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

Closed

Marve10s wants to merge 18 commits into

pingdotgg:mainfrom

Marve10s:feat/checkout-dirty-worktree-error-handling

Commits on Apr 17, 2026

feat(git): friendly checkout error messages with stash & switch recovery
Marve10s
committed
e7ca8cb
feat(git): wire stash recovery into EnvironmentApi and fix optimistic UI
Marve10s
committed
3699a1b
Fix client settings type coverage for thread preview count
Marve10s
committed
5fa9a95
Match client settings fixture to desktop contract
Marve10s
committed
a4d5318
fix(git): add missing refreshGitStatus to stashDrop and handle persistent dirty worktree errors
Marve10s
committed
766b49a
Remove unnecessary git checkout scope requirement
Marve10s
committed
7025fb7
Skip stash pop when stash push creates no entry
Marve10s
committed
3c844c6
fix(git): preserve dirty worktree metadata
Marve10s
committed
bd4148c
Merge upstream/main into feat/checkout-dirty-worktree-error-handling
Marve10s
committed
fb38720

Commits on Apr 18, 2026

fix(git): handle ignored checkout conflicts
Marve10s
committed
91709b3

Commits on Apr 20, 2026

fix(git): address review comments on checkout error handling
Marve10s
committed
301e9cc
style: apply oxfmt to checkout error handling files
Marve10s
committed
146b672

Commits on Apr 24, 2026

Commits on Apr 29, 2026

fix(web): guard stash discard branch action state
Marve10s
committed
9345413
fix(web): report rejected nested branch actions
Marve10s
committed
97f198a
fix(server): refresh git status after stash checkout failure
Marve10s
committed
3b76843

Commits on May 11, 2026

Merge upstream/main into feat/checkout-dirty-worktree-error-handling
Marve10s
committed
144ec1a