flush

# 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: 1. `git rebase hyperflow/staging-<chain-id>` — replay staging commits on top of user's new commits 2. `git cherry-pick <staging-base>..hyperfl...