From a69cd0b17053520ff7aacefa0ca33dbaf2e78f90 Mon Sep 17 00:00:00 2001 From: Levi Neuwirth Date: Tue, 28 Jul 2026 17:21:43 -0400 Subject: [PATCH] docs: integrate main @ 0442d78 and confirm the rooturi deferral MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `main` moved mid-re-scout: #174 (fix-m4-sink-races) merged. It touches `tests/m4_acceptance.rs` only and changes no source, so nothing in the rev 5 census moves — but it intersects this document at one point, and in the direction that strengthens it. #174 fixed the CONFIG sink by waiting for a complete JSONL record (`ends_with('\n')` instead of `contains("probe")`) and deliberately left the ROOTURI predicate alone, adding a comment at `m4_acceptance.rs:5486-5496` giving the same three reasons §11's deferral gives: it is the same weak-predicate class, it has never been observed failing, and waiting for the expected value would trade a precise regression diff for a vague five-second timeout. Closing it needs a record terminator in the fake server first. So that deferral is no longer a claim of this framing; it is a claim of the tree. Item updated with the current line (`:5499`, shifted by #174's own comment) and the in-tree backing. The header now records both anchors: the census was read at `6bee09d`, and it holds unchanged at `0442d78`. Co-Authored-By: Claude Opus 5 (1M context) Claude-Session: https://claude.ai/code/session_01Lv428Fth9LRtffwJSsqH7T --- docs/dired-stage2-framing.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/dired-stage2-framing.md b/docs/dired-stage2-framing.md index eab6b7c..f7c3d37 100644 --- a/docs/dired-stage2-framing.md +++ b/docs/dired-stage2-framing.md @@ -9,10 +9,18 @@ approval, and GitHub records no review on PR #171. **Ground truth: re-scouted 2026-07-28 against canonical `main` @ `6bee09d`** (`Merge pull request #184 from levineuwirth/bottom-panel-stage2b`). Rev 4 was scouted at `c8ec8f3` — which is dired Stage 1's *own* merge -commit — and `main` has moved **153 commits** since. Rev 5 is that +commit — and `main` had moved **153 commits** since. Rev 5 is that re-scout: §0's round-4 section states exactly what moved, what it invalidated, and what survived unchanged. +**`main` then moved again mid-re-scout, to `0442d78`** (#174, +`fix-m4-sink-races`), and this branch is merged up to it. #174 touches +`tests/m4_acceptance.rs` only, changes no source, and intersects this +document at exactly one point — a §11 deferral, which it **confirms** +rather than invalidates. Every scouting claim below therefore holds at +`0442d78` as well as at `6bee09d`; the `6bee09d` anchor is kept as the +one the census was actually read against. + Continues `docs/dired-framing.md` (rev 7, approved; Stage 0 merged as #162, Stage 1 as #165). That document's §6 and §7 carry the *approved* shape of marks and operations; this one re-verifies every claim in them @@ -1731,10 +1739,17 @@ that deserve an undivided reviewer. notifications only). Pre-existing; whether stale results should survive a restart is its own question, and `forget_uri` deliberately does not answer it. -- **The rooturi sink's weak wait predicate** (`m4_acceptance.rs:5487`) — +- **The rooturi sink's weak wait predicate** (`m4_acceptance.rs:5499`) — same class as the config-sink race fixed in #174, not observed failing, and the obvious fix would trade a precise regression diff for a vague timeout. Needs a record terminator in the fake server first. + **Confirmed in rev 5, and now backed in-tree:** #174 merged during + this re-scout (`main` @ `0442d78`), fixed the *config* sink by waiting + for a complete JSONL record (`ends_with('\n')` rather than + `contains("probe")`), and **deliberately left the rooturi predicate + alone**, adding a comment at `m4_acceptance.rs:5486-5496` giving the + same three reasons this deferral gives. So this item is no longer a + claim of this framing; it is a claim of the tree. - **Recursive copy** — 2c refuses directory sources; a real `copy -r` primitive is separate. - **The other three non-adopters of `set_generated_contents`** (new in