fix(monitor): handle deleted worktrees gracefully#234
Merged
gregpriday merged 1 commit intomainfrom Nov 25, 2025
Merged
Conversation
- Add WorktreeRemovedError class for distinguishing deleted worktrees - Add directory existence check in getWorktreeChangesWithStats before simpleGit - Handle WorktreeRemovedError in WorktreeMonitor to stop polling and emit removal event - Add comprehensive tests for deleted worktree scenarios
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fix for WorktreeMonitor crashing the display when monitoring deleted worktrees. When worktrees are deleted externally (e.g., during automated PR merges), the monitor now gracefully stops polling and emits a removal event instead of flooding stderr with errors.
Closes #233
Changes Made
WorktreeRemovedErrorclass for distinguishing deleted worktrees from other git errorsgetWorktreeChangesWithStats()before callingsimpleGit()WorktreeRemovedErrorinWorktreeMonitor.updateGitStatus()to stop polling and emitsys:worktree:removeeventImplementation Notes
Context & rationale:
simple-gitto throw errors that flooded stderr and destroyed the terminal displaysimpleGit(cwd)to catch ENOENT earlyWorktreeRemovedErrorclass for clear error differentiationImplementation details:
WorktreeRemovedErrorclass insrc/utils/errorTypes.ts- extends GitError with path contextfs.access()check ingetWorktreeChangesWithStats()beforesimpleGit()callWorktreeMonitor.updateGitStatus()that detectsWorktreeRemovedError, emitssys:worktree:remove, and callsstop()Breaking Changes
None - internal resilience improvement