@dexto/core 1.4.0 → 1.5.0

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
      */
@@ -135,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
@@ -170,6 +178,17 @@ 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),

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":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,OAAO,EAAwB,MAAM,YAAY,CAAC;AAK3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AAC5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAQnE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qBASa,WAAW;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,qBAAqB,CAAC,CAAwB;IACtD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,oBAAoB,CAAwB;IACpD,OAAO,CAAC,YAAY,CAA0C;IAC9D,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,YAAY,CAA2B;IAG/C,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,YAAY,CAAC,CAAoB;IAGzC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAW;IAClD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAgB;IAC5D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAc;IAGxD,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAe;gBAGzB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,eAAe,EAChC,oBAAoB,EAAE,qBAAqB,EAC3C,YAAY,EAAE,QAAQ,GAAG,cAAc,GAAG,WAAW,EACrD,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,YAAY;IAkCxB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC;;OAEG;IACH,gBAAgB,CACZ,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,iBAAiB,GAChC,IAAI;IAOP;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAO1B;;OAEG;IACH,OAAO,CAAC,eAAe;IAKvB;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAqBlC;;OAEG;IACH,OAAO,CAAC,UAAU;IAQlB;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB;IA6BhC,aAAa,IAAI,UAAU;IAI3B;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC;;;;;;;;;;;;;OAaG;YACW,aAAa;IA6E3B;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAUrC;;;;;;;;;OASG;IACG,WAAW,CACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,WAAW,GAC1B,OAAO,CAAC,OAAO,YAAY,EAAE,mBAAmB,CAAC;IAsMpD;;OAEG;IACG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAuBjD;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC;QAC1B,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;KAClB,CAAC;IA4CF;;;;OAIG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS;IAsB1E;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,iBAAiB;IA0BzB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAS3B;;;;;;;;;OASG;YACW,2BAA2B;IAwEzC;;;;;;;;;OASG;YACW,kBAAkB;IA6MhC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;OAEG;IACH,uBAAuB,IAAI,MAAM,EAAE;IAInC;;OAEG;IACH,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAI5C;;OAEG;IACH,sBAAsB,IAAI,IAAI;CAGjC"}

package/dist/tools/tool-manager.js

