maestro-flow 0.4.19 → 0.4.21

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

@@ -0,0 +1,485 @@
+---
+name: maestro-companion
+description: Knowledge companion — load context, record companion doc, capture insights, route to skills
+argument-hint: "[before|note|after|route] [--task <description>] [--type <task_type>] [--category <cat>]"
+allowed-tools: Read, Write, Edit, Bash, Glob, Grep, AskUserQuestion
+---
+
+<purpose>
+Task companion command — pairs with any task to provide knowledge context loading,
+structured companion document recording, insight capture, and skill routing.
+
+Does not create sessions or modify workflow state. Pure side-car utility.
+
+Four modes:
+- **before** — Pre-task: load spec + knowhow index + codebase index, create companion doc
+- **note** — Mid-task: append a structured entry to the active companion doc
+- **after** — Post-task: review companion doc, promote entries to spec/knowhow, suggest next steps
+- **route** — Routing: recommend next skill/command based on intent
+
+No arguments → auto-detect: uncommitted changes → `after`, else → `before`.
+</purpose>
+
+<context>
+$ARGUMENTS — mode + optional flags.
+
+```bash
+$maestro-companion
+$maestro-companion "before --task 'implement auth module' --type implement"
+$maestro-companion "before --task 'fix login bug' --type debug --category coding"
+$maestro-companion "note 'decided to use bcrypt over argon2'"
+$maestro-companion "note --file src/auth.ts 'changed token validation logic'"
+$maestro-companion "after"
+$maestro-companion "route what should I do next"
+```
+
+**Mode detection priority:**
+1. Explicit `before` / `note` / `after` / `route`
+2. Intent text that is not a mode keyword → `route`
+3. No arguments → auto-detect (`git status` has changes → `after`, else → `before`)
+
+**Flags:**
+- `--task <description>` — Current task description (for targeted knowledge loading and doc title)
+- `--type <task_type>` — Task type for field template selection (see task types below)
+- `--category <cat>` — Spec category filter: coding / arch / test / review / debug / learning / ui
+
+**Task types** (determines which recording sections are active):
+
+| Type | Description | Key sections |
+|------|-------------|--------------|
+| `implement` | Feature development, code writing | working_files, dependencies, decisions, tests_affected |
+| `debug` | Bug investigation, root cause analysis | symptoms, hypotheses, evidence, root_cause, fix_applied |
+| `analyze` | Code/architecture/performance analysis | scope, findings, risks, recommendations |
+| `design` | Architecture/UI/API design | constraints, alternatives, trade_offs, chosen_approach |
+| `plan` | Task decomposition, roadmap planning | goals, breakdown, estimates, dependencies |
+| `review` | Code review, PR review | files_reviewed, findings, severity_counts, verdict |
+| `test` | Test writing, UAT, coverage expansion | coverage_before, coverage_after, gaps, test_files |
+| `refactor` | Code restructuring, tech debt | affected_modules, before_after, breaking_changes |
+| `learn` | Codebase exploration, knowledge building | questions, answers, mental_model, references |
+| `general` | Default / unclassified | (all universal sections) |
+
+Auto-detection: if `--type` not provided, infer from `--task` description keywords.
+
+**Companion document:**
+- Path: `.workflow/.scratchpad/companion-{YYYYMMDD-HHmmss}.md`
+- Active doc tracking: `.workflow/.scratchpad/.companion-active` (stores path of current companion doc)
+- Format: YAML frontmatter (rich metadata) + typed sections + timestamped entries
+</context>
+
+<execution>
+
+## S_BEFORE — Knowledge Loading + Companion Doc Creation
+
+### Step 1: Load Specs
+
+Run `maestro spec load` with appropriate flags:
+- With `--category`: `maestro spec load --category <cat>`
+- With `--task`: `maestro spec load --keyword <extracted_keyword>`
+- No flags: `maestro spec load --category coding`
+
+Display loaded rules summary (entry count + key rule names).
+
+### Step 2: Browse Knowhow Index
+
+Run `maestro knowhow list --store workflow`. With `--task`, also run `maestro knowhow search "<task_keyword>"`. Display available entries (ID + title). Hint: `maestro wiki load <id>` for details.
+
+### Step 3: Check Codebase Index
+
+Check if `.workflow/codebase/doc-index.json` exists.
+- Exists → display "Codebase docs ready, last updated: {timestamp}"
+- Missing → suggest `$manage-codebase-rebuild`
+- Stale (>7 days) → suggest `$manage-codebase-refresh`
+
+### Step 4: Create Companion Document
+
+Create `.workflow/.scratchpad/` if needed. Resolve task type from `--type` flag or infer from `--task` keywords.
+
+Write companion doc with full field template:
+
+```markdown
+---
+# === Identity ===
+task: "{task_description or 'Untitled task'}"
+task_type: "{resolved type}"
+created: "{ISO timestamp}"
+status: active
+
+# === Context Loaded ===
+specs_loaded: "{category or 'coding'}"
+specs_count: {N}
+knowhow_searched: "{keyword or 'none'}"
+knowhow_available: {M}
+codebase_index: "{ready|missing|stale}"
+branch: "{current git branch}"
+phase: "{current phase from state.json or 'none'}"
+milestone: "{current milestone from state.json or 'none'}"
+
+# === Scope ===
+working_files: []
+dependencies: []
+related_artifacts: []
+
+# === Outcome (populated by after mode) ===
+outcome: ""
+files_changed: []
+promoted_specs: 0
+promoted_knowhow: 0
+follow_up: []
+completed: ""
+---
+
+# Companion Doc — {task_description}
+
+> `$maestro-companion "note '<content>'"` — add entries
+> `$maestro-companion after` — review, promote, close
+
+## Context
+
+{Type-specific context section}
+
+## Entries
+
+## Summary
+```
+
+**Type-specific context templates** (written into `## Context`):
+
+**implement:**
+```markdown
+### Working Files
+| File | Role | Status |
+|------|------|--------|
+
+### Dependencies
+- (modules, APIs, or services this task depends on)
+
+### Decisions
+| # | Decision | Rationale | Alternatives Considered |
+|---|----------|-----------|------------------------|
+
+### Tests Affected
+- (test files that need creation or update)
+```
+
+**debug:**
+```markdown
+### Symptoms
+- (observable behavior vs expected behavior)
+
+### Hypotheses
+| # | Hypothesis | Status | Evidence |
+|---|-----------|--------|----------|
+
+### Evidence Trail
+| Time | Source | Type | Finding |
+|------|--------|------|---------|
+
+### Root Cause
+- (populated when identified)
+
+### Fix Applied
+- (description of fix, files changed)
+```
+
+**analyze:**
+```markdown
+### Scope
+- (what is being analyzed and boundaries)
+
+### Findings
+| # | Finding | Severity | Location |
+|---|---------|----------|----------|
+
+### Risks
+- (identified risks or concerns)
+
+### Recommendations
+- (actionable recommendations)
+```
+
+**design:**
+```markdown
+### Constraints
+- (hard limits, requirements, compatibility needs)
+
+### Alternatives
+| # | Approach | Pros | Cons |
+|---|----------|------|------|
+
+### Trade-offs
+- (key trade-off decisions and rationale)
+
+### Chosen Approach
+- (selected design with justification)
+```
+
+**plan:**
+```markdown
+### Goals
+- (what success looks like)
+
+### Breakdown
+| # | Task | Estimate | Depends On | Status |
+|---|------|----------|------------|--------|
+
+### Dependencies
+- (external dependencies, blockers, prerequisites)
+```
+
+**review:**
+```markdown
+### Files Reviewed
+| File | Lines | Findings |
+|------|-------|----------|
+
+### Findings
+| # | Severity | Category | File:Line | Description |
+|---|----------|----------|-----------|-------------|
+
+### Verdict
+- (pass / pass-with-concerns / fail)
+```
+
+**test:**
+```markdown
+### Coverage
+- Before: {%}
+- After: {%}
+- Target: {%}
+
+### Test Files
+| File | Type | Tests Added | Status |
+|------|------|------------|--------|
+
+### Gaps
+- (uncovered paths or scenarios)
+```
+
+**refactor:**
+```markdown
+### Affected Modules
+- (modules being restructured)
+
+### Before / After
+| Aspect | Before | After |
+|--------|--------|-------|
+
+### Breaking Changes
+- (API or behavior changes that affect consumers)
+```
+
+**learn:**
+```markdown
+### Questions
+| # | Question | Answered | Source |
+|---|----------|----------|--------|
+
+### Mental Model
+- (evolving understanding of how it works)
+
+### References
+- (files, docs, wiki entries consulted)
+```
+
+**general:**
+```markdown
+### Notes
+- (general working notes)
+```
+
+Write the companion doc path to `.workflow/.scratchpad/.companion-active`.
+
+### Step 5: Output Summary Card
+
+```
+Knowledge context loaded
+  Spec:     {N} rules ({category})
+  Knowhow:  {M} entries available
+  Codebase: {status}
+  Doc:      {companion_doc_path} [{task_type}]
+
+Mid-task commands:
+  $maestro-companion "note 'finding or decision'"
+  $maestro-companion "note --file src/auth.ts 'changed validation'"
+  $spec-load "--keyword <keyword>"
+```
+
+---
+
+## S_NOTE — Append Structured Entry to Companion Doc
+
+### Step 1: Locate Active Companion Doc
+
+Read `.workflow/.scratchpad/.companion-active` to get the doc path.
+If missing or file not found → create a new companion doc (same as Step 4 above, minimal — no spec/knowhow loading).
+
+### Step 2: Parse Entry Content and Flags
+
+Parse $ARGUMENTS after `note` keyword:
+- `--file <path>` — associate entry with a specific file (appended to frontmatter `working_files`)
+- `--severity <level>` — for findings: critical / high / medium / low
+- Remaining text = entry content
+
+### Step 3: Classify Entry Type
+
+Auto-classify from content signals:
+
+| Content signal | Type tag |
+|---------------|----------|
+| "decided/decision/chose/picked/went with" | `decision` |
+| "pattern/convention/rule/always/never/must" | `spec-candidate` |
+| "pitfall/gotcha/careful/warning/trap/beware" | `pitfall` |
+| "learned/realized/discovered/understood/turns out" | `insight` |
+| "hypothesis/suspect/might be/could be" | `hypothesis` |
+| "found bug/root cause/because of/caused by" | `evidence` |
+| "risk/concern/worry/might break" | `risk` |
+| "todo/need to/should also/follow up/remaining" | `todo` |
+| "question/why does/how does/unclear" | `question` |
+| "blocked/stuck/can't/impossible" | `blocker` |
+| Default | `note` |
+
+### Step 4: Append Entry
+
+Append to the companion doc under `## Entries`:
+
+```markdown
+### [{type}] {HH:mm} — {first line of content}
+
+{full content}
+
+{if --file: **File:** `{path}`}
+{if --severity: **Severity:** {level}}
+```
+
+### Step 5: Update Frontmatter and Context Tables
+
+- If `--file` provided and not already in `working_files` → append to `working_files`
+- If type is `decision` → also append row to `### Decisions` table (if implement/design type doc)
+- If type is `hypothesis` → also append row to `### Hypotheses` table (if debug type doc)
+- If type is `evidence` → also append row to `### Evidence Trail` table (if debug type doc)
+- If type is `risk` → also append to `### Risks` list (if analyze/design type doc)
+- If type is `question` → also append row to `### Questions` table (if learn type doc)
+
+### Step 6: Confirm
+
+```
+[{type}] entry added to companion doc
+  $maestro-companion "note '...'"  — add more
+  $maestro-companion after         — review & promote
+```
+
+---
+
+## S_AFTER — Review + Populate Outcome + Promote + Route
+
+### Step 1: Load Companion Doc
+
+Read `.workflow/.scratchpad/.companion-active` → read the companion doc.
+If no active doc or doc is empty → skip to Step 4 (accumulation reminder).
+
+### Step 2: Populate Outcome Fields
+
+Collect task outcome data:
+
+```bash
+git diff --name-only
+```
+
+Update frontmatter:
+- `files_changed` — from git diff
+- `completed` — current ISO timestamp
+- `status` — `completed`
+
+Display entry summary:
+```
+Companion doc review — {task_type}
+  Entries:    {total} ({by type breakdown})
+  Files:      {files_changed count} changed
+  Duration:   {elapsed since created}
+
+Promotable entries:
+  {list of decision/spec-candidate/pitfall/insight entries}
+```
+
+### Step 3: Promote Entries
+
+If promotable entries exist, ask user:
+
+- Option 1: "Promote to spec" — short coding/arch/test constraint
+- Option 2: "Promote to knowhow" — detailed recipe/template/decision/tip
+- Option 3: "Promote both" — spec index entry + knowhow document
+- Option 4: "Skip — nothing to promote"
+
+**Routing by selection:**
+
+| Selection | Action |
+|-----------|--------|
+| Spec | `Skill({ skill: "spec-add" })` — guide user through category + content |
+| Knowhow | `Skill({ skill: "manage-knowhow-capture" })` — guide through type + content |
+| Both | `spec-add` first, then `manage-knowhow-capture` |
+| Skip | Proceed to Step 4 |
+
+Update frontmatter: `promoted_specs`, `promoted_knowhow` counts.
+Extract any `todo` entries → write to `follow_up` in frontmatter.
+Clear `.workflow/.scratchpad/.companion-active`.
+
+### Step 4: Output Accumulation Reminder + Routing
+
+```
+Knowledge accumulation reminders:
+  Reusable pattern found?        $spec-add "<category> 'title' 'content'"
+  Solved a complex problem?      $manage-knowhow-capture "recipe 'description'"
+  Made an architecture decision? $manage-knowhow-capture "decision 'description'"
+  Discovered a useful trick?     $manage-knowhow-capture "tip 'content'"
+
+Next steps:
+  $maestro-next          — recommend next command
+  $maestro "<intent>"    — route intent to full workflow
+  $manage-status         — view project dashboard
+```
+
+---
+
+## S_ROUTE — Skill Routing
+
+### Step 1: Parse Intent
+
+Extract intent text from $ARGUMENTS after removing the `route` keyword.
+
+### Step 2: Delegate to maestro-next
+
+```
+Skill({ skill: "maestro-next", args: "<intent_text>" })
+```
+
+Reuses maestro-next routing table and scoring logic to recommend the best single command.
+
+</execution>
+
+<error_codes>
+| Code | Severity | Condition | Recovery |
+|------|----------|-----------|----------|
+| W001 | warning | `.workflow/specs/` not initialized | Suggest `$spec-setup` |
+| W002 | warning | `.workflow/knowhow/` is empty | Normal, skip knowhow index |
+| W003 | warning | `.workflow/codebase/` does not exist | Suggest `$manage-codebase-rebuild` |
+| W004 | warning | No active companion doc found (note/after mode) | Create new doc or skip |
+</error_codes>
+
+<success_criteria>
+- [ ] Mode correctly detected (before/note/after/route)
+- [ ] Task type resolved from --type flag or inferred from --task keywords
+- [ ] before: spec + knowhow + codebase indexes loaded or hints given
+- [ ] before: companion doc created with full YAML frontmatter (identity + context + scope + outcome)
+- [ ] before: type-specific context template written (matching task_type)
+- [ ] before: active doc path written to `.companion-active`
+- [ ] note: active companion doc located and entry appended with type tag
+- [ ] note: entry type auto-classified from content signals (11 type tags)
+- [ ] note: --file flag updates working_files in frontmatter
+- [ ] note: typed entries cross-posted to matching context tables
+- [ ] after: outcome fields populated (files_changed, completed, status)
+- [ ] after: promotable entries identified and routed to spec-add or manage-knowhow-capture
+- [ ] after: todo entries extracted to follow_up field
+- [ ] after: companion doc marked completed, active pointer cleared
+- [ ] route: intent correctly forwarded to maestro-next
+- [ ] No session created, no state.json modified
+</success_criteria>

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

