@defai.digital/ax-cli 4.2.0 → 4.3.0

package/README.md

@@ -223,6 +223,16 @@ ax-glm memory status    # View token distribution
 
 ## Changelog
 
+### v4.3.0 - MCP Client V2 & Resource Support
+
+**Enhanced MCP Integration**: Major upgrade to MCP client with improved resource handling and connection reliability.
+
+- **MCP Client V2**: Rewritten MCP client with better error handling, connection pooling, and retry logic
+- **Resource Support**: Full support for MCP resources with read/subscribe capabilities
+- **Provider MCP Loader**: Improved provider-specific MCP configuration loading
+- **Connection Stability**: Better handling of MCP server disconnections and reconnections
+- **Bug Fixes**: Various stability improvements and edge case handling
+
 ### v4.2.0 - Provider-Specific MCP Configuration
 
 **Provider MCP Isolation**: ax-glm and ax-grok now have separate MCP configurations, allowing both CLIs to run simultaneously without conflicts.

package/dist/mcp/automatosx-auto-discovery.d.ts

@@ -0,0 +1,66 @@
+/**
+ * AutomatosX MCP Auto-Discovery
+ *
+ * Automatically detects and enables AutomatosX MCP server when installed.
+ * This provides seamless integration between ax-glm/ax-grok and AutomatosX.
+ *
+ * Design:
+ * 1. Check if `automatosx` command exists in PATH
+ * 2. If installed, automatically inject AutomatosX MCP server config
+ * 3. User can override via .mcp.json or disable via settings
+ *
+ * This ensures that when users have both ax-glm/ax-grok and AutomatosX installed,
+ * they get automatic integration without manual configuration.
+ */
+import type { MCPServerConfig } from '../schemas/settings-schemas.js';
+/**
+ * Result of AutomatosX detection
+ */
+export interface AutomatosXDetectionResult {
+    /** Whether AutomatosX is installed and available */
+    installed: boolean;
+    /** Path to the automatosx command (if found) */
+    commandPath?: string;
+    /** Version of AutomatosX (if detected) */
+    version?: string;
+    /** Whether MCP server capability is available */
+    hasMCPServer: boolean;
+    /** Error message if detection failed */
+    error?: string;
+}
+/**
+ * Options for auto-discovery
+ */
+export interface AutoDiscoveryOptions {
+    /** Skip auto-discovery entirely */
+    disabled?: boolean;
+    /** Custom command path for automatosx */
+    customCommandPath?: string;
+    /** Custom environment variables for the MCP server */
+    env?: Record<string, string>;
+}
+/**
+ * Detect if AutomatosX is installed and available
+ */
+export declare function detectAutomatosX(forceRefresh?: boolean): AutomatosXDetectionResult;
+/**
+ * Generate AutomatosX MCP server config for auto-discovery
+ */
+export declare function generateAutoDiscoveryConfig(options?: AutoDiscoveryOptions): MCPServerConfig | null;
+/**
+ * Get auto-discovered MCP servers
+ *
+ * Returns AutomatosX MCP server config if:
+ * 1. AutomatosX is installed
+ * 2. It has MCP server capability
+ * 3. Auto-discovery is not disabled
+ */
+export declare function getAutoDiscoveredServers(options?: AutoDiscoveryOptions): MCPServerConfig[];
+/**
+ * Check if a server name is an auto-discovered AutomatosX server
+ */
+export declare function isAutoDiscoveredServer(serverName: string): boolean;
+/**
+ * Clear the detection cache
+ */
+export declare function clearDetectionCache(): void;

package/dist/mcp/automatosx-auto-discovery.js

