@opentiny/next-sdk 0.1.13 → 0.1.14-alpha.0

package/dist/WebMcpServer.d.ts

@@ -1,13 +1,11 @@
 import { MessageChannelServerTransport } from '@opentiny/next';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { z, ZodObject, ZodLiteral, ZodType, ZodOptional } from 'zod';
-import { SetLevelRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListResourcesRequestSchema, RootsListChangedNotificationSchema } from '@modelcontextprotocol/sdk/types.js';
-import type { ToolCallback, RegisteredTool, PromptCallback, RegisteredPrompt, ResourceMetadata, ResourceTemplate, RegisteredResource, ReadResourceCallback, RegisteredResourceTemplate, ReadResourceTemplateCallback } from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { Result, Request, Notification, Implementation, ToolAnnotations, ClientCapabilities, ElicitResult, ElicitRequest, ListRootsRequest, CreateMessageRequest, LoggingMessageNotification, ResourceUpdatedNotification } from '@modelcontextprotocol/sdk/types.js';
-import type { ZodRawShape, ZodTypeDef } from 'zod';
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
-import type { ServerOptions } from '@modelcontextprotocol/sdk/server/index.js';
-import type { RequestOptions, NotificationOptions, RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
+import { McpServer, ToolCallback, RegisteredTool, PromptCallback, RegisteredPrompt, ResourceMetadata, ResourceTemplate, RegisteredResource, ReadResourceCallback, RegisteredResourceTemplate, ReadResourceTemplateCallback } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { z, ZodObject, ZodLiteral, ZodType, ZodOptional, ZodRawShape, ZodTypeDef } from 'zod';
+import { SetLevelRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListResourcesRequestSchema, RootsListChangedNotificationSchema, Result, Request, Notification, Implementation, ToolAnnotations, ClientCapabilities, ElicitResult, ElicitRequest, ListRootsRequest, CreateMessageRequest, LoggingMessageNotification, ResourceUpdatedNotification } from '@modelcontextprotocol/sdk/types.js';
+import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import { ServerOptions } from '@modelcontextprotocol/sdk/server/index.js';
+import { RequestOptions, NotificationOptions, RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
+
 type PromptArgsRawShape = {
     [k: string]: ZodType<string, ZodTypeDef, string> | ZodOptional<ZodType<string, ZodTypeDef, string>>;
 };
@@ -100,61 +98,183 @@ export declare class WebMcpServer {
      * Sends a ping to the client to check if it is still connected.
      */
     ping(): Promise<{
-        _meta?: import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough"> | undefined;
+        _meta?: Record<string, unknown> | undefined;
     }>;
     /**
      * Creates a LLM message to be sent to the client.
      */
-    createMessage(params: CreateMessageRequest['params'], options?: RequestOptions): Promise<z.objectOutputType<{
-        _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-    } & {
-        model: import("zod").ZodString;
-        stopReason: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodEnum<["endTurn", "stopSequence", "maxTokens"]>, import("zod").ZodString]>>;
-        role: import("zod").ZodEnum<["user", "assistant"]>;
-        content: import("zod").ZodDiscriminatedUnion<"type", [import("zod").ZodObject<{
-            type: import("zod").ZodLiteral<"text">;
-            text: import("zod").ZodString;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
-            type: import("zod").ZodLiteral<"text">;
-            text: import("zod").ZodString;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
-            type: import("zod").ZodLiteral<"text">;
-            text: import("zod").ZodString;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, import("zod").ZodTypeAny, "passthrough">>, import("zod").ZodObject<{
-            type: import("zod").ZodLiteral<"image">;
-            data: import("zod").ZodEffects<import("zod").ZodString, string, string>;
-            mimeType: import("zod").ZodString;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
-            type: import("zod").ZodLiteral<"image">;
-            data: import("zod").ZodEffects<import("zod").ZodString, string, string>;
-            mimeType: import("zod").ZodString;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
-            type: import("zod").ZodLiteral<"image">;
-            data: import("zod").ZodEffects<import("zod").ZodString, string, string>;
-            mimeType: import("zod").ZodString;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, import("zod").ZodTypeAny, "passthrough">>, import("zod").ZodObject<{
-            type: import("zod").ZodLiteral<"audio">;
-            data: import("zod").ZodEffects<import("zod").ZodString, string, string>;
-            mimeType: import("zod").ZodString;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
-            type: import("zod").ZodLiteral<"audio">;
-            data: import("zod").ZodEffects<import("zod").ZodString, string, string>;
-            mimeType: import("zod").ZodString;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
-            type: import("zod").ZodLiteral<"audio">;
-            data: import("zod").ZodEffects<import("zod").ZodString, string, string>;
-            mimeType: import("zod").ZodString;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, import("zod").ZodTypeAny, "passthrough">>]>;
-    }, z.ZodTypeAny, "passthrough">>;
+    createMessage(params: CreateMessageRequest['params'], options?: RequestOptions): Promise<{
+        [x: string]: unknown;
+        model: string;
+        role: "user" | "assistant";
+        content: {
+            type: "text";
+            text: string;
+            _meta?: Record<string, unknown> | undefined;
+        } | {
+            type: "image";
+            data: string;
+            mimeType: string;
+            _meta?: Record<string, unknown> | undefined;
+        } | {
+            type: "audio";
+            data: string;
+            mimeType: string;
+            _meta?: Record<string, unknown> | undefined;
+        } | {
+            [x: string]: unknown;
+            type: "tool_use";
+            name: string;
+            id: string;
+            input: {
+                [x: string]: unknown;
+            };
+            _meta?: {
+                [x: string]: unknown;
+            } | undefined;
+        } | {
+            [x: string]: unknown;
+            type: "tool_result";
+            toolUseId: string;
+            content: ({
+                type: "text";
+                text: string;
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                type: "image";
+                data: string;
+                mimeType: string;
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                type: "audio";
+                data: string;
+                mimeType: string;
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                type: "resource";
+                resource: {
+                    uri: string;
+                    text: string;
+                    mimeType?: string | undefined;
+                    _meta?: Record<string, unknown> | undefined;
+                } | {
+                    uri: string;
+                    blob: string;
+                    mimeType?: string | undefined;
+                    _meta?: Record<string, unknown> | undefined;
+                };
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                uri: string;
+                name: string;
+                type: "resource_link";
+                description?: string | undefined;
+                mimeType?: string | undefined;
+                _meta?: {
+                    [x: string]: unknown;
+                } | undefined;
+                icons?: {
+                    src: string;
+                    mimeType?: string | undefined;
+                    sizes?: string[] | undefined;
+                }[] | undefined;
+                title?: string | undefined;
+            })[];
+            structuredContent?: {
+                [x: string]: unknown;
+            } | undefined;
+            isError?: boolean | undefined;
+            _meta?: {
+                [x: string]: unknown;
+            } | undefined;
+        } | ({
+            type: "text";
+            text: string;
+            _meta?: Record<string, unknown> | undefined;
+        } | {
+            type: "image";
+            data: string;
+            mimeType: string;
+            _meta?: Record<string, unknown> | undefined;
+        } | {
+            type: "audio";
+            data: string;
+            mimeType: string;
+            _meta?: Record<string, unknown> | undefined;
+        } | {
+            [x: string]: unknown;
+            type: "tool_use";
+            name: string;
+            id: string;
+            input: {
+                [x: string]: unknown;
+            };
+            _meta?: {
+                [x: string]: unknown;
+            } | undefined;
+        } | {
+            [x: string]: unknown;
+            type: "tool_result";
+            toolUseId: string;
+            content: ({
+                type: "text";
+                text: string;
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                type: "image";
+                data: string;
+                mimeType: string;
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                type: "audio";
+                data: string;
+                mimeType: string;
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                type: "resource";
+                resource: {
+                    uri: string;
+                    text: string;
+                    mimeType?: string | undefined;
+                    _meta?: Record<string, unknown> | undefined;
+                } | {
+                    uri: string;
+                    blob: string;
+                    mimeType?: string | undefined;
+                    _meta?: Record<string, unknown> | undefined;
+                };
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                uri: string;
+                name: string;
+                type: "resource_link";
+                description?: string | undefined;
+                mimeType?: string | undefined;
+                _meta? /**
+                 * Registers a handler to invoke when this protocol object receives a notification with the given method.
+                 *
+                 * Note that this will replace any previous notification handler for the same method.
+                 */: {
+                    [x: string]: unknown;
+                } | undefined;
+                icons?: {
+                    src: string;
+                    mimeType?: string | undefined;
+                    sizes?: string[] | undefined;
+                }[] | undefined;
+                title?: string | undefined;
+            })[];
+            structuredContent?: {
+                [x: string]: unknown;
+            } | undefined;
+            isError?: boolean | undefined;
+            _meta?: {
+                [x: string]: unknown;
+            } | undefined;
+        })[];
+        _meta?: Record<string, unknown> | undefined;
+        stopReason?: string | undefined;
+    }>;
     /**
      * Elicits input from the client, such as a prompt or resource.
      */
@@ -162,23 +282,15 @@ export declare class WebMcpServer {
     /**
      * Lists the root resources available to the client.
      */
-    listRoots(params?: ListRootsRequest['params'], options?: RequestOptions): Promise<z.objectOutputType<{
-        _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-    } & {
-        roots: import("zod").ZodArray<import("zod").ZodObject<{
-            uri: import("zod").ZodString;
-            name: import("zod").ZodOptional<import("zod").ZodString>;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
-            uri: import("zod").ZodString;
-            name: import("zod").ZodOptional<import("zod").ZodString>;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
-            uri: import("zod").ZodString;
-            name: import("zod").ZodOptional<import("zod").ZodString>;
-            _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-        }, import("zod").ZodTypeAny, "passthrough">>, "many">;
-    }, z.ZodTypeAny, "passthrough">>;
+    listRoots(params?: ListRootsRequest['params'], options?: RequestOptions): Promise<{
+        [x: string]: unknown;
+        roots: {
+            uri: string;
+            name?: string | undefined;
+            _meta?: Record<string, unknown> | undefined;
+        }[];
+        _meta?: Record<string, unknown> | undefined;
+    }>;
     /**
      * Sends a logging message to the client.
      */
@@ -253,7 +365,7 @@ export declare const createMessageChannelServerTransport: (endpoint: string, glo
 /**
  * Creates a pair of transports for communication between a server and client using MessageChannel.
  */
-export declare const createMessageChannelPairTransport: () => [import("@opentiny/next").MessageChannelTransport, import("@opentiny/next").MessageChannelTransport];
+export declare const createMessageChannelPairTransport: () => [import('@opentiny/next').MessageChannelTransport, import('@opentiny/next').MessageChannelTransport];
 /**
  * Checks if the transport is a MessageChannelServerTransport.
  */

package/dist/Zod.d.ts

@@ -0,0 +1 @@
+export { z } from 'zod';

package/dist/agent/AgentModelProvider.d.ts

@@ -1,10 +1,10 @@
 import { streamText, generateText } from 'ai';
-import type { IAgentModelProviderOption, McpServerConfig } from './type';
+import { IAgentModelProviderOption, McpServerConfig } from './type';
 import { ProviderV2 } from '@ai-sdk/provider';
-import { OpenAIProvider } from '@ai-sdk/openai';
-import { createOpenAI } from '@ai-sdk/openai';
+import { OpenAIProvider, 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;
@@ -39,6 +39,8 @@ export declare class AgentModelProvider {
     private _closeOneClient;
     /** 创建所有 mcpClients */
     private _createMpcClients;
+    /** 兼容两种 client 类型的 tools 获取方法 */
+    private _getClientTools;
     /** 查询所有 mcpClients 的 tools, 失败则保存为null */
     private _createMpcTools;
     /** 关闭所有的 clients */
@@ -48,7 +50,7 @@ export declare class AgentModelProvider {
     /** 全量更新所有的 mcpServers */
     updateMcpServers(mcpServers?: Record<string, McpServerConfig>): Promise<void>;
     /** 插入一个新的mcpServer，如果已经存在则返回false */
-    insertMcpServer(serverName: string, mcpServer: McpServerConfig): Promise<false | WebMcpClient | null>;
+    insertMcpServer(serverName: string, mcpServer: McpServerConfig): Promise<false | WebMcpClient | import('ai').experimental_MCPClient | null>;
     /** 通过服务器名称删除mcpServer： mcpServers mcpClients  mcpTools ignoreToolnames  */
     removeMcpServer(serverName: string): Promise<void>;
     /** 创建临时允许调用的tools集合 */

package/dist/agent/type.d.ts

@@ -1,6 +1,6 @@
+import { ProviderV2 } from '@ai-sdk/provider';
+import { MCPTransport } from 'ai';
 export type { experimental_MCPClient as MCPClient } from 'ai';
-import type { ProviderV2 } from '@ai-sdk/provider';
-import type { MCPTransport } from 'ai';
 type ProviderFactory = 'openai' | 'deepseek' | ((options: any) => ProviderV2);
 type LlmFactoryConfig = {
     /** API密钥 */
@@ -26,15 +26,19 @@ export type IAgentModelProviderLlmConfig = LlmFactoryConfig | LlmInstanceConfig;
 export type McpServerConfig = {
     type: 'streamableHttp';
     url: string;
+    useAISdkClient?: boolean;
 } | {
     type: 'sse';
     url: string;
+    useAISdkClient?: boolean;
 } | {
     type: 'extension';
     url: string;
     sessionId: string;
+    useAISdkClient?: boolean;
 } | {
     transport: MCPTransport;
+    useAISdkClient?: boolean;
 };
 /** */
 export interface IAgentModelProviderOption {

package/dist/agent/utils/getAISDKTools.d.ts

@@ -1,5 +1,6 @@
 import { ToolSet } from 'ai';
 import { WebMcpClient } from '../../WebMcpClient';
+
 /**
  * 快速从官方 mcp 或 WebMcpClient 这2种client中读取 tools 数组，并转换成 ai-sdk 的tool的对象格式。
  * @params client  一个已连接好的 WebMcpClient

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import Ajv from 'ajv';
+import { default as Ajv } from 'ajv';
+
 export { Ajv };
 export { z } from 'zod';
 export { AuthClientProvider } from '@opentiny/next';