@dexto/core 1.2.4 → 1.2.6

package/dist/approval/manager.cjs

@@ -22,55 +22,91 @@ __export(manager_exports, {
 });
 module.exports = __toCommonJS(manager_exports);
 var import_types = require("./types.js");
-var import_event_based_approval_provider = require("./providers/event-based-approval-provider.js");
-var import_noop_approval_provider = require("./providers/noop-approval-provider.js");
-var import_factory = require("./providers/factory.js");
-var import_logger = require("../logger/index.js");
+var import_factory = require("./factory.js");
+var import_types2 = require("../logger/v2/types.js");
 var import_errors = require("./errors.js");
 class ApprovalManager {
-  provider;
+  handler;
   config;
-  constructor(agentEventBus, config) {
+  logger;
+  constructor(config, logger) {
     this.config = config;
-    this.provider = this.createProvider(agentEventBus, config);
-    import_logger.logger.debug(
-      `ApprovalManager initialized with mode: ${config.mode}, timeout: ${config.timeout}ms`
+    this.logger = logger.createChild(import_types2.DextoLogComponent.APPROVAL);
+    this.logger.debug(
+      `ApprovalManager initialized with toolConfirmation.mode: ${config.toolConfirmation.mode}, elicitation.enabled: ${config.elicitation.enabled}`
     );
   }
   /**
-   * Create appropriate approval provider based on configuration
-   * TODO: Move this into factory.ts
+   * Request a generic approval
    */
-  createProvider(agentEventBus, config) {
-    switch (config.mode) {
-      case "event-based":
-        return new import_event_based_approval_provider.EventBasedApprovalProvider(agentEventBus, {
-          defaultTimeout: config.timeout
-        });
-      case "auto-approve":
-        return new import_noop_approval_provider.NoOpApprovalProvider({ defaultStatus: import_types.ApprovalStatus.APPROVED });
-      case "auto-deny":
-        return new import_noop_approval_provider.NoOpApprovalProvider({ defaultStatus: import_types.ApprovalStatus.DENIED });
-      default:
-        throw import_errors.ApprovalError.invalidConfig(`Unknown approval mode: ${config.mode}`);
+  async requestApproval(details) {
+    const request = (0, import_factory.createApprovalRequest)(details);
+    if (request.type === import_types.ApprovalType.ELICITATION && !this.config.elicitation.enabled) {
+      throw import_errors.ApprovalError.invalidConfig(
+        "Elicitation is disabled. Enable elicitation in your agent configuration to use the ask_user tool or MCP server elicitations."
+      );
     }
+    return this.handleApproval(request);
   }
   /**
-   * Request a generic approval
+   * Handle approval requests (tool confirmation, elicitation, command confirmation, custom)
+   * @private
    */
-  async requestApproval(details) {
-    const request = (0, import_factory.createApprovalRequest)(details);
-    return this.provider.requestApproval(request);
+  async handleApproval(request) {
+    if (request.type === import_types.ApprovalType.ELICITATION) {
+      const handler2 = this.ensureHandler();
+      this.logger.info(
+        `Elicitation requested, approvalId: ${request.approvalId}, sessionId: ${request.sessionId ?? "global"}`
+      );
+      return handler2(request);
+    }
+    const mode = this.config.toolConfirmation.mode;
+    if (mode === "auto-approve") {
+      this.logger.info(
+        `Auto-approve approval '${request.type}', approvalId: ${request.approvalId}`
+      );
+      const response = {
+        approvalId: request.approvalId,
+        status: import_types.ApprovalStatus.APPROVED
+      };
+      if (request.sessionId !== void 0) {
+        response.sessionId = request.sessionId;
+      }
+      return response;
+    }
+    if (mode === "auto-deny") {
+      this.logger.info(
+        `Auto-deny approval '${request.type}', approvalId: ${request.approvalId}`
+      );
+      const response = {
+        approvalId: request.approvalId,
+        status: import_types.ApprovalStatus.DENIED,
+        reason: import_types.DenialReason.SYSTEM_DENIED,
+        message: `Approval automatically denied by system policy (auto-deny mode)`
+      };
+      if (request.sessionId !== void 0) {
+        response.sessionId = request.sessionId;
+      }
+      return response;
+    }
+    const handler = this.ensureHandler();
+    this.logger.info(
+      `Manual approval '${request.type}' requested, approvalId: ${request.approvalId}, sessionId: ${request.sessionId ?? "global"}`
+    );
+    return handler(request);
   }
   /**
    * Request tool confirmation approval
    * Convenience method for tool execution confirmation
+   *
+   * 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) {
     const { sessionId, timeout, ...toolMetadata } = metadata;
     const details = {
       type: import_types.ApprovalType.TOOL_CONFIRMATION,
-      timeout: timeout ?? this.config.timeout,
+      timeout: timeout ?? this.config.toolConfirmation.timeout,
       metadata: toolMetadata
     };
     if (sessionId !== void 0) {
@@ -85,6 +121,9 @@ class ApprovalManager {
    * This is different from tool confirmation - 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
+   * Command confirmations always happen during tool execution which has session context
+   *
    * @example
    * ```typescript
    * // bash_exec tool is approved, but dangerous commands still require approval
@@ -100,7 +139,7 @@ class ApprovalManager {
     const { sessionId, timeout, ...commandMetadata } = metadata;
     const details = {
       type: import_types.ApprovalType.COMMAND_CONFIRMATION,
-      timeout: timeout ?? this.config.timeout,
+      timeout: timeout ?? this.config.toolConfirmation.timeout,
       metadata: commandMetadata
     };
     if (sessionId !== void 0) {
@@ -119,7 +158,7 @@ class ApprovalManager {
     const { sessionId, timeout, ...elicitationMetadata } = metadata;
     const details = {
       type: import_types.ApprovalType.ELICITATION,
-      timeout: timeout ?? this.config.timeout,
+      timeout: timeout ?? this.config.elicitation.timeout,
       metadata: elicitationMetadata
     };
     if (sessionId !== void 0) {
@@ -136,9 +175,18 @@ class ApprovalManager {
     if (response.status === import_types.ApprovalStatus.APPROVED) {
       return true;
     } else if (response.status === import_types.ApprovalStatus.DENIED) {
-      throw import_errors.ApprovalError.toolConfirmationDenied(metadata.toolName, metadata.sessionId);
+      throw import_errors.ApprovalError.toolConfirmationDenied(
+        metadata.toolName,
+        response.reason,
+        response.message,
+        metadata.sessionId
+      );
     } else {
-      throw import_errors.ApprovalError.cancelled(response.approvalId, import_types.ApprovalType.TOOL_CONFIRMATION);
+      throw import_errors.ApprovalError.cancelled(
+        response.approvalId,
+        import_types.ApprovalType.TOOL_CONFIRMATION,
+        response.message ?? response.reason
+      );
     }
   }
   /**
@@ -153,28 +201,37 @@ class ApprovalManager {
       }
       return {};
     } else if (response.status === import_types.ApprovalStatus.DENIED) {
-      throw import_errors.ApprovalError.elicitationDenied(metadata.serverName, metadata.sessionId);
+      throw import_errors.ApprovalError.elicitationDenied(
+        metadata.serverName,
+        response.reason,
+        response.message,
+        metadata.sessionId
+      );
     } else {
-      throw import_errors.ApprovalError.cancelled(response.approvalId, import_types.ApprovalType.ELICITATION);
+      throw import_errors.ApprovalError.cancelled(
+        response.approvalId,
+        import_types.ApprovalType.ELICITATION,
+        response.message ?? response.reason
+      );
     }
   }
   /**
    * Cancel a specific approval request
    */
   cancelApproval(approvalId) {
-    this.provider.cancelApproval(approvalId);
+    this.handler?.cancel?.(approvalId);
   }
   /**
    * Cancel all pending approval requests
    */
   cancelAllApprovals() {
-    this.provider.cancelAllApprovals();
+    this.handler?.cancelAll?.();
   }
   /**
    * Get list of pending approval IDs
    */
   getPendingApprovals() {
-    return this.provider.getPendingApprovals();
+    return this.handler?.getPending?.() ?? [];
   }
   /**
    * Get current configuration
@@ -182,6 +239,52 @@ class ApprovalManager {
   getConfig() {
     return { ...this.config };
   }
+  /**
+   * 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)
+   *
+   * A handler must be set before processing requests if:
+   * - toolConfirmation.mode is 'manual', or
+   * - elicitation is enabled (elicitation.enabled is true)
+   *
+   * @param handler The approval handler function, or null to clear
+   */
+  setHandler(handler) {
+    if (handler === null) {
+      this.handler = void 0;
+    } else {
+      this.handler = handler;
+    }
+    this.logger.debug(`Approval handler ${handler ? "registered" : "cleared"}`);
+  }
+  /**
+   * Clear the current approval handler
+   */
+  clearHandler() {
+    this.handler = void 0;
+    this.logger.debug("Approval handler cleared");
+  }
+  /**
+   * Check if an approval handler is registered
+   */
+  hasHandler() {
+    return this.handler !== void 0;
+  }
+  /**
+   * Get the approval handler, throwing if not set
+   * @private
+   */
+  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.'
+      );
+    }
+    return this.handler;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/approval/manager.d.ts

@@ -1,15 +1,17 @@
-import type { ApprovalResponse, ApprovalRequestDetails, ToolConfirmationMetadata, CommandConfirmationMetadata, ElicitationMetadata } from './types.js';
-import type { AgentEventBus } from '../events/index.js';
+import type { ApprovalHandler, ApprovalResponse, ApprovalRequestDetails, ToolConfirmationMetadata, CommandConfirmationMetadata, ElicitationMetadata } from './types.js';
+import type { IDextoLogger } from '../logger/v2/types.js';
 /**
  * Configuration for the approval manager
  */
 export interface ApprovalManagerConfig {
-    mode: 'event-based' | 'auto-approve' | 'auto-deny';
-    /**
-     * Timeout in milliseconds for approval requests
-     * @default 120000 (2 minutes)
-     */
-    timeout: number;
+    toolConfirmation: {
+        mode: 'manual' | 'auto-approve' | 'auto-deny';
+        timeout: number;
+    };
+    elicitation: {
+        enabled: boolean;
+        timeout: number;
+    };
 }
 /**
  * ApprovalManager orchestrates all user approval flows in Dexto.
@@ -23,11 +25,14 @@ export interface ApprovalManagerConfig {
  * - Route approvals to appropriate providers
  * - Provide convenience methods for specific approval types
  * - Handle approval responses and errors
- * - Support multiple approval modes (event-based, auto-approve, auto-deny)
+ * - Support multiple approval modes (manual, auto-approve, auto-deny)
  *
  * @example
  * ```typescript
- * const manager = new ApprovalManager(eventBus, { mode: 'event-based' });
+ * const manager = new ApprovalManager(
+ *   { toolConfirmation: { mode: 'manual', timeout: 60000 }, elicitation: { enabled: true, timeout: 60000 } },
+ *   logger
+ * );
  *
  * // Request tool confirmation
  * const response = await manager.requestToolConfirmation({
@@ -42,21 +47,25 @@ export interface ApprovalManagerConfig {
  * ```
  */
 export declare class ApprovalManager {
-    private provider;
+    private handler;
     private config;
-    constructor(agentEventBus: AgentEventBus, config: ApprovalManagerConfig);
-    /**
-     * Create appropriate approval provider based on configuration
-     * TODO: Move this into factory.ts
-     */
-    private createProvider;
+    private logger;
+    constructor(config: ApprovalManagerConfig, logger: IDextoLogger);
     /**
      * Request a generic approval
      */
     requestApproval(details: ApprovalRequestDetails): Promise<ApprovalResponse>;
+    /**
+     * Handle approval requests (tool confirmation, elicitation, command confirmation, custom)
+     * @private
+     */
+    private handleApproval;
     /**
      * Request tool confirmation approval
      * Convenience method for tool execution confirmation
+     *
+     * 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 & {
         sessionId?: string;
@@ -69,6 +78,9 @@ export declare class ApprovalManager {
      * This is different from tool confirmation - 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
+     * Command confirmations always happen during tool execution which has session context
+     *
      * @example
      * ```typescript
      * // bash_exec tool is approved, but dangerous commands still require approval
@@ -127,5 +139,32 @@ export declare class ApprovalManager {
      * Get current configuration
      */
     getConfig(): ApprovalManagerConfig;
+    /**
+     * 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)
+     *
+     * A handler must be set before processing requests if:
+     * - toolConfirmation.mode is 'manual', or
+     * - elicitation is enabled (elicitation.enabled is true)
+     *
+     * @param handler The approval handler function, or null to clear
+     */
+    setHandler(handler: ApprovalHandler | null): void;
+    /**
+     * Clear the current approval handler
+     */
+    clearHandler(): void;
+    /**
+     * Check if an approval handler is registered
+     */
+    hasHandler(): boolean;
+    /**
+     * Get the approval handler, throwing if not set
+     * @private
+     */
+    private ensureHandler;
 }
 //# sourceMappingURL=manager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/approval/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAER,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,EACxB,2BAA2B,EAC3B,mBAAmB,EACtB,MAAM,YAAY,CAAC;AAKpB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIxD;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC,IAAI,EAAE,aAAa,GAAG,cAAc,GAAG,WAAW,CAAC;IACnD;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,eAAe;IACxB,OAAO,CAAC,QAAQ,CAAmB;IACnC,OAAO,CAAC,MAAM,CAAwB;gBAE1B,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,qBAAqB;IASvE;;;OAGG;IACH,OAAO,CAAC,cAAc;IAkBtB;;OAEG;IACG,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAKjF;;;OAGG;IACG,uBAAuB,CACzB,QAAQ,EAAE,wBAAwB,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC9E,OAAO,CAAC,gBAAgB,CAAC;IAgB5B;;;;;;;;;;;;;;;;;OAiBG;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;IAgB5B;;;;;;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;IAgB5B;;;OAGG;IACG,qBAAqB,CACvB,QAAQ,EAAE,wBAAwB,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC9E,OAAO,CAAC,OAAO,CAAC;IAYnB;;;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;IAwBnC;;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,SAAS,IAAI,qBAAqB;CAGrC"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/approval/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,eAAe,EAEf,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,EACxB,2BAA2B,EAC3B,mBAAmB,EACtB,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAI1D;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC,gBAAgB,EAAE;QACd,IAAI,EAAE,QAAQ,GAAG,cAAc,GAAG,WAAW,CAAC;QAC9C,OAAO,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,WAAW,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;KACnB,CAAC;CACL;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,qBAAa,eAAe;IACxB,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,qBAAqB,EAAE,MAAM,EAAE,YAAY;IAS/D;;OAEG;IACG,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAcjF;;;OAGG;YACW,cAAc;IAqD5B;;;;;;OAMG;IACG,uBAAuB,CACzB,QAAQ,EAAE,wBAAwB,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC9E,OAAO,CAAC,gBAAgB,CAAC;IAgB5B;;;;;;;;;;;;;;;;;;;;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;IAgB5B;;;;;;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;IAgB5B;;;OAGG;IACG,qBAAqB,CACvB,QAAQ,EAAE,wBAAwB,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC9E,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,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"}

package/dist/approval/manager.js

@@ -1,54 +1,90 @@
 import "../chunk-C6A6W6XS.js";
-import { ApprovalType, ApprovalStatus } from "./types.js";
-import { EventBasedApprovalProvider } from "./providers/event-based-approval-provider.js";
-import { NoOpApprovalProvider } from "./providers/noop-approval-provider.js";
-import { createApprovalRequest } from "./providers/factory.js";
-import { logger } from "../logger/index.js";
+import { ApprovalType, ApprovalStatus, DenialReason } from "./types.js";
+import { createApprovalRequest } from "./factory.js";
+import { DextoLogComponent } from "../logger/v2/types.js";
 import { ApprovalError } from "./errors.js";
 class ApprovalManager {
-  provider;
+  handler;
   config;
-  constructor(agentEventBus, config) {
+  logger;
+  constructor(config, logger) {
     this.config = config;
-    this.provider = this.createProvider(agentEventBus, config);
-    logger.debug(
-      `ApprovalManager initialized with mode: ${config.mode}, timeout: ${config.timeout}ms`
+    this.logger = logger.createChild(DextoLogComponent.APPROVAL);
+    this.logger.debug(
+      `ApprovalManager initialized with toolConfirmation.mode: ${config.toolConfirmation.mode}, elicitation.enabled: ${config.elicitation.enabled}`
     );
   }
   /**
-   * Create appropriate approval provider based on configuration
-   * TODO: Move this into factory.ts
+   * Request a generic approval
    */
-  createProvider(agentEventBus, config) {
-    switch (config.mode) {
-      case "event-based":
-        return new EventBasedApprovalProvider(agentEventBus, {
-          defaultTimeout: config.timeout
-        });
-      case "auto-approve":
-        return new NoOpApprovalProvider({ defaultStatus: ApprovalStatus.APPROVED });
-      case "auto-deny":
-        return new NoOpApprovalProvider({ defaultStatus: ApprovalStatus.DENIED });
-      default:
-        throw ApprovalError.invalidConfig(`Unknown approval mode: ${config.mode}`);
+  async requestApproval(details) {
+    const request = createApprovalRequest(details);
+    if (request.type === ApprovalType.ELICITATION && !this.config.elicitation.enabled) {
+      throw ApprovalError.invalidConfig(
+        "Elicitation is disabled. Enable elicitation in your agent configuration to use the ask_user tool or MCP server elicitations."
+      );
     }
+    return this.handleApproval(request);
   }
   /**
-   * Request a generic approval
+   * Handle approval requests (tool confirmation, elicitation, command confirmation, custom)
+   * @private
    */
-  async requestApproval(details) {
-    const request = createApprovalRequest(details);
-    return this.provider.requestApproval(request);
+  async handleApproval(request) {
+    if (request.type === ApprovalType.ELICITATION) {
+      const handler2 = this.ensureHandler();
+      this.logger.info(
+        `Elicitation requested, approvalId: ${request.approvalId}, sessionId: ${request.sessionId ?? "global"}`
+      );
+      return handler2(request);
+    }
+    const mode = this.config.toolConfirmation.mode;
+    if (mode === "auto-approve") {
+      this.logger.info(
+        `Auto-approve approval '${request.type}', approvalId: ${request.approvalId}`
+      );
+      const response = {
+        approvalId: request.approvalId,
+        status: ApprovalStatus.APPROVED
+      };
+      if (request.sessionId !== void 0) {
+        response.sessionId = request.sessionId;
+      }
+      return response;
+    }
+    if (mode === "auto-deny") {
+      this.logger.info(
+        `Auto-deny approval '${request.type}', approvalId: ${request.approvalId}`
+      );
+      const response = {
+        approvalId: request.approvalId,
+        status: ApprovalStatus.DENIED,
+        reason: DenialReason.SYSTEM_DENIED,
+        message: `Approval automatically denied by system policy (auto-deny mode)`
+      };
+      if (request.sessionId !== void 0) {
+        response.sessionId = request.sessionId;
+      }
+      return response;
+    }
+    const handler = this.ensureHandler();
+    this.logger.info(
+      `Manual approval '${request.type}' requested, approvalId: ${request.approvalId}, sessionId: ${request.sessionId ?? "global"}`
+    );
+    return handler(request);
   }
   /**
    * Request tool confirmation approval
    * Convenience method for tool execution confirmation
+   *
+   * 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) {
     const { sessionId, timeout, ...toolMetadata } = metadata;
     const details = {
       type: ApprovalType.TOOL_CONFIRMATION,
-      timeout: timeout ?? this.config.timeout,
+      timeout: timeout ?? this.config.toolConfirmation.timeout,
       metadata: toolMetadata
     };
     if (sessionId !== void 0) {
@@ -63,6 +99,9 @@ class ApprovalManager {
    * This is different from tool confirmation - 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
+   * Command confirmations always happen during tool execution which has session context
+   *
    * @example
    * ```typescript
    * // bash_exec tool is approved, but dangerous commands still require approval
@@ -78,7 +117,7 @@ class ApprovalManager {
     const { sessionId, timeout, ...commandMetadata } = metadata;
     const details = {
       type: ApprovalType.COMMAND_CONFIRMATION,
-      timeout: timeout ?? this.config.timeout,
+      timeout: timeout ?? this.config.toolConfirmation.timeout,
       metadata: commandMetadata
     };
     if (sessionId !== void 0) {
@@ -97,7 +136,7 @@ class ApprovalManager {
     const { sessionId, timeout, ...elicitationMetadata } = metadata;
     const details = {
       type: ApprovalType.ELICITATION,
-      timeout: timeout ?? this.config.timeout,
+      timeout: timeout ?? this.config.elicitation.timeout,
       metadata: elicitationMetadata
     };
     if (sessionId !== void 0) {
@@ -114,9 +153,18 @@ class ApprovalManager {
     if (response.status === ApprovalStatus.APPROVED) {
       return true;
     } else if (response.status === ApprovalStatus.DENIED) {
-      throw ApprovalError.toolConfirmationDenied(metadata.toolName, metadata.sessionId);
+      throw ApprovalError.toolConfirmationDenied(
+        metadata.toolName,
+        response.reason,
+        response.message,
+        metadata.sessionId
+      );
     } else {
-      throw ApprovalError.cancelled(response.approvalId, ApprovalType.TOOL_CONFIRMATION);
+      throw ApprovalError.cancelled(
+        response.approvalId,
+        ApprovalType.TOOL_CONFIRMATION,
+        response.message ?? response.reason
+      );
     }
   }
   /**
@@ -131,28 +179,37 @@ class ApprovalManager {
       }
       return {};
     } else if (response.status === ApprovalStatus.DENIED) {
-      throw ApprovalError.elicitationDenied(metadata.serverName, metadata.sessionId);
+      throw ApprovalError.elicitationDenied(
+        metadata.serverName,
+        response.reason,
+        response.message,
+        metadata.sessionId
+      );
     } else {
-      throw ApprovalError.cancelled(response.approvalId, ApprovalType.ELICITATION);
+      throw ApprovalError.cancelled(
+        response.approvalId,
+        ApprovalType.ELICITATION,
+        response.message ?? response.reason
+      );
     }
   }
   /**
    * Cancel a specific approval request
    */
   cancelApproval(approvalId) {
-    this.provider.cancelApproval(approvalId);
+    this.handler?.cancel?.(approvalId);
   }
   /**
    * Cancel all pending approval requests
    */
   cancelAllApprovals() {
-    this.provider.cancelAllApprovals();
+    this.handler?.cancelAll?.();
   }
   /**
    * Get list of pending approval IDs
    */
   getPendingApprovals() {
-    return this.provider.getPendingApprovals();
+    return this.handler?.getPending?.() ?? [];
   }
   /**
    * Get current configuration
@@ -160,6 +217,52 @@ class ApprovalManager {
   getConfig() {
     return { ...this.config };
   }
+  /**
+   * 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)
+   *
+   * A handler must be set before processing requests if:
+   * - toolConfirmation.mode is 'manual', or
+   * - elicitation is enabled (elicitation.enabled is true)
+   *
+   * @param handler The approval handler function, or null to clear
+   */
+  setHandler(handler) {
+    if (handler === null) {
+      this.handler = void 0;
+    } else {
+      this.handler = handler;
+    }
+    this.logger.debug(`Approval handler ${handler ? "registered" : "cleared"}`);
+  }
+  /**
+   * Clear the current approval handler
+   */
+  clearHandler() {
+    this.handler = void 0;
+    this.logger.debug("Approval handler cleared");
+  }
+  /**
+   * Check if an approval handler is registered
+   */
+  hasHandler() {
+    return this.handler !== void 0;
+  }
+  /**
+   * Get the approval handler, throwing if not set
+   * @private
+   */
+  ensureHandler() {
+    if (!this.handler) {
+      throw 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.'
+      );
+    }
+    return this.handler;
+  }
 }
 export {
   ApprovalManager