pi-maestro-flow 0.2.0 → 0.3.0

package/skills/maestro/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: maestro
 description: "Auto-route intent to optimal command chain Arguments: <intent> [-y] [-c] [--dry-run] [--super]"
-allowed-tools: Read Write Edit Bash Glob Grep Agent AskUserQuestion TodoWrite
+allowed-tools: Read Write Edit Bash Glob Grep teammate maestro
 ---
 
 <purpose>
@@ -9,10 +9,9 @@ Orchestrate all maestro commands: classify intent → select chain → create se
 Session: `.workflow/.maestro/{session_id}/status.json`.
 </purpose>
 
-<deferred_reading>
-- [maestro.md](~/.maestro/workflows/maestro.md) — read at execution start for intent analysis + chain selection
-- [maestro-super.md](~/.maestro/workflows/maestro-super.md) — read when `--super` flag active
-</deferred_reading>
+> **Reference files** (read when needed):
+> - [maestro.md](~/.pi/agent/packages/pi-maestro-flow/workflows/maestro.md) — read at execution start for intent analysis + chain selection
+> - [maestro-super.md](~/.pi/agent/packages/pi-maestro-flow/workflows/maestro-super.md) — read when `--super` flag active
 
 <context>
 $ARGUMENTS — user intent text, or special keywords.
@@ -95,10 +94,10 @@ S_CONFIRM:
   → END           WHEN: user cancels
 
 S_DISPATCH:
-  → END           DO: Skill({ skill: "maestro-ralph-execute" })
+  → END           DO: invoke /skill: "maestro-ralph-execute" })
 
 S_FALLBACK:
-  → S_CLASSIFY    WHEN: user provides new intent           DO: AskUserQuestion
+  → S_CLASSIFY    WHEN: user provides new intent           DO: user prompt
   → END           WHEN: user cancels
 
 </transitions>
@@ -117,7 +116,7 @@ S_FALLBACK:
 
 ### A_CLASSIFY_INTENT
 
-1. Read `~/.maestro/workflows/maestro.md` from deferred_reading
+1. Read `~/.pi/agent/packages/pi-maestro-flow/workflows/maestro.md` from deferred_reading
 2. Match intent to task_type via chain catalog (semantic)
 3. Select chain from chainMap，遵循拓扑约束：
    - 压力测试/拷问/验证假设/grill/stress-test → `grill`（**-y 模式透传 `-y` 到 grill，grill 以 Auto mode 执行，不跳过**）
@@ -133,7 +132,7 @@ S_FALLBACK:
 
 ### A_CLARIFY
 
-1. `AskUserQuestion` with parsed intent + available chain options
+1. `user prompt` with parsed intent + available chain options
 2. Re-classify with user response
 
 ### A_DECOMPOSE_TASKS
@@ -141,7 +140,7 @@ S_FALLBACK:
 设 `session.decomposition_owner = "maestro"`。下游 ralph 只消费不二次提问（invariant 4）。Condensed:
 
 1. 分类意图广度。narrow / 单步 / `{status,init,quick}` 链跳过
-2. broad/medium → `AskUserQuestion` ≤3 轮：Scope / Constraints / Definition of Done
+2. broad/medium → `user prompt` ≤3 轮：Scope / Constraints / Definition of Done
 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（execute/review/test）之后、`milestone-complete` 之前追加 `decision:post-goal-audit`。ralph-execute 在该节点按需动态生长 `steps[]`

package/skills/maestro-amend/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-amend
 description: "Generate overlays to fix workflow command deficiencies Arguments: [description] [--from-verify <dir>] [--from-review <dir>] [--from-session <id>] [--from-issues ISS-xxx,...] [--scan] [--dry-run] [-y]"
-allowed-tools: Read Write Bash Glob Grep AskUserQuestion
+allowed-tools: Read Write Bash Glob Grep maestro
 ---
 
 <purpose>
@@ -9,7 +9,7 @@ Signal-driven overlay generator — collect workflow deficiency signals from mul
 </purpose>
 
 <required_reading>
-@~/.maestro/workflows/overlays.md
+Read and follow `~/.pi/agent/packages/pi-maestro-flow/workflows/overlays.md`.
 @~/.maestro/cli-tools.json
 </required_reading>
 
@@ -27,7 +27,7 @@ $ARGUMENTS — optional description and/or source flags.
 | `--scan` | Auto-scan .workflow/ | Discover all workflow-related signals |
 | _(positional text)_ | User description | Direct observation |
 
