| name | Session Cleanup |
| description | End-of-session housekeeping for git repositories. Use when the user asks to 'end of session', 'clean up session', 'session housekeeping', 'clean up branches', 'clean up worktrees', or 'clean up remote branches'. |
| version | 1.2.0 |
Session Cleanup
Structured end-of-session housekeeping: doc review, branch audit, worktree removal, and remote sync.
Behavioral Classification
Type: Guided Decision
Directive: ASK, THEN EXECUTE
Audits each category and presents findings before taking any destructive action. Deletions always follow an explicit audit phase.
Execution Context Requirements
This skill spawns a general-purpose subagent that performs git operations and file edits.
Foreground execution required: Yes
Required tools: Read, Write, Edit, Bash, Grep, Glob
Fallback: If tools are denied, the subagent returns a checklist of recommended actions for the coordinator to apply manually.
Usage
Invoke at the end of a working session:
/session-cleanup
Or trigger via phrases: "end of session", "clean up branches", "clean up worktrees", "session cleanup"
Out of scope: PR creation/merge (/ship), production deploys, Linear issue updates (/linear), resolving merge conflicts.
Five Phases
- Doc Review — CLAUDE.md staleness, MEMORY.md updates, submodule dirty state
- Branch Audit — PR status check, unpushed commit detection, squash-merge artifact filtering
- Branch Cleanup — Push unreleased content, cherry-pick docs to main, delete merged branches
- Worktree Cleanup — Remove stale worktrees via project script or
git worktree remove
- Final State — Sync main, confirm clean working tree, report summary
Pre-Dispatch Check (REQUIRED — run before spawning agent)
Before launching the cleanup agent, run these two commands via Bash:
git status --porcelain
git branch --list | grep -v "^\* main$"
If both return empty (working tree clean AND only main branch exists locally), cleanup has almost certainly already run this session. Do NOT spawn the agent. Instead, tell the user:
"The repo looks clean already — only main, nothing uncommitted. Cleanup appears to have already run this session. Run it again anyway?"
Only proceed to Dispatch if the user confirms, or if either check returns output (there is real work to do).
Dispatch
Use the Task tool with subagent_type="general-purpose" and pass the full contents
of ./agent-prompt.md as the prompt.
Changelog
v1.2.0 (2026-02)
- New: Pre-dispatch check — skip agent spawn when repo is already clean
- New: Two-dot diff gate for unreleased content detection
- New:
--no-verify consent rule — never bypass hooks without explicit user approval
- New: Abort-gracefully rule — clean state report when user cancels mid-run
v1.1.0 (2026-01)
- New: Thin dispatcher pattern — full workflow extracted to
agent-prompt.md
- New: Cherry-pick to main for docs-only commits on merged branches
- New: Worktree cleanup phase using project
remove-worktree.sh script
- New: Squash-merge artifact filtering in branch audit
v1.0.0 (2025-12)
- Initial release
- Five-phase workflow: Doc Review, Branch Audit, Branch Cleanup, Worktree Cleanup, Final State
- Guided decision pattern — audit first, delete only with user approval
- Remote sync and main branch verification
