@agiflowai/one-mcp 0.3.7 → 0.3.9

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_http = require('./http-CKXz9Gp8.cjs');
+const require_http = require('./http-pwzeCOpM.cjs');
 let node_fs_promises = require("node:fs/promises");
 let node_path = require("node:path");
 let liquidjs = require("liquidjs");
@@ -7,6 +7,84 @@ let commander = require("commander");
 let __agiflowai_aicode_utils = require("@agiflowai/aicode-utils");
 let node_child_process = require("node:child_process");
 
+//#region src/templates/mcp-config.yaml.liquid?raw
+var mcp_config_yaml_default = "# MCP Server Configuration\n# This file configures the MCP servers that one-mcp will connect to\n#\n# Environment Variable Interpolation:\n# Use ${VAR_NAME} syntax to reference environment variables\n# Example: ${HOME}, ${API_KEY}, ${DATABASE_URL}\n#\n# Instructions:\n# - config.instruction: Server's default instruction (from server documentation)\n# - instruction: User override (optional, takes precedence over config.instruction)\n# - config.toolBlacklist: Array of tool names to hide/block from this server\n# - config.omitToolDescription: Boolean to show only tool names without descriptions (saves tokens)\n\n# Remote Configuration Sources (OPTIONAL)\n# Fetch and merge configurations from remote URLs\n# Remote configs are merged with local configs based on merge strategy\n#\n# SECURITY: SSRF Protection is ENABLED by default\n# - Only HTTPS URLs are allowed (set security.enforceHttps: false to allow HTTP)\n# - Private IPs and localhost are blocked (set security.allowPrivateIPs: true for internal networks)\n# - Blocked ranges: 127.0.0.0/8, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 169.254.0.0/16\nremoteConfigs:\n  # Example 1: Basic remote config with default security\n  # - url: ${AGIFLOW_URL}/api/v1/mcp-configs\n  #   headers:\n  #     Authorization: Bearer ${AGIFLOW_API_KEY}\n  #   mergeStrategy: local-priority  # Options: local-priority (default), remote-priority, merge-deep\n  #\n  # Example 2: Remote config with custom security settings (for internal networks)\n  # - url: ${INTERNAL_URL}/mcp-configs\n  #   headers:\n  #     Authorization: Bearer ${INTERNAL_TOKEN}\n  #   security:\n  #     allowPrivateIPs: true   # Allow internal IPs (default: false)\n  #     enforceHttps: false     # Allow HTTP (default: true, HTTPS only)\n  #   mergeStrategy: local-priority\n  #\n  # Example 3: Remote config with additional validation (OPTIONAL)\n  # - url: ${AGIFLOW_URL}/api/v1/mcp-configs\n  #   headers:\n  #     Authorization: Bearer ${AGIFLOW_API_KEY}\n  #     X-API-Key: ${AGIFLOW_API_KEY}\n  #   security:\n  #     enforceHttps: true      # Require HTTPS (default: true)\n  #     allowPrivateIPs: false  # Block private IPs (default: false)\n  #   validation:  # OPTIONAL: Additional regex validation on top of security checks\n  #     url: ^https://.*\\.agiflow\\.io/.*  # OPTIONAL: Regex pattern to validate URL format\n  #     headers:  # OPTIONAL: Regex patterns to validate header values\n  #       Authorization: ^Bearer [A-Za-z0-9_-]+$\n  #       X-API-Key: ^[A-Za-z0-9_-]{32,}$\n  #   mergeStrategy: local-priority\n\nmcpServers:\n{%- if mcpServers %}{% for server in mcpServers %}\n  {{ server.name }}:\n    command: {{ server.command }}\n    args:{% for arg in server.args %}\n      - '{{ arg }}'{% endfor %}\n    # env:\n    #   LOG_LEVEL: info\n    #   # API_KEY: ${MY_API_KEY}\n    # config:\n    #   instruction: Use this server for...\n    #   # toolBlacklist:\n    #   #   - tool_to_block\n    #   # omitToolDescription: true\n{% endfor %}\n  # Example MCP server using SSE transport\n  # remote-server:\n  #   url: https://example.com/mcp\n  #   type: sse\n  #   headers:\n  #     Authorization: Bearer ${API_KEY}\n  #   config:\n  #     instruction: This server provides tools for...\n{% else %}\n  # Example MCP server using stdio transport\n  example-server:\n    command: node\n    args:\n      - /path/to/mcp-server/build/index.js\n    env:\n      # Environment variables for the MCP server\n      LOG_LEVEL: info\n      # You can use environment variable interpolation:\n      # DATABASE_URL: ${DATABASE_URL}\n      # API_KEY: ${MY_API_KEY}\n    config:\n      # Server's default instruction (from server documentation)\n      instruction: Use this server for...\n      # Optional: Block specific tools from being listed or executed\n      # toolBlacklist:\n      #   - dangerous_tool_name\n      #   - another_blocked_tool\n      # Optional: Omit tool descriptions to save tokens (default: false)\n      # omitToolDescription: true\n    # instruction: Optional user override - takes precedence over config.instruction\n\n  # Example MCP server using SSE transport with environment variables\n  # remote-server:\n  #   url: https://example.com/mcp\n  #   type: sse\n  #   headers:\n  #     # Use ${VAR_NAME} to interpolate environment variables\n  #     Authorization: Bearer ${API_KEY}\n  #   config:\n  #     instruction: This server provides tools for...\n  #     # Optional: Block specific tools from being listed or executed\n  #     # toolBlacklist:\n  #     #   - tool_to_block\n  #     # Optional: Omit tool descriptions to save tokens (default: false)\n  #     # omitToolDescription: true\n  #   # instruction: Optional user override\n{% endif %}\n";
+
+//#endregion
+//#region src/templates/mcp-config.json?raw
+var mcp_config_default = "{\n  \"_comment\": \"MCP Server Configuration - Use ${VAR_NAME} syntax for environment variable interpolation\",\n  \"_instructions\": \"config.instruction: Server's default instruction | instruction: User override (takes precedence)\",\n  \"mcpServers\": {\n    \"example-server\": {\n      \"command\": \"node\",\n      \"args\": [\"/path/to/mcp-server/build/index.js\"],\n      \"env\": {\n        \"LOG_LEVEL\": \"info\",\n        \"_comment\": \"You can use environment variable interpolation:\",\n        \"_example_DATABASE_URL\": \"${DATABASE_URL}\",\n        \"_example_API_KEY\": \"${MY_API_KEY}\"\n      },\n      \"config\": {\n        \"instruction\": \"Use this server for...\"\n      },\n      \"_instruction_override\": \"Optional user override - takes precedence over config.instruction\"\n    }\n  }\n}\n";
+
+//#endregion
+//#region src/commands/init.ts
+/**
+* Init Command
+*
+* DESIGN PATTERNS:
+* - Command pattern with Commander for CLI argument parsing
+* - Async/await pattern for asynchronous operations
+* - Error handling pattern with try-catch and proper exit codes
+*
+* CODING STANDARDS:
+* - Use async action handlers for asynchronous operations
+* - Provide clear option descriptions and default values
+* - Handle errors gracefully with process.exit()
+* - Log progress and errors to console
+* - Use Commander's .option() and .argument() for inputs
+*
+* AVOID:
+* - Synchronous blocking operations in action handlers
+* - Missing error handling (always use try-catch)
+* - Hardcoded values (use options or environment variables)
+* - Not exiting with appropriate exit codes on errors
+*/
+/**
+* Initialize MCP configuration file
+*/
+const initCommand = new commander.Command("init").description("Initialize MCP configuration file").option("-o, --output <path>", "Output file path", "mcp-config.yaml").option("--json", "Generate JSON config instead of YAML", false).option("-f, --force", "Overwrite existing config file", false).option("--mcp-servers <json>", "JSON string of MCP servers to add to config (optional)").action(async (options) => {
+	try {
+		const outputPath = (0, node_path.resolve)(options.output);
+		const isYaml = !options.json && (outputPath.endsWith(".yaml") || outputPath.endsWith(".yml"));
+		let content;
+		if (isYaml) {
+			const liquid = new liquidjs.Liquid();
+			let mcpServersData = null;
+			if (options.mcpServers) try {
+				const serversObj = JSON.parse(options.mcpServers);
+				mcpServersData = Object.entries(serversObj).map(([name, config]) => ({
+					name,
+					command: config.command,
+					args: config.args
+				}));
+			} catch (parseError) {
+				__agiflowai_aicode_utils.log.error("Failed to parse --mcp-servers JSON:", parseError instanceof Error ? parseError.message : String(parseError));
+				process.exit(1);
+			}
+			content = await liquid.parseAndRender(mcp_config_yaml_default, { mcpServers: mcpServersData });
+		} else content = mcp_config_default;
+		try {
+			await (0, node_fs_promises.writeFile)(outputPath, content, {
+				encoding: "utf-8",
+				flag: options.force ? "w" : "wx"
+			});
+		} catch (error) {
+			if (error && typeof error === "object" && "code" in error && error.code === "EEXIST") {
+				__agiflowai_aicode_utils.log.error(`Config file already exists: ${outputPath}`);
+				__agiflowai_aicode_utils.log.info("Use --force to overwrite");
+				process.exit(1);
+			}
+			throw error;
+		}
+		__agiflowai_aicode_utils.log.info(`MCP configuration file created: ${outputPath}`);
+		__agiflowai_aicode_utils.log.info("Next steps:");
+		__agiflowai_aicode_utils.log.info("1. Edit the configuration file to add your MCP servers");
+		__agiflowai_aicode_utils.log.info(`2. Run: one-mcp mcp-serve --config ${outputPath}`);
+	} catch (error) {
+		__agiflowai_aicode_utils.log.error("Error executing init:", error instanceof Error ? error.message : String(error));
+		process.exit(1);
+	}
+});
+
+//#endregion
 //#region src/types/index.ts
 /**
 * Transport mode constants
@@ -99,256 +177,387 @@ const mcpServeCommand = new commander.Command("mcp-serve").description("Start MC
 });
 
 //#endregion
-//#region src/commands/list-tools.ts
+//#region src/services/PrefetchService/constants.ts
 /**
-* List Tools Command
-*
-* DESIGN PATTERNS:
-* - Command pattern with Commander for CLI argument parsing
-* - Async/await pattern for asynchronous operations
-* - Error handling pattern with try-catch and proper exit codes
-*
-* CODING STANDARDS:
-* - Use async action handlers for asynchronous operations
-* - Provide clear option descriptions and default values
-* - Handle errors gracefully with process.exit()
-* - Log progress and errors to console
-* - Use Commander's .option() and .argument() for inputs
+* PrefetchService Constants
 *
-* AVOID:
-* - Synchronous blocking operations in action handlers
-* - Missing error handling (always use try-catch)
-* - Hardcoded values (use options or environment variables)
-* - Not exiting with appropriate exit codes on errors
+* Constants for package manager commands and process configuration.
 */
