maestro-flow 0.4.14 → 0.4.15

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

@@ -17,7 +17,7 @@ Closed-loop decision engine for the maestro workflow lifecycle.
 Reads project state → infers position → builds adaptive chain → delegates execution.
 
 Entry points:
-- **`/maestro-ralph "intent"`** — New session: infer → decompose → build → (decomposition → emit /goal prompt, STOP；否则 dispatch ralph-execute)
+- **`/maestro-ralph "intent"`** — New session: infer → decompose → build → emit /goal prompt（如有 decomposition）→ dispatch ralph-execute
 - **`/maestro-ralph continue`** — Wrapper; dispatches to ralph-execute（首选直接 `/maestro-ralph-execute` 推进 step）
 - **`/maestro-ralph status`** — Display session progress
 
@@ -25,10 +25,9 @@ Entry points:
 
 Initial decomposition (S_DECOMPOSE): boundary-clarified via ≤3 questions for broad intents (重构/全面/迁移/重写). 写入 status.json 的 `boundary_contract` / `execution_criteria` / `task_decomposition`，附 `/goal` prompt。
 
-Node types:
-- **internal** (default): ralph-execute `Read({command_path})` 命令 .md，按内容内联执行
-- **decision**: 回 ralph 评估
-- **external**: 仅在显式声明时使用（`maestro delegate --to claude`）
+Step kinds:
+- **执行 step**: ralph-execute `Read({command_path})` 命令 .md，按内容内联执行
+- **decision step**: `step.decision` 字段非空；回 ralph 评估（CLI 只读分析）
 
 Key difference from maestro coordinator:
 - maestro: static chain → one-time selection → runs all steps
@@ -45,8 +44,8 @@ Mutual invocation with `/maestro-ralph-execute` forms a self-perpetuating work l
                               │           writes status.json
                               │           emits /goal prompt
                               ▼
-                       ralph-execute  ◀─┐ internal → Read(command_path) inline
-                              │         │ decision → Skill("maestro-ralph")
+                       ralph-execute  ◀─┐ 执行 step → Read(command_path) inline
+                              │         │ decision step → Skill("maestro-ralph")
                               └─────────┘ writes step.completion_confirmed
                        loop until all completion_confirmed | paused
 ```
@@ -70,14 +69,14 @@ Remaining     → intent
 
 <invariants>
 1. **Ralph never executes steps** — only creates sessions and evaluates decisions
-2. **Handoff via Skill("maestro-ralph-execute")** — 仅当 session 无 `task_decomposition` 时在创建后自动 handoff；decomposition 路径 STOP 等用户输入。decision 评估后始终 handoff
+2. **Handoff via Skill("maestro-ralph-execute")** — 创建 session 后始终自动 handoff；decision 评估后始终 handoff
 3. **Decision delegates read-only** — `maestro delegate --role analyze --mode analysis`
-4. **Default type = internal** — `external` 仅显式标注时出现，build 不默认生成
+4. **执行 step 通过 Read 命令 .md 内联执行**
 5. **status.json 是唯一真源** — 不生成 markdown 清单或侧文件
 6. **每个 step 必须 `completion_confirmed: true`** — 基于 `--- COMPLETION STATUS ---` 的 `STATUS: DONE`；缺失则视为未完成
 7. **command_path 在 A_BUILD_STEPS 解析** — 全局优先 `~/.claude/commands/{name}.md`，fallback 项目 `.claude/commands/{name}.md`，写入 status.json
-8. **Internal step 加载契约** — ralph-execute 读 `command_path` 后，必须解析并加载该命令 `<required_reading>` 引用的所有文件（"入口 + workflow"形式的核心），并把 `<deferred_reading>` 路径记录到 `step.deferred_reads`；加载完成后输出 `✓ skill {name} 加载完成`。ralph 在 build 阶段只解析路径，不读 .md 内容
-9. **Decomposition is outcome-oriented** — sub-goals 为可观测交付，禁止 lifecycle 复刻；`/goal` 用户绑定，ralph 只发提示词后 STOP，等用户输入
+8. **执行 step 加载契约** — ralph-execute 读 `command_path` 后，必须解析并加载该命令 `<required_reading>` 引用的所有文件（"入口 + workflow"形式的核心），并把 `<deferred_reading>` 路径记录到 `step.deferred_reads`；加载完成后输出 `✓ skill {name} 加载完成`。ralph 在 build 阶段只解析路径，不读 .md 内容
+9. **Decomposition is outcome-oriented** — sub-goals 为可观测交付，禁止 lifecycle 复刻；`/goal` 用户绑定，ralph 输出提示词后继续 handoff，用户可在执行过程中随时输入 `/goal`
 10. **planning_mode governs arg granularity** — `unified` → skill args 无 `{phase}`；`independent` → 含 `{phase}`
 11. **task_decomposition 驱动 steps[] 动态生长** — `post-goal-audit` 按 unmet 子目标插入 scoped mini-loop；字段可选/累加，既有字段不删不改
 </invariants>
@@ -149,9 +148,8 @@ S_BUILD_CHAIN:
   → S_CREATE_SESSION DO: A_BUILD_STEPS
 
 S_CREATE_SESSION:
-  → END             WHEN: task_decomposition present        DO: A_CREATE_SESSION (emits Goal Prompt → STOP，等用户输入 /goal 后手动 /maestro-ralph-execute)
-  → S_CONFIRM       WHEN: not auto_confirm AND no decomposition DO: A_CREATE_SESSION
-  → S_DISPATCH      WHEN: auto_confirm AND no decomposition  DO: A_CREATE_SESSION
+  → S_CONFIRM       WHEN: not auto_confirm                   DO: A_CREATE_SESSION
+  → S_DISPATCH      WHEN: auto_confirm                       DO: A_CREATE_SESSION
 
 S_CONFIRM:
   → S_DISPATCH      WHEN: user selects "Proceed"
@@ -161,7 +159,7 @@ S_CONFIRM:
 S_DISPATCH:
   → END             DO: Skill({ skill: "maestro-ralph-execute" })
 
-S_DECISION_EVAL:
+S_DECISION_EVAL: (decision 节点 == `step.decision` 非空，下述 gate 名取自该字段)
   → S_APPLY_VERDICT WHEN: quality-gate (post-verify, post-business-test, post-review, post-test)
                      DO: A_DELEGATE_EVALUATE
   → S_APPLY_VERDICT WHEN: goal-gate (post-goal-audit)
@@ -200,7 +198,7 @@ S_FALLBACK:
 
 1. Find latest ralph session (by created_at)
 2. Display: Session, Status, Position, Progress, Current step
-3. List steps: [✓] completion_confirmed, [▸] current, [ ] pending, [◆] decision；附 `command_scope`(global/project) + `command_path`
+3. List steps: [✓] completion_confirmed, [▸] current, [ ] pending, [◆] decision（`step.decision` 非空）；执行 step 附 `command_scope`(global/project) + `command_path`
 4. If `task_decomposition` present (absent → skip):
    ```
    Sub-goals  ({done}/{total})    source: {session_dir}/status.json#/task_decomposition
