@opentiny/next-sdk 0.1.12 → 0.1.14

package/agent/AgentModelProvider.ts

@@ -1,13 +1,17 @@
 import { streamText, stepCountIs, generateText, StreamTextResult } from 'ai'
-import { experimental_createMCPClient as createMCPClient, experimental_MCPClientConfig as MCPClientConfig } from 'ai'
+import { experimental_MCPClientConfig as MCPClientConfig } from 'ai'
 import type { ToolSet } from 'ai'
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
+import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js'
 import type { IAgentModelProviderOption, McpServerConfig } from './type'
 import { ProviderV2 } from '@ai-sdk/provider'
 import { OpenAIProvider } from '@ai-sdk/openai'
 import { createOpenAI } from '@ai-sdk/openai'
 import { createDeepSeek } from '@ai-sdk/deepseek'
 import { ExtensionClientTransport } from '../transport/ExtensionClientTransport'
+import { MessageChannelTransport } from '@opentiny/next'
+import { WebMcpClient } from '../WebMcpClient'
+import { getAISDKTools } from './utils/getAISDKTools'
 
 export const AIProviderFactories = {
   ['openai']: createOpenAI,
@@ -40,27 +44,31 @@ export class AgentModelProvider {
   /** 缓存 ai-sdk response 中的 多轮会话的上下文 */
   messages: any[] = []
 
-  constructor({ llmConfig, mcpServers, llm }: IAgentModelProviderOption) {
+  constructor({ llmConfig, mcpServers }: IAgentModelProviderOption) {
+    if (!llmConfig) {
+      throw new Error('llmConfig is required to initialize AgentModelProvider')
+    }
     this.mcpServers = mcpServers || {}
     this.mcpClients = {}
     this.mcpTools = {}
 
-    if (llm) {
-      this.llm = llm
-    } else if (llmConfig) {
+    if (llmConfig.llm) {
+      this.llm = llmConfig.llm
+    } else if (llmConfig.providerType) {
+      const providerType = llmConfig.providerType
       let providerFn: (options: any) => ProviderV2 | OpenAIProvider
 
-      if (typeof llmConfig.providerType === 'string') {
-        providerFn = AIProviderFactories[llmConfig.providerType]
+      if (typeof providerType === 'string') {
+        providerFn = AIProviderFactories[providerType]
       } else {
-        providerFn = llmConfig.providerType
+        providerFn = providerType
       }
       this.llm = providerFn({
         apiKey: llmConfig.apiKey,
         baseURL: llmConfig.baseURL
       })
     } else {
-      throw new Error('Either llmConfig or llm must be provided')
+      throw new Error('Either llmConfig.llm or llmConfig.providerType must be provided')
     }
   }
 
@@ -77,7 +85,12 @@ export class AgentModelProvider {
         transport = serverConfig as MCPClientConfig['transport']
       }
 
-      const client = await createMCPClient({ transport: transport as MCPClientConfig['transport'] })
+      const client = new WebMcpClient(
+        { name: 'mcp-web-client', version: '1.0.0' },
+        { capabilities: { roots: { listChanged: true }, sampling: {}, elicitation: {} } }
+      )
+      await client.connect(transport)
+
       //@ts-ignore
       client['__transport__'] = transport
 
@@ -93,8 +106,19 @@ export class AgentModelProvider {
   /** 关闭一个 mcpClient */
   private async _closeOneClient(client: any) {
     try {
-      await client['__transport__']?.terminateSession?.()
-      await client['__transport__']?.close?.()
+      const transport = client['__transport__']
+
+      // 如果是 InMemoryTransport，不关闭传输层 因为它是配对的，关闭一端会影响另一端（服务端）
+      if (
+        (transport && transport instanceof InMemoryTransport) ||
+        (transport && transport instanceof MessageChannelTransport)
+      ) {
+        return
+      }
+
+      // 其他类型的传输正常关闭
+      await transport?.terminateSession?.()
+      await transport?.close?.()
       await client?.close?.()
     } catch (error) {}
   }
@@ -120,7 +144,7 @@ export class AgentModelProvider {
     const tools = await Promise.all(
       clientEntries.map(async ([serverName, client]) => {
         try {
-          const result = client ? await client?.tools?.() : null
+          const result = client ? await getAISDKTools(client) : null
           return { serverName, tools: result }
         } catch (error: unknown) {
           if (this.onError) {
@@ -134,7 +158,8 @@ export class AgentModelProvider {
     // 将结果存储到对象中，使用 serverName 作为键
     this.mcpTools = {}
     tools.forEach(({ serverName, tools: toolsData }) => {
-      this.mcpTools[serverName] = toolsData
+      const normalizedTools = toolsData && typeof toolsData === 'object' ? (toolsData as Record<string, any>) : {}
+      this.mcpTools[serverName] = normalizedTools
     })
   }
   /** 关闭所有的 clients */
@@ -175,12 +200,19 @@ export class AgentModelProvider {
     }
 
     const client = await this._createOneClient(mcpServer)
+    if (!client) {
+      // 创建客户端失败时直接返回，避免后续出现空指针问题
+      this.onError?.(`Failed to create MCP client: ${serverName}`)
+      return null
+    }
     this.mcpClients[serverName] = client
-    this.mcpTools[serverName] = (await client?.tools?.()) as Record<string, any>
+    const tools = await getAISDKTools(client)
+    // 工具列表可能为 null，统一兜底为空对象，确保类型安全
+    this.mcpTools[serverName] = tools && typeof tools === 'object' ? (tools as Record<string, any>) : {}
     this.mcpServers[serverName] = mcpServer
     this.onUpdatedTools?.()
 
-    return true
+    return client
   }
   /** 通过服务器名称删除mcpServer： mcpServers mcpClients  mcpTools ignoreToolnames  */
   async removeMcpServer(serverName: string) {

package/agent/type.ts

@@ -2,17 +2,31 @@ export type { experimental_MCPClient as MCPClient } from 'ai'
 import type { ProviderV2 } from '@ai-sdk/provider'
 import type { MCPTransport } from 'ai'
 
-/** 代理模型提供器的大语言配置对象 */
-export interface IAgentModelProviderLlmConfig {
+type ProviderFactory = 'openai' | 'deepseek' | ((options: any) => ProviderV2)
+
+type LlmFactoryConfig = {
+  /** API密钥 */
   apiKey: string
+  /** API基础URL */
   baseURL: string
-  /** 支持内置的常用模型，或者传入一个ai-sdk官方的Provider工厂函数
-   * @example
-   * import { createOpenAI } from '@ai-sdk/openai'
-   */
-  providerType: 'openai' | 'deepseek' | ((options: any) => ProviderV2)
+  /** 内置或自定义 Provider 工厂函数 */
+  providerType: ProviderFactory
+  /** 互斥：当使用 providerType 分支时不允许传入 llm */
+  llm?: never
+}
+
+type LlmInstanceConfig = {
+  /** 自定义 Provider 实例，优先级最高 */
+  llm: ProviderV2
+  /** 互斥：当传入 llm 实例时不需要 apiKey/baseURL/providerType */
+  apiKey?: never
+  baseURL?: never
+  providerType?: never
 }
 
+/** 代理模型提供器的大语言配置对象, 通过 XOR 表达二选一 */
+export type IAgentModelProviderLlmConfig = LlmFactoryConfig | LlmInstanceConfig
+
 /** Mcp Server的配置对象 */
 export type McpServerConfig =
   | { type: 'streamableHttp'; url: string }
@@ -22,13 +36,8 @@ export type McpServerConfig =
 
 /** */
 export interface IAgentModelProviderOption {
-  /** ai-sdk官方的Provider实例，不能与 llmConfig 同时传入
-   * @example
-   * import { openai } from '@ai-sdk/openai'
-   */
-  llm?: ProviderV2
-  /** 代理模型提供器的大语言配置对象, 不能与 llm 同时传入 */
-  llmConfig?: IAgentModelProviderLlmConfig
+  /** 代理模型提供器的大语言配置对象 */
+  llmConfig: IAgentModelProviderLlmConfig
   /** Mcp Server的配置对象的集合，键为服务器名称，值为配置对象 */
   mcpServers?: Record<string, McpServerConfig>
 }