Beagle SCM

GET-048: get weaves COMMITTED deltas as if dirty — divergent+clean must be a plain reset (spec GET §intro+§4)

Incident 2026-07-17, work/ABC-016: tree CLEAN at local head ?467fb44b (ahead 1, behind 5); jab get dissolved the committed delta into 11 mod rows AND del-ed test/EXIT.c (a file the local commit ADDED — the merge used the local head as diff base, so a local add read as an upstream deletion; data loss). gritzko clarified GET the same day: get "never changes history — it only resets the worktree to a chosen version, maybe re-applying uncommitted changes"; §4: ONLY uncommitted changes are carried by weave. get.js classifies per-file "differs from base" as dirty without asking whether the delta is committed.

Input

Context

be/verbs/get/get.js (weave path ~:485-530): dirty-vs-clean is judged against the BASE; a committed local head's files all "differ from base" and get weaved. Spec-conforming behavior for ABC-016's case: plain reset to the target, tracking re-pointed, ?467fb44b left intact in the store for an explicit patch '#467fb44b' + post (the Verbs.mkd cheat-sheet route).

• The four cases to differentiate (spec §3 x §4): target ahead/behind/same/divergent CROSS tree clean/dirty; committed-ness of the base→head delta is NOT dirtiness.
• GET-053 (2026-07-24) proposes bare get FF-ONLY: the diverged plain-reset here would then move behind get! and this ticket's machinery goes STALE — see there before extending it.
• Add-side evidence: with base = local head, target lacking a locally-added file → del (wrong under ANY reading; a true 3-way base keeps a local add of uncommitted files).
• Recovery of the incident file was manual (extracted from the commit diff; cat path?ref printing empty is separate, needs own ticket).

Goals

get tests differentiate the case matrix; code complies with the clarified spec.

• Tests FIRST (test/get/, follow the existing case-dir layout): (a) divergent + CLEAN tree → plain reset to target, no mod rows, local head still resolvable by hash, wtlog tracks target; (b) divergent + DIRTY tree → only the uncommitted edits weave, committed delta does NOT reappear as mods; (c) locally-committed ADD + divergent get → file must NOT be deleted; (d) existing ahead/behind/dirty cases stay green.
• Fix get.js: dirtiness = checkout vs LOCAL HEAD (cur), not vs merge base; divergent committed history is never replayed — the worktree resets to the target (uncommitted edits still weave on top).

Constraints

• GET verb only; patch stays the merge verb (no auto-merge of divergent heads).
• Existing test/get/ cases are the contract for ahead/behind/dirty — do not edit them; new cases only.
• GET is the spec as edited 2026-07-17; if code and spec still disagree somewhere, report — don't improvise spec.

WIP

Design decisions

Fix is 3 spots in verbs/get/get.js: leaf weave base = cur (oldSha), never the merge base (:986) — a committed delta reads clean and clean-overwrites to target; in diverged mode a path absent from the merge-base tree is a locally-committed add — unlinked by the reset but NO del row (:951); basePaths demoted to del-row classifier (~:559). No auto-merge — divergent heads stay patch's job.

TODOs

• new cases (all RED pre-fix, green post): divergent-clean-reset (zero mrg/mod, wtlog tracks target, old head hash-resolvable), divergent-dirty-weave (only the uncommitted edit weaves), divergent-committed-add (no false del row; blob intact in store).
• get.js: dirtiness vs cur; no committed-delta replay; false-del gate.
• suite 268/269 -LE big; ABC-016 scenario re-run end-to-end (upd+post rows, one mrg for the real edit, head recoverable).
• RULED by gritzko 2026-07-17: test/get/dag-diverge DELETED as superseded (asserted the old §3.4 weave-of-committed-edits, spec text removed the same day; divergent-clean-reset covers the scenario spec-correctly). Suite 269/269 after re-glob; deletion pending as mis in the test subrepo.

Blockers and bummers

The dag-diverge contradiction above is the only red; its header also stale-claims the case is unregistered.

Outcome

UNCOMMITTED in work/GET-048: mod verbs/get/get.js (3 hunks); test subrepo: 3 unk run.sh (test/get/divergent-*). Orchestrator re-verified the 3 new cases green + dag-diverge red. Suggested commit: GET-048: divergent get resets, never replays commits.