maestro-flow 0.5.0 → 0.5.2

package/.codex/skills/maestro-quick/SKILL.md

@@ -1,129 +1,129 @@
----
-name: maestro-quick
-description: Quick task execution, skip optional agents
-argument-hint: "\"task description\" [--discuss] [--full]"
-allowed-tools: Read, Write, Edit, Bash, Glob, Grep, AskUserQuestion
----
-
-<purpose>
-Shortened pipeline for well-understood tasks. Creates a scratch directory, runs quick analysis, generates a plan, executes tasks, and optionally verifies results. Single agent, sequential flow — no CSV waves needed.
-
-**Pipeline**: `[discuss] → analyze-q → plan → execute → [verify]`
-
-Quick tasks default to minimal interaction. `--discuss` adds a decision extraction step. `--full` adds plan-checking and post-execution verification.
-</purpose>
-
-<context>
-
-```bash
-$maestro-quick "add rate limiting to /api/auth endpoints"
-$maestro-quick "refactor user service to use repository pattern" --discuss
-$maestro-quick "fix memory leak in WebSocket handler" --full
-$maestro-quick "add dark mode toggle to settings page" --discuss --full
-```
-
-**Flags**:
-- `--discuss`: Decision extraction before planning (Locked/Free/Deferred classification)
-- `--full`: Enable plan-checking (max 2 iterations) and post-execution verification
-
-**Output**: `.workflow/scratch/{slug}/` with plan.json, execution results, optional verification
-
-</context>
-
-<invariants>
-1. **Speed over ceremony** — minimal overhead, get to implementation fast
-2. **Follow existing patterns** — grep for 3+ similar implementations before writing new code
-3. **Atomic commits** — one commit per quick task, descriptive message
-4. **Scratch isolation** — all metadata stays in .workflow/scratch/{slug}/
-5. **Works without init** — quick tasks function even without full .workflow/ setup
-</invariants>
-
-<execution>
-
-### Step 1: Parse Arguments
-
-Extract from arguments:
-- `--discuss` flag
-- `--full` flag
-- Remaining text as task description (required — E001 if empty)
-
-### Step 2: Load Project Context
-
-Read `.workflow/state.json` and `.workflow/project.md` if they exist. If `.workflow/` does not exist, create minimal scratch structure anyway (quick works without full init).
-
-Load coding specs + tools if available: `maestro spec load --category coding`. If the task involves frontend/UI work (description contains component, page, style, layout, CSS, HTML, frontend), also run `maestro spec load --category ui`. Browse wiki: `maestro search --category coding`, load relevant entries via `maestro wiki load <id>`. All optional — proceed without if unavailable.
-
-### Step 3: Create Scratch Directory
-
-Generate slug from task description (lowercase, hyphens, max 40 chars). Create `.workflow/scratch/{slug}/`. Write `config.json` with: `task`, `flags` (discuss, full), `created_at` (ISO), `status` ("active").
-
-### Step 4: Discussion Phase (if --discuss)
-
-**Only when `--discuss` is set.**
-
-Analyze the task for gray areas and ambiguities:
-1. Identify decision points in the task
-2. Classify each as: **Locked** (clear from context), **Free** (implementation choice), **Deferred** (need user input)
-3. For Deferred items: ask user for decisions
-4. Write `context.md` to scratch directory with all decisions
-
-### Step 5: Quick Analysis
-
-Rapid codebase exploration focused on the task:
-1. Search for related files using Grep/Glob
-2. Identify existing patterns to follow
-3. Map dependencies and integration points
-4. Write analysis findings to `context.md` (append if --discuss created it)
-
-### Step 6: Generate Plan
-
-Create `plan.json` in scratch directory:
-- Decompose task into subtasks (typically 1-5 for quick tasks)
-- Each task has: id, title, description, scope, convergence_criteria, files
-- Assign single wave (sequential execution)
-
-**If `--full`**: Present plan for review, allow up to 2 revision iterations.
-
-### Step 7: Execute Tasks
-
-For each task in plan.json (sequential):
-1. Read task definition
-2. Implement changes following existing patterns
-3. Run any specified verification commands
-4. Write task summary with files_modified, status
-
-Update plan.json task statuses as completed.
-
-### Step 8: Verification (if --full)
-
-**Only when `--full` is set.** Run convergence criteria checks for each task via grep/test commands. If gaps found (W001): attempt single fix iteration, then report remaining gaps.
-
-### Step 9: Commit and Report
-
-Commit all changes: `git add -A && git commit -m "quick: {slug} - {short description}"`. Update `.workflow/state.json` scratch task entry (if state.json exists).
-
-Display report: task description, scratch path, status (completed/completed-with-gaps), tasks completed/total, files modified count. If `--full`: include verification result (PASS/GAPS).
-
-</execution>
-
-### Artifact Verification
-Before reporting completion, verify: plan.json exists AND .summaries/TASK-*-summary.md exists for each task. Task summaries MUST include concrete evidence of completion. If missing: DO NOT report completion.
-
-<error_codes>
-
-| Code | Severity | Description | Recovery |
-|------|----------|-------------|----------|
-| E001 | error | Task description required | Ask user for description |
-| E002 | error | Scratch directory creation failed | Check permissions |
-| W001 | warning | Verification found minor gaps | Report gaps, continue |
-
-</error_codes>
-
-<success_criteria>
-- [ ] Scratch directory created with config.json
-- [ ] Analysis completed and context.md written
-- [ ] Plan generated with subtasks
-- [ ] All tasks executed and statuses updated
-- [ ] Changes committed with descriptive message
-- [ ] Completion report displayed
-</success_criteria>
+---
+name: maestro-quick
+description: Quick task execution, skip optional agents
+argument-hint: "\"task description\" [--discuss] [--full]"
+allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
+---
+
+<purpose>
+Shortened pipeline for well-understood tasks. Creates a scratch directory, runs quick analysis, generates a plan, executes tasks, and optionally verifies results. Single agent, sequential flow — no CSV waves needed.
+
+**Pipeline**: `[discuss] → analyze-q → plan → execute → [verify]`
+
+Quick tasks default to minimal interaction. `--discuss` adds a decision extraction step. `--full` adds plan-checking and post-execution verification.
+</purpose>
+
+<context>
+
+```bash
+$maestro-quick "add rate limiting to /api/auth endpoints"
+$maestro-quick "refactor user service to use repository pattern" --discuss
+$maestro-quick "fix memory leak in WebSocket handler" --full
+$maestro-quick "add dark mode toggle to settings page" --discuss --full
+```
+
+**Flags**:
+- `--discuss`: Decision extraction before planning (Locked/Free/Deferred classification)
+- `--full`: Enable plan-checking (max 2 iterations) and post-execution verification
+
+**Output**: `.workflow/scratch/{slug}/` with plan.json, execution results, optional verification
+
+</context>
+
+<invariants>
+1. **Speed over ceremony** — minimal overhead, get to implementation fast
+2. **Follow existing patterns** — grep for 3+ similar implementations before writing new code
+3. **Atomic commits** — one commit per quick task, descriptive message
+4. **Scratch isolation** — all metadata stays in .workflow/scratch/{slug}/
+5. **Works without init** — quick tasks function even without full .workflow/ setup
+</invariants>
+
+<execution>
+
+### Step 1: Parse Arguments
+
+Extract from arguments:
+- `--discuss` flag
+- `--full` flag
+- Remaining text as task description (required — E001 if empty)
+
+### Step 2: Load Project Context
+
+Read `.workflow/state.json` and `.workflow/project.md` if they exist. If `.workflow/` does not exist, create minimal scratch structure anyway (quick works without full init).
+
+Load coding specs + tools if available: `maestro spec load --category coding`. If the task involves frontend/UI work (description contains component, page, style, layout, CSS, HTML, frontend), also run `maestro spec load --category ui`. Browse wiki: `maestro search --category coding`, load relevant entries via `maestro wiki load <id>`. All optional — proceed without if unavailable.
+
+### Step 3: Create Scratch Directory
+
+Generate slug from task description (lowercase, hyphens, max 40 chars). Create `.workflow/scratch/{slug}/`. Write `config.json` with: `task`, `flags` (discuss, full), `created_at` (ISO), `status` ("active").
+
+### Step 4: Discussion Phase (if --discuss)
+
+**Only when `--discuss` is set.**
+
+Analyze the task for gray areas and ambiguities:
+1. Identify decision points in the task
+2. Classify each as: **Locked** (clear from context), **Free** (implementation choice), **Deferred** (need user input)
+3. For Deferred items: ask user for decisions
+4. Write `context.md` to scratch directory with all decisions
+
+### Step 5: Quick Analysis
+
+Rapid codebase exploration focused on the task:
+1. Search for related files using Grep/Glob
+2. Identify existing patterns to follow
+3. Map dependencies and integration points
+4. Write analysis findings to `context.md` (append if --discuss created it)
+
+### Step 6: Generate Plan
+
+Create `plan.json` in scratch directory:
+- Decompose task into subtasks (typically 1-5 for quick tasks)
+- Each task has: id, title, description, scope, convergence_criteria, files
+- Assign single wave (sequential execution)
+
+**If `--full`**: Present plan for review, allow up to 2 revision iterations.
+
+### Step 7: Execute Tasks
+
+For each task in plan.json (sequential):
+1. Read task definition
+2. Implement changes following existing patterns
+3. Run any specified verification commands
+4. Write task summary with files_modified, status
+
+Update plan.json task statuses as completed.
+
+### Step 8: Verification (if --full)
+
+**Only when `--full` is set.** Run convergence criteria checks for each task via grep/test commands. If gaps found (W001): attempt single fix iteration, then report remaining gaps.
+
+### Step 9: Commit and Report
+
+Commit all changes: `git add -A && git commit -m "quick: {slug} - {short description}"`. Update `.workflow/state.json` scratch task entry (if state.json exists).
+
+Display report: task description, scratch path, status (completed/completed-with-gaps), tasks completed/total, files modified count. If `--full`: include verification result (PASS/GAPS).
+
+</execution>
+
+### Artifact Verification
+Before reporting completion, verify: plan.json exists AND .summaries/TASK-*-summary.md exists for each task. Task summaries MUST include concrete evidence of completion. If missing: DO NOT report completion.
+
+<error_codes>
+
+| Code | Severity | Description | Recovery |
+|------|----------|-------------|----------|
+| E001 | error | Task description required | Ask user for description |
+| E002 | error | Scratch directory creation failed | Check permissions |
+| W001 | warning | Verification found minor gaps | Report gaps, continue |
+
+</error_codes>
+
+<success_criteria>
+- [ ] Scratch directory created with config.json
+- [ ] Analysis completed and context.md written
+- [ ] Plan generated with subtasks
+- [ ] All tasks executed and statuses updated
+- [ ] Changes committed with descriptive message
+- [ ] Completion report displayed
+</success_criteria>

