maestro-flow 0.3.12 → 0.3.14

package/workflows/fork.md

@@ -121,25 +121,17 @@ IF syncMode:
 ## Step 5: Validate & Confirm
 
 ```
-// Load phase status — artifact registry first, fallback to legacy phases/
+// Load phase status from artifact registry
 phaseList = []
 artifacts = projectState.artifacts ?? []
-useArtifactRegistry = artifacts.length > 0
-
-IF useArtifactRegistry:
-  // Derive phase status from artifact registry
-  for (phaseNum of milestonePhases):
-    execArtifacts = artifacts.filter(a => a.type === 'execute' && a.phase === phaseNum)
-    status = execArtifacts.some(a => a.status === 'completed') ? 'completed'
-           : execArtifacts.length > 0 ? 'in_progress'
-           : 'pending'
-    phaseList.push({ phase: phaseNum, title: "Phase " + phaseNum, status })
-ELSE:
-  // Legacy: load from phases/ directory
-  for (phaseNum of milestonePhases):
-    Glob: .workflow/phases/{NN}-*/index.json where NN matches phaseNum
-    Read index.json → phaseIndex
-    phaseList.push(phaseIndex)
+
+// Derive phase status from artifact registry
+for (phaseNum of milestonePhases):
+  execArtifacts = artifacts.filter(a => a.type === 'execute' && a.phase === phaseNum)
+  status = execArtifacts.some(a => a.status === 'completed') ? 'completed'
+         : execArtifacts.length > 0 ? 'in_progress'
+         : 'pending'
+  phaseList.push({ phase: phaseNum, title: "Phase " + phaseNum, status })
 
 // Validate: milestone should have at least one non-completed phase
 nonCompleted = phaseList.filter(p => p.status !== "completed")
@@ -198,63 +190,35 @@ IF directory_exists(".workflow/specs"):
 // 6e: Copy milestone artifacts to worktree
 ownedPhaseNumbers = milestonePhases.slice()  // all phases in this milestone
 
-IF useArtifactRegistry:
-  // Copy scratch dirs for this milestone's artifacts
-  milestoneArtifacts = artifacts.filter(a =>
-    a.milestone === milestoneName && a.path
-  )
-  for (art of milestoneArtifacts):
-    IF directory_exists(".workflow/" + art.path):
-      Copy .workflow/{art.path}/ → {wtPath}/.workflow/{art.path}/
-ELSE:
-  // Legacy: copy phase directories
-  Bash("mkdir -p {wtPath}/.workflow/phases")
-  for (p of phaseList):
-    NN = String(p.phase).padStart(2, '0')
-    Copy .workflow/phases/{NN}-{p.slug}/ → {wtPath}/.workflow/phases/{NN}-{p.slug}/
+// Copy scratch dirs for this milestone's artifacts
+milestoneArtifacts = artifacts.filter(a =>
+  a.milestone === milestoneName && a.path
+)
+for (art of milestoneArtifacts):
+  IF directory_exists(".workflow/" + art.path):
+    Copy .workflow/{art.path}/ → {wtPath}/.workflow/{art.path}/
 
 // 6f: Copy dependency artifacts (phases outside this milestone)
-IF useArtifactRegistry:
-  // Collect dependency phases from roadmap milestone entry
-  // (cross-milestone dependencies are defined in milestoneEntry.depends_on or roadmap)
-  depPhases = new Set()
-  IF milestoneEntry.depends_on:
-    for (dep of milestoneEntry.depends_on):
-      IF NOT ownedPhaseNumbers.includes(dep):
-        depPhases.add(dep)
-  // Copy dependency artifacts from main
-  for (dep of depPhases):
-    depArtifacts = artifacts.filter(a => a.phase === dep && a.path)
-    for (art of depArtifacts):
-      IF directory_exists(".workflow/" + art.path):
-        Copy .workflow/{art.path}/ → {wtPath}/.workflow/{art.path}/
-ELSE:
-  // Legacy: copy completed dependency phase dirs
-  allDeps = new Set()
-  for (p of phaseList):
-    IF p.depends_on:
-      for (dep of p.depends_on):
-        IF NOT ownedPhaseNumbers.includes(dep):
-          allDeps.add(dep)
-  for (dep of allDeps):
-    depNN = String(dep).padStart(2, '0')
-    Glob: .workflow/phases/{depNN}-*/index.json
-    Read → depIndex
-    Copy .workflow/phases/{depNN}-{depIndex.slug}/ → {wtPath}/.workflow/phases/{depNN}-{depIndex.slug}/
+// Collect dependency phases from roadmap milestone entry
+// (cross-milestone dependencies are defined in milestoneEntry.depends_on or roadmap)
+depPhases = new Set()
+IF milestoneEntry.depends_on:
+  for (dep of milestoneEntry.depends_on):
+    IF NOT ownedPhaseNumbers.includes(dep):
+      depPhases.add(dep)
+// Copy dependency artifacts from main
+for (dep of depPhases):
+  depArtifacts = artifacts.filter(a => a.phase === dep && a.path)
+  for (art of depArtifacts):
+    IF directory_exists(".workflow/" + art.path):
+      Copy .workflow/{art.path}/ → {wtPath}/.workflow/{art.path}/
 
 // 6g: Build phase_dependencies map for worktree-scope
 phaseDeps = {}
-IF useArtifactRegistry:
-  IF milestoneEntry.depends_on:
-    for (phaseNum of ownedPhaseNumbers):
-      phaseDeps[String(phaseNum)] = milestoneEntry.depends_on
-        .filter(d => !ownedPhaseNumbers.includes(d))
-ELSE:
-  for (p of phaseList):
-    IF p.depends_on:
-      externalDeps = p.depends_on.filter(d => !ownedPhaseNumbers.includes(d))
-      IF externalDeps.length > 0:
-        phaseDeps[String(p.phase)] = externalDeps
+IF milestoneEntry.depends_on:
+  for (phaseNum of ownedPhaseNumbers):
+    phaseDeps[String(phaseNum)] = milestoneEntry.depends_on
+      .filter(d => !ownedPhaseNumbers.includes(d))
 
 // 6h: Write worktree-scope.json
 Write {wtPath}/.workflow/worktree-scope.json:
@@ -275,12 +239,9 @@ Read .workflow/state.json → mainState
 firstPending = phaseList.find(p => p.status !== "completed")
 scopedState = {
   ...mainState,
-  current_phase: firstPending?.phase ?? phaseList[0].phase,
   current_milestone: milestoneName,
   // Carry over milestone-scoped artifacts to worktree
-  artifacts: useArtifactRegistry
-    ? artifacts.filter(a => a.milestone === milestoneName || ownedPhaseNumbers.includes(a.phase))
-    : []
+  artifacts: artifacts.filter(a => a.milestone === milestoneName || ownedPhaseNumbers.includes(a.phase))
 }
 Write {wtPath}/.workflow/state.json: scopedState
 ```
