maestro-flow 0.5.42 → 0.5.43

package/.claude/commands/learn-investigate.md

@@ -1,7 +1,7 @@
 ---
 name: learn-investigate
 description: Investigate questions with hypothesis testing and evidence logging
-argument-hint: "<question> [--scope <path>] [--max-hypotheses N]"
+argument-hint: "<question> [--scope <path>] [--max-hypotheses N] [-y]"
 allowed-tools:
   - Read
   - Write
@@ -22,6 +22,7 @@ $ARGUMENTS — question text and optional flags.
 **Flags**:
 - `--scope <path>`: Restrict to files under this dir (default: entire project)
 - `--max-hypotheses N`: Max hypotheses before escalation (default: 3)
+- `-y`: Skip confirmation prompts for report/spec writes
 
 **Storage write**:
 - `.workflow/knowhow/KNW-investigate-{slug}/evidence.ndjson` — structured evidence (one JSON line per item)
@@ -57,11 +58,11 @@ S_PATTERN:
   → S_HYPOTHESIZE DO: match evidence against debug-notes.md + .workflow/specs/learnings.md patterns
 
 S_HYPOTHESIZE:
-  → S_CLI_EXPLORE WHEN: CLI tools enabled AND hypotheses non-trivial    DO: A_FORM_HYPOTHESES
-  → S_TEST        WHEN: no CLI tools OR trivial hypotheses              DO: A_FORM_HYPOTHESES
+  → S_CLI_EXPLORE WHEN: CLI tools enabled (at least one tool in cli-tools.json enabled) AND hypotheses non-trivial (require cross-file tracing or data-flow analysis)    DO: A_FORM_HYPOTHESES
+  → S_TEST        WHEN: no CLI tools OR trivial hypotheses (answerable by local Grep/Read)    DO: A_FORM_HYPOTHESES
 
 S_CLI_EXPLORE:
-  → S_TEST        DO: A_CLI_SUPPLEMENT (maestro delegate --role explore --mode analysis, run_in_background, STOP)
+  → S_TEST        DO: A_CLI_SUPPLEMENT (maestro delegate --to <first-enabled-tool> --mode analysis, run_in_background, STOP)
 
 S_TEST:
   → S_REPORT      WHEN: hypothesis confirmed                  DO: A_TEST_HYPOTHESIS
@@ -73,7 +74,8 @@ S_ESCALATE:
   → S_REPORT      WHEN: user selects "Escalate" or still stuck          DO: mark INCONCLUSIVE
 
 S_REPORT:
-  → END           DO: A_SYNTHESIZE_REPORT
+  → END           GATE: unless -y, AskUserQuestion showing report.md path and spec-entries to append — proceed only on confirm
+                  DO: A_SYNTHESIZE_REPORT
 
 </transitions>
 
@@ -108,7 +110,7 @@ Rank by plausibility (evidence strength). Write to understanding.md:
 maestro delegate "PURPOSE: Gather evidence for hypotheses
 TASK: Trace call chains and data flows per hypothesis | Find corroborating/contradicting patterns
 EXPECTED: JSON [{hypothesis_rank, evidence: [{file, line, supports: bool, explanation}]}]
