agentgui 1.0.594 → 1.0.596

package/lib/ws-handlers-conv.js

@@ -104,7 +104,6 @@ export function register(router, deps) {
     if (!conv) notFound('Conversation not found');
     if (!p.content) fail(400, 'Missing content');
     const entry = activeExecutions.get(p.id);
-    if (entry && p.eager) fail(409, 'Cannot eagerly inject while execution is running - message queued');
     const message = queries.createMessage(p.id, 'user', '[INJECTED] ' + p.content);
     if (!entry) {
       const agentId = conv.agentId || 'claude-code';

package/package.json

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

package/static/js/client.js

@@ -79,6 +79,10 @@ class AgentGUIClient {
     this._inflightRequests = new Map();
     this._previousConvAbort = null;
 
+    // PHASE 2: Request Lifetime Tracking
+    this._loadInProgress = {}; // { [conversationId]: { requestId, abortController, timestamp, prevConversationId } }
+    this._currentRequestId = 0; // Auto-incrementing request counter
+
     this._scrollKalman = typeof KalmanFilter !== 'undefined' ? new KalmanFilter({ processNoise: 50, measurementNoise: 100 }) : null;
     this._scrollTarget = 0;
     this._scrollAnimating = false;
@@ -491,17 +495,21 @@ class AgentGUIClient {
             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);
+
+          // Capture message and clear UI immediately (no await)
+          const steerMsg = message;
+          if (this.ui.messageInput) {
+            this.ui.messageInput.value = '';
+            this.ui.messageInput.style.height = 'auto';
           }
+
+          // Fire RPC in background, don't await
+          window.wsClient.rpc('conv.steer', { id: this.state.currentConversation.id, content: steerMsg })
+            .then(data => console.log('Steer response:', data))
+            .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;
@@ -2521,6 +2529,55 @@ class AgentGUIClient {
     this.conversationCache.delete(conversationId);
   }
 
+  /**
+   * PHASE 2: Create a new load request with lifetime tracking
+   * Assigns unique requestId, tracks in _loadInProgress, returns abort signal
+   * Automatically cancels previous loads to this conversation
+   */
+  _makeLoadRequest(conversationId) {
+    const requestId = ++this._currentRequestId;
+    const abortController = new AbortController();
+
+    // Cancel previous request to this conversation
+    if (this._loadInProgress[conversationId]) {
+      const prevReq = this._loadInProgress[conversationId];
+      try {
+        prevReq.abortController.abort();
+      } catch (e) {}
+    }
+
+    this._loadInProgress[conversationId] = {
+      requestId,
+      abortController,
+      timestamp: Date.now(),
+      prevConversationId: this.state.currentConversation?.id
+    };
+
+    return { requestId, abortController: abortController.signal };
+  }
+
+  /**
+   * PHASE 2: Verify request is still current before rendering
+   * Returns true if requestId matches current load for this conversation
+   * Returns false if newer request arrived, or request was cancelled
+   */
+  _verifyRequestId(conversationId, requestId) {
+    const current = this._loadInProgress[conversationId];
+    if (!current) return false;
+    if (current.requestId !== requestId) return false;
+    return true;
+  }
+
+  /**
+   * PHASE 2: Complete/cleanup a load request
+   */
+  _completeLoadRequest(conversationId, requestId) {
+    const req = this._loadInProgress[conversationId];
+    if (req && req.requestId === requestId) {
+      delete this._loadInProgress[conversationId];
+    }
+  }
+
   async loadConversationMessages(conversationId) {
     try {
       if (this._previousConvAbort) {