Detect and recover locked worktree entries with missing directories - #182
Conversation
git worktree prune skips locked entries by design, so a locked worktree whose directory was deleted (e.g. a crashed agent session) lingers in the registry and keeps its branch checked out. clean now detects this, offers to unlock and prune (auto-confirmed by --force/--yes, previewed by --dry-run), and prints the manual recovery command when declined.
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (4)
WalkthroughThis PR adds automatic recovery for "locked phantom" worktrees—registry entries marked locked whose directories have been deleted. The ChangesLocked phantom worktree recovery
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Comment |
* Detect and recover locked worktree entries with missing directories (coderabbitai#182) git worktree prune skips locked entries by design, so a locked worktree whose directory was deleted (e.g. a crashed agent session) lingers in the registry and keeps its branch checked out. clean now detects this, offers to unlock and prune (auto-confirmed by --force/--yes, previewed by --dry-run), and prints the manual recovery command when declined. * feat(clean): support closed PR cleanup (coderabbitai#183) * feat(clean): support closed PR cleanup Assisted-by: pi:gpt-5.5 Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> * fix(clean): address closed cleanup review nits Assisted-by: pi:gpt-5.5 Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> * fix(clean): match GitLab head_sha fallback Assisted-by: pi:gpt-5.5 Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> --------- Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> * Release v2.8.0 * Replace Homebrew bump action with direct formula update (coderabbitai#184) * Replace Homebrew bump action with direct formula update * Allow manual formula bump via workflow_dispatch * Return non-zero when git gtr rm fails (coderabbitai#190) * Fix rm exit status on removal failures * Test public rm failure status * chore: prepare v2.8.1 release * fix(copy): bound includeDirs discovery (coderabbitai#191) * fix(copy): bound includeDirs discovery * test(copy): allow filesystem result order * fix(copy): preserve basename fallback * chore: prepare v2.8.2 release * feat: inherit sparse-checkout in new worktrees (coderabbitai#186) * feat: inherit sparse-checkout in new worktrees When creating a new worktree from one with sparse-checkout enabled, the new worktree inherits the cone pattern automatically. Controlled by gtr.sparse.inherit config (default on) and --sparse/--no-sparse flags. Adds reusable helpers for sparse-checkout replication. * fix(sparse): address CodeRabbit review feedback on sparse-checkout inheritance - Preserve slash-separated branch paths in _worktree_path_for_ref - Allow fallback to top-level worktree when matching worktree is not sparse - Add Git 2.25+ guard for sparse-checkout support with full checkout fallback - Fix non-cone mode to use init --no-cone (git defaults to cone mode) - Improve error handling: failed sparse inheritance now falls back to full checkout and hard-errors if that fails, instead of leaving --no-checkout worktree empty - Add tests for slash refs, non-cone inheritance, and sparse config precedence * fix: harden sparse-checkout inheritance * fix: support pre-2.20 config lookup * fix: align sparse sources with git refs --------- Co-authored-by: Tom Elizaga <tom.elizaga@gmail.com> * Add PR worktree checkout command (coderabbitai#187) * feat: add pull request worktree command Assisted-by: pi:gpt-5.5 Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> * fix: make pr worktrees gh-aware Assisted-by: pi:gpt-5.5 Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> * fix: harden pr worktree checkout Assisted-by: pi:gpt-5.5 Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> * fix: address pr review feedback Assisted-by: pi:gpt-5.5 Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> --------- Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> Co-authored-by: Tom Elizaga <tom.elizaga@gmail.com> * Run CI on fork pull requests (coderabbitai#185) * Run CI on fork pull requests * fix(ci): minimize fork pull request permissions * chore: prepare v2.9.0 release * feat: add machine-readable worktree creation for agents (coderabbitai#192) Adds stable porcelain output and hook disposition reporting for shell-native agent integrations, with tests and documentation. * chore: prepare v2.10.0 release * perf: avoid per-worktree path resolution in list * fix: complete v2.10 integration artifacts --------- Co-authored-by: Tom Elizaga <tom.elizaga@gmail.com> Co-authored-by: scarf <greenscarf005@gmail.com> Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com> Co-authored-by: Adam Wettreich <80975389+adamwett@users.noreply.github.com>
Summary
Fixes #180.
git worktree pruneskips locked entries by design, so a locked worktree whose directory was deleted (e.g. a crashed agent session under.claude/worktrees/) lingers in the registry and keeps its branch checked out.git gtr clean --merged --yes --forceskipped these silently, and a latergit branch -Dfailed with "used by worktree at ...".cleannow detects entries that are locked but whose directory no longer exists:--forceor--yesauto-confirms,--dry-runpreviews)git worktree unlock <path> && git worktree pruneAuto-unlock stays behind confirmation on purpose: a locked entry with a missing directory can also just be a worktree on an unmounted network/removable volume, which is exactly what the lock protects.
Testing
bats tests/— 474 passclean --yes --forceunlocks + prunes the entry andgit branch -Dworks afterwards; without confirmation the entry is left alone and the recovery hint is printedSummary by CodeRabbit
Bug Fixes
--forceor--yesflags are used.Documentation