-" --role explore --mode analysis
+" --to <first-enabled-tool> --mode analysis
 ```
 Run_in_background, STOP, wait. On callback: append to evidence.ndjson.
 

package/.claude/commands/learn-second-opinion.md

@@ -1,7 +1,7 @@
 ---
 name: learn-second-opinion
 description: Get alternative perspectives — review, challenge, or consult
-argument-hint: "<target> [--mode review|challenge|consult]"
+argument-hint: "<target> [--mode review|challenge|consult] [-y]"
 allowed-tools:
   - Read
   - Write
@@ -27,7 +27,9 @@ $ARGUMENTS — target and optional mode flag.
 | `HEAD` / `staged` | `git diff HEAD` / `git diff --staged` |
 | Phase number | Resolve via state.json.artifacts[] → plan.json |
 
-**Flags**: `--mode review|challenge|consult` (default: review)
+**Flags**:
+- `--mode review|challenge|consult` (default: review)
+- `-y`: Skip confirmation prompts for knowhow/spec writes
 
 **Pre-load** (optional): `Skill("spec-load")` for conventions + `maestro search "<target topic>"` for related entries.
 
@@ -62,7 +64,8 @@ S_SYNTHESIZE:
   → S_PERSIST     DO: merge perspectives → agreements, disagreements, verdict, top 3 recommendations
 
 S_PERSIST:
-  → END           DO: write KNW-opinion + append <spec-entry> blocks to .workflow/specs/learnings.md
+  → END           GATE: unless -y, AskUserQuestion showing files to write and spec-entries to append — proceed only on confirm
+                  DO: write KNW-opinion + append <spec-entry> blocks to .workflow/specs/learnings.md
 
 </transitions>
 

package/.claude/commands/maestro-amend.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-amend
 description: Generate overlays to fix workflow command deficiencies
-argument-hint: "[description] [--from-verify <dir>] [--from-review <dir>] [--from-session <id>] [--from-issues ISS-xxx,...] [--scan] [--dry-run]"
+argument-hint: "[description] [--from-verify <dir>] [--from-review <dir>] [--from-session <id>] [--from-issues ISS-xxx,...] [--scan] [--dry-run] [-y]"
 allowed-tools:
   - Read
   - Write

package/.claude/commands/maestro-analyze.md

@@ -45,7 +45,7 @@ $ARGUMENTS -- phase number for micro mode, topic text for macro/adhoc mode, no a
 |------|--------|---------|
 | `-y` / `--yes` | Auto mode — skip interactive scoping, use recommended defaults, auto-deepen | false |
 | `-c` / `--continue` | Resume from existing session (auto-detect session folder + discussion.md) | false |
-| `-q` / `--quick` | Quick mode — skip exploration + scoring, go straight to decision extraction (context.md only) | false |
+| `-q` / `--quick` | Quick mode — skip exploration + scoring, go straight to decision extraction (context.md only). **Precedence**: when combined with `-c`, the resumed session preserves its original mode (full or quick); `-q` does NOT override a resumed full session to quick mode. | false |
 | `--from <source>` | Load upstream context package (grill:ID, brainstorm:ID, blueprint:BLP-xxx, @file, or path) | — |
 | `--gaps [ISS-ID]` | Issue root cause analysis mode. If ISS-ID provided, analyze single issue. If omitted, analyze all open/registered issues from issues.jsonl | — |
 

package/.claude/commands/maestro-blueprint.md

@@ -159,7 +159,7 @@ Status verdicts:
 - [ ] Readiness gate: Pass (>=80%) or Review (>=60%) with documented caveats
 - [ ] Artifact registered in state.json (type=blueprint)
 - [ ] context-package.json generated for downstream consumption
-- [ ] On gate Pass/Review: session sealed via finish-work (archive.json + optional spec/knowhow extraction). On Fail: skip — session stays active, excluded from wiki search.
+- [ ] On gate Pass/Review: session sealed via finish-work (finish-work.md includes AskUserQuestion confirmation before state.json artifact registration and optional spec/knowhow extraction). On Fail: skip — session stays active, excluded from wiki search.
 </success_criteria>
 
 <on_complete>

package/.claude/commands/maestro-brainstorm.md

@@ -1,10 +1,11 @@
 ---
 name: maestro-brainstorm
 description: Use when exploring ideas, evaluating approaches, or needing multi-perspective analysis before implementation
-argument-hint: "[topic|role-name] [--yes] [--count N] [--session ID] [--update] [--skip-questions] [--include-questions] [--style-skill PKG]"
+argument-hint: "[topic|role-name] [--yes] [--count N] [--session ID] [--update] [--skip-questions] [--include-questions] [--style-skill PKG] [--review-only] [--from <source>]"
 allowed-tools:
   - Read
   - Write
+  - Edit
   - Bash
   - Glob
   - Grep
@@ -51,6 +52,8 @@ $ARGUMENTS -- topic text for auto mode, or role name for single role mode.
 | `--skip-questions` | Skip context gathering questions | false |
 | `--include-questions` | Force context gathering even if analysis exists | false |
 | `--style-skill PKG` | Style package for ui-designer role | — |
+| `--review-only` | Run cross-role review on existing analyses without re-running role analysis | false |
+| `--from <source>` | Load upstream context package (grill:ID, blueprint:ID, @file, or path) | — |
 
 ### Pre-load specs
 1. **Architecture specs**: Run `maestro load --type spec --category arch` to load architecture constraints. Use as context for multi-role analysis — ensures roles respect documented decisions.

package/.claude/commands/maestro-collab.md

@@ -43,6 +43,7 @@ S_CONFIRM         — 展示计划、用户确认（-y 跳过）              PE
 S_FANOUT          — 构建 prompt、并行启动 delegate、STOP       PERSIST: —
 S_COLLECT         — 回调到达、收集结果                          PERSIST: per-tool outputs
 S_CROSS_VERIFY    — 分类发现（共识/冲突/独有）                  PERSIST: —
+S_BOUNDARY_GRILL  — 边界冲突检测与解决                          PERSIST: —
 S_SYNTHESIZE      — 解决冲突、生成 3 个输出文件                 PERSIST: outputs
 S_REGISTER        — 注册 CLB artifact                          PERSIST: state.json
 S_REPORT          — 显示摘要 + next-step routing               PERSIST: —
@@ -84,7 +85,9 @@ S_SYNTHESIZE:
   → S_REGISTER      DO: A_GENERATE_OUTPUTS
 
 S_REGISTER:
-  → S_REPORT        DO: append CLB artifact to state.json (type: collab, scope: adhoc)
+  → S_REPORT        WHEN: user confirms or -y    DO: append CLB artifact to state.json (type: collab, scope: adhoc)
+  → S_REPORT        WHEN: user declines           DO: skip artifact registration, proceed to report
+  GUARD: AskUserQuestion "Register collab artifact to state.json?" (skipped if -y)
 
 S_REPORT:
   → END             DO: display summary (requirement, tools, consensus_level, per-tool status, artifact id, output dir)
@@ -96,8 +99,9 @@ S_REPORT:
 ### A_DISCOVER_TOOLS
 
 ```
