@prestyj/agent 4.3.209 → 4.3.237

package/dist/index.cjs

@@ -26,6 +26,7 @@ __export(index_exports, {
   isAbortError: () => isAbortError,
   isBillingError: () => isBillingError,
   isContextOverflow: () => isContextOverflow,
+  isUsageLimitError: () => isUsageLimitError,
   setStreamDiagnostic: () => setStreamDiagnostic
 });
 module.exports = __toCommonJS(index_exports);
@@ -36,7 +37,7 @@ var import_ai2 = require("@prestyj/ai");
 // src/agent-loop.ts
 var import_zod = require("zod");
 var import_ai = require("@prestyj/ai");
-var DEFAULT_MAX_TURNS = 200;
+var DEFAULT_MAX_TURNS = 300;
 var _diagFn = null;
 function setStreamDiagnostic(fn) {
   _diagFn = fn;
@@ -99,15 +100,27 @@ function isBillingError(err) {
   const msg = err.message.toLowerCase();
   return msg.includes("insufficient balance") || msg.includes("no resource package") || msg.includes("quota exceeded") || msg.includes("billing") || msg.includes("recharge") || msg.includes("subscription plan") || msg.includes("does not yet include access") || msg.includes("token quota") || msg.includes("exceeded_current_quota_error") || msg.includes("check your account balance");
 }
+function isUsageLimitError(err) {
+  if (!(err instanceof Error)) return false;
+  return /usage limit reached/i.test(err.message);
+}
 function isToolPairingError(err) {
   if (!(err instanceof Error)) return false;
   const msg = err.message.toLowerCase();
   return msg.includes("tool_use") && msg.includes("tool_result") || msg.includes("unexpected `tool_use_id`") || msg.includes("tool_use ids found without") || // Moonshot/OpenAI-compatible: "tool call id <id> is not found"
   msg.includes("tool call id") && msg.includes("is not found");
 }
+function isThinkingBlockError(err) {
+  if (!(err instanceof Error)) return false;
+  const msg = err.message.toLowerCase();
+  if (!msg.includes("thinking")) return false;
+  return msg.includes("cannot be modified") || msg.includes("must remain as they were") || msg.includes("signature") && msg.includes("invalid") || // "Expected `thinking` or `redacted_thinking`, but found `text`"
+  msg.includes("expected") && msg.includes("but found");
+}
 function classifyOverload(err) {
   if (!(err instanceof Error)) return null;
   if (isBillingError(err)) return null;
+  if (isUsageLimitError(err)) return null;
   const msg = err.message.toLowerCase();
   const errorWithStatus = err;
   const statusCode = typeof errorWithStatus.statusCode === "number" ? errorWithStatus.statusCode : void 0;
@@ -196,6 +209,7 @@ async function* agentLoop(messages, options) {
   let firstTurn = true;
   let consecutivePauses = 0;
   let toolPairingRepaired = false;
+  let thinkingBlocksStripped = false;
   let overloadRetries = 0;
   let emptyResponseRetries = 0;
   let stallRetries = 0;
@@ -212,7 +226,7 @@ async function* agentLoop(messages, options) {
   const OVERLOAD_BASE_DELAY_MS = 2e3;
   const OVERLOAD_MAX_DELAY_MS = 3e4;
   const STREAM_FIRST_EVENT_TIMEOUT_MS = 45e3;
-  const STREAM_IDLE_TIMEOUT_MS = 3e4;
+  const STREAM_IDLE_TIMEOUT_MS = 9e4;
   const STREAM_HARD_TIMEOUT_MS = 9e4;
   const STREAM_OUTPUT_HARD_TIMEOUT_MS = 3e5;
   const STREAM_THINKING_IDLE_TIMEOUT_MS = 3e5;
@@ -391,7 +405,10 @@ async function* agentLoop(messages, options) {
             });
           }
           lastEventTime = now;
-          resetIdleTimer();
+          if (idleTimer) {
+            clearTimeout(idleTimer);
+            idleTimer = null;
+          }
           if (event.type === "text_delta") {
             yield { type: "text_delta", text: event.text };
           } else if (event.type === "thinking_delta") {
@@ -433,6 +450,7 @@ async function* agentLoop(messages, options) {
             };
           }
           lastYieldEndTime = Date.now();
+          resetIdleTimer();
         }
         diag("stream_done", {
           events: streamEventCount,
@@ -453,6 +471,13 @@ async function* agentLoop(messages, options) {
           provider: options.provider,
           model: options.model
         });
+        if (isUsageLimitError(err)) {
+          diag("usage_limit_reached", {
+            provider: options.provider,
+            model: options.model
+          });
+          throw err;
+        }
         if (isContextOverflow(err)) {
           const overflowDetails = extractContextOverflowDetails(err);
           diag("context_overflow_detected", {
@@ -626,6 +651,13 @@ async function* agentLoop(messages, options) {
           turn--;
           continue;
         }
+        if (isThinkingBlockError(err) && !thinkingBlocksStripped) {
+          thinkingBlocksStripped = true;
+          diag("thinking_block_repair", { error: errMsg.slice(0, 200) });
+          stripThinkingBlocks(messages);
+          turn--;
+          continue;
+        }
         if (isAbortError(err) || options.signal?.aborted) {
           diag("aborted", { turn, provider: options.provider, model: options.model });
           break;
@@ -1114,6 +1146,24 @@ function repairToolPairingAdjacent(messages) {
     }
   }
 }
+function stripThinkingBlocks(messages) {
+  for (const msg of messages) {
+    if (msg.role !== "assistant" || !Array.isArray(msg.content)) continue;
+    const next = [];
+    for (const part of msg.content) {
+      if (part.type === "thinking") {
+        if (part.text) next.push({ type: "text", text: part.text });
+        continue;
+      }
+      if (part.type === "raw") {
+        const t = part.data.type;
+        if (t === "thinking" || t === "redacted_thinking") continue;
+      }
+      next.push(part);
+    }
+    msg.content = next;
+  }
+}
 
 // src/agent.ts
 var AgentStream = class {
@@ -1236,6 +1286,7 @@ var Agent = class {
   isAbortError,
   isBillingError,
   isContextOverflow,
+  isUsageLimitError,
   setStreamDiagnostic
 });
 //# sourceMappingURL=index.cjs.map