orchestrix-yuri 2.0.0 → 2.0.2

package/lib/gateway/config.js

@@ -18,10 +18,7 @@ const DEFAULTS = {
     storage: path.join(os.homedir(), '.yuri', 'chat-history'),
   },
   engine: {
-    cli_command: 'cc',
-    fallback_command: 'claude',
     skill: 'yuri',
-    allowed_tools: 'Read,Write,Edit,Bash,Glob,Grep',
   },
 };
 
@@ -47,7 +44,7 @@ function loadConfig() {
         ? parsed.chat_history.storage.replace('~', os.homedir())
         : DEFAULTS.chat_history.storage,
     },
-    engine: { ...DEFAULTS.engine, ...parsed.engine },
+    engine: { ...DEFAULTS.engine, ...(parsed.engine || {}) },
   };
 }
 

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

@@ -1,14 +1,11 @@
 'use strict';
 
-const { execFile } = require('child_process');
-const { promisify } = require('util');
+const { spawn } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const yaml = require('js-yaml');
 
-const execFileAsync = promisify(execFile);
-
 const YURI_GLOBAL = path.join(os.homedir(), '.yuri');
 
 /**
@@ -69,31 +66,61 @@ function resolveProjectRoot() {
 }
 
 /**
- * Find the CLI command (cc or claude).
+ * Find the claude binary path.
+ * Shell aliases (like `cc`) are not available in child_process, so we
+ * resolve the actual binary via the user's login shell PATH.
  */
-function findCliCommand(engineConfig) {
-  const { cli_command, fallback_command } = engineConfig;
-
-  // Check if primary command exists via which
+function findClaudeBinary() {
+  // Primary: resolve via user's login shell (handles all install methods)
   try {
-    require('child_process').execSync(`which ${cli_command} 2>/dev/null`);
-    return cli_command;
+    const resolved = require('child_process')
+      .execSync('zsh -lc "which claude" 2>/dev/null', { encoding: 'utf8' })
+      .trim();
+    if (resolved && fs.existsSync(resolved)) {
+      return resolved;
+    }
   } catch {
-    // Try fallback
-    try {
-      require('child_process').execSync(`which ${fallback_command} 2>/dev/null`);
-      return fallback_command;
-    } catch {
-      return cli_command; // Return primary anyway, let it fail with a clear error
+    // fall through
+  }
+
+  // Fallback: check common install locations
+  const candidates = [
+    '/usr/local/bin/claude',
+    '/opt/homebrew/bin/claude',
+    path.join(os.homedir(), '.npm-global', 'bin', 'claude'),
+    path.join(os.homedir(), '.local', 'bin', 'claude'),
+    path.join(os.homedir(), '.claude', 'bin', 'claude'),
+  ];
+
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) {
+      return candidate;
     }
   }
+
+  // Last resort: let the shell find it
+  return 'claude';
+}
+
+// Cache the binary path
+let _claudeBinary = null;
+function getClaudeBinary() {
+  if (!_claudeBinary) {
+    _claudeBinary = findClaudeBinary();
+    console.log(`[claude-cli] Using binary: ${_claudeBinary}`);
+  }
+  return _claudeBinary;
 }
 
 /**
  * Execute a Claude CLI call with the Yuri skill.
  *
+ * Uses `claude --dangerously-skip-permissions -p "prompt"` to match the user's
+ * `cc` alias behavior. The prompt is written to a temp file to avoid command-line
+ * length limits and shell escaping issues.
+ *
  * @param {object} opts
- * @param {string} opts.prompt - The composed prompt (L1 context + chat history + user message)
+ * @param {string} opts.prompt - The composed prompt
  * @param {string} opts.cwd - Working directory (project root)
  * @param {object} opts.engineConfig - Engine configuration from channels.yaml
  * @param {number} [opts.timeout=300000] - Timeout in ms (default 5 min)
@@ -102,35 +129,56 @@ function findCliCommand(engineConfig) {
 async function callClaude(opts) {
   const { prompt, cwd, engineConfig, timeout = 300000 } = opts;
 
-  const cmd = findCliCommand(engineConfig);
-  const args = [
-    '-p', prompt,
-    '--allowedTools', engineConfig.allowed_tools || 'Read,Write,Edit,Bash,Glob,Grep',
-  ];
+  const binary = getClaudeBinary();
 
-  const execOpts = {
-    cwd: cwd || os.homedir(),
-    timeout,
-    maxBuffer: 10 * 1024 * 1024, // 10MB
-    env: { ...process.env },
-  };
+  // Write prompt to temp file to avoid command-line length limits
+  const tmpFile = path.join(os.tmpdir(), `yuri-prompt-${Date.now()}.txt`);
+  fs.writeFileSync(tmpFile, prompt);
 
-  try {
-    const { stdout, stderr } = await execFileAsync(cmd, args, execOpts);
+  return new Promise((resolve) => {
+    const args = [
+      '--dangerously-skip-permissions',
+      '-p',
+      `$(cat "${tmpFile}")`,
+    ];
 
-    if (stderr && stderr.trim()) {
-      console.error('[claude-cli] stderr:', stderr.trim().slice(0, 500));
-    }
+    // Use shell to expand $(cat ...) and get proper PATH
+    const child = spawn('zsh', ['-lc', `"${binary}" --dangerously-skip-permissions -p "$(cat "${tmpFile}")"`], {
+      cwd: cwd || os.homedir(),
+      env: { ...process.env },
+      timeout,
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
 
-    const reply = stdout.trim();
-    return { reply, raw: stdout };
-  } catch (err) {
-    if (err.killed) {
-      return { reply: '⏰ Request timed out. The operation took too long.', raw: '' };
-    }
-    console.error('[claude-cli] error:', err.message);
-    return { reply: `❌ Error: ${err.message.slice(0, 200)}`, raw: '' };
-  }
+    let stdout = '';
+    let stderr = '';
+
+    child.stdout.on('data', (data) => { stdout += data.toString(); });
+    child.stderr.on('data', (data) => { stderr += data.toString(); });
+
+    child.on('close', (code) => {
+      // Clean up temp file
+      try { fs.unlinkSync(tmpFile); } catch {}
+
+      if (stderr.trim()) {
+        console.error('[claude-cli] stderr:', stderr.trim().slice(0, 500));
+      }
+
+      if (code !== 0 && !stdout.trim()) {
+        console.error(`[claude-cli] Process exited with code ${code}`);
+        resolve({ reply: `❌ Claude CLI error (exit ${code}). Check gateway logs.`, raw: '' });
+        return;
+      }
+
+      resolve({ reply: stdout.trim(), raw: stdout });
+    });
+
+    child.on('error', (err) => {
+      try { fs.unlinkSync(tmpFile); } catch {}
+      console.error('[claude-cli] spawn error:', err.message);
+      resolve({ reply: `❌ Failed to start Claude CLI: ${err.message}`, raw: '' });
+    });
+  });
 }
 
 /**
@@ -174,4 +222,4 @@ function composePrompt(userMessage, chatHistory) {
   return parts.join('\n\n---\n\n');
 }
 
-module.exports = { callClaude, composePrompt, loadL1Context, resolveProjectRoot, findCliCommand };
+module.exports = { callClaude, composePrompt, loadL1Context, resolveProjectRoot, findClaudeBinary };

package/package.json

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

package/skill/templates/channels.template.yaml

@@ -23,7 +23,4 @@ chat_history:
   storage: ~/.yuri/chat-history/
 
 engine:
-  cli_command: cc
-  fallback_command: claude
   skill: yuri
-  allowed_tools: "Read,Write,Edit,Bash,Glob,Grep"