agentgui 1.0.794 → 1.0.796

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.794",
+  "version": "1.0.796",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "electron/main.js",

package/server.js

@@ -8,6 +8,7 @@ import { WebSocketServer } from 'ws';
 import { execSync, spawn } from 'child_process';
 import { LRUCache } from 'lru-cache';
 import { createRequire } from 'module';
+import crypto from 'crypto';
 const PKG_VERSION = JSON.parse(fs.readFileSync(new URL('./package.json', import.meta.url), 'utf8')).version;
 import express from 'express';
 import Busboy from 'busboy';
@@ -59,20 +60,7 @@ process.on('unhandledRejection', (reason, promise) => {
   if (reason instanceof Error) console.error(reason.stack);
 });
 
-function gracefulShutdown(signal) {
-  console.log(`[SIGNAL] ${signal} received - graceful shutdown`);
-  try { pm2Manager.disconnect(); } catch (_) {}
-  if (jsonlWatcher) try { jsonlWatcher.stop(); } catch (_) {}
-  for (const [convId, entry] of activeExecutions) {
-    try { if (entry.pid) process.kill(entry.pid, 'SIGTERM'); } catch (_) {}
-  }
-  stopACPTools().catch(() => {}).finally(() => {
-    try { wss.close(() => server.close(() => process.exit(0))); } catch (_) { process.exit(0); }
-    setTimeout(() => process.exit(1), 5000);
-  });
-}
-process.on('SIGINT', () => gracefulShutdown('SIGINT'));
-process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
+// Signal handlers registered after server initialization (see bottom of file)
 process.on('SIGHUP', () => { console.log('[SIGNAL] SIGHUP received (ignored - uncrashable)'); });
 process.on('beforeExit', (code) => { console.log('[PROCESS] beforeExit with code:', code); });
 process.on('exit', (code) => { console.log('[PROCESS] exit with code:', code); });
@@ -469,7 +457,7 @@ const server = http.createServer(async (req, res) => {
       try {
         const _decoded = Buffer.from(_auth.slice(6), 'base64').toString('utf8');
         const _ci = _decoded.indexOf(':');
-        if (_ci !== -1) _ok = _decoded.slice(_ci + 1) === _pwd;
+        if (_ci !== -1) { const _p = _decoded.slice(_ci + 1); try { _ok = _p.length === _pwd.length && crypto.timingSafeEqual(Buffer.from(_p), Buffer.from(_pwd)); } catch { _ok = false; } }
       } catch (_) {}
     }
     if (!_ok) {
@@ -1966,10 +1954,21 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
               }
               
               // Set flag to stop processing and trigger retry
-              rateLimitState.set(conversationId, { 
-                retryAt: Date.now() + (retryAfterSec * 1000), 
-                cooldownMs: retryAfterSec * 1000, 
-                retryCount: 0,
+              const existingRetryCount = rateLimitState.get(conversationId)?.retryCount || 0;
+              if (existingRetryCount >= 3) {
+                debugLog(`[rate-limit] Conv ${conversationId} stream rate limit hit ${existingRetryCount + 1} times, giving up`);
+                batcher.drain();
+                activeExecutions.delete(conversationId);
+                queries.setIsStreaming(conversationId, false);
+                const errorMessage = queries.createMessage(conversationId, 'assistant', `Error: Rate limit exceeded after ${existingRetryCount + 1} attempts. Please try again later.`);
+                broadcastSync({ type: 'message_created', conversationId, message: errorMessage, timestamp: Date.now() });
+                broadcastSync({ type: 'streaming_complete', sessionId, conversationId, interrupted: true, timestamp: Date.now() });
+                return;
+              }
+              rateLimitState.set(conversationId, {
+                retryAt: Date.now() + (retryAfterSec * 1000),
+                cooldownMs: retryAfterSec * 1000,
+                retryCount: existingRetryCount + 1,
                 isStreamDetected: true
               });
               
@@ -2073,27 +2072,38 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
               } catch (e) {}
             }
             
-            rateLimitState.set(conversationId, { 
-              retryAt: Date.now() + (retryAfterSec * 1000), 
-              cooldownMs: retryAfterSec * 1000, 
-              retryCount: 0,
+            const existingRetryCount2 = rateLimitState.get(conversationId)?.retryCount || 0;
+            if (existingRetryCount2 >= 3) {
+              debugLog(`[rate-limit] Conv ${conversationId} result rate limit hit ${existingRetryCount2 + 1} times, giving up`);
+              batcher.drain();
+              activeExecutions.delete(conversationId);
+              queries.setIsStreaming(conversationId, false);
+              const errorMessage = queries.createMessage(conversationId, 'assistant', `Error: Rate limit exceeded after ${existingRetryCount2 + 1} attempts. Please try again later.`);
+              broadcastSync({ type: 'message_created', conversationId, message: errorMessage, timestamp: Date.now() });
+              broadcastSync({ type: 'streaming_complete', sessionId, conversationId, interrupted: true, timestamp: Date.now() });
+              return;
+            }
+            rateLimitState.set(conversationId, {
+              retryAt: Date.now() + (retryAfterSec * 1000),
+              cooldownMs: retryAfterSec * 1000,
+              retryCount: existingRetryCount2 + 1,
               isStreamDetected: true
             });
-            
+
             broadcastSync({
               type: 'rate_limit_hit',
               sessionId,
               conversationId,
               retryAfterMs: retryAfterSec * 1000,
               retryAt: Date.now() + (retryAfterSec * 1000),
-              retryCount: 1,
+              retryCount: existingRetryCount2 + 1,
               timestamp: Date.now()
             });
-            
+
             batcher.drain();
             activeExecutions.delete(conversationId);
             queries.setIsStreaming(conversationId, false);
-            
+
             setTimeout(() => {
               rateLimitState.delete(conversationId);
               broadcastSync({
@@ -2103,7 +2113,7 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
               });
               scheduleRetry(conversationId, messageId, content, agentId, model, subAgent);
             }, retryAfterSec * 1000);
-            
+
             return;
           }
           
@@ -2938,10 +2948,12 @@ function killActiveExecutions() {
 
 process.on('SIGTERM', () => {
   console.log('[SIGNAL] SIGTERM received - graceful shutdown');
-  if (!watch) killActiveExecutions();
+  killActiveExecutions();
+  if (jsonlWatcher) try { jsonlWatcher.stop(); } catch (_) {}
   try { pm2Manager.disconnect(); } catch (_) {}
   stopACPTools().catch(() => {}).finally(() => {
     try { wss.close(() => server.close(() => process.exit(0))); } catch (_) { process.exit(0); }
+    setTimeout(() => process.exit(1), 5000);
   });
 });