@@ -0,0 +1,168 @@
+/**
+ * AutomatosX MCP Auto-Discovery
+ *
+ * Automatically detects and enables AutomatosX MCP server when installed.
+ * This provides seamless integration between ax-glm/ax-grok and AutomatosX.
+ *
+ * Design:
+ * 1. Check if `automatosx` command exists in PATH
+ * 2. If installed, automatically inject AutomatosX MCP server config
+ * 3. User can override via .mcp.json or disable via settings
+ *
+ * This ensures that when users have both ax-glm/ax-grok and AutomatosX installed,
+ * they get automatic integration without manual configuration.
+ */
+import { execSync } from 'child_process';
+import { getActiveProvider } from '../provider/config.js';
+// Cache the detection result to avoid repeated checks
+let cachedDetection = null;
+let cacheTime = 0;
+const CACHE_TTL_MS = 60000; // 1 minute
+/**
+ * Detect if AutomatosX is installed and available
+ */
+export function detectAutomatosX(forceRefresh = false) {
+    // Return cached result if still valid
+    const now = Date.now();
+    if (!forceRefresh && cachedDetection && (now - cacheTime) < CACHE_TTL_MS) {
+        return cachedDetection;
+    }
+    try {
+        // Try to find automatosx in PATH
+        const commandPath = findCommand('automatosx');
+        if (!commandPath) {
+            cachedDetection = {
+                installed: false,
+                hasMCPServer: false,
+            };
+            cacheTime = now;
+            return cachedDetection;
+        }
+        // Check version
+        let version;
+        try {
+            const versionOutput = execSync('automatosx --version', {
+                encoding: 'utf-8',
+                timeout: 5000,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            }).trim();
+            version = versionOutput;
+        }
+        catch {
+            // Version check failed, but command exists
+        }
+        // Check if MCP server capability exists
+        let hasMCPServer = false;
+        try {
+            const helpOutput = execSync('automatosx mcp --help', {
+                encoding: 'utf-8',
+                timeout: 5000,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            hasMCPServer = helpOutput.includes('mcp server') || helpOutput.includes('Start AutomatosX as MCP server');
+        }
+        catch {
+            // MCP help failed, might be older version
+        }
+        cachedDetection = {
+            installed: true,
+            commandPath,
+            version,
+            hasMCPServer,
+        };
+        cacheTime = now;
+        return cachedDetection;
+    }
+    catch (error) {
+        cachedDetection = {
+            installed: false,
+            hasMCPServer: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+        cacheTime = now;
+        return cachedDetection;
+    }
+}
+/**
+ * Find a command in PATH
+ */
+function findCommand(command) {
+    try {
+        // Use 'which' on Unix, 'where' on Windows
+        const whichCmd = process.platform === 'win32' ? 'where' : 'which';
+        const result = execSync(`${whichCmd} ${command}`, {
+            encoding: 'utf-8',
+            timeout: 5000,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        // 'where' on Windows might return multiple lines
+        return result.split('\n')[0]?.trim();
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Generate AutomatosX MCP server config for auto-discovery
+ */
+export function generateAutoDiscoveryConfig(options) {
+    if (options?.disabled) {
+        return null;
+    }
+    const detection = detectAutomatosX();
+    if (!detection.installed || !detection.hasMCPServer) {
+        return null;
+    }
+    const provider = getActiveProvider();
+    const serverName = `automatosx-${provider.name}`;
+    const command = options?.customCommandPath || detection.commandPath || 'automatosx';
+    // Build environment variables
+    const env = {
+        // Set the project directory
+        AUTOMATOSX_PROJECT_DIR: process.cwd(),
+        // Indicate which provider is using AutomatosX
+        AUTOMATOSX_PROVIDER: provider.name,
+        // Pass through any custom env vars
+        ...(options?.env || {}),
+    };
+    const transport = {
+        type: 'stdio',
+        command,
+        args: ['mcp', 'server'],
+        env,
+    };
+    return {
+        name: serverName,
+        enabled: true,
+        transport,
+        initTimeout: 30000,
+        // Mark as auto-discovered
+        quiet: true,
+    };
+}
+/**
+ * Get auto-discovered MCP servers
+ *
+ * Returns AutomatosX MCP server config if:
+ * 1. AutomatosX is installed
+ * 2. It has MCP server capability
+ * 3. Auto-discovery is not disabled
+ */
+export function getAutoDiscoveredServers(options) {
+    const config = generateAutoDiscoveryConfig(options);
+    return config ? [config] : [];
+}
+/**
+ * Check if a server name is an auto-discovered AutomatosX server
+ */
+export function isAutoDiscoveredServer(serverName) {
+    return serverName.startsWith('automatosx-');
+}
+/**
+ * Clear the detection cache
+ */
+export function clearDetectionCache() {
+    cachedDetection = null;
+    cacheTime = 0;
+}
+//# sourceMappingURL=automatosx-auto-discovery.js.map

package/dist/mcp/automatosx-auto-discovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"automatosx-auto-discovery.js","sourceRoot":"","sources":["../../src/mcp/automatosx-auto-discovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AA8B1D,sDAAsD;AACtD,IAAI,eAAe,GAAqC,IAAI,CAAC;AAC7D,IAAI,SAAS,GAAW,CAAC,CAAC;AAC1B,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,WAAW;AAEvC;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,YAAY,GAAG,KAAK;IACnD,sCAAsC;IACtC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,YAAY,IAAI,eAAe,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,YAAY,EAAE,CAAC;QACzE,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,IAAI,CAAC;QACH,iCAAiC;QACjC,MAAM,WAAW,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;QAE9C,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,eAAe,GAAG;gBAChB,SAAS,EAAE,KAAK;gBAChB,YAAY,EAAE,KAAK;aACpB,CAAC;YACF,SAAS,GAAG,GAAG,CAAC;YAChB,OAAO,eAAe,CAAC;QACzB,CAAC;QAED,gBAAgB;QAChB,IAAI,OAA2B,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,QAAQ,CAAC,sBAAsB,EAAE;gBACrD,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;aAChC,CAAC,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,GAAG,aAAa,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,2CAA2C;QAC7C,CAAC;QAED,wCAAwC;QACxC,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,QAAQ,CAAC,uBAAuB,EAAE;gBACnD,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;aAChC,CAAC,CAAC;YACH,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAC;QAC5G,CAAC;QAAC,MAAM,CAAC;YACP,0CAA0C;QAC5C,CAAC;QAED,eAAe,GAAG;YAChB,SAAS,EAAE,IAAI;YACf,WAAW;YACX,OAAO;YACP,YAAY;SACb,CAAC;QACF,SAAS,GAAG,GAAG,CAAC;QAChB,OAAO,eAAe,CAAC;IAEzB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAe,GAAG;YAChB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;YACnB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC9D,CAAC;QACF,SAAS,GAAG,GAAG,CAAC;QAChB,OAAO,eAAe,CAAC;IACzB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,WAAW,CAAC,OAAe;IAClC,IAAI,CAAC;QACH,0CAA0C;QAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAClE,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,QAAQ,IAAI,OAAO,EAAE,EAAE;YAChD,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;SAChC,CAAC,CAAC,IAAI,EAAE,CAAC;QAEV,iDAAiD;QACjD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,2BAA2B,CAAC,OAA8B;IACxE,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAC;IAErC,IAAI,CAAC,SAAS,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,iBAAiB,EAAE,CAAC;IACrC,MAAM,UAAU,GAAG,cAAc,QAAQ,CAAC,IAAI,EAAE,CAAC;IACjD,MAAM,OAAO,GAAG,OAAO,EAAE,iBAAiB,IAAI,SAAS,CAAC,WAAW,IAAI,YAAY,CAAC;IAEpF,8BAA8B;IAC9B,MAAM,GAAG,GAA2B;QAClC,4BAA4B;QAC5B,sBAAsB,EAAE,OAAO,CAAC,GAAG,EAAE;QACrC,8CAA8C;QAC9C,mBAAmB,EAAE,QAAQ,CAAC,IAAI;QAClC,mCAAmC;QACnC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;KACxB,CAAC;IAEF,MAAM,SAAS,GAAuB;QACpC,IAAI,EAAE,OAAO;QACb,OAAO;QACP,IAAI,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;QACvB,GAAG;KACJ,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,IAAI;QACb,SAAS;QACT,WAAW,EAAE,KAAK;QAClB,0BAA0B;QAC1B,KAAK,EAAE,IAAI;KACZ,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB,CAAC,OAA8B;IACrE,MAAM,MAAM,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAChC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,UAAkB;IACvD,OAAO,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAC9C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB;IACjC,eAAe,GAAG,IAAI,CAAC;IACvB,SAAS,GAAG,CAAC,CAAC;AAChB,CAAC"}

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

@@ -138,6 +138,37 @@ export interface MCPPrompt {
         required?: boolean;
     }>;
 }
+/**
+ * MCP Server Capabilities Summary
+ *
+ * Provides a structured view of what an MCP server supports.
+ * This enables agents to tailor their behavior based on server capabilities.
+ *
+ * For example, Figma MCP servers may support:
+ * - Resource subscriptions for real-time design updates
+ * - Progress notifications for long-running exports
+ * - Tools with output schemas for structured responses
+ */
+export interface MCPServerCapabilities {
+    /** Whether the server supports resources/list and resources/read */
+    supportsResources: boolean;
+    /** Whether the server supports resources/subscribe for real-time updates */
+    supportsResourceSubscriptions: boolean;
+    /** Whether the server emits notifications/resources/list_changed */
+    supportsResourceListChanged: boolean;
+    /** Whether the server supports tools/list and tools/call */
+    supportsTools: boolean;
+    /** Whether the server emits notifications/tools/list_changed */
+    supportsToolListChanged: boolean;
+    /** Whether the server supports prompts/list and prompts/get */
+    supportsPrompts: boolean;
+    /** Whether the server emits notifications/prompts/list_changed */
+    supportsPromptListChanged: boolean;
+    /** Whether the server supports logging/setLevel */
+    supportsLogging: boolean;
+    experimental: Record<string, unknown>;
+    raw: Record<string, unknown>;
+}
 /**
  * Type-safe MCP Manager with improved safety
  */
@@ -198,17 +229,28 @@ export declare class MCPManagerV2 extends EventEmitter {
      *
      * @param toolName - The tool to call
      * @param arguments_ - Tool arguments
-     * @param options - Optional settings for validation
+     * @param options - Optional settings for validation and MCP _meta
      * @returns Result containing the tool result with optional schema validation
      */
     callTool(toolName: ToolName, arguments_: Record<string, unknown> | null | undefined, options?: {
         validateOutput?: boolean;
+        /** MCP _meta for progress tracking and cancellation */
+        _meta?: {
+            progressToken?: string | number;
+            /** Request ID for cancellation (custom extension) */
+            requestId?: string | number;
+        };
+        /** AbortSignal for cancellation */
+        signal?: AbortSignal;
     }): Promise<Result<ValidatedToolResult, Error>>;
     /**
      * Call MCP tool with progress tracking
      *
      * MCP Specification: Supports notifications/progress for long-running operations.
      *
+     * FIX: Now properly forwards _meta.progressToken to the MCP server so it can
+     * attach progress notifications to this specific request.
+     *
      * @param toolName - The tool to call
      * @param arguments_ - Tool arguments
      * @param options - Progress tracking options
@@ -222,6 +264,10 @@ export declare class MCPManagerV2 extends EventEmitter {
      *
      * MCP Specification: Supports notifications/cancelled for aborting operations.
      *
+     * FIX: Now properly propagates AbortSignal to the MCP SDK so cancellation
+     * actually stops the server work instead of just racing locally. Also sends
+     * notifications/cancelled to the server so it can clean up.
+     *
      * @param toolName - The tool to call
      * @param arguments_ - Tool arguments
      * @returns Result containing the tool result, cancellation status, or error
@@ -335,6 +381,68 @@ export declare class MCPManagerV2 extends EventEmitter {
      * Get transport type for a server
      */
     getTransportType(serverName: ServerName): Result<TransportType, Error>;
+    /**
+     * Get capabilities for a specific MCP server
+     *
+     * This allows agents to tailor their behavior based on server capabilities.
+     * For example, Figma MCP servers may support long-running exports with progress.
+     *
+     * @param serverName - The server to query capabilities for
+     * @returns Result containing capability summary or error
+     *
+     * @example
+     * ```typescript
+     * const caps = manager.getServerCapabilities(serverName);
+     * if (caps.success && caps.value.supportsProgress) {
+     *   // Use callToolWithProgress for better UX
+     *   await manager.callToolWithProgress(toolName, args, { onProgress });
+     * }
+     * ```
+     */
+    getServerCapabilities(serverName: ServerName): Result<MCPServerCapabilities, Error>;
+    /**
+     * Get capabilities for all connected servers
+     *
+     * @returns Map of server names to their capabilities
+     */
+    getAllServerCapabilities(): Map<ServerName, MCPServerCapabilities>;
+    /**
+     * Check if a server supports a specific capability
+     *
+     * @param serverName - Server to check
+     * @param capability - Capability to check for
+     * @returns true if the server supports the capability
+     */
+    serverSupports(serverName: ServerName, capability: keyof Omit<MCPServerCapabilities, 'experimental' | 'raw'>): boolean;
+    /**
+     * Get the MCP client for a specific server
+     *
+     * This is used by resources.ts to access listResources/readResource
+     *
+     * @param serverName - The server name
+     * @returns Result containing the client or error
+     */
+    getClient(serverName: ServerName): Result<Client, Error>;
+    /**
+     * List resources from a specific server
+     *
+     * @param serverName - The server name
+     * @returns Result containing resources or error
+     */
+    listResources(serverName: ServerName): Promise<Result<Array<{
+        uri: string;
+        name: string;
+        description?: string;
+        mimeType?: string;
+    }>, Error>>;
+    /**
+     * Read a resource from a specific server
+     *
+     * @param serverName - The server name
+     * @param uri - Resource URI
+     * @returns Result containing resource content or error
+     */
+    readResource(serverName: ServerName, uri: string): Promise<Result<string, Error>>;
     /**
      * Schedule reconnection for a failed server with exponential backoff
      *