orchestrix-yuri 4.7.3 → 4.7.5

package/lib/gateway/engine/dispatcher.js

@@ -107,9 +107,9 @@ class Dispatcher {
         }
       }
 
-      // Timeout — default to conversation
-      log.warn('Dispatcher: classify timeout');
-      return { action: 'conversation', description: text, reasoning: 'classifier timeout' };
+      // Timeout — default to change (bias toward action)
+      log.warn('Dispatcher: classify timeout, defaulting to change');
+      return { action: 'change', description: text, reasoning: 'classifier timeout' };
     } finally {
       this._busy = false;
     }
@@ -117,33 +117,65 @@ class Dispatcher {
 
   /**
    * Parse the dispatcher's tmux pane output to extract the JSON response.
-   * Searches from bottom up for the first valid JSON line with "action".
+   * Handles: bare JSON lines, markdown code blocks, partial lines with JSON.
    */
   _parseResponse(output, originalText) {
-    const lines = output.split('\n');
+    const valid = ['bugfix', 'change', 'plan', 'develop', 'test', 'deploy', 'status', 'iterate', 'conversation'];
 
+    // Strategy 1: Find JSON on its own line (bottom-up)
+    const lines = output.split('\n');
     for (let i = lines.length - 1; i >= 0; i--) {
       const line = lines[i].trim();
-      // Look for JSON that contains "action"
-      if (line.startsWith('{') && line.includes('"action"')) {
-        try {
-          const parsed = JSON.parse(line);
-          if (parsed.action) {
-            const valid = ['bugfix', 'change', 'plan', 'develop', 'test', 'deploy', 'status', 'iterate', 'conversation'];
-            if (valid.includes(parsed.action)) {
+      if (line.includes('"action"')) {
+        // Extract JSON substring (may be embedded in other text)
+        const jsonMatch = line.match(/\{[^{}]*"action"\s*:\s*"[^"]+?"[^{}]*\}/);
+        if (jsonMatch) {
+          try {
+            const parsed = JSON.parse(jsonMatch[0]);
+            if (parsed.action && valid.includes(parsed.action)) {
               return {
                 action: parsed.action,
                 description: parsed.description || originalText,
                 reasoning: parsed.reasoning || '',
               };
             }
-          }
-        } catch { /* not valid JSON, continue searching */ }
+          } catch { /* continue */ }
+        }
+      }
+    }
+
+    // Strategy 2: Search entire output for JSON pattern (handles multiline/code blocks)
+    const fullMatch = output.match(/\{\s*"action"\s*:\s*"(\w+)"[^}]*\}/);
+    if (fullMatch) {
+      try {
+        const parsed = JSON.parse(fullMatch[0]);
+        if (parsed.action && valid.includes(parsed.action)) {
+          return {
+            action: parsed.action,
+            description: parsed.description || originalText,
+            reasoning: parsed.reasoning || '',
+          };
+        }
+      } catch { /* continue */ }
+
+      // Even if full JSON parse fails, extract action from regex
+      const action = fullMatch[1];
+      if (valid.includes(action)) {
+        return { action, description: originalText, reasoning: 'partial parse' };
+      }
+    }
+
+    // Strategy 3: Look for bare action words in the last few lines
+    const tail = lines.slice(-5).join(' ').toLowerCase();
+    for (const action of valid) {
+      if (action !== 'conversation' && tail.includes(`"${action}"`)) {
+        return { action, description: originalText, reasoning: 'keyword match' };
       }
     }
 
-    log.warn('Dispatcher: failed to parse response, defaulting to conversation');
-    return { action: 'conversation', description: originalText, reasoning: 'parse failed' };
+    // Parse failed — default to "change" (bias toward action, not conversation)
+    log.warn('Dispatcher: failed to parse response, defaulting to change');
+    return { action: 'change', description: originalText, reasoning: 'parse failed' };
   }
 
   /**

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();
@@ -1394,14 +1415,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 +1648,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 +1668,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.3",
+  "version": "4.7.5",
   "description": "Yuri — Meta-Orchestrator for Orchestrix. Drive your entire project lifecycle with natural language.",
   "main": "lib/installer.js",
   "bin": {