* fix(#2440): per-counter progress ratchet — total_plans always takes derived value Two sites fixed (targeted — existing body-only write tests preserved): Site A — read path: shouldPreserveExistingProgress (state-document.cts:167) removed total_plans from the all-or-nothing ratchet check. It now joins total_phases as an always-derived counter. Only completed_phases and completed_plans keep ratchet behaviour (they are monotonic). This fixes gsd-tools query state.json reporting stale total_plans when a curated completed_plans triggers the ratchet. Site B — write path: applyStatePreservation (state-transition.cts:162) gained a deriveProgressKeys opt-in flag. When true (passed by cmdStatePlannedPhase only), total_plans and total_phases take the derived (post-sync) value instead of the wholesale curated restore. When false (the default — state.update, state.patch), the existing #3242 wholesale protection stays fully in force. This fixes the state planned-phase verb writing a stale total_plans. The opt-in approach preserves all 8 existing #3242/#1264/#500 body-only write tests that assert wholesale progress preservation during non- progress updates. Tests: - tests/state.test.cjs: 4 unit tests for shouldPreserveExistingProgress (total_plans upward/downward/equality + completed_plans ratchet active). - tests/state-transition.test.cjs: 2 #2440 regression tests for deriveProgressKeys=true (total_plans takes derived; boundary at equality). The existing !resync wholesale-restore test stays unchanged (default behavior preserved). References: #2440; #1446 (total_phases read-path fix — same principle); #3242 Bug A (body-only preservation — protection preserved via the opt-in gate); ADR-1769 (applyStatePreservation table-driven preservation). * chore(#2440): backfill pr:2468 in .changeset/mellow-eagles-chatter.md
This commit is contained in:
@@ -1254,6 +1254,7 @@ describe('ADR-1769 #1796: applyStatePreservation — table-driven post-sync cons
|
||||
};
|
||||
|
||||
test('progress: restores curated block when table=preserve-always and transition is not re-deriving (!resync)', () => {
|
||||
// Default behavior: wholesale curated restore. #3242 Bug A protection.
|
||||
const curated = { progress: { total_phases: 4, completed_phases: 3, percent: 75 } };
|
||||
const r = applyStatePreservation({
|
||||
preFm: curated,
|
||||
@@ -1266,6 +1267,42 @@ describe('ADR-1769 #1796: applyStatePreservation — table-driven post-sync cons
|
||||
assert.equal(r.mutated, true);
|
||||
});
|
||||
|
||||
test('#2440: deriveProgressKeys=true — total_plans takes derived value under !resync', () => {
|
||||
// The cmdStatePlannedPhase caller opts in via deriveProgressKeys. total_plans
|
||||
// and total_phases take the derived (post-sync) value; completed_plans and
|
||||
// completed_phases keep curated protection.
|
||||
const curated = { progress: { total_plans: 50, completed_plans: 50, total_phases: 2, completed_phases: 1, percent: 100 } };
|
||||
const r = applyStatePreservation({
|
||||
preFm: curated,
|
||||
preFmSnapshot: curated,
|
||||
postFm: { progress: { total_plans: 64, completed_plans: 49, total_phases: 2, completed_phases: 1, percent: 77 } },
|
||||
resync: false,
|
||||
deriveProgressKeys: true,
|
||||
...untouched,
|
||||
});
|
||||
assert.equal(r.postFm.progress.total_plans, 64,
|
||||
'total_plans must take derived value (64) when deriveProgressKeys=true (#2440)');
|
||||
assert.equal(r.postFm.progress.completed_plans, 50,
|
||||
'completed_plans must keep curated value (50 > 49 triggers ratchet)');
|
||||
assert.equal(r.postFm.progress.total_phases, 2,
|
||||
'total_phases takes derived value (same as curated here — identity)');
|
||||
assert.equal(r.mutated, true);
|
||||
});
|
||||
|
||||
test('#2440 boundary: deriveProgressKeys=true, total_plans derived == curated → identity', () => {
|
||||
const curated = { progress: { total_plans: 64, completed_plans: 49 } };
|
||||
const r = applyStatePreservation({
|
||||
preFm: curated,
|
||||
preFmSnapshot: curated,
|
||||
postFm: { progress: { total_plans: 64, completed_plans: 49, percent: 77 } },
|
||||
resync: false,
|
||||
deriveProgressKeys: true,
|
||||
...untouched,
|
||||
});
|
||||
assert.equal(r.postFm.progress.total_plans, 64,
|
||||
'total_plans equality → derived value (identity)');
|
||||
});
|
||||
|
||||
test('progress: NOT restored when transition re-derives from disk (resync=true) — sync/advancePlan/completePhase path', () => {
|
||||
const recomputed = { progress: { total_phases: 5, completed_phases: 1, percent: 20 } };
|
||||
const r = applyStatePreservation({
|
||||
|
||||
Reference in New Issue
Block a user