Entire

/simplify → 4 cleanup agents in parallel → apply the fixes

You are improving the quality of the changed code, not hunting for bugs. Review it for reuse, simplification, efficiency, and altitude issues, then fix what you find. Do not look for correctness bugs — that is what /code-review is for.

Phase 0 — Gather the diff

Run git diff @{upstream}...HEAD (or git diff main...HEAD / git diff HEAD~1 if there's no upstream) to get the unified diff under review. If there are uncommitted changes, or the range diff is empty, also run git diff HEAD and include the working-tree changes in scope — the review often runs before the commit. If a PR number, branch name, or file path was passed as an argument, review that target instead. Treat this diff as the review scope.

Phase 1 — Review (4 cleanup agents in parallel)

Launch 4 independent review agents via the Agent tool, all in a single message so they run concurrently. Pass each agent the diff and one of the four angles below. Each returns its findings with file, line, a one-line summary, and the concrete cost (what is duplicated, wasted, or harder to maintain).

Reuse

Flag new code that re-implements something the codebase already has — Grep shared/utility modules and files adjacent to the change, and name the existing helper to call instead.

Simplification

Flag unnecessary complexity the diff adds: redundant or derivable state, copy-paste with slight variation, deep nesting, dead code left behind. Name the simpler form that does the same job.

Efficiency

Flag wasted work the diff introduces: redundant computation or repeated I/O, independent operations run sequentially, blocking work added to startup or hot paths. Also flag long-lived objects built from closures or captured environments — they keep the entire enclosing scope alive for the object's lifetime (a memory leak when that scope holds large values); prefer a class/struct that copies only the fields it needs. Name the cheaper alternative.

Altitude

Check that each change is implemented at the right depth, not as a fragile bandaid. Special cases layered on shared infrastructure are a sign the fix isn't deep enough — prefer generalizing the underlying mechanism over adding special cases.

Phase 2 — Apply the fixes

Wait for all four agents to complete, dedup findings that point at the same line or mechanism, and fix each remaining one directly. Skip any finding whose fix would change intended behavior, require changes well outside the reviewed diff, or that you judge to be a false positive — note the skip rather than arguing with it. Finish with a brief summary of what was fixed and what was skipped (or confirm the code was already clean).

3mo ago·6m

Done. Build and checkpoint tests pass.

Summary

Ran 4 cleanup agents (reuse / simplification / efficiency / altitude) against the v1.1-mirror removal diff. The diff is largely clean — most "findings" were deliberate scaffolding I left in place.

Fixed (1):

checkpoint/open.go — removed the redundant Stores.temporary field. It was always assigned the exact same *GitStore pointer as Primary, so it was derivable state with no purpose. Temporary() now returns s.Primary, preserving the intent-communicating accessor at the 4 call sites with zero call-site churn and no behavior change.

Skipped, with reasons:

Fallible Open() (//nolint:unparam) — all agents noted it never fails today. But it's a deliberate, documented boundary the author chose for a future pluggable backend, and unwinding the error handling across ~24 call sites changes intended design rather than simplifying a wart. Left as-is.
CommittedRefs Read/Primary + PrimaryAsRead()/ReadBootstrappableFromOrigin() — Read == Primary in today's single topology, but this is intentional scaffolding for the documented future direction where v1.1 becomes primary and Read/Primary diverge again. Collapsing it now would just have to be rebuilt. Left as-is.
resolveOpenRefs single-use helper — inlining is a wash; the named helper reads fine. Left as-is.

Confirmed clean:

Reuse: setRefHash properly reused across strategy files; AdvanceCommittedPrimary, AdvanceLocalRef, and all Mirror* helpers fully removed with no dead code.
Efficiency: store-construction count unchanged by the refactor; no new memory retention.

One unrelated pre-existing lint diagnostic (committed.go:903, inefficient WriteString) surfaced but is outside this diff — left untouched.