commit f4553b29691883148d64b3eb687ccbee2816e83d
parent 8fd36c5c246f56dff446f25bd2879ccc72c23fb2
Author: I Mean I'm Just Saying <imeanimjustsaying@kiwifarms.st>
Date: Sat, 12 Sep 2026 01:53:50 -0400
plans: the merge review's three notes, and Next points at the Phase 2 slice plan
Nothing above low: every conflicted file reproduces both parents' deltas,
the auto-merged files are exact unions. The three notes are recorded so the
operator meets the stacked bulk bars and the failed-not-skipped unreachable
sync with a page that already says so.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Diffstat:
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/plans/STATE.md b/plans/STATE.md
@@ -284,7 +284,21 @@ the conflicts.** `common` is 908 at `e74f005` + 63 relocate (971 at `bc62248`) +
priority (528) = **533**. Neither known flake reappeared: `backfill.spec.ts:457` (the
`PolicyTreeEditor` adopt race) was green on its first run, and so was every video-page case.
-**Next:** one-core Phase 2 (the contract: one `ArchiveReader`), 3 slices. Read
+**The merge review (2026-09-12, on `c7f7b90`) found nothing above low.** Every conflicted
+file reproduces both parents' deltas line for line, and the six auto-merged files are exact
+unions; the sanitizer carries both branches' new keys on read and write. Three notes, none a
+blocker: (1) with rows ticked on `/channels`, BOTH bulk bars render — storage first, then
+priority — each announcing its own count and Clear, sharing one selection; no e2e on either
+branch could see the pair. (2) The relocate plan's "Step 0 / Step 1" labels are stale
+against the order above — the store rsync targets the platter, so the mount comes first; the
+runbook above is the one to follow. (3) `syncAllChannelsAction` skips paused channels but
+not unreachable ones (`channels/actions.ts:536-543`); an unmounted channel is refused inside
+`syncAction` by the `needsMedia` guard and surfaces as a failed sync, not a skip reason.
+Pre-existing on the relocate branch.
+
+**Next:** one-core Phase 2 (the contract: one `ArchiveReader`), five slices, planned in
+[`one-core-phase-2.md`](one-core-phase-2.md) — S1 is the only prerequisite, then S2a / S2b /
+S2c / S3 and the legacy pause-field deletion in parallel off its merged tip. Read
`common/architecture.test.ts`'s allow-list first — it is the shortest accurate statement of
what is still tangled, it shrank by one across phase 1, and no slice added an entry, relocate
included.
