Commit 3293543
committed
fix(worktree): exclude .klondike/ from diff when applying changes
When the agent runs klondike commands (feature start, verify, session end)
inside a worktree, it modifies .klondike/features.json. These state changes
conflict when trying to patch back to the main project.
Now get_worktree_diff() excludes .klondike/ by default, so only code changes
are applied. The klondike state in the main project remains authoritative.1 parent da0b564 commit 3293543
1 file changed
Lines changed: 16 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
455 | 455 | | |
456 | 456 | | |
457 | 457 | | |
458 | | - | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
459 | 463 | | |
460 | 464 | | |
461 | 465 | | |
462 | 466 | | |
463 | 467 | | |
| 468 | + | |
464 | 469 | | |
465 | 470 | | |
466 | 471 | | |
467 | 472 | | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
468 | 477 | | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
469 | 483 | | |
470 | | - | |
| 484 | + | |
471 | 485 | | |
472 | 486 | | |
473 | 487 | | |
| |||
0 commit comments