-Multiple combinable. No flags + no description → interactive (scan + AskUserQuestion).
+Multiple combinable. No flags + no description → interactive (scan + user prompt).
 
 **Control**: `--dry-run` (preview, don't install), `-y` (skip confirmations)
 

package/skills/maestro-analyze/SKILL.md

@@ -1,22 +1,19 @@
 ---
 name: maestro-analyze
 description: "Use when a topic needs structured multi-dimensional investigation before planning or decision-making Arguments: [milestone|topic] [-y] [-c] [-q] [--gaps [ISS-ID]]"
-allowed-tools: Read Write Edit Bash Glob Grep Agent AskUserQuestion
+allowed-tools: Read Write Edit Bash Glob Grep teammate maestro
 ---
 
 <purpose>
 Multi-dimensional analysis of a proposal, decision, or architecture choice via CLI-assisted exploration and interactive discussion. Produces analysis.md (6-dimension scoring), context.md (Locked/Free/Deferred decisions), conclusions.json, and discussion.md with Go/No-Go recommendation. Use `--gaps` for issue root cause analysis feeding `plan --gaps`.
 </purpose>
 
-<required_reading>
-@~/.maestro/workflows/analyze.md
-</required_reading>
+> **Required**: Read `~/.pi/agent/packages/pi-maestro-flow/workflows/analyze.md` before proceeding.
 
-<deferred_reading>
-- [state.json](~/.maestro/templates/state.json) — read when registering artifact
-- [issue-gaps-analyze.md](~/.maestro/workflows/issue-gaps-analyze.md) — read when --gaps is triggered
-- [boundary-grill.md](~/.maestro/workflows/boundary-grill.md) — read when boundary conflicts detected (between Phase 4 and Phase 5)
-</deferred_reading>
+> **Reference files** (read when needed):
+> - [state.json](~/.pi/agent/packages/pi-maestro-flow/templates/state.json) — read when registering artifact
+> - [issue-gaps-analyze.md](~/.pi/agent/packages/pi-maestro-flow/workflows/issue-gaps-analyze.md) — read when --gaps is triggered
+> - [boundary-grill.md](~/.pi/agent/packages/pi-maestro-flow/workflows/boundary-grill.md) — read when boundary conflicts detected (between Phase 4 and Phase 5)
 
 <context>
 $ARGUMENTS -- milestone number for micro mode, topic text for macro/adhoc mode, no args for current milestone.
@@ -64,7 +61,7 @@ Output directory format, artifact registration schema, and output artifact listi
 </context>
 
 <interview_protocol>
-Follows @~/.maestro/workflows/interview-mechanics.md standard.
+Follows `~/.pi/agent/packages/pi-maestro-flow/workflows/interview-mechanics.md` standard.
 
 **Interaction mode**: convergent menu-driven
 **Decision tree** (strict order): scope (phase / topic / milestone-wide / adhoc / --gaps) → depth (quick / standard / deep) → dimensions (which of the 6 to keep) → Go/No-Go threshold
@@ -76,11 +73,11 @@ Follows @~/.maestro/workflows/interview-mechanics.md standard.
 </interview_protocol>
 
 <execution>
-Follow '~/.maestro/workflows/analyze.md' completely.
+Follow '~/.pi/agent/packages/pi-maestro-flow/workflows/analyze.md' completely.
 
 ### --gaps Mode
 
-When `--gaps` is present, follow `~/.maestro/workflows/issue-gaps-analyze.md` instead of the standard pipeline.
+When `--gaps` is present, follow `~/.pi/agent/packages/pi-maestro-flow/workflows/issue-gaps-analyze.md` instead of the standard pipeline.
 </execution>
 
 <completion>
@@ -125,7 +122,7 @@ Status verdicts:
 
 ### Session seal
 
-@~/.maestro/workflows/finish-work.md — SESSION_DIR=OUTPUT_DIR, SESSION_TYPE=analyze, SESSION_ID={artifact_id}, LINKED_MILESTONE={target_milestone or null}
+Read and follow `~/.pi/agent/packages/pi-maestro-flow/workflows/finish-work.md`. — SESSION_DIR=OUTPUT_DIR, SESSION_TYPE=analyze, SESSION_ID={artifact_id}, LINKED_MILESTONE={target_milestone or null}
 </completion>
 
 <error_codes>

package/skills/maestro-blueprint/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-blueprint
 description: "Generate formal specification package (Product Brief, PRD, Architecture, Epics) through 6-phase document chain Arguments: <idea or @file> [-y] [-c] [--from <source>]"
-allowed-tools: Read Write Edit Bash Glob Grep Agent AskUserQuestion
+allowed-tools: Read Write Edit Bash Glob Grep teammate maestro
 ---
 
 <purpose>
@@ -10,13 +10,10 @@ allowed-tools: Read Write Edit Bash Glob Grep Agent AskUserQuestion
 Pipeline: brainstorm (optional) → **blueprint** → analyze / roadmap / plan.
 </purpose>
 
-<required_reading>
-@~/.maestro/workflows/blueprint.md
-</required_reading>
+> **Required**: Read `~/.pi/agent/packages/pi-maestro-flow/workflows/blueprint.md` before proceeding.
 
-<deferred_reading>
-- [blueprint-config.json](~/.maestro/templates/blueprint-config.json) — read when initializing blueprint configuration
-</deferred_reading>
+> **Reference files** (read when needed):
+> - [blueprint-config.json](~/.pi/agent/packages/pi-maestro-flow/templates/blueprint-config.json) — read when initializing blueprint configuration
 
 <context>
 $ARGUMENTS -- idea text, @file reference, or upstream context source.
@@ -46,7 +43,7 @@ $ARGUMENTS -- idea text, @file reference, or upstream context source.
 </context>
 
 <interview_protocol>
-Follows @~/.maestro/workflows/interview-mechanics.md standard.
+Follows `~/.pi/agent/packages/pi-maestro-flow/workflows/interview-mechanics.md` standard.
 
 **Interaction mode**: convergent menu-driven, depth-first
 **Decision tree** (strict depth-first): scope (full product / feature set / single feature) → spec type (service / api / library / platform) → focus areas → whether to run codebase exploration → requirement priorities
@@ -57,7 +54,7 @@ Follows @~/.maestro/workflows/interview-mechanics.md standard.
 </interview_protocol>
 
 <execution>
-Follow `~/.maestro/workflows/blueprint.md` completely.
+Follow `~/.pi/agent/packages/pi-maestro-flow/workflows/blueprint.md` completely.
 
 ### Phase chain
 
@@ -151,9 +148,9 @@ Status verdicts:
 - [ ] Readiness gate: Pass (>=80%) or Review (>=60%) with documented caveats
 - [ ] Artifact registered in state.json (type=blueprint)
 - [ ] context-package.json generated for downstream consumption
-- [ ] On gate Pass/Review: session sealed via finish-work (finish-work.md includes AskUserQuestion confirmation before state.json artifact registration and optional spec/knowhow extraction). On Fail: skip — session stays active, excluded from wiki search.
+- [ ] On gate Pass/Review: session sealed via finish-work (finish-work.md includes user prompt confirmation before state.json artifact registration and optional spec/knowhow extraction). On Fail: skip — session stays active, excluded from wiki search.
 </success_criteria>
 
 <on_complete>
-@~/.maestro/workflows/finish-work.md — SESSION_DIR={session_dir}, SESSION_TYPE=blueprint, SESSION_ID={session_id}, LINKED_MILESTONE=null
+Read and follow `~/.pi/agent/packages/pi-maestro-flow/workflows/finish-work.md`. — SESSION_DIR={session_dir}, SESSION_TYPE=blueprint, SESSION_ID={session_id}, LINKED_MILESTONE=null
 </on_complete>

package/skills/maestro-brainstorm/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-brainstorm
 description: "Use when exploring ideas, evaluating approaches, or needing multi-perspective analysis before implementation Arguments: [topic|role-name] [--yes] [--count N] [--session ID] [--update] [--skip-questions] [--include-questions] [--style-skill PKG] [--review-only] [--from <source>]"
-allowed-tools: Read Write Edit Bash Glob Grep Agent AskUserQuestion
+allowed-tools: Read Write Edit Bash Glob Grep teammate maestro
 ---
 
 <purpose>
@@ -10,16 +10,13 @@ Multi-role brainstorming with cross-role conflict resolution. Auto mode: guidanc
 Pipeline: grill (optional) → **brainstorm** → roadmap / analyze / blueprint.
 </purpose>
 
-<required_reading>
-@~/.maestro/workflows/brainstorm.md
-</required_reading>
+> **Required**: Read `~/.pi/agent/packages/pi-maestro-flow/workflows/brainstorm.md` before proceeding.
 
-<deferred_reading>
-- [scratch-index.json](~/.maestro/templates/scratch-index.json) — read when operating in scratch mode
-- [index.json](~/.maestro/templates/index.json) — read when operating in phase mode
-- [brainstorm-visualize.md](~/.maestro/workflows/brainstorm-visualize.md) — read when html-prototypes/ produced and user wants to browse them
-- [boundary-grill.md](~/.maestro/workflows/boundary-grill.md) — read when boundary conflicts detected (in cross-role review)
-</deferred_reading>
+> **Reference files** (read when needed):
+> - [scratch-index.json](~/.pi/agent/packages/pi-maestro-flow/templates/scratch-index.json) — read when operating in scratch mode
+> - [index.json](~/.pi/agent/packages/pi-maestro-flow/templates/index.json) — read when operating in phase mode
+> - [brainstorm-visualize.md](~/.pi/agent/packages/pi-maestro-flow/workflows/brainstorm-visualize.md) — read when html-prototypes/ produced and user wants to browse them
+> - [boundary-grill.md](~/.pi/agent/packages/pi-maestro-flow/workflows/boundary-grill.md) — read when boundary conflicts detected (in cross-role review)
 
 <context>
 $ARGUMENTS -- topic text for auto mode, or role name for single role mode.
@@ -57,7 +54,7 @@ $ARGUMENTS -- topic text for auto mode, or role name for single role mode.
 </context>
 
 <interview_protocol>
-Follows @~/.maestro/workflows/interview-mechanics.md standard.
+Follows `~/.pi/agent/packages/pi-maestro-flow/workflows/interview-mechanics.md` standard.
 
 **Interaction mode**: convergent menu-driven
 **Decision tree** (flexible order — user may jump between branches): mode (auto / single-role / review-only) → role selection and --count → --from upstream source (grill:ID, blueprint:ID, @file, path) → whether to enable design-research and DESIGN.md sub-pipeline
@@ -68,7 +65,7 @@ Follows @~/.maestro/workflows/interview-mechanics.md standard.
 </interview_protocol>
 
 <execution>
-Follow '~/.maestro/workflows/brainstorm.md' completely.
+Follow '~/.pi/agent/packages/pi-maestro-flow/workflows/brainstorm.md' completely.
 
 ### Phase Gates (MANDATORY, BLOCKING)
 
@@ -134,7 +131,7 @@ Status verdicts:
 | Quick roadmap needed | `/maestro-roadmap --from brainstorm:{artifact_id}` |
 | Need deeper analysis first | `/maestro-analyze {topic} --from brainstorm:{artifact_id}` |
 | Need stress-testing first | `/maestro-grill {topic}` |
-| `html-prototypes/` produced with 2+ files and user wants to browse | Load `~/.maestro/workflows/brainstorm-visualize.md` and launch visualizer server |
+| `html-prototypes/` produced with 2+ files and user wants to browse | Load `~/.pi/agent/packages/pi-maestro-flow/workflows/brainstorm-visualize.md` and launch visualizer server |
 | DESIGN.md established during Step 3.5 | `/maestro-impeccable build <feature-description>` |
 
 **Single role mode:**
@@ -189,5 +186,5 @@ Status verdicts:
 </success_criteria>
 
 <on_complete>
-@~/.maestro/workflows/finish-work.md — SESSION_DIR={output_dir}, SESSION_TYPE=brainstorm, SESSION_ID={artifact_id}, LINKED_MILESTONE=null
+Read and follow `~/.pi/agent/packages/pi-maestro-flow/workflows/finish-work.md`. — SESSION_DIR={output_dir}, SESSION_TYPE=brainstorm, SESSION_ID={artifact_id}, LINKED_MILESTONE=null
 </on_complete>

package/skills/maestro-collab/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-collab
 description: "Use when a question needs cross-verification from multiple CLI tools or diverse analytical perspectives Arguments: <requirement> [--tools agy,qwen,claude] [--mode analysis|write] [--rule <template>] [-y]"
-allowed-tools: Read Write Bash Glob Grep Agent AskUserQuestion
+allowed-tools: Read Write Bash Glob Grep teammate maestro
 ---
 
 <purpose>
@@ -45,7 +45,7 @@ S_REPORT          — 显示摘要 + next-step routing               PERSIST:
 
 S_PARSE:
   → S_DISCOVER    WHEN: requirement non-empty              DO: extract requirement, tools, mode, rule, autoYes
-  → S_PARSE       WHEN: requirement empty                  DO: AskUserQuestion for requirement
+  → S_PARSE       WHEN: requirement empty                  DO: user prompt for requirement
 
 S_DISCOVER:
   → S_CONFIRM     WHEN: eligible tools >= 2                DO: A_DISCOVER_TOOLS
@@ -79,7 +79,7 @@ S_SYNTHESIZE:
 S_REGISTER:
   → S_REPORT        WHEN: user confirms or -y    DO: append CLB artifact to state.json (type: collab, scope: adhoc)
   → S_REPORT        WHEN: user declines           DO: skip artifact registration, proceed to report
-  GUARD: AskUserQuestion "Register collab artifact to state.json?" (skipped if -y)
+  GUARD: user prompt "Register collab artifact to state.json?" (skipped if -y)
 
 S_REPORT:
   → END             DO: display summary (requirement, tools, consensus_level, per-tool status, artifact id, output dir)
@@ -137,7 +137,7 @@ If consensus_level < 40%: W003.
 
 ### A_BOUNDARY_GRILL
 
-Run boundary grill per `~/.maestro/workflows/boundary-grill.md`.
+Run boundary grill per `~/.pi/agent/packages/pi-maestro-flow/workflows/boundary-grill.md`.
 Input: classified CONFLICT findings + per-tool outputs. Check upstream scope if `--from` used.
 IF conflicts → tag with resolution, feed into A_GENERATE_OUTPUTS. No conflicts → pass through.
 

package/skills/maestro-companion/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-companion
 description: "Knowledge companion — load context, record companion doc, capture insights, route to skills Arguments: [before|note|after|route] [--task <description>] [--type <task_type>] [--category <cat>]"
-allowed-tools: Read Write Edit Bash Glob Grep Skill AskUserQuestion
+allowed-tools: Read Write Edit Bash Glob Grep maestro
 ---
 
 <purpose>
@@ -439,7 +439,7 @@ Promotable entries:
 
 ### 3. Promote entries
 
-If promotable entries exist, AskUserQuestion:
+If promotable entries exist, user prompt:
 
 - Option 1: "Promote to spec" — short coding/arch/test constraint
 - Option 2: "Promote to knowhow" — detailed recipe/template/decision/tip
@@ -517,7 +517,7 @@ Delegates intent routing to maestro-next, which recommends the best single comma
 - [ ] note: typed entries cross-posted to matching context tables (decisions→Decisions, hypothesis→Hypotheses, etc.)
 - [ ] after: companion doc entries reviewed and promotable items identified
 - [ ] after: outcome fields populated (files_changed, completed, status)
-- [ ] after: AskUserQuestion routes to spec-add or manage-knowhow-capture
+- [ ] after: user prompt routes to spec-add or manage-knowhow-capture
 - [ ] after: todo entries extracted to follow_up field
 - [ ] after: companion doc marked completed, active pointer cleared
 - [ ] after: accumulation reminder + next-step routing displayed

package/skills/maestro-composer/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-composer
 description: "Compose reusable workflow templates from natural language Arguments: <workflow-description> [--resume] [--edit <template-path>]"
-allowed-tools: Read Write Edit Bash Glob Grep Agent AskUserQuestion Skill
+allowed-tools: Read Write Edit Bash Glob Grep teammate maestro
 ---
 
 <purpose>
@@ -9,10 +9,9 @@ Interactive workflow template composer: natural language to DAG template.
 Three modes: new design (default), resume (`--resume`), edit (`--edit <path>`).
 </purpose>
 
-<deferred_reading>
-- [node-catalog](~/.maestro/templates/workflows/specs/node-catalog.md) — read at Phase 2 (Resolve)
-- [template-schema](~/.maestro/templates/workflows/specs/template-schema.md) — read at Phase 5 (Persist)
-</deferred_reading>
+> **Reference files** (read when needed):
+> - [node-catalog](~/.pi/agent/packages/pi-maestro-flow/templates/workflows/specs/node-catalog.md) — read at Phase 2 (Resolve)
+> - [template-schema](~/.pi/agent/packages/pi-maestro-flow/templates/workflows/specs/template-schema.md) — read at Phase 5 (Persist)
 
 <context>
 $ARGUMENTS — natural language description, or flags.
@@ -20,8 +19,8 @@ $ARGUMENTS — natural language description, or flags.
 **Flags**: `--resume` (resume in-progress design), `--edit <path>` (edit existing template)
 
 **Constants**:
-- Template dir: `~/.maestro/templates/workflows/`
-- Template index: `~/.maestro/templates/workflows/index.json`
+- Template dir: `~/.pi/agent/packages/pi-maestro-flow/templates/workflows/`
+- Template index: `~/.pi/agent/packages/pi-maestro-flow/templates/workflows/index.json`
 - Design drafts: `.workflow/templates/design-drafts/`
 - Template ID: `wft-<slug>-<YYYYMMDD>`, Node ID: `N-<seq>`, Checkpoint: `CP-<seq>`
 - Max nodes: 20
@@ -31,14 +30,14 @@ $ARGUMENTS — natural language description, or flags.
 2. **Coding specs**: Run `maestro load --type spec --category coding` to load coding conventions. Informs executor argument defaults and context injection.
 3. Optional — proceed without if unavailable.
 
-**Output boundary**: ALL file writes MUST target `~/.maestro/templates/workflows/` (template JSON + index.json) and `.workflow/templates/design-drafts/` (intermediate drafts) only. NEVER modify source code or `.claude/commands/` files.
+**Output boundary**: ALL file writes MUST target `~/.pi/agent/packages/pi-maestro-flow/templates/workflows/` (template JSON + index.json) and `.workflow/templates/design-drafts/` (intermediate drafts) only. NEVER modify source code or `.claude/commands/` files.
 </context>
 
 <invariants>
 1. **Max 20 nodes** — workflow templates MUST NOT exceed 20 nodes; larger workflows MUST be split into sub-workflows
 2. **Acyclic DAG** — generated template MUST be a directed acyclic graph; cycles MUST be detected and rejected before persistence
 3. **No orphan nodes** — every node MUST be reachable from at least one edge; unreachable nodes MUST be flagged
-4. **Confirmation before write** — template JSON MUST be shown to user via AskUserQuestion before writing to `~/.maestro/templates/workflows/`; cancellation saves draft only
+4. **Confirmation before write** — template JSON MUST be shown to user via user prompt before writing to `~/.pi/agent/packages/pi-maestro-flow/templates/workflows/`; cancellation saves draft only
 5. **Draft preservation** — abandoning at any confirmation gate MUST save current progress to design-drafts directory; NEVER discard user's partial work
 6. **Deferred reading only** — node-catalog and template-schema MUST be read at their designated phases (P2, P5), NEVER loaded eagerly at startup
 </invariants>
@@ -98,7 +97,7 @@ S_PERSIST:
 
 ### A_PARSE_INTENT
 
-1. Parse description (if empty: AskUserQuestion for workflow description)
+1. Parse description (if empty: user prompt for workflow description)
 2. Extract candidate nodes via semantic signals:
 
 | Signal | Type hint |
@@ -156,8 +155,8 @@ Write `nodes.json`. Display resolved node list.
 
 Read deferred `template-schema.md` (fallback to built-in structure).
 Assemble template JSON: template_id, name, nodes, edges, checkpoints, context_schema, execution_mode.
-**Confirmation gate**: AskUserQuestion showing template summary (ID, node count, variables) before writing.
-- User confirms → write to `~/.maestro/templates/workflows/<slug>.json` and update index.json.
+**Confirmation gate**: user prompt showing template summary (ID, node count, variables) before writing.
+- User confirms → write to `~/.pi/agent/packages/pi-maestro-flow/templates/workflows/<slug>.json` and update index.json.
 - User cancels → save draft, do not write template or index.
 Display: path, ID, node count, variables, execute/edit commands. Clean up draft dir.
 

package/skills/maestro-execute/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-execute
 description: "Use when a confirmed plan is ready for implementation Arguments: [milestone] [--auto-commit] [--method agent|cli|auto] [--executor <tool>] [--dir <path>] [-y]"
-allowed-tools: Read Write Edit Bash Glob Grep Agent AskUserQuestion
+allowed-tools: Read Write Edit Bash Glob Grep teammate maestro
 ---
 
 <purpose>
@@ -9,14 +9,11 @@ Execute confirmed plan tasks via wave-based parallel dispatch.
 Consumes plan from maestro-plan; registers EXC artifact in state.json.
 </purpose>
 
-<required_reading>
-@~/.maestro/workflows/execute.md
-</required_reading>
+> **Required**: Read `~/.pi/agent/packages/pi-maestro-flow/workflows/execute.md` before proceeding.
 
-<deferred_reading>
-- [task.json](~/.maestro/templates/task.json) — read when reading task definitions
-- [state.json](~/.maestro/templates/state.json) — read when registering artifact
-</deferred_reading>
+> **Reference files** (read when needed):
+> - [task.json](~/.pi/agent/packages/pi-maestro-flow/templates/task.json) — read when reading task definitions
+> - [state.json](~/.pi/agent/packages/pi-maestro-flow/templates/state.json) — read when registering artifact
 
 <context>
 $ARGUMENTS — milestone number, or no args for current milestone, with optional flags.
@@ -26,7 +23,7 @@ $ARGUMENTS — milestone number, or no args for current milestone, with optional
 | Flag | Effect | Default |
 |------|--------|---------|
 | `--auto-commit` | Auto-commit after each completed task | false |
-| `--method agent\|cli\|auto` | Execution method: Agent tool, CLI delegate, or auto-select | `auto` |
+| `--method agent\|cli\|auto` | Execution method: teammate tool, CLI delegate, or auto-select | `auto` |
 | `--executor <tool>` | Explicit executor tool for CLI delegate mode | First enabled in config |
 | `--dir <path>` | Execute a specific plan directory instead of auto-discovery | — |
 | `-y` / `--yes` | Auto mode — skip ALL interactive questions (executor selection, wave progression, blocked prompts) | false |
@@ -63,7 +60,7 @@ Bash("maestro collab preflight --phase <phase-number>")
 ```
 If exit code is 1, present warnings and ask whether to proceed.
 
-Follow '~/.maestro/workflows/execute.md' completely.
+Follow '~/.pi/agent/packages/pi-maestro-flow/workflows/execute.md' completely.
 
 ### Phase Gates (MANDATORY, BLOCKING)
 
@@ -82,7 +79,7 @@ Follow '~/.maestro/workflows/execute.md' completely.
 - IF all tasks in a wave failed: halt wave progression, report E005 with per-task failure reasons. Do NOT proceed to next wave — downstream waves depend on current wave outputs.
 - IF cascading failure (wave N fails → wave N+1 has unmet dependencies): mark all dependent tasks in subsequent waves as `blocked` with reason `"upstream_wave_failed"`. Skip blocked waves and proceed to completion with partial results.
 - `-y` mode: auto-skip blocked waves without prompting, log warning W002.
-- Non `-y` mode: `AskUserQuestion` with options [retry wave / skip and continue / abort execution].
+- Non `-y` mode: `user prompt` with options [retry wave / skip and continue / abort execution].
 
 **GATE 3: All Tasks → Completion**
 - REQUIRED: All waves executed in dependency order (or explicitly skipped via Gate 2.5).
@@ -127,7 +124,7 @@ For each completed/failed TASK with issue_id:
     all task_refs completed → proposed issue.status = "resolved"
     any task_ref failed    → proposed issue.status = "in_progress"
   IF NOT auto_mode (-y):
-    AskUserQuestion: "Update issue {issue_id} status to {proposed_status}?" [Yes / Skip]
+    user prompt: "Update issue {issue_id} status to {proposed_status}?" [Yes / Skip]
     IF Skip → continue to next task without writing
   Append history entry: { action: "executed", at: <ISO>, by: "maestro-execute", summary: "TASK-{NNN} {status}" }
   Write updated issue back to issues.jsonl

package/skills/maestro-fork/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-fork
 description: "Create or sync milestone worktree for parallel dev Arguments: -m <milestone-number> [--base <branch>] [--sync]"
-allowed-tools: Read Write Edit Bash Glob Grep Agent AskUserQuestion
+allowed-tools: Read Write Edit Bash Glob Grep teammate maestro
 ---
 
 <purpose>
@@ -9,14 +9,11 @@ Create or sync a milestone-level git worktree for parallel development.
 Supports `--sync` mode to pull latest main changes into an active worktree.
 </purpose>
 
-<required_reading>
-@~/.maestro/workflows/fork.md
-</required_reading>
+> **Required**: Read `~/.pi/agent/packages/pi-maestro-flow/workflows/fork.md` before proceeding.
 
-<deferred_reading>
-- [worktrees.json](~/.maestro/templates/worktrees.json) — read when updating registry
-- [worktree-scope.json](~/.maestro/templates/worktree-scope.json) — read when writing scope marker
-</deferred_reading>
+> **Reference files** (read when needed):
+> - [worktrees.json](~/.pi/agent/packages/pi-maestro-flow/templates/worktrees.json) — read when updating registry
+> - [worktree-scope.json](~/.pi/agent/packages/pi-maestro-flow/templates/worktree-scope.json) — read when writing scope marker
 
 <context>
 $ARGUMENTS -- milestone number and optional flags.
@@ -25,7 +22,7 @@ Modes (`Fork` / `Sync`), flags (`-m`, `--base`, `--sync`), milestone resolution,
 </context>
 
 <execution>
-Follow '~/.maestro/workflows/fork.md' completely.
+Follow '~/.pi/agent/packages/pi-maestro-flow/workflows/fork.md' completely.
 
 Fork and sync algorithm steps are defined in workflow `fork.md`.
 
@@ -45,7 +42,7 @@ Fork and sync algorithm steps are defined in workflow `fork.md`.
 - BLOCKED if missing: worktree creation failed or shared files not copied — do not proceed to artifact scoping.
 
 **GATE 3: Artifact Copy → Completion**
-- REQUIRED: AskUserQuestion confirmation before registry writes — show milestone scope, worktree path, and state entries to be written. User must confirm or abort.
+- REQUIRED: user prompt confirmation before registry writes — show milestone scope, worktree path, and state entries to be written. User must confirm or abort.
 - REQUIRED: `worktree-scope.json` written with milestone scope (after confirmation).
 - REQUIRED: Scoped `state.json` written (only this milestone's artifacts) (after confirmation).
 - REQUIRED: `worktrees.json` registry updated in main worktree (after confirmation).
@@ -67,7 +64,7 @@ Fork and sync algorithm steps are defined in workflow `fork.md`.
 |-----------|-----------|
 | Fork complete | `cd {wt.path} && /maestro-analyze` |
 | Fork + automated | `maestro delegate "run full lifecycle for milestone" --cd {wt.path} --mode write` |
-| Fork + status check | Skill({ skill: "manage-status" }) |
+| Fork + status check | invoke /skill: "manage-status" }) |
 | Sync complete | Resume work in worktree |
 | Sync conflicts found | Resolve manually, then retry |
 </completion>

package/skills/maestro-grill/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: maestro-grill
 description: "Use when stress-testing a plan, idea, or requirement against codebase reality before brainstorming Arguments: <topic|plan> [-y] [-c] [--from <source>] [--depth shallow|standard|deep]"
-allowed-tools: Read Write Edit Bash Glob Grep Agent AskUserQuestion
+allowed-tools: Read Write Edit Bash Glob Grep teammate maestro
 ---
 
 <purpose>
@@ -10,13 +10,10 @@ Socratic stress-testing of plans/ideas against codebase reality. Produces grill-
 Pipeline position: BEFORE brainstorm (stress-test → then elaborate).
 </purpose>
 
-<required_reading>
-@~/.maestro/workflows/grill.md
-</required_reading>
+> **Required**: Read `~/.pi/agent/packages/pi-maestro-flow/workflows/grill.md` before proceeding.
 
-<deferred_reading>
-- [state.json](~/.maestro/templates/state.json) — read when registering artifact
-</deferred_reading>
+> **Reference files** (read when needed):
+> - [state.json](~/.pi/agent/packages/pi-maestro-flow/templates/state.json) — read when registering artifact
 
 <context>
 $ARGUMENTS -- topic/plan text for interactive mode, or --from source for upstream input.
@@ -47,7 +44,7 @@ $ARGUMENTS -- topic/plan text for interactive mode, or --from source for upstrea
 </context>
 
 <interview_protocol>
-Follows @~/.maestro/workflows/interview-mechanics.md standard.
+Follows `~/.pi/agent/packages/pi-maestro-flow/workflows/interview-mechanics.md` standard.
 
 **Interaction mode override**: adversarial Socratic — NOT menu-driven
 **Question style**:
@@ -62,7 +59,7 @@ Follows @~/.maestro/workflows/interview-mechanics.md standard.
 </interview_protocol>
 
 <execution>
-Follow '~/.maestro/workflows/grill.md' completely.
+Follow '~/.pi/agent/packages/pi-maestro-flow/workflows/grill.md' completely.
 
 ### Phase Gates (MANDATORY, BLOCKING)
 
@@ -116,11 +113,11 @@ Status verdicts:
 
 | Condition | Suggestion |
 |-----------|-----------|
-| Need multi-role elaboration | `Skill({ skill: "maestro-brainstorm", args: "{topic} --from grill:{artifact_id}" })` |
-| Need deep technical analysis | `Skill({ skill: "maestro-analyze", args: "{topic} --from grill:{artifact_id}" })` |
-| Scope is clear, ready for roadmap | `Skill({ skill: "maestro-roadmap", args: "--from grill:{artifact_id}" })` |
-| Need formal spec package | `Skill({ skill: "maestro-blueprint", args: "--from grill:{artifact_id}" })` |
-| More branches to walk | `Skill({ skill: "maestro-grill", args: "{topic} -c" })` |
+| Need multi-role elaboration | `invoke /skill: "maestro-brainstorm", args: "{topic} --from grill:{artifact_id}" })` |
+| Need deep technical analysis | `invoke /skill: "maestro-analyze", args: "{topic} --from grill:{artifact_id}" })` |
+| Scope is clear, ready for roadmap | `invoke /skill: "maestro-roadmap", args: "--from grill:{artifact_id}" })` |
+| Need formal spec package | `invoke /skill: "maestro-blueprint", args: "--from grill:{artifact_id}" })` |
+| More branches to walk | `invoke /skill: "maestro-grill", args: "{topic} -c" })` |
 </completion>
 
 <error_codes>
@@ -143,9 +140,9 @@ Status verdicts:
 - [ ] Risk register captures all unresolved tensions
 - [ ] `context-package.json` generated with schema "context-package/1.0"
 - [ ] Artifact registered in state.json (type=grill, id=GRL-xxx)
-- [ ] Session sealed via finish-work (finish-work.md includes AskUserQuestion confirmation before state.json artifact registration and optional spec/knowhow extraction)
+- [ ] Session sealed via finish-work (finish-work.md includes user prompt confirmation before state.json artifact registration and optional spec/knowhow extraction)
 </success_criteria>
 
 <on_complete>
-@~/.maestro/workflows/finish-work.md — SESSION_DIR={output_dir}, SESSION_TYPE=grill, SESSION_ID={artifact_id}, LINKED_MILESTONE=null
+Read and follow `~/.pi/agent/packages/pi-maestro-flow/workflows/finish-work.md`. — SESSION_DIR={output_dir}, SESSION_TYPE=grill, SESSION_ID={artifact_id}, LINKED_MILESTONE=null
 </on_complete>