@@ -380,24 +378,26 @@ narrow → derive defaults from intent + codebase, skip questions.
 
 Generate steps from `session.lifecycle_position` to `milestone-complete`.
 
-| Stage | Skill (independent) | Skill (unified) | Type | Decision after | quality_mode |
-|-------|---------------------|-----------------|------|----------------|--------------|
-| brainstorm | `maestro-brainstorm "{intent}"` | *(same)* | internal | — | all |
-| blueprint | `maestro-blueprint "{intent}"` | *(same)* | internal | — | all |
-| init | `maestro-init` | *(same)* | internal | — | all |
-| analyze-macro | `maestro-analyze "{intent}"` | *(same)* | internal | `post-analyze-scope` | all |
-| roadmap | `maestro-roadmap --from analyze:{analyze_macro_id}` | *(same)* | internal | — | all |
-| analyze | `maestro-analyze {phase}` | `maestro-analyze` | internal | — | all |
-| plan | `maestro-plan {phase}` *(scope=phase)* / `maestro-plan --from analyze:{analyze_macro_id}` *(scope=standalone)* / `maestro-plan --from blueprint:{blueprint_id}` *(scope=standalone)* | `maestro-plan` | internal | — | all |
-| execute | `maestro-execute {phase}` | `maestro-execute` | internal | — | all |
-| verify | `maestro-verify {phase}` | `maestro-verify` | internal | `post-verify` | all |
-| business-test | `quality-auto-test {phase}` | `quality-auto-test` | internal | `post-business-test` | full only |
-| review | `quality-review {phase}` | `quality-review` | internal | `post-review` | all (quick: append `--tier quick`) |
-| test-gen | `quality-auto-test {phase}` | `quality-auto-test` | internal | — | full / standard if coverage<80% |
-| test | `quality-test {phase}` | `quality-test` | internal | `post-test` | full, standard |
-| milestone-audit | `maestro-milestone-audit` | *(same)* | internal | — | all |
-| goal-audit | *(decision-only)* | *(same)* | decision | `post-goal-audit` | all (only if decomposed) |
-| milestone-complete | `maestro-milestone-complete` | *(same)* | internal | `post-milestone` | all |
+| Stage | Skill (independent) | Skill (unified) | Decision after | quality_mode |
+|-------|---------------------|-----------------|----------------|--------------|
+| brainstorm | `maestro-brainstorm "{intent}"` | *(same)* | — | all |
+| blueprint | `maestro-blueprint "{intent}"` | *(same)* | — | all |
+| init | `maestro-init` | *(same)* | — | all |
+| analyze-macro | `maestro-analyze "{intent}"` | *(same)* | `post-analyze-scope` | all |
+| roadmap | `maestro-roadmap --from analyze:{analyze_macro_id}` | *(same)* | — | all |
+| analyze | `maestro-analyze {phase}` | `maestro-analyze` | — | all |
+| plan | `maestro-plan {phase}` *(scope=phase)* / `maestro-plan --from analyze:{analyze_macro_id}` *(scope=standalone)* / `maestro-plan --from blueprint:{blueprint_id}` *(scope=standalone)* | `maestro-plan` | — | all |
+| execute | `maestro-execute {phase}` | `maestro-execute` | — | all |
+| verify | `maestro-verify {phase}` | `maestro-verify` | `post-verify` | all |
+| business-test | `quality-auto-test {phase}` | `quality-auto-test` | `post-business-test` | full only |
+| review | `quality-review {phase}` | `quality-review` | `post-review` | all (quick: append `--tier quick`) |
+| test-gen | `quality-auto-test {phase}` | `quality-auto-test` | — | full / standard if coverage<80% |
+| test | `quality-test {phase}` | `quality-test` | `post-test` | full, standard |
+| milestone-audit | `maestro-milestone-audit` | *(same)* | — | all |
+| goal-audit | *(decision-only)* | *(same)* | `post-goal-audit` | all (only if decomposed) |
+| milestone-complete | `maestro-milestone-complete` | *(same)* | `post-milestone` | all |
+
+> 所有执行 stage 统一通过 Read .md 内联执行；decision 节点单独作为独立 step 插入（见规则 4）。
 
 **Build rules (按顺序应用):**
 
