@dexto/core 1.2.6 → 1.4.0

package/dist/agent/types.d.ts

@@ -3,12 +3,12 @@
  *
  * Re-uses existing types from context, llm/services, and events to avoid duplication.
  */
-import type { ImageData, FileData } from '../context/types.js';
+import type { ContentPart } from '../context/types.js';
 import type { LLMTokenUsage } from '../llm/services/types.js';
 /**
- * Re-export existing types for convenience
+ * Re-export content part types for API consumers
  */
-export type { ImageData as ImageInput, FileData as FileInput } from '../context/types.js';
+export type { ContentPart, TextPart, ImagePart, FilePart, ImageData, FileData, } from '../context/types.js';
 export type { LLMTokenUsage as TokenUsage } from '../llm/services/types.js';
 /**
  * Tool call information for agent streaming
@@ -24,13 +24,28 @@ export interface AgentToolCall {
     } | undefined;
 }
 /**
- * Options for generate() method
+ * Content input for generate() and stream() methods.
+ * Can be a simple string (for text-only messages) or an array of ContentPart (for multimodal).
+ *
+ * @example
+ * ```typescript
+ * // Simple text
+ * agent.generate('What is 2+2?', sessionId);
+ *
+ * // Multimodal with image
+ * agent.generate([
+ *     { type: 'text', text: 'Describe this image' },
+ *     { type: 'image', image: base64Data, mimeType: 'image/png' }
+ * ], sessionId);
+ * ```
+ */
+export type ContentInput = string | ContentPart[];
+/**
+ * Options for generate() and stream() methods
  */
 export interface GenerateOptions {
-    sessionId: string;
-    imageData?: ImageData | undefined;
-    fileData?: FileData | undefined;
-    signal?: AbortSignal | undefined;
+    /** AbortSignal for cancellation */
+    signal?: AbortSignal;
 }
 /**
  * Complete response from generate() method
@@ -41,7 +56,6 @@ export interface GenerateResponse {
     usage: LLMTokenUsage;
     toolCalls: AgentToolCall[];
     sessionId: string;
-    messageId: string;
 }
 /**
  * Options for stream() method (same as generate)
@@ -49,6 +63,5 @@ export interface GenerateResponse {
  * Note: stream() now returns core StreamingEvent types directly from the event system.
  * See packages/core/src/events/index.ts for event definitions.
  */
-export interface StreamOptions extends GenerateOptions {
-}
+export type StreamOptions = GenerateOptions;
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/agent/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;GAEG;AACH,YAAY,EAAE,SAAS,IAAI,UAAU,EAAE,QAAQ,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC1F,YAAY,EAAE,aAAa,IAAI,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE5E;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EACD;QACI,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,EAAE,GAAG,CAAC;KACb,GACD,SAAS,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAc,SAAQ,eAAe;CAErD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/agent/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;GAEG;AACH,YAAY,EACR,WAAW,EACX,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,SAAS,EACT,QAAQ,GACX,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,aAAa,IAAI,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE5E;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EACD;QACI,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,EAAE,GAAG,CAAC;KACb,GACD,SAAS,CAAC;CACnB;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,WAAW,EAAE,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,mCAAmC;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG,eAAe,CAAC"}

