56 KiB
Active work — cross-machine resume ledger
Snapshot: 2026-07-28. This file records volatile work that has not
landed on main. Read it after docs/agent-handoff.md. Remove completed
entries when their PR merges; do not let this become a second permanent
backlog.
No lane below is retained past its merge. The PTY terminate
diagnostic (#176) was the last one — retained because rule 4 removes a
merged lane only after its durable facts reach
docs/agent-handoff.md, and that absorption was unowned. This snapshot
owns it: #176's facts are now in the handoff (§1's arc bullet and §5's
two ops lessons about ticking observers and proving child exit), so its
lane is gone. The Lean 4, GPU-terminal-input, inline-math (#172), dired
(#169), and terminal config + copy mode lanes were removed the same way
— the last of these was #180's work, folded into #182 so two open PRs
would stop re-conflicting in this file.
Trust the canonical-base line below over any lane header: if a PR
number appears in git log --first-parent githubsucks/main, it has
landed regardless of what a lane says.
Two open PRs had no lane here at all before this snapshot — #174 and
#171. An open PR is exactly the volatile work this file exists to
record, so its absence is a ledger defect rather than a tidy omission:
#171 drifted 153 commits while invisible here, and its still-green
old CI run describes a tree nobody has looked at since. When a PR is
opened, give it a lane. #174 has since merged, so per rule 4 its lane
is gone again and its durable lesson is in docs/agent-handoff.md §5;
#171's lane is below.
Repository authority
- Canonical development URL:
https://github.com/levineuwirth/pmacs.git. This ledger uses the normalized local aliasgithubsucksso its refs and recovery commands are identical on every machine. Remote names are otherwise machine-local:originmay 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@0442d78(the M4 config-sink race fix #174, atop bottom-panel Stage 2B-1 #184, the Journey/GPU directory-target ratchet #183, Journey Stage 1a #182 and the previously recorded landed work). Protocol schema support isv6..=v21; the production server-firstHellostill advertises v20 — two different facts, and #184 landed only the first. The previous snapshot named7fd646d, and the recovery floor advances with it: the check below now requires0442d78or newer, so a tree at7fd646d— or at6bee09d— no longer passes. That is deliberate — the floor moves with the base, because a check that accepts an older commit than the declared base passes on a tree the rest of this file does not describe. Lanes below that name an older base have not been re-based; derive their integration surface fromgit diff <their base>..main. - On the transfer source,
origin/mainnamed a release mirror atd3fa632and lagged badly. On the current destination,originnames the canonical URL. This difference is why all recovery begins by verifying URLs and normalizinggithubsucksrather than trustingorigin/main. - The shared desktop checkout contained unrelated uncommitted work. The branches below were prepared in isolated worktrees; never clean or overwrite the shared checkout to recover them.
Start on another machine by inspecting its remotes:
git remote -v
git remote get-url githubsucks
If the second command says the alias is absent, add it; if it prints a different URL, stop and resolve that collision rather than overwriting an unknown remote:
git remote add githubsucks https://github.com/levineuwirth/pmacs.git
Then recover current refs:
git fetch githubsucks --prune
git log -1 --oneline githubsucks/main
git worktree list
git status --short --branch
The git log command must expose 0442d78 — the base named above — or a
newer intentional main. Keep this threshold and the canonical-base line in
step: a recovery check that accepts an older commit than the base it
declares canonical will pass on a tree the rest of this file does not
describe.
If it does not, stop and repair the remote/fetch configuration.
The CRDT half of the test corpus is dark in CI — NEEDS A LANE
-
No branch, no framing yet. Found while gating #166, then measured properly during the vterm as-framed audit. Deliberately kept out of #166 so a CI change would not arrive after review approval.
-
Root cause:
.github/workflows/ci.ymlnever enables thecrdtfeature anywhere — zero hits across the workflow directory. Thetestjob runscargo test --all-targets --no-default-features --features luajit|lua54. Every#[cfg(feature = "crdt")]test is therefore not compiled in CI, not merely skipped. -
Measured,
--listunder CI's exact flags versus the same flags pluscrdt: 3,176 vs 3,449 — 273 tests dark. Re-measured at74301d1(2026-07-26; atfe8b8bait read 3,170 vs 3,443, the same 273 dark — #176 added six tests, none of themcrdt-gated). The number moves with every merge and must be re-measured, not quoted. #168 reported 3,024 vs 3,288 — 264 dark, 177 in the library — at1b6a084; #178 then added CRDT-only generated-buffer coverage, and other lanes landed CRDT tests in between. Per target:dark CI full target 185 1,848 2,033 the library itself ( src/lib.rs)21 15 36 m5_5_acceptance13 1 14 gpu_invocation_acceptance13 1 14 gpu_initial_target_acceptance8 0 8 m10_11_acceptance6 0 6 auto_pair_crdt_acceptance6 0 6 m10_2_perf4 5 9 vterm_stage3_acceptance4 0 4 m10_10_perf3 0 3 compile_mode_crdt_acceptance2 22 24 theme_faces_acceptance2 0 2 m11_5_semantic_acceptance1 14 15 terminal_copy_mode_acceptance1 9 10 vterm_stage1_acceptance1 7 8 statusline_segments_acceptance1 10 11 gpu_font_acceptance1 0 1 auto_indent_crdt_acceptance1 0 1 m10_11_perfThe rows sum to 273; the table is the whole census, not its head.
-
The single worst line is the library.
cargo test --lib --features crdtis a REQUIRED local gate inCLAUDE.md, and CI has never run it. 185 library tests — the whole CRDT half — are developer-machine-only, and that count grows with every merged branch that adds acrdt-gated unit test. -
Ten suites run zero or one test in CI, including
gpu_initial_target(#148's entire acceptance, 1/14),gpu_invocation(#141's, 1/14), anda37, the Vterm Stage 3 real-daemon/real-PTY/real-wgpu path that #135 built specifically because "a decoded-message fixture would prove none of the three fit together". -
⚠
a37will report green in the new job without running, unless the job buildspmacs-gpuAND setsPMACS_REQUIRE_GPU=1. Measured 2026-07-26 while gating #173.a37_real_daemon_real_pty_and_headless_gpu_ render_one_terminal_sessionderives its sibling binary path fromCARGO_BIN_EXE_pmacs, and on a missing binary iteprintln!s a skip and returnsok. A fresh worktree runningcargo test --features crdt --test vterm_stage3_acceptancereports 9/9 in 0.17 s having never run it; a real run takes ~4 s. OnlyPMACS_REQUIRE_GPU=1promotes that skip to a failure, andCLAUDE.mdapplies that flag tocargo test -p pmacs-gpu— a different package, so the required local gate does not cover a37 either. Thegpu-renderjob already sets the flag, which is what makes fix-shape part 2 sound; state it as a requirement of that job rather than inheriting it by luck, because acrdtleg added to the plaintestjob would run a37 vacuously. -
a37is also load-sensitive, which changes how to read the expected first-run failures. It passed atd152120and failed at that same commit twenty minutes later, with a second agent saturating the machine withrustcin between; it then failed identically ond152120,04c5ad1, and the #173 merge commit, which is how #173 established the failure was not its own. The signature islast_frame_textall spaces withrendered_nonuniform_framesnonzero — frames arrive, content does not.pmacs-gpu's own suite flaked the same way under the same load (201/202, then 202/202 on immediate rerun). So a red a37 on the first CI run is ambiguous by construction: before treating it as a real failure, run the same command on the merge base, and prefer serialized execution for this suite over retry-until-green. -
Sort deliberate from accidental before proposing a fix. Some of the 264 are perf suites that are
#[ignore]d by default and belong to their own jobs (m10_2_perf6,m10_11_perf1).m10_10_perfhas no#[ignore]and no CI job naming it, so it looks accidental. This classification is not finished and is the lane's first task. -
Fix shape, two parts (the flag combination is verified to work:
--no-default-features --features luajit,crdtlists 10 vterm Stage 1 tests versus 9 without):- a
crdtleg on thetestjob for the non-GPU suites and the library; - the GPU-requiring
crdtsuites onto the existinggpu-renderjob, which already has lavapipe andPMACS_REQUIRE_GPU=1—vterm_stage3_acceptance,gpu_invocation_acceptance,gpu_initial_target_acceptance,gpu_font_acceptance.
- a
-
Expect first-run failures, and budget for them. These would execute in CI for the first time ever: real PTY timing on CI runners, wgpu under lavapipe, and daemon-socket tests at unfamiliar concurrency. Start ubuntu-only and decide about macOS from evidence. A red first run is the lane working, not the lane failing.
-
Mitigating fact, verified rather than assumed: #166's three unit pins are not
crdt-gated and do run under CI's exact flags, including the controller-release pin whose only job is catching the plausible wrong fix. -
This lane also owns a
--lib --features crdtflake, observed and scoped without overclaiming its cause (inherited from #178's gating, where the terminal lane recorded it).cargo test --lib --features crdtfailed ~1 run in 5 onprocess::tests::setsid_escapee_is_not_reaped_and_teardown_reclaims_readers—active_reader_probereturningNoneatprocess.rs:3179("live runtime probe"). Pre-existing and unrelated to #178: that branch did not touchsrc/process.rsat all, and the test passed 10/10 standalone; the observed failures were during parallel full-suite runs. That localizes the trigger to suite load or interaction, but does not distinguish parallelism from another full-suite effect — no serial full-suite bite was run. The leading code-path explanation is the knowndrain_untiltrap: draining forStartedalso ticks, and a tick can reap the leader before the followingactive_reader_probe. That is an inference from the failure site and control flow, not yet a falsified root cause. Discriminating it belongs here. Two unnamed CRDT failures in #178's round-2 gating are a plausible match but remain unattributed — no test names were captured. -
A second standing obstacle for this lane:
cargo clippy --workspace --all-targets --features crdt -- -D warningsfails onmain— measured at74301d1: seven errors before the build aborts, four insrc/daemon.rs(useless_conversionat 3996, missing doc backticks at 4076,too_many_lines112/100 at 4083, an unneededmutat 4965) and three intests/vterm_stage3_acceptance.rs(too_many_linesat 637 and 793, a redundantcontinueat 843). Treat that as a lower bound, not an inventory: Clippy abandons the remaining targets once one fails, and a run on an older tree surfaced a further doc-backticks error intests/auto_indent_crdt_acceptance.rs:42that this run never reached. The standing gate list runs Clippy withoutcrdt, so these lints have never been enforced. Any CI job that compiles thecrdttargets has to fix them first or it will be red on arrival.
Bottom-panel lane (Arc 7) — 2B-1 MERGED; 2B-2 IN FLIGHT
Stage 1, the Stage 2 framing, Stage 2A, and Stage 2B-1 are all on
main. Framing revision 5's three-way split of 2B was explicitly
approved on 2026-07-27; revision 6 records PR #184's review correction.
2B-2 — the daemon panel projection and epoch machine — is under way
on branch bottom-panel-stage2b2, worktree ../pmacs-bp-stage2b2,
branched fresh from githubsucks/main @ 6bee09d. It is not stacked
on the 2B-1 branch, which is the rule for every slice in this arc. Note
that main has since advanced to 0442d78; the only difference is the
test-only #174, so the slice's integration surface is unchanged.
2B-2's boundaries, restated because they are easy to overrun: the
production Hello stays at v20 and panel_capable stays false. The
slice is dark/test-only capability exactly as 2B-1 was. Compatible v21
activation, the GPU band, and the negotiated capability flip are all
2B-3's, and 2B-3 may not simply change the unsolicited Hello to
21.
-
Stage 2B-1 MERGED as #184 (
main@6bee09d, 2026-07-28; all twelve checks green on the reviewed head5539b6e; two review rounds plus a gate-found follow-up). Branchgithubsucks/bottom-panel-stage2band worktree../pmacs-bp-stage2bare retained and carry nothing unmerged. Durable facts — the schema-support-versus-advertisement split, the sharedwire_gridboundary, authoritativeAbsent, and the two epochs — are indocs/agent-handoff.md§1 per rule 3, not here. -
What 2B-1 deliberately did not do, because 2B-2 and 2B-3 must not re-litigate it: no producer, no consumer, no capability change.
panel_capableis stillfalsefor every semantic session, so the journey grade is unchanged and every shipped v20 client remains attachable. -
2B-3 inherits a hard constraint from 2B-1's review: it owns a compatibility-preserving v21 activation mechanism and may not simply change the unsolicited
Helloto 21. The handshake is server-first, so that one-line change locks out every shipped v20 frontend before it can even send anAttachRequest. -
Two review rounds, and what each cost. Round 1:
PanelFrameneeded an explicitbuffer_id, the transport ratchet had to drive the real attach path rather than a detached codec assertion, and shared grid bounds needed one validator. Round 2: the server-firstHellomade the advertised v20↔v21 compatibility one-way;COHERENCE.mdand the handoff still named only v20 schema support; framing §9 named a nonexistent aggregate 2B suite instead of the three exact slice suites; and the panel plus copied-terminal "one byte over" fixtures were actually two bytes over. -
The full gate — not review — found two version-ladder omissions and one probe contradiction. The statusline and Vterm Stage 3 ladders still pinned v20 and rejected v21. Separately, Vterm Stage 3's headless probe exited its loop as soon as resize plus two nonuniform composites were observed, while its acceptance later required the PTY child's
VTERMROWoutput in the final frame; the v20-compatible handshake made that scheduling race deterministic, so the report sampled a blank frame. The probe now waits for the exact child-output observation its acceptance asserts. -
The probe fix then leaked its own fixture, and that is the reusable lesson. The generic runner hard-coded the producer fixture's
VTERMROWbreadcrumb, so the CAT input fixture could satisfy every assertion yet never satisfy the loop exit — it waited out the 20-second safety deadline and passed on the deadline. Producer probes now name their own required frame text while input probes finish on the latched echo, and the report exposescompletion_observedwhich both paths assert, so a deadline-driven pass cannot hide a stall again. -
Final verification on the reviewed head:
cargo fmt --check; strict workspace Clippy; library 1,849 passed + 3 ignored default and 2,034 passed + 4 ignored CRDT; bottom-panel Stage 1 / 2A / 2B-1 46 / 17 / 16; folding Stage 2 48; GPU font 11; statusline 8 CRDT; m11_5 semantic 2 CRDT; GPU initial target and invocation 15 / 15 CRDT; the handshake consumers m5_5 / m5_7 / mode-system wiring 36 / 7 / 1 CRDT; Vterm Stages 1 / 2 / 3 10 / 6 / 9 CRDT, including the required real daemon + real PTY + real wgpu probe; M4 121 passed + 3 ignored + 1 filtered; required GPU 202/202; the isolated-config one-invocation full workspace sweep; andgit diff --check.- Retained as classification rather than erased: the first
required-GPU pass was 201/202 on
a_fraction_draws_rule_pixels_between_its_operand_rows, a rendering test structurally outside a protocol-only diff, which passed immediately in single-threaded isolation and 202/202 on the mandatory complete rerun. Separately, library and Vterm attempts inside the restricted tool sandbox producedOperation not permittedfailures in socket-based attach tests; the authoritative outside-sandbox reruns passed.
- Retained as classification rather than erased: the first
required-GPU pass was 201/202 on
-
Ordering for the rest of the arc is fixed: 2B-2 branches from landed
main; 2B-3 branches only after 2B-2 lands; Stage 3 (the adopter default flip) last. Each slice starts fresh from landed main. -
Stage 2A MERGED as #177 (
main@0a3fcd1, 2026-07-26, all twelve checks green at8424172, three review rounds). Branchgithubsucks/bottom-panel-stage2aand worktree../pmacs-bp-stage2aare retained and carry nothing unmerged. Five commits: the classified census routing, the painter extraction + acceptance, the lane record, then the round-1, round-2 and round-3 review fixes. No protocol change; no behavior change for any frontend today — withpanel_capable = falsefor semantic sessions,primary_document_windowreturnsview.activein every existing configuration, so this is seam adoption that becomes load-bearing in 2B. -
Stage 2A verification on its merge result:
cargo fmt --checkclean; strict workspace Clippy clean; 1,832 default + 2,015 CRDT library tests;bottom_panel_stage2a_acceptance17; bottom-panel Stage 1 46; statusline segments 8 CRDT; m11_5 semantic 2 CRDT; GPU initial target 14 CRDT; terminal config 12 CRDT; vterm Stage 1/2 10 / 6; folding Stage 2 48; M4 121; required GPU 202;git diff --checkclean. -
Every routed producer is now pinned at a seam its production caller uses, and each pin was falsified by revert: #1 follow, #2 lazy CRDT upgrade, #3
CursorByte, #5 decorations, #7Viewport(aligns without focusing), #8Pointer(aligns and focuses), #9 the terminal-context gate, #12 statusline, #21 the publication filter, plus the focus-class negatives. #1/#3/#21 required extracting three named helpers, because their only production caller isdispatcher_loop, which no test can drive. -
Three lessons about the TESTS, not the code, all from review: (a) a structural test comparing the two authorities directly does not catch a misrouted consumer — only consumer-level assertions do; (b) a daemon-path test must
register_sessionor the event is dropped at the uninstalled-session check before reaching the code under test; (c) a discriminating fixture must make the two routings DISAGREE — comparing two non-terminal buffers, or two windows with no selection, yields the same answer either way and proves nothing. Round 2 found four of my own pins vacuous by exactly these shapes, and round 3 found two more problems of the same family: a pin placed at a HELPER while production called it from a producer (reverting only the producer's call site left every test green), and a socket-pair assertion whose blocking read made a regression HANG instead of fail. Both now assert at the producer, with read timeouts on every read. -
Review round 1 closed: 4 P1 + 2 P2, all real. The P1s were a stale-
Pointerfocus steal (the failed-alignment arm returned the window, so #8's activation focused it beforedispatch_pointerrejected the buffer), the missing A2A-2 two-context fan-out, a census suite that asserted the AUTHORITY rather than the CONSUMERS, and the missing main integration. Two of the new pins were themselves vacuous on the first attempt — the dispatcher test passed because an unregistered session is dropped atdaemon.rs:1962before reaching the aligner, and the painter test was a fixed-point check that survived deletingtext_view.render. Both now fail under their own bite. -
vterm_stage3_acceptance::a37is a pre-existing flake here, not a Stage 2A regression: measured 6/8 failures on the base commit and 7/8 on the branch in matched isolated samples. It needs a real daemon + real PTY + headless GPU and is documented load-sensitive. It also silently returnsokunlesspmacs-gpuhas been built, and iscrdt-gated so CI never runs it at all. -
Two suites are dark without
--features crdt:m11_5_semantic_acceptancereports 0 tests andgpu_initial_target_acceptancereports 1 in the default config. Both are semantic-census suites, so Stage 2A must be gated with the feature on or its most relevant coverage never executes. -
Stage 1 merged as #155 (
main@e745068, 2026-07-24, after two review rounds). No protocol change. Durable substrate facts live indocs/agent-handoff.md§1; the two round lessons are in §5. -
Landed-docs follow-up merged as #156 (
main@d152120, 2026-07-25). -
Stage 2 framing:
docs/bottom-panel-stage2-framing.mdrevision 6 is on branchgithubsucks/bottom-panel-stage2b(revision 5 is commit56301edthere), worktree../pmacs-bp-stage2b. Revisions 1–4 remain ongithubsucks/bottom-panel-stage2-framing(head4fbd47f, four framing commits, revision 4 at49757e5). Round 1 closed 2 blocking + 3 high; round 2 closed 1 blocking + 2 high + 1 medium and decided both open items; round 3 closed 1 blocking + 1 high + 1 medium. No open items remain. Revision 5 adds no decision; it records the approved 2B-1/2B-2/2B-3 implementation split. Revision 6 corrects the server-first compatibility contract, durable protocol claims, exact acceptance-suite names, andlimit + 1fixture. The parent framingdocs/bottom-panel-framing.md(rev 4) remains authoritative, including its acceptance criteria 37–55. -
Retained, carrying nothing unmerged: branch
bottom-paneland worktree../pmacs-bottom-panel. -
Stage 2 ships as four serial implementation slices, each landing before the next branches: 2A = classified §1.3 census routing +
paint_frameper-window painter extraction (with the active-window auto-scroll preparation), no protocol change; 2B-1 = reserved protocol schema v21, with production advertisement held at v20, (InstanceMessage::PanelFrameplusFrontendEvent::{FrontendCellGeometry, PanelResizeRows, PanelPointer}, gated both directions, each extended enum byte-pinned on its own previous final variant); 2B-2 = daemon panel projection and epoch machine; 2B-3 = compatible v21 activation, the GPU band, and the negotiatedpanel_capableflip. Stage 3 is the adopter default flip. -
Correction — this entry previously mis-stated the census contract. It is not "route every consumer through
primary_document_window". Q#BP14 classifies the 23 reads into four classes and routes only the Projection class that way; focus/input (#13–#15, #23), focus chrome and surface-routed (#16–#19), and focus/session (#20) keep their own authorities. Rerouting them would break remote-op validation and application,DispatchIdle, presence, focused search/menu/completion routing, and terminal bell ownership. The Stage 2 framing carries the full table. -
The GPU document bottom is three boundaries, not one.
text_area_bottom(pmacs-gpu/src/main.rs:8490) is todaystatus_band_top,geometry_capacity_bottom, anddocument_text_bottomat once. Once a band is installed they diverge: the status chrome must stay pixel-identical at the physical window bottom while document consumers move. A blanket rewrite of that helper moves both together and passes an "everything moved" assertion, so the Stage 2 criterion asserts both directions in one scenario. The census is 20 production sites (8 status-owned, 12 document-owned) + 1 definition + 8 test sites = 29 matches; the framing carries the per-site table. The three easiest to misclassify are document completion:6140, minibuffer candidates:7351, and edge scrolling:8561— each with its own visible symptom. -
Folding Stage 3 and this arc's Stage 2 both touch the semantic projection. Whichever is framed second re-scouts the other's landed state.
Folding lane (Arc 6) — Stages 1 and 2 MERGED; Stage 3 (GPU) is next
Both shipped stages are on main; nothing in this arc is in flight. Stage 3
has no branch and no framing yet.
- Stage 1 (headless fold engine) merged as #142, Stage 2 (grid/daemon collapse) as #149 — both under "Closed since the last snapshot".
- Retained, carrying nothing unmerged: branches
folding/folding-tuiand worktrees../pmacs-folding/../pmacs-folding-tui. The framingsdocs/folding-framing.md(rev 5) anddocs/folding-stage2-framing.md(rev 4) are the approved artifacts Stage 3 re-scouts against. - Stage 3 (GPU) obligations, already named by the framings — the
starting point for its own framing doc: GPU collapse at TUI parity;
caret/hit-test fold-awareness; the
BufferSnapshotfold-mirror clear (parent R2-4 — without it, empty-after-revert diff suppression leaves stale folds on the GPU, the same trap class as #120); CRDT-origin and GPU-optimistic interactive unfold (parent R2-3); and flippingFrontendView.fold_projectiontotruefor semantic frontends, which Stage 2 deliberately leftfalse(Q#FD21).
Generated-buffer immutability framing lane — PR #188 OPEN, PROPOSED
- Portable branch:
githubsucks/generated-buffer-immutability; worktree../pmacs-generated-immutability. PR #188, basemain, forked fromgithubsucks/main@ad41cf1, integrated to7586905(#189,COHERENCE.mdonly; clean merge, no conflict). Framing only —docs/generated-buffer-immutability-framing.md, revision 3, plus this lane. No runtime code, no protocol change. - PROPOSED — two review rounds closed (ten findings, six P1, four P2). Not approved. Do not implement, do not merge.
- What it frames. The class-wide half of the
set_generated_contentsinvariant thatdocs/agent-handoff.md§4 andCOHERENCE.md§14 both record as unfinished:Buffer::undogates onensure_writable()(src/buffer.rs:1302) and never consults the intercept chain, so theadd_intercept-plus-bypass_interceptidiom leaves the rope writable and every affected buffer emptiable. All five families were reproduced by execution atad41cf1, not inferred; the transcripts are in the document's §0 and §2. - Recommended primitive:
Buffer::apply_generated_edit(op), exposed as a{ generated = true }option on the existing Lua mutators, withset_generated_contentsreimplemented as its whole-buffer wrapper. It is the only candidate in which the buffer is never observably unlocked. Revision 3 pins the transaction (framing §3.4): its ownrun_buffer_editarm — not the bypass arm, which callsbegin_edit, which callsensure_writablefirst (src/buffer.rs:725) and would refuse every generated write to a locked buffer — one&mut Buffermethod, eight named exits, relock and flag-clear unconditional, and history cleared iff the revision advanced. - Two stages, two PRs. Stage 1 — listview ownership fix plus its
identity-routing fix in the same PR, dired and listview adopting the
shipped primitive, the window-coordinate clamp, and the fold decision.
Stage 2 — the new primitive, compile's nine write sites, the search
panel's four, compile/search ownership + routing, the path-backed
refusal plus
mark_clean, thegenerated_lockprovenance field, and the boundedunlock_generated. - Six facts from this lane that other lanes need before it merges:
bypass_interceptis the wrong inventory key. It misses*buffer-list*,*help*and*workers*, which are generated with plain writes and no intercept at all.docs/agent-handoff.md§4's four-row table inherits that blind spot — and undercounts by one:src/help.rs:354replace_help_bufferis a fifth writer mechanism (own find-or-create,Buffer::apply_edit, ownmark_clean) writing the same*help*buffer asdefault.lua:1239, which does not mark clean. Two owners, one buffer, two copies of the name constant across the FFI boundary.COHERENCE.md§14's listview consumer list was wrong and is now FIXED — PR #189 (main@7586905) landed exactly the correction this lane measured. Nothing owed. Recorded so it is not re-asserted.- Three writers adopt any buffer sharing their name —
listview.lua:95,compile.lua:263,default.lua:861-868— against a rule the tree already states atterminal.lua:300-305and implements atdired.lua:476-504. Measured: a foreign*references*is clobbered and left permanently un-editable, and apmacs.compile.runthat raises on validation still leaves a foreign*compilation*un-editable. TodayM-x buffer.undo— this arc's bug — is the only recovery, so the arc must not lock these buffers before fixing ownership. - Disambiguating a name breaks the sites that read one. Census in
framing §2.10: 19 units across 14 grep lines, two genuinely broken.
listview.lua:44'spanels[d.name](written under the requested name at:97, read under the actual name) has four consumers, and the fourth —listview.open:118-123's never-capture-a-panel guard — fails inverted and silently, capturing a panel as its ownqtarget.compile.lua:216'sis_generated_bufferhas two.compile.lua'sslotsis not affected: keyed by a module constant at both ends, withslot_for_bufferid-based. read_onlyis one boolean serving THREE policies (framing §2.11): the generated lock; terminal identity (src/terminal/session.rs:305); and, as a reader,src/lua_bindings/fold.rs:313's "is this a document buffer" test, pinned bytests/folding_acceptance.rs:570. Consequence for any lane: locking a buffer silently disablespmacs.fold.foldon it, with the statusfold rejected: not a document buffer.- The SHIPPED
set_generated_contentscan overwrite a live terminal identity buffer. It doesself.read_only = falseunconditionally (src/buffer.rs:546), so it lifts a lock it did not install, writes, and re-locks. Present onmain, untested, unframed anywhere before this revision. Bounded in Stage 2 by thegenerated_lockfield.
- Overlap warning. Stage 2 touches
src/lua_bindings/mod.rs's buffer mutator bindings andsrc/buffer.rs. Do not run it concurrently with theapply_resource_oplane or the bottom-panel 2B work without assigning those files to one lane first. The framing itself touches neither. - Cross-lane, settled, not re-decided here. #186 owns the urgent
pre-filesystem refusal for synchronous
apply_resource_op; #171 later owns full post-delete lifecycle reconciliation, including the async race where a buffer becomes modified after dired dispatch. #171's Q#DR25 is deferred INTO this lane — confirmed against #171 revision 7 (fd7ae37), which states that dired's listing becoming immutable is "owned by thegenerated-buffer-immutabilitylane" and that "Stage 2 does not implement it, does not gate on it, and carries no acceptance for it." This lane's Stage 1 claims that work. Neither ordering conflicts: #171 Stage 2b changespaint's callers, this lane changespaintitself. Revisions 1 and 2 of this framing never mentioned Q#DR25 at all; revision 3 §9b records it. - Re-measured at
ad41cf1while scouting: 276 CRDT-dark tests (3,251 vs 3,527), bycargo test --all-targets --no-default-features --features lua54[,crdt] -- --list | grep -c ': test$'. Recorded here because the section above asks for exactly that and warns against quoting a stale figure; it does not replace that section's per-target census, which was not re-derived.
dired Stage 2 framing lane — PR #171 OPEN, STALE, DO NOT MERGE AS-IS
-
Portable branch:
githubsucks/dired-stage2-framing(headab42a79, four framing commits); worktree../pmacs-dired-stage1. PR #171, basemain. Framing only —docs/dired-stage2-framing.md, 1,570 lines, no runtime code. -
Measured 2026-07-28: 4 commits ahead of
main, 153 behind, merge basec8ec8f3. GitHub reports it mergeable, and its old CI run is green — both facts are about a tree nobody has looked at in 153 commits, and the document still says PROPOSED. -
The commit history embodies three review rounds. That is not the same as approval, and GitHub records no formal review or comment on it. Do not read the round count as a green light.
-
Its dependencies moved materially underneath it, which is the real reason not to merge. Note that dired Stage 1 (#165) and find-file (#162) are its base, not new arrivals — the merge base
c8ec8f3is #165's merge commit. Eighteen PRs landed after it, and at least three change ground the framing stands on:- #178 gave generated buffers a write invariant
(
Buffer::set_generated_contents). Dired's listing is a generated buffer, and dired is named in the handoff as one of the writer mechanisms that has not adopted it. Stage 2's marks and operations write that buffer constantly. - #182 (Journey Stage 1a) made
resolve_target_bufferthe single directory-open path, with dired demoted to a replaceable slot (pmacs.path.directory_handler) rather than a hook subscriber. Any Stage 2 claim about how a directory reaches dired is now describing a mechanism that no longer exists in that form. - #179/#181 landed the typed-edit consumer chain, which is the fan-out a rename transaction has to survive.
Re-scout against
6bee09d, publish a new revision, and get explicit framing approval before any implementation. The re-scout is under way on the existing branch, so PR #171 keeps its three-round history; the product is a revision 5, not a new document. (mainhas since advanced to0442d78, but the only difference is the test-only #174, so no re-scout conclusion turns on it.) - #178 gave generated buffers a write invariant
(
-
The rename problem the framing must still answer, restated because it is the hard part: a rename is a transaction across five path owners — the buffer path, the buffer name, the URI-keyed LSP stores plus
DiagnosticView(whose URI is set once at construction), dired's pathless handles, and a captured Lua local that no transaction can reach. -
Intended serial implementation once approved: 2a rename/delete reconciliation substrate with no dired UI, 2b marks and operations, 2c mkdir/copy/recursive-delete primitives, then Stage 3 wdired.
-
Ownership warning: dired 2a overlaps
src/editor_core.rs,builtin/runtime/lsp.lua, and the URI-keyed LSP state with other coherence work. Do not run it concurrently with Journey Stage 1b without assigning those files to one lane first.
Parked lane: kill-ring browser + persistence
- Portable branch:
githubsucks/kill-ring-browser - Parked framing head:
503c489 - State: framing only, revision 2; no implementation and no PR.
- Status: explicitly parked by the user on 2026-07-20.
- Its original scout was based on
0efb5cd. The preserved framing marks this ground truth stale and requires a complete re-scout against the then-currentgithubsucks/mainbefore implementation. - Compile-mode has merged since the original scout, so old “compile-mode in flight” keybinding/touch-set assumptions are not authoritative.
Recovery worktree, only when the user un-parks it:
git worktree add --track \
-b kill-ring-browser \
../pmacs-kill-ring-browser \
githubsucks/kill-ring-browser
Documentation lane — STALE, AND ITS DISPOSITION IS UNDECIDED
Measured 2026-07-28, not inferred:
githubsucks/handoff-2026-07-20is atc11d7e7, 1 commit ahead ofmainand 320 behind. Its whole diff againstmainis four documentation files (docs/active-work.md,docs/agent-handoff.md,docs/roadmap-2026-07.md,docs/vterm-framing.md), every one of which has been rewritten repeatedly since by the landed-doc PRs #156/#168/#169/#172/#180. Rule 4 removes a lane on merge or abandonment, and this one looks abandoned in substance — but "looks abandoned" is not the same as a decision, and no PR was ever opened for it. This snapshot deliberately annotates rather than deletes: whoever confirms the branch carries nothing unique removes the section. The bullets below are its original claims, preserved as written and now unverified.
- Portable branch:
githubsucks/handoff-2026-07-20 - Carries synchronized
AGENTS.md/CLAUDE.md, this ledger, the durable handoff refresh, and the keybinding reference correction. - It changes no runtime code.
- Review and merge this documentation branch separately; it must not be folded into a feature framing branch.
- Now also absorbs both landed arcs: Vterm Stage 1 (#126) and the config
registry (#127). Canonical
mainis merged into it up to2e37c04, so its diff againstmainis documentation only.
Closed since the last snapshot
-
Terminal configuration + copy mode arc — BOTH STAGES MERGED, lane removed. Stage 1 #173 (
main@cf54270, one review round) and Stage 2 #178 (main@fe8b8ba, four review rounds, twelve checks green on head1b44c69— verified byhead_sha, not by the check summary), both 2026-07-26, both with no protocol change. Approved framing:docs/terminal-config-and-copy-mode-framing.mdrev 4, committed as the first commit of Stage 1's branch; its Q#TC6a carries a superseded-in-part box rather than a silent rewrite. Durable facts moved todocs/agent-handoff.md§1 (the arc bullet) and §4 (theset_generated_contentsinvariant) per rule 3 below, and toCOHERENCE.md§14. Stage 2 ships eight of nine criteria and the missing one is named — criterion 17 needs a real GPU frontend, so it waits on thea37footing; the handoff records what it must assert. Branchesgithubsucks/terminal-configandgithubsucks/terminal-copy-modewith worktrees../pmacs-terminal-configand../pmacs-terminal-copy-modeare retained. The gate-run flake found while gating #178 moved to the CIcrdt-coverage lane above, which owns its discrimination. -
Dired Stage 1 (the directory view) — MERGED as #165 (
main@c8ec8f3, 2026-07-25, after one review round). pmacs has a directory surface:C-x d/C-x C-j, one read-only buffer per directory named*dired:<canonical path>*, adiredmajor mode carryingRET/f,^,n/p,g,q,s. No wire change (v20). The Rust is two things — a per-entry-tolerantread_dir(Q#DR6), which had to be Rust becauseread_dir_blockingfails a whole listing on any of five per-entry conditions and a tolerant wrapper cannot be written in Lua at all, andnormalize_buffer_pathgoingpubaspmacs.path.canonicalize(Q#DR2's preferred end state, so no Lua mirror exists and Stage 2 owes no mirror removal). The frozen m8_1/m8_2/m8_3 counts are unchanged, which is the additivity gate. 15 claims bite-verified; one came back VACUOUS (acceptance 3c cannot pin descent routing — dired holds focus in its own panel, so dedication is the only discriminator) and is documented at the assertion rather than relabelled. Its branch (dired-stage1) and worktree (../pmacs-dired-stage1) are done; the abandoneddiredbranch (ffdd642,../pmacs-dired-arc) was superseded by a fresh cut and carries nothing unmerged. Stage 2 (marks and operations) and Stage 3 (wdired) each still need their own framing, and the frozen fixture shrinks after Stage 3. Durable substrate facts and both new ops lessons live indocs/agent-handoff.md§§1/5; the implementation notes aredocs/dired-framing.md§0, S1-1…S1-12. Two named forward items for Stage 2:apply_resource_op's rename rebind is exact-PathBuf-equality, first-match-only, looked up with the raw path while stored paths are normalized — so a directory rename strands every buffer under it, andpmacs.fs.renamehas zero production callers, so it can be fixed at the primitive; and Q#DR5's seam is the main-thread drainAsyncRuntime::tick, not_take_result, where rename settles as an undifferentiatedReplyKind::FsUnitand so must be keyed onJobKind::FsRename. -
GPU terminal input (the double terminal-layout sync) — MERGED as #166 (
main@b889873, 2026-07-25, one review round, all twelve checks green after a macOS PTY-timing rerun). The dispatcher applied both terminal-layout syncs to every attached frontend; a semantic session satisfies both conditions, so its PTY was resized twice per tick forever and the child took aSIGWINCHstorm that made a GPU terminal untypable while output still flowed.sync_terminal_layoutis now split into a frontend-kind-neutral half (panel reconcile + controller liveness) and a grid-only geometry half, with the loop body extracted tosync_terminal_layouts_for_tickso the exclusivity is structural. No protocol change (v20). Durable lessons are indocs/agent-handoff.md§5; the framing (docs/gpu-terminal-input-framing.mdrev 2) carries three falsified hypotheses, the two-pre-image bite matrix, and two named out-of-scope items (Q#GT5 interactive-shell echo on a raw PTY, which reproduces in-process and so is not the GUI/TUI asymmetry; and a geometry change appearing to clear the visible screen, which reproduces pre-fix). Branchgpu-terminal-inputand worktree../pmacs-gui-term-inputretained. Its landed-doc pair MERGED as #168 (main@1b6a084, 2026-07-26): #166 recorded as landed, the CIcrdt-coverage gap measured (264 tests dark workspace-wide, 177 in the library — a reading taken at1b6a084and kept here only as history. The CIcrdt-coverage lane above is the authority for the live figure; do not quote this one forward), the vterm audit corrected — "only 3 of 9 acceptances drive a real daemon" was optimistic; without the frontend binary the honest number is 2 — and the a37 findings folded into the coverage lane. -
Inline-math slice — MERGED as #158 (
main@5aa9044, 2026-07-25). Detect → parse → layout → draw for$…$, entirely insidepmacs-gpu, no protocol change. Verified by the user's manual pass on a real paper after the landing. What is worth carrying forward:- The v0 subset is 34 Greek symbols, sub/superscript, and
\frac. An unsupported command fails the whole span back to source, so on a real document most inline spans still show LaTeX. Widening the symbol map is the highest-value next increment — ahead of display math, which is also deferred. - A stale frontend binary is invisible from the source tree. The
slice lives only in
pmacs-gpu, so after it merged the feature was absent untilcargo build --release -p pmacs-gpuand a client restart; the daemon needs neither. Diagnose withstringson the binary (Latin Modern Math,MathBox) rather than by re-reading the checkout, which was already current. - Main was integrated three times in one day (
8c86d34,46a1b8f,b889873), merged not rebased to preserve review anchors. Two conflicts, both this ledger and nothing else. The dangerous case was the one that did NOT conflict: #166 auto-merged intopmacs-gpu/src/main.rs, the file this lane rewrites, because the two edits sat in different regions of it. Decide whether to integrate from the shared-file set, never from whether git complained. - Integration was proved by test-count reconciliation, not by a
green run: predict what the other side adds, then check the deltas.
GPU 199→202 matched
e547a90's 3; later lib 1,826→1,829 and CRDT 2,003→2,006 matched #166's 3, with GPU unchanged because #166 adds none. Suites 91→92 was #161's new binary. - Why the branch had no CI for a day: a conflicting PR builds no
merge ref, so no
pull_requestrun is created. The ledger previously recorded this cause as unidentified; it is not. Checkmergeableand confirm a run exists for the current head SHA. m4_5_basedpyrighthas no timeout and hangs forever, parking a--workspacesweep (observed 2h26m at 38 of 92 suites). It is intermittent, so an earlier clean sweep proves nothing. Sweep withcargo test --workspace --no-fail-fast -- --skip basedpyrightand judge progress by whether the suite count advances.- Named v0 approximations: the peer-caret half of acceptance 14 is
pinned at the mapping level, not pixels; a soft-wrapped spacer draws
its box whole at the first run's origin; the fit budget reads the
bundled code face even under a custom
set_fontfamily.
- The v0 subset is 34 Greek symbols, sub/superscript, and
-
Bottom panel Stage 1 — MERGED as #155 (
main@e745068, 2026-07-24, after two review rounds). Window placement, window parameters, TUI side windows, the divider, and the adopterdisplayopt-in, with no protocol change. Both rounds found the same class of defect and are worth keeping:- Round 1: the Q#BP6 side-window split guard had no production
caller —
C-x 2still reached plainsplit_active— and survived because the acceptance test called the core method directly. - Round 2: Q#BP7's terminal growth re-arm had never been
implemented, and the assertion meant to pin it (
at_bottom) is a geometric readout that a still-anchored view satisfies; the anchor assertions beside it compared""with""because the PTY fixture emitted LF-only output. - Post-round-2 self-review, caught by CI going red on all four Test
jobs: resolving
pmacs.window.buffer()'s no-argument arm through the acting frontend made a total function partial, and six runtime modules silently dropped operations (kill_ring_acceptance30/30 → 25/5). Fixed in9110f9fbefore merge. - Gating fact found on the way: the workspace sweep must run with an
isolated
XDG_CONFIG_HOME, because the real userinit.luainstalls a local package and the losing race leaks a status message into painted-frame comparisons. There is also a latent pre-existingmainbug in the buffer CRDT undo path, unrelated to this arc. compile_mode_acceptanceis load-sensitive under default parallelism (~1 run in 3, a different test each time); verified pre-existing by swapping inmain'scompile.lua. It is 67/67 at--test-threads=1.
- Round 1: the Q#BP6 side-window split guard had no production
caller —
-
GPU initial target — MERGED as #148 (
main@0dd16a5, 2026-07-24, after two review rounds).pmacs --gpu [--socket …] FILEopens a target before the GPU window appears. Protocol bumped 19 → 20: a semantic-sessionSessionBootstrapRequestafterAttachRequest, plus an appendedInstanceMessage::InitialTargetResultpre-window readiness barrier; v6–v19 wire encodings are unchanged. Root owns launcher tilde/cwd resolution and exact raw-byte path transport; the daemon resolves/dedups/loads the target and runs load/switch hooks inside one dispatcher transaction, then publishes CRDT-upgraded targets to existing grid replicas (gated onupgraded_to_crdt, independent of the load/create outcome, so a dedup onto a hidden not-yet-backed buffer still reaches pre-attached replicas — round 2 finding). Semantic replicas receive a publication only when displaying that buffer, so a second target launch cannot switch an existing GPU window. Round 2 also closed a failure-containment gap: every dispatcher-side bootstrap failure now shuts down the socket (a dropped write-half clone does not close a shared FD), and the dispatcher drops any event from a session that was never installed, rather than reaching absent render/size state. Integrated cleanly with Folding Stage 2 (#149): fold projection at attach is selected from the same negotiatedsemantic_renderbit the target bootstrap uses. Its lane, worktree (../pmacs-gpu-initial-target), and branch (gpu-initial-target) are done; the-framingbranch is kept. Durable substrate facts and both review-round lessons live indocs/agent-handoff.md§§1/5 anddocs/gpu-initial-target-framing.mdrev 3. -
Folding Stage 2 (grid/daemon collapse) — MERGED as #149 (
main@6ed4fe9, 2026-07-24, after five review rounds). The grid TUI now renders collapses. Spine (Q#FD12):src/fold_view.rs'sVisibleLineMap, derived from the fold store plus a window's line offsets and never stored, threaded asOption<&'a VisibleLineMap>on a lifetime-bearingViewport<'a>that staysCopy. No wire schema or protocol change; the GPU path is Stage 3. 48 acceptance tests on the realpaint_framegrid, every behavioral claim bite-verified. Durable design points, each a trap Stage 3 inherits:- the map's unit is a merged hidden component (overlapping or adjacent intervals unioned, keeping the earliest visible head), not a fold — folds may cross, and a later fold's own head can be hidden;
- instances are per rendered window and per command/event operation, never per frame; a command's map follows the operation's target window, since a wheel event names a pane without activating it;
- fold projection is per-frontend (
FrontendView.fold_projection) — sharedEditorCoremotion would otherwise make a simultaneous unfolded GPU session's cursor skip lines it still displays; - a hidden cursor normalizes by position, not row, and
set_view_topclamps in the setter rather than being repaired at render time; - the interactive-Lua unfold keys on the post-intercept edit site — a managed buffer intercept may legally relocate the op.
Process notes worth keeping:
mainmoved under the arc, and the merge was textually clean but not semantically clean (#146 addedViewportliterals the newfoldsfield invalidated) — a cleangit merge-treedoes not mean the merged tree compiles. CI was red at review on the macOS/luajitoutline_5_level_100_entry_renders_within_100msbudget flake and went green on rerun. -
Documentation ledger refresh — MERGED as #147 (
main@0a479ae, 2026-07-24). The #142 housekeeping, expanded after review found the ledger stale through four merges rather than one. Its own macOS/luajit red was the vtermVTERM_ALT_READYPTY timeout; green on rerun. -
Web grammars HTML + CSS — MERGED as #146 (
main@47581f4, 2026-07-23)..html/.htm/.xhtmland.csshighlight off the officialtree-sitter-html0.23 /tree-sitter-css0.25 crate query constants (no in-repo overlay), and HTML'sINJECTIONS_QUERYlights up<script>→ js and<style>→ css. Durable lesson recorded indocs/web-grammars-html-css-framing.md: thehighlight.rscapture table is global, so adding a capture name retro-paints every other language — check the reverse direction and pin it. -
LaTeX Stage 1 — MERGED as #144, with its parent inline-math framing committed as #145 (
main@f09b0a1, 2026-07-23)..tex/.latex/.sty/.clshighlight viacodebook-tree-sitter-latex0.6 plus the first in-repo query overlay (builtin/queries/latex/highlights.scm,include_str!) — the reusable pattern for grammars whose crate ships no usable queries. The crates.iotree-sitter-latexis provably broken (noscanner.c). The math parser and Tiers 3–4 are deferred to the inline-math arc. -
Folding Stage 1 (headless fold engine) — MERGED as #142 (
main@c49a8c7, 2026-07-23, after three review rounds; round 3 clean). The instance-side fold store + translating/droppingView, the structural source (derived head line, closer-aware tail), the Lua data API + interactiveC-c @commands, the command-path pre-edit unfold, and authoritative-emptyFoldStateproduction landed with no protocol bump. Thefoldingbranch and worktree (../pmacs-folding) are retained but carry nothing unmerged; thefolding-framing.mdframing is preserved. CI red at merge was an unrelated environmental perf flake (outline_5_level_100_entry_renders_within_100ms, macOS/luajit only), green on rerun. Stage 2 has since merged as #149 (above); durable substrate seams live indocs/agent-handoff.md§1. -
Vterm Stage 3 (protocol v19 + GPU terminal) — MERGED as #135 (
main@cac4961, 2026-07-22, after two review rounds). Arc 5's terminal stage is complete (compile mode #113, Stage 1 #126, Stage 2 #130, Stage 3 #135). Its lane, worktree (../pmacs-vterm-gpu), and branch are done; durable substrate facts live indocs/agent-handoff.mdanddocs/vterm-framing.md. -
Branches deleted 2026-07-22 (authorized):
vterm-stage3-framing(Revision 8 framing; its content is carried onvterm-gpu, verified as a superset before deletion — the branch was NOT an ancestor ofvterm-gpubecause the framing was copied rather than merged, so it needed a forced local delete) andtab-width-parity(a clean ancestor ofmainvia #137). Both removed as worktree + local ref +githubsucksref; theorigintracking refs were pruned. The-framingbranches for each are deliberately kept. -
Tab-width rendering parity — MERGED as #137 (
main@2625ec7, 2026-07-22). One fixed 8-columnTAB_STOP_COLUMNSinpmacs-protocolnow drives core/TUI columns, GPU code projection, and minimap width; source bytes and protocol ranges are unchanged. Its lane, worktree, andtab-width-paritybranch (local +githubsucks) are deleted; thetab-width-parity-framingbranch is kept. This closes the long-standing "tab width is a rendering-parity bug, NOT a config gap" deferral recorded indocs/agent-handoff.md§5. -
Locals-query processing — MERGED as #134 (with handoff #136), and modeline detection handoff #133. Both landed between this lane's base and its canonical-main integration.
-
Config registry — MERGED as #127 (
main@2e37c04). Its lane (config-registry, worktree../pmacs-config-registry) is done; the branch is kept but carries nothing unmerged. Durable substrate facts moved todocs/agent-handoff.md§1 per rule 3 below. -
Both this and Vterm Stage 1 ran as concurrent lanes in sibling worktrees off
main, with the shared files (src/editor.rs,src/lua_bindings/mod.rs,src/lib.rs) assigned to one lane each in advance. The rebase of the second lane onto the first had zero conflicts — worth repeating for future parallel work, along with its precondition: agree the file split before either lane starts, and keep each lane's footprint in the other's files to a single line.
Update protocol
Whenever a listed lane changes materially:
- update its public branch and head/state here;
- record new verification and remove superseded caveats;
- keep durable architecture in
docs/agent-handoff.md, not here; - remove the lane after merge or abandonment;
- verify every recovery command from a clean worktree before calling the transfer complete.