docs(row333): join onto landed row 332 record (#1831)

Records the replayed join of row 333 R2 (0ef269da9) onto landed row 332 (5df0e9d6f) in merge c0c291cda: the two conflict hunks and their resolution, the comparison with the earlier join resolution, and the nine suite results. Adds the docs/SESSIONS.md line.
2026-11-02 16:50:14 -06:00
1 parent c0c291cda2
commit b37cc50878
@@ -73,3 +73,38 @@ GREEN, on 12eba4b59:
 - The counts for business (286) and plugins (123) are lower than the join's (292, 128) because the join included row 332's tests; this branch stays on base 09a847eda.
 Mutant. With the helper changed to drop model-quota.mjs from its result (a one-line filter in business-imports.mjs), stack-release.test.mjs gave 224 tests, 56 pass, 168 fail in 183 s, with 127 "Cannot find module .../packages/plugins/src/model-quota.mjs" lines. The helper then printed four files, without model-quota.mjs. git checkout restored the file; git status --short printed nothing afterwards.
 ## Join onto landed 332
 Written 2026-11-02T22:49Z by Claude (sub-agent of the Mosaic Stack lead, T3 c5c1e8ba), author of this join. Issue #1831. Checkout branch t3/row-333-join-replay.
 Base and heads. Row 333 R2 head 0ef269da9 on base 09a847eda (R1 503b91e56, overlay 2627321f6, docs c012b2e0a and ddb3e961f, R2 fixtures 12eba4b59 and 0ef269da9). Row 332 landed on refactor at 5df0e9d6f (R2 and the lead correction). The branch started at 5df0e9d6f with no commits of its own and a clean tree. Command: git -c core.attributesFile=/mnt/storage/scratch/q284gate/union.attributes merge --no-ff --no-commit 0ef269da9. Merge commit c0c291cda, parents 5df0e9d6f and 0ef269da9, made at 22:33:47Z.
 Why a replay. The earlier join (eabeb1aa8) was made on 332 R1. Row 332 then changed (R2 and a lead fix) and row 333 gained two fixture commits. Both rows change packages/business/src/launch.mjs and packages/plugins/README.md.
 Conflicts. Exactly two paths, the two named in the brief. No other path conflicted.
 - packages/business/src/launch.mjs, import block (lines 3 to 8 before resolution). 332 changed the errors import to `{ BusinessError, refuse }` for the proxy route refusals in checkModels. 333 added `import { isDailyModelQuota } from "../../plugins/src/model-quota.mjs"` for the daily model leaves in checkTokenLimits. They do not contradict. Resolution: both imports, the model-quota line first, then `{ BusinessError, refuse }`. The rest of launch.mjs merged without conflict: 332's checkModels route handling and the checkAccount `proxy` credential, and 333's checkTokenLimits keys block.
 - packages/plugins/README.md, end of file (lines 331 to 378 before resolution). 332 appended "Per-session proxy context (P3)" and 333 appended "Proxy usage telemetry (row333 / P5)" after the same last paragraph. Resolution: keep both, P3 section first, one blank line between, P5 section last.
 Other paths touched by both sides, merged without a conflict and not edited by hand: BUILD-LOG.md and docs/SESSIONS.md (union attribute, both sides' lines kept), and packages/cli/tests/stack-release.test.mjs (333's 3 lines for the business-imports helper, 332's R2 hermetic-launch edits). No product or test file was edited by hand.
 Comparison with the reference resolution (/mnt/storage/scratch/tmp/iLeQSZ/join-resolution.patch). I took git diff 5df0e9d6f for the two files and compared it with the reference patch after removing the index lines. The result is identical, and the hunk headers (-1,5 +1,6; -76,8 +77,16; -365,3 +365,12) are equal too, so there is no difference to explain. The reference was a diff against the 332 R1 blobs. launch.mjs is d9ef01b40 and README.md is d4625c9f6 on both 332 R1 and landed 332, so R2 and the lead fix did not change these two files, which is why the earlier resolution carries over unchanged. A correction to the merge commit message: it says the files match the reference "apart from hunk offsets", but the hunk offsets match as well. The commit stays as made.
 Tests, on c0c291cda. node_modules linked from /mnt/storage/src/mosaic-stack (a link at the root and a real directory of links under packages/webui), TMPDIR /mnt/storage/scratch/tmp/Z280Ko (31 bytes), each suite whole, one at a time, from its package directory with node --test tests/*.test.mjs, 30-minute limit, started 22:34:09Z. Nothing was skipped, failed or rerun except as noted.
 | Suite | Tests | Pass | Fail | Skip | Time |
 | --- | --- | --- | --- | --- | --- |
 | business | 293 | 293 | 0 | 0 | 2 s |
 | plugins | 129 | 129 | 0 | 0 | 1 s |
 | bus | 1382 | 1382 | 0 | 0 | 48 s |
 | model-proxy | 108 | 108 | 0 | 0 | 1 s |
 | harness | 205 | 205 | 0 | 0 | 13 s |
 | seat | 223 | 223 | 0 | 0 | 6 s |
 | webui | 498 | 498 | 0 | 0 | 132 s |
 | cli | 1102 | 1101 | 0 | 1 | 669 s |
 | bash scripts/test-federation-acceptance.sh | 1 | 1 | 0 | 0 | 5 s |
 The one cli skip is "FED R7 scratch two-instance acceptance", which names scripts/test-federation-acceptance.sh as the way to run it. That script passed 1/1 in the last row, with "R7 cleanup: no child groups, ports or sockets remain". The model-final-completion.test.mjs:69 host flake (16 !== 19) did not appear, so no rerun was needed. Business and plugins are one test higher than the earlier join's 292 and 128, and bus 1382 is two above R2's 1380 on the 09a847eda base; this record does not attribute those differences to a cause.
 Cleanup. No test process of mine remained after the runs. The node_modules links and the TMPDIR were removed; git ls-files -co --exclude-standard | grep node_modules printed nothing, and git status --short showed only this file and docs/SESSIONS.md before this commit.
@@ -1940,3 +1940,4 @@ are never rewritten or removed; corrections are new entries.
 2026-10-26 | Codex P5 builder | row333 R1 CHANGES response on same isolated503b91e | full real review hash7c95672a30c0d5c39189c7c7d610ada89cd539dcb9413617071fbb81200fd008 verified; all three findings source-confirmed; RED-first repairs authorized; original candidate/raw history preserved; no heavy/full/browser/remote/landing.
 2026-10-26 | Codex P5 builder | row333 independentR1 repair source/static packet | all3 source fixes + regression controls authored, UNCOMMITTED on503b91e; nativepriority07 drift19→16 yielded78UNVERIFIED/STOP and no local retry;01–06 priorityUNVERIFIED; held-response controls unexecuted; admittedrunner baselineRED/fixedGREEN/nativeprovenance + newR2 pending; original503/R1/raws preserved; no productcommit/heavy/full/browser/queue/push/landing.
 2026-11-02 | Claude (sub-agent of Mosaic Stack lead c5c1e8ba) | row333 join onto landed row332 (#1831) | Merge c0c291cda joins 0ef269da9 onto 5df0e9d6f on t3/row-333-join-replay; two conflicts (launch.mjs imports, plugins README sections) resolved by keeping both, identical to the earlier join resolution; 9/9 suites green (business 293, plugins 129, bus 1382, model-proxy 108, harness 205, seat 223, webui 498, cli 1101 and 1 skip, federation 1); no push, queue or PR action.