Skip to content

Bug fixes in 1286 - #1288

Closed
joepio wants to merge 2 commits into
fix/sync-nodes-index-and-uifrom
cursor/identified-bug-fixes-ec06
Closed

Bug fixes in 1286#1288
joepio wants to merge 2 commits into
fix/sync-nodes-index-and-uifrom
cursor/identified-bug-fixes-ec06

Conversation

@joepio

@joepio joepio commented Aug 19, 2026

Copy link
Copy Markdown
Member

This pull request contains changes generated by a Cursor Cloud Agent

Cursor generated this PR to address Bugbot findings on PR #1286. If that PR is closed, this PR will be closed automatically. Configure in dashboard.

cursoragent and others added 2 commits August 19, 2026 12:34
…ount repair

- Fix action errors stringifying label function instead of calling it
- Fix explicit choice flag blocking local drive restore on Tauri
- Fix count repair treating local surplus as stale data
All three fixes in this branch had already landed on the base branch in
381eaf6, in a more complete form:

- Action label: base also guards `action.label(ctx)` against throwing, so
  a failing label cannot swallow the error the toast exists to report.
- Count repair: base kept the surplus guard for a while and then reverted
  the whole count probe in bd83cea — it fired a query per collection and
  broke the tested "refresh does not refetch known resources" invariant.
  The real cause was server-side and is fixed in 6c83924.
- Tauri drive restore: base restores in the `did:` branch
  (`wasExplicitlyChosen() ? get() : getLocalServerOrigin()`) rather than by
  persisting the foreign origin. Dropping the `!isRunningInTauri()` guard,
  as this branch did, would store that origin on Tauri and clear the
  explicit marker — reinstating the bug where one visit to an
  `https://…/drive/…` entry left the app booting against that server.

Every conflict is therefore resolved to the base version, and the merged
tree is identical to it.
@joepio

joepio commented Aug 19, 2026

Copy link
Copy Markdown
Member Author

Closing: this branch no longer contributes anything. git diff fix/sync-nodes-index-and-ui cursor/identified-bug-fixes-ec06 is empty.

All three fixes landed on the base branch independently, in a more complete form:

  • Action error label381eaf6d also wraps action.label(ctx) in a try/catch with an 'Action' fallback, since resolving the label reads the resource and can itself throw. A label that fails must not swallow the error the toast exists to report.
  • Count repair381eaf6d added the same surplus guard, then bd83cea6 reverted the whole count probe: it fired a query per collection and broke the invariant query-drive-filter.spec.ts:100 exists to assert. The real cause was server-side, fixed in 6c83924f.
  • Tauri drive restore381eaf6d restores in the did: branch instead (wasExplicitlyChosen() ? get() : getLocalServerOrigin()), rather than persisting the foreign origin. Dropping the !isRunningInTauri() guard as this branch did would store that origin on Tauri and clear the explicit marker, reinstating the bug where one visit to an https://…/drive/… entry left the app booting against that server.

The merge I pushed here (badfc5cb) resolved every conflict to the base version and produced a tree identical to it, which is what made the no-op explicit. Closing collapses the stack to #1286 against develop.

@joepio joepio closed this Aug 19, 2026
An error occurred while trying to automatically change base from fix/sync-nodes-index-and-ui to develop August 21, 2026 17:54
@cursor
cursor Bot deleted the cursor/identified-bug-fixes-ec06 branch August 21, 2026 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants