maestro-flow 0.5.0 → 0.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (95) hide show
  1. package/.agents/skills/codify-to-knowhow/phases/03-generate-specs.md +2 -1
  2. package/.agents/skills/manage-knowhow-capture/SKILL.md +4 -2
  3. package/.agy/skills/codify-to-knowhow/phases/03-generate-specs.md +2 -1
  4. package/.agy/skills/manage-knowhow-capture/SKILL.md +4 -2
  5. package/.claude/commands/manage-knowhow-capture.md +4 -2
  6. package/.claude/skills/codify-to-knowhow/phases/03-generate-specs.md +2 -1
  7. package/.codex/skills/codify-to-knowhow/SKILL.md +1 -1
  8. package/.codex/skills/learn-decompose/SKILL.md +144 -144
  9. package/.codex/skills/learn-follow/SKILL.md +83 -83
  10. package/.codex/skills/learn-investigate/SKILL.md +84 -84
  11. package/.codex/skills/learn-retro/SKILL.md +113 -113
  12. package/.codex/skills/learn-second-opinion/SKILL.md +116 -116
  13. package/.codex/skills/maestro/SKILL.md +11 -8
  14. package/.codex/skills/maestro-amend/SKILL.md +4 -4
  15. package/.codex/skills/maestro-analyze/SKILL.md +3 -3
  16. package/.codex/skills/maestro-blueprint/SKILL.md +4 -4
  17. package/.codex/skills/maestro-collab/SKILL.md +1 -1
  18. package/.codex/skills/maestro-companion/SKILL.md +4 -4
  19. package/.codex/skills/maestro-composer/SKILL.md +217 -217
  20. package/.codex/skills/maestro-grill/SKILL.md +1 -1
  21. package/.codex/skills/maestro-help/SKILL.md +30 -30
  22. package/.codex/skills/maestro-init/SKILL.md +1 -1
  23. package/.codex/skills/maestro-learn/SKILL.md +80 -80
  24. package/.codex/skills/maestro-merge/SKILL.md +76 -76
  25. package/.codex/skills/maestro-milestone-release/SKILL.md +74 -74
  26. package/.codex/skills/maestro-player/SKILL.md +3 -3
  27. package/.codex/skills/maestro-quick/SKILL.md +129 -129
  28. package/.codex/skills/maestro-ralph/SKILL.md +9 -9
  29. package/.codex/skills/maestro-ralph-beta/SKILL.md +34 -34
  30. package/.codex/skills/maestro-ralph-execute/SKILL.md +5 -5
  31. package/.codex/skills/maestro-tools-execute/SKILL.md +3 -3
  32. package/.codex/skills/maestro-tools-register/SKILL.md +3 -3
  33. package/.codex/skills/manage-codebase-rebuild/SKILL.md +412 -412
  34. package/.codex/skills/manage-codebase-refresh/SKILL.md +1 -1
  35. package/.codex/skills/manage-harvest/SKILL.md +99 -99
  36. package/.codex/skills/manage-issue-discover/SKILL.md +1 -1
  37. package/.codex/skills/manage-knowhow/SKILL.md +95 -95
  38. package/.codex/skills/manage-knowhow-capture/SKILL.md +137 -125
  39. package/.codex/skills/manage-status/SKILL.md +7 -7
  40. package/.codex/skills/manage-wiki/SKILL.md +55 -55
  41. package/.codex/skills/quality-auto-test/SKILL.md +1 -1
  42. package/.codex/skills/quality-debug/SKILL.md +8 -8
  43. package/.codex/skills/quality-refactor/SKILL.md +3 -3
  44. package/.codex/skills/quality-review/SKILL.md +1 -1
  45. package/.codex/skills/quality-sync/SKILL.md +111 -111
  46. package/.codex/skills/quality-test/SKILL.md +1 -1
  47. package/.codex/skills/spec-add/SKILL.md +2 -2
  48. package/.codex/skills/spec-load/SKILL.md +1 -1
  49. package/.codex/skills/spec-map/SKILL.md +204 -204
  50. package/.codex/skills/spec-remove/SKILL.md +75 -75
  51. package/.codex/skills/spec-setup/SKILL.md +2 -2
  52. package/.codex/skills/wiki-connect/SKILL.md +73 -73
  53. package/.codex/skills/wiki-digest/SKILL.md +87 -87
  54. package/dist/src/commands/install.d.ts.map +1 -1
  55. package/dist/src/commands/install.js +40 -10
  56. package/dist/src/commands/install.js.map +1 -1
  57. package/dist/src/i18n/locales/en.d.ts.map +1 -1
  58. package/dist/src/i18n/locales/en.js +4 -0
  59. package/dist/src/i18n/locales/en.js.map +1 -1
  60. package/dist/src/i18n/locales/zh.d.ts.map +1 -1
  61. package/dist/src/i18n/locales/zh.js +4 -0
  62. package/dist/src/i18n/locales/zh.js.map +1 -1
  63. package/dist/src/i18n/types.d.ts +4 -0
  64. package/dist/src/i18n/types.d.ts.map +1 -1
  65. package/dist/src/ralph/skill-scanner.d.ts.map +1 -1
  66. package/dist/src/ralph/skill-scanner.js +9 -3
  67. package/dist/src/ralph/skill-scanner.js.map +1 -1
  68. package/dist/src/tui/install-ui/InstallConfirm.d.ts +1 -0
  69. package/dist/src/tui/install-ui/InstallConfirm.d.ts.map +1 -1
  70. package/dist/src/tui/install-ui/InstallConfirm.js +3 -1
  71. package/dist/src/tui/install-ui/InstallConfirm.js.map +1 -1
  72. package/dist/src/tui/install-ui/InstallExecution.d.ts +2 -0
  73. package/dist/src/tui/install-ui/InstallExecution.d.ts.map +1 -1
  74. package/dist/src/tui/install-ui/InstallExecution.js +20 -0
  75. package/dist/src/tui/install-ui/InstallExecution.js.map +1 -1
  76. package/dist/src/tui/install-ui/InstallFlow.d.ts.map +1 -1
  77. package/dist/src/tui/install-ui/InstallFlow.js +13 -5
  78. package/dist/src/tui/install-ui/InstallFlow.js.map +1 -1
  79. package/dist/src/tui/install-ui/InstallHub.d.ts +2 -0
  80. package/dist/src/tui/install-ui/InstallHub.d.ts.map +1 -1
  81. package/dist/src/tui/install-ui/InstallHub.js +10 -0
  82. package/dist/src/tui/install-ui/InstallHub.js.map +1 -1
  83. package/dist/src/tui/install-ui/InstallResult.d.ts.map +1 -1
  84. package/dist/src/tui/install-ui/InstallResult.js +5 -1
  85. package/dist/src/tui/install-ui/InstallResult.js.map +1 -1
  86. package/dist/src/utils/update-notices.js +6 -0
  87. package/dist/src/utils/update-notices.js.map +1 -1
  88. package/package.json +1 -1
  89. package/workflows/agy-instructions.md +1 -1
  90. package/workflows/finish-work.md +1 -1
  91. package/workflows/impeccable/design.md +1 -0
  92. package/workflows/impeccable.md +1 -0
  93. package/workflows/knowhow.md +14 -8
  94. package/workflows/specs-add.md +1 -1
  95. package/workflows/specs-setup.md +2 -2
@@ -2,7 +2,7 @@
2
2
  name: maestro-help
3
3
  description: Maestro Flow command help system — search, browse, recommend commands, skills, agents, CLI tools, and workflows
4
4
  argument-hint: "[search <keyword>|workflow|skills|agents|cli|新手|下一步|<command-name>]"
5
- allowed-tools: Read, Grep, Glob, AskUserQuestion
5
+ allowed-tools: Read, Grep, Glob, request_user_input
6
6
  ---
7
7
 
8
8
  <purpose>
@@ -79,10 +79,10 @@ Mode 3 (Smart Recommendations) 需要检测项目状态:
79
79
  ```
80
80
  找到 N 个匹配命令:
81
81
 
82
- /maestro-analyze — 多维度分析
82
+ $maestro-analyze — 多维度分析
83
83
  分类: pipeline | 查看详情 →
84
84
 
85
- /maestro-plan — 任务规划
85
+ $maestro-plan — 任务规划
86
86
  分类: pipeline | 查看详情 →
87
87
  ...
88
88
  ```
@@ -90,7 +90,7 @@ Mode 3 (Smart Recommendations) 需要检测项目状态:
90
90
  ### Mode 2: Command Documentation
91
91
 
92
92
  1. 在 `catalog.json` commands[] 中定位命令
93
- 2. 通过 `source` 路径读取命令源文件(如 `../../commands/maestro-analyze.md`)
93
+ 2. 通过 `source` 路径读取命令源文件(如 `../../commands$maestro-analyze.md`)
94
94
  3. 提取 `<purpose>`、`argument-hint`、`<context>` 中的用法示例
95
95
  4. 如有对应 guide 文档,读取相关段落
96
96
 
@@ -108,16 +108,16 @@ Guide 映射:
108
108
 
109
109
  | 当前状态 | 推荐命令 | 原因 |
110
110
  |---------|---------|------|
