claude-code-acp-ts 0.13.1 → 0.16.0

package/dist/acp-agent.d.ts

@@ -1,4 +1,4 @@
-import { Agent, AgentSideConnection, AuthenticateRequest, CancelNotification, ClientCapabilities, ForkSessionRequest, ForkSessionResponse, InitializeRequest, InitializeResponse, NewSessionRequest, NewSessionResponse, PromptRequest, PromptResponse, ReadTextFileRequest, ReadTextFileResponse, ResumeSessionRequest, ResumeSessionResponse, SessionNotification, SetSessionModelRequest, SetSessionModelResponse, SetSessionModeRequest, SetSessionModeResponse, TerminalHandle, TerminalOutputResponse, WriteTextFileRequest, WriteTextFileResponse } from "@agentclientprotocol/sdk";
+import { Agent, AgentSideConnection, AuthenticateRequest, CancelNotification, ClientCapabilities, ForkSessionRequest, ForkSessionResponse, InitializeRequest, InitializeResponse, LoadSessionRequest, LoadSessionResponse, ListSessionsRequest, ListSessionsResponse, NewSessionRequest, NewSessionResponse, PromptRequest, PromptResponse, ReadTextFileRequest, ReadTextFileResponse, ResumeSessionRequest, ResumeSessionResponse, SessionNotification, SetSessionModelRequest, SetSessionModelResponse, SetSessionModeRequest, SetSessionModeResponse, TerminalHandle, TerminalOutputResponse, WriteTextFileRequest, WriteTextFileResponse } from "@agentclientprotocol/sdk";
 import { SettingsManager } from "./settings.js";
 import { CanUseTool, Options, PermissionMode, Query, SDKPartialAssistantMessage, SDKUserMessage } from "@anthropic-ai/claude-agent-sdk";
 import { Pushable } from "./utils.js";
