pi-maestro-flow 0.2.0 → 0.3.1

package/skills/scholar-experiment/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: scholar-experiment
 description: "Systematic experimental results analysis workflow for ML/AI research papers. Connects experimental data to publication-ready Results sections with statistical validation, visualizations, and quality checks. Triggers on \"analyze experimental results\", \"generate results section\", \"statistical analysis of experiments\", \"compare model performance\", \"create results visualization\"."
-allowed-tools: Read Write Edit Bash Glob Grep AskUserQuestion TodoWrite
+allowed-tools: Read Write Edit Bash Glob Grep maestro
 ---
 
 # Scholar Experiment: Results Analysis Workflow
@@ -111,7 +111,7 @@ library(multcomp)   # Multiple comparisons
 Before dispatching to phases, collect analysis preferences:
 
 ```javascript
-const prefResponse = AskUserQuestion({
+const prefResponse = ask user ({
   question: "How would you like to configure the analysis?",
   options: [
     {

package/skills/scholar-ideation/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: scholar-ideation
 description: "Research ideation workflow from literature search to research planning. Triggers on \"brainstorm research ideas\", \"identify research gaps\", \"conduct gap analysis\", \"start research project\", \"conduct literature review\", \"define research question\", \"select research method\", \"plan research\", \"research ideation\"."
-allowed-tools: WebSearch WebFetch Read Write Edit Bash Glob Grep TodoWrite AskUserQuestion
+allowed-tools: WebSearch WebFetch Read Write Edit Bash Glob Grep maestro
 ---
 
 # Scholar Ideation
@@ -50,11 +50,11 @@ User Input (research topic/interest)
 Before dispatching to phases, collect research context and workflow preferences:
 
 ```
-AskUserQuestion:
+user prompt:
   question: "Please describe your research topic or interest area."
   → Store as: researchTopic
 
-AskUserQuestion:
+user prompt:
   question: "What is the scope and context of your research?"
   options:
     - "Broad exploration (survey a field)"
@@ -62,7 +62,7 @@ AskUserQuestion:
     - "Applied research (practical application)"
   → Store as: researchScope
 
-AskUserQuestion:
+user prompt:
   question: "What is your target research timeline?"
   options:
     - "Short-term (3-6 months)"
@@ -70,14 +70,14 @@ AskUserQuestion:
     - "Long-term (1-2 years)"
   → Store as: researchTimeline
 
-AskUserQuestion:
+user prompt:
   question: "Do you have access to Zotero for literature management?"
   options:
     - "Yes (auto-import papers to Zotero)"
     - "No (skip Zotero integration)"
   → Store as: useZotero
 
-AskUserQuestion:
+user prompt:
   question: "Workflow mode?"
   options:
     - "Interactive (confirm at each phase)"
@@ -188,7 +188,7 @@ TIMELINE: [short | medium | long]
 CONTEXT: [additional constraints, domain, background]
 ```
 
-If user provides a simple topic string, derive scope and timeline from the topic description or ask via AskUserQuestion.
+If user provides a simple topic string, derive scope and timeline from the topic description or ask via user prompt.
 
 ## Data Flow
 

package/skills/scholar-latex-organizer/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: scholar-latex-organizer
 description: "Organize messy conference LaTeX template .zip files into clean Overleaf-ready structure. Extracts, analyzes, cleans up, and generates README with submission requirements. Triggers on \"organize LaTeX template\", \"clean up template\", \"prepare Overleaf template\", \"整理LaTeX模板\"."
-allowed-tools: Read Write Edit Bash Glob Grep WebSearch WebFetch AskUserQuestion TodoWrite
+allowed-tools: Read Write Edit Bash Glob Grep WebSearch WebFetch maestro
 ---
 
 # Scholar LaTeX Organizer

package/skills/scholar-publish/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: scholar-publish
 description: "Post-acceptance conference preparation workflow covering presentation slides, academic posters, and promotion content. Triggers on \"scholar publish\", \"conference preparation\", \"prepare presentation\", \"create poster\", \"write promotion\", \"post-acceptance\"."
-allowed-tools: AskUserQuestion TodoWrite Read Write Edit Bash Glob Grep
+allowed-tools: Read Write Edit Bash Glob Grep maestro
 ---
 
 # Scholar Publish
@@ -53,7 +53,7 @@ Each phase runs independently based on user selection.
 
 ## Interactive Preference Collection
 
-Collect workflow preferences via AskUserQuestion before dispatching to phases:
+Collect workflow preferences via user prompt before dispatching to phases:
 
 ```
 Step 1: Identify paper context
