maestro-flow 0.5.35 → 0.5.36

package/.codex/skills/domain-discover/SKILL.md

@@ -0,0 +1,43 @@
+---
+name: domain-discover
+description: Discover domain term candidates from codebase
+argument-hint: "[--auto]"
+allowed-tools: Read, Bash, Glob, Grep
+---
+
+<purpose>
+Scan codebase for potential domain terms not yet in `.workflow/domain/glossary.yaml`. Presents candidates with confidence scores for interactive registration.
+
+`--auto`: auto-register candidates with confidence ≥ 0.8 without prompting.
+</purpose>
+
+<execution>
+
+### Step 1: Scan Codebase
+
+Run `maestro domain discover` to scan TypeScript interfaces, types, enums, const patterns, API routes, and README headings.
+
+### Step 2: Filter Existing
+
+Remove candidates already registered in glossary.yaml (by canonical name or alias match).
+
+### Step 3: Present Candidates
+
+Display ranked candidates with confidence scores:
+
+```
+=== DOMAIN TERM CANDIDATES ({N} found) ===
+
+  0.92  session-context — Runtime state container for active workflow session
+  0.85  skill-resolver — Module that maps skill names to SKILL.md file paths
+  0.71  chain-graph — DAG definition for multi-step command sequences
+  ...
+
+Register? (all | select by number | skip)
+```
+
+### Step 4: Register Selected
+
+For each confirmed candidate, run `maestro domain add "<canonical>" "<definition>"`.
+
+</execution>

package/.codex/skills/domain-list/SKILL.md

@@ -0,0 +1,38 @@
+---
+name: domain-list
+description: List registered domain terms from glossary
+argument-hint: "[--tier core|extended|peripheral]"
+allowed-tools: Read, Bash, Glob, Grep
+---
+
+<purpose>
+List all registered domain terms from `.workflow/domain/glossary.yaml`. Shows canonical name, definition, tier, aliases, and status.
+</purpose>
+
+<execution>
+
+### Step 1: Load Glossary
+
+Read `.workflow/domain/glossary.yaml`. If not exists, report "No domain glossary — run `maestro domain init`".
+
+### Step 2: Filter and Display
+
+Apply optional `--tier` filter. Display terms grouped by tier (core → extended → peripheral):
+
+```
+=== DOMAIN TERMS ({N} total) ===
+
+[core]
+  auth-token — Short-lived credential for API authentication
+    aliases: 令牌, access-token | keywords: auth, credential, jwt
+  event-bus — Central pub-sub message broker
+    aliases: 事件总线 | keywords: pubsub, messaging
+
+[extended]
+  ...
+
+[deprecated]
+  wikiindexer → search-engine (successor)
+```
+
+</execution>

package/.codex/skills/learn-follow/SKILL.md

@@ -9,9 +9,6 @@ allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
 Guided reading experience for code files, wiki entries, or topics. Walks through content
 section by section using 4 forcing questions to extract patterns, identify assumptions,
 and build a structured understanding map. Insights persist to `.workflow/specs/learnings.md`.
-
-Unlike `learn-decompose` which is parallel pattern extraction, this is sequential
-deep reading that builds understanding incrementally.
 </purpose>
 
 <context>

package/.codex/skills/learn-investigate/SKILL.md

@@ -9,9 +9,6 @@ allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
 Systematic investigation for understanding questions (not bug-fixing). 4-phase approach
 with scope lock and 3-strike escalation. Produces structured evidence trails and
 understanding documents that persist to the learning system.
-
-Unlike `quality-debug` (fixing bugs during execution), this answers "how does X work?",
-"why does Y happen?", "what would happen if Z?" questions.
 </purpose>
 
 <context>

package/.codex/skills/learn-retro/SKILL.md

@@ -10,8 +10,6 @@ Unified retrospective combining git activity analysis and decision quality evalu
 Two lenses, usable independently or together:
 - **git**: Commit metrics, session detection, per-author breakdown, file hotspots, trends
 - **decision**: Decision tracing across wiki/specs/git, multi-perspective evaluation via 3 parallel agents
-
-Works on raw git history and wiki/spec data — does not require completed phase artifacts.
 </purpose>
 
 <context>

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

@@ -180,6 +180,9 @@ Extract:
 | `overlay` | Create/edit command overlays |
 | `update` | Update maestro itself |
 | `harvest` | Extract knowledge from artifacts |
+| `domain_add` | Register a domain term into glossary |
+| `domain_list` | List registered domain terms |
+| `domain_discover` | Discover domain term candidates from codebase |
 | `wiki` | Manage wiki graph |
 | `knowhow` | Manage knowhow entries |
 | `ui_design` | UI design, build new UI |