@@ -40,6 +40,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;
@@ -52,14 +53,15 @@ let _ToolManager = class _ToolManager {
     this.agentEventBus = agentEventBus;
     this.toolPolicies = toolPolicies;
     this.logger = logger.createChild(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 InternalToolsProvider(
         internalToolsServices,
-        options.internalToolsConfig,
+        options.internalToolsConfig || [],
+        options.customToolsConfig || [],
         this.logger
       );
     }
@@ -84,6 +86,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
    */
@@ -115,7 +127,7 @@ let _ToolManager = class _ToolManager {
    * Check if a tool name represents a bash execution tool
    */
   isBashTool(toolName) {
-    return toolName === "bash_exec" || toolName === "internal--bash_exec";
+    return toolName === "bash_exec" || toolName === "internal--bash_exec" || toolName === "custom--bash_exec";
   }
   /**
    * Check if a bash command is covered by any approved pattern.
@@ -169,6 +181,7 @@ let _ToolManager = class _ToolManager {
     const allTools = {};
     let mcpTools = {};
     let internalTools = {};
+    let customTools = {};
     try {
       mcpTools = await this.mcpManager.getAllTools();
     } catch (error) {
@@ -178,13 +191,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] = {
@@ -193,6 +214,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] = {
@@ -204,8 +233,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;
   }
@@ -306,14 +336,30 @@ let _ToolManager = class _ToolManager {
           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 ToolError.invalidName(toolName, "tool name cannot be empty after prefix");
+        }
+        if (!this.internalToolsProvider) {
+          throw 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 ToolError.notFound(toolName);
       }
@@ -379,7 +425,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;
   }
@@ -389,6 +439,7 @@ let _ToolManager = class _ToolManager {
   async getToolStats() {
     let mcpTools = {};
     let internalTools = {};
+    let customTools = {};
     try {
       mcpTools = await this.mcpManager.getAllTools();
     } catch (error) {
@@ -398,24 +449,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
    */
@@ -426,6 +486,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";
   }
   /**
@@ -481,6 +544,62 @@ 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 === 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 ToolError.directoryAccessDenied(
+        metadata?.parentDir ?? "unknown directory",
+        sessionId
+      );
+    }
+    throw ToolError.executionDenied(toolName, sessionId);
+  }
   /**
    * Handle tool approval/confirmation flow
    * Checks allowed list, manages approval modes (manual, auto-approve, auto-deny),
@@ -499,6 +618,14 @@ let _ToolManager = class _ToolManager {
       this.logger.debug(`\u{1F6AB} Tool execution blocked by policy: ${toolName}`);
       throw 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"})`

package/dist/tools/types.d.ts

@@ -1,6 +1,7 @@
 import type { JSONSchema7 } from 'json-schema';
 import type { ZodSchema } from 'zod';
 import type { ToolDisplayData } from './display-types.js';
+import type { ApprovalRequestDetails, ApprovalResponse } from '../approval/types.js';
 /**
  * Context passed to tool execution
  */
@@ -39,6 +40,48 @@ export interface InternalTool {
      * Returns null if no preview is available.
      */
     generatePreview?: (input: unknown, context?: ToolExecutionContext) => Promise<ToolDisplayData | null>;
+    /**
+     * Optional custom approval override.
+     * If present and returns non-null, this approval request is used instead of
+     * the default tool confirmation. Allows tools to request specialized approval
+     * flows (e.g., directory access approval for file tools).
+     *
+     * @param args The validated input arguments for the tool
+     * @returns ApprovalRequestDetails for custom approval, or null to use default tool confirmation
+     *
+     * @example
+     * ```typescript
+     * // File tool requesting directory access approval for external paths
+     * getApprovalOverride: (args) => {
+     *   const filePath = (args as {file_path: string}).file_path;
+     *   if (!isPathWithinAllowed(filePath)) {
+     *     return {
+     *       type: ApprovalType.DIRECTORY_ACCESS,
+     *       metadata: { path: filePath, operation: 'read', ... }
+     *     };
+     *   }
+     *   return null; // Use default tool confirmation
+     * }
+     * ```
+     */
+    getApprovalOverride?: (args: unknown) => ApprovalRequestDetails | null;
+    /**
+     * Optional callback invoked when custom approval is granted.
+     * Allows tools to handle approval responses (e.g., remember approved directories).
+     * Only called when getApprovalOverride returned non-null and approval was granted.
+     *
+     * @param response The approval response from ApprovalManager
+     *
+     * @example
+     * ```typescript
+     * onApprovalGranted: (response) => {
+     *   if (response.data?.rememberDirectory) {
+     *     directoryApproval.addApproved(parentDir, 'session');
+     *   }
+     * }
+     * ```
+     */
+    onApprovalGranted?: (response: ApprovalResponse) => void;
 }
 /**
  * Standard tool set interface - used by AI/LLM services

package/dist/tools/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/tools/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AACrC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,4CAA4C;IAC5C,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC;IAChB,gEAAgE;IAChE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oEAAoE;IACpE,cAAc,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;CAC5C;AAMD;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,qCAAqC;IACrC,EAAE,EAAE,MAAM,CAAC;IAEX,uDAAuD;IACvD,WAAW,EAAE,MAAM,CAAC;IAEpB,+CAA+C;IAC/C,WAAW,EAAE,SAAS,CAAC;IAEvB,8FAA8F;IAC9F,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAExF;;;;OAIG;IACH,eAAe,CAAC,EAAE,CACd,KAAK,EAAE,OAAO,EACd,OAAO,CAAC,EAAE,oBAAoB,KAC7B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;CACxC;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG;QACX,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,WAAW,CAAC;KAC3B,CAAC;CACL;AAMD;;GAEG;AACH,MAAM,WAAW,UAAU;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/E"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/tools/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AACrC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAErF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,4CAA4C;IAC5C,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC;IAChB,gEAAgE;IAChE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oEAAoE;IACpE,cAAc,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;CAC5C;AAMD;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,qCAAqC;IACrC,EAAE,EAAE,MAAM,CAAC;IAEX,uDAAuD;IACvD,WAAW,EAAE,MAAM,CAAC;IAEpB,+CAA+C;IAC/C,WAAW,EAAE,SAAS,CAAC;IAEvB,8FAA8F;IAC9F,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAExF;;;;OAIG;IACH,eAAe,CAAC,EAAE,CACd,KAAK,EAAE,OAAO,EACd,OAAO,CAAC,EAAE,oBAAoB,KAC7B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IAErC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,sBAAsB,GAAG,IAAI,CAAC;IAEvE;;;;;;;;;;;;;;;OAeG;IACH,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,CAAC;CAC5D;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG;QACX,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,WAAW,CAAC;KAC3B,CAAC;CACL;AAMD;;GAEG;AACH,MAAM,WAAW,UAAU;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/E"}

package/dist/utils/api-key-resolver.cjs

@@ -31,7 +31,25 @@ const PROVIDER_API_KEY_MAP = {
   google: ["GOOGLE_GENERATIVE_AI_API_KEY", "GOOGLE_API_KEY", "GEMINI_API_KEY"],
   groq: ["GROQ_API_KEY"],
   cohere: ["COHERE_API_KEY"],
-  xai: ["XAI_API_KEY", "X_AI_API_KEY"]
+  xai: ["XAI_API_KEY", "X_AI_API_KEY"],
+  openrouter: ["OPENROUTER_API_KEY"],
+  litellm: ["LITELLM_API_KEY", "LITELLM_KEY"],
+  glama: ["GLAMA_API_KEY"],
+  // Vertex uses ADC (Application Default Credentials), not API keys
+  // GOOGLE_APPLICATION_CREDENTIALS points to service account JSON (optional)
+  // Primary config is GOOGLE_VERTEX_PROJECT (required) + GOOGLE_VERTEX_LOCATION (optional)
+  vertex: [],
+  // Bedrock supports two auth methods:
+  // 1. AWS_BEARER_TOKEN_BEDROCK - Bedrock API key (simplest)
+  // 2. AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY + AWS_REGION (IAM credentials)
+  // AWS_SESSION_TOKEN (optional, for temporary credentials)
+  bedrock: ["AWS_BEARER_TOKEN_BEDROCK"],
+  // Local providers don't require API keys
+  local: [],
+  // Native node-llama-cpp execution
+  ollama: []
+  // Ollama server (no authentication required)
+  // TODO: dexto: ['DEXTO_API_KEY'],
   // perplexity: ['PERPLEXITY_API_KEY'],
   // together: ['TOGETHER_API_KEY'],
   // fireworks: ['FIREWORKS_API_KEY'],

package/dist/utils/api-key-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-key-resolver.d.ts","sourceRoot":"","sources":["../../src/utils/api-key-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;;GAGG;AAGH,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,CAY9D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAelF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,CAGpE"}
+{"version":3,"file":"api-key-resolver.d.ts","sourceRoot":"","sources":["../../src/utils/api-key-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;;GAGG;AAGH,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,CA4B9D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAelF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,CAGpE"}

package/dist/utils/api-key-resolver.js

@@ -7,7 +7,25 @@ const PROVIDER_API_KEY_MAP = {
   google: ["GOOGLE_GENERATIVE_AI_API_KEY", "GOOGLE_API_KEY", "GEMINI_API_KEY"],
   groq: ["GROQ_API_KEY"],
   cohere: ["COHERE_API_KEY"],
-  xai: ["XAI_API_KEY", "X_AI_API_KEY"]
+  xai: ["XAI_API_KEY", "X_AI_API_KEY"],
+  openrouter: ["OPENROUTER_API_KEY"],
+  litellm: ["LITELLM_API_KEY", "LITELLM_KEY"],
+  glama: ["GLAMA_API_KEY"],
+  // Vertex uses ADC (Application Default Credentials), not API keys
+  // GOOGLE_APPLICATION_CREDENTIALS points to service account JSON (optional)
+  // Primary config is GOOGLE_VERTEX_PROJECT (required) + GOOGLE_VERTEX_LOCATION (optional)
+  vertex: [],
+  // Bedrock supports two auth methods:
+  // 1. AWS_BEARER_TOKEN_BEDROCK - Bedrock API key (simplest)
+  // 2. AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY + AWS_REGION (IAM credentials)
+  // AWS_SESSION_TOKEN (optional, for temporary credentials)
+  bedrock: ["AWS_BEARER_TOKEN_BEDROCK"],
+  // Local providers don't require API keys
+  local: [],
+  // Native node-llama-cpp execution
+  ollama: []
+  // Ollama server (no authentication required)
+  // TODO: dexto: ['DEXTO_API_KEY'],
   // perplexity: ['PERPLEXITY_API_KEY'],
   // together: ['TOGETHER_API_KEY'],
   // fireworks: ['FIREWORKS_API_KEY'],

package/dist/utils/index.cjs

@@ -23,7 +23,6 @@ __reExport(utils_exports, require("./error-conversion.js"), module.exports);
 __reExport(utils_exports, require("./execution-context.js"), module.exports);
 __reExport(utils_exports, require("./fs-walk.js"), module.exports);
 __reExport(utils_exports, require("./redactor.js"), module.exports);
-__reExport(utils_exports, require("./env-file.js"), module.exports);
 __reExport(utils_exports, require("./debug.js"), module.exports);
 __reExport(utils_exports, require("./safe-stringify.js"), module.exports);
 __reExport(utils_exports, require("./api-key-resolver.js"), module.exports);
@@ -38,7 +37,6 @@ __reExport(utils_exports, require("./defer.js"), module.exports);
   ...require("./execution-context.js"),
   ...require("./fs-walk.js"),
   ...require("./redactor.js"),
-  ...require("./env-file.js"),
   ...require("./debug.js"),
   ...require("./safe-stringify.js"),
   ...require("./api-key-resolver.js"),

package/dist/utils/index.d.ts

@@ -6,7 +6,6 @@ export * from './error-conversion.js';
 export * from './execution-context.js';
 export * from './fs-walk.js';
 export * from './redactor.js';
-export * from './env-file.js';
 export * from './debug.js';
 export * from './safe-stringify.js';
 export * from './api-key-resolver.js';

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAKA,cAAc,WAAW,CAAC;AAC1B,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAKA,cAAc,WAAW,CAAC;AAC1B,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC"}

package/dist/utils/index.js

@@ -6,7 +6,6 @@ export * from "./error-conversion.js";
 export * from "./execution-context.js";
 export * from "./fs-walk.js";
 export * from "./redactor.js";
-export * from "./env-file.js";
 export * from "./debug.js";
 export * from "./safe-stringify.js";
 export * from "./api-key-resolver.js";

package/dist/utils/redactor.cjs

@@ -45,10 +45,19 @@ const SENSITIVE_PATTERNS = [
   // OpenAI API keys (at least 20 chars after sk-)
   /\bBearer\s+[A-Za-z0-9\-_.=]+\b/gi,
   // Bearer tokens
-  /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g,
+  /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g
   // Emails
-  /\beyJ[A-Za-z0-9_-]*\.[A-Za-z0-9_-]*\.[A-Za-z0-9_-]*/g
-  // JWT tokens
+];
+const JWT_PATTERN = /\beyJ[A-Za-z0-9_-]*\.[A-Za-z0-9_-]*\.[A-Za-z0-9_-]*/g;
+const SIGNED_URL_PATTERNS = [
+  /supabase\.co\/storage\/.*\?token=/i,
+  // Supabase signed URLs
+  /\.r2\.cloudflarestorage\.com\/.*\?/i,
+  // Cloudflare R2 signed URLs
+  /\.s3\..*amazonaws\.com\/.*\?(X-Amz-|AWSAccessKeyId)/i,
+  // AWS S3 presigned URLs
+  /storage\.googleapis\.com\/.*\?/i
+  // Google Cloud Storage signed URLs
 ];
 const REDACTED = "[REDACTED]";
 const REDACTED_CIRCULAR = "[REDACTED_CIRCULAR]";
