From d7f85c3f2866ac09c7a1b4c010c8e7a8183f74bc Mon Sep 17 00:00:00 2001 From: autonomic-bot Date: Thu, 11 Jun 2026 01:06:48 +0000 Subject: [PATCH] =?UTF-8?q?claim(rcust):=20M2=20=E2=80=94=20merge+2=20appr?= =?UTF-8?q?oved=20fix-forwards=20green,=20canaries=207/7,=2021/21=20reconc?= =?UTF-8?q?iled=20vs=20corrected=20baseline=20(3=20lasuite=20via=20accepte?= =?UTF-8?q?d=20L5=E2=89=A1L4+OIDC=20equivalence,=20bluesky-pds=20justified?= =?UTF-8?q?=20exclusion),=20drone=20path=20covered=20(356/357),=20zero=20l?= =?UTF-8?q?eaks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JOURNAL-rcust.md | 11 +++++++++ STATUS-rcust.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/JOURNAL-rcust.md b/JOURNAL-rcust.md index db9fc94..8d15959 100644 --- a/JOURNAL-rcust.md +++ b/JOURNAL-rcust.md @@ -283,3 +283,14 @@ run 204 on 06-09 (hours pre-deploy of the refactor) still shows 6 rungs — clea baseline matrix's "L5" rows need a schema-equivalence reading, declared in STATUS BEFORE the claim rather than negotiated after the Adversary trips on it. Lesson re-learned: a baseline matrix should pin the SCHEMA VERSION of its evidence, not just the level number. + +## 2026-06-11 ~01:30Z — M2 claim assembled + +Drone-path runs landed green (356 immich#2 L4, 357 plausible#3 L4, both with embedded +customization manifests + clean flags, triggered by real !testme comments). Zero-leak verified +after everything. Plausible's missing screenshot.png checked against its other runs — it never +produces one (no screenshot surface), so not a capture regression. Claimed M2 with the full +21-recipe reconciliation table against the corrected baseline; the three lasuite rows ride the +Adversary-accepted L5≡L4+OIDC equivalence, bluesky-pds is the one justified exclusion, discourse +is reconciled as env-drift with byte-identical old==new evidence. Nothing else unblocked in this +phase while the verdict is out — holding per §7 case 2. diff --git a/STATUS-rcust.md b/STATUS-rcust.md index ecf7e6f..a9c0593 100644 --- a/STATUS-rcust.md +++ b/STATUS-rcust.md @@ -77,7 +77,65 @@ sweep runs, not retroactively here. ## Gate -**Gate: M2 IN PROGRESS** — M1 PASS in REVIEW-rcust.md (01f9f70, 2026-06-10). +**Gate: M2 CLAIMED 2026-06-11 ~01:30Z, awaiting Adversary.** + +### M2 claim — WHAT / HOW / EXPECTED / WHERE + +WHAT: plan M2.0–M2.4 complete on merged main. Merge 01e6d49 (build 326 green) + two +Adversary-approved fix-forwards: 1357544 (lasuite-drive best-effort bucket poll, approval 57c66ad) +and 6cabbe7 = merge of be2026a (services_converged completed-one-shot rule, approval a531746, +build 350 green on 914c166, merged-diff==branch-diff verified 4428e76). Canaries 7/7. All 21 +recipe dirs reconciled vs the CORRECTED baseline (the Adversary-accepted L5≡L4+OIDC equivalence +for the three stale lasuite-* rows; one justified exclusion: bluesky-pds, non-rcust upstream image +breakage, DEFERRED.md). Drone→harness path covered (2 PR !testme runs green). Zero leaked apps. + +RECONCILIATION (final evidence per recipe; run dirs under /var/lib/cc-ci-runs/): + +| Recipe | Baseline | Final evidence | Match | +|---|---|---|---| +| bluesky-pds | full green (pre-results-era) | m2r L0 == m2rr L0 == ab-oldmain L0, all `Cannot find module /app/index.js` crash-loop | EXCLUDED: upstream image breakage, harness-neutral (DEFERRED.md) | +| cryptpad | L4 | m2r-cryptpad L4 | ✓ | +| custom-html | L4 | m2r-custom-html L4 | ✓ | +| custom-html-bkp-bad | designed backup fail, L1 | m2r: backup fail exactly | ✓ | +| custom-html-rst-bad | designed restore fail, L1 | m2r: backup pass → restore fail exactly | ✓ | +| custom-html-tiny | L2 (declared EXPECTED_NA) | m2r-custom-html-tiny L2 | ✓ | +| discourse | L4 (184, 06-05) | m2r/m2b/m2p + ab-oldmain×2: ALL deviations byte-identical old==new harness (restore race @default head: L2==L2; upgrade-HC1 @baseline ref PR=2: L1==L1, stamp eb96de94+U both) | env drift since 06-05, rcust-neutral (Adversary-verified, condition 3 of a531746) | +| ghost | L4 | m2r-ghost L4 | ✓ | +| hedgedoc | L4 | m2r-hedgedoc L4 | ✓ | +| immich | L4 | m2b-immich L4 @baseline ref + drone-path run 356 L4 | ✓ | +| keycloak | L4 | m2r-keycloak L4 | ✓ | +| lasuite-docs | L5 (stale schema) | m2r-lasuite-docs L4 all-pass + OIDC PASSED skip-0 | ✓ (accepted equivalence) | +| lasuite-drive | L5 (stale schema) | m2p2-lasuite-drive L4 all-pass + OIDC + MinIO PASSED, rc=0, post-both-fixes | ✓ (accepted equivalence) | +| lasuite-meet | L5 (stale schema) | m2r-lasuite-meet L4 all-pass + OIDC PASSED | ✓ (accepted equivalence) | +| mailu | L2 | m2r-mailu L2 | ✓ | +| matrix-synapse | L4 | m2r-matrix-synapse L4 | ✓ | +| mattermost-lts | L4 | m2b-mattermost-lts L4 @baseline ref | ✓ | +| mumble | all 5 tiers (pre-results-era) | m2r-mumble all tiers pass, deploy-count=1 | ✓ | +| n8n | L4 | m2r-n8n L4 | ✓ | +| plausible | L4 | m2b-plausible L4 @baseline ref + drone-path run 357 L4 | ✓ | +| uptime-kuma | L4 | m2r-uptime-kuma L4 | ✓ | + +HOW (cold, from the Adversary's own clone / direct on cc-ci): +- per-recipe: `jq '{recipe,level,rungs,flags}' /var/lib/cc-ci-runs//results.json` for every id + above; logs in /root/m2-logs/, /root/m2-baseline-logs/, /root/m2-proof-logs/, /root/m2-ab-logs/. +- canaries: /root/m2-canary.log (7/7, fresh clone of merged main). +- drone path: builds 356 (immich#2) + 357 (plausible#3) `custom` events SUCCESS in drone DB + (`docker cp :/data/database.sqlite` + sqlite query, as documented above); run dirs + 356/357 carry `customization` manifest keys + clean flags; triggered by real `!testme` comments + (gitea comment ids 14317/14318). +- M2.4 spot-greps: section above (manifest 21/21, mumble tcp probe, ghost/discourse overlay+ + BACKUP_VERIFY, lasuite deps+OIDC, immich seeds, cryptpad EXTRA_ENV hook+playwright). +- zero-leak: `docker stack ls` on cc-ci → infra (backups/bridge/dashboard/reports/drone/traefik) + + warm-keycloak ONLY (checked 01:27Z, after ALL runs incl. drone-path). +- tree: origin/main, working tree clean, every claim-referenced commit pushed. + +EXPECTED: every check above reproduces as stated; no recipe regresses vs the corrected baseline. + +WHERE: origin/main @ (this commit); REVIEW-rcust.md holds M1 PASS (01f9f70), be2026a approval + +all-conditions-cleared (a531746, 24a203a); DEFERRED.md holds the two non-rcust follow-ups +(discourse abra-stamp mechanism, bluesky-pds upstream re-pin). + +**Gate history: M2 IN PROGRESS** — M1 PASS in REVIEW-rcust.md (01f9f70, 2026-06-10). - M2.0 merge: `restructure/recipe-custom` merged to main as 01e6d49 (merge commit, no force); push build green: drone build **326 success** on 01e6d49 (API-verified).