@@ -0,0 +1,111 @@
+---
+name: maestro-grill
+description: Use when stress-testing a plan, idea, or requirement against codebase reality before brainstorming
+argument-hint: "<topic|plan> [-y] [-c] [--from <source>] [--depth shallow|standard|deep]"
+allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
+---
+<purpose>
+Socratic stress-testing of a plan, idea, or requirement against codebase reality. Walks every branch of the decision tree one question at a time — challenging vague terminology against existing code, probing edge cases with concrete scenarios, and verifying assumptions with code evidence. Produces a verified context package (grill-report.md + terminology.md + context-package.json) for downstream brainstorm/analyze/roadmap consumption.
+
+Positioned BEFORE brainstorm in the pipeline: grill stress-tests and sharpens; brainstorm generates and elaborates.
+
+Codex specifics:
+- **No agent spawning** — codebase exploration runs directly via Glob/Grep/Read in coordinator context.
+- **request_user_input** replaces AskUserQuestion for Socratic Q&A.
+- **CLI delegation** for auto mode: `exec_command("maestro delegate ... --role analyze --mode analysis")`.
+</purpose>
+
+<required_reading>
+@~/.maestro/workflows/grill.md
+</required_reading>
+
+<deferred_reading>
+- [state.json](~/.maestro/templates/state.json) — read when registering artifact
+</deferred_reading>
+
+<context>
+$ARGUMENTS -- topic/plan text for interactive mode, or --from source for upstream input.
+
+**Mode selection:**
+- **Interactive mode** (default): Topic text triggers full Socratic grilling with user Q&A
+- **Auto mode** (`-y`): Code exploration answers questions instead of the user
+- **Resume mode** (`-c` or `--session ID`): Continue from a previous grill session
+
+**Flags:**
+- `-y` / `--yes`: Auto mode — CLI exploration replaces human answers
+- `-c` / `--continue`: Resume from last grill session
+- `--session ID`: Resume specific session
+- `--depth shallow|standard|deep`: Branch count 3/5/8 (default: standard)
+- `--from <source>`: Load upstream material (`blueprint:ID`, `@file`, or path)
+
+**Output directory**: `.workflow/scratch/{YYYYMMDD}-grill-{slug}/`
+**Produced files**: `grill-report.md`, `terminology.md`, `context-package.json`
+
+### Role Knowledge
+`maestro wiki search "{topic keywords}"` → load relevant entries before grilling.
+`maestro spec load --category arch` → load architecture constraints.
+</context>
+
+<interview_protocol>
+Grill the user relentlessly until every branch of the decision tree is walked. This is NOT a menu-driven interview — it is adversarial Socratic questioning. Active only in interactive mode; skip when `-y/--yes` or `-c/--continue`.
+
+Core protocol:
+- **One question per turn**. Each question probes ONE specific aspect. Never ask compound questions.
+- **Code-grounded**: Before asking, search the codebase for evidence. Use findings to sharpen the question or challenge the user's answer. Never ask what code can verify — search first, then confront.
+- **Escalating depth**: Start with scope boundaries, progress to data model, edge cases, failure modes. Each branch goes basic → specific → adversarial.
+- **Immediate writeback**: After each answered question, immediately append the Q&A + decision to `grill-report.md`. Do NOT batch — partial progress must be on disk before the next question.
+- **Challenge contradictions**: If an answer conflicts with code evidence or a prior answer, immediately surface the contradiction and demand resolution.
+- **Terminology enforcement**: When the user uses a term that conflicts with codebase naming, challenge it immediately. Propose the code-consistent alternative. Update `terminology.md` as terms crystallize.
+
+Question framing rules:
+- Reference specific code findings: "The codebase uses `{symbol}` at `{file:line}` — your proposal calls it `{term}`. Which wins?"
+- Use concrete scenarios: "What happens when a user does {action} while {condition} is true?"
+- Probe boundaries: "You said {X} is in scope — does that include {edge_case}, or is that separate?"
+- Challenge scale: "This touches `{table}` — at 10x current data volume, which query breaks first?"
+
+Branch walking order: Scope & Boundaries → Data Model & State → Edge Cases & Failure Modes → Integration & Dependencies → Scale & Performance → Security & Access Control → Observability & Operations → Migration & Rollback. Number of branches determined by `--depth`.
+
+Exit: When all depth-selected branches are fully walked (every question answered or explicitly deferred), finalize the report and generate context-package.json.
+</interview_protocol>
+
+<execution>
+Follow '~/.maestro/workflows/grill.md' completely.
+
+**Next-step routing on completion:**
+
+Standard routing:
+- Need multi-role elaboration → `$maestro-brainstorm "{topic}" --from grill:{artifact_id}`
+- Need deep technical analysis → `$maestro-analyze "{topic}" --from grill:{artifact_id}`
+- Scope is clear, ready for roadmap → `$maestro-roadmap --from grill:{artifact_id}`
+- Need formal spec package → `$maestro-blueprint --from grill:{artifact_id}`
+
+Resume routing:
+- More branches to walk → `$maestro-grill "{topic}" -c`
+</execution>
+
+<error_codes>
+| Code | Severity | Condition | Recovery |
+|------|----------|-----------|----------|
+| E001 | error | No topic/plan and no --from/--continue flag | Prompt user for topic text |
+| E002 | error | --session ID not found | Show available sessions |
+| W001 | warning | Codebase scan failed or returned empty | Continue without code grounding, note limitation |
+| W002 | warning | CLI exploration timeout in auto mode | Skip question, mark as open |
+| W003 | warning | Max branch depth reached without resolution | Force synthesis, offer continuation |
+</error_codes>
+
+<success_criteria>
+- [ ] Interactive mode: all depth-selected branches walked (shallow=3, standard=5, deep=8)
+- [ ] Each branch has >= 2 question-answer pairs with evidence or explicit user input
+- [ ] `grill-report.md` written with Branch Log table, all Q&A entries, synthesis section
+- [ ] `terminology.md` written with >= 5 terms, code references where applicable
+- [ ] Every locked decision has evidence (code reference or explicit user confirmation)
+- [ ] Contradictions between answers and code surfaced and resolved (or logged as risks)
+- [ ] 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
+</success_criteria>
+
+<on_complete>
+@~/.maestro/workflows/finish-work.md — SESSION_DIR={output_dir}, SESSION_TYPE=grill, SESSION_ID={artifact_id}, LINKED_MILESTONE=null
+</on_complete>

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

