commit dc48db8aee30ce6102e6fd4b4e4032eb8fa93ade
parent ac54353bd75f27beda782728eaa89fb9090b6783
Author: I Mean I'm Just Saying <imeanimjustsaying@kiwifarms.st>
Date: Wed, 30 Sep 2026 20:47:05 -0400
plans: slice W1's second join — main at b36ccebb (W3) merged at ac54353b, the changelog and the Record kept both sides (W3's then W1's), doctor merged clean; re-gates (tsc, doctor 19, common 2,402, editor unit 101)
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Diffstat:
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/plans/release-13.md b/plans/release-13.md
@@ -908,8 +908,8 @@ tree as reviewed.
land where they did; `main`'s additions are elsewhere and about nothing W1 changed.
- **Checked, nothing to reconcile:** `common/jobs/**` (`jobKinds`, `registry`, `streamCommand`,
`shutdownCancel`) is unchanged on `main` since the fork. DS's `needsMedia` work is in
- `buildStats.ts` and the records, not in `jobKinds.ts`. `DiagnosticsStage.tsx` and W1's three
- specs are unchanged on `main`; `editor/e2e/helpers.ts` gained HS's `listed`, which no W1 spec uses.
+ `buildStats.ts` and the records, not in `jobKinds.ts`. `DiagnosticsStage.tsx` and the two
+ specs W1 changed (`transcript-source`, `sites-homepage`) are unchanged on `main`; `editor/e2e/helpers.ts` gained HS's `listed`, which no W1 spec uses.
**Re-gates on the merged tree** (logs `$T/w1-*.log` in the job's `tmp/`):
- **tsc** (all workspaces) clean, 113 s. The first pass failed in `export` only, on a generated
@@ -940,9 +940,32 @@ tree as reviewed.
in run 2.
- **Numbers tool:** none.
+**The second join: W3 landed first.** `main` moved to `4a186547` (the merge of `r13/build-image`,
+slice W3 brought to main) while the gates above ran, so the branch merged `main` again, at
+**`bcba6bdf`**. Two conflicts, both resolved by keeping both sides whole:
+- **`editor/CHANGELOG.md`:** `[Unreleased]` holds W3's four bullets as `main` has them, then W1's
+ four. `[0.11.0]` and everything below it are `main`'s.
+- **`plans/release-13.md`:** the Record keeps W3's sections as `main` has them (as shipped, W3b,
+ W3c, its Brought to main) and puts W1's after them, before the Rollout: the merging slice's
+ sections after `main`'s, as release 15 SS's merge did. `git diff main` on the file adds W1's
+ lines and removes none.
+- **`common/bin/doctor.ts` and `doctor.test.ts` merged with no conflict:** W3's build-image section
+ (between umtool and source publish) and its probe helpers, and W1's L7 line in the worker loop of
+ the tools section. W3's `run()` helper passes `buildImage: noEngine`, so W1's L7 test, which calls
+ it, never asks the machine's container engine.
+- `git diff main --stat` after the merge is W1's 19 files and nothing else.
+
+Re-gates at `bcba6bdf`'s tree (`w1-gates2.log`): **tsc** clean, 87 s; **doctor 19/19** (W3's 18
+and W1's L7 test); **common 2,402/2,402**, 98 s (`main`'s 2,396 plus W1's 6); **editor unit
+101/101**. No e2e and no build: what W3 added is `Dockerfile.build`, `common/publish/build.ts`,
+the doctor and their tests, which W3's own re-gate built and ran, and none of it is a file W1
+changed or a path W1's specs drive.
+
| sha | what |
|---|---|
| `fd1b5a52` | the merge of `main` `7a77536b`; `editor/CHANGELOG.md` resolved as above |
-| _this_ | `plans:` this subsection |
+| `2d701ef9` | `plans:` this subsection, to the first join's gates |
+| `bcba6bdf` | the merge of `main` `4a186547` (W3); the changelog and the Record kept both sides |
+| _this_ | `plans:` the second join and its re-gates |
## Rollout
