orchestrix-yuri 4.1.9 → 4.2.1

package/lib/gateway/router.js

@@ -568,7 +568,8 @@ class Router {
 
     // 1. Scan stories via scan-stories.sh
     let byStatus = {};
-    let totalStories = 0;
+    let totalPlanned = 0;   // total stories defined in epic YAMLs
+    let createdStories = 0; // stories with files in docs/stories/
     let doneStories = 0;
     let totalEpics = 0;
     let currentEpic = 0;
@@ -581,30 +582,21 @@ class Router {
           const colonIdx = line.indexOf(':');
           if (colonIdx < 0) continue;
           const key = line.slice(0, colonIdx);
-          const val = line.slice(colonIdx + 1);
-
-          if (key === 'Total') {
-            totalStories = parseInt(val, 10) || 0;
-          } else if (key === 'Epics') {
-            totalEpics = parseInt(val, 10) || 0;
-          } else if (key === 'CurrentEpic') {
-            currentEpic = parseInt(val, 10) || 0;
-          } else if (key === 'CurrentStory') {
-            currentStory = val.trim();
-          } else if (key === 'StatusDone') {
-            doneStories++;
-            byStatus.Done = (byStatus.Done || 0) + 1;
-          } else if (key === 'StatusInProgress') {
-            byStatus.InProgress = (byStatus.InProgress || 0) + 1;
-          } else if (key === 'StatusReview') {
-            byStatus.Review = (byStatus.Review || 0) + 1;
-          } else if (key === 'StatusBlocked') {
-            byStatus.Blocked = (byStatus.Blocked || 0) + 1;
-          } else if (key === 'StatusApproved') {
-            byStatus.Approved = (byStatus.Approved || 0) + 1;
-          } else if (key === 'StatusOther') {
-            byStatus.Other = (byStatus.Other || 0) + 1;
-          }
+          const val = line.slice(colonIdx + 1).trim();
+
+          if (key === 'Total') totalPlanned = parseInt(val, 10) || 0;
+          else if (key === 'Created') createdStories = parseInt(val, 10) || 0;
+          else if (key === 'Epics') totalEpics = parseInt(val, 10) || 0;
+          else if (key === 'CurrentEpic') currentEpic = parseInt(val, 10) || 0;
+          else if (key === 'CurrentStory') currentStory = val || null;
+          else if (key === 'StatusDone') { doneStories++; byStatus.Done = (byStatus.Done || 0) + 1; }
+          else if (key === 'StatusInProgress') byStatus.InProgress = (byStatus.InProgress || 0) + 1;
+          else if (key === 'StatusReview') byStatus.Review = (byStatus.Review || 0) + 1;
+          else if (key === 'StatusBlocked') byStatus.Blocked = (byStatus.Blocked || 0) + 1;
+          else if (key === 'StatusApproved') byStatus.Approved = (byStatus.Approved || 0) + 1;
+          else if (key === 'StatusDraft') byStatus.Draft = (byStatus.Draft || 0) + 1;
+          else if (key === 'StatusNoStatus') byStatus.NoStatus = (byStatus.NoStatus || 0) + 1;
+          else if (key === 'StatusOther') byStatus.Other = (byStatus.Other || 0) + 1;
         }
       }
     }