@@ -129,20 +129,20 @@ S_INFER:
 
 S_RESOLVE_SCOPE:
   → S_QUALITY_MODE  DO: A_RESOLVE_SCOPE_VERDICT
-                     GUARD: position ∈ {brainstorm, blueprint, init} → skip (scope_verdict = null)
+                     GUARD: position ∈ {grill, brainstorm, blueprint, init} → skip (scope_verdict = null)
 
 S_QUALITY_MODE:
   → S_PLANNING_MODE DO: A_DETERMINE_QUALITY_MODE
 
 S_PLANNING_MODE:
   → S_DECOMPOSE     DO: A_DETERMINE_PLANNING_MODE
-                     GUARD: lifecycle_position ∈ {brainstorm, blueprint, init, analyze-macro, roadmap} → skip (force independent)
+                     GUARD: lifecycle_position ∈ {grill, brainstorm, blueprint, init, analyze-macro, roadmap} → skip (force independent)
 
 S_DECOMPOSE:
   → S_BUILD_CHAIN   DO: A_DECOMPOSE_TASKS
                      GUARD: broad intent → MUST clarify boundary even if auto_confirm
                      GUARD: narrow intent → auto-derive, skip questions
-                     GUARD: position ∈ {brainstorm, blueprint, init} → skip decomposition
+                     GUARD: position ∈ {grill, brainstorm, blueprint, init} → skip decomposition
 
 S_BUILD_CHAIN:
   → S_CREATE_SESSION DO: A_BUILD_STEPS
