@cargo-ai/cli 1.0.95 → 1.0.96

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

@@ -1 +1 @@
-{"version":3,"file":"approvals.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/approvals.ts"],"names":[],"mappings":"AA2CA,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjC,OAAO,CA2BT;AAqBD,eAAO,MAAM,kBAAkB,2HAC2F,CAAC;AAE3H,0BAA0B;AAC1B,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAExD"}
+{"version":3,"file":"approvals.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/approvals.ts"],"names":[],"mappings":"AA0CA,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjC,OAAO,CA2BT;AAqBD,eAAO,MAAM,kBAAkB,2HAC2F,CAAC;AAE3H,0BAA0B;AAC1B,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAExD"}

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

@@ -13,7 +13,6 @@ const AUTO_APPROVED_TOOL_NAMES = new Set([
     "TaskCreate",
     "TaskUpdate",
     "TaskStop",
-    "AskUserQuestion",
 ]);
 /**
  * Cargo's MCP tools run unattended in an interactive session, `execute_action`

package/build/commands/ask/harness/askUserQuestion.d.ts

@@ -0,0 +1,69 @@
+/**
+ * Claude Code's `AskUserQuestion` — a structured multiple-choice prompt.
+ *
+ * The native picker cannot run here: `allow-reads` classifies it as readonly,
+ * so Claude Code starts it without asking us, then waits on a UI this session
+ * does not have. The native tool is withheld for that reason, via session
+ * `disallowedTools` — not a settings.json deny of the same name, which would
+ * also disable this host replacement. This session implements the tool as a
+ * host tool: the questions are shown in Ask's own picker, and the answers are
+ * the tool result.
+ *
+ * The input schema has to name `questions`. The Claude Code bridge turns host
+ * tool schemas into a Zod object shape; an empty shape strips every argument,
+ * and the picker sees `{}`.
+ */
+import { jsonSchema } from "ai";
+export declare const ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion";
+export declare const ASK_USER_QUESTION_DENIED_REASON = "Nobody is at the terminal to answer. Ask in your reply text instead.";
+export declare const ASK_USER_QUESTION_MISSING_INPUT_REASON = "AskUserQuestion requires `questions`: an array of 1\u20134 items, each with `question`, `header`, `options` (each `{ label, description }`), and `multiSelect`. Call it again with those fields filled in.";
+type AskUserQuestionHostTool = {
+    description: string;
+    inputSchema: ReturnType<typeof jsonSchema>;
+    execute: (data: unknown) => Promise<unknown>;
+};
+export type AskUserQuestionAsk = (input: unknown) => Promise<Record<string, string> | undefined>;
+type BuiltinToolFiltering = {
+    mode: "allow" | "deny";
+    toolNames: string[];
+};
+/**
+ * Withhold Claude Code's native `AskUserQuestion` without dropping a host tool
+ * of the same name.
+ *
+ * HarnessAgent `inactiveTools` cannot do this: it also filters the user tool
+ * out of `toolSpecs`, so the replacement is never registered. A settings.json
+ * deny of `AskUserQuestion` matches the host tool too. Merging a deny into the
+ * session's builtin filtering becomes `disallowedTools` for the native tool
+ * only; host `execute` still runs.
+ */
+export declare function denyNativeAskUserQuestion(existing: BuiltinToolFiltering | undefined): BuiltinToolFiltering;
+/**
+ * Host-side `AskUserQuestion`. Same name as the builtin so the model keeps
+ * calling it; HarnessAgent runs `execute` on the host instead of Claude Code.
+ */
+export declare function buildAskUserQuestionHostTool(getAsk: () => AskUserQuestionAsk | undefined): Record<string, AskUserQuestionHostTool>;
+export type AskUserQuestionOption = {
+    label: string;
+    description: string | undefined;
+};
+export type AskUserQuestionItem = {
+    question: string;
+    header: string | undefined;
+    options: AskUserQuestionOption[];
+    multiSelect: boolean;
+};
+/**
+ * Pull the questions out of a tool input, whether the bridge sent a JSON
+ * string or the parsed object.
+ */
+export declare function readAskUserQuestions(toolInput: unknown): AskUserQuestionItem[] | undefined;
+/** First question, for the spinner — not the whole JSON payload. */
+export declare function summarizeAskUserQuestion(toolInput: unknown): string | undefined;
+/**
+ * Told to the model as the denial reason so it can continue with the answers
+ * rather than asking again.
+ */
+export declare function formatAskUserQuestionAnswers(answers: Record<string, string>): string;
+export {};
+//# sourceMappingURL=askUserQuestion.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"askUserQuestion.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/askUserQuestion.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAoB,MAAM,IAAI,CAAC;AAElD,eAAO,MAAM,2BAA2B,oBAAoB,CAAC;AAE7D,eAAO,MAAM,+BAA+B,yEAC4B,CAAC;AAEzE,eAAO,MAAM,sCAAsC,+MACsJ,CAAC;AA4C1M,KAAK,uBAAuB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC3C,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAC/B,KAAK,EAAE,OAAO,KACX,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC;AAEjD,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,oBAAoB,GAAG,SAAS,GACzC,oBAAoB,CAsBtB;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,kBAAkB,GAAG,SAAS,GAC3C,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CA2BzC;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,OAAO,GACjB,mBAAmB,EAAE,GAAG,SAAS,CA0BnC;AAED,oEAAoE;AACpE,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,OAAO,GACjB,MAAM,GAAG,SAAS,CAkBpB;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,MAAM,CAER"}

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

