@dexto/core 1.5.8 → 1.6.1

package/dist/approval/manager.cjs

@@ -32,21 +32,47 @@ __export(manager_exports, {
 });
 module.exports = __toCommonJS(manager_exports);
 var import_node_path = __toESM(require("node:path"), 1);
+var import_node_fs = require("node:fs");
 var import_types = require("./types.js");
 var import_factory = require("./factory.js");
 var import_types2 = require("../logger/v2/types.js");
 var import_errors = require("./errors.js");
-var import_bash_pattern_utils = require("../tools/bash-pattern-utils.js");
+var import_pattern_utils = require("../tools/pattern-utils.js");
+function tryRealpathSync(targetPath) {
+  try {
+    return (0, import_node_fs.realpathSync)(targetPath);
+  } catch {
+    return null;
+  }
+}
+function tryRealpathSyncWithExistingParent(resolvedPath) {
+  const direct = tryRealpathSync(resolvedPath);
+  if (direct) return direct;
+  let currentDir = import_node_path.default.dirname(resolvedPath);
+  while (true) {
+    const realDir = tryRealpathSync(currentDir);
+    if (realDir) {
+      const suffix = import_node_path.default.relative(currentDir, resolvedPath);
+      return import_node_path.default.join(realDir, suffix);
+    }
+    const parent = import_node_path.default.dirname(currentDir);
+    if (parent === currentDir) {
+      return null;
+    }
+    currentDir = parent;
+  }
+}
 class ApprovalManager {
   handler;
   config;
   logger;
   /**
-   * Bash command patterns approved for the current session.
-   * Patterns use simple glob syntax (e.g., "git *", "npm install *").
-   * Cleared when session ends.
+   * Tool approval patterns, keyed by tool id.
+   *
+   * Patterns use simple glob syntax (e.g. "git *", "npm install *") and are matched
+   * using pattern-to-pattern covering (see {@link patternCovers}).
    */
-  bashPatterns = /* @__PURE__ */ new Set();
+  toolPatterns = /* @__PURE__ */ new Map();
   /**
    * Directories approved for file access for the current session.
    * Stores normalized absolute paths mapped to their approval type:
@@ -59,36 +85,37 @@ class ApprovalManager {
     this.config = config;
     this.logger = logger.createChild(import_types2.DextoLogComponent.APPROVAL);
     this.logger.debug(
-      `ApprovalManager initialized with toolConfirmation.mode: ${config.toolConfirmation.mode}, elicitation.enabled: ${config.elicitation.enabled}`
+      `ApprovalManager initialized with permissions.mode: ${config.permissions.mode}, elicitation.enabled: ${config.elicitation.enabled}`
     );
   }
-  // ==================== Bash Pattern Methods ====================
+  // ==================== Pattern Methods ====================
+  getOrCreateToolPatternSet(toolName) {
+    const existing = this.toolPatterns.get(toolName);
+    if (existing) return existing;
+    const created = /* @__PURE__ */ new Set();
+    this.toolPatterns.set(toolName, created);
+    return created;
+  }
   /**
-   * Add a bash command pattern to the approved list for this session.
-   * Patterns use simple glob syntax with * as wildcard.
-   *
-   * @example
-   * ```typescript
-   * manager.addBashPattern("git *");        // Approves all git commands
-   * manager.addBashPattern("npm install *"); // Approves npm install with any package
-   * ```
+   * Add an approval pattern for a tool.
    */
