maestro-flow 0.3.9 → 0.3.11

package/workflows/maestro-coordinate.codex.md

@@ -1,6 +1,6 @@
-# Workflow: maestro-coordinate (Codex Edition)
+# Workflow: Maestro-coordinate (Codex CLI-Delegate Edition)
 
-Codex team-agent version of `maestro-coordinate`. Replaces `maestro cli` background execution + hook callbacks with synchronous `spawn_agent / wait / close_agent`. Each chain step assembles a prompt containing the skill invocation (`$skill-name args`) and spawns one agent; the analysis step spawns a second agent inline. All async state-machine concerns are eliminated.
+Autonomous CLI coordinator for Codex. Classifies intent, selects command chain, executes each step via `codex delegate` with template-driven prompts and async state machine. After each step, gemini evaluates output quality and generates optimization hints for subsequent steps.
 
 > Referenced by: `~/.codex/skills/maestro-coordinate/SKILL.md`
 
@@ -10,58 +10,57 @@ Codex team-agent version of `maestro-coordinate`. Replaces `maestro cli` backgro
 
 ```javascript
 const args = $ARGUMENTS.trim();
-const AUTO_YES   = new RegExp('\\b(-y|--yes)\\b').test(args);
-const RESUME     = new RegExp('\\b(-c|--continue)\\b').test(args);
-const DRY_RUN    = new RegExp('\\b--dry-run\\b').test(args);
-const forceChain = args.match(new RegExp('--chain\\s+(\\S+)'))?.[1] ?? null;
+const autoYes = /\b(-y|--yes)\b/.test(args);
+const resumeMode = /\b(-c|--continue)\b/.test(args);
+const dryRun = /\b--dry-run\b/.test(args);
+const forcedChain = args.match(/--chain\s+(\S+)/)?.[1] || null;
+const cliTool = args.match(/--tool\s+(\S+)/)?.[1] || 'codex';
 const intent = args
-  .replace(new RegExp('\\b(-y|--yes|-c|--continue|--dry-run)\\b', 'g'), '')
-  .replace(new RegExp('--(chain)\\s+\\S+', 'g'), '')
+  .replace(/\b(-y|--yes|-c|--continue|--dry-run)\b/g, '')
+  .replace(/--(chain|tool)\s+\S+/g, '')
   .trim();
 ```
 
-**Resume mode**: If `RESUME`:
-1. Glob `.workflow/.maestro-coordinate/coord-*/state.json`, sort desc by name, load latest
-2. Set `current_step` to index of first step where `status === "pending"`
+**If resumeMode:**
+1. Find latest `state.json` in `.workflow/.maestro-coordinate/`
+2. Load state → set `current_step` to first non-completed step
 3. Jump to **Step 6**
 
 ---
 
 ## Step 2: Read Project State
 
