From f16d72fded019fd8734d22af2e447302146da61c Mon Sep 17 00:00:00 2001 From: Levi Neuwirth Date: Thu, 23 Jul 2026 21:58:02 -0400 Subject: [PATCH] docs: refresh the ledger to current main and Stage 2's real state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #149 review round 5 flagged this PR as stale: it still claimed `main` @ `c49a8c7`, Stage 2 framing "rev 2, under review; no implementation, no PR", while `main` is `47581f4` and Stage 2 is implemented and open. - Base snapshot and the recovery check bump `c49a8c7` -> `47581f4`. - The folding Stage 2 lane becomes IMPLEMENTED / PR #149 OPEN: framing rev 4 approved, the `VisibleLineMap` spine, the base-moved merge (and why it was merged rather than rebased), and the five review rounds' design-changing findings — each of which is a trap Stage 3 inherits. - `main`'s ledger had gone unrefreshed through four merges, not one, so "Closed since the last snapshot" now also records web grammars HTML + CSS (#146) and LaTeX Stage 1 (#144) with its inline-math framing (#145), including their durable lessons. - agent-handoff §1: `main` @ `47581f4`, the "Last updated" line, the Stage 2 substrate bullet, and the roadmap entry. Rebased onto `47581f4` so it stays one documentation-only commit directly off canonical main. Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01Q5BkezMppbpCgGAYk2ftxV --- docs/active-work.md | 77 ++++++++++++++++++++++++++++++------------- docs/agent-handoff.md | 55 +++++++++++++++++++++---------- 2 files changed, 93 insertions(+), 39 deletions(-) diff --git a/docs/active-work.md b/docs/active-work.md index 0cd719c..ac661be 100644 --- a/docs/active-work.md +++ b/docs/active-work.md @@ -14,8 +14,9 @@ backlog. machine-local: `origin` may name this canonical URL, a release mirror, or something else, and therefore has no authority by name alone. - Canonical base at this snapshot: - `githubsucks/main` @ `c49a8c7` (folding Stage 1 #142 atop one-command GPU - invocation #141 and documentation refresh #140; protocol v19). + `githubsucks/main` @ `47581f4` (web grammars HTML+CSS #146 atop the LaTeX + Stage 1 #144 / inline-math framing #145 pair and folding Stage 1 #142; + protocol v19). - On the transfer source, `origin/main` named a release mirror at `d3fa632` and lagged badly. On the current destination, `origin` names the canonical URL. This difference is why all recovery begins by @@ -49,33 +50,46 @@ git worktree list git status --short --branch ``` -The first command must expose `c49a8c7` or a newer intentional main. +The first command must expose `47581f4` or a newer intentional main. If it does not, stop and repair the remote/fetch configuration. -## Folding Stage 2 framing lane (Arc 6) +## Folding Stage 2 lane (Arc 6) — IMPLEMENTED, PR #149 OPEN Stage 1 (the headless fold engine) is MERGED as **#142** (see "Closed since the last snapshot"); this lane carries the Stage 2 (grid/daemon collapse) work off the resulting main. - Portable branch: `githubsucks/folding-tui`; worktree `../pmacs-folding-tui`. -- Base: canonical `main` @ `c49a8c7` (folding Stage 1 / #142 merged). -- Framing head: `docs/folding-stage2-framing.md` (rev 1 → rev 2; rev 2 - absorbs review round 1's five findings + two rulings). Numbering continues - the parent `Q#FD` scheme from `Q#FD12`. -- State: **framing only, rev 2, under review; no implementation, no PR.** - Load-bearing reframe (Q#FD12): the TUI has no non-identity - source-line↔display-row map today (`view_top + row` is baked into ~13 - sites), so Stage 2's spine is one shared visible-line-map primitive that - every consumer routes through. Correction to the parent premise (Q#FD19): - yank + query-replace are `apply_active_edit` callers (local), not - Lua-mutator callers; only comment-toggle/yank-pop take the Lua path - (shared with the remote/optimistic-CRDT apply deferred to Stage 3). No - wire schema or protocol change — `FoldState` production (Stage 1) is +- Base: originally canonical `main` @ `c49a8c7`; `main` moved to `47581f4` + (#146) during the arc, so the branch carries a **merge** of it. The merge + is textually clean but was NOT semantically clean — #146 added three new + `Viewport` literals to `src/highlight.rs`'s unit tests and Stage 2 gives + `Viewport` a `folds` field — so the carry-over is resolved in the merge + commit. Merged rather than rebased so the four framing revisions the + review rounds cite by SHA stay reachable. +- Framing head: `docs/folding-stage2-framing.md` **rev 4, APPROVED** + (`4222ffa`; rev 1 → 4 absorb review rounds 1–3). Numbering continues the + parent `Q#FD` scheme from `Q#FD12`. +- State: **implemented; PR #149 OPEN, five review rounds so far, awaiting + the merge word.** The spine (Q#FD12) is `src/fold_view.rs`'s + `VisibleLineMap`, derived per rendered window and per command/event + operation and never stored; fold projection is per-frontend + (`FrontendView.fold_projection`, Q#FD21). 48 acceptance tests in + `tests/folding_stage2_acceptance.rs`, each asserting on the real + `paint_frame` cell grid; every behavioral claim bite-verified. No wire + schema or protocol change — `FoldState` production (Stage 1) is untouched; the GPU render path is Stage 3. -- Next: land the remaining review rounds → implement Stage 2 on this branch - → PR. Stage 3 (GPU) is a separate branch/PR off the resulting main, - re-framed in detail after Stage 2 lands. +- Review findings that changed the design, worth carrying forward: fold + projection must be per-frontend or a simultaneous unfolded GPU session's + cursor skips lines it displays (round 2); maps are per-window, and a + command's map follows the operation's TARGET window, not the active one + (rounds 2–3); crossing folds need merged hidden components, not + "outermost containing fold" (round 3); hidden-cursor motion must project + the whole POSITION and `set_view_top` must clamp in the setter (round 4); + the Lua widening must key on the **post-intercept** edit site, since a + managed intercept may relocate the op (round 5). +- Next: remaining review rounds → merge word. Stage 3 (GPU) is a separate + branch/PR off the resulting main, re-framed in detail after Stage 2 lands. Recovery worktree: @@ -122,6 +136,24 @@ git worktree add --track \ ## Closed since the last snapshot +- **Web grammars HTML + CSS — MERGED as #146** (`main` @ `47581f4`, + 2026-07-23). `.html/.htm/.xhtml` and `.css` highlight off the official + `tree-sitter-html` 0.23 / `tree-sitter-css` 0.25 crate query constants (no + in-repo overlay), and HTML's `INJECTIONS_QUERY` lights up `