@defai.digital/ax-cli 3.14.17 → 3.15.0

package/dist/mcp/cancellation.js

@@ -0,0 +1,237 @@
+/**
+ * MCP Cancellation Support
+ *
+ * Enables cancellation of long-running MCP operations.
+ * MCP Specification: notifications/cancelled
+ *
+ * @module mcp/cancellation
+ */
+import { EventEmitter } from 'events';
+/**
+ * Cancellation Manager
+ *
+ * Manages cancellable requests and coordinates cancellation with MCP servers.
+ *
+ * @example
+ * ```typescript
+ * const manager = new CancellationManager();
+ *
+ * // Register a request
+ * const abortController = new AbortController();
+ * manager.register({
+ *   id: 'req-1',
+ *   serverName,
+ *   toolName,
+ *   startedAt: new Date(),
+ *   abortController
+ * });
+ *
+ * // Cancel when needed
+ * await manager.cancel('req-1', 'User requested cancellation');
+ * ```
+ */
+export class CancellationManager extends EventEmitter {
+    activeRequests = new Map();
+    cancelledIds = new Set();
+    sendNotification = null;
+    /**
+     * Set the notification sender function
+     * Called by MCPManagerV2 to wire up the notification mechanism
+     */
+    setSendNotification(fn) {
+        this.sendNotification = fn;
+    }
+    /**
+     * Register a cancellable request
+     *
+     * @param request - Request information
+     */
+    register(request) {
+        this.activeRequests.set(request.id, request);
+        this.emit('requestRegistered', request);
+    }
+    /**
+     * Cancel a specific request
+     *
+     * @param requestId - ID of the request to cancel
+     * @param reason - Optional reason for cancellation
+     * @returns Promise that resolves when cancellation is processed
+     */
+    async cancel(requestId, reason) {
+        const request = this.activeRequests.get(requestId);
+        if (!request) {
+            // Already completed or doesn't exist
+            return {
+                success: false,
+                requestId,
+                reason: 'Request not found or already completed',
+            };
+        }
+        // Mark as cancelled
+        this.cancelledIds.add(requestId);
+        // Abort the local request
+        request.abortController.abort();
+        // Send cancellation notification to server
+        if (this.sendNotification) {
+            try {
+                await this.sendNotification(request.serverName, requestId, reason ?? 'User cancelled');
+            }
+            catch (error) {
+                // Log but don't fail - the local abort is what matters
+                console.warn(`Failed to send cancellation notification: ${error}`);
+            }
+        }
+        // Emit cancellation event
+        this.emit('requestCancelled', request, reason);
+        // Cleanup
+        this.cleanup(requestId);
+        return {
+            success: true,
+            requestId,
+            reason,
+        };
+    }
+    /**
+     * Cancel all active requests
+     *
+     * @param reason - Optional reason for cancellation
+     * @returns Promise that resolves when all cancellations are processed
+     */
+    async cancelAll(reason) {
+        const requests = Array.from(this.activeRequests.values());
+        const results = await Promise.all(requests.map((req) => this.cancel(req.id, reason)));
+        return results;
+    }
+    /**
+     * Cancel all requests for a specific server
+     *
+     * @param serverName - Server to cancel requests for
+     * @param reason - Optional reason for cancellation
+     * @returns Promise that resolves when cancellations are processed
+     */
+    async cancelByServer(serverName, reason) {
+        const requests = Array.from(this.activeRequests.values()).filter((req) => req.serverName === serverName);
+        const results = await Promise.all(requests.map((req) => this.cancel(req.id, reason)));
+        return results;
+    }
+    /**
+     * Get all active requests
+     *
+     * @returns Array of active requests
+     */
+    getActiveRequests() {
+        return Array.from(this.activeRequests.values());
+    }
+    /**
+     * Get the most recent active request
+     *
+     * @returns Most recent request, or undefined if none
+     */
+    getMostRecentRequest() {
+        const requests = this.getActiveRequests();
+        if (requests.length === 0) {
+            return undefined;
+        }
+        return requests.reduce((latest, req) => req.startedAt > latest.startedAt ? req : latest);
+    }
+    /**
+     * Check if a request has been cancelled
+     *
+     * @param requestId - Request ID to check
+     * @returns true if request was cancelled
+     */
+    isCancelled(requestId) {
+        return this.cancelledIds.has(requestId);
+    }
+    /**
+     * Check if there are any active requests
+     *
+     * @returns true if there are active requests
+     */
+    hasActiveRequests() {
+        return this.activeRequests.size > 0;
+    }
+    /**
+     * Get the number of active requests
+     *
+     * @returns Number of active requests
+     */
+    getActiveRequestCount() {
+        return this.activeRequests.size;
+    }
+    /**
+     * Cleanup a completed or cancelled request
+     *
+     * @param requestId - Request ID to cleanup
+     */
+    cleanup(requestId) {
+        this.activeRequests.delete(requestId);
+        // Keep cancelled IDs briefly to handle race conditions
+        setTimeout(() => {
+            this.cancelledIds.delete(requestId);
+        }, 5000);
+    }
+    /**
+     * Cleanup all tracking
+     */
+    cleanupAll() {
+        for (const requestId of this.activeRequests.keys()) {
+            this.cleanup(requestId);
+        }
+    }
+}
+/**
+ * Error code for cancelled requests (JSON-RPC)
+ */
+export const CANCELLED_ERROR_CODE = -32800;
+/**
+ * Check if an error indicates a cancelled request
+ *
+ * @param error - Error to check
+ * @returns true if error indicates cancellation
+ */
+export function isRequestCancelled(error) {
+    if (typeof error === 'object' && error !== null) {
+        const err = error;
+        if (err.code === CANCELLED_ERROR_CODE) {
+            return true;
+        }
+        if (err.message?.toLowerCase().includes('cancelled')) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Create an abort error for cancelled requests
+ *
+ * @param reason - Cancellation reason
+ * @returns Error object
+ */
+export function createCancellationError(reason) {
+    const error = new Error(reason ?? 'Request cancelled');
+    error.code = CANCELLED_ERROR_CODE;
+    return error;
+}
+// Singleton instance
+let cancellationManager = null;
+/**
+ * Get the singleton cancellation manager instance
+ */
+export function getCancellationManager() {
+    if (!cancellationManager) {
+        cancellationManager = new CancellationManager();
+    }
+    return cancellationManager;
+}
+/**
+ * Reset the cancellation manager (for testing)
+ */
+export function resetCancellationManager() {
+    if (cancellationManager) {
+        cancellationManager.cleanupAll();
+        cancellationManager.removeAllListeners();
+    }
+    cancellationManager = null;
+}
+//# sourceMappingURL=cancellation.js.map

package/dist/mcp/cancellation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cancellation.js","sourceRoot":"","sources":["../../src/mcp/cancellation.ts"],"names":[],"mappings":"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"}

package/dist/mcp/client-v2.d.ts

@@ -17,6 +17,21 @@ import { MCPTransport, TransportType } from "./transports.js";
 import type { MCPServerConfig, MCPTransportConfig } from "../schemas/settings-schemas.js";
 import { Result } from "./type-safety.js";
 import { ServerName, ToolName, createServerName } from "./type-safety.js";
+import { type ProgressUpdate, type ProgressCallback } from "./progress.js";
+import { type CancellableRequest, type CancellationResult } from "./cancellation.js";
+import { type ResourceSubscription } from "./subscriptions.js";
+import { type SchemaValidationResult } from "./schema-validator.js";
+export type { ProgressUpdate, ProgressCallback };
+export type { CancellableRequest, CancellationResult };
+export type { ResourceSubscription };
+export type { SchemaValidationResult };
+/**
+ * Extended tool result with schema validation
+ */
+export interface ValidatedToolResult extends CallToolResult {
+    /** Schema validation result (if tool has outputSchema) */
+    schemaValidation?: SchemaValidationResult;
+}
 export type { MCPServerConfig, MCPTransportConfig, ServerName, ToolName };
 /**
  * Connection State Machine
@@ -107,6 +122,7 @@ export interface MCPTool {
     name: ToolName;
     description: string;
     inputSchema: any;
+    outputSchema?: any;
     serverName: ServerName;
 }
 /**
@@ -174,9 +190,97 @@ export declare class MCPManagerV2 extends EventEmitter {
      */
     private disconnectTransport;
     /**
-     * Call MCP tool with type safety
+     * Call MCP tool with type safety and optional schema validation
+     *
+     * @param toolName - The tool to call
+     * @param arguments_ - Tool arguments
+     * @param options - Optional settings for validation
+     * @returns Result containing the tool result with optional schema validation
+     */
+    callTool(toolName: ToolName, arguments_: Record<string, unknown> | null | undefined, options?: {
+        validateOutput?: boolean;
+    }): Promise<Result<ValidatedToolResult, Error>>;
+    /**
+     * Call MCP tool with progress tracking
+     *
+     * MCP Specification: Supports notifications/progress for long-running operations.
+     *
+     * @param toolName - The tool to call
+     * @param arguments_ - Tool arguments
+     * @param options - Progress tracking options
+     * @returns Result containing the tool result or error
+     */
+    callToolWithProgress(toolName: ToolName, arguments_: Record<string, unknown> | null | undefined, options?: {
+        onProgress?: ProgressCallback;
+    }): Promise<Result<CallToolResult, Error>>;
+    /**
+     * Call MCP tool with cancellation support
+     *
+     * MCP Specification: Supports notifications/cancelled for aborting operations.
+     *
+     * @param toolName - The tool to call
+     * @param arguments_ - Tool arguments
+     * @returns Result containing the tool result, cancellation status, or error
+     */
+    callToolCancellable(toolName: ToolName, arguments_: Record<string, unknown> | null | undefined): Promise<Result<CallToolResult & {
+        isCancelled?: boolean;
+        cancelReason?: string;
+    }, Error>>;
+    /**
+     * Cancel the most recent active request
+     *
+     * @param reason - Optional reason for cancellation
+     * @returns Cancellation result
+     */
+    cancelCurrentRequest(reason?: string): Promise<CancellationResult | undefined>;
+    /**
+     * Cancel all active requests
+     *
+     * @param reason - Optional reason for cancellation
+     * @returns Array of cancellation results
+     */
+    cancelAllRequests(reason?: string): Promise<CancellationResult[]>;
+    /**
+     * Check if there are any active cancellable requests
+     */
+    hasActiveRequests(): boolean;
+    /**
+     * Get the count of active cancellable requests
+     */
+    getActiveRequestCount(): number;
+    /**
+     * Subscribe to a resource
+     *
+     * @param serverName - Server providing the resource
+     * @param uri - Resource URI to subscribe to
+     * @returns Result indicating success or error
+     */
+    subscribeResource(serverName: ServerName, uri: string): Promise<Result<void, Error>>;
+    /**
+     * Unsubscribe from a resource
+     *
+     * @param serverName - Server providing the resource
+     * @param uri - Resource URI to unsubscribe from
+     * @returns Result indicating success or error
+     */
+    unsubscribeResource(serverName: ServerName, uri: string): Promise<Result<void, Error>>;
+    /**
+     * Get all active resource subscriptions
+     */
+    getResourceSubscriptions(): ResourceSubscription[];
+    /**
+     * Check if subscribed to a resource
+     */
+    isSubscribedToResource(serverName: ServerName, uri: string): boolean;
+    /**
+     * Set up notification handlers for MCP server
+     *
+     * Handles:
+     * - notifications/progress - Progress updates for long-running operations
+     * - notifications/resources/updated - Resource change notifications
+     * - notifications/resources/list_changed - Resource list changes
      */
-    callTool(toolName: ToolName, arguments_: Record<string, unknown> | null | undefined): Promise<Result<CallToolResult, Error>>;
+    private setupNotificationHandlers;
     /**
      * Truncate text to fit within token limit
      * UNICODE FIX: Uses grapheme clusters