@@ -434,6 +437,9 @@ S_DECISION_EVAL 入口；镜像 maestro-ralph `A_GOAL_AUDIT_EVALUATE`。Condense
 | `spec_load` | `spec-load` |
 | `spec_map` | `manage-codebase-rebuild` |
 | `spec_remove` | `spec-remove "{description}"` |
+| `domain_add` | `domain-add "{description}"` |
+| `domain_list` | `domain-list` |
+| `domain_discover` | `domain-discover` |
 | `knowhow_capture` | `manage-knowhow-capture "{description}"` |
 | `knowhow` | `manage-knowhow "{description}"` |
 | `issue` | `manage-issue "{description}"` |
@@ -459,26 +465,26 @@ S_DECISION_EVAL 入口；镜像 maestro-ralph `A_GOAL_AUDIT_EVALUATE`。Condense
 
 | Chain | Steps (→ = sequential, [B] = context-producing barrier) |
 |-------|---------------------------------------|
-| `feature` | [B] maestro-plan → [B] maestro-execute → quality-review |
+| `feature` | [B] maestro-plan → [B] maestro-execute → quality-review → manage-harvest --auto |
 | `quality-fix` | [B] maestro-analyze --gaps → [B] maestro-plan --gaps → [B] maestro-execute → quality-review |
 | `deploy` | quality-review → maestro-milestone-release |
-| `blueprint-driven` | maestro-init → [B] maestro-blueprint → [B] maestro-plan --from blueprint:{BLP} → [B] maestro-execute → quality-review |
-| `analyze-macro-driven` | [B] maestro-analyze "{intent}" → ◆ post-analyze-scope → (large: [B] maestro-roadmap --from analyze:{ANL} → [B] maestro-analyze {phase} → [B] maestro-plan {phase}) / (medium\|small: [B] maestro-plan --from analyze:{ANL}) → [B] maestro-execute → quality-review |
-| `grill-brainstorm` | [B] maestro-grill → [B] maestro-brainstorm --from grill:{GRL} → [B] maestro-plan → [B] maestro-execute → quality-review (**auto_mode: skip grill step, fall back to brainstorm-driven**) |
-| `brainstorm-driven` | [B] maestro-brainstorm → [B] maestro-plan → [B] maestro-execute → quality-review |
-| `ui-craft-build` | maestro-impeccable build → [B] maestro-plan → [B] maestro-execute → quality-review |
-| `roadmap-driven` | maestro-init → [B] maestro-roadmap → [B] maestro-plan → [B] maestro-execute → quality-review |
-| `next-milestone` | [B] maestro-roadmap → [B] maestro-plan → [B] maestro-execute → quality-review |
-| `full-lifecycle` | [B] maestro-plan → [B] maestro-execute → quality-review → quality-test → maestro-milestone-audit → maestro-milestone-complete |
+| `blueprint-driven` | maestro-init → [B] maestro-blueprint → [B] maestro-plan --from blueprint:{BLP} → [B] maestro-execute → quality-review → manage-harvest --auto |
+| `analyze-macro-driven` | [B] maestro-analyze "{intent}" → ◆ post-analyze-scope → (large: [B] maestro-roadmap --from analyze:{ANL} → [B] maestro-analyze {phase} → [B] maestro-plan {phase}) / (medium\|small: [B] maestro-plan --from analyze:{ANL}) → [B] maestro-execute → quality-review → manage-harvest --auto |
+| `grill-brainstorm` | [B] maestro-grill → [B] maestro-brainstorm --from grill:{GRL} → [B] maestro-plan → [B] maestro-execute → quality-review → manage-harvest --auto (**auto_mode: skip grill step, fall back to brainstorm-driven**) |
+| `brainstorm-driven` | [B] maestro-brainstorm → [B] maestro-plan → [B] maestro-execute → quality-review → manage-harvest --auto |
+| `ui-craft-build` | maestro-impeccable build → [B] maestro-plan → [B] maestro-execute → quality-review → manage-harvest --auto |
+| `roadmap-driven` | maestro-init → [B] maestro-roadmap → [B] maestro-plan → [B] maestro-execute → quality-review → manage-harvest --auto |
+| `next-milestone` | [B] maestro-roadmap → [B] maestro-plan → [B] maestro-execute → quality-review → manage-harvest --auto |
+| `full-lifecycle` | [B] maestro-plan → [B] maestro-execute → quality-review → quality-test → maestro-milestone-audit → maestro-milestone-complete → manage-harvest --auto |
 | `execute-review` | [B] maestro-execute → quality-review |