package/dist/approval/error-codes.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 var ApprovalErrorCode = /* @__PURE__ */ ((ApprovalErrorCode2) => {
   ApprovalErrorCode2["APPROVAL_INVALID_REQUEST"] = "approval_invalid_request";
   ApprovalErrorCode2["APPROVAL_INVALID_RESPONSE"] = "approval_invalid_response";

package/dist/approval/errors.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { DextoRuntimeError, ErrorScope, ErrorType } from "../errors/index.js";
 import { ApprovalErrorCode } from "./error-codes.js";
 class ApprovalError {

package/dist/approval/factory.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { randomUUID } from "crypto";
 function createApprovalRequest(details) {
   return {

package/dist/approval/index.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { ApprovalType, ApprovalStatus, DenialReason } from "./types.js";
 import {
   ApprovalTypeSchema,

package/dist/approval/manager.cjs

@@ -25,10 +25,17 @@ 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");
 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.
+   */
+  bashPatterns = /* @__PURE__ */ new Set();
   constructor(config, logger) {
     this.config = config;
     this.logger = logger.createChild(import_types2.DextoLogComponent.APPROVAL);
@@ -36,6 +43,56 @@ class ApprovalManager {
       `ApprovalManager initialized with toolConfirmation.mode: ${config.toolConfirmation.mode}, elicitation.enabled: ${config.elicitation.enabled}`
     );
   }
+  // ==================== Bash Pattern Methods ====================
+  /**
+   * 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
+   * ```
+   */
+  addBashPattern(pattern) {
+    this.bashPatterns.add(pattern);
+    this.logger.debug(`Added bash pattern: "${pattern}"`);
+  }
+  /**
+   * Check if a bash pattern key is covered by any approved pattern.
+   * Uses pattern-to-pattern covering for broader pattern support.
+   *
+   * @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)) {
+        this.logger.debug(
+          `Pattern key "${patternKey}" is covered by approved pattern "${storedPattern}"`
+        );
+        return true;
+      }
+    }
+    return false;
+  }
+  /**
+   * Clear all approved bash patterns.
+   * Should be called when session ends.
+   */
+  clearBashPatterns() {
+    const count = this.bashPatterns.size;
+    this.bashPatterns.clear();
+    if (count > 0) {
+      this.logger.debug(`Cleared ${count} bash patterns`);
+    }
+  }
+  /**
+   * Get the current set of approved bash patterns (for debugging/display).
+   */
+  getBashPatterns() {
+    return this.bashPatterns;
+  }
   /**
    * Request a generic approval
    */
@@ -106,7 +163,8 @@ class ApprovalManager {
     const { sessionId, timeout, ...toolMetadata } = metadata;
     const details = {
       type: import_types.ApprovalType.TOOL_CONFIRMATION,
-      timeout: timeout ?? this.config.toolConfirmation.timeout,
+      // Use provided timeout, fallback to config timeout, or undefined (no timeout)
+      timeout: timeout !== void 0 ? timeout : this.config.toolConfirmation.timeout,
       metadata: toolMetadata
     };
     if (sessionId !== void 0) {
@@ -139,7 +197,8 @@ class ApprovalManager {
     const { sessionId, timeout, ...commandMetadata } = metadata;
     const details = {
       type: import_types.ApprovalType.COMMAND_CONFIRMATION,
-      timeout: timeout ?? this.config.toolConfirmation.timeout,
+      // Use provided timeout, fallback to config timeout, or undefined (no timeout)
+      timeout: timeout !== void 0 ? timeout : this.config.toolConfirmation.timeout,
       metadata: commandMetadata
     };
     if (sessionId !== void 0) {
@@ -158,7 +217,8 @@ class ApprovalManager {
     const { sessionId, timeout, ...elicitationMetadata } = metadata;
     const details = {
       type: import_types.ApprovalType.ELICITATION,
-      timeout: timeout ?? this.config.elicitation.timeout,
+      // Use provided timeout, fallback to config timeout, or undefined (no timeout)
+      timeout: timeout !== void 0 ? timeout : this.config.elicitation.timeout,
       metadata: elicitationMetadata
     };
     if (sessionId !== void 0) {
@@ -233,6 +293,12 @@ class ApprovalManager {
   getPendingApprovals() {
     return this.handler?.getPending?.() ?? [];
   }
+  /**
+   * Get full pending approval requests
+   */
+  getPendingApprovalRequests() {
+    return this.handler?.getPendingRequests?.() ?? [];
+  }
   /**
    * Get current configuration
    */

package/dist/approval/manager.d.ts

@@ -1,4 +1,4 @@
-import type { ApprovalHandler, ApprovalResponse, ApprovalRequestDetails, ToolConfirmationMetadata, CommandConfirmationMetadata, ElicitationMetadata } from './types.js';
+import type { ApprovalHandler, ApprovalRequest, ApprovalResponse, ApprovalRequestDetails, ToolConfirmationMetadata, CommandConfirmationMetadata, ElicitationMetadata } from './types.js';
 import type { IDextoLogger } from '../logger/v2/types.js';
 /**
  * Configuration for the approval manager
@@ -6,11 +6,11 @@ import type { IDextoLogger } from '../logger/v2/types.js';
 export interface ApprovalManagerConfig {
     toolConfirmation: {
         mode: 'manual' | 'auto-approve' | 'auto-deny';
-        timeout: number;
+        timeout?: number;
     };
     elicitation: {
         enabled: boolean;
-        timeout: number;
+        timeout?: number;
     };
 }
 /**
@@ -50,7 +50,41 @@ export declare class ApprovalManager {
     private handler;
     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.
+     */
+    private bashPatterns;
     constructor(config: ApprovalManagerConfig, logger: IDextoLogger);
+    /**
+     * 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
+     * ```
+     */
+    addBashPattern(pattern: string): void;
+    /**
+     * Check if a bash pattern key is covered by any approved pattern.
+     * Uses pattern-to-pattern covering for broader pattern support.
+     *
+     * @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: string): boolean;
+    /**
+     * Clear all approved bash patterns.
+     * Should be called when session ends.
+     */
+    clearBashPatterns(): void;
+    /**
+     * Get the current set of approved bash patterns (for debugging/display).
+     */
+    getBashPatterns(): ReadonlySet<string>;
     /**
      * Request a generic approval
      */
@@ -135,6 +169,10 @@ export declare class ApprovalManager {
      * Get list of pending approval IDs
      */
     getPendingApprovals(): string[];
+    /**
+     * Get full pending approval requests
+     */
+    getPendingApprovalRequests(): ApprovalRequest[];
     /**
      * Get current configuration
      */

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,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"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/approval/manager.ts"],"names":[],"mappings":"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"}

package/dist/approval/manager.js

@@ -1,12 +1,19 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.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";
+import { patternCovers } from "../tools/bash-pattern-utils.js";
 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.
+   */
+  bashPatterns = /* @__PURE__ */ new Set();
   constructor(config, logger) {
     this.config = config;
     this.logger = logger.createChild(DextoLogComponent.APPROVAL);
@@ -14,6 +21,56 @@ class ApprovalManager {
       `ApprovalManager initialized with toolConfirmation.mode: ${config.toolConfirmation.mode}, elicitation.enabled: ${config.elicitation.enabled}`
     );
   }
+  // ==================== Bash Pattern Methods ====================
+  /**
+   * 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
+   * ```
+   */
+  addBashPattern(pattern) {
+    this.bashPatterns.add(pattern);
+    this.logger.debug(`Added bash pattern: "${pattern}"`);
+  }
+  /**
+   * Check if a bash pattern key is covered by any approved pattern.
+   * Uses pattern-to-pattern covering for broader pattern support.
+   *
+   * @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 (patternCovers(storedPattern, patternKey)) {
+        this.logger.debug(
+          `Pattern key "${patternKey}" is covered by approved pattern "${storedPattern}"`
+        );
+        return true;
+      }
+    }
+    return false;
+  }
+  /**
+   * Clear all approved bash patterns.
+   * Should be called when session ends.
+   */
+  clearBashPatterns() {
+    const count = this.bashPatterns.size;
+    this.bashPatterns.clear();
+    if (count > 0) {
+      this.logger.debug(`Cleared ${count} bash patterns`);
+    }
+  }
+  /**
+   * Get the current set of approved bash patterns (for debugging/display).
+   */
+  getBashPatterns() {
+    return this.bashPatterns;
+  }
   /**
    * Request a generic approval
    */
@@ -84,7 +141,8 @@ class ApprovalManager {
     const { sessionId, timeout, ...toolMetadata } = metadata;
     const details = {
       type: ApprovalType.TOOL_CONFIRMATION,
-      timeout: timeout ?? this.config.toolConfirmation.timeout,
+      // Use provided timeout, fallback to config timeout, or undefined (no timeout)
+      timeout: timeout !== void 0 ? timeout : this.config.toolConfirmation.timeout,
       metadata: toolMetadata
     };
     if (sessionId !== void 0) {
@@ -117,7 +175,8 @@ class ApprovalManager {
     const { sessionId, timeout, ...commandMetadata } = metadata;
     const details = {
       type: ApprovalType.COMMAND_CONFIRMATION,
-      timeout: timeout ?? this.config.toolConfirmation.timeout,
+      // Use provided timeout, fallback to config timeout, or undefined (no timeout)
+      timeout: timeout !== void 0 ? timeout : this.config.toolConfirmation.timeout,
       metadata: commandMetadata
     };
     if (sessionId !== void 0) {
@@ -136,7 +195,8 @@ class ApprovalManager {
     const { sessionId, timeout, ...elicitationMetadata } = metadata;
     const details = {
       type: ApprovalType.ELICITATION,
-      timeout: timeout ?? this.config.elicitation.timeout,
+      // Use provided timeout, fallback to config timeout, or undefined (no timeout)
+      timeout: timeout !== void 0 ? timeout : this.config.elicitation.timeout,
       metadata: elicitationMetadata
     };
     if (sessionId !== void 0) {
@@ -211,6 +271,12 @@ class ApprovalManager {
   getPendingApprovals() {
     return this.handler?.getPending?.() ?? [];
   }
+  /**
+   * Get full pending approval requests
+   */
+  getPendingApprovalRequests() {
+    return this.handler?.getPendingRequests?.() ?? [];
+  }
   /**
    * Get current configuration
    */

package/dist/approval/schemas.cjs

@@ -46,13 +46,25 @@ __export(schemas_exports, {
 module.exports = __toCommonJS(schemas_exports);
 var import_zod = require("zod");
 var import_types = require("./types.js");
+var import_display_types = require("../tools/display-types.js");
+const JsonSchema7Schema = import_zod.z.record(import_zod.z.unknown());
 const ApprovalTypeSchema = import_zod.z.nativeEnum(import_types.ApprovalType);
 const ApprovalStatusSchema = import_zod.z.nativeEnum(import_types.ApprovalStatus);
 const DenialReasonSchema = import_zod.z.nativeEnum(import_types.DenialReason);
+const ToolDisplayDataSchema = import_zod.z.custom((val) => (0, import_display_types.isValidDisplayData)(val), {
+  message: "Invalid ToolDisplayData"
+});
 const ToolConfirmationMetadataSchema = import_zod.z.object({
   toolName: import_zod.z.string().describe("Name of the tool to confirm"),
+  toolCallId: import_zod.z.string().describe("Unique tool call ID for tracking parallel tool calls"),
   args: import_zod.z.record(import_zod.z.unknown()).describe("Arguments for the tool"),
-  description: import_zod.z.string().optional().describe("Description of the tool")
+  description: import_zod.z.string().optional().describe("Description of the tool"),
+  displayPreview: ToolDisplayDataSchema.optional().describe(
+    "Preview display data for approval UI (e.g., diff preview)"
+  ),
+  suggestedPatterns: import_zod.z.array(import_zod.z.string()).optional().describe(
+    'Suggested patterns for session approval (for bash commands). E.g., ["git push *", "git *"] for command "git push origin main"'
+  )
 }).strict().describe("Tool confirmation metadata");
 const CommandConfirmationMetadataSchema = import_zod.z.object({
   toolName: import_zod.z.string().describe("Name of the tool executing the command"),
@@ -60,7 +72,7 @@ const CommandConfirmationMetadataSchema = import_zod.z.object({
   originalCommand: import_zod.z.string().optional().describe("The original command before normalization")
 }).strict().describe("Command confirmation metadata");
 const ElicitationMetadataSchema = import_zod.z.object({
-  schema: import_zod.z.record(import_zod.z.unknown()).describe("JSON Schema for the form"),
+  schema: JsonSchema7Schema.describe("JSON Schema for the form"),
   prompt: import_zod.z.string().describe("Prompt to show the user"),
   serverName: import_zod.z.string().describe("MCP server requesting input"),
   context: import_zod.z.record(import_zod.z.unknown()).optional().describe("Additional context")
@@ -70,7 +82,7 @@ const BaseApprovalRequestSchema = import_zod.z.object({
   approvalId: import_zod.z.string().uuid().describe("Unique approval identifier"),
   type: ApprovalTypeSchema.describe("Type of approval"),
   sessionId: import_zod.z.string().optional().describe("Session identifier"),
-  timeout: import_zod.z.number().int().positive().describe("Timeout in milliseconds"),
+  timeout: import_zod.z.number().int().positive().optional().describe("Timeout in milliseconds (optional - no timeout if not specified)"),
   timestamp: import_zod.z.date().describe("When the request was created")
 }).describe("Base approval request");
 const ToolConfirmationRequestSchema = BaseApprovalRequestSchema.extend({
@@ -96,7 +108,10 @@ const ApprovalRequestSchema = import_zod.z.discriminatedUnion("type", [
   CustomApprovalRequestSchema
 ]);
 const ToolConfirmationResponseDataSchema = import_zod.z.object({
-  rememberChoice: import_zod.z.boolean().optional().describe("Remember this choice")
+  rememberChoice: import_zod.z.boolean().optional().describe("Remember this tool for the session (approves ALL uses of this tool)"),
+  rememberPattern: import_zod.z.string().optional().describe(
+    'Remember a command pattern for bash commands (e.g., "git *"). Only applicable for bash_exec tool approvals.'
+  )
 }).strict().describe("Tool confirmation response data");
 const CommandConfirmationResponseDataSchema = import_zod.z.object({
   // Command confirmations don't have remember choice - they're per-command
@@ -137,7 +152,7 @@ const ApprovalResponseSchema = import_zod.z.union([
 const ApprovalRequestDetailsSchema = import_zod.z.object({
   type: ApprovalTypeSchema,
   sessionId: import_zod.z.string().optional(),
-  timeout: import_zod.z.number().int().positive(),
+  timeout: import_zod.z.number().int().positive().optional().describe("Timeout in milliseconds (optional - no timeout if not specified)"),
   metadata: import_zod.z.union([
     ToolConfirmationMetadataSchema,
     CommandConfirmationMetadataSchema,