agentgui 1.0.648 → 1.0.650

package/lib/claude-runner.js

@@ -203,6 +203,10 @@ class AgentRunner {
 
       proc.on('close', (code) => {
         clearTimeout(timeoutHandle);
+        // Close stdin when process exits - it was kept open for steering during execution
+        if (proc.stdin && !proc.stdin.destroyed) {
+          try { proc.stdin.end(); } catch (e) {}
+        }
         if (timedOut) return;
 
         if (authError) {
@@ -609,9 +613,9 @@ registry.register({
   name: 'Claude Code',
   command: 'claude',
   protocol: 'direct',
-  supportsStdin: true, // keep open for steering via JSON-RPC
-  closeStdin: false, // must NOT close stdin to allow steering prompts
-  useJsonRpcStdin: true, // support JSON-RPC steering input
+  supportsStdin: false, // prompt passed as positional arg, not stdin
+  closeStdin: false, // keep stdin open for JSON-RPC steering commands
+  useJsonRpcStdin: false,
   supportedFeatures: ['streaming', 'resume', 'system-prompt', 'permissions-skip', 'steering'],
   spawnEnv: { MAX_THINKING_TOKENS: '0' },
 
@@ -633,8 +637,7 @@ registry.register({
     if (model) flags.push('--model', model);
     if (resumeSessionId) flags.push('--resume', resumeSessionId);
     if (systemPrompt) flags.push('--append-system-prompt', systemPrompt);
-    // Do NOT pass prompt as positional arg - send via stdin instead to allow steering
-    // This allows stdin to stay open for receiving JSON-RPC steering commands
+    flags.push(prompt); // positional arg - stdin stays open separately for steering
 
     return flags;
   },

package/package.json

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

package/server.js

@@ -4643,89 +4643,41 @@ server.on('error', (err) => {
   }
 });
 
+// On startup: mark all active/pending sessions as interrupted (server was down, they didn't complete).
+// Then resumeInterruptedStreams will pick up recent ones for auto-resume.
 function recoverStaleSessions() {
   try {
-    const now = Date.now();
-    const RESUME_WINDOW_MS = 600000; // 10 minutes
-
-    const resumable = new Set();
-    const resumableConvs = queries.getResumableConversations ? queries.getResumableConversations(RESUME_WINDOW_MS) : [];
-    for (const conv of resumableConvs) {
-      resumable.add(conv.id); // All agent types are resumable
-    }
-
-    const staleSessions = queries.getActiveSessions ? queries.getActiveSessions() : [];
-    let markedCount = 0;
+    const RESUME_WINDOW_MS = 600000;
+    const cutoff = Date.now() - RESUME_WINDOW_MS;
+    const staleSessions = queries.getActiveSessions();
     for (const session of staleSessions) {
-      if (activeExecutions.has(session.conversationId)) continue;
-      if (resumable.has(session.conversationId)) continue;
       queries.updateSession(session.id, {
-        status: 'error',
+        status: session.started_at > cutoff ? 'interrupted' : 'error',
         error: 'Server restarted',
-        completed_at: now
+        completed_at: Date.now()
       });
-      markedCount++;
     }
-    if (markedCount > 0) {
-      console.log(`[RECOVERY] Marked ${markedCount} stale session(s) as error`);
-    }
-
-    const streamingConvs = queries.getStreamingConversations ? queries.getStreamingConversations() : [];
-    let clearedCount = 0;
-    for (const conv of streamingConvs) {
-      if (activeExecutions.has(conv.id)) continue;
-      if (resumable.has(conv.id)) continue;
-      queries.setIsStreaming(conv.id, false);
-      clearedCount++;
-    }
-    if (clearedCount > 0) {
-      console.log(`[RECOVERY] Cleared isStreaming flag on ${clearedCount} stale conversation(s)`);
-    }
-    if (resumable.size > 0) {
-      console.log(`[RECOVERY] Found ${resumable.size} resumable conversation(s)`);
+    // Clear all isStreaming flags - nothing is running yet
+    queries.clearAllStreamingFlags();
+    if (staleSessions.length > 0) {
+      console.log(`[RECOVERY] Marked ${staleSessions.length} stale session(s); cleared streaming flags`);
     }
   } catch (err) {
-    console.error('[RECOVERY] Stale session recovery error:', err.message);
+    console.error('[RECOVERY] Error:', err.message);
   }
 }
 
+// Resume conversations with recently interrupted sessions (started within 10 min).
 async function resumeInterruptedStreams() {
   try {
-    const RESUME_WINDOW_MS = 600000; // Only resume sessions active within the last 10 minutes
-    const cutoff = Date.now() - RESUME_WINDOW_MS;
-
-    // Get conversations marked as streaming in database (isStreaming=1)
-    // Fall back to getResumableConversations if isStreaming is not being used
-    let toResume = [];
-
-    // Primary: Check database isStreaming flag for conversations still marked as active
-    // Exclude conversations whose last session completed or started more than 10 min ago
-    const streamingConvs = queries.getConversations().filter(c => {
-      if (c.isStreaming !== 1) return false;
-      const lastSession = queries.getLatestSession(c.id);
-      if (!lastSession) return false;
-      if (lastSession.status === 'complete') return false;
-      // Only resume if session started within the last 10 minutes
-      return lastSession.started_at > cutoff;
-    });
-
-    if (streamingConvs.length > 0) {
-      toResume = streamingConvs;
-    } else {
-      // Fallback: Use session-based resumable conversations (already filtered by 10 min)
-      toResume = queries.getResumableConversations ? queries.getResumableConversations(RESUME_WINDOW_MS) : [];
-    }
-
+    const toResume = queries.getResumableConversations(600000);
     if (toResume.length === 0) return;
-
     console.log(`[RESUME] Resuming ${toResume.length} interrupted conversation(s)`);
-
     for (let i = 0; i < toResume.length; i++) {
       const conv = toResume[i];
       try {
-        const previousSessions = [...queries.getSessionsByStatus(conv.id, 'active'), ...queries.getSessionsByStatus(conv.id, 'pending')];
-        const previousSessionId = previousSessions.length > 0 ? previousSessions[0].id : null;
-        await resumeConversation(conv.id, previousSessionId, 'Server restarted, resuming');
+        const lastSession = queries.getLatestSession(conv.id);
+        await resumeConversation(conv.id, lastSession?.id || null, 'Server restarted');
         if (i < toResume.length - 1) await new Promise(r => setTimeout(r, 200));
       } catch (err) {
         console.error(`[RESUME] Failed to resume conv ${conv.id}: ${err.message}`);
@@ -4733,7 +4685,7 @@ async function resumeInterruptedStreams() {
       }
     }
   } catch (err) {
-    console.error('[RESUME] Error during stream resumption:', err.message);
+    console.error('[RESUME] Error:', err.message);
   }
 }
 

package/static/js/client.js

@@ -1453,7 +1453,7 @@ class AgentGUIClient {
     this.enableControls();
   }
 
-  async handleAllConversationsDeleted(data) {
+  handleAllConversationsDeleted(data) {
     window.ConversationState?.clear('all_deleted');
     this.state.currentConversation = null;
     this.state.conversations = [];
@@ -1462,10 +1462,6 @@ class AgentGUIClient {
     this.conversationListCache = { data: [], timestamp: 0, ttl: 30000 };
     this.draftPrompts.clear();
     window.dispatchEvent(new CustomEvent('conversation-deselected'));
-    if (window.conversationManager) {
-      this.state.currentConversation = null;
-      await window.conversationManager.loadConversations();
-    }
     const outputEl = document.getElementById('output');
     if (outputEl) outputEl.innerHTML = '';
   }