@@ -405,17 +405,17 @@ Generate steps from `session.lifecycle_position` to `milestone-complete`.
 1. **起点**：从 `session.lifecycle_position` 开始
 2. **跳过已完成**：跳过当前 milestone+phase 下已有 completed artifact 的 stage（按 `session.phase` 过滤）；unified 按 milestone 过滤
 3. **quality_mode 过滤**：按 `session.quality_mode` 排除不匹配 stage
-4. **决策节点**：每个 Decision after 非空的 stage 之后插入 `{ type: "decision", decision: "<gate>", retry_count: 0, max_retries: 2 }`
+4. **决策节点**：每个 Decision after 非空的 stage 之后插入 `{ decision: "<gate>", retry_count: 0, max_retries: 2, command_scope: null, command_path: null }`
 5. **goal-audit 插入**：`task_decomposition` 存在时，在最后一个 evidence-producing stage（verify/review/test）之后、`milestone-complete` 之前插入 `decision:post-goal-audit`
 6. **终点硬约束**：chain 以 `milestone-complete` 结尾
 7. **goal_ref 传播**：`task_decomposition` 存在时，每个 step 按 `step.stage ∈ g.lifecycle` 匹配 `step.goal_ref = g.id`（多匹配取字典序最小）；decision 节点不打 goal_ref
 8. **占位符**：independent 保留 `{phase}` `{intent}`；unified 不带 `{phase}`
-9. **command_path 解析**（每个非 decision step）：
+9. **command_path 解析**（每个执行 step，decision 节点跳过）：
    - 取 skill 名（args 前的第一个 token）
    - 全局优先：`~/.claude/commands/{name}.md` 存在 → `command_scope = "global"`
    - Fallback：`.claude/commands/{name}.md` 存在 → `command_scope = "project"`
    - 两者都缺 → `command_scope = "missing"`, `command_path = null`，A_CREATE_SESSION 报错 E006
-   - **不在 build 阶段读取 .md 内容**；`<required_reading>` / `<deferred_reading>` 解析与加载由 ralph-execute A_EXEC_INTERNAL 负责（保持入口/工作流分离）
+   - **不在 build 阶段读取 .md 内容**；`<required_reading>` / `<deferred_reading>` 解析与加载由 ralph-execute A_EXEC_STEP 负责（保持入口/工作流分离）
 10. **每个 step 初始化** `completion_confirmed: false`, `completion_status: null`, `completion_evidence: null`, `deferred_reads: []`
 11. **scope_verdict gating**（仅当 chain 起点 = `analyze-macro`）：
     - `scope_verdict ∈ {medium, small}` → 跳过 `roadmap` + `analyze` 两 stage；`plan` 选 standalone 列（`--from analyze:{analyze_macro_id}`），不带 `{phase}`
@@ -434,7 +434,7 @@ Generate steps from `session.lifecycle_position` to `milestone-complete`.
 1. Validate: 所有 step 的 `command_scope != "missing"`；否则 raise E006 + 列出缺失 skill
 2. Write `.workflow/.maestro/ralph-{YYYYMMDD-HHmmss}/status.json` (Appendix: Session Schema)
 3. Display chain overview：每步显示 `{index}. {skill} [{type}] [{command_scope}]`
-4. If `task_decomposition` present: display **Goal Prompt block** (Appendix) → STOP，等用户输入 `/goal`（auto_confirm 也不跳过）
+4. If `task_decomposition` present: display **Goal Prompt block** (Appendix)，不阻塞流程，继续 handoff
 
 ### A_DELEGATE_EVALUATE
 
@@ -609,12 +609,14 @@ Runs only when `task_decomposition` present.
     "analysis_dir": null, "brainstorm_dir": null, "blueprint_dir": null },
   "steps": [{
     "index": 0,
-    "type": "internal|external|decision",
-    "skill": "",
+    "skill": "",                  // 执行 step 有值；decision 节点为空字符串/null
     "args": "",
     "stage": "",                  // brainstorm|blueprint|init|analyze-macro|roadmap|analyze|plan|execute|verify|...
     "scope": null,                // "phase"|"standalone"|"milestone"|null（plan 等需要）
-    "command_scope": "global|project|missing|null",
+    "decision": null,             // 非 null → decision 节点（值为 gate 名，如 "post-verify"）；null → 执行 step
+    "retry_count": 0,             // decision 节点专用
+    "max_retries": 2,             // decision 节点专用
+    "command_scope": "global|project|missing|null",  // 执行 step；decision 节点固定 null
     "command_path": "~/.claude/commands/{name}.md | .claude/commands/{name}.md | null",
     "milestone_id": null,         // D-007 反查注入；仅含 {phase} 占位符的 step 有
     "source_artifact_ref": null,  // "analyze:ANL-xxx" | "blueprint:BLP-xxx" | null
@@ -624,7 +626,7 @@ Runs only when `task_decomposition` present.
     "completion_status": null,
     "completion_evidence": null,
     "completed_at": null,
-    "deferred_reads": []          // 由 ralph-execute A_EXEC_INTERNAL 解析 .md 时填充
+    "deferred_reads": []          // 由 ralph-execute A_EXEC_STEP 解析 .md 时填充
   }],
   "waves": [], "current_step": 0,
 
