@elizaos/plugin-mcp 1.7.1 → 1.8.0

package/dist/cjs/index.cjs

@@ -38,521 +38,23 @@ var __export = (target, all) => {
       set: (newValue) => all[name] = () => newValue
     });
 };
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-
-// src/tool-compatibility/providers/openai.ts
-var exports_openai = {};
-__export(exports_openai, {
-  OpenAIReasoningMcpCompatibility: () => OpenAIReasoningMcpCompatibility,
-  OpenAIMcpCompatibility: () => OpenAIMcpCompatibility2
-});
-var OpenAIMcpCompatibility2, OpenAIReasoningMcpCompatibility;
-var init_openai = __esm(() => {
-  OpenAIMcpCompatibility2 = class OpenAIMcpCompatibility2 extends McpToolCompatibility {
-    constructor(modelInfo2) {
-      super(modelInfo2);
-    }
-    shouldApply() {
-      return this.modelInfo.provider === "openai" && (!this.modelInfo.supportsStructuredOutputs || this.modelInfo.isReasoningModel === true);
-    }
-    getUnsupportedStringProperties() {
-      const baseUnsupported = ["format"];
-      if (this.modelInfo.isReasoningModel === true) {
-        return [...baseUnsupported, "pattern"];
-      }
-      if (this.modelInfo.modelId.includes("gpt-3.5") || this.modelInfo.modelId.includes("davinci")) {
-        return [...baseUnsupported, "pattern"];
-      }
-      return baseUnsupported;
-    }
-    getUnsupportedNumberProperties() {
-      if (this.modelInfo.isReasoningModel === true) {
-        return ["exclusiveMinimum", "exclusiveMaximum", "multipleOf"];
-      }
-      return [];
-    }
-    getUnsupportedArrayProperties() {
-      if (this.modelInfo.isReasoningModel === true) {
-        return ["uniqueItems"];
-      }
-      return [];
-    }
-    getUnsupportedObjectProperties() {
-      return ["minProperties", "maxProperties"];
-    }
-  };
-  OpenAIReasoningMcpCompatibility = class OpenAIReasoningMcpCompatibility extends McpToolCompatibility {
-    constructor(modelInfo2) {
-      super(modelInfo2);
-    }
-    shouldApply() {
-      return this.modelInfo.provider === "openai" && this.modelInfo.isReasoningModel === true;
-    }
-    getUnsupportedStringProperties() {
-      return ["format", "pattern", "minLength", "maxLength"];
-    }
-    getUnsupportedNumberProperties() {
-      return ["exclusiveMinimum", "exclusiveMaximum", "multipleOf"];
-    }
-    getUnsupportedArrayProperties() {
-      return ["uniqueItems", "minItems", "maxItems"];
-    }
-    getUnsupportedObjectProperties() {
-      return ["minProperties", "maxProperties", "additionalProperties"];
-    }
-    mergeDescription(originalDescription, constraints) {
-      const constraintText = this.formatConstraintsForReasoningModel(constraints);
-      if (originalDescription) {
-        return `${originalDescription}
-
-IMPORTANT: ${constraintText}`;
-      }
-      return `IMPORTANT: ${constraintText}`;
-    }
-    formatConstraintsForReasoningModel(constraints) {
-      const rules = [];
-      if (constraints.minLength) {
-        rules.push(`minimum ${constraints.minLength} characters`);
-      }
-      if (constraints.maxLength) {
-        rules.push(`maximum ${constraints.maxLength} characters`);
-      }
-      if (constraints.minimum !== undefined) {
-        rules.push(`must be >= ${constraints.minimum}`);
-      }
-      if (constraints.maximum !== undefined) {
-        rules.push(`must be <= ${constraints.maximum}`);
-      }
-      if (constraints.format === "email") {
-        rules.push(`must be a valid email address`);
-      }
-      if (constraints.format === "uri" || constraints.format === "url") {
-        rules.push(`must be a valid URL`);
-      }
-      if (constraints.format === "uuid") {
-        rules.push(`must be a valid UUID`);
-      }
-      if (constraints.pattern) {
-        rules.push(`must match pattern: ${constraints.pattern}`);
-      }
-      if (constraints.enum) {
-        rules.push(`must be one of: ${constraints.enum.join(", ")}`);
-      }
-      if (constraints.minItems) {
-        rules.push(`array must have at least ${constraints.minItems} items`);
-      }
-      if (constraints.maxItems) {
-        rules.push(`array must have at most ${constraints.maxItems} items`);
-      }
-      return rules.length > 0 ? rules.join(", ") : JSON.stringify(constraints);
-    }
-  };
-});
-
-// src/tool-compatibility/providers/anthropic.ts
-var exports_anthropic = {};
-__export(exports_anthropic, {
-  AnthropicMcpCompatibility: () => AnthropicMcpCompatibility2
-});
-var AnthropicMcpCompatibility2;
-var init_anthropic = __esm(() => {
-  AnthropicMcpCompatibility2 = class AnthropicMcpCompatibility2 extends McpToolCompatibility {
-    constructor(modelInfo2) {
-      super(modelInfo2);
-    }
-    shouldApply() {
-      return this.modelInfo.provider === "anthropic";
-    }
-    getUnsupportedStringProperties() {
-      return [];
-    }
-    getUnsupportedNumberProperties() {
-      return [];
-    }
-    getUnsupportedArrayProperties() {
-      return [];
-    }
-    getUnsupportedObjectProperties() {
-      return ["additionalProperties"];
-    }
-    mergeDescription(originalDescription, constraints) {
-      const constraintHints = this.formatConstraintsForAnthropic(constraints);
-      if (originalDescription && constraintHints) {
-        return `${originalDescription}. ${constraintHints}`;
-      } else if (constraintHints) {
-        return constraintHints;
-      }
-      return originalDescription || "";
-    }
-    formatConstraintsForAnthropic(constraints) {
-      const hints = [];
-      if (constraints.additionalProperties === false) {
-        hints.push("Only use the specified properties");
-      }
-      if (constraints.format === "date-time") {
-        hints.push("Use ISO 8601 date-time format");
-      }
-      if (constraints.pattern) {
-        hints.push(`Must match the pattern: ${constraints.pattern}`);
-      }
-      return hints.join(". ");
-    }
-  };
-});
-
-// src/tool-compatibility/providers/google.ts
-var exports_google = {};
-__export(exports_google, {
-  GoogleMcpCompatibility: () => GoogleMcpCompatibility2
-});
-var GoogleMcpCompatibility2;
-var init_google = __esm(() => {
-  GoogleMcpCompatibility2 = class GoogleMcpCompatibility2 extends McpToolCompatibility {
-    constructor(modelInfo2) {
-      super(modelInfo2);
-    }
-    shouldApply() {
-      return this.modelInfo.provider === "google";
-    }
-    getUnsupportedStringProperties() {
-      return ["minLength", "maxLength", "pattern", "format"];
-    }
-    getUnsupportedNumberProperties() {
-      return ["minimum", "maximum", "exclusiveMinimum", "exclusiveMaximum", "multipleOf"];
-    }
-    getUnsupportedArrayProperties() {
-      return ["minItems", "maxItems", "uniqueItems"];
-    }
-    getUnsupportedObjectProperties() {
-      return ["minProperties", "maxProperties", "additionalProperties"];
-    }
-    mergeDescription(originalDescription, constraints) {
-      const constraintText = this.formatConstraintsForGoogle(constraints);
-      if (originalDescription && constraintText) {
-        return `${originalDescription}
-
-Constraints: ${constraintText}`;
-      } else if (constraintText) {
-        return `Constraints: ${constraintText}`;
-      }
-      return originalDescription || "";
-    }
-    formatConstraintsForGoogle(constraints) {
-      const rules = [];
-      if (constraints.minLength) {
-        rules.push(`text must be at least ${constraints.minLength} characters long`);
-      }
-      if (constraints.maxLength) {
-        rules.push(`text must be no more than ${constraints.maxLength} characters long`);
-      }
-      if (constraints.minimum !== undefined) {
-        rules.push(`number must be at least ${constraints.minimum}`);
-      }
-      if (constraints.maximum !== undefined) {
-        rules.push(`number must be no more than ${constraints.maximum}`);
-      }
-      if (constraints.exclusiveMinimum !== undefined) {
-        rules.push(`number must be greater than ${constraints.exclusiveMinimum}`);
-      }
-      if (constraints.exclusiveMaximum !== undefined) {
-        rules.push(`number must be less than ${constraints.exclusiveMaximum}`);
-      }
-      if (constraints.multipleOf) {
-        rules.push(`number must be a multiple of ${constraints.multipleOf}`);
-      }
-      if (constraints.format === "email") {
-        rules.push(`must be a valid email address`);
-      }
-      if (constraints.format === "uri" || constraints.format === "url") {
-        rules.push(`must be a valid URL starting with http:// or https://`);
-      }
-      if (constraints.format === "uuid") {
-        rules.push(`must be a valid UUID in the format xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`);
-      }
-      if (constraints.format === "date-time") {
-        rules.push(`must be a valid ISO 8601 date-time (e.g., 2023-12-25T10:30:00Z)`);
-      }
-      if (constraints.pattern) {
-        rules.push(`must match the regular expression pattern: ${constraints.pattern}`);
-      }
-      if (constraints.enum && Array.isArray(constraints.enum)) {
-        rules.push(`must be exactly one of these values: ${constraints.enum.join(", ")}`);
-      }
-      if (constraints.minItems) {
-        rules.push(`array must contain at least ${constraints.minItems} items`);
-      }
-      if (constraints.maxItems) {
-        rules.push(`array must contain no more than ${constraints.maxItems} items`);
-      }
-      if (constraints.uniqueItems === true) {
-        rules.push(`array items must all be unique (no duplicates)`);
-      }
-      if (constraints.minProperties) {
-        rules.push(`object must have at least ${constraints.minProperties} properties`);
-      }
-      if (constraints.maxProperties) {
-        rules.push(`object must have no more than ${constraints.maxProperties} properties`);
-      }
-      if (constraints.additionalProperties === false) {
-        rules.push(`object must only contain the specified properties, no additional properties allowed`);
-      }
-      return rules.join("; ");
-    }
-  };
-});
-
-// src/tool-compatibility/index.ts
-class McpToolCompatibility {
-  modelInfo;
-  constructor(modelInfo2) {
-    this.modelInfo = modelInfo2;
-  }
-  transformToolSchema(toolSchema) {
-    if (!this.shouldApply()) {
-      return toolSchema;
-    }
-    return this.processSchema(toolSchema);
-  }
-  processSchema(schema) {
-    const processed = { ...schema };
-    switch (processed.type) {
-      case "string":
-        return this.processStringSchema(processed);
-      case "number":
-      case "integer":
-        return this.processNumberSchema(processed);
-      case "array":
-        return this.processArraySchema(processed);
-      case "object":
-        return this.processObjectSchema(processed);
-      default:
-        return this.processGenericSchema(processed);
-    }
-  }
-  processStringSchema(schema) {
-    const constraints = {};
-    const processed = { ...schema };
-    if (typeof schema.minLength === "number") {
-      constraints.minLength = schema.minLength;
-    }
-    if (typeof schema.maxLength === "number") {
-      constraints.maxLength = schema.maxLength;
-    }
-    if (typeof schema.pattern === "string") {
-      constraints.pattern = schema.pattern;
-    }
-    if (typeof schema.format === "string") {
-      constraints.format = schema.format;
-    }
-    if (Array.isArray(schema.enum)) {
-      constraints.enum = schema.enum;
-    }
-    const unsupportedProps = this.getUnsupportedStringProperties();
-    for (const prop of unsupportedProps) {
-      if (prop in processed) {
-        delete processed[prop];
-      }
-    }
-    if (Object.keys(constraints).length > 0) {
-      processed.description = this.mergeDescription(schema.description, constraints);
-    }
-    return processed;
-  }
-  processNumberSchema(schema) {
-    const constraints = {};
-    const processed = { ...schema };
-    if (typeof schema.minimum === "number") {
-      constraints.minimum = schema.minimum;
-    }
-    if (typeof schema.maximum === "number") {
-      constraints.maximum = schema.maximum;
-    }
-    if (typeof schema.exclusiveMinimum === "number") {
-      constraints.exclusiveMinimum = schema.exclusiveMinimum;
-    }
-    if (typeof schema.exclusiveMaximum === "number") {
-      constraints.exclusiveMaximum = schema.exclusiveMaximum;
-    }
-    if (typeof schema.multipleOf === "number") {
-      constraints.multipleOf = schema.multipleOf;
-    }
-    const unsupportedProps = this.getUnsupportedNumberProperties();
-    for (const prop of unsupportedProps) {
-      if (prop in processed) {
-        delete processed[prop];
-      }
-    }
-    if (Object.keys(constraints).length > 0) {
-      processed.description = this.mergeDescription(schema.description, constraints);
-    }
-    return processed;
-  }
-  processArraySchema(schema) {
-    const constraints = {};
-    const processed = { ...schema };
-    if (typeof schema.minItems === "number") {
-      constraints.minItems = schema.minItems;
-    }
-    if (typeof schema.maxItems === "number") {
-      constraints.maxItems = schema.maxItems;
-    }
-    if (typeof schema.uniqueItems === "boolean") {
-      constraints.uniqueItems = schema.uniqueItems;
-    }
-    if (schema.items && typeof schema.items === "object" && !Array.isArray(schema.items)) {
-      processed.items = this.processSchema(schema.items);
-    }
-    const unsupportedProps = this.getUnsupportedArrayProperties();
-    for (const prop of unsupportedProps) {
-      if (prop in processed) {
-        delete processed[prop];
-      }
-    }
-    if (Object.keys(constraints).length > 0) {
-      processed.description = this.mergeDescription(schema.description, constraints);
-    }
-    return processed;
-  }
-  processObjectSchema(schema) {
-    const constraints = {};
-    const processed = { ...schema };
-    if (typeof schema.minProperties === "number") {
-      constraints.minProperties = schema.minProperties;
-    }
-    if (typeof schema.maxProperties === "number") {
-      constraints.maxProperties = schema.maxProperties;
-    }
-    if (typeof schema.additionalProperties === "boolean") {
-      constraints.additionalProperties = schema.additionalProperties;
-    }
-    if (schema.properties && typeof schema.properties === "object") {
-      processed.properties = {};
-      for (const [key, prop] of Object.entries(schema.properties)) {
-        if (typeof prop === "object" && !Array.isArray(prop)) {
-          processed.properties[key] = this.processSchema(prop);
-        } else {
-          processed.properties[key] = prop;
-        }
-      }
-    }
-    const unsupportedProps = this.getUnsupportedObjectProperties();
-    for (const prop of unsupportedProps) {
-      if (prop in processed) {
-        delete processed[prop];
-      }
-    }
-    if (Object.keys(constraints).length > 0) {
-      processed.description = this.mergeDescription(schema.description, constraints);
-    }
-    return processed;
-  }
-  processGenericSchema(schema) {
-    const processed = { ...schema };
-    if (Array.isArray(schema.oneOf)) {
-      processed.oneOf = schema.oneOf.map((s) => typeof s === "object" ? this.processSchema(s) : s);
-    }
-    if (Array.isArray(schema.anyOf)) {
-      processed.anyOf = schema.anyOf.map((s) => typeof s === "object" ? this.processSchema(s) : s);
-    }
-    if (Array.isArray(schema.allOf)) {
-      processed.allOf = schema.allOf.map((s) => typeof s === "object" ? this.processSchema(s) : s);
-    }
-    return processed;
-  }
-  mergeDescription(originalDescription, constraints) {
-    const constraintJson = JSON.stringify(constraints);
-    if (originalDescription) {
-      return `${originalDescription}
-${constraintJson}`;
-    }
-    return constraintJson;
-  }
-}
-function detectModelProvider(runtime2) {
-  const modelString = runtime2?.modelProvider || runtime2?.model || "";
-  const modelId = String(modelString).toLowerCase();
-  let provider2 = "unknown";
-  let supportsStructuredOutputs = false;
-  let isReasoningModel = false;
-  if (modelId.includes("openai") || modelId.includes("gpt-") || modelId.includes("o1-") || modelId.includes("o3-")) {
-    provider2 = "openai";
-    supportsStructuredOutputs = modelId.includes("gpt-4") || modelId.includes("o1") || modelId.includes("o3");
-    isReasoningModel = modelId.includes("o1") || modelId.includes("o3");
-  } else if (modelId.includes("anthropic") || modelId.includes("claude")) {
-    provider2 = "anthropic";
-    supportsStructuredOutputs = true;
-  } else if (modelId.includes("google") || modelId.includes("gemini")) {
-    provider2 = "google";
-    supportsStructuredOutputs = true;
-  } else if (modelId.includes("openrouter")) {
-    provider2 = "openrouter";
-    supportsStructuredOutputs = false;
-  }
-  return {
-    provider: provider2,
-    modelId,
-    supportsStructuredOutputs,
-    isReasoningModel
-  };
-}
-async function createMcpToolCompatibility(runtime2) {
-  const modelInfo2 = detectModelProvider(runtime2);
-  try {
-    switch (modelInfo2.provider) {
-      case "openai":
-        const { OpenAIMcpCompatibility: OpenAIMcpCompatibility3 } = await Promise.resolve().then(() => (init_openai(), exports_openai));
-        return new OpenAIMcpCompatibility3(modelInfo2);
-      case "anthropic":
-        const { AnthropicMcpCompatibility: AnthropicMcpCompatibility3 } = await Promise.resolve().then(() => (init_anthropic(), exports_anthropic));
-        return new AnthropicMcpCompatibility3(modelInfo2);
-      case "google":
-        const { GoogleMcpCompatibility: GoogleMcpCompatibility3 } = await Promise.resolve().then(() => (init_google(), exports_google));
-        return new GoogleMcpCompatibility3(modelInfo2);
-      default:
-        return null;
-    }
-  } catch (error) {
-    console.warn("Failed to load compatibility provider:", error);
-    return null;
-  }
-}
-function createMcpToolCompatibilitySync(runtime) {
-  const modelInfo = detectModelProvider(runtime);
-  try {
-    switch (modelInfo.provider) {
-      case "openai":
-        const OpenAIModule = eval("require")("./providers/openai");
-        const { OpenAIMcpCompatibility } = OpenAIModule;
-        return new OpenAIMcpCompatibility(modelInfo);
-      case "anthropic":
-        const AnthropicModule = eval("require")("./providers/anthropic");
-        const { AnthropicMcpCompatibility } = AnthropicModule;
-        return new AnthropicMcpCompatibility(modelInfo);
-      case "google":
-        const GoogleModule = eval("require")("./providers/google");
-        const { GoogleMcpCompatibility } = GoogleModule;
-        return new GoogleMcpCompatibility(modelInfo);
-      default:
-        return null;
-    }
-  } catch (error) {
-    console.warn("Failed to load compatibility provider:", error);
-    return null;
-  }
-}
 
 // src/index.ts
 var exports_src = {};
 __export(exports_src, {
+  isMcpToolAction: () => isMcpToolAction,
+  getSchemaCache: () => getSchemaCache,
+  getMcpToolActionsForServer: () => getMcpToolActionsForServer,
   detectModelProvider: () => detectModelProvider,
   default: () => src_default,
   createMcpToolCompatibilitySync: () => createMcpToolCompatibilitySync,
   createMcpToolCompatibility: () => createMcpToolCompatibility,
-  ToolSelectionSchema: () => ToolSelectionSchema,
+  createMcpToolActions: () => createMcpToolActions,
+  createMcpToolAction: () => createMcpToolAction,
   ResourceSelectionSchema: () => ResourceSelectionSchema,
   McpToolCompatibility: () => McpToolCompatibility,
   McpService: () => McpService,
-  MIN_MCP_TIMEOUT_SECONDS: () => MIN_MCP_TIMEOUT_SECONDS,
+  McpSchemaCache: () => McpSchemaCache,
   MCP_SERVICE_NAME: () => MCP_SERVICE_NAME,
   MAX_RECONNECT_ATTEMPTS: () => MAX_RECONNECT_ATTEMPTS,
   INITIAL_RETRY_DELAY: () => INITIAL_RETRY_DELAY,
@@ -564,70 +66,74 @@ __export(exports_src, {
 module.exports = __toCommonJS(exports_src);
 var import_core9 = require("@elizaos/core");
 
-// src/actions/callToolAction.ts
-var import_core6 = require("@elizaos/core");
+// src/actions/readResourceAction.ts
+var import_core5 = require("@elizaos/core");
+
+// src/templates/resourceSelectionTemplate.ts
+var resourceSelectionTemplate = `
+{{{mcpProvider.text}}}
+
+{{{recentMessages}}}
+
+# Prompt
+
+You are an intelligent assistant helping select the right resource to address a user's request.
+
+CRITICAL INSTRUCTIONS:
+1. You MUST specify both a valid serverName AND uri from the list above
+2. The serverName value should match EXACTLY the server name shown in parentheses (Server: X)
+   CORRECT: "serverName": "github"  (if the server is called "github") 
+   WRONG: "serverName": "GitHub" or "Github" or any other variation
+3. The uri value should match EXACTLY the resource uri listed
+   CORRECT: "uri": "weather://San Francisco/current"  (if that's the exact uri)
+   WRONG: "uri": "weather://sanfrancisco/current" or any variation
+4. Identify the user's information need from the conversation context
+5. Select the most appropriate resource based on its description and the request
+6. If no resource seems appropriate, output {"noResourceAvailable": true}
+
+!!! YOUR RESPONSE MUST BE A VALID JSON OBJECT ONLY !!! 
+
+STRICT FORMAT REQUIREMENTS:
+- NO code block formatting (NO backticks or \`\`\`)
+- NO comments (NO // or /* */)
+- NO placeholders like "replace with...", "example", "your...", "actual", etc.
+- Every parameter value must be a concrete, usable value (not instructions to replace)
+- Use proper JSON syntax with double quotes for strings
+- NO explanatory text before or after the JSON object
+
+EXAMPLE RESPONSE:
+{
+  "serverName": "weather-server",
+  "uri": "weather://San Francisco/current",
+  "reasoning": "Based on the conversation, the user is asking about current weather in San Francisco. This resource provides up-to-date weather information for that city."
+}
+
+REMEMBER: Your response will be parsed directly as JSON. If it fails to parse, the operation will fail completely!
+`;
 
 // src/types.ts
 var MCP_SERVICE_NAME = "mcp";
 var DEFAULT_MCP_TIMEOUT_SECONDS = 60000;
-var MIN_MCP_TIMEOUT_SECONDS = 1;
 var DEFAULT_MAX_RETRIES = 2;
-var ToolSelectionSchema = {
-  type: "object",
-  required: ["serverName", "toolName", "arguments"],
-  properties: {
-    serverName: {
-      type: "string",
-      minLength: 1,
-      errorMessage: "serverName must not be empty"
-    },
-    toolName: {
-      type: "string",
-      minLength: 1,
-      errorMessage: "toolName must not be empty"
-    },
-    arguments: {
-      type: "object"
-    },
-    reasoning: {
-      type: "string"
-    },
-    noToolAvailable: {
-      type: "boolean"
-    }
-  }
+var MAX_RECONNECT_ATTEMPTS = 5;
+var BACKOFF_MULTIPLIER = 2;
+var INITIAL_RETRY_DELAY = 2000;
+var DEFAULT_PING_CONFIG = {
+  enabled: true,
+  intervalMs: 1e4,
+  timeoutMs: 5000,
+  failuresBeforeDisconnect: 3
 };
 var ResourceSelectionSchema = {
   type: "object",
   required: ["serverName", "uri"],
   properties: {
-    serverName: {
-      type: "string",
-      minLength: 1,
-      errorMessage: "serverName must not be empty"
-    },
-    uri: {
-      type: "string",
-      minLength: 1,
-      errorMessage: "uri must not be empty"
-    },
-    reasoning: {
-      type: "string"
-    },
-    noResourceAvailable: {
-      type: "boolean"
-    }
+    serverName: { type: "string", minLength: 1 },
+    uri: { type: "string", minLength: 1 },
+    reasoning: { type: "string" },
+    noResourceAvailable: { type: "boolean" }
   }
 };
-var DEFAULT_PING_CONFIG = {
-  enabled: true,
-  intervalMs: 1e4,
-  timeoutMs: 5000,
-  failuresBeforeDisconnect: 3
-};
-var MAX_RECONNECT_ATTEMPTS = 5;
-var BACKOFF_MULTIPLIER = 2;
-var INITIAL_RETRY_DELAY = 2000;
 
 // src/utils/error.ts
 var import_core = require("@elizaos/core");
@@ -655,89 +161,33 @@ Your response:
 `;
 
 // src/utils/error.ts
-async function handleMcpError(state, mcpProvider, error, runtime2, message, type, callback) {
+async function handleMcpError(state, mcpProvider, error, runtime, message, type, callback) {
   const errorMessage = error instanceof Error ? error.message : String(error);
-  import_core.logger.error({ error, mcpType: type }, `Error executing MCP ${type}: ${errorMessage}`);
-  let responseText = `I'm sorry, I wasn't able to get the information you requested. There seems to be an issue with the ${type} right now. Is there something else I can help you with?`;
-  let thoughtText = `Error calling MCP ${type} and failed to generate a custom response. Providing a generic fallback response.`;
+  import_core.logger.error({ error, mcpType: type }, `MCP ${type} error: ${errorMessage}`);
+  const fallbackText = `I wasn't able to complete that request. There's an issue with the ${type}. Can I help with something else?`;
+  let responseText = fallbackText;
   if (callback) {
-    const enhancedState = {
-      ...state,
-      values: {
-        ...state.values,
-        mcpProvider,
-        userMessage: message.content.text || "",
-        error: errorMessage
-      }
-    };
-    const prompt = import_core.composePromptFromState({
-      state: enhancedState,
-      template: errorAnalysisPrompt
-    });
     try {
-      const errorResponse = await runtime2.useModel(import_core.ModelType.TEXT_SMALL, {
-        prompt
-      });
-      responseText = errorResponse;
-      thoughtText = `Error calling MCP ${type}: ${errorMessage}. Providing a helpful response to the user.`;
-      await callback({
-        thought: thoughtText,
-        text: responseText,
-        actions: ["REPLY"]
-      });
-    } catch (modelError) {
-      import_core.logger.error({ error: modelError instanceof Error ? modelError.message : String(modelError) }, "Failed to generate error response");
-      await callback({
-        thought: thoughtText,
-        text: responseText,
-        actions: ["REPLY"]
+      const prompt = import_core.composePromptFromState({
+        state: {
+          ...state,
+          values: { ...state.values, mcpProvider, userMessage: message.content.text || "", error: errorMessage }
+        },
+        template: errorAnalysisPrompt
       });
-    }
+      responseText = await runtime.useModel(import_core.ModelType.TEXT_SMALL, { prompt });
+    } catch {}
+    await callback({ thought: `MCP ${type} error: ${errorMessage}`, text: responseText, actions: ["REPLY"] });
   }
   return {
     text: `Failed to execute MCP ${type}`,
-    values: {
-      success: false,
-      error: errorMessage,
-      errorType: type
-    },
-    data: {
-      actionName: type === "tool" ? "CALL_MCP_TOOL" : "READ_MCP_RESOURCE",
-      error: errorMessage,
-      mcpType: type
-    },
+    values: { success: false, error: errorMessage, errorType: type },
+    data: { actionName: type === "tool" ? "CALL_MCP_TOOL" : "READ_MCP_RESOURCE", error: errorMessage },
     success: false,
     error: error instanceof Error ? error : new Error(errorMessage)
   };
 }
 
-// src/utils/handler.ts
-async function handleNoToolAvailable(callback, toolSelection) {
-  const responseText = "I don't have a specific tool that can help with that request. Let me try to assist you directly instead.";
-  const thoughtText = "No appropriate MCP tool available for this request. Falling back to direct assistance.";
-  if (callback && toolSelection?.noToolAvailable) {
-    await callback({
-      text: responseText,
-      thought: thoughtText,
-      actions: ["REPLY"]
-    });
-  }
-  return {
-    text: responseText,
-    values: {
-      success: true,
-      noToolAvailable: true,
-      fallbackToDirectAssistance: true
-    },
-    data: {
-      actionName: "CALL_MCP_TOOL",
-      noToolAvailable: true,
-      reason: toolSelection?.reasoning || "No appropriate tool available"
-    },
-    success: true
-  };
-}
-
 // src/utils/processing.ts
 var import_core2 = require("@elizaos/core");
 var import_core3 = require("@elizaos/core");
@@ -771,49 +221,19 @@ Instructions:
 Your response (written as if directly to the user):
 `;
 
-// src/templates/toolReasoningTemplate.ts
-var toolReasoningTemplate = `
-{{{mcpProvider.text}}}
-
-{{{recentMessages}}}
-
-# Prompt
-
-You are a helpful assistant responding to a user's request. You've just used the "{{{toolName}}}" tool from the "{{{serverName}}}" server to help answer this request.
-
-Original user request: "{{{userMessage}}}"
-
-Tool response:
-{{{toolOutput}}}
-
-{{#if hasAttachments}}
-The tool also returned images or other media that will be shared with the user.
-{{/if}}
-
-Instructions:
-1. Analyze how well the tool's response addresses the user's specific question or need
-2. Identify the most relevant information from the tool's output
-3. Create a natural, conversational response that incorporates this information
-4. If the tool's response is insufficient, acknowledge its limitations and explain what you can determine
-5. Do not start with phrases like "I used the X tool" or "Here's what I found" - instead, integrate the information naturally
-6. Maintain your helpful, intelligent assistant personality while presenting the information
-
-Your response (written as if directly to the user):
-`;
-
 // src/utils/mcp.ts
 var NO_DESC = "No description";
-async function createMcpMemory(runtime2, message, type, serverName, content, metadata) {
-  const memory = await runtime2.addEmbeddingToMemory({
+async function createMcpMemory(runtime, message, type, serverName, content, metadata) {
+  const memory = await runtime.addEmbeddingToMemory({
     entityId: message.entityId,
-    agentId: runtime2.agentId,
+    agentId: runtime.agentId,
     roomId: message.roomId,
     content: {
       text: `Used "${type}" from "${serverName}". Content: ${content}`,
       metadata: { ...metadata, serverName }
     }
   });
-  await runtime2.createMemory(memory, type === "resource" ? "resources" : "tools", true);
+  await runtime.createMemory(memory, type === "resource" ? "resources" : "tools", true);
 }
 function buildMcpProviderData(servers) {
   if (servers.length === 0) {
@@ -870,24 +290,20 @@ function processResourceResult(result, uri) {
   let resourceContent = "";
   let resourceMeta = "";
   for (const content of result.contents) {
-    if (content.text) {
-      resourceContent += content.text;
-    } else if (content.blob) {
-      resourceContent += `[Binary data - ${content.mimeType || "unknown type"}]`;
-    }
+    resourceContent += content.text || (content.blob ? `[Binary: ${content.mimeType || "unknown"}]` : "");
     resourceMeta += `Resource: ${content.uri || uri}
 `;
-    if (content.mimeType) {
+    if (content.mimeType)
       resourceMeta += `Type: ${content.mimeType}
 `;
-    }
   }
   return { resourceContent, resourceMeta };
 }
-function processToolResult(result, serverName, toolName, runtime2, messageEntityId) {
+function processToolResult(result, serverName, toolName, runtime, messageEntityId) {
   let toolOutput = "";
   let hasAttachments = false;
   const attachments = [];
+  let attachmentIndex = 0;
   for (const content of result.content) {
     if (content.type === "text") {
       toolOutput += content.text;
@@ -896,136 +312,115 @@ function processToolResult(result, serverName, toolName, runtime2, messageEntity
       attachments.push({
         contentType: getMimeTypeToContentType(content.mimeType),
         url: `data:${content.mimeType};base64,${content.data}`,
-        id: import_core2.createUniqueUuid(runtime2, messageEntityId),
+        id: import_core2.createUniqueUuid(runtime, `${messageEntityId}-attachment-${attachmentIndex++}`),
         title: "Generated image",
         source: `${serverName}/${toolName}`,
         description: "Tool-generated image",
         text: "Generated image"
       });
-    } else if (content.type === "resource") {
-      const resource = content.resource;
-      if (resource && "text" in resource) {
-        toolOutput += `
+    } else if (content.type === "resource" && content.resource) {
+      const r = content.resource;
+      toolOutput += r.text ? `
 
-Resource (${resource.uri}):
-${resource.text}`;
-      } else if (resource && "blob" in resource) {
-        toolOutput += `
+Resource (${r.uri}):
+${r.text}` : `
 
-Resource (${resource.uri}): [Binary data]`;
-      }
+Resource (${r.uri}): [Binary]`;
     }
   }
   return { toolOutput, hasAttachments, attachments };
 }
-async function handleResourceAnalysis(runtime2, message, uri, serverName, resourceContent, resourceMeta, callback) {
-  await createMcpMemory(runtime2, message, "resource", serverName, resourceContent, {
+async function handleResourceAnalysis(runtime, message, uri, serverName, resourceContent, resourceMeta, callback) {
+  await createMcpMemory(runtime, message, "resource", serverName, resourceContent, {
     uri,
     isResourceAccess: true
   });
-  const analysisPrompt = createAnalysisPrompt(uri, message.content.text || "", resourceContent, resourceMeta);
-  const analyzedResponse = await runtime2.useModel(import_core2.ModelType.TEXT_SMALL, {
-    prompt: analysisPrompt
+  const prompt = import_core3.composePromptFromState({
+    state: {
+      data: {},
+      text: "",
+      values: { uri, userMessage: message.content.text || "", resourceContent, resourceMeta }
+    },
+    template: resourceAnalysisTemplate
   });
+  const response = await runtime.useModel(import_core2.ModelType.TEXT_SMALL, { prompt });
   if (callback) {
     await callback({
-      text: analyzedResponse,
-      thought: `I analyzed the content from the ${uri} resource on ${serverName} and crafted a thoughtful response that addresses the user's request while maintaining my conversational style.`,
+      text: response,
+      thought: `Analyzed resource ${uri} from ${serverName}`,
       actions: ["READ_MCP_RESOURCE"]
     });
   }
 }
-async function handleToolResponse(runtime2, message, serverName, toolName, toolArgs, toolOutput, hasAttachments, attachments, state, mcpProvider, callback) {
-  await createMcpMemory(runtime2, message, "tool", serverName, toolOutput, {
-    toolName,
-    arguments: toolArgs,
-    isToolCall: true
-  });
-  const reasoningPrompt = createReasoningPrompt(state, mcpProvider, toolName, serverName, message.content.text || "", toolOutput, hasAttachments);
-  import_core2.logger.info({ reasoningPrompt }, "reasoning prompt");
-  const reasonedResponse = await runtime2.useModel(import_core2.ModelType.TEXT_SMALL, {
-    prompt: reasoningPrompt
-  });
-  const agentId = message.agentId || runtime2.agentId;
-  const replyMemory = {
-    entityId: agentId,
-    roomId: message.roomId,
-    worldId: message.worldId,
-    content: {
-      text: reasonedResponse,
-      thought: `I analyzed the output from the ${toolName} tool on ${serverName} and crafted a thoughtful response that addresses the user's request while maintaining my conversational style.`,
-      actions: ["CALL_MCP_TOOL"],
-      attachments: hasAttachments && attachments.length > 0 ? attachments : undefined
-    }
-  };
-  await runtime2.createMemory(replyMemory, "messages");
-  if (callback) {
-    await callback({
-      text: reasonedResponse,
-      thought: `I analyzed the output from the ${toolName} tool on ${serverName} and crafted a thoughtful response that addresses the user's request while maintaining my conversational style.`,
-      actions: ["CALL_MCP_TOOL"],
-      attachments: hasAttachments && attachments.length > 0 ? attachments : undefined
-    });
-  }
-  return replyMemory;
-}
 async function sendInitialResponse(callback) {
   if (callback) {
-    const responseContent = {
-      thought: "The user is asking for information that can be found in an MCP resource. I will retrieve and analyze the appropriate resource.",
+    await callback({
+      thought: "Retrieving MCP resource...",
       text: "I'll retrieve that information for you. Let me access the resource...",
       actions: ["READ_MCP_RESOURCE"]
-    };
-    await callback(responseContent);
+    });
   }
 }
-function createAnalysisPrompt(uri, userMessage, resourceContent, resourceMeta) {
-  const enhancedState = {
-    data: {},
-    text: "",
-    values: {
-      uri,
-      userMessage,
-      resourceContent,
-      resourceMeta
-    }
-  };
-  return import_core3.composePromptFromState({
-    state: enhancedState,
-    template: resourceAnalysisTemplate
-  });
-}
-function createReasoningPrompt(state, mcpProvider, toolName, serverName, userMessage, toolOutput, hasAttachments) {
-  const enhancedState = {
-    ...state,
-    values: {
-      ...state.values,
-      mcpProvider,
-      toolName,
-      serverName,
-      userMessage,
-      toolOutput,
-      hasAttachments
-    }
-  };
-  return import_core3.composePromptFromState({
-    state: enhancedState,
-    template: toolReasoningTemplate
-  });
-}
-
-// src/utils/selection.ts
-var import_core5 = require("@elizaos/core");
 
 // src/utils/json.ts
 var import_ajv = __toESM(require("ajv"));
 var import_json5 = __toESM(require("json5"));
+function findMatchingClose(str, start, open, close) {
+  let depth = 0;
+  let inString = false;
+  let escape = false;
+  for (let i = start;i < str.length; i++) {
+    const ch = str[i];
+    if (escape) {
+      escape = false;
+      continue;
+    }
+    if (ch === "\\" && inString) {
+      escape = true;
+      continue;
+    }
+    if (ch === '"') {
+      inString = !inString;
+      continue;
+    }
+    if (inString)
+      continue;
+    if (ch === open)
+      depth++;
+    else if (ch === close) {
+      depth--;
+      if (depth === 0)
+        return i;
+    }
+  }
+  return -1;
+}
 function parseJSON(input) {
   let cleanedInput = input.replace(/^```(?:json)?\s*|\s*```$/g, "").trim();
   const firstBrace = cleanedInput.indexOf("{");
-  const lastBrace = cleanedInput.lastIndexOf("}");
-  if (firstBrace !== -1 && lastBrace !== -1 && lastBrace > firstBrace) {
-    cleanedInput = cleanedInput.substring(firstBrace, lastBrace + 1);
+  const firstBracket = cleanedInput.indexOf("[");
+  let start = -1;
+  let isArray = false;
+  if (firstBrace === -1 && firstBracket === -1) {
+    return import_json5.default.parse(cleanedInput);
+  } else if (firstBrace === -1) {
+    start = firstBracket;
+    isArray = true;
+  } else if (firstBracket === -1) {
+    start = firstBrace;
+    isArray = false;
+  } else {
+    if (firstBracket < firstBrace) {
+      start = firstBracket;
+      isArray = true;
+    } else {
+      start = firstBrace;
+      isArray = false;
+    }
+  }
+  const end = isArray ? findMatchingClose(cleanedInput, start, "[", "]") : findMatchingClose(cleanedInput, start, "{", "}");
+  if (end !== -1) {
+    cleanedInput = cleanedInput.substring(start, end + 1);
   }
   return import_json5.default.parse(cleanedInput);
 }
@@ -1047,570 +442,100 @@ function validateJsonSchema(data, schema) {
     return { success: true, data };
   } catch (error) {
     return {
-      success: false,
-      error: `Schema validation error: ${error instanceof Error ? error.message : String(error)}`
-    };
-  }
-}
-
-// src/utils/wrapper.ts
-var import_core4 = require("@elizaos/core");
-async function withModelRetry({
-  runtime: runtime2,
-  message,
-  state,
-  callback,
-  input,
-  validationFn,
-  createFeedbackPromptFn,
-  failureMsg,
-  retryCount = 0
-}) {
-  const maxRetries = getMaxRetries(runtime2);
-  try {
-    import_core4.logger.info(`[WITH-MODEL-RETRY] Raw selection input:
-${input}`);
-    const parsedJson = typeof input === "string" ? parseJSON(input) : input;
-    import_core4.logger.debug(`[WITH-MODEL-RETRY] Parsed selection input:
-${JSON.stringify(parsedJson, null, 2)}`);
-    const validationResult = validationFn(parsedJson);
-    if (validationResult.success === false) {
-      throw new Error(validationResult.error);
-    }
-    return validationResult.data;
-  } catch (parseError) {
-    const errorMessage = parseError instanceof Error ? parseError.message : "Unknown parsing error";
-    import_core4.logger.error({ errorMessage }, `[WITH-MODEL-RETRY] Failed to parse response: ${errorMessage}`);
-    if (retryCount < maxRetries) {
-      import_core4.logger.debug(`[WITH-MODEL-RETRY] Retrying (attempt ${retryCount + 1}/${maxRetries})`);
-      const feedbackPrompt = createFeedbackPromptFn(input, errorMessage, state, message.content.text || "");
-      const retrySelection = await runtime2.useModel(import_core4.ModelType.OBJECT_LARGE, {
-        prompt: feedbackPrompt
-      });
-      return withModelRetry({
-        runtime: runtime2,
-        input: retrySelection,
-        validationFn,
-        message,
-        state,
-        createFeedbackPromptFn,
-        callback,
-        failureMsg,
-        retryCount: retryCount + 1
-      });
-    }
-    if (callback && failureMsg) {
-      await callback({
-        text: failureMsg,
-        thought: "Failed to parse response after multiple retries. Requesting clarification from user.",
-        actions: ["REPLY"]
-      });
-    }
-    return null;
-  }
-}
-function getMaxRetries(runtime2) {
-  try {
-    const rawSettings = runtime2.getSetting("mcp");
-    const settings = rawSettings;
-    if (settings && typeof settings.maxRetries === "number") {
-      const configValue = settings.maxRetries;
-      if (!Number.isNaN(configValue) && configValue >= 0) {
-        import_core4.logger.debug(`[WITH-MODEL-RETRY] Using configured selection retries: ${configValue}`);
-        return configValue;
-      }
-    }
-  } catch (error) {
-    import_core4.logger.debug({ error: error instanceof Error ? error.message : String(error) }, "[WITH-MODEL-RETRY] Error reading selection retries config");
-  }
-  return DEFAULT_MAX_RETRIES;
-}
-
-// src/templates/toolSelectionTemplate.ts
-var toolSelectionNameTemplate = `
-{{mcpProvider.text}}
-
-{{recentMessages}}
-
-# TASK: Select the Most Appropriate Tool and Server
-
-You must select the most appropriate tool from the list above to fulfill the user's request. Your response must be a valid JSON object with the required properties.
-
-## CRITICAL INSTRUCTIONS
-1. Provide both "serverName" and "toolName" from the options listed above.
-2. Each name must match EXACTLY as shown in the list:
-   - Example (correct): "serverName": "github"
-   - Example (incorrect): "serverName": "GitHub", "Github", or variations
-3. Extract ACTUAL parameter values from the conversation context.
-   - Do not invent or use placeholders like "octocat" or "Hello-World" unless the user said so.
-4. Include a "reasoning" field explaining why the selected tool fits the request.
-5. If no tool is appropriate, respond with:
-   {
-     "noToolAvailable": true
-   }
-
-!!! YOUR RESPONSE MUST BE A VALID JSON OBJECT ONLY !!! 
-
-CRITICAL: Your response must START with { and END with }. DO NOT include ANY text before or after the JSON.
-
-## STRICT FORMAT REQUIREMENTS
-- The response MUST be a single valid JSON object.
-- DO NOT wrap the JSON in triple backticks (\`\`\`), code blocks, or include any explanatory text.
-- DO NOT include comments (// or /* */) anywhere.
-- DO NOT use placeholders (e.g., "replace with...", "example", "your...", etc.)
-- ALL strings must use double quotes.
-
-## CRITICAL NOTES
-- All values must be fully grounded in user input or inferred contextually.
-- No missing fields unless they are explicitly optional in the schema.
-- All types must match the schema (strings, numbers, booleans).
-
-## JSON OBJECT STRUCTURE
-Your response MUST contain ONLY these top-level keys:
-1. "serverName" — The name of the server (e.g., "github", "notion")
-2. "toolName" — The name of the tool (e.g., "get_file_contents", "search")
-3. "reasoning" — A string explaining how the values were inferred from the conversation.
-4. "noToolAvailable" — A boolean indicating if no tool is available (true/false)
-
-## EXAMPLE RESPONSE
-{
-  "serverName": "github",
-  "toolName": "get_file_contents",
-  "reasoning": "The user wants to retrieve the README from the facebook/react repository.",
-  "noToolAvailable": false
-}
-
-## REMINDERS
-- Use "github" as serverName for GitHub tools.
-- Use "notion" as serverName for Notion tools.
-- For search and knowledge-based tasks, MCP tools are often appropriate.
-
-REMEMBER: This output will be parsed directly as JSON. If the format is incorrect, the operation will fail.
-`;
-var toolSelectionArgumentTemplate = `
-{{recentMessages}}
-
-# TASK: Generate a Strictly Valid JSON Object for Tool Execution
-
-You have chosen the "{{toolSelectionName.toolName}}" tool from the "{{toolSelectionName.serverName}}" server to address the user's request.
-The reasoning behind this selection is: "{{toolSelectionName.reasoning}}"
-
-## CRITICAL INSTRUCTIONS
-1. Ensure the "toolArguments" object strictly adheres to the structure and requirements defined in the schema.
-2. All parameter values must be extracted from the conversation context and must be concrete, usable values.
-3. Avoid placeholders or generic terms unless explicitly provided by the user.
-
-!!! YOUR RESPONSE MUST BE A VALID JSON OBJECT ONLY !!! 
-
-## STRICT FORMAT REQUIREMENTS
-- The response MUST be a single valid JSON object.
-- DO NOT wrap the JSON in triple backticks (\`\`\`), code blocks, or include any explanatory text.
-- DO NOT include comments (// or /* */) anywhere.
-- DO NOT use placeholders (e.g., "replace with...", "example", "your...", etc.)
-- ALL strings must use double quotes
-
-## CRITICAL NOTES
-- All values must be fully grounded in user input or inferred contextually.
-- No missing fields unless they are explicitly optional in the schema.
-- All types must match the schema (strings, numbers, booleans).
-
-## JSON OBJECT STRUCTURE
-Your response MUST contain ONLY these two top-level keys:
-1. "toolArguments" — An object matching the input schema: {{toolInputSchema}}
-2. "reasoning" — A string explaining how the values were inferred from the conversation.
-
-## EXAMPLE RESPONSE
-{
-  "toolArguments": {
-    "owner": "facebook",
-    "repo": "react",
-    "path": "README.md",
-    "branch": "main"
-  },
-  "reasoning": "The user wants to see the README from the facebook/react repository based on our conversation."
-}
-
-REMEMBER: Your response will be parsed directly as JSON. If it fails to parse, the operation will fail completely.
-`;
-
-// src/utils/schemas.ts
-var toolSelectionNameSchema = {
-  type: "object",
-  required: ["serverName", "toolName"],
-  properties: {
-    serverName: {
-      type: "string",
-      minLength: 1,
-      errorMessage: "serverName must not be empty"
-    },
-    toolName: {
-      type: "string",
-      minLength: 1,
-      errorMessage: "toolName must not be empty"
-    },
-    reasoning: {
-      type: "string"
-    },
-    noToolAvailable: {
-      type: "boolean"
-    }
-  }
-};
-var toolSelectionArgumentSchema = {
-  type: "object",
-  required: ["toolArguments"],
-  properties: {
-    toolArguments: {
-      type: "object"
-    }
-  }
-};
-
-// src/utils/validation.ts
-function validateToolSelectionName(parsed, state) {
-  const basicResult = validateJsonSchema(parsed, toolSelectionNameSchema);
-  if (basicResult.success === false) {
-    return { success: false, error: basicResult.error };
-  }
-  const data = basicResult.data;
-  const mcpData = state.values.mcp || {};
-  const server = mcpData[data.serverName];
-  if (!server || server.status !== "connected") {
-    return {
-      success: false,
-      error: `Server "${data.serverName}" not found or not connected`
-    };
-  }
-  const toolInfo = server.tools?.[data.toolName];
-  if (!toolInfo) {
-    return {
-      success: false,
-      error: `Tool "${data.toolName}" not found on server "${data.serverName}"`
-    };
-  }
-  return { success: true, data };
-}
-function validateToolSelectionArgument(parsed, toolInputSchema) {
-  const basicResult = validateJsonSchema(parsed, toolSelectionArgumentSchema);
-  if (basicResult.success === false) {
-    return { success: false, error: basicResult.error };
-  }
-  const data = basicResult.data;
-  const validationResult = validateJsonSchema(data.toolArguments, toolInputSchema);
-  if (validationResult.success === false) {
-    return {
-      success: false,
-      error: `Invalid arguments: ${validationResult.error}`
-    };
-  }
-  return { success: true, data };
-}
-function validateResourceSelection(selection) {
-  return validateJsonSchema(selection, ResourceSelectionSchema);
-}
-function createResourceSelectionFeedbackPrompt(originalResponse, errorMessage, composedState, userMessage) {
-  let resourcesDescription = "";
-  for (const [serverName, server] of Object.entries(composedState.values.mcp || {})) {
-    if (server.status !== "connected")
-      continue;
-    for (const [uri, resource] of Object.entries(server.resources || {})) {
-      resourcesDescription += `Resource: ${uri} (Server: ${serverName})
-`;
-      resourcesDescription += `Name: ${resource.name || "No name available"}
-`;
-      resourcesDescription += `Description: ${resource.description || "No description available"}
-
-`;
-    }
-  }
-  return createFeedbackPrompt(originalResponse, errorMessage, "resource", resourcesDescription, userMessage);
-}
-function createFeedbackPrompt(originalResponse, errorMessage, itemType, itemsDescription, userMessage) {
-  return `Error parsing JSON: ${errorMessage}
-
-Your original response:
-${originalResponse}
-
-Please try again with valid JSON for ${itemType} selection.
-Available ${itemType}s:
-${itemsDescription}
-
-User request: ${userMessage}`;
-}
-
-// src/utils/selection.ts
-async function createToolSelectionName({
-  runtime: runtime2,
-  state,
-  message,
-  callback,
-  mcpProvider
-}) {
-  const toolSelectionPrompt = import_core5.composePromptFromState({
-    state: { ...state, values: { ...state.values, mcpProvider } },
-    template: toolSelectionNameTemplate
-  });
-  import_core5.logger.debug(`[SELECTION] Tool Selection Name Prompt:
-${toolSelectionPrompt}`);
-  const toolSelectionName = await runtime2.useModel(import_core5.ModelType.TEXT_LARGE, {
-    prompt: toolSelectionPrompt
-  });
-  import_core5.logger.debug(`[SELECTION] Tool Selection Name Response:
-${toolSelectionName}`);
-  return await withModelRetry({
-    runtime: runtime2,
-    message,
-    state,
-    callback,
-    input: toolSelectionName,
-    validationFn: (parsed) => validateToolSelectionName(parsed, state),
-    createFeedbackPromptFn: (originalResponse, errorMessage, state2, userMessage) => createToolSelectionFeedbackPrompt(originalResponse, errorMessage, state2, userMessage),
-    failureMsg: "I'm having trouble figuring out the best way to help with your request."
-  });
-}
-async function createToolSelectionArgument({
-  runtime: runtime2,
-  state,
-  message,
-  callback,
-  mcpProvider,
-  toolSelectionName
-}) {
-  if (!toolSelectionName) {
-    import_core5.logger.warn("[SELECTION] Tool selection name is not provided. Cannot create tool selection argument.");
-    return null;
-  }
-  const { serverName, toolName } = toolSelectionName;
-  const toolInputSchema = mcpProvider.data.mcp[serverName].tools[toolName].inputSchema;
-  import_core5.logger.trace(`[SELECTION] Tool Input Schema:
-${JSON.stringify({ toolInputSchema }, null, 2)}`);
-  const toolSelectionArgumentPrompt = import_core5.composePromptFromState({
-    state: {
-      ...state,
-      values: {
-        ...state.values,
-        toolSelectionName,
-        toolInputSchema: JSON.stringify(toolInputSchema)
-      }
-    },
-    template: toolSelectionArgumentTemplate
-  });
-  import_core5.logger.debug(`[SELECTION] Tool Selection Prompt:
-${toolSelectionArgumentPrompt}`);
-  const toolSelectionArgument = await runtime2.useModel(import_core5.ModelType.TEXT_LARGE, {
-    prompt: toolSelectionArgumentPrompt
-  });
-  import_core5.logger.debug(`[SELECTION] Tool Selection Argument Response:
-${toolSelectionArgument}`);
-  return await withModelRetry({
-    runtime: runtime2,
-    message,
-    state,
-    callback,
-    input: toolSelectionArgument,
-    validationFn: (parsed) => validateToolSelectionArgument(parsed, state),
-    createFeedbackPromptFn: (originalResponse, errorMessage, state2, userMessage) => createToolSelectionFeedbackPrompt(originalResponse, errorMessage, state2, userMessage),
-    failureMsg: "I'm having trouble figuring out the best way to help with your request."
-  });
+      success: false,
+      error: `Schema validation error: ${error instanceof Error ? error.message : String(error)}`
+    };
+  }
+}
+
+// src/utils/validation.ts
+function validateResourceSelection(selection) {
+  return validateJsonSchema(selection, ResourceSelectionSchema);
 }
-function createToolSelectionFeedbackPrompt(originalResponse, errorMessage, state, userMessage) {
-  let toolsDescription = "";
-  for (const [serverName, server] of Object.entries(state.values.mcp || {})) {
+function createResourceSelectionFeedbackPrompt(originalResponse, errorMessage, composedState, userMessage) {
+  let description = "";
+  for (const [serverName, server] of Object.entries(composedState.values.mcp || {})) {
     if (server.status !== "connected")
       continue;
-    for (const [toolName, tool] of Object.entries(server.tools || {})) {
-      toolsDescription += `Tool: ${toolName} (Server: ${serverName})
+    for (const [uri, resource] of Object.entries(server.resources || {})) {
+      description += `Resource: ${uri} (Server: ${serverName})
 `;
-      toolsDescription += `Description: ${tool.description || "No description available"}
+      description += `Name: ${resource.name || "No name"}
+`;
+      description += `Description: ${resource.description || "No description"}
 
 `;
     }
   }
-  const feedbackPrompt = createFeedbackPrompt2(originalResponse, errorMessage, "tool", toolsDescription, userMessage);
-  import_core5.logger.debug(`[SELECTION] Tool Selection Feedback Prompt:
-${feedbackPrompt}`);
-  return feedbackPrompt;
-}
-function createFeedbackPrompt2(originalResponse, errorMessage, itemType, itemsDescription, userMessage) {
   return `Error parsing JSON: ${errorMessage}
-  
-  Your original response:
-  ${originalResponse}
-  
-  Please try again with valid JSON for ${itemType} selection.
-  Available ${itemType}s:
-  ${itemsDescription}
-  
-  User request: ${userMessage}`;
+
+Your original response:
+${originalResponse}
+
+Please try again with valid JSON for resource selection.
+Available resources:
+${description}
+
+User request: ${userMessage}`;
 }
 
-// src/actions/callToolAction.ts
-var callToolAction = {
-  name: "CALL_MCP_TOOL",
-  similes: [
-    "CALL_TOOL",
-    "CALL_MCP_TOOL",
-    "USE_TOOL",
-    "USE_MCP_TOOL",
-    "EXECUTE_TOOL",
-    "EXECUTE_MCP_TOOL",
-    "RUN_TOOL",
-    "RUN_MCP_TOOL",
-    "INVOKE_TOOL",
-    "INVOKE_MCP_TOOL"
-  ],
-  description: "Calls a tool from an MCP server to perform a specific task",
-  validate: async (runtime2, _message, _state) => {
-    const mcpService = runtime2.getService(MCP_SERVICE_NAME);
-    if (!mcpService)
-      return false;
-    const servers = mcpService.getServers();
-    return servers.length > 0 && servers.some((server) => server.status === "connected" && server.tools && server.tools.length > 0);
-  },
-  handler: async (runtime2, message, _state, _options, callback) => {
-    const composedState = await runtime2.composeState(message, ["RECENT_MESSAGES", "MCP"]);
-    const mcpService = runtime2.getService(MCP_SERVICE_NAME);
-    if (!mcpService) {
-      throw new Error("MCP service not available");
-    }
-    const mcpProvider = mcpService.getProviderData();
-    try {
-      const toolSelectionName = await createToolSelectionName({
-        runtime: runtime2,
-        state: composedState,
-        message,
-        callback,
-        mcpProvider
-      });
-      if (!toolSelectionName || toolSelectionName.noToolAvailable) {
-        import_core6.logger.warn("[NO_TOOL_AVAILABLE] No appropriate tool available for the request");
-        return await handleNoToolAvailable(callback, toolSelectionName);
-      }
-      const { serverName, toolName, reasoning } = toolSelectionName;
-      import_core6.logger.info(`[CALLING] Calling tool "${serverName}/${toolName}" on server with reasoning: "${reasoning}"`);
-      const toolSelectionArgument = await createToolSelectionArgument({
-        runtime: runtime2,
-        state: composedState,
+// src/utils/wrapper.ts
+var import_core4 = require("@elizaos/core");
+async function withModelRetry({
+  runtime,
+  message,
+  state,
+  callback,
+  input,
+  validationFn,
+  createFeedbackPromptFn,
+  failureMsg,
+  retryCount = 0
+}) {
+  const maxRetries = getMaxRetries(runtime);
+  try {
+    const parsed = typeof input === "string" ? parseJSON(input) : input;
+    const result = validationFn(parsed);
+    if (!result.success)
+      throw new Error(result.error);
+    return result.data;
+  } catch (e) {
+    const error = e instanceof Error ? e.message : "Parse error";
+    import_core4.logger.error({ error }, "[Retry] Parse failed");
+    if (retryCount < maxRetries) {
+      const feedback = createFeedbackPromptFn(input, error, state, message.content.text || "");
+      const retry = await runtime.useModel(import_core4.ModelType.OBJECT_LARGE, { prompt: feedback });
+      return withModelRetry({
+        runtime,
+        input: retry,
+        validationFn,
         message,
+        state,
+        createFeedbackPromptFn,
         callback,
-        mcpProvider,
-        toolSelectionName
+        failureMsg,
+        retryCount: retryCount + 1
       });
-      if (!toolSelectionArgument) {
-        import_core6.logger.warn("[NO_TOOL_SELECTION_ARGUMENT] No appropriate tool selection argument available");
-        return await handleNoToolAvailable(callback, toolSelectionName);
-      }
-      import_core6.logger.info(`[SELECTED] Tool Selection result:
-${JSON.stringify(toolSelectionArgument, null, 2)}`);
-      const result = await mcpService.callTool(serverName, toolName, toolSelectionArgument.toolArguments);
-      const { toolOutput, hasAttachments, attachments } = processToolResult(result, serverName, toolName, runtime2, message.entityId);
-      const replyMemory = await handleToolResponse(runtime2, message, serverName, toolName, toolSelectionArgument.toolArguments, toolOutput, hasAttachments, attachments, composedState, mcpProvider, callback);
-      const actionResult = {
-        text: `Successfully called tool: ${serverName}/${toolName}. Reasoned response: ${replyMemory.content.text}`,
-        values: {
-          success: true,
-          toolExecuted: true,
-          serverName,
-          toolName,
-          hasAttachments,
-          output: toolOutput
-        },
-        data: {
-          actionName: "CALL_MCP_TOOL",
-          serverName,
-          toolName,
-          toolArguments: toolSelectionArgument.toolArguments,
-          reasoning: toolSelectionName.reasoning,
-          output: toolOutput,
-          attachments: attachments || []
-        },
-        success: true
-      };
-      import_core6.logger.info({
-        serverName,
-        toolName,
-        hasOutput: !!toolOutput,
-        outputLength: toolOutput?.length || 0,
-        hasAttachments,
-        reasoning: toolSelectionName.reasoning
-      }, `[CALL_MCP_TOOL] Action result`);
-      return actionResult;
-    } catch (error) {
-      return await handleMcpError(composedState, mcpProvider, error, runtime2, message, "tool", callback);
     }
-  },
-  examples: [
-    [
-      {
-        name: "{{user}}",
-        content: {
-          text: "Can you search for information about climate change?"
-        }
-      },
-      {
-        name: "{{assistant}}",
-        content: {
-          text: "I'll help you with that request. Let me access the right tool...",
-          actions: ["CALL_MCP_TOOL"]
-        }
-      },
-      {
-        name: "{{assistant}}",
-        content: {
-          text: `I found the following information about climate change:
-
-Climate change refers to long-term shifts in temperatures and weather patterns. These shifts may be natural, but since the 1800s, human activities have been the main driver of climate change, primarily due to the burning of fossil fuels like coal, oil, and gas, which produces heat-trapping gases.`,
-          actions: ["CALL_MCP_TOOL"]
-        }
-      }
-    ]
-  ]
-};
-
-// src/actions/readResourceAction.ts
-var import_core7 = require("@elizaos/core");
-
-// src/templates/resourceSelectionTemplate.ts
-var resourceSelectionTemplate = `
-{{{mcpProvider.text}}}
-
-{{{recentMessages}}}
-
-# Prompt
-
-You are an intelligent assistant helping select the right resource to address a user's request.
-
-CRITICAL INSTRUCTIONS:
-1. You MUST specify both a valid serverName AND uri from the list above
-2. The serverName value should match EXACTLY the server name shown in parentheses (Server: X)
-   CORRECT: "serverName": "github"  (if the server is called "github") 
-   WRONG: "serverName": "GitHub" or "Github" or any other variation
-3. The uri value should match EXACTLY the resource uri listed
-   CORRECT: "uri": "weather://San Francisco/current"  (if that's the exact uri)
-   WRONG: "uri": "weather://sanfrancisco/current" or any variation
-4. Identify the user's information need from the conversation context
-5. Select the most appropriate resource based on its description and the request
-6. If no resource seems appropriate, output {"noResourceAvailable": true}
-
-!!! YOUR RESPONSE MUST BE A VALID JSON OBJECT ONLY !!! 
-
-STRICT FORMAT REQUIREMENTS:
-- NO code block formatting (NO backticks or \`\`\`)
-- NO comments (NO // or /* */)
-- NO placeholders like "replace with...", "example", "your...", "actual", etc.
-- Every parameter value must be a concrete, usable value (not instructions to replace)
-- Use proper JSON syntax with double quotes for strings
-- NO explanatory text before or after the JSON object
-
-EXAMPLE RESPONSE:
-{
-  "serverName": "weather-server",
-  "uri": "weather://San Francisco/current",
-  "reasoning": "Based on the conversation, the user is asking about current weather in San Francisco. This resource provides up-to-date weather information for that city."
+    if (callback && failureMsg) {
+      await callback({ text: failureMsg, thought: "Parse failed after retries", actions: ["REPLY"] });
+    }
+    return null;
+  }
+}
+function getMaxRetries(runtime) {
+  try {
+    const mcp = runtime.getSetting("mcp");
+    if (mcp?.maxRetries !== undefined) {
+      const val = Number(mcp.maxRetries);
+      if (!isNaN(val) && val >= 0)
+        return val;
+    }
+  } catch (e) {
+    import_core4.logger.debug({ error: e instanceof Error ? e.message : e }, "[Retry] Failed to get maxRetries setting");
+  }
+  return DEFAULT_MAX_RETRIES;
 }
-
-REMEMBER: Your response will be parsed directly as JSON. If it fails to parse, the operation will fail completely!
-`;
 
 // src/actions/readResourceAction.ts
 function createResourceSelectionPrompt(composedState, userMessage) {
@@ -1643,7 +568,7 @@ function createResourceSelectionPrompt(composedState, userMessage) {
       userMessage
     }
   };
-  return import_core7.composePromptFromState({
+  return import_core5.composePromptFromState({
     state: enhancedState,
     template: resourceSelectionTemplate
   });
@@ -1661,16 +586,16 @@ var readResourceAction = {
     "ACCESS_MCP_RESOURCE"
   ],
   description: "Reads a resource from an MCP server",
-  validate: async (runtime2, _message, _state) => {
-    const mcpService = runtime2.getService(MCP_SERVICE_NAME);
+  validate: async (runtime, _message, _state) => {
+    const mcpService = runtime.getService(MCP_SERVICE_NAME);
     if (!mcpService)
       return false;
     const servers = mcpService.getServers();
     return servers.length > 0 && servers.some((server) => server.status === "connected" && server.resources && server.resources.length > 0);
   },
-  handler: async (runtime2, message, _state, _options, callback) => {
-    const composedState = await runtime2.composeState(message, ["RECENT_MESSAGES", "MCP"]);
-    const mcpService = runtime2.getService(MCP_SERVICE_NAME);
+  handler: async (runtime, message, _state, _options, callback) => {
+    const composedState = await runtime.composeState(message, ["RECENT_MESSAGES", "MCP"]);
+    const mcpService = runtime.getService(MCP_SERVICE_NAME);
     if (!mcpService) {
       throw new Error("MCP service not available");
     }
@@ -1678,11 +603,11 @@ var readResourceAction = {
     try {
       await sendInitialResponse(callback);
       const resourceSelectionPrompt = createResourceSelectionPrompt(composedState, message.content.text || "");
-      const resourceSelection = await runtime2.useModel(import_core7.ModelType.TEXT_SMALL, {
+      const resourceSelection = await runtime.useModel(import_core5.ModelType.TEXT_SMALL, {
         prompt: resourceSelectionPrompt
       });
       const parsedSelection = await withModelRetry({
-        runtime: runtime2,
+        runtime,
         state: composedState,
         message,
         callback,
@@ -1718,11 +643,11 @@ var readResourceAction = {
         };
       }
       const { serverName, uri, reasoning } = parsedSelection;
-      import_core7.logger.debug(`Selected resource "${uri}" on server "${serverName}" because: ${reasoning}`);
+      import_core5.logger.debug(`Selected resource "${uri}" on server "${serverName}" because: ${reasoning}`);
       const result = await mcpService.readResource(serverName, uri);
-      import_core7.logger.debug(`Read resource ${uri} from server ${serverName}`);
+      import_core5.logger.debug(`Read resource ${uri} from server ${serverName}`);
       const { resourceContent, resourceMeta } = processResourceResult(result, uri);
-      await handleResourceAnalysis(runtime2, message, uri, serverName, resourceContent, resourceMeta, callback);
+      await handleResourceAnalysis(runtime, message, uri, serverName, resourceContent, resourceMeta, callback);
       return {
         text: `Successfully read resource: ${uri}`,
         values: {
@@ -1741,271 +666,889 @@ var readResourceAction = {
         },
         success: true
       };
-    } catch (error) {
-      return await handleMcpError(composedState, mcpProvider, error, runtime2, message, "resource", callback);
+    } catch (error) {
+      return await handleMcpError(composedState, mcpProvider, error, runtime, message, "resource", callback);
+    }
+  },
+  examples: [
+    [
+      {
+        name: "{{user}}",
+        content: {
+          text: "Can you get the documentation about installing ElizaOS?"
+        }
+      },
+      {
+        name: "{{assistant}}",
+        content: {
+          text: `I'll retrieve that information for you. Let me access the resource...`,
+          actions: ["READ_MCP_RESOURCE"]
+        }
+      },
+      {
+        name: "{{assistant}}",
+        content: {
+          text: `ElizaOS installation is straightforward. You'll need Node.js 23+ and Git installed. For Windows users, WSL 2 is required. The quickest way to get started is by cloning the ElizaOS starter repository with \`git clone https://github.com/elizaos/eliza-starter.git\`, then run \`cd eliza-starter && cp .env.example .env && bun i && bun run build && bun start\`. This will set up a development environment with the core features enabled. After starting, you can access the web interface at http://localhost:3000 to interact with your agent.`,
+          actions: ["READ_MCP_RESOURCE"]
+        }
+      }
+    ]
+  ]
+};
+
+// src/provider.ts
+var EMPTY_PROVIDER = { values: { mcp: {} }, data: { mcp: {} }, text: "No MCP servers available." };
+var provider = {
+  name: "MCP",
+  description: "Connected MCP servers, tools, and resources",
+  get: async (runtime, _message, _state) => {
+    const svc = runtime.getService(MCP_SERVICE_NAME);
+    if (!svc)
+      return EMPTY_PROVIDER;
+    await svc.waitForInitialization();
+    return svc.getProviderData();
+  }
+};
+
+// src/service.ts
+var import_core8 = require("@elizaos/core");
+var import_client = require("@modelcontextprotocol/sdk/client/index.js");
+var import_sse = require("@modelcontextprotocol/sdk/client/sse.js");
+var import_streamableHttp = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
+var import_stdio = require("@modelcontextprotocol/sdk/client/stdio.js");
+
+// src/actions/dynamic-tool-actions.ts
+var import_core6 = require("@elizaos/core");
+
+// src/utils/schema-converter.ts
+function mapJsonSchemaType(jsonType) {
+  if (Array.isArray(jsonType)) {
+    return mapJsonSchemaType(jsonType.find((t) => t !== "null"));
+  }
+  switch (jsonType) {
+    case "string":
+      return "string";
+    case "number":
+    case "integer":
+      return "number";
+    case "boolean":
+      return "boolean";
+    case "array":
+      return "array";
+    default:
+      return "object";
+  }
+}
+function buildDescription(name, prop) {
+  const parts = [prop.description || `Parameter: ${name}`];
+  if (prop.enum?.length)
+    parts.push(`Allowed: ${prop.enum.map((v) => JSON.stringify(v)).join(", ")}`);
+  if (prop.format)
+    parts.push(`Format: ${prop.format}`);
+  if (prop.minimum !== undefined || prop.maximum !== undefined) {
+    parts.push(`Range: ${[prop.minimum !== undefined ? `min: ${prop.minimum}` : "", prop.maximum !== undefined ? `max: ${prop.maximum}` : ""].filter(Boolean).join(", ")}`);
+  }
+  if (prop.minLength !== undefined || prop.maxLength !== undefined) {
+    parts.push(`Length: ${[prop.minLength !== undefined ? `min: ${prop.minLength}` : "", prop.maxLength !== undefined ? `max: ${prop.maxLength}` : ""].filter(Boolean).join(", ")}`);
+  }
+  if (prop.pattern)
+    parts.push(`Pattern: ${prop.pattern}`);
+  if (prop.default !== undefined)
+    parts.push(`Default: ${JSON.stringify(prop.default)}`);
+  if (prop.type === "array" && prop.items)
+    parts.push(`Array of ${prop.items.type || "any"}`);
+  if (prop.type === "object" && prop.properties) {
+    const keys = Object.keys(prop.properties);
+    parts.push(`Object with: ${keys.join(", ")}`);
+  }
+  return parts.join(". ");
+}
+function convertJsonSchemaToActionParams(schema) {
+  const properties = schema?.properties;
+  if (!properties || Object.keys(properties).length === 0)
+    return;
+  const required = new Set(schema?.required || []);
+  const params = {};
+  for (const [name, prop] of Object.entries(properties)) {
+    params[name] = {
+      type: mapJsonSchemaType(prop.type),
+      description: buildDescription(name, prop),
+      required: required.has(name)
+    };
+  }
+  return Object.keys(params).length > 0 ? params : undefined;
+}
+function validateParamsAgainstSchema(params, schema) {
+  if (!schema)
+    return [];
+  const errors = [];
+  const properties = schema.properties;
+  const required = new Set(schema.required || []);
+  for (const field of required) {
+    if (params[field] === undefined || params[field] === null) {
+      errors.push(`Missing required parameter: ${field}`);
+    }
+  }
+  if (properties) {
+    for (const [name, value] of Object.entries(params)) {
+      const prop = properties[name];
+      if (!prop)
+        continue;
+      const expected = mapJsonSchemaType(prop.type);
+      const actual = getValueType(value);
+      if (actual !== expected && value !== null && value !== undefined) {
+        errors.push(`Parameter '${name}' expected ${expected}, got ${actual}`);
+      }
+      if (prop.enum && !prop.enum.includes(value)) {
+        errors.push(`Parameter '${name}' must be one of: ${prop.enum.map((v) => JSON.stringify(v)).join(", ")}`);
+      }
+    }
+  }
+  return errors;
+}
+function getValueType(value) {
+  if (Array.isArray(value))
+    return "array";
+  if (value === null)
+    return "object";
+  switch (typeof value) {
+    case "string":
+      return "string";
+    case "number":
+      return "number";
+    case "boolean":
+      return "boolean";
+    default:
+      return "object";
+  }
+}
+
+// src/utils/action-naming.ts
+function normalize(str) {
+  return str.toUpperCase().replace(/[^A-Z0-9]+/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "");
+}
+function toActionName(serverName, toolName) {
+  const server = normalize(serverName);
+  const tool = normalize(toolName);
+  if (!server)
+    return tool || "_";
+  if (!tool)
+    return server + "_";
+  if (tool.startsWith(server + "_"))
+    return tool;
+  return `${server}_${tool}`;
+}
+function generateSimiles(serverName, toolName) {
+  const tool = normalize(toolName);
+  const fullName = toActionName(serverName, toolName);
+  const similes = [
+    tool,
+    `${serverName}/${toolName}`,
+    `${serverName.toLowerCase()}/${toolName.toLowerCase()}`,
+    `MCP_${fullName}`
+  ];
+  const parts = toolName.split("_");
+  if (parts.length === 2) {
+    const reversed = `${parts[1]}_${parts[0]}`.toUpperCase();
+    if (reversed !== tool)
+      similes.push(reversed);
+  }
+  return [...new Set(similes)].filter((s) => s !== fullName);
+}
+function makeUniqueActionName(serverName, toolName, existing) {
+  let name = toActionName(serverName, toolName);
+  if (!existing.has(name))
+    return name;
+  let suffix = 2;
+  while (existing.has(`${name}_${suffix}`))
+    suffix++;
+  return `${name}_${suffix}`;
+}
+
+// src/actions/dynamic-tool-actions.ts
+function extractParams(message, state) {
+  const content = message.content;
+  return content.actionParams || content.actionInput || state?.data?.actionParams || {};
+}
+function createMcpToolAction(serverName, tool, existingNames) {
+  const actionName = makeUniqueActionName(serverName, tool.name, existingNames);
+  const description = `${tool.description || `Execute ${tool.name}`} (MCP: ${serverName}/${tool.name})`;
+  return {
+    name: actionName,
+    description,
+    similes: generateSimiles(serverName, tool.name),
+    parameters: convertJsonSchemaToActionParams(tool.inputSchema),
+    validate: async (runtime) => {
+      const svc = runtime.getService(MCP_SERVICE_NAME);
+      if (!svc)
+        return false;
+      if (svc.isLazyConnection(serverName))
+        return true;
+      const server = svc.getServers().find((s) => s.name === serverName);
+      return server?.status === "connected" && !!server.tools?.some((t) => t.name === tool.name);
+    },
+    handler: async (runtime, message, state, _options, callback) => {
+      const svc = runtime.getService(MCP_SERVICE_NAME);
+      if (!svc) {
+        return { success: false, error: "MCP service not available", data: { actionName, serverName, toolName: tool.name } };
+      }
+      const params = extractParams(message, state);
+      import_core6.logger.info({ serverName, toolName: tool.name, params }, `[MCP] Executing ${actionName}`);
+      const errors = validateParamsAgainstSchema(params, tool.inputSchema);
+      const missing = errors.filter((e) => e.startsWith("Missing required"));
+      if (missing.length > 0) {
+        import_core6.logger.error({ missing, params }, `[MCP] Missing required params for ${actionName}`);
+        return { success: false, error: missing.join(", "), data: { actionName, serverName, toolName: tool.name } };
+      }
+      const warnings = errors.filter((e) => !e.startsWith("Missing required"));
+      if (warnings.length > 0) {
+        import_core6.logger.warn({ warnings, params }, `[MCP] Type warnings for ${actionName}`);
+      }
+      const result = await svc.callTool(serverName, tool.name, params);
+      const { toolOutput, hasAttachments, attachments } = processToolResult(result, serverName, tool.name, runtime, message.entityId);
+      if (result.isError) {
+        import_core6.logger.error({ serverName, toolName: tool.name, output: toolOutput }, `[MCP] Tool error`);
+        return {
+          success: false,
+          error: toolOutput || "Tool execution failed",
+          text: toolOutput,
+          data: { actionName, serverName, toolName: tool.name, toolArguments: params, isError: true }
+        };
+      }
+      if (callback && hasAttachments && attachments.length > 0) {
+        await callback({ text: `Executed ${serverName}/${tool.name}`, attachments });
+      }
+      return {
+        success: true,
+        text: toolOutput,
+        values: { success: true, serverName, toolName: tool.name, hasAttachments, output: toolOutput },
+        data: { actionName, serverName, toolName: tool.name, toolArguments: params, output: toolOutput, attachments: attachments.length > 0 ? attachments : undefined }
+      };
+    },
+    examples: [[
+      { name: "{{user}}", content: { text: `Can you use ${tool.name}?` } },
+      { name: "{{assistant}}", content: { text: `I'll execute ${tool.name} for you.`, actions: [actionName] } }
+    ]],
+    _mcpMeta: { serverName, toolName: tool.name, originalSchema: tool.inputSchema }
+  };
+}
+function createMcpToolActions(serverName, tools, existingNames) {
+  const actions = tools.map((tool) => {
+    const action = createMcpToolAction(serverName, tool, existingNames);
+    existingNames.add(action.name);
+    import_core6.logger.debug({ actionName: action.name, serverName, toolName: tool.name }, `[MCP] Created action`);
+    return action;
+  });
+  import_core6.logger.info({ serverName, toolCount: actions.length }, `[MCP] Created ${actions.length} actions for ${serverName}`);
+  return actions;
+}
+function isMcpToolAction(action) {
+  return "_mcpMeta" in action && typeof action._mcpMeta === "object";
+}
+function getMcpToolActionsForServer(actions, serverName) {
+  return actions.filter((a) => isMcpToolAction(a) && a._mcpMeta.serverName === serverName);
+}
+
+// src/cache/schema-cache.ts
+var import_crypto = require("crypto");
+var import_core7 = require("@elizaos/core");
+var CACHE_KEY_PREFIX = "mcp:schema:v1";
+var DEFAULT_TTL = 3600;
+
+class UpstashClient {
+  url;
+  token;
+  constructor(url, token) {
+    this.url = url;
+    this.token = token;
+    if (url.startsWith("redis://") || url.startsWith("rediss://")) {
+      throw new Error("MCP_CACHE_REDIS_URL must be Upstash REST URL (https://...), not Redis protocol URL");
+    }
+    this.url = url.replace(/\/$/, "");
+  }
+  async exec(cmd) {
+    try {
+      const res = await fetch(this.url, {
+        method: "POST",
+        headers: { Authorization: `Bearer ${this.token}`, "Content-Type": "application/json" },
+        body: JSON.stringify(cmd)
+      });
+      if (!res.ok)
+        return null;
+      const data = await res.json();
+      return data.result;
+    } catch {
+      return null;
+    }
+  }
+  get = (key) => this.exec(["GET", key]);
+  setex = (key, ttl, val) => this.exec(["SETEX", key, String(ttl), val]);
+  del = (key) => this.exec(["DEL", key]);
+}
+
+class McpSchemaCache {
+  client = null;
+  ttl;
+  constructor() {
+    const enabled = process.env.MCP_SCHEMA_CACHE_ENABLED === "true";
+    const url = process.env.MCP_CACHE_REDIS_URL;
+    const token = process.env.MCP_CACHE_REDIS_TOKEN;
+    this.ttl = parseInt(process.env.MCP_SCHEMA_CACHE_TTL || String(DEFAULT_TTL), 10);
+    if (!enabled) {
+      import_core7.logger.debug("[McpSchemaCache] Disabled");
+      return;
+    }
+    if (!url || !token) {
+      import_core7.logger.warn("[McpSchemaCache] Enabled but missing MCP_CACHE_REDIS_URL or MCP_CACHE_REDIS_TOKEN");
+      return;
+    }
+    try {
+      this.client = new UpstashClient(url, token);
+      import_core7.logger.info(`[McpSchemaCache] Enabled (TTL: ${this.ttl}s)`);
+    } catch (e) {
+      import_core7.logger.error(`[McpSchemaCache] Init failed: ${e instanceof Error ? e.message : e}`);
+    }
+  }
+  get isEnabled() {
+    return this.client !== null;
+  }
+  hashConfig(config) {
+    const sortedJson = JSON.stringify(config, (_, value) => value && typeof value === "object" && !Array.isArray(value) ? Object.keys(value).sort().reduce((sorted, key) => {
+      sorted[key] = value[key];
+      return sorted;
+    }, {}) : value);
+    return import_crypto.createHash("sha256").update(sortedJson).digest("hex").slice(0, 16);
+  }
+  key(agentId, serverName) {
+    return `${CACHE_KEY_PREFIX}:${agentId}:${serverName}`;
+  }
+  async getSchemas(agentId, serverName, configHash) {
+    if (!this.client)
+      return null;
+    try {
+      const raw = await this.client.get(this.key(agentId, serverName));
+      if (!raw)
+        return null;
+      const cached = JSON.parse(raw);
+      if (cached.configHash !== configHash) {
+        await this.client.del(this.key(agentId, serverName));
+        import_core7.logger.debug(`[McpSchemaCache] Config changed for ${serverName}, invalidated`);
+        return null;
+      }
+      import_core7.logger.info(`[McpSchemaCache] Hit: ${serverName} (${cached.tools.length} tools)`);
+      return cached;
+    } catch {
+      return null;
+    }
+  }
+  async setSchemas(agentId, serverName, configHash, tools) {
+    if (!this.client)
+      return;
+    try {
+      const cached = {
+        serverName,
+        tools: tools.map((t) => ({ name: t.name, description: t.description, inputSchema: t.inputSchema })),
+        cachedAt: Date.now(),
+        configHash
+      };
+      await this.client.setex(this.key(agentId, serverName), this.ttl, JSON.stringify(cached));
+      import_core7.logger.info(`[McpSchemaCache] Cached: ${serverName} (${tools.length} tools)`);
+    } catch {}
+  }
+  static toTools(cached) {
+    return cached.tools.map((t) => ({
+      name: t.name,
+      description: t.description,
+      inputSchema: t.inputSchema || { type: "object", properties: {} }
+    }));
+  }
+}
+var instance = null;
+function getSchemaCache() {
+  if (!instance)
+    instance = new McpSchemaCache;
+  return instance;
+}
+// src/tool-compatibility/base.ts
+class McpToolCompatibility {
+  modelInfo;
+  constructor(modelInfo) {
+    this.modelInfo = modelInfo;
+  }
+  transformToolSchema(toolSchema) {
+    return this.shouldApply() ? this.processSchema(toolSchema) : toolSchema;
+  }
+  processSchema(schema) {
+    const processed = { ...schema };
+    switch (processed.type) {
+      case "string":
+        return this.processTypeSchema(processed, this.getUnsupportedStringProperties());
+      case "number":
+      case "integer":
+        return this.processTypeSchema(processed, this.getUnsupportedNumberProperties());
+      case "array":
+        return this.processArraySchema(processed);
+      case "object":
+        return this.processObjectSchema(processed);
+      default:
+        return this.processGenericSchema(processed);
     }
-  },
-  examples: [
-    [
-      {
-        name: "{{user}}",
-        content: {
-          text: "Can you get the documentation about installing ElizaOS?"
-        }
-      },
-      {
-        name: "{{assistant}}",
-        content: {
-          text: `I'll retrieve that information for you. Let me access the resource...`,
-          actions: ["READ_MCP_RESOURCE"]
-        }
-      },
-      {
-        name: "{{assistant}}",
-        content: {
-          text: `ElizaOS installation is straightforward. You'll need Node.js 23+ and Git installed. For Windows users, WSL 2 is required. The quickest way to get started is by cloning the ElizaOS starter repository with \`git clone https://github.com/elizaos/eliza-starter.git\`, then run \`cd eliza-starter && cp .env.example .env && bun i && bun run build && bun start\`. This will set up a development environment with the core features enabled. After starting, you can access the web interface at http://localhost:3000 to interact with your agent.`,
-          actions: ["READ_MCP_RESOURCE"]
-        }
+  }
+  processTypeSchema(schema, unsupported) {
+    const processed = { ...schema };
+    const constraints = {};
+    for (const prop of [
+      "minLength",
+      "maxLength",
+      "pattern",
+      "format",
+      "enum",
+      "minimum",
+      "maximum",
+      "exclusiveMinimum",
+      "exclusiveMaximum",
+      "multipleOf",
+      "minItems",
+      "maxItems",
+      "uniqueItems"
+    ]) {
+      if (schema[prop] !== undefined) {
+        constraints[prop] = schema[prop];
+      }
+    }
+    for (const prop of unsupported) {
+      delete processed[prop];
+    }
+    if (Object.keys(constraints).length > 0) {
+      processed.description = this.mergeDescription(schema.description, constraints);
+    }
+    return processed;
+  }
+  processArraySchema(schema) {
+    const processed = this.processTypeSchema(schema, this.getUnsupportedArrayProperties());
+    if (schema.items && typeof schema.items === "object" && !Array.isArray(schema.items)) {
+      processed.items = this.processSchema(schema.items);
+    }
+    return processed;
+  }
+  processObjectSchema(schema) {
+    const processed = this.processTypeSchema(schema, this.getUnsupportedObjectProperties());
+    if (schema.properties) {
+      processed.properties = {};
+      for (const [key, prop] of Object.entries(schema.properties)) {
+        processed.properties[key] = typeof prop === "object" && !Array.isArray(prop) ? this.processSchema(prop) : prop;
       }
-    ]
-  ]
-};
+    }
+    return processed;
+  }
+  processGenericSchema(schema) {
+    const processed = { ...schema };
+    for (const key of ["oneOf", "anyOf", "allOf"]) {
+      if (Array.isArray(schema[key])) {
+        processed[key] = schema[key].map((s) => typeof s === "object" ? this.processSchema(s) : s);
+      }
+    }
+    return processed;
+  }
+  mergeDescription(original, constraints) {
+    const json = JSON.stringify(constraints);
+    return original ? `${original}
+${json}` : json;
+  }
+}
+// src/tool-compatibility/providers/openai.ts
+class OpenAIMcpCompatibility extends McpToolCompatibility {
+  constructor(modelInfo) {
+    super(modelInfo);
+  }
+  shouldApply() {
+    return this.modelInfo.provider === "openai" && (!this.modelInfo.supportsStructuredOutputs || this.modelInfo.isReasoningModel === true);
+  }
+  getUnsupportedStringProperties() {
+    return this.modelInfo.isReasoningModel || this.modelInfo.modelId.includes("gpt-3.5") ? ["format", "pattern"] : ["format"];
+  }
+  getUnsupportedNumberProperties() {
+    return this.modelInfo.isReasoningModel ? ["exclusiveMinimum", "exclusiveMaximum", "multipleOf"] : [];
+  }
+  getUnsupportedArrayProperties() {
+    return this.modelInfo.isReasoningModel ? ["uniqueItems"] : [];
+  }
+  getUnsupportedObjectProperties() {
+    return ["minProperties", "maxProperties"];
+  }
+}
 
-// src/provider.ts
-var createEmptyProvider = () => ({
-  values: { mcp: {} },
-  data: { mcp: {} },
-  text: "No MCP servers available."
-});
-var provider = {
-  name: "MCP",
-  description: "Connected MCP servers, tools, and resources",
-  get: async (runtime2, _message, _state) => {
-    const svc = runtime2.getService(MCP_SERVICE_NAME);
-    if (!svc)
-      return createEmptyProvider();
-    await svc.waitForInitialization();
-    return svc.getProviderData();
+class OpenAIReasoningMcpCompatibility extends McpToolCompatibility {
+  constructor(modelInfo) {
+    super(modelInfo);
+  }
+  shouldApply() {
+    return this.modelInfo.provider === "openai" && this.modelInfo.isReasoningModel === true;
+  }
+  getUnsupportedStringProperties() {
+    return ["format", "pattern", "minLength", "maxLength"];
+  }
+  getUnsupportedNumberProperties() {
+    return ["exclusiveMinimum", "exclusiveMaximum", "multipleOf"];
+  }
+  getUnsupportedArrayProperties() {
+    return ["uniqueItems", "minItems", "maxItems"];
+  }
+  getUnsupportedObjectProperties() {
+    return ["minProperties", "maxProperties", "additionalProperties"];
+  }
+  mergeDescription(original, constraints) {
+    const rules = [];
+    if (constraints.minLength)
+      rules.push(`minimum ${constraints.minLength} characters`);
+    if (constraints.maxLength)
+      rules.push(`maximum ${constraints.maxLength} characters`);
+    if (constraints.minimum !== undefined)
+      rules.push(`must be >= ${constraints.minimum}`);
+    if (constraints.maximum !== undefined)
+      rules.push(`must be <= ${constraints.maximum}`);
+    if (constraints.format === "email")
+      rules.push(`must be a valid email`);
+    if (constraints.format === "uri" || constraints.format === "url")
+      rules.push(`must be a valid URL`);
+    if (constraints.pattern)
+      rules.push(`must match: ${constraints.pattern}`);
+    if (constraints.enum)
+      rules.push(`must be one of: ${constraints.enum.join(", ")}`);
+    if (constraints.minItems)
+      rules.push(`at least ${constraints.minItems} items`);
+    if (constraints.maxItems)
+      rules.push(`at most ${constraints.maxItems} items`);
+    const text = rules.length > 0 ? `IMPORTANT: ${rules.join(", ")}` : JSON.stringify(constraints);
+    return original ? `${original}
+
+${text}` : text;
   }
-};
+}
+
+// src/tool-compatibility/providers/anthropic.ts
+class AnthropicMcpCompatibility extends McpToolCompatibility {
+  constructor(modelInfo) {
+    super(modelInfo);
+  }
+  shouldApply() {
+    return this.modelInfo.provider === "anthropic";
+  }
+  getUnsupportedStringProperties() {
+    return [];
+  }
+  getUnsupportedNumberProperties() {
+    return [];
+  }
+  getUnsupportedArrayProperties() {
+    return [];
+  }
+  getUnsupportedObjectProperties() {
+    return ["additionalProperties"];
+  }
+  mergeDescription(original, constraints) {
+    const hints = [];
+    if (constraints.additionalProperties === false)
+      hints.push("Only use the specified properties");
+    if (constraints.format === "date-time")
+      hints.push("Use ISO 8601 format");
+    if (constraints.pattern)
+      hints.push(`Must match: ${constraints.pattern}`);
+    const text = hints.join(". ");
+    return original && text ? `${original}. ${text}` : original || text || "";
+  }
+}
+
+// src/tool-compatibility/providers/google.ts
+class GoogleMcpCompatibility extends McpToolCompatibility {
+  constructor(modelInfo) {
+    super(modelInfo);
+  }
+  shouldApply() {
+    return this.modelInfo.provider === "google";
+  }
+  getUnsupportedStringProperties() {
+    return ["minLength", "maxLength", "pattern", "format"];
+  }
+  getUnsupportedNumberProperties() {
+    return ["minimum", "maximum", "exclusiveMinimum", "exclusiveMaximum", "multipleOf"];
+  }
+  getUnsupportedArrayProperties() {
+    return ["minItems", "maxItems", "uniqueItems"];
+  }
+  getUnsupportedObjectProperties() {
+    return ["minProperties", "maxProperties", "additionalProperties"];
+  }
+  mergeDescription(original, constraints) {
+    const rules = [];
+    if (constraints.minLength)
+      rules.push(`at least ${constraints.minLength} chars`);
+    if (constraints.maxLength)
+      rules.push(`at most ${constraints.maxLength} chars`);
+    if (constraints.minimum !== undefined)
+      rules.push(`>= ${constraints.minimum}`);
+    if (constraints.maximum !== undefined)
+      rules.push(`<= ${constraints.maximum}`);
+    if (constraints.format === "email")
+      rules.push(`valid email`);
+    if (constraints.format === "uri" || constraints.format === "url")
+      rules.push(`valid URL`);
+    if (constraints.pattern)
+      rules.push(`matches ${constraints.pattern}`);
+    if (constraints.enum)
+      rules.push(`one of: ${constraints.enum.join(", ")}`);
+    if (constraints.minItems)
+      rules.push(`>= ${constraints.minItems} items`);
+    if (constraints.maxItems)
+      rules.push(`<= ${constraints.maxItems} items`);
+    if (constraints.uniqueItems)
+      rules.push(`unique items`);
+    const text = rules.length > 0 ? `Constraints: ${rules.join("; ")}` : "";
+    return original && text ? `${original}
+
+${text}` : original || text;
+  }
+}
+
+// src/tool-compatibility/index.ts
+function detectModelProvider(runtime) {
+  const providerString = String(runtime?.modelProvider || "").toLowerCase();
+  const modelString = String(runtime?.model || "").toLowerCase();
+  let provider2 = "unknown";
+  let supportsStructuredOutputs = false;
+  let isReasoningModel = false;
+  if (providerString.includes("openai") || modelString.includes("gpt-") || modelString.includes("o1") || modelString.includes("o3")) {
+    provider2 = "openai";
+    supportsStructuredOutputs = modelString.includes("gpt-4") || modelString.includes("o1") || modelString.includes("o3");
+    isReasoningModel = modelString.includes("o1") || modelString.includes("o3");
+  } else if (providerString.includes("anthropic") || modelString.includes("claude")) {
+    provider2 = "anthropic";
+    supportsStructuredOutputs = true;
+  } else if (providerString.includes("google") || modelString.includes("gemini")) {
+    provider2 = "google";
+    supportsStructuredOutputs = true;
+  } else if (providerString.includes("openrouter") || modelString.includes("openrouter")) {
+    provider2 = "openrouter";
+  }
+  return { provider: provider2, modelId: modelString || providerString || "unknown", supportsStructuredOutputs, isReasoningModel };
+}
+function createMcpToolCompatibilitySync(runtime) {
+  const info = detectModelProvider(runtime);
+  switch (info.provider) {
+    case "openai":
+      return info.isReasoningModel ? new OpenAIReasoningMcpCompatibility(info) : new OpenAIMcpCompatibility(info);
+    case "anthropic":
+      return new AnthropicMcpCompatibility(info);
+    case "google":
+      return new GoogleMcpCompatibility(info);
+    default:
+      return null;
+  }
+}
+var createMcpToolCompatibility = createMcpToolCompatibilitySync;
 
 // src/service.ts
-var import_core8 = require("@elizaos/core");
-var import_client = require("@modelcontextprotocol/sdk/client/index.js");
-var import_sse = require("@modelcontextprotocol/sdk/client/sse.js");
-var import_stdio = require("@modelcontextprotocol/sdk/client/stdio.js");
-var import_streamableHttp = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
-var errMsg = (e) => e instanceof Error ? e.message : String(e);
+var err = (e) => e instanceof Error ? e.message : String(e);
 
 class McpService extends import_core8.Service {
   static serviceType = MCP_SERVICE_NAME;
-  capabilityDescription = "Enables the agent to interact with MCP (Model Context Protocol) servers";
+  capabilityDescription = "Enables the agent to interact with MCP servers";
   connections = new Map;
   connectionStates = new Map;
-  mcpProvider = {
-    values: { mcp: {}, mcpText: "" },
-    data: { mcp: {} },
-    text: ""
-  };
+  mcpProvider = { values: { mcp: {}, mcpText: "" }, data: { mcp: {} }, text: "" };
   pingConfig = DEFAULT_PING_CONFIG;
   toolCompatibility = null;
-  compatibilityInitialized = false;
-  initializationPromise = null;
-  constructor(runtime2) {
-    super(runtime2);
-    this.initializationPromise = this.initializeMcpServers();
-  }
-  static async start(runtime2) {
-    const service = new McpService(runtime2);
-    if (service.initializationPromise) {
-      await service.initializationPromise;
-    }
-    return service;
+  initPromise = null;
+  registeredActions = new Map;
+  schemaCache = getSchemaCache();
+  lazyConnections = new Map;
+  constructor(runtime) {
+    super(runtime);
+    this.initPromise = this.init();
+  }
+  static async start(runtime) {
+    const svc = new McpService(runtime);
+    await svc.initPromise;
+    return svc;
   }
   async waitForInitialization() {
-    if (this.initializationPromise) {
-      await this.initializationPromise;
-    }
+    await this.initPromise;
   }
   async stop() {
     for (const name of this.connections.keys()) {
-      await this.deleteConnection(name);
-    }
-    for (const [name, state] of this.connectionStates.entries()) {
-      if (state.pingInterval)
-        clearInterval(state.pingInterval);
-      if (state.reconnectTimeout)
-        clearTimeout(state.reconnectTimeout);
-      this.connectionStates.delete(name);
+      await this.disconnect(name);
     }
   }
-  async initializeMcpServers() {
+  async init() {
     try {
-      const mcpSettings = this.getMcpSettings();
-      if (!mcpSettings?.servers || Object.keys(mcpSettings.servers).length === 0) {
+      const settings = this.getSettings();
+      if (!settings?.servers || Object.keys(settings.servers).length === 0) {
         this.mcpProvider = buildMcpProviderData([]);
         return;
       }
-      const connectionStartTime = Date.now();
-      await this.updateServerConnections(mcpSettings.servers);
-      const connectionDuration = Date.now() - connectionStartTime;
-      const servers = this.getServers();
-      const connected = servers.filter((s) => s.status === "connected");
-      const failed = servers.filter((s) => s.status !== "connected");
-      if (connected.length > 0) {
-        import_core8.logger.info(`[MCP] Connected ${connected.length}/${servers.length} in ${connectionDuration}ms (${connected.map((s) => `${s.name}:${s.tools?.length || 0}`).join(", ")})`);
-      }
-      if (failed.length > 0) {
-        import_core8.logger.warn(`[MCP] Failed: ${failed.map((s) => s.name).join(", ")}`);
-      }
-      if (connected.length === 0 && servers.length > 0) {
-        import_core8.logger.error(`[MCP] All servers failed`);
-      }
-      this.mcpProvider = buildMcpProviderData(servers);
-    } catch (error) {
-      import_core8.logger.error({ error: errMsg(error) }, "[MCP] Initialization failed");
+      const start = Date.now();
+      const entries = Object.entries(settings.servers);
+      const results = { cached: [], connected: [], failed: [] };
+      await Promise.allSettled(entries.map(async ([name, config]) => {
+        try {
+          const hash = this.schemaCache.hashConfig(config);
+          if (this.schemaCache.isEnabled) {
+            const cached = await this.schemaCache.getSchemas(this.runtime.agentId, name, hash);
+            if (cached) {
+              this.registerToolsAsActions(name, McpSchemaCache.toTools(cached));
+              this.lazyConnections.set(name, config);
+              results.cached.push(`${name}:${cached.tools.length}`);
+              return;
+            }
+          }
+          await this.connect(name, config);
+          const server = this.connections.get(name)?.server;
+          if (this.schemaCache.isEnabled && server?.tools?.length) {
+            await this.schemaCache.setSchemas(this.runtime.agentId, name, hash, server.tools);
+          }
+          results.connected.push(`${name}:${server?.tools?.length || 0}`);
+        } catch (e) {
+          import_core8.logger.error({ error: err(e), server: name }, `[MCP] Failed: ${name}`);
+          results.failed.push(name);
+        }
+      }));
+      const total = results.cached.length + results.connected.length;
+      import_core8.logger.info(`[MCP] Ready ${total}/${entries.length} in ${Date.now() - start}ms ` + `(${results.cached.length} cached, ${results.connected.length} connected, ${results.failed.length} failed)`);
+      this.mcpProvider = buildMcpProviderData(this.getServers());
+    } catch (e) {
+      import_core8.logger.error({ error: err(e) }, "[MCP] Init failed");
       this.mcpProvider = buildMcpProviderData([]);
     }
   }
-  getMcpSettings() {
-    let settings = this.runtime.getSetting("mcp");
-    if (!settings || typeof settings === "object" && !settings.servers) {
-      settings = this.runtime.character?.settings?.mcp;
-    }
-    if (!settings || typeof settings === "object" && !settings.servers) {
-      settings = this.runtime.settings?.mcp;
-    }
-    return settings && typeof settings === "object" && settings.servers ? settings : undefined;
-  }
-  async updateServerConnections(serverConfigs) {
-    const newNames = new Set(Object.keys(serverConfigs));
-    for (const name of this.connections.keys()) {
-      if (!newNames.has(name))
-        await this.deleteConnection(name);
-    }
-    await Promise.allSettled(Object.entries(serverConfigs).map(async ([name, config]) => {
-      const current = this.connections.get(name);
-      if (!current) {
-        await this.initializeConnection(name, config).catch((e) => import_core8.logger.error({ error: errMsg(e), serverName: name }, `[MCP] Failed: ${name}`));
-      } else if (JSON.stringify(config) !== current.server.config) {
-        await this.deleteConnection(name);
-        await this.initializeConnection(name, config).catch((e) => import_core8.logger.error({ error: errMsg(e), serverName: name }, `[MCP] Failed: ${name}`));
-      }
-    }));
+  getSettings() {
+    let s = this.runtime.getSetting("mcp");
+    if (!s?.servers)
+      s = this.runtime.character?.settings?.mcp;
+    if (!s?.servers)
+      s = this.runtime.settings?.mcp;
+    return s?.servers ? s : undefined;
   }
-  async initializeConnection(name, config) {
-    await this.deleteConnection(name);
-    const state = {
-      status: "connecting",
-      reconnectAttempts: 0,
-      consecutivePingFailures: 0
-    };
+  async connect(name, config) {
+    await this.disconnect(name);
+    const state = { status: "connecting", reconnectAttempts: 0, consecutivePingFailures: 0 };
     this.connectionStates.set(name, state);
     try {
       const client = new import_client.Client({ name: "ElizaOS", version: "1.0.0" }, { capabilities: {} });
-      const transport = config.type === "stdio" ? await this.buildStdioClientTransport(name, config) : await this.buildHttpClientTransport(name, config);
-      const connection = {
+      const transport = config.type === "stdio" ? this.createStdioTransport(name, config) : this.createHttpTransport(name, config);
+      const conn = {
         server: { name, config: JSON.stringify(config), status: "connecting" },
         client,
         transport
       };
-      this.connections.set(name, connection);
-      this.setupTransportHandlers(name, connection, state);
-      const connectPromise = client.connect(transport);
-      connectPromise.catch(() => {});
+      this.connections.set(name, conn);
+      this.setupTransportHandlers(name, conn, state, config.type === "stdio");
       await Promise.race([
-        connectPromise,
-        new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout connecting to ${name}`)), 60000))
+        client.connect(transport),
+        new Promise((_, rej) => setTimeout(() => rej(new Error("Connection timeout")), 60000))
       ]);
-      const capabilities = client.getServerCapabilities();
-      const tools = await this.fetchToolsList(name);
-      const resources = capabilities?.resources ? await this.fetchResourcesList(name) : [];
-      const resourceTemplates = capabilities?.resources ? await this.fetchResourceTemplatesList(name) : [];
-      connection.server = {
-        status: "connected",
-        name,
-        config: JSON.stringify(config),
-        error: "",
-        tools,
-        resources,
-        resourceTemplates
-      };
+      const caps = client.getServerCapabilities();
+      const tools = await this.fetchTools(name);
+      const resources = caps?.resources ? await this.fetchResources(name) : [];
+      const resourceTemplates = caps?.resources ? await this.fetchResourceTemplates(name) : [];
+      conn.server = { status: "connected", name, config: JSON.stringify(config), error: "", tools, resources, resourceTemplates };
       state.status = "connected";
       state.lastConnected = new Date;
       state.reconnectAttempts = 0;
       state.consecutivePingFailures = 0;
-      this.startPingMonitoring(name);
-    } catch (error) {
+      if (config.type === "stdio")
+        this.startPingMonitor(name);
+      this.registerToolsAsActions(name, tools);
+      import_core8.logger.info(`[MCP] Connected: ${name} (${tools?.length || 0} tools)`);
+    } catch (e) {
       state.status = "disconnected";
-      state.lastError = error instanceof Error ? error : new Error(String(error));
-      this.handleDisconnection(name, error);
-      throw error;
+      state.lastError = e instanceof Error ? e : new Error(String(e));
+      this.handleDisconnect(name, e);
+      throw e;
     }
   }
-  setupTransportHandlers(name, connection, state) {
-    const config = JSON.parse(connection.server.config);
-    const isHttp = config.type !== "stdio";
-    connection.transport.onerror = async (error) => {
-      const msg = error?.message || String(error);
-      const isExpectedTimeout = isHttp && (!msg || msg === "undefined" || msg.includes("SSE") || msg.includes("timeout"));
-      if (!isExpectedTimeout) {
-        import_core8.logger.error({ error, serverName: name }, `Transport error: ${name}`);
-        connection.server.status = "disconnected";
-        this.appendErrorMessage(connection, msg);
+  async disconnect(name) {
+    this.unregisterToolsAsActions(name);
+    const conn = this.connections.get(name);
+    if (conn) {
+      try {
+        await conn.transport.close();
+        await conn.client.close();
+      } catch (e) {
+        import_core8.logger.debug({ error: err(e), server: name }, `[MCP] Error during disconnect (expected during shutdown)`);
       }
-      if (!isHttp)
-        this.handleDisconnection(name, error);
+      this.connections.delete(name);
+    }
+    const state = this.connectionStates.get(name);
+    if (state) {
+      if (state.pingInterval)
+        clearInterval(state.pingInterval);
+      if (state.reconnectTimeout)
+        clearTimeout(state.reconnectTimeout);
+      this.connectionStates.delete(name);
+    }
+  }
+  createStdioTransport(name, config) {
+    if (!config.command)
+      throw new Error(`Missing command for stdio server ${name}`);
+    return new import_stdio.StdioClientTransport({
+      command: config.command,
+      args: config.args,
+      env: { ...config.env, ...process.env.PATH ? { PATH: process.env.PATH } : {} },
+      stderr: "pipe",
+      cwd: config.cwd
+    });
+  }
+  createHttpTransport(name, config) {
+    if (!config.url)
+      throw new Error(`Missing URL for server ${name}`);
+    const url = new URL(config.url);
+    const opts = config.headers ? { requestInit: { headers: config.headers } } : undefined;
+    return config.type === "sse" ? new import_sse.SSEClientTransport(url, opts) : new import_streamableHttp.StreamableHTTPClientTransport(url, opts);
+  }
+  setupTransportHandlers(name, conn, state, isStdio) {
+    conn.transport.onerror = async (e) => {
+      const msg = e?.message || "";
+      if (isStdio || !msg.includes("SSE") && !msg.includes("timeout") && msg !== "undefined") {
+        import_core8.logger.error({ error: e, server: name }, `[MCP] Transport error: ${name}`);
+        conn.server.status = "disconnected";
+        conn.server.error = (conn.server.error || "") + `
+` + msg;
+      }
+      if (isStdio)
+        this.handleDisconnect(name, e);
     };
-    connection.transport.onclose = async () => {
-      if (!isHttp) {
-        import_core8.logger.warn({ serverName: name }, `Transport closed: ${name}`);
-        connection.server.status = "disconnected";
-        this.handleDisconnection(name, new Error("Transport closed"));
+    conn.transport.onclose = async () => {
+      if (isStdio) {
+        conn.server.status = "disconnected";
+        this.handleDisconnect(name, new Error("Transport closed"));
       }
     };
   }
-  startPingMonitoring(name) {
-    const connection = this.connections.get(name);
-    if (!connection)
-      return;
-    const config = JSON.parse(connection.server.config);
-    if (config.type !== "stdio")
-      return;
+  startPingMonitor(name) {
     const state = this.connectionStates.get(name);
     if (!state || !this.pingConfig.enabled)
       return;
     if (state.pingInterval)
       clearInterval(state.pingInterval);
-    state.pingInterval = setInterval(() => {
-      this.sendPing(name).catch((err) => {
-        import_core8.logger.warn({ error: errMsg(err), serverName: name }, `Ping failed: ${name}`);
-        this.handlePingFailure(name, err);
-      });
+    state.pingInterval = setInterval(async () => {
+      const conn = this.connections.get(name);
+      if (!conn)
+        return;
+      try {
+        await Promise.race([
+          conn.client.listTools(),
+          new Promise((_, r) => setTimeout(() => r(new Error("Ping timeout")), this.pingConfig.timeoutMs))
+        ]);
+        state.consecutivePingFailures = 0;
+      } catch (e) {
+        state.consecutivePingFailures++;
+        if (state.consecutivePingFailures >= this.pingConfig.failuresBeforeDisconnect) {
+          this.handleDisconnect(name, e);
+        }
+      }
     }, this.pingConfig.intervalMs);
   }
-  async sendPing(name) {
-    const connection = this.connections.get(name);
-    if (!connection)
-      throw new Error(`No connection: ${name}`);
-    await Promise.race([
-      connection.client.listTools(),
-      new Promise((_, reject) => setTimeout(() => reject(new Error("Ping timeout")), this.pingConfig.timeoutMs))
-    ]);
-    const state = this.connectionStates.get(name);
-    if (state)
-      state.consecutivePingFailures = 0;
-  }
-  handlePingFailure(name, error) {
-    const state = this.connectionStates.get(name);
-    if (!state)
-      return;
-    state.consecutivePingFailures++;
-    if (state.consecutivePingFailures >= this.pingConfig.failuresBeforeDisconnect) {
-      import_core8.logger.warn(`Ping failures exceeded for ${name}, disconnecting and attempting reconnect.`);
-      this.handleDisconnection(name, error);
-    }
-  }
-  handleDisconnection(name, error) {
+  handleDisconnect(name, error) {
     const state = this.connectionStates.get(name);
     if (!state)
       return;
@@ -2016,140 +1559,131 @@ class McpService extends import_core8.Service {
     if (state.reconnectTimeout)
       clearTimeout(state.reconnectTimeout);
     if (state.reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
-      import_core8.logger.error(`Max reconnect attempts reached for ${name}. Giving up.`);
+      import_core8.logger.error(`[MCP] Max reconnect attempts for ${name}`);
       return;
     }
     const delay = INITIAL_RETRY_DELAY * Math.pow(BACKOFF_MULTIPLIER, state.reconnectAttempts);
     state.reconnectTimeout = setTimeout(async () => {
       state.reconnectAttempts++;
-      import_core8.logger.info(`Attempting to reconnect to ${name} (attempt ${state.reconnectAttempts})...`);
       const config = this.connections.get(name)?.server.config;
       if (config) {
         try {
-          await this.initializeConnection(name, JSON.parse(config));
-        } catch (err) {
-          import_core8.logger.error({ error: errMsg(err), serverName: name }, `Reconnect attempt failed for ${name}`);
-          this.handleDisconnection(name, err);
+          await this.connect(name, JSON.parse(config));
+        } catch (e) {
+          this.handleDisconnect(name, e);
         }
       }
     }, delay);
   }
-  async deleteConnection(name) {
-    const connection = this.connections.get(name);
-    if (connection) {
-      try {
-        await connection.transport.close();
-        await connection.client.close();
-      } catch (error) {
-        import_core8.logger.error({ error: errMsg(error), serverName: name }, `Failed to close transport for ${name}`);
-      }
-      this.connections.delete(name);
-    }
-    const state = this.connectionStates.get(name);
-    if (state) {
-      if (state.pingInterval)
-        clearInterval(state.pingInterval);
-      if (state.reconnectTimeout)
-        clearTimeout(state.reconnectTimeout);
-      this.connectionStates.delete(name);
-    }
-  }
-  async buildStdioClientTransport(name, config) {
-    if (!config.command) {
-      throw new Error(`Missing command for stdio MCP server ${name}`);
-    }
-    return new import_stdio.StdioClientTransport({
-      command: config.command,
-      args: config.args,
-      env: {
-        ...config.env,
-        ...process.env.PATH ? { PATH: process.env.PATH } : {}
-      },
-      stderr: "pipe",
-      cwd: config.cwd
-    });
-  }
-  async buildHttpClientTransport(name, config) {
-    if (!config.url)
-      throw new Error(`Missing URL for MCP server ${name}`);
-    const url = new URL(config.url);
-    const opts = config.headers ? { requestInit: { headers: config.headers } } : undefined;
-    if (config.type === "sse") {
-      import_core8.logger.warn(`[MCP] "${name}": SSE requires Redis. Use "streamable-http" instead.`);
-      return new import_sse.SSEClientTransport(url, opts);
-    }
-    return new import_streamableHttp.StreamableHTTPClientTransport(url, opts);
-  }
-  appendErrorMessage(connection, error) {
-    connection.server.error = connection.server.error ? `${connection.server.error}
-${error}` : error;
-  }
-  async fetchToolsList(serverName) {
-    const connection = this.connections.get(serverName);
-    if (!connection)
+  async fetchTools(name) {
+    const conn = this.connections.get(name);
+    if (!conn)
       return [];
     try {
-      const response = await connection.client.listTools();
-      return (response?.tools || []).map((tool) => {
-        if (!tool.inputSchema)
-          return tool;
-        if (!this.compatibilityInitialized)
-          this.initializeToolCompatibility();
+      const res = await conn.client.listTools();
+      return (res?.tools || []).map((t) => {
+        if (!t.inputSchema)
+          return t;
+        if (!this.toolCompatibility)
+          this.toolCompatibility = createMcpToolCompatibilitySync(this.runtime);
         try {
-          return { ...tool, inputSchema: this.applyToolCompatibility(tool.inputSchema) };
-        } catch {
-          return tool;
+          return { ...t, inputSchema: this.toolCompatibility.transformToolSchema(t.inputSchema) };
+        } catch (e) {
+          import_core8.logger.debug({ error: err(e), tool: t.name }, `[MCP] Schema transform failed, using original`);
+          return t;
         }
       });
-    } catch (error) {
-      import_core8.logger.error({ error: errMsg(error), serverName }, `Failed to fetch tools: ${serverName}`);
+    } catch (e) {
+      import_core8.logger.warn({ error: err(e), server: name }, `[MCP] Failed to fetch tools`);
       return [];
     }
   }
-  async fetchResourcesList(name) {
-    const conn = this.connections.get(name);
-    if (!conn)
-      return [];
+  async fetchResources(name) {
     try {
-      return (await conn.client.listResources())?.resources || [];
-    } catch (error) {
-      import_core8.logger.debug({ error: errMsg(error), serverName: name }, `No resources for ${name}`);
+      return (await this.connections.get(name)?.client.listResources())?.resources || [];
+    } catch (e) {
+      import_core8.logger.debug({ error: err(e), server: name }, `[MCP] Failed to fetch resources`);
       return [];
     }
   }
-  async fetchResourceTemplatesList(name) {
-    const conn = this.connections.get(name);
-    if (!conn)
-      return [];
+  async fetchResourceTemplates(name) {
     try {
-      return (await conn.client.listResourceTemplates())?.resourceTemplates || [];
-    } catch (error) {
-      import_core8.logger.debug({ error: errMsg(error), serverName: name }, `No resource templates for ${name}`);
+      return (await this.connections.get(name)?.client.listResourceTemplates())?.resourceTemplates || [];
+    } catch (e) {
+      import_core8.logger.debug({ error: err(e), server: name }, `[MCP] Failed to fetch resource templates`);
       return [];
     }
   }
+  registerToolsAsActions(serverName, tools) {
+    if (!tools?.length)
+      return;
+    const existing = new Set([...this.runtime.actions.map((a) => a.name), ...this.registeredActions.keys()]);
+    const actions = createMcpToolActions(serverName, tools, existing);
+    for (const action of actions) {
+      if (!this.registeredActions.has(action.name)) {
+        this.runtime.registerAction(action);
+        this.registeredActions.set(action.name, action);
+      }
+    }
+    import_core8.logger.info(`[MCP] Registered ${actions.length} actions for ${serverName}`);
+  }
+  unregisterToolsAsActions(serverName) {
+    const toRemove = [];
+    for (const [name, action] of this.registeredActions) {
+      if (action._mcpMeta.serverName === serverName)
+        toRemove.push(name);
+    }
+    for (const name of toRemove) {
+      const idx = this.runtime.actions.findIndex((a) => a.name === name);
+      if (idx !== -1)
+        this.runtime.actions.splice(idx, 1);
+      this.registeredActions.delete(name);
+    }
+  }
   getServers() {
-    return Array.from(this.connections.values()).filter((conn) => !conn.server.disabled).map((conn) => conn.server);
+    return Array.from(this.connections.values()).filter((c) => !c.server.disabled).map((c) => c.server);
   }
   getProviderData() {
     return this.mcpProvider;
   }
+  getRegisteredActions() {
+    return Array.from(this.registeredActions.values());
+  }
+  isLazyConnection(serverName) {
+    return this.lazyConnections.has(serverName);
+  }
+  async ensureConnected(serverName) {
+    if (this.connections.has(serverName))
+      return;
+    const config = this.lazyConnections.get(serverName);
+    if (!config)
+      throw new Error(`Unknown server: ${serverName}`);
+    const start = Date.now();
+    await this.connect(serverName, config);
+    this.lazyConnections.delete(serverName);
+    const server = this.connections.get(serverName)?.server;
+    if (this.schemaCache.isEnabled && server?.tools?.length) {
+      await this.schemaCache.setSchemas(this.runtime.agentId, serverName, this.schemaCache.hashConfig(config), server.tools);
+    }
+    import_core8.logger.info(`[MCP] Lazy connected: ${serverName} in ${Date.now() - start}ms`);
+    this.mcpProvider = buildMcpProviderData(this.getServers());
+  }
   async callTool(serverName, toolName, args) {
+    await this.ensureConnected(serverName);
     const conn = this.connections.get(serverName);
     if (!conn)
       throw new Error(`No connection: ${serverName}`);
     if (conn.server.disabled)
       throw new Error(`Server disabled: ${serverName}`);
     const config = JSON.parse(conn.server.config);
-    const timeout = (config.type === "stdio" ? config.timeoutInMillis : config.timeout) ?? DEFAULT_MCP_TIMEOUT_SECONDS;
-    const result = await conn.client.callTool({ name: toolName, arguments: args }, undefined, {
-      timeout
-    });
+    const timeout = config.timeoutInMillis || DEFAULT_MCP_TIMEOUT_SECONDS;
+    const result = await conn.client.callTool({ name: toolName, arguments: args }, undefined, { timeout });
     if (!result.content)
-      throw new Error("Invalid tool result: missing content");
+      throw new Error("Invalid tool result");
     return result;
   }
   async readResource(serverName, uri) {
+    await this.ensureConnected(serverName);
     const conn = this.connections.get(serverName);
     if (!conn)
       throw new Error(`No connection: ${serverName}`);
@@ -2162,27 +1696,8 @@ ${error}` : error;
     if (!conn)
       throw new Error(`No connection: ${serverName}`);
     const config = conn.server.config;
-    conn.server.status = "connecting";
-    conn.server.error = "";
-    await this.deleteConnection(serverName);
-    await this.initializeConnection(serverName, JSON.parse(config));
-  }
-  initializeToolCompatibility() {
-    if (this.compatibilityInitialized)
-      return;
-    this.toolCompatibility = createMcpToolCompatibilitySync(this.runtime);
-    this.compatibilityInitialized = true;
-  }
-  applyToolCompatibility(toolSchema) {
-    if (!this.compatibilityInitialized)
-      this.initializeToolCompatibility();
-    if (!this.toolCompatibility || !toolSchema)
-      return toolSchema;
-    try {
-      return this.toolCompatibility.transformToolSchema(toolSchema);
-    } catch {
-      return toolSchema;
-    }
+    await this.disconnect(serverName);
+    await this.connect(serverName, JSON.parse(config));
   }
 }
 
@@ -2194,9 +1709,9 @@ var mcpPlugin = {
     import_core9.logger.info("Initializing MCP plugin...");
   },
   services: [McpService],
-  actions: [callToolAction, readResourceAction],
+  actions: [readResourceAction],
   providers: [provider]
 };
 var src_default = mcpPlugin;
 
-//# debugId=4999FDCEADE0A8A564756E2164756E21
+//# debugId=48F4A8AA4A8260E964756E2164756E21