@opentiny/next-sdk 0.1.15 → 0.2.1

package/dist/WebMcpServer.d.ts

@@ -1,7 +1,7 @@
 import { MessageChannelServerTransport } from '@opentiny/next';
 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 { Result, Request, Notification, Implementation, ToolAnnotations, ClientCapabilities, ElicitResult, ElicitRequest, ListRootsRequest, CreateMessageRequest, LoggingMessageNotification, ResourceUpdatedNotification, SubscribeRequest, UnsubscribeRequest, SetLevelRequest, ListResourcesRequest, RootsListChangedNotification } 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';
@@ -98,7 +98,13 @@ export declare class WebMcpServer {
      * Sends a ping to the client to check if it is still connected.
      */
     ping(): Promise<{
-        _meta?: Record<string, unknown> | undefined;
+        _meta?: {
+            [x: string]: unknown;
+            progressToken?: string | number | undefined;
+            "io.modelcontextprotocol/related-task"?: {
+                taskId: string;
+            } | undefined;
+        } | undefined;
     }>;
     /**
      * Creates a LLM message to be sent to the client.
@@ -110,169 +116,46 @@ export declare class WebMcpServer {
         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;
+            annotations?: {
+                audience?: ("user" | "assistant")[] | undefined;
+                priority?: number | undefined;
+                lastModified?: string | undefined;
             } | 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;
+            annotations?: {
+                audience?: ("user" | "assistant")[] | undefined;
+                priority?: number | undefined;
+                lastModified?: string | undefined;
+            } | undefined;
+            _meta?: {
+                [x: 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;
-            };
+            annotations?: {
+                audience?: ("user" | "assistant")[] | undefined;
+                priority?: number | undefined;
+                lastModified?: string | undefined;
+            } | undefined;
             _meta?: {
                 [x: string]: unknown;
             } | undefined;
-        } | {
+        };
+        _meta?: {
             [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;
+            progressToken?: string | number | undefined;
+            "io.modelcontextprotocol/related-task"?: {
+                taskId: string;
             } | undefined;
-            isError?: boolean | undefined;
-            _meta?: {
-                [x: string]: unknown;
-            } | undefined;
-        })[];
-        _meta?: Record<string, unknown> | undefined;
+        } | undefined;
         stopReason?: string | undefined;
     }>;
     /**
@@ -289,7 +172,13 @@ export declare class WebMcpServer {
             name?: string | undefined;
             _meta?: Record<string, unknown> | undefined;
         }[];
-        _meta?: Record<string, unknown> | undefined;
+        _meta?: {
+            [x: string]: unknown;
+            progressToken?: string | number | undefined;
+            "io.modelcontextprotocol/related-task"?: {
+                taskId: string;
+            } | undefined;
+        } | undefined;
     }>;
     /**
      * Sends a logging message to the client.
@@ -336,23 +225,23 @@ export declare class WebMcpServer {
     /**
      * Registers a handler for the subscribe request.
      */
-    onSubscribe(handler: (request: z.infer<typeof SubscribeRequestSchema>, extra: RequestHandlerExtra<SendRequestT, SendNotificationT>) => SendResultT | Promise<SendResultT>): void;
+    onSubscribe(handler: (request: SubscribeRequest, extra: RequestHandlerExtra<SendRequestT, SendNotificationT>) => SendResultT | Promise<SendResultT>): void;
     /**
      * Registers a handler for the unsubscribe request.
      */
-    onUnsubscribe(handler: (request: z.infer<typeof UnsubscribeRequestSchema>, extra: RequestHandlerExtra<SendRequestT, SendNotificationT>) => SendResultT | Promise<SendResultT>): void;
+    onUnsubscribe(handler: (request: UnsubscribeRequest, extra: RequestHandlerExtra<SendRequestT, SendNotificationT>) => SendResultT | Promise<SendResultT>): void;
     /**
      * Registers a handler for the set log level request.
      */
-    onSetLogLevel(handler: (request: z.infer<typeof SetLevelRequestSchema>, extra: RequestHandlerExtra<SendRequestT, SendNotificationT>) => SendResultT | Promise<SendResultT>): void;
+    onSetLogLevel(handler: (request: SetLevelRequest, extra: RequestHandlerExtra<SendRequestT, SendNotificationT>) => SendResultT | Promise<SendResultT>): void;
     /**
      * Registers a handler for the list tools request.
      */
-    onListResources(handler: (request: z.infer<typeof ListResourcesRequestSchema>, extra: RequestHandlerExtra<SendRequestT, SendNotificationT>) => SendResultT | Promise<SendResultT>): void;
+    onListResources(handler: (request: ListResourcesRequest, extra: RequestHandlerExtra<SendRequestT, SendNotificationT>) => SendResultT | Promise<SendResultT>): void;
     /**
      * Registers a handler for the roots list changed notification.
      */
-    onRootsListChanged(handler: (notification: z.infer<typeof RootsListChangedNotificationSchema>) => void | Promise<void>): void;
+    onRootsListChanged(handler: (notification: RootsListChangedNotification) => void | Promise<void>): void;
     /**
      * Close the transport for window.addEventListener('pagehide')
      */

package/dist/agent/AgentModelProvider.d.ts

@@ -32,6 +32,8 @@ export declare class AgentModelProvider {
     onClientDisconnected?: (serverName: string, reason?: string) => void;
     /** 缓存 ai-sdk response 中的 多轮会话的上下文 */
     messages: any[];
+    /** 是否使用 ReAct 模式（通过提示词而非 function calling 进行工具调用） */
+    useReActMode: boolean;
     constructor({ llmConfig, mcpServers }: IAgentModelProviderOption);
     /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 null */
     private _createOneClient;
@@ -50,11 +52,43 @@ export declare class AgentModelProvider {
     /** 全量更新所有的 mcpServers */
     updateMcpServers(mcpServers?: Record<string, McpServerConfig>): Promise<void>;
     /** 插入一个新的mcpServer，如果已经存在则返回false */
-    insertMcpServer(serverName: string, mcpServer: McpServerConfig): Promise<false | WebMcpClient | import('ai').experimental_MCPClient | null>;
+    insertMcpServer(serverName: string, mcpServer: McpServerConfig): Promise<false | WebMcpClient | import('@ai-sdk/mcp').experimental_MCPClient | null>;
     /** 通过服务器名称删除mcpServer： mcpServers mcpClients  mcpTools ignoreToolnames  */
     removeMcpServer(serverName: string): Promise<void>;
     /** 创建临时允许调用的tools集合 */
     private _tempMergeTools;
+    /** 生成 ReAct 模式的系统提示词（包含工具描述） */
+    private _generateReActSystemPrompt;
+    /** 执行 ReAct 模式下的工具调用 */
+    private _executeReActToolCall;
+    /** ReAct 模式的对话实现 */
+    private _chatReAct;
+    /**
+     * 检查消息内容是否包含图片
+     * @param content 消息内容
+     * @returns 是否包含图片
+     */
+    private _messageHasImage;
+    /**
+     * 从消息中移除图片，但保留文本内容
+     * @param message 原始消息
+     * @returns 移除图片后的消息（如果只有图片没有文本，返回 null）
+     */
+    private _removeImageFromMessage;
+    /**
+     * 构建用于模型调用的消息列表（magentic-ui 风格）
+     * 策略：保留所有文本消息，仅限制图片数量（类似 magentic-ui 的 maybe_remove_old_screenshots）
+     *
+     * @param systemMessage 系统提示词
+     * @param allMessages 所有消息历史（包括初始消息和后续对话）
+     * @param maxImages 最多保留的图片数量（默认3张）
+     * @returns 构建好的消息列表
+     */
+    private _buildMessagesForModel;
+    /** ReAct 模式非流式对话 */
+    private _chatReActNonStream;
+    /** ReAct 模式流式对话 */
+    private _chatReActStream;
     private _chat;
     chat(options: Parameters<typeof generateText>[0] & {
         maxSteps?: number;

package/dist/agent/type.d.ts

@@ -1,6 +1,7 @@
 import { ProviderV2 } from '@ai-sdk/provider';
-import { MCPTransport } from 'ai';
-export type { experimental_MCPClient as MCPClient } from 'ai';
+import { experimental_MCPClientConfig as MCPClientConfig } from '@ai-sdk/mcp';
+
+export type MCPTransport = MCPClientConfig['transport'];
 type ProviderFactory = 'openai' | 'deepseek' | ((options: any) => ProviderV2);
 type LlmFactoryConfig = {
     /** API密钥 */
@@ -11,6 +12,8 @@ type LlmFactoryConfig = {
     providerType: ProviderFactory;
     /** 互斥：当使用 providerType 分支时不允许传入 llm */
     llm?: never;
+    /** 是否使用 ReAct 模式（通过提示词而非 function calling 进行工具调用），默认为 false */
+    useReActMode?: boolean;
 };
 type LlmInstanceConfig = {
     /** 自定义 Provider 实例，优先级最高 */
@@ -19,6 +22,8 @@ type LlmInstanceConfig = {
     apiKey?: never;
     baseURL?: never;
     providerType?: never;
+    /** 是否使用 ReAct 模式（通过提示词而非 function calling 进行工具调用），默认为 false */
+    useReActMode?: boolean;
 };
 /** 代理模型提供器的大语言配置对象, 通过 XOR 表达二选一 */
 export type IAgentModelProviderLlmConfig = LlmFactoryConfig | LlmInstanceConfig;
@@ -37,6 +42,7 @@ export type McpServerConfig = {
     sessionId: string;
     useAISdkClient?: boolean;
 } | {
+    type: 'local';
     transport: MCPTransport;
     useAISdkClient?: boolean;
 };
@@ -47,3 +53,4 @@ export interface IAgentModelProviderOption {
     /** Mcp Server的配置对象的集合，键为服务器名称，值为配置对象 */
     mcpServers?: Record<string, McpServerConfig>;
 }
+export {};

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

@@ -0,0 +1,9 @@
+import { ToolSet } from 'ai';
+
+/**
+ * 生成 ReAct 模式的工具描述提示词（统一使用 XML 格式）
+ * 将工具集合转换为 ReAct 格式的文本描述，用于添加到系统提示词中
+ * @param tools - 工具集合对象
+ * @returns 格式化的工具描述字符串
+ */
+export declare function generateReActToolsPrompt(tools: ToolSet): string;

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

@@ -0,0 +1,14 @@
+import { ToolSet } from 'ai';
+
+/**
+ * 解析 ReAct 格式的工具调用
+ * 从模型输出文本中提取工具名称和参数
+ * 现在统一使用 XML 格式（<call> 标签），同时保留对其他格式的兼容性支持
+ * @param text - 模型输出的文本
+ * @param availableTools - 可用的工具集合，用于验证工具名称
+ * @returns 解析出的工具调用信息，如果未找到则返回 null
+ */
+export declare function parseReActAction(text: string, availableTools: ToolSet): {
+    toolName: string;
+    arguments: any;
+} | null;