@@ -646,7 +648,7 @@ Runs only when `task_decomposition` present.
 
 ### Fix-Loop Templates
 
-所有插入 step 默认 `type: "internal"`，按 A_BUILD_STEPS 规则 9 解析 `command_path` + `command_scope`。
+所有插入的执行 step 按 A_BUILD_STEPS 规则 9 解析 `command_path` + `command_scope`；`decision:*` 条目为 decision 节点（`step.decision` 字段）。
 
 **post-verify:**
 ```
@@ -708,12 +710,12 @@ decision:post-goal-audit {retry+1}
 链路概览后逐字显示（仅当 decomposition 已产出）：
 
 ```
-📋 任务分解完成。复制以下 /goal 设定终止条件，随后运行 /maestro-ralph-execute：
+📋 任务分解完成。可随时复制以下 /goal 设定终止条件（执行过程中输入即可）：
 
 /goal 直到 {session_dir}/status.json 的 task_decomposition[*] 与 steps[*] 全部 completion_confirmed=true 才停。每轮以 status.json 为唯一行动手册，通过 /maestro-ralph-execute 推进 step；decision 节点由其自动 handoff 回 ralph 评估。禁止手动执行 skill 或修改 boundary_contract.out_of_scope。
 ```
 
-`/goal` 由用户输入；ralph 只输出此提示词。判据以 status.json 为权威。
+`/goal` 由用户输入；ralph 输出提示词后继续 handoff，不阻塞。
 
 ### Error Codes
 
@@ -745,8 +747,8 @@ decision:post-goal-audit {retry+1}
 - [ ] quality_mode 由 A_DETERMINE_QUALITY_MODE 决定，过滤 build steps
 - [ ] Decomposition: broad intent ≤3 question clarify；narrow auto-derive
 - [ ] status.json 唯一真源：boundary_contract + execution_criteria + task_decomposition；无外部清单
-- [ ] 每个 step 默认 `type: "internal"`，含 `command_scope` + `command_path`（全局优先 fallback 项目）
-- [ ] Ralph build 阶段只解析路径，不读 .md 内容；`<required_reading>` 加载由 ralph-execute A_EXEC_INTERNAL 完成
+- [ ] 执行 step 含 `command_scope` + `command_path`（全局优先 fallback 项目）；decision step 通过 `step.decision` 字段标识
+- [ ] Ralph build 阶段只解析路径，不读 .md 内容；`<required_reading>` 加载由 ralph-execute A_EXEC_STEP 完成
 - [ ] 每个 step 含 `completion_confirmed` + `completion_status` + `completion_evidence` + `deferred_reads`（初始 false/null/[]）
 - [ ] 每个 sub-goal 含 `completion_confirmed`（初始 false）
 - [ ] post-goal-audit decision 仅在 decomposed 时插入，位于 milestone-complete 之前

package/.claude/commands/maestro.md

@@ -1,7 +1,7 @@
 ---
 name: maestro
 description: Auto-route intent to optimal command chain
-argument-hint: "<intent> [-y] [-c] [--dry-run] [--exec auto|cli|internal] [--tool <name>] [--super]"
+argument-hint: "<intent> [-y] [-c] [--dry-run] [--super]"
 allowed-tools:
   - Read
   - Write
@@ -40,18 +40,16 @@ $ARGUMENTS — user intent text, or special keywords.
 - `-y` / `--yes` — Auto mode: skip clarification, skip confirmation, auto-skip on errors
 - `-c` / `--continue` — Resume previous session
 - `--dry-run` — Show chain without executing
-- `--exec <mode>` — `auto` (default), `cli`, `internal`
-- `--tool <name>` — CLI tool for delegates (default: claude)
 - `--super` — Read and follow `maestro-super.md`
 </context>
 
 <invariants>
 1. **All chains dispatch via maestro-ralph-execute** — maestro never executes steps directly
 2. **Session before execution** — status.json created before any step runs
-3. **Auto flags only to supporting commands** — unlisted commands execute as-is
+3. **Auto flag pass-through** — 仅当用户传入 `-y` 时透传 `-y` 到 skill args
 4. **Decomposition contract shared with maestro-ralph** — broad/lifecycle intents run S_DECOMPOSE producing the SAME additive block (`boundary_contract`, `execution_criteria`, `task_decomposition`)。Reference maestro-ralph `A_DECOMPOSE_TASKS`
 5. **status.json 唯一真源** — 不生成 `goal-checklist.md` 或外部清单
-6. **Default step type = internal** — chain 内每个 step 解析 `command_scope`/`command_path`（全局优先 `~/.claude/commands/{name}.md`，fallback 项目）
+6. **执行步骤统一 Read .md 内联** — chain 内每个执行 step 解析 `command_scope`/`command_path`（全局优先 `~/.claude/commands/{name}.md`，fallback 项目），由 ralph-execute `Read({command_path})` 内联执行；CLI 仅在 decision 节点做只读分析
 7. **Topology awareness** — chain catalog 含 brainstorm / blueprint / analyze-macro(text) / analyze(numeric phase) / roadmap / plan(三路径) / execute / verify / ...；scope_verdict 路由由 ralph 在 `post-analyze-scope` 决定
 8. **D-007 milestone 反查** — 数字 phase 步骤的 `milestone_id` 由 `state.json.milestones[].phase_slugs` 反查得出
 9. **每个 step 必须 `completion_confirmed: true`** — 基于 `--- COMPLETION STATUS ---` 的 `STATUS: DONE`
@@ -141,7 +139,7 @@ S_FALLBACK:
    - 数字 phase 上下文 → `analyze {phase}` → `plan {phase}` → `execute {phase}` → `verify {phase}` → quality pipeline
    - 已有 analyze artifact 想直达执行 → `plan --from analyze:{ANL_ID}` → execute → verify
    - 已有 blueprint artifact → `plan --from blueprint:{BLP_ID}` → execute → verify
-4. 每个 step 默认 `type: "internal"`；解析 `command_scope` + `command_path`（全局优先 fallback 项目）；写入 `step.stage` / `step.scope` / `step.source_artifact_ref`（如 `--from` 注入时）
+4. 执行 step 解析 `command_scope` + `command_path`（全局优先 fallback 项目）；写入 `step.stage` / `step.scope` / `step.source_artifact_ref`（如 `--from` 注入时）。decision 节点通过 `step.decision` 字段标识
 
 ### A_CLARIFY
 
@@ -157,9 +155,9 @@ S_FALLBACK:
 3. 派生 `execution_criteria` + `task_decomposition`（每个 sub-goal 含 `done_when` + `evidence` + `lifecycle` + `completion_confirmed: false`）
 4. **status.json 唯一真源**：写入 `boundary_contract` / `execution_criteria` / `task_decomposition`；不生成 markdown 清单
 5. 在最后一个 evidence-producing stage（verify/review/test）之后、`milestone-complete` 之前追加 `decision:post-goal-audit`。ralph-execute 在该节点按需动态生长 `steps[]`
-6. **输出 `/goal` 绑定提示词：**
+6. **输出 `/goal` 绑定提示词（不阻塞，用户可在执行过程中随时输入）：**
    ```
