@dexto/core 1.3.0 → 1.5.0

package/dist/tools/tool-manager.cjs

@@ -68,9 +68,12 @@ __export(tool_manager_exports, {
 module.exports = __toCommonJS(tool_manager_exports);
 var import_provider = require("./internal-tools/provider.js");
 var import_errors = require("./errors.js");
+var import_error_codes = require("./error-codes.js");
+var import_errors2 = require("../errors/index.js");
 var import_types2 = require("../logger/v2/types.js");
 var import_types3 = require("../approval/types.js");
 var import_decorators = require("../telemetry/decorators.js");
+var import_bash_pattern_utils = require("./bash-pattern-utils.js");
 var _ToolManager_decorators, _init;
 _ToolManager_decorators = [(0, import_decorators.InstrumentClass)({
   prefix: "tool",
@@ -96,6 +99,7 @@ let _ToolManager = class _ToolManager {
   // Tool source prefixing - ALL tools get prefixed by source
   static MCP_TOOL_PREFIX = "mcp--";
   static INTERNAL_TOOL_PREFIX = "internal--";
+  static CUSTOM_TOOL_PREFIX = "custom--";
   // Tool caching for performance
   toolsCache = {};
   cacheValid = false;
@@ -108,11 +112,15 @@ let _ToolManager = class _ToolManager {
     this.agentEventBus = agentEventBus;
     this.toolPolicies = toolPolicies;
     this.logger = logger.createChild(import_types2.DextoLogComponent.TOOLS);
-    if (options?.internalToolsConfig && options.internalToolsConfig.length > 0) {
+    if (options?.internalToolsConfig && options.internalToolsConfig.length > 0 || options?.customToolsConfig && options.customToolsConfig.length > 0) {
+      const internalToolsServices = {
+        ...options.internalToolsServices,
+        approvalManager
+      };
       this.internalToolsProvider = new import_provider.InternalToolsProvider(
-        options.internalToolsServices || {},
-        approvalManager,
-        options.internalToolsConfig,
+        internalToolsServices,
+        options.internalToolsConfig || [],
+        options.customToolsConfig || [],
         this.logger
       );
     }
@@ -137,6 +145,16 @@ let _ToolManager = class _ToolManager {
     this.stateManager = stateManager;
     this.logger.debug("Plugin support configured for ToolManager");
   }
+  /**
+   * Set agent reference for custom tools (called after construction to avoid circular dependencies)
+   * Must be called before initialize() if custom tools are configured
+   */
+  setAgent(agent) {
+    if (this.internalToolsProvider) {
+      this.internalToolsProvider.setAgent(agent);
+      this.logger.debug("Agent reference configured for custom tools");
+    }
+  }
   /**
    * Invalidate the tools cache when tool sources change
    */
@@ -163,6 +181,37 @@ let _ToolManager = class _ToolManager {
       this.invalidateCache();
     });
   }
+  // ==================== Bash Pattern Approval Helpers ====================
+  /**
+   * Check if a tool name represents a bash execution tool
+   */
+  isBashTool(toolName) {
+    return toolName === "bash_exec" || toolName === "internal--bash_exec" || toolName === "custom--bash_exec";
+  }
+  /**
+   * Check if a bash command is covered by any approved pattern.
+   * Generates a pattern key from the command, then checks if it's covered by stored patterns.
+   *
+   * Returns approval info if covered, or pattern suggestions if not.
+   */
+  checkBashPatternApproval(command) {
+    const patternKey = (0, import_bash_pattern_utils.generateBashPatternKey)(command);
+    if (!patternKey) {
+      if ((0, import_bash_pattern_utils.isDangerousCommand)(command)) {
+        this.logger.debug(
+          `Skipping pattern generation for dangerous command: ${command.split(/\s+/)[0]}`
+        );
+      }
+      return { approved: false, suggestedPatterns: [] };
+    }
+    if (this.approvalManager.matchesBashPattern(patternKey)) {
+      return { approved: true };
+    }
+    return {
+      approved: false,
+      suggestedPatterns: (0, import_bash_pattern_utils.generateBashPatternSuggestions)(command)
+    };
+  }
   getMcpManager() {
     return this.mcpManager;
   }
@@ -191,6 +240,7 @@ let _ToolManager = class _ToolManager {
     const allTools = {};
     let mcpTools = {};
     let internalTools = {};
+    let customTools = {};
     try {
       mcpTools = await this.mcpManager.getAllTools();
     } catch (error) {
@@ -200,13 +250,21 @@ let _ToolManager = class _ToolManager {
       mcpTools = {};
     }
     try {
-      internalTools = this.internalToolsProvider?.getAllTools() || {};
+      internalTools = this.internalToolsProvider?.getInternalTools() || {};
     } catch (error) {
       this.logger.error(
         `Failed to get internal tools: ${error instanceof Error ? error.message : String(error)}`
       );
       internalTools = {};
     }
+    try {
+      customTools = this.internalToolsProvider?.getCustomTools() || {};
+    } catch (error) {
+      this.logger.error(
+        `Failed to get custom tools: ${error instanceof Error ? error.message : String(error)}`
+      );
+      customTools = {};
+    }
     for (const [toolName, toolDef] of Object.entries(internalTools)) {
       const qualifiedName = `${_ToolManager.INTERNAL_TOOL_PREFIX}${toolName}`;
       allTools[qualifiedName] = {
@@ -215,6 +273,14 @@ let _ToolManager = class _ToolManager {
         description: `${toolDef.description || "No description provided"} (internal tool)`
       };
     }
+    for (const [toolName, toolDef] of Object.entries(customTools)) {
+      const qualifiedName = `${_ToolManager.CUSTOM_TOOL_PREFIX}${toolName}`;
+      allTools[qualifiedName] = {
+        ...toolDef,
+        name: qualifiedName,
+        description: `${toolDef.description || "No description provided"} (custom tool)`
+      };
+    }
     for (const [toolName, toolDef] of Object.entries(mcpTools)) {
       const qualifiedName = `${_ToolManager.MCP_TOOL_PREFIX}${toolName}`;
       allTools[qualifiedName] = {
@@ -226,8 +292,9 @@ let _ToolManager = class _ToolManager {
     const totalTools = Object.keys(allTools).length;
     const mcpCount = Object.keys(mcpTools).length;
     const internalCount = Object.keys(internalTools).length;
+    const customCount = Object.keys(customTools).length;
     this.logger.debug(
-      `\u{1F527} Unified tool discovery: ${totalTools} total tools (${mcpCount} MCP \u2192 ${_ToolManager.MCP_TOOL_PREFIX}*, ${internalCount} internal \u2192 ${_ToolManager.INTERNAL_TOOL_PREFIX}*)`
+      `\u{1F527} Unified tool discovery: ${totalTools} total tools (${mcpCount} MCP, ${internalCount} internal, ${customCount} custom)`
     );
     return allTools;
   }
@@ -247,15 +314,41 @@ let _ToolManager = class _ToolManager {
   /**
    * Execute a tool by routing based on universal prefix
    * ALL tools must have source prefix - no exceptions
+   *
+   * @param toolName The fully qualified tool name (e.g., "internal--edit_file")
+   * @param args The arguments for the tool
+   * @param toolCallId The unique tool call ID for tracking (from LLM or generated for direct calls)
+   * @param sessionId Optional session ID for context
+   * @param abortSignal Optional abort signal for cancellation support
    */
-  async executeTool(toolName, args, sessionId) {
-    this.logger.debug(`\u{1F527} Tool execution requested: '${toolName}'`);
+  async executeTool(toolName, args, toolCallId, sessionId, abortSignal) {
+    this.logger.debug(`\u{1F527} Tool execution requested: '${toolName}' (toolCallId: ${toolCallId})`);
     this.logger.debug(`Tool args: ${JSON.stringify(args, null, 2)}`);
-    await this.handleToolApproval(toolName, args, sessionId);
+    if (sessionId) {
+      this.agentEventBus.emit("llm:tool-call", {
+        toolName,
+        args,
+        callId: toolCallId,
+        sessionId
+      });
+    }
+    const { requireApproval, approvalStatus } = await this.handleToolApproval(
+      toolName,
+      args,
+      toolCallId,
+      sessionId
+    );
     this.logger.debug(`\u2705 Tool execution approved: ${toolName}`);
     this.logger.info(
       `\u{1F527} Tool execution started for ${toolName}, sessionId: ${sessionId ?? "global"}`
     );
+    if (sessionId) {
+      this.agentEventBus.emit("tool:running", {
+        toolName,
+        toolCallId,
+        sessionId
+      });
+    }
     const startTime = Date.now();
     if (this.pluginManager && this.sessionManager && this.stateManager) {
       const beforePayload = {
@@ -299,16 +392,33 @@ let _ToolManager = class _ToolManager {
         result = await this.internalToolsProvider.executeTool(
           actualToolName,
           args,
-          sessionId
+          sessionId,
+          abortSignal
+        );
+      } else if (toolName.startsWith(_ToolManager.CUSTOM_TOOL_PREFIX)) {
+        this.logger.debug(`\u{1F527} Detected custom tool: '${toolName}'`);
+        const actualToolName = toolName.substring(_ToolManager.CUSTOM_TOOL_PREFIX.length);
+        if (actualToolName.length === 0) {
+          throw import_errors.ToolError.invalidName(toolName, "tool name cannot be empty after prefix");
+        }
+        if (!this.internalToolsProvider) {
+          throw import_errors.ToolError.internalToolsNotInitialized(toolName);
+        }
+        this.logger.debug(`\u{1F3AF} Custom routing: '${toolName}' -> '${actualToolName}'`);
+        result = await this.internalToolsProvider.executeTool(
+          actualToolName,
+          args,
+          sessionId,
+          abortSignal
         );
       } else {
         this.logger.debug(`\u{1F527} Detected tool without proper prefix: '${toolName}'`);
         const stats = await this.getToolStats();
         this.logger.error(
-          `\u274C Tool missing source prefix: '${toolName}' (expected '${_ToolManager.MCP_TOOL_PREFIX}*' or '${_ToolManager.INTERNAL_TOOL_PREFIX}*')`
+          `\u274C Tool missing source prefix: '${toolName}' (expected '${_ToolManager.MCP_TOOL_PREFIX}*', '${_ToolManager.INTERNAL_TOOL_PREFIX}*', or '${_ToolManager.CUSTOM_TOOL_PREFIX}*')`
         );
         this.logger.debug(
-          `Available: ${stats.mcp} MCP tools, ${stats.internal} internal tools`
+          `Available: ${stats.mcp} MCP, ${stats.internal} internal, ${stats.custom} custom tools`
         );
         throw import_errors.ToolError.notFound(toolName);
       }
@@ -337,7 +447,10 @@ let _ToolManager = class _ToolManager {
         );
         result = modifiedPayload.result;
       }
-      return result;
+      return {
+        result,
+        ...requireApproval && { requireApproval, approvalStatus }
+      };
     } catch (error) {
       const duration = Date.now() - startTime;
       this.logger.error(
@@ -371,7 +484,11 @@ let _ToolManager = class _ToolManager {
     }
     if (toolName.startsWith(_ToolManager.INTERNAL_TOOL_PREFIX)) {
       const actualToolName = toolName.substring(_ToolManager.INTERNAL_TOOL_PREFIX.length);
-      return this.internalToolsProvider?.hasTool(actualToolName) ?? false;
+      return this.internalToolsProvider?.hasInternalTool(actualToolName) ?? false;
+    }
+    if (toolName.startsWith(_ToolManager.CUSTOM_TOOL_PREFIX)) {
+      const actualToolName = toolName.substring(_ToolManager.CUSTOM_TOOL_PREFIX.length);
+      return this.internalToolsProvider?.hasCustomTool(actualToolName) ?? false;
     }
     return false;
   }
@@ -381,6 +498,7 @@ let _ToolManager = class _ToolManager {
   async getToolStats() {
     let mcpTools = {};
     let internalTools = {};
+    let customTools = {};
     try {
       mcpTools = await this.mcpManager.getAllTools();
     } catch (error) {
@@ -390,24 +508,33 @@ let _ToolManager = class _ToolManager {
       mcpTools = {};
     }
     try {
-      internalTools = this.internalToolsProvider?.getAllTools() || {};
+      internalTools = this.internalToolsProvider?.getInternalTools() || {};
     } catch (error) {
       this.logger.error(
         `Failed to get internal tools for stats: ${error instanceof Error ? error.message : String(error)}`
       );
       internalTools = {};
     }
+    try {
+      customTools = this.internalToolsProvider?.getCustomTools() || {};
+    } catch (error) {
+      this.logger.error(
+        `Failed to get custom tools for stats: ${error instanceof Error ? error.message : String(error)}`
+      );
+      customTools = {};
+    }
     const mcpCount = Object.keys(mcpTools).length;
     const internalCount = Object.keys(internalTools).length;
+    const customCount = Object.keys(customTools).length;
     return {
-      total: mcpCount + internalCount,
-      // No conflicts with universal prefixing
+      total: mcpCount + internalCount + customCount,
       mcp: mcpCount,
-      internal: internalCount
+      internal: internalCount,
+      custom: customCount
     };
   }
   /**
-   * Get the source of a tool (mcp, internal, or unknown)
+   * Get the source of a tool (mcp, internal, custom, or unknown)
    * @param toolName The name of the tool to check
    * @returns The source of the tool
    */
@@ -418,6 +545,9 @@ let _ToolManager = class _ToolManager {
     if (toolName.startsWith(_ToolManager.INTERNAL_TOOL_PREFIX) && toolName.length > _ToolManager.INTERNAL_TOOL_PREFIX.length) {
       return "internal";
     }
+    if (toolName.startsWith(_ToolManager.CUSTOM_TOOL_PREFIX) && toolName.length > _ToolManager.CUSTOM_TOOL_PREFIX.length) {
+      return "custom";
+    }
     return "unknown";
   }
   /**
@@ -473,12 +603,73 @@ let _ToolManager = class _ToolManager {
       (pattern) => this.matchesToolPolicy(toolName, pattern)
     );
   }
+  /**
+   * Check if a tool has a custom approval override and handle it.
+   * Tools can implement getApprovalOverride() to request specialized approval flows
+   * (e.g., directory access approval for file tools) instead of default tool confirmation.
+   *
+   * @param toolName The fully qualified tool name
+   * @param args The tool arguments
+   * @param sessionId Optional session ID
+   * @returns { handled: true } if custom approval was processed, { handled: false } to continue normal flow
+   */
+  async checkCustomApprovalOverride(toolName, args, sessionId) {
+    let actualToolName;
+    if (toolName.startsWith(_ToolManager.INTERNAL_TOOL_PREFIX)) {
+      actualToolName = toolName.substring(_ToolManager.INTERNAL_TOOL_PREFIX.length);
+    } else if (toolName.startsWith(_ToolManager.CUSTOM_TOOL_PREFIX)) {
+      actualToolName = toolName.substring(_ToolManager.CUSTOM_TOOL_PREFIX.length);
+    }
+    if (!actualToolName || !this.internalToolsProvider) {
+      return { handled: false };
+    }
+    const tool = this.internalToolsProvider.getTool(actualToolName);
+    if (!tool?.getApprovalOverride) {
+      return { handled: false };
+    }
+    const approvalRequest = tool.getApprovalOverride(args);
+    if (!approvalRequest) {
+      return { handled: false };
+    }
+    this.logger.debug(
+      `Tool '${toolName}' requested custom approval: type=${approvalRequest.type}`
+    );
+    if (sessionId && !approvalRequest.sessionId) {
+      approvalRequest.sessionId = sessionId;
+    }
+    const response = await this.approvalManager.requestApproval(approvalRequest);
+    if (response.status === import_types3.ApprovalStatus.APPROVED) {
+      if (tool.onApprovalGranted) {
+        tool.onApprovalGranted(response);
+      }
+      this.logger.info(
+        `Custom approval granted for '${toolName}', type=${approvalRequest.type}, session=${sessionId ?? "global"}`
+      );
+      return { handled: true };
+    }
+    this.logger.info(
+      `Custom approval denied for '${toolName}', type=${approvalRequest.type}, reason=${response.reason ?? "unknown"}`
+    );
+    if (approvalRequest.type === "directory_access") {
+      const metadata = approvalRequest.metadata;
+      throw import_errors.ToolError.directoryAccessDenied(
+        metadata?.parentDir ?? "unknown directory",
+        sessionId
+      );
+    }
+    throw import_errors.ToolError.executionDenied(toolName, sessionId);
+  }
   /**
    * Handle tool approval/confirmation flow
    * Checks allowed list, manages approval modes (manual, auto-approve, auto-deny),
    * and handles remember choice logic
+   *
+   * @param toolName The fully qualified tool name
+   * @param args The arguments for the tool
+   * @param toolCallId The unique tool call ID for tracking parallel tool calls
+   * @param sessionId Optional session ID for context
    */
-  async handleToolApproval(toolName, args, sessionId) {
+  async handleToolApproval(toolName, args, toolCallId, sessionId) {
     if (this.isInAlwaysDenyList(toolName)) {
       this.logger.info(
         `Tool '${toolName}' is in static deny list \u2013 blocking execution (session: ${sessionId ?? "global"})`
@@ -486,22 +677,43 @@ let _ToolManager = class _ToolManager {
       this.logger.debug(`\u{1F6AB} Tool execution blocked by policy: ${toolName}`);
       throw import_errors.ToolError.executionDenied(toolName, sessionId);
     }
+    const customApprovalResult = await this.checkCustomApprovalOverride(
+      toolName,
+      args,
+      sessionId
+    );
+    if (customApprovalResult.handled) {
+      return { requireApproval: true, approvalStatus: "approved" };
+    }
     if (this.isInAlwaysAllowList(toolName)) {
       this.logger.info(
         `Tool '${toolName}' is in static allow list \u2013 skipping confirmation (session: ${sessionId ?? "global"})`
       );
-      return;
+      return { requireApproval: false };
     }
     const isAllowed = await this.allowedToolsProvider.isToolAllowed(toolName, sessionId);
     if (isAllowed) {
       this.logger.info(
         `Tool '${toolName}' already allowed for session '${sessionId ?? "global"}' \u2013 skipping confirmation.`
       );
-      return;
+      return { requireApproval: false };
+    }
+    let bashPatternResult;
+    if (this.isBashTool(toolName)) {
+      const command = args.command;
+      if (command) {
+        bashPatternResult = this.checkBashPatternApproval(command);
+        if (bashPatternResult.approved) {
+          this.logger.info(
+            `Bash command '${command}' matched approved pattern \u2013 skipping confirmation.`
+          );
+          return { requireApproval: false };
+        }
+      }
     }
     if (this.approvalMode === "auto-approve") {
       this.logger.debug(`\u{1F7E2} Auto-approving tool execution: ${toolName}`);
-      return;
+      return { requireApproval: false };
     }
     if (this.approvalMode === "auto-deny") {
       this.logger.debug(`\u{1F6AB} Auto-denying tool execution: ${toolName}`);
@@ -511,21 +723,57 @@ let _ToolManager = class _ToolManager {
       `Tool confirmation requested for ${toolName}, sessionId: ${sessionId ?? "global"}`
     );
     try {
+      let displayPreview;
+      const actualToolName = toolName.replace(/^internal--/, "");
+      const internalTool = this.internalToolsProvider?.getTool(actualToolName);
+      if (internalTool?.generatePreview) {
+        try {
+          const context = { sessionId };
+          const preview = await internalTool.generatePreview(args, context);
+          displayPreview = preview ?? void 0;
+          this.logger.debug(`Generated preview for ${toolName}`);
+        } catch (previewError) {
+          if (previewError instanceof import_errors2.DextoRuntimeError && previewError.code === import_error_codes.ToolErrorCode.VALIDATION_FAILED) {
+            this.logger.debug(
+              `Validation failed for ${toolName}: ${previewError.message}`
+            );
+            throw previewError;
+          }
+          this.logger.debug(
+            `Preview generation failed for ${toolName}: ${previewError instanceof Error ? previewError.message : String(previewError)}`
+          );
+        }
+      }
       const requestData = {
         toolName,
+        toolCallId,
         args
       };
       if (sessionId !== void 0) {
         requestData.sessionId = sessionId;
       }
+      if (displayPreview !== void 0) {
+        requestData.displayPreview = displayPreview;
+      }
+      if (bashPatternResult?.suggestedPatterns && bashPatternResult.suggestedPatterns.length > 0) {
+        requestData.suggestedPatterns = bashPatternResult.suggestedPatterns;
+      }
       const response = await this.approvalManager.requestToolConfirmation(requestData);
-      const rememberChoice = response.data && "rememberChoice" in response.data ? response.data.rememberChoice : false;
-      if (response.status === import_types3.ApprovalStatus.APPROVED && rememberChoice) {
-        const allowSessionId = sessionId ?? response.sessionId;
-        await this.allowedToolsProvider.allowTool(toolName, allowSessionId);
-        this.logger.info(
-          `Tool '${toolName}' added to allowed tools for session '${allowSessionId ?? "global"}' (remember choice selected)`
-        );
+      if (response.status === import_types3.ApprovalStatus.APPROVED && response.data) {
+        const rememberChoice = "rememberChoice" in response.data ? response.data.rememberChoice : false;
+        const rememberPattern = "rememberPattern" in response.data ? response.data.rememberPattern : void 0;
+        if (rememberChoice) {
+          const allowSessionId = sessionId ?? response.sessionId;
+          await this.allowedToolsProvider.allowTool(toolName, allowSessionId);
+          this.logger.info(
+            `Tool '${toolName}' added to allowed tools for session '${allowSessionId ?? "global"}' (remember choice selected)`
+          );
+        } else if (rememberPattern && typeof rememberPattern === "string" && this.isBashTool(toolName)) {
+          this.approvalManager.addBashPattern(rememberPattern);
+          this.logger.info(
+            `Bash pattern '${rememberPattern}' added for session approval`
+          );
+        }
       }
       const approved = response.status === import_types3.ApprovalStatus.APPROVED;
       if (!approved) {
@@ -546,6 +794,7 @@ let _ToolManager = class _ToolManager {
       this.logger.info(
         `Tool confirmation approved for ${toolName}, sessionId: ${sessionId ?? "global"}`
       );
+      return { requireApproval: true, approvalStatus: "approved" };
     } catch (error) {
       this.logger.error(
         `Tool confirmation error for ${toolName}: ${error instanceof Error ? error.message : String(error)}`

package/dist/tools/tool-manager.d.ts

@@ -1,6 +1,6 @@
 import { MCPManager } from '../mcp/manager.js';
 import { InternalToolsServices } from './internal-tools/registry.js';
-import type { InternalToolsConfig, ToolPolicies } from './schemas.js';
+import type { InternalToolsConfig, CustomToolsConfig, ToolPolicies } from './schemas.js';
 import { ToolSet } from './types.js';
 import type { IDextoLogger } from '../logger/v2/types.js';
 import type { AgentEventBus } from '../events/index.js';
@@ -15,6 +15,7 @@ import type { AgentStateManager } from '../agent/state-manager.js';
 export interface InternalToolsOptions {
     internalToolsServices?: InternalToolsServices;
     internalToolsConfig?: InternalToolsConfig;
+    customToolsConfig?: CustomToolsConfig;
 }
 /**
  * Unified Tool Manager - Single interface for all tool operations
@@ -55,6 +56,7 @@ export declare class ToolManager {
     private stateManager?;
     private static readonly MCP_TOOL_PREFIX;
     private static readonly INTERNAL_TOOL_PREFIX;
+    private static readonly CUSTOM_TOOL_PREFIX;
     private toolsCache;
     private cacheValid;
     private logger;
@@ -67,6 +69,11 @@ export declare class ToolManager {
      * Set plugin support services (called after construction to avoid circular dependencies)
      */
     setPluginSupport(pluginManager: PluginManager, sessionManager: SessionManager, stateManager: AgentStateManager): void;
+    /**
+     * Set agent reference for custom tools (called after construction to avoid circular dependencies)
+     * Must be called before initialize() if custom tools are configured
+     */
+    setAgent(agent: any): void;
     /**
      * Invalidate the tools cache when tool sources change
      */
@@ -75,6 +82,17 @@ export declare class ToolManager {
      * Set up listeners for MCP notifications to invalidate cache on changes
      */
     private setupNotificationListeners;
+    /**
+     * Check if a tool name represents a bash execution tool
+     */
+    private isBashTool;
+    /**
+     * Check if a bash command is covered by any approved pattern.
+     * Generates a pattern key from the command, then checks if it's covered by stored patterns.
+     *
+     * Returns approval info if covered, or pattern suggestions if not.
+     */
+    private checkBashPatternApproval;
     getMcpManager(): MCPManager;
     /**
      * Get all MCP tools (delegates to mcpManager.getAllTools())
@@ -105,8 +123,14 @@ export declare class ToolManager {
     /**
      * Execute a tool by routing based on universal prefix
      * ALL tools must have source prefix - no exceptions
+     *
+     * @param toolName The fully qualified tool name (e.g., "internal--edit_file")
+     * @param args The arguments for the tool
+     * @param toolCallId The unique tool call ID for tracking (from LLM or generated for direct calls)
+     * @param sessionId Optional session ID for context
+     * @param abortSignal Optional abort signal for cancellation support
      */
-    executeTool(toolName: string, args: Record<string, unknown>, sessionId?: string): Promise<unknown>;
+    executeTool(toolName: string, args: Record<string, unknown>, toolCallId: string, sessionId?: string, abortSignal?: AbortSignal): Promise<import('./types.js').ToolExecutionResult>;
     /**
      * Check if a tool exists (must have proper source prefix)
      */
@@ -118,13 +142,14 @@ export declare class ToolManager {
         total: number;
         mcp: number;
         internal: number;
+        custom: number;
     }>;
     /**
-     * Get the source of a tool (mcp, internal, or unknown)
+     * Get the source of a tool (mcp, internal, custom, or unknown)
      * @param toolName The name of the tool to check
      * @returns The source of the tool
      */
-    getToolSource(toolName: string): 'mcp' | 'internal' | 'unknown';
+    getToolSource(toolName: string): 'mcp' | 'internal' | 'custom' | 'unknown';
     /**
      * Check if a tool matches a policy pattern
      * Supports both exact matching and suffix matching for MCP tools with server prefixes
@@ -153,10 +178,26 @@ export declare class ToolManager {
      * @returns true if the tool is in the allow list
      */
     private isInAlwaysAllowList;
+    /**
+     * Check if a tool has a custom approval override and handle it.
+     * Tools can implement getApprovalOverride() to request specialized approval flows
+     * (e.g., directory access approval for file tools) instead of default tool confirmation.
+     *
+     * @param toolName The fully qualified tool name
+     * @param args The tool arguments
+     * @param sessionId Optional session ID
+     * @returns { handled: true } if custom approval was processed, { handled: false } to continue normal flow
+     */
+    private checkCustomApprovalOverride;
     /**
      * Handle tool approval/confirmation flow
      * Checks allowed list, manages approval modes (manual, auto-approve, auto-deny),
      * and handles remember choice logic
+     *
+     * @param toolName The fully qualified tool name
+     * @param args The arguments for the tool
+     * @param toolCallId The unique tool call ID for tracking parallel tool calls
+     * @param sessionId Optional session ID for context
      */
     private handleToolApproval;
     /**

package/dist/tools/tool-manager.d.ts.map

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