-| `analyze-plan-execute` | [B] maestro-analyze -q → [B] maestro-plan --dir {scratch_dir} → [B] maestro-execute --dir {scratch_dir} |
+| `analyze-plan-execute` | [B] maestro-analyze -q → [B] maestro-plan --dir {scratch_dir} → [B] maestro-execute --dir {scratch_dir} → manage-harvest --auto |
 | `quality-loop` | quality-review → quality-test → quality-debug --from-uat → [B] maestro-plan --gaps → [B] maestro-execute |
 | `quality-loop-partial` | [B] maestro-plan --gaps → [B] maestro-execute → quality-review |
 | `review-fix` | [B] maestro-plan --gaps → [B] maestro-execute → quality-review |
 | `milestone-close` | maestro-milestone-audit → maestro-milestone-complete |
 | `milestone-release` | maestro-milestone-audit → maestro-milestone-release |
 | `phase_transition` | maestro-milestone-audit → maestro-milestone-complete |
-| `issue-full` | [B] maestro-analyze --gaps → [B] maestro-plan --gaps → [B] maestro-execute → quality-review → manage-issue close |
+| `issue-full` | [B] maestro-analyze --gaps → [B] maestro-plan --gaps → [B] maestro-execute → quality-review → manage-issue close → manage-harvest --auto |
 | `issue-quick` | [B] maestro-plan --gaps → [B] maestro-execute → quality-review → manage-issue close |
 
 > When S_DECOMPOSE ran, a `decision:post-goal-audit` node is appended as the final node (after the last evidence-producing step; before milestone-complete/close-out if the chain ends with one). `[B]` now denotes a context-producing skill (artifacts read into `session.context`) — execution is still sequential (no parallelism; spawning removed).

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

@@ -6,8 +6,6 @@ allowed-tools: Read, Write, Bash, Glob, Grep, request_user_input
 ---
 <purpose>
 Signal-driven overlay generator — collect workflow deficiency signals from multiple sources, diagnose which commands need amendment, batch-generate targeted overlays. All amendments use overlay system (`~/.maestro/overlays/*.json`) — non-invasive, idempotent, survives reinstall.
-
-Differs from `$maestro-overlay` (single explicit intent). This command **discovers** what needs amending by analyzing workflow artifacts.
 </purpose>
 
 <required_reading>

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

@@ -14,8 +14,6 @@ Wave 1 (CLI exploration, parallel) -> Wave 2 (6-dimension scoring, parallel) ->
 **Dual-layer scope (D-003)**:
 - **Macro layer** (text argument, e.g. `analyze "auth refactor"`): broad impact exploration. Produces `scope_verdict ∈ {small, medium, large}` to drive downstream routing (roadmap vs plan).
 - **Phase layer** (numeric argument, e.g. `analyze 1`): phase-scoped deep analysis under `current_milestone`. Milestone resolved via D-007 `phase_slugs` reverse lookup, NEVER direct `current_milestone` read.
-
-Produces context-package.json (standardized cross-command context contract) in all modes.
 </purpose>
 
 <context>
@@ -151,7 +149,12 @@ S_WAVE_1:
   -> ERROR        WHEN: all failed
 
 S_WAVE_2:
-  -> S_WAVE_3     DO: A_SPAWN_WAVE_2
+  -> S_BOUNDARY_GRILL   DO: A_SPAWN_WAVE_2
+
+S_BOUNDARY_GRILL:
+  -> S_WAVE_3     WHEN: no boundary conflicts detected     DO: —
+  -> S_WAVE_3     WHEN: conflicts detected + resolved      DO: A_BOUNDARY_GRILL
+  GUARD: max 3 conflicts × 3 questions; non-blocking (see boundary-grill.md)
 
 S_WAVE_3:
   -> S_AGGREGATE  DO: A_SPAWN_WAVE_3
@@ -237,6 +240,14 @@ Write to `conclusions.json.scope_verdict` (all modes that produce conclusions);
 
 Gray area detection: domain-aware (things users SEE/CALL/RUN/READ), phase-specific (skip prior decided areas).
 
+### A_BOUNDARY_GRILL
+
+Run boundary grill per `~/.maestro/workflows/boundary-grill.md` after Wave 2 scoring, before Wave 3 synthesis.
+Input: Wave 1 exploration findings + Wave 2 dimension scores. Scope guard: "only analyze decisions; do not prejudge plan/execute concerns".
+Detect RSC (scope violations), MOD (module boundary crossings), DEC (upstream locked vs code reality).
+IF conflicts → results to `analysis.md` § Boundary Grill Results + update `context.md` Locked/Free/Deferred.
+Non-blocking: conflicts produce warnings, pipeline continues.
+
 ### A_AGGREGATE_RESULTS
 
 1. Export results.csv
