Skip to content

Commit 05ee9ec

Browse files
authored
Merge pull request #350 from lidge-jun/codex/260724-passthrough-state
fix(responses): reconstruct dropped SSE output items + dedupe replayed multi-agent guidance (#334, #326)
2 parents 5eeff1d + cc7d945 commit 05ee9ec

15 files changed

Lines changed: 4490 additions & 9 deletions
Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
# 000 — 260724_bugfix_train: Plan
2+
3+
> Roadmap master for the bugfix train. One work-phase = one full PABCD cycle.
4+
> Bound goalplan: `.codexclaw/goalplans/opencodex-bugfix-train-6-pabcd-cycles-bookkeepin/goalplan.json`
5+
> (session 019f8f62-c778-7550-bd4c-aa4419fce259).
6+
7+
## Objective
8+
9+
Land every verified-unpatched bug from the 2026-07-23 issue sweep as reviewable PRs
10+
against `dev`, and bring the two open contributor PRs to merge-ready quality.
11+
12+
Evidence base: three Sol reviewer reports against origin/dev tip `d9e06c8d`
13+
(issues #334/#326, issues #335/#331/#329/#324/#320/#241/#92, PRs #336/#337) plus a
14+
3-Mind contradiction rescan (14 contradictions; 4 high folded into this plan as
15+
corrections, 6 medium recorded as OPEN ASSUMPTIONS below).
16+
17+
## Loop-spec
18+
19+
- Loop archetype: verifier-defined (spec-satisfaction repair) for every phase.
20+
- Trigger: owner directive 2026-07-24 — auto-resolve open questions via subagent
21+
opinion, run repeated small PABCD cycles, push + open PR per cycle.
22+
- Goal: cycles 1-6 each closed through D with branch pushed and PR opened; #324
23+
closed; #92/#241 status comments posted.
24+
- Non-goals: upstream-blocked fixes (#92/#241 root causes), #42 Phase 2/3, all
25+
feature-request issues, merging any PR (owner decision; gui/ merges need fresh
26+
explicit approval).
27+
- Verifier per cycle: `bun run typecheck` + `bun run test` + `bun run privacy:scan`
28+
green; cycle 4/6 add `bun run lint:gui` + `bun run build:gui`; docs-site sync
29+
decision recorded in the D summary.
30+
- Stop condition: all goalplan criteria met, or a stated terminal outcome
31+
(BLOCKED / NEEDS_HUMAN / UNSAFE / BUDGET_EXHAUSTED with evidence).
32+
- Memory artifact: this unit + goalplan + `.codexclaw/ledger.jsonl`.
33+
- Escalation: upward — main reclaims a slice after two distinct agent failures on
34+
the same packet (DISPATCH-RETIRE-01); downward — pushing a slice to a worker is a
35+
P-phase amendment, never mid-B improvisation.
36+
- Resource bounds: tools = local git/gh/bun + GitHub via gh; write scope = the
37+
ocx-bugfix-train worktree + contributor PR branches (maintainerCanModify verified);
38+
push scope = per-cycle `codex/260724-*` branches and the two contributor branches
39+
only (owner pre-approved for this exact scope).
40+
41+
## Topology (corrected per contradiction scan)
42+
43+
- One worktree: `/Users/jun/.codex/worktrees/ocx-bugfix-train` (deps installed).
44+
- Per-cycle branches `codex/260724-<unit>` cut from CURRENT `origin/dev` — never
45+
stacked on unmerged predecessors (keeps every PR independently reviewable).
46+
- Cycles 5/6 fetch the contributor head branches and push fix commits there
47+
(attribution preserved; no superseding PRs).
48+
- The review worktree `codex-260723-issue-pr-review` stays pinned at d9e06c8d as
49+
read-only reference; all post-cycle-1 verification runs in this worktree.
50+
51+
## Work-phase map (dependency-ordered, PHASE-SPLIT-01)
52+
53+
| WP | Doc | Slice | Depends on |
54+
|-----|------|-------|------------|
55+
| wp0 | 000 | This roadmap (docs-only cycle) | — |
56+
| wp1 | 010 | #334 SSE output backfill + #326 idempotent guidance injection (file set per 010: src/server/relay.ts, src/types.ts, src/responses/parser.ts, src/server/responses/collaboration.ts — core.ts/state.ts explicitly untouched) | wp0 |
57+
| wp2 | 020 | #335 bounded single pool retry on allow-listed account-specific 400 (SECURITY GATE) | wp1 |
58+
| wp3 | 030 | #320 codex-shim auto-restore after external npm update (SECURITY GATE) | wp1 |
59+
| wp4 | 040 | #329 discovery-error badge + #331 helper-fallback UX copy (gui) | wp1 |
60+
| wp5 | 050 | PR #336 takeover: refresh to live head (87af85fb, 8 files, Cross-platform CI already GREEN), rebase onto post-wp1 dev, interdiff review, re-run gates. Expected textual overlap with wp1 is LOW (wp1 avoids core.ts); treat any collaboration.ts adjacency case-by-case | wp1 MERGED |
61+
| wp6 | 060 | PR #337 takeover: interactive component tests + split 840-line component + root-suite failures | wp4 merged preferred (i18n overlap) |
62+
| wp7 | — | Bookkeeping: close #324 (docs pointer), status comments on #92/#241 | wp1 |
63+
64+
Dependency rationale: wp1 is the foundation (passthrough state machine; PR #336
65+
edits the same subsystem, so it rebases after wp1 lands to keep semantics
66+
consistent even though direct textual conflict is expected to be low). wp2-wp4
67+
are independent capability lanes. wp5 is integration gated on wp1 merging. wp6
68+
prefers wp4 merged to avoid i18n hunk collisions. wp7 is hygiene.
69+
70+
## wp0 artifact map (docs-only cycle, DIFFLEVEL-ROADMAP-01)
71+
72+
| Action | Path (relative to repo root) |
73+
|--------|------------------------------|
74+
| NEW | devlog/_plan/260724_bugfix_train/000_plan.md (this file) |
75+
| NEW | devlog/_plan/260724_bugfix_train/010_passthrough_state.md |
76+
| NEW | devlog/_plan/260724_bugfix_train/020_pool_retry_400.md |
77+
| NEW | devlog/_plan/260724_bugfix_train/030_shim_autorestore.md |
78+
| NEW | devlog/_plan/260724_bugfix_train/040_ux_discovery_badge.md |
79+
| NEW | devlog/_plan/260724_bugfix_train/050_pr336_takeover.md |
80+
| NEW | devlog/_plan/260724_bugfix_train/060_pr337_takeover.md |
81+
| NEW | devlog/_plan/260724_bugfix_train/061_root_suite_investigation.md (wp6 research artifact, split per LEXICO-SPLIT-01) |
82+
83+
Note: the six `0N0_phaseN.md` scaffolds were replaced before the unit's first
84+
commit and were never tracked by git — no DELETE rows apply to this map.
85+
86+
No production code changes in wp0. Activation proof for this cycle: the A-gate
87+
reviewer verdict (adversarial repo-grounded audit) + `git status` showing only
88+
devlog/_plan additions + the D attestation in `.codexclaw/ledger.jsonl`.
89+
devlog/ is gitignored with tracked content: force-add these artifacts when
90+
committing (`git add -f devlog/_plan/260724_bugfix_train`).
91+
92+
## OPEN ASSUMPTIONS (carried from Interview, recorded)
93+
94+
1. #335 intentionally refines the 35d28a02 "4xx = caller, no failover" policy; PR
95+
description must say so explicitly; the pinned no-penalty test stays green.
96+
2. Done-gate extended beyond the user's "PR open": + privacy:scan + docs-site sync
97+
decision per cycle (AGENTS.md requirements).
98+
3. Cycles 5/6 push fix commits to contributor branches (maintainerCanModify=true);
99+
no superseding PRs; original authors keep attribution.
100+
4. #326 fix = idempotent injection (option a) with replayPrefixLen plumbed through
101+
parseRequest; option (b) strip-at-persist rejected (5 call sites).
102+
5. #334 fix = one shared SSE item-accumulator helper for both consumers;
103+
trackSseForRequestLog needs no backfill (terminal-status only).
104+
6. Cycles 2 and 3 carry security-review checkpoints (MAINTAINERS.md security
105+
boundary); gui/ merges are outside this loop's authority.
106+
7. (superseded assumption, corrected by A-gate round 1) PR #336's required CI was
107+
NOT missing — the initial gap was the first-time-contributor approval gate;
108+
Cross-platform CI is green on live head 87af85fb. wp5 scope is rebase +
109+
interdiff + gates re-run, not CI restoration.
110+
111+
## Accept criteria (mirrored in goalplan criteria[])
112+
113+
- c0: this roadmap closes its own PABCD cycle with reviewer PASS/near-pass.
114+
- c1-c6: each cycle's branch pushed, PR opened, gates output captured.
115+
- c7: #324 closed with docs-pointer comment; #92/#241 status comments posted.
116+
117+
## SoT sync (SOT-SYNC-01)
118+
119+
Repo SoT targets: `structure/` maintainer invariants + `docs-site/` user docs.
120+
Each cycle's P names which docs-site page (if any) its behavior change touches;
121+
the D summary records the sync decision.

0 commit comments

Comments
 (0)