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 git branch checkout error handling and adds new stash-based recovery commands end-to-end (contracts/RPC/server/client), which could affect branch switching flows and stash state on failure paths.

Overview
Improves branch switching UX by returning a structured GitCheckoutDirtyWorktreeError (including conflicting file list) when checkoutBranch fails due to dirty or untracked-overwrite worktree state, instead of only generic GitCommandError.

Adds new git operations stashAndCheckout and stashDrop in GitCore with defensive cleanup for failed stash pop, and wires them through contracts + WS RPC (gitStashAndCheckout, gitStashDrop) to the web client.

Updates the branch selector to detect dirty-worktree and unresolved-index errors, show friendlier toasts with a "Stash & Switch" action (and optional "Discard stash" flow on stash-pop conflicts), and tweaks toast layout so action/copy controls render under the description (including copy for warning toasts).

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

Note

Add stash & switch recovery flow with friendly checkout error messages

• Adds stashAndCheckout and stashDrop operations to GitCore and exposes them as WebSocket RPC endpoints (gitStashAndCheckout, gitStashDrop).
• checkoutBranch now returns a typed GitCheckoutDirtyWorktreeError (including conflicting files and target branch) instead of a generic error when local or untracked changes block a checkout.
• In the branch selector UI, checkout errors now show actionable toasts: a 'Stash & Switch' option triggers stashAndCheckout, and on stash conflict a 'Discard stash' option triggers stashDrop.
• Toast layout is updated to place action and copy buttons in a footer row below the description, and copy buttons now appear on warning toasts as well.
• Behavioral Change: createBranch with checkout now emits a GitCommandError (not GitCheckoutDirtyWorktreeError) on dirty worktree failures to preserve operation-specific messaging.

^{Macroscope summarized 23cb962.}

[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: 0ce38ac8-5fd4-4067-9000-0d84608d52f9

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 user-facing feature for git checkout error recovery with stash & switch functionality. It adds new RPC endpoints, new error types, and new UI flows (actionable toasts with 'Stash & Switch' button). The scope and new user-facing behavior warrant human review.

^{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 019345b. Configure here.}