@@ -310,6 +321,8 @@ Protocol: read before analysis, append-only, dedup by type+key.
 - [ ] Decision Recording Protocol applied to all decisions
 - [ ] Confidence scored per dimension with factor-based model (full mode)
 - [ ] Readiness gate checked before synthesis (wave 3)
+- [ ] Boundary grill executed between Wave 2 and Wave 3 (skip if no conflicts detected)
+- [ ] Boundary grill results written to analysis.md § Boundary Grill Results (if conflicts found)
 - [ ] Pressure pass completed ≥ 1 time on highest-risk dimension before synthesis
 - [ ] Deferred items auto-created as issues
 - [ ] Scope creep redirected to Deferred section

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

@@ -7,10 +7,6 @@ allowed-tools: Read, Write, Edit, Bash, Glob, Grep, spawn_agents_on_csv, request
 <purpose>
 Formal specification document chain producing a complete specification package through 7 sequential phases (P0–P6, plus P1.5 requirement expansion) with multi-CLI analysis and interactive refinement. Pure documentation — no code generation, no roadmap generation.
 
-Parallel to `brainstorm` as an upstream origin command:
-- **brainstorm** = divergent exploration (lightweight, multi-role creative)
-- **blueprint** = convergent documentation (heavyweight, 7-phase formal spec chain)
-
 Output: `.workflow/blueprint/BLP-{slug}-{date}/` containing Product Brief, PRD, Architecture, and Epics.
 </purpose>
 

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

@@ -316,8 +316,13 @@ S_WAVE_2 → S_AGGREGATE WHEN: all failed       DO: skip review
 S_CHECK_2 → S_WAVE_3   WHEN: -y OR user "Proceed"
 S_CHECK_2 → S_WAVE_2   WHEN: user "Add Roles"  DO: add new role rows, spawn only new
 
-S_WAVE_3 → S_RESOLVE   DO: spawn wave-3, capture review_findings (conflicts/gaps/synergies with patch_targets)
-S_WAVE_3 → S_AGGREGATE WHEN: zero findings    DO: log "No cross-role issues detected", skip resolve
+S_WAVE_3 → S_BOUNDARY_GRILL  DO: spawn wave-3, capture review_findings (conflicts/gaps/synergies with patch_targets)
+S_WAVE_3 → S_AGGREGATE      WHEN: zero findings    DO: log "No cross-role issues detected", skip resolve
+
+S_BOUNDARY_GRILL:
+  → S_RESOLVE     WHEN: no boundary conflicts detected     DO: —
+  → S_RESOLVE     WHEN: conflicts detected + resolved      DO: A_BOUNDARY_GRILL
+  GUARD: max 3 conflicts × 3 questions; non-blocking (see boundary-grill.md)
 
 S_RESOLVE → S_AGGREGATE  DO: A_APPLY_RESOLUTIONS (orchestrator iterates patch_targets and applies Edits)
 
@@ -382,6 +387,13 @@ When ui-designer is among selected roles, establish visual direction before Wave
 explore generates multi-style HTML prototypes, visual comparison, user selection/mix, and produces DESIGN.md.
 ui-designer agents in Wave 2 then focus on UX/visual design referencing DESIGN.md.
 
+### A_BOUNDARY_GRILL
+
+Run boundary grill per `~/.maestro/workflows/boundary-grill.md` after cross-role review, before resolution application.
+Input: reviewer findings + role Decision Digests. Scope guard: "only brainstorm decisions; do not pre-resolve roadmap/plan choices".
+IF conflicts → results to `guidance-specification.md` §12.5 Boundary Grill Results + feed into S_RESOLVE.
+Non-blocking: conflicts produce warnings, pipeline continues.
+
 ### A_APPLY_RESOLUTIONS
 
 For each finding in `review_findings`:
@@ -442,6 +454,8 @@ Protocol: read before analysis, append-only, dedup by type+key.
 - [ ] system-architect/analysis.md §3 includes Data Model + State Machine when system-architect selected
 - [ ] Each {role}/analysis.md §2 Decisions table has ≥ 1 row per feature
 - [ ] Cross-role review (W3) executed; reviewer output includes `patch_targets[]` for every finding
