@n0ts123/mcplink-core 0.0.2 → 0.0.3

package/dist/index.js

@@ -1,8 +1,11 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { generateText, streamText } from 'ai';
 import { z } from 'zod';
+export { createOpenAI } from '@ai-sdk/openai';
+export { createAnthropic } from '@ai-sdk/anthropic';
 
 // src/MCPManager.ts
 var MCPManager = class {
@@ -19,6 +22,9 @@ var MCPManager = class {
     if (config.type === "sse") {
       const sseConfig = config;
       transport = new SSEClientTransport(new URL(sseConfig.url));
+    } else if (config.type === "streamable-http") {
+      const httpConfig = config;
+      transport = new StreamableHTTPClientTransport(new URL(httpConfig.url));
     } else {
       const stdioConfig = config;
       const processEnv = {};
@@ -86,11 +92,16 @@ var MCPManager = class {
       if (stdioConfig.env && Object.keys(stdioConfig.env).length > 0) {
         console.log(`   \u73AF\u5883\u53D8\u91CF: ${Object.keys(stdioConfig.env).join(", ")}`);
       }
-    } else {
+    } else if (config.type === "sse") {
       const sseConfig = config;
       console.log(`
 \u{1F527} [MCP] \u6B63\u5728\u8FDE\u63A5 SSE \u670D\u52A1\u5668 "${id}"...`);
       console.log(`   URL: ${sseConfig.url}`);
+    } else if (config.type === "streamable-http") {
+      const httpConfig = config;
+      console.log(`
+\u{1F527} [MCP] \u6B63\u5728\u8FDE\u63A5 Streamable HTTP \u670D\u52A1\u5668 "${id}"...`);
+      console.log(`   URL: ${httpConfig.url}`);
     }
     try {
       await server.client.connect(server.transport);
@@ -248,32 +259,108 @@ var MCPLinkEventType = /* @__PURE__ */ ((MCPLinkEventType2) => {
   MCPLinkEventType2["TEXT_END"] = "text_end";
   MCPLinkEventType2["TOOL_CALL_START"] = "tool_call_start";
   MCPLinkEventType2["TOOL_CALL_DELTA"] = "tool_call_delta";
-  MCPLinkEventType2["TOOL_CALL_END"] = "tool_call_end";
   MCPLinkEventType2["TOOL_EXECUTING"] = "tool_executing";
   MCPLinkEventType2["TOOL_RESULT"] = "tool_result";
+  MCPLinkEventType2["IMMEDIATE_RESULT"] = "immediate_result";
   MCPLinkEventType2["ITERATION_START"] = "iteration_start";
   MCPLinkEventType2["ITERATION_END"] = "iteration_end";
   MCPLinkEventType2["COMPLETE"] = "complete";
   MCPLinkEventType2["ERROR"] = "error";
-  MCPLinkEventType2["TODO_START"] = "todo_start";
-  MCPLinkEventType2["TODO_ITEM_ADD"] = "todo_item_add";
-  MCPLinkEventType2["TODO_ITEM_UPDATE"] = "todo_item_update";
-  MCPLinkEventType2["TODO_END"] = "todo_end";
   return MCPLinkEventType2;
 })(MCPLinkEventType || {});
 
 // src/Agent.ts
-var DEFAULT_SYSTEM_PROMPT = `\u4F60\u662F\u4E00\u4E2A\u667A\u80FD\u52A9\u624B\uFF0C\u8BF7\u4F7F\u7528\u4E2D\u6587\u56DE\u590D\u3002`;
+var DEFAULT_SYSTEM_PROMPT = `\u4F60\u662F\u4E00\u4E2A\u4E13\u4E1A\u3001\u53CB\u597D\u7684\u667A\u80FD\u52A9\u624B\u3002
+
+## \u56DE\u590D\u8981\u6C42
+- \u7B80\u6D01\u6E05\u6670\uFF0C\u91CD\u70B9\u7A81\u51FA
+- \u7528\u5217\u8868\u5448\u73B0\u5173\u952E\u4FE1\u606F
+- \u8BED\u6C14\u793C\u8C8C\u81EA\u7136\uFF0C\u50CF\u4E13\u4E1A\u52A9\u624B
+- \u6709\u7ED3\u8BBA\u65F6\u76F4\u63A5\u7ED9\u51FA\uFF0C\u9700\u8981\u8865\u5145\u4FE1\u606F\u65F6\u7B80\u5355\u8BE2\u95EE`;
 var Agent = class {
   model;
   mcpManager;
   systemPrompt;
   maxIterations;
+  immediateResultMatchers;
+  parallelToolCalls;
+  enableThinkingPhase;
   constructor(model, mcpManager, options = {}) {
     this.model = model;
     this.mcpManager = mcpManager;
     this.systemPrompt = options.systemPrompt || DEFAULT_SYSTEM_PROMPT;
     this.maxIterations = options.maxIterations || 10;
+    this.immediateResultMatchers = options.immediateResultMatchers || [];
+    this.parallelToolCalls = options.parallelToolCalls ?? true;
+    this.enableThinkingPhase = options.enableThinkingPhase ?? true;
+  }
+  /**
+   * 生成工具描述文本（用于思考阶段）
+   */
+  generateToolsDescription(tools) {
+    if (tools.length === 0) {
+      return "\u5F53\u524D\u6CA1\u6709\u53EF\u7528\u7684\u5DE5\u5177\u3002";
+    }
+    let description = "";
+    for (const tool of tools) {
+      description += `### ${tool.name}
+`;
+      description += `\u63CF\u8FF0: ${tool.description}
+`;
+      if (tool.inputSchema.properties) {
+        description += `\u53C2\u6570:
+`;
+        for (const [key, prop] of Object.entries(tool.inputSchema.properties)) {
+          const propInfo = prop;
+          const required = tool.inputSchema.required?.includes(key) ? "\u5FC5\u586B" : "\u53EF\u9009";
+          description += `  - ${key} (${propInfo.type || "any"}, ${required}): ${propInfo.description || ""}
+`;
+        }
+      }
+      description += "\n";
+    }
+    return description;
+  }
+  /**
+   * 思考阶段的系统提示词
+   */
+  THINKING_PHASE_PROMPT = `\u4F60\u6B63\u5728\u601D\u8003\u5982\u4F55\u5E2E\u52A9\u7528\u6237\u3002\u8BF7\u7528\u81EA\u7136\u8BED\u8A00\u5206\u6790\uFF1A
+
+1. \u7528\u6237\u60F3\u8981\u4EC0\u4E48\uFF1F
+2. \u6211\u76EE\u524D\u638C\u63E1\u4E86\u54EA\u4E9B\u4FE1\u606F\uFF1F
+3. \u8FD8\u9700\u8981\u505A\u4EC0\u4E48\u624D\u80FD\u56DE\u7B54\u7528\u6237\uFF1F
+
+\u8981\u6C42\uFF1A
+- \u50CF\u5185\u5FC3\u72EC\u767D\u4E00\u6837\u81EA\u7136\u8868\u8FBE
+- \u4F53\u73B0\u4F60\u8BA4\u771F\u5206\u6790\u4E86\u95EE\u9898
+- \u8BF4\u6E05\u695A\u63A5\u4E0B\u6765\u7684\u8BA1\u5212
+- \u4E0D\u8981\u8F93\u51FA\u7ED9\u7528\u6237\u770B\u7684\u6B63\u5F0F\u56DE\u590D\uFF08\u5982\u4EA7\u54C1\u5217\u8868\u3001\u7ED3\u8BBA\u7B49\uFF09"`;
+  /**
+   * 检查工具返回结果是否匹配即时结果匹配器
+   * @param result 工具返回的结果
+   * @returns 如果匹配返回 true，否则返回 false
+   */
+  matchImmediateResult(result) {
+    if (!this.immediateResultMatchers.length) {
+      return false;
+    }
+    if (typeof result !== "object" || result === null) {
+      return false;
+    }
+    const resultObj = result;
+    for (const matcher of this.immediateResultMatchers) {
+      let matched = true;
+      for (const [key, value] of Object.entries(matcher)) {
+        if (resultObj[key] !== value) {
+          matched = false;
+          break;
+        }
+      }
+      if (matched) {
+        return true;
+      }
+    }
+    return false;
   }
   /**
    * 将 MCP 工具转换为 Vercel AI SDK 格式
@@ -290,18 +377,31 @@ var Agent = class {
     return tools;
   }
   /**
-   * 简单的 JSON Schema 到 Zod 转换
+   * JSON Schema 到 Zod 的完整递归转换
+   * 支持嵌套对象、对象数组、枚举等所有常见类型
    */
   jsonSchemaToZod(schema) {
-    if (!schema.properties) {
-      return z.object({});
-    }
-    const shape = {};
-    const required = schema.required || [];
-    for (const [key, prop] of Object.entries(schema.properties)) {
-      const propSchema = prop;
-      let zodType;
-      switch (propSchema.type) {
+    return this.convertSchemaToZod(schema, schema.required || []);
+  }
+  /**
+   * 递归转换 JSON Schema 节点为 Zod 类型
+   */
+  convertSchemaToZod(schema, parentRequired = [], key) {
+    const type = schema.type;
+    const description = schema.description;
+    const enumValues = schema.enum;
+    let zodType;
+    if (enumValues && enumValues.length > 0) {
+      if (enumValues.every((v) => typeof v === "string")) {
+        zodType = z.enum(enumValues);
+      } else if (enumValues.every((v) => typeof v === "number")) {
+        const literals = enumValues.map((v) => z.literal(v));
+        zodType = literals.length === 1 ? literals[0] : z.union([literals[0], literals[1], ...literals.slice(2)]);
+      } else {
+        zodType = z.unknown();
+      }
+    } else {
+      switch (type) {
         case "string":
           zodType = z.string();
           break;
@@ -314,27 +414,45 @@ var Agent = class {
         case "boolean":
           zodType = z.boolean();
           break;
-        case "array":
-          if (propSchema.items?.type === "string") {
-            zodType = z.array(z.string());
-          } else if (propSchema.items?.type === "number") {
-            zodType = z.array(z.number());
+        case "null":
+          zodType = z.null();
+          break;
+        case "object": {
+          const properties = schema.properties;
+          const required = schema.required || [];
+          if (properties) {
+            const shape = {};
+            for (const [propKey, propSchema] of Object.entries(properties)) {
+              let propZod = this.convertSchemaToZod(propSchema, required, propKey);
+              if (!required.includes(propKey)) {
+                propZod = propZod.optional();
+              }
+              shape[propKey] = propZod;
+            }
+            zodType = z.object(shape);
+          } else {
+            zodType = z.record(z.unknown());
+          }
+          break;
+        }
+        case "array": {
+          const items = schema.items;
+          if (items) {
+            const itemsRequired = items.required || [];
+            zodType = z.array(this.convertSchemaToZod(items, itemsRequired));
           } else {
             zodType = z.array(z.unknown());
           }
           break;
+        }
         default:
           zodType = z.unknown();
       }
-      if (propSchema.description) {
-        zodType = zodType.describe(propSchema.description);
-      }
-      if (!required.includes(key)) {
-        zodType = zodType.optional();
-      }
-      shape[key] = zodType;
     }
-    return z.object(shape);
+    if (description) {
+      zodType = zodType.describe(description);
+    }
+    return zodType;
   }
   /**
    * 执行对话
@@ -457,6 +575,7 @@ var Agent = class {
    */
   async *chatStream(userMessage, options) {
     const startTime = Date.now();
+    const toolCallRecords = [];
     const messages = [{ role: "system", content: this.systemPrompt }];
     if (options?.history && options.history.length > 0) {
       for (const msg of options.history) {
@@ -481,6 +600,53 @@ var Agent = class {
         timestamp: Date.now(),
         data: { iteration, maxIterations: this.maxIterations }
       };
+      if (this.enableThinkingPhase && hasTools) {
+        yield {
+          type: "thinking_start" /* THINKING_START */,
+          timestamp: Date.now(),
+          data: {}
+        };
+        const toolsDescription = this.generateToolsDescription(mcpTools);
+        const thinkingMessages = [
+          {
+            role: "system",
+            content: `${this.THINKING_PHASE_PROMPT}
+
+## \u53EF\u7528\u5DE5\u5177
+${toolsDescription}`
+          },
+          ...messages.slice(1)
+          // 跳过原来的 system 消息，使用历史消息
+        ];
+        const thinkingStream = streamText({
+          model: this.model,
+          messages: thinkingMessages
+          // 不传 tools，强制 AI 输出文本思考
+        });
+        let thinkingContent = "";
+        for await (const chunk of thinkingStream.fullStream) {
+          if (chunk.type === "text-delta") {
+            thinkingContent += chunk.textDelta;
+            yield {
+              type: "thinking_delta" /* THINKING_DELTA */,
+              timestamp: Date.now(),
+              data: { content: chunk.textDelta }
+            };
+          }
+        }
+        yield {
+          type: "thinking_end" /* THINKING_END */,
+          timestamp: Date.now(),
+          data: {}
+        };
+        if (thinkingContent) {
+          messages.push({
+            role: "assistant",
+            content: `[\u5185\u90E8\u51B3\u7B56]
+${thinkingContent}`
+          });
+        }
+      }
       const stream = streamText({
         model: this.model,
         messages,
@@ -613,12 +779,12 @@ var Agent = class {
                 }
               };
               sentToolCallStarts.add(chunk.toolCallId);
+              toolCalls.push({
+                toolCallId: chunk.toolCallId,
+                toolName: chunk.toolName,
+                args: chunk.args
+              });
             }
-            toolCalls.push({
-              toolCallId: chunk.toolCallId,
-              toolName: chunk.toolName,
-              args: chunk.args
-            });
             break;
           case "tool-call-streaming-start":
             currentToolCall = {
@@ -720,42 +886,126 @@ var Agent = class {
       }
       const toolResults = [];
       for (const toolCall of toolCalls) {
-        const toolName = toolCall.toolName;
-        const toolArgs = toolCall.args;
-        const toolCallId = toolCall.toolCallId;
         yield {
           type: "tool_executing" /* TOOL_EXECUTING */,
           timestamp: Date.now(),
-          data: { toolName, toolCallId, toolArgs }
-        };
-        const toolStartTime = Date.now();
-        let result;
-        let isError = false;
-        try {
-          result = await this.mcpManager.callTool(toolName, toolArgs);
-        } catch (error) {
-          result = error instanceof Error ? error.message : String(error);
-          isError = true;
-        }
-        const duration = Date.now() - toolStartTime;
-        yield {
-          type: "tool_result" /* TOOL_RESULT */,
-          timestamp: Date.now(),
           data: {
-            toolName,
-            toolResult: result,
-            toolCallId,
-            duration,
-            isError
+            toolName: toolCall.toolName,
+            toolCallId: toolCall.toolCallId,
+            toolArgs: toolCall.args
           }
         };
-        toolResults.push({
-          toolCallId,
-          toolName,
-          result,
-          isError,
-          duration
+      }
+      if (this.parallelToolCalls && toolCalls.length > 1) {
+        const executePromises = toolCalls.map(async (toolCall) => {
+          const toolStartTime = Date.now();
+          let result;
+          let isError = false;
+          try {
+            result = await this.mcpManager.callTool(toolCall.toolName, toolCall.args);
+          } catch (error) {
+            result = error instanceof Error ? error.message : String(error);
+            isError = true;
+          }
+          const duration = Date.now() - toolStartTime;
+          return {
+            toolCallId: toolCall.toolCallId,
+            toolName: toolCall.toolName,
+            args: toolCall.args,
+            result,
+            isError,
+            duration
+          };
         });
+        const results = await Promise.all(executePromises);
+        for (const r of results) {
+          yield {
+            type: "tool_result" /* TOOL_RESULT */,
+            timestamp: Date.now(),
+            data: {
+              toolName: r.toolName,
+              toolResult: r.result,
+              toolCallId: r.toolCallId,
+              duration: r.duration,
+              isError: r.isError
+            }
+          };
+          if (!r.isError && this.matchImmediateResult(r.result)) {
+            yield {
+              type: "immediate_result" /* IMMEDIATE_RESULT */,
+              timestamp: Date.now(),
+              data: {
+                toolName: r.toolName,
+                toolCallId: r.toolCallId,
+                immediateResult: r.result
+              }
+            };
+          }
+          toolResults.push({
+            toolCallId: r.toolCallId,
+            toolName: r.toolName,
+            result: r.result,
+            isError: r.isError,
+            duration: r.duration
+          });
+          toolCallRecords.push({
+            name: r.toolName,
+            arguments: r.args,
+            result: r.result,
+            duration: r.duration
+          });
+        }
+      } else {
+        for (const toolCall of toolCalls) {
+          const toolName = toolCall.toolName;
+          const toolArgs = toolCall.args;
+          const toolCallId = toolCall.toolCallId;
+          const toolStartTime = Date.now();
+          let result;
+          let isError = false;
+          try {
+            result = await this.mcpManager.callTool(toolName, toolArgs);
+          } catch (error) {
+            result = error instanceof Error ? error.message : String(error);
+            isError = true;
+          }
+          const duration = Date.now() - toolStartTime;
+          yield {
+            type: "tool_result" /* TOOL_RESULT */,
+            timestamp: Date.now(),
+            data: {
+              toolName,
+              toolResult: result,
+              toolCallId,
+              duration,
+              isError
+            }
+          };
+          if (!isError && this.matchImmediateResult(result)) {
+            yield {
+              type: "immediate_result" /* IMMEDIATE_RESULT */,
+              timestamp: Date.now(),
+              data: {
+                toolName,
+                toolCallId,
+                immediateResult: result
+              }
+            };
+          }
+          toolResults.push({
+            toolCallId,
+            toolName,
+            result,
+            isError,
+            duration
+          });
+          toolCallRecords.push({
+            name: toolName,
+            arguments: toolArgs,
+            result,
+            duration
+          });
+        }
       }
       messages.push({
         role: "assistant",
@@ -804,11 +1054,45 @@ var PromptBasedAgent = class {
   mcpManager;
   systemPrompt;
   maxIterations;
+  immediateResultMatchers;
+  parallelToolCalls;
+  // PromptBasedAgent 本身通过 prompt 实现思考，此配置保留以保持接口一致
+  enableThinkingPhase;
   constructor(model, mcpManager, options = {}) {
     this.model = model;
     this.mcpManager = mcpManager;
     this.systemPrompt = options.systemPrompt || "";
     this.maxIterations = options.maxIterations || 10;
+    this.immediateResultMatchers = options.immediateResultMatchers || [];
+    this.parallelToolCalls = options.parallelToolCalls ?? true;
+    this.enableThinkingPhase = options.enableThinkingPhase ?? false;
+  }
+  /**
+   * 检查工具返回结果是否匹配即时结果匹配器
+   * @param result 工具返回的结果
+   * @returns 如果匹配返回 true，否则返回 false
+   */
+  matchImmediateResult(result) {
+    if (!this.immediateResultMatchers.length) {
+      return false;
+    }
+    if (typeof result !== "object" || result === null) {
+      return false;
+    }
+    const resultObj = result;
+    for (const matcher of this.immediateResultMatchers) {
+      let matched = true;
+      for (const [key, value] of Object.entries(matcher)) {
+        if (resultObj[key] !== value) {
+          matched = false;
+          break;
+        }
+      }
+      if (matched) {
+        return true;
+      }
+    }
+    return false;
   }
   /**
    * 生成工具列表描述
@@ -1167,6 +1451,17 @@ ${this.BUILT_IN_PROMPT}`;
           timestamp: Date.now(),
           data: { toolName: toolCall.name, toolResult: result, toolCallId, duration, isError }
         };
+        if (!isError && this.matchImmediateResult(result)) {
+          yield {
+            type: "immediate_result" /* IMMEDIATE_RESULT */,
+            timestamp: Date.now(),
+            data: {
+              toolName: toolCall.name,
+              toolCallId,
+              immediateResult: result
+            }
+          };
+        }
         messages.push({ role: "assistant", content: fullResponse });
         const resultStr = typeof result === "string" ? result : JSON.stringify(result, null, 2);
         messages.push({
@@ -1274,11 +1569,17 @@ var MCPLink = class {
     }
     this.agent = new Agent(this.model, this.mcpManager, {
       systemPrompt: config.systemPrompt,
-      maxIterations: config.maxIterations
+      maxIterations: config.maxIterations,
+      immediateResultMatchers: config.immediateResultMatchers,
+      parallelToolCalls: config.parallelToolCalls,
+      enableThinkingPhase: config.enableThinkingPhase
     });
     this.promptBasedAgent = new PromptBasedAgent(this.model, this.mcpManager, {
       systemPrompt: config.systemPrompt,
-      maxIterations: config.maxIterations
+      maxIterations: config.maxIterations,
+      immediateResultMatchers: config.immediateResultMatchers,
+      parallelToolCalls: config.parallelToolCalls,
+      enableThinkingPhase: config.enableThinkingPhase
     });
     if (config.usePromptBasedTools === true) {
       this.detectedNativeSupport = false;
@@ -1389,7 +1690,17 @@ var MCPLink = class {
     this.config.systemPrompt = prompt;
     this.agent = new Agent(this.model, this.mcpManager, {
       systemPrompt: prompt,
-      maxIterations: this.config.maxIterations
+      maxIterations: this.config.maxIterations,
+      immediateResultMatchers: this.config.immediateResultMatchers,
+      parallelToolCalls: this.config.parallelToolCalls,
+      enableThinkingPhase: this.config.enableThinkingPhase
+    });
+    this.promptBasedAgent = new PromptBasedAgent(this.model, this.mcpManager, {
+      systemPrompt: prompt,
+      maxIterations: this.config.maxIterations,
+      immediateResultMatchers: this.config.immediateResultMatchers,
+      parallelToolCalls: this.config.parallelToolCalls,
+      enableThinkingPhase: this.config.enableThinkingPhase
     });
   }
   /**
@@ -1400,7 +1711,17 @@ var MCPLink = class {
     this.config.model = model;
     this.agent = new Agent(this.model, this.mcpManager, {
       systemPrompt: this.config.systemPrompt,
-      maxIterations: this.config.maxIterations
+      maxIterations: this.config.maxIterations,
+      immediateResultMatchers: this.config.immediateResultMatchers,
+      parallelToolCalls: this.config.parallelToolCalls,
+      enableThinkingPhase: this.config.enableThinkingPhase
+    });
+    this.promptBasedAgent = new PromptBasedAgent(this.model, this.mcpManager, {
+      systemPrompt: this.config.systemPrompt,
+      maxIterations: this.config.maxIterations,
+      immediateResultMatchers: this.config.immediateResultMatchers,
+      parallelToolCalls: this.config.parallelToolCalls,
+      enableThinkingPhase: this.config.enableThinkingPhase
     });
   }
 };