@@ -242,6 +242,7 @@ resolve_milestone(phase_number):
 
 | Pattern | Position |
 |---------|----------|
+| 压力测试 / 拷问 / 验证假设 / grill / stress-test | `grill`（**auto_confirm=true 时跳过，直接 `brainstorm`**） |
 | brainstorm / 头脑风暴 / 探索 / ideate / 设计思路 | `brainstorm` |
 | blueprint / 规格 / 正式文档 / spec-generate / 7-phase | `blueprint` |
 | broad/medium intent 无数字 phase (重构/全面/重写/迁移/新功能 X) | `analyze-macro` |
@@ -262,7 +263,7 @@ resolve_milestone(phase_number):
 | `phase_is_new == true` (新 phase) | `analyze` |
 | no milestones AND no roadmap.md AND has analyze macro artifact | `roadmap` |
 | no milestones AND no roadmap.md AND no analyze artifact | `analyze-macro` |
-| `phase == null` (brainstorm/blueprint/init/roadmap/analyze-macro override 已定) | n/a |
+| `phase == null` (grill/brainstorm/blueprint/init/roadmap/analyze-macro override 已定) | n/a |
 | phase 已存在 + 无任何 artifact | `analyze` |
 | phase 已存在 + 最新 artifact = analyze | `plan` |
 | phase 已存在 + 最新 artifact = plan | `execute` |
