agentgui 1.0.376 → 1.0.377

package/package.json

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

package/static/js/client.js

@@ -1944,9 +1944,8 @@ class AgentGUIClient {
       this.ui.agentSelector.disabled = true;
     }
     this.loadModelsForAgent(agentId).then(() => {
-      if (this.ui.modelSelector) {
-        if (model) this.ui.modelSelector.value = model;
-        this.ui.modelSelector.disabled = true;
+      if (this.ui.modelSelector && model) {
+        this.ui.modelSelector.value = model;
       }
     });
   }
@@ -1956,8 +1955,28 @@ class AgentGUIClient {
     if (this.ui.agentSelector) {
       this.ui.agentSelector.disabled = false;
     }
-    if (this.ui.modelSelector) {
-      this.ui.modelSelector.disabled = false;
+  }
+
+  /**
+   * Apply agent and model selection based on conversation state
+   * Consolidates duplicate logic for cached and fresh conversation loads
+   */
+  applyAgentAndModelSelection(conversation, hasActivity) {
+    const agentId = conversation.agentType || 'claude-code';
+    const model = conversation.model || null;
+
+    if (hasActivity) {
+      this.lockAgentAndModel(agentId, model);
+    } else {
+      this.unlockAgentAndModel();
+      if (this.ui.agentSelector) {
+        this.ui.agentSelector.value = agentId;
+      }
+      this.loadModelsForAgent(agentId).then(() => {
+        if (model && this.ui.modelSelector) {
+          this.ui.modelSelector.value = model;
+        }
+      });
     }
   }
 
@@ -2247,19 +2266,7 @@ class AgentGUIClient {
           }
           this.state.currentConversation = cached.conversation;
           const cachedHasActivity = cached.conversation.messageCount > 0 || this.state.streamingConversations.has(conversationId);
-          if (cachedHasActivity) {
-            this.lockAgentAndModel(cached.conversation.agentType || 'claude-code', cached.conversation.model || null);
-          } else {
-            this.unlockAgentAndModel();
-            if (this.ui.agentSelector && cached.conversation.agentType) this.ui.agentSelector.value = cached.conversation.agentType;
-            if (cached.conversation.agentType) {
-              this.loadModelsForAgent(cached.conversation.agentType).then(() => {
-                if (cached.conversation.model && this.ui.modelSelector) {
-                  this.ui.modelSelector.value = cached.conversation.model;
-                }
-              });
-            }
-          }
+          this.applyAgentAndModelSelection(cached.conversation, cachedHasActivity);
           this.conversationCache.delete(conversationId);
           this.restoreScrollPosition(conversationId);
           this.enableControls();
@@ -2288,19 +2295,7 @@ class AgentGUIClient {
 
       this.state.currentConversation = conversation;
       const hasActivity = (allMessages && allMessages.length > 0) || isActivelyStreaming || latestSession || this.state.streamingConversations.has(conversationId);
-      if (hasActivity) {
-        this.lockAgentAndModel(conversation.agentType || 'claude-code', conversation.model || null);
-      } else {
-        this.unlockAgentAndModel();
-        if (this.ui.agentSelector && conversation.agentType) this.ui.agentSelector.value = conversation.agentType;
-        if (conversation.agentType) {
-          this.loadModelsForAgent(conversation.agentType).then(() => {
-            if (conversation.model && this.ui.modelSelector) {
-              this.ui.modelSelector.value = conversation.model;
-            }
-          });
-        }
-      }
+      this.applyAgentAndModelSelection(conversation, hasActivity);
 
       const chunks = (rawChunks || []).map(chunk => ({
         ...chunk,

package/static/js/streaming-renderer.js

@@ -423,7 +423,7 @@ class StreamingRenderer {
   }
 
   _getToolColorClass(toolName) {
-    const n = (toolName || '').replace(/^mcp__[^_]+__/, '').toLowerCase();
+    const n = (toolName || '').replace(/^mcp__.*?__/, '').toLowerCase();
     const map = {
       read: 'read', write: 'write', edit: 'edit', bash: 'bash', glob: 'glob', grep: 'grep',
       webfetch: 'web', websearch: 'web', todowrite: 'todo', task: 'task', notebookedit: 'edit',
@@ -572,7 +572,7 @@ class StreamingRenderer {
   renderSmartParams(toolName, input) {
     if (!input || Object.keys(input).length === 0) return '';
 
-    const normalizedName = toolName.replace(/^mcp__[^_]+__/, '');
+    const normalizedName = toolName.replace(/^mcp__.*?__/, '');
 
     switch (normalizedName) {
       case 'Read':
@@ -695,7 +695,7 @@ class StreamingRenderer {
    * Render tool use block with smart parameter display
    */
   getToolUseTitle(toolName, input) {
-    const normalizedName = toolName.replace(/^mcp__[^_]+__/, '');
+    const normalizedName = toolName.replace(/^mcp__.*?__/, '');
     if (normalizedName === 'Edit' && input.file_path) {
       const parts = pathSplit(input.file_path);
       const fileName = parts.pop();
@@ -729,7 +729,7 @@ class StreamingRenderer {
   }
 
   getToolUseDisplayName(toolName) {
-    const normalized = toolName.replace(/^mcp__[^_]+__/, '');
+    const normalized = toolName.replace(/^mcp__.*?__/, '');
     const knownTools = ['Read','Write','Edit','Bash','Glob','Grep','WebFetch','WebSearch','TodoWrite','Task','NotebookEdit'];
     if (knownTools.includes(normalized)) return normalized;
     if (toolName.startsWith('mcp__')) {
@@ -1135,7 +1135,7 @@ class StreamingRenderer {
   }
 
   static getToolDisplayName(toolName) {
-    const normalized = toolName.replace(/^mcp__[^_]+__/, '');
+    const normalized = toolName.replace(/^mcp__.*?__/, '');
     const knownTools = ['Read','Write','Edit','Bash','Glob','Grep','WebFetch','WebSearch','TodoWrite','Task','NotebookEdit'];
     if (knownTools.includes(normalized)) return normalized;
     if (toolName.startsWith('mcp__')) {
@@ -1146,7 +1146,7 @@ class StreamingRenderer {
   }
 
   static getToolTitle(toolName, input) {
-    const n = toolName.replace(/^mcp__[^_]+__/, '');
+    const n = toolName.replace(/^mcp__.*?__/, '');
     if (n === 'Edit' && input.file_path) { const p = pathSplit(input.file_path); const f = p.pop(); const d = p.slice(-2).join('/'); return d ? d+'/'+f : f; }
     if (n === 'Read' && input.file_path) return pathBasename(input.file_path);
     if (n === 'Write' && input.file_path) return pathBasename(input.file_path);