-Bash("maestro tools list --json 2>/dev/null || cat ~/.maestro/cli-tools.json")
+Bash("maestro tools list --json 2>$null || cat ~/.maestro/cli-tools.json")
 ```
+**Note:** Shell commands MUST use the Bash tool (not PowerShell). Use POSIX syntax within Bash calls.
 Filter: enabled == true. If --mode write: exclude type == "api-endpoint".
 Auto-select (no --tools): first 3 eligible in config order.
 

package/.claude/commands/maestro-companion.md

@@ -413,7 +413,10 @@ Collect task outcome data:
 
 ```bash
 # Detect files changed since companion doc creation
-git diff --name-only --since="{companion_created_timestamp}"
+# Use git log --since for time-based filtering, then git diff for the range
+git log --since="{companion_created_timestamp}" --format="%H" -1  # get oldest commit in range
+git diff --name-only {oldest_commit}..HEAD                         # diff from that commit to HEAD
+# Fallback if no commits since timestamp: git diff --name-only HEAD
 ```
 
 Update frontmatter:

package/.claude/commands/maestro-composer.md

@@ -124,7 +124,7 @@ Read deferred `node-catalog.md` (fallback to built-in mapping):
 | testing | `quality-test` |
 | review | `quality-review` |
 | brainstorm | `maestro-brainstorm` |
-| analysis | `maestro delegate --role analyze` |
+| analysis | `maestro delegate --to <tool> --mode analysis` |
 | verify | `maestro-execute` |
 | refactor | `quality-refactor` |
 | debug | `quality-debug` |
@@ -154,7 +154,9 @@ Write `nodes.json`. Display resolved node list.
 
 Read deferred `template-schema.md` (fallback to built-in structure).
 Assemble template JSON: template_id, name, nodes, edges, checkpoints, context_schema, execution_mode.
-Write to `~/.maestro/templates/workflows/<slug>.json`. Update index.json.
+**Confirmation gate**: AskUserQuestion showing template summary (ID, node count, variables) before writing.
+- User confirms → write to `~/.maestro/templates/workflows/<slug>.json` and update index.json.
+- User cancels → save draft, do not write template or index.
 Display: path, ID, node count, variables, execute/edit commands. Clean up draft dir.
 
 </actions>

package/.claude/commands/maestro-execute.md

@@ -86,8 +86,14 @@ Follow '~/.maestro/workflows/execute.md' completely.
 - BLOCKED if missing: summary file absent or task status not updated — halt wave progression until evidence is recorded.
 - Do NOT silently skip failed tasks — mark as blocked with reason.
 
+**GATE 2.5: Wave Failure Handling**
+- IF all tasks in a wave failed: halt wave progression, report E005 with per-task failure reasons. Do NOT proceed to next wave — downstream waves depend on current wave outputs.
+- IF cascading failure (wave N fails → wave N+1 has unmet dependencies): mark all dependent tasks in subsequent waves as `blocked` with reason `"upstream_wave_failed"`. Skip blocked waves and proceed to completion with partial results.
+- `-y` mode: auto-skip blocked waves without prompting, log warning W002.
+- Non `-y` mode: `AskUserQuestion` with options [retry wave / skip and continue / abort execution].
+
 **GATE 3: All Tasks → Completion**
-- REQUIRED: All waves executed in dependency order.
+- REQUIRED: All waves executed in dependency order (or explicitly skipped via Gate 2.5).
 - REQUIRED: EXC artifact registered in state.json.
 - BLOCKED if missing: waves incomplete or EXC artifact not registered — do not report execution complete.
 
@@ -100,27 +106,37 @@ Task summaries MUST include:
 
 ### Post-task Knowledge Inquiry
 
-After each task completion, check triggers:
+After each task completion, extract structured fields from the task summary, then check triggers:
+
+**Structured extraction** (from `.summaries/TASK-{NNN}-summary.md`):
+- `deviations[]` — explicit plan deviations (look for "deviated", "changed approach", "instead of", "unlike plan")
+- `design_rationale[]` — explicit design decisions (look for "chose X because", "decided to", "trade-off")
+- `retry_count` — from `.task/TASK-{NNN}.json` status history
 
 | Condition | Ask | Route |
 |-----------|-----|-------|
-| Summary mentions approach change / plan deviation | "Record as arch constraint?" | spec-add arch |
-| retry_count >= 2 | "Document fix pattern?" | spec-add debug |
-| Summary contains design rationale ("chose X because") | "Record as knowhow?" | spec-add learning |
+| `deviations[]` is non-empty | "Record as arch constraint?" | spec-add arch |
+| `retry_count >= 2` | "Document fix pattern?" | spec-add debug |
+| `design_rationale[]` is non-empty | "Record as knowhow?" | spec-add learning |
 
 On confirm → `Skill("spec-add", "<category> <content> --description \"<summary>\"")`.
 Include `--description` with a one-line summary for search result display.
 
 ### Issue Status Sync
 
-On each task completion, if `task.issue_id` exists, sync status back to the issue in `.workflow/issues/issues.jsonl`:
+On each task completion, if `task.issue_id` exists, sync status back to the issue in `.workflow/issues/issues.jsonl`.
+
+**Confirmation gate**: Before writing to issues.jsonl, show the proposed status change and ask for confirmation — unless `-y` is active, in which case auto-approve.
 
 ```
 For each completed/failed TASK with issue_id:
   Read issue from issues.jsonl by issue_id
   Collect all task_refs[] statuses for that issue:
