@@ -113,3 +113,29 @@ Local-only stacking of merge-ready PRs. NO push, NO GitHub mutations. Sol subage
113113
114114Branch: ` codex/pr-review-260723 ` (local only — NOT pushed; GitHub untouched).
115115Upstream feedback owed: #309 two blockers; #279 docs contradiction (residual).
116+
117+ ## Integration with maintainer dev (a0b9688d) — WP-INT
118+
119+ While our local stack was building, the maintainer advanced origin/dev to a0b9688d:
120+ upstream merged #307 , #309 , #279 (as-composed, without our fixups), #303 docs,
121+ #318 cursor continuation (9cf0abd4, 29cb2dcd), #319 fast-uri 3.1.4, and converged
122+ v2.7.34 from main.
123+
124+ Reconciliation rationale (per the reasoned-mixing brief):
125+
126+ - ** Upstream is base of truth for maintainer decisions.** #309 landed upstream despite
127+ our NEEDS_HUMAN audit — respected, not reverted. Our two audit blockers
128+ (toolNameCodec cross-request collision nondeterminism; Vertex/AI-Studio allowlist
129+ overreach) remain KNOWN-ISSUE feedback for upstream, recorded in WP4 above.
130+ - ** Our side carries verified improvements upstream lacks:** the two #279 fixups
131+ (/v1/models back to requireApiAuth — upstream merged the regression; abortable
132+ shared SSE decoder replacing the hand-rolled splitter with its CRLF/EOF and
133+ idle-cancel defects) and the #304 merge (kiro clean-text-EOF + test isolation,
134+ security-reviewed CLEAN; PR still open upstream).
135+ - Merge mechanics: ` git merge --no-ff origin/dev ` → ** ab72fc10** , zero conflicts;
136+ result tree d31cce0d verified byte-equal to the Sol-audited synthetic tree.
137+ - Sol integration audit (agent 019f8ded): ** PASS** , five areas, no blockers, no file
138+ requiring manual blending; package.json blend is the intended union (upstream
139+ fast-uri override + our scripts/test.ts runner), version stays 2.7.34.
140+ - Verification: typecheck 0; ` bun run test ` ** 3676 pass / 0 fail** across 299 files;
141+ privacy scan passed.
0 commit comments