Repository navigation
Commit d0186cb
fix(server): restore reservations match missing worktrees under symlinked ancestors
A worktree that storage cleanup removed has no realPath, so its reservation
fell back to the literal path and missed an overlap through a symlinked
ancestor. Resolve the nearest existing ancestor and rejoin the missing tail.
The rollback test now also holds a turn start while files are being restored,
not only while the provider session is opening.
Co-Authored-By: Claude Opus 5.5 <[email protected]>1 parent 8e4748b commit d0186cb
3 files changed
Lines changed: 68 additions & 9 deletions
File tree
- apps/server/src
- orchestration-v2
- workspace
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
366 | 366 | | |
367 | 367 | | |
368 | 368 | | |
| 369 | + | |
| 370 | + | |
369 | 371 | | |
370 | 372 | | |
371 | 373 | | |
| |||
403 | 405 | | |
404 | 406 | | |
405 | 407 | | |
406 | | - | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
407 | 413 | | |
408 | 414 | | |
409 | 415 | | |
| |||
439 | 445 | | |
440 | 446 | | |
441 | 447 | | |
442 | | - | |
| 448 | + | |
443 | 449 | | |
444 | 450 | | |
445 | 451 | | |
446 | 452 | | |
447 | 453 | | |
| 454 | + | |
448 | 455 | | |
449 | 456 | | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
450 | 465 | | |
451 | 466 | | |
452 | 467 | | |
| 468 | + | |
453 | 469 | | |
454 | | - | |
455 | 470 | | |
456 | 471 | | |
457 | | - | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
458 | 476 | | |
459 | 477 | | |
460 | 478 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
964 | 964 | | |
965 | 965 | | |
966 | 966 | | |
967 | | - | |
| 967 | + | |
968 | 968 | | |
969 | 969 | | |
970 | 970 | | |
971 | 971 | | |
972 | 972 | | |
973 | 973 | | |
| 974 | + | |
974 | 975 | | |
975 | 976 | | |
976 | 977 | | |
977 | 978 | | |
978 | 979 | | |
979 | 980 | | |
| 981 | + | |
980 | 982 | | |
981 | 983 | | |
982 | 984 | | |
983 | 985 | | |
984 | 986 | | |
985 | 987 | | |
| 988 | + | |
| 989 | + | |
| 990 | + | |
| 991 | + | |
| 992 | + | |
| 993 | + | |
| 994 | + | |
| 995 | + | |
| 996 | + | |
| 997 | + | |
| 998 | + | |
986 | 999 | | |
987 | 1000 | | |
988 | 1001 | | |
989 | | - | |
| 1002 | + | |
990 | 1003 | | |
991 | 1004 | | |
992 | 1005 | | |
993 | 1006 | | |
994 | 1007 | | |
995 | 1008 | | |
996 | 1009 | | |
997 | | - | |
| 1010 | + | |
| 1011 | + | |
| 1012 | + | |
| 1013 | + | |
| 1014 | + | |
| 1015 | + | |
| 1016 | + | |
| 1017 | + | |
| 1018 | + | |
| 1019 | + | |
998 | 1020 | | |
999 | 1021 | | |
1000 | 1022 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
72 | 92 | | |
73 | 93 | | |
74 | 94 | | |
| |||
77 | 97 | | |
78 | 98 | | |
79 | 99 | | |
80 | | - | |
81 | | - | |
| 100 | + | |
82 | 101 | | |
83 | 102 | | |
84 | 103 | | |
| |||
0 commit comments