@cargo-ai/cli 1.0.133 → 1.0.135

package/build/commands/ask/harness/usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/usage.ts"],"names":[],"mappings":"AAeA;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,MAAM,CAWT;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,cAAc,CAAC;IACtB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,MAAM,GAC1B,oBAAoB,CActB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAEhE;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,WAAW,EAAE,oBAAoB,EACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,IAAI,CAwCN;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,OAAO,GAEZ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACtE,SAAS,CAkBZ;AAQD;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,MAAM,GAAG,SAAS,CA0BpB"}
+{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/usage.ts"],"names":[],"mappings":"AAiBA;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,MAAM,CAYT;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,cAAc,CAAC;IACtB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,MAAM,GAC1B,oBAAoB,CActB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAEhE;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,WAAW,EAAE,oBAAoB,EACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,IAAI,CAwCN;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,OAAO,GAEZ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACtE,SAAS,CAkBZ;AAQD;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,MAAM,GAAG,SAAS,CA0BpB"}

package/build/commands/ask/harness/usage.js

@@ -1,11 +1,13 @@
 /**
- * What one Cargo credit is worth, and what the sandbox proxy charges per
- * million tokens. Mirrors `USD_PER_CREDIT` and
- * `ANTHROPIC_FALLBACK_RATES_USD_PER_MILLION` in the backend's harness usage:
+ * What one Cargo credit is worth, the markup language model usage is resold
+ * at, and what the sandbox proxy charges per million tokens. Mirrors
+ * `CREDIT_USD_VALUE` and `LANGUAGE_MODEL_MARKUP` in the backend's billing
+ * utils and `ANTHROPIC_FALLBACK_RATES_USD_PER_MILLION` in its harness usage:
  * the proxy prices each request from these, not from Claude Code's own cost,
  * so the credits shown after a turn have to use them too.
  */
 const USD_PER_CREDIT = 0.04;
+const LANGUAGE_MODEL_MARKUP = 2;
 const PROXY_RATES_USD_PER_MILLION = {
     input: 3,
     output: 15,
@@ -21,7 +23,7 @@ export function creditsForStep(tokens) {
         PROXY_RATES_USD_PER_MILLION.input +
         tokens.cacheReadTokens * PROXY_RATES_USD_PER_MILLION.cacheRead +
         tokens.outputTokens * PROXY_RATES_USD_PER_MILLION.output;
-    const credits = usdPerMillion / 1_000_000 / USD_PER_CREDIT;
+    const credits = (usdPerMillion / 1_000_000 / USD_PER_CREDIT) * LANGUAGE_MODEL_MARKUP;
     // `toFixed` first, as the backend does, so float noise cannot round an
     // exact hundredth up by one.
     return Math.ceil(Number((credits * 100).toFixed(6))) / 100;

package/build/commands/ask/session/index.d.ts

@@ -2,5 +2,5 @@ export { type ChatTurnClaim, claimChatTurn, proxyTokenDeadlineMs, } from "./clai
 export { renderMarkdown } from "./markdown.js";
 export { type AskSessionOptions, doesChatExist, runAskPrint, runAskSession, } from "./run.js";
 export { ASK_THINKING_WORDS, pickThinkingWord } from "./thinking.js";
-export { displayPath, showTurnStats, wrapLine } from "./tree.js";
+export { approvalMessage, displayPath, foldUserTurn, showTurnStats, wrapLine, } from "./tree.js";
 //# sourceMappingURL=index.d.ts.map

package/build/commands/ask/session/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/session/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,aAAa,EACb,oBAAoB,GACrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,KAAK,iBAAiB,EACtB,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/session/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,aAAa,EACb,oBAAoB,GACrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,KAAK,iBAAiB,EACtB,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EACL,eAAe,EACf,WAAW,EACX,YAAY,EACZ,aAAa,EACb,QAAQ,GACT,MAAM,WAAW,CAAC"}

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

@@ -2,4 +2,4 @@ export { claimChatTurn, proxyTokenDeadlineMs, } from "./claim.js";
 export { renderMarkdown } from "./markdown.js";
 export { doesChatExist, runAskPrint, runAskSession, } from "./run.js";
 export { ASK_THINKING_WORDS, pickThinkingWord } from "./thinking.js";
-export { displayPath, showTurnStats, wrapLine } from "./tree.js";
+export { approvalMessage, displayPath, foldUserTurn, showTurnStats, wrapLine, } from "./tree.js";

package/build/commands/ask/session/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/session/run.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAkE3C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAwHF;;;;;;;;;GASG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAqBlB;AAyND;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,CA0zB7B;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IACvC,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,OAAO,CAAC,IAAI,CAAC,CAqGhB"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/session/run.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAmE3C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAwHF;;;;;;;;;GASG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAqBlB;AAyND;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,CAg0B7B;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IACvC,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,OAAO,CAAC,IAAI,CAAC,CAqGhB"}

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

@@ -13,7 +13,7 @@ import { saveAskState } from "../persist/persist.js";
 import { ASK_STATE_VERSION } from "../persist/state.js";
 import { claimChatTurn, proxyTokenDeadlineMs, releaseChatTurn, reportApiFailure, } from "./claim.js";
 import { pickThinkingWord } from "./thinking.js";
-import { appendAssistantDelta, appendReasoningDelta, askToolApproval, askUserQuestions, beginAssistantTurn, beginReasoning, describeToolActivity, endAssistantTurn, endReasoning, REASONING_DISPLAYS, setAssistantFooter, setReasoningFooter, showAssistantTurn, showCard, showNotices, showToolGroup, showToolRun, showTouchedFiles, showTurnStats, showUserTurn, TOOL_DISPLAYS, } from "./tree.js";
+import { appendAssistantDelta, appendReasoningDelta, askToolApproval, askUserQuestions, beginAssistantTurn, beginReasoning, describeToolActivity, endAssistantTurn, endReasoning, isCountOnlyTool, REASONING_DISPLAYS, setAssistantFooter, setReasoningFooter, showAssistantTurn, showCard, showNotices, showToolGroup, showToolRun, showTouchedFiles, showTurnStats, showUserTurn, TOOL_DISPLAYS, } from "./tree.js";
 function requireInteractive() {
     if (isInteractive() === false || process.stdout.isTTY !== true) {
         failWith("Ask needs a terminal. Re-run with --print for one JSON turn.", {
@@ -557,7 +557,9 @@ export async function runAskSession(options) {
             };
             const flushToolRun = () => {
                 const [only] = toolRun.summaries;
-                if (toolRun.summaries.length === 1 && only !== undefined) {
+                if (toolRun.summaries.length === 1 &&
+                    only !== undefined &&
+                    isCountOnlyTool(toolRun.toolName) === false) {
                     showToolRun({
                         spinner,
                         toolName: toolRun.toolName,
@@ -567,7 +569,9 @@ export async function runAskSession(options) {
                         display: "collapsed",
                     });
                 }
-                else if (toolRun.summaries.length > 1) {
+                else if (toolRun.summaries.length > 0) {
+                    // Two or more of a tool, or one read, which is counted rather than
+                    // named: `Read 1 file`.
                     showToolGroup({
                         spinner,
                         toolName: toolRun.toolName,

package/build/commands/ask/session/tree.d.ts

@@ -19,6 +19,26 @@ export declare function showCard(body: string): void;
  * `◇  ask hey --continue`. No "You" label.
  */
 export declare function showUserTurn(body: string): void;
+/**
+ * A message of more than a few lines, folded to its start and its length:
+ *
+ *   ◇  /cargo-project Set up the `tam-building` cookbook with…  [81 lines]
+ *
+ * The person already knows what they sent, and a message that long was
+ * pasted or handed over (the brief `cargo-ai project init` passes when it
+ * opens this chat) rather than typed. Printed whole, a brief fills the screen
+ * above the reply it asked for, with its lists run together into one block by
+ * the wrap. Claude Code folds a paste the same way.
+ *
+ * Counted in the message's own lines, not in rows: a long paragraph typed in
+ * one go is one line, and it is shown whole.
+ *
+ * Exported for tests.
+ */
+export declare function foldUserTurn(body: string, width: number): {
+    text: string;
+    suffix: string;
+} | undefined;
 export type LiveAssistantTurn = {
     buffer: string;
     /**
@@ -143,6 +163,7 @@ export declare function showToolGroup(input: {
     toolName: string;
     summaries: readonly string[];
 }): void;
+export declare function isCountOnlyTool(toolName: string): boolean;
 /**
  * A path inside the session directory reads better relative to it; anything
  * outside stays absolute so it is obvious the turn left the project.
@@ -168,6 +189,15 @@ export declare function showNotices(notices: string[]): void;
  *   │  ● Yes …
  */
 export declare function askToolApproval(approval: LocalToolApproval): Promise<"yes" | "always" | "no">;
+/**
+ * The approval's question on one row. clack wraps a long message itself, at
+ * the terminal edge and with its own indent, so a long command came out over
+ * three ragged rows; the command is clipped here instead, and the line under
+ * the finished call (`⏺  Bash: …`) says the same thing again once it has run.
+ *
+ * Exported for tests.
+ */
+export declare function approvalMessage(approval: Pick<LocalToolApproval, "toolName" | "summary">, width: number): string;
 /**
  * Claude Code's question picker, in this session's tree. Each question is one
  * `selectOne` — the same prompt as a tool approval, so the rail stays intact.

package/build/commands/ask/session/tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/session/tree.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/session/tree.ts"],"names":[],"mappings":"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"}

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

@@ -104,7 +104,40 @@ export function showCard(body) {
  * `◇  ask hey --continue`. No "You" label.
  */
 export function showUserTurn(body) {
-    writeDiamondBlock(body);
+    const folded = foldUserTurn(body, treeBodyWidth());
+    if (folded === undefined) {
+        writeDiamondBlock(body);
+        return;
+    }
+    process.stderr.write(`${colors.dim("◇")}  ${folded.text}${colors.dim(folded.suffix)}\n`);
+}
+/** Lines a sent message may have before it is folded to one row. */
+const USER_TURN_MAX_LINES = 4;
+/**
+ * A message of more than a few lines, folded to its start and its length:
+ *
+ *   ◇  /cargo-project Set up the `tam-building` cookbook with…  [81 lines]
+ *
+ * The person already knows what they sent, and a message that long was
+ * pasted or handed over (the brief `cargo-ai project init` passes when it
+ * opens this chat) rather than typed. Printed whole, a brief fills the screen
+ * above the reply it asked for, with its lists run together into one block by
+ * the wrap. Claude Code folds a paste the same way.
+ *
+ * Counted in the message's own lines, not in rows: a long paragraph typed in
+ * one go is one line, and it is shown whole.
+ *
+ * Exported for tests.
+ */
+export function foldUserTurn(body, width) {
+    const count = body.trim().split("\n").length;
+    if (count <= USER_TURN_MAX_LINES) {
+        return undefined;
+    }
+    const lines = body.split("\n").filter((line) => line.trim() !== "");
+    const suffix = `  [${String(count)} lines]`;
+    const text = clipToCells(lines.map((line) => line.trim()).join(" "), Math.max(8, width - textWidth(suffix)));
+    return { text, suffix };
 }
 /**
  * Where the finished part of a reply ends: just past its last blank line, as
@@ -484,11 +517,13 @@ export function showToolGroup(input) {
     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}`;
+        : `${verb.label} ${String(count)} ${count === 1 ? verb.one : 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 items = isCountOnlyTool(input.toolName)
+        ? []
+        : 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) {
@@ -499,16 +534,32 @@ export function showToolGroup(input) {
 }
 /** 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" },
+    { toolName: "read", label: "Read", one: "file", noun: "files" },
+    { toolName: "edit", label: "Edited", one: "file", noun: "files" },
+    { toolName: "multiedit", label: "Edited", one: "file", noun: "files" },
+    { toolName: "write", label: "Wrote", one: "file", noun: "files" },
+    { toolName: "bash", label: "Ran", one: "command", noun: "commands" },
+    { toolName: "grep", label: "Ran", one: "search", noun: "searches" },
+    { toolName: "glob", label: "Listed", one: "pattern", noun: "patterns" },
+    { toolName: "webfetch", label: "Fetched", one: "page", noun: "pages" },
+    {
+        toolName: "websearch",
+        label: "Ran",
+        one: "web search",
+        noun: "web searches",
+    },
 ];
+/**
+ * Tools whose calls are counted under `collapsed`, never named: `Read 2
+ * files`. What an agent read on its way to an answer is how it got there, not
+ * what it did, and a row of paths says less than the reply under it. The
+ * names are one `/tools full` away. Edits and writes keep theirs, because
+ * they changed something.
+ */
+const COUNT_ONLY_TOOLS = new Set(["read"]);
+export function isCountOnlyTool(toolName) {
+    return COUNT_ONLY_TOOLS.has(toolName.toLowerCase());
+}
 /**
  * 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.
@@ -576,9 +627,7 @@ export function showNotices(notices) {
  */
 export async function askToolApproval(approval) {
     const decision = await selectOne({
-        message: approval.summary === ""
-            ? `Run ${approval.toolName}?`
-            : `Run ${approval.toolName}: ${approval.summary}?`,
+        message: approvalMessage(approval, treeBodyWidth()),
         recommended: "yes",
         // Escape here means "not that tool", not "leave the chat" — the turn
         // continues and the model reports what it could not do.
@@ -589,8 +638,32 @@ export async function askToolApproval(approval) {
             { value: "no", label: "No", hint: "tell the model to skip it" },
         ],
     });
+    closePicker();
     return decision === "always" ? "always" : decision === "no" ? "no" : "yes";
 }
+/**
+ * The approval's question on one row. clack wraps a long message itself, at
+ * the terminal edge and with its own indent, so a long command came out over
+ * three ragged rows; the command is clipped here instead, and the line under
+ * the finished call (`⏺  Bash: …`) says the same thing again once it has run.
+ *
+ * Exported for tests.
+ */
+export function approvalMessage(approval, width) {
+    if (approval.summary === "") {
+        return `Run ${approval.toolName}?`;
+    }
+    return `${clipToCells(`Run ${approval.toolName}: ${approval.summary}`, width - 1)}?`;
+}
+/**
+ * The rail row a finished picker leaves under its answer. clack opens each of
+ * its prompts with one, so a second question gets it for free; the tool line
+ * or the reply that comes next does not, and printed straight under the dim
+ * answer it reads as part of it.
+ */
+function closePicker() {
+    writeRail("");
+}
 const SKIP_QUESTION = "__skip__";
 /**
  * Claude Code's question picker, in this session's tree. Each question is one
@@ -623,5 +696,6 @@ export async function askUserQuestions(toolInput) {
             answers[question.question] = chosen;
         }
     }
+    closePicker();
     return Object.keys(answers).length === 0 ? undefined : answers;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.133",
+  "version": "1.0.135",
   "mcpName": "io.github.getcargohq/cargo",
   "private": false,
   "license": "UNLICENSED",
@@ -74,10 +74,10 @@
   "dependencies": {
     "@ai-sdk/harness": "1.0.144",
     "@ai-sdk/harness-claude-code": "1.0.148",
-    "@cargo-ai/api": "^1.0.101",
+    "@cargo-ai/api": "^1.0.102",
     "@cargo-ai/app-sdk": "^1.0.11",
     "@cargo-ai/cdk": "^1.0.126",
-    "@cargo-ai/types": "^1.0.103",
+    "@cargo-ai/types": "^1.0.104",
     "@cargo-ai/utils": "^1.0.35",
     "@cargo-ai/worker-sdk": "^1.0.21",
     "@modelcontextprotocol/sdk": "^1.31.0",