agentgui 1.0.185 → 1.0.187

package/lib/claude-runner.js

@@ -107,11 +107,34 @@ class AgentRunner {
         const errorText = chunk.toString();
         console.error(`[${this.id}] stderr:`, errorText);
 
-        const rateLimitMatch = errorText.match(/rate.?limit|429|too many requests|overloaded|throttl/i);
+        const rateLimitMatch = errorText.match(/rate.?limit|429|too many requests|overloaded|throttl|hit your limit/i);
         if (rateLimitMatch) {
           rateLimited = true;
           const retryMatch = errorText.match(/retry.?after[:\s]+(\d+)/i);
-          if (retryMatch) retryAfterSec = parseInt(retryMatch[1], 10) || 60;
+          if (retryMatch) {
+            retryAfterSec = parseInt(retryMatch[1], 10) || 60;
+          } else {
+            const resetTimeMatch = errorText.match(/resets?\s+(?:at\s+)?(\d{1,2})(?::(\d{2}))?\s*(am|pm)?\s*\(?(UTC|[A-Z]{2,4})\)?/i);
+            if (resetTimeMatch) {
+              let hours = parseInt(resetTimeMatch[1], 10);
+              const minutes = resetTimeMatch[2] ? parseInt(resetTimeMatch[2], 10) : 0;
+              const period = resetTimeMatch[3]?.toLowerCase();
+              const tz = resetTimeMatch[4]?.toUpperCase() || 'UTC';
+
+              if (period === 'pm' && hours !== 12) hours += 12;
+              if (period === 'am' && hours === 12) hours = 0;
+
+              const now = new Date();
+              const resetTime = new Date(now);
+              resetTime.setUTCHours(hours, minutes, 0, 0);
+
+              if (resetTime <= now) {
+                resetTime.setUTCDate(resetTime.getUTCDate() + 1);
+              }
+
+              retryAfterSec = Math.max(60, Math.ceil((resetTime.getTime() - now.getTime()) / 1000));
+            }
+          }
         }
 
         if (onError) {

package/package.json

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

package/server.js

@@ -1014,10 +1014,34 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
     });
 
     if (isRateLimit) {
+      const existingState = rateLimitState.get(conversationId) || {};
+      const retryCount = (existingState.retryCount || 0) + 1;
+      const maxRateLimitRetries = 3;
+
+      if (retryCount > maxRateLimitRetries) {
+        debugLog(`[rate-limit] Conv ${conversationId} hit rate limit ${retryCount} times, giving up`);
+        broadcastSync({
+          type: 'streaming_error',
+          sessionId,
+          conversationId,
+          error: `Rate limit exceeded after ${retryCount} attempts. Please try again later.`,
+          recoverable: false,
+          timestamp: Date.now()
+        });
+        const errorMessage = queries.createMessage(conversationId, 'assistant', `Error: Rate limit exceeded after ${retryCount} attempts. Please try again later.`);
+        broadcastSync({
+          type: 'message_created',
+          conversationId,
+          message: errorMessage,
+          timestamp: Date.now()
+        });
+        return;
+      }
+
       const cooldownMs = (error.retryAfterSec || 60) * 1000;
       const retryAt = Date.now() + cooldownMs;
-      rateLimitState.set(conversationId, { retryAt, cooldownMs });
-      debugLog(`[rate-limit] Conv ${conversationId} hit rate limit, retry in ${cooldownMs}ms`);
+      rateLimitState.set(conversationId, { retryAt, cooldownMs, retryCount });
+      debugLog(`[rate-limit] Conv ${conversationId} hit rate limit (attempt ${retryCount}/${maxRateLimitRetries}), retry in ${cooldownMs}ms`);
 
       broadcastSync({
         type: 'rate_limit_hit',
@@ -1025,6 +1049,7 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
         conversationId,
         retryAfterMs: cooldownMs,
         retryAt,
+        retryCount,
         timestamp: Date.now()
       });
 
@@ -1032,7 +1057,7 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
 
       setTimeout(() => {
         rateLimitState.delete(conversationId);
-        debugLog(`[rate-limit] Conv ${conversationId} cooldown expired, restarting`);
+        debugLog(`[rate-limit] Conv ${conversationId} cooldown expired, restarting (attempt ${retryCount + 1})`);
         broadcastSync({
           type: 'rate_limit_clear',
           conversationId,
@@ -1172,10 +1197,18 @@ wss.on('connection', (ws, req) => {
             timestamp: Date.now()
           }));
         } else if (data.type === 'unsubscribe') {
-          ws.subscriptions.delete(data.sessionId);
-          const idx = subscriptionIndex.get(data.sessionId);
-          if (idx) { idx.delete(ws); if (idx.size === 0) subscriptionIndex.delete(data.sessionId); }
-          debugLog(`[WebSocket] Client ${ws.clientId} unsubscribed from ${data.sessionId}`);
+          if (data.sessionId) {
+            ws.subscriptions.delete(data.sessionId);
+            const idx = subscriptionIndex.get(data.sessionId);
+            if (idx) { idx.delete(ws); if (idx.size === 0) subscriptionIndex.delete(data.sessionId); }
+          }
+          if (data.conversationId) {
+            const key = `conv-${data.conversationId}`;
+            ws.subscriptions.delete(key);
+            const idx = subscriptionIndex.get(key);
+            if (idx) { idx.delete(ws); if (idx.size === 0) subscriptionIndex.delete(key); }
+          }
+          debugLog(`[WebSocket] Client ${ws.clientId} unsubscribed from ${data.sessionId || data.conversationId}`);
         } else if (data.type === 'get_subscriptions') {
           ws.send(JSON.stringify({
             type: 'subscriptions',

package/static/js/client.js

@@ -1335,7 +1335,11 @@ class AgentGUIClient {
     try {
       this.cacheCurrentConversation();
       this.stopChunkPolling();
-      if (this.state.currentConversation?.id !== conversationId) {
+      var prevId = this.state.currentConversation?.id;
+      if (prevId && prevId !== conversationId) {
+        if (this.wsManager.isConnected && !this.state.streamingConversations.has(prevId)) {
+          this.wsManager.sendMessage({ type: 'unsubscribe', conversationId: prevId });
+        }
         this.state.currentSession = null;
       }
 

package/static/js/voice.js

@@ -585,9 +585,11 @@
       }
       if (!voiceActive) return;
       if (data.type === 'streaming_progress' && data.block) {
+        if (data.conversationId && data.conversationId !== currentConversationId) return;
         handleVoiceBlock(data.block, true);
       }
       if (data.type === 'streaming_start') {
+        if (data.conversationId && data.conversationId !== currentConversationId) return;
         spokenChunks = new Set();
       }
     });