mcp-use 0.1.11 → 0.1.14

package/dist/index.d.ts

@@ -12,6 +12,7 @@ export * from './src/agents/utils/index.js';
 export { ServerManager } from './src/managers/server_manager.js';
 export * from './src/managers/tools/index.js';
 export { setTelemetrySource, Telemetry } from './src/telemetry/index.js';
+export { AIMessage, BaseMessage, HumanMessage, SystemMessage, ToolMessage } from '@langchain/core/messages';
 export type { StreamEvent } from '@langchain/core/tracers/log_stream';
 export { BaseConnector, HttpConnector, loadConfigFile, Logger, logger, MCPAgent, MCPClient, MCPSession, StdioConnector, WebSocketConnector };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAElE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAEvE,cAAc,6BAA6B,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAA;AAEhE,cAAc,+BAA+B,CAAA;AAG7C,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAGxE,YAAY,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAA;AAErE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAElE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAEvE,cAAc,6BAA6B,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAA;AAEhE,cAAc,+BAA+B,CAAA;AAG7C,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAGxE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAG3G,YAAY,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAA;AAErE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAA"}

package/dist/index.js

@@ -14,4 +14,6 @@ export { ServerManager } from './src/managers/server_manager.js';
 export * from './src/managers/tools/index.js';
 // Export telemetry utilities
 export { setTelemetrySource, Telemetry } from './src/telemetry/index.js';
+// Re-export message classes to ensure a single constructor instance is shared by consumers
+export { AIMessage, BaseMessage, HumanMessage, SystemMessage, ToolMessage } from '@langchain/core/messages';
 export { BaseConnector, HttpConnector, loadConfigFile, Logger, logger, MCPAgent, MCPClient, MCPSession, StdioConnector, WebSocketConnector };

package/dist/src/agents/mcp_agent.d.ts

@@ -3,7 +3,7 @@ import type { BaseMessage } from '@langchain/core/messages';
 import type { StructuredToolInterface } from '@langchain/core/tools';
 import type { StreamEvent } from '@langchain/core/tracers/log_stream';
 import type { AgentStep } from 'langchain/agents';
-import type { z } from 'zod';
+import type { ZodSchema } from 'zod';
 import type { MCPClient } from '../client.js';
 import type { BaseConnector } from '../connectors/base.js';
 import { SystemMessage } from '@langchain/core/messages';
