orchestrix-yuri 4.2.0 → 4.2.2

package/lib/gateway/router.js

@@ -594,6 +594,8 @@ class Router {
           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;
         }
       }
@@ -617,17 +619,33 @@ class Router {
     const tmx = require('./engine/tmux-utils');
     if (devSession && tmx.hasSession(devSession)) {
       const windowNames = ['Architect', 'SM', 'Dev', 'QA'];
+      // Detect active agent: an agent showing the Command table or
+      // "How can I assist" is IDLE (waiting). A window WITHOUT these
+      // patterns is actively executing a task.
+      const idlePatterns = /Command.*Description|How can I assist|assist you today/i;
+
+      // Pass 1: find window with spinner (definitely working)
       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: find window that is NOT idle (no Command table)
+      if (!currentAgent) {
+        for (let w = 0; w < 4; w++) {
+          const pane = tmx.capturePane(devSession, w, 15);
+          const hasContent = pane.split('\n').filter((l) => l.trim()).length > 2;
+          if (hasContent && !idlePatterns.test(pane)) {
+            currentAgent = windowNames[w];
+            currentWindow = w;
+            break;
+          }
+        }
+      }
     }
 
     // 4. Count epics from docs/prd/ (epic YAML files)
@@ -665,7 +683,7 @@ class Router {
     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.2.0",
+  "version": "4.2.2",
   "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

@@ -63,12 +63,14 @@ for f in "$STORIES_DIR"/*.md; do
   status_lower=$(echo "$status" | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]')
 
   case "$status_lower" in
-    done) echo "StatusDone:$fname" ;;
-    inprogress|in_progress|in-progress) echo "StatusInProgress:$fname"; in_progress_story="$fname" ;;
-    review|inreview|in_review) echo "StatusReview:$fname" ;;
+    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
 
@@ -80,18 +82,29 @@ else
   echo "Epics:0"
 fi
 
-# ── CurrentEpic: 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}"
-
-# ── CurrentStory: InProgress 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 -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