@agiflowai/one-mcp 0.3.16 → 0.3.18

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_src = require('./src-BRqEdbha.cjs');
+const require_src = require('./src-hm1dRqUF.cjs');
 let node_fs_promises = require("node:fs/promises");
 let node_fs = require("node:fs");
 let node_crypto = require("node:crypto");
@@ -1132,7 +1132,7 @@ const describeToolsCommand = new commander.Command("describe-tools").description
 /**
 * 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) => {
+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("-t, --timeout <ms>", "Request timeout in milliseconds for tool execution (default: 60000)", parseInt).option("-j, --json", "Output as JSON", false).action(async (toolName, options) => {
 	try {
 		const configFilePath = options.config || require_src.findConfigFile();
 		if (!configFilePath) {
@@ -1170,7 +1170,8 @@ const useToolCommand = new commander.Command("use-tool").description("Execute an
 			}
 			try {
 				if (!options.json) console.error(`Executing ${toolName} on ${options.server}...`);
-				const result = await client$1.callTool(toolName, toolArgs);
+				const requestOptions = options.timeout ? { timeout: options.timeout } : void 0;
+				const result = await client$1.callTool(toolName, toolArgs, requestOptions);
 				if (options.json) console.log(JSON.stringify(result, null, 2));
 				else {
 					console.log("\nResult:");
@@ -1255,7 +1256,8 @@ const useToolCommand = new commander.Command("use-tool").description("Execute an
 		}
 		try {
 			if (!options.json) console.error(`Executing ${toolName} on ${targetServer}...`);
-			const result = await client.callTool(toolName, toolArgs);
+			const requestOpts = options.timeout ? { timeout: options.timeout } : void 0;
+			const result = await client.callTool(toolName, toolArgs, requestOpts);
 			if (options.json) console.log(JSON.stringify(result, null, 2));
 			else {
 				console.log("\nResult:");

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { _ as DefinitionsCacheService, a as SseTransportHandler, b as ConfigFetcherService, c as createServer, d as version, g as McpClientManagerService, h as SkillService, i as StdioTransportHandler, l as createSessionServer, n as RuntimeStateService, o as HttpTransportHandler, p as SearchListToolsTool, r as StdioHttpTransportHandler, s as TRANSPORT_MODE, t as StopServerService, u as initializeSharedServices, v as generateServerId, y as findConfigFile } from "./src-Dn6vMZIk.mjs";
+import { _ as DefinitionsCacheService, a as SseTransportHandler, b as ConfigFetcherService, c as createServer, d as version, g as McpClientManagerService, h as SkillService, i as StdioTransportHandler, l as createSessionServer, n as RuntimeStateService, o as HttpTransportHandler, p as SearchListToolsTool, r as StdioHttpTransportHandler, s as TRANSPORT_MODE, t as StopServerService, u as initializeSharedServices, v as generateServerId, y as findConfigFile } from "./src-DPIjPYdS.mjs";
 import { access, writeFile } from "node:fs/promises";
 import { constants } from "node:fs";
 import { randomUUID } from "node:crypto";
@@ -1132,7 +1132,7 @@ const describeToolsCommand = new Command("describe-tools").description("Describe
 /**
 * Execute an MCP tool with arguments
 */