@@ -64,7 +64,7 @@ Step 1: Identify paper context
         - Co-authors (for tagging in promotion)"
 
 Step 2: Select outputs to generate
-  AskUserQuestion:
+  user prompt:
     question: "Which outputs would you like to generate?"
     options:
       - "Presentation slides outline" → enablePresentation = true

package/skills/scholar-rebuttal-pro/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: scholar-rebuttal-pro
 description: "Enhanced academic paper review response workflow with Agy/CLI collaborative analysis and multi-perspective discussion. Produces structured rebuttal documents with evidence-based strategies. Triggers on \"rebuttal\", \"respond to reviewers\", \"review response\", \"审稿回复\"."
-allowed-tools: Task AskUserQuestion TodoWrite Read Write Edit Bash Glob Grep Skill mcp__ace-tool__search_context mcp__ccw-tools__read_file mcp__ccw-tools__edit_file
+allowed-tools: Task Read Write Edit Bash Glob Grep mcp__ace-tool__search_context mcp__ccw-tools__read_file mcp__ccw-tools__edit_file maestro
 ---
 
 # Scholar Rebuttal Pro
@@ -43,10 +43,10 @@ Enhanced academic paper review response workflow combining Agy/CLI collaborative
 
 ## Interactive Preference Collection
 
-Collect workflow preferences via AskUserQuestion before dispatching to phases:
+Collect workflow preferences via user prompt before dispatching to phases:
 
 ```javascript
-const prefResponse = AskUserQuestion({
+const prefResponse = ask user ({
   questions: [
     {
       question: "是否跳过所有确认步骤（自动模式）？",

package/skills/scholar-review/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: scholar-review
 description: "Systematic academic paper review workflow covering self-review before submission and rebuttal writing after receiving reviewer feedback. Triggers on \"review paper\", \"self-review\", \"write rebuttal\", \"respond to reviewers\", \"analyze review comments\", \"paper review\"."
-allowed-tools: Read Write Edit Bash Glob Grep WebFetch WebSearch AskUserQuestion TodoWrite
+allowed-tools: Read Write Edit Bash Glob Grep WebFetch WebSearch maestro
 ---
 
 # Scholar Review

package/skills/scholar-writing/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: scholar-writing
 description: "End-to-end academic paper writing workflow. Takes a research repository and produces a publication-ready LaTeX manuscript for top ML/AI conferences (NeurIPS, ICML, ICLR, ACL, AAAI, COLM). Covers repo understanding, structure planning, section drafting, citation management, anti-AI polishing, and conference formatting. Triggers on \"write paper\", \"draft paper\", \"scholar writing\", \"paper writing workflow\"."
-allowed-tools: Read Write Edit Bash Glob Grep WebSearch WebFetch TodoWrite AskUserQuestion Task
+allowed-tools: Read Write Edit Bash Glob Grep WebSearch WebFetch Task maestro
 ---
 
 # Scholar Writing

package/skills/security-audit/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: security-audit
 description: "OWASP Top 10 and STRIDE security auditing with supply chain analysis Arguments: [quick|standard|deep] [--scope <path>]"
-allowed-tools: Read Write Bash Glob Grep Agent AskUserQuestion
+allowed-tools: Read Write Bash Glob Grep teammate maestro
 ---
 
 <purpose>
@@ -10,7 +10,7 @@ CI/CD pipeline review, and optional STRIDE threat modeling. Three tiers control
 </purpose>
 
 <required_reading>
-@~/.maestro/workflows/review.md
+~/.pi/agent/packages/pi-maestro-flow/workflows/review.md
 </required_reading>
 
 <context>

package/skills/skill-generator/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: skill-generator
 description: "Meta-skill for creating new Claude Code skills with configurable execution modes. Supports sequential (fixed order) and autonomous (stateless) phase patterns. Use for skill scaffolding, skill creation, or building new workflows. Triggers on \"create skill\", \"new skill\", \"skill generator\"."
-allowed-tools: Agent AskUserQuestion Read Bash Glob Grep Write
+allowed-tools: teammate Read Bash Glob Grep Write maestro
 ---
 
 # Skill Generator
@@ -150,7 +150,7 @@ Phase 0: Specification Study (MANDATORY - Must complete before proceeding)
 
 Phase 1: Requirements Discovery
    - Gather skill requirements via user interaction
-   - Tool: AskUserQuestion
+   - Tool: user prompt
    - Collect: Skill name, purpose, execution mode
    - Collect: Phase/Action definition
    - Collect: Tool dependencies, output format
@@ -217,7 +217,7 @@ Read('.claude/skills/_shared/SKILL-DESIGN-SPEC.md');
 Read('.claude/skills/skill-generator/templates/*.md'); // All templates
 
 // Phase 1: Gather requirements
-const answers = AskUserQuestion({
+const answers = ask user ({
   questions: [
     { question: "Skill name?", header: "Name", options: [...] },
     { question: "Execution mode?", header: "Mode", options: ["Sequential", "Autonomous"] }

package/skills/skill-iter-tune/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: skill-iter-tune
 description: "Iterative skill tuning via execute-evaluate-improve feedback loop. Uses maestro delegate Claude to execute skill, Agy to evaluate quality, and Agent to apply improvements. Iterates until quality threshold or max iterations. Triggers on \"skill iter tune\", \"iterative skill tuning\", \"tune skill\"."
-allowed-tools: Skill Agent AskUserQuestion TaskCreate TaskUpdate TaskList Read Write Edit Bash Glob Grep
+allowed-tools: teammate Read Write Edit Bash Glob Grep maestro
 ---
 
 # Skill Iter Tune
@@ -70,7 +70,7 @@ if (autoYes) {
     executionMode: 'single'
   }
 } else {
-  const prefResponse = AskUserQuestion({
+  const prefResponse = ask user ({
     questions: [
       {
         question: "选择迭代调优配置：",
@@ -96,7 +96,7 @@ if (autoYes) {
   workflowPreferences = { autoYes: false, ...configMap[selected] }
 
   // ★ Mode selection: chain vs single
-  const modeResponse = AskUserQuestion({
+  const modeResponse = ask user ({
     questions: [{
       question: "选择调优模式：",
       header: "Tune Mode",

package/skills/skill-simplify/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: skill-simplify
 description: "SKILL.md simplification with functional integrity verification. Analyze redundancy, optimize content, check no functionality lost. Triggers on \"simplify skill\", \"optimize skill\", \"skill-simplify\"."
-allowed-tools: AskUserQuestion Read Write Edit Bash Glob Grep
+allowed-tools: Read Write Edit Bash Glob Grep maestro
 ---
 
 # Skill Simplify

package/skills/skill-tuning/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: skill-tuning
 description: "Universal skill diagnosis and optimization tool. Detect and fix skill execution issues including context explosion, long-tail forgetting, data flow disruption, and agent coordination failures. Supports Agy CLI for deep analysis. Triggers on \"skill tuning\", \"tune skill\", \"skill diagnosis\", \"optimize skill\", \"skill debug\"."
-allowed-tools: Agent AskUserQuestion Read Write Bash Glob Grep
+allowed-tools: teammate Read Write Bash Glob Grep maestro
 ---
 
 # Skill Tuning

package/skills/spec-add/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: spec-add
 description: "Add spec entry by category with role tagging Arguments: [--scope project|global|team|personal] [-y] <category> <content>"
-allowed-tools: Read Write Bash Glob Grep AskUserQuestion
+allowed-tools: Read Write Bash Glob Grep maestro
 ---
 
 <purpose>
@@ -9,7 +9,7 @@ Add `<spec-entry>` to specs by category. 4 scopes: project (default), global, te
 </purpose>
 
 <required_reading>
-@~/.maestro/workflows/specs-add.md
+~/.pi/agent/packages/pi-maestro-flow/workflows/specs-add.md
 </required_reading>
 
 <context>
@@ -43,13 +43,13 @@ Scope-to-directory mapping, category-to-file mapping, and entry format defined i
 1. **Idempotent append** — duplicate entry ID MUST be rejected (E003-level check on title + category match before write)
 2. **Category validation** — category MUST be one of: coding, arch, quality, debug, test, review, learning, ui. Invalid category → E003
 3. **Scope isolation** — writes target ONLY the scope-resolved directory; project scope NEVER writes to global (~/.maestro/specs/), global scope NEVER writes to project (.workflow/specs/)
-4. **Confirmation gate** — MUST AskUserQuestion before appending entry (unless -y flag); NEVER write without user confirmation in interactive mode
+4. **Confirmation gate** — MUST user prompt before appending entry (unless -y flag); NEVER write without user confirmation in interactive mode
 5. **Entry format invariance** — all entries MUST use `<spec-entry>` closed-tag format with id, keywords, and category attributes
 6. **Output boundary** — ALL file writes MUST target the scope-resolved specs directory (.workflow/specs/, ~/.maestro/specs/, .workflow/collab/specs/, or .workflow/collab/{uid}/specs/) and optionally .workflow/knowhow/ for --ref mode. NEVER modify source code or files outside these paths
 </invariants>
 
 <execution>
-Follow '~/.maestro/workflows/specs-add.md' completely.
+Follow '~/.pi/agent/packages/pi-maestro-flow/workflows/specs-add.md' completely.
 
 ### Phase Gates (MANDATORY, BLOCKING)
 
@@ -69,7 +69,7 @@ Follow '~/.maestro/workflows/specs-add.md' completely.
 - REQUIRED: User confirmation via AskUserQuestion (unless -y flag).
 - BLOCKED if: user declines confirmation — abort without writing.
 
-**Confirmation gate**: Unless -y flag is passed, after formatting the `<spec-entry>` block but before appending to the target file, AskUserQuestion showing the formatted entry, target file path, and scope. Proceed only on user confirm.
+**Confirmation gate**: Unless -y flag is passed, after formatting the `<spec-entry>` block but before appending to the target file, user prompt showing the formatted entry, target file path, and scope. Proceed only on user confirm.
 </execution>
 
 <error_codes>

package/skills/spec-load/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: spec-load
 description: "Load specs and lessons for current context Arguments: [--scope <scope>] [--category <category>] [--keyword <word>]"
-allowed-tools: Read Bash Glob Grep
+allowed-tools: Read Bash Glob Grep maestro
 ---
 
 <purpose>
@@ -11,7 +11,7 @@ By default, loads from both global (~/.maestro/specs/) and project (.workflow/sp
 </purpose>
 
 <required_reading>
-@~/.maestro/workflows/specs-load.md
+~/.pi/agent/packages/pi-maestro-flow/workflows/specs-load.md
 </required_reading>
 
 <context>
@@ -63,7 +63,7 @@ Use the load command to read the full referenced document.
 </invariants>
 
 <execution>
-Follow '~/.maestro/workflows/specs-load.md' completely.
+Follow '~/.pi/agent/packages/pi-maestro-flow/workflows/specs-load.md' completely.
 
 ### Phase Gates (MANDATORY, BLOCKING)
 

package/skills/spec-remove/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: spec-remove
 description: "Remove spec entry by ID Arguments: <entry-id> [--cascade] [-y]"
-allowed-tools: Read Write Edit Bash Glob Grep AskUserQuestion
+allowed-tools: Read Write Edit Bash Glob Grep maestro
 ---
 
 <purpose>
@@ -10,7 +10,7 @@ Uses `maestro wiki remove-entry` for atomic removal with index auto-update.
 </purpose>
 
 <required_reading>
-@~/.maestro/workflows/specs-remove.md
+~/.pi/agent/packages/pi-maestro-flow/workflows/specs-remove.md
 </required_reading>
 
 <context>
@@ -25,7 +25,7 @@ $ARGUMENTS -- expects `<entry-id>` (e.g., `spec-learnings-003`, `spec-coding-con
 </context>
 
 <invariants>
