| name | flush |
| description | Use when the user wants to manually flush a deferred-commit queue from a prior or interrupted chain. Reads .hyperflow/commits-queue/manifest.json, fast-forwards the staging branch onto the user's branch, deletes staging, clears the queue. Recovery interface when a chain crashed before its Step 4 auto-flush ran.
Trigger with /hyperflow:flush, "flush pending commits", "flush queue", "apply staged commits", "where are my commits".
|
| allowed-tools | Read, Bash(git:*), Bash(ls:*), Bash(cat:*), Bash(rm:*), Bash(bash:*), Bash(scripts/*:*) |
| argument-hint | [--dry-run] |
| version | 4.12.7 |
| license | MIT |
| compatibility | Designed for Claude Code |
| tags | ["git","deferred-commits","recovery","lifecycle"] |
Flush
Manually flush the deferred-commit queue from a chain that ran with commit-when=end. Normally /hyperflow:dispatch calls scripts/flush-commits.sh at its Step 4 wrap-up; this skill exists for the case where the chain was interrupted (crash, kill, context loss) before the auto-flush ran.
Subcommands
| Subcommand | Description |
|---|
| (no arg) | Run scripts/flush-commits.sh <project-root> — fast-forward staging onto user's branch, delete staging, clear queue |
--dry-run | Show what would be flushed without doing it. Lists the queued commits in order. |
What gets flushed
.hyperflow/commits-queue/manifest.json tracks the chain's user_branch, staging_branch (always hyperflow/staging-<chain-id>), and the list of queued commits with SHAs and messages. Flush replays them via git merge --ff-only so:
- All N commits land on the user's branch with original SHAs preserved
- Order is chronological (queue-time order)
- Original commit messages are preserved
- Original file-to-message mapping is preserved (each commit touched exactly the files its sub-task touched)
What happens if fast-forward isn't possible
If the user's branch diverged from staging (e.g. the user committed manually mid-chain on the same branch), git merge --ff-only refuses. The skill surfaces the error with two recovery options:
git rebase hyperflow/staging-<chain-id> — replay staging commits on top of user's new commitsgit cherry-pick <staging-base>..hyperflow/staging-<chain-id> — selectively pick commits
The staging branch is preserved for the user to act on manually. The queue manifest stays in place so a future /hyperflow:flush retry can attempt again after the user resolves divergence.
Flow
- Check
.hyperflow/commits-queue/manifest.json exists. If not, print No queue to flush. and stop.
- Run
bash $PLUGIN_ROOT/scripts/flush-commits.sh $PROJECT_ROOT [--dry-run].
- Print the script's output verbatim.
Overview
/hyperflow:flush is the user-facing handle for the deferred-commit flush mechanism. Most users never call it explicitly — Step 4 wrap-up runs the same script automatically. This skill exists for recovery: if a chain ran with and crashed before wrap-up, the queue persists on disk and the user can flush it later.