-const useToolCommand = new 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 useToolCommand = new 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("-t, --timeout <ms>", "Request timeout in milliseconds for tool execution (default: 60000)", parseInt).option("-j, --json", "Output as JSON", false).action(async (toolName, options) => {
 	try {
 		const configFilePath = options.config || findConfigFile();
 		if (!configFilePath) {
@@ -1170,7 +1170,8 @@ const useToolCommand = new Command("use-tool").description("Execute an MCP tool
 			}
 			try {
 				if (!options.json) console.error(`Executing ${toolName} on ${options.server}...`);
-				const result = await client$1.callTool(toolName, toolArgs);
+				const requestOptions = options.timeout ? { timeout: options.timeout } : void 0;
+				const result = await client$1.callTool(toolName, toolArgs, requestOptions);
 				if (options.json) console.log(JSON.stringify(result, null, 2));
 				else {
 					console.log("\nResult:");
@@ -1255,7 +1256,8 @@ const useToolCommand = new Command("use-tool").description("Execute an MCP tool
 		}
 		try {
 			if (!options.json) console.error(`Executing ${toolName} on ${targetServer}...`);
-			const result = await client.callTool(toolName, toolArgs);
+			const requestOpts = options.timeout ? { timeout: options.timeout } : void 0;
+			const result = await client.callTool(toolName, toolArgs, requestOpts);
 			if (options.json) console.log(JSON.stringify(result, null, 2));
 			else {
 				console.log("\nResult:");

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_src = require('./src-BRqEdbha.cjs');
+const require_src = require('./src-hm1dRqUF.cjs');
 
 exports.ConfigFetcherService = require_src.ConfigFetcherService;
 exports.DefinitionsCacheService = require_src.DefinitionsCacheService;

package/dist/index.d.cts

@@ -221,6 +221,8 @@ interface McpServerConfig {
   transport: McpServerTransportType;
   config: McpServerTransportConfig;
   timeout?: number;
+  /** Optional per-request timeout in milliseconds for tool calls (default: 60000 from MCP SDK) */
+  requestTimeout?: number;
   disabled?: boolean;
 }
 /**
@@ -322,7 +324,9 @@ interface McpClientConnection {
   /** List available prompts from the server */
   listPrompts(): Promise<McpPromptInfo[]>;
   /** Call a tool with the given name and arguments */
-  callTool(name: string, args: Record<string, unknown>): Promise<CallToolResult>;
+  callTool(name: string, args: Record<string, unknown>, options?: {
+    timeout?: number;
+  }): Promise<CallToolResult>;
   /** Read a resource by URI */
   readResource(uri: string): Promise<ReadResourceResult>;
   /** Get a prompt by name with optional arguments */
@@ -552,6 +556,7 @@ declare class McpClientManagerService {
   connectToServer(serverName: string, config: McpServerConfig): Promise<void>;
   registerServerConfigs(configs: Record<string, McpServerConfig>): void;
   getKnownServerNames(): string[];
+  getServerRequestTimeout(serverName: string): number | undefined;
   ensureConnected(serverName: string): Promise<McpClientConnection>;
   private createConnection;
   /**

package/dist/index.d.mts

@@ -222,6 +222,8 @@ interface McpServerConfig {
   transport: McpServerTransportType;
   config: McpServerTransportConfig;
   timeout?: number;
+  /** Optional per-request timeout in milliseconds for tool calls (default: 60000 from MCP SDK) */
+  requestTimeout?: number;
   disabled?: boolean;
 }
 /**
@@ -323,7 +325,9 @@ interface McpClientConnection {
   /** List available prompts from the server */
   listPrompts(): Promise<McpPromptInfo[]>;
   /** Call a tool with the given name and arguments */
-  callTool(name: string, args: Record<string, unknown>): Promise<CallToolResult>;
+  callTool(name: string, args: Record<string, unknown>, options?: {
+    timeout?: number;
+  }): Promise<CallToolResult>;
   /** Read a resource by URI */
   readResource(uri: string): Promise<ReadResourceResult>;
   /** Get a prompt by name with optional arguments */
@@ -553,6 +557,7 @@ declare class McpClientManagerService {
   connectToServer(serverName: string, config: McpServerConfig): Promise<void>;
   registerServerConfigs(configs: Record<string, McpServerConfig>): void;
   getKnownServerNames(): string[];
+  getServerRequestTimeout(serverName: string): number | undefined;
   ensureConnected(serverName: string): Promise<McpClientConnection>;
   private createConnection;
   /**

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { _ as DefinitionsCacheService, a as SseTransportHandler, b as ConfigFetcherService, c as createServer, f as UseToolTool, g as McpClientManagerService, h as SkillService, i as StdioTransportHandler, l as createSessionServer, m as DescribeToolsTool, n as RuntimeStateService, o as HttpTransportHandler, p as SearchListToolsTool, r as StdioHttpTransportHandler, s as TRANSPORT_MODE, t as StopServerService, u as initializeSharedServices, v as generateServerId, y as findConfigFile } from "./src-Dn6vMZIk.mjs";
+import { _ as DefinitionsCacheService, a as SseTransportHandler, b as ConfigFetcherService, c as createServer, f as UseToolTool, g as McpClientManagerService, h as SkillService, i as StdioTransportHandler, l as createSessionServer, m as DescribeToolsTool, n as RuntimeStateService, o as HttpTransportHandler, p as SearchListToolsTool, r as StdioHttpTransportHandler, s as TRANSPORT_MODE, t as StopServerService, u as initializeSharedServices, v as generateServerId, y as findConfigFile } from "./src-DPIjPYdS.mjs";
 
 export { ConfigFetcherService, DefinitionsCacheService, DescribeToolsTool, HttpTransportHandler, McpClientManagerService, RuntimeStateService, SearchListToolsTool, SkillService, SseTransportHandler, StdioHttpTransportHandler, StdioTransportHandler, StopServerService, TRANSPORT_MODE, UseToolTool, createServer, createSessionServer, findConfigFile, generateServerId, initializeSharedServices };

package/dist/{src-Dn6vMZIk.mjs → src-DPIjPYdS.mjs}

@@ -8,8 +8,8 @@ import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { homedir, tmpdir } from "node:os";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { Liquid } from "liquidjs";
 import { once } from "node:events";
@@ -205,6 +205,7 @@ const ClaudeCodeStdioServerSchema = z.object({
 	disabled: z.boolean().optional(),
 	instruction: z.string().optional(),
 	timeout: z.number().positive().optional(),
+	requestTimeout: z.number().positive().optional(),
 	config: AdditionalConfigSchema
 });
 const ClaudeCodeHttpServerSchema = z.object({
@@ -214,6 +215,7 @@ const ClaudeCodeHttpServerSchema = z.object({
 	disabled: z.boolean().optional(),
 	instruction: z.string().optional(),
 	timeout: z.number().positive().optional(),
+	requestTimeout: z.number().positive().optional(),
 	config: AdditionalConfigSchema
 });
 const ClaudeCodeServerConfigSchema = z.union([ClaudeCodeStdioServerSchema, ClaudeCodeHttpServerSchema]);
@@ -286,6 +288,7 @@ const McpServerConfigSchema = z.discriminatedUnion("transport", [
 		omitToolDescription: z.boolean().optional(),
 		prompts: z.record(z.string(), InternalPromptConfigSchema).optional(),
 		timeout: z.number().positive().optional(),
+		requestTimeout: z.number().positive().optional(),
 		transport: z.literal("stdio"),
 		config: McpStdioConfigSchema
 	}),
@@ -296,6 +299,7 @@ const McpServerConfigSchema = z.discriminatedUnion("transport", [
 		omitToolDescription: z.boolean().optional(),
 		prompts: z.record(z.string(), InternalPromptConfigSchema).optional(),
 		timeout: z.number().positive().optional(),
+		requestTimeout: z.number().positive().optional(),
 		transport: z.literal("http"),
 		config: McpHttpConfigSchema
 	}),
@@ -306,6 +310,7 @@ const McpServerConfigSchema = z.discriminatedUnion("transport", [
 		omitToolDescription: z.boolean().optional(),
 		prompts: z.record(z.string(), InternalPromptConfigSchema).optional(),
 		timeout: z.number().positive().optional(),
+		requestTimeout: z.number().positive().optional(),
 		transport: z.literal("sse"),
 		config: McpSseConfigSchema
 	})
@@ -341,6 +346,7 @@ function transformClaudeCodeConfig(claudeConfig) {
 				omitToolDescription: stdioConfig.config?.omitToolDescription,
 				prompts: stdioConfig.config?.prompts,
 				timeout: stdioConfig.timeout,
+				requestTimeout: stdioConfig.requestTimeout,
 				transport: "stdio",
 				config: {
 					command: interpolatedCommand,
@@ -360,6 +366,7 @@ function transformClaudeCodeConfig(claudeConfig) {
 				omitToolDescription: httpConfig.config?.omitToolDescription,
 				prompts: httpConfig.config?.prompts,
 				timeout: httpConfig.timeout,
+				requestTimeout: httpConfig.requestTimeout,
 				transport,
 				config: {
 					url: interpolatedUrl,
@@ -1424,6 +1431,14 @@ var DefinitionsCacheService = class {
 /** Default connection timeout in milliseconds (30 seconds) */
 const DEFAULT_CONNECTION_TIMEOUT_MS = 3e4;
 /**
+* Checks if an error is a session-related error from an HTTP backend
+* (e.g., downstream server restarted and no longer recognizes the session ID).
+*/
+function isSessionError(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	return message.includes("unknown session") || message.includes("Session not found");
+}
+/**
 * MCP Client wrapper for managing individual server connections
 * This is an internal class used by McpClientManagerService
 */
@@ -1437,6 +1452,7 @@ var McpClient = class {
 	client;
 	childProcess;
 	connected = false;
+	reconnectFn;
 	constructor(serverName, transport, client, config) {
 		this.serverName = serverName;
 		this.serverInstruction = config.instruction;
@@ -1452,34 +1468,77 @@ var McpClient = class {
 	setConnected(connected) {
 		this.connected = connected;
 	}
+	/**
+	* Sets a reconnection function that creates a fresh Client and transport.
+	* Called automatically by withSessionRetry when a session error is detected
+	* (e.g., downstream HTTP server restarted and the old session ID is invalid).
+	*/
+	setReconnectFn(fn) {
+		this.reconnectFn = fn;
+	}
+	/**
+	* Wraps an operation with automatic retry on session errors.
+	* If the operation fails with a session error (e.g., downstream server restarted),
+	* reconnects and retries once.
+	*/
+	async withSessionRetry(operation) {
+		try {
+			return await operation();
+		} catch (error) {
+			if (!this.reconnectFn || !isSessionError(error)) throw error;
+			console.error(`Session error for ${this.serverName}, reconnecting: ${error instanceof Error ? error.message : String(error)}`);
+			try {
+				await this.client.close();
+			} catch (closeError) {
+				console.error(`Failed to close stale client for ${this.serverName}:`, closeError);
+			}
+			const result = await this.reconnectFn();
+			this.client = result.client;
+			if (result.childProcess) this.childProcess = result.childProcess;
+			return await operation();
+		}
+	}
 	async listTools() {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return (await this.client.listTools()).tools;
+		return this.withSessionRetry(async () => {
+			return (await this.client.listTools()).tools;
+		});
 	}
 	async listResources() {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return (await this.client.listResources()).resources;
+		return this.withSessionRetry(async () => {
+			return (await this.client.listResources()).resources;
+		});
 	}
 	async listPrompts() {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return (await this.client.listPrompts()).prompts;
+		return this.withSessionRetry(async () => {
+			return (await this.client.listPrompts()).prompts;
+		});
 	}
-	async callTool(name, args) {
+	async callTool(name, args, options) {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return await this.client.callTool({
-			name,
-			arguments: args
+		return this.withSessionRetry(async () => {
+			const requestOptions = options?.timeout ? { timeout: options.timeout } : void 0;
+			return await this.client.callTool({
+				name,
+				arguments: args
+			}, void 0, requestOptions);
 		});
 	}
 	async readResource(uri) {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return await this.client.readResource({ uri });
+		return this.withSessionRetry(async () => {
+			return await this.client.readResource({ uri });
+		});
 	}
 	async getPrompt(name, args) {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return await this.client.getPrompt({
-			name,
-			arguments: args
+		return this.withSessionRetry(async () => {
+			return await this.client.getPrompt({
+				name,
+				arguments: args
+			});
 		});
 	}
 	async close() {
@@ -1530,6 +1589,9 @@ var McpClientManagerService = class {
 	getKnownServerNames() {
 		return Array.from(this.serverConfigs.keys());
 	}
+	getServerRequestTimeout(serverName) {
+		return this.serverConfigs.get(serverName)?.requestTimeout;
+	}
 	async ensureConnected(serverName) {
 		const existingClient = this.clients.get(serverName);
 		if (existingClient) return existingClient;
@@ -1560,6 +1622,20 @@ var McpClientManagerService = class {
 		try {
 			await Promise.race([this.performConnection(mcpClient, config), new Promise((_, reject) => setTimeout(() => reject(/* @__PURE__ */ new Error(`Connection timeout after ${timeoutMs}ms`)), timeoutMs))]);
 			mcpClient.setConnected(true);
+			if (config.transport === "http" || config.transport === "sse") mcpClient.setReconnectFn(async () => {
+				try {
+					const newClient = new Client({
+						name: "@agiflowai/one-mcp-client",
+						version: "0.1.0"
+					}, { capabilities: {} });
+					const newMcpClient = new McpClient(serverName, config.transport, newClient, {});
+					await this.performConnection(newMcpClient, config);
+					return { client: newClient };
+				} catch (error) {
+					console.error(`Failed to reconnect to ${serverName}:`, error);
+					throw error;
+				}
+			});
 			if (!mcpClient.serverInstruction) try {
 				const serverInstruction = mcpClient["client"].getInstructions();
 				if (serverInstruction) mcpClient.serverInstruction = serverInstruction;
@@ -2708,7 +2784,8 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 					}],
 					isError: true
 				};
-				return await client.callTool(actualToolName, toolArgs);
+				const reqTimeout = this.clientManager.getServerRequestTimeout(serverName);
+				return await client.callTool(actualToolName, toolArgs, reqTimeout ? { timeout: reqTimeout } : void 0);
 			} catch (error) {
 				return {
 					content: [{
@@ -2743,7 +2820,9 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 			};
 			try {
 				const targetServerName = matchingServers[0];
-				return await (await this.clientManager.ensureConnected(targetServerName)).callTool(actualToolName, toolArgs);
+				const client = await this.clientManager.ensureConnected(targetServerName);
+				const targetReqTimeout = this.clientManager.getServerRequestTimeout(targetServerName);
+				return await client.callTool(actualToolName, toolArgs, targetReqTimeout ? { timeout: targetReqTimeout } : void 0);
 			} catch (error) {
 				return {
 					content: [{
@@ -2767,7 +2846,7 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 
 //#endregion
 //#region package.json
-var version = "0.3.15";
+var version = "0.3.17";
 
 //#endregion
 //#region src/server/index.ts

package/dist/{src-BRqEdbha.cjs → src-hm1dRqUF.cjs}

@@ -36,8 +36,8 @@ let node_crypto = require("node:crypto");
 let node_path = require("node:path");
 let node_os = require("node:os");
 let __modelcontextprotocol_sdk_client_index_js = require("@modelcontextprotocol/sdk/client/index.js");
-let __modelcontextprotocol_sdk_client_stdio_js = require("@modelcontextprotocol/sdk/client/stdio.js");
 let __modelcontextprotocol_sdk_client_sse_js = require("@modelcontextprotocol/sdk/client/sse.js");
+let __modelcontextprotocol_sdk_client_stdio_js = require("@modelcontextprotocol/sdk/client/stdio.js");
 let __modelcontextprotocol_sdk_client_streamableHttp_js = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
 let liquidjs = require("liquidjs");
 let node_events = require("node:events");
@@ -234,6 +234,7 @@ const ClaudeCodeStdioServerSchema = zod.z.object({
 	disabled: zod.z.boolean().optional(),
 	instruction: zod.z.string().optional(),
 	timeout: zod.z.number().positive().optional(),
+	requestTimeout: zod.z.number().positive().optional(),
 	config: AdditionalConfigSchema
 });
 const ClaudeCodeHttpServerSchema = zod.z.object({
@@ -243,6 +244,7 @@ const ClaudeCodeHttpServerSchema = zod.z.object({
 	disabled: zod.z.boolean().optional(),
 	instruction: zod.z.string().optional(),
 	timeout: zod.z.number().positive().optional(),
+	requestTimeout: zod.z.number().positive().optional(),
 	config: AdditionalConfigSchema
 });
 const ClaudeCodeServerConfigSchema = zod.z.union([ClaudeCodeStdioServerSchema, ClaudeCodeHttpServerSchema]);
@@ -315,6 +317,7 @@ const McpServerConfigSchema = zod.z.discriminatedUnion("transport", [
 		omitToolDescription: zod.z.boolean().optional(),
 		prompts: zod.z.record(zod.z.string(), InternalPromptConfigSchema).optional(),
 		timeout: zod.z.number().positive().optional(),
+		requestTimeout: zod.z.number().positive().optional(),
 		transport: zod.z.literal("stdio"),
 		config: McpStdioConfigSchema
 	}),
@@ -325,6 +328,7 @@ const McpServerConfigSchema = zod.z.discriminatedUnion("transport", [
 		omitToolDescription: zod.z.boolean().optional(),
 		prompts: zod.z.record(zod.z.string(), InternalPromptConfigSchema).optional(),
 		timeout: zod.z.number().positive().optional(),
+		requestTimeout: zod.z.number().positive().optional(),
 		transport: zod.z.literal("http"),
 		config: McpHttpConfigSchema
 	}),
@@ -335,6 +339,7 @@ const McpServerConfigSchema = zod.z.discriminatedUnion("transport", [
 		omitToolDescription: zod.z.boolean().optional(),
 		prompts: zod.z.record(zod.z.string(), InternalPromptConfigSchema).optional(),
 		timeout: zod.z.number().positive().optional(),
+		requestTimeout: zod.z.number().positive().optional(),
 		transport: zod.z.literal("sse"),
 		config: McpSseConfigSchema
 	})
@@ -370,6 +375,7 @@ function transformClaudeCodeConfig(claudeConfig) {
 				omitToolDescription: stdioConfig.config?.omitToolDescription,
 				prompts: stdioConfig.config?.prompts,
 				timeout: stdioConfig.timeout,
+				requestTimeout: stdioConfig.requestTimeout,
 				transport: "stdio",
 				config: {
 					command: interpolatedCommand,
@@ -389,6 +395,7 @@ function transformClaudeCodeConfig(claudeConfig) {
 				omitToolDescription: httpConfig.config?.omitToolDescription,
 				prompts: httpConfig.config?.prompts,
 				timeout: httpConfig.timeout,
+				requestTimeout: httpConfig.requestTimeout,
 				transport,
 				config: {
 					url: interpolatedUrl,
@@ -1453,6 +1460,14 @@ var DefinitionsCacheService = class {
 /** Default connection timeout in milliseconds (30 seconds) */
 const DEFAULT_CONNECTION_TIMEOUT_MS = 3e4;
 /**
+* Checks if an error is a session-related error from an HTTP backend
+* (e.g., downstream server restarted and no longer recognizes the session ID).
+*/
+function isSessionError(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	return message.includes("unknown session") || message.includes("Session not found");
+}
+/**
 * MCP Client wrapper for managing individual server connections
 * This is an internal class used by McpClientManagerService
 */
@@ -1466,6 +1481,7 @@ var McpClient = class {
 	client;
 	childProcess;
 	connected = false;
+	reconnectFn;
 	constructor(serverName, transport, client, config) {
 		this.serverName = serverName;
 		this.serverInstruction = config.instruction;
@@ -1481,34 +1497,77 @@ var McpClient = class {
 	setConnected(connected) {
 		this.connected = connected;
 	}
+	/**
+	* Sets a reconnection function that creates a fresh Client and transport.
+	* Called automatically by withSessionRetry when a session error is detected
+	* (e.g., downstream HTTP server restarted and the old session ID is invalid).
+	*/
+	setReconnectFn(fn) {
+		this.reconnectFn = fn;
+	}
+	/**
+	* Wraps an operation with automatic retry on session errors.
+	* If the operation fails with a session error (e.g., downstream server restarted),
+	* reconnects and retries once.
+	*/
+	async withSessionRetry(operation) {
+		try {
+			return await operation();
+		} catch (error) {
+			if (!this.reconnectFn || !isSessionError(error)) throw error;
+			console.error(`Session error for ${this.serverName}, reconnecting: ${error instanceof Error ? error.message : String(error)}`);
+			try {
+				await this.client.close();
+			} catch (closeError) {
+				console.error(`Failed to close stale client for ${this.serverName}:`, closeError);
+			}
+			const result = await this.reconnectFn();
+			this.client = result.client;
+			if (result.childProcess) this.childProcess = result.childProcess;
+			return await operation();
+		}
+	}
 	async listTools() {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return (await this.client.listTools()).tools;
+		return this.withSessionRetry(async () => {
+			return (await this.client.listTools()).tools;
+		});
 	}
 	async listResources() {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return (await this.client.listResources()).resources;
+		return this.withSessionRetry(async () => {
+			return (await this.client.listResources()).resources;
+		});
 	}
 	async listPrompts() {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return (await this.client.listPrompts()).prompts;
+		return this.withSessionRetry(async () => {
+			return (await this.client.listPrompts()).prompts;
+		});
 	}
-	async callTool(name, args) {
+	async callTool(name, args, options) {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return await this.client.callTool({
-			name,
-			arguments: args
+		return this.withSessionRetry(async () => {
+			const requestOptions = options?.timeout ? { timeout: options.timeout } : void 0;
+			return await this.client.callTool({
+				name,
+				arguments: args
+			}, void 0, requestOptions);
 		});
 	}
 	async readResource(uri) {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return await this.client.readResource({ uri });
+		return this.withSessionRetry(async () => {
+			return await this.client.readResource({ uri });
+		});
 	}
 	async getPrompt(name, args) {
 		if (!this.connected) throw new Error(`Client for ${this.serverName} is not connected`);
-		return await this.client.getPrompt({
-			name,
-			arguments: args
+		return this.withSessionRetry(async () => {
+			return await this.client.getPrompt({
+				name,
+				arguments: args
+			});
 		});
 	}
 	async close() {
@@ -1559,6 +1618,9 @@ var McpClientManagerService = class {
 	getKnownServerNames() {
 		return Array.from(this.serverConfigs.keys());
 	}
+	getServerRequestTimeout(serverName) {
+		return this.serverConfigs.get(serverName)?.requestTimeout;
+	}
 	async ensureConnected(serverName) {
 		const existingClient = this.clients.get(serverName);
 		if (existingClient) return existingClient;
@@ -1589,6 +1651,20 @@ var McpClientManagerService = class {
 		try {
 			await Promise.race([this.performConnection(mcpClient, config), new Promise((_, reject) => setTimeout(() => reject(/* @__PURE__ */ new Error(`Connection timeout after ${timeoutMs}ms`)), timeoutMs))]);
 			mcpClient.setConnected(true);
+			if (config.transport === "http" || config.transport === "sse") mcpClient.setReconnectFn(async () => {
+				try {
+					const newClient = new __modelcontextprotocol_sdk_client_index_js.Client({
+						name: "@agiflowai/one-mcp-client",
+						version: "0.1.0"
+					}, { capabilities: {} });
+					const newMcpClient = new McpClient(serverName, config.transport, newClient, {});
+					await this.performConnection(newMcpClient, config);
+					return { client: newClient };
+				} catch (error) {
+					console.error(`Failed to reconnect to ${serverName}:`, error);
+					throw error;
+				}
+			});
 			if (!mcpClient.serverInstruction) try {
 				const serverInstruction = mcpClient["client"].getInstructions();
 				if (serverInstruction) mcpClient.serverInstruction = serverInstruction;
@@ -2737,7 +2813,8 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 					}],
 					isError: true
 				};
-				return await client.callTool(actualToolName, toolArgs);
+				const reqTimeout = this.clientManager.getServerRequestTimeout(serverName);
+				return await client.callTool(actualToolName, toolArgs, reqTimeout ? { timeout: reqTimeout } : void 0);
 			} catch (error) {
 				return {
 					content: [{
@@ -2772,7 +2849,9 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 			};
 			try {
 				const targetServerName = matchingServers[0];
-				return await (await this.clientManager.ensureConnected(targetServerName)).callTool(actualToolName, toolArgs);
+				const client = await this.clientManager.ensureConnected(targetServerName);
+				const targetReqTimeout = this.clientManager.getServerRequestTimeout(targetServerName);
+				return await client.callTool(actualToolName, toolArgs, targetReqTimeout ? { timeout: targetReqTimeout } : void 0);
 			} catch (error) {
 				return {
 					content: [{
@@ -2796,7 +2875,7 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 
 //#endregion
 //#region package.json
-var version = "0.3.15";
+var version = "0.3.17";
 
 //#endregion
 //#region src/server/index.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agiflowai/one-mcp",
   "description": "One MCP server package",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "license": "AGPL-3.0",
   "keywords": [
     "mcp",