nexrall-code 0.5.127 → 0.5.129

package/dist/index.js

@@ -146428,47 +146428,44 @@ function formatToolUse(name, input) {
   const argDisplay = primaryArg ? source_default.dim(" ") + source_default.white(String(primaryArg).replace(/\n/g, "\u21B5").slice(0, 80)) : "";
   return source_default.yellow(icons.tool) + " " + source_default.bold(name) + argDisplay;
 }
-var ToolStreamPrinter = class _ToolStreamPrinter {
+var ToolStreamPrinter = class {
+  // Only the first PREVIEW lines are printed live; the rest are COUNTED, not printed, and the
+  // full text stays in the ToolOutputStore for Ctrl+O / /expand. A build log used to bury the
+  // conversation under 200 lines of scrollback that nobody re-reads.
+  constructor(preview = 8) {
+    this.preview = preview;
+  }
   carry = "";
   linesShown = 0;
-  // Cap visible lines per command so a runaway/very chatty process (e.g. a
-  // build tool re-printing a progress bar thousands of times) doesn't flood
-  // the terminal — the full output is still available afterward via
-  // formatToolResult's summary and, for large output, the spill file.
-  static MAX_LINES = 200;
-  capped = false;
+  hidden = 0;
   feed(chunk) {
-    if (this.capped)
-      return;
     this.carry += chunk;
     const lines = this.carry.split("\n");
     this.carry = lines.pop() ?? "";
-    for (const line of lines) {
-      if (!this.printLine(line))
-        return;
-    }
+    for (const line of lines)
+      this.printLine(line);
   }
   printLine(line) {
-    if (this.linesShown >= _ToolStreamPrinter.MAX_LINES) {
-      if (!this.capped) {
-        this.capped = true;
-        console.log(source_default.dim("  \u2502 \u2026 output continues (full log in the result above once finished)"));
-      }
-      return false;
+    if (this.linesShown >= this.preview) {
+      this.hidden++;
+      return;
     }
     this.linesShown++;
     console.log(source_default.dim("  \u2502 ") + source_default.gray(line.slice(0, 300)));
-    return true;
+  }
+  /** Lines counted but not printed so far (the trailing partial line is not included). */
+  get hiddenLines() {
+    return this.hidden;
   }
   flush() {
-    if (!this.capped && this.carry)
+    if (this.carry)
       this.printLine(this.carry);
     this.carry = "";
   }
   reset() {
     this.carry = "";
     this.linesShown = 0;
-    this.capped = false;
+    this.hidden = 0;
   }
 };
 function formatToolResult(name, result, durationMs) {
@@ -155005,9 +155002,9 @@ function ErrorOverview({ error }) {
     ))) : null,
     error.stack ? import_react13.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, error.stack.split("\n").slice(1).map((line) => {
       const parsedLine = stackUtils.parseLine(line);
-      const lineCount = stackLineCounts.get(line) ?? 0;
-      stackLineCounts.set(line, lineCount + 1);
-      const key = `${line}-${lineCount}`;
+      const lineCount2 = stackLineCounts.get(line) ?? 0;
+      stackLineCounts.set(line, lineCount2 + 1);
+      const key = `${line}-${lineCount2}`;
       if (!parsedLine?.file || !parsedLine.line || !parsedLine.column) {
         return import_react13.default.createElement(
           Box_default,
@@ -157583,6 +157580,7 @@ var BUILTIN_SLASH_COMMANDS = [
   { name: "cost", description: "Tokens and cost of this conversation", kind: "builtin" },
   { name: "status", description: "Version, model, mode, directory and session at a glance", kind: "builtin" },
   { name: "copy", description: "Copy the last reply to the clipboard", kind: "builtin" },
+  { name: "expand", description: "Show the full output of a folded tool call (Ctrl+O)", argHint: "[n]", kind: "builtin" },
   { name: "export", description: "Write this conversation to a Markdown file", argHint: "[file]", kind: "builtin" },
   { name: "rename", description: "Rename this session", argHint: "<title>", requiresArg: true, kind: "builtin" },
   { name: "diff", description: "Show uncommitted changes in the working directory", kind: "builtin" },
@@ -157696,6 +157694,9 @@ function windowStart(selected, total, size) {
   const start = selected - Math.floor(size / 2);
   return Math.max(0, Math.min(start, total - size));
 }
+function reserveMenuRows(previous, showing) {
+  return Math.max(0, previous, showing);
+}
 
 // src/commands/bangShell.ts
 import { spawn } from "child_process";
@@ -158394,6 +158395,7 @@ var App2 = ({ onReady }) => {
   const slashEntriesRef = (0, import_react35.useRef)(BUILTIN_SLASH_COMMANDS);
   const menuSelRef = (0, import_react35.useRef)({ query: "", idx: 0 });
   const menuDismissedRef = (0, import_react35.useRef)(null);
+  const menuReserveRef = (0, import_react35.useRef)(0);
   const [, bumpMenu] = (0, import_react35.useState)(0);
   const searchRef = (0, import_react35.useRef)(null);
   const draftBeforeSearchRef = (0, import_react35.useRef)("");
@@ -158405,6 +158407,10 @@ var App2 = ({ onReady }) => {
   const onHelp = (0, import_react35.useCallback)((cb) => {
     onHelpRef.current = cb;
   }, []);
+  const onExpandRef = (0, import_react35.useRef)(null);
+  const onExpand = (0, import_react35.useCallback)((cb) => {
+    onExpandRef.current = cb;
+  }, []);
   const mentionSelRef = (0, import_react35.useRef)({ query: "", idx: 0 });
   const mentionDismissedRef = (0, import_react35.useRef)(null);
   const mentionRootRef = (0, import_react35.useRef)(process.cwd());
@@ -158602,6 +158608,12 @@ var App2 = ({ onReady }) => {
       onCycleModeRef.current?.();
       return;
     }
+    if (key.ctrl && char === "o") {
+      if (askResolverRef.current)
+        return;
+      onExpandRef.current?.();
+      return;
+    }
     const menu = askResolverRef.current || searchRef.current || historyRef.current.browsing ? null : computeMenu(lineRef.current, cursorRef.current, slashEntriesRef.current, menuDismissedRef.current);
     if (menu) {
       const sel = menuSelRef.current.query === menu.query ? menuSelRef.current.idx : 0;
@@ -158846,6 +158858,7 @@ var App2 = ({ onReady }) => {
       const submitted = lineRef.current.slice(0, pos) + before + lineRef.current.slice(pos);
       setLine(after);
       setCursorPos(0);
+      menuReserveRef.current = 0;
       print(prompt2 + submitted);
       const askResolve = askResolverRef.current;
       if (!askResolve && submitted.trim()) {
@@ -158971,7 +158984,8 @@ var App2 = ({ onReady }) => {
       onBusyCommand,
       onCycleMode,
       onRewind,
-      onHelp
+      onHelp,
+      onExpand
     });
   }, []);
   const slices = renderInputSlices(line, cursorPos);
@@ -159035,9 +159049,13 @@ var App2 = ({ onReady }) => {
       hint: `  ${sel + 1}/${m2.items.length} \xB7 \u2191\u2193 select \xB7 Tab/Enter insert \xB7 Esc close`
     };
   })();
+  menuReserveRef.current = reserveMenuRows(
+    menuReserveRef.current,
+    slashMenu ? slashMenu.rows.length + 1 : mentionMenu ? mentionMenu.rows.length + 1 : 0
+  );
   const choiceVm = choiceRef.current ? choiceView(choiceRef.current.spec, choiceRef.current.sel) : null;
   const riskColor = choiceVm?.risk === "high" ? "red" : choiceVm?.risk === "medium" ? "yellow" : "green";
-  return /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Static, { items, key: staticKey }, (item) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: item.id }, item.content)), live ? /* @__PURE__ */ import_react35.default.createElement(Text, null, live) : null, choiceVm ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Text, { bold: true, wrap: "truncate-end" }, choiceVm.title), choiceVm.detail ? /* @__PURE__ */ import_react35.default.createElement(Text, { wrap: "truncate-end", color: choiceVm.risk ? riskColor : void 0, dimColor: !choiceVm.risk }, choiceVm.risk ? `${choiceVm.risk.toUpperCase()} RISK \xB7 ` : "", choiceVm.detail) : null, choiceVm.rows.map((r2) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: r2.text, wrap: "truncate-end", inverse: r2.selected }, r2.text)), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, choiceVm.hint)) : null, searchVm ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Text, { color: searchVm.failed ? "red" : "cyan", wrap: "truncate-end" }, "  " + searchVm.label), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, SEARCH_HINT)) : null, mentionMenu ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, mentionMenu.rows.map((r2) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: r2.key, wrap: "truncate-end", inverse: r2.selected }, r2.text)), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, mentionMenu.hint)) : null, slashMenu ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, slashMenu.rows.map((r2) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: r2.key, wrap: "truncate-end", inverse: r2.selected }, r2.text)), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, slashMenu.hint)) : null, /* @__PURE__ */ import_react35.default.createElement(
+  return /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Static, { items, key: staticKey }, (item) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: item.id }, item.content)), live ? /* @__PURE__ */ import_react35.default.createElement(Text, null, live) : null, choiceVm ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Text, { bold: true, wrap: "truncate-end" }, choiceVm.title), choiceVm.detail ? /* @__PURE__ */ import_react35.default.createElement(Text, { wrap: "truncate-end", color: choiceVm.risk ? riskColor : void 0, dimColor: !choiceVm.risk }, choiceVm.risk ? `${choiceVm.risk.toUpperCase()} RISK \xB7 ` : "", choiceVm.detail) : null, choiceVm.rows.map((r2) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: r2.text, wrap: "truncate-end", inverse: r2.selected }, r2.text)), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, choiceVm.hint)) : null, searchVm ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Text, { color: searchVm.failed ? "red" : "cyan", wrap: "truncate-end" }, "  " + searchVm.label), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, SEARCH_HINT)) : null, menuReserveRef.current > 0 ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column", justifyContent: "flex-end", minHeight: menuReserveRef.current }, mentionMenu ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, mentionMenu.rows.map((r2) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: r2.key, wrap: "truncate-end", inverse: r2.selected }, r2.text)), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, mentionMenu.hint)) : null, slashMenu ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, slashMenu.rows.map((r2) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: r2.key, wrap: "truncate-end", inverse: r2.selected }, r2.text)), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, slashMenu.hint)) : null) : null, /* @__PURE__ */ import_react35.default.createElement(
     Box_default,
     {
       borderStyle: "single",
@@ -159255,6 +159273,99 @@ function rewindChoices(cps) {
   return { options, ids: newest.map((c) => c.id) };
 }
 
+// src/ui/toolOutputStore.ts
+var MAX_ENTRIES = 20;
+var MAX_ENTRY_CHARS = 4e5;
+var MAX_EXPAND_LINES = 1500;
+var PREVIEW_LINES = 8;
+function toolLabel(name, input) {
+  const rec = input && typeof input === "object" ? input : {};
+  const pick = ["command", "file_path", "path", "pattern", "url", "query", "description"].map((k) => rec[k]).find((v) => typeof v === "string" && v.length > 0);
+  const flat = (pick ?? "").replace(/\s+/g, " ").trim();
+  const clipped = flat.length > 100 ? flat.slice(0, 99) + "\u2026" : flat;
+  return clipped ? `${name}: ${clipped}` : name;
+}
+function capOutput(text, max = MAX_ENTRY_CHARS) {
+  if (text.length <= max)
+    return text;
+  const head = Math.floor(max * 0.6);
+  const tail = max - head;
+  const dropped = text.length - max;
+  return text.slice(0, head) + `
+\u2026 ${dropped.toLocaleString()} characters omitted \u2026
+` + text.slice(text.length - tail);
+}
+var ToolOutputStore = class {
+  entries = [];
+  nextId = 1;
+  add(e2) {
+    const entry = { ...e2, id: this.nextId++, output: capOutput(e2.output) };
+    this.entries.push(entry);
+    if (this.entries.length > MAX_ENTRIES)
+      this.entries.shift();
+    return entry;
+  }
+  /** Newest first; `n` = 1 is the latest. */
+  fromEnd(n) {
+    if (!Number.isInteger(n) || n < 1)
+      return void 0;
+    return this.entries[this.entries.length - n];
+  }
+  byId(id) {
+    return this.entries.find((e2) => e2.id === id);
+  }
+  /** The newest entry that actually has something worth expanding. */
+  latestFoldable() {
+    for (let i2 = this.entries.length - 1; i2 >= 0; i2--) {
+      const e2 = this.entries[i2];
+      if (lineCount(e2.output) > PREVIEW_LINES)
+        return e2;
+    }
+    return void 0;
+  }
+  list() {
+    return this.entries.slice();
+  }
+  clear() {
+    this.entries = [];
+  }
+};
+function lineCount(text) {
+  if (!text)
+    return 0;
+  const t2 = text.endsWith("\n") ? text.slice(0, -1) : text;
+  return t2.split("\n").length;
+}
+function expansionOf(e2, maxLines = MAX_EXPAND_LINES) {
+  const all = (e2.output.endsWith("\n") ? e2.output.slice(0, -1) : e2.output).split("\n");
+  const total = all.length;
+  let lines = all;
+  let omitted = 0;
+  if (total > maxLines) {
+    const head = Math.floor(maxLines * 0.4);
+    const tail = maxLines - head;
+    lines = [...all.slice(0, head), ...all.slice(total - tail)];
+    omitted = total - maxLines;
+  }
+  return {
+    header: `#${e2.id} ${e2.label}${e2.isError ? " (failed)" : ""} \u2014 ${total} line${total === 1 ? "" : "s"}`,
+    lines,
+    omitted
+  };
+}
+function resolveExpand(store, arg) {
+  const a = arg.trim();
+  if (a === "") {
+    const e3 = store.latestFoldable() ?? store.fromEnd(1);
+    return e3 ? { entry: e3 } : { error: "No tool output yet." };
+  }
+  const n = Number(a.replace(/^#/, ""));
+  if (!Number.isInteger(n) || n < 1)
+    return { error: `Usage: /expand [n]  (n = 1 is the latest tool call, 2 the one before \u2026)` };
+  const e2 = store.fromEnd(n);
+  return e2 ? { entry: e2 } : { error: `Only the last ${Math.min(MAX_ENTRIES, store.list().length)} tool call(s) are kept.` };
+}
+
 // src/commands/chat.ts
 var require2 = createRequire(import.meta.url);
 var CLI_VERSION = (() => {
@@ -159277,6 +159388,23 @@ var CLI_VERSION = (() => {
   return "unknown";
 })();
 var sessionUsage = new UsageTotals();
+var toolOutputs = new ToolOutputStore();
+function printExpansion(arg) {
+  const r2 = resolveExpand(toolOutputs, arg);
+  if (!r2.entry) {
+    console.log(source_default.dim("  " + (r2.error ?? "Nothing to expand.")));
+    return;
+  }
+  const x2 = expansionOf(r2.entry);
+  console.log();
+  console.log(source_default.cyan("  \u25BE " + x2.header));
+  for (const l2 of x2.lines)
+    console.log(source_default.dim("  \u2502 ") + source_default.gray(l2.slice(0, 300)));
+  if (x2.omitted > 0)
+    console.log(source_default.dim(`  \u2514 \u2026 ${x2.omitted} line(s) omitted \u2014 /export writes the whole conversation to a file`));
+  else
+    console.log(source_default.dim("  \u2514 end"));
+}
 var MODEL_LABELS = {
   "claude-sonnet-5-5": "Claude Sonnet 5.5",
   "claude-opus-5-5": "Claude Opus 5.5",
@@ -159836,9 +159964,10 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
   let lastUsage;
   const spinner = new Spinner();
   const mdRender = new MarkdownStreamRenderer();
-  const toolStream = new ToolStreamPrinter();
+  const toolStream = new ToolStreamPrinter(PREVIEW_LINES);
   let toolStartTime = 0;
   let lastToolName = "";
+  let lastToolLabel = "";
   const toolCalls = /* @__PURE__ */ new Map();
   const subPrefix = (meta) => source_default.dim(`  \u21B3 ${meta?.agentName ?? "sub-agent"} `);
   let thinkingTokens = 0;
@@ -159944,7 +160073,7 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
       mdRender.flush();
       spinner.stop();
       if (meta?.id)
-        toolCalls.set(meta.id, { name, start: Date.now() });
+        toolCalls.set(meta.id, { name, start: Date.now(), label: toolLabel(name, input) });
       if (isSubTask) {
         console.log(subPrefix(meta) + formatToolUse(name, input).trim());
         spinner.start(`${meta?.agentName ?? "sub-agent"}: ${name}\u2026`);
@@ -159954,6 +160083,7 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
       console.log();
       console.log(formatToolUse(name, input));
       lastToolName = name;
+      lastToolLabel = toolLabel(name, input);
       toolStartTime = Date.now();
       spinner.start(`running ${name}\u2026`);
     },
@@ -159984,6 +160114,26 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
       toolStream.flush();
       const durationMs = Date.now() - (tracked?.start ?? toolStartTime);
       console.log(formatToolResult(tracked?.name ?? lastToolName, res, durationMs));
+      const text = res.error ? `${res.output ? res.output + "\n" : ""}${res.error}` : res.output ?? "";
+      if (text) {
+        const entry = toolOutputs.add({
+          name: tracked?.name ?? lastToolName,
+          label: tracked?.label ?? lastToolLabel,
+          output: text,
+          isError: !!res.error,
+          durationMs
+        });
+        const total = lineCount(text);
+        if (total > PREVIEW_LINES) {
+          if (res.error) {
+            const tail = text.replace(/\n$/, "").split("\n").slice(-3);
+            for (const l2 of tail)
+              console.log(source_default.dim("  \u2502 ") + source_default.red(l2.slice(0, 300)));
+          }
+          const more = Math.max(0, total - PREVIEW_LINES - (res.error ? 3 : 0));
+          console.log(source_default.dim(`  \u2514 \u2026 +${more} more line${more === 1 ? "" : "s"} \xB7 Ctrl+O or /expand to see all (#${entry.id})`));
+        }
+      }
       toolStartTime = 0;
       resumeWorking();
     },
@@ -160215,6 +160365,7 @@ function printHelp() {
     ["/team [use <id|personal>]", "List your teams, or switch what usage is billed to"],
     ["/cost", "Tokens and cost of this conversation so far"],
     ["/status", "Version, model, mode, directory, session and cost at a glance"],
+    ["/expand [n]", "Show the full output of a folded tool call (newest by default; Ctrl+O does the same)"],
     ["/copy", "Copy the last reply to the clipboard"],
     ["/export [file]", "Write this conversation to a Markdown file"],
     ["/rename <title>", "Rename this session"],
@@ -160257,6 +160408,7 @@ function printHelp() {
     ["Ctrl+G", "Edit the draft in $VISUAL / $EDITOR"],
     ["Esc Esc", "At an empty prompt: pick a checkpoint to rewind to (same as /rewind)"],
     ["?", "At an empty prompt: show this list"],
+    ["Ctrl+O", "Expand the last folded tool output (also works while it is running; /expand [n] picks an older one)"],
     ["Ctrl+L", "Redraw the screen"],
     ["Ctrl+D", "Delete the character under the cursor; press twice on an empty line to exit"],
     ["(paste)", "Multi-line paste goes into the input box \u2014 it does not send until you press Enter"]
@@ -160674,6 +160826,9 @@ ${text}` : "");
     getInkTerminal().onHelp(() => {
       printHelp();
     });
+    getInkTerminal().onExpand(() => {
+      printExpansion("");
+    });
     getInkTerminal().onRewind(() => {
       void (async () => {
         const opts = rewindChoices(checkpoints.list());
@@ -160742,6 +160897,7 @@ ${text}` : "");
           sessionTitle = "";
           (0, import_code_core8.resetSessionSubAgentBudget)();
           sessionUsage.reset();
+          toolOutputs.clear();
           cliBackgroundAgents.stopAll({ dropPending: true });
           inputBuffer = "";
           if (interactive)
@@ -161198,6 +161354,10 @@ ${dirList}`;
           rl.prompt();
           return;
         }
+        case "/expand":
+          printExpansion(arg);
+          rl.prompt();
+          return;
         case "/copy": {
           const text = lastAssistantText(messages);
           if (!text) {
@@ -161633,7 +161793,7 @@ ${text}
         if (shown < MAX_SHOWN_LINES)
           console.log("  " + clean);
         else if (shown === MAX_SHOWN_LINES)
-          console.log(source_default.dim("  \u2026 output continues (the model still gets the start and the end)"));
+          console.log(source_default.dim("  \u2026 output continues (the model still gets the start and the end; /expand shows it all)"));
         shown++;
       };
       let result;
@@ -161655,6 +161815,9 @@ ${text}
       }
       const tag = result.aborted ? source_default.yellow("  interrupted") : result.timedOut ? source_default.yellow("  timed out") : result.code === 0 ? source_default.dim("  exit 0") : source_default.red(`  exit ${result.code ?? result.signal}`);
       console.log(tag);
+      if (result.output) {
+        toolOutputs.add({ name: "bash", label: `!${bang}`, output: result.output, isError: result.code !== 0, durationMs: 0 });
+      }
       messages.push(
         { role: "user", content: [{ type: "text", text: bangTranscript(bang, result) }] },
         { role: "assistant", content: [{ type: "text", text: "Noted the command output." }] }

package/package.json

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