@@ -627,17 +619,27 @@ class Router {
     const tmx = require('./engine/tmux-utils');
     if (devSession && tmx.hasSession(devSession)) {
       const windowNames = ['Architect', 'SM', 'Dev', 'QA'];
+      // Pass 1: find window with active spinner
       for (let w = 0; w < 4; w++) {
-        const pane = tmx.capturePane(devSession, w, 5);
-        const lines = pane.split('\n').filter((l) => l.trim());
+        const pane = tmx.capturePane(devSession, w, 10);
         if (/●|⠋|⠙|⠹|⠸|⠼|⠴|⠦|⠧|⠇|⠏/.test(pane)) {
           currentAgent = windowNames[w];
           currentWindow = w;
-          const storyMatch = pane.match(/story[_-]?\d+[\._-]\d+/i) || pane.match(/\d+\.\d+/);
-          if (storyMatch) currentStory = storyMatch[0];
           break;
         }
       }
+      // Pass 2: if no spinner, find window with most output (likely active)
+      if (!currentAgent) {
+        for (let w = 0; w < 4; w++) {
+          const pane = tmx.capturePane(devSession, w, 10);
+          const contentLines = pane.split('\n').filter((l) => l.trim() && !/^❯\s*$/.test(l));
+          if (contentLines.length > 3) {
+            currentAgent = windowNames[w];
+            currentWindow = w;
+            break;
+          }
+        }
+      }
     }
 
     // 4. Count epics from docs/prd/ (epic YAML files)
@@ -660,7 +662,8 @@ class Router {
     const elapsed = runMin < 60 ? `${runMin}min` : `${Math.floor(runMin / 60)}h ${runMin % 60}min`;
 
     // 6. Build card
-    const pct = totalStories > 0 ? Math.round(doneStories / totalStories * 100) : 0;
+    const total = totalPlanned || createdStories; // prefer planned, fallback to created
+    const pct = total > 0 ? Math.round(doneStories / total * 100) : 0;
     const barLen = 20;
     const filled = Math.round(pct / 100 * barLen);
     const bar = '▓'.repeat(filled) + '░'.repeat(barLen - filled);
@@ -669,12 +672,12 @@ class Router {
     if (totalEpics > 0) {
       lines.push(`Epic: ${currentEpic}/${totalEpics}`);
     }
-    lines.push(`Story: ${doneStories}/${totalStories} (${pct}%)`);
+    lines.push(`Story: ${doneStories}/${total} done (${pct}%) | ${createdStories} created`);
     lines.push(`${bar} ${pct}%`);
     lines.push('━━━━━━━━━━━━━━━━━━━━━');
 
     // Status breakdown
-    const icons = { Done: '✅', InProgress: '🔄', Review: '👀', Blocked: '🚫', Approved: '✅', AwaitingArchReview: '🏛️', RequiresRevision: '🔧', Escalated: '⚠️' };
+    const icons = { Done: '✅', InProgress: '🔄', Review: '👀', Blocked: '🚫', Approved: '📋', Draft: '📝', NoStatus: '❓', Other: '·' };
     const statusEntries = Object.entries(byStatus).filter(([, v]) => v > 0);
     if (statusEntries.length > 0) {
       for (const [s, n] of statusEntries) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchestrix-yuri",
-  "version": "4.1.9",
+  "version": "4.2.1",
   "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

@@ -3,55 +3,78 @@
 # Usage: scan-stories.sh <project_root>
 #
 # Outputs:
-#   {Status}:{count} for each status (Done, InProgress, etc.)
-#   Total:{N}         total story files
-#   Epics:{N}         total epics (max N from docs/prd/epic-N-*)
-#   CurrentEpic:{N}   current epic (max prefix from story filenames)
-#   CurrentStory:{id} current story being worked on
+#   Total:{N}           total planned stories (from epic YAML definitions)
+#   Created:{N}         stories with files in docs/stories/
+#   StatusDone:{id}     per-file status (one line per story file)
+#   StatusInProgress:{id}
+#   StatusApproved:{id}
+#   StatusReview:{id}
+#   StatusBlocked:{id}
+#   StatusOther:{id}
+#   Epics:{N}           total epics (max N from docs/prd/epic-N-*)
+#   CurrentEpic:{N}     current epic (max prefix from created stories)
+#   CurrentStory:{id}   current story being worked on
 set +e
 
 PROJECT_ROOT="$1"
 STORIES_DIR="$PROJECT_ROOT/docs/stories"
+PRD_DIR="$PROJECT_ROOT/docs/prd"
+
+# ── Total planned stories from epic YAML definitions ──
+# Count "- id:" entries under "stories:" in each epic YAML
+total_planned=0
+if [ -d "$PRD_DIR" ]; then
+  for yaml in "$PRD_DIR"/epic-*.yaml; do
+    [ -f "$yaml" ] || continue
+    # Count lines matching "  - id:" (story entries in the stories array)
+    n=$(grep -cE '^\s+- id:' "$yaml" 2>/dev/null || echo 0)
+    total_planned=$((total_planned + n))
+  done
+fi
+echo "Total:$total_planned"
 
+# ── Created stories (files in docs/stories/) ──
 if [ ! -d "$STORIES_DIR" ]; then
-  echo "NO_STORIES_DIR"
-  exit 1
+  echo "Created:0"
+  echo "Epics:0"
+  echo "CurrentEpic:0"
+  echo "CurrentStory:none"
+  exit 0
 fi
 
-# Count total story files
-total=$(ls "$STORIES_DIR"/*.md 2>/dev/null | wc -l | tr -d ' ')
-echo "Total:$total"
+created=$(ls "$STORIES_DIR"/*.md 2>/dev/null | wc -l | tr -d ' ')
+echo "Created:$created"
 
-# Extract status from each story file
-# Supports: "## Status\n\nDone" (heading format) and "Status: Done" (inline)
+# ── Per-file status extraction ──
 in_progress_story=""
 for f in "$STORIES_DIR"/*.md; do
   [ -f "$f" ] || continue
   fname=$(basename "$f" .md)
 
-  # Try heading format first: "## Status" then next non-empty line
+  # Try heading format: "## Status" then next non-empty line
   status=$(awk '/^## Status/{found=1; next} found && /^[[:space:]]*$/{next} found{print; exit}' "$f" 2>/dev/null)
 
   # Fallback: inline "Status: XXX"
   if [ -z "$status" ]; then
-    status=$(grep -oP 'Status:\s*\K\S+' "$f" 2>/dev/null | head -1)
+    status=$(grep -m1 -oE 'Status:\s*\S+' "$f" 2>/dev/null | sed 's/Status:\s*//')
   fi
 
-  # Normalize
-  status=$(echo "$status" | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]')
+  # Normalize to lowercase, strip whitespace
+  status_lower=$(echo "$status" | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]')
 
-  case "$status" in
-    done) echo "StatusDone:$fname" ;;
-    inprogress|in_progress|in-progress) echo "StatusInProgress:$fname"; in_progress_story="$fname" ;;
-    review|inreview) echo "StatusReview:$fname" ;;
+  case "$status_lower" in
+    done|complete|completed) echo "StatusDone:$fname" ;;
+    inprogress|in_progress|in-progress|wip) echo "StatusInProgress:$fname"; in_progress_story="$fname" ;;
+    review|inreview|in_review|underreview) echo "StatusReview:$fname" ;;
     blocked) echo "StatusBlocked:$fname" ;;
