agentgui 1.0.572 → 1.0.573

package/lib/acp-manager.js

@@ -148,7 +148,7 @@ export async function restart(agentId) {
 }
 
 export async function queryModels(agentId) {
-  const port = getPort(agentId);
+  const port = await ensureRunning(agentId);
   if (!port) return [];
   try {
     const res = await fetch('http://127.0.0.1:' + port + '/models');

package/package.json

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

package/static/index.html

@@ -968,25 +968,6 @@
     .queue-btn:disabled { opacity: 0.4; cursor: not-allowed; }
     .queue-btn.visible { display: flex; }
 
-    .steer-btn {
-      display: none;
-      align-items: center;
-      justify-content: center;
-      width: 40px;
-      height: 40px;
-      background-color: #06b6d4;
-      color: white;
-      border: none;
-      border-radius: 0.5rem;
-      cursor: pointer;
-      flex-shrink: 0;
-      transition: background-color 0.15s;
-      margin-right: 0.25rem;
-    }
-
-    .steer-btn:hover:not(:disabled) { background-color: #0891b2; }
-    .steer-btn:disabled { opacity: 0.4; cursor: not-allowed; }
-    .steer-btn.visible { display: flex; }
 
     /* ===== OVERLAY for mobile sidebar ===== */
     .sidebar-overlay {
@@ -3200,9 +3181,9 @@
               </svg>
             </button>
           </div>
-          <button class="inject-btn" id="injectBtn" title="Inject instructions into running agent" aria-label="Inject instructions">
+          <button class="inject-btn" id="injectBtn" title="Steer or inject into running agent" aria-label="Steer/Inject">
             <svg viewBox="0 0 24 24" fill="currentColor" width="18" height="18">
-              <path d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"/>
+              <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm3.5-9c.83 0 1.5-.67 1.5-1.5S16.33 8 15.5 8 14 8.67 14 9.5s.67 1.5 1.5 1.5zm-7 0c.83 0 1.5-.67 1.5-1.5S9.33 8 8.5 8 7 8.67 7 9.5 7.67 11 8.5 11zm3.5 6.5c2.33 0 4.31-1.46 5.11-3.5H6.89c.8 2.04 2.78 3.5 5.11 3.5z"/>
             </svg>
           </button>
           <button class="queue-btn" id="queueBtn" title="Queue message for running agent" aria-label="Queue message">
@@ -3210,11 +3191,6 @@
               <path d="M15 13H1v-2h14v2zm0-4H1V7h14v2zM1 19h14v-2H1v2z"/>
             </svg>
           </button>
-          <button class="steer-btn" id="steerBtn" title="Steer running agent with message" aria-label="Steer agent">
-            <svg viewBox="0 0 24 24" fill="currentColor" width="18" height="18">
-              <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm3.5-9c.83 0 1.5-.67 1.5-1.5S16.33 8 15.5 8 14 8.67 14 9.5s.67 1.5 1.5 1.5zm-7 0c.83 0 1.5-.67 1.5-1.5S9.33 8 8.5 8 7 8.67 7 9.5 7.67 11 8.5 11zm3.5 6.5c2.33 0 4.31-1.46 5.11-3.5H6.89c.8 2.04 2.78 3.5 5.11 3.5z"/>
-            </svg>
-          </button>
           <button class="stop-btn" id="stopBtn" title="Stop running agent (emergency)" aria-label="Stop agent">
             <svg viewBox="0 0 24 24" fill="currentColor" width="18" height="18">
               <path d="M6 6h12v12H6z"/>

package/static/js/client.js

@@ -467,7 +467,6 @@ class AgentGUIClient {
     this.ui.stopButton = document.getElementById('stopBtn');
     this.ui.injectButton = document.getElementById('injectBtn');
     this.ui.queueButton = document.getElementById('queueBtn');
-    this.ui.steerButton = document.getElementById('steerBtn');
 
     if (this.ui.stopButton) {
       this.ui.stopButton.addEventListener('click', async () => {
@@ -484,13 +483,34 @@ class AgentGUIClient {
     if (this.ui.injectButton) {
       this.ui.injectButton.addEventListener('click', async () => {
         if (!this.state.currentConversation) return;
-        const instructions = await window.UIDialog.prompt('Enter instructions to inject into the running agent:', '', 'Inject Instructions');
-        if (!instructions) return;
-        try {
-          const data = await window.wsClient.rpc('conv.inject', { id: this.state.currentConversation.id, content: instructions });
-          console.log('Inject response:', data);
-        } catch (err) {
-          console.error('Failed to inject:', err);
+        const isStreaming = this.state.streamingConversations.has(this.state.currentConversation.id);
+
+        if (isStreaming) {
+          const message = this.ui.messageInput?.value || '';
+          if (!message.trim()) {
+            this.showError('Please enter a message to steer');
+            return;
+          }
+          try {
+            const data = await window.wsClient.rpc('conv.steer', { id: this.state.currentConversation.id, content: message });
+            console.log('Steer response:', data);
+            if (this.ui.messageInput) {
+              this.ui.messageInput.value = '';
+              this.ui.messageInput.style.height = 'auto';
+            }
+          } catch (err) {
+            console.error('Failed to steer:', err);
+            this.showError('Failed to steer: ' + err.message);
+          }
+        } else {
+          const instructions = await window.UIDialog.prompt('Enter instructions to inject into the running agent:', '', 'Inject Instructions');
+          if (!instructions) return;
+          try {
+            const data = await window.wsClient.rpc('conv.inject', { id: this.state.currentConversation.id, content: instructions });
+            console.log('Inject response:', data);
+          } catch (err) {
+            console.error('Failed to inject:', err);
+          }
         }
       });
     }
@@ -517,28 +537,6 @@ class AgentGUIClient {
       });
     }
 
-    if (this.ui.steerButton) {
-      this.ui.steerButton.addEventListener('click', async () => {
-        if (!this.state.currentConversation) return;
-        const message = this.ui.messageInput?.value || '';
-        if (!message.trim()) {
-          this.showError('Please enter a message to steer');
-          return;
-        }
-        try {
-          const data = await window.wsClient.rpc('conv.steer', { id: this.state.currentConversation.id, content: message });
-          console.log('Steer response:', data);
-          if (this.ui.messageInput) {
-            this.ui.messageInput.value = '';
-            this.ui.messageInput.style.height = 'auto';
-          }
-        } catch (err) {
-          console.error('Failed to steer:', err);
-          this.showError('Failed to steer: ' + err.message);
-        }
-      });
-    }
-
     if (this.ui.messageInput) {
       this.ui.messageInput.addEventListener('keydown', (e) => {
         if (e.key === 'Enter' && e.ctrlKey) {
@@ -990,10 +988,9 @@ class AgentGUIClient {
     console.error('Streaming error:', data);
     this._clearThinkingCountdown();
 
-    // Hide stop, steer, and inject buttons on error
+    // Hide stop and inject buttons on error
     if (this.ui.stopButton) this.ui.stopButton.classList.remove('visible');
     if (this.ui.injectButton) this.ui.injectButton.classList.remove('visible');
-    if (this.ui.steerButton) this.ui.steerButton.classList.remove('visible');
     if (this.ui.sendButton) this.ui.sendButton.style.display = '';
 
     const conversationId = data.conversationId || this.state.currentSession?.conversationId;
@@ -2515,7 +2512,6 @@ class AgentGUIClient {
       if (this.ui.stopButton) this.ui.stopButton.classList.remove('visible');
       if (this.ui.injectButton) this.ui.injectButton.classList.remove('visible');
       if (this.ui.queueButton) this.ui.queueButton.classList.remove('visible');
-      if (this.ui.steerButton) this.ui.steerButton.classList.remove('visible');
       if (this.ui.sendButton) this.ui.sendButton.style.display = '';
 
       var prevId = this.state.currentConversation?.id;
@@ -2831,11 +2827,10 @@ class AgentGUIClient {
     const isConnected = this.wsManager?.isConnected;
 
     const injectBtn = document.getElementById('injectBtn');
-    const steerBtn = document.getElementById('steerBtn');
     const queueBtn = document.getElementById('queueBtn');
     const stopBtn = document.getElementById('stopBtn');
 
-    [injectBtn, steerBtn, queueBtn, stopBtn].forEach(btn => {
+    [injectBtn, queueBtn, stopBtn].forEach(btn => {
       if (!btn) return;
       btn.classList.toggle('visible', isStreaming);
       btn.disabled = !isConnected;
@@ -3112,13 +3107,10 @@ class AgentGUIClient {
     if (this.ui.sendButton) {
       this.ui.sendButton.disabled = !this.wsManager.isConnected;
     }
-    // Also disable queue/steer buttons if disconnected
+    // Also disable queue and inject buttons if disconnected
     if (this.ui.injectButton && this.ui.injectButton.classList.contains('visible')) {
       this.ui.injectButton.disabled = !this.wsManager.isConnected;
     }
-    if (this.ui.steerButton && this.ui.steerButton.classList.contains('visible')) {
-      this.ui.steerButton.disabled = !this.wsManager.isConnected;
-    }
     if (this.ui.queueButton && this.ui.queueButton.classList.contains('visible')) {
       this.ui.queueButton.disabled = !this.wsManager.isConnected;
     }
@@ -3144,17 +3136,13 @@ class AgentGUIClient {
   }
 
   /**
-   * Show queue/steer buttons when streaming (busy prompt state)
+   * Show queue/inject buttons when streaming (busy prompt state)
    */
   showStreamingPromptButtons() {
     if (this.ui.injectButton) {
       this.ui.injectButton.classList.add('visible');
       this.ui.injectButton.disabled = !this.wsManager.isConnected;
     }
-    if (this.ui.steerButton) {
-      this.ui.steerButton.classList.add('visible');
-      this.ui.steerButton.disabled = !this.wsManager.isConnected;
-    }
     if (this.ui.queueButton) {
       this.ui.queueButton.classList.add('visible');
       this.ui.queueButton.disabled = !this.wsManager.isConnected;
@@ -3162,7 +3150,7 @@ class AgentGUIClient {
   }
 
   /**
-   * Ensure prompt area is always enabled and shows queue/steer when agent streaming
+   * Ensure prompt area is always enabled and shows queue/inject when agent streaming
    */
   ensurePromptAreaAlwaysEnabled() {
     if (this.ui.messageInput) {