@kenkaiiii/gg-agent 5.4.1 → 5.4.3

package/dist/index.cjs

@@ -217,6 +217,7 @@ async function* agentLoop(messages, options) {
   const toolMap = new Map((options.tools ?? []).map((t) => [t.name, t]));
   const totalUsage = { inputTokens: 0, outputTokens: 0 };
   let turn = 0;
+  let hitMaxTurns = false;
   let firstTurn = true;
   let consecutivePauses = 0;
   let toolPairingRepaired = false;
@@ -227,6 +228,7 @@ async function* agentLoop(messages, options) {
   let overflowCompactionAttempts = 0;
   let toolResultTruncationAttempted = false;
   const invalidToolArgumentCounts = /* @__PURE__ */ new Map();
+  let toolArgumentAutoContinueUsed = false;
   let useNonStreamingFallback = false;
   const MAX_OVERLOAD_RETRIES = 10;
   const MAX_EMPTY_RESPONSE_RETRIES = 2;
@@ -793,8 +795,12 @@ async function* agentLoop(messages, options) {
         }
       }
       let fatalToolArgumentError = null;
-      const markFatalToolArgumentError = (error) => {
+      let fatalToolArgumentRecoverable = false;
+      let fatalToolArgumentToolName = "";
+      const markFatalToolArgumentError = (error, recoverable, toolName) => {
         fatalToolArgumentError = error;
+        fatalToolArgumentRecoverable = recoverable;
+        fatalToolArgumentToolName = toolName;
       };
       const executionOptions = {
         signal: options.signal,
@@ -810,8 +816,24 @@ async function* agentLoop(messages, options) {
       messages.push({ role: "tool", content: executionResult.toolResults });
       const toolsAborted = executionResult.aborted;
       if (fatalToolArgumentError) {
-        yield { type: "error", error: fatalToolArgumentError };
-        break;
+        if (fatalToolArgumentRecoverable && !toolArgumentAutoContinueUsed) {
+          toolArgumentAutoContinueUsed = true;
+          for (const key of invalidToolArgumentCounts.keys()) {
+            if (key.startsWith(`${fatalToolArgumentToolName}:`))
+              invalidToolArgumentCounts.delete(key);
+          }
+          yield {
+            type: "retry",
+            reason: "tool_argument_glitch",
+            attempt: 1,
+            maxAttempts: 1,
+            delayMs: 0,
+            silent: false
+          };
+        } else {
+          yield { type: "error", error: fatalToolArgumentError };
+          break;
+        }
       }
       if (toolsAborted) break;
       if (options.getSteeringMessages) {
@@ -823,6 +845,9 @@ async function* agentLoop(messages, options) {
           }
         }
       }
+      if (turn >= maxTurns) {
+        hitMaxTurns = true;
+      }
     }
   } finally {
     sanitizeOrphanedServerTools(messages);
@@ -834,6 +859,19 @@ async function* agentLoop(messages, options) {
       break;
     }
   }
+  if (hitMaxTurns) {
+    diag("max_turns_reached", {
+      turn,
+      maxTurns,
+      provider: options.provider,
+      model: options.model
+    });
+    yield {
+      type: "max_turns",
+      totalTurns: turn,
+      maxTurns
+    };
+  }
   yield {
     type: "agent_done",
     totalTurns: turn,
@@ -896,10 +934,17 @@ async function executeSingleToolCall(toolCall, options, pushEvent) {
         resultContent = `Invalid arguments for tool \`${toolCall.name}\`:
 ` + prettyError + "\nRe-issue the call with each field as the correct type.";
         if (failureCount >= 3) {
+          const recoverable = Object.keys(toolCall.args ?? {}).length === 0;
           options.markFatalToolArgumentError(
-            new Error(
-              `The model repeatedly issued invalid arguments for tool \`${toolCall.name}\`. This is usually an upstream model/tool-calling bug. Your conversation is preserved; send another message or switch models to continue.`
-            )
+            new import_gg_ai.GGAIError(
+              `The model repeatedly issued invalid arguments for tool \`${toolCall.name}\`. This is usually an upstream model/tool-calling bug` + (recoverable ? " (the provider's stream returned empty tool-call arguments)" : "") + `. Your conversation is preserved; send another message or switch models to continue.`,
+              {
+                source: "provider",
+                hint: "This is the model/provider's fault, not a ggcoder bug. " + (recoverable ? "ggcoder already retried automatically once; if it recurs, send another message or switch models." : "Send another message or switch models to continue.")
+              }
+            ),
+            recoverable,
+            toolCall.name
           );
         }
       } else {