-    approved) echo "StatusApproved:$fname" ;;
-    *) echo "StatusOther:$fname" ;;
+    approved|ready) echo "StatusApproved:$fname" ;;
+    draft|new|todo|pending|open) echo "StatusDraft:$fname" ;;
+    "") echo "StatusNoStatus:$fname" ;;
+    *) echo "StatusOther:$fname:$status" ;;
   esac
 done
 
-# Count epics from docs/prd/epic-N-* (max N = total epics)
-PRD_DIR="$PROJECT_ROOT/docs/prd"
+# ── Epics: max N from docs/prd/epic-N-* ──
 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}"
@@ -59,16 +82,29 @@ else
   echo "Epics:0"
 fi
 
-# Current epic (max prefix from story filenames)
-current_epic=$(ls "$STORIES_DIR" 2>/dev/null | grep -oE '^[0-9]+' | sort -n | tail -1)
-echo "CurrentEpic:${current_epic:-0}"
-
-# Current story: InProgress one, or highest numbered
+# ── CurrentEpic + CurrentStory: based on InProgress story ──
+# Priority: InProgress story > last non-Done story > highest numbered
 if [ -n "$in_progress_story" ]; then
   echo "CurrentStory:$in_progress_story"
+  current_epic=$(echo "$in_progress_story" | grep -oE '^[0-9]+')
+  echo "CurrentEpic:${current_epic:-0}"
 else
-  latest=$(ls "$STORIES_DIR"/*.md 2>/dev/null | sort -t/ -k2 -V | tail -1)
-  if [ -n "$latest" ]; then
-    echo "CurrentStory:$(basename "$latest" .md)"
+  # Find last non-Done story (most likely being worked on next)
+  last_non_done=""
+  for f in $(ls "$STORIES_DIR"/*.md 2>/dev/null | sort -V); do
+    [ -f "$f" ] || continue
+    s=$(awk '/^## Status/{found=1; next} found && /^[[:space:]]*$/{next} found{print; exit}' "$f" 2>/dev/null)
+    s_lower=$(echo "$s" | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]')
+    if [ "$s_lower" != "done" ]; then
+      last_non_done=$(basename "$f" .md)
+    fi
+  done
+  if [ -n "$last_non_done" ]; then
+    echo "CurrentStory:$last_non_done"
+    current_epic=$(echo "$last_non_done" | grep -oE '^[0-9]+')
+    echo "CurrentEpic:${current_epic:-0}"
+  else
+    echo "CurrentStory:none"
+    echo "CurrentEpic:0"
   fi
 fi