🤖 fix: clean stale git index.lock before worktree operations #1003
Conversation
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
Git creates index.lock during operations that modify the index. If a process is killed mid-operation (user cancel, crash, terminal closed), the lock file gets orphaned. This is common in Mux when git operations are interrupted. Added cleanStaleLock() helper that removes lock files older than 5 seconds before git operations that touch the main repository's index: - createWorktree - removeWorktree - pruneWorktrees - WorktreeRuntime.createWorkspace - WorktreeRuntime.renameWorkspace - WorktreeRuntime.deleteWorkspace The 5-second threshold ensures we only remove orphaned locks, not locks from legitimately running processes. _Generated with mux_
|
Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits. |
ammario
approved these changes
Dec 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Problem
When using Mux, git operations (worktree create/delete/rename) can get interrupted (user cancel, crash, terminal closed), leaving orphaned
.git/index.lockfiles in the main repository. This causes subsequent git operations to fail with:Solution
Added
cleanStaleLock()helper that removes lock files older than 5 seconds before git operations that touch the main repository's index:createWorktreeremoveWorktreepruneWorktreesWorktreeRuntime.createWorkspaceWorktreeRuntime.renameWorkspaceWorktreeRuntime.deleteWorkspaceThe 5-second threshold ensures we only remove orphaned locks, not locks from legitimately running processes.
Testing
Added unit tests for the
cleanStaleLockfunction:Generated with
mux