|
| 1 | +# 120 — Sidecar chain merge execution (L1-L9 into dev) |
| 2 | + |
| 3 | +Order: #2203 -> #2204 -> #2206 -> #2209 -> #2211 -> #2238 -> #2242 -> #2243 -> #2245. |
| 4 | +Each merge: resolve CHANGES_REQUESTED, obtain maintainer approval, required CI green, |
| 5 | +squash-merge into its base, retarget the next child, cascade-verify (typecheck + |
| 6 | +focused suites), then proceed. Mid-stream lidge suites are lagging indicators between |
| 7 | +pushes; the merge click itself is gated (MAINTAINERS.md). |
| 8 | + |
| 9 | +## Current blocker inventory (fresh, 260821) |
| 10 | + |
| 11 | +- #2203 (L1, CHANGES_REQUESTED Ingwannu): blocker is the tracked cleanup doc |
| 12 | + 000_wp0_branch_worktree_cleanup.md — contradictory KEEP/REMOVE entries, no preflight, |
| 13 | + incomplete protected set, b2ac2500c preservation, codex/merge-loop-closeout listed |
| 14 | + both ways. Fix: rewrite the doc as a non-executable historical record (all deletions |
| 15 | + already executed in wp0) with a mechanical protected-set preflight template; or mark |
| 16 | + every command block as executed-snapshot. No runtime code change. |
| 17 | +- #2204, #2206 (L2, L3): APPROVED. Rebase-carry only. |
| 18 | +- #2209 (L4, CHANGES_REQUESTED): runtime blocker — webSearchModelOptionsFrom drops |
| 19 | + backend provenance; auth-slot model can persist {backend:'openai', |
| 20 | + model:'claude-haiku-4-5'}. Fix: return (backend, model) pairs, validate the pair in |
| 21 | + both PUT routes, teach sidecarBackendForModel the auth-slot rows. |
| 22 | +- #2211 (L5, CHANGES_REQUESTED): carry the L4 provenance field through the CLI |
| 23 | + contract — show backend in `web --list` human output and validate pairs on write. |
| 24 | +- #2238 (L6, CHANGES_REQUESTED, head a05f23fa9) — three reviewed blockers: |
| 25 | + 1. stripOpenAiOnlyWebSearchFields fires for every non-ChatGPT-forward Responses |
| 26 | + provider; official OpenAI API-key traffic loses external_web_access / |
| 27 | + search_context_size. Gate on xAI-specific provider identity/capability and add |
| 28 | + a buildRequest regression proving OpenAI API-key tools retain both fields. |
| 29 | + 2. English config reference + CLI help still advertise only the old backend pair; |
| 30 | + document the xai/gemini/exa arms as explicit-only/inert; keep translations |
| 31 | + consistent. |
| 32 | + 3. exaApiKey only in SENSITIVE_KEY_PATTERN: add it to the shared colon/query/JSON |
| 33 | + string-redaction grammar with all three canaries in tests/redact.test.ts. |
| 34 | +- #2242 (L7, CHANGES_REQUESTED, head 0f2d670c0) — five reviewed blockers: |
| 35 | + 1. runXaiWebSearch misses cancelBodyOnAbort after fetchWithResetRetry resolves |
| 36 | + (abort-before-reader race). |
| 37 | + 2. parseXaiResponsesSSE must cancel the upstream body at the byte bound, not just |
| 38 | + release the reader lock. |
| 39 | + 3. the management PUT mutates config.webSearchSidecar before xSearch validation |
| 40 | + (400 after live state change) — stage and validate the complete candidate first. |
| 41 | + 4. malformed xSearch fields are silently omitted — reject invalid handle arrays, |
| 42 | + dates, and enabled values instead of broadening the search with a 200. |
| 43 | + 5. public docs + the type comment still call xai inert; update the English source |
| 44 | + and translations. Add no-partial-mutation and oversized-stream regressions. |
| 45 | +- #2243 (L8, CHANGES_REQUESTED): three runtime blockers per review + red macOS CI |
| 46 | + shard — full RCA in the phase B, fixes + rerun. |
| 47 | +- #2245 (L9): reviewer PASS locally; needs maintainer approval; one failing test shard |
| 48 | + reported on CI — reproduce, fix, re-push. |
| 49 | + |
| 50 | +Execution sequence (explicit — the wp numbers are not the order): wp9 (this doc, |
| 51 | +sidecar chain) -> wp8 (triage PRs per doc 110) -> wp11 (doc 130 switch) -> wp10 |
| 52 | +(docs 140/150). |
| 53 | + |
| 54 | +## Execution record (wp9 B-phase, 260821) |
| 55 | + |
| 56 | +Every recorded blocker resolved and pushed; Ingwannu re-review re-requested on all |
| 57 | +six layers. Worker lanes ran in parallel worktrees under .tmp/ (four sol-medium |
| 58 | +subagents + one direct fix): |
| 59 | + |
| 60 | +- #2203 d505dacc7 — cleanup doc recast as an executed historical record; corrected |
| 61 | + 36-ref remote list (merge-loop-closeout excluded); 5-step preflight template. |
| 62 | +- #2209 98eaba601 — options carry (backend, model) pairs; both PUT routes validate |
| 63 | + effective pairs; auth-slot Anthropic persists anthropic/claude-haiku-4-5. |
| 64 | + Suites 50/0 + 30/0, GUI 9/0, gate 13/0. |
| 65 | +- #2211 84357bd2b (parent merge) + 2a610909f — backend-tagged `web --list`, |
| 66 | + provenance-aware pair writes, clear rejection errors. CLI suites 401/0. |
| 67 | +- #2238 19376f737 — strip gated on supportsOpenAiWebSearchToolFields:false (xAI |
| 68 | + registry declares it; OpenAI API-key traffic keeps both fields — regression red |
| 69 | + pre-fix); docs/CLI-help union across 8 locales; exaApiKey in the shared |
| 70 | + colon/query/JSON redaction grammar, 3 canaries (JSON canary red pre-fix). |
| 71 | +- #2242 b2c2054b5 — cancelBodyOnAbort after resolve; byte-bound upstream body |
| 72 | + cancel; staged atomic PUT validation (no-partial-mutation); malformed xSearch |
| 73 | + rejected with 400; docs/type-comment de-inerted. 47/0 + 12/0. |
| 74 | +- #2243 249cc91a3 — atomic token/project snapshot; post-header abort guard; |
| 75 | + bounded 64KiB UTF-8 JSON reads. 4 regressions red pre-fix; 50/0, privacy green. |
| 76 | + |
| 77 | +Remaining before merge clicks: Ingwannu approvals + green required CI per layer |
| 78 | +(#2245's earlier shard failure not reproduced at the current head — checks green |
| 79 | +except queued/pending reruns). Lidge full suite relaunched at stack top |
| 80 | +(/tmp/ocx-gate-stack.log) as the lagging indicator. |
0 commit comments