Skip to content

chore: sync local mainline updates with master#78

Merged
peterjthomson merged 3 commits into
masterfrom
chore/sync-mainline
Apr 21, 2026
Merged

chore: sync local mainline updates with master#78
peterjthomson merged 3 commits into
masterfrom
chore/sync-mainline

Conversation

@peterjthomson

@peterjthomson peterjthomson commented Apr 21, 2026

Copy link
Copy Markdown
Owner

Summary

  • Merges local mainline updates (7af0b18, 2021fca) with the current state of origin/master
  • Resolves one conflict in app/app.tsx (duplicate selectRepo definition — kept HEAD's refactored version using loadRepositoryData)
  • Regenerates package-lock.json from the merged package.json

Context

Local master had diverged: 2 commits ahead / 15 behind. This PR brings them together rather than force-pushing over the 15 commits on origin.

Test plan

  • CI passes (typecheck, lint, tests)
  • App boots and repo selection still works (selectRepo path)
  • No stray merge markers anywhere

Note

Medium Risk
Repo switching behavior is refactored to call a new native openRepository path and resets more UI state, and the PR includes several major dependency/toolchain upgrades (Electron/TypeScript/better-sqlite3) that could cause runtime or build regressions.

Overview
Refactors repository switching to centralize state reset + reload via resetRepositoryViewState/loadRepositoryData, and ensures repo changes go through window.conveyor.repo.openRepository when opened from sidebar/radar (reducing stale UI data when jumping between repos).

Improves canvas settings UX by allowing editable column labels for non-preset canvases, auto-updating the label when changing a column’s panel (unless the user customized it), and preventing drag-reorder from triggering when interacting with inputs/selects; adds corresponding .canvas-column-label-input styling.

Adds a Playwright Electron test (repo-switch.spec.ts) to verify switching between sibling repos updates branch lists, and performs a broad tooling/dependency refresh (notably electron, typescript, better-sqlite3, lucide-react, uuid) plus tsconfig cleanup (removes baseUrl).

Reviewed by Cursor Bugbot for commit 80c5795. Bugbot is set up for automated code reviews on this repo. Configure here.

# Conflicts:
#	app/components/panels/editor/IssueDetailPanel.tsx
#	app/quick-capture/QuickCaptureApp.tsx
#	app/quick-capture/quick-capture.css
#	lib/conveyor/handlers/issue-handler.ts
#	lib/main/tray.ts
#	lib/services/issue/issue-service.ts
#	lib/services/quick-capture/quick-capture-service.ts
#	package-lock.json
#	package.json
# Conflicts:
#	app/app.tsx
#	package-lock.json
@peterjthomson peterjthomson merged commit 80c5795 into master Apr 21, 2026
1 check passed

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 80c5795. Configure here.

Comment thread app/app.tsx
setCurrentBranch('')
setError(null)
setPrError(null)
}, [])

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stale file graph data not cleared on repo switch

Medium Severity

resetRepositoryViewState omits setFileGraph(null) and setFileGraphLoading(false), which the old selectRepo explicitly cleared to "prevent stale data mixing with new repo." Since refresh only calls setFileGraphLoading(true) after the Phase 1 Promise.all resolves, there's a window where the new repo's branches and commits render alongside the previous repo's file graph data.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 80c5795. Configure here.

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.

1 participant