orchestrix-yuri 4.8.5 → 4.8.7

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

@@ -679,10 +679,17 @@ class PhaseOrchestrator {
       this._lastActiveAgent = progress.currentAgent;
     }
 
-    // Check if all stories done
+    // Check if all stories done — but ONLY if no agent is actively working.
+    // If an agent is busy (e.g., SM drafting new stories), story counts are stale.
     if (progress.totalStories > 0 && progress.doneStories >= progress.totalStories) {
-      this._completeDev();
-      return;
+      if (progress.currentAgent) {
+        // Agent still working — stories may be in flux (new ones being created)
+        log.engine(`All ${progress.doneStories}/${progress.totalStories} stories done but ${progress.currentAgent} is still active — waiting`);
+      } else {
+        // No active agent + all stories done → truly complete
+        this._completeDev();
+        return;
+      }
     }
 
     // Periodic progress report
@@ -841,10 +848,10 @@ class PhaseOrchestrator {
   }
 
   _progressBar(pct) {
+    const clamped = Math.min(100, Math.max(0, pct));
     const total = 20;
-    const filled = Math.round(pct / 100 * total);
-    const empty = total - filled;
-    return '▓'.repeat(filled) + '░'.repeat(empty) + ` ${pct}%`;
+    const filled = Math.min(total, Math.round(clamped / 100 * total));
+    return '▓'.repeat(filled) + '░'.repeat(total - filled) + ` ${clamped}%`;
   }
 
   _formatDuration(ms) {

package/lib/gateway/router.js

@@ -38,7 +38,7 @@ const META_COMMANDS = {
 // All natural language ("怎么样了", "进度如何") goes through dispatcher
 // so Claude's understanding ability decides the routing.
 const STATUS_PATTERNS = [
-  /^\*status\b/i,
+  /^[*/]status\b/i,
 ];
 
 /**
@@ -652,10 +652,24 @@ Reply with ONLY one word: small, medium, or large. Nothing else.`;
         try {
           const focus = yaml.load(fs.readFileSync(focusPath, 'utf8')) || {};
 
-          const phaseNum = parseInt(focus.phase, 10);
+          // Always check for live dev session first — it's the ground truth.
+          // focus.yaml may be stale (e.g., still says phase 4 after dev restarted).
+          let hasLiveDevSession = false;
+          try {
+            const { execSync } = require('child_process');
+            const sessions = execSync('tmux list-sessions -F "#{session_name}" 2>/dev/null', { encoding: 'utf8' }).trim();
+            const projectName = path.basename(projectRoot).toLowerCase();
+            const devSession = sessions.split('\n').find((s) =>
+              s.startsWith('orchestrix-') && s.toLowerCase().includes(projectName)
+            ) || sessions.split('\n').find((s) => s.startsWith('orchestrix-'));
+            if (devSession) {
+              const tmx = require('./engine/tmux-utils');
+              hasLiveDevSession = tmx.hasSession(devSession);
+            }
+          } catch { /* no tmux */ }
 
-          // Dev phase: generate progress card (no phase3.yaml dependency)
-          if (phaseNum === 3) {
+          // If live dev session exists, show dev progress card regardless of focus.yaml phase
+          if (hasLiveDevSession) {
             try {
               const card = this._buildStatusCard(projectRoot, focus);
               if (card) parts.push(card);
@@ -664,8 +678,10 @@ Reply with ONLY one word: small, medium, or large. Nothing else.`;
             }
           }
 
-          // Test phase: generate test progress card from phase4.yaml
-          if (phaseNum === 4 && parts.length === 0) {
+          const phaseNum = parseInt(focus.phase, 10);
+
+          // Test phase: only show if no live dev session and no card yet
+          if (phaseNum === 4 && parts.length === 0 && !hasLiveDevSession) {
             try {
               const card = this._buildTestStatusCard(projectRoot);
               if (card) parts.push(card);
@@ -1060,9 +1076,9 @@ Reply with ONLY one word: small, medium, or large. Nothing else.`;
 
     // 6. Build card
     const total = totalPlanned || createdStories; // prefer planned, fallback to created
-    const pct = total > 0 ? Math.round(doneStories / total * 100) : 0;
+    const pct = total > 0 ? Math.min(100, Math.round(doneStories / total * 100)) : 0;
     const barLen = 20;
-    const filled = Math.round(pct / 100 * barLen);
+    const filled = Math.min(barLen, Math.round(pct / 100 * barLen));
     const bar = '▓'.repeat(filled) + '░'.repeat(barLen - filled);
 
     const lines = ['📊 **Dev Progress Report**', '━━━━━━━━━━━━━━━━━━━━━'];
@@ -1111,10 +1127,10 @@ Reply with ONLY one word: small, medium, or large. Nothing else.`;
     const passed = state.epics.filter((e) => e.status === 'passed').length;
     const failed = state.epics.filter((e) => e.status === 'failed').length;
     const tested = passed + failed;
-    const pct = total > 0 ? Math.round((tested / total) * 100) : 0;
+    const pct = total > 0 ? Math.min(100, Math.round((tested / total) * 100)) : 0;
 
     const barTotal = 20;
-    const filled = Math.round(pct / 100 * barTotal);
+    const filled = Math.min(barTotal, Math.round(pct / 100 * barTotal));
     const bar = '▓'.repeat(filled) + '░'.repeat(barTotal - filled) + ` ${pct}%`;
 
     const lines = [

package/package.json

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