@@ -0,0 +1,218 @@
+/**
+ * Claude Code's `AskUserQuestion` — a structured multiple-choice prompt.
+ *
+ * The native picker cannot run here: `allow-reads` classifies it as readonly,
+ * so Claude Code starts it without asking us, then waits on a UI this session
+ * does not have. The native tool is withheld for that reason, via session
+ * `disallowedTools` — not a settings.json deny of the same name, which would
+ * also disable this host replacement. This session implements the tool as a
+ * host tool: the questions are shown in Ask's own picker, and the answers are
+ * the tool result.
+ *
+ * The input schema has to name `questions`. The Claude Code bridge turns host
+ * tool schemas into a Zod object shape; an empty shape strips every argument,
+ * and the picker sees `{}`.
+ */
+import { jsonSchema } from "ai";
+export const ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion";
+export const ASK_USER_QUESTION_DENIED_REASON = "Nobody is at the terminal to answer. Ask in your reply text instead.";
+export const ASK_USER_QUESTION_MISSING_INPUT_REASON = "AskUserQuestion requires `questions`: an array of 1–4 items, each with `question`, `header`, `options` (each `{ label, description }`), and `multiSelect`. Call it again with those fields filled in.";
+const ASK_USER_QUESTION_JSON_SCHEMA = {
+    type: "object",
+    properties: {
+        questions: {
+            type: "array",
+            description: "1–4 multiple-choice questions to present to the user in this terminal.",
+            items: {
+                type: "object",
+                properties: {
+                    question: {
+                        type: "string",
+                        description: "The question to ask.",
+                    },
+                    header: {
+                        type: "string",
+                        description: "Short label shown above the question.",
+                    },
+                    options: {
+                        type: "array",
+                        items: {
+                            type: "object",
+                            properties: {
+                                label: { type: "string" },
+                                description: { type: "string" },
+                                preview: { type: "string" },
+                            },
+                            required: ["label", "description"],
+                        },
+                    },
+                    multiSelect: {
+                        type: "boolean",
+                        description: "Whether the user may pick more than one option.",
+                    },
+                },
+                required: ["question", "header", "options", "multiSelect"],
+            },
+        },
+    },
+    required: ["questions"],
+};
+/**
+ * Withhold Claude Code's native `AskUserQuestion` without dropping a host tool
+ * of the same name.
+ *
+ * HarnessAgent `inactiveTools` cannot do this: it also filters the user tool
+ * out of `toolSpecs`, so the replacement is never registered. A settings.json
+ * deny of `AskUserQuestion` matches the host tool too. Merging a deny into the
+ * session's builtin filtering becomes `disallowedTools` for the native tool
+ * only; host `execute` still runs.
+ */
+export function denyNativeAskUserQuestion(existing) {
+    if (existing === undefined) {
+        return { mode: "deny", toolNames: [ASK_USER_QUESTION_TOOL_NAME] };
+    }
+    if (existing.mode === "deny") {
+        if (existing.toolNames.includes(ASK_USER_QUESTION_TOOL_NAME) === true) {
+            return existing;
+        }
+        return {
+            mode: "deny",
+            toolNames: [...existing.toolNames, ASK_USER_QUESTION_TOOL_NAME],
+        };
+    }
+    return {
+        mode: "allow",
+        toolNames: existing.toolNames.filter((name) => name !== ASK_USER_QUESTION_TOOL_NAME),
+    };
+}
+/**
+ * Host-side `AskUserQuestion`. Same name as the builtin so the model keeps
+ * calling it; HarnessAgent runs `execute` on the host instead of Claude Code.
+ */
+export function buildAskUserQuestionHostTool(getAsk) {
+    return {
+        [ASK_USER_QUESTION_TOOL_NAME]: {
+            description: "Ask the user multiple-choice questions via a structured UI. This session presents the options in the terminal and returns their answers.",
+            inputSchema: jsonSchema(ASK_USER_QUESTION_JSON_SCHEMA),
+            execute: async (data) => {
+                const ask = getAsk();
+                if (ask === undefined) {
+                    return { error: ASK_USER_QUESTION_DENIED_REASON };
+                }
+                if (readAskUserQuestions(data) === undefined) {
+                    return { error: ASK_USER_QUESTION_MISSING_INPUT_REASON };
+                }
+                const answers = await ask(data);
+                if (answers === undefined || Object.keys(answers).length === 0) {
+                    return { error: ASK_USER_QUESTION_DENIED_REASON };
+                }
+                return { answers };
+            },
+        },
+    };
+}
+/**
+ * Pull the questions out of a tool input, whether the bridge sent a JSON
+ * string or the parsed object.
+ */
+export function readAskUserQuestions(toolInput) {
+    const record = asRecord(toolInput);
+    if (record === undefined) {
+        return undefined;
+    }
+    const rawQuestions = record["questions"];
+    if (Array.isArray(rawQuestions) === false || rawQuestions.length === 0) {
+        return undefined;
+    }
+    const questions = [];
+    for (const rawQuestion of rawQuestions) {
+        const parsed = readQuestion(rawQuestion);
+        if (parsed === undefined) {
+            return undefined;
+        }
+        questions.push(parsed);
+    }
+    return questions;
+}
+/** First question, for the spinner — not the whole JSON payload. */
+export function summarizeAskUserQuestion(toolInput) {
+    const questions = readAskUserQuestions(toolInput);
+    if (questions === undefined) {
+        return undefined;
+    }
+    const first = questions[0];
+    if (first === undefined) {
+        return undefined;
+    }
+    if (questions.length === 1) {
+        return first.question;
+    }
+    return `${first.question} (+${String(questions.length - 1)} more)`;
+}
+/**
+ * Told to the model as the denial reason so it can continue with the answers
+ * rather than asking again.
+ */
+export function formatAskUserQuestionAnswers(answers) {
+    return `The user answered: ${JSON.stringify(answers)}. Continue with these answers. Do not call AskUserQuestion again for these questions.`;
+}
+function readQuestion(raw) {
+    const record = asRecord(raw);
+    if (record === undefined) {
+        return undefined;
+    }
+    const question = record["question"];
+    const rawOptions = record["options"];
+    if (typeof question !== "string" || question.length === 0) {
+        return undefined;
+    }
+    if (Array.isArray(rawOptions) === false || rawOptions.length === 0) {
+        return undefined;
+    }
+    const options = [];
+    for (const rawOption of rawOptions) {
+        const parsed = readOption(rawOption);
+        if (parsed === undefined) {
+            return undefined;
+        }
+        options.push(parsed);
+    }
+    const header = record["header"];
+    return {
+        question,
+        header: typeof header === "string" ? header : undefined,
+        options,
+        multiSelect: record["multiSelect"] === true,
+    };
+}
+function readOption(raw) {
+    const record = asRecord(raw);
+    if (record === undefined) {
+        return undefined;
+    }
+    const label = record["label"];
+    const description = record["description"];
+    if (typeof label !== "string" || label.length === 0) {
+        return undefined;
+    }
+    return {
+        label,
+        description: typeof description === "string" ? description : undefined,
+    };
+}
+function asRecord(value) {
+    if (typeof value === "string") {
+        try {
+            const parsed = JSON.parse(value);
+            return typeof parsed === "object" && parsed !== null
+                ? parsed
+                : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    return typeof value === "object" && value !== null
+        ? value
+        : undefined;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"claudeConfig.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/claudeConfig.ts"],"names":[],"mappings":"AA2BA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAa3C"}
+{"version":3,"file":"claudeConfig.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/claudeConfig.ts"],"names":[],"mappings":"AAyCA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAa3C"}

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

