wave-code 0.11.3 → 0.11.5

package/dist/acp/agent.d.ts

@@ -20,7 +20,6 @@ export declare class WaveAcpAgent implements AcpAgent {
     cancel(params: CancelNotification): Promise<void>;
     private getAllowAlwaysName;
     private handlePermissionRequest;
-    private getToolContentAsync;
     private getToolContent;
     private getToolLocations;
     private getToolKind;

package/dist/acp/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/acp/agent.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,KAAK,KAAK,IAAI,QAAQ,EACtB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EAUzB,KAAK,qBAAqB,EAC1B,KAAK,6BAA6B,EAClC,KAAK,8BAA8B,EAMpC,MAAM,0BAA0B,CAAC;AAElC,qBAAa,YAAa,YAAW,QAAQ;IAC3C,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,UAAU,CAAsB;gBAE5B,UAAU,EAAE,mBAAmB;IAI3C,OAAO,CAAC,mBAAmB;IAkC3B,OAAO,CAAC,uBAAuB;YAmBjB,gBAAgB;IASxB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAwBzC,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAI5C,WAAW;IAiEnB,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAalE,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAWrE,YAAY,CAChB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,oBAAoB,CAAC;IAuB1B,qBAAqB,CACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAc7B,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAO7B,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D,sBAAsB,CAC1B,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,8BAA8B,CAAC;IAqBpC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;IAyDtD,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IASvD,OAAO,CAAC,kBAAkB;YA2BZ,uBAAuB;YAqKvB,mBAAmB;IA6EjC,OAAO,CAAC,cAAc;IA0BtB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,eAAe;CA+LxB"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/acp/agent.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,KAAK,KAAK,IAAI,QAAQ,EACtB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EAUzB,KAAK,qBAAqB,EAC1B,KAAK,6BAA6B,EAClC,KAAK,8BAA8B,EAMpC,MAAM,0BAA0B,CAAC;AAElC,qBAAa,YAAa,YAAW,QAAQ;IAC3C,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,UAAU,CAAsB;gBAE5B,UAAU,EAAE,mBAAmB;IAI3C,OAAO,CAAC,mBAAmB;IAkC3B,OAAO,CAAC,uBAAuB;YAmBjB,gBAAgB;IASxB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAwBzC,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAI5C,WAAW;IAiEnB,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAalE,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAWrE,YAAY,CAChB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,oBAAoB,CAAC;IAuB1B,qBAAqB,CACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAc7B,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAO7B,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D,sBAAsB,CAC1B,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,8BAA8B,CAAC;IAqBpC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;IAyDtD,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IASvD,OAAO,CAAC,kBAAkB;YA2BZ,uBAAuB;IA8KrC,OAAO,CAAC,cAAc;IA8FtB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,eAAe;CAmMxB"}

package/dist/acp/agent.js

@@ -1,6 +1,4 @@
-import { Agent as WaveAgent, listSessions as listWaveSessions, listAllSessions as listAllWaveSessions, deleteSession as deleteWaveSession, truncateContent, BASH_TOOL_NAME, EDIT_TOOL_NAME, WRITE_TOOL_NAME, EXIT_PLAN_MODE_TOOL_NAME, } from "wave-agent-sdk";
-import * as fs from "node:fs/promises";
-import * as path from "node:path";
+import { Agent as WaveAgent, listSessions as listWaveSessions, listAllSessions as listAllWaveSessions, deleteSession as deleteWaveSession, truncateContent, BASH_TOOL_NAME, EDIT_TOOL_NAME, WRITE_TOOL_NAME, EXIT_PLAN_MODE_TOOL_NAME, ASK_USER_QUESTION_TOOL_NAME, } from "wave-agent-sdk";
 import { logger } from "../utils/logger.js";
 import { AGENT_METHODS, } from "@agentclientprotocol/sdk";
 export class WaveAcpAgent {
@@ -304,7 +302,6 @@ export class WaveAcpAgent {
     async handlePermissionRequest(sessionId, context) {
         logger.info(`Handling permission request for ${context.toolName} in session ${sessionId}`);
         const agent = this.agents.get(sessionId);
-        const workdir = agent?.workingDirectory || process.cwd();
         const toolCallId = context.toolCallId ||
             "perm-" + Math.random().toString(36).substring(2, 9);
         let effectiveName = context.toolName;
@@ -369,8 +366,11 @@ export class WaveAcpAgent {
                 },
             ];
         }
+        else if (context.toolName === ASK_USER_QUESTION_TOOL_NAME) {
+            options = [];
+        }
         const content = context.toolName
-            ? await this.getToolContentAsync(context.toolName, context.toolInput, workdir)
+            ? this.getToolContent(context.toolName, context.toolInput, undefined, context.planContent)
             : undefined;
         const locations = context.toolName
             ? this.getToolLocations(context.toolName, context.toolInput)
@@ -395,6 +395,12 @@ export class WaveAcpAgent {
             if (response.outcome.outcome === "cancelled") {
                 return { behavior: "deny", message: "Cancelled by user" };
             }
+            if (context.toolName === ASK_USER_QUESTION_TOOL_NAME) {
+                return {
+                    behavior: "allow",
+                    message: response.message,
+                };
+            }
             const selectedOptionId = response.outcome.optionId;
             logger.info(`User selected permission option: ${selectedOptionId}`);
             switch (selectedOptionId) {
@@ -438,96 +444,81 @@ export class WaveAcpAgent {
             };
         }
     }
-    async getToolContentAsync(name, parameters, workdir) {
-        if (!parameters)
-            return undefined;
-        if (name === "Write") {
-            let oldText = null;
-            try {
-                const filePath = (parameters.file_path ||
-                    parameters.filePath);
-                const fullPath = path.isAbsolute(filePath)
-                    ? filePath
-                    : path.join(workdir, filePath);
-                oldText = await fs.readFile(fullPath, "utf-8");
-            }
-            catch {
-                // File might not exist, which is fine for Write
-            }
-            return [
-                {
-                    type: "diff",
-                    path: (parameters.file_path || parameters.filePath),
-                    oldText,
-                    newText: parameters.content,
-                },
-            ];
-        }
-        if (name === "Edit") {
-            let oldText = null;
-            let newText = null;
-            try {
-                const filePath = (parameters.file_path ||
-                    parameters.filePath);
-                const fullPath = path.isAbsolute(filePath)
-                    ? filePath
-                    : path.join(workdir, filePath);
-                oldText = await fs.readFile(fullPath, "utf-8");
-                if (oldText) {
-                    if (parameters.replace_all) {
-                        newText = oldText
-                            .split(parameters.old_string)
-                            .join(parameters.new_string);
-                    }
-                    else {
-                        newText = oldText.replace(parameters.old_string, parameters.new_string);
-                    }
-                }
-            }
-            catch {
-                logger.error("Failed to read file for Edit diff");
-            }
-            if (oldText && newText) {
-                return [
-                    {
-                        type: "diff",
-                        path: (parameters.file_path || parameters.filePath),
-                        oldText,
-                        newText,
-                    },
-                ];
-            }
-            // Fallback to snippets if file reading fails
-            return [
-                {
-                    type: "diff",
-                    path: (parameters.file_path || parameters.filePath),
-                    oldText: parameters.old_string,
-                    newText: parameters.new_string,
-                },
-            ];
-        }
-        return this.getToolContent(name, parameters);
-    }
-    getToolContent(name, parameters) {
+    getToolContent(name, parameters, shortResult, planContent) {
         const contents = [];
         if (parameters) {
-            if (name === "Write") {
+            if (name === WRITE_TOOL_NAME &&
+                typeof parameters.file_path === "string" &&
+                typeof parameters.content === "string") {
                 contents.push({
                     type: "diff",
-                    path: (parameters.file_path || parameters.filePath),
+                    path: parameters.file_path,
                     oldText: null,
                     newText: parameters.content,
                 });
             }
-            else if (name === "Edit") {
+            else if (name === EDIT_TOOL_NAME &&
+                typeof parameters.file_path === "string" &&
+                typeof parameters.old_string === "string" &&
+                typeof parameters.new_string === "string") {
                 contents.push({
                     type: "diff",
-                    path: (parameters.file_path || parameters.filePath),
+                    path: parameters.file_path,
                     oldText: parameters.old_string,
                     newText: parameters.new_string,
                 });
             }
+            else if (name === BASH_TOOL_NAME &&
+                typeof parameters.command === "string") {
+                contents.push({
+                    type: "content",
+                    content: {
+                        type: "text",
+                        text: "**Command:**\n```bash\n" + parameters.command + "\n```",
+                    },
+                });
+            }
+            else if (name === EXIT_PLAN_MODE_TOOL_NAME && planContent) {
+                contents.push({
+                    type: "content",
+                    content: {
+                        type: "text",
+                        text: planContent,
+                    },
+                });
+            }
+            else if (name === ASK_USER_QUESTION_TOOL_NAME &&
+                Array.isArray(parameters.questions)) {
+                const markdown = parameters.questions
+                    .map((q, i) => {
+                    let text = `### Question ${i + 1}\n${q.question}\n`;
+                    if (Array.isArray(q.options)) {
+                        text += q.options
+                            .map((opt) => `- ${opt.label}${opt.description ? `: ${opt.description}` : ""}`)
+                            .join("\n");
+                    }
+                    return text;
+                })
+                    .join("\n\n");
+                contents.push({
+                    type: "content",
+                    content: {
+                        type: "text",
+                        text: markdown,
+                    },
+                });
+            }
+        }
+        if (shortResult) {
+            contents.push({
+                type: "content",
+                content: {
+                    type: "text",
+                    text: name === BASH_TOOL_NAME
+                        ? "```\n" + shortResult + "\n```"
+                        : shortResult,
+                },
+            });
         }
         return contents.length > 0 ? contents : undefined;
     }
@@ -640,7 +631,7 @@ export class WaveAcpAgent {
                     }
                 }
                 const content = effectiveName && (parsedParameters || effectiveShortResult)
-                    ? this.getToolContent(effectiveName, parsedParameters)
+                    ? this.getToolContent(effectiveName, parsedParameters, effectiveShortResult)
                     : undefined;
                 const locations = effectiveName && parsedParameters
                     ? this.getToolLocations(effectiveName, parsedParameters, effectiveStartLineNumber)

package/dist/components/ChatInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatInterface.d.ts","sourceRoot":"","sources":["../../src/components/ChatInterface.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAatE,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAyKjC,CAAC"}
+{"version":3,"file":"ChatInterface.d.ts","sourceRoot":"","sources":["../../src/components/ChatInterface.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAatE,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EA0KjC,CAAC"}

package/dist/components/ChatInterface.js

@@ -77,5 +77,5 @@ export const ChatInterface = () => {
         return null;
     return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { messages: displayMessages, isExpanded: isExpanded, forceStatic: isConfirmationVisible && isConfirmationTooTall, version: version, workdir: workdir, model: model, onDynamicBlocksHeightMeasured: handleDynamicBlocksHeightMeasured }), (isLoading || isCommandRunning || isCompressing) &&
                 !isConfirmationVisible &&
-                !isExpanded && (_jsx(LoadingIndicator, { isLoading: isLoading, isCommandRunning: isCommandRunning, isCompressing: isCompressing, latestTotalTokens: latestTotalTokens })), !isConfirmationVisible && !isExpanded && _jsx(TaskList, {}), isConfirmationVisible && (_jsxs(_Fragment, { children: [_jsx(ConfirmationDetails, { toolName: confirmingTool.name, toolInput: confirmingTool.input, isExpanded: isExpanded, onHeightMeasured: handleDetailsHeightMeasured, isStatic: isConfirmationTooTall }), _jsx(ConfirmationSelector, { toolName: confirmingTool.name, toolInput: confirmingTool.input, suggestedPrefix: confirmingTool.suggestedPrefix, hidePersistentOption: confirmingTool.hidePersistentOption, isExpanded: isExpanded, onDecision: wrappedHandleConfirmationDecision, onCancel: handleConfirmationCancel, onAbort: abortMessage, onHeightMeasured: handleSelectorHeightMeasured })] })), !isConfirmationVisible && !isExpanded && (_jsxs(_Fragment, { children: [_jsx(QueuedMessageList, {}), _jsx(InputBox, { isLoading: isLoading, isCommandRunning: isCommandRunning, sendMessage: sendMessage, abortMessage: abortMessage, mcpServers: mcpServers, connectMcpServer: connectMcpServer, disconnectMcpServer: disconnectMcpServer, slashCommands: slashCommands, hasSlashCommand: hasSlashCommand })] }))] }));
+                !isExpanded && (_jsx(LoadingIndicator, { isLoading: isLoading, isCommandRunning: isCommandRunning, isCompressing: isCompressing, latestTotalTokens: latestTotalTokens })), !isConfirmationVisible && !isExpanded && _jsx(TaskList, {}), isConfirmationVisible && (_jsxs(_Fragment, { children: [_jsx(ConfirmationDetails, { toolName: confirmingTool.name, toolInput: confirmingTool.input, planContent: confirmingTool.planContent, isExpanded: isExpanded, onHeightMeasured: handleDetailsHeightMeasured, isStatic: isConfirmationTooTall }), _jsx(ConfirmationSelector, { toolName: confirmingTool.name, toolInput: confirmingTool.input, suggestedPrefix: confirmingTool.suggestedPrefix, hidePersistentOption: confirmingTool.hidePersistentOption, isExpanded: isExpanded, onDecision: wrappedHandleConfirmationDecision, onCancel: handleConfirmationCancel, onAbort: abortMessage, onHeightMeasured: handleSelectorHeightMeasured })] })), !isConfirmationVisible && !isExpanded && (_jsxs(_Fragment, { children: [_jsx(QueuedMessageList, {}), _jsx(InputBox, { isLoading: isLoading, isCommandRunning: isCommandRunning, sendMessage: sendMessage, abortMessage: abortMessage, mcpServers: mcpServers, connectMcpServer: connectMcpServer, disconnectMcpServer: disconnectMcpServer, slashCommands: slashCommands, hasSlashCommand: hasSlashCommand })] }))] }));
 };

package/dist/components/ConfirmationDetails.d.ts

@@ -2,6 +2,7 @@ import React from "react";
 export interface ConfirmationDetailsProps {
     toolName: string;
     toolInput?: Record<string, unknown>;
+    planContent?: string;
     isExpanded?: boolean;
     onHeightMeasured?: (height: number) => void;
     isStatic?: boolean;

package/dist/components/ConfirmationDetails.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConfirmationDetails.d.ts","sourceRoot":"","sources":["../../src/components/ConfirmationDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAqCvD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CA8DlE,CAAC"}
+{"version":3,"file":"ConfirmationDetails.d.ts","sourceRoot":"","sources":["../../src/components/ConfirmationDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAqCvD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CA4DlE,CAAC"}

package/dist/components/ConfirmationDetails.js

@@ -24,7 +24,7 @@ const getActionDescription = (toolName, toolInput) => {
             return "Execute operation";
     }
 };
-export const ConfirmationDetails = ({ toolName, toolInput, isExpanded = false, onHeightMeasured, isStatic = false, }) => {
+export const ConfirmationDetails = ({ toolName, toolInput, planContent, isExpanded = false, onHeightMeasured, isStatic = false, }) => {
     const { stdout } = useStdout();
     const boxRef = useRef(null);
     const startLineNumber = toolInput?.startLineNumber ??
@@ -37,7 +37,7 @@ export const ConfirmationDetails = ({ toolName, toolInput, isExpanded = false, o
     }, [stdout?.rows, onHeightMeasured, toolInput, isExpanded]);
     const content = (_jsxs(Box, { ref: boxRef, flexDirection: "column", borderStyle: "single", borderColor: "yellow", borderBottom: false, borderLeft: false, borderRight: false, children: [_jsxs(Text, { color: "yellow", bold: true, children: ["Tool: ", toolName] }), _jsx(Text, { color: "yellow", children: getActionDescription(toolName, toolInput) }), _jsx(DiffDisplay, { toolName: toolName, parameters: JSON.stringify(toolInput), startLineNumber: startLineNumber }), toolName !== ASK_USER_QUESTION_TOOL_NAME &&
                 toolName === EXIT_PLAN_MODE_TOOL_NAME &&
-                !!toolInput?.plan_content && (_jsx(PlanDisplay, { plan: toolInput.plan_content, isExpanded: isExpanded }))] }));
+                !!planContent && (_jsx(PlanDisplay, { plan: planContent, isExpanded: isExpanded }))] }));
     if (isStatic) {
         return (_jsx(Static, { items: [1], children: (item) => _jsx(React.Fragment, { children: content }, item) }));
     }

package/dist/contexts/useChat.d.ts

@@ -48,8 +48,9 @@ export interface ChatContextType {
         input?: Record<string, unknown>;
         suggestedPrefix?: string;
         hidePersistentOption?: boolean;
+        planContent?: string;
     };
-    showConfirmation: (toolName: string, toolInput?: Record<string, unknown>, suggestedPrefix?: string, hidePersistentOption?: boolean) => Promise<PermissionDecision>;
+    showConfirmation: (toolName: string, toolInput?: Record<string, unknown>, suggestedPrefix?: string, hidePersistentOption?: boolean, planContent?: string) => Promise<PermissionDecision>;
     hideConfirmation: () => void;
     handleConfirmationDecision: (decision: PermissionDecision) => void;
     handleConfirmationCancel: () => void;

package/dist/contexts/useChat.d.ts.map

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

package/dist/contexts/useChat.js

@@ -68,13 +68,14 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
         }, 100);
     }, [setTasks]);
     // Permission confirmation methods with queue support
-    const showConfirmation = useCallback(async (toolName, toolInput, suggestedPrefix, hidePersistentOption) => {
+    const showConfirmation = useCallback(async (toolName, toolInput, suggestedPrefix, hidePersistentOption, planContent) => {
         return new Promise((resolve, reject) => {
             const queueItem = {
                 toolName,
                 toolInput,
                 suggestedPrefix,
                 hidePersistentOption,
+                planContent,
                 resolver: resolve,
                 reject,
             };
@@ -132,7 +133,7 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
                     ? undefined
                     : async (context) => {
                         try {
-                            return await showConfirmation(context.toolName, context.toolInput, context.suggestedPrefix, context.hidePersistentOption);
+                            return await showConfirmation(context.toolName, context.toolInput, context.suggestedPrefix, context.hidePersistentOption, context.planContent);
                         }
                         catch {
                             // If confirmation was cancelled or failed, deny the operation
@@ -323,6 +324,7 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
                 input: next.toolInput,
                 suggestedPrefix: next.suggestedPrefix,
                 hidePersistentOption: next.hidePersistentOption,
+                planContent: next.planContent,
             });
             setIsConfirmationVisible(true);
             setConfirmationQueue((prev) => prev.slice(1));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@agentclientprotocol/sdk": "0.17.0",
+    "@agentclientprotocol/sdk": "0.17.1",
     "chalk": "^5.6.2",
     "diff": "^8.0.2",
     "glob": "^13.0.0",
@@ -41,7 +41,7 @@
     "react-dom": "19.2.4",
     "yargs": "^17.7.2",
     "zod": "^3.23.8",
-    "wave-agent-sdk": "0.11.3"
+    "wave-agent-sdk": "0.11.5"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/acp/agent.ts

@@ -13,9 +13,10 @@ import {
   EDIT_TOOL_NAME,
   WRITE_TOOL_NAME,
   EXIT_PLAN_MODE_TOOL_NAME,
+  ASK_USER_QUESTION_TOOL_NAME,
+  AskUserQuestion,
+  AskUserQuestionOption,
 } from "wave-agent-sdk";
-import * as fs from "node:fs/promises";
-import * as path from "node:path";
 import { logger } from "../utils/logger.js";
 import {
   type Agent as AcpAgent,
@@ -427,7 +428,6 @@ export class WaveAcpAgent implements AcpAgent {
     );
 
     const agent = this.agents.get(sessionId);
-    const workdir = agent?.workingDirectory || process.cwd();
 
     const toolCallId =
       context.toolCallId ||
@@ -502,13 +502,16 @@ export class WaveAcpAgent implements AcpAgent {
           kind: "allow_always",
         },
       ];
+    } else if (context.toolName === ASK_USER_QUESTION_TOOL_NAME) {
+      options = [];
     }
 
     const content = context.toolName
-      ? await this.getToolContentAsync(
+      ? this.getToolContent(
           context.toolName,
           context.toolInput,
-          workdir,
+          undefined,
+          context.planContent,
         )
       : undefined;
     const locations = context.toolName
@@ -537,6 +540,13 @@ export class WaveAcpAgent implements AcpAgent {
         return { behavior: "deny", message: "Cancelled by user" };
       }
 
+      if (context.toolName === ASK_USER_QUESTION_TOOL_NAME) {
+        return {
+          behavior: "allow",
+          message: (response as unknown as { message?: string }).message,
+        };
+      }
+
       const selectedOptionId = response.outcome.optionId;
       logger.info(`User selected permission option: ${selectedOptionId}`);
 
@@ -583,106 +593,97 @@ export class WaveAcpAgent implements AcpAgent {
     }
   }
 
-  private async getToolContentAsync(
-    name: string,
-    parameters: Record<string, unknown> | undefined,
-    workdir: string,
-  ): Promise<ToolCallContent[] | undefined> {
-    if (!parameters) return undefined;
-    if (name === "Write") {
-      let oldText: string | null = null;
-      try {
-        const filePath = (parameters.file_path ||
-          parameters.filePath) as string;
-        const fullPath = path.isAbsolute(filePath)
-          ? filePath
-          : path.join(workdir, filePath);
-        oldText = await fs.readFile(fullPath, "utf-8");
-      } catch {
-        // File might not exist, which is fine for Write
-      }
-      return [
-        {
-          type: "diff",
-          path: (parameters.file_path || parameters.filePath) as string,
-          oldText,
-          newText: parameters.content as string,
-        },
-      ];
-    }
-    if (name === "Edit") {
-      let oldText: string | null = null;
-      let newText: string | null = null;
-      try {
-        const filePath = (parameters.file_path ||
-          parameters.filePath) as string;
-        const fullPath = path.isAbsolute(filePath)
-          ? filePath
-          : path.join(workdir, filePath);
-        oldText = await fs.readFile(fullPath, "utf-8");
-        if (oldText) {
-          if (parameters.replace_all) {
-            newText = oldText
-              .split(parameters.old_string as string)
-              .join(parameters.new_string as string);
-          } else {
-            newText = oldText.replace(
-              parameters.old_string as string,
-              parameters.new_string as string,
-            );
-          }
-        }
-      } catch {
-        logger.error("Failed to read file for Edit diff");
-      }
-
-      if (oldText && newText) {
-        return [
-          {
-            type: "diff",
-            path: (parameters.file_path || parameters.filePath) as string,
-            oldText,
-            newText,
-          },
-        ];
-      }
-
-      // Fallback to snippets if file reading fails
-      return [
-        {
-          type: "diff",
-          path: (parameters.file_path || parameters.filePath) as string,
-          oldText: parameters.old_string as string,
-          newText: parameters.new_string as string,
-        },
-      ];
-    }
-    return this.getToolContent(name, parameters);
-  }
-
   private getToolContent(
     name: string,
     parameters: Record<string, unknown> | undefined,
+    shortResult: string | undefined,
+    planContent?: string,
   ): ToolCallContent[] | undefined {
     const contents: ToolCallContent[] = [];
     if (parameters) {
-      if (name === "Write") {
+      if (
+        name === WRITE_TOOL_NAME &&
+        typeof parameters.file_path === "string" &&
+        typeof parameters.content === "string"
+      ) {
         contents.push({
           type: "diff",
-          path: (parameters.file_path || parameters.filePath) as string,
+          path: parameters.file_path,
           oldText: null,
-          newText: parameters.content as string,
+          newText: parameters.content,
         });
-      } else if (name === "Edit") {
+      } else if (
+        name === EDIT_TOOL_NAME &&
+        typeof parameters.file_path === "string" &&
+        typeof parameters.old_string === "string" &&
+        typeof parameters.new_string === "string"
+      ) {
         contents.push({
           type: "diff",
-          path: (parameters.file_path || parameters.filePath) as string,
-          oldText: parameters.old_string as string,
-          newText: parameters.new_string as string,
+          path: parameters.file_path,
+          oldText: parameters.old_string,
+          newText: parameters.new_string,
+        });
+      } else if (
+        name === BASH_TOOL_NAME &&
+        typeof parameters.command === "string"
+      ) {
+        contents.push({
+          type: "content",
+          content: {
+            type: "text",
+            text: "**Command:**\n```bash\n" + parameters.command + "\n```",
+          },
+        });
+      } else if (name === EXIT_PLAN_MODE_TOOL_NAME && planContent) {
+        contents.push({
+          type: "content",
+          content: {
+            type: "text",
+            text: planContent,
+          },
+        });
+      } else if (
+        name === ASK_USER_QUESTION_TOOL_NAME &&
+        Array.isArray(parameters.questions)
+      ) {
+        const markdown = (parameters.questions as AskUserQuestion[])
+          .map((q, i) => {
+            let text = `### Question ${i + 1}\n${q.question}\n`;
+            if (Array.isArray(q.options)) {
+              text += q.options
+                .map(
+                  (opt: AskUserQuestionOption) =>
+                    `- ${opt.label}${opt.description ? `: ${opt.description}` : ""}`,
+                )
+                .join("\n");
+            }
+            return text;
+          })
+          .join("\n\n");
+        contents.push({
+          type: "content",
+          content: {
+            type: "text",
+            text: markdown,
+          },
         });
       }
     }
 
+    if (shortResult) {
+      contents.push({
+        type: "content",
+        content: {
+          type: "text",
+          text:
+            name === BASH_TOOL_NAME
+              ? "```\n" + shortResult + "\n```"
+              : shortResult,
+        },
+      });
+    }
+
     return contents.length > 0 ? contents : undefined;
   }
 
@@ -828,7 +829,11 @@ export class WaveAcpAgent implements AcpAgent {
 
         const content =
           effectiveName && (parsedParameters || effectiveShortResult)
-            ? this.getToolContent(effectiveName, parsedParameters)
+            ? this.getToolContent(
+                effectiveName,
+                parsedParameters,
+                effectiveShortResult,
+              )
             : undefined;
         const locations =
           effectiveName && parsedParameters

package/src/components/ChatInterface.tsx

@@ -144,6 +144,7 @@ export const ChatInterface: React.FC = () => {
           <ConfirmationDetails
             toolName={confirmingTool!.name}
             toolInput={confirmingTool!.input}
+            planContent={confirmingTool!.planContent}
             isExpanded={isExpanded}
             onHeightMeasured={handleDetailsHeightMeasured}
             isStatic={isConfirmationTooTall}

package/src/components/ConfirmationDetails.tsx

@@ -38,6 +38,7 @@ const getActionDescription = (
 export interface ConfirmationDetailsProps {
   toolName: string;
   toolInput?: Record<string, unknown>;
+  planContent?: string;
   isExpanded?: boolean;
   onHeightMeasured?: (height: number) => void;
   isStatic?: boolean;
@@ -46,6 +47,7 @@ export interface ConfirmationDetailsProps {
 export const ConfirmationDetails: React.FC<ConfirmationDetailsProps> = ({
   toolName,
   toolInput,
+  planContent,
   isExpanded = false,
   onHeightMeasured,
   isStatic = false,
@@ -87,11 +89,8 @@ export const ConfirmationDetails: React.FC<ConfirmationDetailsProps> = ({
 
       {toolName !== ASK_USER_QUESTION_TOOL_NAME &&
         toolName === EXIT_PLAN_MODE_TOOL_NAME &&
-        !!toolInput?.plan_content && (
-          <PlanDisplay
-            plan={toolInput.plan_content as string}
-            isExpanded={isExpanded}
-          />
+        !!planContent && (
+          <PlanDisplay plan={planContent} isExpanded={isExpanded} />
         )}
     </Box>
   );

package/src/contexts/useChat.tsx

@@ -84,12 +84,14 @@ export interface ChatContextType {
     input?: Record<string, unknown>;
     suggestedPrefix?: string;
     hidePersistentOption?: boolean;
+    planContent?: string;
   };
   showConfirmation: (
     toolName: string,
     toolInput?: Record<string, unknown>,
     suggestedPrefix?: string,
     hidePersistentOption?: boolean,
+    planContent?: string,
   ) => Promise<PermissionDecision>;
   hideConfirmation: () => void;
   handleConfirmationDecision: (decision: PermissionDecision) => void;
@@ -202,6 +204,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
         input?: Record<string, unknown>;
         suggestedPrefix?: string;
         hidePersistentOption?: boolean;
+        planContent?: string;
       }
     | undefined
   >();
@@ -211,6 +214,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
       toolInput?: Record<string, unknown>;
       suggestedPrefix?: string;
       hidePersistentOption?: boolean;
+      planContent?: string;
       resolver: (decision: PermissionDecision) => void;
       reject: () => void;
     }>
@@ -220,6 +224,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     toolInput?: Record<string, unknown>;
     suggestedPrefix?: string;
     hidePersistentOption?: boolean;
+    planContent?: string;
     resolver: (decision: PermissionDecision) => void;
     reject: () => void;
   } | null>(null);
@@ -256,6 +261,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
       toolInput?: Record<string, unknown>,
       suggestedPrefix?: string,
       hidePersistentOption?: boolean,
+      planContent?: string,
     ): Promise<PermissionDecision> => {
       return new Promise<PermissionDecision>((resolve, reject) => {
         const queueItem = {
@@ -263,6 +269,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
           toolInput,
           suggestedPrefix,
           hidePersistentOption,
+          planContent,
           resolver: resolve,
           reject,
         };
@@ -335,6 +342,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
                   context.toolInput,
                   context.suggestedPrefix,
                   context.hidePersistentOption,
+                  context.planContent,
                 );
               } catch {
                 // If confirmation was cancelled or failed, deny the operation
@@ -554,6 +562,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
         input: next.toolInput,
         suggestedPrefix: next.suggestedPrefix,
         hidePersistentOption: next.hidePersistentOption,
+        planContent: next.planContent,
       });
       setIsConfirmationVisible(true);
       setConfirmationQueue((prev) => prev.slice(1));