orchestrix-yuri 4.1.5 → 4.1.7

package/lib/gateway/engine/phase-orchestrator.js

@@ -596,7 +596,7 @@ class PhaseOrchestrator {
    */
   _gatherDevProgress() {
     const result = {
-      totalEpics: 0, doneEpics: 0,
+      totalEpics: 0, currentEpic: 0,
       totalStories: 0, doneStories: 0,
       byStatus: {},
       currentAgent: null, currentWindow: null, currentStory: null,
@@ -613,12 +613,16 @@ class PhaseOrchestrator {
 
         if (output && output !== 'NO_STORIES_DIR') {
           for (const line of output.split('\n')) {
-            const [status, countStr] = line.split(':');
+            const [key, countStr] = line.split(':');
             const count = parseInt(countStr, 10) || 0;
-            if (status && count > 0) {
-              result.byStatus[status] = count;
+            if (key === 'Epics') {
+              result.totalEpics = count;
+            } else if (key === 'CurrentEpic') {
+              result.currentEpic = count;
+            } else if (key && count > 0) {
+              result.byStatus[key] = count;
               result.totalStories += count;
-              if (status === 'Done') result.doneStories += count;
+              if (key === 'Done') result.doneStories += count;
             }
           }
         }
@@ -641,16 +645,17 @@ class PhaseOrchestrator {
       }
     }
 
-    // Count epics from docs/stories/ directory
-    const storiesDir = path.join(this._projectRoot, 'docs', 'stories');
-    if (fs.existsSync(storiesDir)) {
-      try {
-        const entries = fs.readdirSync(storiesDir);
-        const epicDirs = entries.filter((e) => {
-          return fs.statSync(path.join(storiesDir, e)).isDirectory() && e.startsWith('epic');
-        });
-        result.totalEpics = epicDirs.length || result.totalEpics;
-      } catch { /* ok */ }
+    // Count epics from docs/prd/ (epic YAML/MD files) as fallback
+    if (result.totalEpics === 0) {
+      const prdDir = path.join(this._projectRoot, 'docs', 'prd');
+      if (fs.existsSync(prdDir)) {
+        try {
+          const epicNums = fs.readdirSync(prdDir)
+            .map((f) => { const m = f.match(/^epic-(\d+)/i); return m ? parseInt(m[1], 10) : 0; })
+            .filter((n) => n > 0);
+          result.totalEpics = epicNums.length > 0 ? Math.max(...epicNums) : 0;
+        } catch { /* ok */ }
+      }
     }
 
     // Detect current active agent from tmux panes
@@ -690,7 +695,7 @@ class PhaseOrchestrator {
     ];
 
     if (p.totalEpics > 0) {
-      lines.push(`Epic: ${p.doneEpics}/${p.totalEpics}`);
+      lines.push(`Epic: ${p.currentEpic}/${p.totalEpics}`);
     }
     lines.push(`Story: ${p.doneStories}/${p.totalStories} (${pct}%)`);
     lines.push(`${bar}`);

package/lib/gateway/router.js

@@ -570,17 +570,22 @@ class Router {
     let byStatus = {};
     let totalStories = 0;
     let doneStories = 0;
+    let currentEpic = 0;
     const scriptPath = path.join(os.homedir(), '.claude', 'skills', 'yuri', 'scripts', 'scan-stories.sh');
     if (fs.existsSync(scriptPath)) {
       const output = execSync(`bash "${scriptPath}" "${projectRoot}"`, { encoding: 'utf8', timeout: 10000 }).trim();
       if (output && output !== 'NO_STORIES_DIR') {
         for (const line of output.split('\n')) {
-          const [status, cnt] = line.split(':');
+          const [key, cnt] = line.split(':');
           const n = parseInt(cnt, 10) || 0;
-          if (n > 0) {
-            byStatus[status] = n;
+          if (key === 'Epics') {
+            totalEpics = n;
+          } else if (key === 'CurrentEpic') {
+            currentEpic = n;
+          } else if (n > 0) {
+            byStatus[key] = n;
             totalStories += n;
-            if (status === 'Done') doneStories += n;
+            if (key === 'Done') doneStories += n;
           }
         }
       }
@@ -617,15 +622,17 @@ class Router {
       }
     }
 
-    // 4. Count epics
-    let totalEpics = 0;
-    const storiesDir = path.join(projectRoot, 'docs', 'stories');
-    if (fs.existsSync(storiesDir)) {
-      try {
-        totalEpics = fs.readdirSync(storiesDir).filter((e) =>
-          fs.statSync(path.join(storiesDir, e)).isDirectory() && /epic/i.test(e)
-        ).length;
-      } catch { /* ok */ }
+    // 4. Count epics from docs/prd/ (epic YAML files)
+    if (totalEpics === 0) {
+      const prdDir = path.join(projectRoot, 'docs', 'prd');
+      if (fs.existsSync(prdDir)) {
+        try {
+          const epicNums = fs.readdirSync(prdDir)
+              .map((f) => { const m = f.match(/^epic-(\d+)/i); return m ? parseInt(m[1], 10) : 0; })
+              .filter((n) => n > 0);
+            totalEpics = epicNums.length > 0 ? Math.max(...epicNums) : 0;
+        } catch { /* ok */ }
+      }
     }
 
     // 5. Running time
@@ -641,7 +648,9 @@ class Router {
     const bar = '▓'.repeat(filled) + '░'.repeat(barLen - filled);
 
     const lines = ['📊 **Dev Progress Report**', '━━━━━━━━━━━━━━━━━━━━━'];
-    if (totalEpics > 0) lines.push(`Epic: ${totalEpics}`);
+    if (totalEpics > 0) {
+      lines.push(`Epic: ${currentEpic}/${totalEpics}`);
+    }
     lines.push(`Story: ${doneStories}/${totalStories} (${pct}%)`);
     lines.push(`${bar} ${pct}%`);
     lines.push('━━━━━━━━━━━━━━━━━━━━━');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchestrix-yuri",
-  "version": "4.1.5",
+  "version": "4.1.7",
   "description": "Yuri — Meta-Orchestrator for Orchestrix. Drive your entire project lifecycle with natural language.",
   "main": "lib/installer.js",
   "bin": {

package/skill/scripts/scan-stories.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 # Yuri Story Status Scanner
 # Usage: scan-stories.sh <project_root>
+#
+# Supports two status formats in story files:
+#   Format A: "Status: Done" (inline)
+#   Format B: "## Status\n\nDone" (heading + next non-empty line)
+#
+# Also outputs epic count based on filename prefix (e.g., 1.x, 2.x)
 set +e
 
 STORIES_DIR="$1/docs/stories"
@@ -10,7 +16,37 @@ if [ ! -d "$STORIES_DIR" ]; then
   exit 1
 fi
 
+# Scan each story file for status
 for status in Done InProgress Review Blocked Approved AwaitingArchReview RequiresRevision Escalated; do
-  count=$(grep -rl "Status:.*$status" "$STORIES_DIR" 2>/dev/null | wc -l | tr -d ' ')
+  count=0
+  for f in "$STORIES_DIR"/*.md "$STORIES_DIR"/*.yaml; do
+    [ -f "$f" ] || continue
+    # Format A: "Status: Done" or "Status:Done"
+    if grep -qi "Status:[[:space:]]*$status" "$f" 2>/dev/null; then
+      count=$((count + 1))
+      continue
+    fi
+    # Format B: "## Status" heading, then status on a subsequent non-empty line
+    if grep -q "## Status" "$f" 2>/dev/null; then
+      # Extract the first non-empty line after "## Status"
+      extracted=$(awk '/^## Status/{found=1; next} found && /^[[:space:]]*$/{next} found{print; exit}' "$f" 2>/dev/null)
+      if echo "$extracted" | grep -qi "^$status$" 2>/dev/null; then
+        count=$((count + 1))
+      fi
+    fi
+  done
   echo "$status:$count"
 done
+
+# Count total epics from docs/prd/epic-N-*.yaml (max N = total epics)
+PRD_DIR="$1/docs/prd"
+if [ -d "$PRD_DIR" ]; then
+  epics=$(ls "$PRD_DIR" 2>/dev/null | grep -oE '^epic-[0-9]+' | grep -oE '[0-9]+' | sort -n | tail -1)
+  echo "Epics:${epics:-0}"
+else
+  echo "Epics:0"
+fi
+
+# Current epic (max prefix from story files)
+current_epic=$(ls "$STORIES_DIR" 2>/dev/null | grep -oE '^[0-9]+' | sort -n | tail -1)
+echo "CurrentEpic:${current_epic:-0}"