@@ -44,6 +44,7 @@ export type NewSessionMeta = {
          * Those parameters will be used and updated to work with ACP:
          *   - hooks (merged with ACP's hooks)
          *   - mcpServers (merged with ACP's mcpServers)
+         *   - disallowedTools (merged with ACP's disallowedTools)
          */
         options?: Options;
     };
@@ -57,12 +58,12 @@ export type ToolUpdateMeta = {
         toolResponse?: unknown;
     };
 };
-type ToolUseCache = {
+export type ToolUseCache = {
     [key: string]: {
         type: "tool_use" | "server_tool_use" | "mcp_tool_use";
         id: string;
         name: string;
-        input: any;
+        input: unknown;
     };
 };
 export declare class ClaudeAcpAgent implements Agent {
@@ -81,11 +82,19 @@ export declare class ClaudeAcpAgent implements Agent {
     newSession(params: NewSessionRequest): Promise<NewSessionResponse>;
     unstable_forkSession(params: ForkSessionRequest): Promise<ForkSessionResponse>;
     unstable_resumeSession(params: ResumeSessionRequest): Promise<ResumeSessionResponse>;
+    loadSession(params: LoadSessionRequest): Promise<LoadSessionResponse>;
+    /**
+     * List Claude Code sessions by parsing JSONL files
+     * Sessions are stored in ~/.claude/projects/<path-encoded>/
+     * Implements the draft session/list RFD spec
+     */
+    unstable_listSessions(params: ListSessionsRequest): Promise<ListSessionsResponse>;
     authenticate(_params: AuthenticateRequest): Promise<void>;
     prompt(params: PromptRequest): Promise<PromptResponse>;
     cancel(params: CancelNotification): Promise<void>;
     unstable_setSessionModel(params: SetSessionModelRequest): Promise<SetSessionModelResponse | void>;
     setSessionMode(params: SetSessionModeRequest): Promise<SetSessionModeResponse>;
+    private replaySessionHistory;
     readTextFile(params: ReadTextFileRequest): Promise<ReadTextFileResponse>;
     writeTextFile(params: WriteTextFileRequest): Promise<WriteTextFileResponse>;
     canUseTool(sessionId: string): CanUseTool;
@@ -96,7 +105,9 @@ export declare function promptToClaude(prompt: PromptRequest): SDKUserMessage;
  * Convert an SDKAssistantMessage (Claude) to a SessionNotification (ACP).
  * Only handles text, image, and thinking chunks for now.
  */
-export declare function toAcpNotifications(content: string | ContentBlockParam[] | BetaContentBlock[] | BetaRawContentBlockDelta[], role: "assistant" | "user", sessionId: string, toolUseCache: ToolUseCache, client: AgentSideConnection, logger: Logger): SessionNotification[];
+export declare function toAcpNotifications(content: string | ContentBlockParam[] | BetaContentBlock[] | BetaRawContentBlockDelta[], role: "assistant" | "user", sessionId: string, toolUseCache: ToolUseCache, client: AgentSideConnection, logger: Logger, options?: {
+    registerHooks?: boolean;
+}): SessionNotification[];
 export declare function streamEventToAcpNotifications(message: SDKPartialAssistantMessage, sessionId: string, toolUseCache: ToolUseCache, client: AgentSideConnection, logger: Logger): SessionNotification[];
 export declare function runAcp(): void;
 export {};

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":"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"}

package/dist/acp-agent.js

@@ -3,14 +3,31 @@ import { SettingsManager } from "./settings.js";
 import { query, } from "@anthropic-ai/claude-agent-sdk";
 import * as fs from "node:fs";
 import * as path from "node:path";
+import * as readline from "node:readline";
 import * as os from "node:os";
-import { nodeToWebReadable, nodeToWebWritable, Pushable, unreachable } from "./utils.js";
+import { encodeProjectPath, nodeToWebReadable, nodeToWebWritable, Pushable, unreachable, } from "./utils.js";
 import { createMcpServer } from "./mcp-server.js";
 import { EDIT_TOOL_NAMES, acpToolNames } from "./tools.js";
 import { toolInfoFromToolUse, planEntries, toolUpdateFromToolResult, registerHookCallback, createPostToolUseHook, createPreToolUseHook, } from "./tools.js";
 import packageJson from "../package.json" with { type: "json" };
 import { randomUUID } from "node:crypto";
-export const CLAUDE_CONFIG_DIR = process.env.CLAUDE ?? path.join(os.homedir(), ".claude");
+import { fileURLToPath } from "node:url";
+export const CLAUDE_CONFIG_DIR = process.env.CLAUDE_CONFIG_DIR ?? path.join(os.homedir(), ".claude");
+function sessionFilePath(cwd, sessionId) {
+    return path.join(CLAUDE_CONFIG_DIR, "projects", encodeProjectPath(cwd), `${sessionId}.jsonl`);
+}
+const MAX_TITLE_LENGTH = 128;
+function sanitizeTitle(text) {
+    // Replace newlines and collapse whitespace
+    const sanitized = text
+        .replace(/[\r\n]+/g, " ")
+        .replace(/\s+/g, " ")
+        .trim();
+    if (sanitized.length <= MAX_TITLE_LENGTH) {
+        return sanitized;
+    }
+    return sanitized.slice(0, MAX_TITLE_LENGTH - 1) + "…";
+}
 // ==================== 超时配置 ====================
 // 可通过环境变量覆盖默认值
 /** 获取模型列表超时时间（毫秒），默认 30 秒 */
@@ -53,6 +70,7 @@ async function withTimeout(promise, timeoutMs, operationName, logger = console)
 }
 // Bypass Permissions doesn't work if we are a root/sudo user
 const IS_ROOT = (process.geteuid?.() ?? process.getuid?.()) === 0;
+const ALLOW_BYPASS = !IS_ROOT || !!process.env.IS_SANDBOX;
 // Implement the ACP Agent interface
 export class ClaudeAcpAgent {
     constructor(client, logger) {
@@ -71,16 +89,16 @@ export class ClaudeAcpAgent {
             id: "claude-login",
         };
         // If client supports terminal-auth capability, use that instead.
-        // if (request.clientCapabilities?._meta?.["terminal-auth"] === true) {
-        //   const cliPath = fileURLToPath(import.meta.resolve("@anthropic-ai/claude-agent-sdk/cli.js"));
-        //   authMethod._meta = {
-        //     "terminal-auth": {
-        //       command: "node",
-        //       args: [cliPath, "/login"],
-        //       label: "Claude Code Login",
-        //     },
-        //   };
-        // }
+        if (request.clientCapabilities?._meta?.["terminal-auth"] === true) {
+            const cliPath = fileURLToPath(import.meta.resolve("@anthropic-ai/claude-agent-sdk/cli.js"));
+            authMethod._meta = {
+                "terminal-auth": {
+                    command: "node",
+                    args: [cliPath, "/login"],
+                    label: "Claude Code Login",
+                },
+            };
+        }
         return {
             protocolVersion: 1,
             agentCapabilities: {
@@ -92,8 +110,10 @@ export class ClaudeAcpAgent {
                     http: true,
                     sse: true,
                 },
+                loadSession: true,
                 sessionCapabilities: {
                     fork: {},
+                    list: {},
                     resume: {},
                 },
             },
@@ -135,6 +155,171 @@ export class ClaudeAcpAgent {
         });
         return response;
     }
+    async loadSession(params) {
+        try {
+            await fs.promises.access(sessionFilePath(params.cwd, params.sessionId));
+        }
+        catch {
+            throw new Error("Session not found");
+        }
+        const response = await this.createSession({
+            cwd: params.cwd,
+            mcpServers: params.mcpServers ?? [],
+            _meta: params._meta,
+        }, {
+            resume: params.sessionId,
+        });
+        await this.replaySessionHistory(params.sessionId, params.cwd);
+        return {
+            modes: response.modes,
+            models: response.models,
+        };
+    }
+    /**
+     * List Claude Code sessions by parsing JSONL files
+     * Sessions are stored in ~/.claude/projects/<path-encoded>/
+     * Implements the draft session/list RFD spec
+     */
+    async unstable_listSessions(params) {
+        // Note: We load all sessions into memory for sorting, so pagination here is for
+        // API response size limits rather than memory efficiency. This matches the RFD spec.
+        const PAGE_SIZE = 50;
+        const claudeDir = path.join(CLAUDE_CONFIG_DIR, "projects");
+        try {
+            await fs.promises.access(claudeDir);
+        }
+        catch {
+            return { sessions: [] };
+        }
+        // Collect all sessions across all project directories
+        const allSessions = [];
+        const encodedCwdFilter = params.cwd ? encodeProjectPath(params.cwd) : null;
+        try {
+            const projectDirs = await fs.promises.readdir(claudeDir);
+            for (const encodedPath of projectDirs) {
+                const projectDir = path.join(claudeDir, encodedPath);
+                const stat = await fs.promises.stat(projectDir);
+                if (!stat.isDirectory())
+                    continue;
+                // Path encoding is not always reversible (hyphens can be separators or literals),
+                // so only use encoded value as a coarse pre-filter.
+                if (encodedCwdFilter && encodedPath !== encodedCwdFilter)
+                    continue;
+                const files = await fs.promises.readdir(projectDir);
+                // Filter to user session files only. Skip agent-*.jsonl files which contain
+                // internal agent metadata and system logs, not user-visible conversation sessions.
+                const jsonlFiles = files.filter((f) => f.endsWith(".jsonl") && !f.startsWith("agent-"));
+                for (const file of jsonlFiles) {
+                    const filePath = path.join(projectDir, file);
+                    try {
+                        const content = await fs.promises.readFile(filePath, "utf-8");
+                        const lines = content.trim().split("\n").filter(Boolean);
+                        const sessionId = file.replace(".jsonl", "");
+                        let parsedAnyEntry = false;
+                        let sessionCwd;
+                        // Find first user message for title
+                        let title;
+                        for (const line of lines) {
+                            try {
+                                const entry = JSON.parse(line);
+                                parsedAnyEntry = true;
+                                if (entry.isSidechain === true) {
+                                    continue;
+                                }
+                                const entrySessionId = typeof entry.sessionId === "string" ? entry.sessionId : undefined;
+                                if (typeof entry.sessionId === "string" && entry.sessionId !== entrySessionId) {
+                                    continue;
+                                }
+                                if (typeof entry.cwd === "string") {
+                                    sessionCwd = entry.cwd;
+                                }
+                                if (!title && entry.type === "user" && entry.message?.content) {
+                                    const msgContent = entry.message.content;
+                                    if (typeof msgContent === "string") {
+                                        title = sanitizeTitle(msgContent);
+                                    }
+                                    if (Array.isArray(msgContent) && msgContent.length > 0) {
+                                        const first = msgContent[0];
+                                        const text = typeof first === "string"
+                                            ? first
+                                            : first && typeof first === "object" && typeof first.text === "string"
+                                                ? first.text
+                                                : undefined;
+                                        if (text) {
+                                            title = sanitizeTitle(text);
+                                        }
+                                    }
+                                }
+                                // Continue scanning until we have both fields, since cwd can appear
+                                // in later entries even after the first user title-bearing message.
+                                if (title && sessionCwd) {
+                                    break;
+                                }
+                            }
+                            catch {
+                                // Skip malformed lines
+                            }
+                        }
+                        if (!parsedAnyEntry)
+                            continue;
+                        // SessionInfo.cwd is currently required. For entries that do not
+                        // include an explicit cwd in the session JSONL (typically metadata-only files),
+                        // we skip them instead of decoding folder names because path encoding is lossy.
+                        if (!sessionCwd)
+                            continue;
+                        // Even after encoded-path pre-filtering, verify per-entry cwd to disambiguate
+                        // collisions such as "/a-b" and "/a/b" that map to the same encoded folder name.
+                        if (params.cwd && sessionCwd !== params.cwd)
+                            continue;
+                        // Get file modification time as updatedAt
+                        const fileStat = await fs.promises.stat(filePath);
+                        const updatedAt = fileStat.mtime.toISOString();
+                        allSessions.push({
+                            sessionId,
+                            cwd: sessionCwd,
+                            title: title ?? null,
+                            updatedAt,
+                        });
+                    }
+                    catch (err) {
+                        this.logger.error(`[unstable_listSessions] Failed to parse session file: ${filePath}`, err);
+                    }
+                }
+            }
+        }
+        catch (err) {
+            this.logger.error("[unstable_listSessions] Failed to list sessions", err);
+            return { sessions: [] };
+        }
+        // Sort by updatedAt descending (most recent first)
+        allSessions.sort((a, b) => {
+            const timeA = a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
+            const timeB = b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
+            return timeB - timeA;
+        });
+        // Handle pagination with cursor
+        let startIndex = 0;
+        if (params.cursor) {
+            try {
+                const decoded = Buffer.from(params.cursor, "base64").toString("utf-8");
+                const cursorData = JSON.parse(decoded);
+                startIndex = cursorData.offset ?? 0;
+            }
+            catch {
+                // Invalid cursor, start from beginning
+            }
+        }
+        const pageOfSessions = allSessions.slice(startIndex, startIndex + PAGE_SIZE);
+        const hasMore = startIndex + PAGE_SIZE < allSessions.length;
+        const response = {
+            sessions: pageOfSessions,
+        };
+        if (hasMore) {
+            const nextCursor = Buffer.from(JSON.stringify({ offset: startIndex + PAGE_SIZE })).toString("base64");
+            response.nextCursor = nextCursor;
+        }
+        return response;
+    }
     async authenticate(_params) {
         throw new Error("Method not implemented.");
     }
@@ -159,8 +344,12 @@ export class ClaudeAcpAgent {
                         case "init":
                             break;
                         case "compact_boundary":
+                        case "hook_started":
+                        case "task_notification":
+                        case "hook_progress":
                         case "hook_response":
                         case "status":
+                        case "files_persisted":
                             // Todo: process via status api: https://docs.claude.com/en/docs/claude-code/hooks#hook-output
                             break;
                         default:
@@ -215,6 +404,14 @@ export class ClaudeAcpAgent {
                     // their own docs: https://docs.anthropic.com/en/docs/claude-code/sdk/sdk-slash-commands#%2Fcompact-compact-conversation-history
                     if (typeof message.message.content === "string" &&
                         message.message.content.includes("<local-command-stdout>")) {
+                        // Handle /context by sending its reply as regular agent message.
+                        if (message.message.content.includes("Context Usage")) {
+                            for (const notification of toAcpNotifications(message.message.content
+                                .replace("<local-command-stdout>", "")
+                                .replace("</local-command-stdout>", ""), "assistant", params.sessionId, this.toolUseCache, this.client, this.logger)) {
+                                await this.client.sessionUpdate(notification);
+                            }
+                        }
                         this.logger.log(message.message.content);
                         break;
                     }
@@ -249,6 +446,7 @@ export class ClaudeAcpAgent {
                     break;
                 }
                 case "tool_progress":
+                case "tool_use_summary":
                     break;
                 case "auth_status":
                     break;
@@ -295,6 +493,54 @@ export class ClaudeAcpAgent {
                 throw new Error("Invalid Mode");
         }
     }
+    async replaySessionHistory(sessionId, cwd) {
+        const filePath = sessionFilePath(cwd, sessionId);
+        const toolUseCache = {};
+        const stream = fs.createReadStream(filePath, { encoding: "utf-8" });
+        const reader = readline.createInterface({ input: stream, crlfDelay: Infinity });
+        try {
+            for await (const line of reader) {
+                const trimmed = line.trim();
+                if (!trimmed) {
+                    continue;
+                }
+                let entry;
+                try {
+                    entry = JSON.parse(trimmed);
+                }
+                catch {
+                    continue;
+                }
+                if (entry.type !== "user" && entry.type !== "assistant") {
+                    continue;
+                }
+                if (entry.isSidechain) {
+                    continue;
+                }
+                if (entry.sessionId && entry.sessionId !== sessionId) {
+                    continue;
+                }
+                const message = entry.message;
+                if (!message) {
+                    continue;
+                }
+                const role = message.role === "assistant" ? "assistant" : message.role === "user" ? "user" : null;
+                if (!role) {
+                    continue;
+                }
+                const content = message.content;
+                if (typeof content !== "string" && !Array.isArray(content)) {
+                    continue;
+                }
+                for (const notification of toAcpNotifications(content, role, sessionId, toolUseCache, this.client, this.logger, { registerHooks: false })) {
+                    await this.client.sessionUpdate(notification);
+                }
+            }
+        }
+        finally {
+            reader.close();
+        }
+    }
     async readTextFile(params) {
         const response = await this.client.readTextFile(params);
         return response;
@@ -487,11 +733,6 @@ export class ClaudeAcpAgent {
         const permissionMode = "default";
         // Extract options from _meta if provided
         const userProvidedOptions = params._meta?.claudeCode?.options;
-        const extraArgs = { ...userProvidedOptions?.extraArgs };
-        if (creationOpts?.resume === undefined || creationOpts?.forkSession) {
-            // Set our own session id if not resuming an existing session.
-            extraArgs["session-id"] = sessionId;
-        }
         // Configure thinking tokens from environment variable
         const maxThinkingTokens = process.env.MAX_THINKING_TOKENS
             ? parseInt(process.env.MAX_THINKING_TOKENS, 10)
@@ -506,10 +747,9 @@ export class ClaudeAcpAgent {
             cwd: params.cwd,
             includePartialMessages: true,
             mcpServers: { ...(userProvidedOptions?.mcpServers || {}), ...mcpServers },
-            extraArgs,
             // If we want bypassPermissions to be an option, we have to allow it here.
             // But it doesn't work in root mode, so we only activate it if it will work.
-            allowDangerouslySkipPermissions: !IS_ROOT,
+            allowDangerouslySkipPermissions: ALLOW_BYPASS,
             permissionMode,
             canUseTool: this.canUseTool(sessionId),
             // note: although not documented by the types, passing an absolute path
@@ -530,12 +770,32 @@ export class ClaudeAcpAgent {
                 PostToolUse: [
                     ...(userProvidedOptions?.hooks?.PostToolUse || []),
                     {
-                        hooks: [createPostToolUseHook(this.logger)],
+                        hooks: [
+                            createPostToolUseHook(this.logger, {
+                                onEnterPlanMode: async () => {
+                                    const session = this.sessions[sessionId];
+                                    if (session) {
+                                        session.permissionMode = "plan";
+                                    }
+                                    await this.client.sessionUpdate({
+                                        sessionId,
+                                        update: {
+                                            sessionUpdate: "current_mode_update",
+                                            currentModeId: "plan",
+                                        },
+                                    });
+                                },
+                            }),
+                        ],
                     },
                 ],
             },
             ...creationOpts,
         };
+        if (creationOpts?.resume === undefined || creationOpts?.forkSession) {
+            // Set our own session id if not resuming an existing session.
+            options.sessionId = sessionId;
+        }
         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"];
@@ -562,7 +822,7 @@ export class ClaudeAcpAgent {
             options.allowedTools = allowedTools;
         }
         if (disallowedTools.length > 0) {
-            options.disallowedTools = disallowedTools;
+            options.disallowedTools = [...(options.disallowedTools || []), ...disallowedTools];
         }
         // Handle abort controller from meta options
         const abortController = userProvidedOptions?.abortController;
@@ -589,47 +849,10 @@ export class ClaudeAcpAgent {
             permissionMode,
             settingsManager,
         };
-        this.logger.log(`📋 [ACP] 开始获取可用命令和模型...`);
-        // 使用超时保护包装命令获取
-        let availableCommands = [];
-        // try {
-        //   availableCommands = await withTimeout(
-        //     getAvailableSlashCommands(q, this.logger),
-        //     COMMAND_FETCH_TIMEOUT_MS,
-        //     "getAvailableSlashCommands",
-        //     this.logger,
-        //   );
-        // } catch (error) {
-        //   if (USE_DEFAULTS_ON_TIMEOUT) {
-        //     this.logger.log(`⚠️ [ACP] 获取命令失败，使用空列表: ${error}`);
-        //     availableCommands = [];
-        //   } else {
-        //     throw error;
-        //   }
-        // }
-        // 使用超时保护包装模型获取
-        let models = {
-            availableModels: [],
-            currentModelId: "",
-        };
-        // try {
-        //   models = await withTimeout(
-        //     getAvailableModels(q, this.logger),
-        //     MODEL_FETCH_TIMEOUT_MS,
-        //     "getAvailableModels",
-        //     this.logger,
-        //   );
-        // } catch (error) {
-        //   if (USE_DEFAULTS_ON_TIMEOUT) {
-        //     this.logger.log(`⚠️ [ACP] 获取模型失败，使用默认值: ${error}`);
-        //     models = {
-        //       availableModels: [],
-        //       currentModelId: "",
-        //     };
-        //   } else {
-        //     throw error;
-        //   }
-        // }
+        this.logger.log(`📋 [ACP] 等待初始化结果 (模型+命令)...`);
+        const initializationResult = await withTimeout(q.initializationResult(), MODEL_FETCH_TIMEOUT_MS, "initializationResult", this.logger);
+        this.logger.log(`📋 [ACP] 初始化完成, 获取到 ${initializationResult.models.length} 个模型, ${initializationResult.commands.length} 个命令`);
+        const models = await getAvailableModels(q, initializationResult.models, settingsManager);
         const sessionCreateElapsed = Date.now() - sessionCreateStartTime;
         this.logger.log(`✅ [ACP] 会话创建完成, 总耗时: ${sessionCreateElapsed}ms`);
         // Needs to happen after we return the session
@@ -638,7 +861,7 @@ export class ClaudeAcpAgent {
                 sessionId,
                 update: {
                     sessionUpdate: "available_commands_update",
-                    availableCommands,
+                    availableCommands: getAvailableSlashCommands(initializationResult.commands),
                 },
             });
         }, 0);
@@ -665,7 +888,7 @@ export class ClaudeAcpAgent {
             },
         ];
         // Only works in non-root mode
-        if (!IS_ROOT) {
+        if (ALLOW_BYPASS) {
             availableModes.push({
                 id: "bypassPermissions",
                 name: "Bypass Permissions",
@@ -682,42 +905,42 @@ export class ClaudeAcpAgent {
         };
     }
 }
-async function getAvailableModels(query, logger = console) {
-    const startTime = Date.now();
-    logger.log(`   📋 [ACP] 开始获取可用模型列表...`);
-    const models = await query.supportedModels();
-    logger.log(`   📋 [ACP] 获取到 ${models.length} 个模型, 耗时: ${Date.now() - startTime}ms`);
-    // Query doesn't give us access to the currently selected model, so we just choose the first model in the list.
+async function getAvailableModels(query, models, settingsManager) {
     if (models.length === 0) {
-        logger.log(`   ⚠️ [ACP] 没有可用模型`);
         return { availableModels: [], currentModelId: "" };
     }
-    const currentModel = models[0];
+    const settings = settingsManager.getSettings();
+    let currentModel = models[0];
+    if (settings.model) {
+        const match = models.find((m) => m.value === settings.model ||
+            m.value.includes(settings.model) ||
+            settings.model.includes(m.value) ||
+            m.displayName.toLowerCase() === settings.model.toLowerCase() ||
+            m.displayName.toLowerCase().includes(settings.model.toLowerCase()));
+        if (match) {
+            currentModel = match;
+        }
+    }
     await query.setModel(currentModel.value);
-    const availableModels = models.map((model) => ({
-        modelId: model.value,
-        name: model.displayName,
-        description: model.description,
-    }));
     return {
-        availableModels,
+        availableModels: models.map((model) => ({
+            modelId: model.value,
+            name: model.displayName,
+            description: model.description,
+        })),
         currentModelId: currentModel.value,
     };
 }
-async function getAvailableSlashCommands(query, logger = console) {
-    const startTime = Date.now();
-    logger.log(`   📋 [ACP] 开始获取可用斜杠命令...`);
+function getAvailableSlashCommands(commands) {
     const UNSUPPORTED_COMMANDS = [
-        "context",
         "cost",
+        "keybindings-help",
         "login",
         "logout",
         "output-style:new",
         "release-notes",
         "todos",
     ];
-    const commands = await query.supportedCommands();
-    logger.log(`   📋 [ACP] 获取到 ${commands.length} 个斜杠命令, 耗时: ${Date.now() - startTime}ms`);
     return commands
         .map((command) => {
         const input = command.argumentHint
@@ -837,7 +1060,8 @@ export function promptToClaude(prompt) {
  * Convert an SDKAssistantMessage (Claude) to a SessionNotification (ACP).
  * Only handles text, image, and thinking chunks for now.
  */
-export function toAcpNotifications(content, role, sessionId, toolUseCache, client, logger) {
+export function toAcpNotifications(content, role, sessionId, toolUseCache, client, logger, options) {
+    const registerHooks = options?.registerHooks !== false;
     if (typeof content === "string") {
         return [
             {
@@ -902,31 +1126,32 @@ export function toAcpNotifications(content, role, sessionId, toolUseCache, clien
                     }
                 }
                 else {
-                    // Register hook callback to receive the structured output from the hook
-                    registerHookCallback(chunk.id, {
-                        onPostToolUseHook: async (toolUseId, toolInput, toolResponse) => {
-                            const toolUse = toolUseCache[toolUseId];
-                            if (toolUse) {
-                                const update = {
-                                    _meta: {
-                                        claudeCode: {
-                                            toolResponse,
-                                            toolName: toolUse.name,
+                    if (registerHooks) {
+                        registerHookCallback(chunk.id, {
+                            onPostToolUseHook: async (toolUseId, toolInput, toolResponse) => {
+                                const toolUse = toolUseCache[toolUseId];
+                                if (toolUse) {
+                                    const update = {
+                                        _meta: {
+                                            claudeCode: {
+                                                toolResponse,
+                                                toolName: toolUse.name,
+                                            },
                                         },
-                                    },
-                                    toolCallId: toolUseId,
-                                    sessionUpdate: "tool_call_update",
-                                };
-                                await client.sessionUpdate({
-                                    sessionId,
-                                    update,
-                                });
-                            }
-                            else {
-                                logger.error(`[claude-code-acp] Got a tool response for tool use that wasn't tracked: ${toolUseId}`);
-                            }
-                        },
-                    });
+                                        toolCallId: toolUseId,
+                                        sessionUpdate: "tool_call_update",
+                                    };
+                                    await client.sessionUpdate({
+                                        sessionId,
+                                        update,
+                                    });
+                                }
+                                else {
+                                    logger.error(`[claude-code-acp] Got a tool response for tool use that wasn't tracked: ${toolUseId}`);
+                                }
+                            },
+                        });
+                    }
                     let rawInput;
                     try {
                         rawInput = JSON.parse(JSON.stringify(chunk.input));
@@ -972,6 +1197,7 @@ export function toAcpNotifications(content, role, sessionId, toolUseCache, clien
                         toolCallId: chunk.tool_use_id,
                         sessionUpdate: "tool_call_update",
                         status: "is_error" in chunk && chunk.is_error ? "failed" : "completed",
+                        rawOutput: chunk.content,
                         ...toolUpdateFromToolResult(chunk, toolUseCache[chunk.tool_use_id]),
                     };
                 }
@@ -984,6 +1210,8 @@ export function toAcpNotifications(content, role, sessionId, toolUseCache, clien
             case "citations_delta":
             case "signature_delta":
             case "container_upload":
+            case "compaction":
+            case "compaction_delta":
                 break;
             default:
                 unreachable(chunk, logger);

package/dist/mcp-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../src/mcp-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AASpE,OAAO,EAAqB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EACL,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAQlC,eAAO,MAAM,eAAe,iSAIT,CAAC;AA2BpB,wBAAgB,eAAe,CAC7B,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,EACjB,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,GACjD,SAAS,CAgoBX;AA+DD;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,KAAK,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC,GACD;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAyF/C"}
+{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../src/mcp-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AASpE,OAAO,EAAqB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EACL,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAQlC,eAAO,MAAM,eAAe,iSAIT,CAAC;AA2BpB,wBAAgB,eAAe,CAC7B,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,EACjB,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,GACjD,SAAS,CA+qBX;AA+DD;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,KAAK,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC,GACD;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAyF/C"}

package/dist/mcp-server.js

@@ -535,15 +535,54 @@ Output: Create directory 'foo'`),
 
 In sessions with ${acpToolNames.bashOutput} always use it for output from Bash commands instead of TaskOutput.`,
             inputSchema: {
-                bash_id: z
+                task_id: z
                     .string()
                     .describe(`The id of the background bash command as returned by \`${acpToolNames.bash}\``),
+                block: z.boolean().describe("Whether to wait for completion"),
+                timeout: z.number().describe("Max wait time in ms"),
             },
         }, async (input) => {
             try {
-                const bgTerm = agent.backgroundTerminals[input.bash_id];
+                const bgTerm = agent.backgroundTerminals[input.task_id];
                 if (!bgTerm) {
-                    throw new Error(`Unknown shell ${input.bash_id}`);
+                    throw new Error(`Unknown shell ${input.task_id}`);
+                }
+                if (input.block && bgTerm.status === "started") {
+                    const statusPromise = Promise.race([
+                        bgTerm.handle
+                            .waitForExit()
+                            .then((exitStatus) => ({ status: "exited", exitStatus })),
+                        sleep(input.timeout ?? 2 * 60 * 1000).then(async () => {
+                            if (bgTerm.status === "started") {
+                                await bgTerm.handle.kill();
+                            }
+                            return { status: "timedOut", exitStatus: null };
+                        }),
+                    ]);
+                    const { status, exitStatus } = await statusPromise;
+                    const currentOutput = await bgTerm.handle.currentOutput();
+                    const strippedOutput = stripCommonPrefix(bgTerm.lastOutput?.output ?? "", currentOutput.output);
+                    agent.backgroundTerminals[input.task_id] = {
+                        status,
+                        pendingOutput: {
+                            ...currentOutput,
+                            output: strippedOutput,
+                            exitStatus: exitStatus ?? currentOutput.exitStatus,
+                        },
+                    };
+                    await bgTerm.handle.release();
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: toolCommandOutput(status, {
+                                    ...currentOutput,
+                                    output: strippedOutput,
+                                    exitStatus: exitStatus ?? currentOutput.exitStatus,
+                                }),
+                            },
+                        ],
+                    };
                 }
                 if (bgTerm.status === "started") {
                     const newOutput = await bgTerm.handle.currentOutput();

package/dist/settings.d.ts

@@ -19,6 +19,7 @@ export interface PermissionSettings {
 export interface ClaudeCodeSettings {
     permissions?: PermissionSettings;
     env?: Record<string, string>;
+    model?: string;
 }
 export type PermissionDecision = "allow" | "deny" | "ask";
 export interface PermissionCheckResult {

package/dist/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;AAE1D,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;CACnC;AAuLD;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAW/C;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE;QAAE,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;QAAC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;KAAE,CAAC;CAC7E;AAED;;;;;;;;;;GAUG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,cAAc,CAA0B;IAChD,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,QAAQ,CAAC,CAAa;IAC9B,OAAO,CAAC,MAAM,CAAqE;IACnF,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,aAAa,CAA8C;gBAEvD,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB;IAMzD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUjC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAI9B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;OAEG;YACW,eAAe;IAgB7B;;;;OAIG;IACH,OAAO,CAAC,aAAa;IA8CrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAkCrB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAgB5B;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,qBAAqB;IAuC5E;;OAEG;IACH,WAAW,IAAI,kBAAkB;IAIjC;;OAEG;IACH,MAAM,IAAI,MAAM;IAIhB;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxC;;OAEG;IACH,OAAO,IAAI,IAAI;CAYhB"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;AAE1D,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;CACnC;AAwLD;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAW/C;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE;QAAE,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;QAAC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;KAAE,CAAC;CAC7E;AAED;;;;;;;;;;GAUG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,cAAc,CAA0B;IAChD,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,QAAQ,CAAC,CAAa;IAC9B,OAAO,CAAC,MAAM,CAAqE;IACnF,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,aAAa,CAA8C;gBAEvD,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB;IAMzD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUjC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAI9B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;OAEG;YACW,eAAe;IAgB7B;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAkDrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAkCrB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAgB5B;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,qBAAqB;IAuC5E;;OAEG;IACH,WAAW,IAAI,kBAAkB;IAIjC;;OAEG;IACH,MAAM,IAAI,MAAM;IAIhB;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxC;;OAEG;IACH,OAAO,IAAI,IAAI;CAYhB"}

package/dist/settings.js

@@ -81,7 +81,8 @@ function normalizePath(filePath, cwd) {
     else if (!path.isAbsolute(filePath)) {
         filePath = path.join(cwd, filePath);
     }
-    return path.normalize(filePath);
+    // Convert backslashes to forward slashes for minimatch compatibility on Windows
+    return path.normalize(filePath).replace(/\\/g, "/");
 }
 /**
  * Checks if a file path matches a glob pattern
@@ -103,7 +104,7 @@ function matchesRule(rule, toolName, toolInput, cwd) {
     // - "Edit rules apply to all built-in tools that edit files."
     // - "Claude will make a best-effort attempt to apply Read rules to all built-in tools
     //    that read files like Grep, Glob, and LS."
-    const ruleAppliesToTool = rule.toolName === "Bash" ||
+    const ruleAppliesToTool = (rule.toolName === "Bash" && toolName === acpToolNames.bash) ||
         (rule.toolName === "Edit" && FILE_EDITING_TOOLS.includes(toolName)) ||
         (rule.toolName === "Read" && FILE_READING_TOOLS.includes(toolName));
     if (!ruleAppliesToTool) {
@@ -288,6 +289,9 @@ export class SettingsManager {
             if (settings.env) {
                 merged.env = { ...merged.env, ...settings.env };
             }
+            if (settings.model) {
+                merged.model = settings.model;
+            }
         }
         this.mergedSettings = merged;
     }

package/dist/tools.d.ts

@@ -1,5 +1,6 @@
 import { PlanEntry, ToolCallContent, ToolCallLocation, ToolKind } from "@agentclientprotocol/sdk";
 import { ToolResultBlockParam, WebSearchToolResultBlockParam } from "@anthropic-ai/sdk/resources";
+import { BetaBashCodeExecutionToolResultBlockParam, BetaCodeExecutionToolResultBlockParam, BetaRequestMCPToolResultBlockParam, BetaTextEditorCodeExecutionToolResultBlockParam, BetaToolResultBlockParam, BetaToolSearchToolResultBlockParam, BetaWebFetchToolResultBlockParam, BetaWebSearchToolResultBlockParam } from "@anthropic-ai/sdk/resources/beta.mjs";
 export declare const ACP_TOOL_NAME_PREFIX = "mcp__acp__";
 export declare const acpToolNames: {
     read: string;
@@ -10,7 +11,6 @@ export declare const acpToolNames: {
     bashOutput: string;
 };
 export declare const EDIT_TOOL_NAMES: string[];
-import { BetaBashCodeExecutionToolResultBlockParam, BetaCodeExecutionToolResultBlockParam, BetaRequestMCPToolResultBlockParam, BetaTextEditorCodeExecutionToolResultBlockParam, BetaToolSearchToolResultBlockParam, BetaWebFetchToolResultBlockParam, BetaWebSearchToolResultBlockParam } from "@anthropic-ai/sdk/resources/beta.mjs";
 import { HookCallback } from "@anthropic-ai/claude-agent-sdk";
 import { Logger } from "./acp-agent.js";
 import { SettingsManager } from "./settings.js";
@@ -26,7 +26,7 @@ interface ToolUpdate {
     locations?: ToolCallLocation[];
 }
 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 declare function toolUpdateFromToolResult(toolResult: ToolResultBlockParam | BetaToolResultBlockParam | BetaWebSearchToolResultBlockParam | BetaWebFetchToolResultBlockParam | WebSearchToolResultBlockParam | BetaCodeExecutionToolResultBlockParam | BetaBashCodeExecutionToolResultBlockParam | BetaTextEditorCodeExecutionToolResultBlockParam | BetaRequestMCPToolResultBlockParam | BetaToolSearchToolResultBlockParam, toolUse: any | undefined): ToolUpdate;
 export type ClaudePlanEntry = {
     content: string;
     status: "pending" | "in_progress" | "completed";
@@ -39,7 +39,9 @@ export declare function markdownEscape(text: string): string;
 export declare const registerHookCallback: (toolUseID: string, { onPostToolUseHook, }: {
     onPostToolUseHook?: (toolUseID: string, toolInput: unknown, toolResponse: unknown) => Promise<void>;
 }) => void;
-export declare const createPostToolUseHook: (logger?: Logger) => HookCallback;
+export declare const createPostToolUseHook: (logger?: Logger, options?: {
+    onEnterPlanMode?: () => Promise<void>;
+}) => HookCallback;
 /**
  * Creates a PreToolUse hook that checks permissions using the SettingsManager.
  * This runs before the SDK's built-in permission rules, allowing us to enforce

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,EAEL,SAAS,EACT,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,oBAAoB,EAEpB,6BAA6B,EAE9B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,yCAAyC,EAGzC,qCAAqC,EAGrC,kCAAkC,EAClC,+CAA+C,EAK/C,wBAAwB,EACxB,kCAAkC,EAIlC,gCAAgC,EAGhC,iCAAiC,EAElC,MAAM,sCAAsC,CAAC;AAW9C,eAAO,MAAM,oBAAoB,eAAe,CAAC;AACjD,eAAO,MAAM,YAAY;;;;;;;CAOxB,CAAC;AAEF,eAAO,MAAM,eAAe,UAA0C,CAAC;AAyBvE,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,wBAAwB,GACxB,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;AA0GD,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,GAE9B,SAAQ,MAAgB,EACxB,UAAU;IACR,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC,KACA,YAoBF,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC9B,iBAAiB,eAAe,EAAE,SAAQ,MAAgB,KAAG,YA2C7D,CAAC"}

package/dist/tools.js

@@ -448,17 +448,22 @@ export function toolUpdateFromToolResult(toolResult, toolUse) {
 function toAcpContentUpdate(content, isError = false) {
     if (Array.isArray(content) && content.length > 0) {
         return {
-            content: content.map((content) => ({
+            content: content.map((c) => ({
                 type: "content",
-                content: isError && content.type === "text"
-                    ? {
-                        ...content,
-                        text: `\`\`\`\n${content.text}\n\`\`\``,
-                    }
-                    : content,
+                content: toAcpContentBlock(c, isError),
             })),
         };
     }
+    else if (typeof content === "object" && content !== null && "type" in content) {
+        return {
+            content: [
+                {
+                    type: "content",
+                    content: toAcpContentBlock(content, isError),
+                },
+            ],
+        };
+    }
     else if (typeof content === "string" && content.length > 0) {
         return {
             content: [
@@ -474,6 +479,62 @@ function toAcpContentUpdate(content, isError = false) {
     }
     return {};
 }
+function toAcpContentBlock(content, isError) {
+    const wrapText = (text) => ({
+        type: "text",
+        text: isError ? `\`\`\`\n${text}\n\`\`\`` : text,
+    });
+    switch (content.type) {
+        case "text":
+            return {
+                type: "text",
+                text: isError ? `\`\`\`\n${content.text}\n\`\`\`` : content.text,
+            };
+        case "image":
+            if (content.source.type === "base64") {
+                return {
+                    type: "image",
+                    data: content.source.data,
+                    mimeType: content.source.media_type,
+                };
+            }
+            // URL and file-based images can't be converted to ACP format (requires data)
+            return wrapText(content.source.type === "url"
+                ? `[image: ${content.source.url}]`
+                : "[image: file reference]");
+        case "tool_reference":
+            return wrapText(`Tool: ${content.tool_name}`);
+        case "tool_search_tool_search_result":
+            return wrapText(`Tools found: ${content.tool_references.map((r) => r.tool_name).join(", ") || "none"}`);
+        case "tool_search_tool_result_error":
+            return wrapText(`Error: ${content.error_code}${content.error_message ? ` - ${content.error_message}` : ""}`);
+        case "web_search_result":
+            return wrapText(`${content.title} (${content.url})`);
+        case "web_search_tool_result_error":
+            return wrapText(`Error: ${content.error_code}`);
+        case "web_fetch_result":
+            return wrapText(`Fetched: ${content.url}`);
+        case "web_fetch_tool_result_error":
+            return wrapText(`Error: ${content.error_code}`);
+        case "code_execution_result":
+            return wrapText(`Output: ${content.stdout || content.stderr || ""}`);
+        case "bash_code_execution_result":
+            return wrapText(`Output: ${content.stdout || content.stderr || ""}`);
+        case "code_execution_tool_result_error":
+        case "bash_code_execution_tool_result_error":
+            return wrapText(`Error: ${content.error_code}`);
+        case "text_editor_code_execution_view_result":
+            return wrapText(content.content);
+        case "text_editor_code_execution_create_result":
+            return wrapText(content.is_file_update ? "File updated" : "File created");
+        case "text_editor_code_execution_str_replace_result":
+            return wrapText(content.lines?.join("\n") || "");
+        case "text_editor_code_execution_tool_result_error":
+            return wrapText(`Error: ${content.error_code}${content.error_message ? ` - ${content.error_message}` : ""}`);
+        default:
+            return wrapText(JSON.stringify(content));
+    }
+}
 export function planEntries(input) {
     return input.todos.map((input) => ({
         content: input.content,
@@ -499,16 +560,22 @@ export const registerHookCallback = (toolUseID, { onPostToolUseHook, }) => {
     };
 };
 /* A callback for Claude Code that is called when receiving a PostToolUse hook */
-export const createPostToolUseHook = (logger = console) => async (input, toolUseID) => {
-    if (input.hook_event_name === "PostToolUse" && toolUseID) {
-        const onPostToolUseHook = toolUseCallbacks[toolUseID]?.onPostToolUseHook;
-        if (onPostToolUseHook) {
-            await onPostToolUseHook(toolUseID, input.tool_input, input.tool_response);
-            delete toolUseCallbacks[toolUseID]; // Cleanup after execution
+export const createPostToolUseHook = (logger = console, options) => async (input, toolUseID) => {
+    if (input.hook_event_name === "PostToolUse") {
+        // Handle EnterPlanMode tool - notify client of mode change after successful execution
+        if (input.tool_name === "EnterPlanMode" && options?.onEnterPlanMode) {
+            await options.onEnterPlanMode();
         }
-        else {
-            logger.error(`No onPostToolUseHook found for tool use ID: ${toolUseID}`);
-            delete toolUseCallbacks[toolUseID];
+        if (toolUseID) {
+            const onPostToolUseHook = toolUseCallbacks[toolUseID]?.onPostToolUseHook;
+            if (onPostToolUseHook) {
+                await onPostToolUseHook(toolUseID, input.tool_input, input.tool_response);
+                delete toolUseCallbacks[toolUseID]; // Cleanup after execution
+            }
+            else {
+                logger.error(`No onPostToolUseHook found for tool use ID: ${toolUseID}`);
+                delete toolUseCallbacks[toolUseID];
+            }
         }
     }
     return { continue: true };

package/dist/utils.d.ts

@@ -29,4 +29,5 @@ export interface ExtractLinesResult {
  * @returns Object containing extracted content and metadata
  */
 export declare function extractLinesWithByteLimit(fullContent: string, maxContentLength: number): ExtractLinesResult;
+export declare function encodeProjectPath(cwd: string): string;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAA0B,MAAM,eAAe,CAAC;AAG3E,qBAAa,QAAQ,CAAC,CAAC,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;IAClD,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,IAAI,CAAS;IAErB,IAAI,CAAC,IAAI,EAAE,CAAC;IASZ,GAAG;IAQH,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC;CAgB3C;AAGD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAclF;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAUlF;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,GAAE,MAAgB,QAQjE;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjD;AAED,wBAAgB,mBAAmB,IAAI,kBAAkB,GAAG,IAAI,CAM/D;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAM3E;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,GACvB,kBAAkB,CA8CpB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAA0B,MAAM,eAAe,CAAC;AAG3E,qBAAa,QAAQ,CAAC,CAAC,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;IAClD,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,IAAI,CAAS;IAErB,IAAI,CAAC,IAAI,EAAE,CAAC;IASZ,GAAG;IAQH,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC;CAgB3C;AAGD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAclF;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAUlF;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,GAAE,MAAgB,QAQjE;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjD;AAED,wBAAgB,mBAAmB,IAAI,kBAAkB,GAAG,IAAI,CAM/D;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAM3E;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,GACvB,kBAAkB,CA8CpB;AAKD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAUrD"}

package/dist/utils.js

@@ -148,3 +148,16 @@ export function extractLinesWithByteLimit(fullContent, maxContentLength) {
         linesRead: linesSeen,
     };
 }
+// Helper to encode a path like Claude does:
+// - Unix: "/Users/test" -> "-Users-test"
+// - Windows: "C:\Users\test" -> "C-Users-test"
+export function encodeProjectPath(cwd) {
+    const windowsPathMatch = cwd.match(/^([A-Za-z]):[\\/]/);
+    if (windowsPathMatch) {
+        const driveLetter = windowsPathMatch[1];
+        const rest = cwd.slice(2);
+        return `${driveLetter}${rest.replace(/[\\/]/g, "-")}`;
+    }
+    // Unix paths
+    return cwd.replace(/\//g, "-");
+}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.13.1",
+  "version": "0.16.0",
   "description": "An ACP-compatible coding agent powered by the Claude Code SDK (TypeScript)",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
@@ -60,23 +60,23 @@
   "author": "Zed Industries",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agentclientprotocol/sdk": "0.13.0",
-    "@anthropic-ai/claude-agent-sdk": "0.2.7",
-    "@modelcontextprotocol/sdk": "1.25.2",
+    "@agentclientprotocol/sdk": "0.14.1",
+    "@anthropic-ai/claude-agent-sdk": "0.2.34",
+    "@modelcontextprotocol/sdk": "1.26.0",
     "diff": "8.0.3",
-    "minimatch": "10.1.1"
+    "minimatch": "10.1.2"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.71.2",
-    "@types/node": "25.0.8",
-    "@typescript-eslint/eslint-plugin": "8.53.0",
-    "@typescript-eslint/parser": "8.53.0",
+    "@anthropic-ai/sdk": "0.73.0",
+    "@types/node": "25.2.1",
+    "@typescript-eslint/eslint-plugin": "8.54.0",
+    "@typescript-eslint/parser": "8.54.0",
     "eslint": "9.39.2",
     "eslint-config-prettier": "10.1.8",
-    "globals": "17.0.0",
-    "prettier": "3.8.0",
+    "globals": "17.3.0",
+    "prettier": "3.8.1",
     "ts-node": "10.9.2",
     "typescript": "5.9.3",
-    "vitest": "4.0.17"
+    "vitest": "4.0.18"
   }
 }