claude-code-rust 0.5.1 → 0.7.0

package/agent-sdk/dist/bridge/tooling.js

@@ -34,6 +34,7 @@ export function normalizeToolKind(name) {
         case "TodoWrite":
             return "other";
         case "Task":
+        case "Agent":
             return "think";
         case "ExitPlanMode":
             return "switch_mode";
@@ -169,16 +170,37 @@ function persistedOutputFirstLine(text) {
     }
     return null;
 }
-export function normalizeToolResultText(value) {
+/**
+ * Replace verbose SDK-internal tool rejection messages with short user-facing text.
+ * The SDK sends these as tool result content meant for Claude, not for the user.
+ */
+const USER_REJECTED_TOOL_USE_EXACT = "The user doesn't want to proceed with this tool use. The tool use was rejected (eg. if it was a file edit, the new_string was NOT written to the file). STOP what you are doing and wait for the user to tell you how to proceed.";
+const USER_REJECTED_TOOL_USE_PREFIX = "The user doesn't want to proceed with this tool use. The tool use was rejected (eg. if it was a file edit, the new_string was NOT written to the file). To tell you how to proceed, the user said:";
+const PERMISSION_DENIED_TOOL_USE_EXACT = "Permission for this tool use was denied. The tool use was rejected (eg. if it was a file edit, the new_string was NOT written to the file). Try a different approach or report the limitation to complete your task.";
+const PERMISSION_DENIED_TOOL_USE_PREFIX = "Permission for this tool use was denied. The tool use was rejected (eg. if it was a file edit, the new_string was NOT written to the file). The user said:";
+function sanitizeSdkRejectionText(text) {
+    const normalized = text.trim();
+    if (normalized === USER_REJECTED_TOOL_USE_EXACT ||
+        normalized.startsWith(USER_REJECTED_TOOL_USE_PREFIX)) {
+        return "Cancelled by user.";
+    }
+    if (normalized === PERMISSION_DENIED_TOOL_USE_EXACT ||
+        normalized.startsWith(PERMISSION_DENIED_TOOL_USE_PREFIX)) {
+        return "Permission denied.";
+    }
+    return text;
+}
+export function normalizeToolResultText(value, isError = false) {
     const text = extractText(value);
     if (!text) {
         return "";
     }
     const persistedLine = persistedOutputFirstLine(text);
-    if (persistedLine) {
-        return persistedLine;
+    const normalized = persistedLine || text;
+    if (!isError) {
+        return normalized;
     }
-    return text;
+    return sanitizeSdkRejectionText(normalized);
 }
 function resolveToolName(toolCall) {
     const meta = asRecordOrNull(toolCall?.meta);
@@ -242,7 +264,7 @@ function writeDiffFromResult(rawContent) {
     return [];
 }
 export function buildToolResultFields(isError, rawContent, base) {
-    const rawOutput = normalizeToolResultText(rawContent);
+    const rawOutput = normalizeToolResultText(rawContent, isError);
     const toolName = resolveToolName(base);
     const fields = {
         status: isError ? "failed" : "completed",

package/agent-sdk/dist/bridge/user_interaction.js

@@ -0,0 +1,175 @@
+import { asRecordOrNull } from "./shared.js";
+import { writeEvent, emitSessionUpdate } from "./events.js";
+import { setToolCallStatus } from "./tool_calls.js";
+export const ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion";
+export const QUESTION_CHOICE_KIND = "question_choice";
+export const EXIT_PLAN_MODE_TOOL_NAME = "ExitPlanMode";
+export const PLAN_APPROVE_KIND = "plan_approve";
+export const PLAN_REJECT_KIND = "plan_reject";
+export async function requestExitPlanModeApproval(session, toolUseId, inputData, baseToolCall) {
+    const options = [
+        {
+            option_id: "approve",
+            name: "Approve",
+            description: "Approve the plan and continue",
+            kind: PLAN_APPROVE_KIND,
+        },
+        {
+            option_id: "reject",
+            name: "Reject",
+            description: "Reject the plan",
+            kind: PLAN_REJECT_KIND,
+        },
+    ];
+    const request = {
+        tool_call: baseToolCall,
+        options,
+    };
+    const outcome = await new Promise((resolve) => {
+        session.pendingPermissions.set(toolUseId, {
+            onOutcome: resolve,
+            toolName: EXIT_PLAN_MODE_TOOL_NAME,
+            inputData,
+        });
+        writeEvent({ event: "permission_request", session_id: session.sessionId, request });
+    });
+    if (outcome.outcome !== "selected" || outcome.option_id === "reject") {
+        setToolCallStatus(session, toolUseId, "failed", "Plan rejected");
+        return { behavior: "deny", message: "Plan rejected", toolUseID: toolUseId };
+    }
+    return { behavior: "allow", updatedInput: inputData, toolUseID: toolUseId };
+}
+export function parseAskUserQuestionPrompts(inputData) {
+    const rawQuestions = Array.isArray(inputData.questions) ? inputData.questions : [];
+    const prompts = [];
+    for (const rawQuestion of rawQuestions) {
+        const questionRecord = asRecordOrNull(rawQuestion);
+        if (!questionRecord) {
+            continue;
+        }
+        const question = typeof questionRecord.question === "string" ? questionRecord.question.trim() : "";
+        if (!question) {
+            continue;
+        }
+        const headerRaw = typeof questionRecord.header === "string" ? questionRecord.header.trim() : "";
+        const header = headerRaw || `Q${prompts.length + 1}`;
+        const multiSelect = Boolean(questionRecord.multiSelect);
+        const rawOptions = Array.isArray(questionRecord.options) ? questionRecord.options : [];
+        const options = [];
+        for (const rawOption of rawOptions) {
+            const optionRecord = asRecordOrNull(rawOption);
+            if (!optionRecord) {
+                continue;
+            }
+            const label = typeof optionRecord.label === "string" ? optionRecord.label.trim() : "";
+            const description = typeof optionRecord.description === "string" ? optionRecord.description.trim() : "";
+            if (!label) {
+                continue;
+            }
+            options.push({ label, description });
+        }
+        if (options.length < 2) {
+            continue;
+        }
+        prompts.push({ question, header, multiSelect, options });
+    }
+    return prompts;
+}
+function askUserQuestionOptions(prompt) {
+    return prompt.options.map((option, index) => ({
+        option_id: `question_${index}`,
+        name: option.label,
+        description: option.description,
+        kind: QUESTION_CHOICE_KIND,
+    }));
+}
+function askUserQuestionPromptToolCall(base, prompt, index, total) {
+    return {
+        ...base,
+        title: prompt.question,
+        raw_input: {
+            questions: [
+                {
+                    question: prompt.question,
+                    header: prompt.header,
+                    multiSelect: prompt.multiSelect,
+                    options: prompt.options,
+                },
+            ],
+            question_index: index,
+            total_questions: total,
+        },
+    };
+}
+function askUserQuestionTranscript(answers) {
+    return answers.map((entry) => `${entry.header}: ${entry.answer}\n  ${entry.question}`).join("\n");
+}
+export async function requestAskUserQuestionAnswers(session, toolUseId, toolName, inputData, baseToolCall) {
+    const prompts = parseAskUserQuestionPrompts(inputData);
+    if (prompts.length === 0) {
+        return { behavior: "allow", updatedInput: inputData, toolUseID: toolUseId };
+    }
+    const answers = {};
+    const transcript = [];
+    for (const [index, prompt] of prompts.entries()) {
+        const promptToolCall = askUserQuestionPromptToolCall(baseToolCall, prompt, index, prompts.length);
+        const fields = {
+            title: promptToolCall.title,
+            status: "in_progress",
+            raw_input: promptToolCall.raw_input,
+        };
+        emitSessionUpdate(session.sessionId, {
+            type: "tool_call_update",
+            tool_call_update: { tool_call_id: toolUseId, fields },
+        });
+        const tracked = session.toolCalls.get(toolUseId);
+        if (tracked) {
+            tracked.title = promptToolCall.title;
+            tracked.status = "in_progress";
+            tracked.raw_input = promptToolCall.raw_input;
+        }
+        const request = {
+            tool_call: promptToolCall,
+            options: askUserQuestionOptions(prompt),
+        };
+        const outcome = await new Promise((resolve) => {
+            session.pendingPermissions.set(toolUseId, {
+                onOutcome: resolve,
+                toolName,
+                inputData,
+            });
+            writeEvent({ event: "permission_request", session_id: session.sessionId, request });
+        });
+        if (outcome.outcome !== "selected") {
+            setToolCallStatus(session, toolUseId, "failed", "Question cancelled");
+            return { behavior: "deny", message: "Question cancelled", toolUseID: toolUseId };
+        }
+        const selected = request.options.find((option) => option.option_id === outcome.option_id);
+        if (!selected) {
+            setToolCallStatus(session, toolUseId, "failed", "Question answer was invalid");
+            return { behavior: "deny", message: "Question answer was invalid", toolUseID: toolUseId };
+        }
+        answers[prompt.question] = selected.name;
+        transcript.push({ header: prompt.header, question: prompt.question, answer: selected.name });
+        const summary = askUserQuestionTranscript(transcript);
+        const progressFields = {
+            status: index + 1 >= prompts.length ? "completed" : "in_progress",
+            raw_output: summary,
+            content: [{ type: "content", content: { type: "text", text: summary } }],
+        };
+        emitSessionUpdate(session.sessionId, {
+            type: "tool_call_update",
+            tool_call_update: { tool_call_id: toolUseId, fields: progressFields },
+        });
+        if (tracked) {
+            tracked.status = progressFields.status ?? tracked.status;
+            tracked.raw_output = summary;
+            tracked.content = progressFields.content ?? tracked.content;
+        }
+    }
+    return {
+        behavior: "allow",
+        updatedInput: { ...inputData, answers },
+        toolUseID: toolUseId,
+    };
+}