|
| 1 | +# 000 — igwanu bug-PR merge round: plan |
| 2 | + |
| 3 | +Round base: `dev @ 8b1b65b8d` (local == `origin/dev`, verified 2026-08-27). |
| 4 | +Scope: the 13 open **bug**-labelled PRs. Four are Ingwannu's (#2767, #2766, #2764, |
| 5 | +#2761); nine are other authors' (#2747, #2745, #2740, #2733, #2729, #2726, #2693, |
| 6 | +#2638, #2497). |
| 7 | + |
| 8 | +Enhancement-labelled PRs are explicitly out of scope for this round. |
| 9 | + |
| 10 | +## The finding that orders the whole round |
| 11 | + |
| 12 | +Three PRs (#2767, #2764, #2747) show **failing required CI** — `ci`, `macos`, |
| 13 | +`test 3/4`, `gates` — while their own merged trees compile clean. The failure is |
| 14 | +not theirs. Every one of them fails the same repository-wide assertion: |
| 15 | + |
| 16 | +``` |
| 17 | +error: package.json version 2.34.0 equals release tag v2.34.0, but this commit is |
| 18 | +not the one that tag names. The tree claims an already-published version. |
| 19 | +(fail) release version line > the in-tree version is never behind a released one |
| 20 | +``` |
| 21 | + |
| 22 | +`dev` still carries `2.34.0` after tag `v2.34.0` shipped, so *every* PR opened |
| 23 | +after the release train inherits a red matrix. A second shared failure hits |
| 24 | +`gates`: `privacy:scan` reads the scp-style SSH remote principal recorded in |
| 25 | +`devlog/_plan/260827_release_train/020_preview_release.md` as an email address. |
| 26 | + |
| 27 | +**#2766 repairs both.** It is the keystone: until it lands, no other PR in this |
| 28 | +round can produce a trustworthy green matrix, and re-running their CI is wasted |
| 29 | +work. This is the inverse of the previous round's lesson — there, green checks |
| 30 | +were not evidence of health; here, red checks are not evidence of harm. |
| 31 | + |
| 32 | +Evidence: run `33081644562` job `98550259965` (#2767), run `33080634739` job |
| 33 | +`98546624127` (#2764), run `33059606933` job `98534630924` (#2747) — each shows |
| 34 | +`1 fail` and that one failure is `release version line`. |
| 35 | + |
| 36 | +## Merged-tree gate (this round's own evidence, not GitHub's) |
| 37 | + |
| 38 | +Every PR head was fetched, merged against `dev @ 8b1b65b8d` with |
| 39 | +`git merge-tree --write-tree`, committed as `mtp/<n>`, checked out to an isolated |
| 40 | +worktree sharing this repo's `node_modules`, and compiled. |
| 41 | + |
| 42 | +| PR | ahead | behind dev | merge-tree | tsc on MERGED tree | |
| 43 | +|---|---|---|---|---| |
| 44 | +| #2767 | 1 | 0 | CLEAN | OK | |
| 45 | +| #2766 | 2 | 0 | CLEAN | OK | |
| 46 | +| #2764 | 1 | 0 | CLEAN | OK | |
| 47 | +| #2761 | 1 | 2 | CLEAN | OK | |
| 48 | +| #2747 | 1 | 26 | CLEAN | OK | |
| 49 | +| #2745 | 2 | 26 | CLEAN | OK | |
| 50 | +| #2740 | 1 | 26 | CLEAN | OK | |
| 51 | +| #2733 | 1 | 43 | CLEAN | OK | |
| 52 | +| #2729 | 2 | 89 | CLEAN | OK | |
| 53 | +| #2726 | 1 | 63 | CLEAN | OK | |
| 54 | +| #2693 | 2 | 118 | CLEAN | OK | |
| 55 | +| #2638 | 2 | 179 | CLEAN | OK | |
| 56 | +| #2497 | 1 | **386** | **CONFLICT** | not reachable | |
| 57 | + |
| 58 | +The typecheck gate was itself verified rather than trusted: 12 runs finishing in |
| 59 | +~12s looked like a no-op, so a deliberate `const x: number = 'str'` was injected |
| 60 | +into a merged worktree and `tsc` returned `error TS2322`, exit 1. The speed is |
| 61 | +real — this repository is on the native TypeScript 7.0.2 compiler (~0.44s full |
| 62 | +typecheck). The gate works. |
| 63 | + |
| 64 | +## Cross-PR file contention |
| 65 | + |
| 66 | +`src/server/responses/core.ts` — **#2745, #2638, #2497**. Pairwise |
| 67 | +`git merge-tree` required before any second one of those lands; textual |
| 68 | +mergeability is not behavioral compatibility on the auth/routing boundary. |
| 69 | + |
| 70 | +`src/adapters/openai-chat.ts` — #2764 only. `src/adapters/openai-responses.ts` |
| 71 | +— #2767 only. `src/codex/auth-context.ts` — #2638 and #2497. |
| 72 | +No other file is touched by two in-scope PRs. |
| 73 | + |
| 74 | +## Loop-spec |
| 75 | + |
| 76 | +- Loop archetype: verifier-defined (spec-satisfaction repair per PR). |
| 77 | +- Write scope: `devlog/_plan/260827_igwanu_bug_pr_merge_round/`, `src/` and |
| 78 | + `tests/` only where needed to land or reimplement a PR, plus PR metadata on |
| 79 | + GitHub and `codex/` topic branches. |
| 80 | +- Out of scope: `main`, `preview`, releases, tags, npm publish, docs deploy, |
| 81 | + enhancement PRs, force-push, history rewrite. |
| 82 | +- Bounds: `dev` is push-protected — every lane travels a `codex/` branch and a PR |
| 83 | + targeting `dev`. `bun test` takes a machine-wide lock: one suite at a time, |
| 84 | + long suites on `ssh lidge` via `ocx-run`. Never `OCX_TEST_NO_QUEUE=1`. |
| 85 | + |
| 86 | +## Work-phase map (one phase = one full PABCD cycle) |
| 87 | + |
| 88 | +| WP | Doc | Slice | Depends on | |
| 89 | +|----|-----|-------|------------| |
| 90 | +| wp1 | 000 | Docs-only roadmap: intake, merged-tree gate, contention map, lanes | — | |
| 91 | +| wp2 | 010 | **Keystone** #2766 — unblock the repository-wide CI gates | wp1 | |
| 92 | +| wp3 | 020 | Ingwannu remainder #2761, #2764, #2767 | wp2 | |
| 93 | +| wp4 | 030 | Clean approved lane #2733, #2726, #2747 | wp2 | |
| 94 | +| wp5 | 040 | Maintainer changes-requested #2745, #2729 | wp2 | |
| 95 | +| wp6 | 050 | Contributor remainder #2740, #2693, #2638 | wp2, wp5 | |
| 96 | +| wp7 | 060 | #2497 adjudication + round close-out | all | |
| 97 | + |
| 98 | +## Standing gates (inherited, all mandatory) |
| 99 | + |
| 100 | +1. Compile evidence comes from the MERGED tree, never the PR head alone. |
| 101 | +2. Any two PRs touching a shared file get `git merge-tree` before either merges. |
| 102 | +3. Green checks are not health unless the list includes `ci` / `test N/4` / |
| 103 | + `macos`. **Corollary discovered this round: red checks are not harm until the |
| 104 | + shared baseline is green.** |
| 105 | +4. One `bun test` suite at a time; remove a stale |
| 106 | + `/tmp/opencodex-bun-test.lock` rather than bypassing the queue. |
| 107 | +5. Every lane travels a `codex/` branch and a PR targeting `dev`. |
| 108 | +6. A safety net that exists in code is not a safety net that functions. |
| 109 | + |
| 110 | +## Accept criteria (mirrored into goalplan criteria[]) |
| 111 | + |
| 112 | +- c1 — all 13 PRs carry a recorded terminal disposition with SHA or reason. |
| 113 | +- c2 — merged-tree compile gate ran for every candidate (this doc's table). |
| 114 | +- c3 — each landed change carries a focused test receipt from the merged tree. |
| 115 | +- c4 — `dev` advanced only through PRs targeting `dev`. |
| 116 | +- c5 — auth/credential/OAuth surfaces are not landed autonomously. |
0 commit comments