@defai.digital/ax-cli 4.1.18 → 4.3.0

package/dist/mcp/index.d.ts

@@ -30,10 +30,14 @@
  */
 export { MCPManager } from "./client.js";
 export type { MCPTool, MCPServerConfig, MCPTransportConfig } from "./client.js";
-export { MCPManagerV2, createServerName, createToolName, type ConnectionState, type ReconnectionConfig, type MCPPrompt, } from "./client-v2.js";
+export { MCPManagerV2, createServerName, createToolName, type ConnectionState, type ReconnectionConfig, type MCPPrompt, type MCPServerCapabilities, } from "./client-v2.js";
 export type { ServerName, ToolName } from "./client-v2.js";
 export { loadMCPConfig, addMCPServer, removeMCPServer, PREDEFINED_SERVERS, getTemplate, generateConfigFromTemplate, } from "./config.js";
 export type { MCPConfig } from "./config.js";
+export { loadProviderMCPConfig, getProviderMCPServers, providerMCPConfigExists, getProviderMCPConfigPath, getClaudeCodeMCPConfigPath, getUserMCPConfigPath, getLegacyMCPConfigPath, } from "./provider-mcp-loader.js";
+export type { ProviderMCPLoadResult, ClaudeCodeMCPConfig, LegacyProviderMCPConfig, } from "./provider-mcp-loader.js";
+export { detectAutomatosX, getAutoDiscoveredServers, generateAutoDiscoveryConfig, isAutoDiscoveredServer, clearDetectionCache, } from "./automatosx-auto-discovery.js";
+export type { AutomatosXDetectionResult, AutoDiscoveryOptions, } from "./automatosx-auto-discovery.js";
 export { detectConfigFormat, detectMultipleConfigs, getDetectionSummary } from "./config-detector.js";
 export { migrateConfig, batchMigrateConfigs, formatBatchMigrationResult } from "./config-migrator.js";
 export { createTransport, type MCPTransport, type TransportType, type TransportConfig, type StdioFraming, } from "./transports.js";
