@opentiny/next-sdk 0.3.0-alpha.0 → 0.3.1

package/WebMcpClient.ts

@@ -22,6 +22,7 @@ import {
   createStreamProxy,
   createSocketProxy
 } from '@opentiny/next'
+import { setupBuiltinProxy } from './utils/builtinProxy'
 import type {
   Result,
   Request,
@@ -69,6 +70,7 @@ export interface ClientConnectOptions {
   sessionId?: string
   type?: 'channel' | 'sse' | 'stream' | 'socket'
   agent?: boolean
+  builtin?: boolean
   onError?: (error: Error) => void
 }
 
@@ -120,7 +122,7 @@ export class WebMcpClient {
       return { transport: this.transport, sessionId: this.transport.sessionId as string }
     }
 
-    const { url, token, sessionId, type, agent, onError } = options as ClientConnectOptions
+    const { url, token, sessionId, type, agent, builtin, onError } = options as ClientConnectOptions
 
     if (agent === true) {
       const proxyOptions: ProxyOptions = { client: this.client, url, token, sessionId }
@@ -139,6 +141,10 @@ export class WebMcpClient {
           onError?.(error)
         }
 
+        if (builtin === true) {
+          setupBuiltinProxy(transport)
+        }
+
         response = { transport, sessionId }
       }
 

package/agent/AgentModelProvider.ts

@@ -12,7 +12,8 @@ import { createDeepSeek, DeepSeekProvider } from '@ai-sdk/deepseek'
 import { ExtensionClientTransport } from '../transport/ExtensionClientTransport'
 import { MessageChannelTransport } from '@opentiny/next'
 import { WebMcpClient } from '../WebMcpClient'
-import { getAISDKTools } from './utils/getAISDKTools'
+import { getAISDKTools } from './utils/getAISDKTools'
+import { getBuiltinMcpTools } from './utils/getBuiltinMcpTools'
 import { generateReActToolsPrompt } from './utils/generateReActPrompt'
 import { parseReActAction } from './utils/parseReActAction'
 
@@ -82,6 +83,15 @@ export class AgentModelProvider {
   private async _createOneClient(serverConfig: McpServerConfig) {
     try {
       let transport: MCPClientConfig['transport']
+      // builtin 类型：使用 navigator.modelContextTesting 作为工具数据源
+      if ('type' in serverConfig && serverConfig.type === 'builtin') {
+        const builtinClient = serverConfig.client
+        // 包装成与 ai-sdk MCPClient 相同接口：提供 tools() 方法
+        return {
+          tools: () => getBuiltinMcpTools(builtinClient),
+          close: async () => {}
+        }
+      }
       // transport 一定是 streamableHttp/sse 或者就是： ai-sdk允许的 transport
       if ('type' in serverConfig && serverConfig.type.toLocaleLowerCase() === 'streamablehttp') {
         const configWithHeaders = serverConfig as { url: string; headers?: Record<string, string> }

package/agent/type.ts

@@ -4,6 +4,17 @@ 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 = {
@@ -39,6 +50,16 @@ export type McpServerConfig =
   | { 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 {
@@ -46,4 +67,4 @@ export interface IAgentModelProviderOption {
   llmConfig: IAgentModelProviderLlmConfig
   /** Mcp Server的配置对象的集合，键为服务器名称，值为配置对象 */
   mcpServers?: Record<string, McpServerConfig>
-}
+}

package/agent/utils/getBuiltinMcpTools.ts

@@ -0,0 +1,86 @@
+import { dynamicTool, jsonSchema, Tool, ToolSet } from 'ai'
+
+/**
+ * 浏览器内置 WebMCP 测试 API 的工具描述格式（Chrome navigator.modelContextTesting）
+ */
+type BuiltinToolDescriptor = {
+  name: string
+  description?: string
+  inputSchema?: {
+    type?: string
+    properties?: Record<string, unknown>
+    required?: string[]
+    [key: string]: unknown
+  }
+}
+
+type BuiltinModelContextTesting = {
+  listTools?: () => Promise<BuiltinToolDescriptor[]>
+  getTools?: () => Promise<BuiltinToolDescriptor[]>
+  executeTool?: (name: string, input: string) => Promise<unknown>
+}
+
+/**
+ * 将浏览器内置 WebMCP 的 `navigator.modelContext` 适配为 ai-sdk 的 ToolSet。
+ *
+ * 类似 getAISDKTools，但数据源是浏览器原生 API 而非 MCP client。
+ * 工具执行时通过 `executeTool(name, JSON.stringify(args))` 代理给浏览器。
+ *
+ * @param client - `navigator.modelContext` 对象
+ * @returns ai-sdk 格式的 ToolSet，可直接传入 streamText/generateText 的 tools 参数
+ */
+export const getBuiltinMcpTools = async (client: object | undefined | null): Promise<ToolSet> => {
+  const tools: Record<string, Tool> = {}
+  if (!client) {
+    return tools
+  }
+
+  const testing = client as BuiltinModelContextTesting
+
+  // 优先使用 listTools，降级到 getTools
+  const listFn = testing.listTools ?? testing.getTools
+  if (!listFn) {
+    return tools
+  }
+
+  const rawList = await listFn.call(testing)
+  const list = Array.isArray(rawList) ? (rawList as BuiltinToolDescriptor[]) : []
+
+  for (const descriptor of list) {
+    const { name, description } = descriptor
+    const rawInputSchema = descriptor.inputSchema
+    let schemaObj: Record<string, any> = {}
+
+    if (typeof rawInputSchema === 'string') {
+      try {
+        schemaObj = JSON.parse(rawInputSchema)
+      } catch (e) {
+        console.error('Failed to parse inputSchema in getBuiltinMcpTools:', e)
+      }
+    } else if (typeof rawInputSchema === 'object' && rawInputSchema !== null) {
+      schemaObj = rawInputSchema as Record<string, any>
+    }
+
+    // 规范化 inputSchema：补全 properties/additionalProperties 字段
+    const normalizedSchema = {
+      type: 'object' as const,
+      properties: (schemaObj.properties ?? {}) as Record<string, unknown>,
+      ...(schemaObj.required ? { required: schemaObj.required } : {}),
+      additionalProperties: false,
+      ...schemaObj
+    }
+
+    tools[name] = dynamicTool({
+      description: description ?? '',
+      inputSchema: jsonSchema(normalizedSchema as Parameters<typeof jsonSchema>[0]),
+      async execute(args) {
+        if (!testing.executeTool) {
+          throw new Error(`navigator.modelContextTesting.executeTool is not available`)
+        }
+        return testing.executeTool(name, JSON.stringify(args ?? {}))
+      }
+    })
+  }
+
+  return tools
+}