@@ -66,12 +75,18 @@ function truncateFileData(value, key, parent) {
   }
   return value;
 }
+function isSignedUrl(value) {
+  return SIGNED_URL_PATTERNS.some((pattern) => pattern.test(value));
+}
 function redactSensitiveData(input, seen = /* @__PURE__ */ new WeakSet()) {
   if (typeof input === "string") {
     let result = input;
     for (const pattern of SENSITIVE_PATTERNS) {
       result = result.replace(pattern, REDACTED);
     }
+    if (!isSignedUrl(result)) {
+      result = result.replace(JWT_PATTERN, REDACTED);
+    }
     return result;
   }
   if (Array.isArray(input)) {

package/dist/utils/redactor.d.ts

@@ -6,12 +6,5 @@
  * - Recursive and preserves structure
  * - Easy to extend
  */
-/**
- * Redacts sensitive data from an object, array, or string.
- * Handles circular references gracefully.
- * @param input - The data to redact
- * @param seen - Internal set to track circular references
- * @returns The redacted data
- */
 export declare function redactSensitiveData(input: unknown, seen?: WeakSet<object>): unknown;
 //# sourceMappingURL=redactor.d.ts.map

package/dist/utils/redactor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redactor.d.ts","sourceRoot":"","sources":["../../src/utils/redactor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAqEH;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,kBAAgB,GAAG,OAAO,CAiCjF"}
+{"version":3,"file":"redactor.d.ts","sourceRoot":"","sources":["../../src/utils/redactor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AA8FH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,kBAAgB,GAAG,OAAO,CAsCjF"}

package/dist/utils/redactor.js

@@ -23,10 +23,19 @@ const SENSITIVE_PATTERNS = [
   // OpenAI API keys (at least 20 chars after sk-)
   /\bBearer\s+[A-Za-z0-9\-_.=]+\b/gi,
   // Bearer tokens
-  /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g,
+  /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g
   // Emails
-  /\beyJ[A-Za-z0-9_-]*\.[A-Za-z0-9_-]*\.[A-Za-z0-9_-]*/g
-  // JWT tokens
+];
+const JWT_PATTERN = /\beyJ[A-Za-z0-9_-]*\.[A-Za-z0-9_-]*\.[A-Za-z0-9_-]*/g;
+const SIGNED_URL_PATTERNS = [
+  /supabase\.co\/storage\/.*\?token=/i,
+  // Supabase signed URLs
+  /\.r2\.cloudflarestorage\.com\/.*\?/i,
+  // Cloudflare R2 signed URLs
+  /\.s3\..*amazonaws\.com\/.*\?(X-Amz-|AWSAccessKeyId)/i,
+  // AWS S3 presigned URLs
+  /storage\.googleapis\.com\/.*\?/i
+  // Google Cloud Storage signed URLs
 ];
 const REDACTED = "[REDACTED]";
 const REDACTED_CIRCULAR = "[REDACTED_CIRCULAR]";
@@ -44,12 +53,18 @@ function truncateFileData(value, key, parent) {
   }
   return value;
 }
+function isSignedUrl(value) {
+  return SIGNED_URL_PATTERNS.some((pattern) => pattern.test(value));
+}
 function redactSensitiveData(input, seen = /* @__PURE__ */ new WeakSet()) {
   if (typeof input === "string") {
     let result = input;
     for (const pattern of SENSITIVE_PATTERNS) {
       result = result.replace(pattern, REDACTED);
     }
+    if (!isSignedUrl(result)) {
+      result = result.replace(JWT_PATTERN, REDACTED);
+    }
     return result;
   }
   if (Array.isArray(input)) {