|
| 1 | +# 090 — Merge log: the bug-PR backlog landing on dev |
| 2 | + |
| 3 | +Unit: 260820_bug_pr_backlog_consolidation |
| 4 | +Work-phases: wp21-wp25. |
| 5 | +dev before: `31ee7a683`. dev after: `a584890f8`. |
| 6 | + |
| 7 | +## The override that was not needed |
| 8 | + |
| 9 | +All 19 PRs sat at CHANGES_REQUESTED from @Ingwannu with green CI, and the plan was to merge |
| 10 | +with admin authority. Three independent read-only lanes read every blocking review first, and |
| 11 | +the answer was the same in all three: **the objection was factually current, not stale.** |
| 12 | + |
| 13 | +The recurring complaint was "this head is N commits behind dev". Measured, it was true |
| 14 | +everywhere — 16 to 25 commits, and `dev` had itself advanced to `31ee7a683` while the reviews |
| 15 | +were being written. A green check on a stale head validates an integration state that no longer |
| 16 | +exists, which is a real merge-readiness defect rather than a formality to wave through. |
| 17 | + |
| 18 | +So the resolution was to rebase all 19 branches onto current `dev`, not to override. Admin |
| 19 | +authority can bypass a gate; it cannot make an untested integration state tested. |
| 20 | + |
| 21 | +Two reviews named genuine code defects, and both were fixed rather than overridden: |
| 22 | + |
| 23 | +- **#2166** — `addRequestLog` is exported and bypassed the sanitizer: the reviewer reproduced a |
| 24 | + raw 111-character value in the `/api/logs` ring against a sanitized 37-character value on |
| 25 | + disk. Fixed at the shared ingress so both surfaces read from one normalized entry, with the |
| 26 | + direct-ingress regression the reviewer asked for. |
| 27 | +- **#2162** — a prompt mutation writing into the outbound user turn needed its content-shape |
| 28 | + boundaries pinned. Added: an already-framed turn stays single, image-only content keeps its |
| 29 | + image block behind the preamble, assistant-only block content keeps its tail before the |
| 30 | + synthesized `(continue)` turn. |
| 31 | + |
| 32 | +One more objection dissolved on rebase: #2148 was carrying eight `devlog/_plan/` planning files |
| 33 | +inherited from its branch point. The rebase removed them. |
| 34 | + |
| 35 | +## What landed |
| 36 | + |
| 37 | +19 PRs, merged bottom-up. Every merge commit verified present in `git log origin/dev`. |
| 38 | + |
| 39 | +| PR | dev merge commit | Absorbed from | |
| 40 | +|---|---|---| |
| 41 | +| #2134 | `930840ca4` | maintainer fix | |
| 42 | +| #2160 | `114e9e543` | #2067 @waw4303 | |
| 43 | +| #2162 | `087c3c368` | #2082 @yzxcj797 | |
| 44 | +| #2164 | `31750b094` | #2027 @yzxcj797 | |
| 45 | +| #2165 | `41689b374` | #2155 @waw4303 | |
| 46 | +| #2166 | `5fbe65570` | #2163 @Ingwannu | |
| 47 | +| #2137 | `be12328bc` | issue #2132 | |
| 48 | +| #2146 | `aa07bc308` | #2101 @Ingwannu | |
| 49 | +| #2138 | `81492fd10` | #2102 @lilinxiong | |
| 50 | +| #2140 | `3ad9c7bf4` | #2100 + #2077 @ntdatt812 | |
| 51 | +| #2141 | `1cc35c560` | #2056 @Ingwannu | |
| 52 | +| #2142 | `52a463dd6` | #2131 @bet4it | |
| 53 | +| #2144 | `8c8a66816` | #2105 @lilinxiong | |
| 54 | +| #2145 | `83d5ffa3c` | #2040 @Ingwannu | |
| 55 | +| #2147 | `7fc50846b` | #2104 @olddonkey | |
| 56 | +| #2148 | `86ed9ed83` | #2109 + #2110 @drakonkat | |
| 57 | +| #2149 | `17e8e916b` | #2053 @Ingwannu | |
| 58 | +| #2150 | `9a7801547` | #2127 @agentHits | |
| 59 | +| #2151 | `a584890f8` | #2075 @olddonkey | |
| 60 | + |
| 61 | +Verification that the rebased content is what actually landed, split by what is still |
| 62 | +re-runnable: |
| 63 | + |
| 64 | +- **Re-runnable today:** every merge SHA in the table above satisfies |
| 65 | + `git merge-base --is-ancestor <sha> origin/dev` (verified 2026-08-21, 19/19 true) — the |
| 66 | + recorded merge commits are exactly the commits on `dev`, so the landed content is the |
| 67 | + table's content by construction. |
| 68 | +- **Historical assertion, no longer re-runnable:** six of the merges recorded a pre-rebase |
| 69 | + branch SHA in their description. At merge time each rebased branch was compared with |
| 70 | + `git diff --name-only origin/dev <branch> -- <that PR's own src/ and tests/ paths>` and |
| 71 | + returned 0 differing files. The source branches were deleted in the wp0 cleanup |
| 72 | + (260820 unit, executed record), so those comparisons cannot be reproduced from this log; |
| 73 | + they stand as recorded assertions, not evidence, and the re-runnable ancestor check above |
| 74 | + is the durable audit trail. |
| 75 | + |
| 76 | +## Security surfaces, named rather than merged silently |
| 77 | + |
| 78 | +`MAINTAINERS.md` reserves auth, credential handling, OAuth, workflows, and release automation |
| 79 | +for explicit human review. Seven of the merged PRs touch that surface, and the user's merge |
| 80 | +authorization is the human decision of record for each: |
| 81 | + |
| 82 | +- **#2137 / #2146** — bearer admission and stored-credential substitution; entitlement-gated |
| 83 | + model discovery sends the selected account's access token. |
| 84 | +- **#2144** — decides whether the shell hook exposing `ANTHROPIC_AUTH_TOKEN` is installed. |
| 85 | +- **#2145** — lowers third-party `function_call` output and restores it as a client-executed |
| 86 | + private `tool_search_call`. |
| 87 | +- **#2147** — OAuth 401 refresh and access-token replay. |
| 88 | +- **#2148** — operator-selected destinations for Anthropic/Antigravity OAuth bearers. The |
| 89 | + transport gate still rejects public cleartext HTTP; only explicitly opted-in local/private |
| 90 | + relays may use it. |
| 91 | +- **#2149** — OAuth credential commit ownership under the store lock. |
| 92 | + |
| 93 | +## Issue closure |
| 94 | + |
| 95 | +Every issue named by a merged PR is closed: #2133, #2132, #2092, #2047, #1950, #2097, #1886, |
| 96 | +#2125, #2074, #1924, plus the superseded contributor PRs. Verified by `gh api` state, not by |
| 97 | +assuming GitHub auto-closed them — these PRs targeted `dev`, not `main`, so auto-close does not |
| 98 | +fire. |
| 99 | + |
| 100 | +## Release readiness — not a release |
| 101 | + |
| 102 | +At `a584890f8`: |
| 103 | + |
| 104 | +- `bun run test` — 13716 pass / 10 skip / 0 fail across 866 files. |
| 105 | +- `bun x tsc --noEmit` — exit 0. |
| 106 | +- `bun run privacy:scan` — passed. |
| 107 | +- `package.json` version line: **2.27.0** (unchanged by this campaign). |
| 108 | + |
| 109 | +Changed surfaces: provider registry and transport headers, quota dispatch, routing capability |
| 110 | +resolution, the Anthropic/OpenAI-chat/Google adapters, Responses core and compact, OAuth store |
| 111 | +and credential commit, request logging and usage persistence, subagent roster management. |
| 112 | + |
| 113 | +Not done, and deliberately: no `scripts/release.ts`, no npm publish, no tag, no change to |
| 114 | +`main` or `preview`. Release execution needs its own authorization. |
| 115 | + |
| 116 | +## Still open |
| 117 | + |
| 118 | +**#2054** (@keepitmello) stays open by explicit instruction, carrying the wire-probe request. |
| 119 | +**#2167** (@ntdatt812) arrived after this campaign and is untriaged. |
0 commit comments