-```javascript
-const stateFile = '.workflow/state.json';
-let projectState = { initialized: false };
-
-if (fileExists(stateFile)) {
-  const raw = JSON.parse(Read(stateFile));
-  projectState = {
-    initialized: true,
-    current_phase: raw.current_phase,
-    phase_slug: raw.phase_slug,
-    phase_status: raw.phase_status,   // pending|exploring|planning|executing|verifying|testing|completed|blocked
-    phase_artifacts: raw.phase_artifacts ?? {},
-    execution: raw.execution ?? { tasks_completed: 0, tasks_total: 0 },
-    verification_status: raw.verification_status ?? 'pending',
-    review_verdict: raw.review_verdict ?? null,
-    uat_status: raw.uat_status ?? 'pending',
-    phases_total: raw.phases_total ?? 0,
-    phases_completed: raw.phases_completed ?? 0,
-    has_blockers: raw.has_blockers ?? false,
-    accumulated_context: raw.accumulated_context ?? null
-  };
-}
+```bash
+test -f .workflow/state.json && echo "exists" || echo "missing"
+```
+
+**If exists:** Read `.workflow/state.json` + `.workflow/roadmap.md` + current phase `index.json`:
 
-if (!projectState.initialized && !intent) throw new Error('E001: No project state and no intent. Run $maestro-init first.');
+```javascript
+const projectState = {
+  initialized: true,
+  current_milestone: /* from state.json */,
+  latest_artifact: /* last artifact in artifacts[] */,
+  milestone_progress: '...', // derived from artifact registry
+  phase_artifacts: { brainstorm: false, analysis: false, context: false, plan: false, verification: false, uat: false },
+  execution: { tasks_completed: 0, tasks_total: 0 },
+  verification_status: 'pending',
+  review_verdict: null, // PASS|WARN|BLOCK|null
+  uat_status: 'pending',
+  phases_total: 0, phases_completed: 0,
+  has_blockers: false, accumulated_context: null
+};
 ```
 
+**If missing:** `projectState = { initialized: false }`. If intent also empty → **Error E001**.
+
 ---
 
 ## Step 3: Classify Intent & Select Chain
 
 ### 3a: Exact-match keywords (fast path)
 
-If `forceChain` is set → validate against chainMap and jump to **3c**.
+If `forcedChain` is set, validate and jump to **3c**.
 
 ```javascript
 const exactMatch = {
@@ -83,7 +82,7 @@ Instead of regex, extract a structured intent tuple using LLM semantic understan
 ```json
 {
   "action":    "<create|fix|analyze|plan|execute|verify|review|test|debug|refactor|explore|manage|transition|continue|sync|learn|retrospect>",
-  "object":    "<feature|bug|issue|code|test|spec|phase|milestone|doc|performance|security|ui|memory|codebase|team|config>",
+  "object":    "<feature|bug|issue|code|test|spec|phase|milestone|doc|performance|security|ui|memory|codebase|config>",
   "scope":     "<module/file/area or null>",
   "issue_id":  "<ISS-XXXXXXXX-NNN if mentioned, else null>",
   "phase_ref": "<integer if mentioned, else null>",
@@ -108,7 +107,7 @@ function routeIntent(intent, projectState) {
   // Action × Object matrix
   const matrix = {
     'fix':       { 'bug': 'debug', 'issue': 'issue', 'code': 'debug', 'performance': 'debug', 'security': 'debug', '_default': 'debug' },
-    'create':    { 'feature': 'quick', 'issue': 'issue', 'test': 'test_gen', 'spec': 'spec_generate', 'ui': 'ui_design', 'config': 'init', 'phase': 'phase_add', '_default': 'quick' },
+    'create':    { 'feature': 'quick', 'issue': 'issue', 'test': 'test_gen', 'spec': 'spec_generate', 'ui': 'ui_design', 'config': 'init', 'phase': 'roadmap', '_default': 'quick' },
     'analyze':   { 'bug': 'analyze', 'issue': 'issue_analyze', 'code': 'analyze', 'codebase': 'spec_map', '_default': 'analyze' },
     'explore':   { 'issue': 'issue_discover', 'feature': 'brainstorm', 'ui': 'ui_design', '_default': 'brainstorm' },
     'plan':      { 'issue': 'issue_plan', 'spec': 'spec_generate', '_default': 'plan' },
@@ -118,82 +117,63 @@ function routeIntent(intent, projectState) {
     'test':      { '_default': 'test' },
     'debug':     { '_default': 'debug' },
     'refactor':  { '_default': 'refactor' },
-    'manage':    { 'issue': 'issue', 'milestone': 'milestone_audit', 'phase': 'phase_transition', 'memory': 'memory', 'doc': 'sync', 'codebase': 'codebase_refresh', 'team': 'team_coordinate', '_default': 'status' },
-    'transition':{ 'phase': 'phase_transition', 'milestone': 'milestone_complete', '_default': 'phase_transition' },
+    'manage':    { 'issue': 'issue', 'milestone': 'milestone_audit', 'phase': 'milestone_close', 'memory': 'memory', 'doc': 'sync', 'codebase': 'codebase_refresh', '_default': 'status' },
+    'transition':{ 'phase': 'milestone_close', 'milestone': 'milestone_complete', '_default': 'milestone_close' },
     'continue':  { '_default': 'state_continue' },
     'sync':      { '_default': 'sync' },
     'learn':     { '_default': 'learn' },
     'retrospect':{ '_default': 'retrospective' },
   };
 
-  // Team skill detection
-  if (object === 'team') {
-    const teamRoutes = { 'review': 'team_review', 'test': 'team_test', 'debug': 'team_qa', 'refactor': 'team_tech_debt', 'execute': 'team_lifecycle', '_default': 'team_coordinate' };
-    return teamRoutes[action] || 'team_coordinate';
-  }
-
   const actionMap = matrix[action] || matrix['fix'];
   return actionMap[object] || actionMap['_default'] || 'quick';
 }
 ```
 
-**Clarity scoring**: 3 = action+object+scope, 2 = action+object, 1 = action only, 0 = empty.
-If `clarity < 2` and not `AUTO_YES`: call `functions.request_user_input` with one focused question (max 2 rounds).
+Compute clarity (3=action+object+scope, 2=action+object, 1=action only, 0=empty).
+If clarity < 2 and not autoYes: clarify via AskUserQuestion (max 2 rounds).
 
-### 3b: State-based routing (when `taskType === 'state_continue'`)
+### 3b: State-based routing (task_type == `state_continue`)
 
 ```javascript
 function detectNextAction(s) {
   if (!s.initialized) return { chain: 'init', steps: [{ cmd: 'maestro-init' }] };
   const ps = s.phase_status, art = s.phase_artifacts, exec = s.execution;
 
+  // Post-milestone: no roadmap, has accumulated context
   if (s.phases_total === 0 && !fileExists('.workflow/roadmap.md') && s.accumulated_context)
     return { chain: 'next-milestone', steps: [{ cmd: 'maestro-roadmap', args: '"{description}"' }] };
   if (s.phases_total === 0)
-    return { chain: 'brainstorm-driven', steps: [
-      { cmd: 'maestro-brainstorm', args: '"{description}"' },
-      { cmd: 'maestro-plan',       args: '{phase}' },
-      { cmd: 'maestro-execute',    args: '{phase}' },
-      { cmd: 'maestro-verify',     args: '{phase}' }
-    ]};
+    return { chain: 'brainstorm-driven', steps: [{ cmd: 'maestro-brainstorm', args: '"{description}"' }, { cmd: 'maestro-plan', args: '{phase}' }, { cmd: 'maestro-execute', args: '{phase}' }, { cmd: 'maestro-verify', args: '{phase}' }] };
 
   if (ps === 'pending') {
-    if (art.context) return { chain: 'plan',    steps: [{ cmd: 'maestro-plan',    args: '{phase}' }] };
-    return             { chain: 'analyze',  steps: [{ cmd: 'maestro-analyze', args: '{phase}' }] };
+    if (art.context) return { chain: 'plan', steps: [{ cmd: 'maestro-plan', args: '{phase}' }] };
+    return { chain: 'analyze', steps: [{ cmd: 'maestro-analyze', args: '{phase}' }] };
   }
   if (ps === 'exploring' || ps === 'planning') {
-    if (art.plan) return { chain: 'execute-verify', steps: [
-      { cmd: 'maestro-execute', args: '{phase}' },
-      { cmd: 'maestro-verify',  args: '{phase}' }
-    ]};
+    if (art.plan) return { chain: 'execute-verify', steps: [{ cmd: 'maestro-execute', args: '{phase}' }, { cmd: 'maestro-verify', args: '{phase}' }] };
     return { chain: 'plan', steps: [{ cmd: 'maestro-plan', args: '{phase}' }] };
   }
   if (ps === 'executing') {
-    if (exec.tasks_completed >= exec.tasks_total && exec.tasks_total > 0)
-      return { chain: 'verify', steps: [{ cmd: 'maestro-verify', args: '{phase}' }] };
+    if (exec.tasks_completed >= exec.tasks_total && exec.tasks_total > 0) return { chain: 'verify', steps: [{ cmd: 'maestro-verify', args: '{phase}' }] };
     return { chain: 'execute', steps: [{ cmd: 'maestro-execute', args: '{phase}' }] };
   }
   if (ps === 'verifying') {
     if (s.verification_status === 'passed') {
-      if (!s.review_verdict)          return { chain: 'review',           steps: [{ cmd: 'quality-review',   args: '{phase}' }] };
-      if (s.uat_status === 'pending') return { chain: 'test',             steps: [{ cmd: 'quality-test',     args: '{phase}' }] };
-      if (s.uat_status === 'passed')  return { chain: 'phase-transition', steps: [{ cmd: 'maestro-phase-transition' }] };
+      if (!s.review_verdict) return { chain: 'review', steps: [{ cmd: 'quality-review', args: '{phase}' }] };
+      if (s.uat_status === 'pending') return { chain: 'test', steps: [{ cmd: 'quality-test', args: '{phase}' }] };
+      if (s.uat_status === 'passed') return { chain: 'milestone-close', steps: [{ cmd: 'maestro-milestone-audit' }, { cmd: 'maestro-milestone-complete' }] };
       return { chain: 'debug', steps: [{ cmd: 'quality-debug', args: '--from-uat {phase}' }] };
     }
-    return { chain: 'quality-loop-partial', steps: [
-      { cmd: 'maestro-plan',    args: '{phase} --gaps' },
-      { cmd: 'maestro-execute', args: '{phase}' },
-      { cmd: 'maestro-verify',  args: '{phase}' }
-    ]};
+    return { chain: 'quality-loop-partial', steps: [{ cmd: 'maestro-plan', args: '{phase} --gaps' }, { cmd: 'maestro-execute', args: '{phase}' }, { cmd: 'maestro-verify', args: '{phase}' }] };
   }
   if (ps === 'testing') {
-    if (s.uat_status === 'passed') return { chain: 'phase-transition', steps: [{ cmd: 'maestro-phase-transition' }] };
+    if (s.uat_status === 'passed') return { chain: 'milestone-close', steps: [{ cmd: 'maestro-milestone-audit' }, { cmd: 'maestro-milestone-complete' }] };
     return { chain: 'debug', steps: [{ cmd: 'quality-debug', args: '--from-uat {phase}' }] };
   }
   if (ps === 'completed') {
-    if (s.phases_completed >= s.phases_total)
-      return { chain: 'milestone-close', steps: [{ cmd: 'maestro-milestone-audit' }, { cmd: 'maestro-milestone-complete' }] };
-    return { chain: 'phase-transition', steps: [{ cmd: 'maestro-phase-transition' }] };
+    if (s.phases_completed >= s.phases_total) return { chain: 'milestone-close', steps: [{ cmd: 'maestro-milestone-audit' }, { cmd: 'maestro-milestone-complete' }] };
+    return { chain: 'milestone-close', steps: [{ cmd: 'maestro-milestone-audit' }, { cmd: 'maestro-milestone-complete' }] };
   }
   if (ps === 'blocked') return { chain: 'debug', steps: [{ cmd: 'quality-debug' }] };
   return { chain: 'status', steps: [{ cmd: 'manage-status' }] };
@@ -204,264 +184,157 @@ function detectNextAction(s) {
 
 ```javascript
 const chainMap = {
-  // ── Single-step ──────────────────────────────────────────────────────────
+  // Single-step
   'status':             [{ cmd: 'manage-status' }],
   'init':               [{ cmd: 'maestro-init' }],
-  'analyze':            [{ cmd: 'maestro-analyze',        args: '{phase}' }],
-  'ui_design':          [{ cmd: 'maestro-ui-design',       args: '{phase}' }],
-  'plan':               [{ cmd: 'maestro-plan',            args: '{phase}' }],
-  'execute':            [{ cmd: 'maestro-execute',         args: '{phase}' }],
-  'verify':             [{ cmd: 'maestro-verify',          args: '{phase}' }],
-  'test_gen':           [{ cmd: 'quality-test-gen',        args: '{phase}' }],
-  'test':               [{ cmd: 'quality-test',            args: '{phase}' }],
-  'debug':              [{ cmd: 'quality-debug',           args: '"{description}"' }],
-  'integration_test':   [{ cmd: 'quality-integration-test',args: '{phase}' }],
-  'refactor':           [{ cmd: 'quality-refactor',        args: '"{description}"' }],
-  'review':             [{ cmd: 'quality-review',          args: '{phase}' }],
-  'retrospective':      [{ cmd: 'quality-retrospective',   args: '{phase}' }],
-  'learn':              [{ cmd: 'manage-learn',            args: '"{description}"' }],
-  'sync':               [{ cmd: 'quality-sync',            args: '{phase}' }],
-  'phase_transition':   [{ cmd: 'maestro-phase-transition' }],
-  'phase_add':          [{ cmd: 'maestro-phase-add',       args: '"{description}"' }],
+  'analyze':            [{ cmd: 'maestro-analyze', args: '{phase}' }],
+  'ui_design':          [{ cmd: 'maestro-ui-design', args: '{phase}' }],
+  'plan':               [{ cmd: 'maestro-plan', args: '{phase}' }],
+  'execute':            [{ cmd: 'maestro-execute', args: '{phase}' }],
+  'verify':             [{ cmd: 'maestro-verify', args: '{phase}' }],
+  'test_gen':           [{ cmd: 'quality-test-gen', args: '{phase}' }],
+  'test':               [{ cmd: 'quality-test', args: '{phase}' }],
+  'debug':              [{ cmd: 'quality-debug', args: '"{description}"' }],
+  'integration_test':   [{ cmd: 'quality-integration-test', args: '{phase}' }],
+  'refactor':           [{ cmd: 'quality-refactor', args: '"{description}"' }],
+  'review':             [{ cmd: 'quality-review', args: '{phase}' }],
+  'retrospective':      [{ cmd: 'quality-retrospective', args: '{phase}' }],
+  'learn':              [{ cmd: 'manage-learn', args: '"{description}"' }],
+  'sync':               [{ cmd: 'quality-sync', args: '{phase}' }],
+  'milestone_close':    [{ cmd: 'maestro-milestone-audit' }, { cmd: 'maestro-milestone-complete' }],
+  'roadmap':            [{ cmd: 'maestro-roadmap', args: '"{description}"' }],
   'milestone_audit':    [{ cmd: 'maestro-milestone-audit' }],
   'milestone_complete': [{ cmd: 'maestro-milestone-complete' }],
   'codebase_rebuild':   [{ cmd: 'manage-codebase-rebuild' }],
   'codebase_refresh':   [{ cmd: 'manage-codebase-refresh' }],
   'spec_setup':         [{ cmd: 'spec-setup' }],
-  'spec_add':           [{ cmd: 'spec-add',                args: '"{description}"' }],
-  'spec_load':          [{ cmd: 'spec-load',               args: '"{description}"' }],
+  'spec_add':           [{ cmd: 'spec-add', args: '"{description}"' }],
+  'spec_load':          [{ cmd: 'spec-load', args: '"{description}"' }],
   'spec_map':           [{ cmd: 'manage-codebase-rebuild' }],
-  'memory_capture':     [{ cmd: 'manage-memory-capture',   args: '"{description}"' }],
-  'memory':             [{ cmd: 'manage-memory',           args: '"{description}"' }],
-  'issue':              [{ cmd: 'manage-issue',            args: '"{description}"' }],
-  'issue_discover':     [{ cmd: 'manage-issue-discover',   args: '"{description}"' }],
-  'issue_analyze':      [{ cmd: 'manage-issue-analyze',    args: '"{description}"' }],
-  'issue_plan':         [{ cmd: 'manage-issue-plan',       args: '"{description}"' }],
-  'issue_execute':      [{ cmd: 'manage-issue-execute',    args: '"{description}"' }],
-  'quick':              [{ cmd: 'maestro-quick',           args: '"{description}"' }],
-  'team_lifecycle':     [{ cmd: 'team-lifecycle-v4',       args: '"{description}"' }],
-  'team_coordinate':    [{ cmd: 'team-coordinate',         args: '"{description}"' }],
-  'team_qa':            [{ cmd: 'team-quality-assurance',  args: '"{description}"' }],
-  'team_test':          [{ cmd: 'team-testing',            args: '"{description}"' }],
-  'team_review':        [{ cmd: 'team-review',             args: '"{description}"' }],
-  'team_tech_debt':     [{ cmd: 'team-tech-debt',          args: '"{description}"' }],
-
-  // ── Multi-step chains ────────────────────────────────────────────────────
-  'spec-driven': [
-    { cmd: 'maestro-init' },
-    { cmd: 'maestro-spec-generate', args: '"{description}"' },
-    { cmd: 'maestro-plan',          args: '{phase}' },
-    { cmd: 'maestro-execute',       args: '{phase}' },
-    { cmd: 'maestro-verify',        args: '{phase}' }
-  ],
-  'brainstorm-driven': [
-    { cmd: 'maestro-brainstorm', args: '"{description}"' },
-    { cmd: 'maestro-plan',       args: '{phase}' },
-    { cmd: 'maestro-execute',    args: '{phase}' },
-    { cmd: 'maestro-verify',     args: '{phase}' }
-  ],
-  'ui-design-driven': [
-    { cmd: 'maestro-ui-design', args: '{phase}' },
-    { cmd: 'maestro-plan',      args: '{phase}' },
-    { cmd: 'maestro-execute',   args: '{phase}' },
-    { cmd: 'maestro-verify',    args: '{phase}' }
-  ],
-  'full-lifecycle': [
-    { cmd: 'maestro-plan',          args: '{phase}' },
-    { cmd: 'maestro-execute',       args: '{phase}' },
-    { cmd: 'maestro-verify',        args: '{phase}' },
-    { cmd: 'quality-review',        args: '{phase}' },
-    { cmd: 'quality-test',          args: '{phase}' },
-    { cmd: 'maestro-phase-transition' }
-  ],
-  'execute-verify': [
-    { cmd: 'maestro-execute', args: '{phase}' },
-    { cmd: 'maestro-verify',  args: '{phase}' }
-  ],
-  'quality-loop': [
-    { cmd: 'maestro-verify',   args: '{phase}' },
-    { cmd: 'quality-review',   args: '{phase}' },
-    { cmd: 'quality-test',     args: '{phase}' },
-    { cmd: 'quality-debug',    args: '--from-uat {phase}' },
-    { cmd: 'maestro-plan',     args: '{phase} --gaps' },
-    { cmd: 'maestro-execute',  args: '{phase}' }
-  ],
-  'milestone-close': [
-    { cmd: 'maestro-milestone-audit' },
-    { cmd: 'maestro-milestone-complete' }
-  ],
-  'roadmap-driven': [
-    { cmd: 'maestro-init' },
-    { cmd: 'maestro-roadmap',  args: '"{description}"' },
-    { cmd: 'maestro-plan',     args: '{phase}' },
-    { cmd: 'maestro-execute',  args: '{phase}' },
-    { cmd: 'maestro-verify',   args: '{phase}' }
-  ],
-  'next-milestone': [
-    { cmd: 'maestro-roadmap',  args: '"{description}"' },
-    { cmd: 'maestro-plan',     args: '{phase}' },
-    { cmd: 'maestro-execute',  args: '{phase}' },
-    { cmd: 'maestro-verify',   args: '{phase}' }
-  ],
-  'analyze-plan-execute': [
-    { cmd: 'maestro-analyze', args: '"{description}" -q' },
-    { cmd: 'maestro-plan',    args: '--dir {scratch_dir}' },
-    { cmd: 'maestro-execute', args: '--dir {scratch_dir}' }
-  ],
-
-  // ── SKILL.md simplified aliases (--chain <name> shortcuts) ───────────────
-  'feature': [
-    { cmd: 'maestro-plan',    args: '{phase}' },
-    { cmd: 'maestro-execute', args: '{phase}' },
-    { cmd: 'maestro-verify',  args: '{phase}' }
-  ],
-  'quality-fix': [
-    { cmd: 'manage-issue-analyze', args: '"{description}"' },
-    { cmd: 'manage-issue-execute', args: '"{description}"' },
-    { cmd: 'maestro-verify',       args: '{phase}' }
-  ],
-  'deploy': [
-    { cmd: 'maestro-verify',  args: '{phase}' },
-    { cmd: 'maestro-execute', args: '{phase}' }
-  ],
-
-  // ── Issue lifecycle chains (with quality gates) ────────────────────────────
-  'issue-full': [
-    { cmd: 'manage-issue-analyze', args: '{issue_id}' },
-    { cmd: 'manage-issue-plan',    args: '{issue_id}' },
-    { cmd: 'manage-issue-execute', args: '{issue_id}' },
-    { cmd: 'quality-review',       args: '--scope {affected_files}' },
-    { cmd: 'manage-issue',         args: 'close {issue_id} --resolution fixed' }
-  ],
-  'issue-quick': [
-    { cmd: 'manage-issue-plan',    args: '{issue_id}' },
-    { cmd: 'manage-issue-execute', args: '{issue_id}' },
-    { cmd: 'manage-issue',         args: 'close {issue_id} --resolution fixed' }
-  ],
+  'memory_capture':     [{ cmd: 'manage-memory-capture', args: '"{description}"' }],
+  'memory':             [{ cmd: 'manage-memory', args: '"{description}"' }],
+  'issue':              [{ cmd: 'manage-issue', args: '"{description}"' }],
+  'issue_discover':     [{ cmd: 'manage-issue-discover', args: '"{description}"' }],
+  'issue_analyze':      [{ cmd: 'maestro-analyze', args: '--gaps "{description}"' }],
+  'issue_plan':         [{ cmd: 'maestro-plan', args: '--gaps' }],
+  'issue_execute':      [{ cmd: 'maestro-execute', args: '' }],
+  'quick':              [{ cmd: 'maestro-quick', args: '"{description}"' }],
+  'fork':               [{ cmd: 'maestro-fork', args: '-m {milestone_num}' }],
+  'merge':              [{ cmd: 'maestro-merge', args: '-m {milestone_num}' }],
+  // Multi-step chains
+  'spec-driven':     [{ cmd: 'maestro-init' }, { cmd: 'maestro-spec-generate', args: '"{description}"' }, { cmd: 'maestro-plan', args: '{phase}' }, { cmd: 'maestro-execute', args: '{phase}' }, { cmd: 'maestro-verify', args: '{phase}' }],
+  'brainstorm-driven': [{ cmd: 'maestro-brainstorm', args: '"{description}"' }, { cmd: 'maestro-plan', args: '{phase}' }, { cmd: 'maestro-execute', args: '{phase}' }, { cmd: 'maestro-verify', args: '{phase}' }],
+  'ui-design-driven': [{ cmd: 'maestro-ui-design', args: '{phase}' }, { cmd: 'maestro-plan', args: '{phase}' }, { cmd: 'maestro-execute', args: '{phase}' }, { cmd: 'maestro-verify', args: '{phase}' }],
+  'full-lifecycle':  [{ cmd: 'maestro-plan', args: '{phase}' }, { cmd: 'maestro-execute', args: '{phase}' }, { cmd: 'maestro-verify', args: '{phase}' }, { cmd: 'quality-review', args: '{phase}' }, { cmd: 'quality-test', args: '{phase}' }, { cmd: 'maestro-milestone-audit' }, { cmd: 'maestro-milestone-complete' }],
+  'execute-verify':  [{ cmd: 'maestro-execute', args: '{phase}' }, { cmd: 'maestro-verify', args: '{phase}' }],
+  'quality-loop':    [{ cmd: 'maestro-verify', args: '{phase}' }, { cmd: 'quality-review', args: '{phase}' }, { cmd: 'quality-test', args: '{phase}' }, { cmd: 'quality-debug', args: '--from-uat {phase}' }, { cmd: 'maestro-plan', args: '{phase} --gaps' }, { cmd: 'maestro-execute', args: '{phase}' }],
+  'milestone-close': [{ cmd: 'maestro-milestone-audit' }, { cmd: 'maestro-milestone-complete' }],
+  'roadmap-driven': [{ cmd: 'maestro-init' }, { cmd: 'maestro-roadmap', args: '"{description}"' }, { cmd: 'maestro-plan', args: '{phase}' }, { cmd: 'maestro-execute', args: '{phase}' }, { cmd: 'maestro-verify', args: '{phase}' }],
+  'next-milestone': [{ cmd: 'maestro-roadmap', args: '"{description}"' }, { cmd: 'maestro-plan', args: '{phase}' }, { cmd: 'maestro-execute', args: '{phase}' }, { cmd: 'maestro-verify', args: '{phase}' }],
+  'analyze-plan-execute': [{ cmd: 'maestro-analyze', args: '"{description}" -q' }, { cmd: 'maestro-plan', args: '--dir {scratch_dir}' }, { cmd: 'maestro-execute', args: '--dir {scratch_dir}' }],
+  // Issue lifecycle chains (with quality gates)
+  'issue-full': [{ cmd: 'maestro-analyze', args: '--gaps {issue_id}' }, { cmd: 'maestro-plan', args: '--gaps' }, { cmd: 'maestro-execute', args: '' }, { cmd: 'quality-review', args: '--scope {affected_files}' }, { cmd: 'manage-issue', args: 'close {issue_id} --resolution fixed' }],
+  'issue-quick': [{ cmd: 'maestro-plan', args: '--gaps' }, { cmd: 'maestro-execute', args: '' }, { cmd: 'manage-issue', args: 'close {issue_id} --resolution fixed' }],
 };
 
-// Aliases: task type → named chain
+// Aliases: task type → named multi-step chain
 const taskToChain = {
-  'spec_generate':  'spec-driven',
-  'brainstorm':     'brainstorm-driven',
-  'issue_execute':  'issue-full',    // issue execute always gets review gate
+  'spec_generate': 'spec-driven',
+  'brainstorm': 'brainstorm-driven',
+  'issue_execute': 'issue-full',    // issue execute always gets review gate
 };
 ```
 
 **Resolution order:**
-1. `forceChain` → `chainMap[forceChain]` (E002 if not found)
+1. `forcedChain` → `chainMap[forcedChain]`
 2. `state_continue` → `detectNextAction(projectState)`
 3. `taskToChain[taskType]` → named chain
 4. `chainMap[taskType]` → direct lookup
 
-### 3d: Resolve phase, description, and issue ID
+### 3d: Resolve phase number and issue ID
 
 ```javascript
 function resolvePhase() {
   // From structured extraction
   if (intentAnalysis.phase_ref) return intentAnalysis.phase_ref;
   // Fallback regex
-  const m = intent.match(new RegExp('^(\\d+)$')) ?? intent.match(new RegExp('phase\\s*(\\d+)', 'i'));
-  if (m) return m[1] ?? m[2];
-  if (projectState.initialized) return projectState.current_phase;
+  const m = intent.match(/phase\s*(\d+)|^(\d+)$/);
+  if (m) return m[1] || m[2];
+  // With scratch-based architecture, commands default to milestone-wide when no phase specified
   return null;
 }
 
 function resolveIssueId() {
   if (intentAnalysis.issue_id) return intentAnalysis.issue_id;
-  const m = intent.match(new RegExp('ISS-[\\w]+-\\d+', 'i'));
+  const m = intent.match(/ISS-[\w]+-\d+/i);
   return m ? m[0] : null;
 }
-
-const resolvedPhase = resolvePhase();
-const resolvedIssueId = resolveIssueId();
-const context = {
-  current_phase: resolvedPhase,
-  user_intent: intent,
-  issue_id: resolvedIssueId,
-  spec_session_id: null,
-  scratch_dir: null
-};
 ```
 
+When executing issue chains, replace `{issue_id}` in step args with the resolved issue ID.
+
 ---
 
 ## Step 4: Confirm
 
-**If `DRY_RUN`**: Display chain and exit.
+**If `dryRun`:** Display chain and exit.
 
 ```
-MAESTRO-COORDINATE: {chain_name}  (dry run)
-  1. ${step.cmd} {step.args}
-  2. ${step.cmd} {step.args}
-  …
+MAESTRO-COORDINATE: {chain_name} (dry run)
+  1. [{cmd}] {args}
+  2. [{cmd}] {args}
 ```
 
-**If not `AUTO_YES`**: Ask user via `functions.request_user_input`:
-- Execute all steps
-- Execute from step N
-- Cancel
+**If not autoYes:** AskUserQuestion — Execute / Execute from step N / Cancel.
 
 ---
 
 ## Step 5: Setup Session
 
 ```javascript
-const ts = new Date().toISOString().replaceAll('-', '').replaceAll(':', '').replaceAll('T', '').slice(0, 15);
-const sessionId = `coord-${ts}`;
+const sessionId = `coord-${new Date().toISOString().replace(/[-:T]/g, '').slice(0, 15)}`;
 const sessionDir = `.workflow/.maestro-coordinate/${sessionId}`;
 Bash(`mkdir -p "${sessionDir}"`);
 
 const state = {
-  session_id: sessionId,
-  status: 'running',
+  session_id: sessionId, status: 'running',
   created_at: new Date().toISOString(),
-  intent,
-  task_type: taskType,
-  chain_name: chainName,
-  auto_yes: AUTO_YES,
-  phase: resolvedPhase,
+  intent, task_type: taskType, chain_name: chainName,
+  tool: cliTool, auto_mode: autoYes, phase: resolvedPhase,
   current_step: 0,
-  step_analyses: [],      // analysis results per step (for hints chaining)
+  gemini_session_id: null,
+  step_analyses: [],
   steps: chain.map((s, i) => ({
-    index: i,
-    cmd: s.cmd,
-    args: s.args ?? '',
-    status: 'pending',
-    findings: null,
-    quality_score: null,
-    hints_for_next: null
+    index: i, cmd: s.cmd, args: s.args || '',
+    status: 'pending', exec_id: null, analysis: null
   }))
 };
 Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
+
+const context = { resolved_phase: resolvedPhase, user_intent: intent, issue_id: resolvedIssueId, spec_session_id: null };
 ```
 
 ---
 
-## Step 6: Execute Step via spawn_agent
+## Step 6: Execute Step via codex delegate
 
 ### 6a: Assemble args
 
 ```javascript
 const AUTO_FLAG_MAP = {
-  'maestro-analyze':        '-y',
-  'maestro-brainstorm':     '-y',
-  'maestro-ui-design':      '-y',
-  'maestro-plan':           '--auto',
-  'maestro-spec-generate':  '-y',
-  'quality-test':           '--auto-fix',
-  'quality-retrospective':  '--auto-yes',
+  'maestro-analyze': '-y', 'maestro-brainstorm': '-y', 'maestro-ui-design': '-y',
+  'maestro-plan': '--auto', 'maestro-spec-generate': '-y', 'quality-test': '--auto-fix',
+  'quality-retrospective': '--auto-yes',
 };
 
 function assembleArgs(step) {
-  let a = (step.args ?? '')
-    .replaceAll('{phase}',           context.current_phase   ?? '')
-    .replaceAll('{description}',     context.user_intent     ?? '')
-    .replaceAll('{issue_id}',        context.issue_id        ?? '')
-    .replaceAll('{spec_session_id}', context.spec_session_id ?? '')
-    .replaceAll('{scratch_dir}',     context.scratch_dir     ?? '');
-
-  if (AUTO_YES) {
+  let a = (step.args || '')
+    .replace(/\{phase\}/g, context.resolved_phase || '')  // empty = milestone-wide default
+    .replace(/\{description\}/g, context.user_intent || '')
+    .replace(/\{issue_id\}/g, context.issue_id || '')
+    .replace(/\{spec_session_id\}/g, context.spec_session_id || '')
+    .replace(/\{scratch_dir\}/g, context.scratch_dir || '');
+  if (state.auto_mode) {
     const flag = AUTO_FLAG_MAP[step.cmd];
     if (flag && !a.includes(flag)) a = a ? `${a} ${flag}` : flag;
   }
@@ -469,233 +342,179 @@ function assembleArgs(step) {
 }
 ```
 
-### 6b: Build analysis hints from previous step
-
-```javascript
-function buildAnalysisHints(stepIdx) {
-  const prev = state.step_analyses.find(a => a.step_index === stepIdx - 1);
-  if (!prev?.next_step_hints) return '';
-  const h = prev.next_step_hints;
-  const parts = [];
-  if (h.prompt_additions)   parts.push(h.prompt_additions);
-  if (h.cautions?.length)   parts.push('Cautions: ' + h.cautions.join('; '));
-  if (h.context_to_carry)   parts.push('Context from prior step: ' + h.context_to_carry);
-  return parts.join('\n');
-}
-```
+### 6b: Build prompt from template
 
-### 6c: Assemble step prompt (replaces coordinate-step.txt template)
-
-The prompt embeds the skill invocation so the agent knows exactly what to call:
+Read `~/.maestro/templates/cli/prompts/coordinate-step.txt`, fill placeholders.
+If previous step has analysis hints, inject them as `{{ANALYSIS_HINTS}}`.
 
 ```javascript
-function buildStepPrompt(step, stepIdx, assembledArgs, analysisHints) {
-  const skillCall = assembledArgs
-    ? `$${step.cmd} ${assembledArgs}`
-    : `$${step.cmd}`;
-
-  return `## TASK ASSIGNMENT
-
-### MANDATORY FIRST STEPS
-1. Read: ~/.codex/agents/universal-executor.md
-2. Read: ~/.codex/skills/${step.cmd}/SKILL.md
-
----
+function escapeForShell(str) { return "'" + str.replace(/'/g, "'\\''") + "'"; }
 
-**Coordinate Step ${stepIdx + 1}/${state.steps.length}: ${step.cmd}**
-Chain: ${state.chain_name}
-Intent: ${state.intent}
-
-## Skill Invocation
-Execute this skill to complete your task:
-
-  ${skillCall}
-
-Follow the Implementation section of the skill file you loaded in step 2.
-${AUTO_YES ? 'Auto mode: skip all confirmation prompts within the skill.' : ''}
+const assembledArgs = assembleArgs(step);
+const template = Read('~/.maestro/templates/cli/prompts/coordinate-step.txt');
 
-${analysisHints ? `## Analysis Hints from Previous Step\n${analysisHints}\n` : ''}
-## Output (required — last JSON block in your response)
-\`\`\`json
-{
-  "status": "completed",
-  "quality_score": <0-100>,
-  "step_summary": "<what was accomplished — max 500 chars>",
-  "phase_detected": <number or null>,
-  "spec_session_id": "<if a spec session was created, else null>",
-  "scratch_dir": "<if a scratch dir was created, else null>",
-  "hints_for_next": "<specific guidance for the next chain step, or null>"
+// Build analysis hints from previous step's gemini evaluation
+let analysisHints = '';
+const prevAnalysis = (state.step_analyses || []).find(a => a.step_index === state.current_step - 1);
+if (prevAnalysis?.next_step_hints) {
+  const h = prevAnalysis.next_step_hints;
+  const parts = [];
+  if (h.prompt_additions) parts.push(h.prompt_additions);
+  if (h.cautions?.length) parts.push('Cautions: ' + h.cautions.join('; '));
+  if (h.context_to_carry) parts.push('Context from prior step: ' + h.context_to_carry);
+  if (parts.length) analysisHints = parts.join('\n');
 }
-\`\`\`
 
-Session artifacts: ${sessionDir}/`;
-}
+const prompt = template
+  .replace('{{COMMAND}}', `/${step.cmd}`)
+  .replace('{{ARGS}}', assembledArgs)
+  .replace('{{STEP_N}}', `${state.current_step + 1}/${state.steps.length}`)
+  .replace('{{AUTO_DIRECTIVE}}', state.auto_mode ? 'Auto-confirm all prompts. No interactive questions.' : '')
+  .replace('{{CHAIN_NAME}}', state.chain_name)
+  .replace('{{ANALYSIS_HINTS}}', analysisHints);
 ```
 
-### 6d: Spawn, wait, close
+### 6c: Launch via codex delegate
 
-```javascript
-const step = state.steps[state.current_step];
-const assembledArgs = assembleArgs(step);
-const analysisHints = buildAnalysisHints(state.current_step);
-const stepPrompt = buildStepPrompt(step, state.current_step, assembledArgs, analysisHints);
+```
+------------------------------------------------------------
+  STEP {i+1}/{total}: {step.cmd}  |  Tool: {cliTool}
+------------------------------------------------------------
+```
 
-step.status = 'running';
-step.started_at = new Date().toISOString();
+```javascript
+state.steps[state.current_step].status = 'running';
+state.steps[state.current_step].started_at = new Date().toISOString();
 Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
 
-const stepAgent = spawn_agent({ message: stepPrompt });
-
-let result = wait({ ids: [stepAgent], timeout_ms: 600000 });
-if (result.timed_out) {
-  send_input({ id: stepAgent, message: "Please finalize and output your results JSON now." });
-  result = wait({ ids: [stepAgent], timeout_ms: 120000 });
-}
-
-const rawOutput = result.status[stepAgent].completed ?? '';
-close_agent({ id: stepAgent });
-
-// Save raw output for analysis
-Write(`${sessionDir}/step-${state.current_step + 1}-output.txt`, rawOutput);
+Bash({
+  command: `codex delegate ${escapeForShell(prompt)} --to ${state.tool} --mode write`,
+  run_in_background: true, timeout: 600000
+});
+// ■ STOP — wait for hook callback
 ```
 
 ---
 
-## Step 7: Post-Step Processing
-
-### 7a: Parse output and propagate context
+## Step 7: Post-Step Callback
 
 ```javascript
-const output = parseLastJSON(rawOutput) ?? {
-  status: result.timed_out ? 'failed' : 'completed',
-  quality_score: null,
-  step_summary: rawOutput.slice(-500),
-  phase_detected: null,
-  spec_session_id: null,
-  scratch_dir: null,
-  hints_for_next: null
-};
-
-// Propagate context to subsequent steps
-if (output.phase_detected)    context.current_phase   = output.phase_detected;
-if (output.spec_session_id)   context.spec_session_id = output.spec_session_id;
-if (output.scratch_dir)       context.scratch_dir     = output.scratch_dir;
-
-// Determine step outcome
-const stepFailed = output.status === 'failed' || result.timed_out;
-
-if (stepFailed && AUTO_YES && !step.retried) {
-  // One auto-retry
-  step.retried = true;
-  Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
-  // → back to Step 6d with same step
-} else if (stepFailed && !AUTO_YES) {
-  // Ask: Retry / Skip / Abort
-  const choice = functions.request_user_input({
-    id: 'step-failure',
-    items: [{ type: 'text', text: `Step ${state.current_step + 1} (${step.cmd}) failed. Retry / Skip / Abort?` }]
-  });
-  if (choice === 'Retry') { /* → back to Step 6d */ }
-  if (choice === 'Abort') {
-    state.status = 'aborted';
-    Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
-    return; // exit
-  }
-  // Skip: fall through
-  step.status = 'skipped';
-} else if (stepFailed) {
+const stepIdx = state.current_step;
+const step = state.steps[stepIdx];
+const output = /* callback output */;
+
+// Capture exec_id from stderr [CODEX_EXEC_ID=xxx]
+step.exec_id = /* from callback */;
+step.completed_at = new Date().toISOString();
+
+// Context propagation
+const phaseMatch = output.match(/PHASE:\s*(\d+)/m);
+if (phaseMatch) context.resolved_phase = phaseMatch[1];
+const specMatch = output.match(/SPEC-[\w-]+/);
+if (specMatch) context.spec_session_id = specMatch[0];
+const scratchMatch = output.match(/scratch_dir:\s*(.+)/m);
+if (scratchMatch) context.scratch_dir = scratchMatch[1].trim();
+
+// Success/failure
+const failed = /^STATUS:\s*FAILURE/m.test(output);
+if (!failed) {
+  step.status = 'completed';
+} else if (state.auto_mode) {
+  if (!step.retried) { step.retried = true; /* re-execute Step 6c */ return; }
   step.status = 'skipped';
 } else {
-  step.status = 'completed';
+  // AskUserQuestion: Retry / Skip / Abort
+  // On Abort: state.status = 'aborted', save, exit
 }
 
-step.findings      = output.step_summary;
-step.quality_score = output.quality_score;
-step.hints_for_next= output.hints_for_next;
-step.completed_at  = new Date().toISOString();
+// Save output for analysis
+Write(`${sessionDir}/step-${stepIdx + 1}-output.txt`, output);
 Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
-```
-
-### 7b: Analyze step output (inline analysis agent)
 
-Skip if: step failed/skipped **or** chain has only one step.
-
-```javascript
+// → Step 7b: Gemini analysis (skip if step failed/skipped or single-step chain)
 if (step.status === 'completed' && state.steps.length > 1) {
-  const nextStep = state.steps[state.current_step + 1] ?? null;
-  const priorAnalysesSummary = state.step_analyses
-    .map(a => `- Step ${a.step_index + 1} (${a.cmd}): score=${a.quality_score}, issues=${a.issues?.length ?? 0}`)
-    .join('\n');
-
-  const analysisPrompt = `## TASK ASSIGNMENT
-
-### MANDATORY FIRST STEPS
-1. Read: ~/.codex/agents/cli-explore-agent.md
+  // → Step 7b
+} else {
+  // Skip analysis, advance directly
+  state.current_step = stepIdx + 1;
+  Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
+  if (state.current_step < state.steps.length) { /* → Step 6 */ }
+  else { /* → Step 8 */ }
+}
+```
 
 ---
 
-Goal: Evaluate execution quality of coordinate step and generate optimization hints for the next step.
-
-Step: $${step.cmd} (step ${state.current_step + 1}/${state.steps.length})
-Chain: ${state.chain_name} | Intent: ${state.intent}
+## Step 7b: Analyze Step Output (via gemini)
 
-Step output (last 200 lines):
-${rawOutput.split('\n').slice(-200).join('\n')}
+After each step completes, call gemini to evaluate execution quality and generate optimization hints for subsequent steps.
 
-${priorAnalysesSummary ? `Prior step analyses:\n${priorAnalysesSummary}\n` : ''}
-Next step: ${nextStep ? `$${nextStep.cmd} ${assembleArgs(nextStep)}` : 'None (last step)'}
-
-## Output (strict JSON)
-\`\`\`json
+```javascript
+const stepIdx = state.current_step;
+const step = state.steps[stepIdx];
+const output = Read(`${sessionDir}/step-${stepIdx + 1}-output.txt`);
+const nextStep = stepIdx < state.steps.length - 1 ? state.steps[stepIdx + 1] : null;
+
+// Build analysis prompt
+const priorAnalyses = (state.step_analyses || [])
+  .map(a => `- Step ${a.step_index + 1} (${a.cmd}): score=${a.quality_score}, issues=${a.issues?.length || 0}`)
+  .join('\n');
+
+const analysisPrompt = `PURPOSE: Evaluate execution quality of coordinate step "${step.cmd}" (${stepIdx + 1}/${state.steps.length}) and generate optimization hints for the next step.
+CHAIN: ${state.chain_name} | Intent: ${state.intent}
+COMMAND: /${step.cmd} ${step.args || ''}
+STEP OUTPUT (last 200 lines):
+${output.split('\n').slice(-200).join('\n')}
+${priorAnalyses ? `PRIOR STEP ANALYSES:\n${priorAnalyses}` : ''}
+${nextStep ? `NEXT STEP: /${nextStep.cmd} ${nextStep.args || ''}` : 'NEXT STEP: None (last step)'}
+EXPECTED OUTPUT (strict JSON):
 {
   "quality_score": <0-100>,
-  "execution_assessment": {
-    "success": <bool>,
-    "completeness": "full|partial|minimal",
-    "key_outputs": [],
-    "missing_outputs": []
-  },
+  "execution_assessment": { "success": <bool>, "completeness": "<full|partial|minimal>", "key_outputs": [], "missing_outputs": [] },
   "issues": [{ "severity": "critical|high|medium|low", "description": "" }],
   "next_step_hints": {
     "prompt_additions": "<extra context or constraints to inject into next step prompt>",
     "cautions": ["<things next step should watch out for>"],
-    "context_to_carry": "<key facts from this step that next step needs>"
+    "context_to_carry": "<key facts from this step's output that next step needs>"
   },
   "step_summary": ""
-}
-\`\`\``;
+}`;
 
-  const analysisAgent = spawn_agent({ message: analysisPrompt });
-  let aResult = wait({ ids: [analysisAgent], timeout_ms: 300000 });
-  if (aResult.timed_out) {
-    send_input({ id: analysisAgent, message: "Finalize and output analysis JSON now." });
-    aResult = wait({ ids: [analysisAgent], timeout_ms: 60000 });
-  }
-  close_agent({ id: analysisAgent });
-
-  const analysis = parseLastJSON(aResult.status[analysisAgent].completed ?? '') ?? {};
-  state.step_analyses.push({
-    step_index: state.current_step,
-    cmd: step.cmd,
-    quality_score: analysis.quality_score,
-    issues: analysis.issues,
-    next_step_hints: analysis.next_step_hints,
-    summary: analysis.step_summary
-  });
-  step.quality_score = analysis.quality_score ?? step.quality_score;
-  Write(`${sessionDir}/step-${state.current_step + 1}-analysis.json`, JSON.stringify(analysis, null, 2));
-  Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
-}
+let delegateCmd = `codex delegate ${escapeForShell(analysisPrompt)} --to gemini --mode analysis --rule analysis-review-code-quality`;
+if (state.gemini_session_id) delegateCmd += ` --resume ${state.gemini_session_id}`;
+Bash({ command: delegateCmd, run_in_background: true, timeout: 300000 });
+// ■ STOP — wait for hook callback
 ```
 
-### 7c: Advance
+### Step 7c: Post-Analyze Callback
 
 ```javascript
-state.current_step += 1;
+const analysisResult = /* parsed JSON from callback output */;
+
+// Capture gemini session ID for resume chain
+state.gemini_session_id = /* from callback stderr [CODEX_EXEC_ID=xxx] */;
+
+// Store analysis
+if (!state.step_analyses) state.step_analyses = [];
+state.step_analyses.push({
+  step_index: stepIdx, cmd: step.cmd,
+  quality_score: analysisResult.quality_score,
+  issues: analysisResult.issues,
+  next_step_hints: analysisResult.next_step_hints,
+  summary: analysisResult.step_summary
+});
+step.analysis = {
+  quality_score: analysisResult.quality_score,
+  issue_count: (analysisResult.issues || []).length
+};
+Write(`${sessionDir}/step-${stepIdx + 1}-analysis.json`, JSON.stringify(analysisResult, null, 2));
+
+// Advance
+state.current_step = stepIdx + 1;
 Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
 
 if (state.current_step < state.steps.length) {
-  // → back to Step 6
+  // → Back to Step 6
 } else {
   // → Step 8
 }
@@ -706,34 +525,26 @@ if (state.current_step < state.steps.length) {
 ## Step 8: Completion Report
 
 ```javascript
-const done    = state.steps.filter(s => s.status === 'completed').length;
-const skipped = state.steps.filter(s => s.status === 'skipped').length;
-const avgScore = state.step_analyses.length
-  ? Math.round(state.step_analyses.reduce((s, a) => s + (a.quality_score ?? 0), 0) / state.step_analyses.length)
-  : null;
-
+const done = state.steps.filter(s => s.status === 'completed').length;
 state.status = state.steps.some(s => s.status === 'failed') ? 'completed_with_errors' : 'completed';
 state.completed_at = new Date().toISOString();
 Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
 ```
 
-Display:
 ```
 ============================================================
   MAESTRO-COORDINATE COMPLETE
 ============================================================
-  Session:  {session_id}
-  Chain:    {chain_name}  ({done}/{total} steps)
+  Session: {session_id}
+  Chain:   {chain_name} ({done}/{total})
+  Tool:    {cliTool}
 
   Steps:
-    [✓] 1. {cmd}  — completed  (quality: {score}/100)
-    [✓] 2. {cmd}  — completed  (quality: {score}/100)
-    [⚠] 3. {cmd}  — skipped
-
-  Avg Quality:  {avgScore}/100
-  Artifacts:    .workflow/.maestro-coordinate/{session_id}/
+    [✓] 1. maestro-plan — completed (quality: 85/100)
+    [✓] 2. maestro-execute — completed (quality: 78/100)
 
-  Resume:  $maestro-coordinate --continue
+  Avg Quality: {avg_score}/100
+  Next: $Maestro-coordinate --continue
 ============================================================
 ```
 
@@ -741,15 +552,15 @@ Display:
 
 ## Core Rules
 
-1. **Semantic routing**: LLM-native structured extraction (`action × object`) replaces regex; disambiguates "问题" by context
-2. **Sequential**: Advance `current_step` only after the current step agent is **closed** and state written
-3. **Skill in prompt**: Every step agent's message MUST contain `$skill-name args` — this is the skill invocation
-4. **MANDATORY FIRST STEPS**: Step agents read `universal-executor.md` + the target `SKILL.md`; analysis agents read `cli-explore-agent.md`
-5. **Context propagation**: Parse `phase_detected`, `spec_session_id`, `scratch_dir`, `issue_id` from each step's output JSON; feed into next step's `assembleArgs`
-6. **Quality gates**: Issue chains auto-include review; `issue-full` is default for issue execution
-7. **Analysis hints chain**: `step_analyses[N].next_step_hints` → `buildAnalysisHints(N+1)` → injected into step N+1's prompt
-8. **Timeout handling**: One `send_input` urge, then close agent regardless
-9. **Auto-retry**: One silent retry if `AUTO_YES` and step fails; no retry in interactive mode
-10. **State.json is source of truth**: Write after every state change; `--continue` reads it to resume
-11. **Dry-run is read-only**: Display chain and exit — no agents spawned
-12. **Analysis skip conditions**: Single-step chains and failed/skipped steps skip the analysis agent
+1. **Semantic routing** — LLM-native structured extraction (`action × object`) replaces regex; disambiguates "问题" by context
+2. **STOP after each `codex delegate` call** — background execution, wait for hook callback
+3. **State machine** — advance via `current_step`, no sync loops for async operations
+4. **Template-driven** — all steps use `coordinate-step.txt`, no per-command prompt assembly
+5. **Context propagation** — parse PHASE / spec session ID / scratch_dir / issue_id from each step output, feed to next step
+6. **Quality gates** — issue chains auto-include review; `issue-full` is default for issue execution
+7. **Tool fallback** — if `codex delegate` fails: retry with same tool once, then try `gemini` → `qwen`
+8. **Auto-confirm injection** — `{{AUTO_DIRECTIVE}}` in template prevents blocking during background execution
+9. **Resumable** — `-c` reads `state.json`, jumps to first pending step
+10. **Gemini analysis after each step** — evaluate output quality via `codex delegate --to gemini --mode analysis`, chained via `--resume`. Analysis generates `next_step_hints` injected into next step's prompt as `{{ANALYSIS_HINTS}}`
+11. **Session capture** — after each gemini callback, capture exec_id → `gemini_session_id` for resume chain
+12. **Analysis skip conditions** — skip gemini analysis for: failed/skipped steps, single-step chains