cleanup-workspace

Cleanup Workspace

Post-merge housekeeping: verify the active dev branch landed in main, then prune it locally and on origin.

When to Use

After a pull request authored on a dev* branch has been merged into main and the user wants to return the workspace to a clean state on the updated main branch.

Safety Rules

• NEVER delete a branch that is not fully merged into origin/main. If the merge check fails, STOP immediately and report to the user — do not pass -D to force delete.
• NEVER run on main itself. If the current branch is main, abort with a clear message.
• NEVER discard uncommitted changes. If the working tree is dirty, abort and ask the user to commit or stash first.
• The remote name is assumed to be origin. If origin is not present, abort and ask the user which remote to use.

Method

Step 1 — Capture state and validate preconditions

Run these checks in parallel:

git rev-parse --abbrev-ref HEAD          # current branch name
git status --porcelain                   # must be empty (clean working tree)
git remote                               # must contain 'origin'

Abort with a clear message if:

• Current branch is main (nothing to clean up).
• git status --porcelain is non-empty (uncommitted changes).
• origin remote does not exist.

Save the current branch name as DEV_BRANCH for later steps.

Step 2 — Fetch latest refs and verify merge status

git fetch origin --prune

Then check whether every commit on DEV_BRANCH is reachable from origin/main:

git merge-base --is-ancestor <DEV_BRANCH> origin/main

• Exit code 0 → branch is fully merged. Proceed to Step 3.
• Exit code 1 → branch has commits not in origin/main. STOP and report to the user:
  • Show the unmerged commits: git log --oneline origin/main..<DEV_BRANCH>
  • Tell the user the branch is not merged and the skill will not delete it.
  • Do not continue to subsequent steps.

Step 3 — Switch to main and pull