tp-post-merge

Post-Merge Cleanup

Verify a design's completion PR is merged, then tear down its branch, sibling worktree, and MRU state. This skill is the sole merge-verified lifecycle teardown path — within the design lifecycle, it is the one place that deletes the design branch and removes its worktree after verifying the merge. (Other tooling can remove a git worktree as a general, unverified operation; that is out of scope here. The point is the merge-verified lifecycle teardown, which only /tp-post-merge performs.)

/tp-design-complete stops at PR-open; /tp-post-merge picks up after the human merge. /tp-merge-from-main auto-chains this skill via step 8 after a successful completion-PR merge.

Arguments:

• {design-name} (optional) — must match [a-z0-9-]+ per skills/_shared/validate-name.md. If absent, runs the no-arg scan form (see below).
• --auto (optional) — autonomous mode; see ## Auto Mode section.

This skill takes no --force-takeover flag: it is lock-aware, not lock-enforcing (see step 2). Teardown deletes the branch, so "claiming" a lock about to be deleted is incoherent — the merge-verify gate (step 4), not the advisory lock, is the safety boundary.

No-arg scan form

When invoked without {design-name}, /tp-post-merge scans for designs awaiting teardown:

1. Walk three-pillars-docs/completed-tp-designs/*/lock.json for entries where phase == "cleanup-pending". (/tp-design-complete git mvs the design directory — lock.json included — into completed-tp-designs/ before it sets phase = "cleanup-pending", so the pending-teardown locks live under the completed tree, not tp-designs/.)
2. Skip already-torn-down designs: for each candidate, run git ls-remote --heads origin tp/{name} and check both its exit status and output. Only when the command succeeds (exit 0) and returns empty output is the branch confirmed absent (teardown already ran) — drop it from the list. If the command fails (offline, auth error, network) its stdout is also empty, but that is not proof of absence — do not drop on a non-zero exit; keep the design and let the step-4 merge gate decide (fail-safe: a transient ls-remote error must never silently drop an actionable design). This guard is load-bearing: phase == "cleanup-pending" is not cleared after teardown (this skill performs no commit of design artifacts; the step-6 doc-reconcile commit on {base} is the sole, scoped exception — see ## Auto Mode), so a confirmed-absent branch is the durable "done" signal. Without it every completed design would re-surface in the scan forever.
3. For each remaining design, run verify_merged.py and partition by the result: merged == true ⇒ actionable; merged == false ⇒ pending (kept for the listing in step 5, never torn down).
4. Present an interactive checklist of the actionable (verified-merged) designs. On confirmation, run the teardown sequence (step 5 of ## Steps) for each selected design.
5. List the pending (unverified) designs separately as "pending merge — not actionable" — they are never torn down without explicit verification.