@dexto/core 1.8.12 → 1.9.0

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

@@ -127,6 +127,7 @@ export declare class ToolManager {
     private cacheValid;
     private logger;
     private readonly sessionToolPolicy;
+    private readonly toolApprovalPolicy;
     private readonly toolPresentation;
     private cleanupHandlers;
     private cleanupStarted;
@@ -248,12 +249,6 @@ export declare class ToolManager {
      * Set up listeners for MCP notifications to invalidate cache on changes
      */
     private setupNotificationListeners;
-    private getToolApprovalPatternKeyFn;
-    private getToolSuggestApprovalPatternsFn;
-    private getToolApprovalOverrideFn;
-    private getToolApprovalOnGrantedFn;
-    private getToolPatternKey;
-    private getToolSuggestedPatterns;
     /**
      * Auto-approve pending tool approval requests for the same tool.
      * Called after a user selects "remember choice" for a tool.
@@ -263,16 +258,7 @@ export declare class ToolManager {
      * @param sessionId The session ID for which the tool was allowed
      */
     private autoApprovePendingToolRequests;
-    /**
-     * Auto-approve pending tool approval requests that are now covered by a remembered pattern.
-     * Called after a user selects "remember pattern" for a tool.
-     */
-    private autoApprovePendingPatternRequests;
-    /**
-     * 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.
-     */
-    private autoApprovePendingDirectoryRequests;
+    private autoApprovePendingApprovalKeyRequests;
     getMcpManager(): MCPManager;
     setContributorContextFactory(factory?: DynamicContributorContextFactory | null): void;
     buildContributorContext(options?: {
@@ -310,8 +296,9 @@ export declare class ToolManager {
      */
     getAllTools(): Promise<ToolSet>;
     prepareToolCall(input: PrepareToolCallInput): Promise<PreparedToolCall>;
+    private prepareApprovalRequiredToolCall;
     recordApprovalRequest(prepared: ApprovalRequiredPreparedToolCall, identity: ToolApprovalRecordIdentity): Promise<RecordedToolApproval>;
-    applyApprovalDecision(recorded: RecordedToolApproval, decision: ApprovalDecisionInput, runContext?: AgentRunContext): Promise<ToolApprovalDecisionApplication>;
+    applyApprovalDecision(recorded: RecordedToolApproval, decision: ApprovalDecisionInput): Promise<ToolApprovalDecisionApplication>;
     requestApprovalDecision(recorded: RecordedToolApproval): Promise<ApprovalResponse>;
     private assertRecordedApprovalMatchesPreparedCall;
     private assertOnGrantedRequestMatchesPreparedCall;
@@ -321,8 +308,6 @@ export declare class ToolManager {
     private resolveExecutableToolSource;
     private createPreparedToolError;
     private createPreparedToolTerminal;
-    private getToolApprovalOverrideRequest;
-    private classifyQuickApprovalRequirement;
     executeTool(toolName: string, args: Record<string, unknown>, toolCallId: string, invocation?: ToolExecutionInvocation): Promise<import('./types.js').ToolExecutionResult>;
     private emitPreparedToolCallEvent;
     private replayExistingDirectToolExecution;

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

package/dist/tools/tool-manager.js

@@ -10,11 +10,9 @@ import { DextoRuntimeError, ErrorScope, ErrorType } from "../errors/index.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
 import { convertZodSchemaToJsonSchema } from "../utils/schema.js";
 import { ApprovalStatus, ApprovalType, DenialReason } from "../approval/types.js";
-import {
-  DirectoryAccessMetadataSchema,
-  ToolApprovalResponseDataSchema
-} from "../approval/schemas.js";
+import { ToolApprovalMetadataSchema, ToolApprovalResponseDataSchema } from "../approval/schemas.js";
 import { matchesToolPolicyPattern, SessionToolPolicy } from "./approval/session-tool-policy.js";
+import { ToolApprovalPolicy } from "./approval/tool-approval-policy.js";
 import { ToolPresentation } from "./presentation/tool-presentation.js";
 import { InstrumentClass } from "../telemetry/decorators.js";
 import {
@@ -49,6 +47,20 @@ let _ToolManager = class _ToolManager {
       this.logger,
       (pattern) => this.normalizeToolPolicyPattern(pattern)
     );
+    this.toolApprovalPolicy = new 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 ToolPresentation(
       (toolName) => this.agentTools.get(toolName),
       (toolName, args) => this.validateLocalToolArgs(toolName, args),
@@ -90,6 +102,7 @@ let _ToolManager = class _ToolManager {
   cacheValid = false;
   logger;
   sessionToolPolicy;
+  toolApprovalPolicy;
   toolPresentation;
   cleanupHandlers = /* @__PURE__ */ new Set();
   cleanupStarted = false;
@@ -409,58 +422,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.
@@ -481,7 +443,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
@@ -492,18 +454,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 !== ApprovalType.TOOL_APPROVAL) {
@@ -512,64 +463,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 !== 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 }
       );
     }
   }
@@ -870,89 +773,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: 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
     };
@@ -966,7 +837,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 ToolError.executionFailed(
         recorded.prepared.call.toolName,
@@ -989,7 +860,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: {
@@ -1028,28 +899,6 @@ let _ToolManager = class _ToolManager {
   assertOnGrantedRequestMatchesPreparedCall(prepared) {
     const approvalDetails = prepared.requestDetails;
     const grantedDetails = prepared.onGrantedRequestDetails;
-    const directoryAccess = approvalDetails.type === ApprovalType.TOOL_APPROVAL && "directoryAccess" in approvalDetails.metadata ? DirectoryAccessMetadataSchema.parse(approvalDetails.metadata.directoryAccess) : void 0;
-    if (directoryAccess !== void 0) {
-      const expected = {
-        type: 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 (!isDeepStrictEqual(actual, expected)) {
-        throw ToolError.executionFailed(
-          prepared.call.toolName,
-          "Approval granted-effects request does not match the prepared tool call"
-        );
-      }
-      return;
-    }
     if (!isDeepStrictEqual(grantedDetails, approvalDetails)) {
       throw ToolError.executionFailed(
         prepared.call.toolName,
@@ -1057,26 +906,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 === ApprovalType.TOOL_APPROVAL && response.data) {
+    if (approvalRequestDetails.type === ApprovalType.TOOL_APPROVAL) {
+      const toolMetadata = ToolApprovalMetadataSchema.parse(approvalRequestDetails.metadata);
+      const approvalKey = toolMetadata.approvalKey;
+      const data = response.data ? 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: ToolApprovalResponseDataSchema.parse(response.data),
+          data,
           ...response.sessionId !== void 0 ? { sessionId: response.sessionId } : {}
         },
+        approvalKey,
         sessionId
       );
     }
@@ -1132,72 +985,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 !== ApprovalType.DIRECTORY_ACCESS) {
-      return { requestDetails, onGrantedRequestDetails: requestDetails };
-    }
-    const parseResult = DirectoryAccessMetadataSchema.safeParse(requestDetails.metadata);
-    if (!parseResult.success) {
-      throw ToolError.configInvalid(
-        `Tool '${toolName}' returned invalid directory access metadata`
-      );
-    }
-    const directoryAccess = parseResult.data;
-    return {
-      directoryAccess,
-      onGrantedRequestDetails: requestDetails,
-      requestDetails: {
-        type: 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})`);
@@ -1230,17 +1017,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;
@@ -1746,26 +1530,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);
+      }
     }
   }
   /**