package/.codex/skills/maestro-ralph/SKILL.md

@@ -10,15 +10,15 @@ Reads project state → infers position → builds adaptive chain → delegates
 
 ### Session
 
-`.workflow/.maestro/{session_id}/status.json` — 工作流唯一真源（schema 见 `<appendix>`）。session_id 格式：`ralph-{YYYYMMDD-HHmmss}`（本 skill 创建，自适应链）或 `maestro-{YYYYMMDD-HHmmss}`（`/maestro` coordinator 创建，静态链）。两类都由 `/maestro-ralph-execute` 推进。session-id 省略时取最新 `status=="running"`。
+`.workflow/.maestro/{session_id}/status.json` — 工作流唯一真源（schema 见 `<appendix>`）。session_id 格式：`ralph-{YYYYMMDD-HHmmss}`（本 skill 创建，自适应链）或 `maestro-{YYYYMMDD-HHmmss}`（`$maestro` coordinator 创建，静态链）。两类都由 `$maestro-ralph-execute` 推进。session-id 省略时取最新 `status=="running"`。
 
 ### Entry points
 
-- **`/maestro-ralph "intent"`** — 新建 session：infer → decompose → build → emit /goal prompt（如有 decomposition）→ dispatch ralph-execute
-- **`/maestro-ralph continue [session-id]`** — 恢复执行；省略=最新 running（首选直接 `/maestro-ralph-execute [session-id]`）
-- **`/maestro-ralph status [session-id]`** — 显示进度；省略=最新 ralph session
+- **`$maestro-ralph "intent"`** — 新建 session：infer → decompose → build → emit /goal prompt（如有 decomposition）→ dispatch ralph-execute
+- **`$maestro-ralph continue [session-id]`** — 恢复执行；省略=最新 running（首选直接 `$maestro-ralph-execute [session-id]`）
+- **`$maestro-ralph status [session-id]`** — 显示进度；省略=最新 ralph session
 
