Repository navigation
Commit 6b7c497
committed
docs(sleep): record the three boundaries of the conflict auto-resolve tier (#616)
The auto-resolve tier (#603 layer 4) is not safe to switch on yet, and none of
the reasons were written down anywhere in the tree. This is a comment-only change:
- config: the threshold argument quoted "345 rows carrying a similarity, 20 at or
above 0.95 (5.8%)" is an earlier snapshot. Re-measured on the live store today:
748 rows total, only 11 with a non-NULL similarity, 0 at or above 0.95, the
highest pair 0.914. Switching the tier on at the default threshold would
adjudicate nothing tonight and read as a broken feature.
- sleep: state that the whole tier lives inside the conflictFreezeEnabled branch.
The two keys look independent in the panel but are parent and child - turning
freeze off silently drops auto-resolve with it.
- sleep: isCrossScopePair treats an unannotated scope as the same scope, because
scopeKeyOf normalises NULL to null and null !== null is false. 2710 of 8259
active rows (32.8%) carry neither scope, so they slip past the ownership guard
in v0.8.1 #170.
- sleep: autoResolved and autoFailed have no consumer - dream.js forwards only
frozen, conflict_reviewed has no API route and records no winner.
No behaviour changes. Full suite: 3154 tests, 3153 pass, 1 skipped.1 parent 9b16b97 commit 6b7c497
4 files changed
Lines changed: 90 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
546 | 546 | | |
547 | 547 | | |
548 | 548 | | |
549 | | - | |
550 | | - | |
551 | | - | |
552 | | - | |
553 | | - | |
554 | | - | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
555 | 573 | | |
556 | 574 | | |
557 | 575 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
356 | 356 | | |
357 | 357 | | |
358 | 358 | | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
359 | 364 | | |
360 | 365 | | |
361 | 366 | | |
| |||
429 | 434 | | |
430 | 435 | | |
431 | 436 | | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
432 | 442 | | |
433 | 443 | | |
434 | 444 | | |
| |||
445 | 455 | | |
446 | 456 | | |
447 | 457 | | |
448 | | - | |
449 | | - | |
| 458 | + | |
450 | 459 | | |
451 | 460 | | |
452 | 461 | | |
453 | 462 | | |
454 | 463 | | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
455 | 469 | | |
456 | 470 | | |
457 | 471 | | |
| |||
552 | 566 | | |
553 | 567 | | |
554 | 568 | | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
555 | 574 | | |
556 | 575 | | |
557 | 576 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
546 | 546 | | |
547 | 547 | | |
548 | 548 | | |
549 | | - | |
550 | | - | |
551 | | - | |
552 | | - | |
553 | | - | |
554 | | - | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
555 | 573 | | |
556 | 574 | | |
557 | 575 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
356 | 356 | | |
357 | 357 | | |
358 | 358 | | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
359 | 364 | | |
360 | 365 | | |
361 | 366 | | |
| |||
429 | 434 | | |
430 | 435 | | |
431 | 436 | | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
432 | 442 | | |
433 | 443 | | |
434 | 444 | | |
| |||
445 | 455 | | |
446 | 456 | | |
447 | 457 | | |
448 | | - | |
449 | | - | |
| 458 | + | |
450 | 459 | | |
451 | 460 | | |
452 | 461 | | |
453 | 462 | | |
454 | 463 | | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
455 | 469 | | |
456 | 470 | | |
457 | 471 | | |
| |||
552 | 566 | | |
553 | 567 | | |
554 | 568 | | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
555 | 574 | | |
556 | 575 | | |
557 | 576 | | |
| |||
0 commit comments