nexrall-code 0.5.51 → 0.5.52

package/dist/index.js

@@ -10234,248 +10234,254 @@ var require_client = __commonJS({
         };
         const haveCompleteMessage = () => completedMessage !== null;
         const partialInputs = {};
-        await new Promise((resolve3, reject) => {
-          const stream = response.body;
-          const HEARTBEAT_TIMEOUT_MS = 9e4;
-          const FIRST_EVENT_TIMEOUT_MS = Number(process.env.NEXRALL_FIRST_EVENT_TIMEOUT_MS) || 3e5;
-          const PROGRESS_TIMEOUT_MS = Number(process.env.NEXRALL_PROGRESS_TIMEOUT_MS) || 15e4;
-          let sawModelEvent = false;
-          let lastDataAt = Date.now();
-          let lastProgressAt = Date.now();
-          const heartbeatWatchdog = setInterval(() => {
-            const now = Date.now();
-            if (haveCompleteMessage() && now - lastDataAt > HEARTBEAT_TIMEOUT_MS) {
-              clearInterval(heartbeatWatchdog);
-              stream.destroy?.();
-              resolve3();
-              return;
-            }
-            if (now - lastDataAt > HEARTBEAT_TIMEOUT_MS) {
-              clearInterval(heartbeatWatchdog);
-              stream.destroy?.();
-              const recoverable = !emittedToCaller || !!allowRestartAfterRender;
-              const secs = Math.round(HEARTBEAT_TIMEOUT_MS / 1e3);
-              reject(tagTransient(new Error(recoverable ? `Connection lost \u2014 no data received for ${secs} s. Reconnecting\u2026` : `Connection lost \u2014 no data received for ${secs} s. Retry your message.`)));
-              return;
-            }
-            const stallLimitMs = sawModelEvent ? PROGRESS_TIMEOUT_MS : FIRST_EVENT_TIMEOUT_MS;
-            if (now - lastProgressAt > stallLimitMs) {
-              clearInterval(heartbeatWatchdog);
-              stream.destroy?.();
-              if (haveCompleteMessage()) {
+        let heartbeatWatchdog;
+        try {
+          await new Promise((resolve3, reject) => {
+            const stream = response.body;
+            const HEARTBEAT_TIMEOUT_MS = 9e4;
+            const FIRST_EVENT_TIMEOUT_MS = Number(process.env.NEXRALL_FIRST_EVENT_TIMEOUT_MS) || 3e5;
+            const PROGRESS_TIMEOUT_MS = Number(process.env.NEXRALL_PROGRESS_TIMEOUT_MS) || 15e4;
+            let sawModelEvent = false;
+            let lastDataAt = Date.now();
+            let lastProgressAt = Date.now();
+            heartbeatWatchdog = setInterval(() => {
+              const now = Date.now();
+              if (haveCompleteMessage() && now - lastDataAt > HEARTBEAT_TIMEOUT_MS) {
+                clearInterval(heartbeatWatchdog);
+                stream.destroy?.();
                 resolve3();
                 return;
               }
-              reject(tagTransient(new Error(sawModelEvent ? `The model stopped responding mid-stream (no output for ${Math.round(stallLimitMs / 1e3)} s).` : `The model did not start responding within ${Math.round(stallLimitMs / 1e3)} s (large context can take a while to process).`)));
-              return;
-            }
-          }, 5e3);
-          const parser = (0, eventsource_parser_1.createParser)((event) => {
-            lastDataAt = Date.now();
-            if (event.type !== "event") {
-              return;
-            }
-            {
-              const frameId = event.id;
-              if (frameId) {
-                const n = Number(frameId);
-                if (Number.isFinite(n) && n > lastEventId)
-                  lastEventId = n;
-              }
-              const raw = event.data;
-              if (!raw || raw === "[DONE]") {
-                resolve3();
+              if (now - lastDataAt > HEARTBEAT_TIMEOUT_MS) {
+                clearInterval(heartbeatWatchdog);
+                stream.destroy?.();
+                const recoverable = !emittedToCaller || !!allowRestartAfterRender;
+                const secs = Math.round(HEARTBEAT_TIMEOUT_MS / 1e3);
+                reject(tagTransient(new Error(recoverable ? `Connection lost \u2014 no data received for ${secs} s. Reconnecting\u2026` : `Connection lost \u2014 no data received for ${secs} s. Retry your message.`)));
                 return;
               }
-              let parsed;
-              try {
-                parsed = JSON.parse(raw);
-              } catch {
+              const stallLimitMs = sawModelEvent ? PROGRESS_TIMEOUT_MS : FIRST_EVENT_TIMEOUT_MS;
+              if (now - lastProgressAt > stallLimitMs) {
+                clearInterval(heartbeatWatchdog);
+                stream.destroy?.();
+                if (haveCompleteMessage()) {
+                  resolve3();
+                  return;
+                }
+                reject(tagTransient(new Error(sawModelEvent ? `The model stopped responding mid-stream (no output for ${Math.round(stallLimitMs / 1e3)} s).` : `The model did not start responding within ${Math.round(stallLimitMs / 1e3)} s (large context can take a while to process).`)));
                 return;
               }
-              if (typeof parsed !== "object" || parsed === null || !("type" in parsed)) {
+            }, 5e3);
+            const parser = (0, eventsource_parser_1.createParser)((event) => {
+              lastDataAt = Date.now();
+              if (event.type !== "event") {
                 return;
               }
-              const evt = parsed;
-              lastProgressAt = Date.now();
-              sawModelEvent = true;
-              clearRetryIfNeeded();
-              switch (evt.type) {
-                case "text": {
-                  const text = typeof evt.text === "string" ? evt.text : "";
-                  textParts.push(text);
-                  emittedToCaller = true;
-                  emittedChars += text.length;
-                  emittedAnythingAcrossAttempts = true;
-                  emittedCharsAcrossAttempts += text.length;
-                  onEvent({ type: "text", text });
-                  break;
+              {
+                const frameId = event.id;
+                if (frameId) {
+                  const n = Number(frameId);
+                  if (Number.isFinite(n) && n > lastEventId)
+                    lastEventId = n;
                 }
-                case "tool_use": {
-                  const block = {
-                    type: "tool_use",
-                    id: typeof evt.id === "string" ? evt.id : "",
-                    name: typeof evt.name === "string" ? evt.name : "",
-                    input: evt.input ?? {}
-                  };
-                  if (typeof evt.input_json_delta === "string") {
-                    partialInputs[block.id] = (partialInputs[block.id] ?? "") + evt.input_json_delta;
-                    try {
-                      block.input = JSON.parse(partialInputs[block.id]);
-                    } catch {
-                      return;
-                    }
-                  }
-                  toolUseBlocks.push(block);
-                  emittedToCaller = true;
-                  emittedAnythingAcrossAttempts = true;
-                  onEvent({ type: "tool_use", id: block.id, name: block.name, input: block.input });
-                  break;
-                }
-                case "message_complete": {
-                  const nestedMessage = evt.message;
-                  const stopReason = typeof nestedMessage?.stop_reason === "string" ? nestedMessage.stop_reason : null;
-                  const contentBlocks2 = [];
-                  const fullText2 = textParts.join("");
-                  if (fullText2) {
-                    contentBlocks2.push({ type: "text", text: fullText2 });
-                  }
-                  contentBlocks2.push(...toolUseBlocks);
-                  const rawContent = Array.isArray(nestedMessage?.content) ? nestedMessage.content : null;
-                  const finalContent = chooseFinalContent(contentBlocks2, rawContent);
-                  completedMessage = {
-                    role: "assistant",
-                    content: finalContent,
-                    stopReason
-                  };
-                  onEvent({ type: "message_complete", message: completedMessage });
-                  break;
+                const raw = event.data;
+                if (!raw || raw === "[DONE]") {
+                  resolve3();
+                  return;
                 }
-                case "usage": {
-                  if (typeof evt.input_tokens === "number" && typeof evt.output_tokens === "number") {
-                    onEvent({
-                      type: "usage",
-                      // Forwarded, not dropped: the backend tags the usage of an attempt it
-                      // billed but never completed (its stream `abort` path). Without this
-                      // the flag dies here and every consumer that sums usage silently folds
-                      // a discarded attempt's tokens into the successful turn's total.
-                      ...evt.partial === true ? { partial: true } : {},
-                      // `replayed` means these tokens are being reported a SECOND time: the
-                      // turn completed and was billed on an earlier attempt whose `done` never
-                      // reached us, and the backend served this one from its idempotency cache
-                      // instead of re-running the model. Nothing new was charged, so a cost
-                      // display must not add them again.
-                      ...evt.replayed === true ? { replayed: true } : {},
-                      usage: {
-                        input_tokens: evt.input_tokens,
-                        output_tokens: evt.output_tokens,
-                        cache_creation_input_tokens: typeof evt.cache_creation_input_tokens === "number" ? evt.cache_creation_input_tokens : void 0,
-                        cache_read_input_tokens: typeof evt.cache_read_input_tokens === "number" ? evt.cache_read_input_tokens : void 0
-                      }
-                    });
-                  }
-                  break;
+                let parsed;
+                try {
+                  parsed = JSON.parse(raw);
+                } catch {
+                  return;
                 }
-                case "context_warning": {
-                  break;
+                if (typeof parsed !== "object" || parsed === null || !("type" in parsed)) {
+                  return;
                 }
-                case "thinking": {
-                  const text = typeof evt.text === "string" ? evt.text : "";
-                  if (text) {
+                const evt = parsed;
+                lastProgressAt = Date.now();
+                sawModelEvent = true;
+                clearRetryIfNeeded();
+                switch (evt.type) {
+                  case "text": {
+                    const text = typeof evt.text === "string" ? evt.text : "";
+                    textParts.push(text);
                     emittedToCaller = true;
                     emittedChars += text.length;
                     emittedAnythingAcrossAttempts = true;
                     emittedCharsAcrossAttempts += text.length;
-                    onEvent({ type: "thinking", text });
+                    onEvent({ type: "text", text });
+                    break;
                   }
-                  break;
-                }
-                case "thinking_progress": {
-                  const tokens = typeof evt.tokens === "number" ? evt.tokens : 0;
-                  onEvent({ type: "thinking_progress", tokens });
-                  break;
-                }
-                case "thinking_delta": {
-                  const text = typeof evt.text === "string" ? evt.text : "";
-                  if (text) {
+                  case "tool_use": {
+                    const block = {
+                      type: "tool_use",
+                      id: typeof evt.id === "string" ? evt.id : "",
+                      name: typeof evt.name === "string" ? evt.name : "",
+                      input: evt.input ?? {}
+                    };
+                    if (typeof evt.input_json_delta === "string") {
+                      partialInputs[block.id] = (partialInputs[block.id] ?? "") + evt.input_json_delta;
+                      try {
+                        block.input = JSON.parse(partialInputs[block.id]);
+                      } catch {
+                        return;
+                      }
+                    }
+                    toolUseBlocks.push(block);
                     emittedToCaller = true;
-                    emittedChars += text.length;
                     emittedAnythingAcrossAttempts = true;
-                    emittedCharsAcrossAttempts += text.length;
-                    onEvent({ type: "thinking_delta", text });
+                    onEvent({ type: "tool_use", id: block.id, name: block.name, input: block.input });
+                    break;
                   }
-                  break;
-                }
-                case "resumable": {
-                  serverResumable = true;
-                  break;
-                }
-                case "balance_status": {
-                  const balance = typeof evt.balance === "number" ? evt.balance : 0;
-                  const zero = !!evt.zero;
-                  onEvent({ type: "balance_status", balance, zero });
-                  break;
-                }
-                case "done": {
-                  onEvent({ type: "done" });
-                  resolve3();
-                  break;
-                }
-                case "error": {
-                  const message = typeof evt.message === "string" ? evt.message : typeof evt.error === "string" ? evt.error : "Unknown SSE error";
-                  const notResumable = evt.notResumable === true;
-                  if (haveCompleteMessage()) {
-                    clearInterval(heartbeatWatchdog);
-                    onEvent({ type: "error", message });
+                  case "message_complete": {
+                    const nestedMessage = evt.message;
+                    const stopReason = typeof nestedMessage?.stop_reason === "string" ? nestedMessage.stop_reason : null;
+                    const contentBlocks2 = [];
+                    const fullText2 = textParts.join("");
+                    if (fullText2) {
+                      contentBlocks2.push({ type: "text", text: fullText2 });
+                    }
+                    contentBlocks2.push(...toolUseBlocks);
+                    const rawContent = Array.isArray(nestedMessage?.content) ? nestedMessage.content : null;
+                    const finalContent = chooseFinalContent(contentBlocks2, rawContent);
+                    completedMessage = {
+                      role: "assistant",
+                      content: finalContent,
+                      stopReason
+                    };
+                    onEvent({ type: "message_complete", message: completedMessage });
+                    break;
+                  }
+                  case "usage": {
+                    if (typeof evt.input_tokens === "number" && typeof evt.output_tokens === "number") {
+                      onEvent({
+                        type: "usage",
+                        // Forwarded, not dropped: the backend tags the usage of an attempt it
+                        // billed but never completed (its stream `abort` path). Without this
+                        // the flag dies here and every consumer that sums usage silently folds
+                        // a discarded attempt's tokens into the successful turn's total.
+                        ...evt.partial === true ? { partial: true } : {},
+                        // `replayed` means these tokens are being reported a SECOND time: the
+                        // turn completed and was billed on an earlier attempt whose `done` never
+                        // reached us, and the backend served this one from its idempotency cache
+                        // instead of re-running the model. Nothing new was charged, so a cost
+                        // display must not add them again.
+                        ...evt.replayed === true ? { replayed: true } : {},
+                        usage: {
+                          input_tokens: evt.input_tokens,
+                          output_tokens: evt.output_tokens,
+                          cache_creation_input_tokens: typeof evt.cache_creation_input_tokens === "number" ? evt.cache_creation_input_tokens : void 0,
+                          cache_read_input_tokens: typeof evt.cache_read_input_tokens === "number" ? evt.cache_read_input_tokens : void 0
+                        }
+                      });
+                    }
+                    break;
+                  }
+                  case "context_warning": {
+                    break;
+                  }
+                  case "thinking": {
+                    const text = typeof evt.text === "string" ? evt.text : "";
+                    if (text) {
+                      emittedToCaller = true;
+                      emittedChars += text.length;
+                      emittedAnythingAcrossAttempts = true;
+                      emittedCharsAcrossAttempts += text.length;
+                      onEvent({ type: "thinking", text });
+                    }
+                    break;
+                  }
+                  case "thinking_progress": {
+                    const tokens = typeof evt.tokens === "number" ? evt.tokens : 0;
+                    onEvent({ type: "thinking_progress", tokens });
+                    break;
+                  }
+                  case "thinking_delta": {
+                    const text = typeof evt.text === "string" ? evt.text : "";
+                    if (text) {
+                      emittedToCaller = true;
+                      emittedChars += text.length;
+                      emittedAnythingAcrossAttempts = true;
+                      emittedCharsAcrossAttempts += text.length;
+                      onEvent({ type: "thinking_delta", text });
+                    }
+                    break;
+                  }
+                  case "resumable": {
+                    serverResumable = true;
+                    break;
+                  }
+                  case "balance_status": {
+                    const balance = typeof evt.balance === "number" ? evt.balance : 0;
+                    const zero = !!evt.zero;
+                    onEvent({ type: "balance_status", balance, zero });
+                    break;
+                  }
+                  case "done": {
+                    onEvent({ type: "done" });
                     resolve3();
-                  } else if (notResumable && (!emittedToCaller || allowRestartAfterRender)) {
-                    clearInterval(heartbeatWatchdog);
-                    stream.destroy?.();
-                    reject(Object.assign(tagTransient(new Error(message)), { forceRestart: true }));
-                  } else if (isRetryableStreamMsg(message) && (!emittedToCaller || allowRestartAfterRender)) {
-                    clearInterval(heartbeatWatchdog);
-                    stream.destroy?.();
-                    reject(tagTransient(new Error(message)));
-                  } else {
-                    clearInterval(heartbeatWatchdog);
-                    stream.destroy?.();
-                    onEvent({ type: "error", message });
-                    reject(new Error(message));
+                    break;
+                  }
+                  case "error": {
+                    const message = typeof evt.message === "string" ? evt.message : typeof evt.error === "string" ? evt.error : "Unknown SSE error";
+                    const notResumable = evt.notResumable === true;
+                    if (haveCompleteMessage()) {
+                      clearInterval(heartbeatWatchdog);
+                      onEvent({ type: "error", message });
+                      resolve3();
+                    } else if (notResumable && (!emittedToCaller || allowRestartAfterRender)) {
+                      clearInterval(heartbeatWatchdog);
+                      stream.destroy?.();
+                      reject(Object.assign(tagTransient(new Error(message)), { forceRestart: true }));
+                    } else if (isRetryableStreamMsg(message) && (!emittedToCaller || allowRestartAfterRender)) {
+                      clearInterval(heartbeatWatchdog);
+                      stream.destroy?.();
+                      reject(tagTransient(new Error(message)));
+                    } else {
+                      clearInterval(heartbeatWatchdog);
+                      stream.destroy?.();
+                      onEvent({ type: "error", message });
+                      reject(new Error(message));
+                    }
+                    break;
                   }
-                  break;
                 }
               }
-            }
-          });
-          stream.on("data", (chunk) => {
-            lastDataAt = Date.now();
-            if (abortSignal?.aborted) {
-              stream.destroy?.();
-              return;
-            }
-            parser.feed(chunk.toString("utf-8"));
-          });
-          stream.on("end", () => {
-            clearInterval(heartbeatWatchdog);
-            if (!sawModelEvent && !completedMessage) {
-              reject(Object.assign(new Error("Connection closed before the model responded. Retrying\u2026"), { retryable: true }));
-              return;
-            }
-            resolve3();
-          });
-          stream.on("error", (err) => {
-            clearInterval(heartbeatWatchdog);
-            if (abortSignal?.aborted || controller.signal.aborted) {
-              resolve3();
-              return;
-            }
-            if (haveCompleteMessage()) {
+            });
+            stream.on("data", (chunk) => {
+              lastDataAt = Date.now();
+              if (abortSignal?.aborted) {
+                stream.destroy?.();
+                return;
+              }
+              parser.feed(chunk.toString("utf-8"));
+            });
+            stream.on("end", () => {
+              clearInterval(heartbeatWatchdog);
+              if (!sawModelEvent && !completedMessage) {
+                reject(Object.assign(new Error("Connection closed before the model responded. Retrying\u2026"), { retryable: true }));
+                return;
+              }
               resolve3();
-              return;
-            }
-            reject(tagTransient(err));
+            });
+            stream.on("error", (err) => {
+              clearInterval(heartbeatWatchdog);
+              if (abortSignal?.aborted || controller.signal.aborted) {
+                resolve3();
+                return;
+              }
+              if (haveCompleteMessage()) {
+                resolve3();
+                return;
+              }
+              reject(tagTransient(err));
+            });
           });
-        });
+        } finally {
+          if (heartbeatWatchdog !== void 0)
+            clearInterval(heartbeatWatchdog);
+        }
         if (completedMessage) {
           return completedMessage;
         }
@@ -15757,7 +15763,8 @@ var require_loop = __commonJS({
       };
     }();
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.VERIFY_CMD_RE = exports.WRITE_TOOL_NAMES = exports.ToolNotAllowedError = void 0;
+    exports.VERIFY_CMD_RE = exports.WRITE_TOOL_NAMES = exports.ToolNotAllowedError = exports._stallLimits = void 0;
+    exports.errorRoundSignature = errorRoundSignature;
     exports.resolveMaxIterations = resolveMaxIterations;
     exports.createLimiter = createLimiter;
     exports.extractSubTaskText = extractSubTaskText;
@@ -15890,6 +15897,11 @@ var require_loop = __commonJS({
     var MAX_ITERATIONS_CEILING = 2e3;
     var HARD_ITERATIONS_CAP = 1e5;
     var STALL_LIMIT = 8;
+    var REPEAT_STALL_LIMIT = 12;
+    function errorRoundSignature(errored) {
+      return errored.map(({ name, error }) => `${name}:${String(error).slice(0, 200)}`).sort().join("|");
+    }
+    exports._stallLimits = { STALL_LIMIT, REPEAT_STALL_LIMIT };
     function resolveMaxIterations(optionValue, settingsRaw) {
       const fromEnv = Number(process.env.NEXRALL_MAX_ITERATIONS);
       const fromSettings = Number(settingsRaw.maxIterations);
@@ -16266,6 +16278,8 @@ ${partial}` : "",
     }
     var PRUNE_MIN_RECLAIM_BYTES = 256 * 1024;
     var COMPACT_KEEP_MIN = 6;
+    var COMPACT_MIN_RECLAIM_BYTES = 32 * 1024;
+    var COMPACT_MAX_FAILURES = 3;
     var MAX_BODY_BYTES = 8 * 1024 * 1024;
     function estimateBodyBytes2(messages) {
       try {
@@ -16347,7 +16361,7 @@ ${tail}`;
     var LEDGER_MAX_FILES = 60;
     var LEDGER_MAX_NOTES = 20;
     function createLedger() {
-      return { filesTouched: /* @__PURE__ */ new Map(), verifications: [], testIntegrity: [], epoch: 0 };
+      return { filesTouched: /* @__PURE__ */ new Map(), filesTouchedTotal: 0, verifications: [], testIntegrity: [], testIntegrityTotal: 0, epoch: 0 };
     }
     function ledgerRecord(ledger, toolName, input, ok, output, exitCode) {
       if (exports.WRITE_TOOL_NAMES.has(toolName)) {
@@ -16357,7 +16371,18 @@ ${tail}`;
         const p = typeof input?.path === "string" ? input.path : void 0;
         if (p) {
           const prev = ledger.filesTouched.get(p);
+          if (!prev)
+            ledger.filesTouchedTotal++;
+          ledger.filesTouched.delete(p);
           ledger.filesTouched.set(p, { tool: toolName, edits: (prev?.edits ?? 0) + 1 });
+          if (ledger.filesTouched.size > LEDGER_MAX_FILES * 4) {
+            for (const key of ledger.filesTouched.keys()) {
+              if (ledger.filesTouched.size <= LEDGER_MAX_FILES * 2)
+                break;
+              if (key !== p)
+                ledger.filesTouched.delete(key);
+            }
+          }
         }
         const reasons = [];
         const markerReasons = toolName === "write_file" ? (0, testIntegrity_1.decodeTestIntegrityMarker)(output) : [];
@@ -16371,6 +16396,7 @@ ${tail}`;
         if (reasons.length && p) {
           for (const reason of reasons) {
             ledger.testIntegrity.push({ path: p, reason });
+            ledger.testIntegrityTotal++;
           }
           if (ledger.testIntegrity.length > LEDGER_MAX_NOTES * 2) {
             ledger.testIntegrity.splice(0, ledger.testIntegrity.length - LEDGER_MAX_NOTES);
@@ -16391,8 +16417,8 @@ ${tail}`;
       const lines = [];
       if (ledger.filesTouched.size) {
         const files = [...ledger.filesTouched.entries()];
-        const shown = files.slice(0, LEDGER_MAX_FILES);
-        lines.push(`FILES CHANGED THIS SESSION (${ledger.filesTouched.size}):`);
+        const shown = files.slice(-LEDGER_MAX_FILES);
+        lines.push(`FILES CHANGED THIS SESSION (${ledger.filesTouchedTotal || ledger.filesTouched.size}):`);
         for (const [p, meta] of shown) {
           lines.push(`  \u2022 ${p}  (${meta.tool}${meta.edits > 1 ? ` \xD7${meta.edits}` : ""})`);
         }
@@ -16629,6 +16655,9 @@ ${options.nexrallMd}` : "") : options.nexrallMd;
       let completedRounds = 0;
       let stalledOut = false;
       let consecutiveErrorRounds = 0;
+      let repeatedErrorRounds = 0;
+      let lastErrorSignature = "";
+      let stalledRepeatError = null;
       let budget = maxIterations;
       let iteration = 0;
       let filesMutatedSinceVerify = false;
@@ -16638,6 +16667,8 @@ ${options.nexrallMd}` : "") : options.nexrallMd;
       const flakyNudgedCmds = /* @__PURE__ */ new Set();
       let claimEvidenceNudged = false;
       const ledger = createLedger();
+      let compactFailures = 0;
+      let compactDisabled = false;
       try {
         for (; iteration < budget; iteration++) {
           if (options.abortSignal?.aborted)
@@ -16654,14 +16685,25 @@ ${options.nexrallMd}` : "") : options.nexrallMd;
               (options.onNotice ?? options.onText)(`\u267B\uFE0F Trimmed ~${(reclaimed / (1024 * 1024)).toFixed(1)}MB of already-processed tool output to keep this chat cheap to continue.`);
             }
           }
-          if (autoCompact && !compacting && (tokenPressure || bytePressure) && messages.length > COMPACT_KEEP_MIN + 2) {
+          if (autoCompact && !compactDisabled && !compacting && (tokenPressure || bytePressure) && messages.length > COMPACT_KEEP_MIN + 2) {
             compacting = true;
             try {
+              const bytesBefore = estimateBodyBytes2(messages);
               const did = await autoCompactMessages(messages, options, ledger);
+              const bytesAfter = did ? estimateBodyBytes2(messages) : bytesBefore;
+              const reclaimed = bytesBefore - bytesAfter;
               if (did) {
                 lastPromptTokens = 0;
                 const reason = bytePressure ? `body ~${(bodyBytes / (1024 * 1024)).toFixed(1)}MB` : "context window";
                 (options.onNotice ?? options.onText)(`\u267B\uFE0F Auto-compacted earlier conversation to stay within the ${reason}.`);
+                bodyBytes = bytesAfter;
+                bytePressure = bodyBytes > MAX_BODY_BYTES;
+              }
+              if (did && reclaimed >= COMPACT_MIN_RECLAIM_BYTES) {
+                compactFailures = 0;
+              } else if (++compactFailures >= COMPACT_MAX_FAILURES) {
+                compactDisabled = true;
+                (options.onNotice ?? options.onText)(`\u26A0\uFE0F Auto-compaction isn't reducing this conversation any further, so it's been switched off for the rest of this run to avoid repeated summarising. If the context fills up, start a fresh chat or run /compact manually.`);
               }
             } finally {
               compacting = false;
@@ -16776,9 +16818,10 @@ ${options.nexrallMd}` : "") : options.nexrallMd;
               messages.push({ role: "user", content: [{ type: "text", text }] });
               continue;
             }
-            if (ledger.testIntegrity.length > testIntegrityNudgedCount) {
-              const fresh = ledger.testIntegrity.slice(testIntegrityNudgedCount);
-              testIntegrityNudgedCount = ledger.testIntegrity.length;
+            if (ledger.testIntegrityTotal > testIntegrityNudgedCount) {
+              const newCount = Math.min(ledger.testIntegrityTotal - testIntegrityNudgedCount, ledger.testIntegrity.length);
+              const fresh = ledger.testIntegrity.slice(ledger.testIntegrity.length - newCount);
+              testIntegrityNudgedCount = ledger.testIntegrityTotal;
               const bullet = fresh.map((t2) => `  \u2022 ${t2.path}: ${t2.reason}`).join("\n");
               messages.push({
                 role: "user",
@@ -16959,12 +17002,25 @@ ${result.output}` : `Error: ${result.error}` : result.output ?? "",
           messages.push(toolResultMessage);
           completedRounds++;
           options.onProgress?.(messages);
-          const allErrored = toolResults.length > 0 && toolResults.every(({ result }) => result.error !== void 0);
+          const errored = toolResults.filter(({ result }) => result.error !== void 0);
+          const allErrored = toolResults.length > 0 && errored.length === toolResults.length;
           consecutiveErrorRounds = allErrored ? consecutiveErrorRounds + 1 : 0;
           if (consecutiveErrorRounds >= STALL_LIMIT) {
             stalledOut = true;
             break;
           }
+          const errSignature = errorRoundSignature(errored.map(({ block, result }) => ({ name: block.name, error: String(result.error) })));
+          if (errSignature && errSignature === lastErrorSignature) {
+            repeatedErrorRounds++;
+          } else {
+            repeatedErrorRounds = 0;
+            lastErrorSignature = errSignature;
+          }
+          if (repeatedErrorRounds >= REPEAT_STALL_LIMIT) {
+            stalledOut = true;
+            stalledRepeatError = errored[0] ? String(errored[0].result.error).slice(0, 300) : null;
+            break;
+          }
           if (autoContinue && iteration + 1 >= budget && budget < hardCap) {
             budget = Math.min(budget + maxIterations, hardCap);
             options.onText(`
@@ -16974,11 +17030,15 @@ ${result.output}` : `Error: ${result.error}` : result.output ?? "",
         }
         if (!options.abortSignal?.aborted && !completedCleanly) {
           if (stalledOut) {
-            options.onText(`
+            (options.onNotice ?? options.onText)(stalledRepeatError ? `
+\u{1F6D1} Stopped: the same tool error repeated ${REPEAT_STALL_LIMIT} rounds in a row, so the agent was looping without making progress. The recurring error was:
+${stalledRepeatError}
+Fix that underlying cause (or grant the needed permission) and send "continue".
+` : `
 \u{1F6D1} Stopped: the last ${STALL_LIMIT} tool rounds all failed, so the agent looked stuck. Fix the underlying error (or grant the needed permission) and send "continue".
 `);
           } else if (iteration >= budget) {
-            options.onText(`
+            (options.onNotice ?? options.onText)(`
 \u23F8\uFE0F Stopped at the ${budget}-step safety limit \u2014 the task may be incomplete. Send "continue" to resume, or raise the limit via "maxIterations" in .nexrall/settings.json (or the NEXRALL_MAX_ITERATIONS env var). Auto-continue can be disabled with "autoContinue": false.
 `);
           }
@@ -63944,7 +64004,7 @@ var InkReadlineAdapter = class extends EventEmitter3 {
 };
 
 // src/commands/chat.ts
-var CLI_VERSION = "0.5.51";
+var CLI_VERSION = "0.5.52";
 var MODEL_LABELS = {
   turbo: "Nexrall Turbo",
   pro: "Nexrall Pro",
@@ -65611,7 +65671,7 @@ function pluginSourceRemoveCommand(name, opts) {
 
 // src/index.ts
 var program2 = new Command();
-program2.name("nex").description("Nexrall Code \u2014 AI coding assistant (powered by Nexrall)").version("0.5.51").enablePositionalOptions();
+program2.name("nex").description("Nexrall Code \u2014 AI coding assistant (powered by Nexrall)").version("0.5.52").enablePositionalOptions();
 program2.command("auth").description("Login to your Nexrall account").action(authCommand);
 program2.command("logout").description("Log out of your Nexrall account").action(logoutCommand);
 program2.command("update").description("Update nex to the latest version").option("-c, --check", "Check for updates without installing").option("-y, --yes", "Skip confirmation prompt").action(async (opts) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexrall-code",
-  "version": "0.5.51",
+  "version": "0.5.52",
   "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",
@@ -41,7 +41,7 @@
     "react": "^19.2.8",
     "readline": "^1.3.0",
     "string-width": "^7.2.0",
-    "@nexrall/code-core": "1.4.26"
+    "@nexrall/code-core": "1.4.27"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.600.0",