+/** Transport type for stdio-based MCP servers */
+const TRANSPORT_STDIO = "stdio";
+/** npx command name */
+const COMMAND_NPX = "npx";
+/** npm command name */
+const COMMAND_NPM = "npm";
+/** pnpx command name (pnpm's npx equivalent) */
+const COMMAND_PNPX = "pnpx";
+/** pnpm command name */
+const COMMAND_PNPM = "pnpm";
+/** uvx command name */
+const COMMAND_UVX = "uvx";
+/** uv command name */
+const COMMAND_UV = "uv";
+/** Path suffix for npx command */
+const COMMAND_NPX_SUFFIX = "/npx";
+/** Path suffix for pnpx command */
+const COMMAND_PNPX_SUFFIX = "/pnpx";
+/** Path suffix for uvx command */
+const COMMAND_UVX_SUFFIX = "/uvx";
+/** Path suffix for uv command */
+const COMMAND_UV_SUFFIX = "/uv";
+/** Run subcommand for uv */
+const ARG_RUN = "run";
+/** Tool subcommand for uv */
+const ARG_TOOL = "tool";
+/** Install subcommand for uv tool and npm/pnpm */
+const ARG_INSTALL = "install";
+/** Add subcommand for pnpm */
+const ARG_ADD = "add";
+/** Global flag for npm/pnpm install */
+const ARG_GLOBAL = "-g";
+/** Flag prefix for command arguments */
+const FLAG_PREFIX = "-";
+/** npx --package flag (long form) */
+const FLAG_PACKAGE_LONG = "--package";
+/** npx -p flag (short form) */
+const FLAG_PACKAGE_SHORT = "-p";
+/** Equals delimiter used in flag=value patterns */
+const EQUALS_DELIMITER = "=";
 /**
-* List all available tools from connected MCP servers
+* Regex pattern for valid package names (npm, pnpm, uvx, uv)
+* Allows: @scope/package-name@version, package-name, package_name
+* Prevents shell metacharacters that could enable command injection
+* @example
+* // Valid: '@scope/package@1.0.0', 'my-package', 'my_package', '@org/pkg'
+* // Invalid: 'pkg; rm -rf /', 'pkg$(cmd)', 'pkg`whoami`', 'pkg|cat /etc/passwd'
 */
-const listToolsCommand = new commander.Command("list-tools").description("List all available tools from connected MCP servers").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Filter by server name").option("-j, --json", "Output as JSON", false).action(async (options) => {
-	try {
-		const configFilePath = options.config || require_http.findConfigFile();
-		if (!configFilePath) {
-			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
-			process.exit(1);
-		}
-		const config = await new require_http.ConfigFetcherService({ configFilePath }).fetchConfiguration();
-		const clientManager = new require_http.McpClientManagerService();
-		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
-			try {
-				await clientManager.connectToServer(serverName, serverConfig);
-				if (!options.json) console.error(`✓ Connected to ${serverName}`);
-			} catch (error) {
-				if (!options.json) console.error(`✗ Failed to connect to ${serverName}:`, error);
-			}
-		});
-		await Promise.all(connectionPromises);
-		const clients = options.server ? [clientManager.getClient(options.server)].filter((c) => c !== void 0) : clientManager.getAllClients();
-		if (clients.length === 0) {
-			console.error("No MCP servers connected");
-			process.exit(1);
-		}
-		const toolsByServer = {};
-		const toolResults = await Promise.all(clients.map(async (client) => {
-			try {
-				const tools = await client.listTools();
-				const blacklist = new Set(client.toolBlacklist || []);
-				const filteredTools = tools.filter((t) => !blacklist.has(t.name));
-				return {
-					serverName: client.serverName,
-					tools: filteredTools,
-					error: null
-				};
-			} catch (error) {
-				return {
-					serverName: client.serverName,
-					tools: [],
-					error
-				};
-			}
-		}));
-		for (const { serverName, tools, error } of toolResults) {
-			if (error && !options.json) console.error(`Failed to list tools from ${serverName}:`, error);
-			toolsByServer[serverName] = tools;
-		}
-		if (options.json) console.log(JSON.stringify(toolsByServer, null, 2));
-		else for (const [serverName, tools] of Object.entries(toolsByServer)) {
-			const omitDescription = clients.find((c) => c.serverName === serverName)?.omitToolDescription || false;
-			console.log(`\n${serverName}:`);
-			if (tools.length === 0) console.log("  No tools available");
-			else if (omitDescription) {
-				const toolNames = tools.map((t) => t.name).join(", ");
-				console.log(`  ${toolNames}`);
-			} else for (const tool of tools) console.log(`  - ${tool.name}: ${tool.description || "No description"}`);
-		}
-		await clientManager.disconnectAll();
-	} catch (error) {
-		console.error("Error executing list-tools:", error);
-		process.exit(1);
-	}
-});
+const VALID_PACKAGE_NAME_PATTERN = /^(@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9._-]+(@[a-zA-Z0-9._-]+)?$/;
+/** Windows platform identifier */
+const PLATFORM_WIN32 = "win32";
+/** Success exit code */
+const EXIT_CODE_SUCCESS = 0;
+/** Stdio option to ignore stream */
+const STDIO_IGNORE = "ignore";
+/** Stdio option to pipe stream */
+const STDIO_PIPE = "pipe";
 
 //#endregion
-//#region src/commands/describe-tools.ts
+//#region src/services/PrefetchService/PrefetchService.ts
 /**
-* Describe Tools Command
+* PrefetchService
 *
 * DESIGN PATTERNS:
-* - Command pattern with Commander for CLI argument parsing
-* - Async/await pattern for asynchronous operations
-* - Error handling pattern with try-catch and proper exit codes
+* - Service pattern for business logic encapsulation
+* - Single responsibility principle
 *
 * CODING STANDARDS:
-* - Use async action handlers for asynchronous operations
-* - Provide clear option descriptions and default values
-* - Handle errors gracefully with process.exit()
-* - Log progress and errors to console
-* - Use Commander's .option() and .argument() for inputs
+* - Use async/await for asynchronous operations
+* - Throw descriptive errors for error cases
+* - Keep methods focused and well-named
+* - Document complex logic with comments
 *
 * AVOID:
-* - Synchronous blocking operations in action handlers
-* - Missing error handling (always use try-catch)
-* - Hardcoded values (use options or environment variables)
-* - Not exiting with appropriate exit codes on errors
+* - Mixing concerns (keep focused on single domain)
+* - Direct tool implementation (services should be tool-agnostic)
 */
 /**
-* Describe specific MCP tools
+* Type guard to check if a config object is an McpStdioConfig
+* @param config - Config object to check
+* @returns True if config has required McpStdioConfig properties
 */
