wip

/wip — work-in-progress cleanup pipeline

Drive a repo full of leftover worktrees and half-finished branches toward a clean, landed state. Four phases run in order, each gated:

• Worktrees: remove every worktree except the main and protected ones, freeing their branches.
• Rebase + GC: rebase every branch onto upstream main (j g / git-all) and delete merged branches.
• Test: retest the rebased commits.
• Push: push the green branches. The user opens and merges PRs.

Opening PRs, CI, review, and merging are the user's call. If the repo or user documents a WIP state model, follow it for those stages.

Golden Rules

• Never --force. Remove worktrees with git worktree remove --no-force (write the flag explicitly) and push with a pinned --force-with-lease. Git's refusal is the safety net for uncommitted work and unexpected remote changes.
• The worktree and branch set is a moving target. Other agents and the user create, switch, and merge while you work. Recompute with git worktree list --porcelain / git for-each-ref immediately before each action, and re-git fetch before testing and pushing.
• Gate irreversible and outward-facing steps. Removing a worktree with WIP, force-pushing, and delete-merged (which deletes remote branches) need the user's OK. Ask at each phase boundary unless the user pre-authorized the whole flow.
• Keep the main checkout clean. Rebases and tests check out commits, so run them in throwaway worktrees (git worktree add) and tear those down afterward.

Protected Worktrees

The main worktree is the first entry of git worktree list --porcelain (the one whose gitdir is git rev-parse --git-common-dir). Never remove it.

Permanent worktrees are listed per repo in .llm/wip.json:

{"protectedWorktrees": ["/Users/you/projects/some-permanent-worktree"]}

If the file is missing, only the main worktree is protected, but ask before removing any long-lived worktree you're unsure about. git worktree lock also works, since a locked worktree can't be removed without --force.