Tom Boucher
77d929429f
fix( #2774 ): inclusion-based worktree cleanup to protect workspace .git ( #2778 )
...
* fix(#2774 ): inclusion-based worktree cleanup to protect workspace .git
The cleanup blocks in execute-phase.md and quick.md used an exclusion
filter (`grep -v "$(pwd)$"`) to skip the current worktree before calling
`git worktree remove --force` on everything else. The exclusion fails
whenever the current workspace is itself a worktree of an upstream repo:
- multi-workspace setups where `git worktree list` reports the registry
path as a different absolute path than `$(pwd)`
- the cross-drive Windows case where the registry reports `E:/...` while
`$(pwd)` resolves to `C:/...` — the equality test never holds, every
other worktree (including the workspace itself) is removed, and the
workspace's `.git` pointer file is destroyed.
Switches both cleanup blocks to an inclusion-based filter that targets
only agent-spawned worktrees under `.claude/worktrees/agent-`, the
namespace Claude Code's `isolation="worktree"` always uses for executor
worktrees. The workspace path can never collide with that prefix.
Adds tests/bug-2774-worktree-cleanup-workspace-safety.test.cjs covering:
- both workflow files use the inclusion filter
- neither falls back to the broken `grep -v "$(pwd)$"` guard
- end-to-end simulation of porcelain output with workspace + agent
worktrees yields only the agent worktree
Closes #2774
* test(#2774 ): replace source-grep with behavioral test of cleanup pipeline
* fix(#2774 ): whitespace-safe worktree iteration with while/read
CodeRabbit review on PR #2778 flagged that `for WT in $WORKTREES` splits
on whitespace. Any agent worktree path containing a space (e.g. a workspace
under '/Users/dev/My Workspace/') would be torn into broken half-paths,
`git -C` would fail on each fragment, and the executor branch would never
be deleted.
Switch both cleanup blocks (quick.md and execute-phase.md) to:
while IFS= read -r WT; do
[ -z "$WT" ] && continue
...
done < <(git worktree list --porcelain | grep ... | sed ...)
Process substitution feeds the pipeline output line-by-line — IFS= and -r
preserve every byte of the path including embedded spaces.
Also rename the misleading `makeBareTempGitRepo` helper to
`makeTempUpstreamRepo` (it does not pass --bare; it inits a normal repo
with an initial commit so worktree-add works).
Add two new behavioral tests:
- discovery pipeline yields whitespace paths intact on a single line
- the actual while/read loop iterates each whitespace-bearing path
exactly once (would fail with the previous `for WT in` form)
Tests: 5681 pass, 0 fail.
2026-04-27 12:31:26 -04:00
..
2026-04-25 10:50:54 -04:00
2026-04-04 14:29:03 -04:00
2026-04-12 17:56:19 -04:00
2026-04-17 10:47:08 -04:00
2026-04-25 10:50:54 -04:00
2026-04-11 03:39:29 -07:00
2026-04-20 09:31:34 -04:00
2026-04-10 10:49:00 -04:00
2026-04-04 14:29:03 -04:00
2026-04-04 14:29:03 -04:00
2026-04-04 14:29:03 -04:00
2026-04-10 12:30:46 -04:00
2026-04-11 03:30:05 -07:00
2026-04-07 17:27:20 -04:00
2026-04-05 23:07:52 -04:00
2026-04-04 14:29:03 -04:00
2026-04-25 10:50:54 -04:00
2026-04-15 14:59:18 -04:00
2026-04-04 14:29:03 -04:00
2026-04-04 07:58:27 -04:00
2026-04-04 07:24:31 -04:00
2026-04-11 08:50:44 -04:00
2026-04-07 08:13:52 -04:00
2026-04-05 17:49:20 -04:00
2026-04-05 17:32:18 -04:00
2026-04-05 18:05:32 -04:00
2026-04-05 18:20:11 -04:00
2026-04-19 16:35:32 -05:00
2026-04-25 11:34:55 -04:00
2026-04-22 12:04:06 -04:00
2026-04-07 17:19:10 -04:00
2026-04-19 16:35:32 -05:00
2026-04-10 10:48:00 -04:00
2026-04-11 03:35:00 -07:00
2026-04-11 03:37:34 -07:00
2026-04-10 10:50:17 -04:00
2026-04-10 11:19:32 -04:00
2026-04-10 11:25:55 -04:00
2026-04-10 11:15:59 -04:00
2026-04-10 12:07:13 -04:00
2026-04-10 21:37:08 -04:00
2026-04-19 16:35:32 -05:00
2026-04-15 14:58:41 -04:00
2026-04-23 11:58:06 -04:00
2026-04-17 09:20:26 -04:00
2026-04-25 10:50:54 -04:00
2026-04-22 10:41:58 -04:00
2026-04-25 12:02:58 -04:00
2026-04-17 09:20:42 -04:00
2026-04-20 10:10:16 -04:00
2026-04-20 18:37:42 -04:00
2026-04-20 10:10:16 -04:00
2026-04-20 10:10:16 -04:00
2026-04-20 10:09:33 -04:00
2026-04-23 11:54:11 -04:00
2026-04-20 10:09:33 -04:00
2026-04-20 10:09:33 -04:00
2026-04-20 10:09:33 -04:00
2026-04-20 10:11:00 -04:00
2026-04-20 10:10:16 -04:00
2026-04-20 10:11:00 -04:00
2026-04-19 15:40:50 -05:00
2026-04-23 08:36:03 -04:00
2026-04-20 10:08:46 -04:00
2026-04-20 18:37:32 -04:00
2026-04-24 18:05:16 -04:00
2026-04-21 09:46:01 -04:00
2026-04-21 10:10:45 -04:00
2026-04-21 21:20:27 -04:00
2026-04-21 10:10:10 -04:00
2026-04-21 21:35:22 -04:00
2026-04-22 12:09:12 -04:00
2026-04-22 10:41:58 -04:00
2026-04-21 20:33:43 -04:00
2026-04-21 20:33:24 -04:00
2026-04-21 21:18:58 -04:00
2026-04-22 11:28:25 -04:00
2026-04-25 10:59:33 -04:00
2026-04-22 12:04:17 -04:00
2026-04-22 21:57:24 -04:00
2026-04-22 12:03:56 -04:00
2026-04-22 12:04:06 -04:00
2026-04-22 12:04:13 -04:00
2026-04-25 12:09:27 -04:00
2026-04-24 18:05:10 -04:00
2026-04-24 18:10:45 -04:00
2026-04-24 18:05:33 -04:00
2026-04-24 18:05:40 -04:00
2026-04-24 18:05:18 -04:00
2026-04-24 18:05:04 -04:00
2026-04-24 20:22:17 -04:00
2026-04-24 20:22:29 -04:00
2026-04-24 20:27:59 -04:00
2026-04-25 12:10:01 -04:00
2026-04-25 12:16:04 -04:00
2026-04-25 12:10:01 -04:00
2026-04-25 12:15:39 -04:00
2026-04-25 12:08:59 -04:00
2026-04-25 12:16:04 -04:00
2026-04-27 12:31:15 -04:00
2026-04-27 12:31:26 -04:00
2026-04-27 12:31:21 -04:00
2026-04-07 08:13:58 -04:00
2026-04-23 08:36:03 -04:00
2026-04-22 21:57:24 -04:00
2026-04-06 15:14:02 -04:00
2026-04-11 09:15:36 -04:00
2026-04-25 10:59:33 -04:00
2026-04-24 18:05:40 -04:00
2026-04-20 09:31:34 -04:00
2026-04-10 13:58:16 -04:00
2026-04-04 14:29:03 -04:00
2026-04-11 09:19:32 -04:00
2026-04-12 08:10:30 -04:00
2026-04-25 12:03:39 -04:00
2026-04-10 10:46:21 -04:00
2026-04-26 13:33:43 -04:00
2026-04-20 09:31:34 -04:00
2026-04-15 14:59:35 -04:00
2026-04-05 17:02:20 -04:00
2026-04-10 10:56:09 -04:00
2026-04-04 14:29:03 -04:00
2026-04-25 11:34:55 -04:00
2026-04-07 17:25:11 -04:00
2026-04-22 11:28:25 -04:00
2026-04-24 18:05:16 -04:00
2026-04-15 16:46:10 -04:00
2026-04-04 14:29:03 -04:00
2026-04-25 11:34:55 -04:00
2026-04-26 11:49:30 -04:00
2026-04-11 09:20:27 -04:00
2026-04-04 14:29:03 -04:00
2026-04-11 09:18:49 -04:00
2026-04-19 23:12:23 -04:00
2026-04-05 09:15:41 -04:00
2026-04-15 16:23:09 -04:00
2026-04-22 21:57:24 -04:00
2026-04-25 11:34:55 -04:00
2026-04-22 21:57:24 -04:00
2026-04-27 09:03:36 -04:00
2026-04-01 08:47:31 -06:00
2026-04-22 21:21:44 -04:00
2026-04-26 13:33:52 -04:00
2026-04-21 08:40:39 -04:00
2026-04-20 18:21:43 -04:00
2026-04-20 18:27:55 -04:00
2026-04-25 16:26:15 -04:00
2026-04-20 18:21:35 -04:00
2026-04-20 18:25:24 -04:00
2026-04-20 18:19:14 -04:00
2026-04-26 21:40:38 -04:00
2026-04-20 18:21:23 -04:00
2026-04-25 14:23:40 -04:00
2026-04-22 12:04:21 -04:00
2026-04-04 14:29:03 -04:00
2026-04-25 12:04:16 -04:00
2026-04-04 14:29:03 -04:00
2026-04-05 18:33:27 -04:00
2026-04-11 09:28:16 -04:00
2026-04-22 20:49:52 -04:00
2026-04-05 18:33:17 -04:00
2026-04-25 16:47:55 -04:00
2026-04-04 14:29:03 -04:00
2026-04-26 21:40:38 -04:00
2026-04-15 22:46:31 -04:00
2026-04-26 11:36:14 -04:00
2026-04-10 21:30:13 -04:00
2026-04-19 15:55:37 -05:00
2026-04-22 20:50:15 -04:00
2026-04-20 10:08:46 -04:00
2026-04-15 22:46:31 -04:00
2026-04-04 14:37:54 -04:00
2026-04-04 14:29:03 -04:00
2026-04-04 14:15:30 -04:00
2026-04-04 14:29:03 -04:00
2026-04-20 09:31:34 -04:00
2026-04-04 14:29:03 -04:00
2026-04-22 12:04:25 -04:00
2026-04-17 17:12:34 -05:00
2026-04-15 14:59:07 -04:00
2026-04-17 09:20:26 -04:00
2026-04-20 10:08:40 -04:00
2026-04-25 10:50:54 -04:00
2026-04-18 08:42:36 -05:00
2026-04-27 00:13:20 -04:00
2026-04-23 11:53:51 -04:00
2026-04-15 14:59:24 -04:00
2026-04-20 09:31:34 -04:00
2026-04-20 09:39:05 -04:00
2026-04-20 09:39:05 -04:00
2026-04-10 12:30:24 -04:00
2026-04-26 13:33:54 -04:00
2026-04-24 18:06:13 -04:00
2026-04-10 11:47:22 -04:00
2026-04-05 19:09:14 -04:00
2026-04-25 11:34:55 -04:00
2026-04-14 17:57:38 -04:00
2026-04-04 14:29:03 -04:00
2026-04-04 14:29:03 -04:00
2026-04-15 14:59:12 -04:00
2026-04-25 11:34:55 -04:00
2026-04-15 22:46:31 -04:00
2026-04-06 08:54:18 -04:00
2026-04-26 11:48:47 -04:00
2026-04-25 12:09:27 -04:00
2026-04-10 21:55:44 -04:00
2026-04-05 18:05:32 -04:00
2026-04-07 08:13:46 -04:00
2026-04-11 09:02:30 -04:00
2026-04-04 14:29:03 -04:00
2026-04-03 12:47:24 +03:00
2026-04-25 11:34:55 -04:00
2026-04-14 17:57:38 -04:00
2026-04-06 15:13:23 -04:00
2026-04-04 14:29:03 -04:00
2026-04-04 14:29:03 -04:00
2026-04-16 17:15:29 -04:00
2026-04-04 14:29:03 -04:00
2026-04-11 15:02:55 -04:00
2026-04-11 09:16:11 -04:00
2026-04-12 15:56:20 -04:00
2026-04-20 10:08:52 -04:00
2026-04-04 14:29:03 -04:00
2026-04-25 12:02:58 -04:00
2026-04-10 12:41:59 -04:00
2026-04-25 14:18:34 -04:00
2026-04-20 18:09:02 -04:00
2026-04-11 10:26:27 -04:00
2026-04-04 14:29:03 -04:00
2026-04-25 16:26:15 -04:00
2026-04-05 12:41:17 -04:00
2026-04-15 07:39:48 -06:00
2026-04-04 14:29:03 -04:00
2026-04-15 16:23:18 -04:00
2026-04-16 17:22:31 -04:00
2026-04-11 09:34:29 -04:00
2026-04-17 10:11:08 -04:00
2026-04-05 10:23:41 -04:00
2026-04-04 14:29:03 -04:00
2026-04-05 10:23:41 -04:00
2026-04-15 22:46:31 -04:00
2026-04-11 11:19:47 -04:00
2026-04-24 18:05:40 -04:00
2026-04-04 14:29:03 -04:00
2026-04-22 10:41:58 -04:00
2026-04-16 17:22:31 -04:00
2026-04-10 12:29:25 -04:00
2026-04-06 15:20:06 -04:00
2026-04-26 13:33:45 -04:00
2026-04-23 11:53:20 -04:00
2026-04-04 14:29:03 -04:00
2026-04-15 14:59:56 -04:00
2026-04-05 17:04:33 -04:00
2026-04-01 16:53:20 -04:00
2026-04-20 10:08:49 -04:00
2026-04-04 14:29:03 -04:00
2026-03-24 13:33:58 -04:00
2026-04-20 10:08:18 -04:00
2026-04-12 17:56:00 -04:00
2026-04-04 07:10:21 -04:00
2026-04-25 10:59:33 -04:00
2026-04-04 14:29:03 -04:00
2026-04-10 13:55:27 -04:00
2026-04-15 10:35:29 -04:00
2026-04-11 15:02:55 -04:00
2026-04-27 09:03:36 -04:00
2026-04-04 14:29:03 -04:00
2026-04-11 15:39:50 -04:00
2026-04-11 09:15:00 -04:00
2026-04-04 14:29:03 -04:00
2026-04-05 17:49:20 -04:00
2026-04-25 10:50:54 -04:00
2026-04-15 22:46:31 -04:00
2026-04-04 14:29:03 -04:00
2026-04-20 10:08:18 -04:00
2026-04-22 12:04:25 -04:00
2026-04-21 10:10:10 -04:00
2026-04-12 17:56:19 -04:00
2026-04-25 16:26:15 -04:00
2026-04-11 03:24:49 -07:00
2026-04-02 18:55:17 -03:00
2026-04-22 12:04:25 -04:00
2026-04-04 14:29:03 -04:00
2026-04-04 14:29:03 -04:00
2026-04-04 14:29:03 -04:00
2026-04-06 08:40:37 -04:00
2026-04-05 22:54:12 -04:00
2026-04-05 12:30:24 -04:00
2026-04-22 21:57:24 -04:00
2026-04-25 11:34:55 -04:00
2026-04-02 21:36:36 -05:00
2026-04-04 14:29:03 -04:00
2026-04-05 11:11:38 -04:00
2026-04-10 12:30:08 -04:00
2026-04-04 14:29:03 -04:00