-1. **Confirmation required** — MUST AskUserQuestion before deletion (unless -y flag); NEVER remove entries silently
+1. **Confirmation required** — MUST user prompt before deletion (unless -y flag); NEVER remove entries silently
 2. **Referential integrity** — before removing, check if other spec entries reference the target entry; warn user if references exist
 3. **Cascade explicit** — ref-type entries MUST NOT cascade-delete the linked knowhow file unless --cascade is explicitly passed; default leaves orphan knowhow intact
 4. **Atomic removal** — use `maestro wiki remove-entry` for atomic operation; NEVER manually edit spec files to remove entries
@@ -34,7 +34,7 @@ $ARGUMENTS -- expects `<entry-id>` (e.g., `spec-learnings-003`, `spec-coding-con
 </invariants>
 
 <execution>
-Follow '~/.maestro/workflows/specs-remove.md' completely.
+Follow '~/.pi/agent/packages/pi-maestro-flow/workflows/specs-remove.md' completely.
 
 ### Phase Gates (MANDATORY, BLOCKING)
 

package/skills/spec-setup/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: spec-setup
 description: "Initialize specs from project structure Arguments: "
-allowed-tools: Read Write Bash Glob Grep AskUserQuestion
+allowed-tools: Read Write Bash Glob Grep maestro
 ---
 
 <purpose>
@@ -9,7 +9,7 @@ Initialize `.workflow/specs/` by scanning codebase for conventions. Core files a
 </purpose>
 
 <required_reading>
-@~/.maestro/workflows/specs-setup.md
+~/.pi/agent/packages/pi-maestro-flow/workflows/specs-setup.md
 </required_reading>
 
 <context>
@@ -23,14 +23,14 @@ $ARGUMENTS (no arguments expected)
 <invariants>
 1. **Non-destructive** — NEVER overwrite existing spec files; if a file already exists, skip it and report as already-initialized
 2. **Idempotent** — safe to re-run on an initialized project; re-running MUST NOT duplicate entries or corrupt existing content
-3. **Confirmation gate** — MUST AskUserQuestion showing all files to be created before writing; NEVER write without user confirmation
+3. **Confirmation gate** — MUST user prompt showing all files to be created before writing; NEVER write without user confirmation
 4. **Output boundary** — ALL file writes MUST target .workflow/specs/ (spec files) and .workflow/knowhow/ (recipe knowhow) only. NEVER modify source code, .workflow/state.json, or files outside these paths
 5. **Core files mandatory** — coding-conventions.md, architecture-constraints.md, and learnings.md MUST always be created (unless they already exist)
 6. **Signal-driven optionals** — optional spec files (quality-rules.md, test-conventions.md, ui-conventions.md) MUST only be created when corresponding framework/tool signals are detected in the codebase; NEVER create optional files without evidence
 </invariants>
 
 <execution>
-Follow '~/.maestro/workflows/specs-setup.md' completely.
+Follow '~/.pi/agent/packages/pi-maestro-flow/workflows/specs-setup.md' completely.
 
 ### Phase Gates (MANDATORY, BLOCKING)
 
@@ -53,7 +53,7 @@ Follow '~/.maestro/workflows/specs-setup.md' completely.
 - REQUIRED: Existing files skipped (not overwritten).
 - REQUIRED: .proposed.md files created when slug collision detected (W003).
 
-**Confirmation gate**: After scanning codebase and determining which files/directories will be created (core specs, optional specs, recipe knowhow), AskUserQuestion showing the full list of files to create with their categories and detected signals. Proceed only on user confirm.
+**Confirmation gate**: After scanning codebase and determining which files/directories will be created (core specs, optional specs, recipe knowhow), user prompt showing the full list of files to create with their categories and detected signals. Proceed only on user confirm.
 </execution>
 
 <error_codes>
@@ -70,6 +70,6 @@ Follow '~/.maestro/workflows/specs-setup.md' completely.
 - [ ] `.workflow/specs/` directory created
 - [ ] Core spec files always created: `coding-conventions.md`, `architecture-constraints.md`, `learnings.md`
 - [ ] Optional spec files created when detected: `quality-rules.md` (linter/CI), `test-conventions.md` (test framework), `ui-conventions.md` (frontend framework). `debug-notes.md` / `review-standards.md` deferred (on demand via `/spec-add`).
-- [ ] Workflow recipe knowhow created in `.workflow/knowhow/` for each detected operational workflow (test / debug / build / dev / lint). Each recipe matches the `recipe` schema in `~/.maestro/workflows/knowhow.md` Part B and contains at least one runnable command.
+- [ ] Workflow recipe knowhow created in `.workflow/knowhow/` for each detected operational workflow (test / debug / build / dev / lint). Each recipe matches the `recipe` schema in `~/.pi/agent/packages/pi-maestro-flow/workflows/knowhow.md` Part B and contains at least one runnable command.
 - [ ] Report displayed grouped by destination (specs / recipes / skipped / deferred), with `.proposed.md` files surfaced when an existing recipe slug was preserved.
 </success_criteria>

package/skills/team-adversarial-swarm/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: team-adversarial-swarm
 description: "ACO swarm intelligence with modular Workflow composition and adversarial decision gates. Coordinator drives iteration loop; 4 composable Workflow scripts handle exploration, scoring, convergence, and synthesis — each with built-in adversarial patterns."
-allowed-tools: Read Write Edit Bash Glob Grep Workflow AskUserQuestion Agent
+allowed-tools: Read Write Edit Bash Glob Grep Workflow teammate maestro
 ---
 
 # Team Adversarial Swarm
@@ -105,7 +105,7 @@ SKILL.md (Coordinator — this file)
 
 解析用户 intent，生成 `swarm-config.json`。
 
-若 intent 不够明确，用 AskUserQuestion 澄清：
+若 intent 不够明确，用 user prompt 澄清：
 - 搜索空间是什么？（文件 glob / 节点列表 / 抽象决策集）
 - 目标是什么？（最优方案 / 发现问题 / 优化路径）
 - 如何评分？（测试通过率 / lint / 自定义规则 / LLM 对抗评分）
@@ -180,7 +180,7 @@ Coordinator 负责 Workflow 间的数据桥接和 Python 脚本调用。
    })
    ```
 3. 将 synthesis 结果写入 `<session>/artifacts/best-solution.md`
-4. 展示完成摘要 + AskUserQuestion（归档 / 保留 / 导出 / 再跑一轮）
+4. 展示完成摘要 + user prompt（归档 / 保留 / 导出 / 再跑一轮）
 
 ---
 
@@ -220,9 +220,9 @@ synthesize(best, top_k) → best-solution.md
 | aco.py 未找到 | Glob team-swarm skill 路径；提示安装 |
 | Python < 3.10 | 尝试 python3；报告依赖 |
 | Workflow 执行失败 | 记录错误，提供 --resume 恢复点 |
-| 所有蚁全部失败 | 暂停，AskUserQuestion（重试/终止/调整config） |
+| 所有蚁全部失败 | 暂停，user prompt（重试/终止/调整config） |
 | 收敛从不触发 | max_iterations 安全网总会触发 |
-| 幻觉集群 (>50% 蚁被降分) | 暂停，AskUserQuestion（继续/调整评分规则） |
+| 幻觉集群 (>50% 蚁被降分) | 暂停，user prompt（继续/调整评分规则） |
 
 ## Completion
 

package/skills/team-arch-opt/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: team-arch-opt
 description: "Unified team skill for architecture optimization. Uses team-worker agent architecture with role directories for domain logic. Coordinator orchestrates pipeline, workers are team-worker agents. Triggers on \"team arch-opt\"."
-allowed-tools: Agent TaskCreate TaskList TaskGet TaskUpdate TeamCreate TeamDelete SendMessage AskUserQuestion Read Write Edit Bash Glob Grep mcp__maestro__team_msg
+allowed-tools: teammate Read Write Edit Bash Glob Grep maestro
 ---
 
 # Team Architecture Optimization
@@ -66,7 +66,7 @@ Parse `$ARGUMENTS`:
 Coordinator spawns workers using this template:
 
 ```
-Agent({
+teammate({
   subagent_type: "team-worker",
   description: "Spawn <role> worker",
   team_name: "arch-opt",

package/skills/team-brainstorm/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: team-brainstorm
 description: "Unified team skill for brainstorming team. Uses team-worker agent architecture with role directories for domain logic. Coordinator orchestrates pipeline, workers are team-worker agents. Triggers on \"team brainstorm\"."
-allowed-tools: TeamCreate TeamDelete SendMessage TaskCreate TaskUpdate TaskList TaskGet Agent AskUserQuestion Read Write Edit Bash Glob Grep mcp__maestro__team_msg
+allowed-tools: teammate Read Write Edit Bash Glob Grep maestro
 ---
 
 # Team Brainstorm
@@ -64,7 +64,7 @@ Parse `$ARGUMENTS`:
 Coordinator spawns workers using this template:
 
 ```
-Agent({
+teammate({
   subagent_type: "team-worker",
   description: "Spawn <role> worker",
   team_name: "brainstorm",
@@ -95,7 +95,7 @@ Execute built-in Phase 1 (task discovery) -> role Phase 2-4 -> built-in Phase 5
 When Full pipeline has N parallel IDEA tasks, spawn N distinct team-worker agents named `ideator-1`, `ideator-2`, etc.
 
 ```
-Agent({
+teammate({
   subagent_type: "team-worker",
   name: "ideator-<N>",
   team_name: "brainstorm",

package/skills/team-coordinate/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: team-coordinate
 description: "Universal team coordination skill with dynamic role generation. Uses team-worker agent architecture with role-spec files. Only coordinator is built-in -- all worker roles are generated at runtime as role-specs and spawned via team-worker agent. Beat/cadence model for orchestration. Triggers on \"Team Coordinate \"."
-allowed-tools: TeamCreate TeamDelete SendMessage TaskCreate TaskUpdate TaskList TaskGet Agent AskUserQuestion Read Write Edit Bash Glob Grep mcp__maestro__team_msg
+allowed-tools: teammate Read Write Edit Bash Glob Grep maestro
 ---
 
 # Team Coordinate 
@@ -110,7 +110,7 @@ User provides task description
 When coordinator spawns workers, use `team-worker` agent with role-spec path:
 
 ```
-Agent({
+teammate({
   subagent_type: "team-worker",
   description: "Spawn <role> worker",
   team_name: <team-name>,
@@ -147,7 +147,7 @@ Execute built-in Phase 1 (task discovery) -> role-spec Phase 2-4 -> built-in Pha
 When pipeline completes (all tasks done), coordinator presents an interactive choice:
 
 ```
-AskUserQuestion({
+ask user ({
   questions: [{
     question: "Team pipeline complete. What would you like to do?",
     header: "Completion",
@@ -243,7 +243,7 @@ AskUserQuestion({
 Coordinator supports `resume` / `continue` for interrupted sessions:
 
 1. Scan `.workflow/.team/TC-*/team-session.json` for active/paused sessions
-2. Multiple matches -> AskUserQuestion for selection
+2. Multiple matches -> user prompt for selection
 3. Audit TaskList -> reconcile session state <-> task status
 4. Reset in_progress -> pending (interrupted tasks)
 5. Rebuild team and spawn needed workers only

package/skills/team-designer/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: team-designer
 description: "Meta-skill for generating team skills following the v4 architecture pattern. Produces complete skill packages with SKILL.md router, coordinator, worker roles, specs, and templates. Triggers on \"team-designer\", \"design team\"."
-allowed-tools: Agent AskUserQuestion Read Write Edit Bash Glob Grep mcp__maestro__team_msg
+allowed-tools: teammate Read Write Edit Bash Glob Grep maestro
 ---
 
 # Team Skill Designer

package/skills/team-executor/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: team-executor
 description: "Lightweight session execution skill. Resumes existing team-coordinate sessions for pure execution via team-worker agents. No analysis, no role generation -- only loads and executes. Session path required. Triggers on \"Team Executor\"."
-allowed-tools: TeamCreate TeamDelete SendMessage TaskCreate TaskUpdate TaskList TaskGet Agent AskUserQuestion Read Write Edit Bash Glob Grep mcp__maestro__team_msg
+allowed-tools: teammate Read Write Edit Bash Glob Grep maestro
 ---
 
 # Team Executor
@@ -107,7 +107,7 @@ Validate session
 When executor spawns workers, use `team-worker` agent with role-spec path:
 
 ```
-Agent({
+teammate({
   subagent_type: "team-worker",
   description: "Spawn <role> worker",
   team_name: <team-name>,
@@ -139,7 +139,7 @@ Read role_spec file to load Phase 2-4 domain instructions.`
 When pipeline completes (all tasks done), executor presents an interactive choice:
 
 ```
-AskUserQuestion({
+ask user ({
   questions: [{
     question: "Team pipeline complete. What would you like to do?",
     header: "Completion",

package/skills/team-frontend/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: team-frontend
 description: "Unified team skill for frontend development. Pure router — all roles read this file. Beat model is coordinator-only in monitor.md. Built-in ui-ux-pro-max design intelligence. Triggers on \"team frontend\"."
-allowed-tools: Agent TaskCreate TaskList TaskGet TaskUpdate TeamCreate TeamDelete SendMessage AskUserQuestion Read Write Edit Bash Glob Grep WebFetch WebSearch mcp__maestro__team_msg
+allowed-tools: teammate Read Write Edit Bash Glob Grep WebFetch WebSearch maestro
 ---
 
 # Team Frontend Development
@@ -66,7 +66,7 @@ Parse `$ARGUMENTS`:
 Coordinator spawns workers using this template:
 
 ```
-Agent({
+teammate({
   subagent_type: "team-worker",
   description: "Spawn <role> worker",
   team_name: "frontend",

package/skills/team-frontend-debug/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: team-frontend-debug
 description: "Frontend debugging team using Chrome DevTools MCP. Dual-mode — feature-list testing or bug-report debugging. Triggers on \"team-frontend-debug\", \"frontend debug\"."
-allowed-tools: TeamCreate TeamDelete SendMessage TaskCreate TaskUpdate TaskList TaskGet Agent AskUserQuestion Read Write Edit Bash Glob Grep mcp__maestro__team_msg mcp__chrome-devtools__*
+allowed-tools: teammate Read Write Edit Bash Glob Grep mcp__chrome-devtools__* maestro
 ---
 
 # Frontend Debug Team
@@ -113,7 +113,7 @@ All browser inspection operations use Chrome DevTools MCP. Reproducer and Verifi
 Coordinator spawns workers using this template:
 
 ```
-Agent({
+teammate({
   subagent_type: "team-worker",
   description: "Spawn <role> worker",
   team_name: <team-name>,
@@ -154,7 +154,7 @@ Execute built-in Phase 1 (task discovery) -> role Phase 2-4 -> built-in Phase 5
 When pipeline completes, coordinator presents:
 
 ```
-AskUserQuestion({
+ask user ({
   questions: [{
     question: "Pipeline complete. What would you like to do?",
     header: "Completion",

package/skills/team-interactive-craft/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: team-interactive-craft
 description: "Unified team skill for interactive component crafting. Vanilla JS + CSS interactive components with zero dependencies. Research -> interaction design -> build -> a11y test. Uses team-worker agent architecture. Triggers on \"team interactive craft\", \"interactive component\"."
-allowed-tools: Agent AskUserQuestion Read Write Edit Bash Glob Grep TaskList TaskGet TaskUpdate TaskCreate TeamCreate TeamDelete SendMessage mcp__maestro__read_file mcp__maestro__write_file mcp__maestro__edit_file mcp__maestro__team_msg
+allowed-tools: teammate Read Write Edit Bash Glob Grep mcp__maestro__read_file mcp__maestro__write_file mcp__maestro__edit_file maestro
 ---
 
 # Team Interactive Craft
@@ -67,7 +67,7 @@ Parse `$ARGUMENTS`:
 Coordinator spawns workers using this template:
 
 ```
-Agent({
+teammate({
   subagent_type: "team-worker",
   description: "Spawn <role> worker for <task-id>",
   team_name: "interactive-craft",