-  addBashPattern(pattern) {
-    this.bashPatterns.add(pattern);
-    this.logger.debug(`Added bash pattern: "${pattern}"`);
+  addPattern(toolName, pattern) {
+    this.getOrCreateToolPatternSet(toolName).add(pattern);
+    this.logger.debug(`Added pattern for '${toolName}': "${pattern}"`);
   }
   /**
-   * Check if a bash pattern key is covered by any approved pattern.
-   * Uses pattern-to-pattern covering for broader pattern support.
+   * Check if a pattern key is covered by any approved pattern for a tool.
    *
-   * @param patternKey The pattern key generated from the command (e.g., "git push *")
-   * @returns true if the pattern key is covered by an approved pattern
-   */
-  matchesBashPattern(patternKey) {
-    for (const storedPattern of this.bashPatterns) {
-      if ((0, import_bash_pattern_utils.patternCovers)(storedPattern, patternKey)) {
+   * Note: This expects a pattern key (e.g. "git push *"), not raw arguments.
+   * Tools are responsible for generating the key via `tool.approval.patternKey()`.
+   */
+  matchesPattern(toolName, patternKey) {
+    const patterns = this.toolPatterns.get(toolName);
+    if (!patterns || patterns.size === 0) return false;
+    for (const storedPattern of patterns) {
+      if ((0, import_pattern_utils.patternCovers)(storedPattern, patternKey)) {
         this.logger.debug(
-          `Pattern key "${patternKey}" is covered by approved pattern "${storedPattern}"`
+          `Pattern key "${patternKey}" is covered by approved pattern "${storedPattern}" (tool: ${toolName})`
         );
         return true;
       }
@@ -96,23 +123,64 @@ class ApprovalManager {
     return false;
   }
   /**
-   * Clear all approved bash patterns.
-   * Should be called when session ends.
+   * Clear all patterns for a tool (or all tools when omitted).
    */
-  clearBashPatterns() {
-    const count = this.bashPatterns.size;
-    this.bashPatterns.clear();
+  clearPatterns(toolName) {
+    if (toolName) {
+      const patterns = this.toolPatterns.get(toolName);
+      if (!patterns) return;
+      const count2 = patterns.size;
+      patterns.clear();
+      if (count2 > 0) {
+        this.logger.debug(`Cleared ${count2} pattern(s) for '${toolName}'`);
+      }
+      return;
+    }
+    const count = Array.from(this.toolPatterns.values()).reduce(
+      (sum, set) => sum + set.size,
+      0
+    );
+    this.toolPatterns.clear();
     if (count > 0) {
-      this.logger.debug(`Cleared ${count} bash patterns`);
+      this.logger.debug(`Cleared ${count} total tool pattern(s)`);
     }
   }
   /**
-   * Get the current set of approved bash patterns (for debugging/display).
+   * Get patterns for a tool (for debugging/display).
    */
-  getBashPatterns() {
-    return this.bashPatterns;
+  getToolPatterns(toolName) {
+    return this.toolPatterns.get(toolName) ?? /* @__PURE__ */ new Set();
+  }
+  /**
+   * Get all tool patterns (for debugging/display).
+   */
+  getAllToolPatterns() {
+    return this.toolPatterns;
   }
   // ==================== Directory Access Methods ====================
+  /**
+   * Resolve a directory path for use as an approval key.
+   *
+   * We store BOTH the resolved path and (when available) its realpath, so approvals
+   * continue to work even when other subsystems canonicalize paths via realpath
+   * (e.g. macOS /tmp -> /private/tmp or custom symlinked directories).
+   */
+  getDirectoryApprovalKeys(directory) {
+    const resolved = import_node_path.default.resolve(directory);
+    const real = tryRealpathSyncWithExistingParent(resolved);
+    if (real && real !== resolved) {
+      return [resolved, real];
+    }
+    return [resolved];
+  }
+  getFileApprovalKeys(filePath) {
+    const resolved = import_node_path.default.resolve(filePath);
+    const real = tryRealpathSyncWithExistingParent(resolved);
+    if (real && real !== resolved) {
+      return [resolved, real];
+    }
+    return [resolved];
+  }
   /**
    * Initialize the working directory as a session-approved directory.
    * This should be called once during setup to ensure the working directory
@@ -121,9 +189,7 @@ class ApprovalManager {
    * @param workingDir The working directory path
    */
   initializeWorkingDirectory(workingDir) {
-    const normalized = import_node_path.default.resolve(workingDir);
-    this.approvedDirectories.set(normalized, "session");
-    this.logger.debug(`Initialized working directory as session-approved: "${normalized}"`);
+    this.addApprovedDirectory(workingDir, "session");
   }
   /**
    * Add a directory to the approved list for this session.
@@ -143,16 +209,28 @@ class ApprovalManager {
    * ```
    */
   addApprovedDirectory(directory, type = "session") {
-    const normalized = import_node_path.default.resolve(directory);
-    const existing = this.approvedDirectories.get(normalized);
-    if (existing === "session") {
+    const keys = this.getDirectoryApprovalKeys(directory);
+    const existingTypes = keys.map((key) => this.approvedDirectories.get(key)).filter((value) => value !== void 0);
+    const hasSessionApproval = existingTypes.includes("session");
+    const effectiveType = type === "session" || hasSessionApproval ? "session" : "once";
+    for (const key of keys) {
+      const existing = this.approvedDirectories.get(key);
+      if (existing === "session") {
+        continue;
+      }
+      this.approvedDirectories.set(key, effectiveType);
+    }
+    const resolvedKey = keys[0];
+    if (effectiveType === "session" && type === "once" && hasSessionApproval) {
       this.logger.debug(
-        `Directory "${normalized}" already approved as 'session', not downgrading to '${type}'`
+        `Directory "${resolvedKey}" already approved as 'session', not downgrading to 'once'`
       );
       return;
     }
-    this.approvedDirectories.set(normalized, type);
-    this.logger.debug(`Added approved directory: "${normalized}" (type: ${type})`);
+    const realKey = keys.length > 1 ? keys[1] : null;
+    this.logger.debug(
+      `Added approved directory: "${resolvedKey}" (type: ${effectiveType})${realKey ? `, realpath: "${realKey}"` : ""}`
+    );
   }
   /**
    * Check if a file path is within any session-approved directory.
@@ -163,15 +241,16 @@ class ApprovalManager {
    * @returns true if the path is within a session-approved directory
    */
   isDirectorySessionApproved(filePath) {
-    const normalized = import_node_path.default.resolve(filePath);
-    for (const [approvedDir, type] of this.approvedDirectories) {
-      if (type !== "session") continue;
-      const relative = import_node_path.default.relative(approvedDir, normalized);
-      if (!relative.startsWith("..") && !import_node_path.default.isAbsolute(relative)) {
-        this.logger.debug(
-          `Path "${normalized}" is within session-approved directory "${approvedDir}"`
-        );
-        return true;
+    for (const normalized of this.getFileApprovalKeys(filePath)) {
+      for (const [approvedDir, type] of this.approvedDirectories) {
+        if (type !== "session") continue;
+        const relative = import_node_path.default.relative(approvedDir, normalized);
+        if (!relative.startsWith("..") && !import_node_path.default.isAbsolute(relative)) {
+          this.logger.debug(
+            `Path "${normalized}" is within session-approved directory "${approvedDir}"`
+          );
+          return true;
+        }
       }
     }
     return false;
@@ -185,14 +264,15 @@ class ApprovalManager {
    * @returns true if the path is within any approved directory
    */
   isDirectoryApproved(filePath) {
-    const normalized = import_node_path.default.resolve(filePath);
-    for (const [approvedDir] of this.approvedDirectories) {
-      const relative = import_node_path.default.relative(approvedDir, normalized);
-      if (!relative.startsWith("..") && !import_node_path.default.isAbsolute(relative)) {
-        this.logger.debug(
-          `Path "${normalized}" is within approved directory "${approvedDir}"`
-        );
-        return true;
+    for (const normalized of this.getFileApprovalKeys(filePath)) {
+      for (const [approvedDir] of this.approvedDirectories) {
+        const relative = import_node_path.default.relative(approvedDir, normalized);
+        if (!relative.startsWith("..") && !import_node_path.default.isAbsolute(relative)) {
+          this.logger.debug(
+            `Path "${normalized}" is within approved directory "${approvedDir}"`
+          );
+          return true;
+        }
       }
     }
     return false;
@@ -221,11 +301,11 @@ class ApprovalManager {
     return Array.from(this.approvedDirectories.keys());
   }
   /**
-   * Clear all session-scoped approvals (bash patterns and directories).
+   * Clear all session-scoped approvals (tool patterns and directories).
    * Convenience method for clearing all session state at once.
    */
   clearSessionApprovals() {
-    this.clearBashPatterns();
+    this.clearPatterns();
     this.clearApprovedDirectories();
     this.logger.debug("Cleared all session approvals");
   }
@@ -249,7 +329,7 @@ class ApprovalManager {
     const details = {
       type: import_types.ApprovalType.DIRECTORY_ACCESS,
       // Use provided timeout, fallback to config timeout, or undefined (no timeout)
-      timeout: timeout !== void 0 ? timeout : this.config.toolConfirmation.timeout,
+      timeout: timeout !== void 0 ? timeout : this.config.permissions.timeout,
       metadata: directoryMetadata
     };
     if (sessionId !== void 0) {
@@ -270,7 +350,7 @@ class ApprovalManager {
     return this.handleApproval(request);
   }
   /**
-   * Handle approval requests (tool confirmation, elicitation, command confirmation, directory access, custom)
+   * Handle approval requests (tool approval, elicitation, command confirmation, directory access, custom)
    * @private
    */
   async handleApproval(request) {
@@ -281,7 +361,7 @@ class ApprovalManager {
       );
       return handler2(request);
     }
-    const mode = this.config.toolConfirmation.mode;
+    const mode = this.config.permissions.mode;
     if (mode === "auto-approve") {
       this.logger.info(
         `Auto-approve approval '${request.type}', approvalId: ${request.approvalId}`
@@ -317,18 +397,18 @@ class ApprovalManager {
     return handler(request);
   }
   /**
-   * Request tool confirmation approval
-   * Convenience method for tool execution confirmation
+   * Request tool approval
+   * Convenience method for tool execution approval
    *
    * TODO: Make sessionId required once all callers are updated to pass it
    * Tool confirmations always happen in session context during LLM execution
    */
-  async requestToolConfirmation(metadata) {
+  async requestToolApproval(metadata) {
     const { sessionId, timeout, ...toolMetadata } = metadata;
     const details = {
-      type: import_types.ApprovalType.TOOL_CONFIRMATION,
+      type: import_types.ApprovalType.TOOL_APPROVAL,
       // Use provided timeout, fallback to config timeout, or undefined (no timeout)
-      timeout: timeout !== void 0 ? timeout : this.config.toolConfirmation.timeout,
+      timeout: timeout !== void 0 ? timeout : this.config.permissions.timeout,
       metadata: toolMetadata
     };
     if (sessionId !== void 0) {
@@ -340,7 +420,7 @@ class ApprovalManager {
    * Request command confirmation approval
    * Convenience method for dangerous command execution within an already-approved tool
    *
-   * This is different from tool confirmation - it's for per-command approval
+   * This is different from tool approval - it's for per-command approval
    * of dangerous operations (like rm, git push) within tools that are already approved.
    *
    * TODO: Make sessionId required once all callers are updated to pass it
@@ -362,7 +442,7 @@ class ApprovalManager {
     const details = {
       type: import_types.ApprovalType.COMMAND_CONFIRMATION,
       // Use provided timeout, fallback to config timeout, or undefined (no timeout)
-      timeout: timeout !== void 0 ? timeout : this.config.toolConfirmation.timeout,
+      timeout: timeout !== void 0 ? timeout : this.config.permissions.timeout,
       metadata: commandMetadata
     };
     if (sessionId !== void 0) {
@@ -391,15 +471,15 @@ class ApprovalManager {
     return this.requestApproval(details);
   }
   /**
-   * Check if tool confirmation was approved
+   * Check if tool approval was approved
    * Throws appropriate error if denied
    */
-  async checkToolConfirmation(metadata) {
-    const response = await this.requestToolConfirmation(metadata);
+  async checkToolApproval(metadata) {
+    const response = await this.requestToolApproval(metadata);
     if (response.status === import_types.ApprovalStatus.APPROVED) {
       return true;
     } else if (response.status === import_types.ApprovalStatus.DENIED) {
-      throw import_errors.ApprovalError.toolConfirmationDenied(
+      throw import_errors.ApprovalError.toolApprovalDenied(
         metadata.toolName,
         response.reason,
         response.message,
@@ -408,7 +488,7 @@ class ApprovalManager {
     } else {
       throw import_errors.ApprovalError.cancelled(
         response.approvalId,
-        import_types.ApprovalType.TOOL_CONFIRMATION,
+        import_types.ApprovalType.TOOL_APPROVAL,
         response.message ?? response.reason
       );
     }
@@ -489,11 +569,11 @@ class ApprovalManager {
    * Set the approval handler for manual approval mode.
    *
    * The handler will be called for:
-   * - Tool confirmation requests when toolConfirmation.mode is 'manual'
-   * - All elicitation requests (when elicitation is enabled, regardless of toolConfirmation.mode)
+   * - Tool confirmation requests when permissions.mode is 'manual'
+   * - All elicitation requests (when elicitation is enabled, regardless of permissions.mode)
    *
    * A handler must be set before processing requests if:
-   * - toolConfirmation.mode is 'manual', or
+   * - permissions.mode is 'manual', or
    * - elicitation is enabled (elicitation.enabled is true)
    *
    * @param handler The approval handler function, or null to clear
@@ -526,7 +606,7 @@ class ApprovalManager {
   ensureHandler() {
     if (!this.handler) {
       throw import_errors.ApprovalError.invalidConfig(
-        'An approval handler is required but not configured.\nHandlers are required for:\n  \u2022 manual tool confirmation mode\n  \u2022 all elicitation requests (when elicitation is enabled)\nEither:\n  \u2022 set toolConfirmation.mode to "auto-approve" or "auto-deny", or\n  \u2022 disable elicitation (set elicitation.enabled: false), or\n  \u2022 call agent.setApprovalHandler(...) before processing requests.'
+        'An approval handler is required but not configured.\nHandlers are required for:\n  \u2022 manual tool approval mode\n  \u2022 all elicitation requests (when elicitation is enabled)\nEither:\n  \u2022 set permissions.mode to "auto-approve" or "auto-deny", or\n  \u2022 disable elicitation (set elicitation.enabled: false), or\n  \u2022 call agent.setApprovalHandler(...) before processing requests.'
       );
     }
     return this.handler;

package/dist/approval/manager.d.ts

@@ -1,11 +1,12 @@
-import type { ApprovalHandler, ApprovalRequest, ApprovalResponse, ApprovalRequestDetails, ToolConfirmationMetadata, CommandConfirmationMetadata, ElicitationMetadata, DirectoryAccessMetadata } from './types.js';
-import type { IDextoLogger } from '../logger/v2/types.js';
+import type { ApprovalHandler, ApprovalRequest, ApprovalResponse, ApprovalRequestDetails, ToolApprovalMetadata, CommandConfirmationMetadata, ElicitationMetadata, DirectoryAccessMetadata } from './types.js';
+import type { Logger } from '../logger/v2/types.js';
+import type { PermissionsMode } from '../tools/schemas.js';
 /**
  * Configuration for the approval manager
  */
 export interface ApprovalManagerConfig {
-    toolConfirmation: {
-        mode: 'manual' | 'auto-approve' | 'auto-deny';
+    permissions: {
+        mode: PermissionsMode;
         timeout?: number;
     };
     elicitation: {
@@ -17,7 +18,7 @@ export interface ApprovalManagerConfig {
  * ApprovalManager orchestrates all user approval flows in Dexto.
  *
  * It provides a unified interface for requesting user approvals across different
- * types (tool confirmation, MCP elicitation, custom approvals) and manages the
+ * types (tool approval, MCP elicitation, custom approvals) and manages the
  * underlying approval provider based on configuration.
  *
  * Key responsibilities:
@@ -30,12 +31,12 @@ export interface ApprovalManagerConfig {
  * @example
  * ```typescript
  * const manager = new ApprovalManager(
- *   { toolConfirmation: { mode: 'manual', timeout: 60000 }, elicitation: { enabled: true, timeout: 60000 } },
+ *   { permissions: { mode: 'manual', timeout: 60000 }, elicitation: { enabled: true, timeout: 60000 } },
  *   logger
  * );
  *
- * // Request tool confirmation
- * const response = await manager.requestToolConfirmation({
+ * // Request tool approval
+ * const response = await manager.requestToolApproval({
  *   toolName: 'git_commit',
  *   args: { message: 'feat: add feature' },
  *   sessionId: 'session-123'
@@ -51,11 +52,12 @@ export declare class ApprovalManager {
     private config;
     private logger;
     /**
-     * Bash command patterns approved for the current session.
-     * Patterns use simple glob syntax (e.g., "git *", "npm install *").
-     * Cleared when session ends.
+     * Tool approval patterns, keyed by tool id.
+     *
+     * Patterns use simple glob syntax (e.g. "git *", "npm install *") and are matched
+     * using pattern-to-pattern covering (see {@link patternCovers}).
      */
-    private bashPatterns;
+    private toolPatterns;
     /**
      * Directories approved for file access for the current session.
      * Stores normalized absolute paths mapped to their approval type:
@@ -64,35 +66,40 @@ export declare class ApprovalManager {
      * Cleared when session ends.
      */
     private approvedDirectories;
-    constructor(config: ApprovalManagerConfig, logger: IDextoLogger);
+    constructor(config: ApprovalManagerConfig, logger: Logger);
+    private getOrCreateToolPatternSet;
     /**
-     * Add a bash command pattern to the approved list for this session.
-     * Patterns use simple glob syntax with * as wildcard.
-     *
-     * @example
-     * ```typescript
-     * manager.addBashPattern("git *");        // Approves all git commands
-     * manager.addBashPattern("npm install *"); // Approves npm install with any package
-     * ```
+     * Add an approval pattern for a tool.
      */
-    addBashPattern(pattern: string): void;
+    addPattern(toolName: string, pattern: string): void;
     /**
-     * Check if a bash pattern key is covered by any approved pattern.
-     * Uses pattern-to-pattern covering for broader pattern support.
+     * Check if a pattern key is covered by any approved pattern for a tool.
      *
-     * @param patternKey The pattern key generated from the command (e.g., "git push *")
-     * @returns true if the pattern key is covered by an approved pattern
+     * Note: This expects a pattern key (e.g. "git push *"), not raw arguments.
+     * Tools are responsible for generating the key via `tool.approval.patternKey()`.
      */
-    matchesBashPattern(patternKey: string): boolean;
+    matchesPattern(toolName: string, patternKey: string): boolean;
     /**
-     * Clear all approved bash patterns.
-     * Should be called when session ends.
+     * Clear all patterns for a tool (or all tools when omitted).
+     */
+    clearPatterns(toolName?: string): void;
+    /**
+     * Get patterns for a tool (for debugging/display).
      */
-    clearBashPatterns(): void;
+    getToolPatterns(toolName: string): ReadonlySet<string>;
     /**
-     * Get the current set of approved bash patterns (for debugging/display).
+     * Get all tool patterns (for debugging/display).
+     */
+    getAllToolPatterns(): ReadonlyMap<string, Set<string>>;
+    /**
+     * Resolve a directory path for use as an approval key.
+     *
+     * We store BOTH the resolved path and (when available) its realpath, so approvals
+     * continue to work even when other subsystems canonicalize paths via realpath
+     * (e.g. macOS /tmp -> /private/tmp or custom symlinked directories).
      */
-    getBashPatterns(): ReadonlySet<string>;
+    private getDirectoryApprovalKeys;
+    private getFileApprovalKeys;
     /**
      * Initialize the working directory as a session-approved directory.
      * This should be called once during setup to ensure the working directory
@@ -151,7 +158,7 @@ export declare class ApprovalManager {
      */
     getApprovedDirectoryPaths(): string[];
     /**
-     * Clear all session-scoped approvals (bash patterns and directories).
+     * Clear all session-scoped approvals (tool patterns and directories).
      * Convenience method for clearing all session state at once.
      */
     clearSessionApprovals(): void;
@@ -179,18 +186,18 @@ export declare class ApprovalManager {
      */
     requestApproval(details: ApprovalRequestDetails): Promise<ApprovalResponse>;
     /**
-     * Handle approval requests (tool confirmation, elicitation, command confirmation, directory access, custom)
+     * Handle approval requests (tool approval, elicitation, command confirmation, directory access, custom)
      * @private
      */
     private handleApproval;
     /**
-     * Request tool confirmation approval
-     * Convenience method for tool execution confirmation
+     * Request tool approval
+     * Convenience method for tool execution approval
      *
      * TODO: Make sessionId required once all callers are updated to pass it
      * Tool confirmations always happen in session context during LLM execution
      */
-    requestToolConfirmation(metadata: ToolConfirmationMetadata & {
+    requestToolApproval(metadata: ToolApprovalMetadata & {
         sessionId?: string;
         timeout?: number;
     }): Promise<ApprovalResponse>;
@@ -198,7 +205,7 @@ export declare class ApprovalManager {
      * Request command confirmation approval
      * Convenience method for dangerous command execution within an already-approved tool
      *
-     * This is different from tool confirmation - it's for per-command approval
+     * This is different from tool approval - it's for per-command approval
      * of dangerous operations (like rm, git push) within tools that are already approved.
      *
      * TODO: Make sessionId required once all callers are updated to pass it
@@ -231,10 +238,10 @@ export declare class ApprovalManager {
         timeout?: number;
     }): Promise<ApprovalResponse>;
     /**
-     * Check if tool confirmation was approved
+     * Check if tool approval was approved
      * Throws appropriate error if denied
      */
-    checkToolConfirmation(metadata: ToolConfirmationMetadata & {
+    checkToolApproval(metadata: ToolApprovalMetadata & {
         sessionId?: string;
         timeout?: number;
     }): Promise<boolean>;
@@ -280,11 +287,11 @@ export declare class ApprovalManager {
      * Set the approval handler for manual approval mode.
      *
      * The handler will be called for:
-     * - Tool confirmation requests when toolConfirmation.mode is 'manual'
-     * - All elicitation requests (when elicitation is enabled, regardless of toolConfirmation.mode)
+     * - Tool confirmation requests when permissions.mode is 'manual'
+     * - All elicitation requests (when elicitation is enabled, regardless of permissions.mode)
      *
      * A handler must be set before processing requests if:
-     * - toolConfirmation.mode is 'manual', or
+     * - permissions.mode is 'manual', or
      * - elicitation is enabled (elicitation.enabled is true)
      *
      * @param handler The approval handler function, or null to clear

package/dist/approval/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/approval/manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/approval/manager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,oBAAoB,EACpB,2BAA2B,EAC3B,mBAAmB,EACnB,uBAAuB,EAC1B,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AA8B3D;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE;QACT,IAAI,EAAE,eAAe,CAAC;QACtB,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,WAAW,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACL;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,qBAAa,eAAe;IACxB,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,MAAM,CAAS;IAEvB;;;;;OAKG;IACH,OAAO,CAAC,YAAY,CAAuC;IAE3D;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB,CAA8C;gBAE7D,MAAM,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM;IAWzD,OAAO,CAAC,yBAAyB;IAQjC;;OAEG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAKnD;;;;;OAKG;IACH,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO;IAe7D;;OAEG;IACH,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAsBtC;;OAEG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;IAItD;;OAEG;IACH,kBAAkB,IAAI,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAMtD;;;;;;OAMG;IACH,OAAO,CAAC,wBAAwB;IAShC,OAAO,CAAC,mBAAmB;IAS3B;;;;;;OAMG;IACH,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIpD;;;;;;;;;;;;;;;;OAgBG;IACH,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,GAAE,SAAS,GAAG,MAAkB,GAAG,IAAI;IAoCnF;;;;;;;OAOG;IACH,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAkBrD;;;;;;;OAOG;IACH,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAe9C;;;OAGG;IACH,wBAAwB,IAAI,IAAI;IAQhC;;OAEG;IACH,sBAAsB,IAAI,WAAW,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC;IAIjE;;OAEG;IACH,yBAAyB,IAAI,MAAM,EAAE;IAIrC;;;OAGG;IACH,qBAAqB,IAAI,IAAI;IAM7B;;;;;;;;;;;;;;OAcG;IACG,sBAAsB,CACxB,QAAQ,EAAE,uBAAuB,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC7E,OAAO,CAAC,gBAAgB,CAAC;IAiB5B;;OAEG;IACG,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAcjF;;;OAGG;YACW,cAAc;IAqD5B;;;;;;OAMG;IACG,mBAAmB,CACrB,QAAQ,EAAE,oBAAoB,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC1E,OAAO,CAAC,gBAAgB,CAAC;IAiB5B;;;;;;;;;;;;;;;;;;;;OAoBG;IACG,0BAA0B,CAC5B,QAAQ,EAAE,2BAA2B,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GACjF,OAAO,CAAC,gBAAgB,CAAC;IAiB5B;;;;;;OAMG;IACG,kBAAkB,CACpB,QAAQ,EAAE,mBAAmB,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GACzE,OAAO,CAAC,gBAAgB,CAAC;IAiB5B;;;OAGG;IACG,iBAAiB,CACnB,QAAQ,EAAE,oBAAoB,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC1E,OAAO,CAAC,OAAO,CAAC;IAqBnB;;;OAGG;IACG,kBAAkB,CACpB,QAAQ,EAAE,mBAAmB,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GACzE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAgCnC;;OAEG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIxC;;OAEG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;OAEG;IACH,mBAAmB,IAAI,MAAM,EAAE;IAI/B;;OAEG;IACH,0BAA0B,IAAI,eAAe,EAAE;IAI/C;;;;;;;;OAQG;IACH,0BAA0B,CACtB,SAAS,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,OAAO,EAChD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM;IAQT;;OAEG;IACH,SAAS,IAAI,qBAAqB;IAIlC;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,GAAG,IAAI;IASjD;;OAEG;IACH,YAAY,IAAI,IAAI;IAKpB;;OAEG;IACI,UAAU,IAAI,OAAO;IAI5B;;;OAGG;IACH,OAAO,CAAC,aAAa;CAgBxB"}