@@ -1,6 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { getConfigDir } from "@cargo-ai/cdk/cli";
+import { ASK_USER_QUESTION_TOOL_NAME } from "./askUserQuestion.js";
 /**
  * Tools that spawn a subagent, refused at source.
  *
@@ -22,6 +23,16 @@ import { getConfigDir } from "@cargo-ai/cdk/cli";
  * Code versions and a rule for a tool that does not exist costs nothing.
  */
 const SUBAGENT_TOOL_NAMES = ["Agent", "Task"];
+/**
+ * Native `AskUserQuestion` used to live on this list. A deny-by-name rule
+ * matches the host replacement of the same name, so model calls came back
+ * disabled instead of reaching host `execute`. Native withholding is now
+ * session `disallowedTools` — see `denyNativeAskUserQuestion`. Names here
+ * are stripped from an existing deny array so a previous Ask run cannot
+ * keep the collision around.
+ */
+const SETTINGS_DENIED_TOOL_NAMES = SUBAGENT_TOOL_NAMES;
+const SETTINGS_UNDENIED_TOOL_NAMES = [ASK_USER_QUESTION_TOOL_NAME];
 /**
  * The Claude Agent SDK loads every filesystem settings source it can find when
  * `settingSources` is omitted, and the harness bridge omits it. A local turn
@@ -52,24 +63,23 @@ export function askClaudeConfigDir() {
     }
     const dir = join(getConfigDir(), "ask-claude-config");
     mkdirSync(dir, { recursive: true });
-    denySubagentTools(dir);
+    denySettingsTools(dir);
     return dir;
 }
 /**
- * Add the subagent deny rules to the settings file in Ask's own config
- * directory, keeping whatever else is in there.
+ * Add the deny rules to the settings file in Ask's own config directory,
+ * keeping whatever else is in there.
  *
  * Merged rather than written whole, because Claude Code keeps its own state
  * under this directory.
  *
  * A failure here is reported rather than swallowed. There is no second line of
- * defence to fall back on: the approval-time refusal in `isAlwaysDenied` is
- * never reached, which is the whole reason this exists — so a settings file
- * that could not be written means subagents run unattended, and the user is
- * the only one who can tell whether that matters. Reported, not thrown: it
- * must not fail the question they just asked.
+ * defence to fall back on for tools `allow-reads` never asks about — so a
+ * settings file that could not be written means those tools run unattended,
+ * and the user is the only one who can tell whether that matters. Reported,
+ * not thrown: it must not fail the question they just asked.
  */
