agentgui 1.0.11 → 1.0.13

package/acp-launcher.js

@@ -3,9 +3,35 @@ import fs from 'fs';
 import path from 'path';
 import os from 'os';
 
-const CLAUDE_BIN = '/home/user/.local/bin/claude';
-const API_KEY_PATH = path.join(os.homedir(), '.claude', 'oauth-api-key');
-const API_URL = 'https://api.anthropic.com/v1/messages';
+// Common paths where claude-code-acp might be installed
+const CLAUDE_CODE_ACP_PATHS = [
+  '/config/.gmweb/npm-global/bin/claude-code-acp',
+  '/usr/local/bin/claude-code-acp',
+  '/usr/bin/claude-code-acp',
+  path.join(os.homedir(), '.local/bin/claude-code-acp'),
+  path.join(os.homedir(), '.gmweb/npm-global/bin/claude-code-acp'),
+  'claude-code-acp', // fallback to PATH
+];
+
+// Common paths where opencode might be installed
+const OPENCODE_PATHS = [
+  '/usr/local/bin/opencode',
+  '/usr/bin/opencode',
+  path.join(os.homedir(), '.local/bin/opencode'),
+  'opencode', // fallback to PATH
+];
+
+function findBinary(paths) {
+  for (const p of paths) {
+    try {
+      fs.accessSync(p, fs.constants.X_OK);
+      return p;
+    } catch (_) {
+      continue;
+    }
+  }
+  return null;
+}
 
 const RIPPLEUI_SYSTEM_PROMPT = `ALWAYS respond with HTML using RippleUI components. The chat renders HTML. Use: cards (class='card'), alerts (class='alert alert-info'), tables (class='table table-zebra'), badges (class='badge badge-primary'), buttons (class='btn btn-primary'). Wrap all responses in styled HTML with Tailwind CSS utility classes for layout.
 
@@ -75,9 +101,35 @@ export default class ACPConnection {
       delete env.NODE_INSPECT;
       delete env.NODE_DEBUG;
 
+      // Ensure npm global bin directories are in PATH
+      const npmGlobalBins = [
+        '/config/.gmweb/npm-global/bin',
+        path.join(os.homedir(), '.gmweb/npm-global/bin'),
+        path.join(os.homedir(), '.local/bin'),
+        '/usr/local/bin',
+      ];
+      const currentPath = env.PATH || '';
+      const newPathEntries = npmGlobalBins.filter(p => !currentPath.includes(p));
+      if (newPathEntries.length > 0) {
+        env.PATH = [...newPathEntries, currentPath].join(':');
+      }
+
       try {
-        const cmd = agentType === 'opencode' ? 'opencode' : 'claude-code-acp';
-        const args = agentType === 'opencode' ? ['acp'] : [];
+        let cmd;
+        let args;
+        if (agentType === 'opencode') {
+          cmd = findBinary(OPENCODE_PATHS);
+          args = ['acp'];
+        } else {
+          cmd = findBinary(CLAUDE_CODE_ACP_PATHS);
+          args = [];
+        }
+
+        if (!cmd) {
+          reject(new Error(`Could not find ${agentType} ACP binary. Please ensure ${agentType === 'opencode' ? 'opencode' : 'claude-code-acp'} is installed and in your PATH.`));
+          return;
+        }
+
         this.child = spawn(cmd, args, { cwd, stdio: ['pipe', 'pipe', 'pipe'], env, shell: false });
       } catch (err) {
         reject(new Error(`Failed to spawn ACP: ${err.message}`));
@@ -219,62 +271,7 @@ export default class ACPConnection {
   }
 
   async _sendPrintPrompt(prompt) {
-    const text = typeof prompt === 'string' ? prompt : (Array.isArray(prompt) ? prompt.map(p => p.text || '').join('\n') : String(prompt));
-    let apiKey;
-    try { apiKey = fs.readFileSync(API_KEY_PATH, 'utf-8').trim(); }
-    catch (e) { throw new Error('No API key found at ' + API_KEY_PATH); }
-
-    const body = JSON.stringify({
-      model: 'claude-sonnet-4-20250514',
-      max_tokens: 4096,
-      system: RIPPLEUI_SYSTEM_PROMPT,
-      messages: [{ role: 'user', content: text }],
-      stream: true,
-    });
-
-    const res = await fetch(API_URL, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'x-api-key': apiKey,
-        'anthropic-version': '2023-06-01',
-      },
-      body,
-    });
-
-    if (!res.ok) {
-      const errText = await res.text();
-      throw new Error(`Anthropic API ${res.status}: ${errText.substring(0, 200)}`);
-    }
-
-    let fullText = '';
-    const reader = res.body.getReader();
-    const decoder = new TextDecoder();
-    let buf = '';
-
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-      buf += decoder.decode(value, { stream: true });
-      const lines = buf.split('\n');
-      buf = lines.pop() || '';
-      for (const line of lines) {
-        if (!line.startsWith('data: ')) continue;
-        const data = line.slice(6);
-        if (data === '[DONE]') continue;
-        try {
-          const evt = JSON.parse(data);
-          if (evt.type === 'content_block_delta' && evt.delta?.text) {
-            fullText += evt.delta.text;
-            if (this.onUpdate) {
-              this.onUpdate({ update: { sessionUpdate: 'agent_message_chunk', content: { text: evt.delta.text } } });
-            }
-          }
-        } catch (_) {}
-      }
-    }
-
-    return { stopReason: 'end_turn', result: fullText };
+    throw new Error('Claude Code uses OAuth and requires the ACP bridge. The fallback to direct API calls is not supported because OAuth tokens cannot be used with the Anthropic API directly. Please ensure claude-code-acp is available in your PATH.');
   }
 
   isRunning() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "server.js",