@agiflowai/one-mcp 0.3.11 → 0.3.13

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_http = require('./http-pwzeCOpM.cjs');
+const require_http = require('./http-SFQFxDCq.cjs');
 let node_fs_promises = require("node:fs/promises");
 let node_path = require("node:path");
 let liquidjs = require("liquidjs");
@@ -125,6 +125,9 @@ const TRANSPORT_MODE = {
 function isValidTransportType(type) {
 	return type === "stdio" || type === "http" || type === "sse";
 }
+function isValidProxyMode(mode) {
+	return mode === "meta" || mode === "flat" || mode === "search";
+}
 /**
 * Start MCP server with given transport handler
 * @param handler - The transport handler to start
@@ -147,17 +150,24 @@ async function startServer(handler) {
 /**
 * MCP Serve command
 */
-const mcpServeCommand = new commander.Command("mcp-serve").description("Start MCP server with specified transport").option("-t, --type <type>", "Transport type: stdio, http, or sse", "stdio").option("-p, --port <port>", "Port to listen on (http/sse only)", (val) => parseInt(val, 10), 3e3).option("--host <host>", "Host to bind to (http/sse only)", "localhost").option("-c, --config <path>", "Path to MCP server configuration file").option("--no-cache", "Disable configuration caching, always reload from config file").option("--id <id>", "Unique server identifier (overrides config file id, auto-generated if not provided)").action(async (options) => {
+const mcpServeCommand = new commander.Command("mcp-serve").description("Start MCP server with specified transport").option("-t, --type <type>", "Transport type: stdio, http, or sse", "stdio").option("-p, --port <port>", "Port to listen on (http/sse only)", (val) => parseInt(val, 10), 3e3).option("--host <host>", "Host to bind to (http/sse only)", "localhost").option("-c, --config <path>", "Path to MCP server configuration file").option("--no-cache", "Disable configuration caching, always reload from config file").option("--definitions-cache <path>", "Path to prefetched tool/prompt/skill definitions cache file").option("--clear-definitions-cache", "Delete definitions cache before startup", false).option("--proxy-mode <mode>", "How one-mcp exposes downstream tools: meta, flat, or search", "meta").option("--id <id>", "Unique server identifier (overrides config file id, auto-generated if not provided)").action(async (options) => {
 	const transportType = options.type.toLowerCase();
 	if (!isValidTransportType(transportType)) {
 		console.error(`Unknown transport type: '${transportType}'. Valid options: stdio, http, sse`);
 		process.exit(1);
 	}
+	if (!isValidProxyMode(options.proxyMode)) {
+		console.error(`Unknown proxy mode: '${options.proxyMode}'. Valid options: meta, flat, search`);
+		process.exit(1);
+	}
 	try {
 		const serverOptions = {
 			configFilePath: options.config || require_http.findConfigFile() || void 0,
 			noCache: options.cache === false,
-			serverId: options.id
+			serverId: options.id,
+			definitionsCachePath: options.definitionsCache,
+			clearDefinitionsCache: options.clearDefinitionsCache,
+			proxyMode: options.proxyMode
 		};
 		if (transportType === "stdio") await startServer(new require_http.StdioTransportHandler(await require_http.createServer(serverOptions)));
 		else if (transportType === "http") await startServer(new require_http.HttpTransportHandler(await require_http.createServer(serverOptions), {
@@ -577,85 +587,62 @@ var PrefetchService = class {
 * - Hardcoded values (use options or environment variables)
 * - Not exiting with appropriate exit codes on errors
 */
-function toErrorMessage$2(error) {
+function toErrorMessage$4(error) {
 	return error instanceof Error ? error.message : String(error);
 }
-/**
-* List all available tools from connected MCP servers
-*/
-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) => {
+function printSearchResults(result) {
+	for (const server of result.servers) {
+		console.log(`\n${server.server}:`);
+		if (server.capabilities && server.capabilities.length > 0) console.log(`  capabilities: ${server.capabilities.join(", ")}`);
+		if (server.summary) console.log(`  summary: ${server.summary}`);
+		if (server.tools.length === 0) {
+			console.log("  no tools");
+			continue;
+		}
+		for (const tool of server.tools) {
+			const capabilitySummary = tool.capabilities && tool.capabilities.length > 0 ? ` [${tool.capabilities.join(", ")}]` : "";
+			console.log(`  - ${tool.name}${capabilitySummary}`);
+			if (tool.description) console.log(`    ${tool.description}`);
+		}
+	}
+}
+const searchToolsCommand = new commander.Command("search-tools").description("Search proxied MCP tools by capability or server").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Filter by server name").option("--capability <name>", "Filter by capability tag, summary, tool name, or description").option("--definitions-cache <path>", "Path to definitions cache file").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();
+		clientManager.registerServerConfigs(config.mcpServers);
 		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}: ${toErrorMessage$2(error)}`);
+				if (!options.json) console.error(`✗ Failed to connect to ${serverName}: ${toErrorMessage$4(error)}`);
 			}
 		});
 		await Promise.all(connectionPromises);
-		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 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}: ${toErrorMessage$2(error)}`);
-			toolsByServer[serverName] = tools;
+		if (clientManager.getAllClients().length === 0) throw new Error("No MCP servers connected");
+		const cachePath = options.definitionsCache || require_http.DefinitionsCacheService.getDefaultCachePath(configFilePath);
+		let cacheData;
+		try {
+			cacheData = await require_http.DefinitionsCacheService.readFromFile(cachePath);
+		} catch {
+			cacheData = void 0;
 		}
-		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) {
-			if (!options.json) console.error(`Failed to load skills: ${toErrorMessage$2(error)}`);
-		}
-		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"}`);
-			}
-			if (skills.length > 0) {
-				console.log("\nskills:");
-				for (const skill of skills) console.log(`  - ${skill.name}: ${skill.description}`);
-			}
+		const textBlock = (await new require_http.SearchListToolsTool(clientManager, new require_http.DefinitionsCacheService(clientManager, void 0, { cacheData })).execute({
+			capability: options.capability,
+			serverName: options.server
+		})).content.find((content) => content.type === "text");
+		const parsed = textBlock?.type === "text" ? JSON.parse(textBlock.text) : { servers: [] };
+		if (options.json) console.log(JSON.stringify(parsed, null, 2));
+		else {
+			if (!parsed.servers || parsed.servers.length === 0) throw new Error("No tools matched the requested filters");
+			printSearchResults(parsed);
 		}
 		await clientManager.disconnectAll();
 	} catch (error) {
-		console.error(`Error executing list-tools: ${toErrorMessage$2(error)}`);
+		console.error(`Error executing search-tools: ${toErrorMessage$4(error)}`);
 		process.exit(1);
 	}
 });
@@ -1014,7 +1001,7 @@ const useToolCommand = new commander.Command("use-tool").description("Execute an
 * - Hardcoded values (use options or environment variables)
 * - Not exiting with appropriate exit codes on errors
 */
-function toErrorMessage$1(error) {
+function toErrorMessage$3(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 /**
@@ -1031,7 +1018,7 @@ const listResourcesCommand = new commander.Command("list-resources").description
 				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 (!options.json) console.error(`✗ Failed to connect to ${serverName}: ${toErrorMessage$3(error)}`);
 			}
 		}));
 		const clients = options.server ? [clientManager.getClient(options.server)].filter((c) => c !== void 0) : clientManager.getAllClients();
@@ -1054,7 +1041,7 @@ const listResourcesCommand = new commander.Command("list-resources").description
 			}
 		}));
 		for (const { serverName, resources, error } of resourceResults) {
-			if (error && !options.json) console.error(`Failed to list resources from ${serverName}: ${toErrorMessage$1(error)}`);
+			if (error && !options.json) console.error(`Failed to list resources from ${serverName}: ${toErrorMessage$3(error)}`);
 			resourcesByServer[serverName] = resources;
 		}
 		if (options.json) console.log(JSON.stringify(resourcesByServer, null, 2));
@@ -1068,7 +1055,7 @@ const listResourcesCommand = new commander.Command("list-resources").description
 		}
 		await clientManager.disconnectAll();
 	} catch (error) {
-		console.error(`Error executing list-resources: ${toErrorMessage$1(error)}`);
+		console.error(`Error executing list-resources: ${toErrorMessage$3(error)}`);
 		process.exit(1);
 	}
 });
@@ -1096,7 +1083,7 @@ const listResourcesCommand = new commander.Command("list-resources").description
 * - Hardcoded values (use options or environment variables)
 * - Not exiting with appropriate exit codes on errors
 */
-function toErrorMessage(error) {
+function toErrorMessage$2(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 /**
@@ -1113,7 +1100,7 @@ const readResourceCommand = new commander.Command("read-resource").description("
 				await clientManager.connectToServer(serverName, serverConfig);
 				if (!options.json) console.error(`✓ Connected to ${serverName}`);
 			} catch (error) {
-				console.error(`✗ Failed to connect to ${serverName}: ${toErrorMessage(error)}`);
+				console.error(`✗ Failed to connect to ${serverName}: ${toErrorMessage$2(error)}`);
 			}
 		}));
 		const clients = clientManager.getAllClients();
@@ -1148,7 +1135,7 @@ const readResourceCommand = new commander.Command("read-resource").description("
 		const matchingServers = [];
 		for (const { serverName, hasResource, error } of searchResults) {
 			if (error) {
-				console.error(`Failed to list resources from ${serverName}: ${toErrorMessage(error)}`);
+				console.error(`Failed to list resources from ${serverName}: ${toErrorMessage$2(error)}`);
 				continue;
 			}
 			if (hasResource) matchingServers.push(serverName);
@@ -1165,7 +1152,125 @@ const readResourceCommand = new commander.Command("read-resource").description("
 		else console.log(JSON.stringify(content, null, 2));
 		await clientManager.disconnectAll();
 	} catch (error) {
-		console.error(`Error executing read-resource: ${toErrorMessage(error)}`);
+		console.error(`Error executing read-resource: ${toErrorMessage$2(error)}`);
+		process.exit(1);
+	}
+});
+
+//#endregion
+//#region src/commands/list-prompts.ts
+function toErrorMessage$1(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+const listPromptsCommand = new commander.Command("list-prompts").description("List all available prompts 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)}`);
+			}
+		}));
+		const clients = options.server ? [clientManager.getClient(options.server)].filter((client) => client !== void 0) : clientManager.getAllClients();
+		if (clients.length === 0) throw new Error("No MCP servers connected");
+		const promptsByServer = {};
+		await Promise.all(clients.map(async (client) => {
+			try {
+				promptsByServer[client.serverName] = await client.listPrompts();
+			} catch (error) {
+				promptsByServer[client.serverName] = [];
+				if (!options.json) console.error(`Failed to list prompts from ${client.serverName}: ${toErrorMessage$1(error)}`);
+			}
+		}));
+		if (options.json) console.log(JSON.stringify(promptsByServer, null, 2));
+		else for (const [serverName, prompts] of Object.entries(promptsByServer)) {
+			console.log(`\n${serverName}:`);
+			if (prompts.length === 0) {
+				console.log("  No prompts available");
+				continue;
+			}
+			for (const prompt of prompts) {
+				console.log(`  - ${prompt.name}: ${prompt.description || "No description"}`);
+				if (prompt.arguments && prompt.arguments.length > 0) {
+					const args = prompt.arguments.map((arg) => `${arg.name}${arg.required ? " (required)" : ""}`).join(", ");
+					console.log(`    args: ${args}`);
+				}
+			}
+		}
+		await clientManager.disconnectAll();
+	} catch (error) {
+		console.error(`Error executing list-prompts: ${toErrorMessage$1(error)}`);
+		process.exit(1);
+	}
+});
+
+//#endregion
+//#region src/commands/get-prompt.ts
+function toErrorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+const getPromptCommand = new commander.Command("get-prompt").description("Get a prompt by name from a connected MCP server").argument("<promptName>", "Prompt name to fetch").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Server name (required if prompt exists on multiple servers)").option("-a, --args <json>", "Prompt arguments as JSON string", "{}").option("-j, --json", "Output as JSON", false).action(async (promptName, 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");
+		let promptArgs = {};
+		try {
+			promptArgs = JSON.parse(options.args);
+		} catch {
+			throw new Error("Invalid JSON in --args");
+		}
+		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(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`);
+			const prompt$1 = await client$1.getPrompt(promptName, promptArgs);
+			if (options.json) console.log(JSON.stringify(prompt$1, null, 2));
+			else for (const message of prompt$1.messages) {
+				const content = message.content;
+				if (typeof content === "object" && content && "text" in content) console.log(content.text);
+				else console.log(JSON.stringify(message, null, 2));
+			}
+			await clientManager.disconnectAll();
+			return;
+		}
+		const matchingServers = [];
+		await Promise.all(clients.map(async (client$1) => {
+			try {
+				if ((await client$1.listPrompts()).some((prompt$1) => prompt$1.name === promptName)) matchingServers.push(client$1.serverName);
+			} catch (error) {
+				if (!options.json) console.error(`Failed to list prompts from ${client$1.serverName}: ${toErrorMessage(error)}`);
+			}
+		}));
+		if (matchingServers.length === 0) throw new Error(`Prompt "${promptName}" not found on any connected server`);
+		if (matchingServers.length > 1) throw new Error(`Prompt "${promptName}" found on multiple servers: ${matchingServers.join(", ")}. Use --server to disambiguate`);
+		const client = clientManager.getClient(matchingServers[0]);
+		if (!client) throw new Error(`Internal error: Server "${matchingServers[0]}" not connected`);
+		const prompt = await client.getPrompt(promptName, promptArgs);
+		if (options.json) console.log(JSON.stringify(prompt, null, 2));
+		else for (const message of prompt.messages) {
+			const content = message.content;
+			if (typeof content === "object" && content && "text" in content) console.log(content.text);
+			else console.log(JSON.stringify(message, null, 2));
+		}
+		await clientManager.disconnectAll();
+	} catch (error) {
+		console.error(`Error executing get-prompt: ${toErrorMessage(error)}`);
 		process.exit(1);
 	}
 });
@@ -1196,7 +1301,7 @@ const readResourceCommand = new commander.Command("read-resource").description("
 /**
 * Pre-download packages used by MCP servers (npx, pnpx, uvx, uv)
 */
-const prefetchCommand = new commander.Command("prefetch").description("Pre-download packages used by MCP servers (npx, pnpx, uvx, uv)").option("-c, --config <path>", "Path to MCP server configuration file").option("-p, --parallel", "Run prefetch commands in parallel", false).option("-d, --dry-run", "Show what would be prefetched without executing", false).option("-f, --filter <type>", "Filter by package manager type: npx, pnpx, uvx, or uv").action(async (options) => {
+const prefetchCommand = new commander.Command("prefetch").description("Pre-download packages used by MCP servers (npx, pnpx, uvx, uv)").option("-c, --config <path>", "Path to MCP server configuration file").option("-p, --parallel", "Run prefetch commands in parallel", false).option("-d, --dry-run", "Show what would be prefetched without executing", false).option("-f, --filter <type>", "Filter by package manager type: npx, pnpx, uvx, or uv").option("--definitions-out <path>", "Write discovered definitions to a JSON or YAML cache file").option("--skip-packages", "Skip package prefetch and only build definitions cache", false).option("--clear-definitions-cache", "Delete the definitions cache file before continuing", false).action(async (options) => {
 	try {
 		const configFilePath = options.config || require_http.findConfigFile();
 		if (!configFilePath) {
@@ -1205,50 +1310,96 @@ const prefetchCommand = new commander.Command("prefetch").description("Pre-downl
 			process.exit(1);
 		}
 		__agiflowai_aicode_utils.print.info(`Loading configuration from: ${configFilePath}`);
+		const mcpConfig = await new require_http.ConfigFetcherService({
+			configFilePath,
+			useCache: false
+		}).fetchConfiguration(true);
+		const serverId = mcpConfig.id || require_http.generateServerId();
+		const configHash = require_http.DefinitionsCacheService.generateConfigHash(mcpConfig);
+		const effectiveDefinitionsPath = options.definitionsOut || require_http.DefinitionsCacheService.getDefaultCachePath(configFilePath);
 		const prefetchService = new PrefetchService({
-			mcpConfig: await new require_http.ConfigFetcherService({
-				configFilePath,
-				useCache: false
-			}).fetchConfiguration(true),
+			mcpConfig,
 			filter: options.filter,
 			parallel: options.parallel
 		});
 		const packages = prefetchService.extractPackages();
-		if (packages.length === 0) {
+		const shouldPrefetchPackages = !options.skipPackages;
+		const shouldWriteDefinitions = Boolean(options.definitionsOut);
+		if (options.clearDefinitionsCache) if (options.dryRun) __agiflowai_aicode_utils.print.info(`Would clear definitions cache: ${effectiveDefinitionsPath}`);
+		else {
+			await require_http.DefinitionsCacheService.clearFile(effectiveDefinitionsPath);
+			__agiflowai_aicode_utils.print.success(`Cleared definitions cache: ${effectiveDefinitionsPath}`);
+		}
+		if (shouldPrefetchPackages) if (packages.length === 0) {
 			__agiflowai_aicode_utils.print.warning("No packages found to prefetch.");
 			__agiflowai_aicode_utils.print.info("Prefetch supports: npx, pnpx, uvx, and uv run commands");
+		} else {
+			__agiflowai_aicode_utils.print.info(`Found ${packages.length} package(s) to prefetch:`);
+			for (const pkg of packages) __agiflowai_aicode_utils.print.item(`${pkg.serverName}: ${pkg.packageManager} ${pkg.packageName}`);
+		}
+		if (!shouldPrefetchPackages && !shouldWriteDefinitions) {
+			__agiflowai_aicode_utils.print.warning("Nothing to do. Use package prefetch or provide --definitions-out.");
 			return;
 		}
-		__agiflowai_aicode_utils.print.info(`Found ${packages.length} package(s) to prefetch:`);
-		for (const pkg of packages) __agiflowai_aicode_utils.print.item(`${pkg.serverName}: ${pkg.packageManager} ${pkg.packageName}`);
 		if (options.dryRun) {
-			__agiflowai_aicode_utils.print.newline();
-			__agiflowai_aicode_utils.print.header("Dry run mode - commands that would be executed:");
-			for (const pkg of packages) __agiflowai_aicode_utils.print.indent(pkg.fullCommand.join(" "));
+			if (shouldPrefetchPackages && packages.length > 0) {
+				__agiflowai_aicode_utils.print.newline();
+				__agiflowai_aicode_utils.print.header("Dry run mode - commands that would be executed:");
+				for (const pkg of packages) __agiflowai_aicode_utils.print.indent(pkg.fullCommand.join(" "));
+			}
+			if (shouldWriteDefinitions) {
+				__agiflowai_aicode_utils.print.newline();
+				__agiflowai_aicode_utils.print.info(`Would write definitions cache to: ${effectiveDefinitionsPath}`);
+			}
 			return;
 		}
-		__agiflowai_aicode_utils.print.newline();
-		__agiflowai_aicode_utils.print.info("Prefetching packages...");
-		const summary = await prefetchService.prefetch();
-		__agiflowai_aicode_utils.print.newline();
-		if (summary.failed === 0) __agiflowai_aicode_utils.print.success(`Prefetch complete: ${summary.successful} succeeded, ${summary.failed} failed`);
-		else __agiflowai_aicode_utils.print.warning(`Prefetch complete: ${summary.successful} succeeded, ${summary.failed} failed`);
-		if (summary.failed > 0) {
+		let packagePrefetchFailed = false;
+		if (shouldPrefetchPackages && packages.length > 0) {
 			__agiflowai_aicode_utils.print.newline();
-			__agiflowai_aicode_utils.print.error("Failed packages:");
-			for (const result of summary.results.filter((r) => !r.success)) __agiflowai_aicode_utils.print.item(`${result.package.serverName} (${result.package.packageName}): ${result.output.trim()}`);
-			process.exit(1);
+			__agiflowai_aicode_utils.print.info("Prefetching packages...");
+			const summary = await prefetchService.prefetch();
+			__agiflowai_aicode_utils.print.newline();
+			if (summary.failed === 0) __agiflowai_aicode_utils.print.success(`Package prefetch complete: ${summary.successful} succeeded, ${summary.failed} failed`);
+			else __agiflowai_aicode_utils.print.warning(`Package prefetch complete: ${summary.successful} succeeded, ${summary.failed} failed`);
+			if (summary.failed > 0) {
+				packagePrefetchFailed = true;
+				__agiflowai_aicode_utils.print.newline();
+				__agiflowai_aicode_utils.print.error("Failed packages:");
+				for (const result of summary.results.filter((r) => !r.success)) __agiflowai_aicode_utils.print.item(`${result.package.serverName} (${result.package.packageName}): ${result.output.trim()}`);
+			}
 		}
+		if (shouldWriteDefinitions) {
+			__agiflowai_aicode_utils.print.newline();
+			__agiflowai_aicode_utils.print.info("Collecting definitions cache...");
+			const clientManager = new require_http.McpClientManagerService();
+			const skillPaths = mcpConfig.skills?.paths || [];
+			const definitionsCacheService = new require_http.DefinitionsCacheService(clientManager, skillPaths.length > 0 ? new require_http.SkillService(process.cwd(), skillPaths) : void 0);
+			await Promise.all(Object.entries(mcpConfig.mcpServers).map(async ([serverName, serverConfig]) => {
+				try {
+					await clientManager.connectToServer(serverName, serverConfig);
+					__agiflowai_aicode_utils.print.item(`Connected for definitions: ${serverName}`);
+				} catch (error) {
+					__agiflowai_aicode_utils.print.warning(`Failed to connect for definitions: ${serverName} (${error instanceof Error ? error.message : String(error)})`);
+				}
+			}));
+			const definitionsCache = await definitionsCacheService.collectForCache({
+				configPath: configFilePath,
+				configHash,
+				oneMcpVersion: require_http.version,
+				serverId
+			});
+			await require_http.DefinitionsCacheService.writeToFile(effectiveDefinitionsPath, definitionsCache);
+			__agiflowai_aicode_utils.print.success(`Definitions cache written: ${effectiveDefinitionsPath} (${Object.keys(definitionsCache.servers).length} servers, ${definitionsCache.skills.length} skills)`);
+			if (definitionsCache.failures.length > 0) __agiflowai_aicode_utils.print.warning(`Definitions cache completed with ${definitionsCache.failures.length} server failure(s)`);
+			await clientManager.disconnectAll();
+		}
+		if (packagePrefetchFailed) process.exit(1);
 	} catch (error) {
 		__agiflowai_aicode_utils.print.error("Error executing prefetch:", error instanceof Error ? error.message : String(error));
 		process.exit(1);
 	}
 });
 
-//#endregion
-//#region package.json
-var version = "0.3.10";
-
 //#endregion
 //#region src/cli.ts
 /**
@@ -1275,14 +1426,16 @@ var version = "0.3.10";
 async function main() {
 	try {
 		const program = new commander.Command();
-		program.name("one-mcp").description("One MCP server package").version(version);
+		program.name("one-mcp").description("One MCP server package").version(require_http.version);
 		program.addCommand(initCommand);
 		program.addCommand(mcpServeCommand);
-		program.addCommand(listToolsCommand);
+		program.addCommand(searchToolsCommand);
 		program.addCommand(describeToolsCommand);
 		program.addCommand(useToolCommand);
 		program.addCommand(listResourcesCommand);
 		program.addCommand(readResourceCommand);
+		program.addCommand(listPromptsCommand);
+		program.addCommand(getPromptCommand);
 		program.addCommand(prefetchCommand);
 		await program.parseAsync(process.argv);
 	} catch (error) {