claude-code - 💡(How to fix) Fix [Bug] "Remove this worktree" button silently fails after commits; exit prompt sometimes missing [2 comments, 2 participants]

[{"error":"Error: NON-FATAL: Lock acquisition failed for /Users/albert/.local/share/claude/versions/2.1.109 (expected in multi-process scenarios)\n at yU_ (/$bunfs/root/src/entrypoints/cli.js:2342:2153)\n at Vs6 (/$bunfs/root/src/entrypoints/cli.js:2342:1233)\n at processTicksAndRejections (native:7:39)","timestamp":"2026-04-15T19:07:59.564Z"},{"error":"Error: ECONNREFUSED\n at from (/$bunfs/root/src/entrypoints/cli.js:107:7862)\n at <anonymous> (/$bunfs/root/src/entrypoints/cli.js:115:12925)\n at emitError (node:events:43:23)\n at <anonymous> (/$bunfs/root/src/entrypoints/cli.js:114:1149)\n at emitError (node:events:43:23)\n at <anonymous> (node:_http_client:253:22)\n at processTicksAndRejections (native:7:39)","timestamp":"2026-04-15T19:08:14.583Z"},{"error":"Error: ECONNREFUSED\n at from (/$bunfs/root/src/entrypoints/cli.js:107:7862)\n at <anonymous> (/$bunfs/root/src/entrypoints/cli.js:115:12925)\n at emitError (node:events:43:23)\n at <anonymous> (/$bunfs/root/src/entrypoints/cli.js:114:1149)\n at emitError (node:events:43:23)\n at <anonymous> (node:_http_client:253:22)\n at processTicksAndRejections (native:7:39)\n at request (/$bunfs/root/src/entrypoints/cli.js:117:2467)\n at processTicksAndRejections (native:7:39)","timestamp":"2026-04-15T19:08:55.600Z"},{"error":"Error: ECONNREFUSED\n at from (/$bunfs/root/src/entrypoints/cli.js:107:7862)\n at <anonymous> (/$bunfs/root/src/entrypoints/cli.js:115:12925)\n at emitError (node:events:43:23)\n at <anonymous> (/$bunfs/root/src/entrypoints/cli.js:114:1149)\n at emitError (node:events:43:23)\n at <anonymous> (node:_http_client:253:22)\n at processTicksAndRejections (native:7:39)\n at request (/$bunfs/root/src/entrypoints/cli.js:117:2467)\n at processTicksAndRejections (native:7:39)","timestamp":"2026-04-15T19:09:18.518Z"},{"error":"Error: ECONNREFUSED\n at from (/$bunfs/root/src/entrypoints/cli.js:107:7862)\n at <anonymous> (/$bunfs/root/src/entrypoints/cli.js:115:12925)\n at emitError (node:events:43:23)\n at <anonymous> (/$bunfs/root/src/entrypoints/cli.js:114:1149)\n at emitError (node:events:43:23)\n at <anonymous> (node:_http_client:253:22)\n at processTicksAndRejections (native:7:39)\n at request (/$bunfs/root/src/entrypoints…

TL;DR

The "Remove this worktree" button fails silently when the HEAD has moved from the original commit, and the exit prompt sometimes doesn't appear, causing issues with worktree removal.

Guidance

• Modify the internal check to compare the current HEAD against the original HEAD commit, considering the branch cleanliness and upstream tracking state instead of exact equality.
• Implement error handling to surface the error inline with a "Remove anyway" option when there are uncommitted or unpushed changes.
• Ensure the exit prompt appears reliably by checking the current session worktree flag and handling cases where it might get cleared or lost.
• Verify the fix by creating a worktree, committing changes, pushing, and clicking "Remove this worktree" to ensure it succeeds or prompts for confirmation.

Example

No specific code snippet can be provided without modifying the existing codebase, but the logic for checking the worktree removal conditions could be updated to consider the branch cleanliness and upstream tracking state.

Notes

The provided error logs seem unrelated to the main issue, as they mention lock acquisition failures and ECONNREFUSED errors, which might be separate issues. The solution should focus on updating the internal check and error handling for worktree removal.

Recommendation

Apply a workaround by manually using git worktree remove --force when the "Remove this worktree" button fails, and consider updating the internal check logic to handle branch cleanliness and upstream tracking state for a more robust solution.