agentgui 1.0.428 → 1.0.430

package/database.js

@@ -329,7 +329,7 @@ try {
   const result = db.prepare("PRAGMA table_info(conversations)").all();
   const columnNames = result.map(r => r.name);
   const requiredColumns = {
-    agentType: 'TEXT DEFAULT "claude-code"',
+    agentType: 'TEXT',
     source: 'TEXT DEFAULT "gui"',
     externalId: 'TEXT',
     firstPrompt: 'TEXT',
@@ -939,54 +939,54 @@ export const queries = {
     return true;
   },
 
-  deleteClaudeSessionFile(sessionId) {
-    try {
-      const claudeDir = path.join(os.homedir(), '.claude');
-      const projectsDir = path.join(claudeDir, 'projects');
-
-      if (!fs.existsSync(projectsDir)) {
-        return false;
-      }
-
-      // Search for session file in all project directories
-      const projects = fs.readdirSync(projectsDir);
-      for (const project of projects) {
-        const projectPath = path.join(projectsDir, project);
-        const sessionFile = path.join(projectPath, `${sessionId}.jsonl`);
-
-        if (fs.existsSync(sessionFile)) {
-          fs.unlinkSync(sessionFile);
-          console.log(`[deleteClaudeSessionFile] Deleted Claude session file: ${sessionFile}`);
-
-          // Also remove the entry from sessions-index.json if it exists
-          const indexPath = path.join(projectPath, 'sessions-index.json');
-          if (fs.existsSync(indexPath)) {
-            try {
-              const indexContent = fs.readFileSync(indexPath, 'utf8');
-              const index = JSON.parse(indexContent);
-              if (index.entries && Array.isArray(index.entries)) {
-                const originalLength = index.entries.length;
-                index.entries = index.entries.filter(entry => entry.sessionId !== sessionId);
-                if (index.entries.length < originalLength) {
-                  fs.writeFileSync(indexPath, JSON.stringify(index, null, 2), { encoding: 'utf8' });
-                  console.log(`[deleteClaudeSessionFile] Removed session ${sessionId} from sessions-index.json in ${projectPath}`);
-                }
-              }
-            } catch (indexErr) {
-              console.error(`[deleteClaudeSessionFile] Failed to update sessions-index.json in ${projectPath}:`, indexErr.message);
-            }
-          }
-
-          return true;
-        }
-      }
-
-      return false;
-    } catch (err) {
-      console.error(`[deleteClaudeSessionFile] Error deleting session ${sessionId}:`, err.message);
-      return false;
-    }
-  },
+  deleteClaudeSessionFile(sessionId) {
+    try {
+      const claudeDir = path.join(os.homedir(), '.claude');
+      const projectsDir = path.join(claudeDir, 'projects');
+
+      if (!fs.existsSync(projectsDir)) {
+        return false;
+      }
+
+      // Search for session file in all project directories
+      const projects = fs.readdirSync(projectsDir);
+      for (const project of projects) {
+        const projectPath = path.join(projectsDir, project);
+        const sessionFile = path.join(projectPath, `${sessionId}.jsonl`);
+
+        if (fs.existsSync(sessionFile)) {
+          fs.unlinkSync(sessionFile);
+          console.log(`[deleteClaudeSessionFile] Deleted Claude session file: ${sessionFile}`);
+
+          // Also remove the entry from sessions-index.json if it exists
+          const indexPath = path.join(projectPath, 'sessions-index.json');
+          if (fs.existsSync(indexPath)) {
+            try {
+              const indexContent = fs.readFileSync(indexPath, 'utf8');
+              const index = JSON.parse(indexContent);
+              if (index.entries && Array.isArray(index.entries)) {
+                const originalLength = index.entries.length;
+                index.entries = index.entries.filter(entry => entry.sessionId !== sessionId);
+                if (index.entries.length < originalLength) {
+                  fs.writeFileSync(indexPath, JSON.stringify(index, null, 2), { encoding: 'utf8' });
+                  console.log(`[deleteClaudeSessionFile] Removed session ${sessionId} from sessions-index.json in ${projectPath}`);
+                }
+              }
+            } catch (indexErr) {
+              console.error(`[deleteClaudeSessionFile] Failed to update sessions-index.json in ${projectPath}:`, indexErr.message);
+            }
+          }
+
+          return true;
+        }
+      }
+
+      return false;
+    } catch (err) {
+      console.error(`[deleteClaudeSessionFile] Error deleting session ${sessionId}:`, err.message);
+      return false;
+    }
+  },
 
   cleanup() {
     const thirtyDaysAgo = Date.now() - (30 * 24 * 60 * 60 * 1000);

package/lib/claude-runner.js

@@ -10,6 +10,25 @@ function getSpawnOptions(cwd, additionalOptions = {}) {
   return options;
 }
 
+function resolveCommand(command, npxPackage) {
+  const whichCmd = isWindows ? 'where' : 'which';
+  const check = spawnSync(whichCmd, [command], { encoding: 'utf-8', timeout: 3000 });
+  if (check.status === 0 && (check.stdout || '').trim()) {
+    return { cmd: command, prefixArgs: [] };
+  }
+  if (npxPackage) {
+    const npxCheck = spawnSync(whichCmd, ['npx'], { encoding: 'utf-8', timeout: 3000 });
+    if (npxCheck.status === 0) {
+      return { cmd: 'npx', prefixArgs: ['--yes', npxPackage] };
+    }
+    const bunxCheck = spawnSync(whichCmd, ['bunx'], { encoding: 'utf-8', timeout: 3000 });
+    if (bunxCheck.status === 0) {
+      return { cmd: 'bunx', prefixArgs: [npxPackage] };
+    }
+  }
+  return { cmd: command, prefixArgs: [] };
+}
+
 /**
  * Agent Framework
  * Extensible registry for AI agent CLI integrations
@@ -30,6 +49,7 @@ class AgentRunner {
     this.requiresAdapter = config.requiresAdapter || false;
     this.adapterCommand = config.adapterCommand || null;
     this.adapterArgs = config.adapterArgs || [];
+    this.npxPackage = config.npxPackage || null;
   }
 
   defaultBuildArgs(prompt, config) {
@@ -226,9 +246,15 @@ class AgentRunner {
         onError = null
       } = config;
 
-      const cmd = this.requiresAdapter && this.adapterCommand ? this.adapterCommand : this.command;
-      const baseArgs = this.requiresAdapter && this.adapterCommand ? this.adapterArgs : this.buildArgs(prompt, config);
-      const args = [...baseArgs];
+      let cmd, args;
+      if (this.requiresAdapter && this.adapterCommand) {
+        cmd = this.adapterCommand;
+        args = [...this.adapterArgs];
+      } else {
+        const resolved = resolveCommand(this.command, this.npxPackage);
+        cmd = resolved.cmd;
+        args = [...resolved.prefixArgs, ...this.buildArgs(prompt, config)];
+      }
 
       const proc = spawn(cmd, args, getSpawnOptions(cwd));
 
@@ -494,7 +520,8 @@ class AgentRegistry {
       command: a.command,
       protocol: a.protocol,
       requiresAdapter: a.requiresAdapter,
-      supportedFeatures: a.supportedFeatures
+      supportedFeatures: a.supportedFeatures,
+      npxPackage: a.npxPackage
     }));
   }
 
@@ -503,11 +530,21 @@ class AgentRegistry {
       try {
         const whichCmd = isWindows ? 'where' : 'which';
         const which = spawnSync(whichCmd, [agent.command], { encoding: 'utf-8', timeout: 3000 });
-        if (which.status !== 0) return false;
-        const binPath = (which.stdout || '').trim().split('\n')[0].trim();
-        if (!binPath) return false;
-        const check = spawnSync(binPath, ['--version'], { encoding: 'utf-8', timeout: 10000, shell: isWindows });
-        return check.status === 0 && (check.stdout || '').trim().length > 0;
+        if (which.status === 0) {
+          const binPath = (which.stdout || '').trim().split('\n')[0].trim();
+          if (binPath) {
+            const check = spawnSync(binPath, ['--version'], { encoding: 'utf-8', timeout: 10000, shell: isWindows });
+            if (check.status === 0 && (check.stdout || '').trim().length > 0) return true;
+          }
+        }
+        const a = this.agents.get(agent.id);
+        if (a && a.npxPackage) {
+          const npxCheck = spawnSync(whichCmd, ['npx'], { encoding: 'utf-8', timeout: 3000 });
+          if (npxCheck.status === 0) return true;
+          const bunxCheck = spawnSync(whichCmd, ['bunx'], { encoding: 'utf-8', timeout: 3000 });
+          if (bunxCheck.status === 0) return true;
+        }
+        return false;
       } catch {
         return false;
       }
@@ -571,6 +608,7 @@ registry.register({
   command: 'opencode',
   protocol: 'acp',
   supportsStdin: false,
+  npxPackage: 'opencode-ai',
   supportedFeatures: ['streaming', 'resume', 'acp-protocol'],
 
   buildArgs(prompt, config) {
@@ -923,6 +961,7 @@ registry.register({
   command: 'gemini',
   protocol: 'acp',
   supportsStdin: false,
+  npxPackage: '@google/gemini-cli',
   supportedFeatures: ['streaming', 'resume', 'acp-protocol'],
   buildArgs(prompt, config) {
     const args = ['--experimental-acp', '--yolo'];
@@ -1085,6 +1124,7 @@ registry.register({
   command: 'kilo',
   protocol: 'acp',
   supportsStdin: false,
+  npxPackage: '@kilocode/cli',
   supportedFeatures: ['streaming', 'resume', 'acp-protocol', 'models'],
 
   buildArgs(prompt, config) {

package/package.json

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

package/server.js

@@ -384,9 +384,9 @@ function discoverAgents() {
   const agents = [];
   const binaries = [
     { cmd: 'claude', id: 'claude-code', name: 'Claude Code', icon: 'C', protocol: 'cli' },
-    { cmd: 'opencode', id: 'opencode', name: 'OpenCode', icon: 'O', protocol: 'acp' },
-    { cmd: 'gemini', id: 'gemini', name: 'Gemini CLI', icon: 'G', protocol: 'acp' },
-    { cmd: 'kilo', id: 'kilo', name: 'Kilo Code', icon: 'K', protocol: 'acp' },
+    { cmd: 'opencode', id: 'opencode', name: 'OpenCode', icon: 'O', protocol: 'acp', npxPackage: 'opencode-ai' },
+    { cmd: 'gemini', id: 'gemini', name: 'Gemini CLI', icon: 'G', protocol: 'acp', npxPackage: '@google/gemini-cli' },
+    { cmd: 'kilo', id: 'kilo', name: 'Kilo Code', icon: 'K', protocol: 'acp', npxPackage: '@kilocode/cli' },
     { cmd: 'goose', id: 'goose', name: 'Goose', icon: 'g', protocol: 'acp' },
     { cmd: 'openhands', id: 'openhands', name: 'OpenHands', icon: 'H', protocol: 'acp' },
     { cmd: 'augment', id: 'augment', name: 'Augment Code', icon: 'A', protocol: 'acp' },
@@ -400,13 +400,11 @@ function discoverAgents() {
   ];
   for (const bin of binaries) {
     const result = findCommand(bin.cmd);
-    if (result) agents.push({ 
-      id: bin.id, 
-      name: bin.name, 
-      icon: bin.icon, 
-      path: result, 
-      protocol: bin.protocol 
-    });
+    if (result) {
+      agents.push({ id: bin.id, name: bin.name, icon: bin.icon, path: result, protocol: bin.protocol });
+    } else if (bin.npxPackage) {
+      agents.push({ id: bin.id, name: bin.name, icon: bin.icon, path: null, protocol: bin.protocol, npxPackage: bin.npxPackage, npxLaunchable: true });
+    }
   }
   return agents;
 }
@@ -462,11 +460,7 @@ async function fetchClaudeModelsFromAPI() {
             const data = JSON.parse(body);
             const items = (data.data || []).filter(m => m.id && m.id.startsWith('claude-'));
             if (items.length === 0) return resolve(null);
-            const models = [{ id: '', label: 'Default' }];
-            for (const m of items) {
-              const label = m.display_name || modelIdToLabel(m.id);
-              models.push({ id: m.id, label });
-            }
+            const models = items.map(m => ({ id: m.id, label: m.display_name || modelIdToLabel(m.id) }));
             resolve(models);
           } catch { resolve(null); }
         });
@@ -497,12 +491,10 @@ async function fetchGeminiModelsFromAPI() {
             const data = JSON.parse(body);
             const items = (data.models || []).filter(m => m.name && m.name.includes('gemini'));
             if (items.length === 0) return resolve(null);
-            const models = [{ id: '', label: 'Default' }];
-            for (const m of items) {
+            const models = items.map(m => {
               const modelId = m.name.replace(/^models\//, '');
-              const label = modelId.replace(/-/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
-              models.push({ id: modelId, label });
-            }
+              return { id: modelId, label: modelId.replace(/-/g, ' ').replace(/\b\w/g, c => c.toUpperCase()) };
+            });
             resolve(models);
           } catch { resolve(null); }
         });

package/static/js/client.js

@@ -1260,7 +1260,7 @@ class AgentGUIClient {
     const prompt = this.ui.messageInput?.value || '';
     const conv = this.state.currentConversation;
     const isNewConversation = conv && !conv.messageCount && !this.state.streamingConversations.has(conv.id);
-    const agentId = (isNewConversation ? this.getCurrentAgent() : null) || conv?.agentType || this.getCurrentAgent() || 'claude-code';
+    const agentId = (isNewConversation ? this.getCurrentAgent() : null) || conv?.agentType || this.getCurrentAgent();
     const model = this.ui.modelSelector?.value || null;
 
     if (!prompt.trim()) {
@@ -1970,7 +1970,7 @@ class AgentGUIClient {
    * Consolidates duplicate logic for cached and fresh conversation loads
    */
   applyAgentAndModelSelection(conversation, hasActivity) {
-    const agentId = conversation.agentId || conversation.agentType || 'claude-code';
+    const agentId = conversation.agentId || conversation.agentType || null;
     const model = conversation.model || null;
 
     if (hasActivity) {
@@ -1980,7 +1980,8 @@ class AgentGUIClient {
       this.unlockAgentAndModel();
       this._setCliSelectorToAgent(agentId);
 
-      this.loadModelsForAgent(agentId).then(() => {
+      const effectiveAgentId = agentId || this.getEffectiveAgentId();
+      this.loadModelsForAgent(effectiveAgentId).then(() => {
         if (model && this.ui.modelSelector) {
           this.ui.modelSelector.value = model;
         }
@@ -2185,7 +2186,7 @@ class AgentGUIClient {
    */
   async createNewConversation(workingDirectory, title) {
     try {
-      const agentId = this.ui.agentSelector?.value || 'claude-code';
+      const agentId = this.getEffectiveAgentId();
       const model = this.ui.modelSelector?.value || null;
       const convTitle = title || 'New Conversation';
       const body = { agentId, title: convTitle };
@@ -2461,7 +2462,7 @@ class AgentGUIClient {
           this.state.currentSession = {
             id: latestSession.id,
             conversationId: conversationId,
-            agentId: conversation.agentType || 'claude-code',
+            agentId: conversation.agentType || null,
             startTime: latestSession.created_at
           };
 
@@ -2564,7 +2565,7 @@ class AgentGUIClient {
     if (this.ui.agentSelector?.value && this.ui.agentSelector.style.display !== 'none') {
       return this.ui.agentSelector.value;
     }
-    return this.ui.cliSelector?.value || 'claude-code';
+    return this.ui.cliSelector?.value || null;
   }
 
   getCurrentAgent() {