mcp-use 1.3.0-canary.0 → 1.3.0

package/dist/{chunk-73SH52J2.js → chunk-6EHM3S3M.js}

@@ -1319,11 +1319,11 @@ Raw error: ${result}`
 
 // src/agents/mcp_agent.ts
 import {
+  AIMessage,
   createAgent,
+  HumanMessage,
   modelCallLimitMiddleware,
   SystemMessage as SystemMessage2,
-  AIMessage,
-  HumanMessage,
   ToolMessage
 } from "langchain";
 import { zodToJsonSchema as zodToJsonSchema2 } from "zod-to-json-schema";
@@ -1880,6 +1880,185 @@ var MCPAgent = class {
       return String(value);
     }
   }
+  /**
+   * Check if a message is AI/assistant-like regardless of whether it's a class instance.
+   * Handles version mismatches, serialization boundaries, and different message formats.
+   *
+   * This method solves the issue where messages from LangChain agents may be plain JavaScript
+   * objects (e.g., `{ type: 'ai', content: '...' }`) instead of AIMessage instances due to
+   * serialization/deserialization across module boundaries or version mismatches.
+   *
+   * @example
+   * // Real AIMessage instance (standard case)
+   * _isAIMessageLike(new AIMessage("hello")) // => true
+   *
+   * @example
+   * // Plain object after serialization (fixes issue #446)
+   * _isAIMessageLike({ type: "ai", content: "hello" }) // => true
+   *
+   * @example
+   * // OpenAI-style format with role
+   * _isAIMessageLike({ role: "assistant", content: "hello" }) // => true
+   *
+   * @example
+   * // Object with getType() method
+   * _isAIMessageLike({ getType: () => "ai", content: "hello" }) // => true
+   *
+   * @param message - The message object to check
+   * @returns true if the message represents an AI/assistant message
+   */
+  _isAIMessageLike(message) {
+    if (message instanceof AIMessage) {
+      return true;
+    }
+    if (typeof message !== "object" || message === null) {
+      return false;
+    }
+    const msg = message;
+    if (typeof msg.getType === "function") {
+      try {
+        const type = msg.getType();
+        if (type === "ai" || type === "assistant") {
+          return true;
+        }
+      } catch (error) {
+      }
+    }
+    if (typeof msg._getType === "function") {
+      try {
+        const type = msg._getType();
+        if (type === "ai" || type === "assistant") {
+          return true;
+        }
+      } catch (error) {
+      }
+    }
+    if ("type" in msg) {
+      return msg.type === "ai" || msg.type === "assistant";
+    }
+    if ("role" in msg) {
+      return msg.role === "ai" || msg.role === "assistant";
+    }
+    return false;
+  }
+  /**
+   * Check if a message has tool calls, handling both class instances and plain objects.
+   * Safely checks for tool_calls array presence.
+   *
+   * @example
+   * // AIMessage with tool calls
+   * const msg = new AIMessage({ content: "", tool_calls: [{ name: "add", args: {} }] });
+   * _messageHasToolCalls(msg) // => true
+   *
+   * @example
+   * // Plain object with tool calls
+   * _messageHasToolCalls({ type: "ai", tool_calls: [{ name: "add" }] }) // => true
+   *
+   * @example
+   * // Message without tool calls
+   * _messageHasToolCalls({ type: "ai", content: "hello" }) // => false
+   *
+   * @param message - The message object to check
+   * @returns true if the message has non-empty tool_calls array
+   */
+  _messageHasToolCalls(message) {
+    if (typeof message === "object" && message !== null && "tool_calls" in message && Array.isArray(message.tool_calls)) {
+      return message.tool_calls.length > 0;
+    }
+    return false;
+  }
+  /**
+   * Check if a message is a HumanMessage-like object.
+   * Handles both class instances and plain objects from serialization.
+   *
+   * @example
+   * _isHumanMessageLike(new HumanMessage("hello")) // => true
+   * _isHumanMessageLike({ type: "human", content: "hello" }) // => true
+   *
+   * @param message - The message object to check
+   * @returns true if the message represents a human message
+   */
+  _isHumanMessageLike(message) {
+    if (message instanceof HumanMessage) {
+      return true;
+    }
+    if (typeof message !== "object" || message === null) {
+      return false;
+    }
+    const msg = message;
+    if (typeof msg.getType === "function") {
+      try {
+        const type = msg.getType();
+        if (type === "human" || type === "user") {
+          return true;
+        }
+      } catch (error) {
+      }
+    }
+    if ("type" in msg && (msg.type === "human" || msg.type === "user")) {
+      return true;
+    }
+    if ("role" in msg && (msg.role === "human" || msg.role === "user")) {
+      return true;
+    }
+    return false;
+  }
+  /**
+   * Check if a message is a ToolMessage-like object.
+   * Handles both class instances and plain objects from serialization.
+   *
+   * @example
+   * _isToolMessageLike(new ToolMessage({ content: "result", tool_call_id: "123" })) // => true
+   * _isToolMessageLike({ type: "tool", content: "result" }) // => true
+   *
+   * @param message - The message object to check
+   * @returns true if the message represents a tool message
+   */
+  _isToolMessageLike(message) {
+    if (message instanceof ToolMessage) {
+      return true;
+    }
+    if (typeof message !== "object" || message === null) {
+      return false;
+    }
+    const msg = message;
+    if (typeof msg.getType === "function") {
+      try {
+        const type = msg.getType();
+        if (type === "tool") {
+          return true;
+        }
+      } catch (error) {
+      }
+    }
+    if ("type" in msg && msg.type === "tool") {
+      return true;
+    }
+    return false;
+  }
+  /**
+   * Extract content from a message, handling both AIMessage instances and plain objects.
+   *
+   * @example
+   * // From AIMessage instance
+   * _getMessageContent(new AIMessage("hello")) // => "hello"
+   *
+   * @example
+   * // From plain object
+   * _getMessageContent({ type: "ai", content: "hello" }) // => "hello"
+   *
+   * @param message - The message object to extract content from
+   * @returns The content of the message, or undefined if not present
+   */
+  _getMessageContent(message) {
+    if (message instanceof AIMessage) {
+      return message.content;
+    }
+    if (message && typeof message === "object" && "content" in message) {
+      return message.content;
+    }
+    return void 0;
+  }
   async _consumeAndReturn(generator) {
     while (true) {
       const { done, value } = await generator.next();
@@ -1951,7 +2130,7 @@ var MCPAgent = class {
       const historyToUse = externalHistory ?? this.conversationHistory;
       const langchainHistory = [];
       for (const msg of historyToUse) {
-        if (msg instanceof HumanMessage || msg instanceof AIMessage) {
+        if (this._isHumanMessageLike(msg) || this._isAIMessageLike(msg)) {
           langchainHistory.push(msg);
         }
       }
@@ -2020,7 +2199,7 @@ var MCPAgent = class {
                     };
                   }
                 }
-                if (message instanceof ToolMessage || message && "type" in message && message.type === "tool") {
+                if (this._isToolMessageLike(message)) {
                   const observation = message.content;
                   let observationStr = String(observation);
                   if (observationStr.length > 100) {
@@ -2055,8 +2234,10 @@ var MCPAgent = class {
                     }
                   }
                 }
-                if (message instanceof AIMessage && !("tool_calls" in message && Array.isArray(message.tool_calls) && message.tool_calls.length > 0)) {
-                  finalOutput = this._normalizeOutput(message.content);
+                if (this._isAIMessageLike(message) && !this._messageHasToolCalls(message)) {
+                  finalOutput = this._normalizeOutput(
+                    this._getMessageContent(message)
+                  );
                   logger.info("\u2705 Agent finished with output");
                 }
               }
@@ -2239,10 +2420,12 @@ var MCPAgent = class {
       const historyToUse = externalHistory ?? this.conversationHistory;
       const langchainHistory = [];
       for (const msg of historyToUse) {
-        if (msg instanceof HumanMessage || msg instanceof AIMessage || msg instanceof ToolMessage) {
+        if (this._isHumanMessageLike(msg) || this._isAIMessageLike(msg) || this._isToolMessageLike(msg)) {
           langchainHistory.push(msg);
         } else {
-          logger.info(`\u26A0\uFE0F Skipped message of type: ${msg.constructor.name}`);
+          logger.info(
+            `\u26A0\uFE0F Skipped message of type: ${msg.constructor?.name || typeof msg}`
+          );
         }
       }
       const inputs = [

package/dist/index.cjs

@@ -2488,6 +2488,185 @@ var MCPAgent = class {
       return String(value);
     }
   }
+  /**
+   * Check if a message is AI/assistant-like regardless of whether it's a class instance.
+   * Handles version mismatches, serialization boundaries, and different message formats.
+   *
+   * This method solves the issue where messages from LangChain agents may be plain JavaScript
+   * objects (e.g., `{ type: 'ai', content: '...' }`) instead of AIMessage instances due to
+   * serialization/deserialization across module boundaries or version mismatches.
+   *
+   * @example
+   * // Real AIMessage instance (standard case)
+   * _isAIMessageLike(new AIMessage("hello")) // => true
+   *
+   * @example
+   * // Plain object after serialization (fixes issue #446)
+   * _isAIMessageLike({ type: "ai", content: "hello" }) // => true
+   *
+   * @example
+   * // OpenAI-style format with role
+   * _isAIMessageLike({ role: "assistant", content: "hello" }) // => true
+   *
+   * @example
+   * // Object with getType() method
+   * _isAIMessageLike({ getType: () => "ai", content: "hello" }) // => true
+   *
+   * @param message - The message object to check
+   * @returns true if the message represents an AI/assistant message
+   */
+  _isAIMessageLike(message) {
+    if (message instanceof import_langchain2.AIMessage) {
+      return true;
+    }
+    if (typeof message !== "object" || message === null) {
+      return false;
+    }
+    const msg = message;
+    if (typeof msg.getType === "function") {
+      try {
+        const type = msg.getType();
+        if (type === "ai" || type === "assistant") {
+          return true;
+        }
+      } catch (error) {
+      }
+    }
+    if (typeof msg._getType === "function") {
+      try {
+        const type = msg._getType();
+        if (type === "ai" || type === "assistant") {
+          return true;
+        }
+      } catch (error) {
+      }
+    }
+    if ("type" in msg) {
+      return msg.type === "ai" || msg.type === "assistant";
+    }
+    if ("role" in msg) {
+      return msg.role === "ai" || msg.role === "assistant";
+    }
+    return false;
+  }
+  /**
+   * Check if a message has tool calls, handling both class instances and plain objects.
+   * Safely checks for tool_calls array presence.
+   *
+   * @example
+   * // AIMessage with tool calls
+   * const msg = new AIMessage({ content: "", tool_calls: [{ name: "add", args: {} }] });
+   * _messageHasToolCalls(msg) // => true
+   *
+   * @example
+   * // Plain object with tool calls
+   * _messageHasToolCalls({ type: "ai", tool_calls: [{ name: "add" }] }) // => true
+   *
+   * @example
+   * // Message without tool calls
+   * _messageHasToolCalls({ type: "ai", content: "hello" }) // => false
+   *
+   * @param message - The message object to check
+   * @returns true if the message has non-empty tool_calls array
+   */
+  _messageHasToolCalls(message) {
+    if (typeof message === "object" && message !== null && "tool_calls" in message && Array.isArray(message.tool_calls)) {
+      return message.tool_calls.length > 0;
+    }
+    return false;
+  }
+  /**
+   * Check if a message is a HumanMessage-like object.
+   * Handles both class instances and plain objects from serialization.
+   *
+   * @example
+   * _isHumanMessageLike(new HumanMessage("hello")) // => true
+   * _isHumanMessageLike({ type: "human", content: "hello" }) // => true
+   *
+   * @param message - The message object to check
+   * @returns true if the message represents a human message
+   */
+  _isHumanMessageLike(message) {
+    if (message instanceof import_langchain2.HumanMessage) {
+      return true;
+    }
+    if (typeof message !== "object" || message === null) {
+      return false;
+    }
+    const msg = message;
+    if (typeof msg.getType === "function") {
+      try {
+        const type = msg.getType();
+        if (type === "human" || type === "user") {
+          return true;
+        }
+      } catch (error) {
+      }
+    }
+    if ("type" in msg && (msg.type === "human" || msg.type === "user")) {
+      return true;
+    }
+    if ("role" in msg && (msg.role === "human" || msg.role === "user")) {
+      return true;
+    }
+    return false;
+  }
+  /**
+   * Check if a message is a ToolMessage-like object.
+   * Handles both class instances and plain objects from serialization.
+   *
+   * @example
+   * _isToolMessageLike(new ToolMessage({ content: "result", tool_call_id: "123" })) // => true
+   * _isToolMessageLike({ type: "tool", content: "result" }) // => true
+   *
+   * @param message - The message object to check
+   * @returns true if the message represents a tool message
+   */
+  _isToolMessageLike(message) {
+    if (message instanceof import_langchain2.ToolMessage) {
+      return true;
+    }
+    if (typeof message !== "object" || message === null) {
+      return false;
+    }
+    const msg = message;
+    if (typeof msg.getType === "function") {
+      try {
+        const type = msg.getType();
+        if (type === "tool") {
+          return true;
+        }
+      } catch (error) {
+      }
+    }
+    if ("type" in msg && msg.type === "tool") {
+      return true;
+    }
+    return false;
+  }
+  /**
+   * Extract content from a message, handling both AIMessage instances and plain objects.
+   *
+   * @example
+   * // From AIMessage instance
+   * _getMessageContent(new AIMessage("hello")) // => "hello"
+   *
+   * @example
+   * // From plain object
+   * _getMessageContent({ type: "ai", content: "hello" }) // => "hello"
+   *
+   * @param message - The message object to extract content from
+   * @returns The content of the message, or undefined if not present
+   */
+  _getMessageContent(message) {
+    if (message instanceof import_langchain2.AIMessage) {
+      return message.content;
+    }
+    if (message && typeof message === "object" && "content" in message) {
+      return message.content;
+    }
+    return void 0;
+  }
   async _consumeAndReturn(generator) {
     while (true) {
       const { done, value } = await generator.next();
@@ -2559,7 +2738,7 @@ var MCPAgent = class {
       const historyToUse = externalHistory ?? this.conversationHistory;
       const langchainHistory = [];
       for (const msg of historyToUse) {
-        if (msg instanceof import_langchain2.HumanMessage || msg instanceof import_langchain2.AIMessage) {
+        if (this._isHumanMessageLike(msg) || this._isAIMessageLike(msg)) {
           langchainHistory.push(msg);
         }
       }
@@ -2628,7 +2807,7 @@ var MCPAgent = class {
                     };
                   }
                 }
-                if (message instanceof import_langchain2.ToolMessage || message && "type" in message && message.type === "tool") {
+                if (this._isToolMessageLike(message)) {
                   const observation = message.content;
                   let observationStr = String(observation);
                   if (observationStr.length > 100) {
@@ -2663,8 +2842,10 @@ var MCPAgent = class {
                     }
                   }
                 }
-                if (message instanceof import_langchain2.AIMessage && !("tool_calls" in message && Array.isArray(message.tool_calls) && message.tool_calls.length > 0)) {
-                  finalOutput = this._normalizeOutput(message.content);
+                if (this._isAIMessageLike(message) && !this._messageHasToolCalls(message)) {
+                  finalOutput = this._normalizeOutput(
+                    this._getMessageContent(message)
+                  );
                   logger.info("\u2705 Agent finished with output");
                 }
               }
@@ -2847,10 +3028,12 @@ var MCPAgent = class {
       const historyToUse = externalHistory ?? this.conversationHistory;
       const langchainHistory = [];
       for (const msg of historyToUse) {
-        if (msg instanceof import_langchain2.HumanMessage || msg instanceof import_langchain2.AIMessage || msg instanceof import_langchain2.ToolMessage) {
+        if (this._isHumanMessageLike(msg) || this._isAIMessageLike(msg) || this._isToolMessageLike(msg)) {
           langchainHistory.push(msg);
         } else {
-          logger.info(`\u26A0\uFE0F Skipped message of type: ${msg.constructor.name}`);
+          logger.info(
+            `\u26A0\uFE0F Skipped message of type: ${msg.constructor?.name || typeof msg}`
+          );
         }
       }
       const inputs = [

package/dist/index.js

@@ -17,7 +17,7 @@ import {
   ServerManager,
   Telemetry,
   setTelemetrySource
-} from "./chunk-73SH52J2.js";
+} from "./chunk-6EHM3S3M.js";
 import {
   useMcp,
   useWidget,