feat(df-merge-pr): add --yes flag to skip confirmation gate#6
Merged
Conversation
Previously /df-merge-pr always stopped at the Confirmation Gate via
AskUserQuestion. When the caller already knows they want to merge
(e.g. scripted invocation or repeated ship workflow) this extra
round-trip is friction with no safety benefit beyond what --admin +
the hard aborts already provide.
Add a --yes / -y flag that, when present:
- prints the summary block and proceeds without AskUserQuestion
- downgrades CI-failing and concurrent-hotfix prompts to warning lines
- does NOT bypass hard aborts: dirty tree, draft PR, rebase conflict,
tag exists, PR already merged — those still stop the run
Updated files:
- SKILL.md: argument-hint, {auto_confirm} semantics, safety-check notes, edge-case table
- workflow-feature.md: step [4/6] gate follows the new bypass
- workflow-deploy.md: step [7/14] gate follows the new bypass, with
an explicit safety note that release tags are still irreversible
Version: 1.9.0 -> 1.10.0 (minor: new user-facing flag, no breakage)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Add a
--yes/-yflag to/df-merge-prthat skips the Confirmation Gate and all soft-warningAskUserQuestionprompts, while keeping every hard abort in place.Why
The Confirmation Gate is a blocking
AskUserQuestionround-trip before every merge. In scripted or repeat-ship workflows the caller already knows they want to merge, so the prompt is friction with no safety gain beyond what--adminand the hard aborts already provide. Users have reported this as the most-noticed stall in the whole skill.Behavior with
--yesSkipped (now auto-proceed with a warning line):
AskUserQuestion(§ Confirmation Gate)AskUserQuestion(safety-check fix(hooks): check for bun before showing devflow-engine setup instructions #4)AskUserQuestion(safety-check feat(df-merge-pr): add --yes flag to skip confirmation gate #6)Still fire (hard aborts —
--yesdoes not bypass):Files touched
skills/df-merge-pr/SKILL.md— argument-hint,{auto_confirm}semantics, safety-check notes, edge-case tableskills/df-merge-pr/references/workflow-feature.md— step [4/6] gate follows the new bypassskills/df-merge-pr/references/workflow-deploy.md— step [7/14] gate follows the new bypass, with an explicit safety note on tag irreversibility.claude-plugin/plugin.json—1.9.0→1.10.0CHANGELOG.md— new1.10.0sectionCompat
Backward-compatible: default behavior (no flag) is unchanged — Confirmation Gate fires as before. Only explicit
--yes/-yalters flow.Test
Manually validated by running
/df-merge-prwith and without--yeson a feature branch. With--yes: summary block prints + merge proceeds. Without: existing AskUserQuestion flow unchanged.