@acmecloud/core 1.0.9 → 1.0.11

package/dist/agent/index.js

@@ -280,30 +280,39 @@ export async function* runAgent(provider, modelName, messages, systemPrompt, abo
                 yield { type: "messages", messages: currentMessages };
                 return [];
             }
-            else {
+            // Check if this is a content safety error (should not retry)
+            const errorMessage = err.message?.toLowerCase() || "";
+            const isContentSafetyError = errorMessage.includes("sensitive_words_detected") ||
+                errorMessage.includes("content_policy") ||
+                errorMessage.includes("safety") ||
+                errorMessage.includes("content_filter");
+            if (isContentSafetyError) {
+                // Content safety errors should not be retried - they won't succeed by retrying
                 yield {
                     type: "text",
-                    text: `\n[Error: ${err.message}]\n[Auto-recovering from stream drop...]\n`,
+                    text: `\n[Content Safety Error: ${err.message}]\n\nThis request triggered the content safety filter. Please modify your request to avoid sensitive topics and try again.\n`,
                 };
-                if (stepText.trim()) {
-                    currentMessages.push({ role: "assistant", content: stepText });
-                }
-                consecutiveErrors++;
-                if (consecutiveErrors >= 3) {
-                    yield {
-                        type: "text",
-                        text: `\n[Fatal Error: Stream dropped ${consecutiveErrors} times consecutively. Halting agent to prevent infinite loops.]\n`,
-                    };
-                    yield { type: "messages", messages: currentMessages };
-                    return [];
-                }
-                currentMessages.push({
-                    role: "user",
-                    content: `[System Error: The network stream disconnected prematurely with error: ${err.message || err}. Please carefully analyze the incomplete text you just generated, and continue your thought or tool execution precisely from where it was cut off without repeating yourself.]`,
-                });
-                await new Promise((resolve) => setTimeout(resolve, 2000));
-                continue;
+                yield { type: "messages", messages: currentMessages };
+                return [];
             }
+            // For all other errors (network issues, timeout, server errors), auto-recover indefinitely
+            yield {
+                type: "text",
+                text: `\n[Error: ${err.message}]\n[Auto-recovering from stream drop...]\n`,
+            };
+            if (stepText.trim()) {
+                currentMessages.push({ role: "assistant", content: stepText });
+            }
+            consecutiveErrors++;
+            // Add system message to prompt the model to continue
+            currentMessages.push({
+                role: "user",
+                content: `[System Error: The network stream disconnected prematurely with error: ${err.message || err}. Please carefully analyze the incomplete text you just generated, and continue your thought or tool execution precisely from where it was cut off without repeating yourself.]`,
+            });
+            // Exponential backoff: 2s, 4s, 8s, max 30s
+            const delay = Math.min(2000 * Math.pow(2, Math.min(consecutiveErrors - 1, 3)), 30000);
+            await new Promise((resolve) => setTimeout(resolve, delay));
+            continue;
         }
         if (collectedToolCalls.length === 0) {
             const parseText = stepText
@@ -412,6 +421,7 @@ export async function* runAgent(provider, modelName, messages, systemPrompt, abo
         }
         if (collectedToolCalls.length === 0) {
             if (!stepText.trim()) {
+                // Empty response - retry a few times
                 consecutiveErrors++;
                 if (consecutiveErrors < 3) {
                     yield {
@@ -435,9 +445,17 @@ export async function* runAgent(provider, modelName, messages, systemPrompt, abo
                     return [];
                 }
             }
+            // Model returned text but no tool calls
+            // This is normal - the model might be providing explanation or asking for clarification
+            // Add the response to history and continue the loop to let model continue working
             currentMessages.push({ role: "assistant", content: stepText });
-            yield { type: "messages", messages: currentMessages };
-            return [];
+            // Add a system prompt to encourage the model to continue if task is not complete
+            currentMessages.push({
+                role: "user",
+                content: `[System] You provided some output but did not complete the task. Please continue working on the task or explain what you need from the user. If you need to use tools, please do so now.`,
+            });
+            // Continue the loop instead of returning
+            continue;
         }
         yield { type: "text", text: "\n" };
         const toolSummary = collectedToolResults

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acmecloud/core",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/agent/index.ts

@@ -362,34 +362,51 @@ export async function* runAgent(
         yield { type: "text", text: "\n[Aborted by user]\n" };
         yield { type: "messages", messages: currentMessages };
         return [];
-      } else {
+      }
+
+      // Check if this is a content safety error (should not retry)
+      const errorMessage = err.message?.toLowerCase() || "";
+      const isContentSafetyError =
+        errorMessage.includes("sensitive_words_detected") ||
+        errorMessage.includes("content_policy") ||
+        errorMessage.includes("safety") ||
+        errorMessage.includes("content_filter");
+
+      if (isContentSafetyError) {
+        // Content safety errors should not be retried - they won't succeed by retrying
         yield {
           type: "text",
-          text: `\n[Error: ${err.message}]\n[Auto-recovering from stream drop...]\n`,
+          text: `\n[Content Safety Error: ${err.message}]\n\nThis request triggered the content safety filter. Please modify your request to avoid sensitive topics and try again.\n`,
         };
+        yield { type: "messages", messages: currentMessages };
+        return [];
+      }
 
-        if (stepText.trim()) {
-          currentMessages.push({ role: "assistant", content: stepText });
-        }
+      // For all other errors (network issues, timeout, server errors), auto-recover indefinitely
+      yield {
+        type: "text",
+        text: `\n[Error: ${err.message}]\n[Auto-recovering from stream drop...]\n`,
+      };
 
-        consecutiveErrors++;
-        if (consecutiveErrors >= 3) {
-          yield {
-            type: "text",
-            text: `\n[Fatal Error: Stream dropped ${consecutiveErrors} times consecutively. Halting agent to prevent infinite loops.]\n`,
-          };
-          yield { type: "messages", messages: currentMessages };
-          return [];
-        }
+      if (stepText.trim()) {
+        currentMessages.push({ role: "assistant", content: stepText });
+      }
 
-        currentMessages.push({
-          role: "user",
-          content: `[System Error: The network stream disconnected prematurely with error: ${err.message || err}. Please carefully analyze the incomplete text you just generated, and continue your thought or tool execution precisely from where it was cut off without repeating yourself.]`,
-        });
+      consecutiveErrors++;
 
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-        continue;
-      }
+      // Add system message to prompt the model to continue
+      currentMessages.push({
+        role: "user",
+        content: `[System Error: The network stream disconnected prematurely with error: ${err.message || err}. Please carefully analyze the incomplete text you just generated, and continue your thought or tool execution precisely from where it was cut off without repeating yourself.]`,
+      });
+
+      // Exponential backoff: 2s, 4s, 8s, max 30s
+      const delay = Math.min(
+        2000 * Math.pow(2, Math.min(consecutiveErrors - 1, 3)),
+        30000,
+      );
+      await new Promise((resolve) => setTimeout(resolve, delay));
+      continue;
     }
 
     if (collectedToolCalls.length === 0) {
@@ -511,6 +528,7 @@ export async function* runAgent(
 
     if (collectedToolCalls.length === 0) {
       if (!stepText.trim()) {
+        // Empty response - retry a few times
         consecutiveErrors++;
         if (consecutiveErrors < 3) {
           yield {
@@ -534,9 +552,19 @@ export async function* runAgent(
         }
       }
 
+      // Model returned text but no tool calls
+      // This is normal - the model might be providing explanation or asking for clarification
+      // Add the response to history and continue the loop to let model continue working
       currentMessages.push({ role: "assistant", content: stepText });
-      yield { type: "messages", messages: currentMessages };
-      return [];
+
+      // Add a system prompt to encourage the model to continue if task is not complete
+      currentMessages.push({
+        role: "user",
+        content: `[System] You provided some output but did not complete the task. Please continue working on the task or explain what you need from the user. If you need to use tools, please do so now.`,
+      });
+
+      // Continue the loop instead of returning
+      continue;
     }
 
     yield { type: "text", text: "\n" };