@oxecli/oxe 1.0.85 → 1.0.86

package/dist/cli.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url";
 import { loadOrPrompt, default_reasoning_effort, max_action_chars, max_resume_history_items, runtimeOsSummary, max_context_tokens, context_overhead_margin, } from "./config.js";
 import { InferenceEngine, estimateTokens } from "./engine.js";
 import { saveSession, loadSession, listSessions, nextSessionId, conversationLabel, COMMAND_HELP, stripOrphanCalls, toolOutputFailed, } from "./sessions.js";
-import { clearScreen, enableAnsi, askBottomPrompt, userDisplayText, aiMarkdown, mutedMarkdown, messageText, toolCallLabel, formatToolResult, truncateEllipsis, stripAnsi, renderPanel, renderTableString, enableRawStdin, disableRawStdin, waitRawKey, } from "./ui.js";
+import { clearScreen, enableAnsi, askBottomPrompt, userDisplayText, aiMarkdown, mutedMarkdown, messageText, toolCallLabel, formatToolResult, truncateEllipsis, stripAnsi, plainLen, truncateStyled, terminalWidth, TOOL_RESULT_MAX_LINES, MAX_COMMAND_DISPLAY_CHARS, renderPanel, renderTableString, enableRawStdin, disableRawStdin, waitRawKey, } from "./ui.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
 const packageInfo = require("../package.json");
@@ -49,14 +49,32 @@ export class CLI {
         const label = started && String(started).trim();
         const body = String(text).trim();
         if (label && /^[⎿╰]/.test(stripAnsi(body))) {
-            process.stdout.write(`${label}\n${body}\n`);
-            if (diff)
-                process.stdout.write(diff + "\n\n");
+            // The result body was formatted against the terminal width at tool time,
+            // but the window may be narrower on resume — re-truncate defensively so
+            // long persisted lines never run off the screen.
+            const lineMax = Math.max(terminalWidth() - 4, 20);
+            const allLines = body.split("\n");
+            const lines = allLines
+                .slice(0, TOOL_RESULT_MAX_LINES)
+                .map((ln) => plainLen(ln) > lineMax ? truncateStyled(ln, lineMax) + "…\x1b[0m" : ln);
+            if (allLines.length > TOOL_RESULT_MAX_LINES) {
+                lines.push("\x1b[90m…\x1b[0m");
+            }
+            const labelLine = plainLen(label) > lineMax ? truncateStyled(label, lineMax) + "…\x1b[0m" : label;
+            process.stdout.write(`${labelLine}\n${lines.join("\n")}\n`);
+            if (diff) {
+                const diffLines = diff.split("\n").map((ln) => plainLen(ln) > lineMax ? truncateStyled(ln, lineMax) + "…\x1b[0m" : ln);
+                process.stdout.write(diffLines.join("\n") + "\n\n");
+            }
             return;
         }
         const icon = status === "failed" ? "\x1b[31m✗\x1b[0m" : "\x1b[32m✓\x1b[0m";
         const style = status === "failed" ? "\x1b[31m" : "\x1b[32m";
-        process.stdout.write(`${icon} ${style}${truncateEllipsis(body, max_action_chars, "text")}\x1b[0m\n`);
+        const truncated = truncateEllipsis(body, Math.min(max_action_chars, MAX_COMMAND_DISPLAY_CHARS), "text");
+        // truncateEllipsis appends a "…(text truncated: N chars total)" suffix, so
+        // re-truncate to the current width to keep the legacy action on one row.
+        const displayMax = Math.max(terminalWidth() - 6, 20);
+        process.stdout.write(`${icon} ${style}${truncateStyled(truncated, displayMax)}\x1b[0m\n`);
     }
     printAssistantBlock(text) {
         const rendered = aiMarkdown(text);

package/dist/ui.js

@@ -681,10 +681,13 @@ const TOOL_DISPLAY_NAMES = {
     grep: "Grep",
     load_skill: "Load",
 };
-const TOOL_RESULT_MAX_CHARS = 400;
-const TOOL_RESULT_MAX_LINES = 6;
-const TOOL_RESULT_MAX_LINE_CHARS = 160;
-/** First line of a tool entry: `Bash(rm -f "…")` — cyan tool name, primary arg in parens. */
+export const TOOL_RESULT_MAX_LINES = 6;
+/** Cap on the visible command/arg shown in a tool label, so the entry always
+ *  fits on a single row regardless of terminal width. */
+export const MAX_COMMAND_DISPLAY_CHARS = 100;
+/** First line of a tool entry: `Bash(rm -f "…")` — cyan tool name, primary arg
+ *  in parens. Newlines collapse to spaces and the arg is width-capped so the
+ *  label never wraps past one row. */
 export function toolCallLabel(name, argumentsJson) {
     let args = {};
     try {
@@ -713,11 +716,12 @@ export function toolCallLabel(name, argumentsJson) {
             arg = String(args["skill_name"] ?? "");
             break;
     }
-    arg = arg.trim();
+    arg = arg.trim().replace(/\s*\r?\n\s*/g, " ");
     if (!arg)
         return `\x1b[1;36m${display}\x1b[0m`;
-    if (arg.length > 400)
-        arg = arg.slice(0, 400) + "…";
+    const cap = Math.max(Math.min(terminalWidth() - plainLen(display) - 4, MAX_COMMAND_DISPLAY_CHARS), 20);
+    if (plainLen(arg) > cap)
+        arg = truncateStyled(arg, cap) + "…";
     return `\x1b[1;36m${display}\x1b[0m(${arg})`;
 }
 /**
@@ -737,17 +741,15 @@ export function formatToolResult(rawResult, failed) {
     if (failed && (!clean || clean === "(no output)") && code) {
         return `${corner}\x1b[31mexit code: ${code}\x1b[0m`;
     }
-    let body = clean;
-    const clipped = body.length > TOOL_RESULT_MAX_CHARS;
-    if (clipped)
-        body = body.slice(0, TOOL_RESULT_MAX_CHARS);
-    const lines = body
-        .split("\n")
+    // Truncate to the terminal width (rows OR per-line length, whichever trips
+    // first) so long tool output — e.g. Glob paths — never runs off the screen.
+    const termW = terminalWidth();
+    const lineMax = Math.max(termW - 4, 20);
+    const allLines = clean.split("\n");
+    const lines = allLines
         .slice(0, TOOL_RESULT_MAX_LINES)
-        .map((ln) => ln.length > TOOL_RESULT_MAX_LINE_CHARS
-        ? ln.slice(0, TOOL_RESULT_MAX_LINE_CHARS) + "…"
-        : ln);
-    if (clipped || body.split("\n").length > TOOL_RESULT_MAX_LINES)
+        .map((ln) => (ln.length > lineMax ? ln.slice(0, lineMax) + "…" : ln));
+    if (allLines.length > TOOL_RESULT_MAX_LINES)
         lines.push("…");
     const styleOpen = failed ? "\x1b[31m" : "\x1b[90m";
     const inner = lines

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxecli/oxe",
-  "version": "1.0.85",
+  "version": "1.0.86",
   "publishConfig": {
     "access": "public"
   },