Plan 3: recovery re-merge dispatch coherence — submodule scoping on every retry, ADR 0019/0040 cross-reference, rot-proof capture comment

[Ljferrer]

Plan 3 of the 2026-07-24-standing-record-and-guard-hardening campaign (stack-and-plow, ADR 0011).
Stacked on plan 2 — base is dev/2026-07-24-runbook-and-standing-record-coherence (PR #1109), not master.

What this closes

After plan 4 rebuilt merge-time gate-failure recovery, three coherence gaps remained — one per layer
of the record. All three are closed here.

1. Retry re-merges dispatched submodule tasks unscoped. The per-task SUBMODULE TASK: note —
   the paragraph rooting a submodule task's rebase and gate in its own checkout via
   targetRepo/targetBase — rode only the initial merge-task prompt. A taskType:'submodule'
   task whose first merge tripped a recoverable route was re-dispatched pointing at the
   superproject. The note now rides all three recovery re-merges in
   skills/war/assets/workflow-template.js — merge:<taskId>:floor-retry:r<round>,
   merge:<taskId>:environment-proceed, merge:<taskId>:baseline-proceed. It is the empty string
   off the submodule path, so every non-submodule prompt stays byte-identical.
2. gateCaptureClause's header comment had rotted to 2 of its 3 consumer sites. The
   enumeration is replaced by a count-free evidence-contract statement naming the captureUses
   drift guard in workflow-template.test.mjs as the arbiter of the site list — the enumeration is
   exactly what rotted, so the fix is to stop enumerating.
3. ADR 0019 still taught the retired 0-fix-round env-blocked route that ADR 0040 replaced, and
   neither record pointed at the other. Repaired in both directions without retro-editing:
   0019 gains a dated ## Amendment (2026-07-24) (original Decision prose byte-intact); 0040's
   ## Relationship to prior ADRs gains one Supersedes one row of ADR 0019 bullet.

Proof is by dispatch capture, not source-occurrence counting: three new sibling tests drive a
taskType:'submodule' fixture through each recovery route and assert the prompt located by
dispatch label carries both the SUBMODULE TASK: marker and the fixture's targetRepo.

Phases

phase	tasks	result
1 — Retry-dispatch scoping + record coherence	1.1 (#1112), 1.2 (#1113)	landed 43a6dc4; 2/2 merged, unanimous approve, 0 fix rounds, 0 escalations; phase-close polish merged 48f93e3
2 — Release	2.1 (#1116)	landed a84b42d4; release 0.14.60, four slots in lock-step

Epics #1110 (phase 1) and #1111 (phase 2), both closed status:done; issue-lifecycle floor assert
rc 0 on both. Red-team: CLEARED-WITH-NOTES in one round (docs/red-team/2026-07-24-recovery-re-merge-dispatch-coherence.md),
3 minor roots auto-fixed pre-execution.

Unexecuted backstops

None. The plan declared one deferred validation and it was EXECUTED — PASS @ 43a6dc4:

Integrated-tip sweep re-check — the three §4.5 greps on the landed Phase-1 tip. Deferred because
the two Phase-1 tasks adjudicate at their own frozen bases, while the coherence claims (End states
1, 7) are properties of the integrated tip after the serial merge queue. Runner: the Lead at
Phase-1 land, before dispatching Phase 2.

Result: submodMergeNote = 5; env-blocked (case-insensitive) = 6 in ADR 0019 / 5 in ADR 0040, every
hit adjudicated; token hunt = 10 in the js (down from 11 — exactly the removed enumeration sentence)
/ 67 in the test, every js hit adjudicated a keep.

End state 9 was reported SOFT cannot-confirm by the gate-audit (no gate-log artifact threaded to
the end-state pass; an auditor cannot execute the gate) and was closed by the Lead executing
version-slots.test.mjs at the landed tip — 3/3 green, four slots all 0.14.60.

Follow-ups filed

• war-followup: submodule scoping/floors incomplete across three dispatch families (re-land, polish merge, floor-retry) #1114 — consolidated submodule dispatch-family gaps: submodLandNote missing on both re-land
  dispatches; polish-merge submodule-awareness undecided; and a pre-existing gap found in flight —
  the floor-retry re-merge omits assert-no-submodule-mutation.sh though two of its own comments
  promise "ALL floor invocations (test + packaging + submodule)" (pre-existing since 3b07815c,
  2026-07-06; confirmed by git blame, out of slice, reported not edited). This supersedes the
  plan's "file ONE war-followup" duty — it folds both spec-§9-deferred sites plus the new third.
• war-followup: ADR 0019 amendment's no-chaining clause names only the merge-site half of ADR 0040 §B #1115 — the amendment's chained-case clause names only the merge-site half of ADR 0040 §B.

Source issues

#1032, #1033, #1034 close at the campaign PR per the plan's ## Notes map (#1032→1.1,
#1033→1.2, #1034→1.1) — deliberately not closed here.

One note recorded, not held: the release blurb's colon-scoped No behavior change: label reads
as a headline contradiction against the paragraph's own opening sentence. Strictly read it is true
(every enumerated surface is verifiably untouched) and it is the anti-overclaim device the plan
mandated; the nit is cross-release readability.

⚠️ Merge order is bottom-up. This PR sits above #1097 (plan 1) and #1109 (plan 2) and must not
be merged before them.

🤖 Generated with Claude Code