+- [ ] Boundary grill executed after cross-role review (skip if no conflicts detected)
+- [ ] Boundary grill results written to guidance-specification.md §12.5 (if conflicts found)
 - [ ] If findings: resolutions applied via Edit AND logged in guidance §12 "Cross-Role Resolutions"
 - [ ] If zero findings: final report explicitly notes "No cross-role issues detected"; guidance §12 unchanged
 - [ ] Heading-drift patch failures surfaced (not silently dropped)

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

@@ -100,7 +100,12 @@ S_FAN_OUT:
   → ERROR(E004)     WHEN: all failed OR fewer than 2 completed
 
 S_CROSS_VERIFY:
-  → S_SYNTHESIZE    DO: A_CROSS_VERIFY
+  → S_BOUNDARY_GRILL  DO: A_CROSS_VERIFY
+
+S_BOUNDARY_GRILL:
+  → S_SYNTHESIZE    WHEN: no boundary conflicts detected     DO: —
+  → S_SYNTHESIZE    WHEN: conflicts detected + resolved      DO: A_BOUNDARY_GRILL
+  GUARD: max 3 conflicts × 3 questions; non-blocking (see boundary-grill.md)
 
 S_SYNTHESIZE:
   → S_AGGREGATE     DO: A_SYNTHESIZE
@@ -229,6 +234,12 @@ Compute: `consensus_level = consensus_count / total_findings * 100`
 
 Write results to `{scratchDir}/cross-verify.md`.
 
+### A_BOUNDARY_GRILL
+
+Run boundary grill per `~/.maestro/workflows/boundary-grill.md` after cross-verification.
+Input: classified CONFLICT findings + per-tool outputs. Check upstream scope if `--from` used.
+IF conflicts → tag with resolution, feed into A_SYNTHESIZE. No conflicts → pass through.
+
 ### A_SYNTHESIZE
 
 Generate 3 output files from cross-verify results:
@@ -313,6 +324,8 @@ Generate 3 output files from cross-verify results:
 - [ ] Blocking poll loop ran until pending_sessions empty — no early exit
 - [ ] Per-tool raw outputs saved to {scratchDir}/per-tool/
 - [ ] Cross-verify: CONSENSUS/CONFLICT/UNIQUE classified, consensus_level computed
+- [ ] Boundary grill executed on CONFLICT items (skip if no boundary conflicts detected)
+- [ ] Boundary grill results written to collab-report.md § Boundary Grill Results (if conflicts found)
 - [ ] collab-report.md + context.md + conclusions.json produced
 - [ ] CLB artifact registered in state.json
 - [ ] Partial degradation: continued if 2+ tools succeeded

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

@@ -9,8 +9,6 @@ allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
 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

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

@@ -12,8 +12,6 @@ the worktree. Since `.workflow/` is gitignored, this command explicitly copies p
 and milestone scratch artifacts into the worktree.
 
 Also supports `--sync` mode to pull latest main into an active worktree.
-
-Produces `.workflow/worktrees.json` registry in the main worktree and `.workflow/worktree-scope.json` marker in the worktree, and writes a scoped `state.json` inside the worktree containing only the forked milestone's artifacts.
 </purpose>
 
 <required_reading>

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

@@ -7,7 +7,6 @@ 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.

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

@@ -19,10 +19,6 @@ Codex specifics:
 - **Skill pool discovery via CLI** — `maestro ralph skills --platform codex --json --quiet`（project `.codex/skills/` 覆盖 global `~/.codex/skills/`）
 - **No session, no status.json, no goal** — 不调 `create_goal` / `update_plan`，由目标 skill 自行管理产出
 
-与 `$maestro` / `$maestro-ralph` 区别：
-- 不创建 session、不构建 chain、不写 status.json
-- 始终只推 1 个 top pick，最多列 2-3 个备选
-- 适用场景：意图清晰且单步即可完成；或需要定向推荐时
 </purpose>
 
 <context>
@@ -132,7 +128,8 @@ ls -la .workflow/.maestro/ 2>/dev/null | head -5  # 进行中的 session
 | 最新 artifact = plan | execute | `maestro-execute {phase}` |
 | 最新 artifact = execute | review | `quality-review {phase}` |
 | review verdict=PASS | test-gen | `quality-auto-test {phase}` |
-| 测试全绿 | milestone-audit | `maestro-milestone-audit` |
+| 测试全绿 + current_milestone 存在 | milestone-audit | `maestro-milestone-audit` |
+| 测试全绿 + current_milestone=null (standalone) | review-done | 回退到 `quality-review` 或 `manage-status`（无 milestone 上下文时不推荐 milestone 命令） |
 | 当前 milestone 全 phase 完成 | milestone-complete | `maestro-milestone-complete` |
 | 任一 stage 产物含 gaps/failed | debug | `quality-debug {gap}` |
 
