@cargo-ai/cli 1.0.126 → 1.0.127

package/build/commands/ask/session/tree.js

@@ -1,7 +1,9 @@
-import { isAbsolute, relative } from "node:path";
+import { basename, isAbsolute, relative } from "node:path";
 import { selectOne } from "@cargo-ai/cdk/cli";
+import { clipToCells, textWidth } from "../../../utils/textWidth.js";
 import { clipToWidth, colors } from "../../runHandler.js";
 import { ASK_USER_QUESTION_TOOL_NAME, readAskUserQuestions, } from "../harness/askUserQuestion.js";
+import { renderMarkdown } from "./markdown.js";
 /**
  * What an assistant turn is marked with, alongside `◇` for a step and `│` for
  * the rail.
@@ -35,7 +37,7 @@ export function wrapLine(text, width) {
     const lines = [];
     for (const word of text.split(/\s+/).filter((part) => part.length > 0)) {
         const current = lines[lines.length - 1];
-        if (current === undefined || `${current} ${word}`.length > width) {
+        if (current === undefined || textWidth(`${current} ${word}`) > width) {
             lines.push(word);
             continue;
         }
@@ -63,16 +65,6 @@ function writeRailWrapped(body) {
         writeRail(line);
     }
 }
-/**
- * Light cleanup so model markdown does not fight the tree. Keeps the words;
- * drops heading marks, bold markers, and horizontal rules.
- */
-function forTerminal(text) {
-    return text
-        .replace(/^#{1,6}\s+/gm, "")
-        .replace(/\*\*([^*]+)\*\*/g, "$1")
-        .replace(/^---+$/gm, "");
-}
 /**
  * A `◇` step: the first line beside the marker, the rest continuing on the
  * rail under it.
@@ -115,44 +107,66 @@ export function showUserTurn(body) {
     writeDiamondBlock(body);
 }
 /**
- * Display lines for an assistant body. First line is the brick header body;
- * later lines sit on the │ rail. Blank paragraphs keep an empty rail.
+ * Where the finished part of a reply ends: just past its last blank line, as
+ * long as that line is not inside a code fence. Never before `from`.
  */
-function assistantDisplayLines(body) {
-    const paragraphs = forTerminal(body).split("\n");
-    const lines = [];
-    for (let index = 0; index < paragraphs.length; index += 1) {
-        const paragraph = paragraphs[index];
-        if (paragraph === undefined) {
-            continue;
-        }
-        if (paragraph === "") {
-            lines.push("");
-            continue;
+function commitPoint(buffer, from) {
+    const cursor = { at: buffer.lastIndexOf("\n\n") };
+    while (cursor.at >= from) {
+        const fences = buffer
+            .slice(0, cursor.at)
+            .split("\n")
+            .filter((line) => /^\s*(```|~~~)/.test(line) === true).length;
+        if (fences % 2 === 0) {
+            return cursor.at + 2;
         }
-        const wrapped = wrapLine(paragraph, treeBodyWidth());
-        if (wrapped.length === 0) {
-            lines.push("");
-            continue;
-        }
-        for (const line of wrapped) {
-            lines.push(line);
+        cursor.at = buffer.lastIndexOf("\n\n", cursor.at - 1);
+    }
+    return from;
+}
+/**
+ * Write reply lines: the first beside `■` until one has been printed for
+ * good, the rest on the │ rail. Returns how many rows were written.
+ */
+function writeAssistantLines(live, lines) {
+    lines.forEach((line, index) => {
+        if (index === 0 && live.markerCommitted === false) {
+            process.stderr.write(`${ASSISTANT_MARKER}  ${line}\n`);
+            return;
         }
+        writeRail(line);
+    });
+    return lines.length;
+}
+/**
+ * Markdown lines for part of a reply, after the blank row that separates it
+ * from paragraphs already printed for good.
+ */
+function assistantLines(text, withGap) {
+    const body = text.replace(/^\n+/, "").replace(/\n+$/, "");
+    if (body === "") {
+        return [];
     }
+    const lines = renderMarkdown(body, treeBodyWidth());
+    return withGap === true ? ["", ...lines] : lines;
+}
+/** Print reply lines for good: they are never cleared or drawn again. */
+function commitAssistantLines(live, lines) {
     if (lines.length === 0) {
-        return [""];
+        return;
     }
-    return lines;
+    writeAssistantLines(live, lines);
+    live.markerCommitted = true;
 }
-function writeAssistantLines(lines) {
-    const first = lines[0] === undefined ? "" : lines[0];
-    process.stderr.write(`${ASSISTANT_MARKER}  ${first}\n`);
-    for (let index = 1; index < lines.length; index += 1) {
-        const line = lines[index];
-        if (line !== undefined) {
-            writeRail(line);
-        }
-    }
+/**
+ * How many rows the redrawn part of a reply may take. Clearing it means
+ * moving the cursor up past every row, and the cursor stops at the top of the
+ * screen: rows that scrolled off would be drawn again under themselves. Two
+ * rows are kept for the typed line and the margin.
+ */
+function liveRowLimit() {
+    const rows = process.stderr.rows === undefined ? 24 : process.stderr.rows;
+    return Math.max(3, rows - 2);
 }
 function clearPaintedLines(count) {
     if (count <= 0 || process.stderr.isTTY !== true) {
@@ -164,7 +178,15 @@ function clearPaintedLines(count) {
 export function beginAssistantTurn() {
     writeRail("");
     process.stderr.write(`${ASSISTANT_MARKER}  \n`);
-    return { buffer: "", paintedLines: 1, footer: "" };
+    return {
+        buffer: "",
+        committed: 0,
+        tailLinesCommitted: 0,
+        tailHasGap: false,
+        markerCommitted: false,
+        paintedLines: 1,
+        footer: "",
+    };
 }
 export function appendAssistantDelta(live, delta) {
     // A tool between two pieces of narration inserts a paragraph break, so that
@@ -182,10 +204,27 @@ export function appendAssistantDelta(live, delta) {
 }
 /** Draw the block again from its buffer, with the typed line under it. */
 function repaintAssistantTurn(live) {
-    const lines = assistantDisplayLines(live.buffer);
     clearPaintedLines(live.paintedLines);
-    writeAssistantLines(lines);
-    live.paintedLines = lines.length;
+    live.paintedLines = 0;
+    const cut = commitPoint(live.buffer, live.committed);
+    if (cut > live.committed) {
+        // Rows of it may already be out, from when it was the unfinished part.
+        commitAssistantLines(live, assistantLines(live.buffer.slice(live.committed, cut), live.tailHasGap).slice(live.tailLinesCommitted));
+        live.committed = cut;
+        live.tailLinesCommitted = 0;
+        live.tailHasGap = live.markerCommitted;
+    }
+    const tail = assistantLines(live.buffer.slice(live.committed), live.tailHasGap).slice(live.tailLinesCommitted);
+    const overflow = Math.max(0, tail.length - liveRowLimit());
+    // A table or a code block taller than the screen: its top rows go out for
+    // good. A table can still widen below them; that beats drawing it twice.
+    if (overflow > 0) {
+        commitAssistantLines(live, tail.slice(0, overflow));
+        live.tailLinesCommitted += overflow;
+    }
+    const visible = tail.slice(overflow);
+    // Nothing said yet: keep the bare marker up, as `beginAssistantTurn` drew it.
+    live.paintedLines = writeAssistantLines(live, visible.length === 0 && live.markerCommitted === false ? [""] : visible);
     if (live.footer !== "") {
         // Clipped for the same reason the spinner's is: it has to occupy exactly
         // one row, or the next repaint clears from the wrong line.
@@ -216,6 +255,171 @@ export function showAssistantTurn(body) {
     appendAssistantDelta(live, body);
     endAssistantTurn(live);
 }
+/**
+ * How Claude Code's thinking is drawn, the same choices `@ai-sdk/tui` offers:
+ *
+ * - `full`: the whole summary stays in the transcript.
+ * - `auto-collapsed`: the latest lines show while it thinks, then fold into
+ *   one "Thought for 4s" line once it moves on.
+ * - `collapsed`: only that one line.
+ * - `hidden`: nothing beyond the spinner.
+ */
+export const REASONING_DISPLAYS = [
+    "full",
+    "auto-collapsed",
+    "collapsed",
+    "hidden",
+];
+/**
+ * How finished tool calls are drawn: `full` adds the start of each result
+ * under its line, `collapsed` keeps one line per call (and the first line of
+ * an error), `hidden` leaves only the spinner while they run.
+ */
+export const TOOL_DISPLAYS = ["full", "collapsed", "hidden"];
+const REASONING_MARKER = "∴";
+/** Rows of thinking kept on screen while it streams. */
+const REASONING_LIVE_LINES = 6;
+/** Rows of a tool result shown under it in `full`. */
+const TOOL_OUTPUT_PREVIEW_LINES = 6;
+/**
+ * Open a thinking block. Only the expanded displays draw while it streams;
+ * `collapsed` leaves the spinner up and adds its one line at the end.
+ */
+export function beginReasoning(display) {
+    const live = {
+        buffer: "",
+        display,
+        startedAtMs: Date.now(),
+        paintedLines: 0,
+        footer: "",
+    };
+    // No gap before it: thinking sits with the tool lines, not the replies.
+    if (drawsWhileThinking(display) === true) {
+        repaintReasoning(live);
+    }
+    return live;
+}
+export function appendReasoningDelta(live, delta) {
+    live.buffer += delta;
+    if (drawsWhileThinking(live.display) === true) {
+        repaintReasoning(live);
+    }
+}
+export function setReasoningFooter(live, footer) {
+    if (live.footer === footer) {
+        return;
+    }
+    live.footer = footer;
+    if (drawsWhileThinking(live.display) === true) {
+        repaintReasoning(live);
+    }
+}
+/** Close the block, leaving what its display keeps in the transcript. */
+export function endReasoning(live, spinner) {
+    clearPaintedLines(live.paintedLines);
+    live.paintedLines = 0;
+    if (live.display === "hidden") {
+        return;
+    }
+    const header = `${colors.dim(REASONING_MARKER)}  ${colors.dim(`Thought for ${formatDuration(Date.now() - live.startedAtMs)}`)}`;
+    if (live.display === "collapsed") {
+        // The spinner stayed up through this one; log above it.
+        if (spinner !== undefined) {
+            spinner.log(header);
+            return;
+        }
+        process.stderr.write(`${header}\n`);
+        return;
+    }
+    process.stderr.write(`${header}\n`);
+    if (live.display === "full") {
+        for (const line of reasoningLines(live.buffer)) {
+            writeRail(line);
+        }
+    }
+}
+function drawsWhileThinking(display) {
+    return display === "full" || display === "auto-collapsed";
+}
+function repaintReasoning(live) {
+    clearPaintedLines(live.paintedLines);
+    const lines = reasoningLines(live.buffer).slice(-REASONING_LIVE_LINES);
+    process.stderr.write(`${colors.dim(REASONING_MARKER)}  ${colors.dim("Thinking…")}\n`);
+    for (const line of lines) {
+        writeRail(line);
+    }
+    live.paintedLines = lines.length + 1;
+    if (live.footer !== "") {
+        process.stderr.write(`${colors.dim(clipToWidth(live.footer))}\n`);
+        live.paintedLines += 1;
+    }
+}
+function reasoningLines(text) {
+    const body = text.trim();
+    if (body === "") {
+        return [];
+    }
+    return renderMarkdown(body, treeBodyWidth(), "dim");
+}
+/** `4s`, `1m 12s`. */
+function formatDuration(ms) {
+    const seconds = Math.max(1, Math.round(ms / 1000));
+    if (seconds < 60) {
+        return `${String(seconds)}s`;
+    }
+    return `${String(Math.floor(seconds / 60))}m ${String(seconds % 60)}s`;
+}
+/**
+ * What a turn cost, under the reply: tokens written, how fast they came, how
+ * full the context window is, and the credits it was billed.
+ *
+ *   │  2.4k tokens written · 38 tok/s · 92k of 1M context (9%) · 6.10 credits
+ */
+export function showTurnStats(stats) {
+    if (stats.outputTokens === 0) {
+        return;
+    }
+    // Written, not read: what the model read is the context share below.
+    const parts = [`${formatTokens(stats.outputTokens)} tokens written`];
+    // Under a second of generation is too short to measure a rate from.
+    if (stats.generationMs >= 1000) {
+        parts.push(`${String(Math.round(stats.outputTokens / (stats.generationMs / 1000)))} tok/s`);
+    }
+    if (stats.contextTokens !== undefined && stats.contextTokens > 0) {
+        const percent = Math.min(100, Math.max(1, Math.round((stats.contextTokens / stats.contextWindow) * 100)));
+        parts.push(`${formatTokens(stats.contextTokens)} of ${formatTokens(stats.contextWindow)} context (${String(percent)}%)`);
+    }
+    if (stats.credits > 0) {
+        parts.push(`${stats.credits.toFixed(2)} credit${stats.credits === 1 ? "" : "s"}`);
+    }
+    // Broken between items, never inside one, when the line is wider than the
+    // rail leaves room for: wrapped by the terminal it would start its next row
+    // at column zero, outside the tree.
+    const width = treeBodyWidth();
+    const rows = [];
+    for (const part of parts.map((entry) => clipToCells(entry, width))) {
+        const last = rows[rows.length - 1];
+        if (last !== undefined && textWidth(`${last} · ${part}`) <= width) {
+            rows[rows.length - 1] = `${last} · ${part}`;
+            continue;
+        }
+        rows.push(part);
+    }
+    for (const row of rows) {
+        writeRail(colors.dim(row));
+    }
+    writeRail("");
+}
+/** `950`, `2.4k`, `1M`. */
+function formatTokens(count) {
+    if (count >= 1_000_000) {
+        return `${String(Math.round(count / 100_000) / 10)}M`;
+    }
+    if (count >= 1_000) {
+        return `${String(Math.round(count / 100) / 10)}k`;
+    }
+    return String(count);
+}
 /** Common tool names arrive lowercase (`bash`); natives keep their case. */
 function toolLabel(toolName) {
     if (toolName === ASK_USER_QUESTION_TOOL_NAME) {
@@ -233,9 +437,7 @@ export function describeToolActivity(toolName, summary) {
         return label;
     }
     const line = `${label}: ${summary}`;
-    return line.length > ACTIVITY_MAX_LENGTH
-        ? `${line.slice(0, ACTIVITY_MAX_LENGTH - 1)}…`
-        : line;
+    return clipToCells(line, ACTIVITY_MAX_LENGTH);
 }
 /**
  * A tool that has finished, left in the transcript.
@@ -250,15 +452,84 @@ export function describeToolActivity(toolName, summary) {
  * line, leaves this behind, and lets the next frame redraw underneath.
  */
 export function showToolRun(input) {
+    if (input.display === "hidden") {
+        return;
+    }
     const marker = input.isError === true ? colors.red("✗") : colors.dim(TOOL_MARKER);
     const label = describeToolActivity(input.toolName, input.summary);
-    const line = `${marker}  ${colors.dim(label)}`;
+    const lines = [
+        `${marker}  ${colors.dim(label)}`,
+        ...toolOutputPreview(input.output, input.display, input.isError).map((line) => `${colors.dim("│")}  ${colors.dim(line)}`),
+    ];
+    for (const line of lines) {
+        if (input.spinner !== undefined) {
+            input.spinner.log(line);
+        }
+        else {
+            process.stderr.write(`${line}\n`);
+        }
+    }
+}
+/**
+ * Several calls of one tool that finished in a row, as one line:
+ *
+ *   ⏺  Read 6 files: run.ts, tree.ts, markdown.ts, …
+ *
+ * Six `Read` lines say less than this one, and push the reply off screen.
+ * Only for successful calls under `collapsed`: a failure keeps its own line
+ * and its error, and `full` shows each result.
+ */
+export function showToolGroup(input) {
+    const count = input.summaries.length;
+    const verb = TOOL_GROUP_VERBS.find((entry) => entry.toolName === input.toolName.toLowerCase());
+    const head = verb === undefined
+        ? `${toolLabel(input.toolName)} ×${String(count)}`
+        : `${verb.label} ${String(count)} ${verb.noun}`;
+    // Paths shown by file name: the directory is usually the same for all.
+    const items = input.summaries
+        .filter((summary) => summary !== "")
+        .map((summary) => isAbsolute(summary) === true ? basename(summary) : summary);
+    const label = clipToCells(items.length === 0 ? head : `${head}: ${items.join(", ")}`, treeBodyWidth());
+    const line = `${colors.dim(TOOL_MARKER)}  ${colors.dim(label)}`;
     if (input.spinner !== undefined) {
         input.spinner.log(line);
         return;
     }
     process.stderr.write(`${line}\n`);
 }
+/** How a run of one built-in tool is counted. Names arrive lowercase. */
+const TOOL_GROUP_VERBS = [
+    { toolName: "read", label: "Read", noun: "files" },
+    { toolName: "edit", label: "Edited", noun: "files" },
+    { toolName: "multiedit", label: "Edited", noun: "files" },
+    { toolName: "write", label: "Wrote", noun: "files" },
+    { toolName: "bash", label: "Ran", noun: "commands" },
+    { toolName: "grep", label: "Ran", noun: "searches" },
+    { toolName: "glob", label: "Listed", noun: "patterns" },
+    { toolName: "webfetch", label: "Fetched", noun: "pages" },
+    { toolName: "websearch", label: "Ran", noun: "web searches" },
+];
+/**
+ * The start of a tool's result, clipped to the rail. A failure always gets
+ * its first line, so a ✗ says why without switching the display.
+ */
+function toolOutputPreview(output, display, isError) {
+    const limit = display === "full" ? TOOL_OUTPUT_PREVIEW_LINES : isError === true ? 1 : 0;
+    if (limit === 0) {
+        return [];
+    }
+    const lines = output
+        .replace(/\t/g, "  ")
+        .split("\n")
+        .map((line) => line.trimEnd())
+        .filter((line) => line !== "");
+    const width = treeBodyWidth();
+    const shown = lines.slice(0, limit).map((line) => clipToCells(line, width));
+    if (lines.length > limit) {
+        shown.push(`… ${String(lines.length - limit)} more line${lines.length - limit === 1 ? "" : "s"}`);
+    }
+    return shown;
+}
 /**
  * A path inside the session directory reads better relative to it; anything
  * outside stays absolute so it is obvious the turn left the project.

package/build/commands/runHandler.d.ts

@@ -7,6 +7,7 @@ export declare const ExitCodes: {
     readonly NotFound: 5;
 };
 export type ExitCode = (typeof ExitCodes)[keyof typeof ExitCodes];
+export declare const colorize: (text: string, code: string) => string;
 export declare const colors: {
     red: (s: string) => string;
     green: (s: string) => string;

package/build/commands/runHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runHandler.d.ts","sourceRoot":"","sources":["../../src/commands/runHandler.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS;;;;;;;CAOZ,CAAC;AAEX,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAclE,eAAO,MAAM,MAAM;aACR,MAAM,KAAG,MAAM;eACb,MAAM,KAAG,MAAM;gBACd,MAAM,KAAG,MAAM;cACjB,MAAM,KAAG,MAAM;aAChB,MAAM,KAAG,MAAM;cACd,MAAM,KAAG,MAAM;CAC1B,CAAC;AAEF,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAM/C;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAE1C;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAE7C;AAID,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAUhE;AAED,KAAK,YAAY,GAAG;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAAC;AAEF,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,KAAK,CAgCpE;AAQD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAiBlE;AAED,MAAM,MAAM,OAAO,GAAG;IAEpB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAGlC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAU5B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB,CAAC;AAIF,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAwBrD;AAgED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,CAQhE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAQ1E;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,OAAO,EAAE,CAAC,EAAE,EACZ,KAAK,EAAE,MAAM,GACZ;IAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CASxD;AAKD,KAAK,iBAAiB,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACzB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF,wBAAsB,aAAa,CAAC,CAAC,EACnC,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,IAAI,CAAC,EAAE,iBAAiB,GACvB,OAAO,CAAC,CAAC,CAAC,CAgEZ;AA0ED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,EACvC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,aAAa,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,EAC9D,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,CAAC,CAyBZ"}
+{"version":3,"file":"runHandler.d.ts","sourceRoot":"","sources":["../../src/commands/runHandler.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,SAAS;;;;;;;CAOZ,CAAC;AAEX,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAOlE,eAAO,MAAM,QAAQ,SAAU,MAAM,QAAQ,MAAM,KAAG,MAKrD,CAAC;AAEF,eAAO,MAAM,MAAM;aACR,MAAM,KAAG,MAAM;eACb,MAAM,KAAG,MAAM;gBACd,MAAM,KAAG,MAAM;cACjB,MAAM,KAAG,MAAM;aAChB,MAAM,KAAG,MAAM;cACd,MAAM,KAAG,MAAM;CAC1B,CAAC;AAEF,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAM/C;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAE1C;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAE7C;AAID,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAUhE;AAED,KAAK,YAAY,GAAG;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAAC;AAEF,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,KAAK,CAgCpE;AAQD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAmBlE;AAED,MAAM,MAAM,OAAO,GAAG;IAEpB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAGlC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAU5B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB,CAAC;AAIF,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAwBrD;AAgED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,CAQhE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAQ1E;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,OAAO,EAAE,CAAC,EAAE,EACZ,KAAK,EAAE,MAAM,GACZ;IAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CASxD;AAKD,KAAK,iBAAiB,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACzB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF,wBAAsB,aAAa,CAAC,CAAC,EACnC,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,IAAI,CAAC,EAAE,iBAAiB,GACvB,OAAO,CAAC,CAAC,CAAC,CAgEZ;AA0ED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,EACvC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,aAAa,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,EAC9D,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,CAAC,CAyBZ"}

package/build/commands/runHandler.js

@@ -1,4 +1,5 @@
 import { determineIfIsFetcherError } from "@cargo-ai/api";
+import { clipToCells } from "../utils/textWidth.js";
 export const ExitCodes = {
     Success: 0,
     GenericError: 1,
@@ -10,7 +11,7 @@ export const ExitCodes = {
 const useColor = process.stderr.isTTY === true &&
     process.env["NO_COLOR"] === undefined &&
     process.env["CI"] !== "true";
-const colorize = (text, code) => {
+export const colorize = (text, code) => {
     if (useColor !== true) {
         return text;
     }
@@ -99,10 +100,12 @@ export function clipToWidth(text, columns) {
     // One column short of the edge: writing into the last cell makes some
     // terminals wrap to the next row, which is the thing being avoided.
     const limit = width - 1;
-    if (limit <= 1 || text.length <= limit) {
+    if (limit <= 1) {
         return text;
     }
-    return `${text.slice(0, limit - 1)}…`;
+    // Counted in columns: an emoji or a CJK character is two of them, and a
+    // line that wraps throws off every redraw that assumed one row.
+    return clipToCells(text, limit);
 }
 let activeSpinner;
 export function startSpinner(message) {

package/build/utils/textWidth.d.ts

@@ -0,0 +1,25 @@
+/**
+ * How many terminal columns text takes. `length` counts UTF-16 units, which
+ * is wrong both ways: an emoji or a CJK character is one code point drawn two
+ * columns wide, and a combining mark or a variation selector is drawn in none.
+ * Every width the terminal UI lines up — wrapping, table columns, clipping a
+ * line to one row — has to use this, or a single emoji pushes the row past
+ * the edge and the next redraw starts from the wrong line.
+ *
+ * A range table rather than full Unicode East Asian Width data: it covers
+ * what a model writes (CJK, Hangul, fullwidth forms, emoji) and nothing else.
+ */
+export declare function textWidth(text: string): number;
+/**
+ * Text split into what the terminal draws as one character: a code point
+ * with the zero-width marks after it (a combining accent, `U+FE0F` asking for
+ * the emoji form, a skin tone). Walk these, not code points, to lay text out.
+ */
+export declare function textCells(text: string): string[];
+/** Columns one entry of `textCells` takes: 0, 1 or 2. */
+export declare function cellWidth(cell: string): number;
+/** The longest prefix of `text` that fits in `width` columns. */
+export declare function sliceToWidth(text: string, width: number): string;
+/** `text` cut to `width` columns, ending in `…` when anything was cut. */
+export declare function clipToCells(text: string, width: number): string;
+//# sourceMappingURL=textWidth.d.ts.map

package/build/utils/textWidth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"textWidth.d.ts","sourceRoot":"","sources":["../../src/utils/textWidth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAehD;AAED,yDAAyD;AACzD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAsB9C;AAED,iEAAiE;AACjE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAehE;AAED,0EAA0E;AAC1E,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAM/D"}

package/build/utils/textWidth.js

@@ -0,0 +1,147 @@
+/**
+ * How many terminal columns text takes. `length` counts UTF-16 units, which
+ * is wrong both ways: an emoji or a CJK character is one code point drawn two
+ * columns wide, and a combining mark or a variation selector is drawn in none.
+ * Every width the terminal UI lines up — wrapping, table columns, clipping a
+ * line to one row — has to use this, or a single emoji pushes the row past
+ * the edge and the next redraw starts from the wrong line.
+ *
+ * A range table rather than full Unicode East Asian Width data: it covers
+ * what a model writes (CJK, Hangul, fullwidth forms, emoji) and nothing else.
+ */
+export function textWidth(text) {
+    return textCells(text).reduce((total, cell) => total + cellWidth(cell), 0);
+}
+/**
+ * Text split into what the terminal draws as one character: a code point
+ * with the zero-width marks after it (a combining accent, `U+FE0F` asking for
+ * the emoji form, a skin tone). Walk these, not code points, to lay text out.
+ */
+export function textCells(text) {
+    const cells = [];
+    for (const character of Array.from(text)) {
+        const last = cells[cells.length - 1];
+        if (last !== undefined && isZeroWidth(character) === true) {
+            cells[cells.length - 1] = `${last}${character}`;
+            continue;
+        }
+        cells.push(character);
+    }
+    return cells;
+}
+/** Columns one entry of `textCells` takes: 0, 1 or 2. */
+export function cellWidth(cell) {
+    const base = cell.codePointAt(0);
+    if (base === undefined) {
+        return 0;
+    }
+    if (isZeroWidth(String.fromCodePoint(base)) === true) {
+        return 0;
+    }
+    // `⚠️`: a symbol that is narrow on its own is drawn as a wide emoji when
+    // `U+FE0F` follows it.
+    if (cell.includes(EMOJI_PRESENTATION) === true) {
+        return 2;
+    }
+    if (inRanges(base, DOUBLE_WIDTH) === true) {
+        return 2;
+    }
+    return 1;
+}
+/** The longest prefix of `text` that fits in `width` columns. */
+export function sliceToWidth(text, width) {
+    const state = { used: 0, prefix: "" };
+    for (const cell of textCells(text)) {
+        const cells = cellWidth(cell);
+        if (state.used + cells > width) {
+            break;
+        }
+        state.used += cells;
+        state.prefix += cell;
+    }
+    return state.prefix;
+}
+/** `text` cut to `width` columns, ending in `…` when anything was cut. */
+export function clipToCells(text, width) {
+    if (textWidth(text) <= width) {
+        return text;
+    }
+    return `${sliceToWidth(text, Math.max(0, width - 1))}…`;
+}
+function isZeroWidth(character) {
+    const code = character.codePointAt(0);
+    return code !== undefined && inRanges(code, ZERO_WIDTH) === true;
+}
+function inRanges(code, ranges) {
+    return ranges.some(([from, to]) => code >= from && code <= to);
+}
+const EMOJI_PRESENTATION = "️";
+const ZERO_WIDTH = [
+    [0x0300, 0x036f], // combining diacritical marks
+    [0x200b, 0x200f], // zero-width space, joiners, direction marks
+    [0x20d0, 0x20ff], // combining marks for symbols
+    [0xfe00, 0xfe0f], // variation selectors
+    [0x1f3fb, 0x1f3ff], // emoji skin tones, drawn into the emoji before them
+];
+/**
+ * East Asian Wide ranges, and the symbols Unicode draws as emoji by default
+ * (`Emoji_Presentation`) inside otherwise narrow blocks: ✅ ✨ ❌ ⭐ and the
+ * like, which terminals draw two columns wide.
+ */
+const DOUBLE_WIDTH = [
+    [0x1100, 0x115f], // Hangul Jamo
+    [0x231a, 0x231b], // ⌚ ⌛
+    [0x23e9, 0x23ec], // ⏩ … ⏬
+    [0x23f0, 0x23f0], // ⏰
+    [0x23f3, 0x23f3], // ⏳
+    [0x25fd, 0x25fe], // ◽ ◾
+    [0x2614, 0x2615], // ☔ ☕
+    [0x2648, 0x2653], // ♈ … ♓
+    [0x267f, 0x267f], // ♿
+    [0x2693, 0x2693], // ⚓
+    [0x26a1, 0x26a1], // ⚡
+    [0x26aa, 0x26ab], // ⚪ ⚫
+    [0x26bd, 0x26be], // ⚽ ⚾
+    [0x26c4, 0x26c5], // ⛄ ⛅
+    [0x26ce, 0x26ce], // ⛎
+    [0x26d4, 0x26d4], // ⛔
+    [0x26ea, 0x26ea], // ⛪
+    [0x26f2, 0x26f3], // ⛲ ⛳
+    [0x26f5, 0x26f5], // ⛵
+    [0x26fa, 0x26fa], // ⛺
+    [0x26fd, 0x26fd], // ⛽
+    [0x2705, 0x2705], // ✅
+    [0x270a, 0x270b], // ✊ ✋
+    [0x2728, 0x2728], // ✨
+    [0x274c, 0x274c], // ❌
+    [0x274e, 0x274e], // ❎
+    [0x2753, 0x2755], // ❓ ❔ ❕
+    [0x2757, 0x2757], // ❗
+    [0x2795, 0x2797], // ➕ ➖ ➗
+    [0x27b0, 0x27b0], // ➰
+    [0x27bf, 0x27bf], // ➿
+    [0x2b1b, 0x2b1c], // ⬛ ⬜
+    [0x2b50, 0x2b50], // ⭐
+    [0x2b55, 0x2b55], // ⭕
+    [0x2e80, 0x303e], // CJK radicals, punctuation
+    [0x3041, 0x33ff], // kana, CJK compatibility
+    [0x3400, 0x4dbf], // CJK extension A
+    [0x4e00, 0x9fff], // CJK unified ideographs
+    [0xa000, 0xa4cf], // Yi
+    [0xac00, 0xd7a3], // Hangul syllables
+    [0xf900, 0xfaff], // CJK compatibility ideographs
+    [0xfe30, 0xfe4f], // CJK compatibility forms
+    [0xff00, 0xff60], // fullwidth forms
+    [0xffe0, 0xffe6], // fullwidth signs
+    [0x1f004, 0x1f004], // 🀄
+    [0x1f0cf, 0x1f0cf], // 🃏
+    [0x1f18e, 0x1f18e], // 🆎
+    [0x1f191, 0x1f19a], // 🆑 … 🆚
+    [0x1f200, 0x1f2ff], // enclosed ideographic supplement
+    [0x1f300, 0x1f64f], // pictographs, emoticons
+    [0x1f680, 0x1f6ff], // transport and map symbols
+    [0x1f7e0, 0x1f7eb], // 🟠 … 🟫
+    [0x1f900, 0x1f9ff], // supplemental symbols and pictographs
+    [0x1fa70, 0x1faff], // symbols and pictographs extended-A
+    [0x20000, 0x3fffd], // CJK extensions B and on
+];