-   📋 任务分解完成。复制下面一行设定目标，会话在子目标全部达成前不停：
+   📋 任务分解完成。可随时复制下面一行设定目标（执行过程中输入即可）：
 
    /goal 目标达成条件: {session_dir}/status.json 中 task_decomposition[*].status == "done" 且 task_decomposition[*].completion_confirmed == true 且 steps[*].completion_confirmed == true。未达成时：阅读 {session_dir}/status.json 取得 execution_criteria / boundary_contract / task_decomposition / steps 作为行动手册，调用 /maestro-ralph continue 推进；严禁手动执行 skill 或越界修改 status.json.boundary_contract.out_of_scope。
    ```
@@ -173,13 +171,14 @@ S_FALLBACK:
      "session_id", "source": "maestro", "intent", "task_type", "chain_name",
      "phase", "phase_is_new": false, "milestone": "",
      "scope_verdict": null, "analyze_macro_id": null, "blueprint_id": null,
-     "auto_mode": false, "exec_mode": "auto", "cli_tool": "claude",
+     "auto_mode": false, "cli_tool": "claude",   // cli_tool: decision 节点 delegate 评估时的 CLI 工具
      "context": { "scratch_dir": null, "plan_dir": null, "analysis_dir": null,
        "brainstorm_dir": null, "blueprint_dir": null, "issue_id": null },
      "steps": [{
-       "index": 0, "type": "internal|external|decision",
+       "index": 0,
        "skill": "", "args": "",
        "stage": "", "scope": null,
+       "decision": null,                 // 非 null → decision 节点；null → 执行节点
        "command_scope": "global|project|missing|null",
        "command_path": "~/.claude/commands/{name}.md | .claude/commands/{name}.md | null",
        "milestone_id": null, "source_artifact_ref": null,
@@ -203,25 +202,6 @@ S_FALLBACK:
 
 <appendix>
 
-### Auto-Yes Flag Map
-
-| Command | Auto Flag | Effect |
-|---------|-----------|--------|
-| maestro-init | `-y` | Skip interactive questioning |
-| maestro-analyze | `-y` | Skip scoping, auto-deepen |
-| maestro-brainstorm | `-y` | Skip questions, use defaults |
-| maestro-blueprint | `-y` | Skip interview, use recommended defaults |
-| maestro-roadmap | `-y` | Skip questions (create/revise/review) |
-| maestro-impeccable | `-y` | Auto-select design variant + skip confirmations |
-| maestro-plan | `-y` | Skip confirmations and clarification |
-| maestro-execute | `-y` | Skip confirmations, blocked auto-continue |
-| quality-auto-test | `-y` | Skip plan confirmation |
-| quality-test | `-y --auto-fix` | Auto-trigger gap-fix loop |
-| quality-retrospective | `-y` | Accept all routing recommendations |
-| maestro-milestone-complete | `-y` | Skip knowledge promotion |
-
-Unlisted commands have no auto flags.
-
 ### Error Codes
 
 | Code | Severity | Description | Recovery |
@@ -246,8 +226,8 @@ Unlisted commands have no auto flags.
 - [ ] status.json 唯一真源；无 markdown 清单；post-goal-audit 节点在 decomposed 时追加；/goal 提示词以 status.json 为判据
 - [ ] Chain selected and confirmed (or auto-confirmed)
 - [ ] Session dir created with status.json before execution; decomposition fields additive-only
-- [ ] 每个 step 含 `command_scope` + `command_path` + `completion_confirmed` 字段
-- [ ] Auto flags propagated to supporting commands only
+- [ ] 执行 step 含 `command_scope` + `command_path` + `completion_confirmed` 字段；decision step 通过 `step.decision` 字段标识
+- [ ] 用户传入 `-y` 时透传到 skill args
 - [ ] All chains dispatched via maestro-ralph-execute
 - [ ] Low-complexity intents routed to maestro-quick
 - [ ] (super) Requirements validated before roadmap

package/dist/src/commands/hooks.d.ts

@@ -51,7 +51,26 @@ export declare const CODEX_HOOK_DEFS: Record<string, CodexHookDef>;
 export declare const CODEX_HOOK_LEVEL_DESCRIPTIONS: Record<HookLevel, string>;
 export declare function getClaudeSettingsPath(): string;
 export declare function loadClaudeSettings(settingsPath: string): ClaudeSettings;
-export declare function removeMaestroHooks(settings: ClaudeSettings): void;
+/**
+ * Remove maestro hooks from Claude settings.
+ *
+ * @param settings  Parsed settings.json object (mutated in place)
+ * @param hookNames Optional whitelist of hook names to remove. When omitted,
+ *                  every command containing the "maestro" substring is stripped
+ *                  (legacy uninstall behavior).
+ */
+export declare function removeMaestroHooks(settings: ClaudeSettings, hookNames?: string[]): void;
+/**
+ * Remove the maestro-installed statusline from Claude settings.
+ * Returns true if a statusline was removed.
+ */
+export declare function removeClaudeStatusline(settingsPath: string): boolean;
+/**
+ * Uninstall hooks recorded under a HookRecord from a Claude settings file.
+ * Removes only the hooks listed in `installed` — does NOT strip statusline.
+ * Returns the number of hook entries removed.
+ */
+export declare function uninstallClaudeHooks(settingsPath: string, installed: string[]): number;
 export interface InstallHooksResult {
     settingsPath: string;
     installedHooks: string[];
@@ -107,7 +126,11 @@ export declare function getCodexHooksPath(opts?: {
     project?: boolean;
 }): string;
 export declare function loadCodexHooks(hooksPath: string): CodexHooksFile;
-export declare function removeCodexMaestroHooks(hooksFile: CodexHooksFile): void;
+export declare function removeCodexMaestroHooks(hooksFile: CodexHooksFile, hookNames?: string[]): void;
+/**
+ * Uninstall codex hooks recorded under a HookRecord. Returns number of entries removed.
+ */
+export declare function uninstallCodexHooks(hooksPath: string, installed: string[]): number;
 /**
  * Check whether `codex_hooks = true` is set in config.toml.
  * Returns true if the flag is found; prints a hint otherwise.
@@ -177,7 +200,11 @@ export declare function getAgyHooksPath(opts?: {
 }): string;
 export declare function loadAgyHooks(hooksPath: string): AgyHooksFile;
 /** Strip all maestro-prefixed top-level entries (preserves user-defined hooks). */
-export declare function removeAgyMaestroHooks(hooksFile: AgyHooksFile): void;
+export declare function removeAgyMaestroHooks(hooksFile: AgyHooksFile, hookNames?: string[]): void;
+/**
+ * Uninstall agy hooks recorded under a HookRecord. Returns number of entries removed.
+ */
+export declare function uninstallAgyHooks(hooksPath: string, installed: string[]): number;
 /**
  * Install hooks at the given level into Antigravity's hooks.json.
  */

package/dist/src/commands/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6BzC,UAAU,SAAS;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACjD;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE;QACN,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;QACzB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC;QAC1B,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;QAC/B,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;QAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,UAAU,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAMD,UAAU,OAAO;IACf,KAAK,EAAE,YAAY,GAAG,aAAa,GAAG,kBAAkB,GAAG,cAAc,GAAG,MAAM,CAAC;IACnF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,KAAK,EAAE,SAAS,CAAC;IACjB,sEAAsE;IACtE,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC;AAEjE,eAAO,MAAM,WAAW,EAAE,SAAS,SAAS,EAA4C,CAAC;AAEzF,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAK7D,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAY7C,CAAC;AAMF,UAAU,YAAY;IACpB,KAAK,EAAE,cAAc,GAAG,YAAY,GAAG,aAAa,GAAG,kBAAkB,GAAG,MAAM,CAAC;IACnF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,CAAC;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAUxD,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAKnE,CAAC;AAaF,wBAAgB,qBAAqB,IAAI,MAAM,CAG9C;AAED,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,CAGvE;AASD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAgBjE;AAkBD,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,KAAK,EAAE,SAAS,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,GAAG,IAAI,CAMhF;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,GAAE;IACtC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CACX,GAAG,MAAM,CAoBd;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,SAAS,EAChB,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GAChF,kBAAkB,CA2CpB;AAMD,UAAU,cAAc;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC3F;AAED,UAAU,cAAc;IACtB,KAAK,CAAC,EAAE;QACN,YAAY,CAAC,EAAE,cAAc,EAAE,CAAC;QAChC,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;QAC9B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;QAC/B,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;QACpC,IAAI,CAAC,EAAE,cAAc,EAAE,CAAC;QACxB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CAI1E;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAIhE;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,CAiBvE;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAOpF;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,SAAS,EAChB,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACnD,kBAAkB,CAwCpB;AAuBD,oCAAoC;AACpC,KAAK,QAAQ,GAAG,YAAY,GAAG,aAAa,GAAG,eAAe,GAAG,gBAAgB,GAAG,MAAM,CAAC;AAE3F,UAAU,UAAU;IAClB,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,CAAC;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAiBpD,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAKjE,CAAC;AAGF,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,iBAAiB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,cAAc,EAAE,CAAC;CACzB;AAED,UAAU,aAAa;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACjC,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAClC,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;IACjC,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;IAClC,IAAI,CAAC,EAAE,cAAc,EAAE,CAAC;CACzB;AAED,kEAAkE;AAClE,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAIlD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,MAAM,CAI9F;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,CAQ5D;AAED,mFAAmF;AACnF,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI,CAInE;AAOD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,SAAS,EAChB,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACzE,kBAAkB,CAoCpB;AAoWD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmZ3D"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/hooks.js

@@ -74,15 +74,30 @@ function getMaestroBinDir() {
     return resolve(new URL('../../../bin', import.meta.url).pathname.replace(/^\/([A-Z]:)/, '$1'));
 }
 const HOOK_MARKER = 'maestro';
-export function removeMaestroHooks(settings) {
+/**
+ * Remove maestro hooks from Claude settings.
+ *
+ * @param settings  Parsed settings.json object (mutated in place)
+ * @param hookNames Optional whitelist of hook names to remove. When omitted,
+ *                  every command containing the "maestro" substring is stripped
+ *                  (legacy uninstall behavior).
+ */
+export function removeMaestroHooks(settings, hookNames) {
     if (!settings.hooks)
         return;
+    const targets = hookNames && hookNames.length > 0
+        ? new Set(hookNames.map((n) => `hooks run ${n}`))
+        : null;
     for (const eventKey of ['PreToolUse', 'PostToolUse', 'UserPromptSubmit', 'Notification', 'Stop']) {
         const groups = settings.hooks[eventKey];
         if (!groups)
             continue;
         for (const group of groups) {
-            group.hooks = group.hooks.filter((h) => !h.command.includes(HOOK_MARKER));
+            group.hooks = group.hooks.filter((h) => {
+                if (targets)
+                    return ![...targets].some((needle) => h.command.includes(needle));
+                return !h.command.includes(HOOK_MARKER);
+            });
         }
         settings.hooks[eventKey] = groups.filter((g) => g.hooks.length > 0);
         if (settings.hooks[eventKey].length === 0) {
@@ -93,6 +108,57 @@ export function removeMaestroHooks(settings) {
         delete settings.hooks;
     }
 }
+/**
+ * Remove the maestro-installed statusline from Claude settings.
+ * Returns true if a statusline was removed.
+ */
+export function removeClaudeStatusline(settingsPath) {
+    if (!existsSync(settingsPath))
+        return false;
+    try {
+        const settings = loadClaudeSettings(settingsPath);
+        if (!settings.statusLine?.command?.includes(HOOK_MARKER))
+            return false;
+        delete settings.statusLine;
+        writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Uninstall hooks recorded under a HookRecord from a Claude settings file.
+ * Removes only the hooks listed in `installed` — does NOT strip statusline.
+ * Returns the number of hook entries removed.
+ */
+export function uninstallClaudeHooks(settingsPath, installed) {
+    if (!existsSync(settingsPath) || installed.length === 0)
+        return 0;
+    try {
+        const settings = loadClaudeSettings(settingsPath);
+        const before = countHookEntries(settings.hooks);
+        removeMaestroHooks(settings, installed);
+        const after = countHookEntries(settings.hooks);
+        writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+        return Math.max(0, before - after);
+    }
+    catch {
+        return 0;
+    }
+}
+function countHookEntries(hooks) {
+    if (!hooks)
+        return 0;
+    let count = 0;
+    for (const groups of Object.values(hooks)) {
+        if (!Array.isArray(groups))
+            continue;
+        for (const g of groups)
+            count += g.hooks.length;
+    }
+    return count;
+}
 function findHookInSettings(settings, hookName) {
     if (!settings.hooks)
         return false;
@@ -155,10 +221,9 @@ export function installHooksByLevel(level, opts = {}) {
             ? join(process.cwd(), '.claude', 'settings.json')
             : getClaudeSettingsPath());
     const settings = loadClaudeSettings(settingsPath);
-    // --- Statusline (skip if managed separately) ---
-    if (!opts.skipStatusline) {
-        settings.statusLine = { type: 'command', command: 'maestro-statusline' };
-    }
+    // Note: statusline is NEVER auto-installed by hooks. It is opt-in only,
+    // controlled by the dedicated `installStatusline` flag in the install flow.
+    // The `skipStatusline` option is kept for API back-compat but ignored.
     // --- Remove existing maestro hooks to avoid duplicates ---
     removeMaestroHooks(settings);
     // --- Register hooks matching the requested level ---
@@ -200,16 +265,23 @@ export function loadCodexHooks(hooksPath) {
         return {};
     }
 }
-export function removeCodexMaestroHooks(hooksFile) {
+export function removeCodexMaestroHooks(hooksFile, hookNames) {
     if (!hooksFile.hooks)
         return;
+    const targets = hookNames && hookNames.length > 0
+        ? new Set(hookNames.map((n) => `hooks run ${n}`))
+        : null;
     const events = ['SessionStart', 'PreToolUse', 'PostToolUse', 'UserPromptSubmit', 'Stop'];
     for (const eventKey of events) {
         const groups = hooksFile.hooks[eventKey];
         if (!groups)
             continue;
         for (const group of groups) {
-            group.hooks = group.hooks.filter((h) => !h.command.includes(HOOK_MARKER));
+            group.hooks = group.hooks.filter((h) => {
+                if (targets)
+                    return ![...targets].some((needle) => h.command.includes(needle));
+                return !h.command.includes(HOOK_MARKER);
+            });
         }
         hooksFile.hooks[eventKey] = groups.filter((g) => g.hooks.length > 0);
         if (hooksFile.hooks[eventKey].length === 0) {
@@ -220,6 +292,36 @@ export function removeCodexMaestroHooks(hooksFile) {
         delete hooksFile.hooks;
     }
 }
+/**
+ * Uninstall codex hooks recorded under a HookRecord. Returns number of entries removed.
+ */
+export function uninstallCodexHooks(hooksPath, installed) {
+    if (!existsSync(hooksPath) || installed.length === 0)
+        return 0;
+    try {
+        const hooksFile = loadCodexHooks(hooksPath);
+        const before = countCodexHookEntries(hooksFile);
+        removeCodexMaestroHooks(hooksFile, installed);
+        const after = countCodexHookEntries(hooksFile);
+        writeFileSync(hooksPath, JSON.stringify(hooksFile, null, 2));
+        return Math.max(0, before - after);
+    }
+    catch {
+        return 0;
+    }
+}
+function countCodexHookEntries(hooksFile) {
+    if (!hooksFile.hooks)
+        return 0;
+    let count = 0;
+    for (const groups of Object.values(hooksFile.hooks)) {
+        if (!Array.isArray(groups))
+            continue;
+        for (const g of groups)
+            count += g.hooks.length;
+    }
+    return count;
+}
 /**
  * Check whether `codex_hooks = true` is set in config.toml.
  * Returns true if the flag is found; prints a hint otherwise.
@@ -333,10 +435,36 @@ export function loadAgyHooks(hooksPath) {
     }
 }
 /** Strip all maestro-prefixed top-level entries (preserves user-defined hooks). */
-export function removeAgyMaestroHooks(hooksFile) {
+export function removeAgyMaestroHooks(hooksFile, hookNames) {
+    const exact = hookNames && hookNames.length > 0
+        ? new Set(hookNames.map((n) => `${AGY_HOOK_NAME_PREFIX}${n}`))
+        : null;
     for (const key of Object.keys(hooksFile)) {
-        if (key.startsWith(AGY_HOOK_NAME_PREFIX))
+        if (exact) {
+            if (exact.has(key))
+                delete hooksFile[key];
+        }
+        else if (key.startsWith(AGY_HOOK_NAME_PREFIX)) {
             delete hooksFile[key];
+        }
+    }
+}
+/**
+ * Uninstall agy hooks recorded under a HookRecord. Returns number of entries removed.
+ */
+export function uninstallAgyHooks(hooksPath, installed) {
+    if (!existsSync(hooksPath) || installed.length === 0)
+        return 0;
+    try {
+        const hooksFile = loadAgyHooks(hooksPath);
+        const before = Object.keys(hooksFile).filter((k) => k.startsWith(AGY_HOOK_NAME_PREFIX)).length;
+        removeAgyMaestroHooks(hooksFile, installed);
+        const after = Object.keys(hooksFile).filter((k) => k.startsWith(AGY_HOOK_NAME_PREFIX)).length;
+        writeFileSync(hooksPath, JSON.stringify(hooksFile, null, 2));
+        return Math.max(0, before - after);
+    }
+    catch {
+        return 0;
     }
 }
 /** Determines which event-key shape applies. */
@@ -807,7 +935,6 @@ export function registerHooksCommand(program) {
         else {
             const result = installHooksByLevel(level, { project: opts.project });
             console.log(`Maestro hooks installed (level: ${level}):`);
-            console.log(`  Statusline: installed`);
             for (const name of result.installedHooks) {
                 const def = HOOK_DEFS[name];
                 const matcher = def.matcher ? ` [${def.matcher}]` : '';