@@ -155,6 +152,16 @@ brainstorm → blueprint → init → analyze-macro → roadmap
 | `name` 关键词命中 intent | 中 | intent 含 "test" → quality-test/quality-auto-test 加分 |
 | Workflow 簇匹配 | 中 | intent 涉及学习/知识/issue 等场景触发对应簇 |
 | Recent activity 反向避免 | 低 | 刚完成的 stage 短期内降权 |
+| **前置条件不满足** | **禁止** | 候选 skill 的前置条件未满足时，直接从候选池移除（如 `maestro-milestone-*` 在 `current_milestone=null` 时移除） |
+
+**前置条件检查（评分前执行，不满足则移除候选）：**
+
+| Skill | 前置条件 |
+|-------|---------|
+| `maestro-milestone-audit` | `current_milestone` 存在且非 null |
+| `maestro-milestone-complete` | `current_milestone` 存在且非 null |
+| `maestro-milestone-release` | `current_milestone` 存在且非 null |
+| `maestro-merge` | 存在活跃的 fork 分支 |
 
 **特殊意图处理：**
 

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

@@ -153,8 +153,13 @@ S_WAVE_1 → S_WAVE_2    DO: spawn parallel explorations, merge results, build p
 
 S_WAVE_2 → S_CHECK     DO: spawn planning agent, merge results
 
-S_CHECK → S_CONFIRM    WHEN: plan passes or max 3 iterations    DO: A_PLAN_CHECK
-S_CHECK → S_WAVE_2     WHEN: plan fails check, iterations < 3   DO: feed checker feedback back
+S_CHECK → S_BOUNDARY_GRILL  WHEN: plan passes or max 3 iterations    DO: A_PLAN_CHECK
+S_CHECK → S_WAVE_2         WHEN: plan fails check, iterations < 3   DO: feed checker feedback back
+
+S_BOUNDARY_GRILL:
+  → S_CONFIRM    WHEN: no boundary conflicts detected     DO: —
+  → S_CONFIRM    WHEN: conflicts detected + resolved      DO: A_BOUNDARY_GRILL
+  GUARD: max 3 conflicts × 3 questions; non-blocking (see boundary-grill.md)
 
 S_CONFIRM → S_REGISTER WHEN: -y OR user confirms
 S_CONFIRM → S_CSV_GEN  WHEN: user wants to modify
