@dexto/core 1.8.12 → 1.9.0

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

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/tools/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAInE;;;GAGG;AACH,qBAAa,SAAS;IAClB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;;;IAUhC;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAU3E;;;;;OAKG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;;;;;IAajF;;;;OAIG;IACH,MAAM,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAWlE;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAc/E;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;IAU3F;;;OAGG;IACH,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;;;;;IAelE;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAUxD;;OAEG;IACH,MAAM,CAAC,sBAAsB,CAAC,QAAQ,EAAE,MAAM;;;IAU9C;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAU9E;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAUnD;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM;IAUpC;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAUzD;;OAEG;IACH,MAAM,CAAC,eAAe,CAClB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EAAE,EACzB,OAAO,EAAE,MAAM,GAChB,iBAAiB,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAcrE;;OAEG;IACH,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,iBAAiB;IAW1F;;OAEG;IACH,MAAM,CAAC,kCAAkC,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB;CAU7E"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/tools/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAInE;;;GAGG;AACH,qBAAa,SAAS;IAClB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;;;IAUhC;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAU3E;;;;;OAKG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;;;;;IAajF;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAc/E;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;IAU3F;;;OAGG;IACH,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;;;;;IAelE;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAUxD;;OAEG;IACH,MAAM,CAAC,sBAAsB,CAAC,QAAQ,EAAE,MAAM;;;IAU9C;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAU9E;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAUnD;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM;IAUpC;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAUzD;;OAEG;IACH,MAAM,CAAC,eAAe,CAClB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EAAE,EACzB,OAAO,EAAE,MAAM,GAChB,iBAAiB,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAcrE;;OAEG;IACH,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,iBAAiB;IAW1F;;OAEG;IACH,MAAM,CAAC,kCAAkC,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB;CAU7E"}

package/dist/tools/errors.js

@@ -43,21 +43,6 @@ class ToolError {
       { toolName, sessionId, userMessage }
     );
   }
-  /**
-   * Directory access denied by user
-   * Used when a file tool tries to access a path outside allowed directories
-   * and the user denies the directory access approval
-   */
-  static directoryAccessDenied(directory, sessionId) {
-    return new DextoRuntimeError(
-      ToolErrorCode.DIRECTORY_ACCESS_DENIED,
-      ErrorScope.TOOLS,
-      ErrorType.FORBIDDEN,
-      `Access to directory '${directory}' was denied`,
-      { directory, sessionId },
-      "Request access to the directory or work within the allowed working directory"
-    );
-  }
   /**
    * Tool execution timeout
    */

