Repository navigation
Commit 3e42783
fix(worktree): preserve ignored-only worktree changes (no silent loss)
Cycle-3 review (Codex, final cycle) found a fourth data-loss path in the same
fail-open class. `git add -A` skips git-ignored paths (.env, dist/, .output,
build artifacts) — so a worktree whose only changes landed in ignored files
produces an empty patch. cleanupWorktreeSession then returned "No changes to
apply" and force-removed the worktree + branch, irreversibly destroying the
artifacts. Confirmed empirically; this very repo ignores exactly .env/dist/
.output — paths Codex/rescue writes to routinely.
Fix: when keep produces an empty tracked patch, check hasIgnoredChanges()
(`git status --porcelain --ignored -uall`, !! entries). If ignored work exists,
preserve the worktree and branch and surface the situation in the result
detail instead of removing. Fail-safe: never lose work silently. If the user
wants those ignored files gone, they remove the worktree explicitly.
Regression test: worktree.test.mjs "keep preserves the worktree when only
ignored files changed" — creates dist/artifact.txt in an ignored worktree,
asserts keep returns applied:false + "ignored files" message AND the worktree
+ artifact survive.
Verified: worktree 15/15, process 5/5, git 11/11 green; full npm test 158 pass
/ 4 pre-existing (unchanged).
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0189cGaohsYdpkB4otKZnpAt1 parent 5748958 commit 3e42783
3 files changed
Lines changed: 59 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
345 | 345 | | |
346 | 346 | | |
347 | 347 | | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
348 | 363 | | |
349 | 364 | | |
350 | 365 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
25 | 36 | | |
26 | 37 | | |
27 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
289 | 289 | | |
290 | 290 | | |
291 | 291 | | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
0 commit comments