Mutation cursor ref reconciliation - #246
Open
davidabram wants to merge 12 commits into
Open
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
davidabram
changed the title
Define the staged implementation path for conservative per-worktree SCE ref reconciliation. The plan specifies durable root discovery, fail-closed pin inventory, atomic conditional deletion under WorktreeLock, and tests needed to safely reclaim orphan pins without changing protocol semantics. Plan: mutation-cursor-ref-reconciliation Tasks: T01, T02, T03, T04, T05 Co-authored-by: SCE <sce@crocoder.dev>
Expose worktree-scoped and repository-wide sets of cursor and historical event tree IDs through single-statement UNION queries, preserving roots across atomic cursor advances and excluding unrelated or transient state. Add coverage for deduplication, worktree isolation, empty repositories, and snapshot retention, and document the store contract. Plan: mutation-cursor-ref-reconciliation.md T01 Co-authored-by: SCE <sce@crocoder.dev>
…tives Enable future ref reconciliation to inventory only pins owned by a worktree and safely remove them without deleting refs that changed after inventory. Add validated PinnedRef inventory with distinct Git/malformed errors and SHA-conditioned batch deletion via one update-ref --stdin transaction, with tests covering scope, malformed refs, and atomic abort behavior. Plan: mutation-cursor-ref-reconciliation (T02) Co-authored-by: SCE <sce@crocoder.dev>
Mutation-cursor pins must remain direct tree refs so a symbolic ref under one worktree's namespace cannot resolve into another worktree's pin. Use NUL-delimited for-each-ref inventory with %(symref), reject symbolic refs, and fail closed by re-inventorying before an atomic git update-ref --no-deref --stdin deletion. Add race and transaction tests and update the runtime contract and plan state. Plan: `mutation-cursor-ref-reconciliation`, T02 (AC7, AC10). Co-authored-by: SCE <sce@crocoder.dev>
Replace manually generated test database paths and explicit cleanup with tempfile-owned directories so fixtures are isolated and cleaned up automatically. Add tempfile as a dev dependency and pass borrowed paths through the store test helpers. Co-authored-by: SCE <sce@crocoder.dev>
…limits Prevent parallel and cross-process test collisions by owning each temporary repository with tempfile::TempDir, replacing PID/counter-derived paths and manual cleanup with RAII teardown. Clarify that mutation-cursor reconciliation removes only orphan or unreferenced pins, retains current and historical durable roots, and does not bound storage for indefinitely retained mutation history. Record the test-isolation follow-up and lifecycle clarification in the affected plans. Plans: mutation-cursor-ref-reconciliation (T02); mutation-cursor-runtime-coordinator Co-authored-by: SCE <sce@crocoder.dev>
Reclaim orphaned SCE-owned snapshot refs without deleting trees that remain durable roots in any worktree. Run inventory, local fail-closed validation, and repository-wide root retention under the shared WorktreeLock, then atomically delete only stale refs. Add dedicated error/report contracts and coverage for linked-worktree retention, malformed or missing pins, idempotence, and no-object-reclamation. Keep this imperative maintenance outside the verified mutation-cursor protocol and defer harness wiring. Plan: mutation-cursor-ref-reconciliation (T03) Co-authored-by: SCE <sce@crocoder.dev>
Verify reconciliation waits for the worktree lock before scanning durable roots, so a pin created while the lock is held is retained after the pass proceeds. The regression uses channel synchronization and asserts the durable cursor ref survives without timing-based sleeps. Plan: mutation-cursor-ref-reconciliation (T04) Co-authored-by: SCE <sce@crocoder.dev>
Clarify that per-worktree reconciliation covers only still-identifiable active worktree namespaces, while retired-worktree cleanup remains future repository-scoped work. Make missing checkout identity an explicit skipped outcome and precisely reframe the T04 lock-race proof without overstating production CAS coverage. Plan: mutation-cursor-ref-reconciliation (T05–T09); update the related acceptance criteria through AC18 and preserve fail-closed deletion guarantees. Co-authored-by: SCE <sce@crocoder.dev>
A missing current checkout identity must not look like a successful zero-work reconciliation, since no per-worktree namespace can be derived or safely inspected. Return explicit `SkippedNoCheckoutIdentity` and avoid opening the database on that path, while preserving normal reports as `Reconciled`. Update runtime tests for outcome handling and no-op safety. Document that per-worktree cleanup only reaches still-identifiable namespaces and that retired linked-worktree refs require future repository-scoped reconciliation. Plan: mutation-cursor-ref-reconciliation (T05, T06) Co-authored-by: SCE <sce@crocoder.dev>
Ensure reconciliation is serialized against the coordinator's complete pin-to-CAS critical section, including the real durable mutation commit. The deterministic cross-module test pauses a real coordinator after pinning and verifies reconciliation waits, then retains the committed tree and its durable event. Update the runtime context and mark T07 complete with its verification evidence. Plan: mutation-cursor-ref-reconciliation, T07 Co-authored-by: SCE <sce@crocoder.dev>
Reframe per-worktree ref cleanup around checkout identities currently derived by a worktree, covering deleted worktrees and checkout-id metadata loss or recreation as unowned namespaces requiring future repository-scoped cleanup. Correct report invariants for skipped outcomes and harden the missing-identity regression to compare full ref structure while preserving fail-closed, no-DB behavior. Ref: context/plans/mutation-cursor-ref-reconciliation.md (T05, T06) Co-authored-by: SCE <sce@crocoder.dev>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.