-const describeToolsCommand = new commander.Command("describe-tools").description("Describe specific MCP tools").argument("<toolNames...>", "Tool names to describe").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Filter by server name").option("-j, --json", "Output as JSON", false).action(async (toolNames, options) => {
-	try {
-		const configFilePath = options.config || require_http.findConfigFile();
-		if (!configFilePath) {
-			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
-			process.exit(1);
-		}
-		const config = await new require_http.ConfigFetcherService({ configFilePath }).fetchConfiguration();
-		const clientManager = new require_http.McpClientManagerService();
-		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
-			try {
-				await clientManager.connectToServer(serverName, serverConfig);
-				if (!options.json) console.error(`✓ Connected to ${serverName}`);
-			} catch (error) {
-				if (!options.json) console.error(`✗ Failed to connect to ${serverName}:`, error);
-			}
-		});
-		await Promise.all(connectionPromises);
-		const clients = clientManager.getAllClients();
-		if (clients.length === 0) {
-			console.error("No MCP servers connected");
-			process.exit(1);
-		}
-		const cwd = process.env.PROJECT_PATH || process.cwd();
-		const skillPaths = config.skills?.paths || [];
-		const skillService = skillPaths.length > 0 ? new require_http.SkillService(cwd, skillPaths) : void 0;
-		const foundTools = [];
-		const foundSkills = [];
-		const notFoundTools = [...toolNames];
-		const filteredClients = clients.filter((client) => !options.server || client.serverName === options.server);
-		const toolResults = await Promise.all(filteredClients.map(async (client) => {
-			try {
-				return {
-					client,
-					tools: await client.listTools(),
-					error: null
-				};
-			} catch (error) {
-				return {
-					client,
-					tools: [],
-					error
-				};
-			}
-		}));
-		for (const { client, tools, error } of toolResults) {
-			if (error) {
-				if (!options.json) console.error(`Failed to list tools from ${client.serverName}:`, error);
-				continue;
-			}
-			for (const toolName of toolNames) {
-				const tool = tools.find((t) => t.name === toolName);
-				if (tool) {
-					foundTools.push({
-						server: client.serverName,
-						name: tool.name,
-						description: tool.description,
-						inputSchema: tool.inputSchema
-					});
-					const idx = notFoundTools.indexOf(toolName);
-					if (idx > -1) notFoundTools.splice(idx, 1);
-				}
+function isMcpStdioConfig(config) {
+	return typeof config === "object" && config !== null && "command" in config;
+}
+/**
+* PrefetchService handles pre-downloading packages used by MCP servers.
+* Supports npx (Node.js), uvx (Python/uv), and uv run commands.
+*
+* @example
+* ```typescript
+* const service = new PrefetchService({
+*   mcpConfig: await configFetcher.fetchConfiguration(),
+*   parallel: true,
+* });
+* const packages = service.extractPackages();
+* const summary = await service.prefetch();
+* ```
+*/
+var PrefetchService = class {
+	config;
+	/**
+	* Creates a new PrefetchService instance
+	* @param config - Service configuration options
+	*/
+	constructor(config) {
+		this.config = config;
+	}
+	/**
+	* Extract all prefetchable packages from the MCP configuration
+	* @returns Array of package info objects
+	*/
+	extractPackages() {
+		const packages = [];
+		const { mcpConfig, filter } = this.config;
+		for (const [serverName, serverConfig] of Object.entries(mcpConfig.mcpServers)) {
+			if (serverConfig.disabled) continue;
+			if (serverConfig.transport !== TRANSPORT_STDIO) continue;
+			if (!isMcpStdioConfig(serverConfig.config)) continue;
+			const packageInfo = this.extractPackageInfo(serverName, serverConfig.config);
+			if (packageInfo) {
+				if (filter && packageInfo.packageManager !== filter) continue;
+				packages.push(packageInfo);
 			}
 		}
-		if (skillService && notFoundTools.length > 0) {
-			const skillsToCheck = [...notFoundTools];
-			const skillResults = await Promise.all(skillsToCheck.map(async (toolName) => {
-				const skillName = toolName.startsWith("skill__") ? toolName.slice(7) : toolName;
-				return {
-					toolName,
-					skill: await skillService.getSkill(skillName)
-				};
-			}));
-			for (const { toolName, skill } of skillResults) if (skill) {
-				foundSkills.push({
-					name: skill.name,
-					location: skill.basePath,
-					instructions: skill.content
-				});
-				const idx = notFoundTools.indexOf(toolName);
-				if (idx > -1) notFoundTools.splice(idx, 1);
+		return packages;
+	}
+	/**
+	* Prefetch all packages from the configuration
+	* @returns Summary of prefetch results
+	* @throws Error if prefetch operation fails unexpectedly
+	*/
+	async prefetch() {
+		try {
+			const packages = this.extractPackages();
+			const results = [];
+			if (packages.length === 0) return {
+				totalPackages: 0,
+				successful: 0,
+				failed: 0,
+				results: []
+			};
+			if (this.config.parallel) {
+				const promises = packages.map(async (pkg) => this.prefetchPackage(pkg));
+				results.push(...await Promise.all(promises));
+			} else for (const pkg of packages) {
+				const result = await this.prefetchPackage(pkg);
+				results.push(result);
 			}
+			const successful = results.filter((r) => r.success).length;
+			const failed = results.filter((r) => !r.success).length;
+			return {
+				totalPackages: packages.length,
+				successful,
+				failed,
+				results
+			};
+		} catch (error) {
+			throw new Error(`Failed to prefetch packages: ${error instanceof Error ? error.message : String(error)}`);
 		}
-		const nextSteps = [];
-		if (foundTools.length > 0) nextSteps.push("For MCP tools: Use the use_tool function with toolName and toolArgs based on the inputSchema above.");
-		if (foundSkills.length > 0) nextSteps.push(`For skill, just follow skill's description to continue.`);
-		if (options.json) {
-			const result = {};
-			if (foundTools.length > 0) result.tools = foundTools;
-			if (foundSkills.length > 0) result.skills = foundSkills;
-			if (nextSteps.length > 0) result.nextSteps = nextSteps;
-			if (notFoundTools.length > 0) result.notFound = notFoundTools;
-			console.log(JSON.stringify(result, null, 2));
-		} else {
-			if (foundTools.length > 0) {
-				console.log("\nFound tools:\n");
-				for (const tool of foundTools) {
-					console.log(`Server: ${tool.server}`);
-					console.log(`Tool: ${tool.name}`);
-					console.log(`Description: ${tool.description || "No description"}`);
-					console.log(`Input Schema:`);
-					console.log(JSON.stringify(tool.inputSchema, null, 2));
-					console.log("");
-				}
-			}
-			if (foundSkills.length > 0) {
-				console.log("\nFound skills:\n");
-				for (const skill of foundSkills) {
-					console.log(`Skill: ${skill.name}`);
-					console.log(`Location: ${skill.location}`);
-					console.log(`Instructions:\n${skill.instructions}`);
-					console.log("");
-				}
-			}
-			if (nextSteps.length > 0) {
-				console.log("\nNext steps:");
-				for (const step of nextSteps) console.log(`  • ${step}`);
-				console.log("");
+	}
+	/**
+	* Prefetch a single package
+	* @param pkg - Package info to prefetch
+	* @returns Result of the prefetch operation
+	*/
+	async prefetchPackage(pkg) {
+		try {
+			const [command, ...args] = pkg.fullCommand;
+			const result = await this.runCommand(command, args);
+			return {
+				package: pkg,
+				success: result.success,
+				output: result.output
+			};
+		} catch (error) {
+			return {
+				package: pkg,
+				success: false,
+				output: error instanceof Error ? error.message : String(error)
+			};
+		}
+	}
+	/**
+	* Validate package name to prevent command injection
+	* @param packageName - Package name to validate
+	* @returns True if package name is safe, false otherwise
+	* @remarks Rejects package names containing shell metacharacters
+	* @example
+	* isValidPackageName('@scope/package') // true
+	* isValidPackageName('my-package@1.0.0') // true
+	* isValidPackageName('pkg; rm -rf /') // false (shell injection)
+	* isValidPackageName('pkg$(whoami)') // false (command substitution)
+	*/
+	isValidPackageName(packageName) {
+		return VALID_PACKAGE_NAME_PATTERN.test(packageName);
+	}
+	/**
+	* Extract package info from a server's stdio config
+	* @param serverName - Name of the MCP server
+	* @param config - Stdio configuration for the server
+	* @returns Package info if extractable, null otherwise
+	*/
+	extractPackageInfo(serverName, config) {
+		const command = config.command.toLowerCase();
+		const args = config.args || [];
+		if (command === COMMAND_NPX || command.endsWith(COMMAND_NPX_SUFFIX)) {
+			const packageName = this.extractNpxPackage(args);
+			if (packageName && this.isValidPackageName(packageName)) return {
+				serverName,
+				packageManager: COMMAND_NPX,
+				packageName,
+				fullCommand: [
+					COMMAND_NPM,
+					ARG_INSTALL,
+					ARG_GLOBAL,
+					packageName
+				]
+			};
+		}
+		if (command === COMMAND_PNPX || command.endsWith(COMMAND_PNPX_SUFFIX)) {
+			const packageName = this.extractNpxPackage(args);
+			if (packageName && this.isValidPackageName(packageName)) return {
+				serverName,
+				packageManager: COMMAND_PNPX,
+				packageName,
+				fullCommand: [
+					COMMAND_PNPM,
+					ARG_ADD,
+					ARG_GLOBAL,
+					packageName
+				]
+			};
+		}
+		if (command === COMMAND_UVX || command.endsWith(COMMAND_UVX_SUFFIX)) {
+			const packageName = this.extractUvxPackage(args);
+			if (packageName && this.isValidPackageName(packageName)) return {
+				serverName,
+				packageManager: COMMAND_UVX,
+				packageName,
+				fullCommand: [COMMAND_UVX, packageName]
+			};
+		}
+		if ((command === COMMAND_UV || command.endsWith(COMMAND_UV_SUFFIX)) && args.includes(ARG_RUN)) {
+			const packageName = this.extractUvRunPackage(args);
+			if (packageName && this.isValidPackageName(packageName)) return {
+				serverName,
+				packageManager: COMMAND_UV,
+				packageName,
+				fullCommand: [
+					COMMAND_UV,
+					ARG_TOOL,
+					ARG_INSTALL,
+					packageName
+				]
+			};
+		}
+		return null;
+	}
+	/**
+	* Extract package name from npx command args
+	* @param args - Command arguments
+	* @returns Package name or null
+	* @remarks Handles --package=value, --package value, -p value patterns.
+	*          Falls back to first non-flag argument if no --package/-p flag found.
+	*          Returns null if flag has no value or is followed by another flag.
+	*          When multiple --package flags exist, returns the first valid one.
+	* @example
+	* extractNpxPackage(['--package=@scope/pkg']) // returns '@scope/pkg'
+	* extractNpxPackage(['--package', 'pkg-name']) // returns 'pkg-name'
+	* extractNpxPackage(['-p', 'pkg']) // returns 'pkg'
+	* extractNpxPackage(['-y', 'pkg-name', '--flag']) // returns 'pkg-name' (fallback)
+	* extractNpxPackage(['--package=']) // returns null (empty value)
+	*/
+	extractNpxPackage(args) {
+		for (let i = 0; i < args.length; i++) {
+			const arg = args[i];
+			if (arg.startsWith(FLAG_PACKAGE_LONG + EQUALS_DELIMITER)) return arg.slice(FLAG_PACKAGE_LONG.length + EQUALS_DELIMITER.length) || null;
+			if (arg === FLAG_PACKAGE_LONG && i + 1 < args.length) {
+				const nextArg = args[i + 1];
+				if (!nextArg.startsWith(FLAG_PREFIX)) return nextArg;
 			}
-			if (notFoundTools.length > 0) console.error(`\nTools/skills not found: ${notFoundTools.join(", ")}`);
-			if (foundTools.length === 0 && foundSkills.length === 0) {
-				console.error("No tools or skills found");
-				process.exit(1);
+			if (arg === FLAG_PACKAGE_SHORT && i + 1 < args.length) {
+				const nextArg = args[i + 1];
+				if (!nextArg.startsWith(FLAG_PREFIX)) return nextArg;
 			}
 		}
-		await clientManager.disconnectAll();
-	} catch (error) {
-		console.error("Error executing describe-tools:", error);
-		process.exit(1);
+		for (const arg of args) {
+			if (arg.startsWith(FLAG_PREFIX)) continue;
+			return arg;
+		}
+		return null;
+	}
+	/**
+	* Extract package name from uvx command args
+	* @param args - Command arguments
+	* @returns Package name or null
+	* @remarks Assumes the first non-flag argument is the package name.
+	*          Handles both single (-) and double (--) dash flags.
+	* @example
+	* extractUvxPackage(['mcp-server-fetch']) // returns 'mcp-server-fetch'
+	* extractUvxPackage(['--quiet', 'pkg-name']) // returns 'pkg-name'
+	*/
+	extractUvxPackage(args) {
+		for (const arg of args) {
+			if (arg.startsWith(FLAG_PREFIX)) continue;
+			return arg;
+		}
+		return null;
+	}
+	/**
+	* Extract package name from uv run command args
+	* @param args - Command arguments
+	* @returns Package name or null
+	* @remarks Looks for the first non-flag argument after the 'run' subcommand.
+	*          Returns null if 'run' is not found in args.
+	* @example
+	* extractUvRunPackage(['run', 'mcp-server']) // returns 'mcp-server'
+	* extractUvRunPackage(['run', '--verbose', 'pkg']) // returns 'pkg'
+	* extractUvRunPackage(['install', 'pkg']) // returns null (no 'run')
+	*/
+	extractUvRunPackage(args) {
+		const runIndex = args.indexOf(ARG_RUN);
+		if (runIndex === -1) return null;
+		for (let i = runIndex + 1; i < args.length; i++) {
+			const arg = args[i];
+			if (arg.startsWith(FLAG_PREFIX)) continue;
+			return arg;
+		}
+		return null;
 	}
-});
+	/**
+	* Run a shell command and capture output
+	* @param command - Command to run
+	* @param args - Command arguments
+	* @returns Promise with success status and output
+	*/
+	runCommand(command, args) {
+		return new Promise((resolve$1) => {
+			const proc = (0, node_child_process.spawn)(command, args, {
+				stdio: [
+					STDIO_IGNORE,
+					STDIO_PIPE,
+					STDIO_PIPE
+				],
+				shell: process.platform === PLATFORM_WIN32
+			});
+			let stdout = "";
+			let stderr = "";
+			proc.stdout?.on("data", (data) => {
+				stdout += data.toString();
+			});
+			proc.stderr?.on("data", (data) => {
+				stderr += data.toString();
+			});
+			proc.on("close", (code) => {
+				resolve$1({
+					success: code === EXIT_CODE_SUCCESS,
+					output: stdout || stderr
+				});
+			});
+			proc.on("error", (error) => {
+				resolve$1({
+					success: false,
+					output: error.message
+				});
+			});
+		});
+	}
+};
 
 //#endregion
-//#region src/commands/use-tool.ts
+//#region src/commands/list-tools.ts
 /**
-* Use Tool Command
+* List Tools Command
 *
 * DESIGN PATTERNS:
 * - Command pattern with Commander for CLI argument parsing
@@ -368,23 +577,16 @@ const describeToolsCommand = new commander.Command("describe-tools").description
 * - Hardcoded values (use options or environment variables)
 * - Not exiting with appropriate exit codes on errors
 */
+function toErrorMessage$2(error) {
+	return error instanceof Error ? error.message : String(error);
+}
 /**
-* Execute an MCP tool with arguments
+* List all available tools from connected MCP servers
 */
-const useToolCommand = new commander.Command("use-tool").description("Execute an MCP tool with arguments").argument("<toolName>", "Tool name to execute").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Server name (required if tool exists on multiple servers)").option("-a, --args <json>", "Tool arguments as JSON string", "{}").option("-j, --json", "Output as JSON", false).action(async (toolName, options) => {
+const listToolsCommand = new commander.Command("list-tools").description("List all available tools from connected MCP servers").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Filter by server name").option("-j, --json", "Output as JSON", false).action(async (options) => {
 	try {
 		const configFilePath = options.config || require_http.findConfigFile();
-		if (!configFilePath) {
-			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
-			process.exit(1);
-		}
-		let toolArgs = {};
-		try {
-			toolArgs = JSON.parse(options.args);
-		} catch (error) {
-			console.error("Error: Invalid JSON in --args");
-			process.exit(1);
-		}
+		if (!configFilePath) throw new Error("No config file found. Use --config or create mcp-config.yaml");
 		const config = await new require_http.ConfigFetcherService({ configFilePath }).fetchConfiguration();
 		const clientManager = new require_http.McpClientManagerService();
 		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
@@ -392,587 +594,581 @@ const useToolCommand = new commander.Command("use-tool").description("Execute an
 				await clientManager.connectToServer(serverName, serverConfig);
 				if (!options.json) console.error(`✓ Connected to ${serverName}`);
 			} catch (error) {
-				if (!options.json) console.error(`✗ Failed to connect to ${serverName}:`, error);
+				if (!options.json) console.error(`✗ Failed to connect to ${serverName}: ${toErrorMessage$2(error)}`);
 			}
 		});
 		await Promise.all(connectionPromises);
-		const clients = clientManager.getAllClients();
-		if (clients.length === 0) {
-			console.error("No MCP servers connected");
-			process.exit(1);
-		}
-		if (options.server) {
-			const client$1 = clientManager.getClient(options.server);
-			if (!client$1) {
-				console.error(`Server "${options.server}" not found`);
-				process.exit(1);
-			}
-			try {
-				if (!options.json) console.error(`Executing ${toolName} on ${options.server}...`);
-				const result = await client$1.callTool(toolName, toolArgs);
-				if (options.json) console.log(JSON.stringify(result, null, 2));
-				else {
-					console.log("\nResult:");
-					if (result.content) for (const content of result.content) if (content.type === "text") console.log(content.text);
-					else console.log(JSON.stringify(content, null, 2));
-					if (result.isError) {
-						console.error("\n⚠️  Tool execution returned an error");
-						process.exit(1);
-					}
-				}
-				await clientManager.disconnectAll();
-				return;
-			} catch (error) {
-				console.error(`Failed to execute tool "${toolName}":`, error);
-				await clientManager.disconnectAll();
-				process.exit(1);
-			}
-		}
-		const searchResults = await Promise.all(clients.map(async (client$1) => {
+		const clients = options.server ? [clientManager.getClient(options.server)].filter((c) => c !== void 0) : clientManager.getAllClients();
+		if (clients.length === 0) throw new Error("No MCP servers connected");
+		const toolsByServer = {};
+		const toolResults = await Promise.all(clients.map(async (client) => {
 			try {
-				const hasTool = (await client$1.listTools()).some((t) => t.name === toolName);
+				const tools = await client.listTools();
+				const blacklist = new Set(client.toolBlacklist || []);
+				const filteredTools = tools.filter((t) => !blacklist.has(t.name));
 				return {
-					serverName: client$1.serverName,
-					hasTool,
+					serverName: client.serverName,
+					tools: filteredTools,
 					error: null
 				};
 			} catch (error) {
 				return {
-					serverName: client$1.serverName,
-					hasTool: false,
+					serverName: client.serverName,
+					tools: [],
 					error
 				};
 			}
 		}));
-		const matchingServers = [];
-		for (const { serverName, hasTool, error } of searchResults) {
-			if (error) {
-				if (!options.json) console.error(`Failed to list tools from ${serverName}:`, error);
-				continue;
-			}
-			if (hasTool) matchingServers.push(serverName);
-		}
-		if (matchingServers.length === 0) {
-			const cwd = process.env.PROJECT_PATH || process.cwd();
-			const skillPaths = config.skills?.paths || [];
-			if (skillPaths.length > 0) try {
-				const skillService = new require_http.SkillService(cwd, skillPaths);
-				const skillName = toolName.startsWith("skill__") ? toolName.slice(7) : toolName;
-				const skill = await skillService.getSkill(skillName);
-				if (skill) {
-					const result = { content: [{
-						type: "text",
-						text: skill.content
-					}] };
-					if (options.json) console.log(JSON.stringify(result, null, 2));
-					else {
-						console.log("\nSkill content:");
-						console.log(skill.content);
-					}
-					await clientManager.disconnectAll();
-					return;
-				}
-			} catch (error) {
-				if (!options.json) console.error(`Failed to lookup skill "${toolName}":`, error);
-			}
-			console.error(`Tool or skill "${toolName}" not found on any connected server or configured skill paths`);
-			await clientManager.disconnectAll();
-			process.exit(1);
-		}
-		if (matchingServers.length > 1) {
-			console.error(`Tool "${toolName}" found on multiple servers: ${matchingServers.join(", ")}`);
-			console.error("Please specify --server to disambiguate");
-			await clientManager.disconnectAll();
-			process.exit(1);
-		}
-		const targetServer = matchingServers[0];
-		const client = clientManager.getClient(targetServer);
-		if (!client) {
-			console.error(`Internal error: Server "${targetServer}" not connected`);
-			await clientManager.disconnectAll();
-			process.exit(1);
+		for (const { serverName, tools, error } of toolResults) {
+			if (error && !options.json) console.error(`Failed to list tools from ${serverName}: ${toErrorMessage$2(error)}`);
+			toolsByServer[serverName] = tools;
 		}
-		try {
-			if (!options.json) console.error(`Executing ${toolName} on ${targetServer}...`);
-			const result = await client.callTool(toolName, toolArgs);
-			if (options.json) console.log(JSON.stringify(result, null, 2));
-			else {
-				console.log("\nResult:");
-				if (result.content) for (const content of result.content) if (content.type === "text") console.log(content.text);
-				else console.log(JSON.stringify(content, null, 2));
-				if (result.isError) {
-					console.error("\n⚠️  Tool execution returned an error");
-					await clientManager.disconnectAll();
-					process.exit(1);
-				}
-			}
-			await clientManager.disconnectAll();
+		const cwd = process.env.PROJECT_PATH || process.cwd();
+		const skillPaths = config.skills?.paths || [];
+		let skills = [];
+		if (skillPaths.length > 0) try {
+			skills = await new require_http.SkillService(cwd, skillPaths).getSkills();
 		} catch (error) {
-			console.error(`Failed to execute tool "${toolName}":`, error);
-			await clientManager.disconnectAll();
-			process.exit(1);
+			if (!options.json) console.error(`Failed to load skills: ${toErrorMessage$2(error)}`);
 		}
-	} catch (error) {
-		console.error("Error executing use-tool:", error);
-		process.exit(1);
-	}
-});
-
-//#endregion
-//#region src/templates/mcp-config.yaml.liquid?raw
-var mcp_config_yaml_default = "# MCP Server Configuration\n# This file configures the MCP servers that one-mcp will connect to\n#\n# Environment Variable Interpolation:\n# Use ${VAR_NAME} syntax to reference environment variables\n# Example: ${HOME}, ${API_KEY}, ${DATABASE_URL}\n#\n# Instructions:\n# - config.instruction: Server's default instruction (from server documentation)\n# - instruction: User override (optional, takes precedence over config.instruction)\n# - config.toolBlacklist: Array of tool names to hide/block from this server\n# - config.omitToolDescription: Boolean to show only tool names without descriptions (saves tokens)\n\n# Remote Configuration Sources (OPTIONAL)\n# Fetch and merge configurations from remote URLs\n# Remote configs are merged with local configs based on merge strategy\n#\n# SECURITY: SSRF Protection is ENABLED by default\n# - Only HTTPS URLs are allowed (set security.enforceHttps: false to allow HTTP)\n# - Private IPs and localhost are blocked (set security.allowPrivateIPs: true for internal networks)\n# - Blocked ranges: 127.0.0.0/8, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 169.254.0.0/16\nremoteConfigs:\n  # Example 1: Basic remote config with default security\n  # - url: ${AGIFLOW_URL}/api/v1/mcp-configs\n  #   headers:\n  #     Authorization: Bearer ${AGIFLOW_API_KEY}\n  #   mergeStrategy: local-priority  # Options: local-priority (default), remote-priority, merge-deep\n  #\n  # Example 2: Remote config with custom security settings (for internal networks)\n  # - url: ${INTERNAL_URL}/mcp-configs\n  #   headers:\n  #     Authorization: Bearer ${INTERNAL_TOKEN}\n  #   security:\n  #     allowPrivateIPs: true   # Allow internal IPs (default: false)\n  #     enforceHttps: false     # Allow HTTP (default: true, HTTPS only)\n  #   mergeStrategy: local-priority\n  #\n  # Example 3: Remote config with additional validation (OPTIONAL)\n  # - url: ${AGIFLOW_URL}/api/v1/mcp-configs\n  #   headers:\n  #     Authorization: Bearer ${AGIFLOW_API_KEY}\n  #     X-API-Key: ${AGIFLOW_API_KEY}\n  #   security:\n  #     enforceHttps: true      # Require HTTPS (default: true)\n  #     allowPrivateIPs: false  # Block private IPs (default: false)\n  #   validation:  # OPTIONAL: Additional regex validation on top of security checks\n  #     url: ^https://.*\\.agiflow\\.io/.*  # OPTIONAL: Regex pattern to validate URL format\n  #     headers:  # OPTIONAL: Regex patterns to validate header values\n  #       Authorization: ^Bearer [A-Za-z0-9_-]+$\n  #       X-API-Key: ^[A-Za-z0-9_-]{32,}$\n  #   mergeStrategy: local-priority\n\nmcpServers:\n{%- if mcpServers %}{% for server in mcpServers %}\n  {{ server.name }}:\n    command: {{ server.command }}\n    args:{% for arg in server.args %}\n      - '{{ arg }}'{% endfor %}\n    # env:\n    #   LOG_LEVEL: info\n    #   # API_KEY: ${MY_API_KEY}\n    # config:\n    #   instruction: Use this server for...\n    #   # toolBlacklist:\n    #   #   - tool_to_block\n    #   # omitToolDescription: true\n{% endfor %}\n  # Example MCP server using SSE transport\n  # remote-server:\n  #   url: https://example.com/mcp\n  #   type: sse\n  #   headers:\n  #     Authorization: Bearer ${API_KEY}\n  #   config:\n  #     instruction: This server provides tools for...\n{% else %}\n  # Example MCP server using stdio transport\n  example-server:\n    command: node\n    args:\n      - /path/to/mcp-server/build/index.js\n    env:\n      # Environment variables for the MCP server\n      LOG_LEVEL: info\n      # You can use environment variable interpolation:\n      # DATABASE_URL: ${DATABASE_URL}\n      # API_KEY: ${MY_API_KEY}\n    config:\n      # Server's default instruction (from server documentation)\n      instruction: Use this server for...\n      # Optional: Block specific tools from being listed or executed\n      # toolBlacklist:\n      #   - dangerous_tool_name\n      #   - another_blocked_tool\n      # Optional: Omit tool descriptions to save tokens (default: false)\n      # omitToolDescription: true\n    # instruction: Optional user override - takes precedence over config.instruction\n\n  # Example MCP server using SSE transport with environment variables\n  # remote-server:\n  #   url: https://example.com/mcp\n  #   type: sse\n  #   headers:\n  #     # Use ${VAR_NAME} to interpolate environment variables\n  #     Authorization: Bearer ${API_KEY}\n  #   config:\n  #     instruction: This server provides tools for...\n  #     # Optional: Block specific tools from being listed or executed\n  #     # toolBlacklist:\n  #     #   - tool_to_block\n  #     # Optional: Omit tool descriptions to save tokens (default: false)\n  #     # omitToolDescription: true\n  #   # instruction: Optional user override\n{% endif %}\n";
-
-//#endregion
-//#region src/templates/mcp-config.json?raw
-var mcp_config_default = "{\n  \"_comment\": \"MCP Server Configuration - Use ${VAR_NAME} syntax for environment variable interpolation\",\n  \"_instructions\": \"config.instruction: Server's default instruction | instruction: User override (takes precedence)\",\n  \"mcpServers\": {\n    \"example-server\": {\n      \"command\": \"node\",\n      \"args\": [\n        \"/path/to/mcp-server/build/index.js\"\n      ],\n      \"env\": {\n        \"LOG_LEVEL\": \"info\",\n        \"_comment\": \"You can use environment variable interpolation:\",\n        \"_example_DATABASE_URL\": \"${DATABASE_URL}\",\n        \"_example_API_KEY\": \"${MY_API_KEY}\"\n      },\n      \"config\": {\n        \"instruction\": \"Use this server for...\"\n      },\n      \"_instruction_override\": \"Optional user override - takes precedence over config.instruction\"\n    }\n  }\n}\n";
-
-//#endregion
-//#region src/commands/init.ts
-/**
-* Init Command
-*
-* DESIGN PATTERNS:
-* - Command pattern with Commander for CLI argument parsing
-* - Async/await pattern for asynchronous operations
-* - Error handling pattern with try-catch and proper exit codes
-*
-* CODING STANDARDS:
-* - Use async action handlers for asynchronous operations
-* - Provide clear option descriptions and default values
-* - Handle errors gracefully with process.exit()
-* - Log progress and errors to console
-* - Use Commander's .option() and .argument() for inputs
-*
-* AVOID:
-* - Synchronous blocking operations in action handlers
-* - Missing error handling (always use try-catch)
-* - Hardcoded values (use options or environment variables)
-* - Not exiting with appropriate exit codes on errors
-*/
-/**
-* Initialize MCP configuration file
-*/
-const initCommand = new commander.Command("init").description("Initialize MCP configuration file").option("-o, --output <path>", "Output file path", "mcp-config.yaml").option("--json", "Generate JSON config instead of YAML", false).option("-f, --force", "Overwrite existing config file", false).option("--mcp-servers <json>", "JSON string of MCP servers to add to config (optional)").action(async (options) => {
-	try {
-		const outputPath = (0, node_path.resolve)(options.output);
-		const isYaml = !options.json && (outputPath.endsWith(".yaml") || outputPath.endsWith(".yml"));
-		let content;
-		if (isYaml) {
-			const liquid = new liquidjs.Liquid();
-			let mcpServersData = null;
-			if (options.mcpServers) try {
-				const serversObj = JSON.parse(options.mcpServers);
-				mcpServersData = Object.entries(serversObj).map(([name, config]) => ({
-					name,
-					command: config.command,
-					args: config.args
-				}));
-			} catch (parseError) {
-				__agiflowai_aicode_utils.log.error("Failed to parse --mcp-servers JSON:", parseError instanceof Error ? parseError.message : String(parseError));
-				process.exit(1);
+		if (options.json) {
+			const output = { ...toolsByServer };
+			if (skills.length > 0) output.__skills__ = skills.map((s) => ({
+				name: s.name,
+				description: s.description
+			}));
+			console.log(JSON.stringify(output, null, 2));
+		} else {
+			for (const [serverName, tools] of Object.entries(toolsByServer)) {
+				const omitDescription = clients.find((c) => c.serverName === serverName)?.omitToolDescription || false;
+				console.log(`\n${serverName}:`);
+				if (tools.length === 0) console.log("  No tools available");
+				else if (omitDescription) {
+					const toolNames = tools.map((t) => t.name).join(", ");
+					console.log(`  ${toolNames}`);
+				} else for (const tool of tools) console.log(`  - ${tool.name}: ${tool.description || "No description"}`);
 			}
-			content = await liquid.parseAndRender(mcp_config_yaml_default, { mcpServers: mcpServersData });
-		} else content = mcp_config_default;
-		try {
-			await (0, node_fs_promises.writeFile)(outputPath, content, {
-				encoding: "utf-8",
-				flag: options.force ? "w" : "wx"
-			});
-		} catch (error) {
-			if (error && typeof error === "object" && "code" in error && error.code === "EEXIST") {
-				__agiflowai_aicode_utils.log.error(`Config file already exists: ${outputPath}`);
-				__agiflowai_aicode_utils.log.info("Use --force to overwrite");
-				process.exit(1);
+			if (skills.length > 0) {
+				console.log("\nskills:");
+				for (const skill of skills) console.log(`  - ${skill.name}: ${skill.description}`);
 			}
-			throw error;
 		}
-		__agiflowai_aicode_utils.log.info(`MCP configuration file created: ${outputPath}`);
-		__agiflowai_aicode_utils.log.info("Next steps:");
-		__agiflowai_aicode_utils.log.info("1. Edit the configuration file to add your MCP servers");
-		__agiflowai_aicode_utils.log.info(`2. Run: one-mcp mcp-serve --config ${outputPath}`);
+		await clientManager.disconnectAll();
 	} catch (error) {
-		__agiflowai_aicode_utils.log.error("Error executing init:", error instanceof Error ? error.message : String(error));
+		console.error(`Error executing list-tools: ${toErrorMessage$2(error)}`);
 		process.exit(1);
 	}
 });
 
 //#endregion
-//#region src/services/PrefetchService/constants.ts
-/**
-* PrefetchService Constants
-*
-* Constants for package manager commands and process configuration.
-*/
-/** Transport type for stdio-based MCP servers */
-const TRANSPORT_STDIO = "stdio";
-/** npx command name */
-const COMMAND_NPX = "npx";
-/** npm command name */
-const COMMAND_NPM = "npm";
-/** pnpx command name (pnpm's npx equivalent) */
-const COMMAND_PNPX = "pnpx";
-/** pnpm command name */
-const COMMAND_PNPM = "pnpm";
-/** uvx command name */
-const COMMAND_UVX = "uvx";
-/** uv command name */
-const COMMAND_UV = "uv";
-/** Path suffix for npx command */
-const COMMAND_NPX_SUFFIX = "/npx";
-/** Path suffix for pnpx command */
-const COMMAND_PNPX_SUFFIX = "/pnpx";
-/** Path suffix for uvx command */
-const COMMAND_UVX_SUFFIX = "/uvx";
-/** Path suffix for uv command */
-const COMMAND_UV_SUFFIX = "/uv";
-/** Run subcommand for uv */
-const ARG_RUN = "run";
-/** Tool subcommand for uv */
-const ARG_TOOL = "tool";
-/** Install subcommand for uv tool and npm/pnpm */
-const ARG_INSTALL = "install";
-/** Add subcommand for pnpm */
-const ARG_ADD = "add";
-/** Global flag for npm/pnpm install */
-const ARG_GLOBAL = "-g";
-/** Flag prefix for command arguments */
-const FLAG_PREFIX = "-";
-/** npx --package flag (long form) */
-const FLAG_PACKAGE_LONG = "--package";
-/** npx -p flag (short form) */
-const FLAG_PACKAGE_SHORT = "-p";
-/** Equals delimiter used in flag=value patterns */
-const EQUALS_DELIMITER = "=";
-/**
-* Regex pattern for valid package names (npm, pnpm, uvx, uv)
-* Allows: @scope/package-name@version, package-name, package_name
-* Prevents shell metacharacters that could enable command injection
-* @example
-* // Valid: '@scope/package@1.0.0', 'my-package', 'my_package', '@org/pkg'
-* // Invalid: 'pkg; rm -rf /', 'pkg$(cmd)', 'pkg`whoami`', 'pkg|cat /etc/passwd'
-*/
-const VALID_PACKAGE_NAME_PATTERN = /^(@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9._-]+(@[a-zA-Z0-9._-]+)?$/;
-/** Windows platform identifier */
-const PLATFORM_WIN32 = "win32";
-/** Success exit code */
-const EXIT_CODE_SUCCESS = 0;
-/** Stdio option to ignore stream */
-const STDIO_IGNORE = "ignore";
-/** Stdio option to pipe stream */
-const STDIO_PIPE = "pipe";
-
-//#endregion
-//#region src/services/PrefetchService/PrefetchService.ts
+//#region src/commands/describe-tools.ts
 /**
-* PrefetchService
+* Describe Tools Command
 *
 * DESIGN PATTERNS:
-* - Service pattern for business logic encapsulation
-* - Single responsibility principle
+* - Command pattern with Commander for CLI argument parsing
+* - Async/await pattern for asynchronous operations
+* - Error handling pattern with try-catch and proper exit codes
 *
 * CODING STANDARDS:
-* - Use async/await for asynchronous operations
-* - Throw descriptive errors for error cases
-* - Keep methods focused and well-named
-* - Document complex logic with comments
+* - Use async action handlers for asynchronous operations
+* - Provide clear option descriptions and default values
+* - Handle errors gracefully with process.exit()
+* - Log progress and errors to console
+* - Use Commander's .option() and .argument() for inputs
 *
 * AVOID:
-* - Mixing concerns (keep focused on single domain)
-* - Direct tool implementation (services should be tool-agnostic)
-*/
-/**
-* Type guard to check if a config object is an McpStdioConfig
-* @param config - Config object to check
-* @returns True if config has required McpStdioConfig properties
+* - Synchronous blocking operations in action handlers
+* - Missing error handling (always use try-catch)
+* - Hardcoded values (use options or environment variables)
+* - Not exiting with appropriate exit codes on errors
 */
-function isMcpStdioConfig(config) {
-	return typeof config === "object" && config !== null && "command" in config;
-}
 /**
-* PrefetchService handles pre-downloading packages used by MCP servers.
-* Supports npx (Node.js), uvx (Python/uv), and uv run commands.
-*
-* @example
-* ```typescript
-* const service = new PrefetchService({
-*   mcpConfig: await configFetcher.fetchConfiguration(),
-*   parallel: true,
-* });
-* const packages = service.extractPackages();
-* const summary = await service.prefetch();
-* ```
+* Describe specific MCP tools
 */
-var PrefetchService = class {
-	config;
-	/**
-	* Creates a new PrefetchService instance
-	* @param config - Service configuration options
-	*/
-	constructor(config) {
-		this.config = config;
-	}
-	/**
-	* Extract all prefetchable packages from the MCP configuration
-	* @returns Array of package info objects
-	*/
-	extractPackages() {
-		const packages = [];
-		const { mcpConfig, filter } = this.config;
-		for (const [serverName, serverConfig] of Object.entries(mcpConfig.mcpServers)) {
-			if (serverConfig.disabled) continue;
-			if (serverConfig.transport !== TRANSPORT_STDIO) continue;
-			if (!isMcpStdioConfig(serverConfig.config)) continue;
-			const packageInfo = this.extractPackageInfo(serverName, serverConfig.config);
-			if (packageInfo) {
-				if (filter && packageInfo.packageManager !== filter) continue;
-				packages.push(packageInfo);
+const describeToolsCommand = new commander.Command("describe-tools").description("Describe specific MCP tools").argument("<toolNames...>", "Tool names to describe").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Filter by server name").option("-j, --json", "Output as JSON", false).action(async (toolNames, options) => {
+	try {
+		const configFilePath = options.config || require_http.findConfigFile();
+		if (!configFilePath) {
+			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
+			process.exit(1);
+		}
+		const config = await new require_http.ConfigFetcherService({ configFilePath }).fetchConfiguration();
+		const clientManager = new require_http.McpClientManagerService();
+		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
+			try {
+				await clientManager.connectToServer(serverName, serverConfig);
+				if (!options.json) console.error(`✓ Connected to ${serverName}`);
+			} catch (error) {
+				if (!options.json) console.error(`✗ Failed to connect to ${serverName}:`, error);
+			}
+		});
+		await Promise.all(connectionPromises);
+		const clients = clientManager.getAllClients();
+		if (clients.length === 0) {
+			console.error("No MCP servers connected");
+			process.exit(1);
+		}
+		const cwd = process.env.PROJECT_PATH || process.cwd();
+		const skillPaths = config.skills?.paths || [];
+		const skillService = skillPaths.length > 0 ? new require_http.SkillService(cwd, skillPaths) : void 0;
+		const foundTools = [];
+		const foundSkills = [];
+		const notFoundTools = [...toolNames];
+		const filteredClients = clients.filter((client) => !options.server || client.serverName === options.server);
+		const toolResults = await Promise.all(filteredClients.map(async (client) => {
+			try {
+				return {
+					client,
+					tools: await client.listTools(),
+					error: null
+				};
+			} catch (error) {
+				return {
+					client,
+					tools: [],
+					error
+				};
+			}
+		}));
+		for (const { client, tools, error } of toolResults) {
+			if (error) {
+				if (!options.json) console.error(`Failed to list tools from ${client.serverName}:`, error);
+				continue;
+			}
+			for (const toolName of toolNames) {
+				const tool = tools.find((t) => t.name === toolName);
+				if (tool) {
+					foundTools.push({
+						server: client.serverName,
+						name: tool.name,
+						description: tool.description,
+						inputSchema: tool.inputSchema
+					});
+					const idx = notFoundTools.indexOf(toolName);
+					if (idx > -1) notFoundTools.splice(idx, 1);
+				}
+			}
+		}
+		if (skillService && notFoundTools.length > 0) {
+			const skillsToCheck = [...notFoundTools];
+			const skillResults = await Promise.all(skillsToCheck.map(async (toolName) => {
+				const skillName = toolName.startsWith("skill__") ? toolName.slice(7) : toolName;
+				return {
+					toolName,
+					skill: await skillService.getSkill(skillName)
+				};
+			}));
+			for (const { toolName, skill } of skillResults) if (skill) {
+				foundSkills.push({
+					name: skill.name,
+					location: skill.basePath,
+					instructions: skill.content
+				});
+				const idx = notFoundTools.indexOf(toolName);
+				if (idx > -1) notFoundTools.splice(idx, 1);
+			}
+		}
+		const nextSteps = [];
+		if (foundTools.length > 0) nextSteps.push("For MCP tools: Use the use_tool function with toolName and toolArgs based on the inputSchema above.");
+		if (foundSkills.length > 0) nextSteps.push(`For skill, just follow skill's description to continue.`);
+		if (options.json) {
+			const result = {};
+			if (foundTools.length > 0) result.tools = foundTools;
+			if (foundSkills.length > 0) result.skills = foundSkills;
+			if (nextSteps.length > 0) result.nextSteps = nextSteps;
+			if (notFoundTools.length > 0) result.notFound = notFoundTools;
+			console.log(JSON.stringify(result, null, 2));
+		} else {
+			if (foundTools.length > 0) {
+				console.log("\nFound tools:\n");
+				for (const tool of foundTools) {
+					console.log(`Server: ${tool.server}`);
+					console.log(`Tool: ${tool.name}`);
+					console.log(`Description: ${tool.description || "No description"}`);
+					console.log(`Input Schema:`);
+					console.log(JSON.stringify(tool.inputSchema, null, 2));
+					console.log("");
+				}
+			}
+			if (foundSkills.length > 0) {
+				console.log("\nFound skills:\n");
+				for (const skill of foundSkills) {
+					console.log(`Skill: ${skill.name}`);
+					console.log(`Location: ${skill.location}`);
+					console.log(`Instructions:\n${skill.instructions}`);
+					console.log("");
+				}
+			}
+			if (nextSteps.length > 0) {
+				console.log("\nNext steps:");
+				for (const step of nextSteps) console.log(`  • ${step}`);
+				console.log("");
+			}
+			if (notFoundTools.length > 0) console.error(`\nTools/skills not found: ${notFoundTools.join(", ")}`);
+			if (foundTools.length === 0 && foundSkills.length === 0) {
+				console.error("No tools or skills found");
+				process.exit(1);
 			}
 		}
-		return packages;
+		await clientManager.disconnectAll();
+	} catch (error) {
+		console.error("Error executing describe-tools:", error);
+		process.exit(1);
 	}
-	/**
-	* Prefetch all packages from the configuration
-	* @returns Summary of prefetch results
-	* @throws Error if prefetch operation fails unexpectedly
-	*/
-	async prefetch() {
+});
+
+//#endregion
+//#region src/commands/use-tool.ts
+/**
+* Use Tool Command
+*
+* DESIGN PATTERNS:
+* - Command pattern with Commander for CLI argument parsing
+* - Async/await pattern for asynchronous operations
+* - Error handling pattern with try-catch and proper exit codes
+*
+* CODING STANDARDS:
+* - Use async action handlers for asynchronous operations
+* - Provide clear option descriptions and default values
+* - Handle errors gracefully with process.exit()
+* - Log progress and errors to console
+* - Use Commander's .option() and .argument() for inputs
+*
+* AVOID:
+* - Synchronous blocking operations in action handlers
+* - Missing error handling (always use try-catch)
+* - Hardcoded values (use options or environment variables)
+* - Not exiting with appropriate exit codes on errors
+*/
+/**
+* Execute an MCP tool with arguments
+*/
+const useToolCommand = new commander.Command("use-tool").description("Execute an MCP tool with arguments").argument("<toolName>", "Tool name to execute").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Server name (required if tool exists on multiple servers)").option("-a, --args <json>", "Tool arguments as JSON string", "{}").option("-j, --json", "Output as JSON", false).action(async (toolName, options) => {
+	try {
+		const configFilePath = options.config || require_http.findConfigFile();
+		if (!configFilePath) {
+			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
+			process.exit(1);
+		}
+		let toolArgs = {};
 		try {
-			const packages = this.extractPackages();
-			const results = [];
-			if (packages.length === 0) return {
-				totalPackages: 0,
-				successful: 0,
-				failed: 0,
-				results: []
-			};
-			if (this.config.parallel) {
-				const promises = packages.map(async (pkg) => this.prefetchPackage(pkg));
-				results.push(...await Promise.all(promises));
-			} else for (const pkg of packages) {
-				const result = await this.prefetchPackage(pkg);
-				results.push(result);
+			toolArgs = JSON.parse(options.args);
+		} catch (_error) {
+			console.error("Error: Invalid JSON in --args");
+			process.exit(1);
+		}
+		const config = await new require_http.ConfigFetcherService({ configFilePath }).fetchConfiguration();
+		const clientManager = new require_http.McpClientManagerService();
+		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
+			try {
+				await clientManager.connectToServer(serverName, serverConfig);
+				if (!options.json) console.error(`✓ Connected to ${serverName}`);
+			} catch (error) {
+				if (!options.json) console.error(`✗ Failed to connect to ${serverName}:`, error);
 			}
-			const successful = results.filter((r) => r.success).length;
-			const failed = results.filter((r) => !r.success).length;
-			return {
-				totalPackages: packages.length,
-				successful,
-				failed,
-				results
-			};
-		} catch (error) {
-			throw new Error(`Failed to prefetch packages: ${error instanceof Error ? error.message : String(error)}`);
+		});
+		await Promise.all(connectionPromises);
+		const clients = clientManager.getAllClients();
+		if (clients.length === 0) {
+			console.error("No MCP servers connected");
+			process.exit(1);
 		}
-	}
-	/**
-	* Prefetch a single package
-	* @param pkg - Package info to prefetch
-	* @returns Result of the prefetch operation
-	*/
-	async prefetchPackage(pkg) {
-		try {
-			const [command, ...args] = pkg.fullCommand;
-			const result = await this.runCommand(command, args);
-			return {
-				package: pkg,
-				success: result.success,
-				output: result.output
-			};
-		} catch (error) {
-			return {
-				package: pkg,
-				success: false,
-				output: error instanceof Error ? error.message : String(error)
-			};
+		if (options.server) {
+			const client$1 = clientManager.getClient(options.server);
+			if (!client$1) {
+				console.error(`Server "${options.server}" not found`);
+				process.exit(1);
+			}
+			try {
+				if (!options.json) console.error(`Executing ${toolName} on ${options.server}...`);
+				const result = await client$1.callTool(toolName, toolArgs);
+				if (options.json) console.log(JSON.stringify(result, null, 2));
+				else {
+					console.log("\nResult:");
+					if (result.content) for (const content of result.content) if (content.type === "text") console.log(content.text);
+					else console.log(JSON.stringify(content, null, 2));
+					if (result.isError) {
+						console.error("\n⚠️  Tool execution returned an error");
+						process.exit(1);
+					}
+				}
+				await clientManager.disconnectAll();
+				return;
+			} catch (error) {
+				console.error(`Failed to execute tool "${toolName}":`, error);
+				await clientManager.disconnectAll();
+				process.exit(1);
+			}
 		}
-	}
-	/**
-	* Validate package name to prevent command injection
-	* @param packageName - Package name to validate
-	* @returns True if package name is safe, false otherwise
-	* @remarks Rejects package names containing shell metacharacters
-	* @example
-	* isValidPackageName('@scope/package') // true
-	* isValidPackageName('my-package@1.0.0') // true
-	* isValidPackageName('pkg; rm -rf /') // false (shell injection)
-	* isValidPackageName('pkg$(whoami)') // false (command substitution)
-	*/
-	isValidPackageName(packageName) {
-		return VALID_PACKAGE_NAME_PATTERN.test(packageName);
-	}
-	/**
-	* Extract package info from a server's stdio config
-	* @param serverName - Name of the MCP server
-	* @param config - Stdio configuration for the server
-	* @returns Package info if extractable, null otherwise
-	*/
-	extractPackageInfo(serverName, config) {
-		const command = config.command.toLowerCase();
-		const args = config.args || [];
-		if (command === COMMAND_NPX || command.endsWith(COMMAND_NPX_SUFFIX)) {
-			const packageName = this.extractNpxPackage(args);
-			if (packageName && this.isValidPackageName(packageName)) return {
-				serverName,
-				packageManager: COMMAND_NPX,
-				packageName,
-				fullCommand: [
-					COMMAND_NPM,
-					ARG_INSTALL,
-					ARG_GLOBAL,
-					packageName
-				]
-			};
+		const searchResults = await Promise.all(clients.map(async (client$1) => {
+			try {
+				const hasTool = (await client$1.listTools()).some((t) => t.name === toolName);
+				return {
+					serverName: client$1.serverName,
+					hasTool,
+					error: null
+				};
+			} catch (error) {
+				return {
+					serverName: client$1.serverName,
+					hasTool: false,
+					error
+				};
+			}
+		}));
+		const matchingServers = [];
+		for (const { serverName, hasTool, error } of searchResults) {
+			if (error) {
+				if (!options.json) console.error(`Failed to list tools from ${serverName}:`, error);
+				continue;
+			}
+			if (hasTool) matchingServers.push(serverName);
 		}
-		if (command === COMMAND_PNPX || command.endsWith(COMMAND_PNPX_SUFFIX)) {
-			const packageName = this.extractNpxPackage(args);
-			if (packageName && this.isValidPackageName(packageName)) return {
-				serverName,
-				packageManager: COMMAND_PNPX,
-				packageName,
-				fullCommand: [
-					COMMAND_PNPM,
-					ARG_ADD,
-					ARG_GLOBAL,
-					packageName
-				]
-			};
+		if (matchingServers.length === 0) {
+			const cwd = process.env.PROJECT_PATH || process.cwd();
+			const skillPaths = config.skills?.paths || [];
+			if (skillPaths.length > 0) try {
+				const skillService = new require_http.SkillService(cwd, skillPaths);
+				const skillName = toolName.startsWith("skill__") ? toolName.slice(7) : toolName;
+				const skill = await skillService.getSkill(skillName);
+				if (skill) {
+					const result = { content: [{
+						type: "text",
+						text: skill.content
+					}] };
+					if (options.json) console.log(JSON.stringify(result, null, 2));
+					else {
+						console.log("\nSkill content:");
+						console.log(skill.content);
+					}
+					await clientManager.disconnectAll();
+					return;
+				}
+			} catch (error) {
+				if (!options.json) console.error(`Failed to lookup skill "${toolName}":`, error);
+			}
+			console.error(`Tool or skill "${toolName}" not found on any connected server or configured skill paths`);
+			await clientManager.disconnectAll();
+			process.exit(1);
 		}
-		if (command === COMMAND_UVX || command.endsWith(COMMAND_UVX_SUFFIX)) {
-			const packageName = this.extractUvxPackage(args);
-			if (packageName && this.isValidPackageName(packageName)) return {
-				serverName,
-				packageManager: COMMAND_UVX,
-				packageName,
-				fullCommand: [COMMAND_UVX, packageName]
-			};
+		if (matchingServers.length > 1) {
+			console.error(`Tool "${toolName}" found on multiple servers: ${matchingServers.join(", ")}`);
+			console.error("Please specify --server to disambiguate");
+			await clientManager.disconnectAll();
+			process.exit(1);
+		}
+		const targetServer = matchingServers[0];
+		const client = clientManager.getClient(targetServer);
+		if (!client) {
+			console.error(`Internal error: Server "${targetServer}" not connected`);
+			await clientManager.disconnectAll();
+			process.exit(1);
 		}
-		if ((command === COMMAND_UV || command.endsWith(COMMAND_UV_SUFFIX)) && args.includes(ARG_RUN)) {
-			const packageName = this.extractUvRunPackage(args);
-			if (packageName && this.isValidPackageName(packageName)) return {
-				serverName,
-				packageManager: COMMAND_UV,
-				packageName,
-				fullCommand: [
-					COMMAND_UV,
-					ARG_TOOL,
-					ARG_INSTALL,
-					packageName
-				]
-			};
+		try {
+			if (!options.json) console.error(`Executing ${toolName} on ${targetServer}...`);
+			const result = await client.callTool(toolName, toolArgs);
+			if (options.json) console.log(JSON.stringify(result, null, 2));
+			else {
+				console.log("\nResult:");
+				if (result.content) for (const content of result.content) if (content.type === "text") console.log(content.text);
+				else console.log(JSON.stringify(content, null, 2));
+				if (result.isError) {
+					console.error("\n⚠️  Tool execution returned an error");
+					await clientManager.disconnectAll();
+					process.exit(1);
+				}
+			}
+			await clientManager.disconnectAll();
+		} catch (error) {
+			console.error(`Failed to execute tool "${toolName}":`, error);
+			await clientManager.disconnectAll();
+			process.exit(1);
 		}
-		return null;
+	} catch (error) {
+		console.error("Error executing use-tool:", error);
+		process.exit(1);
 	}
-	/**
-	* Extract package name from npx command args
-	* @param args - Command arguments
-	* @returns Package name or null
-	* @remarks Handles --package=value, --package value, -p value patterns.
-	*          Falls back to first non-flag argument if no --package/-p flag found.
-	*          Returns null if flag has no value or is followed by another flag.
-	*          When multiple --package flags exist, returns the first valid one.
-	* @example
-	* extractNpxPackage(['--package=@scope/pkg']) // returns '@scope/pkg'
-	* extractNpxPackage(['--package', 'pkg-name']) // returns 'pkg-name'
-	* extractNpxPackage(['-p', 'pkg']) // returns 'pkg'
-	* extractNpxPackage(['-y', 'pkg-name', '--flag']) // returns 'pkg-name' (fallback)
-	* extractNpxPackage(['--package=']) // returns null (empty value)
-	*/
-	extractNpxPackage(args) {
-		for (let i = 0; i < args.length; i++) {
-			const arg = args[i];
-			if (arg.startsWith(FLAG_PACKAGE_LONG + EQUALS_DELIMITER)) return arg.slice(FLAG_PACKAGE_LONG.length + EQUALS_DELIMITER.length) || null;
-			if (arg === FLAG_PACKAGE_LONG && i + 1 < args.length) {
-				const nextArg = args[i + 1];
-				if (!nextArg.startsWith(FLAG_PREFIX)) return nextArg;
+});
+
+//#endregion
+//#region src/commands/list-resources.ts
+/**
+* ListResources Command
+*
+* DESIGN PATTERNS:
+* - Command pattern with Commander for CLI argument parsing
+* - Async/await pattern for asynchronous operations
+* - Error handling pattern with try-catch and proper exit codes
+*
+* CODING STANDARDS:
+* - Use async action handlers for asynchronous operations
+* - Provide clear option descriptions and default values
+* - Handle errors gracefully with process.exit()
+* - Log progress and errors to console
+* - Use Commander's .option() and .argument() for inputs
+*
+* AVOID:
+* - Synchronous blocking operations in action handlers
+* - Missing error handling (always use try-catch)
+* - Hardcoded values (use options or environment variables)
+* - Not exiting with appropriate exit codes on errors
+*/
+function toErrorMessage$1(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+/**
+* List all available resources from connected MCP servers
+*/
+const listResourcesCommand = new commander.Command("list-resources").description("List all available resources from connected MCP servers").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Filter by server name").option("-j, --json", "Output as JSON", false).action(async (options) => {
+	try {
+		const configFilePath = options.config || require_http.findConfigFile();
+		if (!configFilePath) throw new Error("No config file found. Use --config or create mcp-config.yaml");
+		const config = await new require_http.ConfigFetcherService({ configFilePath }).fetchConfiguration();
+		const clientManager = new require_http.McpClientManagerService();
+		await Promise.all(Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
+			try {
+				await clientManager.connectToServer(serverName, serverConfig);
+				if (!options.json) console.error(`✓ Connected to ${serverName}`);
+			} catch (error) {
+				if (!options.json) console.error(`✗ Failed to connect to ${serverName}: ${toErrorMessage$1(error)}`);
 			}
-			if (arg === FLAG_PACKAGE_SHORT && i + 1 < args.length) {
-				const nextArg = args[i + 1];
-				if (!nextArg.startsWith(FLAG_PREFIX)) return nextArg;
+		}));
+		const clients = options.server ? [clientManager.getClient(options.server)].filter((c) => c !== void 0) : clientManager.getAllClients();
+		if (clients.length === 0) throw new Error("No MCP servers connected");
+		const resourcesByServer = {};
+		const resourceResults = await Promise.all(clients.map(async (client) => {
+			try {
+				const resources = await client.listResources();
+				return {
+					serverName: client.serverName,
+					resources,
+					error: null
+				};
+			} catch (error) {
+				return {
+					serverName: client.serverName,
+					resources: [],
+					error
+				};
 			}
+		}));
+		for (const { serverName, resources, error } of resourceResults) {
+			if (error && !options.json) console.error(`Failed to list resources from ${serverName}: ${toErrorMessage$1(error)}`);
+			resourcesByServer[serverName] = resources;
 		}
-		for (const arg of args) {
-			if (arg.startsWith(FLAG_PREFIX)) continue;
-			return arg;
+		if (options.json) console.log(JSON.stringify(resourcesByServer, null, 2));
+		else for (const [serverName, resources] of Object.entries(resourcesByServer)) {
+			console.log(`\n${serverName}:`);
+			if (resources.length === 0) console.log("  No resources available");
+			else for (const resource of resources) {
+				const label = resource.name ? `${resource.name} (${resource.uri})` : resource.uri;
+				console.log(`  - ${label}${resource.description ? `: ${resource.description}` : ""}`);
+			}
 		}
-		return null;
+		await clientManager.disconnectAll();
+	} catch (error) {
+		console.error(`Error executing list-resources: ${toErrorMessage$1(error)}`);
+		process.exit(1);
 	}
-	/**
-	* Extract package name from uvx command args
-	* @param args - Command arguments
-	* @returns Package name or null
-	* @remarks Assumes the first non-flag argument is the package name.
-	*          Handles both single (-) and double (--) dash flags.
-	* @example
-	* extractUvxPackage(['mcp-server-fetch']) // returns 'mcp-server-fetch'
-	* extractUvxPackage(['--quiet', 'pkg-name']) // returns 'pkg-name'
-	*/
-	extractUvxPackage(args) {
-		for (const arg of args) {
-			if (arg.startsWith(FLAG_PREFIX)) continue;
-			return arg;
+});
+
+//#endregion
+//#region src/commands/read-resource.ts
+/**
+* ReadResource Command
+*
+* DESIGN PATTERNS:
+* - Command pattern with Commander for CLI argument parsing
+* - Async/await pattern for asynchronous operations
+* - Error handling pattern with try-catch and proper exit codes
+*
+* CODING STANDARDS:
+* - Use async action handlers for asynchronous operations
+* - Provide clear option descriptions and default values
+* - Handle errors gracefully with process.exit()
+* - Log progress and errors to console
+* - Use Commander's .option() and .argument() for inputs
+*
+* AVOID:
+* - Synchronous blocking operations in action handlers
+* - Missing error handling (always use try-catch)
+* - Hardcoded values (use options or environment variables)
+* - Not exiting with appropriate exit codes on errors
+*/
+function toErrorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+/**
+* Read a resource by URI from a connected MCP server
+*/
+const readResourceCommand = new commander.Command("read-resource").description("Read a resource by URI from a connected MCP server").argument("<uri>", "Resource URI to read").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Server name (required if resource exists on multiple servers)").option("-j, --json", "Output as JSON", false).action(async (uri, options) => {
+	try {
+		const configFilePath = options.config || require_http.findConfigFile();
+		if (!configFilePath) throw new Error("No config file found. Use --config or create mcp-config.yaml");
+		const config = await new require_http.ConfigFetcherService({ configFilePath }).fetchConfiguration();
+		const clientManager = new require_http.McpClientManagerService();
+		await Promise.all(Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
+			try {
+				await clientManager.connectToServer(serverName, serverConfig);
+				if (!options.json) console.error(`✓ Connected to ${serverName}`);
+			} catch (error) {
+				console.error(`✗ Failed to connect to ${serverName}: ${toErrorMessage(error)}`);
+			}
+		}));
+		const clients = clientManager.getAllClients();
+		if (clients.length === 0) throw new Error("No MCP servers connected");
+		if (options.server) {
+			const client$1 = clientManager.getClient(options.server);
+			if (!client$1) throw new Error(`Server "${options.server}" not found`);
+			if (!options.json) console.error(`Reading ${uri} from ${options.server}...`);
+			const result$1 = await client$1.readResource(uri);
+			if (options.json) console.log(JSON.stringify(result$1, null, 2));
+			else for (const content of result$1.contents) if ("text" in content) console.log(content.text);
+			else console.log(JSON.stringify(content, null, 2));
+			await clientManager.disconnectAll();
+			return;
 		}
-		return null;
-	}
-	/**
-	* Extract package name from uv run command args
-	* @param args - Command arguments
-	* @returns Package name or null
-	* @remarks Looks for the first non-flag argument after the 'run' subcommand.
-	*          Returns null if 'run' is not found in args.
-	* @example
-	* extractUvRunPackage(['run', 'mcp-server']) // returns 'mcp-server'
-	* extractUvRunPackage(['run', '--verbose', 'pkg']) // returns 'pkg'
-	* extractUvRunPackage(['install', 'pkg']) // returns null (no 'run')
-	*/
-	extractUvRunPackage(args) {
-		const runIndex = args.indexOf(ARG_RUN);
-		if (runIndex === -1) return null;
-		for (let i = runIndex + 1; i < args.length; i++) {
-			const arg = args[i];
-			if (arg.startsWith(FLAG_PREFIX)) continue;
-			return arg;
+		const searchResults = await Promise.all(clients.map(async (client$1) => {
+			try {
+				const hasResource = (await client$1.listResources()).some((r) => r.uri === uri);
+				return {
+					serverName: client$1.serverName,
+					hasResource,
+					error: null
+				};
+			} catch (error) {
+				return {
+					serverName: client$1.serverName,
+					hasResource: false,
+					error
+				};
+			}
+		}));
+		const matchingServers = [];
+		for (const { serverName, hasResource, error } of searchResults) {
+			if (error) {
+				console.error(`Failed to list resources from ${serverName}: ${toErrorMessage(error)}`);
+				continue;
+			}
+			if (hasResource) matchingServers.push(serverName);
 		}
-		return null;
-	}
-	/**
-	* Run a shell command and capture output
-	* @param command - Command to run
-	* @param args - Command arguments
-	* @returns Promise with success status and output
-	*/
-	runCommand(command, args) {
-		return new Promise((resolve$1) => {
-			const proc = (0, node_child_process.spawn)(command, args, {
-				stdio: [
-					STDIO_IGNORE,
-					STDIO_PIPE,
-					STDIO_PIPE
-				],
-				shell: process.platform === PLATFORM_WIN32
-			});
-			let stdout = "";
-			let stderr = "";
-			proc.stdout?.on("data", (data) => {
-				stdout += data.toString();
-			});
-			proc.stderr?.on("data", (data) => {
-				stderr += data.toString();
-			});
-			proc.on("close", (code) => {
-				resolve$1({
-					success: code === EXIT_CODE_SUCCESS,
-					output: stdout || stderr
-				});
-			});
-			proc.on("error", (error) => {
-				resolve$1({
-					success: false,
-					output: error.message
-				});
-			});
-		});
+		if (matchingServers.length === 0) throw new Error(`Resource "${uri}" not found on any connected server`);
+		if (matchingServers.length > 1) throw new Error(`Resource "${uri}" found on multiple servers: ${matchingServers.join(", ")}. Use --server to disambiguate`);
+		const targetServer = matchingServers[0];
+		const client = clientManager.getClient(targetServer);
+		if (!client) throw new Error(`Internal error: Server "${targetServer}" not connected`);
+		if (!options.json) console.error(`Reading ${uri} from ${targetServer}...`);
+		const result = await client.readResource(uri);
+		if (options.json) console.log(JSON.stringify(result, null, 2));
+		else for (const content of result.contents) if ("text" in content) console.log(content.text);
+		else console.log(JSON.stringify(content, null, 2));
+		await clientManager.disconnectAll();
+	} catch (error) {
+		console.error(`Error executing read-resource: ${toErrorMessage(error)}`);
+		process.exit(1);
 	}
-};
+});
 
 //#endregion
 //#region src/commands/prefetch.ts
@@ -1051,7 +1247,7 @@ const prefetchCommand = new commander.Command("prefetch").description("Pre-downl
 
 //#endregion
 //#region package.json
-var version = "0.3.6";
+var version = "0.3.8";
 
 //#endregion
 //#region src/cli.ts
@@ -1085,6 +1281,8 @@ async function main() {
 		program.addCommand(listToolsCommand);
 		program.addCommand(describeToolsCommand);
 		program.addCommand(useToolCommand);
+		program.addCommand(listResourcesCommand);
+		program.addCommand(readResourceCommand);
 		program.addCommand(prefetchCommand);
 		await program.parseAsync(process.argv);
 	} catch (error) {