diff --git a/JOURNAL-conc.md b/JOURNAL-conc.md index dff82dd..dcaf60d 100644 --- a/JOURNAL-conc.md +++ b/JOURNAL-conc.md @@ -153,3 +153,13 @@ All four commits: tests/unit 138 passed + lint PASS before each. Next: tests/con kernel-lock-table serialization observation). Remaining for DONE: formal M2 claim (this commit) + Adversary cold re-check of (a)/push-builds. - M2 claimed in STATUS-conc.md with consolidated (a)-(d) evidence + cold re-check recipe. + +## 2026-06-10 — M2 PASS → ## DONE + +- Adversary M2 PASS @08:55Z (review 9987fba): all 7 claim items cold-confirmed, both M2-found + fixes verified, guardrails honored, no open veto. Parent-sha typo in my claim noted by the + Adversary (139e319^1 = 2173894, not 4ad55ed) — corrected in STATUS. +- ## DONE written to STATUS-conc.md. Phase conc complete: one mechanism (per-app-domain flock), + per-run ABRA_DIR isolation, flock-probe janitor, lifetime guards + 60-min deadline, single + concurrency knob, spec rewritten, 23-test real-kernel suite. Two live-found fixes along the + way: wrapper exit-code under set -e, CONC-A1 run-keyed state files. diff --git a/STATUS-conc.md b/STATUS-conc.md index 4d2e2b6..ee2b3be 100644 --- a/STATUS-conc.md +++ b/STATUS-conc.md @@ -2,14 +2,19 @@ Plan: /srv/cc-ci/cc-ci-plan/concurrency-restructure-full-plan.md (SSOT for this phase) +## DONE + +Both gates Adversary-verified fresh in REVIEW-conc.md, no open VETO: +- M1 — implementation verified: PASS @2026-06-10T04:38Z (branch @d3fe9e2) +- M2 — merged + live-verified (a)–(d): PASS @2026-06-10T08:55Z (final main 139e319/74ed240) +- CONC-A1 (M2(c) live finding): fixed b6e12ef, veto LIFTED + closed @09:05Z + ## Phase state -- Phase: conc — concurrency restructure (P1–P5 + tests/concurrency) -- M1: PASS (REVIEW-conc @2026-06-10T04:38Z, branch @d3fe9e2) +- Phase: conc — concurrency restructure (P1–P5 + tests/concurrency) — COMPLETE - Merged to main: bb5eb3d (restructure) + b7a009c (wrapper exit-code fix) + 139e319 (CONC-A1 fix) -- CONC-A1 veto: LIFTED (REVIEW-conc @09:05Z); M2(c) PASS logged by Adversary -- Gate: **M2 — CLAIMED, awaiting Adversary** (remaining per Adversary: re-confirm (a) cold + push - build green on current main) +- Correction per M2 verdict: 139e319's first parent is 2173894 (not 4ad55ed as the claim said); + immaterial — the code-diff-empty check (139e319 vs b6e12ef) is authoritative. ## Gate claim: M2 — merged + live-verified