111
- | 无 .workflow/ | `/maestro-init` | 项目未初始化 |
112
- | init 完成,无上游 context | `/maestro-brainstorm` 或 `/maestro-analyze "topic"` | 先探索再规划;brainstorm 发散,analyze 宏观探索影响面 |
113
- | analyze 完成,scope_verdict=large | `/maestro-roadmap --from analyze:ANL-xxx` | 大范围需求,需要 Milestone > Phase 分解 |
114
- | analyze 完成,scope_verdict=medium/small | `/maestro-plan --from analyze:ANL-xxx` | 跳过 roadmap 直达规划(Path C) |
115
- | roadmap 完成,phase=pending | `/maestro-analyze 1` | 微观分析:Phase 级深入探索 |
116
- | analyze (微观) 完成 | `/maestro-plan 1` | Phase 级规划 |
117
- | plan 完成 | `/maestro-execute` | 开始执行 |
118
- | execute 完成 | `/quality-review` | 进入质量管线 |
119
- | quality 全通过 | `/maestro-milestone-audit` | 里程碑审计 |
120
- | 所有 Phase 完成 | `/maestro-milestone-complete` | 关闭里程碑 |
111
+ | 无 .workflow/ | `$maestro-init` | 项目未初始化 |
112
+ | init 完成,无上游 context | `$maestro-brainstorm` 或 `$maestro-analyze "topic"` | 先探索再规划;brainstorm 发散,analyze 宏观探索影响面 |
113
+ | analyze 完成,scope_verdict=large | `$maestro-roadmap --from analyze:ANL-xxx` | 大范围需求,需要 Milestone > Phase 分解 |
114
+ | analyze 完成,scope_verdict=medium/small | `$maestro-plan --from analyze:ANL-xxx` | 跳过 roadmap 直达规划(Path C) |
115
+ | roadmap 完成,phase=pending | `$maestro-analyze 1` | 微观分析:Phase 级深入探索 |
116
+ | analyze (微观) 完成 | `$maestro-plan 1` | Phase 级规划 |
117
+ | plan 完成 | `$maestro-execute` | 开始执行 |
118
+ | execute 完成 | `$quality-review` | 进入质量管线 |
119
+ | quality 全通过 | `$maestro-milestone-audit` | 里程碑审计 |
120
+ | 所有 Phase 完成 | `$maestro-milestone-complete` | 关闭里程碑 |
121
121
 
122
122
  ### Mode 4: Workflow Guide
123
123
 
@@ -134,7 +134,7 @@ Guide 映射:
134
134
 
135
135
  **Path D — 小改动**:
136
136
  - `plan "fix auth bug"` → `execute` → `quality-review`
137
- - 快速: `/maestro-quick "功能描述"`
137
+ - 快速: `$maestro-quick "功能描述"`
138
138
  - 全自动: `/maestro -y "功能描述"`
139
139
 
140
140
  **Path E/F — 纯文档/纯探索**:
@@ -142,12 +142,12 @@ Guide 映射:
142
142
  - `brainstorm "idea"` → (供人决策)
143
143
 
144
144
  **Bug 修复**:
145
- - 快速: `/maestro-quick "Bug 描述"`
145
+ - 快速: `$maestro-quick "Bug 描述"`
146
146
  - Issue 闭环: discover → create → analyze --gaps → plan --gaps → execute → close
147
147
 
148
148
  **代码审查**:
149
- - `/quality-review` → `/quality-auto-test` → `/quality-test`
150
- - 失败循环: `/quality-debug` → `/maestro-plan --gaps` → `/maestro-execute`
149
+ - `$quality-review` → `$quality-auto-test` → `$quality-test`
150
+ - 失败循环: `$quality-debug` → `$maestro-plan --gaps` → `$maestro-execute`
151
151
 
152
152
  ### Mode 5: Beginner Onboarding
153
153
 
@@ -155,20 +155,20 @@ Guide 映射:
155
155
 
156
156
  | 命令 | 用途 | 何时使用 |
157
157
  |------|------|---------|
158
- | `/maestro` | 智能协调器 | 不确定用哪个命令时 |
159
- | `/maestro-init` | 初始化项目 | 首次使用 |
160
- | `/maestro-brainstorm` | 头脑风暴 | 新项目发散探索、多角色创意 |
161
- | `/maestro-blueprint` | 规格文档化 | 正式 7-phase 收敛规格链 |
162
- | `/maestro-analyze` | 双层分析 | 宏观: `"topic"` 探索影响面;微观: `1` Phase 级深入 |
163
- | `/maestro-roadmap` | 路线图编排 | scope_verdict=large 时,Milestone > Phase 分解 |
164
- | `/maestro-plan` | 规划 | 分析完成后,支持 `--from analyze:ANL-xxx` 直达 |
165
- | `/maestro-execute` | 执行 | 计划完成后 |
166
- | `/maestro-quick` | 快速任务 | 简单任务跳过管线 |
158
+ | `$maestro` | 智能协调器 | 不确定用哪个命令时 |
159
+ | `$maestro-init` | 初始化项目 | 首次使用 |
160
+ | `$maestro-brainstorm` | 头脑风暴 | 新项目发散探索、多角色创意 |
161
+ | `$maestro-blueprint` | 规格文档化 | 正式 7-phase 收敛规格链 |
162
+ | `$maestro-analyze` | 双层分析 | 宏观: `"topic"` 探索影响面;微观: `1` Phase 级深入 |
163
+ | `$maestro-roadmap` | 路线图编排 | scope_verdict=large 时,Milestone > Phase 分解 |
164
+ | `$maestro-plan` | 规划 | 分析完成后,支持 `--from analyze:ANL-xxx` 直达 |
165
+ | `$maestro-execute` | 执行 | 计划完成后 |
166
+ | `$maestro-quick` | 快速任务 | 简单任务跳过管线 |
167
167
 
