Repository navigation
Commit 13a943d
committed
S4b (Zoo-Code-Org#1375): a committed write that is not durable keeps its authorization
The rename is the point of no return for the content, and the observation was not
following it. When the commit landed but the parent-directory fsync did not,
PostCommitDurabilityError unwound past guardedWrite's post-publish refresh, so the
observation stayed at the version the read recorded. The next edit of that same
file - content the tool itself had just written - was then refused as stale
against bytes that no longer existed, and ApplyPatchTool's finally sweep withdrew
the read entirely because the publish had not returned. Withdrawal is the right
disposition for a publish that did not happen and the wrong one for content that
is on disk.
PostCommitDurabilityError now carries committedVersion: the version token the
commit landed, read best-effort with the same derivation every guard uses, and the
message says what to do with it - "committed, not durable: do not re-issue the
write; read the file again before editing it" - naming the version so the
instruction is checkable rather than a style preference. When the post-commit stat
itself fails, the field stays undefined and the message says the same thing
without inventing a version.
guardedWrite treats that error as a publish that succeeded with a caveat: the
token the error carries feeds the same refresh a successful publish gets - keeping
a partial observation partial, because the branch that sets that never ran - and
the durability failure is thrown after the refresh, so the caller sees the
accepted state and the caveat together. A failure before the rename still unwinds
untouched: nothing was committed to record.
That ordering is what ApplyPatchTool's sweep depends on. It forgets a tool-recorded
read only when the stored entry is still the one it recorded, so an entry the
refresh re-earned survives, and the withdrawal still applies to every read whose
publish never landed. ApplyPatchTool needed no production change for that - the
sweep was already keyed to the entry rather than the path - so its half of this
commit is the row that pins the property.
This commit touches services/file-safety/safeWriteText.ts and core/tools/guardedWrite.ts
in production, and three spec lanes. It is deliberately one commit: the token is
meaningless without the refresh that reads it, and the refresh is meaningless
without the error that carries it.
Gates: safeWriteText 77 passed (2 rows new), guardedWrite 73 passed (4 rows new),
applyPatchTool.execute 34 passed (1 row new), applyPatchTool.partial and the
applyDiff/apply-patch lanes green, write-path callers (writeToFileTool, editFileTool,
editTool, searchReplaceTool) green, task abort races 9 passed, DiffViewProvider 168
passed, safeWriteJson + fileLock 81 passed | 4 skipped. Together the blast-radius run
is 14 files, 530 passed | 5 skipped. eslint --max-warnings=0 exit 0 on all seven
touched files; --prune-suppressions run afterwards and src/eslint-suppressions.json
restored to HEAD (a narrow prune pass also drops records for files outside the
selection, so it is never committed). prettier --check clean. tsc --noEmit -p . shows
only activate/registerCommands.ts(88,102) TS2739, the local junction artifact. No
it.runIf(win32) gate added anywhere; the parent-directory fsync path is POSIX-only by
construction and the rows drive it with the platform option, not with an OS gate.
Controls, each failing only for the reason its row describes: not recognizing the
committed durability error -> the three durability rows report 'expected v1 to be
v2'; refreshing but swallowing the failure -> the same three rows report 'promise
resolved instead of rejecting'; not mirroring the partial flag -> only the partial
row, 'expected true to be false'; not reading the committed version -> only the
token row, 'expected undefined to be 7:8:4:9:10'; keying the sweep to the path
instead of the entry -> only the apply_patch row, 'expected undefined to be
committed-token'. The row that pins the pre-commit case (a publish refused before
the rename leaves the read's version) passes under every one of those controls,
which is the point of writing it as its own row.
Three spec files had to expose the real error class through their module mock of
safeWriteText (guardedWrite.spec, DiffViewProvider.spec and this lane's stubs):
without it 37 provider-lane rows failed with 'No "PostCommitDurabilityError" export
is defined on the mock', and a locally defined stand-in class would have let rows
pass against a shape production does not build, so the factories now pull the real
class through importOriginal while keeping the publish primitive stubbed.
Review rows 4507764645 and 4507851715.1 parent 802352d commit 13a943d
6 files changed
Lines changed: 327 additions & 76 deletions
File tree
- src
- core/tools
- __tests__
- integrations/editor/__tests__
- services/file-safety
- __tests__
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
310 | 311 | | |
311 | 312 | | |
312 | 313 | | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
313 | 348 | | |
314 | 349 | | |
315 | 350 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
42 | 49 | | |
43 | 50 | | |
44 | 51 | | |
| |||
1332 | 1339 | | |
1333 | 1340 | | |
1334 | 1341 | | |
| 1342 | + | |
| 1343 | + | |
| 1344 | + | |
| 1345 | + | |
| 1346 | + | |
| 1347 | + | |
| 1348 | + | |
| 1349 | + | |
| 1350 | + | |
| 1351 | + | |
| 1352 | + | |
| 1353 | + | |
| 1354 | + | |
| 1355 | + | |
| 1356 | + | |
| 1357 | + | |
| 1358 | + | |
| 1359 | + | |
| 1360 | + | |
| 1361 | + | |
| 1362 | + | |
| 1363 | + | |
| 1364 | + | |
| 1365 | + | |
| 1366 | + | |
| 1367 | + | |
| 1368 | + | |
| 1369 | + | |
| 1370 | + | |
| 1371 | + | |
| 1372 | + | |
| 1373 | + | |
| 1374 | + | |
| 1375 | + | |
| 1376 | + | |
| 1377 | + | |
| 1378 | + | |
| 1379 | + | |
| 1380 | + | |
| 1381 | + | |
| 1382 | + | |
| 1383 | + | |
| 1384 | + | |
| 1385 | + | |
| 1386 | + | |
| 1387 | + | |
| 1388 | + | |
| 1389 | + | |
| 1390 | + | |
| 1391 | + | |
| 1392 | + | |
| 1393 | + | |
| 1394 | + | |
| 1395 | + | |
| 1396 | + | |
| 1397 | + | |
| 1398 | + | |
| 1399 | + | |
| 1400 | + | |
| 1401 | + | |
| 1402 | + | |
| 1403 | + | |
| 1404 | + | |
| 1405 | + | |
| 1406 | + | |
| 1407 | + | |
| 1408 | + | |
| 1409 | + | |
| 1410 | + | |
| 1411 | + | |
| 1412 | + | |
| 1413 | + | |
| 1414 | + | |
| 1415 | + | |
| 1416 | + | |
| 1417 | + | |
| 1418 | + | |
| 1419 | + | |
| 1420 | + | |
| 1421 | + | |
| 1422 | + | |
| 1423 | + | |
1335 | 1424 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
591 | 591 | | |
592 | 592 | | |
593 | 593 | | |
594 | | - | |
595 | | - | |
596 | | - | |
597 | | - | |
598 | | - | |
599 | | - | |
600 | | - | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
601 | 617 | | |
602 | | - | |
603 | | - | |
604 | | - | |
605 | | - | |
606 | | - | |
607 | | - | |
608 | | - | |
609 | | - | |
610 | | - | |
611 | | - | |
612 | | - | |
613 | | - | |
614 | | - | |
615 | | - | |
616 | | - | |
617 | | - | |
618 | | - | |
619 | | - | |
620 | | - | |
621 | | - | |
622 | | - | |
623 | | - | |
624 | | - | |
625 | | - | |
626 | | - | |
627 | | - | |
628 | | - | |
629 | | - | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
630 | 635 | | |
631 | | - | |
632 | | - | |
633 | | - | |
634 | | - | |
635 | | - | |
636 | | - | |
637 | | - | |
638 | | - | |
639 | | - | |
640 | | - | |
641 | | - | |
642 | | - | |
643 | | - | |
644 | | - | |
645 | | - | |
646 | | - | |
647 | | - | |
648 | | - | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
649 | 681 | | |
650 | | - | |
651 | | - | |
652 | | - | |
653 | | - | |
654 | | - | |
655 | | - | |
656 | | - | |
657 | | - | |
658 | | - | |
659 | | - | |
| 682 | + | |
660 | 683 | | |
661 | 684 | | |
662 | 685 | | |
| |||
673 | 696 | | |
674 | 697 | | |
675 | 698 | | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
676 | 705 | | |
677 | 706 | | |
678 | 707 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
51 | 58 | | |
52 | 59 | | |
53 | 60 | | |
| |||
0 commit comments