agentgui 1.0.427 → 1.0.429

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/package.json

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

package/server.js

@@ -462,11 +462,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 +493,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); }
         });
@@ -3173,7 +3167,7 @@ function serveFile(filePath, res, req) {
     if (err) { res.writeHead(500); res.end('Server error'); return; }
     let content = data.toString();
     const baseTag = `<script>window.__BASE_URL='${BASE_URL}';</script>`;
-    content = content.replace('<head>', '<head>\n  ' + baseTag);
+    content = content.replace('<head>', `<head>\n  <base href="${BASE_URL}/">\n  ` + baseTag);
     content = content.replace(/(href|src)="vendor\//g, `$1="${BASE_URL}/vendor/`);
     if (watch) {
       content += `\n<script>(function(){const ws=new WebSocket((location.protocol==='https:'?'wss://':'ws://')+location.host+'${BASE_URL}/hot-reload');ws.onmessage=e=>{if(JSON.parse(e.data).type==='reload')location.reload()};})();</script>`;

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,13 +2565,21 @@ 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() {
     return this.getEffectiveAgentId();
   }
 
+  saveAgentAndModelToConversation() {
+    const convId = this.state.currentConversation;
+    if (!convId || this._agentLocked) return;
+    const agentId = this.getEffectiveAgentId();
+    const model = this.getCurrentModel();
+    window.wsClient.rpc('conv.upd', { id: convId, agentType: agentId, model: model || undefined }).catch(() => {});
+  }
+
   /**
    * Get current selected model
    */