claude-code-acp-ts 0.16.1 → 0.24.3

package/dist/index.js

@@ -1,20 +1,26 @@
 #!/usr/bin/env node
 // Load managed settings and apply environment variables
 import { loadManagedSettings, applyEnvironmentSettings } from "./utils.js";
-const managedSettings = loadManagedSettings();
-if (managedSettings) {
-    applyEnvironmentSettings(managedSettings);
+import { claudeCliPath, runAcp } from "./acp-agent.js";
+if (process.argv.includes("--cli")) {
+    process.argv = process.argv.filter((arg) => arg !== "--cli");
+    await import(await claudeCliPath());
+}
+else {
+    const managedSettings = loadManagedSettings();
+    if (managedSettings) {
+        applyEnvironmentSettings(managedSettings);
+    }
+    // stdout is used to send messages to the client
+    // we redirect everything else to stderr to make sure it doesn't interfere with ACP
+    console.log = console.error;
+    console.info = console.error;
+    console.warn = console.error;
+    console.debug = console.error;
+    process.on("unhandledRejection", (reason, promise) => {
+        console.error("Unhandled Rejection at:", promise, "reason:", reason);
+    });
+    runAcp();
+    // Keep process alive
+    process.stdin.resume();
 }
-// stdout is used to send messages to the client
-// we redirect everything else to stderr to make sure it doesn't interfere with ACP
-console.log = console.error;
-console.info = console.error;
-console.warn = console.error;
-console.debug = console.error;
-process.on("unhandledRejection", (reason, promise) => {
-    console.error("Unhandled Rejection at:", promise, "reason:", reason);
-});
-import { runAcp } from "./acp-agent.js";
-runAcp();
-// Keep process alive
-process.stdin.resume();

package/dist/lib.d.ts

@@ -1,7 +1,6 @@
 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 { SettingsManager, type ClaudeCodeSettings, type PermissionSettings, type PermissionDecision, type PermissionCheckResult, type SettingsManagerOptions, } from "./settings.js";
+export { toolInfoFromToolUse, toDisplayPath, planEntries, toolUpdateFromToolResult, } from "./tools.js";
+export { SettingsManager, type ClaudeCodeSettings, type SettingsManagerOptions, } from "./settings.js";
 export type { ClaudePlanEntry } from "./tools.js";
 //# sourceMappingURL=lib.d.ts.map

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,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,EACL,mBAAmB,EACnB,aAAa,EACb,WAAW,EACX,wBAAwB,GACzB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,eAAe,EACf,KAAK,kBAAkB,EACvB,KAAK,sBAAsB,GAC5B,MAAM,eAAe,CAAC;AAGvB,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC"}

package/dist/lib.js

@@ -1,6 +1,5 @@
 // Export the main agent class and utilities for library usage
 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, toDisplayPath, planEntries, toolUpdateFromToolResult, } from "./tools.js";
 export { SettingsManager, } from "./settings.js";

package/dist/settings.d.ts

