@opentiny/next-sdk 0.1.11 → 0.1.13

package/WebMcpClient.ts

@@ -76,7 +76,7 @@ export class WebMcpClient {
   public readonly client: Client
   public transport: Transport | undefined
 
-  constructor(clientInfo: Implementation, options?: ClientOptions) {
+  constructor(clientInfo?: Implementation, options?: ClientOptions) {
     const info: Implementation = {
       name: 'web-mcp-client',
       version: '1.0.0'

package/WebMcpServer.ts

@@ -61,7 +61,7 @@ export class WebMcpServer {
   public readonly server: McpServer
   public transport: Transport | undefined
 
-  constructor(serverInfo: Implementation, options?: ServerOptions) {
+  constructor(serverInfo?: Implementation, options?: ServerOptions) {
     const info: Implementation = {
       name: 'web-mcp-server',
       version: '1.0.0'

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>
 }

package/dist/WebMcpClient.d.ts

@@ -31,7 +31,7 @@ type SendResultT = Result;
 export declare class WebMcpClient {
     readonly client: Client;
     transport: Transport | undefined;
-    constructor(clientInfo: Implementation, options?: ClientOptions);
+    constructor(clientInfo?: Implementation, options?: ClientOptions);
     /**
      * Connects the client to a transport via the specified option.
      */

package/dist/WebMcpServer.d.ts

@@ -22,7 +22,7 @@ type SendResultT = Result;
 export declare class WebMcpServer {
     readonly server: McpServer;
     transport: Transport | undefined;
-    constructor(serverInfo: Implementation, options?: ServerOptions);
+    constructor(serverInfo?: Implementation, options?: ServerOptions);
     /**
      * Connects the server to a transport via the specified option.
      */

package/dist/agent/AgentModelProvider.d.ts

@@ -4,6 +4,7 @@ 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 { WebMcpClient } from '../WebMcpClient';
 export declare const AIProviderFactories: {
     openai: typeof createOpenAI;
     deepseek: typeof createDeepSeek;
@@ -31,7 +32,7 @@ export declare class AgentModelProvider {
     onClientDisconnected?: (serverName: string, reason?: string) => void;
     /** 缓存 ai-sdk response 中的 多轮会话的上下文 */
     messages: any[];
-    constructor({ llmConfig, mcpServers, llm }: IAgentModelProviderOption);
+    constructor({ llmConfig, mcpServers }: IAgentModelProviderOption);
     /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 null */
     private _createOneClient;
     /** 关闭一个 mcpClient */
@@ -47,7 +48,7 @@ export declare class AgentModelProvider {
     /** 全量更新所有的 mcpServers */
     updateMcpServers(mcpServers?: Record<string, McpServerConfig>): Promise<void>;
     /** 插入一个新的mcpServer，如果已经存在则返回false */
-    insertMcpServer(serverName: string, mcpServer: McpServerConfig): Promise<boolean>;
+    insertMcpServer(serverName: string, mcpServer: McpServerConfig): Promise<false | WebMcpClient | null>;
     /** 通过服务器名称删除mcpServer： mcpServers mcpClients  mcpTools ignoreToolnames  */
     removeMcpServer(serverName: string): Promise<void>;
     /** 创建临时允许调用的tools集合 */

package/dist/agent/AgentModelProvider.js

@@ -19,11 +19,14 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { streamText, stepCountIs, generateText } from 'ai';
-import { experimental_createMCPClient as createMCPClient } from 'ai';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
 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,
     ['deepseek']: createDeepSeek
@@ -33,7 +36,7 @@ export const AIProviderFactories = {
  * @returns 暴露了 chat, chatStream方法
  */
 export class AgentModelProvider {
-    constructor({ llmConfig, mcpServers, llm }) {
+    constructor({ llmConfig, mcpServers }) {
         /**  当前mcpServers对象集合。键为服务器名称，值为 McpServerConfig 或任意的 MCPTransport
          * 参考: https://ai-sdk.dev/docs/ai-sdk-core/tools-and-tool-calling#initializing-an-mcp-client */
         this.mcpServers = {};
@@ -45,19 +48,23 @@ export class AgentModelProvider {
         this.ignoreToolnames = [];
         /** 缓存 ai-sdk response 中的 多轮会话的上下文 */
         this.messages = [];
+        if (!llmConfig) {
+            throw new Error('llmConfig is required to initialize AgentModelProvider');
+        }
         this.mcpServers = mcpServers || {};
         this.mcpClients = {};
         this.mcpTools = {};
-        if (llm) {
-            this.llm = llm;
+        if (llmConfig.llm) {
+            this.llm = llmConfig.llm;
         }
-        else if (llmConfig) {
+        else if (llmConfig.providerType) {
+            const providerType = llmConfig.providerType;
             let providerFn;
-            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,
@@ -65,7 +72,7 @@ export class AgentModelProvider {
             });
         }
         else {
-            throw new Error('Either llmConfig or llm must be provided');
+            throw new Error('Either llmConfig.llm or llmConfig.providerType must be provided');
         }
     }
     /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 null */
@@ -83,7 +90,8 @@ export class AgentModelProvider {
                 else {
                     transport = serverConfig;
                 }
-                const client = yield createMCPClient({ transport: transport });
+                const client = new WebMcpClient({ name: 'mcp-web-client', version: '1.0.0' }, { capabilities: { roots: { listChanged: true }, sampling: {}, elicitation: {} } });
+                yield client.connect(transport);
                 //@ts-ignore
                 client['__transport__'] = transport;
                 return client;
@@ -100,11 +108,18 @@ export class AgentModelProvider {
     /** 关闭一个 mcpClient */
     _closeOneClient(client) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c;
             try {
-                yield ((_b = (_a = client['__transport__']) === null || _a === void 0 ? void 0 : _a.terminateSession) === null || _b === void 0 ? void 0 : _b.call(_a));
-                yield ((_d = (_c = client['__transport__']) === null || _c === void 0 ? void 0 : _c.close) === null || _d === void 0 ? void 0 : _d.call(_c));
-                yield ((_e = client === null || client === void 0 ? void 0 : client.close) === null || _e === void 0 ? void 0 : _e.call(client));
+                const transport = client['__transport__'];
+                // 如果是 InMemoryTransport，不关闭传输层 因为它是配对的，关闭一端会影响另一端（服务端）
+                if ((transport && transport instanceof InMemoryTransport) ||
+                    (transport && transport instanceof MessageChannelTransport)) {
+                    return;
+                }
+                // 其他类型的传输正常关闭
+                yield ((_a = transport === null || transport === void 0 ? void 0 : transport.terminateSession) === null || _a === void 0 ? void 0 : _a.call(transport));
+                yield ((_b = transport === null || transport === void 0 ? void 0 : transport.close) === null || _b === void 0 ? void 0 : _b.call(transport));
+                yield ((_c = client === null || client === void 0 ? void 0 : client.close) === null || _c === void 0 ? void 0 : _c.call(client));
             }
             catch (error) { }
         });
@@ -130,9 +145,8 @@ export class AgentModelProvider {
         return __awaiter(this, void 0, void 0, function* () {
             const clientEntries = Object.entries(this.mcpClients);
             const tools = yield Promise.all(clientEntries.map((_a) => __awaiter(this, [_a], void 0, function* ([serverName, client]) {
-                var _b;
                 try {
-                    const result = client ? yield ((_b = client === null || client === void 0 ? void 0 : client.tools) === null || _b === void 0 ? void 0 : _b.call(client)) : null;
+                    const result = client ? yield getAISDKTools(client) : null;
                     return { serverName, tools: result };
                 }
                 catch (error) {
@@ -146,7 +160,8 @@ export class AgentModelProvider {
             // 将结果存储到对象中，使用 serverName 作为键
             this.mcpTools = {};
             tools.forEach(({ serverName, tools: toolsData }) => {
-                this.mcpTools[serverName] = toolsData;
+                const normalizedTools = toolsData && typeof toolsData === 'object' ? toolsData : {};
+                this.mcpTools[serverName] = normalizedTools;
             });
         });
     }
@@ -192,11 +207,18 @@ export class AgentModelProvider {
                 return false;
             }
             const client = yield this._createOneClient(mcpServer);
+            if (!client) {
+                // 创建客户端失败时直接返回，避免后续出现空指针问题
+                (_a = this.onError) === null || _a === void 0 ? void 0 : _a.call(this, `Failed to create MCP client: ${serverName}`);
+                return null;
+            }
             this.mcpClients[serverName] = client;
-            this.mcpTools[serverName] = (yield ((_a = client === null || client === void 0 ? void 0 : client.tools) === null || _a === void 0 ? void 0 : _a.call(client)));
+            const tools = yield getAISDKTools(client);
+            // 工具列表可能为 null，统一兜底为空对象，确保类型安全
+            this.mcpTools[serverName] = tools && typeof tools === 'object' ? tools : {};
             this.mcpServers[serverName] = mcpServer;
             (_b = this.onUpdatedTools) === null || _b === void 0 ? void 0 : _b.call(this);
-            return true;
+            return client;
         });
     }
     /** 通过服务器名称删除mcpServer： mcpServers mcpClients  mcpTools ignoreToolnames  */

package/dist/agent/type.d.ts

@@ -1,16 +1,27 @@
 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';
@@ -27,13 +38,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>;
 }

package/dist/index.d.ts

@@ -6,6 +6,7 @@ export { ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
 export { UriTemplate } from '@modelcontextprotocol/sdk/shared/uriTemplate.js';
 export { completable } from '@modelcontextprotocol/sdk/server/completable.js';
 export { getDisplayName } from '@modelcontextprotocol/sdk/shared/metadataUtils.js';
+export { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
 export type * from 'zod';
 export type * from '@opentiny/next';
 export type * from '@modelcontextprotocol/sdk/types.js';
@@ -19,7 +20,7 @@ export * from './WebMcpClient';
 export * from './transport/ExtensionClientTransport';
 export * from './transport/ExtensionPageServerTransport';
 export * from './transport/ExtensionContentServerTransport';
-export { createRemoter } from './remoter/createRemoter';
+export * from './remoter/createRemoter';
 export { AgentModelProvider } from './agent/AgentModelProvider';
 export { getAISDKTools } from './agent/utils/getAISDKTools';
 export { QrCode, type QrCodeOption } from './remoter/QrCode';