package/dist/tools/index.cjs

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var tools_exports = {};
 __export(tools_exports, {
   SessionToolPreferencesSchema: () => import_session_tool_preferences_store.SessionToolPreferencesSchema,
+  SessionToolPreferencesStore: () => import_session_tool_preferences_store.SessionToolPreferencesStore,
   ToolError: () => import_errors.ToolError,
   ToolErrorCode: () => import_error_codes.ToolErrorCode,
   ToolManager: () => import_tool_manager.ToolManager,
@@ -38,6 +39,7 @@ var import_tool_manager = require("./tool-manager.js");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SessionToolPreferencesSchema,
+  SessionToolPreferencesStore,
   ToolError,
   ToolErrorCode,
   ToolManager,

package/dist/tools/index.d.ts

@@ -6,7 +6,7 @@
  */
 export * from './types.js';
 export { defineTool } from './define-tool.js';
-export { SessionToolPreferencesSchema } from './session-tool-preferences-store.js';
+export { SessionToolPreferencesSchema, SessionToolPreferencesStore, } from './session-tool-preferences-store.js';
 export type { SessionToolPreferences } from './session-tool-preferences-store.js';
 export * from './display-types.js';
 export * from './schemas.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,cAAc,YAAY,CAAC;AAG3B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAC;AACnF,YAAY,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAGlF,cAAc,oBAAoB,CAAC;AAGnC,cAAc,cAAc,CAAC;AAG7B,cAAc,mBAAmB,CAAC;AAClC,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGrF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,KAAK,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAClF,YAAY,EACR,kBAAkB,EAClB,oBAAoB,EACpB,+BAA+B,EAC/B,0BAA0B,EAC1B,gCAAgC,EAChC,gBAAgB,EAChB,oBAAoB,GACvB,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,cAAc,YAAY,CAAC;AAG3B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACH,4BAA4B,EAC5B,2BAA2B,GAC9B,MAAM,qCAAqC,CAAC;AAC7C,YAAY,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAGlF,cAAc,oBAAoB,CAAC;AAGnC,cAAc,cAAc,CAAC;AAG7B,cAAc,mBAAmB,CAAC;AAClC,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGrF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,KAAK,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAClF,YAAY,EACR,kBAAkB,EAClB,oBAAoB,EACpB,+BAA+B,EAC/B,0BAA0B,EAC1B,gCAAgC,EAChC,gBAAgB,EAChB,oBAAoB,GACvB,MAAM,mBAAmB,CAAC"}

package/dist/tools/index.js

@@ -1,7 +1,10 @@
 import "../chunk-C6A6W6XS.js";
 export * from "./types.js";
 import { defineTool } from "./define-tool.js";
-import { SessionToolPreferencesSchema } from "./session-tool-preferences-store.js";
+import {
+  SessionToolPreferencesSchema,
+  SessionToolPreferencesStore
+} from "./session-tool-preferences-store.js";
 export * from "./display-types.js";
 export * from "./schemas.js";
 export * from "./presentation.js";
@@ -10,6 +13,7 @@ import { ToolErrorCode } from "./error-codes.js";
 import { ToolManager } from "./tool-manager.js";
 export {
   SessionToolPreferencesSchema,
+  SessionToolPreferencesStore,
   ToolError,
   ToolErrorCode,
   ToolManager,

package/dist/tools/tool-manager.cjs

@@ -74,6 +74,7 @@ var import_schema = require("../utils/schema.js");
 var import_types3 = require("../approval/types.js");
 var import_schemas = require("../approval/schemas.js");
 var import_session_tool_policy = require("./approval/session-tool-policy.js");
+var import_tool_approval_policy = require("./approval/tool-approval-policy.js");
 var import_tool_presentation = require("./presentation/tool-presentation.js");
 var import_decorators = require("../telemetry/decorators.js");
 var import_types4 = require("../storage/tool-executions/types.js");
@@ -103,6 +104,20 @@ let _ToolManager = class _ToolManager {
       this.logger,
       (pattern) => this.normalizeToolPolicyPattern(pattern)
     );
+    this.toolApprovalPolicy = new import_tool_approval_policy.ToolApprovalPolicy({
+      getApprovalMode: () => this.approvalMode,
+      getLocalTool: (toolName) => this.agentTools.get(toolName),
+      isApprovalKeySessionApproved: ({ approvalKey, sessionId }) => this.approvalManager.isApprovalKeySessionApproved(approvalKey, sessionId),
+      isToolExplicitlyAllowed: async ({ toolName, sessionId }) => {
+        if (sessionId !== void 0 && this.isToolAutoApprovedForSession(sessionId, toolName)) {
+          return true;
+        }
+        if (this.isInAlwaysAllowList(toolName)) {
+          return true;
+        }
+        return await this.allowedToolsProvider.isToolAllowed(toolName, sessionId);
+      }
+    });
     this.toolPresentation = new import_tool_presentation.ToolPresentation(
       (toolName) => this.agentTools.get(toolName),
       (toolName, args) => this.validateLocalToolArgs(toolName, args),
@@ -144,6 +159,7 @@ let _ToolManager = class _ToolManager {
   cacheValid = false;
   logger;
   sessionToolPolicy;
+  toolApprovalPolicy;
   toolPresentation;
   cleanupHandlers = /* @__PURE__ */ new Set();
   cleanupStarted = false;
@@ -463,58 +479,7 @@ let _ToolManager = class _ToolManager {
       }
     });
   }
-  // ==================== Pattern Approval Helpers ====================
-  getToolApprovalPatternKeyFn(toolName) {
-    const tool = this.agentTools.get(toolName);
-    return tool?.approval?.patternKey;
-  }
-  getToolSuggestApprovalPatternsFn(toolName) {
-    const tool = this.agentTools.get(toolName);
-    return tool?.approval?.suggestPatterns;
-  }
-  getToolApprovalOverrideFn(toolName) {
-    const tool = this.agentTools.get(toolName);
-    return tool?.approval?.override;
-  }
-  getToolApprovalOnGrantedFn(toolName) {
-    const tool = this.agentTools.get(toolName);
-    return tool?.approval?.onGranted;
-  }
-  getToolPatternKey(toolName, args) {
-    if (toolName.startsWith(_ToolManager.MCP_TOOL_PREFIX)) {
-      return null;
-    }
-    const getPatternKey = this.getToolApprovalPatternKeyFn(toolName);
-    if (!getPatternKey) {
-      return null;
-    }
-    try {
-      return getPatternKey(args);
-    } catch (error) {
-      this.logger.debug(
-        `Pattern key generation failed for '${toolName}': ${error instanceof Error ? error.message : String(error)}`
-      );
-      return null;
-    }
-  }
-  getToolSuggestedPatterns(toolName, args) {
-    if (toolName.startsWith(_ToolManager.MCP_TOOL_PREFIX)) {
-      return void 0;
-    }
-    const suggestPatterns = this.getToolSuggestApprovalPatternsFn(toolName);
-    if (!suggestPatterns) {
-      return void 0;
-    }
-    try {
-      const patterns = suggestPatterns(args);
-      return patterns.length > 0 ? patterns : void 0;
-    } catch (error) {
-      this.logger.debug(
-        `Pattern suggestion failed for '${toolName}': ${error instanceof Error ? error.message : String(error)}`
-      );
-      return void 0;
-    }
-  }
+  // ==================== Approval Helpers ====================
   /**
    * Auto-approve pending tool approval requests for the same tool.
    * Called after a user selects "remember choice" for a tool.
@@ -535,7 +500,7 @@ let _ToolManager = class _ToolManager {
         if (request.metadata.toolName !== toolName) {
           return false;
         }
-        return request.metadata.directoryAccess === void 0;
+        return true;
       },
       { rememberChoice: false }
       // Don't propagate remember choice to auto-approved requests
@@ -546,18 +511,7 @@ let _ToolManager = class _ToolManager {
       );
     }
   }
-  /**
-   * Auto-approve pending tool approval requests that are now covered by a remembered pattern.
-   * Called after a user selects "remember pattern" for a tool.
-   */
-  autoApprovePendingPatternRequests(toolName, sessionId) {
-    if (toolName.startsWith(_ToolManager.MCP_TOOL_PREFIX)) {
-      return;
-    }
-    const getPatternKey = this.getToolApprovalPatternKeyFn(toolName);
-    if (!getPatternKey) {
-      return;
-    }
+  autoApprovePendingApprovalKeyRequests(approvalKey, sessionId) {
     const count = this.approvalManager.autoApprovePendingRequests(
       (request) => {
         if (request.type !== import_types3.ApprovalType.TOOL_APPROVAL) {
@@ -566,64 +520,16 @@ let _ToolManager = class _ToolManager {
         if (request.sessionId !== sessionId) {
           return false;
         }
-        if (request.metadata.toolName !== toolName) {
-          return false;
-        }
-        if (request.metadata.directoryAccess !== void 0) {
-          return false;
-        }
-        let patternKey;
-        try {
-          patternKey = getPatternKey(request.metadata.args);
-        } catch (error) {
-          this.logger.debug(
-            `Pattern key generation failed for '${toolName}': ${error instanceof Error ? error.message : String(error)}`
-          );
-          return false;
-        }
-        if (!patternKey) return false;
-        return this.approvalManager.matchesPattern(toolName, patternKey, sessionId);
+        return request.metadata.approvalKey === approvalKey;
       },
-      { rememberPattern: void 0 }
-      // Don't propagate pattern choice to auto-approved requests
+      { rememberChoice: false }
     );
     if (count > 0) {
       this.logger.info(
-        `Auto-approved ${count} parallel request(s) for tool '${toolName}' after user selected "remember pattern"`
-      );
-    }
-  }
-  /**
-   * Auto-approve pending tool approval requests that are now covered by a remembered directory.
-   * Called after a user selects "remember directory" for a directory-access prompt.
-   */
-  autoApprovePendingDirectoryRequests(toolName, sessionId) {
-    const count = this.approvalManager.autoApprovePendingRequests(
-      (request) => {
-        if (request.type !== import_types3.ApprovalType.TOOL_APPROVAL) {
-          return false;
-        }
-        if (request.sessionId !== sessionId) {
-          return false;
-        }
-        if (request.metadata.toolName !== toolName) {
-          return false;
-        }
-        const directoryAccess = request.metadata.directoryAccess;
-        if (!directoryAccess) {
-          return false;
+        "Auto-approved parallel request(s) after approval key was remembered",
+        {
+          count
         }
-        return this.approvalManager.isDirectorySessionApproved(
-          directoryAccess.parentDir,
-          sessionId
-        );
-      },
-      { rememberDirectory: false }
-    );
-    if (count > 0) {
-      this.logger.info(
-        'Auto-approved parallel request(s) after user selected "remember directory"',
-        { count, toolName }
       );
     }
   }
@@ -924,89 +830,57 @@ let _ToolManager = class _ToolManager {
       ...callDescription !== void 0 ? { callDescription } : {},
       ...eventMeta !== void 0 ? { meta: eventMeta } : {}
     };
-    const overrideRequest = await this.getToolApprovalOverrideRequest(
-      input.toolName,
-      validatedArgs,
-      input.toolCallId,
-      sessionId,
-      input.runContext
-    );
-    if (overrideRequest) {
-      if (!overrideRequest.directoryAccess) {
-        return {
-          kind: "approval-required",
-          call,
-          onGrantedRequestDetails: overrideRequest.onGrantedRequestDetails,
-          requestDetails: overrideRequest.requestDetails
-        };
-      }
-      const quickResult2 = await this.classifyQuickApprovalRequirement(
-        input.toolName,
-        validatedArgs,
+    const approvalGate = await this.toolApprovalPolicy.resolve({
+      args: validatedArgs,
+      getContext: () => this.buildToolExecutionContext({
         sessionId,
-        overrideRequest.directoryAccess
-      );
-      if (quickResult2 === "ready") {
-        return { kind: "ready", call };
-      }
-      const displayPreview2 = await this.toolPresentation.preview({
-        toolName: input.toolName,
-        args: validatedArgs,
         toolCallId: input.toolCallId,
-        ...sessionId !== void 0 ? { sessionId } : {},
-        ...input.runContext !== void 0 ? { runContext: input.runContext } : {}
-      });
-      const suggestedPatterns2 = this.getToolSuggestedPatterns(input.toolName, validatedArgs);
-      return {
-        kind: "approval-required",
-        call,
-        onGrantedRequestDetails: overrideRequest.onGrantedRequestDetails,
-        requestDetails: {
-          ...overrideRequest.requestDetails,
-          metadata: {
-            ...overrideRequest.requestDetails.metadata,
-            presentationSnapshot,
-            ...callDescription !== void 0 ? { description: callDescription } : {},
-            ...displayPreview2 !== void 0 ? { displayPreview: displayPreview2 } : {},
-            ...suggestedPatterns2 !== void 0 ? { suggestedPatterns: suggestedPatterns2 } : {}
-          }
-        }
-      };
-    }
-    const quickResult = await this.classifyQuickApprovalRequirement(
-      input.toolName,
-      validatedArgs,
-      sessionId
-    );
-    if (quickResult === "ready") {
+        runContext: input.runContext
+      }),
+      ...sessionId !== void 0 ? { sessionId } : {},
+      source,
+      toolName: input.toolName
+    });
+    if (approvalGate.kind === "ready") {
       return { kind: "ready", call };
     }
-    const displayPreview = await this.toolPresentation.preview({
-      toolName: input.toolName,
+    return await this.prepareApprovalRequiredToolCall({
+      approvalGate,
       args: validatedArgs,
-      toolCallId: input.toolCallId,
+      call,
+      ...callDescription !== void 0 ? { callDescription } : {},
+      ...input.runContext !== void 0 ? { runContext: input.runContext } : {},
       ...sessionId !== void 0 ? { sessionId } : {},
-      ...input.runContext !== void 0 ? { runContext: input.runContext } : {}
+      toolCallId: input.toolCallId,
+      toolName: input.toolName
+    });
+  }
+  async prepareApprovalRequiredToolCall(input) {
+    const displayPreview = await this.toolPresentation.preview({
+      args: input.args,
+      ...input.runContext !== void 0 ? { runContext: input.runContext } : {},
+      ...input.sessionId !== void 0 ? { sessionId: input.sessionId } : {},
+      toolCallId: input.toolCallId,
+      toolName: input.toolName
     });
-    const suggestedPatterns = this.getToolSuggestedPatterns(input.toolName, validatedArgs);
     const hostRuntime = input.runContext?.hostRuntime;
     const requestDetails = {
       type: import_types3.ApprovalType.TOOL_APPROVAL,
-      ...sessionId !== void 0 ? { sessionId } : {},
+      ...input.sessionId !== void 0 ? { sessionId: input.sessionId } : {},
       ...hostRuntime !== void 0 ? { hostRuntime } : {},
       metadata: {
         toolName: input.toolName,
-        presentationSnapshot,
+        ...input.approvalGate.approvalKey !== void 0 ? { approvalKey: input.approvalGate.approvalKey } : {},
+        presentationSnapshot: input.call.presentationSnapshot,
         toolCallId: input.toolCallId,
-        args: validatedArgs,
-        ...callDescription !== void 0 ? { description: callDescription } : {},
-        ...displayPreview !== void 0 ? { displayPreview } : {},
-        ...suggestedPatterns !== void 0 ? { suggestedPatterns } : {}
+        args: input.args,
+        ...input.callDescription !== void 0 ? { description: input.callDescription } : {},
+        ...displayPreview !== void 0 ? { displayPreview } : {}
       }
     };
     return {
       kind: "approval-required",
-      call,
+      call: input.call,
       onGrantedRequestDetails: requestDetails,
       requestDetails
     };
@@ -1020,7 +894,7 @@ let _ToolManager = class _ToolManager {
     this.assertRecordedApprovalMatchesPreparedCall(prepared, request);
     return { prepared, request };
   }
-  async applyApprovalDecision(recorded, decision, runContext) {
+  async applyApprovalDecision(recorded, decision) {
     if (decision.approvalId !== recorded.request.approvalId) {
       throw import_errors.ToolError.executionFailed(
         recorded.prepared.call.toolName,
@@ -1043,7 +917,7 @@ let _ToolManager = class _ToolManager {
         response: record.response
       };
     }
-    await this.applyApprovalGrantedEffects(recorded.prepared, record.response, runContext);
+    await this.applyApprovalGrantedEffects(recorded.prepared, record.response);
     return {
       kind: "ready",
       call: {
@@ -1082,28 +956,6 @@ let _ToolManager = class _ToolManager {
   assertOnGrantedRequestMatchesPreparedCall(prepared) {
     const approvalDetails = prepared.requestDetails;
     const grantedDetails = prepared.onGrantedRequestDetails;
-    const directoryAccess = approvalDetails.type === import_types3.ApprovalType.TOOL_APPROVAL && "directoryAccess" in approvalDetails.metadata ? import_schemas.DirectoryAccessMetadataSchema.parse(approvalDetails.metadata.directoryAccess) : void 0;
-    if (directoryAccess !== void 0) {
-      const expected = {
-        type: import_types3.ApprovalType.DIRECTORY_ACCESS,
-        sessionId: approvalDetails.sessionId,
-        hostRuntime: approvalDetails.hostRuntime,
-        metadata: directoryAccess
-      };
-      const actual = {
-        type: grantedDetails.type,
-        sessionId: grantedDetails.sessionId,
-        hostRuntime: grantedDetails.hostRuntime,
-        metadata: grantedDetails.metadata
-      };
-      if (!(0, import_node_util.isDeepStrictEqual)(actual, expected)) {
-        throw import_errors.ToolError.executionFailed(
-          prepared.call.toolName,
-          "Approval granted-effects request does not match the prepared tool call"
-        );
-      }
-      return;
-    }
     if (!(0, import_node_util.isDeepStrictEqual)(grantedDetails, approvalDetails)) {
       throw import_errors.ToolError.executionFailed(
         prepared.call.toolName,
@@ -1111,26 +963,30 @@ let _ToolManager = class _ToolManager {
       );
     }
   }
-  async applyApprovalGrantedEffects(prepared, response, runContext) {
-    const requestDetails = prepared.onGrantedRequestDetails;
+  async applyApprovalGrantedEffects(prepared, response) {
     const approvalRequestDetails = prepared.requestDetails;
     const sessionId = approvalRequestDetails.sessionId;
-    const onGranted = this.getToolApprovalOnGrantedFn(prepared.call.toolName);
-    if (onGranted) {
-      const context = this.buildToolExecutionContext({
-        sessionId,
-        toolCallId: prepared.call.toolCallId,
-        runContext
-      });
-      await Promise.resolve(onGranted(response, context, requestDetails));
-    }
-    if (approvalRequestDetails.type === import_types3.ApprovalType.TOOL_APPROVAL && response.data) {
+    if (approvalRequestDetails.type === import_types3.ApprovalType.TOOL_APPROVAL) {
+      const toolMetadata = import_schemas.ToolApprovalMetadataSchema.parse(approvalRequestDetails.metadata);
+      const approvalKey = toolMetadata.approvalKey;
+      const data = response.data ? import_schemas.ToolApprovalResponseDataSchema.parse(response.data) : void 0;
+      if (approvalKey !== void 0) {
+        await this.approvalManager.addApprovedKey(
+          approvalKey,
+          data?.rememberChoice ? "session" : "once",
+          sessionId
+        );
+      }
+      if (!data) {
+        return;
+      }
       await this.handleRememberChoice(
         prepared.call.toolName,
         {
-          data: import_schemas.ToolApprovalResponseDataSchema.parse(response.data),
+          data,
           ...response.sessionId !== void 0 ? { sessionId: response.sessionId } : {}
         },
+        approvalKey,
         sessionId
       );
     }
@@ -1186,72 +1042,6 @@ let _ToolManager = class _ToolManager {
       }
     };
   }
-  async getToolApprovalOverrideRequest(toolName, args, toolCallId, sessionId, runContext) {
-    if (toolName.startsWith(_ToolManager.MCP_TOOL_PREFIX)) {
-      return null;
-    }
-    const getApprovalOverride = this.getToolApprovalOverrideFn(toolName);
-    if (!getApprovalOverride) {
-      return null;
-    }
-    const context = this.buildToolExecutionContext({ sessionId, toolCallId, runContext });
-    const approvalRequest = await getApprovalOverride(args, context);
-    if (!approvalRequest) {
-      return null;
-    }
-    const requestDetails = {
-      ...approvalRequest,
-      ...sessionId && !approvalRequest.sessionId ? { sessionId } : {},
-      ...runContext?.hostRuntime !== void 0 && approvalRequest.hostRuntime === void 0 ? { hostRuntime: runContext.hostRuntime } : {}
-    };
-    if (requestDetails.type !== import_types3.ApprovalType.DIRECTORY_ACCESS) {
-      return { requestDetails, onGrantedRequestDetails: requestDetails };
-    }
-    const parseResult = import_schemas.DirectoryAccessMetadataSchema.safeParse(requestDetails.metadata);
-    if (!parseResult.success) {
-      throw import_errors.ToolError.configInvalid(
-        `Tool '${toolName}' returned invalid directory access metadata`
-      );
-    }
-    const directoryAccess = parseResult.data;
-    return {
-      directoryAccess,
-      onGrantedRequestDetails: requestDetails,
-      requestDetails: {
-        type: import_types3.ApprovalType.TOOL_APPROVAL,
-        ...requestDetails.sessionId !== void 0 ? { sessionId: requestDetails.sessionId } : {},
-        ...requestDetails.hostRuntime !== void 0 ? { hostRuntime: requestDetails.hostRuntime } : {},
-        metadata: {
-          toolName,
-          toolCallId,
-          args,
-          directoryAccess
-        }
-      }
-    };
-  }
-  async classifyQuickApprovalRequirement(toolName, args, sessionId, directoryAccess) {
-    if (directoryAccess) {
-      return this.approvalMode === "auto-approve" ? "ready" : "approval-required";
-    }
-    if (sessionId && this.isToolAutoApprovedForSession(sessionId, toolName)) {
-      return "ready";
-    }
-    if (this.isInAlwaysAllowList(toolName)) {
-      return "ready";
-    }
-    if (await this.allowedToolsProvider.isToolAllowed(toolName, sessionId)) {
-      return "ready";
-    }
-    const patternKey = this.getToolPatternKey(toolName, args);
-    if (patternKey && this.approvalManager.matchesPattern(toolName, patternKey, sessionId)) {
-      return "ready";
-    }
-    if (this.approvalMode === "auto-approve") {
-      return "ready";
-    }
-    return "approval-required";
-  }
   async executeTool(toolName, args, toolCallId, invocation) {
     const { sessionId, runContext, hostRuntime } = this.resolveToolExecutionInvocation(invocation);
     this.logger.debug(`\u{1F527} Tool execution requested: '${toolName}' (toolCallId: ${toolCallId})`);
@@ -1284,17 +1074,14 @@ let _ToolManager = class _ToolManager {
         this.resolveDirectApprovalIdentity(invocation, toolCallId)
       );
       const response = await this.requestApprovalDecision(recorded);
-      applied = await this.applyApprovalDecision(
-        recorded,
-        {
-          approvalId: response.approvalId,
-          status: response.status,
-          ...response.reason !== void 0 ? { reason: response.reason } : {},
-          ...response.message !== void 0 ? { message: response.message } : {},
-          ...response.data !== void 0 ? { data: response.data } : {}
-        },
-        runContext
-      );
+      applied = await this.applyApprovalDecision(recorded, {
+        approvalId: response.approvalId,
+        status: response.status,
+        ...response.reason !== void 0 ? { reason: response.reason } : {},
+        ...response.message !== void 0 ? { message: response.message } : {},
+        ...response.timeoutMs !== void 0 ? { timeoutMs: response.timeoutMs } : {},
+        ...response.data !== void 0 ? { data: response.data } : {}
+      });
     } catch (error) {
       await this.recordDirectToolExecutionFailure(prepared.call, invocation, error);
       throw error;
@@ -1800,26 +1587,21 @@ let _ToolManager = class _ToolManager {
   /**
    * Handle "remember" actions when user approves a tool.
    */
-  async handleRememberChoice(toolName, response, sessionId) {
+  async handleRememberChoice(toolName, response, approvalKey, sessionId) {
     const data = response.data;
     if (!data) return;
     const rememberChoice = data.rememberChoice;
-    const rememberPattern = data.rememberPattern;
-    const rememberDirectory = data.rememberDirectory;
     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)`
-      );
-      this.autoApprovePendingToolRequests(toolName, allowSessionId);
-    } else if (rememberPattern && this.getToolApprovalPatternKeyFn(toolName)) {
-      await this.approvalManager.addPattern(toolName, rememberPattern, sessionId);
-      this.logger.info(`Pattern '${rememberPattern}' added for tool '${toolName}' approval`);
-      this.autoApprovePendingPatternRequests(toolName, sessionId);
-    } else if (rememberDirectory) {
-      const allowSessionId = sessionId ?? response.sessionId;
-      this.autoApprovePendingDirectoryRequests(toolName, allowSessionId);
+      if (approvalKey !== void 0) {
+        this.autoApprovePendingApprovalKeyRequests(approvalKey, allowSessionId);
+      } else {
+        await this.allowedToolsProvider.allowTool(toolName, allowSessionId);
+        this.logger.info(
+          `Tool '${toolName}' added to allowed tools for session '${allowSessionId ?? "global"}' (remember choice selected)`
+        );
+        this.autoApprovePendingToolRequests(toolName, allowSessionId);
+      }
     }
   }
   /**