orchestrix-yuri 4.7.4 → 4.7.6

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

@@ -108,6 +108,7 @@ class PhaseOrchestrator {
           this._session = phase3.tmux.session;
           this._devStartedAt = phase3.started_at ? new Date(phase3.started_at).getTime() : Date.now();
           this._lastReportTime = Date.now(); // don't send report immediately on recover
+          this._lastActiveAgent = null;
 
           const pollInterval = this.config.dev_poll_interval || 300000;
           this._timer = setInterval(() => this._pollDevSession(), pollInterval);
@@ -244,12 +245,19 @@ class PhaseOrchestrator {
 
     if (this._phase === 'iterate') {
       const ctx = this._changeContext || {};
-      return { phase: 'iterate', message: `🔄 Iteration in progress. Current: ${ctx.iteratePhase || 'starting'}` };
+      const agentLabels = { pm: 'PM generating next-steps', architect: 'Architect resolving changes' };
+      const label = agentLabels[ctx.iteratePhase] || ctx.iteratePhase || 'starting';
+      return { phase: 'iterate', message: `🔄 Iteration in progress\n📍 ${label} (${this._step + 1}/2)` };
     }
 
     if (this._phase === 'change') {
       const ctx = this._changeContext || {};
-      return { phase: 'change', message: `🔧 Change in progress (${ctx.scope || '?'}). Step ${this._step + 1}` };
+      const stepLabels = ['PO routing change', 'Architect resolving', 'SM applying proposal'];
+      const stepLabel = stepLabels[this._step] || `Step ${this._step + 1}`;
+      return {
+        phase: 'change',
+        message: `🔧 Change in progress (${ctx.scope || '?'})\n📍 ${stepLabel} (${this._step + 1}/3)`,
+      };
     }
 
     return { phase: this._phase, message: `Phase ${this._phase} is running.` };
@@ -630,6 +638,7 @@ class PhaseOrchestrator {
     this._timer = setInterval(() => this._pollDevSession(), pollInterval);
     this._devStartedAt = Date.now();
     this._lastReportTime = Date.now();
+    this._lastActiveAgent = null;
 
     const reportMin = Math.round(this._reportInterval / 60000);
     log.engine(`Dev phase started: session=${this._session}, report every ${reportMin}min`);
@@ -647,6 +656,18 @@ class PhaseOrchestrator {
     // Gather progress data
     const progress = this._gatherDevProgress();
 
+    // Detect agent handoff and notify user
+    if (progress.currentAgent && progress.currentAgent !== this._lastActiveAgent) {
+      const prev = this._lastActiveAgent;
+      this._lastActiveAgent = progress.currentAgent;
+      if (prev) {
+        const storyInfo = progress.currentStory ? ` — working on ${progress.currentStory}` : '';
+        this.onProgress(`🔄 ${prev} → **${progress.currentAgent}**${storyInfo}`);
+      }
+    } else if (progress.currentAgent) {
+      this._lastActiveAgent = progress.currentAgent;
+    }
+
     // Check if all stories done
     if (progress.totalStories > 0 && progress.doneStories >= progress.totalStories) {
       this._completeDev();
@@ -684,17 +705,26 @@ class PhaseOrchestrator {
 
         if (output && output !== 'NO_STORIES_DIR') {
           for (const line of output.split('\n')) {
-            const [key, countStr] = line.split(':');
-            const count = parseInt(countStr, 10) || 0;
-            if (key === 'Epics') {
-              result.totalEpics = count;
+            if (!line.includes(':')) continue;
+            const colonIdx = line.indexOf(':');
+            const key = line.slice(0, colonIdx);
+            const value = line.slice(colonIdx + 1);
+
+            if (key === 'Total') {
+              result.totalStories = parseInt(value, 10) || 0;
+            } else if (key === 'Epics') {
+              result.totalEpics = parseInt(value, 10) || 0;
             } else if (key === 'CurrentEpic') {
-              result.currentEpic = count;
-            } else if (key && count > 0) {
-              result.byStatus[key] = count;
-              result.totalStories += count;
-              if (key === 'Done') result.doneStories += count;
+              result.currentEpic = parseInt(value, 10) || 0;
+            } else if (key === 'CurrentStory') {
+              if (!result.currentStory) result.currentStory = value;
+            } else if (key.startsWith('Status')) {
+              // Per-file status: StatusDone:1.1-name → count as 'Done'
+              const statusName = key.slice(6); // strip 'Status' prefix
+              result.byStatus[statusName] = (result.byStatus[statusName] || 0) + 1;
+              if (statusName === 'Done') result.doneStories++;
             }
+            // 'Created' is metadata — skip (Total is the authoritative count)
           }
         }
       } catch { /* fallback to phase3.yaml */ }
@@ -777,7 +807,8 @@ class PhaseOrchestrator {
     if (statusEntries.length > 0) {
       const statusIcons = {
         Done: '✅', InProgress: '🔄', Review: '👀', Blocked: '🚫',
-        Approved: '✅', AwaitingArchReview: '🏛️', RequiresRevision: '🔧', Escalated: '⚠️',
+        Approved: '📋', Draft: '📝', NoStatus: '❓',
+        AwaitingArchReview: '🏛️', RequiresRevision: '🔧', Escalated: '⚠️',
       };
       for (const [status, count] of statusEntries) {
         lines.push(`${statusIcons[status] || '·'} ${status}: ${count}`);
@@ -1394,14 +1425,32 @@ class PhaseOrchestrator {
 
   _completeIterate(devSession) {
     if (this._timer) { clearInterval(this._timer); this._timer = null; }
-    // Kill planning session
+    // Kill planning session (no longer needed)
     if (this._session && tmx.hasSession(this._session)) {
       tmx.killSession(this._session);
     }
-    this._phase = null;
+
     this._changeContext = null;
     log.engine('Iterate complete — dev automation started');
     this.onComplete('iterate', `🔄 New iteration launched!\n\nSM is drafting stories in dev session: ${devSession}\nAgents will chain automatically via handoff-detector.`);
+
+    // Transition to dev monitoring so SM → Architect → Dev → QA cycle is tracked.
+    // Without this, the entire dev cycle runs unmonitored after iterate completes.
+    if (devSession && tmx.hasSession(devSession)) {
+      this._phase = 'develop';
+      this._session = devSession;
+      this._devStartedAt = Date.now();
+      this._lastReportTime = Date.now();
+      this._lastActiveAgent = null;
+      this._stableCount = 0;
+      this._lastHash = '';
+      const pollInterval = this.config.dev_poll_interval || 300000;
+      this._timer = setInterval(() => this._pollDevSession(), pollInterval);
+      log.engine(`Iterate → dev monitoring: session=${devSession}, poll every ${Math.round(pollInterval / 60000)}min`);
+      this.onProgress('🔄 Now monitoring dev cycle (SM → Architect → Dev → QA). I\'ll report agent handoffs and progress.');
+    } else {
+      this._phase = null;
+    }
   }
 
   // ── Quick Fix ───────────────────────────────────────────────────────────────
@@ -1609,8 +1658,8 @@ class PhaseOrchestrator {
           execSync('sleep 12');
           tmx.sendKeysWithEnter(this._session, 1, '*draft');
 
-          // Now poll dev session SM window
-          this._changeContext._pollDevSM = true;
+          // Planning window 0 (Architect) is already stable — next 3 stable polls
+          // will trigger step 3 → _completeChange → transition to dev monitoring.
         } catch (err) {
           this._handleError('change', `Failed to apply in dev session: ${err.message}`);
         }
@@ -1629,10 +1678,28 @@ class PhaseOrchestrator {
       clearInterval(this._timer);
       this._timer = null;
     }
-    this._phase = null;
-    this._changeContext = null;
+
     log.engine(`Change management complete: ${summary}`);
     this.onComplete('change', `✅ Change management complete.\n\n${summary}`);
+
+    // Transition to dev monitoring if SM was started in a dev session.
+    // Without this, the SM → Architect → Dev → QA cycle runs unmonitored.
+    if (this._session && tmx.hasSession(this._session)) {
+      this._phase = 'develop';
+      this._changeContext = null;
+      this._devStartedAt = Date.now();
+      this._lastReportTime = Date.now();
+      this._lastActiveAgent = null;
+      this._stableCount = 0;
+      this._lastHash = '';
+      const pollInterval = this.config.dev_poll_interval || 300000;
+      this._timer = setInterval(() => this._pollDevSession(), pollInterval);
+      log.engine(`Change → dev monitoring: session=${this._session}, poll every ${Math.round(pollInterval / 60000)}min`);
+      this.onProgress('🔄 Now monitoring dev cycle (SM → Architect → Dev → QA). I\'ll report agent handoffs and progress.');
+    } else {
+      this._phase = null;
+      this._changeContext = null;
+    }
   }
 
   // ── Shared ─────────────────────────────────────────────────────────────────

package/package.json

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