pmacs/docs/active-work.md

146 lines
5.6 KiB
Markdown

# Active work — cross-machine resume ledger
**Snapshot: 2026-07-22.** 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.
## Repository authority
- Canonical development URL:
`https://github.com/levineuwirth/pmacs.git`. This ledger uses the
normalized local alias `githubsucks` so its refs and recovery commands
are identical on every machine. Remote names are otherwise
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` @ `8bd8298` (landed-state handoff #133; protocol v18).
- 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
verifying URLs and normalizing `githubsucks` rather than trusting
`origin/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:
```sh
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:
```sh
git remote add githubsucks https://github.com/levineuwirth/pmacs.git
```
Then recover current refs:
```sh
git fetch githubsucks --prune
git log -1 --oneline githubsucks/main
git worktree list
git status --short --branch
```
The first command must expose `8bd8298` or a newer intentional main.
If it does not, stop and repair the remote/fetch configuration.
## Locals-query processing lane
- Portable branch: `githubsucks/locals-query-processing`
- Base: canonical `main` @ `8bd8298`.
- Framing head: `42a28b9` (`docs/locals-query-processing-framing.md`).
- Implementation head: `47ffe5d`.
- PR: #134, <https://github.com/levineuwirth/pmacs/pull/134>, open for review.
Implementation is complete; protocol remains v18.
- Scope: bundled Lua/JavaScript/TypeScript locals metadata, lexical
scope/definition/value/reference resolution cached on each settled layer,
and shared `#is?`/`#is-not? local` filtering in the TUI and semantic/GPU
highlight producers.
- Focused verification:
- default and Lua 5.4 lexical suites: 35 passed each;
- default and Lua 5.4 end-to-end render/edit acceptance: 1 passed each.
- Full pre-PR verification:
- `cargo fmt --check`: clean;
- strict workspace Clippy: clean;
- default library: 1,757 passed (3 ignored);
- CRDT library: 1,933 passed (3 ignored);
- M4 acceptance excluding basedpyright: 121 passed, 3 ignored, 1 filtered;
- required GPU: 109 passed;
- workspace: 2,893 passed across 82 suites, 19 ignored, 1 filtered;
- `git diff --check`: clean.
Recovery worktree on a machine that does not already own the branch:
```sh
git worktree add --track \
-b locals-query-processing \
../pmacs-locals-query \
githubsucks/locals-query-processing
```
## 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-current `githubsucks/main` before 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:
```sh
git worktree add --track \
-b kill-ring-browser \
../pmacs-kill-ring-browser \
githubsucks/kill-ring-browser
```
## Documentation lane
- 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 `main` is merged into it up to `2e37c04`,
so its diff against `main` is documentation only.
## Closed since the last snapshot
- **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 to `docs/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:
1. update its public branch and head/state here;
2. record new verification and remove superseded caveats;
3. keep durable architecture in `docs/agent-handoff.md`, not here;
4. remove the lane after merge or abandonment;
5. verify every recovery command from a clean worktree before calling
the transfer complete.