@finityno/claude-code-acp 0.13.6 → 0.14.0

package/README.md

@@ -4,7 +4,7 @@
 
 > **Fork of [@zed-industries/claude-code-acp](https://github.com/zed-industries/claude-code-acp)**
 >
-> This fork adds support for **subagent (Task tool) tracking** and will soon include **AskUserQuestion tool** support.
+> This fork adds support for **subagent (Task tool) tracking** and **AskUserQuestion tool** support.
 
 Use [Claude Code](https://www.anthropic.com/claude-code) from [ACP-compatible](https://agentclientprotocol.com) clients such as [Zed](https://zed.dev)!
 
@@ -34,6 +34,7 @@ This adapter implements an ACP agent using the official [Claude Agent SDK](https
 - Custom [Slash commands](https://docs.anthropic.com/en/docs/claude-code/slash-commands)
 - Client MCP servers
 - **Subagent tracking** (Task tool lifecycle events)
+- **AskUserQuestion** (Claude can ask clarifying questions)
 
 ## Subagent Tracking
 
@@ -66,6 +67,38 @@ tracker.getStats();                     // Counts & avg duration
 
 See [docs/subagent-tracking.md](docs/subagent-tracking.md) for full API documentation.
 
+## AskUserQuestion
+
+Claude can ask clarifying questions during execution. Questions are presented via the ACP permission request system:
+
+```typescript
+// Claude sends a question like:
+{
+  "question": "Which testing framework should we use?",
+  "header": "Testing",
+  "options": [
+    { "label": "Jest", "description": "Popular JavaScript testing framework" },
+    { "label": "Vitest", "description": "Vite-native, fast testing framework" }
+  ],
+  "multiSelect": false
+}
+
+// User selects an option, Claude receives:
+{
+  "answers": {
+    "Which testing framework should we use?": "Vitest"
+  }
+}
+```
+
+Features:
+- Multiple questions per request (1-4)
+- 2-4 options per question with labels and descriptions
+- MultiSelect support for non-mutually-exclusive choices
+- "Other" option for free-text input
+
+See [docs/ask-user-question.md](docs/ask-user-question.md) for ACP client integration details.
+
 ## Usage
 
 ### With Zed

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

@@ -1 +1 @@
-{"version":3,"file":"acp-agent.d.ts","sourceRoot":"","sources":["../src/acp-agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"acp-agent.d.ts","sourceRoot":"","sources":["../src/acp-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,mBAAmB,EACnB,mBAAmB,EAEnB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAElB,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EAEpB,oBAAoB,EACpB,qBAAqB,EAErB,mBAAmB,EACnB,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EACL,UAAU,EAEV,OAAO,EACP,cAAc,EACd,KAAK,EAEL,0BAA0B,EAC1B,cAAc,EACf,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAwC,QAAQ,EAAe,MAAM,YAAY,CAAC;AAYzF,OAAO,EACL,eAAe,EAIhB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAIlG,eAAO,MAAM,iBAAiB,QAA2D,CAAC;AAE1F;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjC;AAED,KAAK,OAAO,GAAG;IACb,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAEF,KAAK,kBAAkB,GACnB;IACE,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,sBAAsB,GAAG,IAAI,CAAC;CAC3C,GACD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrD,aAAa,EAAE,sBAAsB,CAAC;CACvC,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE;QACX;;;;;;;;;;;;WAYG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE;QAEX,QAAQ,EAAE,MAAM,CAAC;QAEjB,YAAY,CAAC,EAAE,OAAO,CAAC;QAEvB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,IAAI,EAAE,UAAU,GAAG,iBAAiB,GAAG,cAAc,CAAC;QACtD,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,GAAG,CAAC;KACZ,CAAC;CACH,CAAC;AAMF,qBAAa,cAAe,YAAW,KAAK;IAC1C,QAAQ,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,MAAM,EAAE,mBAAmB,CAAC;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,mBAAmB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAM;IAChE,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;gBAErB,MAAM,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,MAAM;IAQlD,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAgDnE,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAclE,oBAAoB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAc9E,sBAAsB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAepF,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzD,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;IAsKtD,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBjD,wBAAwB,CAC5B,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC;IAOpC,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA0B9E,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAKxE,aAAa,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAKjF,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU;YAmN3B,aAAa;CA6P5B;AAwED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,cAAc,CA6EpE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,GAAG,iBAAiB,EAAE,GAAG,gBAAgB,EAAE,GAAG,wBAAwB,EAAE,EACvF,IAAI,EAAE,WAAW,GAAG,MAAM,EAC1B,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,eAAe;AACjC,kGAAkG;AAClG,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,GACjC,mBAAmB,EAAE,CAiRvB;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,0BAA0B,EACnC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,eAAe,GAChC,mBAAmB,EAAE,CAuCvB;AAED,wBAAgB,MAAM,SAMrB"}

package/dist/acp-agent.js

@@ -331,6 +331,71 @@ export class ClaudeAcpAgent {
                     };
                 }
             }
+            if (toolName === "AskUserQuestion") {
+                const input = toolInput;
+                const answers = {};
+                // Process each question sequentially
+                for (const question of input.questions || []) {
+                    // Build permission options from question options
+                    const permissionOptions = question.options.map((opt) => ({
+                        kind: "allow_once",
+                        name: `${opt.label} - ${opt.description}`,
+                        optionId: opt.label,
+                    }));
+                    // Add "Other" option for free-text input
+                    permissionOptions.push({
+                        kind: "allow_once",
+                        name: "Other (type custom answer)",
+                        optionId: "__other__",
+                    });
+                    const response = await this.client.requestPermission({
+                        options: permissionOptions,
+                        sessionId,
+                        toolCall: {
+                            toolCallId: toolUseID,
+                            rawInput: { question: question.question, header: question.header },
+                            title: question.header || "Question",
+                        },
+                        _meta: {
+                            claudeCode: {
+                                questionType: "askUserQuestion",
+                                multiSelect: question.multiSelect,
+                            },
+                        },
+                    });
+                    if (signal.aborted || response.outcome?.outcome === "cancelled") {
+                        return {
+                            behavior: "deny",
+                            message: "User cancelled the question",
+                            interrupt: true,
+                        };
+                    }
+                    if (response.outcome?.outcome === "selected") {
+                        const selectedId = response.outcome.optionId;
+                        if (selectedId === "__other__") {
+                            // Handle free-text - ACP client should provide custom text in _meta
+                            const customText = response.outcome._meta?.customText ||
+                                "Other";
+                            answers[question.question] = customText;
+                        }
+                        else if (question.multiSelect) {
+                            // For multiSelect, collect all selected labels
+                            const existing = answers[question.question];
+                            answers[question.question] = existing ? `${existing}, ${selectedId}` : selectedId;
+                        }
+                        else {
+                            answers[question.question] = selectedId;
+                        }
+                    }
+                }
+                return {
+                    behavior: "allow",
+                    updatedInput: {
+                        questions: input.questions,
+                        answers,
+                    },
+                };
+            }
             if (session.permissionMode === "bypassPermissions" ||
                 (session.permissionMode === "acceptEdits" && EDIT_TOOL_NAMES.includes(toolName))) {
                 return {
@@ -508,8 +573,7 @@ export class ClaudeAcpAgent {
             ...creationOpts,
         };
         const allowedTools = [];
-        // Disable this for now, not a great way to expose this over ACP at the moment (in progress work so we can revisit)
-        const disallowedTools = ["AskUserQuestion"];
+        const disallowedTools = [];
         // Check if built-in tools should be disabled
         const disableBuiltInTools = params._meta?.disableBuiltInTools === true;
         if (!disableBuiltInTools) {
@@ -872,10 +936,13 @@ sdkParentToolUseId) {
                         // ignore if we can't turn it to JSON
                     }
                     // Send tool_call notification with subagent metadata
+                    // Include parentToolUseId for nested subagents (Task called from within another Task)
                     update = {
                         _meta: {
                             claudeCode: {
                                 toolName: chunk.name,
+                                // For nested subagents, include parent reference
+                                ...(parentSubagentId && { parentToolUseId: parentSubagentId }),
                                 subagent: {
                                     id: chunk.id,
                                     eventType: "subagent_started",
@@ -883,6 +950,8 @@ sdkParentToolUseId) {
                                     description: input.description,
                                     status: "running",
                                     parentSessionId: sessionId,
+                                    // Include parent for nested subagents
+                                    ...(parentSubagentId && { parentToolUseId: parentSubagentId }),
                                     model: input.model,
                                     runInBackground: input.run_in_background ?? false,
                                 },

package/dist/lib.d.ts

@@ -1,7 +1,7 @@
 export { ClaudeAcpAgent, runAcp, toAcpNotifications, streamEventToAcpNotifications, type ToolUpdateMeta, type NewSessionMeta, } from "./acp-agent.js";
 export { loadManagedSettings, applyEnvironmentSettings, nodeToWebReadable, nodeToWebWritable, Pushable, unreachable, } from "./utils.js";
 export { createMcpServer } from "./mcp-server.js";
-export { toolInfoFromToolUse, planEntries, toolUpdateFromToolResult, createPreToolUseHook, acpToolNames as toolNames, } from "./tools.js";
+export { toolInfoFromToolUse, planEntries, toolUpdateFromToolResult, createPreToolUseHook, acpToolNames as toolNames, normalizeToolName, getCanonicalToolName, } from "./tools.js";
 export { SettingsManager, type ClaudeCodeSettings, type PermissionSettings, type PermissionDecision, type PermissionCheckResult, type SettingsManagerOptions, } from "./settings.js";
 export { SubagentTracker, isTaskToolInput, extractSubagentMeta, type TrackedSubagent, type SubagentStatus, type SubagentType, type SubagentEventType, type SubagentUpdateMeta, type SubagentEventListener, type SubagentStats, type TaskToolInput, } from "./subagent-tracker.js";
 export type { ClaudePlanEntry } from "./tools.js";

package/dist/lib.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,MAAM,EACN,kBAAkB,EAClB,6BAA6B,EAC7B,KAAK,cAAc,EACnB,KAAK,cAAc,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB,EACjB,iBAAiB,EACjB,QAAQ,EACR,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACL,mBAAmB,EACnB,WAAW,EACX,wBAAwB,EACxB,oBAAoB,EACpB,YAAY,IAAI,SAAS,GAC1B,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,eAAe,EACf,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,GAC5B,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,aAAa,GACnB,MAAM,uBAAuB,CAAC;AAG/B,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,MAAM,EACN,kBAAkB,EAClB,6BAA6B,EAC7B,KAAK,cAAc,EACnB,KAAK,cAAc,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB,EACjB,iBAAiB,EACjB,QAAQ,EACR,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACL,mBAAmB,EACnB,WAAW,EACX,wBAAwB,EACxB,oBAAoB,EACpB,YAAY,IAAI,SAAS,EACzB,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,eAAe,EACf,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,GAC5B,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,aAAa,GACnB,MAAM,uBAAuB,CAAC;AAG/B,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC"}

package/dist/lib.js

@@ -2,7 +2,7 @@
 export { ClaudeAcpAgent, runAcp, toAcpNotifications, streamEventToAcpNotifications, } from "./acp-agent.js";
 export { loadManagedSettings, applyEnvironmentSettings, nodeToWebReadable, nodeToWebWritable, Pushable, unreachable, } from "./utils.js";
 export { createMcpServer } from "./mcp-server.js";
-export { toolInfoFromToolUse, planEntries, toolUpdateFromToolResult, createPreToolUseHook, acpToolNames as toolNames, } from "./tools.js";
+export { toolInfoFromToolUse, planEntries, toolUpdateFromToolResult, createPreToolUseHook, acpToolNames as toolNames, normalizeToolName, getCanonicalToolName, } from "./tools.js";
 export { SettingsManager, } from "./settings.js";
 // Export subagent tracking
 export { SubagentTracker, isTaskToolInput, extractSubagentMeta, } from "./subagent-tracker.js";

package/dist/tools.d.ts

@@ -25,6 +25,16 @@ interface ToolUpdate {
     content?: ToolCallContent[];
     locations?: ToolCallLocation[];
 }
+/**
+ * Normalize a tool name by stripping MCP prefixes.
+ * e.g., "mcp__acp__Read" -> "Read", "mcp__context7__query-docs" -> "query-docs"
+ */
+export declare function normalizeToolName(name: string): string;
+/**
+ * Get the canonical tool name for categorization purposes.
+ * This maps tool names to their canonical form for icon/kind matching.
+ */
+export declare function getCanonicalToolName(name: string): string;
 export declare function toolInfoFromToolUse(toolUse: any): ToolInfo;
 export declare function toolUpdateFromToolResult(toolResult: ToolResultBlockParam | BetaWebSearchToolResultBlockParam | BetaWebFetchToolResultBlockParam | WebSearchToolResultBlockParam | BetaCodeExecutionToolResultBlockParam | BetaBashCodeExecutionToolResultBlockParam | BetaTextEditorCodeExecutionToolResultBlockParam | BetaRequestMCPToolResultBlockParam | BetaToolSearchToolResultBlockParam, toolUse: any | undefined): ToolUpdate;
 export type ClaudePlanEntry = {

package/dist/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGlG,OAAO,EAAE,oBAAoB,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAWlG,eAAO,MAAM,oBAAoB,eAAe,CAAC;AACjD,eAAO,MAAM,YAAY;;;;;;;CAOxB,CAAC;AAEF,eAAO,MAAM,eAAe,UAA0C,CAAC;AAEvE,OAAO,EACL,yCAAyC,EACzC,qCAAqC,EACrC,kCAAkC,EAClC,+CAA+C,EAC/C,kCAAkC,EAClC,gCAAgC,EAChC,iCAAiC,EAClC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC;AAED,UAAU,UAAU;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,QAAQ,CA+V1D;AAED,wBAAgB,wBAAwB,CACtC,UAAU,EACN,oBAAoB,GACpB,iCAAiC,GACjC,gCAAgC,GAChC,6BAA6B,GAC7B,qCAAqC,GACrC,yCAAyC,GACzC,+CAA+C,GAC/C,kCAAkC,GAClC,kCAAkC,EACtC,OAAO,EAAE,GAAG,GAAG,SAAS,GACvB,UAAU,CA4HZ;AAmCD,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,CAAC;IAChD,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,WAAW,CAAC,KAAK,EAAE;IAAE,KAAK,EAAE,eAAe,EAAE,CAAA;CAAE,GAAG,SAAS,EAAE,CAM5E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQnD;AAcD,eAAO,MAAM,oBAAoB,GAC/B,WAAW,MAAM,EACjB,wBAEG;IACD,iBAAiB,CAAC,EAAE,CAClB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,OAAO,EAClB,YAAY,EAAE,OAAO,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,SAKF,CAAC;AAGF,eAAO,MAAM,qBAAqB,GAC/B,SAAQ,MAAgB,KAAG,YAa3B,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC9B,iBAAiB,eAAe,EAAE,SAAQ,MAAgB,KAAG,YA2C7D,CAAC"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGlG,OAAO,EAAE,oBAAoB,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAWlG,eAAO,MAAM,oBAAoB,eAAe,CAAC;AACjD,eAAO,MAAM,YAAY;;;;;;;CAOxB,CAAC;AAEF,eAAO,MAAM,eAAe,UAA0C,CAAC;AAEvE,OAAO,EACL,yCAAyC,EACzC,qCAAqC,EACrC,kCAAkC,EAClC,+CAA+C,EAC/C,kCAAkC,EAClC,gCAAgC,EAChC,iCAAiC,EAClC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC;AAED,UAAU,UAAU;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOtD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAqCzD;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,QAAQ,CAuX1D;AAED,wBAAgB,wBAAwB,CACtC,UAAU,EACN,oBAAoB,GACpB,iCAAiC,GACjC,gCAAgC,GAChC,6BAA6B,GAC7B,qCAAqC,GACrC,yCAAyC,GACzC,+CAA+C,GAC/C,kCAAkC,GAClC,kCAAkC,EACtC,OAAO,EAAE,GAAG,GAAG,SAAS,GACvB,UAAU,CA8GZ;AAmCD,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,CAAC;IAChD,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,WAAW,CAAC,KAAK,EAAE;IAAE,KAAK,EAAE,eAAe,EAAE,CAAA;CAAE,GAAG,SAAS,EAAE,CAM5E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQnD;AAcD,eAAO,MAAM,oBAAoB,GAC/B,WAAW,MAAM,EACjB,wBAEG;IACD,iBAAiB,CAAC,EAAE,CAClB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,OAAO,EAClB,YAAY,EAAE,OAAO,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,SAKF,CAAC;AAGF,eAAO,MAAM,qBAAqB,GAC/B,SAAQ,MAAgB,KAAG,YAa3B,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC9B,iBAAiB,eAAe,EAAE,SAAQ,MAAgB,KAAG,YA2C7D,CAAC"}

package/dist/tools.js

@@ -18,9 +18,59 @@ export const acpToolNames = {
     bashOutput: ACP_TOOL_NAME_PREFIX + acpUnqualifiedToolNames.bashOutput,
 };
 export const EDIT_TOOL_NAMES = [acpToolNames.edit, acpToolNames.write];
+/**
+ * Normalize a tool name by stripping MCP prefixes.
+ * e.g., "mcp__acp__Read" -> "Read", "mcp__context7__query-docs" -> "query-docs"
+ */
+export function normalizeToolName(name) {
+    // Strip mcp__<server>__ prefix
+    const mcpMatch = name.match(/^mcp__[^_]+__(.+)$/);
+    if (mcpMatch) {
+        return mcpMatch[1];
+    }
+    return name;
+}
+/**
+ * Get the canonical tool name for categorization purposes.
+ * This maps tool names to their canonical form for icon/kind matching.
+ */
+export function getCanonicalToolName(name) {
+    const normalized = normalizeToolName(name);
+    // Map common variations to canonical names
+    const canonicalMap = {
+        // ACP tools
+        "Read": "Read",
+        "Edit": "Edit",
+        "Write": "Write",
+        "Bash": "Bash",
+        "BashOutput": "BashOutput",
+        "KillShell": "KillShell",
+        "TaskOutput": "TaskOutput",
+        // Search tools
+        "Glob": "Glob",
+        "Grep": "Grep",
+        "LS": "LS",
+        // Web tools
+        "WebFetch": "WebFetch",
+        "WebSearch": "WebSearch",
+        // Agent/planning tools
+        "Task": "Task",
+        "TodoWrite": "TodoWrite",
+        "ExitPlanMode": "ExitPlanMode",
+        "EnterPlanMode": "EnterPlanMode",
+        "AskUserQuestion": "AskUserQuestion",
+        "Skill": "Skill",
+        // Notebook tools
+        "NotebookRead": "NotebookRead",
+        "NotebookEdit": "NotebookEdit",
+    };
+    return canonicalMap[normalized] ?? normalized;
+}
 export function toolInfoFromToolUse(toolUse) {
-    const name = toolUse.name;
+    const rawName = toolUse.name;
     const input = toolUse.input;
+    // Get canonical name for matching
+    const name = getCanonicalToolName(rawName);
     switch (name) {
         case "Task":
             return {
@@ -57,7 +107,6 @@ export function toolInfoFromToolUse(toolUse) {
                 locations: input?.notebook_path ? [{ path: input.notebook_path }] : [],
             };
         case "Bash":
-        case acpToolNames.bash:
             return {
                 title: input?.command ? "`" + input.command.replaceAll("`", "\\`") + "`" : "Terminal",
                 kind: "execute",
@@ -71,32 +120,36 @@ export function toolInfoFromToolUse(toolUse) {
                     : [],
             };
         case "BashOutput":
-        case acpToolNames.bashOutput:
             return {
                 title: "Tail Logs",
                 kind: "execute",
                 content: [],
             };
         case "KillShell":
-        case acpToolNames.killShell:
             return {
                 title: "Kill Process",
                 kind: "execute",
                 content: [],
             };
-        case acpToolNames.read: {
+        case "TaskOutput":
+            return {
+                title: input?.task_id ? `Task Output (${input.task_id})` : "Task Output",
+                kind: "read",
+                content: [],
+            };
+        case "Read": {
             let limit = "";
-            if (input.limit) {
+            if (input?.limit) {
                 limit =
                     " (" + ((input.offset ?? 0) + 1) + " - " + ((input.offset ?? 0) + input.limit) + ")";
             }
-            else if (input.offset) {
+            else if (input?.offset) {
                 limit = " (from line " + (input.offset + 1) + ")";
             }
             return {
-                title: "Read " + (input.file_path ?? "File") + limit,
+                title: "Read " + (input?.file_path ?? "File") + limit,
                 kind: "read",
-                locations: input.file_path
+                locations: input?.file_path
                     ? [
                         {
                             path: input.file_path,
@@ -107,20 +160,6 @@ export function toolInfoFromToolUse(toolUse) {
                 content: [],
             };
         }
-        case "Read":
-            return {
-                title: "Read File",
-                kind: "read",
-                content: [],
-                locations: input.file_path
-                    ? [
-                        {
-                            path: input.file_path,
-                            line: input.offset ?? 0,
-                        },
-                    ]
-                    : [],
-            };
         case "LS":
             return {
                 title: `List the ${input?.path ? "`" + input.path + "`" : "current"} directory's contents`,
@@ -128,9 +167,8 @@ export function toolInfoFromToolUse(toolUse) {
                 content: [],
                 locations: [],
             };
-        case acpToolNames.edit:
         case "Edit": {
-            const path = input?.file_path ?? input?.file_path;
+            const path = input?.file_path;
             return {
                 title: path ? `Edit \`${path}\`` : "Edit",
                 kind: "edit",
@@ -147,7 +185,7 @@ export function toolInfoFromToolUse(toolUse) {
                 locations: path ? [{ path }] : undefined,
             };
         }
-        case acpToolNames.write: {
+        case "Write": {
             let content = [];
             if (input && input.file_path) {
                 content = [
@@ -174,22 +212,6 @@ export function toolInfoFromToolUse(toolUse) {
                 locations: input?.file_path ? [{ path: input.file_path }] : [],
             };
         }
-        case "Write":
-            return {
-                title: input?.file_path ? `Write ${input.file_path}` : "Write",
-                kind: "edit",
-                content: input && input.file_path
-                    ? [
-                        {
-                            type: "diff",
-                            path: input.file_path,
-                            oldText: null,
-                            newText: input.content,
-                        },
-                    ]
-                    : [],
-                locations: input?.file_path ? [{ path: input.file_path }] : [],
-            };
         case "Glob": {
             let label = "Find";
             if (input.path) {
@@ -302,6 +324,43 @@ export function toolInfoFromToolUse(toolUse) {
                     ? [{ type: "content", content: { type: "text", text: input.plan } }]
                     : [],
             };
+        case "AskUserQuestion":
+            return {
+                title: input?.questions?.[0]?.header || "Question",
+                kind: "think",
+                content: input?.questions
+                    ? [
+                        {
+                            type: "content",
+                            content: {
+                                type: "text",
+                                text: Array.isArray(input.questions)
+                                    ? input.questions
+                                        .map((q) => {
+                                        const options = q.options
+                                            ?.map((o) => `  - ${o.label}: ${o.description}`)
+                                            .join("\n");
+                                        return `${q.question}\n${options || ""}`;
+                                    })
+                                        .join("\n\n")
+                                    : String(input.questions),
+                            },
+                        },
+                    ]
+                    : [],
+            };
+        case "EnterPlanMode":
+            return {
+                title: "Enter Plan Mode",
+                kind: "switch_mode",
+                content: [],
+            };
+        case "Skill":
+            return {
+                title: input?.skill ? `/${input.skill}` : "Skill",
+                kind: "execute",
+                content: [],
+            };
         case "Other": {
             let output;
             try {
@@ -311,7 +370,7 @@ export function toolInfoFromToolUse(toolUse) {
                 output = typeof input === "string" ? input : "{}";
             }
             return {
-                title: name || "Unknown Tool",
+                title: rawName || "Unknown Tool",
                 kind: "other",
                 content: [
                     {
@@ -324,12 +383,23 @@ export function toolInfoFromToolUse(toolUse) {
                 ],
             };
         }
-        default:
+        default: {
+            // For MCP tools from other servers, try to provide a reasonable title
+            const isMcpTool = rawName.startsWith("mcp__");
+            let title = rawName;
+            if (isMcpTool) {
+                // Extract server and tool name: mcp__server__toolName -> server: toolName
+                const parts = rawName.match(/^mcp__([^_]+)__(.+)$/);
+                if (parts) {
+                    title = `${parts[1]}: ${parts[2]}`;
+                }
+            }
             return {
-                title: name || "Unknown Tool",
-                kind: "other",
+                title: title || "Unknown Tool",
+                kind: isMcpTool ? "other" : "other",
                 content: [],
             };
+        }
     }
 }
 export function toolUpdateFromToolResult(toolResult, toolUse) {
@@ -340,9 +410,10 @@ export function toolUpdateFromToolResult(toolResult, toolUse) {
         // Only return errors
         return toAcpContentUpdate(toolResult.content, true);
     }
-    switch (toolUse?.name) {
+    // Use canonical name for matching
+    const canonicalName = toolUse?.name ? getCanonicalToolName(toolUse.name) : undefined;
+    switch (canonicalName) {
         case "Read":
-        case acpToolNames.read:
             if (Array.isArray(toolResult.content) && toolResult.content.length > 0) {
                 return {
                     content: toolResult.content.map((content) => ({
@@ -370,7 +441,7 @@ export function toolUpdateFromToolResult(toolResult, toolUse) {
                 };
             }
             return {};
-        case acpToolNames.edit: {
+        case "Edit": {
             const content = [];
             const locations = [];
             if (Array.isArray(toolResult.content) &&
@@ -416,30 +487,14 @@ export function toolUpdateFromToolResult(toolResult, toolUse) {
             }
             return result;
         }
-        case acpToolNames.bash:
-        case "edit":
-        case "Edit":
-        case acpToolNames.write:
+        case "Bash":
         case "Write": {
             return {};
         }
         case "ExitPlanMode": {
             return { title: "Exited Plan Mode" };
         }
-        case "Task":
-        case "NotebookEdit":
-        case "NotebookRead":
-        case "TodoWrite":
-        case "exit_plan_mode":
-        case "Bash":
-        case "BashOutput":
-        case "KillBash":
-        case "LS":
-        case "Glob":
-        case "Grep":
-        case "WebFetch":
-        case "WebSearch":
-        case "Other":
+        // All other tools: return content as-is
         default: {
             return toAcpContentUpdate(toolResult.content, "is_error" in toolResult ? toolResult.is_error : false);
         }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.13.6",
+  "version": "0.14.0",
   "description": "An ACP-compatible coding agent powered by the Claude Code SDK (TypeScript)",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
@@ -61,7 +61,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@agentclientprotocol/sdk": "0.13.0",
-    "@anthropic-ai/claude-agent-sdk": "0.2.7",
+    "@anthropic-ai/claude-agent-sdk": "0.2.9",
     "@modelcontextprotocol/sdk": "1.25.2",
     "diff": "8.0.3",
     "minimatch": "10.1.1"