orchestrix-yuri 4.7.11 → 4.8.0

package/lib/gateway/engine/claude-sdk.js

@@ -309,7 +309,7 @@ function runClaude(args, cwd, timeout) {
     }, (err, stdout, stderr) => {
       if (err && err.killed) {
         log.warn('Claude CLI timed out');
-        return resolve({ reply: '⏱ Taking longer than expected. Try a specific command like `*change "desc"` or `*status`.', raw: '' });
+        return resolve({ reply: '⏱ This is taking longer than usual. The operation may still be running.\n\nTry `*status` to check progress, or send your message again.', raw: '' });
       }
       // Claude CLI may return non-zero exit code even with valid JSON output
       // (e.g., stderr "Warning: no stdin data received" causes exit code 1).
@@ -317,7 +317,7 @@ function runClaude(args, cwd, timeout) {
       if (err && !stdout.trim()) {
         log.error(`Claude CLI error: ${err.message.slice(0, 200)}`);
         if (stderr) log.info(`stderr: ${stderr.slice(0, 200)}`);
-        return resolve({ reply: `❌ Claude CLI error: ${err.message.slice(0, 200)}`, raw: stderr });
+        return resolve({ reply: '❌ Something went wrong. Try again, or use `*status` to check state.', raw: stderr });
       }
 
       try {
@@ -478,7 +478,7 @@ function composePrompt(userMessage) {
   if (l2) sections.push(l2);
 
   log.engine('Memory context changed, injecting refresh into prompt');
-  return `[CONTEXT UPDATE — Your memory has been updated]\n${sections.join('\n\n')}\n[END CONTEXT UPDATE]\n\n${userMessage}`;
+  return `<system-context-update silent="true">\nDo not mention or reference this context update in your response. This is an automatic memory refresh.\n${sections.join('\n\n')}\n</system-context-update>\n\n${userMessage}`;
 }
 
 /**

package/lib/gateway/engine/dispatcher.js

@@ -67,7 +67,8 @@ class Dispatcher {
   async classify(text) {
     // Re-entry guard
     if (this._busy) {
-      return { action: 'conversation', description: text, reasoning: 'dispatcher busy' };
+      log.warn('Dispatcher: busy, defaulting to change');
+      return { action: 'change', description: text, reasoning: 'dispatcher busy' };
     }
 
     // Auto-recover if session died
@@ -75,7 +76,8 @@ class Dispatcher {
       this._ready = false;
       await this.start();
       if (!this._ready) {
-        return { action: 'conversation', description: text, reasoning: 'dispatcher unavailable' };
+        log.warn('Dispatcher: unavailable after recovery attempt, defaulting to change');
+        return { action: 'change', description: text, reasoning: 'dispatcher unavailable' };
       }
     }
 
@@ -165,17 +167,32 @@ class Dispatcher {
       }
     }
 
-    // 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' };
+    // Strategy 3: Claude re-classify (replaces keyword matching)
+    // Only reached when tmux output was garbled or unparseable — rare but important.
+    log.warn('Dispatcher: JSON parse failed, attempting Claude re-classify');
+    try {
+      const engine = require('./claude-sdk');
+      const binary = engine.findClaudeBinary();
+      const safeText = originalText.slice(0, 500).replace(/'/g, "'\\''");
+      const prompt = `Classify this user message into ONE action. Valid actions: ${valid.join(', ')}. Reply with ONLY a JSON object like {"action":"change","description":"summary","reasoning":"why"}. User message: "${safeText}"`;
+      const result = execSync(
+        `${binary} -p '${prompt.replace(/'/g, "'\\''")}' --output-format json 2>/dev/null`,
+        { encoding: 'utf8', timeout: 15000 }
+      ).trim();
+      const json = JSON.parse(result);
+      const reply = json.result || '';
+      const reParsed = JSON.parse(reply);
+      if (reParsed.action && valid.includes(reParsed.action)) {
+        log.engine(`Dispatcher: re-classified as "${reParsed.action}"`);
+        return { action: reParsed.action, description: reParsed.description || originalText, reasoning: 'reclassified' };
       }
+    } catch (err) {
+      log.warn(`Dispatcher: re-classify failed: ${err.message}`);
     }
 
-    // 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' };
+    // Absolute last resort — default to "change" (bias toward action)
+    log.warn('Dispatcher: all strategies failed, defaulting to change');
+    return { action: 'change', description: originalText, reasoning: 'all parse strategies failed' };
   }
 
   /**

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

@@ -194,7 +194,6 @@ class PhaseOrchestrator {
 
       const waiting = this._waitingForInput ? ' (WAITING FOR YOUR INPUT)' : '';
       return `[LIVE AGENT CONTEXT] Phase: plan, Agent: ${agent.name} (${this._step + 1}/${PLAN_AGENTS.length})${waiting}\n` +
-             `tmux session: ${this._session}, window: ${agent.window}\n` +
              `--- Agent output (last 40 lines) ---\n${pane}\n--- End agent output ---`;
     }
 
@@ -205,9 +204,9 @@ class PhaseOrchestrator {
       for (let w = 0; w < 4; w++) {
         const tail = tmx.capturePane(this._session, w, 5);
         const lastLine = tail.split('\n').filter((l) => l.trim()).pop() || '(empty)';
-        summaries.push(`  Window ${w} (${windows[w]}): ${lastLine.trim().slice(0, 80)}`);
+        summaries.push(`  ${windows[w]}: ${lastLine.trim().slice(0, 80)}`);
       }
-      return `[LIVE AGENT CONTEXT] Phase: develop, Session: ${this._session}\n${summaries.join('\n')}`;
+      return `[LIVE AGENT CONTEXT] Phase: develop\n${summaries.join('\n')}`;
     }
 
     return null;
@@ -539,8 +538,19 @@ class PhaseOrchestrator {
     this._phase = null;
     this._step = 0;
 
+    // Build output summary
+    const outputs = [];
+    for (const agent of PLAN_AGENTS) {
+      if (agent.output) {
+        const outputPath = path.join(this._projectRoot, agent.output);
+        const exists = fs.existsSync(outputPath);
+        outputs.push(`  ${exists ? '✅' : '⚠️'} ${agent.name} → ${agent.output}`);
+      }
+    }
+    const outputSummary = outputs.length > 0 ? `\n\n${outputs.join('\n')}` : '';
+
     log.engine('Plan phase complete');
-    this.onComplete('plan', '🎉 Planning phase complete! All 6 agents finished.\n\nRun *develop to start automated development.');
+    this.onComplete('plan', `🎉 Planning complete!${outputSummary}\n\nNext: review the docs above, then run \`*develop\` to start building.`);
   }
 
   /**
@@ -819,7 +829,7 @@ class PhaseOrchestrator {
     // Current activity
     if (p.currentAgent) {
       const storyInfo = p.currentStory ? ` → ${p.currentStory}` : '';
-      lines.push(`Current: ${p.currentAgent} (window ${p.currentWindow})${storyInfo}`);
+      lines.push(`Current: ${p.currentAgent}${storyInfo}`);
     } else {
       lines.push(`Current: waiting for next handoff`);
     }
@@ -875,7 +885,7 @@ class PhaseOrchestrator {
     }
 
     log.engine('Dev phase complete');
-    this.onComplete('develop', '🎉 Development complete! All stories finished.\n\nRun *test to start smoke testing.');
+    this.onComplete('develop', '🎉 Development complete! All stories implemented.\n\nNext: run `*test` to validate each epic with smoke tests.');
   }
 
   // ── Test Phase ──────────────────────────────────────────────────────────────
@@ -1432,7 +1442,7 @@ class PhaseOrchestrator {
 
     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.`);
+    this.onComplete('iterate', `🔄 New iteration launched!\n\nSM is drafting new stories. Agents will chain automatically (SM → Architect → Dev → QA).`);
 
     // Transition to dev monitoring so SM → Architect → Dev → QA cycle is tracked.
     // Without this, the entire dev cycle runs unmonitored after iterate completes.
@@ -1711,7 +1721,25 @@ class PhaseOrchestrator {
     }
     this._phase = null;
     log.error(`Phase ${phase} error: ${message}`);
-    this.onError(phase, message);
+
+    // Sanitize internal details from user-facing message
+    const cleanMsg = message
+      .replace(/orchestrix-[\w-]+/g, 'dev session')
+      .replace(/op-[\w-]+/g, 'planning session')
+      .replace(/yuri-[\w-]+/g, 'dispatcher')
+      .replace(/\/Users\/\S+/g, '')
+      .replace(/tmux session/gi, 'agent session');
+
+    const hints = {
+      plan:    'Run `*plan` to restart, or `*status` to check saved progress.',
+      develop: 'Run `*develop` to restart, or `*status` to see completed stories.',
+      test:    'Run `*test` to restart testing.',
+      change:  'Send your change request again.',
+      iterate: 'Run `*iterate` again.',
+    };
+
+    const recovery = hints[phase] || 'Use `*status` to check current state.';
+    this.onError(phase, `❌ ${cleanMsg}\n\n${recovery}`);
   }
 
   _updatePlanMemory(status) {

package/lib/gateway/router.js

@@ -65,7 +65,7 @@ class Router {
       config: config.engine,
       onProgress: (msg) => this._sendProactive(msg),
       onComplete: (phase, summary) => this._sendProactive(summary),
-      onError: (phase, err) => this._sendProactive(`❌ Phase ${phase} error: ${err}`),
+      onError: (phase, err) => this._sendProactive(err),
       onQuestionAsked: (text) => this._sendProactiveWithId(text),
     });
 
@@ -1123,7 +1123,7 @@ Reply with ONLY one word: small, medium, or large. Nothing else.`;
         const last = lines.slice(-3).map((l) => l.trim().slice(0, 100)).join('\n    ');
         summaries.push(`  Window ${w} (${windows[w]}):\n    ${last || '(idle)'}`);
       }
-      return `[LIVE DEV SESSION] ${devSession} (orchestrator not actively tracking)\n${summaries.join('\n')}`;
+      return `[LIVE DEV SESSION] (agents running independently)\n${summaries.join('\n')}`;
     } catch { return null; }
   }
 

package/package.json

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