-    all task_refs completed → issue.status = "resolved"
-    any task_ref failed    → issue.status = "in_progress"
+    all task_refs completed → proposed issue.status = "resolved"
+    any task_ref failed    → proposed issue.status = "in_progress"
+  IF NOT auto_mode (-y):
+    AskUserQuestion: "Update issue {issue_id} status to {proposed_status}?" [Yes / Skip]
+    IF Skip → continue to next task without writing
   Append history entry: { action: "executed", at: <ISO>, by: "maestro-execute", summary: "TASK-{NNN} {status}" }
   Write updated issue back to issues.jsonl
 ```
@@ -169,7 +185,9 @@ Status verdicts:
 | E002 | error | Plan directory not found | Check --dir path |
 | E003 | error | plan.json not found in directory | Verify plan.json exists, run maestro-plan first |
 | E004 | error | No pending tasks, all tasks already completed | Check task statuses, reset if needed |
+| E005 | error | All tasks in wave failed — wave progression halted | Review per-task failure reasons; retry wave or abort |
 | W001 | warning | Executor completed with partial failures | Check task dependencies, retry failed wave |
+| W002 | warning | Cascading wave failure — downstream waves auto-blocked | Review blocked tasks; re-run after fixing upstream failures |
 </error_codes>
 
 <success_criteria>

package/.claude/commands/maestro-fork.md

@@ -53,9 +53,10 @@ Fork and sync algorithm steps are defined in workflow `fork.md`.
 - BLOCKED if missing: worktree creation failed or shared files not copied — do not proceed to artifact scoping.
 
 **GATE 3: Artifact Copy → Completion**
-- REQUIRED: `worktree-scope.json` written with milestone scope.
-- REQUIRED: Scoped `state.json` written (only this milestone's artifacts).
-- REQUIRED: `worktrees.json` registry updated in main worktree.
+- REQUIRED: AskUserQuestion confirmation before registry writes — show milestone scope, worktree path, and state entries to be written. User must confirm or abort.
+- REQUIRED: `worktree-scope.json` written with milestone scope (after confirmation).
+- REQUIRED: Scoped `state.json` written (only this milestone's artifacts) (after confirmation).
+- REQUIRED: `worktrees.json` registry updated in main worktree (after confirmation).
 - BLOCKED if missing: scope marker, scoped state, or registry update absent — worktree is unusable without these.
 
 **Sync mode:**

package/.claude/commands/maestro-grill.md

@@ -151,7 +151,7 @@ Status verdicts:
 - [ ] Risk register captures all unresolved tensions
 - [ ] `context-package.json` generated with schema "context-package/1.0"
 - [ ] Artifact registered in state.json (type=grill, id=GRL-xxx)
-- [ ] Session sealed via finish-work
+- [ ] Session sealed via finish-work (finish-work.md includes AskUserQuestion confirmation before state.json artifact registration and optional spec/knowhow extraction)
 </success_criteria>
 
 <on_complete>

package/.claude/commands/maestro-guard.md

@@ -64,14 +64,14 @@ Read `.workflow/config.json`. If file missing, initialize with empty guard secti
 
 **`allow <path>`:**
 - Normalize path to forward slashes, ensure trailing slash for directories
-- If `guard.mode` is `deny`, switch to `allow` and clear paths with warning
+- If `guard.mode` is `deny`, AskUserQuestion: "Switching from deny to allow mode will clear existing paths ({N} paths). Continue?" — abort if user declines.
 - Add path to `guard.paths` (deduplicate)
 - Set `guard.enabled = true` if not already
 - Write config
 
 **`deny <path>`:**
 - Normalize path to forward slashes, ensure trailing slash for directories
-- If `guard.mode` is `allow`, switch to `deny` and clear paths with warning
+- If `guard.mode` is `allow`, AskUserQuestion: "Switching from allow to deny mode will clear existing paths ({N} paths). Continue?" — abort if user declines.
 - Set `guard.mode = "deny"`
 - Add path to `guard.paths` (deduplicate)
 - Set `guard.enabled = true` if not already (symmetric with `allow`: adding a deny path auto-enables the guard)

package/.claude/commands/maestro-impeccable.md

@@ -202,7 +202,8 @@ Before reading any command workflow:
    - `↺` marks refine loop with max iteration count
    - Conditional steps show trigger condition
    - Skipped conditional steps marked `(skipped)`
-3. Create session: `.workflow/.maestro/ui-craft-{YYYYMMDD-HHmmss}/status.json`
+3. **Confirm chain session**: AskUserQuestion "Create chain session for '{chain_type}' targeting '{target}'?" — proceed only if user confirms. On decline, abort chain.
+   Create session: `.workflow/.maestro/ui-craft-{YYYYMMDD-HHmmss}/status.json`
    ```json
    { "chain_type": "...", "target": "...", "steps": [...], "current_step": 0,
      "gate_history": [], "loop_count": 0, "status": "running" }

