nexrall-code 0.5.2 → 0.5.12

package/dist/index.js

@@ -9810,6 +9810,7 @@ var require_client = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.API_BASE = void 0;
+    exports2.chooseFinalContent = chooseFinalContent;
     exports2.streamChat = streamChat;
     exports2.getBalance = getBalance3;
     exports2.exchangeVscodeCode = exchangeVscodeCode;
@@ -9818,6 +9819,12 @@ var require_client = __commonJS({
     var node_fetch_1 = __importDefault((init_src(), __toCommonJS(src_exports)));
     var index_1 = require_auth();
     exports2.API_BASE = "https://api.nexrall.com";
+    function chooseFinalContent(rebuilt, rawContent) {
+      if (!Array.isArray(rawContent))
+        return rebuilt;
+      const hasServerSideBlocks = rawContent.some((b) => b && b.type !== "text" && b.type !== "tool_use");
+      return hasServerSideBlocks ? rawContent : rebuilt;
+    }
     function authHeaders() {
       const token = (0, index_1.getToken)();
       if (!token) {
@@ -9828,11 +9835,17 @@ var require_client = __commonJS({
         Authorization: `Bearer ${token}`
       };
     }
-    var MAX_RETRIES = 3;
+    var MAX_RETRIES = 5;
     var RETRY_BASE_MS = 1e3;
+    var RETRY_MAX_MS = 3e4;
+    function backoffMs(attempt) {
+      const exp = Math.min(RETRY_MAX_MS, RETRY_BASE_MS * Math.pow(2, attempt));
+      return Math.round(exp / 2 + Math.random() * (exp / 2));
+    }
     function sleep(ms) {
       return new Promise((r2) => setTimeout(r2, ms));
     }
+    var MAX_TOTAL_ATTEMPTS = (MAX_RETRIES + 1) * (MAX_RETRIES + 1);
     async function streamChat(messages, options, onEvent) {
       const { model, env: env2, editorContext, nexrallMd, mode, effort, clientType, abortSignal, extraTools, agents } = options;
       const controller = new AbortController();
@@ -9855,6 +9868,19 @@ var require_client = __commonJS({
         }
       ];
       const isRetryableStreamMsg = (m2) => /overloaded|rate.?limit|temporarily|unavailable|try again|internal server error/i.test(String(m2 ?? ""));
+      let didRetry = false;
+      let totalAttemptsMade = 0;
+      const reportRetry = (reason) => {
+        totalAttemptsMade++;
+        didRetry = true;
+        onEvent({ type: "retry", attempt: totalAttemptsMade, maxAttempts: MAX_TOTAL_ATTEMPTS, reason });
+      };
+      const clearRetryIfNeeded = () => {
+        if (didRetry) {
+          didRetry = false;
+          onEvent({ type: "retry_resolved" });
+        }
+      };
       async function runAttempt() {
         let response;
         let lastErr;
@@ -9862,12 +9888,14 @@ var require_client = __commonJS({
           try {
             response = await (0, node_fetch_1.default)(...fetchArgs);
             if (response.status === 429 && attempt < MAX_RETRIES) {
+              reportRetry("Rate limited by the API \u2014 retrying");
               const retryAfter = parseInt(response.headers.get("retry-after") ?? "0", 10);
-              await sleep(retryAfter > 0 ? retryAfter * 1e3 : RETRY_BASE_MS * Math.pow(2, attempt));
+              await sleep(retryAfter > 0 ? retryAfter * 1e3 : backoffMs(attempt));
               continue;
             }
             if (response.status >= 500 && response.status < 600 && attempt < MAX_RETRIES) {
-              await sleep(RETRY_BASE_MS * Math.pow(2, attempt));
+              reportRetry(`Server error (${response.status}) \u2014 retrying`);
+              await sleep(backoffMs(attempt));
               continue;
             }
             break;
@@ -9876,7 +9904,8 @@ var require_client = __commonJS({
               throw err;
             lastErr = err;
             if (attempt < MAX_RETRIES) {
-              await sleep(RETRY_BASE_MS * Math.pow(2, attempt));
+              reportRetry("Connection lost \u2014 attempting to reconnect");
+              await sleep(backoffMs(attempt));
               continue;
             }
           }
@@ -9886,14 +9915,17 @@ var require_client = __commonJS({
         if (!response.ok) {
           const errText = await response.text();
           let errMsg = `API error ${response.status}`;
+          let balance;
           try {
             const parsed = JSON.parse(errText);
             if (parsed.error)
               errMsg = parsed.error;
+            if (typeof parsed.balance === "number")
+              balance = parsed.balance;
           } catch {
             errMsg = errText || errMsg;
           }
-          throw new Error(errMsg);
+          throw Object.assign(new Error(errMsg), { status: response.status, balance });
         }
         if (!response.body) {
           throw new Error("Response body is null");
@@ -9916,7 +9948,8 @@ var require_client = __commonJS({
             if (now - lastDataAt > HEARTBEAT_TIMEOUT_MS) {
               clearInterval(heartbeatWatchdog);
               stream.destroy?.();
-              reject(new Error("Connection lost \u2014 no data received for 45 s. Retry your message."));
+              const deadErr = new Error(emittedToCaller ? "Connection lost \u2014 no data received for 45 s. Retry your message." : "Connection lost \u2014 no data received for 45 s. Reconnecting\u2026");
+              reject(emittedToCaller ? deadErr : Object.assign(deadErr, { retryable: true }));
               return;
             }
             const stallLimitMs = sawModelEvent ? PROGRESS_TIMEOUT_MS : FIRST_EVENT_TIMEOUT_MS;
@@ -9951,6 +9984,7 @@ var require_client = __commonJS({
               const evt = parsed;
               lastProgressAt = Date.now();
               sawModelEvent = true;
+              clearRetryIfNeeded();
               switch (evt.type) {
                 case "text": {
                   const text = typeof evt.text === "string" ? evt.text : "";
@@ -9980,15 +10014,20 @@ var require_client = __commonJS({
                   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: contentBlocks2
+                    content: finalContent,
+                    stopReason
                   };
                   onEvent({ type: "message_complete", message: completedMessage });
                   break;
@@ -10034,6 +10073,12 @@ var require_client = __commonJS({
                   }
                   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();
@@ -10097,12 +10142,15 @@ var require_client = __commonJS({
       try {
         for (let sAttempt = 0; sAttempt <= MAX_RETRIES; sAttempt++) {
           try {
-            return await runAttempt();
+            const result = await runAttempt();
+            clearRetryIfNeeded();
+            return result;
           } catch (err) {
             if (abortSignal?.aborted || controller.signal.aborted || err.name === "AbortError")
               throw err;
             if (err.retryable && sAttempt < MAX_RETRIES) {
-              await sleep(RETRY_BASE_MS * Math.pow(2, sAttempt));
+              reportRetry(err.message || "Connection interrupted \u2014 reconnecting");
+              await sleep(backoffMs(sAttempt));
               continue;
             }
             throw err;
@@ -12002,7 +12050,7 @@ Update these call-sites (or restore the symbol), then run a build/typecheck to c
             args.push("-m", "200", "--regexp", pattern, resolved);
             result = (0, child_process_1.spawnSync)("rg", args, spawnOpts);
           } else {
-            const args = ["-rn", "--binary-files=without-match", "--color=never"];
+            const args = ["-rnE", "--binary-files=without-match", "--color=never"];
             if (ignoreCase)
               args.push("-i");
             if (contextLines > 0)
@@ -12031,8 +12079,10 @@ ${globalCapMatches(output)}` : "";
           }
           if (result.status === 1 && !output)
             return { output: "No matches found." };
-          if (result.status !== 0 && result.status !== 1)
-            return { error: stderr || "search failed" };
+          if (result.status !== 0 && result.status !== 1) {
+            const hint = /parenthes|bracket|brace|Unmatched|repetition-operator|invalid regex/i.test(stderr) ? ' \u2014 the pattern has invalid/unbalanced regex syntax. If you meant to match literal parentheses/brackets, escape them (e.g. "\\(", "\\)"), or simplify the pattern.' : "";
+            return { error: (stderr || "search failed").trim() + hint };
+          }
           output = globalCapMatches(output);
           return { output: output || "No matches found." };
         }
@@ -12373,6 +12423,14 @@ ${diff2}${xfile}` };
             return callback(null, address, family);
           });
         };
+        let settled = false;
+        let selfAborted = false;
+        const finish = (result) => {
+          if (settled)
+            return;
+          settled = true;
+          resolve3(result);
+        };
         const req = transport.get(url, {
           timeout: DEFAULT_TIMEOUT_MS,
           lookup: guardedLookup,
@@ -12385,15 +12443,16 @@ ${diff2}${xfile}` };
         }, (res) => {
           const status = res.statusCode ?? 0;
           if ((status === 301 || status === 302 || status === 307 || status === 308) && res.headers.location) {
+            selfAborted = true;
             req.destroy();
             let nextUrl;
             try {
               nextUrl = new URL(res.headers.location, url).href;
             } catch {
-              resolve3({ error: `Invalid redirect location: ${res.headers.location}` });
+              finish({ error: `Invalid redirect location: ${res.headers.location}` });
               return;
             }
-            fetchUrl({ url: nextUrl }, void 0, _redirectCount + 1).then(resolve3);
+            fetchUrl({ url: nextUrl }, void 0, _redirectCount + 1).then(finish);
             return;
           }
           const contentType = res.headers["content-type"] ?? "";
@@ -12401,6 +12460,19 @@ ${diff2}${xfile}` };
           const chunks = [];
           let totalBytes = 0;
           let truncated = false;
+          const emitBody = () => {
+            let body = Buffer.concat(chunks).toString("utf-8");
+            if (isHtml)
+              body = stripHtml(body);
+            const truncNote = truncated ? `
+
+[Truncated at ${MAX_FETCH_BYTES / 1024}KB]` : "";
+            finish({ output: `HTTP ${status}
+
+<untrusted_web_content url="${url}">
+${body}${truncNote}
+</untrusted_web_content>` });
+          };
           res.on("data", (chunk) => {
             if (totalBytes + chunk.length > MAX_FETCH_BYTES) {
               const remaining = MAX_FETCH_BYTES - totalBytes;
@@ -12408,31 +12480,28 @@ ${diff2}${xfile}` };
                 chunks.push(chunk.subarray(0, remaining));
               totalBytes = MAX_FETCH_BYTES;
               truncated = true;
+              selfAborted = true;
               req.destroy();
+              emitBody();
             } else {
               chunks.push(chunk);
               totalBytes += chunk.length;
             }
           });
-          res.on("end", () => {
-            let body = Buffer.concat(chunks).toString("utf-8");
-            if (isHtml)
-              body = stripHtml(body);
-            const truncNote = truncated ? `
-
-[Truncated at ${MAX_FETCH_BYTES / 1024}KB]` : "";
-            resolve3({ output: `HTTP ${status}
-
-<untrusted_web_content url="${url}">
-${body}${truncNote}
-</untrusted_web_content>` });
+          res.on("end", emitBody);
+          res.on("error", (err) => {
+            if (!selfAborted)
+              finish({ error: err.message });
           });
-          res.on("error", (err) => resolve3({ error: err.message }));
         });
-        req.on("error", (err) => resolve3({ error: err.message }));
+        req.on("error", (err) => {
+          if (!selfAborted)
+            finish({ error: err.message });
+        });
         req.on("timeout", () => {
+          selfAborted = true;
           req.destroy();
-          resolve3({ error: `Request timed out after ${DEFAULT_TIMEOUT_MS}ms` });
+          finish({ error: `Request timed out after ${DEFAULT_TIMEOUT_MS}ms` });
         });
       });
     }
@@ -13706,6 +13775,8 @@ var require_loop = __commonJS({
     exports2.ledgerRecord = ledgerRecord;
     exports2.ledgerSummary = ledgerSummary;
     exports2.pruneOldToolResults = pruneOldToolResults;
+    exports2.estimateTokensRough = estimateTokensRough;
+    exports2.compactMessagesForResume = compactMessagesForResume2;
     exports2.runAgentLoop = runAgentLoop2;
     var client_1 = require_client();
     var executor_1 = require_executor();
@@ -14009,7 +14080,13 @@ ${tail}`;
       pro: 1e6,
       ultra: 1e6
     };
-    var AUTO_COMPACT_THRESHOLD = 0.8;
+    function envFraction(name, fallback) {
+      const v = Number(process.env[name]);
+      return Number.isFinite(v) && v > 0 && v < 1 ? v : fallback;
+    }
+    var AUTO_PRUNE_THRESHOLD = envFraction("NEXRALL_PRUNE_THRESHOLD", 0.35);
+    var AUTO_COMPACT_THRESHOLD = envFraction("NEXRALL_COMPACT_THRESHOLD", 0.8);
+    var PRUNE_MIN_RECLAIM_BYTES = 256 * 1024;
     var COMPACT_KEEP_MIN = 6;
     var MAX_BODY_BYTES = 8 * 1024 * 1024;
     function estimateBodyBytes(messages) {
@@ -14160,11 +14237,12 @@ ${tail}`;
     var PRUNE_STUB_KEEP_CHARS = 400;
     var PRUNE_MARKER = "\n\n[\u2026 ";
     var PRUNE_MARKER_TAIL = " pruned to conserve context. Re-run the tool if you need the full result.]";
-    function pruneOldToolResults(messages) {
+    function pruneOldToolResults(messages, minReclaimBytes = 0) {
       const cutoff = messages.length - PRUNE_KEEP_RECENT;
       if (cutoff <= 1)
         return 0;
-      let reclaimed = 0;
+      const targets = [];
+      let total = 0;
       for (let i2 = 0; i2 < cutoff; i2++) {
         const m2 = messages[i2];
         if (!Array.isArray(m2.content))
@@ -14179,10 +14257,17 @@ ${tail}`;
             continue;
           const head = text.slice(0, PRUNE_STUB_KEEP_CHARS);
           const omitted = text.length - head.length;
-          b.content = `${head}${PRUNE_MARKER}${omitted} chars of earlier tool output${PRUNE_MARKER_TAIL}`;
-          reclaimed += omitted;
+          targets.push({ block: b, head, omitted });
+          total += omitted;
         }
       }
+      if (total < minReclaimBytes)
+        return 0;
+      let reclaimed = 0;
+      for (const { block, head, omitted } of targets) {
+        block.content = `${head}${PRUNE_MARKER}${omitted} chars of earlier tool output${PRUNE_MARKER_TAIL}`;
+        reclaimed += omitted;
+      }
       return reclaimed;
     }
     function originalTaskText(messages) {
@@ -14204,7 +14289,14 @@ ${tail}`;
       let summary = "";
       try {
         const reply = await (0, client_1.streamChat)([{ role: "user", content: [{ type: "text", text: summaryPrompt }] }], {
-          model: options.model ?? "turbo",
+          // COST: the summariser is a mechanical "bullet-point this transcript" task —
+          // its quality is indistinguishable across model tiers, so there is no reason
+          // to run it on the user's (possibly expensive) tier. Force 'turbo' (Sonnet 5):
+          // it is the cheapest 1M-context tier (in $2.0/1M vs Opus $2.5, Fable $3.0;
+          // out $15/1M vs $25 / $50), so this is always ≤ the user's cost, and its 1M
+          // window comfortably holds the transcript (capped at ~170K tokens by
+          // transcriptOf) even on the largest sessions.
+          model: "turbo",
           mode: "ask",
           // summariser must not call tools; ask-mode discourages action
           env: options.env,
@@ -14235,6 +14327,66 @@ ${summary}
 Continue the work from here.` }] });
       return true;
     }
+    var RESUME_CHARS_PER_TOKEN = 4;
+    function estimateTokensRough(messages) {
+      return Math.ceil(estimateBodyBytes(messages) / RESUME_CHARS_PER_TOKEN);
+    }
+    async function compactMessagesForResume2(messages, opts) {
+      if (messages.length <= COMPACT_KEEP_MIN + 2)
+        return false;
+      const settings = (0, rules_1.loadSettings)(opts.workDir);
+      if (!resolveAutoCompact(void 0, settings.raw))
+        return false;
+      const contextWindow = MODEL_CONTEXT_TOKENS[opts.model ?? "turbo"] ?? 1e6;
+      let bodyBytes = estimateBodyBytes(messages);
+      let tokenGuess = estimateTokensRough(messages);
+      const overPruneThreshold = () => tokenGuess > contextWindow * AUTO_PRUNE_THRESHOLD || bodyBytes > MAX_BODY_BYTES;
+      const overCompactThreshold = () => tokenGuess > contextWindow * AUTO_COMPACT_THRESHOLD || bodyBytes > MAX_BODY_BYTES;
+      if (!overPruneThreshold())
+        return false;
+      let compacted = false;
+      if (messages.length > PRUNE_KEEP_RECENT + 2) {
+        const reclaimed = pruneOldToolResults(messages, PRUNE_MIN_RECLAIM_BYTES);
+        if (reclaimed > 0) {
+          bodyBytes = estimateBodyBytes(messages);
+          tokenGuess = estimateTokensRough(messages);
+          compacted = true;
+          opts.onNotice?.(`
+\u267B\uFE0F Trimmed ~${(reclaimed / (1024 * 1024)).toFixed(1)}MB of older tool output before resuming this chat.
+`);
+        }
+      }
+      let guard = 0;
+      while (overCompactThreshold() && messages.length > COMPACT_KEEP_MIN + 2 && guard < 5) {
+        guard += 1;
+        const did = await autoCompactMessages(messages, {
+          workDir: opts.workDir,
+          model: opts.model,
+          clientType: opts.clientType,
+          env: opts.env,
+          onText: () => {
+          },
+          onToolUse: () => {
+          },
+          onToolResult: () => {
+          },
+          onUsage: () => {
+          },
+          requestPermission: async () => false
+        });
+        if (!did)
+          break;
+        compacted = true;
+        bodyBytes = estimateBodyBytes(messages);
+        tokenGuess = estimateTokensRough(messages);
+      }
+      if (compacted) {
+        opts.onNotice?.(`
+\u267B\uFE0F Auto-compacted this chat's earlier history before resuming, to avoid resending it at full cost.
+`);
+      }
+      return compacted;
+    }
     async function runAgentLoop2(initialMessages, options) {
       const messages = [...initialMessages];
       const model = options.model ?? "turbo";
@@ -14270,16 +14422,15 @@ Continue the work from here.` }] });
           if (options.abortSignal?.aborted)
             break;
           let bodyBytes = estimateBodyBytes(messages);
+          const prunePressure = lastPromptTokens > contextWindow * AUTO_PRUNE_THRESHOLD;
           const tokenPressure = lastPromptTokens > contextWindow * AUTO_COMPACT_THRESHOLD;
           let bytePressure = bodyBytes > MAX_BODY_BYTES;
-          if (autoCompact && !compacting && bytePressure && messages.length > PRUNE_KEEP_RECENT + 2) {
-            const reclaimed = pruneOldToolResults(messages);
+          if (autoCompact && !compacting && (prunePressure || bytePressure) && messages.length > PRUNE_KEEP_RECENT + 2) {
+            const reclaimed = pruneOldToolResults(messages, PRUNE_MIN_RECLAIM_BYTES);
             if (reclaimed > 0) {
               bodyBytes = estimateBodyBytes(messages);
               bytePressure = bodyBytes > MAX_BODY_BYTES;
-              options.onText(`
-\u267B\uFE0F Trimmed ~${(reclaimed / (1024 * 1024)).toFixed(1)}MB of older tool output to conserve context.
-`);
+              (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) {
@@ -14289,9 +14440,7 @@ Continue the work from here.` }] });
               if (did) {
                 lastPromptTokens = 0;
                 const reason = bytePressure ? `body ~${(bodyBytes / (1024 * 1024)).toFixed(1)}MB` : "context window";
-                options.onText(`
-\u267B\uFE0F Auto-compacted earlier conversation to stay within the ${reason}.
-`);
+                (options.onNotice ?? options.onText)(`\u267B\uFE0F Auto-compacted earlier conversation to stay within the ${reason}.`);
               }
             } finally {
               compacting = false;
@@ -14331,6 +14480,15 @@ Continue the work from here.` }] });
                 break;
               case "message_complete":
                 break;
+              case "retry":
+                options.onRetry?.(event.attempt, event.maxAttempts, event.reason);
+                break;
+              case "retry_resolved":
+                options.onRetryResolved?.();
+                break;
+              case "balance_status":
+                options.onBalanceStatus?.(event.balance, event.zero);
+                break;
               case "done":
               case "error":
                 break;
@@ -14353,6 +14511,12 @@ Continue the work from here.` }] });
           } catch (err) {
             if (options.abortSignal?.aborted || err.name === "AbortError")
               break;
+            const status = err.status;
+            if (status === 402) {
+              const balance = err.balance ?? 0;
+              options.onBalanceStatus?.(balance, true);
+              break;
+            }
             runSimpleHooks(hooks.OnError, options.workDir);
             throw new Error(`Stream failed: ${err.message}`);
           }
@@ -14371,9 +14535,12 @@ Continue the work from here.` }] });
             completedCleanly = true;
             break;
           }
-          messages.push(assistantMessage);
+          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));
           const toolUseBlocks = assistantMessage.content.filter((block) => block.type === "tool_use" && !serverSideResultIds.has(block.id));
+          const lastBlock = assistantMessage.content[assistantMessage.content.length - 1];
+          const truncatedToolUseId = assistantMessage.stopReason === "max_tokens" && lastBlock?.type === "tool_use" ? lastBlock.id : void 0;
           if (toolUseBlocks.length === 0) {
             const queued = options.takePendingInput?.() ?? [];
             if (queued.length) {
@@ -14441,8 +14608,15 @@ Continue the work from here.` }] });
           const toolResults = await Promise.all(toolUseBlocks.map(async (block) => {
             const { id, name, input } = block;
             options.onToolUse(name, input);
-            const description = humanDescription(name, input);
             let result;
+            if (id === truncatedToolUseId) {
+              result = {
+                error: `This tool call (${name}) was CUT OFF because the response hit the model's output-token limit mid-generation (stop_reason: max_tokens) \u2014 its arguments may be incomplete or missing fields entirely, so it was NOT executed to avoid a silent partial edit. Retry with a SMALLER call: ` + (name === "multi_edit" || name === "edit_file" ? "split this into fewer edits per call (or call edit_file once per change instead of one large multi_edit), " : name === "write_file" ? "write the file in smaller chunks via write_file + edit_file follow-ups instead of one large write_file, " : "") + `so the full response fits comfortably under the per-turn output budget.`
+              };
+              options.onToolResult(name, result);
+              return { block: { ...block, id }, result };
+            }
+            const description = humanDescription(name, input);
             let permitted;
             try {
               permitted = await options.requestPermission({ tool: name, input, description });
@@ -22883,11 +23057,15 @@ var import_code_core2 = __toESM(require_dist2());
 var autoApproved = /* @__PURE__ */ new Set();
 var _rules = { allow: [], ask: [], deny: [] };
 var _workDir = process.cwd();
+var _mode = "auto";
 function initPermissions(workDir) {
   _workDir = workDir;
   _rules = (0, import_code_core2.loadSettings)(workDir).permissions;
   return _rules;
 }
+function setMode(mode) {
+  _mode = mode || "auto";
+}
 function setAutoApprove(category) {
   autoApproved.add(category);
 }
@@ -22955,6 +23133,10 @@ async function requestPermission(req) {
   ];
   if (readOnlyTools.includes(tool))
     return true;
+  if (_mode === "plan") {
+    console.error(source_default.yellow(`  \u2298 Plan mode \u2014 refused ${tool} (read-only until you switch mode).`));
+    return false;
+  }
   if (tool === "write_file" || tool === "create_file") {
     if (isAutoApproved("write"))
       return true;
@@ -23356,6 +23538,23 @@ function tryExec(cmd, cwd) {
     return void 0;
   }
 }
+var BILLING_URL = "https://app.nexrall.com/?settings=billing";
+function hyperlink(label, url) {
+  return `\x1B]8;;${url}\x1B\\${label}\x1B]8;;\x1B\\`;
+}
+var lastBalanceNoticeState = null;
+function printBalanceNotice(balance, zero) {
+  const state = zero ? "zero" : "low";
+  if (lastBalanceNoticeState === state)
+    return;
+  lastBalanceNoticeState = state;
+  const title = zero ? "Out of balance" : "Balance running low";
+  const detail = zero ? "You're out of funds \u2014 top up to keep the agent working." : `Your wallet is under $5${typeof balance === "number" ? ` ($${balance.toFixed(2)} left)` : ""}. Top up before it runs out.`;
+  console.log();
+  console.log(source_default.bgYellow.black(` ${title} `) + "  " + source_default.dim(detail));
+  console.log("  " + source_default.yellow(hyperlink("\u2192 Top up", BILLING_URL)) + source_default.dim(`  (${BILLING_URL})`));
+  console.log();
+}
 function collectEnv(workDir) {
   return {
     cwd: workDir,
@@ -23430,6 +23629,7 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env2, nexrall
   let toolStartTime = 0;
   let lastToolName = "";
   let thinkingTokens = 0;
+  setMode(mode);
   process.stdout.write("\n");
   const result = await (0, import_code_core3.runAgentLoop)(messages, {
     workDir,
@@ -23456,6 +23656,18 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env2, nexrall
       spinner.stop();
       mdRender.feed(text);
     },
+    // System notices (mid-run auto-prune/auto-compact housekeeping) are NOT part
+    // of the model's own reply — used to go through onText, which spliced
+    // "♻️ Trimmed ~0.3MB…" straight into the markdown stream renderer as if the
+    // model itself had said it. Print it as its own dim line instead (same
+    // treatment as the resume-time compaction notice below).
+    onNotice: (text) => {
+      if (abortSignal.aborted)
+        return;
+      mdRender.flush();
+      spinner.stop();
+      console.log(source_default.dim(`  ${text}`));
+    },
     onToolUse: (name, input) => {
       if (abortSignal.aborted)
         return;
@@ -23476,6 +23688,23 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env2, nexrall
     onUsage: (u) => {
       lastUsage = u;
     },
+    // A transient disconnect (network drop, machine sleep/wake, overloaded upstream)
+    // is retried transparently by the network layer — without this, that pause was
+    // completely invisible: the CLI just appeared to freeze and then resume with no
+    // explanation. Reuse the same spinner to show what's actually happening.
+    onRetry: (attempt, _maxAttempts, reason) => {
+      if (abortSignal.aborted)
+        return;
+      spinner.start(`${reason}\u2026 (attempt ${attempt})`);
+    },
+    onRetryResolved: () => {
+      spinner.stop();
+    },
+    onBalanceStatus: (balance, zero) => {
+      spinner.stop();
+      mdRender.flush();
+      printBalanceNotice(balance, zero);
+    },
     requestPermission,
     checkpointManager,
     onProgress
@@ -23508,6 +23737,13 @@ async function runTurnHeadless(messages, modelAlias, workDir, _abortSignal, env2
       resultText += text;
       emit({ type: "text", text });
     },
+    // System notice (mid-run auto-prune/auto-compact) — emit as its own event
+    // type instead of falling through to onText, so a stream-json consumer
+    // doesn't see compaction housekeeping text mixed into the model's `text`
+    // events or accumulated into resultText.
+    onNotice: (text) => {
+      emit({ type: "notice", text });
+    },
     onToolUse: (name, input) => {
       emit({ type: "tool_use", tool: name, input });
     },
@@ -23519,6 +23755,12 @@ async function runTurnHeadless(messages, modelAlias, workDir, _abortSignal, env2
       lastUsage = u;
       emit({ type: "usage", usage: u });
     },
+    onRetry: (attempt, maxAttempts, reason) => {
+      emit({ type: "retry", attempt, max_attempts: maxAttempts, reason });
+    },
+    onBalanceStatus: (balance, zero) => {
+      emit({ type: "balance_status", balance, zero, billing_url: BILLING_URL });
+    },
     // Headless → auto-approve (no TTY to ask on). Destructive/irreversible
     // commands (DB drops, force-push, terraform destroy…) fail CLOSED here: with
     // no human to confirm, they are denied unless NEXRALL_ALLOW_DESTRUCTIVE=1 is
@@ -23642,9 +23884,23 @@ async function startChatSession(options) {
     messages = stored.messages;
     sessionId = stored.id;
     sessionTitle = stored.title;
-    console.log(source_default.green(`  Resumed session: ${source_default.bold(stored.title.slice(0, 60))}`));
-    console.log(source_default.dim(`  ${messages.length} messages restored`));
-    console.log();
+    try {
+      const compacted = await (0, import_code_core3.compactMessagesForResume)(messages, {
+        workDir,
+        model: modelAlias,
+        clientType: "cli",
+        onNotice: (text) => {
+          if (!headless)
+            console.log(source_default.dim(text.trim()));
+        }
+      });
+    } catch {
+    }
+    if (!headless) {
+      console.log(source_default.green(`  Resumed session: ${source_default.bold(stored.title.slice(0, 60))}`));
+      console.log(source_default.dim(`  ${messages.length} messages restored`));
+      console.log();
+    }
   }
   const checkpoints = new import_code_core3.CheckpointManager(workDir, sessionId);
   const updateTitle = () => {
@@ -23789,6 +24045,15 @@ ${text}` : "");
           messages = stored.messages;
           sessionId = stored.id;
           sessionTitle = stored.title;
+          try {
+            await (0, import_code_core3.compactMessagesForResume)(messages, {
+              workDir,
+              model: modelAlias,
+              clientType: "cli",
+              onNotice: (text) => console.log(source_default.dim(text.trim()))
+            });
+          } catch {
+          }
           console.log(source_default.green(`  Resumed: ${source_default.bold(stored.title.slice(0, 60))}`));
           console.log(source_default.dim(`  ${messages.length} messages restored`));
           rl.prompt();
@@ -24335,7 +24600,7 @@ function pluginListCommand() {
 
 // src/index.ts
 var program2 = new Command();
-program2.name("nex").description("Nexrall Code \u2014 AI coding assistant (powered by Nexrall)").version("0.5.2");
+program2.name("nex").description("Nexrall Code \u2014 AI coding assistant (powered by Nexrall)").version("0.5.12");
 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.2",
+  "version": "0.5.12",
   "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",
@@ -37,7 +37,7 @@
     "ora": "^8.0.1",
     "prompts": "^2.4.2",
     "readline": "^1.3.0",
-    "@nexrall/code-core": "1.4.2"
+    "@nexrall/code-core": "1.4.11"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.600.0",