Repository navigation
Commit 2a9bfab
easonLiangWorldedtech
fix(tools): stop a post-commit failure from rolling back a landed write
Three CodeRabbit rows at head 1b09bab, all in the write_to_file teardown:
- execute()'s catch called diffViewProvider.reset() directly, so a reset that
rejected skipped reportRevertFailure(): the user saw only the write error while
the editor still held content nobody approved. It now goes through the same
resilient helper the parse-failure and partial-stream teardowns use.
- The prevent-focus-disruption rejection exit returned without resetting the
provider. That branch never opens a diff view, but the preflight had already
adopted this call's created directories and set editType/originalContent, so
the next write's open() folded them into its own createdDirs and its rollback
rmdir'ed directories belonging to the rejected write.
- saveChanges() persists the document and then keeps working (closing the diff
views, tab bookkeeping, diagnostics), and trackFileContext() and
pushToolWriteResult() run after it. A failure past that point restored the
previous content, or unlinked a file the user had just approved being created.
saveChanges() now signals its commit point at the document save and the
rollback stands down from there; saveDirectly() commits when it returns,
because performing the write is what it does.
Same shape as the landed rule recorded for #41 Follow-up 11 (6092123982) in
Zoo-Code-Org#1921 (1b9ae30): the commit point is where a write becomes irreversible, not
where the call finished.
Tests: four new cases; each is the only failure when its own guard is removed,
and the DiffViewProvider pair pins both directions of the commit signal.1 parent 1b09bab commit 2a9bfab
4 files changed
Lines changed: 126 additions & 3 deletions
File tree
- src
- core/tools
- __tests__
- integrations/editor
- __tests__
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
324 | 324 | | |
325 | 325 | | |
326 | 326 | | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
327 | 334 | | |
328 | 335 | | |
329 | 336 | | |
| |||
410 | 417 | | |
411 | 418 | | |
412 | 419 | | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
413 | 426 | | |
414 | 427 | | |
415 | 428 | | |
416 | 429 | | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
417 | 433 | | |
418 | 434 | | |
419 | 435 | | |
| |||
449 | 465 | | |
450 | 466 | | |
451 | 467 | | |
452 | | - | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
453 | 474 | | |
454 | 475 | | |
455 | 476 | | |
| |||
490 | 511 | | |
491 | 512 | | |
492 | 513 | | |
493 | | - | |
494 | | - | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
495 | 522 | | |
496 | 523 | | |
497 | 524 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1149 | 1149 | | |
1150 | 1150 | | |
1151 | 1151 | | |
| 1152 | + | |
| 1153 | + | |
| 1154 | + | |
| 1155 | + | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
| 1164 | + | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
| 1170 | + | |
| 1171 | + | |
| 1172 | + | |
| 1173 | + | |
| 1174 | + | |
| 1175 | + | |
| 1176 | + | |
| 1177 | + | |
| 1178 | + | |
| 1179 | + | |
| 1180 | + | |
| 1181 | + | |
| 1182 | + | |
| 1183 | + | |
| 1184 | + | |
| 1185 | + | |
| 1186 | + | |
| 1187 | + | |
| 1188 | + | |
| 1189 | + | |
| 1190 | + | |
| 1191 | + | |
| 1192 | + | |
| 1193 | + | |
| 1194 | + | |
| 1195 | + | |
| 1196 | + | |
| 1197 | + | |
| 1198 | + | |
| 1199 | + | |
| 1200 | + | |
| 1201 | + | |
| 1202 | + | |
| 1203 | + | |
| 1204 | + | |
| 1205 | + | |
| 1206 | + | |
| 1207 | + | |
| 1208 | + | |
| 1209 | + | |
| 1210 | + | |
| 1211 | + | |
| 1212 | + | |
| 1213 | + | |
1152 | 1214 | | |
1153 | 1215 | | |
1154 | 1216 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
344 | 344 | | |
345 | 345 | | |
346 | 346 | | |
| 347 | + | |
347 | 348 | | |
348 | 349 | | |
349 | 350 | | |
| |||
361 | 362 | | |
362 | 363 | | |
363 | 364 | | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
364 | 371 | | |
365 | 372 | | |
366 | 373 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
970 | 970 | | |
971 | 971 | | |
972 | 972 | | |
| 973 | + | |
| 974 | + | |
| 975 | + | |
| 976 | + | |
| 977 | + | |
| 978 | + | |
| 979 | + | |
| 980 | + | |
| 981 | + | |
| 982 | + | |
| 983 | + | |
| 984 | + | |
| 985 | + | |
| 986 | + | |
| 987 | + | |
| 988 | + | |
| 989 | + | |
| 990 | + | |
| 991 | + | |
| 992 | + | |
| 993 | + | |
| 994 | + | |
| 995 | + | |
| 996 | + | |
| 997 | + | |
| 998 | + | |
| 999 | + | |
973 | 1000 | | |
974 | 1001 | | |
975 | 1002 | | |
| |||
0 commit comments