package/.claude/commands/maestro-init.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-init
 description: Initialize project with auto state detection
-argument-hint: "[-y] [--from <source>]"
+argument-hint: "[-y] [--from <source>] [--from-brainstorm SESSION-ID]"
 allowed-tools:
   - Read
   - Write

package/.claude/commands/maestro-merge.md

@@ -52,7 +52,18 @@ Follow '~/.maestro/workflows/merge.md' completely.
 <completion>
 ### Knowledge inquiry
 
-After successful merge, ask user once: "Record milestone learnings?" If yes, persist via `Skill("spec-add", "learning \"<title>\" \"<insight>\" --keywords <kw1>,<kw2> --description \"<summary>\"")`.
+After successful merge, use `AskUserQuestion` to confirm knowledge persistence:
+
+```
+question: "Merge 完成。是否记录里程碑经验教训？"
+options:
+  - label: "记录经验"
+    description: "通过 spec-add 持久化此次里程碑的关键洞察"
+  - label: "跳过"
+    description: "不记录，直接完成"
+```
+
+User selects "记录经验" → prompt for title/insight, then persist via `Skill("spec-add", "learning \"<title>\" \"<insight>\" --keywords <kw1>,<kw2> --description \"<summary>\"")`. User selects "跳过" → proceed to next-step routing.
 
 ### Next-step routing
 

