Skip to content

chore: prune stale branches, worktrees, and dangling references#712

Merged
mkobit merged 2 commits into
mainfrom
chore/prune-stale-branches-and-references
Jul 14, 2026
Merged

chore: prune stale branches, worktrees, and dangling references#712
mkobit merged 2 commits into
mainfrom
chore/prune-stale-branches-and-references

Conversation

@mkobit

@mkobit mkobit commented Jul 14, 2026

Copy link
Copy Markdown
Owner

Summary

Dedicated pruning pass across three areas, per request. Each branch/worktree/remote
deletion below was verified against the actual merged PR record (not raw git log
reachability, which false-negatives on squash merges) plus content diffs before deletion —
none were guessed from names or dates alone.

1. Local branches and worktrees (already executed, no diff here)

Deleted 56 local branches and removed 3 worktrees (chezmoi-fix-tmux-url-popup,
chezmoi-fix-zellij-term, chezmoi-gemini-bump). Every branch was confirmed merged, or
closed-but-superseded by different work that did merge:

2. Remote branches (already executed, no diff here)

Deleted 10 remote stragglers GitHub didn't auto-clean (8 map to closed/merged PRs, one
Bazel-era revert, and review-593-fixup — a manual review branch with real but abandoned
termbud scrollback-extraction work from a closed PR, confirmed abandoned and approved for
deletion).

3. Dangling references (this diff)

4. Retired catalog/BOM entries (this diff)

Deleted the claude_statusline and agent_run tombstone entries (BOM +
local_bin_tools.toml) — both were retired via rename (→ termstatus, → sandboxr)
over 2 weeks ago; confirmed applied on all machines.

Test plan

  • chezmoi execute-template --init renders the BOM template cleanly with no leftover
    references to the deleted keys
  • uv run pytest tests/integration/test_local_bin_tools.py tests/integration/test_chezmoi_data.py
    — same 4 pre-existing failures with and without this diff (local dev-venv PATH
    shadowing, unrelated to this change)
  • git branch -a / git worktree list confirm a clean final state
  • rg -l "HANDOFF-sandboxr-runtime-decision" confirms zero remaining references after
    deletion

🤖 Generated with Claude Code

mkobit added 2 commits July 13, 2026 22:37
- docs/HANDOFF-sandboxr-runtime-decision.md: continuation prompt pointed
  at feat/sandboxr-two-layer-design, a branch that no longer exists;
  point at the merged PRs instead.
- src/chezmoi/dot_config/mise/AGENTS.md: locking script was renamed
  (run_after_onchange_06_... -> run_onchange_after_06_...) and its
  MISE_LOCKED value flipped 1->0 per #574 (relax locking) without the
  doc being updated; repo-root .mise.toml was also renamed to mise.toml.
- docs/DESIGN-keybindings.md: managed-files table had stale paths for
  zellij config, Ghostty conf.d files, and VS Code/Cursor keybindings
  (referenced a modify_ prefix that was never shipped).
- Delete the claude_statusline and agent_run tombstone entries from the
  BOM and local_bin_tools catalog: both were retired via rename
  (termstatus, sandboxr respectively) over 2 weeks ago and confirmed
  applied on all machines.
docs/HANDOFF-sandboxr-runtime-decision.md was a session-continuation
artifact from PR #695 ("Audience: fresh agent session executing
follow-ups"), not curated documentation. Every follow-up it listed is
resolved (#706, #707, #708, #709); the decision rationale it recorded
is already duplicated in memory. Repoint the two comment references
that cited it at the actual PR instead.
@mkobit mkobit merged commit 3940a54 into main Jul 14, 2026
6 checks passed
@mkobit mkobit deleted the chore/prune-stale-branches-and-references branch July 14, 2026 04:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant