wave-code 0.17.5 → 0.17.7

package/dist/acp/agent.d.ts

@@ -2,6 +2,7 @@ import { type Agent as AcpAgent, type AgentSideConnection, type InitializeRespon
 export declare class WaveAcpAgent implements AcpAgent {
     private agents;
     private connection;
+    private taskCache;
     constructor(connection: AgentSideConnection);
     private getSessionModeState;
     private getSessionConfigOptions;
@@ -19,6 +20,8 @@ export declare class WaveAcpAgent implements AcpAgent {
     prompt(params: PromptRequest): Promise<PromptResponse>;
     cancel(params: CancelNotification): Promise<void>;
     private getAllowAlwaysName;
+    private handleAskQuestion;
+    private handleCreatePlan;
     private handlePermissionRequest;
     private getToolContent;
     private getToolLocations;

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

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/acp/agent.ts"],"names":[],"mappings":"AAyBA,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,EAOpC,MAAM,0BAA0B,CAAC;AAGlC,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;YAmCjB,gBAAgB;IASxB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyBzC,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAI5C,WAAW;IA2EnB,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAalE,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAcrE,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;IAuBpC,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;IA8LrC,OAAO,CAAC,cAAc;IA6FtB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,WAAW;YAmBL,yBAAyB;IAiIvC,OAAO,CAAC,eAAe;CAyOxB"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/acp/agent.ts"],"names":[],"mappings":"AAyBA,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,EAOpC,MAAM,0BAA0B,CAAC;AAwBlC,qBAAa,YAAa,YAAW,QAAQ;IAC3C,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,SAAS,CAA6B;gBAElC,UAAU,EAAE,mBAAmB;IAI3C,OAAO,CAAC,mBAAmB;IAkC3B,OAAO,CAAC,uBAAuB;YAmCjB,gBAAgB;IASxB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyBzC,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAI5C,WAAW;IA8EnB,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAalE,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAcrE,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;IAuBpC,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,iBAAiB;YAsEjB,gBAAgB;YAyDhB,uBAAuB;IAmNrC,OAAO,CAAC,cAAc;IA6FtB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,WAAW;YAmBL,yBAAyB;IAoIvC,OAAO,CAAC,eAAe;CAkRxB"}

package/dist/acp/agent.js

@@ -4,6 +4,7 @@ import { AGENT_METHODS, } from "@agentclientprotocol/sdk";
 export class WaveAcpAgent {
     constructor(connection) {
         this.agents = new Map();
+        this.taskCache = new Map();
         this.connection = connection;
     }
     getSessionModeState(agent) {
@@ -133,13 +134,15 @@ export class WaveAcpAgent {
                 onModelChange: (model) => callbacks.onModelChange?.(model),
                 onUserMessageAdded: (params) => callbacks.onUserMessageAdded?.(params),
                 onMcpServersChange: (servers) => callbacks.onMcpServersChange?.(servers),
+                onSessionIdChange: (newSessionId) => callbacks.onSessionIdChange?.(newSessionId),
             },
         });
         agentRef.instance = agent;
         const actualSessionId = agent.sessionId;
         this.agents.set(actualSessionId, agent);
         // Update the callbacks object with the correct sessionId
-        Object.assign(callbacks, this.createCallbacks(actualSessionId));
+        const { callbacks: cb } = this.createCallbacks(actualSessionId);
+        Object.assign(callbacks, cb);
         // Send initial available commands after agent creation
         // Use setImmediate to ensure the client receives the session response before the update
         setImmediate(() => {
@@ -327,6 +330,87 @@ export class WaveAcpAgent {
         }
         return "Allow Always";
     }
+    async handleAskQuestion(sessionId, toolCallId, context) {
+        try {
+            const questions = context.toolInput?.questions || [];
+            const request = {
+                toolCallId,
+                title: questions.length === 1 ? questions[0].header : undefined,
+                questions: questions.map((q, qi) => ({
+                    id: `q${qi}`,
+                    prompt: q.question,
+                    options: q.options.map((opt, oi) => ({
+                        id: String(oi),
+                        label: opt.label,
+                        description: opt.description,
+                    })),
+                    allowMultiple: q.multiSelect,
+                })),
+            };
+            const response = await this.connection.extMethod("wave/ask_question", request);
+            const outcome = response.outcome;
+            if (outcome === "cancelled") {
+                return { behavior: "deny", message: "Cancelled by user" };
+            }
+            // outcome === "answered"
+            const answers = response.answers || [];
+            const answerMap = {};
+            for (const answer of answers) {
+                const qIndex = parseInt(answer.questionId.replace("q", ""), 10);
+                const question = questions[qIndex];
+                if (!question)
+                    continue;
+                const selectedLabels = answer.selectedOptionIds
+                    .map((id) => question.options[parseInt(id, 10)]?.label)
+                    .filter(Boolean);
+                answerMap[question.question] = selectedLabels.join(", ");
+            }
+            return { behavior: "allow", message: JSON.stringify(answerMap) };
+        }
+        catch (error) {
+            logger.warn("wave/ask_question extMethod failed, falling back to requestPermission", { error });
+            return null;
+        }
+    }
+    async handleCreatePlan(sessionId, toolCallId, context) {
+        try {
+            const cachedTasks = this.taskCache.get(sessionId) || [];
+            const request = {
+                toolCallId,
+                plan: context.planContent || "",
+                todos: cachedTasks
+                    .filter((t) => t.status !== "deleted")
+                    .map((t) => ({
+                    id: t.id,
+                    content: t.subject,
+                    status: t.status === "completed"
+                        ? "completed"
+                        : t.status === "in_progress"
+                            ? "in_progress"
+                            : "pending",
+                })),
+            };
+            const response = await this.connection.extMethod("wave/create_plan", request);
+            const outcome = response.outcome;
+            if (outcome === "accepted") {
+                const mode = response.mode;
+                return {
+                    behavior: "allow",
+                    newPermissionMode: (mode || "default"),
+                };
+            }
+            if (outcome === "rejected") {
+                const reason = response.reason;
+                return { behavior: "deny", message: reason || "Plan rejected" };
+            }
+            // cancelled or unknown outcome
+            return { behavior: "deny", message: "Cancelled by user" };
+        }
+        catch (error) {
+            logger.warn("wave/create_plan extMethod failed, falling back to requestPermission", { error });
+            return null;
+        }
+    }
     async handlePermissionRequest(sessionId, context) {
         logger.info(`Handling permission request for ${context.toolName} in session ${sessionId}`);
         const agent = this.agents.get(sessionId);
@@ -420,6 +504,19 @@ export class WaveAcpAgent {
         const kind = context.toolName
             ? this.getToolKind(context.toolName)
             : undefined;
+        // Try extension methods first, fall back to requestPermission
+        if (context.toolName === ASK_USER_QUESTION_TOOL_NAME) {
+            const extResult = await this.handleAskQuestion(sessionId, toolCallId, context);
+            if (extResult !== null)
+                return extResult;
+            // Fall through to existing requestPermission logic
+        }
+        if (context.toolName === EXIT_PLAN_MODE_TOOL_NAME) {
+            const extResult = await this.handleCreatePlan(sessionId, toolCallId, context);
+            if (extResult !== null)
+                return extResult;
+            // Fall through to existing requestPermission logic
+        }
         try {
             const response = await this.connection.requestPermission({
                 sessionId: sessionId,
@@ -612,15 +709,7 @@ export class WaveAcpAgent {
     }
     async replayConversationHistory(agent) {
         const sessionId = agent.sessionId;
-        let history;
-        try {
-            const thread = await agent.getFullMessageThread();
-            history = thread.messages;
-        }
-        catch {
-            // Fallback to in-memory messages if full thread fails
-            history = agent.messages;
-        }
+        const history = agent.messages;
         for (const message of history) {
             if (message.isMeta)
                 continue;
@@ -719,202 +808,248 @@ export class WaveAcpAgent {
                         },
                     });
                 }
-                // Skip: image, bang, compact, error, file_history, task_notification blocks
+                else if (block.type === "compact") {
+                    const compactBlock = block;
+                    this.connection.sessionUpdate({
+                        sessionId,
+                        update: {
+                            sessionUpdate: "agent_message_chunk",
+                            content: { type: "text", text: compactBlock.content },
+                            messageId,
+                        },
+                    });
+                }
+                // Skip: image, bang, error, file_history, task_notification blocks
             }
         }
     }
     createCallbacks(sessionId) {
-        const getAgent = () => this.agents.get(sessionId);
+        const sessionRef = { id: sessionId };
+        const getAgent = () => this.agents.get(sessionRef.id);
         const toolStates = new Map();
         return {
-            onAssistantContentUpdated: (chunk) => {
-                this.connection.sessionUpdate({
-                    sessionId: sessionId,
-                    update: {
-                        sessionUpdate: "agent_message_chunk",
-                        content: {
-                            type: "text",
-                            text: chunk,
+            callbacks: {
+                onAssistantContentUpdated: (chunk) => {
+                    this.connection.sessionUpdate({
+                        sessionId: sessionRef.id,
+                        update: {
+                            sessionUpdate: "agent_message_chunk",
+                            content: {
+                                type: "text",
+                                text: chunk,
+                            },
                         },
-                    },
-                });
-            },
-            onAssistantReasoningUpdated: (chunk) => {
-                this.connection.sessionUpdate({
-                    sessionId: sessionId,
-                    update: {
-                        sessionUpdate: "agent_thought_chunk",
-                        content: {
-                            type: "text",
-                            text: chunk,
+                    });
+                },
+                onAssistantReasoningUpdated: (chunk) => {
+                    this.connection.sessionUpdate({
+                        sessionId: sessionRef.id,
+                        update: {
+                            sessionUpdate: "agent_thought_chunk",
+                            content: {
+                                type: "text",
+                                text: chunk,
+                            },
                         },
-                    },
-                });
-            },
-            onToolBlockUpdated: (params) => {
-                const { id, name, stage, success, error, result, parameters, compactParams, shortResult, startLineNumber, } = params;
-                let state = toolStates.get(id);
-                if (!state) {
-                    state = {};
-                    toolStates.set(id, state);
-                }
-                if (name)
-                    state.name = name;
-                if (compactParams)
-                    state.compactParams = compactParams;
-                if (shortResult)
-                    state.shortResult = shortResult;
-                if (startLineNumber !== undefined)
-                    state.startLineNumber = startLineNumber;
-                const effectiveName = state.name || name;
-                const effectiveCompactParams = state.compactParams || compactParams;
-                const effectiveShortResult = state.shortResult || shortResult;
-                const effectiveStartLineNumber = state.startLineNumber !== undefined
-                    ? state.startLineNumber
-                    : startLineNumber;
-                const displayTitle = effectiveName && effectiveCompactParams
-                    ? `${effectiveName}: ${effectiveCompactParams}`
-                    : effectiveName || "Tool Call";
-                let parsedParameters = undefined;
-                if (parameters) {
-                    try {
-                        const parsed = JSON.parse(parameters);
-                        parsedParameters = Array.isArray(parsed)
-                            ? { args: parsed }
-                            : parsed;
+                    });
+                },
+                onToolBlockUpdated: (params) => {
+                    const { id, name, stage, success, error, result, parameters, compactParams, shortResult, startLineNumber, } = params;
+                    let state = toolStates.get(id);
+                    if (!state) {
+                        state = {};
+                        toolStates.set(id, state);
                     }
-                    catch {
-                        // Ignore parse errors during streaming
+                    if (name)
+                        state.name = name;
+                    if (compactParams)
+                        state.compactParams = compactParams;
+                    if (shortResult)
+                        state.shortResult = shortResult;
+                    if (startLineNumber !== undefined)
+                        state.startLineNumber = startLineNumber;
+                    const effectiveName = state.name || name;
+                    const effectiveCompactParams = state.compactParams || compactParams;
+                    const effectiveShortResult = state.shortResult || shortResult;
+                    const effectiveStartLineNumber = state.startLineNumber !== undefined
+                        ? state.startLineNumber
+                        : startLineNumber;
+                    const displayTitle = effectiveName && effectiveCompactParams
+                        ? `${effectiveName}: ${effectiveCompactParams}`
+                        : effectiveName || "Tool Call";
+                    let parsedParameters = undefined;
+                    if (parameters) {
+                        try {
+                            const parsed = JSON.parse(parameters);
+                            parsedParameters = Array.isArray(parsed)
+                                ? { args: parsed }
+                                : parsed;
+                        }
+                        catch {
+                            // Ignore parse errors during streaming
+                        }
                     }
-                }
-                const content = effectiveName && (parsedParameters || effectiveShortResult)
-                    ? this.getToolContent(effectiveName, parsedParameters, effectiveShortResult)
-                    : undefined;
-                const locations = effectiveName && parsedParameters
-                    ? this.getToolLocations(effectiveName, parsedParameters, effectiveStartLineNumber)
-                    : undefined;
-                const kind = effectiveName
-                    ? this.getToolKind(effectiveName)
-                    : undefined;
-                if (stage === "start") {
+                    const content = effectiveName && (parsedParameters || effectiveShortResult)
+                        ? this.getToolContent(effectiveName, parsedParameters, effectiveShortResult)
+                        : undefined;
+                    const locations = effectiveName && parsedParameters
+                        ? this.getToolLocations(effectiveName, parsedParameters, effectiveStartLineNumber)
+                        : undefined;
+                    const kind = effectiveName
+                        ? this.getToolKind(effectiveName)
+                        : undefined;
+                    if (stage === "start") {
+                        this.connection.sessionUpdate({
+                            sessionId: sessionRef.id,
+                            update: {
+                                sessionUpdate: "tool_call",
+                                toolCallId: id,
+                                title: displayTitle,
+                                status: "pending",
+                                content,
+                                locations,
+                                kind,
+                                rawInput: parsedParameters,
+                            },
+                        });
+                        return;
+                    }
+                    if (stage === "streaming") {
+                        // We don't support streaming tool arguments in ACP yet
+                        return;
+                    }
+                    const status = stage === "end"
+                        ? success
+                            ? "completed"
+                            : "failed"
+                        : stage === "running"
+                            ? "in_progress"
+                            : "pending";
                     this.connection.sessionUpdate({
-                        sessionId: sessionId,
+                        sessionId: sessionRef.id,
                         update: {
-                            sessionUpdate: "tool_call",
+                            sessionUpdate: "tool_call_update",
                             toolCallId: id,
+                            status,
                             title: displayTitle,
-                            status: "pending",
+                            rawOutput: result || error,
                             content,
                             locations,
                             kind,
                             rawInput: parsedParameters,
                         },
                     });
-                    return;
-                }
-                if (stage === "streaming") {
-                    // We don't support streaming tool arguments in ACP yet
-                    return;
-                }
-                const status = stage === "end"
-                    ? success
-                        ? "completed"
-                        : "failed"
-                    : stage === "running"
-                        ? "in_progress"
-                        : "pending";
-                this.connection.sessionUpdate({
-                    sessionId: sessionId,
-                    update: {
-                        sessionUpdate: "tool_call_update",
-                        toolCallId: id,
-                        status,
-                        title: displayTitle,
-                        rawOutput: result || error,
-                        content,
-                        locations,
-                        kind,
-                        rawInput: parsedParameters,
-                    },
-                });
-                if (stage === "end") {
-                    toolStates.delete(id);
-                }
-            },
-            onTasksChange: (tasks) => {
-                this.connection.sessionUpdate({
-                    sessionId: sessionId,
-                    update: {
-                        sessionUpdate: "plan",
-                        entries: tasks.map((task) => ({
-                            content: task.subject,
-                            status: task.status === "completed"
-                                ? "completed"
-                                : task.status === "in_progress"
-                                    ? "in_progress"
-                                    : "pending",
-                            priority: "medium",
-                        })),
-                    },
-                });
-            },
-            onPermissionModeChange: (mode) => {
-                this.connection.sessionUpdate({
-                    sessionId: sessionId,
-                    update: {
-                        sessionUpdate: "current_mode_update",
-                        currentModeId: mode,
-                    },
-                });
-                const agent = getAgent();
-                if (agent) {
+                    if (stage === "end") {
+                        toolStates.delete(id);
+                    }
+                },
+                onTasksChange: (tasks) => {
+                    this.taskCache.set(sessionRef.id, tasks);
                     this.connection.sessionUpdate({
-                        sessionId: sessionId,
+                        sessionId: sessionRef.id,
                         update: {
-                            sessionUpdate: "config_option_update",
-                            configOptions: this.getSessionConfigOptions(agent),
+                            sessionUpdate: "plan",
+                            entries: tasks
+                                .filter((t) => t.status !== "deleted")
+                                .map((task) => ({
+                                content: task.subject,
+                                status: task.status === "completed"
+                                    ? "completed"
+                                    : task.status === "in_progress"
+                                        ? "in_progress"
+                                        : "pending",
+                                priority: "medium",
+                            })),
                         },
                     });
-                }
-            },
-            onModelChange: () => {
-                const agent = getAgent();
-                if (agent) {
+                },
+                onPermissionModeChange: (mode) => {
                     this.connection.sessionUpdate({
-                        sessionId: sessionId,
+                        sessionId: sessionRef.id,
                         update: {
-                            sessionUpdate: "config_option_update",
-                            configOptions: this.getSessionConfigOptions(agent),
+                            sessionUpdate: "current_mode_update",
+                            currentModeId: mode,
                         },
                     });
-                }
-            },
-            onUserMessageAdded: (params) => {
-                this.connection.sessionUpdate({
-                    sessionId: sessionId,
-                    update: {
-                        sessionUpdate: "user_message_chunk",
-                        content: { type: "text", text: params.content },
-                    },
-                });
-            },
-            onMcpServersChange: (servers) => {
-                for (const server of servers) {
+                    const agent = getAgent();
+                    if (agent) {
+                        this.connection.sessionUpdate({
+                            sessionId: sessionRef.id,
+                            update: {
+                                sessionUpdate: "config_option_update",
+                                configOptions: this.getSessionConfigOptions(agent),
+                            },
+                        });
+                    }
+                },
+                onModelChange: () => {
+                    const agent = getAgent();
+                    if (agent) {
+                        this.connection.sessionUpdate({
+                            sessionId: sessionRef.id,
+                            update: {
+                                sessionUpdate: "config_option_update",
+                                configOptions: this.getSessionConfigOptions(agent),
+                            },
+                        });
+                    }
+                },
+                onUserMessageAdded: (params) => {
                     this.connection.sessionUpdate({
-                        sessionId: sessionId,
+                        sessionId: sessionRef.id,
                         update: {
-                            sessionUpdate: "ext_notification",
-                            method: "mcp_server_status",
-                            params: {
-                                name: server.name,
-                                status: server.status,
-                                toolCount: server.toolCount,
-                                error: server.error,
+                            sessionUpdate: "user_message_chunk",
+                            content: { type: "text", text: params.content },
+                        },
+                    });
+                },
+                onMcpServersChange: (servers) => {
+                    for (const server of servers) {
+                        this.connection.sessionUpdate({
+                            sessionId: sessionRef.id,
+                            update: {
+                                sessionUpdate: "ext_notification",
+                                method: "mcp_server_status",
+                                params: {
+                                    name: server.name,
+                                    status: server.status,
+                                    toolCount: server.toolCount,
+                                    error: server.error,
+                                },
                             },
+                        });
+                    }
+                },
+                onSessionIdChange: (newSessionId) => {
+                    const oldSessionId = sessionRef.id;
+                    if (oldSessionId === newSessionId)
+                        return;
+                    // Update agents Map key
+                    const agent = this.agents.get(oldSessionId);
+                    if (agent) {
+                        this.agents.delete(oldSessionId);
+                        this.agents.set(newSessionId, agent);
+                    }
+                    // Update taskCache key
+                    const tasks = this.taskCache.get(oldSessionId);
+                    if (tasks) {
+                        this.taskCache.delete(oldSessionId);
+                        this.taskCache.set(newSessionId, tasks);
+                    }
+                    // Update ref so all subsequent callbacks use new ID
+                    sessionRef.id = newSessionId;
+                    // Notify ACP client
+                    this.connection.sessionUpdate({
+                        sessionId: oldSessionId,
+                        update: {
+                            sessionUpdate: "ext_notification",
+                            method: "session_id_change",
+                            params: { oldSessionId, newSessionId },
                         },
                     });
-                }
+                },
             },
+            sessionRef,
         };
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"BtwDisplay.d.ts","sourceRoot":"","sources":["../../src/components/BtwDisplay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,UAAU,eAAe;IACvB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAuBhD,CAAC"}
+{"version":3,"file":"BtwDisplay.d.ts","sourceRoot":"","sources":["../../src/components/BtwDisplay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,UAAU,eAAe;IACvB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA0BhD,CAAC"}

package/dist/components/BtwDisplay.js

@@ -2,8 +2,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 import { Markdown } from "./Markdown.js";
 export const BtwDisplay = ({ btwState }) => {
-    if (!btwState.isActive) {
+    if (!btwState.question) {
         return null;
     }
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 0, marginBottom: 0, children: [btwState.question && (_jsxs(Box, { children: [_jsx(Text, { color: btwState.isLoading ? "yellow" : "green", children: "/ " }), _jsxs(Text, { italic: true, color: "gray", children: ["btw ", btwState.question] })] })), btwState.answer && (_jsx(Box, { flexDirection: "column", children: _jsx(Markdown, { children: btwState.answer }) }))] }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 0, marginBottom: 0, children: [btwState.question && (_jsxs(Box, { children: [_jsx(Text, { color: btwState.isLoading ? "yellow" : "green", children: "/ " }), _jsxs(Text, { italic: true, color: "gray", children: ["btw ", btwState.question] })] })), btwState.answer && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Markdown, { children: btwState.answer }), _jsx(Text, { color: "gray", dimColor: true, children: "ESC to dismiss" })] }))] }));
 };

package/dist/components/InputBox.js

@@ -21,7 +21,7 @@ import { useChat } from "../contexts/useChat.js";
 export const INPUT_PLACEHOLDER_TEXT = "Type your message (use /help for more info)...";
 export const INPUT_PLACEHOLDER_TEXT_PREFIX = INPUT_PLACEHOLDER_TEXT.substring(0, 10);
 export const InputBox = ({ sendMessage = () => { }, abortMessage = () => { }, mcpServers = [], connectMcpServer = async () => false, disconnectMcpServer = async () => false, slashCommands = [], hasSlashCommand = () => false, latestTotalTokens = 0, maxInputTokens = 128000, isGoalActive, goalElapsed, }) => {
-    const { permissionMode: chatPermissionMode, setPermissionMode: setChatPermissionMode, handleRewindSelect, backgroundCurrentTask, messages, getFullMessageThread, sessionId, workingDirectory, askBtw, currentModel, configuredModels, setModel, recreateAgent, recallQueuedMessage, queuedMessages, } = useChat();
+    const { permissionMode: chatPermissionMode, setPermissionMode: setChatPermissionMode, handleRewindSelect, backgroundCurrentTask, messages, getFullMessageThread, sessionId, workingDirectory, askBtw, clearMessages, compact, goalCommand, currentModel, configuredModels, setModel, recreateAgent, recallQueuedMessage, queuedMessages, } = useChat();
     // Ref to hold setInputText so queue callbacks can access it before useInputManager returns
     const setInputTextRef = useRef(() => { });
     const hasQueuedMessages = (queuedMessages?.length ?? 0) > 0;
@@ -56,6 +56,9 @@ export const InputBox = ({ sendMessage = () => { }, abortMessage = () => { }, mc
     setInputText, } = useInputManager({
         onSendMessage: sendMessage,
         onAskBtw: askBtw,
+        onClearMessages: clearMessages,
+        onCompact: compact,
+        onGoalCommand: goalCommand,
         onHasSlashCommand: hasSlashCommand,
         onAbortMessage: abortMessage,
         onBackgroundCurrentTask: backgroundCurrentTask,
@@ -136,12 +139,14 @@ export const InputBox = ({ sendMessage = () => { }, abortMessage = () => { }, mc
     if (showModelSelector) {
         return (_jsx(ModelSelector, { onCancel: () => setShowModelSelector(false), currentModel: currentModel, configuredModels: configuredModels, onSelectModel: setModel }));
     }
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(BtwDisplay, { btwState: btwState }), showFileSelector && (_jsx(FileSelector, { files: filteredFiles, searchQuery: searchQuery, isLoading: isFileSearching, onSelect: handleFileSelect, onCancel: handleCancelFileSelect })), showCommandSelector && (_jsx(CommandSelector, { searchQuery: commandSearchQuery, onSelect: handleCommandSelect, onInsert: handleCommandInsert, onCancel: handleCancelCommandSelect, commands: slashCommands })), showHistorySearch && (_jsx(HistorySearch, { searchQuery: historySearchQuery, onSelect: handleHistorySearchSelect, onCancel: handleCancelHistorySearch })), showBackgroundTaskManager && (_jsx(BackgroundTaskManager, { onCancel: () => setShowBackgroundTaskManager(false) })), showMcpManager && (_jsx(McpManager, { onCancel: () => setShowMcpManager(false), servers: mcpServers, onConnectServer: connectMcpServer, onDisconnectServer: disconnectMcpServer })), showWorkflowManager && (_jsx(WorkflowManager, { onCancel: () => setShowWorkflowManager(false) })), showBackgroundTaskManager ||
-                showMcpManager ||
-                showRewindManager ||
-                showHelp ||
-                showStatusCommand ||
-                showLoginCommand ||
-                showPluginManager ||
-                showWorkflowManager || (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { borderStyle: "single", borderColor: btwState.isActive ? "cyan" : "gray", borderLeft: false, borderRight: false, children: _jsx(Text, { color: isPlaceholder ? "gray" : "white", children: btwState.isActive && isPlaceholder ? (_jsxs(_Fragment, { children: [_jsx(Text, { backgroundColor: "white", color: "black", children: " " }), _jsx(Text, { color: "cyan", children: "Type your side question..." })] })) : shouldShowCursor ? (_jsxs(_Fragment, { children: [beforeCursor, _jsx(Text, { backgroundColor: "white", color: "black", children: atCursor }), afterCursor] })) : (displayText) }) }), _jsx(StatusLine, { permissionMode: permissionMode, isShellCommand: isShellCommand, isBtwActive: btwState.isActive, isGoalActive: isGoalActive, goalElapsed: goalElapsed, latestTotalTokens: latestTotalTokens, maxInputTokens: maxInputTokens })] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(BtwDisplay, { btwState: btwState }), showFileSelector && (_jsx(FileSelector, { files: filteredFiles, searchQuery: searchQuery, isLoading: isFileSearching, onSelect: handleFileSelect, onCancel: handleCancelFileSelect })), showCommandSelector && (_jsx(CommandSelector, { searchQuery: commandSearchQuery, onSelect: handleCommandSelect, onInsert: handleCommandInsert, onCancel: handleCancelCommandSelect, commands: slashCommands })), showHistorySearch && (_jsx(HistorySearch, { searchQuery: historySearchQuery, onSelect: handleHistorySearchSelect, onCancel: handleCancelHistorySearch })), showBackgroundTaskManager && (_jsx(BackgroundTaskManager, { onCancel: () => setShowBackgroundTaskManager(false) })), showMcpManager && (_jsx(McpManager, { onCancel: () => setShowMcpManager(false), servers: mcpServers, onConnectServer: connectMcpServer, onDisconnectServer: disconnectMcpServer })), showWorkflowManager && (_jsx(WorkflowManager, { onCancel: () => setShowWorkflowManager(false) })), btwState.question
+                ? null
+                : showBackgroundTaskManager ||
+                    showMcpManager ||
+                    showRewindManager ||
+                    showHelp ||
+                    showStatusCommand ||
+                    showLoginCommand ||
+                    showPluginManager ||
+                    showWorkflowManager || (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { borderStyle: "single", borderColor: "gray", borderLeft: false, borderRight: false, children: _jsx(Text, { color: isPlaceholder ? "gray" : "white", children: shouldShowCursor ? (_jsxs(_Fragment, { children: [beforeCursor, _jsx(Text, { backgroundColor: "white", color: "black", children: atCursor }), afterCursor] })) : (displayText) }) }), _jsx(StatusLine, { permissionMode: permissionMode, isShellCommand: isShellCommand, isGoalActive: isGoalActive, goalElapsed: goalElapsed, latestTotalTokens: latestTotalTokens, maxInputTokens: maxInputTokens })] }))] }));
 };