@agiflowai/one-mcp 0.2.7 → 0.3.1

package/dist/{http-B4NAfsQl.cjs → http-C4IfZSwW.cjs}

@@ -231,6 +231,7 @@ const ClaudeCodeStdioServerSchema = zod.z.object({
 	env: zod.z.record(zod.z.string(), zod.z.string()).optional(),
 	disabled: zod.z.boolean().optional(),
 	instruction: zod.z.string().optional(),
+	timeout: zod.z.number().positive().optional(),
 	config: AdditionalConfigSchema
 });
 const ClaudeCodeHttpServerSchema = zod.z.object({
@@ -239,6 +240,7 @@ const ClaudeCodeHttpServerSchema = zod.z.object({
 	type: zod.z.enum(["http", "sse"]).optional(),
 	disabled: zod.z.boolean().optional(),
 	instruction: zod.z.string().optional(),
+	timeout: zod.z.number().positive().optional(),
 	config: AdditionalConfigSchema
 });
 const ClaudeCodeServerConfigSchema = zod.z.union([ClaudeCodeStdioServerSchema, ClaudeCodeHttpServerSchema]);
@@ -269,6 +271,7 @@ const SkillsConfigSchema = zod.z.object({ paths: zod.z.array(zod.z.string()) });
 * Full Claude Code MCP configuration schema
 */
 const ClaudeCodeMcpConfigSchema = zod.z.object({
+	id: zod.z.string().optional(),
 	mcpServers: zod.z.record(zod.z.string(), ClaudeCodeServerConfigSchema),
 	remoteConfigs: zod.z.array(RemoteConfigSourceSchema).optional(),
 	skills: SkillsConfigSchema.optional()
@@ -309,6 +312,7 @@ const McpServerConfigSchema = zod.z.discriminatedUnion("transport", [
 		toolBlacklist: zod.z.array(zod.z.string()).optional(),
 		omitToolDescription: zod.z.boolean().optional(),
 		prompts: zod.z.record(zod.z.string(), InternalPromptConfigSchema).optional(),
+		timeout: zod.z.number().positive().optional(),
 		transport: zod.z.literal("stdio"),
 		config: McpStdioConfigSchema
 	}),
@@ -318,6 +322,7 @@ const McpServerConfigSchema = zod.z.discriminatedUnion("transport", [
 		toolBlacklist: zod.z.array(zod.z.string()).optional(),
 		omitToolDescription: zod.z.boolean().optional(),
 		prompts: zod.z.record(zod.z.string(), InternalPromptConfigSchema).optional(),
+		timeout: zod.z.number().positive().optional(),
 		transport: zod.z.literal("http"),
 		config: McpHttpConfigSchema
 	}),
@@ -327,6 +332,7 @@ const McpServerConfigSchema = zod.z.discriminatedUnion("transport", [
 		toolBlacklist: zod.z.array(zod.z.string()).optional(),
 		omitToolDescription: zod.z.boolean().optional(),
 		prompts: zod.z.record(zod.z.string(), InternalPromptConfigSchema).optional(),
+		timeout: zod.z.number().positive().optional(),
 		transport: zod.z.literal("sse"),
 		config: McpSseConfigSchema
 	})
@@ -335,6 +341,7 @@ const McpServerConfigSchema = zod.z.discriminatedUnion("transport", [
 * Full internal MCP configuration schema
 */
 const InternalMcpConfigSchema = zod.z.object({
+	id: zod.z.string().optional(),
 	mcpServers: zod.z.record(zod.z.string(), McpServerConfigSchema),
 	skills: SkillsConfigSchema.optional()
 });
@@ -360,6 +367,7 @@ function transformClaudeCodeConfig(claudeConfig) {
 				toolBlacklist: stdioConfig.config?.toolBlacklist,
 				omitToolDescription: stdioConfig.config?.omitToolDescription,
 				prompts: stdioConfig.config?.prompts,
+				timeout: stdioConfig.timeout,
 				transport: "stdio",
 				config: {
 					command: interpolatedCommand,
@@ -378,6 +386,7 @@ function transformClaudeCodeConfig(claudeConfig) {
 				toolBlacklist: httpConfig.config?.toolBlacklist,
 				omitToolDescription: httpConfig.config?.omitToolDescription,
 				prompts: httpConfig.config?.prompts,
+				timeout: httpConfig.timeout,
 				transport,
 				config: {
 					url: interpolatedUrl,
@@ -387,6 +396,7 @@ function transformClaudeCodeConfig(claudeConfig) {
 		}
 	}
 	return {
+		id: claudeConfig.id,
 		mcpServers: transformedServers,
 		skills: claudeConfig.skills
 	};
@@ -836,6 +846,8 @@ var ConfigFetcherService = class {
 
 //#endregion
 //#region src/services/McpClientManagerService.ts
+/** Default connection timeout in milliseconds (30 seconds) */
+const DEFAULT_CONNECTION_TIMEOUT_MS = 3e4;
 /**
 * MCP Client wrapper for managing individual server connections
 * This is an internal class used by McpClientManagerService
@@ -941,8 +953,10 @@ var McpClientManagerService = class {
 	}
 	/**
 	* Connect to an MCP server based on its configuration with timeout
+	* Uses the timeout from server config, falling back to default (30s)
 	*/
-	async connectToServer(serverName, config, timeoutMs = 1e4) {
+	async connectToServer(serverName, config) {
+		const timeoutMs = config.timeout ?? DEFAULT_CONNECTION_TIMEOUT_MS;
 		if (this.clients.has(serverName)) throw new Error(`Client for ${serverName} is already connected`);
 		const client = new __modelcontextprotocol_sdk_client_index_js.Client({
 			name: `@agiflowai/one-mcp-client`,
@@ -1237,6 +1251,71 @@ function extractSkillFrontMatter(content) {
 	return null;
 }
 
+//#endregion
+//#region src/utils/generateServerId.ts
+/**
+* generateServerId Utilities
+*
+* DESIGN PATTERNS:
+* - Pure functions with no side effects
+* - Single responsibility per function
+* - Functional programming approach
+*
+* CODING STANDARDS:
+* - Export individual functions, not classes
+* - Use descriptive function names with verbs
+* - Add JSDoc comments for complex logic
+* - Keep functions small and focused
+*
+* AVOID:
+* - Side effects (mutating external state)
+* - Stateful logic (use services for state)
+* - Complex external dependencies
+*/
+/**
+* Character set for generating human-readable IDs.
+* Excludes confusing characters: 0, O, 1, l, I
+*/
+const CHARSET = "23456789abcdefghjkmnpqrstuvwxyz";
+/**
+* Default length for generated server IDs (6 characters)
+*/
+const DEFAULT_ID_LENGTH = 6;
+/**
+* Generate a short, human-readable server ID.
+*
+* Uses Node.js crypto.randomBytes for cryptographically secure randomness
+* with rejection sampling to avoid modulo bias.
+*
+* The generated ID:
+* - Is 6 characters long by default
+* - Uses only lowercase alphanumeric characters
+* - Excludes confusing characters (0, O, 1, l, I)
+*
+* @param length - Length of the ID to generate (default: 6)
+* @returns A random, human-readable ID
+*
+* @example
+* generateServerId() // "abc234"
+* generateServerId(4) // "x7mn"
+*/
+function generateServerId(length = DEFAULT_ID_LENGTH) {
+	const charsetLength = 31;
+	const maxUnbiased = Math.floor(256 / charsetLength) * charsetLength - 1;
+	let result = "";
+	let remaining = length;
+	while (remaining > 0) {
+		const bytes = (0, node_crypto.randomBytes)(remaining);
+		for (let i = 0; i < bytes.length && remaining > 0; i++) {
+			const byte = bytes[i];
+			if (byte > maxUnbiased) continue;
+			result += CHARSET[byte % charsetLength];
+			remaining--;
+		}
+	}
+	return result;
+}
+
 //#endregion
 //#region src/services/SkillService.ts
 /**
@@ -1514,7 +1593,7 @@ var SkillService = class {
 * Prefix added to skill names when they clash with MCP tool names.
 * This ensures skills can be uniquely identified even when a tool has the same name.
 */
-const SKILL_PREFIX$1 = "skill__";
+const SKILL_PREFIX = "skill__";
 /**
 * Log prefix for skill detection messages.
 * Used to easily filter skill detection logs in stderr output.
@@ -1525,10 +1604,15 @@ const LOG_PREFIX_SKILL_DETECTION = "[skill-detection]";
 * Format: "prompt:{serverName}:{promptName}"
 */
 const PROMPT_LOCATION_PREFIX = "prompt:";
+/**
+* Default server ID used when no ID is provided via CLI or config.
+* This fallback is used when auto-generation also fails.
+*/
+const DEFAULT_SERVER_ID = "unknown";
 
 //#endregion
 //#region src/templates/toolkit-description.liquid?raw
-var toolkit_description_default = "<toolkit>\n<instruction>\nBefore you use any capabilities below, you MUST call this tool with a list of names to learn how to use them properly; this includes:\n- For tools: Arguments schema needed to pass to use_tool\n- For skills: Detailed instructions that will expand when invoked (Prefer to be explored first when relevant)\n\nThis tool is optimized for batch queries - you can request multiple capabilities at once for better performance.\n\nHow to invoke:\n- For MCP tools: Use use_tool with toolName and toolArgs based on the schema\n- For skills: Use this tool with the skill name to get expanded instructions\n</instruction>\n\n<available_capabilities>\n{% for server in servers -%}\n<group name=\"{{ server.name }}\">\n{% if server.instruction -%}\n<group_instruction>{{ server.instruction }}</group_instruction>\n{% endif -%}\n{% if server.omitToolDescription -%}\n{% for toolName in server.toolNames -%}\n<item name=\"{{ toolName }}\"></item>\n{% endfor -%}\n{% else -%}\n{% for tool in server.tools -%}\n<item name=\"{{ tool.displayName }}\"><description>{{ tool.description | default: \"No description\" }}</description></item>\n{% endfor -%}\n{% endif -%}\n</group>\n{% endfor -%}\n{% if skills.size > 0 -%}\n<group name=\"skills\">\n{% for skill in skills -%}\n<item name=\"{{ skill.displayName }}\"><description>{{ skill.description }}</description></item>\n{% endfor -%}\n</group>\n{% endif -%}\n</available_capabilities>\n</toolkit>\n";
+var toolkit_description_default = "<toolkit id=\"{{ serverId }}\">\n<instruction>\nBefore you use any capabilities below, you MUST call this tool with a list of names to learn how to use them properly; this includes:\n- For tools: Arguments schema needed to pass to use_tool\n- For skills: Detailed instructions that will expand when invoked (Prefer to be explored first when relevant)\n\nThis tool is optimized for batch queries - you can request multiple capabilities at once for better performance.\n\nHow to invoke:\n- For MCP tools: Use use_tool with toolName and toolArgs based on the schema\n- For skills: Use this tool with the skill name to get expanded instructions\n</instruction>\n\n<available_capabilities>\n{% for server in servers -%}\n<group name=\"{{ server.name }}\">\n{% if server.instruction -%}\n<group_instruction>{{ server.instruction }}</group_instruction>\n{% endif -%}\n{% if server.omitToolDescription -%}\n{% for toolName in server.toolNames -%}\n<item name=\"{{ toolName }}\"></item>\n{% endfor -%}\n{% else -%}\n{% for tool in server.tools -%}\n<item name=\"{{ tool.displayName }}\"><description>{{ tool.description | default: \"No description\" }}</description></item>\n{% endfor -%}\n{% endif -%}\n</group>\n{% endfor -%}\n{% if skills.size > 0 -%}\n<group name=\"skills\">\n{% for skill in skills -%}\n<item name=\"{{ skill.displayName }}\"><description>{{ skill.description }}</description></item>\n{% endfor -%}\n</group>\n{% endif -%}\n</available_capabilities>\n</toolkit>\n";
 
 //#endregion
 //#region src/tools/DescribeToolsTool.ts
@@ -1567,14 +1651,18 @@ var DescribeToolsTool = class DescribeToolsTool {
 	liquid = new liquidjs.Liquid();
 	/** Cache for auto-detected skills from prompt front-matter */
 	autoDetectedSkillsCache = null;
+	/** Unique server identifier for this one-mcp instance */
+	serverId;
 	/**
 	* Creates a new DescribeToolsTool instance
 	* @param clientManager - The MCP client manager for accessing remote servers
 	* @param skillService - Optional skill service for loading skills
+	* @param serverId - Unique server identifier for this one-mcp instance
 	*/
-	constructor(clientManager, skillService) {
+	constructor(clientManager, skillService, serverId) {
 		this.clientManager = clientManager;
 		this.skillService = skillService;
+		this.serverId = serverId || DEFAULT_SERVER_ID;
 	}
 	/**
 	* Clears the cached auto-detected skills from prompt front-matter.
@@ -1799,14 +1887,15 @@ var DescribeToolsTool = class DescribeToolsTool {
 			const clashesWithMcpTool = allToolNames.has(skill.name);
 			return {
 				name: skill.name,
-				displayName: clashesWithMcpTool ? `${SKILL_PREFIX$1}${skill.name}` : skill.name,
+				displayName: clashesWithMcpTool ? `${SKILL_PREFIX}${skill.name}` : skill.name,
 				description: skill.description
 			};
 		});
 		return {
 			content: await this.liquid.parseAndRender(toolkit_description_default, {
 				servers,
-				skills
+				skills,
+				serverId: this.serverId
 			}),
 			toolNames: allToolNames
 		};
@@ -1892,8 +1981,8 @@ var DescribeToolsTool = class DescribeToolsTool {
 			const foundSkills = [];
 			const notFoundItems = [];
 			for (const requestedName of toolNames) {
-				if (requestedName.startsWith(SKILL_PREFIX$1)) {
-					const skillName = requestedName.slice(SKILL_PREFIX$1.length);
+				if (requestedName.startsWith(SKILL_PREFIX)) {
+					const skillName = requestedName.slice(SKILL_PREFIX.length);
 					if (this.skillService) {
 						const skill = await this.skillService.getSkill(skillName);
 						if (skill) {
@@ -2017,10 +2106,6 @@ var DescribeToolsTool = class DescribeToolsTool {
 //#endregion
 //#region src/tools/UseToolTool.ts
 /**
-* Prefix used to identify skill invocations (e.g., skill__pdf)
-*/
-const SKILL_PREFIX = "skill__";
-/**
 * UseToolTool executes MCP tools and skills with proper error handling.
 *
 * This tool supports three invocation patterns:
@@ -2037,14 +2122,18 @@ var UseToolTool = class UseToolTool {
 	static TOOL_NAME = "use_tool";
 	clientManager;
 	skillService;
+	/** Unique server identifier for this one-mcp instance */
+	serverId;
 	/**
 	* Creates a new UseToolTool instance
 	* @param clientManager - The MCP client manager for accessing remote servers
 	* @param skillService - Optional skill service for loading and executing skills
+	* @param serverId - Unique server identifier for this one-mcp instance
 	*/
-	constructor(clientManager, skillService) {
+	constructor(clientManager, skillService, serverId) {
 		this.clientManager = clientManager;
 		this.skillService = skillService;
+		this.serverId = serverId || DEFAULT_SERVER_ID;
 	}
 	/**
 	* Returns the MCP tool definition with name, description, and input schema.
@@ -2060,6 +2149,8 @@ var UseToolTool = class UseToolTool {
 			description: `Execute an MCP tool (NOT Skill) with provided arguments. You MUST call describe_tools first to discover the tool's correct arguments. Then to use tool:
 - Provide toolName and toolArgs based on the schema
 - If multiple servers provide the same tool, specify serverName
+
+IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverId}".
 `,
 			inputSchema: {
 				type: "object",
@@ -2146,7 +2237,7 @@ var UseToolTool = class UseToolTool {
 		try {
 			const { toolName: inputToolName, toolArgs = {} } = input;
 			if (inputToolName.startsWith(SKILL_PREFIX)) {
-				const skillName = inputToolName.slice(7);
+				const skillName = inputToolName.slice(SKILL_PREFIX.length);
 				if (this.skillService) {
 					const skill = await this.skillService.getSkill(skillName);
 					if (skill) return this.executeSkill(skill);
@@ -2281,6 +2372,7 @@ async function createServer(options) {
 	} });
 	const clientManager = new McpClientManagerService();
 	let configSkills;
+	let configId;
 	if (options?.configFilePath) {
 		let config;
 		try {
@@ -2292,6 +2384,7 @@ async function createServer(options) {
 			throw new Error(`Failed to load MCP configuration from '${options.configFilePath}': ${error instanceof Error ? error.message : String(error)}`);
 		}
 		configSkills = config.skills;
+		configId = config.id;
 		const failedConnections = [];
 		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
 			try {
@@ -2310,13 +2403,15 @@ async function createServer(options) {
 		if (failedConnections.length > 0 && failedConnections.length < Object.keys(config.mcpServers).length) console.error(`Warning: Some MCP server connections failed: ${failedConnections.map((f) => f.serverName).join(", ")}`);
 		if (failedConnections.length > 0 && failedConnections.length === Object.keys(config.mcpServers).length) throw new Error(`All MCP server connections failed: ${failedConnections.map((f) => `${f.serverName}: ${f.error.message}`).join(", ")}`);
 	}
+	const serverId = options?.serverId || configId || generateServerId();
+	console.error(`[one-mcp] Server ID: ${serverId}`);
 	const skillsConfig = options?.skills || configSkills;
 	const toolsRef = { describeTools: null };
 	const skillService = skillsConfig && skillsConfig.paths.length > 0 ? new SkillService(process.cwd(), skillsConfig.paths, { onCacheInvalidated: () => {
 		toolsRef.describeTools?.clearAutoDetectedSkillsCache();
 	} }) : void 0;
-	const describeTools = new DescribeToolsTool(clientManager, skillService);
-	const useTool = new UseToolTool(clientManager, skillService);
+	const describeTools = new DescribeToolsTool(clientManager, skillService, serverId);
+	const useTool = new UseToolTool(clientManager, skillService, serverId);
 	toolsRef.describeTools = describeTools;
 	if (skillService) skillService.startWatching().catch((error) => {
 		console.error(`[skill-watcher] File watcher failed (non-critical): ${error instanceof Error ? error.message : "Unknown error"}`);

package/dist/{http-DSkkpGJU.mjs → http-xi_ha63Y.mjs}

@@ -4,7 +4,7 @@ import { access, mkdir, readFile, readdir, stat, unlink, watch, writeFile } from
 import { existsSync } from "node:fs";
 import yaml from "js-yaml";
 import { z } from "zod";
-import { createHash, randomUUID } from "node:crypto";
+import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { tmpdir } from "node:os";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
@@ -202,6 +202,7 @@ const ClaudeCodeStdioServerSchema = z.object({
 	env: z.record(z.string(), z.string()).optional(),
 	disabled: z.boolean().optional(),
 	instruction: z.string().optional(),
+	timeout: z.number().positive().optional(),
 	config: AdditionalConfigSchema
 });
 const ClaudeCodeHttpServerSchema = z.object({
@@ -210,6 +211,7 @@ const ClaudeCodeHttpServerSchema = z.object({
 	type: z.enum(["http", "sse"]).optional(),
 	disabled: z.boolean().optional(),
 	instruction: z.string().optional(),
+	timeout: z.number().positive().optional(),
 	config: AdditionalConfigSchema
 });
 const ClaudeCodeServerConfigSchema = z.union([ClaudeCodeStdioServerSchema, ClaudeCodeHttpServerSchema]);
@@ -240,6 +242,7 @@ const SkillsConfigSchema = z.object({ paths: z.array(z.string()) });
 * Full Claude Code MCP configuration schema
 */
 const ClaudeCodeMcpConfigSchema = z.object({
+	id: z.string().optional(),
 	mcpServers: z.record(z.string(), ClaudeCodeServerConfigSchema),
 	remoteConfigs: z.array(RemoteConfigSourceSchema).optional(),
 	skills: SkillsConfigSchema.optional()
@@ -280,6 +283,7 @@ const McpServerConfigSchema = z.discriminatedUnion("transport", [
 		toolBlacklist: z.array(z.string()).optional(),
 		omitToolDescription: z.boolean().optional(),
 		prompts: z.record(z.string(), InternalPromptConfigSchema).optional(),
+		timeout: z.number().positive().optional(),
 		transport: z.literal("stdio"),
 		config: McpStdioConfigSchema
 	}),
@@ -289,6 +293,7 @@ const McpServerConfigSchema = z.discriminatedUnion("transport", [
 		toolBlacklist: z.array(z.string()).optional(),
 		omitToolDescription: z.boolean().optional(),
 		prompts: z.record(z.string(), InternalPromptConfigSchema).optional(),
+		timeout: z.number().positive().optional(),
 		transport: z.literal("http"),
 		config: McpHttpConfigSchema
 	}),
@@ -298,6 +303,7 @@ const McpServerConfigSchema = z.discriminatedUnion("transport", [
 		toolBlacklist: z.array(z.string()).optional(),
 		omitToolDescription: z.boolean().optional(),
 		prompts: z.record(z.string(), InternalPromptConfigSchema).optional(),
+		timeout: z.number().positive().optional(),
 		transport: z.literal("sse"),
 		config: McpSseConfigSchema
 	})
@@ -306,6 +312,7 @@ const McpServerConfigSchema = z.discriminatedUnion("transport", [
 * Full internal MCP configuration schema
 */
 const InternalMcpConfigSchema = z.object({
+	id: z.string().optional(),
 	mcpServers: z.record(z.string(), McpServerConfigSchema),
 	skills: SkillsConfigSchema.optional()
 });
@@ -331,6 +338,7 @@ function transformClaudeCodeConfig(claudeConfig) {
 				toolBlacklist: stdioConfig.config?.toolBlacklist,
 				omitToolDescription: stdioConfig.config?.omitToolDescription,
 				prompts: stdioConfig.config?.prompts,
+				timeout: stdioConfig.timeout,
 				transport: "stdio",
 				config: {
 					command: interpolatedCommand,
@@ -349,6 +357,7 @@ function transformClaudeCodeConfig(claudeConfig) {
 				toolBlacklist: httpConfig.config?.toolBlacklist,
 				omitToolDescription: httpConfig.config?.omitToolDescription,
 				prompts: httpConfig.config?.prompts,
+				timeout: httpConfig.timeout,
 				transport,
 				config: {
 					url: interpolatedUrl,
@@ -358,6 +367,7 @@ function transformClaudeCodeConfig(claudeConfig) {
 		}
 	}
 	return {
+		id: claudeConfig.id,
 		mcpServers: transformedServers,
 		skills: claudeConfig.skills
 	};
@@ -807,6 +817,8 @@ var ConfigFetcherService = class {
 
 //#endregion
 //#region src/services/McpClientManagerService.ts
+/** Default connection timeout in milliseconds (30 seconds) */
+const DEFAULT_CONNECTION_TIMEOUT_MS = 3e4;
 /**
 * MCP Client wrapper for managing individual server connections
 * This is an internal class used by McpClientManagerService
@@ -912,8 +924,10 @@ var McpClientManagerService = class {
 	}
 	/**
 	* Connect to an MCP server based on its configuration with timeout
+	* Uses the timeout from server config, falling back to default (30s)
 	*/
-	async connectToServer(serverName, config, timeoutMs = 1e4) {
+	async connectToServer(serverName, config) {
+		const timeoutMs = config.timeout ?? DEFAULT_CONNECTION_TIMEOUT_MS;
 		if (this.clients.has(serverName)) throw new Error(`Client for ${serverName} is already connected`);
 		const client = new Client({
 			name: `@agiflowai/one-mcp-client`,
@@ -1208,6 +1222,71 @@ function extractSkillFrontMatter(content) {
 	return null;
 }
 
+//#endregion
+//#region src/utils/generateServerId.ts
+/**
+* generateServerId Utilities
+*
+* DESIGN PATTERNS:
+* - Pure functions with no side effects
+* - Single responsibility per function
+* - Functional programming approach
+*
+* CODING STANDARDS:
+* - Export individual functions, not classes
+* - Use descriptive function names with verbs
+* - Add JSDoc comments for complex logic
+* - Keep functions small and focused
+*
+* AVOID:
+* - Side effects (mutating external state)
+* - Stateful logic (use services for state)
+* - Complex external dependencies
+*/
+/**
+* Character set for generating human-readable IDs.
+* Excludes confusing characters: 0, O, 1, l, I
+*/
+const CHARSET = "23456789abcdefghjkmnpqrstuvwxyz";
+/**
+* Default length for generated server IDs (6 characters)
+*/
+const DEFAULT_ID_LENGTH = 6;
+/**
+* Generate a short, human-readable server ID.
+*
+* Uses Node.js crypto.randomBytes for cryptographically secure randomness
+* with rejection sampling to avoid modulo bias.
+*
+* The generated ID:
+* - Is 6 characters long by default
+* - Uses only lowercase alphanumeric characters
+* - Excludes confusing characters (0, O, 1, l, I)
+*
+* @param length - Length of the ID to generate (default: 6)
+* @returns A random, human-readable ID
+*
+* @example
+* generateServerId() // "abc234"
+* generateServerId(4) // "x7mn"
+*/
+function generateServerId(length = DEFAULT_ID_LENGTH) {
+	const charsetLength = 31;
+	const maxUnbiased = Math.floor(256 / charsetLength) * charsetLength - 1;
+	let result = "";
+	let remaining = length;
+	while (remaining > 0) {
+		const bytes = randomBytes(remaining);
+		for (let i = 0; i < bytes.length && remaining > 0; i++) {
+			const byte = bytes[i];
+			if (byte > maxUnbiased) continue;
+			result += CHARSET[byte % charsetLength];
+			remaining--;
+		}
+	}
+	return result;
+}
+
 //#endregion
 //#region src/services/SkillService.ts
 /**
@@ -1485,7 +1564,7 @@ var SkillService = class {
 * Prefix added to skill names when they clash with MCP tool names.
 * This ensures skills can be uniquely identified even when a tool has the same name.
 */
-const SKILL_PREFIX$1 = "skill__";
+const SKILL_PREFIX = "skill__";
 /**
 * Log prefix for skill detection messages.
 * Used to easily filter skill detection logs in stderr output.
@@ -1496,10 +1575,15 @@ const LOG_PREFIX_SKILL_DETECTION = "[skill-detection]";
 * Format: "prompt:{serverName}:{promptName}"
 */
 const PROMPT_LOCATION_PREFIX = "prompt:";
+/**
+* Default server ID used when no ID is provided via CLI or config.
+* This fallback is used when auto-generation also fails.
+*/
+const DEFAULT_SERVER_ID = "unknown";
 
 //#endregion
 //#region src/templates/toolkit-description.liquid?raw
-var toolkit_description_default = "<toolkit>\n<instruction>\nBefore you use any capabilities below, you MUST call this tool with a list of names to learn how to use them properly; this includes:\n- For tools: Arguments schema needed to pass to use_tool\n- For skills: Detailed instructions that will expand when invoked (Prefer to be explored first when relevant)\n\nThis tool is optimized for batch queries - you can request multiple capabilities at once for better performance.\n\nHow to invoke:\n- For MCP tools: Use use_tool with toolName and toolArgs based on the schema\n- For skills: Use this tool with the skill name to get expanded instructions\n</instruction>\n\n<available_capabilities>\n{% for server in servers -%}\n<group name=\"{{ server.name }}\">\n{% if server.instruction -%}\n<group_instruction>{{ server.instruction }}</group_instruction>\n{% endif -%}\n{% if server.omitToolDescription -%}\n{% for toolName in server.toolNames -%}\n<item name=\"{{ toolName }}\"></item>\n{% endfor -%}\n{% else -%}\n{% for tool in server.tools -%}\n<item name=\"{{ tool.displayName }}\"><description>{{ tool.description | default: \"No description\" }}</description></item>\n{% endfor -%}\n{% endif -%}\n</group>\n{% endfor -%}\n{% if skills.size > 0 -%}\n<group name=\"skills\">\n{% for skill in skills -%}\n<item name=\"{{ skill.displayName }}\"><description>{{ skill.description }}</description></item>\n{% endfor -%}\n</group>\n{% endif -%}\n</available_capabilities>\n</toolkit>\n";
+var toolkit_description_default = "<toolkit id=\"{{ serverId }}\">\n<instruction>\nBefore you use any capabilities below, you MUST call this tool with a list of names to learn how to use them properly; this includes:\n- For tools: Arguments schema needed to pass to use_tool\n- For skills: Detailed instructions that will expand when invoked (Prefer to be explored first when relevant)\n\nThis tool is optimized for batch queries - you can request multiple capabilities at once for better performance.\n\nHow to invoke:\n- For MCP tools: Use use_tool with toolName and toolArgs based on the schema\n- For skills: Use this tool with the skill name to get expanded instructions\n</instruction>\n\n<available_capabilities>\n{% for server in servers -%}\n<group name=\"{{ server.name }}\">\n{% if server.instruction -%}\n<group_instruction>{{ server.instruction }}</group_instruction>\n{% endif -%}\n{% if server.omitToolDescription -%}\n{% for toolName in server.toolNames -%}\n<item name=\"{{ toolName }}\"></item>\n{% endfor -%}\n{% else -%}\n{% for tool in server.tools -%}\n<item name=\"{{ tool.displayName }}\"><description>{{ tool.description | default: \"No description\" }}</description></item>\n{% endfor -%}\n{% endif -%}\n</group>\n{% endfor -%}\n{% if skills.size > 0 -%}\n<group name=\"skills\">\n{% for skill in skills -%}\n<item name=\"{{ skill.displayName }}\"><description>{{ skill.description }}</description></item>\n{% endfor -%}\n</group>\n{% endif -%}\n</available_capabilities>\n</toolkit>\n";
 
 //#endregion
 //#region src/tools/DescribeToolsTool.ts
@@ -1538,14 +1622,18 @@ var DescribeToolsTool = class DescribeToolsTool {
 	liquid = new Liquid();
 	/** Cache for auto-detected skills from prompt front-matter */
 	autoDetectedSkillsCache = null;
+	/** Unique server identifier for this one-mcp instance */
+	serverId;
 	/**
 	* Creates a new DescribeToolsTool instance
 	* @param clientManager - The MCP client manager for accessing remote servers
 	* @param skillService - Optional skill service for loading skills
+	* @param serverId - Unique server identifier for this one-mcp instance
 	*/
-	constructor(clientManager, skillService) {
+	constructor(clientManager, skillService, serverId) {
 		this.clientManager = clientManager;
 		this.skillService = skillService;
+		this.serverId = serverId || DEFAULT_SERVER_ID;
 	}
 	/**
 	* Clears the cached auto-detected skills from prompt front-matter.
@@ -1770,14 +1858,15 @@ var DescribeToolsTool = class DescribeToolsTool {
 			const clashesWithMcpTool = allToolNames.has(skill.name);
 			return {
 				name: skill.name,
-				displayName: clashesWithMcpTool ? `${SKILL_PREFIX$1}${skill.name}` : skill.name,
+				displayName: clashesWithMcpTool ? `${SKILL_PREFIX}${skill.name}` : skill.name,
 				description: skill.description
 			};
 		});
 		return {
 			content: await this.liquid.parseAndRender(toolkit_description_default, {
 				servers,
-				skills
+				skills,
+				serverId: this.serverId
 			}),
 			toolNames: allToolNames
 		};
@@ -1863,8 +1952,8 @@ var DescribeToolsTool = class DescribeToolsTool {
 			const foundSkills = [];
 			const notFoundItems = [];
 			for (const requestedName of toolNames) {
-				if (requestedName.startsWith(SKILL_PREFIX$1)) {
-					const skillName = requestedName.slice(SKILL_PREFIX$1.length);
+				if (requestedName.startsWith(SKILL_PREFIX)) {
+					const skillName = requestedName.slice(SKILL_PREFIX.length);
 					if (this.skillService) {
 						const skill = await this.skillService.getSkill(skillName);
 						if (skill) {
@@ -1988,10 +2077,6 @@ var DescribeToolsTool = class DescribeToolsTool {
 //#endregion
 //#region src/tools/UseToolTool.ts
 /**
-* Prefix used to identify skill invocations (e.g., skill__pdf)
-*/
-const SKILL_PREFIX = "skill__";
-/**
 * UseToolTool executes MCP tools and skills with proper error handling.
 *
 * This tool supports three invocation patterns:
@@ -2008,14 +2093,18 @@ var UseToolTool = class UseToolTool {
 	static TOOL_NAME = "use_tool";
 	clientManager;
 	skillService;
+	/** Unique server identifier for this one-mcp instance */
+	serverId;
 	/**
 	* Creates a new UseToolTool instance
 	* @param clientManager - The MCP client manager for accessing remote servers
 	* @param skillService - Optional skill service for loading and executing skills
+	* @param serverId - Unique server identifier for this one-mcp instance
 	*/
-	constructor(clientManager, skillService) {
+	constructor(clientManager, skillService, serverId) {
 		this.clientManager = clientManager;
 		this.skillService = skillService;
+		this.serverId = serverId || DEFAULT_SERVER_ID;
 	}
 	/**
 	* Returns the MCP tool definition with name, description, and input schema.
@@ -2031,6 +2120,8 @@ var UseToolTool = class UseToolTool {
 			description: `Execute an MCP tool (NOT Skill) with provided arguments. You MUST call describe_tools first to discover the tool's correct arguments. Then to use tool:
 - Provide toolName and toolArgs based on the schema
 - If multiple servers provide the same tool, specify serverName
+
+IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverId}".
 `,
 			inputSchema: {
 				type: "object",
@@ -2117,7 +2208,7 @@ var UseToolTool = class UseToolTool {
 		try {
 			const { toolName: inputToolName, toolArgs = {} } = input;
 			if (inputToolName.startsWith(SKILL_PREFIX)) {
-				const skillName = inputToolName.slice(7);
+				const skillName = inputToolName.slice(SKILL_PREFIX.length);
 				if (this.skillService) {
 					const skill = await this.skillService.getSkill(skillName);
 					if (skill) return this.executeSkill(skill);
@@ -2252,6 +2343,7 @@ async function createServer(options) {
 	} });
 	const clientManager = new McpClientManagerService();
 	let configSkills;
+	let configId;
 	if (options?.configFilePath) {
 		let config;
 		try {
@@ -2263,6 +2355,7 @@ async function createServer(options) {
 			throw new Error(`Failed to load MCP configuration from '${options.configFilePath}': ${error instanceof Error ? error.message : String(error)}`);
 		}
 		configSkills = config.skills;
+		configId = config.id;
 		const failedConnections = [];
 		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
 			try {
@@ -2281,13 +2374,15 @@ async function createServer(options) {
 		if (failedConnections.length > 0 && failedConnections.length < Object.keys(config.mcpServers).length) console.error(`Warning: Some MCP server connections failed: ${failedConnections.map((f) => f.serverName).join(", ")}`);
 		if (failedConnections.length > 0 && failedConnections.length === Object.keys(config.mcpServers).length) throw new Error(`All MCP server connections failed: ${failedConnections.map((f) => `${f.serverName}: ${f.error.message}`).join(", ")}`);
 	}
+	const serverId = options?.serverId || configId || generateServerId();
+	console.error(`[one-mcp] Server ID: ${serverId}`);
 	const skillsConfig = options?.skills || configSkills;
 	const toolsRef = { describeTools: null };
 	const skillService = skillsConfig && skillsConfig.paths.length > 0 ? new SkillService(process.cwd(), skillsConfig.paths, { onCacheInvalidated: () => {
 		toolsRef.describeTools?.clearAutoDetectedSkillsCache();
 	} }) : void 0;
-	const describeTools = new DescribeToolsTool(clientManager, skillService);
-	const useTool = new UseToolTool(clientManager, skillService);
+	const describeTools = new DescribeToolsTool(clientManager, skillService, serverId);
+	const useTool = new UseToolTool(clientManager, skillService, serverId);
 	toolsRef.describeTools = describeTools;
 	if (skillService) skillService.startWatching().catch((error) => {
 		console.error(`[skill-watcher] File watcher failed (non-critical): ${error instanceof Error ? error.message : "Unknown error"}`);

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_http = require('./http-B4NAfsQl.cjs');
+const require_http = require('./http-C4IfZSwW.cjs');
 
 exports.HttpTransportHandler = require_http.HttpTransportHandler;
 exports.SseTransportHandler = require_http.SseTransportHandler;