package/.claude/commands/maestro-milestone-audit.md

@@ -23,6 +23,7 @@ Produces audit-report.md with PASS/FAIL verdict.
 
 <context>
 Milestone: $ARGUMENTS (optional -- defaults to current_milestone from state.json).
+If $ARGUMENTS is empty AND current_milestone is null → raise E001 with message "No milestone specified and no current_milestone set in state.json. Provide a milestone identifier as argument."
 
 **Requires:** All phases in the milestone should have completed execute artifacts.
 

package/.claude/commands/maestro-milestone-complete.md

@@ -27,6 +27,7 @@ Requires audit PASS; produces milestone archive and learnings.
 
 <context>
 Milestone: $ARGUMENTS (optional -- defaults to current_milestone from state.json).
+If $ARGUMENTS is empty AND current_milestone is null → raise E001 with message "No milestone specified and no current_milestone set in state.json. Provide a milestone identifier as argument."
 
 **Requires:** `/maestro-milestone-audit` should have passed.
 
@@ -59,7 +60,8 @@ Archive flow steps (validation, directory archival, artifact history, knowhow ex
 - BLOCKED if missing: knowhow extraction not attempted or project.md not updated — state advancement requires completed knowledge capture.
 
 **GATE 4: State Advancement → Completion**
-- REQUIRED: state.json updated — next milestone as current (standard) or current_milestone=null (adhoc).
+- REQUIRED: AskUserQuestion confirmation before state.json advancement — show current milestone, next milestone (or null for adhoc), and artifacts to clear. User must confirm or abort.
+- REQUIRED: state.json updated — next milestone as current (standard) or current_milestone=null (adhoc) (after confirmation).
 - REQUIRED: Roadmap snapshot saved (standard only).
 - BLOCKED if missing: state.json not advanced — project remains stuck on completed milestone.
 
@@ -73,9 +75,12 @@ After knowhow extraction (step 4), scan `learnings.md` for promotion candidates:
 2. **Convention drift detection**: Compare executed task summaries against `coding-conventions.md` and `architecture-constraints.md`:
    → Ask: "Were any established conventions bypassed during this milestone? Should conventions be updated?"
 
-3. **Wiki island check**: Auto-trigger `manage-wiki connect --fix` to link newly extracted knowledge.
+3. **Wiki island check**: AskUserQuestion "Run wiki-connect --fix to link newly extracted knowledge?" — execute `manage-wiki connect --fix` only if user confirms.
 
-If user confirms promotion, invoke `Skill({ skill: "spec-add", args: "<category> <content>" })` with promoted content, preserving original date and source traceability.
+Each promotion candidate requires explicit user confirmation via AskUserQuestion before writing:
+- **"Promote"** → invoke `Skill({ skill: "spec-add", args: "<category> <content>" })` with promoted content, preserving original date and source traceability.
+- **"Skip"** → do not promote this candidate; proceed to next.
+- **"Skip all"** → skip remaining candidates.
 
 **Adhoc milestone (D-008):** When completing an adhoc milestone, skip roadmap snapshot and do not advance to next milestone. Set `current_milestone = null`, `status = "idle"`. Adhoc milestones are self-contained — no successor in roadmap chain.
 </execution>

package/.claude/commands/maestro-milestone-release.md

@@ -70,10 +70,13 @@ Follow '~/.maestro/workflows/milestone-release.md' completely.
 
 **GATE 3: Changelog → Tag/Push**
 - REQUIRED: CHANGELOG.md entry written with milestone summary + grouped changes.
-- REQUIRED: Release commit created with conventional message.
+- REQUIRED: AskUserQuestion confirmation before creating release commit — show version, changelog diff, and files to be committed. User must confirm or abort.
+- REQUIRED: Release commit created with conventional message (after confirmation).
 
-**GATE 4: Tag → Completion**
-- REQUIRED: Annotated git tag created (unless --no-tag).
+**GATE 4: Tag → Push → Completion**
+- REQUIRED: AskUserQuestion confirmation before git tag creation — show tag name and annotation (unless --no-tag). User must confirm or abort.
+- REQUIRED: Annotated git tag created (unless --no-tag) (after confirmation).
+- REQUIRED: AskUserQuestion confirmation before git push — show remote and refs to push (unless --no-push). User must confirm or abort.
 - REQUIRED: state.json updated with last_release_version + last_release_at.
 
 For `--dry-run`: print computed version, changelog diff, and tag name without side effects.
@@ -132,5 +135,6 @@ Status verdicts:
 - [ ] Release commit created with conventional message
 - [ ] Annotated git tag created (unless `--no-tag`)
 - [ ] Commit + tag pushed to remote (unless `--no-push` or push failed → W002)
-- [ ] state.json updated with last_release_version + last_release_at timestamp
+- [ ] User confirmed before each destructive git operation (commit, tag, push) via AskUserQuestion
+- [ ] state.json updated with last_release_version + last_release_at timestamp (after AskUserQuestion confirmation)
 </success_criteria>

package/.claude/commands/maestro-overlay.md

@@ -134,6 +134,15 @@ Handoff rules:
 - Support runtime variable placeholders: `{phase}`, `{description}`, `{session_id}`
 - Keep handoff block under 10 lines of markdown
 
+### 3.5. Content approval
+
+Display the full overlay JSON to the user. AskUserQuestion:
+- **"Approve & install"** — proceed to installation
+- **"Edit"** — user provides corrections, re-draft
+- **"Cancel"** — discard overlay, do not write
+
+Only write the overlay JSON file to `~/.maestro/overlays/<slug>.json` after user approval.
+
 ### 4. Install via `maestro overlay add`
 
 Run:

package/.claude/commands/maestro-plan.md

@@ -38,6 +38,7 @@ Scope routing, base flags (`--collab`, `--spec`, `-y`, `--gaps`, `--dir`), outpu
   - `analyze:ANL-xxx` → CONTEXT_DIR = artifact path, scope = "standalone"
   - `blueprint:BLP-xxx` → CONTEXT_DIR = blueprint path, scope = "standalone"
   - `@file` or `path/` → load context-package.json from path
+- `--tdd` — Enable TDD mode: generate test-first task structure (Red-Green-Refactor). See workflow `plan.md` § TDD Mode for task generation rules.
 - `--revise [instructions]` -- See workflow plan.md § Revise Mode
 - `--check <plan-dir>` -- See workflow plan.md § Check Mode
 

package/.claude/commands/maestro-player.md

@@ -35,7 +35,7 @@ $ARGUMENTS — template slug/path, or flags.
 | skill | `Skill(skill, args)` | sync |
 | command | `Skill(skill, args)` | sync |
 | cli | `maestro delegate --to tool --mode mode` via `Bash(run_in_background: true)` | async, STOP + wait |
-| agent | `Agent(subagent_type, prompt)` | configurable |
+| agent | `Agent(subagent_type, prompt)` — valid subagent_type: `"task"` (default), `"research"`, `"code"`. Unknown type falls back to `"task"`. | configurable |
 | checkpoint | State save + optional user pause | — |
 
 **Runtime reference resolution** in args_template:
@@ -105,7 +105,7 @@ S_EXEC_LOOP:
   → END           WHEN: checkpoint pause                    DO: set status=paused, display resume command
   → END           WHEN: abort chosen                        DO: set status=aborted, save progress
   GUARD: cli nodes → Bash(run_in_background: true) + STOP, wait for callback
-  GUARD: on failure → on_fail: skip (log, advance) | retry (once) | abort (AskUserQuestion: Retry/Skip/Abort)
+  GUARD: on failure → on_fail: skip (log, advance) | retry (once) | abort (AskUserQuestion: Retry/Skip/Abort). Default on_fail when not specified: `abort` (prompt user via AskUserQuestion).
   GUARD: after step 3+ → display context hint "可随时 /maestro-player -c 恢复"
 
 S_COMPLETE:

package/.claude/commands/maestro-quick.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-quick
 description: Quick task execution, skip optional agents
-argument-hint: "[description] [--full] [--discuss]"
+argument-hint: "[description] [--full] [--discuss] [-y]"
 allowed-tools:
   - Read
   - Write
@@ -15,6 +15,7 @@ allowed-tools:
 <purpose>
 Execute small, ad-hoc tasks with workflow guarantees (atomic commits, state tracking) via a shortened pipeline.
 Flags --discuss and --full enable additional pipeline stages.
+**Implicit write**: state.json scratch task entry is written automatically as part of workflow tracking (no confirmation gate).
 </purpose>
 
 <required_reading>
@@ -27,6 +28,7 @@ $ARGUMENTS
 Parse for:
 - `--full` flag -- Enables plan-checking (max 2 iterations) and post-execution verification
 - `--discuss` flag -- Decision extraction before planning (gray areas, Locked/Free/Deferred classification)
+- `-y` / `--yes` flag -- Auto mode: skip commit confirmation, auto-approve state writes
 - Remaining text as task description
 
 ### Pre-load context
@@ -78,6 +80,6 @@ Task summaries MUST include concrete evidence of completion (files changed, test
 - [ ] Scratch task directory created under .workflow/scratch/
 - [ ] plan.json written with task definitions
 - [ ] All tasks executed with summaries written
-- [ ] state.json updated with scratch task entry
-- [ ] Commit created with task changes
+- [ ] state.json updated with scratch task entry (implicit — part of workflow tracking, no confirmation needed)
+- [ ] Commit created with task changes: stage ONLY files modified by the task (from `.summaries/TASK-*-summary.md` "Files modified" list); confirm with `AskUserQuestion` showing staged files and proposed commit message — unless `-y` is active, in which case auto-commit
 </success_criteria>