@@ -317,7 +318,7 @@ resolve_milestone(phase_number):
 
 | Condition | Mode | Reason |
 |-----------|------|--------|
-| lifecycle_position ∈ {brainstorm, init, roadmap} | `independent` | 前期阶段不涉及多 phase 规划 |
+| lifecycle_position ∈ {grill, brainstorm, init, roadmap} | `independent` | 前期阶段不涉及多 phase 规划 |
 | `phase_is_new == true` | `independent` | 新 phase 尚无里程碑上下文 |
 | intent 显式指定 phase 编号（如 "phase 2"、"P3"） | `independent` | 用户明确针对单个 phase |
 | milestone 仅含 1 个 phase（读 state.json） | `independent` | 统一无意义 |
@@ -380,7 +381,8 @@ Generate steps from `session.lifecycle_position` to `milestone-complete`.
 
 | Stage | Skill (independent) | Skill (unified) | Decision after | quality_mode |
 |-------|---------------------|-----------------|----------------|--------------|
-| brainstorm | `maestro-brainstorm "{intent}"` | *(same)* | — | all |
+| grill | `maestro-grill "{intent}"` | *(same)* | — | all (**skip when auto_confirm**) |
+| brainstorm | `maestro-brainstorm "{intent}" --from grill:{grill_id}` *(if grill ran)* / `maestro-brainstorm "{intent}"` *(otherwise)* | *(same)* | — | all |
 | blueprint | `maestro-blueprint "{intent}"` | *(same)* | — | all |
 | init | `maestro-init` | *(same)* | — | all |
 | analyze-macro | `maestro-analyze "{intent}"` | *(same)* | `post-analyze-scope` | all |
