nexrall-code 0.5.133 → 0.5.134

package/dist/index.js

@@ -3382,7 +3382,7 @@ var require_dist = __commonJS({
           return;
         }
         const noValue = fieldLength < 0;
-        const field = lineBuffer.slice(index, index + (noValue ? lineLength : fieldLength));
+        const field2 = lineBuffer.slice(index, index + (noValue ? lineLength : fieldLength));
         let step = 0;
         if (noValue) {
           step = lineLength;
@@ -3394,13 +3394,13 @@ var require_dist = __commonJS({
         const position = index + step;
         const valueLength = lineLength - step;
         const value = lineBuffer.slice(position, position + valueLength).toString();
-        if (field === "data") {
+        if (field2 === "data") {
           data += value ? "".concat(value, "\n") : "\n";
-        } else if (field === "event") {
+        } else if (field2 === "event") {
           eventName = value;
-        } else if (field === "id" && !value.includes("\0")) {
+        } else if (field2 === "id" && !value.includes("\0")) {
           eventId = value;
-        } else if (field === "retry") {
+        } else if (field2 === "retry") {
           const retry = parseInt(value, 10);
           if (!Number.isNaN(retry)) {
             onParse({
@@ -3728,9 +3728,9 @@ var require_ponyfill_es2018 = __commonJS({
           throw new TypeError(`Parameter ${position} is required in '${context}'.`);
         }
       }
-      function assertRequiredField(x2, field, context) {
+      function assertRequiredField(x2, field2, context) {
         if (x2 === void 0) {
-          throw new TypeError(`${field} is required in '${context}'.`);
+          throw new TypeError(`${field2} is required in '${context}'.`);
         }
       }
       function convertUnrestrictedDouble(value) {
@@ -68109,8 +68109,8 @@ var require_FieldFormatter = __commonJS({
         }
         return false;
       }
-      format(field, fieldIndex, isHeader) {
-        const preparedField = `${lodash_isnil_1.default(field) ? "" : field}`.replace(/\0/g, "");
+      format(field2, fieldIndex, isHeader) {
+        const preparedField = `${lodash_isnil_1.default(field2) ? "" : field2}`.replace(/\0/g, "");
         const { formatterOptions } = this;
         if (formatterOptions.quote !== "") {
           const shouldEscape = preparedField.indexOf(formatterOptions.quote) !== -1;
@@ -68124,9 +68124,9 @@ var require_FieldFormatter = __commonJS({
         }
         return preparedField;
       }
-      quoteField(field) {
+      quoteField(field2) {
         const { quote } = this.formatterOptions;
-        return `${quote}${field}${quote}`;
+        return `${quote}${field2}${quote}`;
       }
     };
     exports2.FieldFormatter = FieldFormatter;
@@ -68292,7 +68292,7 @@ var require_RowFormatter = __commonJS({
         return this._rowTransform(row, cb);
       }
       formatColumns(columns, isHeadersRow) {
-        const formattedCols = columns.map((field, i2) => this.fieldFormatter.format(field, i2, isHeadersRow)).join(this.formatterOptions.delimiter);
+        const formattedCols = columns.map((field2, i2) => this.fieldFormatter.format(field2, i2, isHeadersRow)).join(this.formatterOptions.delimiter);
         const { rowCount } = this;
         this.rowCount += 1;
         if (rowCount) {
@@ -77951,8 +77951,8 @@ var require_common2 = __commonJS({
     exports2.mark = mark;
     exports2.isIgnored = isIgnored;
     exports2.childrenIgnored = childrenIgnored;
-    function ownProp(obj2, field) {
-      return Object.prototype.hasOwnProperty.call(obj2, field);
+    function ownProp(obj2, field2) {
+      return Object.prototype.hasOwnProperty.call(obj2, field2);
     }
     var fs15 = __require("fs");
     var path15 = __require("path");
@@ -105961,14 +105961,14 @@ var require_destructive = __commonJS({
       return null;
     }
     var MAX_DEPTH = 4;
-    function classify(command, depth) {
+    function classify2(command, depth) {
       if (depth > MAX_DEPTH)
         return null;
       const viaRegex = classifyRegex(command);
       if (viaRegex)
         return viaRegex;
       for (const tokens of (0, destructiveTokens_1.tokenize)(stripHeredocs(command))) {
-        const m2 = (0, destructiveTokens_1.classifyTokens)(tokens, (inner) => classify(inner, depth + 1), classifyRawSql);
+        const m2 = (0, destructiveTokens_1.classifyTokens)(tokens, (inner) => classify2(inner, depth + 1), classifyRawSql);
         if (m2)
           return m2;
       }
@@ -105977,7 +105977,7 @@ var require_destructive = __commonJS({
     function classifyDestructiveCommand(command) {
       if (!command || typeof command !== "string")
         return null;
-      return classify(command, 0);
+      return classify2(command, 0);
     }
     function isDestructiveBash3(tool, input) {
       if (tool !== "bash" && tool !== "run_command" && tool !== "execute_command")
@@ -146066,6 +146066,269 @@ function paintLine(l2) {
   }
 }
 
+// src/ui/errorView.ts
+var TITLE_MAX = 120;
+var DETAIL_MAX = 300;
+function clip(s2, max) {
+  const flat = s2.replace(/\s+/g, " ").trim();
+  return flat.length <= max ? flat : flat.slice(0, max - 1) + "\u2026";
+}
+function messageOf(err) {
+  let msg;
+  if (typeof err === "string")
+    msg = err;
+  else if (err instanceof Error)
+    msg = err.message || (err.name && err.name !== "Error" ? err.name : "");
+  else if (err && typeof err === "object" && typeof err.message === "string")
+    msg = err.message;
+  else
+    msg = String(err);
+  const brace = msg.indexOf("{");
+  if (brace > 0) {
+    const tail = msg.slice(brace);
+    try {
+      const parsed = JSON.parse(tail);
+      const inner = typeof parsed.error === "string" ? parsed.error : typeof parsed.message === "string" ? parsed.message : "";
+      if (inner)
+        return `${msg.slice(0, brace).replace(/[:,\s]+$/, "")}: ${inner}`.trim();
+    } catch {
+    }
+  }
+  return msg;
+}
+function codesOf(err) {
+  const out = [];
+  const push = (v) => {
+    if (v && typeof v === "object") {
+      const rec = v;
+      if (typeof rec.code === "string")
+        out.push(rec.code);
+      if (typeof rec.errno === "string")
+        out.push(rec.errno);
+      if (typeof rec.name === "string")
+        out.push(rec.name);
+      if (rec.cause)
+        push(rec.cause);
+    }
+  };
+  push(err);
+  return out;
+}
+function field(err, key) {
+  if (err && typeof err === "object" && key in err) {
+    return err[key];
+  }
+  return void 0;
+}
+var NETWORK_RE = /fetch failed|econnrefused|econnreset|enotfound|eai_again|etimedout|socket hang up|network error|getaddrinfo|tls|ssl|proxy|socket disconnected|terminated|other side closed/i;
+var NETWORK_CODES = /* @__PURE__ */ new Set(["ECONNREFUSED", "ECONNRESET", "ENOTFOUND", "EAI_AGAIN", "ETIMEDOUT", "UND_ERR_SOCKET", "UND_ERR_CONNECT_TIMEOUT", "EHOSTUNREACH", "ENETUNREACH"]);
+var CONTEXT_RE = /context (?:length|window)|too many tokens|maximum context|token limit|prompt is too long|exceeds the maximum|max_tokens|input length/i;
+var MODEL_RE = /unknown model|model[^.]{0,20}not found|invalid model|model[^.]{0,20}does not exist|model[^.]{0,20}not available|no such model|unsupported model/i;
+var AUTH_RE = /not authenticated|unauthorized|invalid (?:api )?(?:key|token)|authentication (?:failed|required)|sign in|login required|token (?:expired|revoked)/i;
+var BALANCE_RE = /insufficient (?:balance|credit|funds)|out of (?:credit|funds|balance)|balance (?:is )?too low|no credit|quota exceeded|payment required/i;
+var RATE_RE = /rate ?limit|too many requests|overloaded/i;
+function describeError(err, opts = {}) {
+  const view = classify(err, opts);
+  if (opts.debugLogPath && view.kind !== "abort")
+    view.hints.push(`Full trace: ${opts.debugLogPath}`);
+  return view;
+}
+function classify(err, opts) {
+  const msg = messageOf(err);
+  const status = field(err, "status");
+  const code = field(err, "code");
+  const names = codesOf(err);
+  const hay = `${msg} ${names.join(" ")}`;
+  const name = field(err, "name");
+  if (opts.aborted || name === "AbortError" || names.includes("AbortError") || /^(Aborted|Request aborted)$/i.test(msg)) {
+    return { kind: "abort", title: "Interrupted", hints: [] };
+  }
+  if (code === "team_budget_exhausted") {
+    return {
+      kind: "team-budget",
+      title: "This team pool is out of budget",
+      hints: ["Bill your own wallet instead: /team use personal", "Or ask a team admin to top the shared budget up"]
+    };
+  }
+  if (status === 402 || BALANCE_RE.test(msg)) {
+    return {
+      kind: "balance",
+      title: "Out of credit \u2014 the turn could not start",
+      hints: ["Top up your wallet, then send the message again", "/balance shows what is left; /team switches who pays"]
+    };
+  }
+  if (field(err, "authExpired") || status === 401 || AUTH_RE.test(msg)) {
+    return {
+      kind: "auth",
+      title: "Not signed in",
+      hints: ["Run `nexrall-code login` to sign in again", "Your session keeps its place: /resume picks it back up"]
+    };
+  }
+  if (status === 429 || RATE_RE.test(msg)) {
+    return {
+      kind: "rate-limit",
+      title: "Rate limited by the API",
+      hints: ["Transient overload \u2014 already retried a few times automatically", "Send the message again, or /model to switch models"]
+    };
+  }
+  if (status === 404 && MODEL_RE.test(msg)) {
+    return { kind: "model", title: clip(msg, TITLE_MAX), hints: ["/model lists what this account can use"] };
+  }
+  if (MODEL_RE.test(msg)) {
+    return { kind: "model", title: clip(msg, TITLE_MAX), hints: ["/model lists what this account can use"] };
+  }
+  if (CONTEXT_RE.test(msg)) {
+    return {
+      kind: "context",
+      title: "Context window is full",
+      hints: ["/compact summarizes the conversation to make room", "/clear starts a fresh session"]
+    };
+  }
+  if (field(err, "name") === "ToolNotAllowedError") {
+    return { kind: "tool", title: clip(msg, TITLE_MAX), hints: ["/permissions shows which tools are allowed, asked for, or denied"] };
+  }
+  if (typeof status === "number" && status >= 500 || /\bAPI error 5\d\d\b/.test(msg)) {
+    return {
+      kind: "server",
+      title: `Nexrall API error (${typeof status === "number" ? status : "5xx"})`,
+      hints: ["Usually transient \u2014 send the message again", "`nex doctor` checks login, model and connectivity"]
+    };
+  }
+  if (NETWORK_RE.test(hay) || names.some((n) => NETWORK_CODES.has(n))) {
+    return {
+      kind: "network",
+      title: "Cannot reach the Nexrall API",
+      hints: ["Check your connection, VPN or proxy", "`nex doctor` shows what is reachable and with which credentials"]
+    };
+  }
+  const view = {
+    kind: "other",
+    title: clip(msg, TITLE_MAX) || "The turn failed",
+    hints: ["Send the message again to retry", "`nex doctor` checks your setup"]
+  };
+  return view;
+}
+function errorDetail(err, view) {
+  if (view.kind !== "other")
+    return null;
+  const msg = messageOf(err);
+  const title = view.title;
+  if (!msg || msg === title || title.endsWith(msg))
+    return null;
+  return clip(msg, DETAIL_MAX);
+}
+
+// src/ui/turnSummary.ts
+var FILE_TOOLS = /* @__PURE__ */ new Set([
+  "write_file",
+  "write_docx",
+  "write_xlsx",
+  "write_pptx",
+  "edit_file",
+  "multi_edit",
+  "delete_file",
+  "notebook_edit",
+  "move_file",
+  "copy_file"
+]);
+var TEST_RE = /(^|[\s;&|])(npm (?:run )?(?:test|t)\b|yarn test\b|pnpm (?:run )?test\b|bun test\b|jest\b|vitest\b|mocha\b|pytest\b|python3? -m pytest\b|go test\b|cargo test\b|rspec\b|phpunit\b|dotnet test\b|mvn (?:test|verify)\b|gradle test\b|make test\b|swift test\b)/i;
+function freshTurnStats(now = Date.now()) {
+  return { startedAt: now, endedAt: now, rounds: 0, toolCalls: 0, files: [], testRuns: [], costKnown: false };
+}
+function pathsTouched(name, input) {
+  if (!FILE_TOOLS.has(name) || !input || typeof input !== "object")
+    return [];
+  const rec = input;
+  const str = (v) => typeof v === "string" && v ? [v] : [];
+  if (name === "move_file")
+    return [...str(rec.source), ...str(rec.dest)];
+  if (name === "copy_file")
+    return str(rec.destination);
+  return str(rec.path);
+}
+function noteToolUse(stats, name, input, subAgent = false) {
+  if (subAgent)
+    return;
+  stats.toolCalls++;
+  for (const p of pathsTouched(name, input)) {
+    if (!stats.files.includes(p))
+      stats.files.push(p);
+  }
+}
+function isTestCommand(command) {
+  return TEST_RE.test(command);
+}
+function noteBashResult(stats, command, ok) {
+  if (!isTestCommand(command))
+    return;
+  const label = command.replace(/\s+/g, " ").trim().slice(0, 60);
+  const existing = stats.testRuns.find((t2) => t2.label === label);
+  if (existing)
+    existing.ok = ok;
+  else
+    stats.testRuns.push({ label, ok });
+}
+function formatDuration(ms) {
+  const clamped = Math.max(0, ms);
+  if (clamped < 1e3)
+    return `${Math.round(clamped)}ms`;
+  const s2 = clamped / 1e3;
+  if (s2 < 60)
+    return `${s2 < 10 ? s2.toFixed(1) : Math.round(s2)}s`;
+  const m2 = Math.floor(s2 / 60);
+  const rest = Math.round(s2 - m2 * 60);
+  if (m2 < 60)
+    return rest ? `${m2}m ${rest}s` : `${m2}m`;
+  const h2 = Math.floor(m2 / 60);
+  const rem = m2 - h2 * 60;
+  return rem ? `${h2}h ${rem}m` : `${h2}h`;
+}
+function formatTokens(n) {
+  if (n < 1e3)
+    return String(n);
+  if (n < 1e6)
+    return `${(n / 1e3).toFixed(n < 1e5 ? 1 : 0)}k`;
+  return `${(n / 1e6).toFixed(1)}M`;
+}
+function formatCost(usd) {
+  if (usd > 0 && usd < 0.01)
+    return `$${usd.toFixed(4)}`;
+  return `$${usd.toFixed(2)}`;
+}
+function summaryLines2(stats, opts) {
+  const { outcome } = opts;
+  const elapsed = formatDuration(stats.endedAt - stats.startedAt);
+  const parts = [];
+  if (outcome === "failed")
+    parts.push("stopped early");
+  if (outcome === "interrupted")
+    parts.push("interrupted");
+  const n = stats.files.length;
+  if (n)
+    parts.push(`${n} file${n === 1 ? "" : "s"} changed`);
+  if (stats.toolCalls)
+    parts.push(`${stats.toolCalls} tool call${stats.toolCalls === 1 ? "" : "s"}`);
+  if (stats.tokens) {
+    const cached = stats.cachedTokens ?? 0;
+    const pct = cached > 0 ? ` (cached ${Math.round(cached / stats.tokens * 100)}%)` : "";
+    parts.push(`${formatTokens(stats.tokens)} tokens${pct}`);
+  }
+  if (stats.costKnown && stats.costUsd)
+    parts.push(formatCost(stats.costUsd));
+  parts.push(elapsed);
+  const head = parts.join(" \xB7 ");
+  const lines = [head];
+  const failedTests = stats.testRuns.filter((t2) => !t2.ok);
+  for (const t2 of failedTests)
+    lines.push(`tests: \u2717 ${t2.label}`);
+  if (failedTests.length === 0) {
+    for (const t2 of stats.testRuns)
+      lines.push(`tests: \u2713 ${t2.label}`);
+  }
+  const cols = opts.cols && opts.cols > 20 ? opts.cols - 4 : 0;
+  return cols ? lines.map((l2) => l2.length > cols ? l2.slice(0, cols - 1) + "\u2026" : l2) : lines;
+}
+
 // src/commands/chat.ts
 import * as os9 from "os";
 import * as crypto4 from "crypto";
@@ -147036,23 +147299,39 @@ function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, ne
   };
 }
 
+// src/ui/previewCap.ts
+var MAX_PREVIEW_LINES = 24;
+function previewCap(total, max = MAX_PREVIEW_LINES) {
+  const show = Math.max(0, Math.min(total, max));
+  return { show, hidden: Math.max(0, total - show) };
+}
+function hiddenNote(hidden) {
+  return `\u2026 ${hidden} more line${hidden === 1 ? "" : "s"} not shown`;
+}
+
 // src/ui/diff.ts
 function showDiff(filePath2, oldContent, newContent) {
   const isNew = oldContent === null;
   const from = isNew ? "/dev/null" : `a/${filePath2}`;
   const to = `b/${filePath2}`;
-  console.log();
-  console.log(source_default.bold(`--- ${from}`));
-  console.log(source_default.bold(`+++ ${to}`));
+  const emit = (head, body2) => {
+    for (const line of head)
+      console.log(line);
+    const { show, hidden } = previewCap(body2.length);
+    for (const line of body2.slice(0, show))
+      console.log(line);
+    if (hidden > 0)
+      console.log(source_default.dim(`  ${hiddenNote(hidden)}`));
+    console.log();
+  };
   if (isNew) {
     const lines = newContent.split("\n");
     if (lines[lines.length - 1] === "")
       lines.pop();
-    console.log(source_default.cyan(`@@ -0,0 +1,${lines.length} @@`));
-    for (const line of lines) {
-      console.log(source_default.green(`+${line}`));
-    }
-    console.log();
+    emit(
+      ["", source_default.bold(`--- ${from}`), source_default.bold(`+++ ${to}`), source_default.cyan(`@@ -0,0 +1,${lines.length} @@`)],
+      lines.map((line) => source_default.green(`+${line}`))
+    );
     return;
   }
   const patch = structuredPatch(
@@ -147069,20 +147348,21 @@ function showDiff(filePath2, oldContent, newContent) {
     console.log();
     return;
   }
+  const body = [];
   for (const hunk of patch.hunks) {
     const hunkHeader = `@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`;
-    console.log(source_default.cyan(hunkHeader));
+    body.push(source_default.cyan(hunkHeader));
     for (const line of hunk.lines) {
       if (line.startsWith("+")) {
-        console.log(source_default.green(line));
+        body.push(source_default.green(line));
       } else if (line.startsWith("-")) {
-        console.log(source_default.red(line));
+        body.push(source_default.red(line));
       } else {
-        console.log(source_default.gray(line));
+        body.push(source_default.gray(line));
       }
     }
   }
-  console.log();
+  emit(["", source_default.bold(`--- ${from}`), source_default.bold(`+++ ${to}`)], body);
 }
 
 // src/permissions/risk.ts
@@ -147211,6 +147491,15 @@ function announceAgent(req) {
   console.error();
   console.error(source_default.cyan(`  \u21B3 sub-agent ${req.agent.name}${req.agent.description ? ` (${req.agent.description})` : ""} asks:`));
 }
+function printCommandBox(command) {
+  const lines = command.split("\n");
+  const { show, hidden } = previewCap(lines.length);
+  for (const line of lines.slice(0, show)) {
+    console.error(source_default.yellow("  \u2502 ") + source_default.white(line));
+  }
+  if (hidden > 0)
+    console.error(source_default.yellow("  \u2502 ") + source_default.dim(hiddenNote(hidden)));
+}
 async function requestPermission(req) {
   const { tool, input } = req;
   const decision = (0, import_code_core4.evaluatePermission)(_rules, tool, input, _workDir);
@@ -147227,9 +147516,7 @@ async function requestPermission(req) {
       console.error(source_default.red.bold("  \u26A0  DESTRUCTIVE / IRREVERSIBLE COMMAND"));
       console.error(source_default.red(`     ${destructive.reason} [${destructive.category}]`));
       console.error(source_default.yellow("  \u250C\u2500 bash \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-      for (const line of command.split("\n")) {
-        console.error(source_default.yellow("  \u2502 ") + source_default.white(line));
-      }
+      printCommandBox(command);
       console.error(source_default.yellow("  \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
       console.error(source_default.dim("  This cannot be undone. Auto-approve does not apply here."));
       console.error();
@@ -147341,9 +147628,7 @@ async function askFlow(req) {
     const command = input.command ?? input.cmd ?? "";
     console.error();
     console.error(source_default.yellow("  \u250C\u2500 bash \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-    for (const line of command.split("\n")) {
-      console.error(source_default.yellow("  \u2502 ") + source_default.white(line));
-    }
+    printCommandBox(command);
     console.error(source_default.yellow("  \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
     console.error();
     const v = await choose({
@@ -147454,6 +147739,9 @@ function redact(text, max = 400) {
   s2 = s2.replace(/(authorization["']?\s*[:=]\s*["']?)(bearer\s+)?[^\s"',}]+/gi, "$1[redacted]").replace(/\bbearer\s+[A-Za-z0-9._~+/=-]{8,}/gi, "Bearer [redacted]").replace(/\b(sk|pk|rk|ghp|gho|ghs|github_pat|xox[abprs]|AKIA|AIza)[-_A-Za-z0-9]{12,}/g, "[redacted]").replace(/\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{5,}/g, "[redacted-jwt]").replace(/((?:api[_-]?key|token|secret|password|passwd)["']?\s*[:=]\s*["']?)[^\s"',}&]{4,}/gi, "$1[redacted]");
   return s2.length > max ? s2.slice(0, max) + "\u2026" : s2;
 }
+function debugLogPath() {
+  return filePath;
+}
 function enableDebug(explicitPath) {
   try {
     const p = explicitPath ? path3.resolve(explicitPath) : path3.join(debugDir(), `${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${process.pid}.log`);
@@ -154372,10 +154660,10 @@ var Output = class {
       transformers
     });
   }
-  clip(clip3) {
+  clip(clip4) {
     this.operations.push({
       type: "clip",
-      clip: clip3
+      clip: clip4
     });
   }
   unclip() {
@@ -154409,40 +154697,40 @@ var Output = class {
         const { text, transformers } = operation;
         let { x: x2, y } = operation;
         let lines = text.split("\n");
-        const clip3 = clips.at(-1);
-        if (clip3) {
-          const clipHorizontally = typeof clip3?.x1 === "number" && typeof clip3?.x2 === "number";
-          const clipVertically = typeof clip3?.y1 === "number" && typeof clip3?.y2 === "number";
+        const clip4 = clips.at(-1);
+        if (clip4) {
+          const clipHorizontally = typeof clip4?.x1 === "number" && typeof clip4?.x2 === "number";
+          const clipVertically = typeof clip4?.y1 === "number" && typeof clip4?.y2 === "number";
           if (clipHorizontally) {
             const width = this.caches.getWidestLine(text);
-            if (x2 + width < clip3.x1 || x2 > clip3.x2) {
+            if (x2 + width < clip4.x1 || x2 > clip4.x2) {
               continue;
             }
           }
           if (clipVertically) {
             const height = lines.length;
-            if (y + height < clip3.y1 || y > clip3.y2) {
+            if (y + height < clip4.y1 || y > clip4.y2) {
               continue;
             }
           }
           if (clipHorizontally) {
             lines = lines.map((line) => {
-              const from = x2 < clip3.x1 ? clip3.x1 - x2 : 0;
+              const from = x2 < clip4.x1 ? clip4.x1 - x2 : 0;
               const width = this.caches.getStringWidth(line);
-              const to = x2 + width > clip3.x2 ? clip3.x2 - x2 : width;
+              const to = x2 + width > clip4.x2 ? clip4.x2 - x2 : width;
               return sliceAnsi(line, from, to);
             });
-            if (x2 < clip3.x1) {
-              x2 = clip3.x1;
+            if (x2 < clip4.x1) {
+              x2 = clip4.x1;
             }
           }
           if (clipVertically) {
-            const from = y < clip3.y1 ? clip3.y1 - y : 0;
+            const from = y < clip4.y1 ? clip4.y1 - y : 0;
             const height = lines.length;
-            const to = y + height > clip3.y2 ? clip3.y2 - y : height;
+            const to = y + height > clip4.y2 ? clip4.y2 - y : height;
             lines = lines.slice(from, to);
-            if (y < clip3.y1) {
-              y = clip3.y1;
+            if (y < clip4.y1) {
+              y = clip4.y1;
             }
           }
         }
@@ -157611,7 +157899,7 @@ function ctxSegment(pct) {
 function money2(usd) {
   return usd > 0 && usd < 0.01 ? "$" + usd.toFixed(4) : "$" + usd.toFixed(2);
 }
-function clip(s2, max) {
+function clip2(s2, max) {
   return s2.length <= max ? s2 : s2.slice(0, Math.max(1, max - 1)) + "\u2026";
 }
 function composeFooter(base, extras, columns, reserve = 0) {
@@ -157622,9 +157910,9 @@ function composeFooter(base, extras, columns, reserve = 0) {
   ];
   const optional = [];
   if (extras?.model)
-    optional.push({ keep: 3, at: 0, segment: { text: clip(extras.model, 24), tone: "dim" } });
+    optional.push({ keep: 3, at: 0, segment: { text: clip2(extras.model, 24), tone: "dim" } });
   if (extras?.branch)
-    optional.push({ keep: 1, at: 1, segment: { text: "\u2387 " + clip(extras.branch, 24), tone: "dim" } });
+    optional.push({ keep: 1, at: 1, segment: { text: "\u2387 " + clip2(extras.branch, 24), tone: "dim" } });
   if (typeof extras?.ctxPct === "number")
     optional.push({ keep: 4, at: 2, segment: ctxSegment(extras.ctxPct) });
   if (typeof extras?.costUsd === "number")
@@ -159672,7 +159960,7 @@ var InkReadlineAdapter = class extends EventEmitter3 {
 // src/ui/rewindPicker.ts
 var MAX_REWIND_CHOICES = 9;
 var LABEL_MAX = 52;
-function clip2(text, max) {
+function clip3(text, max) {
   const t2 = text.replace(/\s+/g, " ").trim();
   return t2.length <= max ? t2 : t2.slice(0, max - 1) + "\u2026";
 }
@@ -159683,7 +159971,7 @@ function rewindChoices(cps) {
   const options = newest.map((c, i2) => {
     const files = `${c.fileCount} file${c.fileCount === 1 ? "" : "s"}`;
     const bash = c.bashCount > 0 ? ` \xB7 ${c.bashCount} shell cmd${c.bashCount === 1 ? "" : "s"} (not undone)` : "";
-    return { key: String(i2 + 1), label: `${clip2(c.label, LABEL_MAX)}  (${files}${bash})` };
+    return { key: String(i2 + 1), label: `${clip3(c.label, LABEL_MAX)}  (${files}${bash})` };
   });
   options.push({ key: "n", label: "Cancel" });
   return { options, ids: newest.map((c) => c.id) };
@@ -160501,8 +160789,38 @@ function formatAgentsList(workDir) {
   }
   return lines.join("\n");
 }
+var turnStats = freshTurnStats();
+function printTurnSummary(outcome) {
+  if (turnStats.endedAt <= turnStats.startedAt)
+    turnStats.endedAt = Date.now();
+  const lines = summaryLines2(turnStats, { outcome, cols: process.stdout.columns });
+  const glyph = outcome === "ok" ? source_default.green("\u2713") : outcome === "interrupted" ? source_default.yellow("\u25E6") : source_default.red("\u2717");
+  console.log("  " + glyph + " " + source_default.dim(lines[0]));
+  for (const extra of lines.slice(1))
+    console.log("    " + source_default.dim(extra));
+}
+function errorReportLines(err, aborted) {
+  const view = describeError(err, { aborted, debugLogPath: debugLogPath() ?? void 0 });
+  if (view.kind === "abort")
+    return ["", source_default.yellow("  \u25E6 Interrupted")];
+  const lines = ["", source_default.red("  \u2717 ") + source_default.bold(view.title)];
+  const detail = errorDetail(err, view);
+  if (detail)
+    lines.push(source_default.dim("    " + detail));
+  for (const h2 of view.hints)
+    lines.push(source_default.dim("    " + h2));
+  return lines;
+}
+function printErrorReport(err, aborted) {
+  for (const l2 of errorReportLines(err, aborted))
+    console.error(l2);
+}
 async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrallMd, mode, effort, checkpointManager, onProgress, takePendingInput, worktreeState, peerCtx) {
   let lastUsage;
+  turnStats = freshTurnStats();
+  const turnCostStart = sessionUsage.cost;
+  const turnTokenStart = sessionUsage.totalTokens;
+  const turnCachedStart = sessionUsage.cacheRead;
   const spinner = new Spinner();
   const mdRender = new MarkdownStreamRenderer();
   const toolStream = new ToolStreamPrinter(PREVIEW_LINES);
@@ -160614,7 +160932,13 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
       mdRender.flush();
       spinner.stop();
       if (meta?.id)
-        toolCalls.set(meta.id, { name, start: Date.now(), label: toolLabel(name, input) });
+        toolCalls.set(meta.id, {
+          name,
+          start: Date.now(),
+          label: toolLabel(name, input),
+          command: name === "bash" && typeof input.command === "string" ? input.command : void 0
+        });
+      noteToolUse(turnStats, name, input, isSubTask);
       debugLog("tool_use", { tool: name, sub: !!isSubTask });
       if (isSubTask) {
         console.log(subPrefix(meta) + formatToolUse(name, input).trim());
@@ -160647,6 +160971,8 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
       const tracked = meta?.id ? toolCalls.get(meta.id) : void 0;
       if (meta?.id)
         toolCalls.delete(meta.id);
+      if (!isSubTask && tracked?.command)
+        noteBashResult(turnStats, tracked.command, res.error === void 0);
       debugLog("tool_result", { tool: tracked?.name ?? name, ms: tracked ? Date.now() - tracked.start : void 0, ok: res.error === void 0, error: res.error, sub: !!isSubTask });
       if (isSubTask) {
         const ms = tracked ? Date.now() - tracked.start : 0;
@@ -160690,6 +161016,7 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
       debugLog("usage", { input: u.input_tokens, output: u.output_tokens, cache_read: u.cache_read_input_tokens, cache_write: u.cache_creation_input_tokens, cost, partial: !!partial, sub: !!isSubTask });
     },
     onApiCallDuration: (ms) => {
+      turnStats.rounds++;
       debugLog("api_call", { ms });
     },
     // A transient disconnect (network drop, machine sleep/wake, overloaded upstream)
@@ -160731,6 +161058,12 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
       mdRender.flush();
       printBalanceNotice(balance, zero);
     },
+    // The user's Esc / Ctrl+C. Wiring this into the loop is what makes "interrupt" mean
+    // STOP rather than "stop drawing": without it the signal only silenced the event
+    // handlers below, and the agent kept calling tools and the API (and spending money)
+    // until it happened to finish — measured live: Esc at 12s left `sleep 30` running to
+    // 30.0s and the turn still made its next request. Headless mode already passed it.
+    abortSignal,
     requestPermission,
     checkpointManager,
     onProgress,
@@ -160745,6 +161078,11 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
   if (lastUsage) {
     console.log(source_default.dim("  " + formatUsage(lastUsage.output_tokens)));
   }
+  turnStats.tokens = Math.max(0, sessionUsage.totalTokens - turnTokenStart);
+  turnStats.cachedTokens = Math.max(0, sessionUsage.cacheRead - turnCachedStart);
+  turnStats.costKnown = sessionUsage.costReported;
+  turnStats.costUsd = Math.max(0, sessionUsage.cost - turnCostStart);
+  printTurnSummary(abortSignal.aborted ? "interrupted" : "ok");
   return { messages: result, usage: lastUsage };
 }
 function toolIds(isSubTask, meta) {
@@ -161243,7 +161581,8 @@ Resume it with: nex --worktree ${worktreeState.name}
   };
   const recoverTurn = (err, current) => {
     const salvaged = (0, import_code_core8.salvageHistory)(err);
-    console.error("\n" + source_default.red("Error: ") + String(err.message));
+    printErrorReport(err, abortSignal.aborted);
+    printTurnSummary(abortSignal.aborted ? "interrupted" : "failed");
     if (!salvaged)
       return current;
     const rounds = err.progressCount ?? 1;
@@ -161321,7 +161660,8 @@ ${text}` : "");
           ...salvaged ? { resumable: true, messagesCompleted: salvaged.length } : {}
         }) + "\n");
       } else {
-        console.error(source_default.red("\nError: ") + String(err.message));
+        for (const l2 of errorReportLines(err, abortSignal2.aborted))
+          console.error(l2);
         if (salvaged) {
           console.error(source_default.dim("  Progress was saved \u2014 run `nex --resume` (or `nex -r`) to resume this session."));
         }

package/package.json

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