@@ -69,12 +69,12 @@ export declare class MCPAgent {
     /**
      * Runs the agent with structured output and returns a promise for the typed result.
      */
-    run<T>(query: string, maxSteps?: number, manageConnector?: boolean, externalHistory?: BaseMessage[], outputSchema?: z.ZodSchema<T>): Promise<T>;
+    run<T>(query: string, maxSteps?: number, manageConnector?: boolean, externalHistory?: BaseMessage[], outputSchema?: ZodSchema<T>): Promise<T>;
     /**
      * Runs the agent and yields intermediate steps as an async generator.
      * If outputSchema is provided, returns structured output of type T.
      */
-    stream<T = string>(query: string, maxSteps?: number, manageConnector?: boolean, externalHistory?: BaseMessage[], outputSchema?: z.ZodSchema<T>): AsyncGenerator<AgentStep, string | T, void>;
+    stream<T = string>(query: string, maxSteps?: number, manageConnector?: boolean, externalHistory?: BaseMessage[], outputSchema?: ZodSchema<T>): AsyncGenerator<AgentStep, string | T, void>;
     close(): Promise<void>;
     /**
      * Yields LangChain StreamEvent objects from the underlying streamEvents() method.
@@ -82,9 +82,13 @@ export declare class MCPAgent {
      */
     streamEvents(query: string, maxSteps?: number, manageConnector?: boolean, externalHistory?: BaseMessage[]): AsyncGenerator<StreamEvent, void, void>;
     /**
-     * Attempt to create structured output from raw result with validation.
+     * Attempt to create structured output from raw result with validation and retry logic.
      */
     private _attemptStructuredOutput;
+    /**
+     * Validate the structured result against the schema with detailed error reporting
+     */
+    private _validateStructuredResult;
     /**
      * Enhance the query with schema information to make the agent aware of required fields.
      */

package/dist/src/agents/mcp_agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp_agent.d.ts","sourceRoot":"","sources":["../../../src/agents/mcp_agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp_agent.d.ts","sourceRoot":"","sources":["../../../src/agents/mcp_agent.ts"],"names":[],"mappings":"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"}

package/dist/src/agents/mcp_agent.js

@@ -1,7 +1,8 @@
-import { AIMessage, HumanMessage, SystemMessage, } from '@langchain/core/messages';
+import { AIMessage, HumanMessage, SystemMessage, ToolMessage, } from '@langchain/core/messages';
 import { OutputParserException } from '@langchain/core/output_parsers';
 import { ChatPromptTemplate, MessagesPlaceholder, } from '@langchain/core/prompts';
 import { AgentExecutor, createToolCallingAgent, } from 'langchain/agents';
+import { zodToJsonSchema } from 'zod-to-json-schema';
 import { LangChainAdapter } from '../adapters/langchain_adapter.js';
 import { logger } from '../logging.js';
 import { ServerManager } from '../managers/server_manager.js';
@@ -231,6 +232,7 @@ export class MCPAgent {
         let schemaDescription = '';
         if (outputSchema) {
             query = this._enhanceQueryWithSchema(query, outputSchema);
+            logger.debug(`🔄 Structured output requested, schema: ${JSON.stringify(zodToJsonSchema(outputSchema), null, 2)}`);
             // Check if withStructuredOutput method exists
             if ('withStructuredOutput' in this.llm && typeof this.llm.withStructuredOutput === 'function') {
                 structuredLlm = this.llm.withStructuredOutput(outputSchema);
@@ -239,25 +241,7 @@ export class MCPAgent {
                 // Fallback: use the same LLM but we'll handle structure in our helper method
                 structuredLlm = this.llm;
             }
-            // Get schema description for feedback
-            try {
-                const schemaType = outputSchema;
-                if (schemaType._def && schemaType._def.shape) {
-                    const fields = [];
-                    for (const [key, fieldSchema] of Object.entries(schemaType._def.shape)) {
-                        const field = fieldSchema;
-                        const isOptional = field.isOptional?.() ?? field._def?.typeName === 'ZodOptional';
-                        const isNullable = field.isNullable?.() ?? field._def?.typeName === 'ZodNullable';
-                        const description = field._def?.description || field.description || key;
-                        fields.push(`- ${key}: ${description} ${(isOptional || isNullable) ? '(optional)' : '(required)'}`);
-                    }
-                    schemaDescription = fields.join('\n');
-                }
-            }
-            catch (e) {
-                logger.warn(`Could not extract schema details: ${e}`);
-                schemaDescription = `Schema: ${outputSchema.constructor.name}`;
-            }
+            schemaDescription = JSON.stringify(zodToJsonSchema(outputSchema), null, 2);
         }
         try {
             if (manageConnector && !this._initialized) {
@@ -312,6 +296,7 @@ export class MCPAgent {
                 try {
                     logger.debug('Starting agent step execution');
                     const nextStepOutput = await this._agentExecutor._takeNextStep(nameToToolMap, inputs, intermediateSteps);
+                    // Agent finish handling
                     if (nextStepOutput.returnValues) {
                         logger.info(`✅ Agent finished at step ${stepNum + 1}`);
                         result = nextStepOutput.returnValues?.output ?? 'No output generated';
@@ -320,6 +305,7 @@ export class MCPAgent {
                             try {
                                 logger.info('🔧 Attempting structured output...');
                                 const structuredResult = await this._attemptStructuredOutput(result, structuredLlm, outputSchema, schemaDescription);
+                                logger.debug(`🔄 Structured result: ${JSON.stringify(structuredResult)}`);
                                 // Add the final response to conversation history if memory is enabled
                                 if (this.memoryEnabled) {
                                     this.addToHistory(new AIMessage(`Structured result: ${JSON.stringify(structuredResult)}`));
@@ -331,21 +317,21 @@ export class MCPAgent {
                             catch (e) {
                                 logger.warn(`⚠️ Structured output failed: ${e}`);
                                 // Continue execution to gather missing information
-                                const missingInfoPrompt = `
+                                const failedStructuredOutputPrompt = `
                 The current result cannot be formatted into the required structure.
                 Error: ${String(e)}
                 
                 Current information: ${result}
                 
-                Please continue working to gather the missing information needed for:
+                If information is missing, please continue working to gather the missing information needed for:
                 ${schemaDescription}
-                
-                Focus on finding the specific missing details.
+
+                If the information is complete, please return the result in the required structure.
                 `;
                                 // Add this as feedback and continue the loop
-                                inputs.input = missingInfoPrompt;
+                                inputs.input = failedStructuredOutputPrompt;
                                 if (this.memoryEnabled) {
-                                    this.addToHistory(new HumanMessage(missingInfoPrompt));
+                                    this.addToHistory(new HumanMessage(failedStructuredOutputPrompt));
                                 }
                                 logger.info('🔄 Continuing execution to gather missing information...');
                                 continue;
@@ -403,28 +389,6 @@ export class MCPAgent {
                 logger.warn(`⚠️ Agent stopped after reaching max iterations (${steps})`);
                 result = `Agent stopped after reaching the maximum number of steps (${steps}).`;
             }
-            // If structured output was requested but not achieved, attempt one final time
-            if (outputSchema && structuredLlm && !success) {
-                try {
-                    logger.info('🔧 Final attempt at structured output...');
-                    const structuredResult = await this._attemptStructuredOutput(result, structuredLlm, outputSchema, schemaDescription);
-                    // Add the final response to conversation history if memory is enabled
-                    if (this.memoryEnabled) {
-                        this.addToHistory(new AIMessage(`Structured result: ${JSON.stringify(structuredResult)}`));
-                    }
-                    logger.info('✅ Final structured output successful');
-                    success = true;
-                    return structuredResult;
-                }
-                catch (e) {
-                    logger.error(`❌ Final structured output attempt failed: ${e}`);
-                    throw new Error(`Failed to generate structured output after ${steps} steps: ${e}`);
-                }
-            }
-            // Add the final response to conversation history if memory is enabled (regular case)
-            if (this.memoryEnabled && !outputSchema) {
-                this.addToHistory(new AIMessage(result));
-            }
             logger.info('🎉 Agent execution complete');
             success = true;
             // Return regular result
@@ -543,9 +507,12 @@ export class MCPAgent {
             const historyToUse = externalHistory ?? this.conversationHistory;
             const langchainHistory = [];
             for (const msg of historyToUse) {
-                if (msg instanceof HumanMessage || msg instanceof AIMessage) {
+                if (msg instanceof HumanMessage || msg instanceof AIMessage || msg instanceof ToolMessage) {
                     langchainHistory.push(msg);
                 }
+                else {
+                    logger.info(`⚠️ Skipped message of type: ${msg.constructor.name}`);
+                }
             }
             // Prepare inputs
             const inputs = { input: query, chat_history: langchainHistory };
@@ -626,24 +593,81 @@ export class MCPAgent {
         }
     }
     /**
-     * Attempt to create structured output from raw result with validation.
+     * Attempt to create structured output from raw result with validation and retry logic.
      */
     async _attemptStructuredOutput(rawResult, structuredLlm, outputSchema, schemaDescription) {
-        const formatPrompt = `
-    Please format the following information according to the specified schema.
-    Extract and structure the relevant information from the content below.
-    
-    Required schema fields:
-    ${schemaDescription}
-    
-    Content to format:
-    ${rawResult}
-    
-    Please provide the information in the requested structured format.
-    If any required information is missing, you must indicate this clearly.
-    `;
-        const structuredResult = await structuredLlm.invoke(formatPrompt);
-        // Validate that the result is complete (basic check)
+        logger.info(`🔄 Attempting structured output with schema: ${outputSchema}`);
+        logger.info(`🔄 Schema description: ${schemaDescription}`);
+        logger.info(`🔄 Raw result: ${JSON.stringify(rawResult, null, 2)}`);
+        // Handle different input formats - rawResult might be an array or object from the agent
+        let textContent = '';
+        if (typeof rawResult === 'string') {
+            textContent = rawResult;
+        }
+        else if (rawResult && typeof rawResult === 'object') {
+            // Handle object format
+            textContent = JSON.stringify(rawResult);
+        }
+        // If we couldn't extract text, use the stringified version
+        if (!textContent) {
+            textContent = JSON.stringify(rawResult);
+        }
+        // Get detailed schema information for better prompting
+        const maxRetries = 3;
+        let lastError = '';
+        for (let attempt = 1; attempt <= maxRetries; attempt++) {
+            logger.info(`🔄 Structured output attempt ${attempt}/${maxRetries}`);
+            let formatPrompt = `
+      Please format the following information according to the EXACT schema specified below.
+      You must use the exact field names and types as shown in the schema.
+      
+      Required schema format:
+      ${schemaDescription}
+      
+      Content to extract from:
+      ${textContent}
+      
+      IMPORTANT: 
+      - Use ONLY the field names specified in the schema
+      - Match the data types exactly (string, number, boolean, array, etc.)
+      - Include ALL required fields
+      - Return valid JSON that matches the schema structure exactly
+      `;
+            // Add specific error feedback for retry attempts
+            if (attempt > 1) {
+                formatPrompt += `
+        
+        PREVIOUS ATTEMPT FAILED with error: ${lastError}
+        Please fix the issues mentioned above and ensure the output matches the schema exactly.
+        `;
+            }
+            try {
+                const structuredResult = await structuredLlm.invoke(formatPrompt);
+                logger.info(`🔄 Structured result attempt ${attempt}: ${JSON.stringify(structuredResult, null, 2)}`);
+                // Validate the structured result
+                const validatedResult = this._validateStructuredResult(structuredResult, outputSchema);
+                logger.info(`✅ Structured output successful on attempt ${attempt}`);
+                return validatedResult;
+            }
+            catch (e) {
+                lastError = e instanceof Error ? e.message : String(e);
+                logger.warn(`⚠️ Structured output attempt ${attempt} failed: ${lastError}`);
+                if (attempt === maxRetries) {
+                    logger.error(`❌ All ${maxRetries} structured output attempts failed`);
+                    throw new Error(`Failed to generate valid structured output after ${maxRetries} attempts. Last error: ${lastError}`);
+                }
+                // Continue to next attempt
+                continue;
+            }
+        }
+        // This should never be reached, but TypeScript requires it
+        throw new Error('Unexpected error in structured output generation');
+    }
+    /**
+     * Validate the structured result against the schema with detailed error reporting
+     */
+    _validateStructuredResult(structuredResult, outputSchema) {
+        // Use Zod to validate the structured result
         try {
             // Use Zod to validate the structured result
             const validatedResult = outputSchema.parse(structuredResult);
@@ -675,20 +699,8 @@ export class MCPAgent {
      * Enhance the query with schema information to make the agent aware of required fields.
      */
     _enhanceQueryWithSchema(query, outputSchema) {
-        const schemaFields = [];
         try {
-            // Get field information from the schema
-            const schemaType = outputSchema;
-            if (schemaType._def && schemaType._def.shape) {
-                for (const [fieldName, fieldSchema] of Object.entries(schemaType._def.shape)) {
-                    const field = fieldSchema;
-                    const description = field._def?.description || field.description || fieldName;
-                    const isOptional = field.isOptional?.() ?? field._def?.typeName === 'ZodOptional';
-                    const isNullable = field.isNullable?.() ?? field._def?.typeName === 'ZodNullable';
-                    schemaFields.push(`- ${fieldName}: ${description} ${(isOptional || isNullable) ? '(optional)' : '(required)'}`);
-                }
-            }
-            const schemaDescription = schemaFields.join('\n');
+            const schemaDescription = JSON.stringify(zodToJsonSchema(outputSchema), null, 2);
             // Enhance the query with schema awareness
             const enhancedQuery = `
       ${query}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mcp-use",
   "type": "module",
-  "version": "0.1.11",
+  "version": "0.1.14",
   "packageManager": "pnpm@10.6.1",
   "description": "A utility library for integrating Model Context Protocol (MCP) with LangChain, Zod, and related tools. Provides helpers for schema conversion, event streaming, and SDK usage.",
   "author": "Zane",
@@ -94,7 +94,7 @@
     "winston": "^3.17.0",
     "ws": "^8.18.2",
     "zod": "^3.25.48",
-    "zod-to-json-schema": "^3.24.5"
+    "zod-to-json-schema": "^3.24.6"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^4.13.2",