-> 推进规则：**step 推进由 `/maestro-ralph-execute` 负责**；ralph 仅在 build / decision 评估时介入。decision 节点由 ralph-execute 自动 `$maestro-ralph` 直调 handoff，无需用户手动切换。
+> 推进规则：**step 推进由 `$maestro-ralph-execute` 负责**；ralph 仅在 build / decision 评估时介入。decision 节点由 ralph-execute 自动 `$maestro-ralph` 直调 handoff，无需用户手动切换。
 
 Initial decomposition (S_DECOMPOSE): boundary-clarified via ≤3 questions for broad intents (重构/全面/迁移/重写). 写入 status.json 的 `boundary_contract` / `execution_criteria` / `task_decomposition`，附 `/goal` prompt。
 
@@ -31,12 +31,12 @@ Key difference from maestro coordinator:
 - ralph: living chain → decision nodes re-evaluate → chain grows/shrinks dynamically
 
 Session: `.workflow/.maestro/ralph-{YYYYMMDD-HHmmss}/status.json`
-Mutual invocation with `/maestro-ralph-execute` forms a self-perpetuating work loop.
+Mutual invocation with `$maestro-ralph-execute` forms a self-perpetuating work loop.
 
 ### Execution Flow
 
 ```
- /maestro-ralph "intent" ─▶ ralph        infer → decompose → build chain
+ $maestro-ralph "intent" ─▶ ralph        infer → decompose → build chain
                               │           resolves command_path per step
                               │           writes status.json
                               │           emits /goal prompt
@@ -582,7 +582,7 @@ Runs only when `task_decomposition` present.
 
 1. Set session status = "paused", write status.json
 2. Display: ◆ 已达最大重试次数，debug 已执行。请人工介入。
-3. Display: /maestro-ralph continue 恢复
+3. Display: $maestro-ralph continue 恢复
 
 </actions>
 
@@ -714,7 +714,7 @@ decision:post-goal-audit {retry+1}
 ```
 📋 任务分解完成。可随时复制以下 /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 直到 {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 输出提示词后继续 handoff，不阻塞。

package/.codex/skills/maestro-ralph-beta/SKILL.md

@@ -10,16 +10,16 @@ allowed-tools:
   - Glob
   - Grep
   - Skill
-  - AskUserQuestion
+  - request_user_input
 ---
 <purpose>
 Closed-loop runner for the maestro workflow lifecycle.
-Single skill — every invocation routes by session state, executes one tick, and self-invokes `Skill("maestro-ralph-beta")` until all `completion_confirmed` or paused.
+Single skill — every invocation routes by session state, executes one tick, and self-invokes `$maestro-ralph-beta` until all `completion_confirmed` or paused.
 
 Entry points:
-- **`/maestro-ralph-beta "intent"`** — New session: infer → decompose → build → tick
-- **`/maestro-ralph-beta continue`** — Resume: locate session → tick
-- **`/maestro-ralph-beta status`** — Display session progress
+- **`$maestro-ralph-beta "intent"`** — New session: infer → decompose → build → tick
+- **`$maestro-ralph-beta continue`** — Resume: locate session → tick
+- **`$maestro-ralph-beta status`** — Display session progress
 
 Tick kinds:
 - **执行 step** (`step.decision == null`): `maestro ralph next` → inline → `maestro ralph complete` → self-invoke
@@ -47,7 +47,7 @@ Remaining     → intent (new session)
 </context>
 
 <invariants>
-1. **Self-invocation = `Skill("maestro-ralph-beta")`** — 每次 tick 末尾强制自调用；除非 router 命中终止条件
+1. **Self-invocation = `$maestro-ralph-beta`** — 每次 tick 末尾强制自调用；除非 router 命中终止条件
 2. **status.json 是唯一真源；写入权限分层**：
    - **Step 级字段**（`step.completion_*`, `step.status` 执行 step running↔completed, `step.load.*`, `step.retried`，以及执行 step 的 `active_step_index` 占用/释放）→ 由 `maestro ralph next/complete/retry` CLI 写入
    - **会话级结构**（`session.status`, `passed_gates`, `steps[]` 增删/reindex, `task_decomposition[*]`, `boundary_contract`, `context.*`, `scope_verdict`, `consec_exit2_count`, decision step 的 `status`/`retry_count`/`active_step_index` 占用与释放）→ 由 maestro-ralph-beta 写入
@@ -74,13 +74,13 @@ Remaining     → intent (new session)
 2. intent == "continue" AND active session exists              → A_RESUME_SESSION → S_TICK_LOCATE
 3. intent non-empty AND intent ∉ {"continue","status"} AND active session exists
                                                                → S_FALLBACK                → END
-   display "已有 active session {id}；先 /maestro-ralph-beta continue 续跑或显式 abandon"
+   display "已有 active session {id}；先 $maestro-ralph-beta continue 续跑或显式 abandon"
 4. live session AND active_step.status == "running" AND active_step.decision != null
                                                                → S_TICK_LOCATE → S_TICK_DECISION
 5. live session AND has pending step                            → S_TICK_LOCATE
 6. live session AND all completion_confirmed                   → S_COMPLETE                → END
 7. active session AND session.status == "paused" AND no intent → S_FALLBACK                → END
-   display "Session {id} paused；输入 /maestro-ralph-beta continue 显式恢复"
+   display "Session {id} paused；输入 $maestro-ralph-beta continue 显式恢复"
 8. no active session AND intent non-empty                      → S_BUILD_PHASE
 9. no active session AND no intent                             → S_FALLBACK                → END
 ```
@@ -152,10 +152,10 @@ S_BUILD_CHAIN:
 
 S_CREATE_SESSION:
   → S_CONFIRM       WHEN: not auto_confirm                 DO: A_CREATE_SESSION
-  → S_TICK_LOCATE   WHEN: auto_confirm                     DO: A_CREATE_SESSION + Skill("maestro-ralph-beta")
+  → S_TICK_LOCATE   WHEN: auto_confirm                     DO: A_CREATE_SESSION + $maestro-ralph-beta
 
 S_CONFIRM:
-  → S_TICK_LOCATE   WHEN: user selects "Proceed"           DO: Skill("maestro-ralph-beta")
+  → S_TICK_LOCATE   WHEN: user selects "Proceed"           DO: $maestro-ralph-beta
   → S_BUILD_CHAIN   WHEN: user selects "Edit"
   → END             WHEN: user selects "Cancel"
 
@@ -171,8 +171,8 @@ S_TICK:
   → S_TICK_EXEC     WHEN: next_pending_step.decision == null   DO: A_RESOLVE_ARGS
 
 S_TICK_EXEC: Entry: A_EXEC_STEP
-  → S_TICK_LOCATE   WHEN: ralph complete with DONE|DONE_WITH_CONCERNS   DO: Skill("maestro-ralph-beta")
-  → S_TICK_LOCATE   WHEN: ralph next exit == 2                          DO: Skill("maestro-ralph-beta")
+  → S_TICK_LOCATE   WHEN: ralph complete with DONE|DONE_WITH_CONCERNS   DO: $maestro-ralph-beta
+  → S_TICK_LOCATE   WHEN: ralph next exit == 2                          DO: $maestro-ralph-beta
   → S_HANDLE_FAIL   WHEN: ralph next exit == 1 OR exit >= 3
   → S_HANDLE_FAIL   WHEN: ralph complete with NEEDS_RETRY|BLOCKED
 
@@ -187,13 +187,13 @@ S_TICK_DECISION: (gate 名取自 `step.decision`)
                      DO: A_STRUCTURAL_EVALUATE
 
 S_TICK_APPLY:
-  → S_TICK_LOCATE   WHEN: verdict == "proceed"                          DO: A_APPLY_PROCEED + Skill("maestro-ralph-beta")
-  → S_TICK_LOCATE   WHEN: post-goal-audit + unmet sub-goals              DO: A_APPLY_GOAL_FIX + Skill("maestro-ralph-beta")
-  → S_TICK_LOCATE   WHEN: post-goal-audit + all sub-goals met            DO: A_APPLY_GOAL_DONE + Skill("maestro-ralph-beta")
-  → S_TICK_LOCATE   WHEN: post-analyze-scope                             DO: A_APPLY_SCOPE_VERDICT + Skill("maestro-ralph-beta")
-  → S_TICK_LOCATE   WHEN: verdict == "fix"                              DO: A_APPLY_FIX + Skill("maestro-ralph-beta")
-  → S_TICK_LOCATE   WHEN: verdict == "escalate"                         DO: A_APPLY_ESCALATE + Skill("maestro-ralph-beta")
-  → S_TICK_LOCATE   WHEN: post-milestone + standard + next milestone    DO: A_ADVANCE_MILESTONE + Skill("maestro-ralph-beta")
+  → S_TICK_LOCATE   WHEN: verdict == "proceed"                          DO: A_APPLY_PROCEED + $maestro-ralph-beta
+  → S_TICK_LOCATE   WHEN: post-goal-audit + unmet sub-goals              DO: A_APPLY_GOAL_FIX + $maestro-ralph-beta
+  → S_TICK_LOCATE   WHEN: post-goal-audit + all sub-goals met            DO: A_APPLY_GOAL_DONE + $maestro-ralph-beta
+  → S_TICK_LOCATE   WHEN: post-analyze-scope                             DO: A_APPLY_SCOPE_VERDICT + $maestro-ralph-beta
+  → S_TICK_LOCATE   WHEN: verdict == "fix"                              DO: A_APPLY_FIX + $maestro-ralph-beta
+  → S_TICK_LOCATE   WHEN: verdict == "escalate"                         DO: A_APPLY_ESCALATE + $maestro-ralph-beta
+  → S_TICK_LOCATE   WHEN: post-milestone + standard + next milestone    DO: A_ADVANCE_MILESTONE + $maestro-ralph-beta
   → END             WHEN: post-milestone + standard + no next milestone DO: mark completed
   → END             WHEN: post-milestone + adhoc                        DO: mark completed (adhoc self-contained)
   → END             WHEN: post-debug-escalate (always STOP)              DO: A_PAUSE_ESCALATE
@@ -201,13 +201,13 @@ S_TICK_APPLY:
   GUARD: confidence_score < 60 AND proceed → override to fix
   GUARD: confidence_score > 95 AND fix AND retry > 0 → suggest proceed
   GUARD: auto_confirm → skip user prompt, apply adjusted verdict
-  GUARD: not auto_confirm → AskUserQuestion with override options
+  GUARD: not auto_confirm → request_user_input with override options
 
 S_HANDLE_FAIL:
-  → S_TICK_LOCATE   WHEN: auto + not retried                            DO: A_RETRY + Skill("maestro-ralph-beta")
+  → S_TICK_LOCATE   WHEN: auto + not retried                            DO: A_RETRY + $maestro-ralph-beta
   → END             WHEN: auto + retried                                DO: A_PAUSE_SESSION
-  → S_TICK_LOCATE   WHEN: interactive + user selects retry              DO: A_RETRY + Skill("maestro-ralph-beta")
-  → S_TICK_LOCATE   WHEN: interactive + user selects skip               DO: A_SKIP_STEP + Skill("maestro-ralph-beta")
+  → S_TICK_LOCATE   WHEN: interactive + user selects retry              DO: A_RETRY + $maestro-ralph-beta
+  → S_TICK_LOCATE   WHEN: interactive + user selects skip               DO: A_SKIP_STEP + $maestro-ralph-beta
   → END             WHEN: interactive + user selects abort              DO: A_PAUSE_SESSION
 
 # === Terminal ===
@@ -219,8 +219,8 @@ S_COMPLETE:
   → END             DO: A_COMPLETE_SESSION
 
 S_FALLBACK:
-  → S_BUILD_PHASE   WHEN: user provides intent (no active session)      DO: AskUserQuestion
-  → S_TICK_LOCATE   WHEN: user selects "continue active session"         DO: A_RESUME_SESSION + Skill("maestro-ralph-beta")
+  → S_BUILD_PHASE   WHEN: user provides intent (no active session)      DO: request_user_input
+  → S_TICK_LOCATE   WHEN: user selects "continue active session"         DO: A_RESUME_SESSION + $maestro-ralph-beta
   → END             WHEN: user cancels OR no active session for resume
 
 </transitions>
@@ -252,7 +252,7 @@ S_FALLBACK:
 | 3 | 未派生 → 取最新 in-progress artifact 的 phase | false |
 | 4 | 仍无 → state.json 首个 incomplete phase | false |
 | 5 | position 将是 brainstorm/blueprint/init/roadmap/analyze-macro → phase = null | n/a |
-| 6 | 仍模糊 → `AskUserQuestion` | 由用户回答确定 |
+| 6 | 仍模糊 → `request_user_input` | 由用户回答确定 |
 
 **D-007 Phase→Milestone 反查**（数字 phase 已解析时）：
 ```
@@ -348,9 +348,9 @@ resolve_milestone(phase_number):
 | intent 显式指定 phase 编号（如 "phase 2"、"P3"） | `independent` |
 | milestone 仅含 1 个 phase | `independent` |
 | milestone 含多个 phase + `auto_confirm` | `unified` |
-| milestone 含多个 phase + 非 `auto_confirm` | → AskUserQuestion |
+| milestone 含多个 phase + 非 `auto_confirm` | → request_user_input |
 
-**AskUserQuestion** (仅当 milestone 含 ≥2 phase 且非 auto_confirm):
+**request_user_input** (仅当 milestone 含 ≥2 phase 且非 auto_confirm):
 
 ```
 question: "当前里程碑含 {N} 个 phase，选择规划模式？"
@@ -373,7 +373,7 @@ options:
 | named single file/function/bug, "fix X", "add Y to Z" | narrow | skip — auto-derive |
 | otherwise | medium | clarify unless auto_confirm |
 
-**2. Clarify boundary** (broad/medium) — `AskUserQuestion`, ≤3 rounds, options pre-filled from intent + a quick Glob/Grep scan of the target module:
+**2. Clarify boundary** (broad/medium) — `request_user_input`, ≤3 rounds, options pre-filled from intent + a quick Glob/Grep scan of the target module:
 
 | Round | Question | Drives |
 |-------|----------|--------|
@@ -655,7 +655,7 @@ Write enriched args back to status.json.
    - 删除 `goal-audit` 之前未完成的 `roadmap` + `analyze` (phase) step
    - 下一个未完成的 `plan` step → `maestro-plan --from analyze:{analyze_macro_id}`，去掉 `{phase}`，`source_artifact_ref = analyze:{analyze_macro_id}`
    - 后续 `execute` / `verify` 同 standalone scope
-4. `unknown`：非 auto_confirm → AskUserQuestion 二选一（large / medium-small）；auto_confirm → 默认 large
+4. `unknown`：非 auto_confirm → request_user_input 二选一（large / medium-small）；auto_confirm → 默认 large
 5. release 协议 — 完成分支；reindex
 6. Display: ◆ Scope verdict: {verdict} → {kept|collapsed to standalone via analyze:{ANL_ID}}
 
@@ -690,13 +690,13 @@ Write enriched args back to status.json.
 ### A_PAUSE_SESSION
 
 `session.status = "paused"` (CLI 通过 `ralph complete N --status BLOCKED` 自动写；手动场景直接编辑)
-Display: `[{index}/{total}] ✗ {step.skill} 失败，会话已暂停。/maestro-ralph-beta continue 恢复。`
+Display: `[{index}/{total}] ✗ {step.skill} 失败，会话已暂停。$maestro-ralph-beta continue 恢复。`
 
 ### A_PAUSE_ESCALATE
 
 1. `session.status = "paused"`
 2. Display: ◆ 已达最大重试次数，debug 已执行。请人工介入。
-3. Display: /maestro-ralph-beta continue 恢复
+3. Display: $maestro-ralph-beta continue 恢复
 
 ### A_COMPLETE_SESSION
 
@@ -847,7 +847,7 @@ decomposition 产出后，链路概览之后逐字显示：
 ```
 📋 任务分解完成。可随时复制以下 /goal 设定终止条件：
 
-/goal 直到 {session_dir}/status.json 的 task_decomposition[*] 与 steps[*] 全部 completion_confirmed=true 才停。每轮以 status.json 为唯一行动手册，通过 /maestro-ralph-beta 推进 tick；decision 节点由 ralph 内联评估。禁止手动执行 skill 或修改 boundary_contract.out_of_scope。
+/goal 直到 {session_dir}/status.json 的 task_decomposition[*] 与 steps[*] 全部 completion_confirmed=true 才停。每轮以 status.json 为唯一行动手册，通过 $maestro-ralph-beta 推进 tick；decision 节点由 ralph 内联评估。禁止手动执行 skill 或修改 boundary_contract.out_of_scope。
 ```
 
 ### Error Codes
@@ -873,7 +873,7 @@ decomposition 产出后，链路概览之后逐字显示：
 
 ### Success Criteria
 
-- [ ] Tick 末尾自调用 `Skill("maestro-ralph-beta")`，直到全部 `completion_confirmed` 或 paused
+- [ ] Tick 末尾自调用 `$maestro-ralph-beta`，直到全部 `completion_confirmed` 或 paused
 - [ ] 同一 session 同时仅一个 step 持 `active_step_index`；切换前必经 release
 - [ ] Decision step 全程不调 `maestro ralph next` / `complete`，由 maestro-ralph-beta 内联评估并 release
 - [ ] `task_decomposition` 存在时，chain 含 `decision:post-goal-audit`，且最终 `task_decomposition_all_done == true` 才允许 S_COMPLETE

package/.codex/skills/maestro-ralph-execute/SKILL.md

@@ -8,9 +8,9 @@ allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
 Single-step executor for ralph (adaptive) and maestro (static) sessions.
 Each invocation: locate session → find next step → resolve args → execute → update → self-invoke next.
 
-Mutual invocation with `/maestro-ralph` forms a self-perpetuating work loop.
+Mutual invocation with `$maestro-ralph` forms a self-perpetuating work loop.
 
-**Session**: `.workflow/.maestro/{session_id}/status.json` — 工作流唯一真源。session_id 格式 `ralph-{YYYYMMDD-HHmmss}`（/maestro-ralph 创建，自适应链）或 `maestro-{YYYYMMDD-HHmmss}`（/maestro 创建，静态链）。两类都由本 skill 推进；省略 `[session-id]` 时取最新 `status=="running"`。Schema 详见 `/maestro-ralph` 的 Session Schema。
+**Session**: `.workflow/.maestro/{session_id}/status.json` — 工作流唯一真源。session_id 格式 `ralph-{YYYYMMDD-HHmmss}`（$maestro-ralph 创建，自适应链）或 `maestro-{YYYYMMDD-HHmmss}`（$maestro 创建，静态链）。两类都由本 skill 推进；省略 `[session-id]` 时取最新 `status=="running"`。Schema 详见 `$maestro-ralph` 的 Session Schema。
 </purpose>
 
 <context>
@@ -92,7 +92,7 @@ S_COMPLETE:
   → END             DO: A_COMPLETE_SESSION
 
 S_FALLBACK:
-  → END             DO: display "无运行中的会话。使用 /maestro 或 /maestro-ralph 创建。"
+  → END             DO: display "无运行中的会话。使用 $maestro 或 $maestro-ralph 创建。"
 
 </transitions>
 
@@ -179,7 +179,7 @@ Write enriched args back to status.json.
 ### A_PAUSE_SESSION
 
 通常由 `ralph complete N --status BLOCKED --reason "..."` 触发，CLI 已写 `session.status = "paused"`。手动 pause 场景下直接编辑 status.json。
-Display: `[{index}/{total}] ✗ {step.skill} 失败，会话已暂停。/maestro-ralph continue 恢复。`
+Display: `[{index}/{total}] ✗ {step.skill} 失败，会话已暂停。$maestro-ralph continue 恢复。`
 
 ### A_COMPLETE_SESSION
 
@@ -213,7 +213,7 @@ Display: `[{index}/{total}] ✗ {step.skill} 失败，会话已暂停。/maestro
 
 | Code | Severity | Description | Recovery |
 |------|----------|-------------|----------|
-| E001 | error | No running session found | Suggest /maestro or /maestro-ralph |
+| E001 | error | No running session found | Suggest $maestro or $maestro-ralph |
 | E006 | error | command_path missing/unreachable for 执行 step | `ralph next` 拒绝；编辑 status.json 或重 build |
 | E007 | error | required_reading 引用文件缺失 | `ralph next` 拒绝；CLI stderr 列出缺失路径 |
 | E008 | error | `ralph complete` idx ≠ active_step_index | 编辑 status.json 修正一致性 |

package/.codex/skills/maestro-tools-execute/SKILL.md

@@ -2,7 +2,7 @@
 name: maestro-tools-execute
 description: Load and execute tool specs by role or name
 argument-hint: "[tool-name | --category <category>]"
-allowed-tools: Read, Write, Edit, Bash, Glob, Grep, AskUserQuestion
+allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
 ---
 
 <purpose>
@@ -44,7 +44,7 @@ maestro spec load --category <category>
 Extract tool entries from output, list available tools.
 
 **Empty args**:
-Load all tool entries, present to user with AskUserQuestion for selection.
+Load all tool entries, present to user with request_user_input for selection.
 
 ### Step 2: Display Tool
 
@@ -75,7 +75,7 @@ Follow the tool definition steps in order:
 
 **Blocker handling**:
 - Step fails → report error, ask user: retry / skip / abort
-- Needs user input → AskUserQuestion for parameters
+- Needs user input → request_user_input for parameters
 - Prerequisites unmet → show missing items, ask how to proceed
 
 ### Step 5: Report Results

package/.codex/skills/maestro-tools-register/SKILL.md

@@ -2,7 +2,7 @@
 name: maestro-tools-register
 description: Register tool specs - extract, generate, or optimize reusable process definitions
 argument-hint: "[description or intent]"
-allowed-tools: Read, Write, Edit, Bash, Glob, Grep, AskUserQuestion
+allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
 ---
 
 <purpose>
@@ -55,7 +55,7 @@ Parse $ARGUMENTS to determine mode:
 - Contains "optimize/improve" → optimize mode
 - Contains "promote" or references existing knowhow doc (path/ID) → promote mode
 - Other → generate mode
-- Empty → ask user with AskUserQuestion
+- Empty → ask user with request_user_input
 
 ### Step 2: Gather Information
 
@@ -65,7 +65,7 @@ Parse $ARGUMENTS to determine mode:
 
 **Generate mode**:
 - Confirm tool name, applicable roles, target scenario
-- If unclear, ask user with AskUserQuestion
+- If unclear, ask user with request_user_input
 
 **Optimize mode**:
 - Load existing tool: `maestro spec load --category coding --keyword <name>`