feat(git): friendly checkout error messages with stash & switch recovery

[Marve10s]

Summary

• When git checkout fails because the working tree has uncommitted changes, the app now shows a friendly "Uncommitted changes block checkout" error toast listing the conflicting files — instead of dumping a raw GitCommandError stack trace with internal file paths
• The error toast includes a "Stash & Switch" action button that stashes changes, checks out the target branch, and attempts to pop the stash on the new branch
• If the stash cannot be applied cleanly (e.g. the target branch doesn't have the same files), the server resets the merge state, cleans up orphaned untracked files, and keeps the stash entry safe. The UI shows a warning toast with a "Discard stash" button (with confirmation dialog) to drop the stash
• Both "Your local changes would be overwritten" and "untracked working tree files would be overwritten" git error variants are now detected and handled with the same friendly UX
• The "you need to resolve your current index" error (which previously showed a raw stack trace) now shows a clear "Unresolved conflicts in the repository" message
• Toast layout restructured: copy and action buttons now render below the description instead of floating inline with the title. Copy button extended to warning-type toasts
• Adds GitCheckoutDirtyWorktreeError tagged error, stashAndCheckout and stashDrop WS methods end-to-end (contracts → server → client)

---

Note

Medium Risk
Changes branch checkout error handling and adds new stash-based recovery commands end-to-end (contracts, server GitCore, WS RPC, and UI), which can affect git state and error propagation. Risk is mitigated by extensive new integration tests covering conflict and cleanup scenarios.

Overview
Improves branch switching UX when git checkout is blocked by a dirty worktree. checkoutBranch now detects “would be overwritten” (tracked and untracked) failures and returns a typed GitCheckoutDirtyWorktreeError containing the target branch and conflicting files.

Adds a new “stash & switch” recovery path via GitCore.stashAndCheckout (stash with a descriptive message, checkout, then pop), including cleanup logic when stash pop conflicts and a stashDrop helper to discard the top stash entry.

Exposes the new operations over WebSocket RPC (gitStashAndCheckout, gitStashDrop) and updates the branch selector to show friendly toasts with action buttons (including “Stash & Switch” and optional “Discard stash”), plus a clearer message for unresolved index errors. Toast rendering is adjusted so copy/action buttons appear below the description and copy is available for warnings too.

^{Reviewed by Cursor Bugbot for commit 8d9f042. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add stash-and-switch checkout recovery with friendly dirty worktree error messages

• Introduces a structured GitCheckoutDirtyWorktreeError (with branch, cwd, and conflictingFiles fields) when checkoutBranch is blocked by uncommitted or untracked file conflicts, replacing the generic GitCommandError.
• Adds stashAndCheckout to the git service: stashes local changes, checks out the target branch, and pops the stash; on failure it restores state, cleans untracked stash remnants, and preserves the stash with a descriptive error.
• Adds stashDrop to drop the top stash entry via the API.
• The branch selector in BranchToolbarBranchSelector.tsx now shows actionable toasts on dirty worktree failures, offering a 'Stash & Switch' action and an optional 'Discard stash' follow-up.
• Toast layout updated in toast.tsx: action and copy buttons now appear beneath the description, and warnings also show the copy button.
• Behavioral Change: WsGitCheckoutRpc error schema now includes GitCheckoutDirtyWorktreeError in its union; callers handling GitManagerServiceError may now receive this new error type.

^{Macroscope summarized 8d9f042.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 2db636bf-28a1-4f0b-bb43-836f332fe5cc

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces a new feature for git checkout error recovery with stash & switch functionality. It adds new git operations, RPC methods, error types, and complex UI error handling flows with actionable toasts. The scope and runtime behavior changes warrant human review. Additionally, there's an unresolved comment about potential UI flicker from the state management refactor.

^{You can customize Macroscope's approvability policy. Learn more.}

[Marve10s]

Before :

After :


If users tried to discard stash - shows a modal with approval.

[sashaduke]

+1, I have an error of a different kind that spills out so much i cant even close the toast so im gonna make a similar PR but this is useful

[cursor]

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

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

^{Reviewed by Cursor Bugbot for commit 8d9f042. Configure here.}

[cursor]

useState+useEffect sync overrides in-flight optimistic branch value

Medium Severity

Replacing useOptimistic/useTransition with useState + useEffect changes the synchronization semantics. The useEffect syncs resolvedActiveBranch to canonicalActiveBranch on every change — including while a branch action is in flight. If a git status refresh fires mid-checkout and reports the old branch, the useEffect overwrites the optimistic value, causing the branch display to flicker back to the old name before settling on the new one. The previous useOptimistic implementation preserved the optimistic value for the duration of the transition, avoiding this flicker.

 

^{Reviewed by Cursor Bugbot for commit 8d9f042. Configure here.}