@opentiny/next-sdk 0.3.1 → 0.3.3-alpha.1

package/WebMcp.ts

@@ -18,3 +18,9 @@ export type * from '@modelcontextprotocol/sdk/client/streamableHttp.js'
 export type * from '@modelcontextprotocol/sdk/server/mcp.js'
 
 export * from './transport/ExtensionPageServerTransport'
+
+// page-tools：供浏览器插件通过 scripting.executeScript 注入到第三方页面后初始化 WebMCP
+export { initializeBuiltinWebMCP } from './page-tools/initialize-builtin-WebMCP'
+export { setupModelContextBridge } from './page-tools/bridge'
+export { registerPageAgentTool } from './page-tools/page-agent-tool'
+

package/WebMcpClient.ts

@@ -113,6 +113,7 @@ export class WebMcpClient {
    * Connects the client to a transport via the specified option.
    */
   async connect(options: Transport | ClientConnectOptions): Promise<{ transport: Transport; sessionId: string }> {
+    // 1. 直连一个Transport时
     if (typeof (options as Transport)['start'] === 'function') {
       this.transport = options as Transport
       this.transport.onclose = undefined
@@ -124,34 +125,28 @@ export class WebMcpClient {
 
     const { url, token, sessionId, type, agent, builtin, onError } = options as ClientConnectOptions
 
-    if (agent === true) {
+    if (agent) {
       const proxyOptions: ProxyOptions = { client: this.client, url, token, sessionId }
 
-      let response
+      const response: { transport: Transport; sessionId: string } =
+        type === 'sse'
+          ? await createSseProxy(proxyOptions)
+          : type === 'socket'
+            ? await createSocketProxy(proxyOptions)
+            : await createStreamProxy(proxyOptions)
 
-      const connectProxy = async () => {
-        const { transport, sessionId } =
-          type === 'sse'
-            ? await createSseProxy(proxyOptions)
-            : type === 'socket'
-              ? await createSocketProxy(proxyOptions)
-              : await createStreamProxy(proxyOptions)
-
-        transport.onerror = async (error: Error) => {
-          onError?.(error)
-        }
-
-        if (builtin === true) {
-          setupBuiltinProxy(transport)
-        }
+      response.transport.onerror = async (error: Error) => {
+        onError?.(error)
+      }
 
-        response = { transport, sessionId }
+      if (builtin) {
+        setupBuiltinProxy(response.transport)
       }
 
-      await connectProxy()
-      return response as unknown as { transport: Transport; sessionId: string }
+      return response
     }
 
+    // 3. 非代理，通过 URL 连接时
     const endpoint = new URL(url)
     let transport: Transport | undefined
 
@@ -172,7 +167,7 @@ export class WebMcpClient {
       await this.client.connect(transport)
     }
 
-    if (typeof transport === 'undefined') {
+    if (type === 'stream' || typeof transport === 'undefined') {
       const opts = streamOptions(token, sessionId) as StreamableHTTPClientTransportOptions
       transport = new StreamableHTTPClientTransport(endpoint, opts)
       await this.client.connect(transport)

package/agent/type.ts

@@ -1,70 +1,94 @@
-import type { ProviderV2 } from '@ai-sdk/provider'
-import type { MCPClientConfig } from '@ai-sdk/mcp'
-
-// 从 MCPClientConfig 中提取 transport 类型
-export type MCPTransport = MCPClientConfig['transport']
-
-/**
- * 浏览器内置 WebMCP 测试 API 接口 (如 navigator.modelContextTesting)
- */
-export interface BuiltinMcpClient {
-  listTools?: () => Promise<any[]>
-  getTools?: () => Promise<any[]>
-  executeTool: (name: string, input: string) => Promise<any>
-  registerTool?: (config: { name: string; execute: (input: any) => Promise<any> | any; [key: string]: any }) => void
-  unregisterTool?: (name: string) => void
-}
-
-type ProviderFactory = 'openai' | 'deepseek' | ((options: any) => ProviderV2)
-
-type LlmFactoryConfig = {
-  /** API密钥 */
-  apiKey: string
-  /** API基础URL */
-  baseURL: string
-  /** 内置或自定义 Provider 工厂函数 */
-  providerType: ProviderFactory
-  /** 互斥：当使用 providerType 分支时不允许传入 llm */
-  llm?: never
-  /** 是否使用 ReAct 模式（通过提示词而非 function calling 进行工具调用），默认为 false */
-  useReActMode?: boolean
-}
-
-type LlmInstanceConfig = {
-  /** 自定义 Provider 实例，优先级最高 */
-  llm: ProviderV2
-  /** 互斥：当传入 llm 实例时不需要 apiKey/baseURL/providerType */
-  apiKey?: never
-  baseURL?: never
-  providerType?: never
-  /** 是否使用 ReAct 模式（通过提示词而非 function calling 进行工具调用），默认为 false */
-  useReActMode?: boolean
-}
-
-/** 代理模型提供器的大语言配置对象, 通过 XOR 表达二选一 */
-export type IAgentModelProviderLlmConfig = LlmFactoryConfig | LlmInstanceConfig
-
-/** Mcp Server的配置对象 */
-export type McpServerConfig =
-  | { type: 'streamableHttp'; url: string; useAISdkClient?: boolean; headers?: Record<string, string> }
-  | { type: 'sse'; url: string; useAISdkClient?: boolean; headers?: Record<string, string> }
-  | { type: 'extension'; url: string; sessionId: string; useAISdkClient?: boolean; headers?: Record<string, string> }
-  | { type: 'local'; transport: MCPTransport; useAISdkClient?: boolean }
-  | {
-      /**
-       * 浏览器内置 WebMCP 类型。
-       * 将 `navigator.modelContextTesting` 作为 MCP 工具数据源，
-       * 通过 `getBuiltinMcpTools` 适配为 ai-sdk 可调用的 ToolSet。
-       */
-      type: 'builtin'
-      /** 传入 `navigator.modelContextTesting` 对象 */
-      client: BuiltinMcpClient
-    }
-
-/** */
-export interface IAgentModelProviderOption {
-  /** 代理模型提供器的大语言配置对象 */
-  llmConfig: IAgentModelProviderLlmConfig
-  /** Mcp Server的配置对象的集合，键为服务器名称，值为配置对象 */
-  mcpServers?: Record<string, McpServerConfig>
+import type { ProviderV2 } from '@ai-sdk/provider'
+import type { MCPClientConfig } from '@ai-sdk/mcp'
+
+// 从 MCPClientConfig 中提取 transport 类型
+export type MCPTransport = MCPClientConfig['transport']
+
+/**
+ * 浏览器内置 WebMCP 测试 API 接口 (如 navigator.modelContextTesting)
+ */
+export interface BuiltinMcpClient {
+  listTools?: () => Promise<any[]>
+  getTools?: () => Promise<any[]>
+  executeTool: (name: string, input: string) => Promise<any>
+  registerTool?: (config: { name: string; execute: (input: any) => Promise<any> | any; [key: string]: any }) => void
+  unregisterTool?: (name: string) => void
+}
+
+type ProviderFactory = 'openai' | 'deepseek' | ((options: any) => ProviderV2)
+
+type LlmFactoryConfig = {
+  /** API密钥 */
+  apiKey: string
+  /** API基础URL */
+  baseURL: string
+  /** 内置或自定义 Provider 工厂函数 */
+  providerType: ProviderFactory
+  /** 互斥：当使用 providerType 分支时不允许传入 llm */
+  llm?: never
+  /** 是否使用 ReAct 模式（通过提示词而非 function calling 进行工具调用），默认为 false */
+  useReActMode?: boolean
+}
+
+type LlmInstanceConfig = {
+  /** 自定义 Provider 实例，优先级最高 */
+  llm: ProviderV2
+  /** 互斥：当传入 llm 实例时不需要 apiKey/baseURL/providerType */
+  apiKey?: never
+  baseURL?: never
+  providerType?: never
+  /** 是否使用 ReAct 模式（通过提示词而非 function calling 进行工具调用），默认为 false */
+  useReActMode?: boolean
+}
+
+/** 代理模型提供器的大语言配置对象, 通过 XOR 表达二选一 */
+export type IAgentModelProviderLlmConfig = LlmFactoryConfig | LlmInstanceConfig
+
+/** Mcp Server的配置对象 */
+export type McpServerConfig =
+  | {
+      type: 'streamableHttp'
+      url: string
+      useAISdkClient?: boolean
+      headers?: Record<string, string>
+      name?: string
+      description?: string
+    }
+  | {
+      type: 'sse'
+      url: string
+      useAISdkClient?: boolean
+      headers?: Record<string, string>
+      name?: string
+      description?: string
+    }
+  | {
+      type: 'extension'
+      url: string
+      sessionId: string
+      useAISdkClient?: boolean
+      headers?: Record<string, string>
+      name?: string
+      description?: string
+    }
+  | { type: 'local'; transport: MCPTransport; useAISdkClient?: boolean; name?: string; description?: string }
+  | {
+      /**
+       * 浏览器内置 WebMCP 类型。
+       * 将 `navigator.modelContextTesting` 作为 MCP 工具数据源，
+       * 通过 `getBuiltinMcpTools` 适配为 ai-sdk 可调用的 ToolSet。
+       */
+      type: 'builtin'
+      /** 传入 `navigator.modelContextTesting` 对象 */
+      client: BuiltinMcpClient
+      name?: string
+      description?: string
+    }
+
+/** */
+export interface IAgentModelProviderOption {
+  /** 代理模型提供器的大语言配置对象 */
+  llmConfig: IAgentModelProviderLlmConfig
+  /** Mcp Server的配置对象的集合，键为服务器名称，值为配置对象 */
+  mcpServers?: Record<string, McpServerConfig>
 }

package/core.ts

@@ -26,3 +26,4 @@ export * from './transport/ExtensionClientTransport'
 export { AgentModelProvider } from './agent/AgentModelProvider'
 export { getAISDKTools } from './agent/utils/getAISDKTools'
 export type * from './agent/type'
+export { initializeBuiltinWebMCP } from './page-tools/initialize-builtin-WebMCP'