@@ -10,10 +10,6 @@
  * Docs: https://code.claude.com/docs/en/iam#tool-specific-permission-rules
  */
 export interface PermissionSettings {
-    allow?: string[];
-    deny?: string[];
-    ask?: string[];
-    additionalDirectories?: string[];
     defaultMode?: string;
 }
 export interface ClaudeCodeSettings {
@@ -21,12 +17,6 @@ export interface ClaudeCodeSettings {
     env?: Record<string, string>;
     model?: string;
 }
-export type PermissionDecision = "allow" | "deny" | "ask";
-export interface PermissionCheckResult {
-    decision: PermissionDecision;
-    rule?: string;
-    source?: "allow" | "deny" | "ask";
-}
 /**
  * Gets the enterprise settings path based on the current platform
  */
@@ -60,7 +50,9 @@ export declare class SettingsManager {
     private onChange?;
     private logger;
     private initialized;
+    private disposed;
     private debounceTimer;
+    private initPromise;
     constructor(cwd: string, options?: SettingsManagerOptions);
     /**
      * Initialize the settings manager by loading all settings and setting up file watchers
@@ -96,14 +88,6 @@ export declare class SettingsManager {
      * Handles settings file changes with debouncing to avoid rapid reloads
      */
     private handleSettingsChange;
-    /**
-     * Checks if a tool invocation is allowed based on the loaded settings.
-     *
-     * @param toolName - The tool name (can be ACP-prefixed like mcp__acp__Read or plain like Read)
-     * @param toolInput - The tool input object
-     * @returns The permission decision and matching rule info
-     */
-    checkPermission(toolName: string, toolInput: unknown): PermissionCheckResult;
     /**
      * Returns the current merged settings
      */

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;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"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,kBAAkB;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;AA2BD;;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,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAA8C;IACnE,OAAO,CAAC,WAAW,CAA8B;gBAErC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB;IAMzD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBjC;;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;IA8BrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAkCrB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAqB5B;;OAEG;IACH,WAAW,IAAI,kBAAkB;IAIjC;;OAEG;IACH,MAAM,IAAI,MAAM;IAIhB;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUxC;;OAEG;IACH,OAAO,IAAI,IAAI;CAehB"}

package/dist/settings.js

@@ -1,155 +1,12 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import * as os from "node:os";
-import { minimatch } from "minimatch";
-import { ACP_TOOL_NAME_PREFIX, acpToolNames } from "./tools.js";
 import { CLAUDE_CONFIG_DIR } from "./acp-agent.js";
 /**
- * Shell operators that can be used for command chaining/injection
- * These should cause a prefix match to fail to prevent bypasses like:
- * - "safe-cmd && malicious-cmd"
- * - "safe-cmd; malicious-cmd"
- * - "safe-cmd | malicious-cmd"
- * - "safe-cmd || malicious-cmd"
- * - "$(malicious-cmd)"
- * - "`malicious-cmd`"
+ * Reads and parses a JSON settings file, returning an empty object if not found or invalid.
+ * Silently ignores missing files (ENOENT) but logs warnings for other errors
+ * (malformed JSON, permission errors, etc.) to aid debugging.
  */
-const SHELL_OPERATORS = ["&&", "||", ";", "|", "$(", "`", "\n"];
-/**
- * Checks if a string contains shell operators that could allow command chaining
- */
-function containsShellOperator(str) {
-    return SHELL_OPERATORS.some((op) => str.includes(op));
-}
-/*
- * Tools that modify files. Per Claude Code docs:
- * "Edit rules apply to all built-in tools that edit files."
- * This means an Edit(...) rule should match Write, MultiEdit, etc.
- */
-const FILE_EDITING_TOOLS = [acpToolNames.edit, acpToolNames.write];
-/**
- * Tools that read files. Per Claude Code docs:
- * "Claude will make a best-effort attempt to apply Read rules to all built-in tools
- * that read files like Grep and Glob."
- * This means a Read(...) rule should match Grep, Glob, etc.
- */
-const FILE_READING_TOOLS = [acpToolNames.read];
-/**
- * Functions to extract the relevant argument from tool input for permission matching
- */
-const TOOL_ARG_ACCESSORS = {
-    mcp__acp__Read: (input) => input?.file_path,
-    mcp__acp__Edit: (input) => input?.file_path,
-    mcp__acp__Write: (input) => input?.file_path,
-    mcp__acp__Bash: (input) => input?.command,
-};
-/**
- * Parses a permission rule string into its components
- * Examples:
- *   "Read" -> { toolName: "Read" }
- *   "Read(./.env)" -> { toolName: "Read", argument: "./.env" }
- *   "Bash(npm run:*)" -> { toolName: "Bash", argument: "npm run", isWildcard: true }
- */
-function parseRule(rule) {
-    const match = rule.match(/^(\w+)(?:\((.+)\))?$/);
-    if (!match) {
-        return { toolName: rule };
-    }
-    const [, toolName, argument] = match;
-    if (argument && argument.endsWith(":*")) {
-        return {
-            toolName,
-            argument: argument.slice(0, -2),
-            isWildcard: true,
-        };
-    }
-    return { toolName, argument };
-}
-/**
- * Normalizes a path for comparison:
- * - Expands ~ to home directory
- * - Resolves relative paths against cwd
- * - Normalizes path separators
- */
-function normalizePath(filePath, cwd) {
-    if (filePath.startsWith("~/")) {
-        filePath = path.join(os.homedir(), filePath.slice(2));
-    }
-    else if (filePath.startsWith("./")) {
-        filePath = path.join(cwd, filePath.slice(2));
-    }
-    else if (!path.isAbsolute(filePath)) {
-        filePath = path.join(cwd, 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
- */
-function matchesGlob(pattern, filePath, cwd) {
-    const normalizedPattern = normalizePath(pattern, cwd);
-    const normalizedPath = normalizePath(filePath, cwd);
-    return minimatch(normalizedPath, normalizedPattern, {
-        dot: true,
-        matchBase: false,
-        nocase: process.platform === "win32",
-    });
-}
-/**
- * Checks if a tool invocation matches a parsed permission rule
- */
-function matchesRule(rule, toolName, toolInput, cwd) {
-    // Per Claude Code docs:
-    // - "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" && toolName === acpToolNames.bash) ||
-        (rule.toolName === "Edit" && FILE_EDITING_TOOLS.includes(toolName)) ||
-        (rule.toolName === "Read" && FILE_READING_TOOLS.includes(toolName));
-    if (!ruleAppliesToTool) {
-        return false;
-    }
-    if (!rule.argument) {
-        return true;
-    }
-    const argAccessor = TOOL_ARG_ACCESSORS[toolName];
-    if (!argAccessor) {
-        return true;
-    }
-    const actualArg = argAccessor(toolInput);
-    if (!actualArg) {
-        return false;
-    }
-    if (toolName === acpToolNames.bash) {
-        // Per Claude Code docs: https://code.claude.com/docs/en/iam#tool-specific-permission-rules
-        // - Bash(npm run build) matches the EXACT command "npm run build"
-        // - Bash(npm run test:*) matches commands STARTING WITH "npm run test"
-        // The :* suffix enables prefix matching, without it the match is exact
-        //
-        // Also from docs: "Claude Code is aware of shell operators (like &&) so a prefix match
-        // rule like Bash(safe-cmd:*) won't give it permission to run the command safe-cmd && other-cmd"
-        if (rule.isWildcard) {
-            if (!actualArg.startsWith(rule.argument)) {
-                return false;
-            }
-            // Check that the matched prefix isn't followed by shell operators that could
-            // allow command chaining/injection
-            const remainder = actualArg.slice(rule.argument.length);
-            if (containsShellOperator(remainder)) {
-                return false;
-            }
-            return true;
-        }
-        return actualArg === rule.argument;
-    }
-    // For file-based tools (Read, Edit, Write), use glob matching
-    return matchesGlob(rule.argument, actualArg, cwd);
-}
-/**
- * Reads and parses a JSON settings file, returning an empty object if not found or invalid
- */
-async function loadSettingsFile(filePath) {
+async function loadSettingsFile(filePath, logger) {
     if (!filePath) {
         return {};
     }
@@ -157,7 +14,11 @@ async function loadSettingsFile(filePath) {
         const content = await fs.promises.readFile(filePath, "utf-8");
         return JSON.parse(content);
     }
-    catch {
+    catch (error) {
+        if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+            return {};
+        }
+        logger?.error(`Failed to load settings from ${filePath}:`, error);
         return {};
     }
 }
@@ -196,7 +57,9 @@ export class SettingsManager {
         this.mergedSettings = {};
         this.watchers = [];
         this.initialized = false;
+        this.disposed = false;
         this.debounceTimer = null;
+        this.initPromise = null;
         this.cwd = cwd;
         this.onChange = options?.onChange;
         this.logger = options?.logger ?? console;
@@ -208,9 +71,18 @@ export class SettingsManager {
         if (this.initialized) {
             return;
         }
-        await this.loadAllSettings();
-        this.setupWatchers();
-        this.initialized = true;
+        if (this.initPromise) {
+            return this.initPromise;
+        }
+        this.disposed = false;
+        this.initPromise = this.loadAllSettings().then(() => {
+            if (!this.disposed) {
+                this.setupWatchers();
+                this.initialized = true;
+            }
+            this.initPromise = null;
+        });
+        return this.initPromise;
     }
     /**
      * Returns the path to the user settings file
@@ -235,10 +107,10 @@ export class SettingsManager {
      */
     async loadAllSettings() {
         const [userSettings, projectSettings, localSettings, enterpriseSettings] = await Promise.all([
-            loadSettingsFile(this.getUserSettingsPath()),
-            loadSettingsFile(this.getProjectSettingsPath()),
-            loadSettingsFile(this.getLocalSettingsPath()),
-            loadSettingsFile(getManagedSettingsPath()),
+            loadSettingsFile(this.getUserSettingsPath(), this.logger),
+            loadSettingsFile(this.getProjectSettingsPath(), this.logger),
+            loadSettingsFile(this.getLocalSettingsPath(), this.logger),
+            loadSettingsFile(getManagedSettingsPath(), this.logger),
         ]);
         this.userSettings = userSettings;
         this.projectSettings = projectSettings;
@@ -258,40 +130,20 @@ export class SettingsManager {
             this.localSettings,
             this.enterpriseSettings,
         ];
-        const merged = {
-            permissions: {
-                allow: [],
-                deny: [],
-                ask: [],
-            },
-        };
+        const merged = {};
         for (const settings of allSettings) {
-            if (settings.permissions) {
-                if (settings.permissions.allow) {
-                    merged.permissions.allow.push(...settings.permissions.allow);
-                }
-                if (settings.permissions.deny) {
-                    merged.permissions.deny.push(...settings.permissions.deny);
-                }
-                if (settings.permissions.ask) {
-                    merged.permissions.ask.push(...settings.permissions.ask);
-                }
-                if (settings.permissions.additionalDirectories) {
-                    merged.permissions.additionalDirectories = [
-                        ...(merged.permissions.additionalDirectories || []),
-                        ...settings.permissions.additionalDirectories,
-                    ];
-                }
-                if (settings.permissions.defaultMode) {
-                    merged.permissions.defaultMode = settings.permissions.defaultMode;
-                }
-            }
             if (settings.env) {
                 merged.env = { ...merged.env, ...settings.env };
             }
             if (settings.model) {
                 merged.model = settings.model;
             }
+            if (settings.permissions?.defaultMode !== undefined) {
+                merged.permissions = {
+                    ...merged.permissions,
+                    defaultMode: settings.permissions.defaultMode,
+                };
+            }
         }
         this.mergedSettings = merged;
     }
@@ -337,54 +189,20 @@ export class SettingsManager {
         }
         this.debounceTimer = setTimeout(async () => {
             this.debounceTimer = null;
+            if (this.disposed) {
+                return;
+            }
             try {
                 await this.loadAllSettings();
-                this.onChange?.();
+                if (!this.disposed) {
+                    this.onChange?.();
+                }
             }
             catch (error) {
                 this.logger.error("Failed to reload settings:", error);
             }
         }, 100);
     }
-    /**
-     * Checks if a tool invocation is allowed based on the loaded settings.
-     *
-     * @param toolName - The tool name (can be ACP-prefixed like mcp__acp__Read or plain like Read)
-     * @param toolInput - The tool input object
-     * @returns The permission decision and matching rule info
-     */
-    checkPermission(toolName, toolInput) {
-        if (!toolName.startsWith(ACP_TOOL_NAME_PREFIX)) {
-            return { decision: "ask" };
-        }
-        const permissions = this.mergedSettings.permissions;
-        if (!permissions) {
-            return { decision: "ask" };
-        }
-        // Check deny rules first (highest priority)
-        for (const rule of permissions.deny || []) {
-            const parsed = parseRule(rule);
-            if (matchesRule(parsed, toolName, toolInput, this.cwd)) {
-                return { decision: "deny", rule, source: "deny" };
-            }
-        }
-        // Check allow rules
-        for (const rule of permissions.allow || []) {
-            const parsed = parseRule(rule);
-            if (matchesRule(parsed, toolName, toolInput, this.cwd)) {
-                return { decision: "allow", rule, source: "allow" };
-            }
-        }
-        // Check ask rules
-        for (const rule of permissions.ask || []) {
-            const parsed = parseRule(rule);
-            if (matchesRule(parsed, toolName, toolInput, this.cwd)) {
-                return { decision: "ask", rule, source: "ask" };
-            }
-        }
-        // No matching rule - default to ask
-        return { decision: "ask" };
-    }
     /**
      * Returns the current merged settings
      */
@@ -406,13 +224,15 @@ export class SettingsManager {
         }
         this.dispose();
         this.cwd = cwd;
-        this.initialized = false;
         await this.initialize();
     }
     /**
      * Disposes of file watchers and cleans up resources
      */
     dispose() {
+        this.disposed = true;
+        this.initialized = false;
+        this.initPromise = null;
         if (this.debounceTimer) {
             clearTimeout(this.debounceTimer);
             this.debounceTimer = null;
@@ -421,6 +241,5 @@ export class SettingsManager {
             watcher.close();
         }
         this.watchers = [];
-        this.initialized = false;
     }
 }

package/dist/tools.d.ts

@@ -1,19 +1,8 @@
 import { PlanEntry, ToolCallContent, ToolCallLocation, ToolKind } from "@agentclientprotocol/sdk";
+import { HookCallback } from "@anthropic-ai/claude-agent-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;
-    edit: string;
-    write: string;
-    bash: string;
-    killShell: string;
-    bashOutput: string;
-};
-export declare const EDIT_TOOL_NAMES: string[];
-import { HookCallback } from "@anthropic-ai/claude-agent-sdk";
 import { Logger } from "./acp-agent.js";
-import { SettingsManager } from "./settings.js";
 interface ToolInfo {
     title: string;
     kind: ToolKind;
@@ -24,9 +13,28 @@ interface ToolUpdate {
     title?: string;
     content?: ToolCallContent[];
     locations?: ToolCallLocation[];
+    _meta?: {
+        terminal_info?: {
+            terminal_id: string;
+        };
+        terminal_output?: {
+            terminal_id: string;
+            data: string;
+        };
+        terminal_exit?: {
+            terminal_id: string;
+            exit_code: number;
+            signal: string | null;
+        };
+    };
 }
-export declare function toolInfoFromToolUse(toolUse: any): ToolInfo;
-export declare function toolUpdateFromToolResult(toolResult: ToolResultBlockParam | BetaToolResultBlockParam | BetaWebSearchToolResultBlockParam | BetaWebFetchToolResultBlockParam | WebSearchToolResultBlockParam | BetaCodeExecutionToolResultBlockParam | BetaBashCodeExecutionToolResultBlockParam | BetaTextEditorCodeExecutionToolResultBlockParam | BetaRequestMCPToolResultBlockParam | BetaToolSearchToolResultBlockParam, toolUse: any | undefined): ToolUpdate;
+/**
+ * Convert an absolute file path to a project-relative path for display.
+ * Returns the original path if it's outside the project directory or if no cwd is provided.
+ */
+export declare function toDisplayPath(filePath: string, cwd?: string): string;
+export declare function toolInfoFromToolUse(toolUse: any, supportsTerminalOutput?: boolean, cwd?: string): ToolInfo;
+export declare function toolUpdateFromToolResult(toolResult: ToolResultBlockParam | BetaToolResultBlockParam | BetaWebSearchToolResultBlockParam | BetaWebFetchToolResultBlockParam | WebSearchToolResultBlockParam | BetaCodeExecutionToolResultBlockParam | BetaBashCodeExecutionToolResultBlockParam | BetaTextEditorCodeExecutionToolResultBlockParam | BetaRequestMCPToolResultBlockParam | BetaToolSearchToolResultBlockParam, toolUse: any | undefined, supportsTerminalOutput?: boolean): ToolUpdate;
 export type ClaudePlanEntry = {
     content: string;
     status: "pending" | "in_progress" | "completed";
@@ -36,17 +44,21 @@ export declare function planEntries(input: {
     todos: ClaudePlanEntry[];
 }): PlanEntry[];
 export declare function markdownEscape(text: string): string;
+/**
+ * Builds diff ToolUpdate content from the structured Edit toolResponse provided
+ * by the PostToolUse hook. Unlike parsing the plain unified diff string, this uses
+ * the pre-parsed structuredPatch which supports multiple replacement sites (replaceAll)
+ * and always includes context lines for better readability.
+ */
+export declare function toolUpdateFromEditToolResponse(toolResponse: unknown): {
+    content?: ToolCallContent[];
+    locations?: ToolCallLocation[];
+};
 export declare const registerHookCallback: (toolUseID: string, { onPostToolUseHook, }: {
     onPostToolUseHook?: (toolUseID: string, toolInput: unknown, toolResponse: unknown) => Promise<void>;
 }) => void;
 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
- * our own permission settings for ACP-prefixed tools.
- */
-export declare const createPreToolUseHook: (settingsManager: SettingsManager, logger?: Logger) => HookCallback;
 export {};
 //# sourceMappingURL=tools.d.ts.map

package/dist/tools.d.ts.map

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