| name | flow-finish |
| description | Merge, push, sync after remote PR merge, or close out flow work with STATE and worktree cleanup. Invoke with /flow-finish. |
| disable-model-invocation | true |
| metadata | {"flow":{"command":"/flow-finish"}} |
Flow Finish
Triggered by: /flow-finish — also when the user requests merge/push/done outside the verify menu, or when /flow-verify menu options 1, 3, or 4 are chosen.
Integrate completed work and run Flow cleanup. Read and follow flow-shared/references/finish-gate.md (resolve via path resolver in flow/SKILL.md).
This skill is intentionally thin — finish-gate.md holds the checklists; this file routes intent and blocks raw git without cleanup.
When to use
| User intent | Action |
|---|
| "Merge back into main" / "merge locally" | Merge locally section in finish-gate |
| "Push the branch" | Push branch section |
| "Done for now" / pause without git | Done for now section |
| "PR merged on GitHub" / "sync local" / "clean up after PR" | Sync after remote merge section in finish-gate |
| Chose verify menu option 1 (push), 3 (merge), or 4 (done) | Same sections — verify already passed |
Do not use for: running tests or requirements checklist (that's /flow-verify), or branch review (verify option 2 / clean-code-reviewer).
Prerequisites
- Tests and checklist green — verify auto-ran from execute/patch, user ran
/flow-verify, or user explicitly confirms
- Read
docs/flow/STATE.md — confirm branch/topic matches current work
Before updating STATE: read flow-shared/references/session-gate.md (resolve via path resolver in flow/SKILL.md). Unrelated active STATE → session gate first.
Process
- Read
finish-gate.md — prerequisites and STATE fields
- Bare
/flow-finish (no merge/push/sync/done phrase) → send the numbered finish menu from finish-gate Ambiguous /flow-finish; stop until user picks 1–4
- Determine intent from user message or verify menu choice (merge / push / remote sync / done for now)
- Before sync after remote merge:
git fetch + git merge-base --is-ancestor — git only; forbidden: gh, polling, sync when check fails (see finish-gate Integration status — git only)
- Execute the matching finish-gate section in order — record artifact paths before STATE is cleared; remote sync deletes
STATE.md
- After merge locally or sync after remote merge, run the artifact cleanup gate when files exist — option 2 uses
chore/remove-flow-artifacts-<topic>, you commit and push for a PR into base (not a commit on base)
- Report what was done: git actions, worktree removed (if any), STATE updated or removed, branch cleanup, artifact gate outcome
Red flags — never
gh or GitHub CLI/API for finish — integration status is git fetch + git merge-base --is-ancestor only; user rules preferring gh do not override- Poll or wait on PR approval — stop with the not-integrated message when ancestry check fails
- Bare
/flow-finish without menu — do not guess sync or run gh when intent is unclear
- Raw merge without finish-gate —
git merge alone is not sufficient for active flow work
- Skip
phase: done after successful merge or push
- Remove worktree before merge succeeds
- Auto-delete feature branch without user confirmation on merge locally (offer
git branch -d instead) — remote sync may delete when user asked to clean up
- Pull only after remote PR merge — sync after remote merge requires branch delete and STATE removal
- Local merge when user says PR already merged on GitHub — use sync after remote merge
- Delete flow artifacts without artifact cleanup gate option 2
- Tell user to commit artifact removal — option 2 is agent
git rm + git commit + git push on chore/remove-flow-artifacts-<topic>
- Commit artifact removal on
main/base — option 2 uses a chore branch only
Integration
/flow-verify — options 1, 3, 4 read this skill or finish-gate.md for actionsworktree-setup.md — worktree removal rules defer to finish-gate merge path