-function denySubagentTools(dir) {
+function denySettingsTools(dir) {
     const path = join(dir, "settings.json");
     try {
         const existing = existsSync(path)
@@ -84,16 +94,21 @@ function denySubagentTools(dir) {
             : {};
         const denyValue = permissions["deny"];
         const deny = Array.isArray(denyValue) ? denyValue : [];
-        const missing = SUBAGENT_TOOL_NAMES.filter((name) => deny.includes(name) === false);
-        if (missing.length === 0) {
+        const kept = deny.filter((name) => {
+            return typeof name === "string"
+                ? SETTINGS_UNDENIED_TOOL_NAMES.includes(name) === false
+                : true;
+        });
+        const missing = SETTINGS_DENIED_TOOL_NAMES.filter((name) => kept.includes(name) === false);
+        if (missing.length === 0 && kept.length === deny.length) {
             return;
         }
         writeFileSync(path, `${JSON.stringify({
             ...settings,
-            permissions: { ...permissions, deny: [...deny, ...missing] },
+            permissions: { ...permissions, deny: [...kept, ...missing] },
         }, null, 2)}\n`);
     }
     catch (error) {
-        process.stderr.write(`Could not write ${path}, so subagent tools are not withheld from this session: ${error instanceof Error ? error.message : "unknown error"}\n`);
+        process.stderr.write(`Could not write ${path}, so Agent and Task are not withheld from this session: ${error instanceof Error ? error.message : "unknown error"}\n`);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/create.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAmB3C,OAAO,EAGL,KAAK,kBAAkB,EAKxB,MAAM,WAAW,CAAC;AAGnB,MAAM,MAAM,YAAY,GAAG;IACzB,YAAY,EAAE,CACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,kBAAkB,KACzB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAC5C,sEAAsE;IACtE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAcF,wBAAsB,kBAAkB,CAAC,KAAK,EAAE;IAC9C,GAAG,EAAE,GAAG,CAAC;IACT;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,uBAAuB,EAAE,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,YAAY,CAAC,CA4SxB"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/create.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAuB3C,OAAO,EAGL,KAAK,kBAAkB,EAKxB,MAAM,WAAW,CAAC;AAGnB,MAAM,MAAM,YAAY,GAAG;IACzB,YAAY,EAAE,CACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,kBAAkB,KACzB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAC5C,sEAAsE;IACtE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAcF,wBAAsB,kBAAkB,CAAC,KAAK,EAAE;IAC9C,GAAG,EAAE,GAAG,CAAC;IACT;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,uBAAuB,EAAE,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,YAAY,CAAC,CAsUxB"}

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

@@ -2,6 +2,7 @@ import { HarnessAgent } from "@ai-sdk/harness/agent";
 import { createClaudeCode } from "@ai-sdk/harness-claude-code";
 import { createLocalSandbox } from "ai-sdk-sandbox-local";
 import { pruneHarnessArtifacts } from "./artifacts.js";
+import { buildAskUserQuestionHostTool, denyNativeAskUserQuestion, } from "./askUserQuestion.js";
 import { askClaudeConfigDir } from "./claudeConfig.js";
 import { ingestTurn } from "./ingest.js";
 import { localHarnessInstructions, localHarnessSkills, } from "./instructions.js";
@@ -39,9 +40,15 @@ export async function createLocalHarness(input) {
     setupPhase("stale harness artifacts pruned");
     const anthropicBaseUrl = `${input.apiBaseUrl.replace(/\/$/, "")}/sandbox/anthropic`;
     const release = input.release;
-    const hostTools = input.allowWorkspaceMutations === false || release === undefined
+    const releaseTools = input.allowWorkspaceMutations === false || release === undefined
         ? {}
         : buildReleaseHostTools(input.api, release.actions);
+    // Bound per prompt: the picker lives on the turn, the tool on the session.
+    const askUserQuestionAsk = { current: undefined };
+    const hostTools = {
+        ...releaseTools,
+        ...buildAskUserQuestionHostTool(() => askUserQuestionAsk.current),
+    };
     const mcpServers = {
         [CARGO_MCP_SERVER_NAME]: cargoMcpServer(input.apiBaseUrl),
     };
@@ -51,19 +58,29 @@ export async function createLocalHarness(input) {
             mcpServers[name] = server;
         }
     }
+    // Pin auth the same way the backend harness stream does. Credentials go
+    // through `auth`, not `env`: passing them via `env` alone lets
+    // createClaudeCode auto-detect AI Gateway from the host process and ignore
+    // the Cargo proxy.
+    const claudeCode = createClaudeCode({
+        auth: {
+            ANTHROPIC_BASE_URL: anthropicBaseUrl,
+            ANTHROPIC_API_KEY: input.proxyToken,
+        },
+        env: { CLAUDE_CONFIG_DIR: askClaudeConfigDir() },
+        mcpServers,
+    });
     const harnessAgent = new HarnessAgent({
-        // Pin auth the same way the backend harness stream does. Credentials go
-        // through `auth`, not `env`: passing them via `env` alone lets
-        // createClaudeCode auto-detect AI Gateway from the host process and ignore
-        // the Cargo proxy.
-        harness: createClaudeCode({
-            auth: {
-                ANTHROPIC_BASE_URL: anthropicBaseUrl,
-                ANTHROPIC_API_KEY: input.proxyToken,
-            },
-            env: { CLAUDE_CONFIG_DIR: askClaudeConfigDir() },
-            mcpServers,
-        }),
+        // Native AskUserQuestion is withheld on the session, not via
+        // `inactiveTools` (that would drop the host tool of the same name) and
+        // not via settings.json deny (that name matches the replacement too).
+        harness: {
+            ...claudeCode,
+            doStart: async (startOpts) => claudeCode.doStart({
+                ...startOpts,
+                builtinToolFiltering: denyNativeAskUserQuestion(startOpts.builtinToolFiltering),
+            }),
+        },
         id: "cargo-ai-ask",
         sandbox: withGetPortEndpoint(createLocalSandbox({ cwd: workspace.sandboxCwd })),
         sandboxConfig: workspace.workDir === undefined ? {} : { workDir: workspace.workDir },
@@ -166,6 +183,8 @@ export async function createLocalHarness(input) {
             }
             const accumulator = createTurnAccumulator();
             let answer;
+            askUserQuestionAsk.current =
+                options === undefined ? undefined : options.onUserQuestion;
             try {
                 answer = await runPromptTurn({
                     driver: {
@@ -230,6 +249,9 @@ export async function createLocalHarness(input) {
                 });
                 throw error;
             }
+            finally {
+                askUserQuestionAsk.current = undefined;
+            }
             if (didReachAnthropic(accumulator.usage) === true) {
                 proxyLastUsedAtMs = Date.now();
             }

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

@@ -1,4 +1,5 @@
 export { isAlwaysDenied, isAutoApproved } from "./approvals.js";
+export { ASK_USER_QUESTION_DENIED_REASON, ASK_USER_QUESTION_MISSING_INPUT_REASON, ASK_USER_QUESTION_TOOL_NAME, buildAskUserQuestionHostTool, denyNativeAskUserQuestion, formatAskUserQuestionAnswers, readAskUserQuestions, summarizeAskUserQuestion, } from "./askUserQuestion.js";
 export { createLocalHarness, type LocalHarness } from "./create.js";
 export { localHarnessInstructions, localHarnessSkills, } from "./instructions.js";
 export { resolveWorkspaceLayout } from "./layout.js";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EACL,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,aAAa,EACb,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,UAAU,GAChB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,qBAAqB,EACrB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,qBAAqB,GACtB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACL,+BAA+B,EAC/B,sCAAsC,EACtC,2BAA2B,EAC3B,4BAA4B,EAC5B,yBAAyB,EACzB,4BAA4B,EAC5B,oBAAoB,EACpB,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EACL,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,aAAa,EACb,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,UAAU,GAChB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,qBAAqB,EACrB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,qBAAqB,GACtB,MAAM,YAAY,CAAC"}

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

@@ -1,4 +1,5 @@
 export { isAlwaysDenied, isAutoApproved } from "./approvals.js";
+export { ASK_USER_QUESTION_DENIED_REASON, ASK_USER_QUESTION_MISSING_INPUT_REASON, ASK_USER_QUESTION_TOOL_NAME, buildAskUserQuestionHostTool, denyNativeAskUserQuestion, formatAskUserQuestionAnswers, readAskUserQuestions, summarizeAskUserQuestion, } from "./askUserQuestion.js";
 export { createLocalHarness } from "./create.js";
 export { localHarnessInstructions, localHarnessSkills, } from "./instructions.js";
 export { resolveWorkspaceLayout } from "./layout.js";

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

@@ -1 +1 @@
-{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAsBxC;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,GACnB,MAAM,CAkBR;AAED,0BAA0B;AAC1B,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,GACV,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAM/D"}
+{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAwBxC;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,GACnB,MAAM,CAkBR;AAED,0BAA0B;AAC1B,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,GACV,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAM/D"}

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

@@ -4,6 +4,8 @@ const LOCAL_WORKING_COPY_INSTRUCTIONS = `You are working in the user's local wor
 
 The user confirms each Bash, Write, Edit and NotebookEdit call, and can only answer one at a time. Ask for a single one of those per step and wait for its result before asking for the next; two in one step leaves the second waiting on a confirmation it will never be offered. Reads (Read, Glob, Grep) and the Cargo \`mcp__cargo__*\` tools need no confirmation — batch those freely.
 
+When you need a multiple-choice answer, call AskUserQuestion. This session presents the options in the terminal and returns the user's answers as the tool result. Do not wait for a Claude Code question picker.
+
 Prefer minimal, focused diffs; match the existing code style; run the project's own checks when they exist. End each task with a short summary of what changed and how it was validated.`;
 const CDK_RAILS_INSTRUCTIONS = `This directory is a Cargo CDK project.
 - Never edit cargo.state.json, cargo.state.lock, or .cargo-ai/ by hand — they are generated. Repoint this project's deploy state with \`cargo-cdk state bind\`.

package/build/commands/ask/harness/turn.d.ts

@@ -43,6 +43,13 @@ export type LocalStreamHandlers = {
      * do rather than silently running commands on the user's machine.
      */
     onApproval?: (approval: LocalToolApproval) => Promise<boolean>;
+    /**
+     * Present `AskUserQuestion` in this session's own picker. Used by the host
+     * tool that replaces Claude Code's native picker, and by the approval path
+     * if a call is still offered. Omitted (`--print`) means the model is told
+     * to ask in its reply instead.
+     */
+    onUserQuestion?: (input: unknown) => Promise<Record<string, string> | undefined>;
     onActivity?: (activity: LocalToolActivity) => void;
     /** Path of a file the turn wrote or edited, as the tool named it. */
     onFileTouched?: (path: string) => void;

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

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

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

@@ -1,4 +1,5 @@
 import { DENIED_TOOL_REASON, isAlwaysDenied, isAutoApproved, } from "./approvals.js";
+import { ASK_USER_QUESTION_DENIED_REASON, ASK_USER_QUESTION_TOOL_NAME, formatAskUserQuestionAnswers, summarizeAskUserQuestion, } from "./askUserQuestion.js";
 import { addTurnUsage, createTurnAccumulator, } from "./usage.js";
 /**
  * How many times one turn may suspend for approvals. Each round trip is a
@@ -101,15 +102,20 @@ export async function runPromptTurn(input) {
             // Refused before the user is asked: not their call to make, and a
             // prompt for it could not say what it was granting.
             const denied = isAlwaysDenied(approval.toolName);
-            const approved = denied === true
+            const question = approval.toolName === ASK_USER_QUESTION_TOOL_NAME
+                ? await settleAskUserQuestion(approval.input, handlers.onUserQuestion)
+                : undefined;
+            const approved = question !== undefined
                 ? false
-                : isAutoApproved(approval.toolName, {
-                    unattended: onApproval === undefined,
-                }) === true
-                    ? true
-                    : onApproval === undefined
-                        ? false
-                        : await onApproval(approval);
+                : denied === true
+                    ? false
+                    : isAutoApproved(approval.toolName, {
+                        unattended: onApproval === undefined,
+                    }) === true
+                        ? true
+                        : onApproval === undefined
+                            ? false
+                            : await onApproval(approval);
             // Recorded against the call so the retraction pass below knows it is
             // settled: an approved one is running and must be left alone, a refused
             // one is certainly not and needs no reprieve to find out. Absent when
@@ -132,7 +138,11 @@ export async function runPromptTurn(input) {
                     approved,
                     // Told why, so it does something else rather than asking again
                     // until the approval-round cap ends the turn.
-                    reason: denied === true ? DENIED_TOOL_REASON : undefined,
+                    reason: question !== undefined
+                        ? question.reason
+                        : denied === true
+                            ? DENIED_TOOL_REASON
+                            : undefined,
                 },
                 toolCall: {
                     type: "tool-call",
@@ -400,7 +410,7 @@ async function consumeTurn(input) {
             }
             continue;
         }
-        if (part["type"] === "tool-call") {
+        if (isToolCallPart(part) === true) {
             const toolCallId = part["toolCallId"];
             const toolName = part["toolName"];
             if (typeof toolCallId === "string" && typeof toolName === "string") {
@@ -444,12 +454,12 @@ async function consumeTurn(input) {
             }
             continue;
         }
-        if (part["type"] === "tool-result" || part["type"] === "tool-error") {
+        if (isToolEndPart(part) === true) {
             const toolCallId = part["toolCallId"];
             const recorded = typeof toolCallId === "string"
                 ? input.toolCalls.get(toolCallId)
                 : undefined;
-            const isError = part["type"] === "tool-error";
+            const isError = isToolErrorPart(part);
             // A preliminary result is progress from a tool that is still running,
             // so it must not clear the spinner or tell the stall watchdog the tool
             // is done.
@@ -616,11 +626,51 @@ function summarizeToolInput(toolInput) {
             return truncate(value);
         }
     }
+    const question = summarizeAskUserQuestion(toolInput);
+    if (question !== undefined) {
+        return truncate(question);
+    }
     return truncate(JSON.stringify(record));
 }
+async function settleAskUserQuestion(toolInput, onUserQuestion) {
+    if (onUserQuestion === undefined) {
+        return { reason: ASK_USER_QUESTION_DENIED_REASON };
+    }
+    const answers = await onUserQuestion(toolInput);
+    if (answers === undefined || Object.keys(answers).length === 0) {
+        return { reason: ASK_USER_QUESTION_DENIED_REASON };
+    }
+    return { reason: formatAskUserQuestionAnswers(answers) };
+}
 function truncate(value) {
     const flat = value.replace(/\s+/g, " ").trim();
     return flat.length > TOOL_SUMMARY_MAX_LENGTH
         ? `${flat.slice(0, TOOL_SUMMARY_MAX_LENGTH - 1)}…`
         : flat;
 }
+/**
+ * `fullStream` still uses `tool-call`. The UI message stream — and some
+ * harness adapters after AI SDK 7 — spell the assembled call
+ * `tool-input-available` instead. Treat them as the same moment: the tool
+ * is now executing.
+ */
+function isToolCallPart(part) {
+    return (part["type"] === "tool-call" || part["type"] === "tool-input-available");
+}
+/**
+ * Same split for the result. Missing the UI names left the tool "running"
+ * after it had already finished, which is the spinner-stuck-on-every-tool
+ * hang: the stall watchdog switched to its long deadline and waited there.
+ */
+function isToolEndPart(part) {
+    return (part["type"] === "tool-result" ||
+        part["type"] === "tool-error" ||
+        part["type"] === "tool-output-available" ||
+        part["type"] === "tool-output-error" ||
+        part["type"] === "tool-output-denied");
+}
+function isToolErrorPart(part) {
+    return (part["type"] === "tool-error" ||
+        part["type"] === "tool-output-error" ||
+        part["type"] === "tool-output-denied");
+}

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;AAmD3C,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;AAkHF;;;;;;;;;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,CAulB7B;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;AAoD3C,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;AAkHF;;;;;;;;;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,CAsmB7B;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, askToolApproval, beginAssistantTurn, describeToolActivity, endAssistantTurn, setAssistantFooter, showAssistantTurn, showCard, showNotices, showToolRun, showTouchedFiles, showUserTurn, } from "./tree.js";
+import { appendAssistantDelta, askToolApproval, askUserQuestions, beginAssistantTurn, describeToolActivity, endAssistantTurn, setAssistantFooter, showAssistantTurn, showCard, showNotices, showToolRun, showTouchedFiles, showUserTurn, } 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.", {
@@ -663,6 +663,20 @@ export async function runAskSession(options) {
                         });
                         return true;
                     },
+                    onUserQuestion: async (input) => {
+                        if (live !== undefined) {
+                            endAssistantTurn(live);
+                            live = undefined;
+                        }
+                        stopSpinner();
+                        await typing.pause();
+                        try {
+                            return await askUserQuestions(input);
+                        }
+                        finally {
+                            typing.resume();
+                        }
+                    },
                 });
                 stopSpinner();
                 if (live !== undefined) {

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

@@ -1,5 +1,5 @@
 import { type Spinner } from "../../runHandler.js";
-import type { LocalToolApproval } from "../harness/index.js";
+import type { LocalToolApproval } from "../harness/turn.js";
 /**
  * Greedy wrap on spaces. A word longer than the width keeps its own line
  * rather than being cut mid-token.
@@ -87,4 +87,13 @@ export declare function showNotices(notices: string[]): void;
  *   │  ● Yes …
  */
 export declare function askToolApproval(approval: LocalToolApproval): Promise<"yes" | "always" | "no">;
+/**
+ * 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.
+ *
+ * Multi-select is flattened to one pick: this terminal can only answer one
+ * row at a time, and a comma-joined bag of labels is worse than the one the
+ * user actually chose.
+ */
+export declare function askUserQuestions(toolInput: unknown): Promise<Record<string, string> | undefined>;
 //# sourceMappingURL=tree.d.ts.map

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":"AAIA,OAAO,EAAuB,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA6B7D;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAe9D;AA0DD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAM1D;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAK3C;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAE/C;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;;OAOG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA+DF,4DAA4D;AAC5D,wBAAgB,kBAAkB,IAAI,iBAAiB,CAItD;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,MAAM,GACZ,IAAI,CAeN;AAkBD,uEAAuE;AACvE,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,MAAM,GACb,IAAI,CAON;AAED,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI,CAK9D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAIpD;AAaD,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,MAAM,CAYR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE;IACjC,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,GAAG,IAAI,CAYP;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAQ7D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAC1B,GAAG,EAAE,MAAM,GACV,IAAI,CAWN;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAQnD;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,KAAK,GAAG,QAAQ,GAAG,IAAI,CAAC,CAkBlC"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/session/tree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAuB,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAKxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AA6B5D;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAe9D;AA0DD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAM1D;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAK3C;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAE/C;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;;OAOG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA+DF,4DAA4D;AAC5D,wBAAgB,kBAAkB,IAAI,iBAAiB,CAItD;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,MAAM,GACZ,IAAI,CAeN;AAkBD,uEAAuE;AACvE,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,MAAM,GACb,IAAI,CAON;AAED,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI,CAK9D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAIpD;AAiBD,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,MAAM,CAYR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE;IACjC,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,GAAG,IAAI,CAYP;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAQ7D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAC1B,GAAG,EAAE,MAAM,GACV,IAAI,CAWN;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAQnD;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,KAAK,GAAG,QAAQ,GAAG,IAAI,CAAC,CAkBlC;AAID;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,CA6B7C"}

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

@@ -1,6 +1,7 @@
 import { isAbsolute, relative } from "node:path";
 import { selectOne } from "@cargo-ai/cdk/cli";
 import { clipToWidth, colors } from "../../runHandler.js";
+import { ASK_USER_QUESTION_TOOL_NAME, readAskUserQuestions, } from "../harness/askUserQuestion.js";
 /**
  * What an assistant turn is marked with, alongside `◇` for a step and `│` for
  * the rail.
@@ -217,6 +218,9 @@ export function showAssistantTurn(body) {
 }
 /** Common tool names arrive lowercase (`bash`); natives keep their case. */
 function toolLabel(toolName) {
+    if (toolName === ASK_USER_QUESTION_TOOL_NAME) {
+        return "Ask user";
+    }
     if (toolName.length === 0) {
         return "tool";
     }
@@ -316,3 +320,37 @@ export async function askToolApproval(approval) {
     });
     return decision === "always" ? "always" : decision === "no" ? "no" : "yes";
 }
+const SKIP_QUESTION = "__skip__";
+/**
+ * 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.
+ *
+ * Multi-select is flattened to one pick: this terminal can only answer one
+ * row at a time, and a comma-joined bag of labels is worse than the one the
+ * user actually chose.
+ */
+export async function askUserQuestions(toolInput) {
+    const questions = readAskUserQuestions(toolInput);
+    if (questions === undefined) {
+        return undefined;
+    }
+    const answers = {};
+    for (const question of questions) {
+        const header = question.header === undefined ? "" : `${question.header}: `;
+        const first = question.options[0];
+        const chosen = await selectOne({
+            message: `${header}${question.question}`,
+            recommended: first === undefined ? undefined : first.label,
+            cancelValue: SKIP_QUESTION,
+            choices: question.options.map((option) => ({
+                value: option.label,
+                label: option.label,
+                hint: option.description,
+            })),
+        });
+        if (chosen !== SKIP_QUESTION) {
+            answers[question.question] = chosen;
+        }
+    }
+    return Object.keys(answers).length === 0 ? undefined : answers;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.95",
+  "version": "1.0.96",
   "private": false,
   "license": "UNLICENSED",
   "homepage": "https://getcargo.ai",