@@ -405,6 +407,7 @@ Generate steps from `session.lifecycle_position` to `milestone-complete`.
 1. **起点**：从 `session.lifecycle_position` 开始
 2. **跳过已完成**：跳过当前 milestone+phase 下已有 completed artifact 的 stage（按 `session.phase` 过滤）；unified 按 milestone 过滤
 3. **quality_mode 过滤**：按 `session.quality_mode` 排除不匹配 stage
+3.5. **grill auto_confirm 跳过**：`auto_confirm == true` 时删除 `grill` stage（grill 为交互式苏格拉底拷问，不支持自动模式）；brainstorm args 不含 `--from grill:*`
 4. **决策节点**：每个 Decision after 非空的 stage 之后插入 `{ decision: "<gate>", retry_count: 0, max_retries: 2, command_scope: null, command_path: null }`
 5. **goal-audit 插入**：`task_decomposition` 存在时，在最后一个 evidence-producing stage（verify/review/test）之后、`milestone-complete` 之前插入 `decision:post-goal-audit`
 6. **终点硬约束**：chain 以 `milestone-complete` 结尾
@@ -742,7 +745,8 @@ decision:post-goal-audit {retry+1}
 - [ ] Phase 先于 position 解析；phase_is_new 标记写入 session
 - [ ] D-007 反查：phase 数字 → `session.milestone`，禁止读 current_milestone；写入 step.milestone_id
 - [ ] phase_is_new=true → lifecycle_position 强制 `analyze`