@@ -224,6 +229,13 @@ Consumes all exploration findings + context.md + specs. Produces:
 
 Verifies plan.json and every .task/*.json exists on disk before reporting completed; else report blocked.
 
+### A_BOUNDARY_GRILL
+
+Run boundary grill per `~/.maestro/workflows/boundary-grill.md` after plan-checker pass.
+Input: plan.json tasks + convergence criteria + upstream context. Scope guard: "only plan scope; do not re-analyze or re-scope".
+IF conflicts → results to plan.json `boundary_grill` section + affected TASK files. DEC conflicts add `boundary_warning` to confidence.
+Non-blocking: warnings, not hard stops.
+
 ### A_PLAN_CHECK
 Run plan-checker: coverage, dependency validity, criteria quality, pressure pass on highest-complexity task.
 Confidence: 5-dimension factor model + readiness gate.
@@ -263,6 +275,9 @@ Collision detection against same-milestone plans.
 - [ ] .task/TASK-*.json with read_first[] (file being modified + source of truth files)
 - [ ] Every task has convergence.criteria[] with grep-verifiable conditions (no subjective language)
 - [ ] Every task action and implementation contain concrete values (no "align X with Y")
+- [ ] Boundary grill executed after plan-checker pass (skip if no conflicts detected)
+- [ ] Boundary grill results written to plan.json `boundary_grill` section (if conflicts found)
+- [ ] DEC conflicts reflected in confidence `boundary_warning` factor
 - [ ] Plan confidence scored with 5-dimension factor model
 - [ ] Readiness gate checked before collision detection
 - [ ] Pressure pass completed on highest-complexity task

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

@@ -294,7 +294,8 @@ resolve_milestone(phase_number):
 |-----------|----------|
 | review.json: verdict=="BLOCK" | `review-failed` |
 | review.json: verdict!="BLOCK" | `test` |
-| uat.md: all passed | `milestone-audit` |
+| uat.md: all passed + `session.milestone` 存在 | `milestone-audit` |
+| uat.md: all passed + `session.milestone=null` (standalone) | 标记 session completed（无 milestone 可审计） |
 | uat.md: has failures | `test-failed` |
 
 ### A_DETERMINE_QUALITY_MODE
@@ -376,7 +377,7 @@ narrow → derive defaults from intent + codebase, skip questions.
 
 ### A_BUILD_STEPS
 
-Generate steps from `session.lifecycle_position` to `milestone-complete`.
+Generate steps from `session.lifecycle_position` to `milestone-complete`（`session.milestone` 存在时）或最后一个质量门（standalone 时）。
 
 | Stage | Skill (independent) | Skill (unified) | Decision after | quality_mode |
 |-------|---------------------|-----------------|----------------|--------------|
@@ -408,7 +409,7 @@ Generate steps from `session.lifecycle_position` to `milestone-complete`.
 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` 结尾
+6. **终点硬约束**：`session.milestone` 存在时 chain 以 `milestone-complete` 结尾；`session.milestone=null`（standalone）时跳过 `milestone-audit` + `milestone-complete` stage，chain 以最后一个质量门 stage 结尾
 7. **goal_ref 传播**：`task_decomposition` 存在时，每个 step 按 `step.stage ∈ g.lifecycle` 匹配 `step.goal_ref = g.id`（多匹配取字典序最小）；decision 节点不打 goal_ref
 8. **占位符**：independent 保留 `{phase}` `{intent}`；unified 不带 `{phase}`
 9. **command_path 解析**（每个执行 step，decision 节点跳过）：

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

@@ -11,8 +11,6 @@ Generate a milestone/phase roadmap using `spawn_agents_on_csv` with 2-wave analy
 Wave 1: parallel analysis (scope, risk, dependency). Wave 2: assembly -> roadmap.md with Milestone > Phase hierarchy.
 
 Additional: `--revise` (modify existing roadmap), `--review` (read-only health check).
-
-For formal specification documents (Product Brief, PRD, Architecture, Epics), use `maestro-blueprint` instead.
 </purpose>
 
 <context>

package/.codex/skills/manage-wiki/SKILL.md

@@ -7,8 +7,6 @@ allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
 
 <purpose>
 Unified wiki graph management. Health monitoring, interactive search, orphan cleanup, and graph statistics. Day-to-day operations to keep the knowledge graph healthy.
-
-Complements `wiki-connect` (link discovery) and `wiki-digest` (synthesis) with operational tooling.
 </purpose>
 
 <required_reading>

package/.codex/skills/odyssey-debug/SKILL.md

@@ -8,8 +8,6 @@ allowed-tools: spawn_agents_on_csv, Read, Write, Edit, Bash, Glob, Grep, request
 <purpose>
 Closed-loop deep debugging: archaeology (what changed) → explore (call chains, error gaps) → diagnose (hypothesis-driven) → fix & confirm → generalize (举一反三) → discover siblings → persist learnings.
 
-Unlike `quality-debug` (fast fix), this treats every bug as a learning signal — digs into git history before hypotheses, confirms fixes with CLI review, scans for siblings of the root cause.
-
 Core philosophy:
 - **Archaeology before hypothesis** — look at what changed before guessing why
 - **Fix one, find many** — a single bug reveals a class of bugs

package/.codex/skills/odyssey-improve/SKILL.md

@@ -9,12 +9,6 @@ allowed-tools: spawn_agents_on_csv, Read, Write, Edit, Bash, Glob, Grep, request
 Deep codebase improvement: survey (dependency + complexity baseline) -> audit (6 dimensions) ->
 diagnose (root cause analysis) -> fix -> verify -> generalize -> discover -> record.
 
-Unlike `$quality-review` (single pass), this is a persistent session with evidence trails,
-baseline metrics, iterative improvement, and codebase-wide generalization. `--skip-fix` for audit-only.
-
-Focuses on **program runtime quality** — performance, security, architecture, reliability,
-observability, maintainability. Combines static analysis with runtime-aware reasoning.
-
 Core philosophy:
 - **Measure before improving** — baseline first, then optimize
 - **Root cause over symptom** — trace each issue to its origin

package/.codex/skills/odyssey-review-test-fix/SKILL.md

@@ -9,9 +9,6 @@ allowed-tools: spawn_agents_on_csv, Read, Write, Edit, Bash, Glob, Grep, request
 Deep code review with generalization: archaeology → explore → multi-dimensional review →
 fix all findings → confirm → generalize (举一反三) → discover → persist.
 
-Unlike `quality-review` (pipeline gate verdict), this reviews AND fixes: exhaustive documentation,
-targeted fixes, codebase-wide generalization, decision journal. `--skip-fix` for review-only.
-
 **三句哲学约束（穷尽迭代）:**
 1. **零遗留** — 每个 finding 必须是 action item（修复 / issue / 决策），不允许只报告不处理
 2. **穷尽迭代** — 按 severity 从高到低逐轮修复，直到 0 remaining actionable findings 才退出 fix loop

package/.codex/skills/odyssey-ui/SKILL.md

@@ -9,9 +9,6 @@ allowed-tools: spawn_agents_on_csv, Read, Write, Edit, Bash, Glob, Grep, request
 Deep UI polish cycle: survey (design tokens + pattern inventory) -> audit (6 dimensions) ->
 diverge (creative exploration) -> fix -> verify -> generalize -> discover -> record.
 
-Unlike `$maestro-impeccable` (single command), this is a persistent session with evidence trails,
-decision journal, iterative improvement, and codebase-wide generalization. `--skip-fix` for audit-only.
-
 Core philosophy:
 - **Every pixel tells a story** — subtle details create the experience
 - **Diverge before converge** — explore creatively, then implement methodically

package/.codex/skills/spec-setup/SKILL.md

@@ -9,8 +9,6 @@ allowed-tools: Read, Write, Bash, Glob, Grep
 Initialize project specs by scanning the codebase and generating spec files in `.workflow/specs/`.
 Core files (coding, arch, learning) always created. Optional files created only when relevant signals detected.
 
-Triggered automatically by `maestro-init` for **existing projects** (source files detected). Greenfield projects skip this — specs are populated progressively by analyze, plan, and execute stages.
-
 ```bash
 $spec-setup
 ```

package/.codex/skills/team-coordinate/SKILL.md

@@ -7,9 +7,6 @@ allowed-tools: spawn_agents_on_csv, Read, Write, Edit, Bash, Glob, Grep, request
 
 <purpose>
 Wave-based multi-role coordination via `spawn_agents_on_csv`. Dynamic role generation + linear wave execution with per-wave evaluation gates.
-
-**Core difference from other team skills**: Roles are NOT predefined — they are dynamically generated from task analysis at runtime. Each role's behavioral instructions are encoded directly into the CSV `description` column, eliminating the need for role-spec files.
-
 **Core workflow**: Analyze Task → Generate Dynamic Roles → Build CSV → Wave-by-Wave Execution with Evaluation → Aggregate Results
 
 ```

package/.codex/skills/team-lifecycle-v4/instructions/agent-instruction.md

@@ -1,7 +1,5 @@
 # Team Lifecycle v4 — Agent Instruction
 
-This instruction is loaded by team-worker agents when spawned with roles: `analyst`, `writer`, `planner`, `executor`, `tester`, `reviewer`.
-
 ---
 
 ## Role-Based Execution

package/chains/_intent-map.json

@@ -20,6 +20,24 @@
       "flags": "i",
       "route": { "graph": "spec-driven" }
     },
+    {
+      "type": "grill",
+      "regex": "grill|stress.?test|压力测试|拷问|验证假设",
+      "flags": "i",
+      "route": { "graph": "grill-driven" }
+    },
+    {
+      "type": "blueprint",
+      "regex": "blueprint|蓝图|7.?phase|正式.*文档",
+      "flags": "i",
+      "route": { "graph": "blueprint-driven" }
+    },
+    {
+      "type": "analyze_macro",
+      "regex": "overhaul|migrate|rewrite|revamp|全面重写|整体迁移",
+      "flags": "i",
+      "route": { "graph": "analyze-plan-execute" }
+    },
     {
       "type": "brainstorm",
       "regex": "brainstorm|ideate|头脑风暴|发散",
@@ -176,6 +194,24 @@
       "flags": "i",
       "route": { "graph": "singles/codebase-refresh" }
     },
+    {
+      "type": "domain_add",
+      "regex": "domain.*add|领域.*注册|register.*domain|添加.*领域",
+      "flags": "i",
+      "route": { "graph": "singles/domain-add" }
+    },
+    {
+      "type": "domain_list",
+      "regex": "domain.*list|领域.*列表|list.*domain",
+      "flags": "i",
+      "route": { "graph": "singles/domain-list" }
+    },
+    {
+      "type": "domain_discover",
+      "regex": "domain.*discover|领域.*发现|discover.*term",
+      "flags": "i",
+      "route": { "graph": "singles/domain-discover" }
+    },
     {
       "type": "spec_setup",
       "regex": "spec.*setup|规范.*初始化",