168
168
  快速上手路径:
169
169
  1. `maestro install --force`
170
- 2. `/maestro-init`
171
- 3. `/maestro "任务描述"` — 自动选择最佳工作流
170
+ 2. `$maestro-init`
171
+ 3. `$maestro "任务描述"` — 自动选择最佳工作流
172
172
 
173
173
  ### Mode 6: Skill & Agent Browsing
174
174
 
@@ -208,7 +208,7 @@ Guide 映射:
208
208
  | E001 | error | catalog.json 读取失败 | 回退到 Glob 扫描 .claude/commands/*.md |
209
209
  | W001 | warning | 搜索无结果 | 模糊匹配最近命令,建议查看全部 |
210
210
  | W002 | warning | Source 文件不存在 | 仅展示 catalog 描述 |
211
- | W003 | warning | 项目未初始化 | 推荐先运行 /maestro-init |
211
+ | W003 | warning | 项目未初始化 | 推荐先运行 $maestro-init |
212
212
  </error_codes>
213
213
 
214
214
  <success_criteria>
@@ -123,7 +123,7 @@ Write collected configuration to `.workflow/config.json`.
123
123
  Run `Bash("maestro spec init")` to create empty seed files in `.workflow/specs/`.
124
124
 
125
125
  If project state is **code** (existing source files detected in Step 2):
126
- - Auto-trigger `Skill({ skill: "spec-setup" })` to scan codebase and populate specs with detected conventions
126
+ - Auto-trigger `$spec-setup` to scan codebase and populate specs with detected conventions
127
127
  - This runs unconditionally for `code` state — existing source means conventions can be extracted
128
128
 
129
129
  If project state is **empty** (greenfield, no source files found in Step 2):
@@ -1,80 +1,80 @@
1
- ---
2
- name: maestro-learn
3
- description: Route learning intent to learn-* commands
4
- argument-hint: "\"intent text\" [-y] [--dry-run] [--chain <name>]"
5
- allowed-tools: Read, Write, Edit, Bash, Glob, Grep, AskUserQuestion
6
- ---
7
-
8
- <purpose>
9
- Route learning requests to the optimal learn command or multi-step chain.
10
- Executes commands sequentially with session tracking.
11
-
12
- ```
13
- Intent → Route to Chain → Execute Steps → Session Summary
14
- ```
15
- </purpose>
16
-
17
- <context>
18
- $ARGUMENTS — learning intent text, or flags.
19
-
20
- **Flags:**
21
- - `-y, --yes` — Auto mode: skip confirmation
22
- - `--dry-run` — Show planned chain without executing
23
- - `--chain <name>` — Force specific chain
24
-
25
- **Chains:**
26
- | Chain | Steps | Use when |
27
- |-------|-------|----------|
28
- | `follow` | learn-follow | Read/understand code or docs |
29
- | `investigate` | learn-investigate | Answer "how/why" questions |
30
- | `decompose` | learn-decompose | Catalog patterns in a module |
31
- | `second-opinion` | learn-second-opinion | Get review/challenge on code |
32
- | `retro` | learn-retro --lens all | Full retrospective |
33
- | `deep-understand` | follow → decompose → second-opinion | Thorough module analysis |
34
- | `pattern-catalog` | decompose --save-spec --save-wiki → second-opinion --mode review | Full pattern extraction + review |
35
-
36
- **Session state:** `.workflow/knowhow/.maestro-learn/{session_id}/status.json`
37
- </context>
38
-
39
- <execution>
40
-
41
- ### Step 1: Parse & Route
42
-
43
- **Intent routing:**
44
- | Keywords | Route |
45
- |----------|-------|
46
- | File path (contains `/` or `\`) | `follow` |
47
- | read, follow, walk through, understand | `follow` |
48
- | why, how, what if, investigate | `investigate` |
49
- | pattern, decompose, catalog | `decompose` |
50
- | opinion, review, challenge, consult | `second-opinion` |
51
- | retro, git, commit, decision | `retro` |
52
- | thorough, deep | `deep-understand` |
53
-
54
- No match → present menu via AskUserQuestion. Max 1 clarification.
55
-
56
- ### Step 2: Resolve Target & Build Args
57
- Map chain to skill invocations. Extract target and flags from arguments.
58
-
59
- ### Step 3: Confirm & Execute
60
- - `--dry-run`: display chain and exit
61
- - Not `-y`: show plan, ask confirmation
62
- - Execute each step sequentially. On failure: retry/skip/abort
63
- - Write session `status.json`, display summary
64
- </execution>
65
-
66
- <error_codes>
67
- | Code | Severity | Condition | Recovery |
68
- |------|----------|-----------|----------|
69
- | E001 | error | No intent provided | Provide learning goal or use --chain |
70
- | E002 | error | Cannot determine intent | Rephrase or use --chain |
71
- | E005 | error | Invalid --chain name | Show valid chains |
72
- | W001 | warning | Intent ambiguous | Present options |
73
- </error_codes>
74
-
75
- <success_criteria>
76
- - [ ] Intent routed to correct chain
77
- - [ ] Session directory created with status.json
78
- - [ ] All chain steps executed
79
- - [ ] Session summary displayed with next-step routing
80
- </success_criteria>
1
+ ---
2
+ name: maestro-learn
3
+ description: Route learning intent to learn-* commands
4
+ argument-hint: "\"intent text\" [-y] [--dry-run] [--chain <name>]"
5
+ allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
6
+ ---
7
+
8
+ <purpose>
9
+ Route learning requests to the optimal learn command or multi-step chain.
10
+ Executes commands sequentially with session tracking.
11
+
12
+ ```
13
+ Intent → Route to Chain → Execute Steps → Session Summary
14
+ ```
15
+ </purpose>
16
+
17
+ <context>
18
+ $ARGUMENTS — learning intent text, or flags.
19
+
20
+ **Flags:**
21
+ - `-y, --yes` — Auto mode: skip confirmation
22
+ - `--dry-run` — Show planned chain without executing
23
+ - `--chain <name>` — Force specific chain
24
+
25
+ **Chains:**
26
+ | Chain | Steps | Use when |
27
+ |-------|-------|----------|
28
+ | `follow` | learn-follow | Read/understand code or docs |
29
+ | `investigate` | learn-investigate | Answer "how/why" questions |
30
+ | `decompose` | learn-decompose | Catalog patterns in a module |
31
+ | `second-opinion` | learn-second-opinion | Get review/challenge on code |
32
+ | `retro` | learn-retro --lens all | Full retrospective |
33
+ | `deep-understand` | follow → decompose → second-opinion | Thorough module analysis |
34
+ | `pattern-catalog` | decompose --save-spec --save-wiki → second-opinion --mode review | Full pattern extraction + review |
35
+
36
+ **Session state:** `.workflow/knowhow/.maestro-learn/{session_id}/status.json`
37
+ </context>
38
+
39
+ <execution>
40
+
41
+ ### Step 1: Parse & Route
42
+
43
+ **Intent routing:**
44
+ | Keywords | Route |
45
+ |----------|-------|
46
+ | File path (contains `/` or `\`) | `follow` |
47
+ | read, follow, walk through, understand | `follow` |
48
+ | why, how, what if, investigate | `investigate` |
49
+ | pattern, decompose, catalog | `decompose` |
50
+ | opinion, review, challenge, consult | `second-opinion` |
51
+ | retro, git, commit, decision | `retro` |
52
+ | thorough, deep | `deep-understand` |
53
+
54
+ No match → present menu via request_user_input. Max 1 clarification.
55
+
56
+ ### Step 2: Resolve Target & Build Args
57
+ Map chain to skill invocations. Extract target and flags from arguments.
58
+
59
+ ### Step 3: Confirm & Execute
60
+ - `--dry-run`: display chain and exit
61
+ - Not `-y`: show plan, ask confirmation
62
+ - Execute each step sequentially. On failure: retry/skip/abort
63
+ - Write session `status.json`, display summary
64
+ </execution>
65
+
66
+ <error_codes>
67
+ | Code | Severity | Condition | Recovery |
68
+ |------|----------|-----------|----------|
69
+ | E001 | error | No intent provided | Provide learning goal or use --chain |
70
+ | E002 | error | Cannot determine intent | Rephrase or use --chain |
71
+ | E005 | error | Invalid --chain name | Show valid chains |
72
+ | W001 | warning | Intent ambiguous | Present options |
73
+ </error_codes>
74
+
75
+ <success_criteria>
76
+ - [ ] Intent routed to correct chain
77
+ - [ ] Session directory created with status.json
78
+ - [ ] All chain steps executed
79
+ - [ ] Session summary displayed with next-step routing
80
+ </success_criteria>
@@ -1,76 +1,76 @@
1
- ---
2
- name: maestro-merge
3
- description: Merge milestone worktree branch back to main
4
- argument-hint: "-m <milestone-number> [--force] [--dry-run] [--no-cleanup] [--continue]"
5
- allowed-tools: Read, Write, Edit, Bash, Glob, Grep, AskUserQuestion
6
- ---
7
-
8
- <purpose>
9
- Merge a completed milestone worktree branch back into main, sync scratch artifacts,
10
- and reconcile artifact registry. Two-phase approach: git merge first (source code),
11
- artifact sync second (only after git succeeds). Prevents partial state corruption
12
- when merge conflicts occur.
13
- </purpose>
14
-
15
- <required_reading>
16
- @~/.maestro/workflows/merge.md
17
- </required_reading>
18
-
19
- <context>
20
- $ARGUMENTS — milestone number and optional flags.
21
-
22
- **Flags:**
23
- - `-m <N>` or bare `<N>`: Milestone number
24
- - `--force`: Merge even if milestone has incomplete artifacts
25
- - `--dry-run`: Show what would be merged
26
- - `--no-cleanup`: Keep worktree and branch after merge
27
- - `--continue`: Resume merge paused due to git conflict
28
-
29
- **Merge sequence:**
30
- 1. Registry health check → 2. Milestone artifact completeness validation →
31
- 3. Pre-merge rebase → 4. Git merge (source) → 5. Scratch artifact sync →
32
- 6. Artifact registry reconciliation → 7. Cleanup
33
-
34
- **Phase 2 detail:**
35
- - Copy worktree `scratch/*` to main `.workflow/scratch/`
36
- - Merge `state.json.artifacts[]` entries (worktree wins for same id)
37
- - Remove milestone `"forked"` flag in main state.json
38
- </context>
39
-
40
- <execution>
41
- Follow '~/.maestro/workflows/merge.md' completely.
42
-
43
- **Knowledge inquiry on completion:**
44
- After successful merge, ask user once: "Record milestone learnings?" If yes, persist via `maestro spec add learning "<title>" "<insight>" --keywords <kw1>,<kw2> --description "<summary>"`.
45
-
46
- **Next steps:**
47
- - View dashboard → `$manage-status`
48
- - Audit milestone → `$maestro-milestone-audit`
49
- </execution>
50
-
51
- <invariants>
52
- **Phase order enforcement** — git merge MUST complete before artifact sync. Do NOT sync artifacts until git merge succeeds — prevents partial state corruption.
53
- </invariants>
54
-
55
- <error_codes>
56
- | Code | Severity | Condition | Recovery |
57
- |------|----------|-----------|----------|
58
- | E001 | error | Running inside a worktree | Run from main worktree |
59
- | E002 | error | No worktree registry found | Nothing to merge |
60
- | E003 | error | --continue but no merge state | Start fresh merge |
61
- | E004 | error | No milestone number | Provide `-m <N>` |
62
- | W001 | warning | Stale registry entries | Auto-cleaned |
63
- | W002 | warning | Incomplete artifacts without --force | Confirm or use --force |
64
- | W003 | warning | Conflict pulling main into worktree | Resolve first |
65
- </error_codes>
66
-
67
- <success_criteria>
68
- - [ ] Registry health check passed
69
- - [ ] Pre-merge rebase successful
70
- - [ ] Git merge completed (or conflicts resolved via --continue)
71
- - [ ] Scratch artifacts synced to main `.workflow/scratch/`
72
- - [ ] `state.json.artifacts[]` reconciled (worktree entries merged)
73
- - [ ] Milestone `"forked"` flag removed
74
- - [ ] Worktree removed and branch deleted (unless --no-cleanup)
75
- - [ ] Registry updated
76
- </success_criteria>
1
+ ---
2
+ name: maestro-merge
3
+ description: Merge milestone worktree branch back to main
4
+ argument-hint: "-m <milestone-number> [--force] [--dry-run] [--no-cleanup] [--continue]"
5
+ allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
6
+ ---
7
+
8
+ <purpose>
9
+ Merge a completed milestone worktree branch back into main, sync scratch artifacts,
10
+ and reconcile artifact registry. Two-phase approach: git merge first (source code),
11
+ artifact sync second (only after git succeeds). Prevents partial state corruption
12
+ when merge conflicts occur.
13
+ </purpose>
14
+
15
+ <required_reading>
16
+ @~/.maestro/workflows/merge.md
17
+ </required_reading>
18
+
19
+ <context>
20
+ $ARGUMENTS — milestone number and optional flags.
21
+
22
+ **Flags:**
23
+ - `-m <N>` or bare `<N>`: Milestone number
24
+ - `--force`: Merge even if milestone has incomplete artifacts
25
+ - `--dry-run`: Show what would be merged
26
+ - `--no-cleanup`: Keep worktree and branch after merge
27
+ - `--continue`: Resume merge paused due to git conflict
28
+
29
+ **Merge sequence:**
30
+ 1. Registry health check → 2. Milestone artifact completeness validation →
31
+ 3. Pre-merge rebase → 4. Git merge (source) → 5. Scratch artifact sync →
32
+ 6. Artifact registry reconciliation → 7. Cleanup
33
+
34
+ **Phase 2 detail:**
35
+ - Copy worktree `scratch/*` to main `.workflow/scratch/`
36
+ - Merge `state.json.artifacts[]` entries (worktree wins for same id)
37
+ - Remove milestone `"forked"` flag in main state.json
38
+ </context>
39
+
40
+ <execution>
41
+ Follow '~/.maestro/workflows/merge.md' completely.
42
+
43
+ **Knowledge inquiry on completion:**
44
+ After successful merge, ask user once: "Record milestone learnings?" If yes, persist via `maestro spec add learning "<title>" "<insight>" --keywords <kw1>,<kw2> --description "<summary>"`.
45
+
46
+ **Next steps:**
47
+ - View dashboard → `$manage-status`
48
+ - Audit milestone → `$maestro-milestone-audit`
49
+ </execution>
50
+
51
+ <invariants>
52
+ **Phase order enforcement** — git merge MUST complete before artifact sync. Do NOT sync artifacts until git merge succeeds — prevents partial state corruption.
53
+ </invariants>
54
+
55
+ <error_codes>
56
+ | Code | Severity | Condition | Recovery |
57
+ |------|----------|-----------|----------|
58
+ | E001 | error | Running inside a worktree | Run from main worktree |
59
+ | E002 | error | No worktree registry found | Nothing to merge |
60
+ | E003 | error | --continue but no merge state | Start fresh merge |
61
+ | E004 | error | No milestone number | Provide `-m <N>` |
62
+ | W001 | warning | Stale registry entries | Auto-cleaned |
63
+ | W002 | warning | Incomplete artifacts without --force | Confirm or use --force |
64
+ | W003 | warning | Conflict pulling main into worktree | Resolve first |
65
+ </error_codes>
66
+
67
+ <success_criteria>
68
+ - [ ] Registry health check passed
69
+ - [ ] Pre-merge rebase successful
70
+ - [ ] Git merge completed (or conflicts resolved via --continue)
71
+ - [ ] Scratch artifacts synced to main `.workflow/scratch/`
72
+ - [ ] `state.json.artifacts[]` reconciled (worktree entries merged)
73
+ - [ ] Milestone `"forked"` flag removed
74
+ - [ ] Worktree removed and branch deleted (unless --no-cleanup)
75
+ - [ ] Registry updated
76
+ </success_criteria>
@@ -1,74 +1,74 @@
1
- ---
2
- name: maestro-milestone-release
3
- description: Bump version, generate changelog, tag milestone
4
- argument-hint: "[<version>] [--bump patch|minor|major] [--dry-run] [--no-tag] [--no-push]"
5
- allowed-tools: Read, Write, Edit, Bash, Glob, Grep, AskUserQuestion
6
- ---
7
-
8
- <purpose>
9
- Package a completed milestone into a releasable version. Bumps project version in manifest,
10
- generates CHANGELOG.md entry from phase/milestone summaries and git log, creates annotated
11
- git tag, optionally pushes to remote. Runs after `/maestro-milestone-complete`.
12
- </purpose>
13
-
14
- <required_reading>
15
- @~/.maestro/workflows/milestone-release.md
16
- </required_reading>
17
-
18
- <context>
19
- $ARGUMENTS — optional explicit version and flags.
20
-
21
- **Flags:**
22
- - `<version>` — Explicit version (e.g. `1.2.0`). If omitted, derived from `--bump`.
23
- - `--bump patch|minor|major` — Semver bump (default: `minor`)
24
- - `--dry-run` — Compute version + changelog without writing
25
- - `--no-tag` — Skip git tag creation
26
- - `--no-push` — Skip `git push --follow-tags`
27
-
28
- **Preconditions:**
29
- - Current milestone completed (audit PASS + milestone-complete run)
30
- - Working tree clean (no uncommitted changes) unless `--dry-run`
31
- </context>
32
-
33
- <execution>
34
- Follow '~/.maestro/workflows/milestone-release.md' completely.
35
-
36
- **Flow:** Validate preconditions → Resolve version → Collect changes → Generate CHANGELOG →
37
- Bump manifest → Commit → Tag → Push
38
-
39
- **Report:**
40
- ```
41
- === RELEASE COMPLETE ===
42
- Version: v{previous} → v{new}
43
- Milestone: {name}
44
- Tag: v{new} {pushed|local-only}
45
- Changelog: {N} entries
46
- ```
47
- </execution>
48
-
49
- <invariants>
50
- **Prerequisite enforcement** — milestone MUST be completed (audit PASS + milestone-complete run). Working tree MUST be clean. Artifact verification: CHANGELOG.md entry, version manifest update, release commit, git tag (unless --no-tag) all MUST exist before reporting completion.
51
- </invariants>
52
-
53
- <error_codes>
54
- | Code | Severity | Condition | Recovery |
55
- |------|----------|-----------|----------|
56
- | E001 | error | Milestone not completed | Run `$maestro-milestone-complete` first |
57
- | E002 | error | Audit verdict not PASS | Re-run `$maestro-milestone-audit` |
58
- | E003 | error | Working tree not clean | Commit or stash changes |
59
- | E004 | error | Version manifest not found | Add manifest or pass explicit version |
60
- | E005 | error | Version not greater than current | Choose higher version |
61
- | W001 | warning | No changes since last tag | Confirm release is desired |
62
- | W002 | warning | Remote push failed | Retry `git push --follow-tags` |
63
- </error_codes>
64
-
65
- <success_criteria>
66
- - [ ] Preconditions validated
67
- - [ ] Target version computed and greater than previous
68
- - [ ] Version manifest(s) updated
69
- - [ ] CHANGELOG.md entry with milestone summary + grouped changes
70
- - [ ] Release commit created
71
- - [ ] Annotated git tag created (unless --no-tag)
72
- - [ ] Pushed to remote (unless --no-push)
73
- - [ ] state.json updated with last_release_version
74
- </success_criteria>
1
+ ---
2
+ name: maestro-milestone-release
3
+ description: Bump version, generate changelog, tag milestone
4
+ argument-hint: "[<version>] [--bump patch|minor|major] [--dry-run] [--no-tag] [--no-push]"
5
+ allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
6
+ ---
7
+
8
+ <purpose>
9
+ Package a completed milestone into a releasable version. Bumps project version in manifest,
10
+ generates CHANGELOG.md entry from phase/milestone summaries and git log, creates annotated
11
+ git tag, optionally pushes to remote. Runs after `$maestro-milestone-complete`.
12
+ </purpose>
13
+
14
+ <required_reading>
15
+ @~/.maestro/workflows/milestone-release.md
16
+ </required_reading>
17
+
18
+ <context>
19
+ $ARGUMENTS — optional explicit version and flags.
20
+
21
+ **Flags:**
22
+ - `<version>` — Explicit version (e.g. `1.2.0`). If omitted, derived from `--bump`.
23
+ - `--bump patch|minor|major` — Semver bump (default: `minor`)
24
+ - `--dry-run` — Compute version + changelog without writing
25
+ - `--no-tag` — Skip git tag creation
26
+ - `--no-push` — Skip `git push --follow-tags`
27
+
28
+ **Preconditions:**
29
+ - Current milestone completed (audit PASS + milestone-complete run)
30
+ - Working tree clean (no uncommitted changes) unless `--dry-run`
31
+ </context>
32
+
33
+ <execution>
34
+ Follow '~/.maestro/workflows/milestone-release.md' completely.
35
+
36
+ **Flow:** Validate preconditions → Resolve version → Collect changes → Generate CHANGELOG →
37
+ Bump manifest → Commit → Tag → Push
38
+
39
+ **Report:**
40
+ ```
41
+ === RELEASE COMPLETE ===
42
+ Version: v{previous} → v{new}
43
+ Milestone: {name}
44
+ Tag: v{new} {pushed|local-only}
45
+ Changelog: {N} entries
46
+ ```
47
+ </execution>
48
+
49
+ <invariants>
50
+ **Prerequisite enforcement** — milestone MUST be completed (audit PASS + milestone-complete run). Working tree MUST be clean. Artifact verification: CHANGELOG.md entry, version manifest update, release commit, git tag (unless --no-tag) all MUST exist before reporting completion.
51
+ </invariants>
52
+
53
+ <error_codes>
54
+ | Code | Severity | Condition | Recovery |
55
+ |------|----------|-----------|----------|
56
+ | E001 | error | Milestone not completed | Run `$maestro-milestone-complete` first |
57
+ | E002 | error | Audit verdict not PASS | Re-run `$maestro-milestone-audit` |
58
+ | E003 | error | Working tree not clean | Commit or stash changes |
59
+ | E004 | error | Version manifest not found | Add manifest or pass explicit version |
60
+ | E005 | error | Version not greater than current | Choose higher version |
61
+ | W001 | warning | No changes since last tag | Confirm release is desired |
62
+ | W002 | warning | Remote push failed | Retry `git push --follow-tags` |
63
+ </error_codes>
64
+
65
+ <success_criteria>
66
+ - [ ] Preconditions validated
67
+ - [ ] Target version computed and greater than previous
68
+ - [ ] Version manifest(s) updated
69
+ - [ ] CHANGELOG.md entry with milestone summary + grouped changes
70
+ - [ ] Release commit created
71
+ - [ ] Annotated git tag created (unless --no-tag)
72
+ - [ ] Pushed to remote (unless --no-push)
73
+ - [ ] state.json updated with last_release_version
74
+ </success_criteria>
@@ -2,7 +2,7 @@
2
2
  name: maestro-player
3
3
  description: Play workflow templates with checkpoint resume
4
4
  argument-hint: "<template-slug|path> [--context key=value...] [-c [session-id]] [--list] [--dry-run]"
5
- allowed-tools: spawn_agents_on_csv, Read, Write, Edit, Bash, Glob, Grep, AskUserQuestion
5
+ allowed-tools: spawn_agents_on_csv, Read, Write, Edit, Bash, Glob, Grep, request_user_input
6
6
  ---
7
7
 
8
8
  <purpose>
@@ -123,7 +123,7 @@ S_COMPLETE:
123
123
 
124
124
  1. Resolve template: absolute/relative/slug → index.json lookup
125
125
  2. Parse --context key=value, validate template JSON
126
- 3. Collect missing required vars via AskUserQuestion
126
+ 3. Collect missing required vars via request_user_input
127
127
  4. Bind {variable} placeholders (leave {N-xxx.field}/{prev_*} for runtime)
128
128
 
129
129
  ### A_INIT_SESSION
@@ -135,7 +135,7 @@ S_COMPLETE:
135
135
 
136
136
  ### A_EXECUTE_WAVE
137
137
 
138
- 1. **Checkpoint**: handle inline — save snapshot, update context.last_checkpoint, mark completed. If auto_continue==false: AskUserQuestion (Continue/Pause/Abort).
138
+ 1. **Checkpoint**: handle inline — save snapshot, update context.last_checkpoint, mark completed. If auto_continue==false: request_user_input (Continue/Pause/Abort).
139
139
 
140
140
  2. **Skill nodes**: resolve runtime references → write wave-{N}.csv (only rows with status == "pending") → spawn:
141
141
  ```