|
| 1 | +# 000 — 260819 triage-execution campaign plan |
| 2 | + |
| 3 | +Baseline: 4-lane sol-medium triage (2026-08-19) over 53 open PRs + 75 open |
| 4 | +issues. This unit EXECUTES the verdicts. All merges via gh pr merge --admin |
| 5 | +(user pre-approved). Issue-closure rule: a merged PR that resolves an issue |
| 6 | +closes that issue in the same work-phase. |
| 7 | + |
| 8 | +Live-state reverify (wp0, 2026-08-19): all 14 merge candidates OPEN, |
| 9 | +MERGEABLE, base=dev, zero FAILED checks — but NOT all CI-proven: #2061 #2066 |
| 10 | +#2042 #2072 #2068 #1903 #2075 have no Cross-platform CI run on their exact |
| 11 | +heads (only hygiene/enforce-target). mergeStateStatus=BLOCKED is the |
| 12 | +review-requirement ruleset; admin merge passes. #1885 CONFLICTING (close |
| 13 | +target anyway), #1498 draft+CONFLICTING+red hygiene (close target). |
| 14 | + |
| 15 | +**Pre-merge validation rule (r1 audit fold-back):** a PR without a |
| 16 | +Cross-platform CI conclusion on its exact head must NOT be merged on |
| 17 | +mergeability alone. Before merging such a PR: scratch-merge its head onto |
| 18 | +current dev in a lidge worktree and run the focused suites the diff touches |
| 19 | +(plus tsc); only a clean scratch-merge run authorizes the admin merge. The |
| 20 | +post-merge push CI on the merge SHA remains the decisive gate; a red |
| 21 | +post-merge CI triggers immediate fix-forward or revert of that one merge. |
| 22 | + |
| 23 | +## Work-phase map (dependency-ordered) |
| 24 | + |
| 25 | +| wp | scope | PRs / issues | gate | |
| 26 | +|---|---|---|---| |
| 27 | +| wp1 | batch-quota | merge #2056 #2055 -> close #2047 #2046 | sol review lane per PR, then admin merge, CI on merge SHA | |
| 28 | +| wp2 | batch-small-fixes | merge #2053 #2045 #2061 #2066 -> close #2065 | same | |
| 29 | +| wp3 | batch-lab-chat | merge #2042 #2059; re-diff #2075 vs #2042 (prefix-matching claim); #2044 test-gap decision (merge with follow-up test or request change) | same + 2075 contradiction resolution | |
| 30 | +| wp4 | batch-features | SERIALIZED: merge #2072 first, then re-diff/re-review/scratch-validate #1903 against post-2072 dev before merging it (both touch src/codex/catalog/provider-fetch.ts + provider docs + 9 GUI locales); then #2068 #2057; close #1885 (superseded by #2072) #1498 (stale/dont-merge) | same + serialization gate | |
| 31 | +| wp5 | redesign #2073 | injector env_http_headers -> env_key (codex 0.146+) | C3: wp5's P WRITES 010_env_key_contract.md (contract proof from codex-rs source/release notes via cxc-search) BEFORE impl; impl+tests, PR, admin merge, close #2073 | |
| 32 | +| wp6 | redesign #2064 | Remote raw-thinking on empty summary[] | C3: wp6's P WRITES 020_remote_reasoning_leak_rca.md (root-cause in OUR relay; model-side intermittent exposure is out of scope) BEFORE impl; impl+tests, PR, merge, close #2064 | |
| 33 | +| wp7 | redesign #1926 | tsig credential scope | C4 security: design 051_tsig_credential_scope.md (fin unit), impl+tests, PR, merge, close #1926 | |
| 34 | +| wp8 | redesign #1942 | Windows transactional update rollback | C4: base design 090_transactional_update_rollback.md has a KNOWN path-structure defect (staging/backup as CHILDREN of <prefix> makes the live-prefix swap move them with it, and live cannot move into its own subdirectory) — wp8's P MUST amend the design to sibling-of-prefix staging/backup paths (e.g. <prefix>.ocx-staging-<ts>) before impl; impl+tests, PR, merge, close #1942 | |
| 35 | +| wp9 | closeout | final dev-head CI verify, ledger, unit disposition | push-CI green or pre-existing-red classified | |
| 36 | + |
| 37 | +## Review-lane contract (every merge batch) |
| 38 | + |
| 39 | +- One sol-medium read-only reviewer per PR (parallel), packet includes |
| 40 | + $codexclaw:cxc-dev + $codexclaw:cxc-search mentions, full diff read, |
| 41 | + verdict line MERGE-OK | BLOCK(reason). |
| 42 | +- Main agent merges only MERGE-OK PRs; BLOCK verdicts downgrade the PR to |
| 43 | + NEEDS-WORK with an evidence comment. |
| 44 | +- Merge method: squash when the branch has fixup/noise commits, merge |
| 45 | + otherwise. |
| 46 | +- Suites: lidge dispatch without long blocking waits; decisive gate is the |
| 47 | + Cross-platform CI push run on the merged SHA. |
| 48 | + |
| 49 | +## Known risks |
| 50 | + |
| 51 | +- Seven merge candidates lack head CI (see pre-merge validation rule above); |
| 52 | + scratch-merge lidge validation is mandatory for them. |
| 53 | +- wp4 #2072/#1903 file overlap (provider-fetch.ts, provider docs, locales): |
| 54 | + serialized merge with re-validation between. |
| 55 | +- #1942 base design path defect: fixed at wp8 P via design amendment. |
| 56 | +- #2075 verdict conflict: 1st-pass ADOPT-NOW vs sol NEEDS-WORK (claims it |
| 57 | + reintroduces prefix matching #2042 fixes). Resolve by diffing #2075 head |
| 58 | + against #2042 semantics AFTER #2042 lands. |
| 59 | +- #2064: reasoning leakage can be intermittent model-side behavior; fix only |
| 60 | + what our relay provably does wrong (persisting/rendering raw reasoning when |
| 61 | + summary[] is empty). |
| 62 | +- Windows dispatch CI leg is known-red pre-campaign (Log Guard families) — |
| 63 | + not a gate for these merges. |
0 commit comments