nexrall-code 0.5.103 → 0.5.105

package/dist/index.js

@@ -9973,6 +9973,11 @@ var require_client = __commonJS({
     var MAX_RETRIES = 5;
     var RETRY_BASE_MS = 1e3;
     var RETRY_MAX_MS = 3e4;
+    var HOUSEKEEPING_FRAMES = /* @__PURE__ */ new Set([
+      "resumable",
+      "context_warning",
+      "tool_progress"
+    ]);
     var MAX_TOTAL_RETRY_MS = (() => {
       const raw = Number(process.env.NEXRALL_MAX_RETRY_MS);
       return Number.isFinite(raw) && raw > 0 ? raw : 5 * 6e4;
@@ -10063,7 +10068,12 @@ var require_client = __commonJS({
           }
         ];
       };
-      const isRetryableStreamMsg = (m2) => /overloaded|rate.?limit|temporarily|unavailable|try again|internal server error/i.test(String(m2 ?? ""));
+      const isRetryableStreamMsg = (m2) => {
+        const s2 = String(m2 ?? "");
+        if (/403[\s\S]*"type"\s*:\s*"forbidden"/i.test(s2))
+          return true;
+        return /overloaded|rate.?limit|temporarily|unavailable|try again|internal server error/i.test(s2);
+      };
       let didRetry = false;
       let totalAttemptsMade = 0;
       let retryDeadline = 0;
@@ -10335,7 +10345,8 @@ var require_client = __commonJS({
                 }
                 const evt = parsed;
                 lastProgressAt = Date.now();
-                sawModelEvent = true;
+                if (!HOUSEKEEPING_FRAMES.has(evt.type))
+                  sawModelEvent = true;
                 clearRetryIfNeeded();
                 switch (evt.type) {
                   case "text": {
@@ -10461,6 +10472,7 @@ var require_client = __commonJS({
                   case "error": {
                     const message = typeof evt.message === "string" ? evt.message : typeof evt.error === "string" ? evt.error : "Unknown SSE error";
                     const notResumable = evt.notResumable === true;
+                    const serverSaysRetryable = evt.retryable === true;
                     if (haveCompleteMessage()) {
                       clearInterval(heartbeatWatchdog);
                       onEvent({ type: "error", message });
@@ -10469,7 +10481,7 @@ var require_client = __commonJS({
                       clearInterval(heartbeatWatchdog);
                       stream.destroy?.();
                       reject(Object.assign(tagTransient(new Error(message)), { forceRestart: true }));
-                    } else if (isRetryableStreamMsg(message) && (!emittedToCaller || allowRestartAfterRender)) {
+                    } else if ((serverSaysRetryable || isRetryableStreamMsg(message)) && (!emittedToCaller || allowRestartAfterRender)) {
                       clearInterval(heartbeatWatchdog);
                       stream.destroy?.();
                       reject(tagTransient(new Error(message)));
@@ -10494,7 +10506,8 @@ var require_client = __commonJS({
             });
             stream.on("end", () => {
               clearInterval(heartbeatWatchdog);
-              if (!sawModelEvent && !completedMessage) {
+              const producedNothing = !completedMessage && textParts.length === 0 && toolUseBlocks.length === 0;
+              if (producedNothing) {
                 reject(Object.assign(new Error("Connection closed before the model responded. Retrying\u2026"), { retryable: true }));
                 return;
               }
@@ -103387,7 +103400,9 @@ var require_loop = __commonJS({
       };
     }();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.VERIFY_CMD_RE = exports2.WRITE_TOOL_NAMES = exports2.ToolNotAllowedError = exports2.AGENT_MEMORY_TOOL_SCHEMA = exports2.AGENT_MEMORY_TOOL = exports2._stallLimits = exports2.bashNeedsRepoLock = void 0;
+    exports2.VERIFY_CMD_RE = exports2.WRITE_TOOL_NAMES = exports2.ToolNotAllowedError = exports2.AGENT_MEMORY_TOOL_SCHEMA = exports2.AGENT_MEMORY_TOOL = exports2._stallLimits = exports2._emptyTurnRetry = exports2.bashNeedsRepoLock = void 0;
+    exports2.emptyTurnBackoffMs = emptyTurnBackoffMs;
+    exports2.shouldRetryEmptyTurn = shouldRetryEmptyTurn;
     exports2.errorRoundSignature = errorRoundSignature;
     exports2.executeAgentMemoryWrite = executeAgentMemoryWrite;
     exports2.stopReasonNotice = stopReasonNotice;
@@ -103544,6 +103559,17 @@ var require_loop = __commonJS({
     var HARD_ITERATIONS_CAP = Infinity;
     var STALL_LIMIT = 8;
     var REPEAT_STALL_LIMIT = 12;
+    var EMPTY_TURN_RETRY_LIMIT = 3;
+    var EMPTY_TURN_RETRY_BASE_MS = 1e3;
+    function emptyTurnBackoffMs(attempt) {
+      return EMPTY_TURN_RETRY_BASE_MS * Math.pow(2, Math.max(0, attempt));
+    }
+    function shouldRetryEmptyTurn(stopReason, attemptsSoFar) {
+      if (stopReason === "max_tokens")
+        return false;
+      return attemptsSoFar < EMPTY_TURN_RETRY_LIMIT;
+    }
+    exports2._emptyTurnRetry = { EMPTY_TURN_RETRY_LIMIT, EMPTY_TURN_RETRY_BASE_MS };
     function errorRoundSignature(errored) {
       return errored.map(({ name, error }) => `${name}:${String(error).slice(0, 200)}`).sort().join("|");
     }
@@ -103587,7 +103613,7 @@ var require_loop = __commonJS({
           return null;
         case "empty-response":
           return `
-\u26A0\uFE0F The model returned an empty response, so nothing was done. This is usually a transient upstream hiccup \u2014 send "continue" to retry.
+\u26A0\uFE0F The model returned an empty response ${EMPTY_TURN_RETRY_LIMIT} times in a row, so nothing was done. This is usually a transient upstream hiccup that the agent retries by itself; it did not clear this time. Send "continue" to try again, or switch model with /model if it persists.
 `;
         case "output-limit":
           return `
@@ -104750,6 +104776,7 @@ ${options.nexrallMd}` : "") : options.nexrallMd;
       let stalledRepeatError = null;
       let budget = maxIterations;
       let iteration = 0;
+      let emptyTurnRetries = 0;
       let filesMutatedSinceVerify = false;
       let ranVerificationCmd = false;
       let verificationNudgeSent = false;
@@ -104941,10 +104968,24 @@ ${options.nexrallMd}` : "") : options.nexrallMd;
               messages.push({ role: "user", content: [{ type: "text", text }] });
               continue;
             }
+            if (shouldRetryEmptyTurn(assistantMessage.stopReason, emptyTurnRetries)) {
+              const waitMs = emptyTurnBackoffMs(emptyTurnRetries);
+              emptyTurnRetries++;
+              options.onRetry?.(emptyTurnRetries, EMPTY_TURN_RETRY_LIMIT, "The model returned an empty response \u2014 retrying automatically");
+              await new Promise((r2) => setTimeout(r2, waitMs));
+              if (options.abortSignal?.aborted) {
+                stopReason = "aborted";
+                break;
+              }
+              options.onRetryResolved?.();
+              iteration--;
+              continue;
+            }
             runSimpleHooks(hooks.PostMessageComplete, options.workDir);
             stopReason = assistantMessage.stopReason === "max_tokens" ? "output-limit" : "empty-response";
             break;
           }
+          emptyTurnRetries = 0;
           const { stopReason: _stopReason, ...historyMessage } = assistantMessage;
           messages.push(historyMessage);
           const serverSideResultIds = new Set(assistantMessage.content.filter((b) => b.type === "tool_result").map((b) => b.tool_use_id).filter((id) => !!id));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexrall-code",
-  "version": "0.5.103",
+  "version": "0.5.105",
   "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",