@@ -320,19 +281,9 @@ registry.fork_sessions.push({
 Write .workflow/worktrees.json: registry
 
 // Mark milestone phases as "forked"
-IF useArtifactRegistry:
-  // In artifact registry model, worktrees.json tracks forked state.
-  // No per-phase marking needed — the registry entry signals ownership.
-  // (worktrees.json already updated above with owned_phases)
-ELSE:
-  // Legacy: mark phase index.json as forked
-  for (p of phaseList):
-    IF p.status !== "completed":
-      NN = String(p.phase).padStart(2, '0')
-      Read .workflow/phases/{NN}-{p.slug}/index.json → idx
-      idx.status = "forked"
-      idx.updated_at = getUtc8ISOString()
-      Write .workflow/phases/{NN}-{p.slug}/index.json: idx
+// In artifact registry model, worktrees.json tracks forked state.
+// No per-phase marking needed — the registry entry signals ownership.
+// (worktrees.json already updated above with owned_phases)
 
 mainState.last_updated = getUtc8ISOString()
 Write .workflow/state.json: mainState

package/workflows/init.md

@@ -88,7 +88,7 @@ CHECK .workflow/state.json exists?
 
 5. **Create project files:**
    - `.workflow/project.md` from @templates/project.md + user answers (include Core Value, Requirements, Key Decisions)
-   - `.workflow/state.json` from template (status: "idle", current_phase: null)
+   - `.workflow/state.json` from template (status: "idle")
    - `.workflow/config.json` already created in step 2
 
 ### Path B: Brownfield (has code, no .workflow/)
@@ -119,14 +119,12 @@ If `.workflow/specs/` does not exist:
 1. Create `.workflow/specs/` directory
 2. Auto-trigger `/workflow:specs-setup` — **MUST follow `specs-setup.md` templates exactly**:
    - Scan codebase for conventions
-   - Generate `project-tech.json`
    - Generate `specs/coding-conventions.md`
    - Generate `specs/architecture-constraints.md`
    - Generate `specs/quality-rules.md`
    - Generate `specs/debug-notes.md`
    - Generate `specs/test-conventions.md`
    - Generate `specs/review-standards.md`
-   - Generate `specs/validation-rules.md`
    - Create empty `specs/learnings.md`
 
 
@@ -143,7 +141,6 @@ Verify all required directories and files exist:
   config.json        ✓
   specs/             ✓
   research/          ✓ (if research enabled)
-  phases/            ✓ (create empty)
   scratch/           ✓ (create empty)
   milestones/        ✓ (create empty)
   codebase/          ✓ (create empty)

package/workflows/integration-test.md

@@ -15,7 +15,7 @@ L0-L3 progressive layers: Static Analysis -> Unit -> Integration -> E2E
 | Input | Result |
 |-------|--------|
 | No arguments | Error E001 |
-| Phase number | Resolve phase dir (artifact registry or legacy `.workflow/phases/{NN}-{slug}/`) |
+| Phase number | Resolve phase dir from artifact registry |
 | `--max-iter N` | Set MAX_ITER = N (default 5) |
 | `--layer L2` | Start from L2 layer |
 
@@ -23,12 +23,11 @@ L0-L3 progressive layers: Static Analysis -> Unit -> Integration -> E2E
 ```
 Read .workflow/state.json → state
 artifacts = state.artifacts ?? []
-IF artifacts.length > 0:
-  art = artifacts.find(a => a.type === 'execute' && a.phase === phaseNum)
+art = artifacts.find(a => a.type === 'execute' && a.phase === phaseNum)
+IF art:
   PHASE_DIR = ".workflow/" + art.path
 ELSE:
-  Glob: .workflow/phases/{NN}-*/
-  PHASE_DIR = resolved path
+  ERROR "Phase {phaseNum} not found in artifact registry"
 ```
 
 Check for existing integration test session:

package/workflows/issue.md

@@ -180,11 +180,8 @@ Cross-milestone conflict check (for supplement issues):
    b. Identify phases belonging to OTHER milestones (not milestone_ref)
    c. For each other-milestone phase, resolve phase dir and check if plan.json exists:
       Read .workflow/state.json → state; artifacts = state.artifacts ?? []
-      IF artifacts.length > 0:
-        art = artifacts.find(a => a.type === 'plan' && a.phase === phaseNum)
-        IF art: Read .workflow/{art.path}/plan.json (if exists)
-      ELSE:
-        Read .workflow/phases/{NN}-{slug}/plan.json (if exists)
+      art = artifacts.find(a => a.type === 'plan' && a.phase === phaseNum)
+      IF art: Read .workflow/{art.path}/plan.json (if exists)
       Collect files_to_create[] as planned_files
    d. IF affected_components in the new issue overlap with planned_files:
       WARNING: "Conflict detected: this supplement issue affects components planned in milestone {other_milestone}"
@@ -456,10 +453,7 @@ Process bidirectional link:
 2. Locate task file:
    - Read .workflow/state.json → state
    - artifacts = state.artifacts ?? []
-   - IF artifacts.length > 0:
-       Search .workflow/scratch/*/.task/{TASK_ID}.json (artifact registry scratch paths)
-     ELSE:
-       Search .workflow/phases/*/.task/{TASK_ID}.json (legacy)
+   - Search artifact registry paths: .workflow/{artifact.path}/.task/{TASK_ID}.json
    - Also search .workflow/scratch/*/.task/{TASK_ID}.json (standalone scratch tasks)
    - If still not found → error: "Task {TASK_ID} not found"
 

package/workflows/learn.md

@@ -4,7 +4,7 @@ Atomic insight capture, search, and retrieval. Lightweight gstack-style "eureka
 
 Storage:
 - `.workflow/learning/lessons.jsonl` — append-only JSONL row per insight (shared with retrospective output)
-- `.workflow/learning/learning-index.json` — searchable index (mirrors `memory-index.json` schema)
+- `.workflow/learning/learning-index.json` — searchable index (searchable index)
 
 This workflow does NOT spawn agents or call CLI tools. It is a thin file operation: parse → infer → append → confirm.
 
@@ -83,17 +83,21 @@ phase_slug = null
 
 IF .workflow/state.json exists:
   state = read JSON
-  IF state.current_phase is not null:
-    phase = state.current_phase
+  artifacts = state.artifacts ?? []
+
+  # Derive current phase from artifacts (first phase with in_progress, or first without completed execute)
+  phase = null
+  inProgressArt = artifacts.find(a => a.type === 'execute' && a.status === 'in_progress')
+  IF inProgressArt:
+    phase = inProgressArt.phase
+  ELSE:
+    phaseNums = [...new Set(artifacts.map(a => a.phase).filter(Boolean))].sort()
+    phase = phaseNums.find(p => !artifacts.some(a => a.phase === p && a.type === 'execute' && a.status === 'completed'))
 
-    # Resolve slug — artifact registry first, fallback to legacy phases/
-    artifacts = state.artifacts ?? []
-    IF artifacts.length > 0:
-      art = artifacts.find(a => a.phase === phase)
-      phase_slug = art?.slug ?? "phase-" + phase
-    ELSE:
-      Glob ".workflow/phases/{NN}-*/" where NN == phase
-      phase_slug = matched directory basename (e.g. "01-auth")
+  IF phase is not null:
+    # Resolve slug from artifact registry
+    art = artifacts.find(a => a.phase === phase)
+    phase_slug = art?.slug ?? "phase-" + phase
 ```
 
 If `--phase 0` is passed, force `phase = null, phase_slug = null` regardless.
@@ -304,15 +308,12 @@ IF row is null → error E004: "Insight {target_id} not found"
 ```
 phase_context = null
 IF row.phase_slug is not null:
-  // Resolve phase dir — artifact registry first, fallback to legacy phases/
+  // Resolve phase dir from artifact registry
   Read .workflow/state.json → state
   artifacts = state.artifacts ?? []
   phase_dir = null
-  IF artifacts.length > 0:
-    art = artifacts.find(a => a.phase === row.phase && a.path)
-    IF art: phase_dir = ".workflow/" + art.path
-  ELSE:
-    phase_dir = ".workflow/phases/" + row.phase_slug
+  art = artifacts.find(a => a.phase === row.phase && a.path)
+  IF art: phase_dir = ".workflow/" + art.path
 
   IF phase_dir AND directory exists:
     phase_context = {
@@ -382,7 +383,7 @@ PHASE CONTEXT:
 | E002 | error | Unknown `--category` (allowed: pattern, antipattern, decision, tool, gotcha, technique) |
 | E003 | error | `show` mode requires an INS-id argument |
 | E004 | error | Insight id not found in lessons.jsonl |
-| W001 | warning | Auto-phase detection found a current_phase but no matching directory; phase set to null |
+| W001 | warning | Auto-phase detection found no matching artifact in registry; phase set to null |
 | W002 | warning | learning-index.json out of sync with lessons.jsonl (different row count); offer to rebuild |
 
 ---
@@ -392,7 +393,7 @@ PHASE CONTEXT:
 - [ ] Mode correctly routed (capture / list / search / show)
 - [ ] Capture mode: `lessons.jsonl` row appended, valid JSON, all required fields present
 - [ ] Capture mode: `learning-index.json` updated with matching entry
-- [ ] Capture mode: phase auto-link resolves correctly when state.json has current_phase
+- [ ] Capture mode: phase auto-link resolves correctly from artifact registry
 - [ ] Capture mode: category inference produces a sensible default when --category absent
 - [ ] List mode: filters apply; output sorted newest-first
 - [ ] Search mode: results ranked by title > tags > summary match

package/workflows/maestro-coordinate.codex.md

@@ -22,7 +22,7 @@ const intent = args
 ```
 
 **If resumeMode:**
-1. Find latest `state.json` in `.workflow/.maestro-coordinate/`
+1. Find latest `status.json` in `.workflow/.maestro-coordinate/`
 2. Load state → set `current_step` to first non-completed step
 3. Jump to **Step 6**
 
@@ -305,11 +305,11 @@ const state = {
   gemini_session_id: null,
   step_analyses: [],
   steps: chain.map((s, i) => ({
-    index: i, cmd: s.cmd, args: s.args || '',
+    index: i, skill: s.cmd, args: s.args || '',
     status: 'pending', exec_id: null, analysis: null
   }))
 };
-Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
+Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
 
 const context = { resolved_phase: resolvedPhase, user_intent: intent, issue_id: resolvedIssueId, spec_session_id: null };
 ```
@@ -385,7 +385,7 @@ const prompt = template
 ```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));
+Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
 
 Bash({
   command: `codex delegate ${escapeForShell(prompt)} --to ${state.tool} --mode write`,
@@ -429,7 +429,7 @@ if (!failed) {
 
 // Save output for analysis
 Write(`${sessionDir}/step-${stepIdx + 1}-output.txt`, output);
-Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
+Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
 
 // → Step 7b: Gemini analysis (skip if step failed/skipped or single-step chain)
 if (step.status === 'completed' && state.steps.length > 1) {
@@ -437,7 +437,7 @@ if (step.status === 'completed' && state.steps.length > 1) {
 } else {
   // Skip analysis, advance directly
   state.current_step = stepIdx + 1;
-  Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
+  Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
   if (state.current_step < state.steps.length) { /* → Step 6 */ }
   else { /* → Step 8 */ }
 }
@@ -511,7 +511,7 @@ Write(`${sessionDir}/step-${stepIdx + 1}-analysis.json`, JSON.stringify(analysis
 
 // Advance
 state.current_step = stepIdx + 1;
-Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
+Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
 
 if (state.current_step < state.steps.length) {
   // → Back to Step 6
@@ -528,7 +528,7 @@ if (state.current_step < state.steps.length) {
 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));
+Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
 ```
 
 ```
@@ -560,7 +560,7 @@ Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
 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
+9. **Resumable** — `-c` reads `status.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

package/workflows/maestro-coordinate.md

@@ -20,7 +20,7 @@ const intent = args
 ```
 
 **If resumeMode:**
-1. Find latest `state.json` in `.workflow/.maestro-coordinate/`
+1. Find latest `status.json` in `.workflow/.maestro-coordinate/`
 2. Load state → set `current_step` to first non-completed step
 3. Jump to **Step 6**
 
@@ -321,11 +321,11 @@ const state = {
   gemini_session_id: null,
   step_analyses: [],
   steps: chain.map((s, i) => ({
-    index: i, cmd: s.cmd, args: s.args || '',
+    index: i, skill: s.cmd, args: s.args || '',
     status: 'pending', exec_id: null, analysis: null
   }))
 };
-Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
+Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
 
 const context = { resolved_phase: resolvedPhase, user_intent: intent, issue_id: resolvedIssueId, spec_session_id: null };
 ```
@@ -401,7 +401,7 @@ const prompt = template
 ```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));
+Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
 
 Bash({
   command: `maestro delegate ${escapeForShell(prompt)} --to ${state.tool} --mode write`,
@@ -445,7 +445,7 @@ if (!failed) {
 
 // Save output for analysis
 Write(`${sessionDir}/step-${stepIdx + 1}-output.txt`, output);
-Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
+Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
 
 // → Step 7b: Gemini analysis (skip if step failed/skipped or single-step chain)
 if (step.status === 'completed' && state.steps.length > 1) {
@@ -453,7 +453,7 @@ if (step.status === 'completed' && state.steps.length > 1) {
 } else {
   // Skip analysis, advance directly
   state.current_step = stepIdx + 1;
-  Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
+  Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
   if (state.current_step < state.steps.length) { /* → Step 6 */ }
   else { /* → Step 8 */ }
 }
@@ -527,7 +527,7 @@ Write(`${sessionDir}/step-${stepIdx + 1}-analysis.json`, JSON.stringify(analysis
 
 // Advance
 state.current_step = stepIdx + 1;
-Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
+Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
 
 if (state.current_step < state.steps.length) {
   // → Back to Step 6
@@ -544,7 +544,7 @@ if (state.current_step < state.steps.length) {
 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));
+Write(`${sessionDir}/status.json`, JSON.stringify(state, null, 2));
 ```
 
 ```
@@ -576,7 +576,7 @@ Write(`${sessionDir}/state.json`, JSON.stringify(state, null, 2));
 6. **Quality gates** — issue chains auto-include review; `issue-full` is default for issue execution
 7. **Tool fallback** — if `maestro 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
+9. **Resumable** — `-c` reads `status.json`, jumps to first pending step
 10. **Gemini analysis after each step** — evaluate output quality via `maestro 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

package/workflows/maestro.codex.md

@@ -37,7 +37,14 @@ if (fileExists(stateFile)) {
   const raw = JSON.parse(Read(stateFile));
   projectState = {
     initialized: true,
-    current_phase: raw.current_phase,
+    // Derive current_phase from artifacts (first in_progress execute, or first without completed execute)
+    current_phase: (() => {
+      const arts = raw.artifacts ?? [];
+      const ip = arts.find(a => a.type === 'execute' && a.status === 'in_progress');
+      if (ip) return ip.phase;
+      const phases = [...new Set(arts.map(a => a.phase).filter(Boolean))].sort((a,b) => a - b);
+      return phases.find(p => !arts.some(a => a.phase === p && a.type === 'execute' && a.status === 'completed')) ?? raw.current_phase ?? null;
+    })(),
     phase_slug: raw.phase_slug,
     phase_status: raw.phase_status,   // pending|exploring|planning|executing|verifying|testing|completed|blocked
     phase_artifacts: raw.phase_artifacts ?? {},

package/workflows/maestro.md

@@ -661,8 +661,17 @@ function resolvePhase(intent_analysis, project_state) {
   const phaseMatch = intent.match(/phase\s*(\d+)|^(\d+)$/);
   if (phaseMatch) return phaseMatch[1] || phaseMatch[2];
 
-  // 3. From project state
-  if (project_state.initialized) return project_state.current_phase;
+  // 3. From project state — derive from artifacts
+  if (project_state.initialized) {
+    // Derive current phase: first phase with in_progress execute, or first without completed execute
+    const arts = project_state.artifacts ?? [];
+    const inProgress = arts.find(a => a.type === 'execute' && a.status === 'in_progress');
+    if (inProgress) return inProgress.phase;
+    const phases = [...new Set(arts.map(a => a.phase).filter(Boolean))].sort((a,b) => a - b);
+    const current = phases.find(p => !arts.some(a => a.phase === p && a.type === 'execute' && a.status === 'completed'));
+    if (current) return current;
+    return project_state.latest_artifact?.phase ?? null;
+  }
 
   // 4. Scratch mode chains use {scratch_dir} instead of {phase}
   if (chainName === 'analyze-plan-execute') return null;
@@ -751,8 +760,8 @@ mkdir -p "${SESSION_DIR}"
   "intent": "{original_intent}",
   "task_type": "{task_type}",
   "chain_name": "{chain_name}",
-  "phase": "{resolved_phase}",
-  "auto_mode": "{autoYes}",
+  "phase": {resolved_phase},
+  "auto_mode": {autoYes},
   "steps": [
     {
       "index": 0,
@@ -775,7 +784,7 @@ mkdir -p "${SESSION_DIR}"
 **Initialize execution context:**
 ```javascript
 const context = {
-  current_phase: resolvedPhase,
+  current_phase: resolvedPhase,  // derived from artifacts
   user_intent: intent,
   issue_id: resolvedIssueId,
   spec_session_id: null,