@@ -42,7 +46,8 @@ export { CancellationManager, getCancellationManager, resetCancellationManager,
 export { SubscriptionManager, getSubscriptionManager, resetSubscriptionManager, type ResourceSubscription, } from "./subscriptions.js";
 export { ToolOutputValidator, getToolOutputValidator, resetToolOutputValidator, type SchemaValidationResult, type SchemaValidationStatus, } from "./schema-validator.js";
 export { MCP_TIMEOUTS, MCP_LIMITS, MCP_ERROR_CODES, MCP_RECONNECTION, MCP_TRANSPORT_DEFAULTS, MCP_PATTERNS, } from "./constants.js";
-export { Result, Ok, Err, toError } from "./type-safety.js";
+export { Ok, Err, toError } from "./type-safety.js";
+export type { Result } from "./type-safety.js";
 export { matchErrorPattern, getTransportHints, getEnvVarHints, ERROR_REMEDIATION, type Remediation } from "./error-remediation.js";
 export { resolveMCPReferences, extractMCPReferences } from "./resources.js";
 export { parseMCPIdentifier, promptToSlashCommand, parsePromptCommand, formatPromptResult, getPromptDescription, } from "./prompts.js";

package/dist/mcp/index.js

@@ -40,6 +40,10 @@ export { MCPManagerV2, createServerName, createToolName, } from "./client-v2.js"
 // ============================================================================
 // Config loading and management
 export { loadMCPConfig, addMCPServer, removeMCPServer, PREDEFINED_SERVERS, getTemplate, generateConfigFromTemplate, } from "./config.js";
+// Provider-specific MCP config loading (Claude Code format support)
+export { loadProviderMCPConfig, getProviderMCPServers, providerMCPConfigExists, getProviderMCPConfigPath, getClaudeCodeMCPConfigPath, getUserMCPConfigPath, getLegacyMCPConfigPath, } from "./provider-mcp-loader.js";
+// AutomatosX auto-discovery (seamless integration when AutomatosX is installed)
+export { detectAutomatosX, getAutoDiscoveredServers, generateAutoDiscoveryConfig, isAutoDiscoveredServer, clearDetectionCache, } from "./automatosx-auto-discovery.js";
 // Config detection and migration
 export { detectConfigFormat, detectMultipleConfigs, getDetectionSummary } from "./config-detector.js";
 export { migrateConfig, batchMigrateConfigs, formatBatchMigrationResult } from "./config-migrator.js";

package/dist/mcp/index.js.map

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

package/dist/mcp/provider-mcp-loader.d.ts

@@ -0,0 +1,130 @@
+/**
+ * Provider-Specific MCP Configuration Loader
+ *
+ * Loads MCP configurations from multiple locations following Claude Code best practices.
+ *
+ * Priority (highest to lowest):
+ * 1. .ax-glm/.mcp.json or .ax-grok/.mcp.json (provider-specific directory)
+ * 2. Project root .mcp.json (Claude Code standard location)
+ * 3. ~/.ax-glm/.mcp.json or ~/.ax-grok/.mcp.json (user-level config)
+ * 4. .ax-glm/mcp-config.json or .ax-grok/mcp-config.json (legacy format)
+ *
+ * Claude Code Format (.mcp.json):
+ * ```json
+ * {
+ *   "mcpServers": {
+ *     "serverName": {
+ *       "command": "...",
+ *       "args": [...],
+ *       "env": {...}
+ *     }
+ *   }
+ * }
+ * ```
+ *
+ * This ensures that when both ax-glm and ax-grok are installed,
+ * they maintain separate MCP configurations without conflicts.
+ */
+import type { MCPServerConfig } from '../schemas/settings-schemas.js';
+/**
+ * Claude Code MCP format (.mcp.json)
+ * This is the recommended format, same as Claude Code
+ */
+export interface ClaudeCodeMCPConfig {
+    mcpServers?: Record<string, {
+        command: string;
+        args?: string[];
+        env?: Record<string, string>;
+        disabled?: boolean;
+    }>;
+}
+/**
+ * Legacy provider-specific MCP configuration format
+ * This is the format used in .ax-glm/mcp-config.json and .ax-grok/mcp-config.json
+ */
+export interface LegacyProviderMCPConfig {
+    mcp?: {
+        /** Whether MCP is enabled for this provider */
+        enabled?: boolean;
+        /** Command to start the MCP server */
+        serverCommand?: string;
+        /** Arguments for the MCP server command */
+        serverArgs?: string[];
+        /** Whether to auto-connect on startup */
+        autoConnect?: boolean;
+        /** Connection timeout in milliseconds */
+        timeout?: number;
+        /** Environment variables for the MCP server */
+        env?: Record<string, string>;
+    };
+    provider?: {
+        /** Provider name (e.g., 'glm', 'grok') */
+        name?: string;
+        /** Environment variable for API key */
+        apiKeyEnv?: string;
+        /** Default model */
+        defaultModel?: string;
+    };
+    integration?: {
+        /** Use AutomatosX memory system */
+        useMemory?: boolean;
+        /** Use agent context for enhanced prompts */
+        useAgentContext?: boolean;
+        /** Save responses to memory */
+        saveResponsesToMemory?: boolean;
+    };
+}
+/**
+ * Result of loading provider-specific MCP config
+ */
+export interface ProviderMCPLoadResult {
+    /** Whether config was found */
+    found: boolean;
+    /** Path to config file */
+    configPath?: string;
+    /** Format of the config file */
+    format?: 'claude-code' | 'legacy';
+    /** Converted MCPServerConfigs (if found and valid) */
+    serverConfigs: MCPServerConfig[];
+    /** Error message if loading failed */
+    error?: string;
+    /** Warnings during loading */
+    warnings: string[];
+}
+/**
+ * Get the path to the provider-specific MCP config file (.ax-glm/.mcp.json or .ax-grok/.mcp.json)
+ */
+export declare function getProviderMCPConfigPath(projectRoot?: string): string;
+/**
+ * Get the path to the Claude Code format MCP config file (.mcp.json in project root)
+ * This is the standard Claude Code location that users may already have configured
+ */
+export declare function getClaudeCodeMCPConfigPath(projectRoot?: string): string;
+/**
+ * Get the path to the user-level MCP config file (~/.ax-glm/.mcp.json or ~/.ax-grok/.mcp.json)
+ */
+export declare function getUserMCPConfigPath(): string;
+/**
+ * Get the path to the legacy MCP config file (mcp-config.json)
+ */
+export declare function getLegacyMCPConfigPath(projectRoot?: string): string;
+/**
+ * Check if provider-specific MCP config exists (any format/location)
+ */
+export declare function providerMCPConfigExists(projectRoot?: string): boolean;
+/**
+ * Load provider-specific MCP configuration
+ *
+ * This function checks multiple locations in priority order:
+ * 1. Provider-specific directory (.ax-glm/.mcp.json or .ax-grok/.mcp.json)
+ * 2. Project root .mcp.json (Claude Code standard location)
+ * 3. User-level config (~/.ax-glm/.mcp.json or ~/.ax-grok/.mcp.json)
+ * 4. Legacy format (.ax-glm/mcp-config.json or .ax-grok/mcp-config.json)
+ *
+ * The first config found is used. Converts to MCPServerConfig[] format.
+ */
+export declare function loadProviderMCPConfig(projectRoot?: string): ProviderMCPLoadResult;
+/**
+ * Get provider MCP servers ready to be merged with other sources
+ */
+export declare function getProviderMCPServers(projectRoot?: string): MCPServerConfig[];

package/dist/mcp/provider-mcp-loader.js

@@ -0,0 +1,292 @@
+/**
+ * Provider-Specific MCP Configuration Loader
+ *
+ * Loads MCP configurations from multiple locations following Claude Code best practices.
+ *
+ * Priority (highest to lowest):
+ * 1. .ax-glm/.mcp.json or .ax-grok/.mcp.json (provider-specific directory)
+ * 2. Project root .mcp.json (Claude Code standard location)
+ * 3. ~/.ax-glm/.mcp.json or ~/.ax-grok/.mcp.json (user-level config)
+ * 4. .ax-glm/mcp-config.json or .ax-grok/mcp-config.json (legacy format)
+ *
+ * Claude Code Format (.mcp.json):
+ * ```json
+ * {
+ *   "mcpServers": {
+ *     "serverName": {
+ *       "command": "...",
+ *       "args": [...],
+ *       "env": {...}
+ *     }
+ *   }
+ * }
+ * ```
+ *
+ * This ensures that when both ax-glm and ax-grok are installed,
+ * they maintain separate MCP configurations without conflicts.
+ */
+import fs from 'fs';
+import path from 'path';
+import { homedir } from 'os';
+import { getActiveConfigPaths, getActiveProvider } from '../provider/config.js';
+import { extractErrorMessage } from '../utils/error-handler.js';
+/**
+ * Get the path to the provider-specific MCP config file (.ax-glm/.mcp.json or .ax-grok/.mcp.json)
+ */
+export function getProviderMCPConfigPath(projectRoot) {
+    const configPaths = getActiveConfigPaths();
+    const root = projectRoot || process.cwd();
+    return path.join(root, configPaths.DIR_NAME, '.mcp.json');
+}
+/**
+ * Get the path to the Claude Code format MCP config file (.mcp.json in project root)
+ * This is the standard Claude Code location that users may already have configured
+ */
+export function getClaudeCodeMCPConfigPath(projectRoot) {
+    const root = projectRoot || process.cwd();
+    return path.join(root, '.mcp.json');
+}
+/**
+ * Get the path to the user-level MCP config file (~/.ax-glm/.mcp.json or ~/.ax-grok/.mcp.json)
+ */
+export function getUserMCPConfigPath() {
+    const configPaths = getActiveConfigPaths();
+    return path.join(homedir(), configPaths.DIR_NAME, '.mcp.json');
+}
+/**
+ * Get the path to the legacy MCP config file (mcp-config.json)
+ */
+export function getLegacyMCPConfigPath(projectRoot) {
+    const configPaths = getActiveConfigPaths();
+    const root = projectRoot || process.cwd();
+    return path.join(root, configPaths.DIR_NAME, 'mcp-config.json');
+}
+/**
+ * Check if provider-specific MCP config exists (any format/location)
+ */
+export function providerMCPConfigExists(projectRoot) {
+    return fs.existsSync(getProviderMCPConfigPath(projectRoot)) ||
+        fs.existsSync(getClaudeCodeMCPConfigPath(projectRoot)) ||
+        fs.existsSync(getUserMCPConfigPath()) ||
+        fs.existsSync(getLegacyMCPConfigPath(projectRoot));
+}
+/**
+ * Load provider-specific MCP configuration
+ *
+ * This function checks multiple locations in priority order:
+ * 1. Provider-specific directory (.ax-glm/.mcp.json or .ax-grok/.mcp.json)
+ * 2. Project root .mcp.json (Claude Code standard location)
+ * 3. User-level config (~/.ax-glm/.mcp.json or ~/.ax-grok/.mcp.json)
+ * 4. Legacy format (.ax-glm/mcp-config.json or .ax-grok/mcp-config.json)
+ *
+ * The first config found is used. Converts to MCPServerConfig[] format.
+ */
+export function loadProviderMCPConfig(projectRoot) {
+    const warnings = [];
+    // Priority 1: Provider-specific directory (.ax-glm/.mcp.json or .ax-grok/.mcp.json)
+    const providerPath = getProviderMCPConfigPath(projectRoot);
+    if (fs.existsSync(providerPath)) {
+        try {
+            const raw = fs.readFileSync(providerPath, 'utf-8');
+            const config = JSON.parse(raw);
+            const serverConfigs = convertClaudeCodeFormat(config);
+            return {
+                found: true,
+                configPath: providerPath,
+                format: 'claude-code',
+                serverConfigs,
+                warnings,
+            };
+        }
+        catch (error) {
+            return {
+                found: true,
+                configPath: providerPath,
+                format: 'claude-code',
+                serverConfigs: [],
+                error: `Failed to parse ${providerPath}: ${extractErrorMessage(error)}`,
+                warnings,
+            };
+        }
+    }
+    // Priority 2: Project root .mcp.json (Claude Code standard location)
+    const claudeCodePath = getClaudeCodeMCPConfigPath(projectRoot);
+    if (fs.existsSync(claudeCodePath)) {
+        try {
+            const raw = fs.readFileSync(claudeCodePath, 'utf-8');
+            const config = JSON.parse(raw);
+            const serverConfigs = convertClaudeCodeFormat(config);
+            return {
+                found: true,
+                configPath: claudeCodePath,
+                format: 'claude-code',
+                serverConfigs,
+                warnings,
+            };
+        }
+        catch (error) {
+            return {
+                found: true,
+                configPath: claudeCodePath,
+                format: 'claude-code',
+                serverConfigs: [],
+                error: `Failed to parse .mcp.json: ${extractErrorMessage(error)}`,
+                warnings,
+            };
+        }
+    }
+    // Priority 3: User-level config (~/.ax-glm/.mcp.json or ~/.ax-grok/.mcp.json)
+    const userPath = getUserMCPConfigPath();
+    if (fs.existsSync(userPath)) {
+        try {
+            const raw = fs.readFileSync(userPath, 'utf-8');
+            const config = JSON.parse(raw);
+            const serverConfigs = convertClaudeCodeFormat(config);
+            return {
+                found: true,
+                configPath: userPath,
+                format: 'claude-code',
+                serverConfigs,
+                warnings,
+            };
+        }
+        catch (error) {
+            return {
+                found: true,
+                configPath: userPath,
+                format: 'claude-code',
+                serverConfigs: [],
+                error: `Failed to parse ${userPath}: ${extractErrorMessage(error)}`,
+                warnings,
+            };
+        }
+    }
+    // Priority 4: Legacy format (.ax-glm/mcp-config.json or .ax-grok/mcp-config.json)
+    const legacyPath = getLegacyMCPConfigPath(projectRoot);
+    if (fs.existsSync(legacyPath)) {
+        warnings.push(`Using legacy mcp-config.json format. Consider migrating to .mcp.json (Claude Code format)`);
+        try {
+            const raw = fs.readFileSync(legacyPath, 'utf-8');
+            const config = JSON.parse(raw);
+            const serverConfigs = convertLegacyFormat(config);
+            return {
+                found: true,
+                configPath: legacyPath,
+                format: 'legacy',
+                serverConfigs,
+                warnings,
+            };
+        }
+        catch (error) {
+            return {
+                found: true,
+                configPath: legacyPath,
+                format: 'legacy',
+                serverConfigs: [],
+                error: `Failed to parse mcp-config.json: ${extractErrorMessage(error)}`,
+                warnings,
+            };
+        }
+    }
+    // No config found
+    return {
+        found: false,
+        serverConfigs: [],
+        warnings,
+    };
+}
+/**
+ * Convert Claude Code format (.mcp.json) to MCPServerConfig[]
+ */
+function convertClaudeCodeFormat(config) {
+    if (!config.mcpServers || typeof config.mcpServers !== 'object') {
+        return [];
+    }
+    const servers = [];
+    for (const [name, serverDef] of Object.entries(config.mcpServers)) {
+        if (serverDef.disabled) {
+            continue;
+        }
+        // Build environment variables
+        const env = {
+            AUTOMATOSX_PROJECT_DIR: process.cwd(),
+            ...(serverDef.env || {}),
+        };
+        const transport = {
+            type: 'stdio',
+            command: serverDef.command,
+            args: serverDef.args || [],
+            env,
+        };
+        servers.push({
+            name,
+            enabled: true,
+            transport,
+            // Default timeout for provider MCP servers
+            initTimeout: 30000,
+            // Suppress verbose output by default
+            quiet: true,
+        });
+    }
+    return servers;
+}
+/**
+ * Convert legacy format (mcp-config.json) to MCPServerConfig[]
+ */
+function convertLegacyFormat(config) {
+    const mcp = config.mcp;
+    if (!mcp?.serverCommand) {
+        return [];
+    }
+    // Check if MCP is disabled
+    if (mcp.enabled === false) {
+        return [];
+    }
+    const provider = getActiveProvider();
+    // Build the server name based on provider
+    // e.g., "automatosx-glm" or "automatosx-grok"
+    const serverName = `automatosx-${provider.name}`;
+    // Build environment variables
+    const env = {
+        AUTOMATOSX_PROJECT_DIR: process.cwd(),
+        ...(mcp.env || {}),
+    };
+    // Add provider-specific env vars from the config
+    if (config.provider?.apiKeyEnv) {
+        env.AUTOMATOSX_API_KEY_ENV = config.provider.apiKeyEnv;
+    }
+    // Add integration settings as env vars
+    if (config.integration) {
+        if (config.integration.useMemory !== undefined) {
+            env.AUTOMATOSX_USE_MEMORY = String(config.integration.useMemory);
+        }
+        if (config.integration.useAgentContext !== undefined) {
+            env.AUTOMATOSX_USE_AGENT_CONTEXT = String(config.integration.useAgentContext);
+        }
+        if (config.integration.saveResponsesToMemory !== undefined) {
+            env.AUTOMATOSX_SAVE_RESPONSES = String(config.integration.saveResponsesToMemory);
+        }
+    }
+    const transport = {
+        type: 'stdio',
+        command: mcp.serverCommand,
+        args: mcp.serverArgs || [],
+        env,
+    };
+    return [{
+            name: serverName,
+            enabled: true,
+            transport,
+            initTimeout: mcp.timeout || 30000,
+            // Suppress verbose output by default
+            quiet: true,
+        }];
+}
+/**
+ * Get provider MCP servers ready to be merged with other sources
+ */
+export function getProviderMCPServers(projectRoot) {
+    const result = loadProviderMCPConfig(projectRoot);
+    return result.serverConfigs;
+}
+//# sourceMappingURL=provider-mcp-loader.js.map

package/dist/mcp/provider-mcp-loader.js.map

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

package/dist/mcp/resources.d.ts

@@ -3,8 +3,12 @@
  *
  * Enables users to reference MCP-exposed resources using @mcp: syntax
  * Similar to file references, but for database tables, API endpoints, etc.
+ *
+ * BUG FIX: Updated to use v2 manager's connection state instead of legacy clients Map.
+ * The v1 MCPManager now wraps v2 internally, so we access the v2 instance.
  */
 import type { MCPManager } from './client.js';
+import { MCPManagerV2 } from './client-v2.js';
 export interface MCPResource {
     /** Resource URI (e.g., database://users, api://endpoints/get-user) */
     uri: string;
@@ -22,15 +26,15 @@ export interface MCPResource {
 /**
  * List all resources from MCP servers
  */
-export declare function listAllResources(mcpManager: MCPManager): Promise<MCPResource[]>;
+export declare function listAllResources(mcpManager: MCPManager | MCPManagerV2): Promise<MCPResource[]>;
 /**
  * List resources from a specific MCP server
  */
-export declare function listServerResources(mcpManager: MCPManager, serverName: string): Promise<MCPResource[]>;
+export declare function listServerResources(mcpManager: MCPManager | MCPManagerV2, serverName: string): Promise<MCPResource[]>;
 /**
  * Get resource content from MCP server
  */
-export declare function getResourceContent(mcpManager: MCPManager, serverName: string, uri: string): Promise<string>;
+export declare function getResourceContent(mcpManager: MCPManager | MCPManagerV2, serverName: string, uri: string): Promise<string>;
 /**
  * Parse @mcp: reference
  * Format: @mcp:server/uri
@@ -47,7 +51,7 @@ export declare function extractMCPReferences(text: string): string[];
 /**
  * Replace MCP references in text with actual content
  */
-export declare function resolveMCPReferences(text: string, mcpManager: MCPManager): Promise<string>;
+export declare function resolveMCPReferences(text: string, mcpManager: MCPManager | MCPManagerV2): Promise<string>;
 /**
  * Search resources by name or URI
  */

package/dist/mcp/resources.js

@@ -3,17 +3,33 @@
  *
  * Enables users to reference MCP-exposed resources using @mcp: syntax
  * Similar to file references, but for database tables, API endpoints, etc.
+ *
+ * BUG FIX: Updated to use v2 manager's connection state instead of legacy clients Map.
+ * The v1 MCPManager now wraps v2 internally, so we access the v2 instance.
  */
+import { MCPManagerV2, createServerName } from './client-v2.js';
 import { extractErrorMessage } from '../utils/error-handler.js';
+/**
+ * Get the v2 manager from either v1 or v2 instance
+ */
+function getV2Manager(mcpManager) {
+    // If it's already v2, return it directly
+    if (mcpManager instanceof MCPManagerV2) {
+        return mcpManager;
+    }
+    // Otherwise, it's v1 wrapper - access the internal v2 instance
+    return mcpManager.v2;
+}
 /**
  * List all resources from MCP servers
  */
 export async function listAllResources(mcpManager) {
     const resources = [];
-    const servers = mcpManager.getServers();
+    const v2 = getV2Manager(mcpManager);
+    const servers = v2.getServers();
     for (const serverName of servers) {
         try {
-            const serverResources = await listServerResources(mcpManager, serverName);
+            const serverResources = await listServerResources(mcpManager, String(serverName));
             resources.push(...serverResources);
         }
         catch {
@@ -27,55 +43,40 @@ export async function listAllResources(mcpManager) {
  * List resources from a specific MCP server
  */
 export async function listServerResources(mcpManager, serverName) {
-    try {
-        // Get the client for this server
-        const client = mcpManager.clients.get(serverName);
-        if (!client) {
-            return [];
-        }
-        // Try to list resources
-        const result = await client.listResources();
-        // Convert to our resource format
-        return result.resources.map((resource) => ({
-            uri: resource.uri,
-            name: resource.name || resource.uri,
-            description: resource.description,
-            mimeType: resource.mimeType,
-            serverName,
-            reference: `@mcp:${serverName}/${resource.uri}`
-        }));
+    const v2 = getV2Manager(mcpManager);
+    const brandedServerName = createServerName(serverName);
+    if (!brandedServerName) {
+        return [];
     }
-    catch {
-        // Server doesn't support resources
+    // Use the v2 manager's listResources method
+    const result = await v2.listResources(brandedServerName);
+    if (!result.success) {
         return [];
     }
+    // Convert to our resource format
+    return result.value.map(resource => ({
+        uri: resource.uri,
+        name: resource.name || resource.uri,
+        description: resource.description,
+        mimeType: resource.mimeType,
+        serverName,
+        reference: `@mcp:${serverName}/${resource.uri}`
+    }));
 }
 /**
  * Get resource content from MCP server
  */
 export async function getResourceContent(mcpManager, serverName, uri) {
-    try {
-        const client = mcpManager.clients.get(serverName);
-        if (!client) {
-            throw new Error(`Server "${serverName}" not connected`);
-        }
-        const result = await client.readResource({ uri });
-        // Extract text content
-        if (result.contents && result.contents.length > 0) {
-            const content = result.contents[0];
-            if (content.text) {
-                return content.text;
-            }
-            if (content.blob) {
-                // Handle base64 encoded content
-                return Buffer.from(content.blob, 'base64').toString('utf-8');
-            }
-        }
-        return '';
+    const v2 = getV2Manager(mcpManager);
+    const brandedServerName = createServerName(serverName);
+    if (!brandedServerName) {
+        throw new Error(`Invalid server name: "${serverName}"`);
     }
-    catch (error) {
-        throw new Error(`Failed to read resource ${uri}: ${extractErrorMessage(error)}`);
+    const result = await v2.readResource(brandedServerName, uri);
+    if (!result.success) {
+        throw new Error(`Failed to read resource ${uri}: ${extractErrorMessage(result.error)}`);
     }
+    return result.value;
 }
 /**
  * Parse @mcp: reference

package/dist/mcp/resources.js.map

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