-- [ ] Intent overrides 识别 brainstorm / blueprint / analyze-macro
+- [ ] Intent overrides 识别 grill / brainstorm / blueprint / analyze-macro
+- [ ] auto_confirm=true 时 grill stage 跳过（交互式拷问不支持自动模式）
 - [ ] A_RESOLVE_SCOPE_VERDICT 读 macro analyze conclusions.scope_verdict，写入 session.scope_verdict + analyze_macro_id
 - [ ] 链路起点 = analyze-macro 时：large→roadmap+analyze+plan(phase)；medium/small→直跳 plan --from analyze:{ANL_ID}（跳过 roadmap+analyze）
 - [ ] post-analyze-scope decision 节点在 macro analyze 之后插入；A_SCOPE_EVALUATE/A_APPLY_SCOPE_VERDICT 重塑链路

package/.codex/skills/manage-codebase-rebuild/SKILL.md

@@ -153,6 +153,9 @@ Single wave generates `wave-1.csv`. No `prev_context` needed (all tasks independ
 | `tech-registry/{slug}.md` | Per-component documentation |
 | `feature-maps/_index.md` | Feature index table |
 | `feature-maps/{slug}.md` | Per-feature documentation |
+| `knowledge-graph.json` | UA Knowledge Graph: nodes, edges, layers, tour (if UA vendor installed) |
+
+**Wiki Integration**: After rebuild, KG nodes are automatically indexed as virtual wiki entries (type: knowhow, virtualKind: ua-kg-node/ua-kg-layer/ua-kg-tour-step) on next `maestro wiki` access. Verify with `maestro wiki list --keyword kg`. Use `maestro kg diff-wiki` for future change impact analysis.
 
 ### Session Structure
 
@@ -350,6 +353,9 @@ Generators: {completed}/{total} succeeded
 Next steps:
   Skill({ skill: "manage-status" })
   Skill({ skill: "manage-codebase-refresh" })
+  maestro kg stats           # verify KG
+  maestro wiki list --keyword kg  # verify wiki integration
+  maestro kg diff-wiki       # future change impact
 ```
 
 ### Shared Discovery Board Protocol