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

package/skills/index.ts

@@ -26,9 +26,15 @@ export interface SkillMeta {
 /**
  * 从主 SKILL.md 的 YAML front matter 中用正则提取 name、description
  */
-export function parseSkillFrontMatter(content: string): { name: string; description: string } | null {
+export async function parseSkillFrontMatter(
+  content: string | (() => Promise<string>)
+): Promise<{ name: string; description: string } | null> {
+  if (typeof content !== 'string' && typeof content !== 'function') return null
+
   // 先提取 --- 之间的文本块
-  const blockMatch = content.match(FRONT_MATTER_BLOCK_REG)
+  const realContent = typeof content === 'string' ? content : await content()
+  const blockMatch = realContent.match(FRONT_MATTER_BLOCK_REG)
+
   if (!blockMatch?.[1]) return null
   const block = blockMatch[1]
 
@@ -47,14 +53,17 @@ export function parseSkillFrontMatter(content: string): { name: string; descript
  * 以便 getSkillMdContent / getMainSkillPathByName 等能正确按 path 查找。
  * 兼容任意引入位置：./skills/xxx、../skills/xxx、src/skills/xxx 等，取最后一个 skills/ 后的部分并加上 ./
  */
-function normalizeSkillModuleKeys(modules: Record<string, string>): Record<string, string> {
+async function normalizeSkillModuleKeys(
+  modules: Record<string, string | (() => Promise<string>)>
+): Promise<Record<string, string>> {
   const result: Record<string, string> = {}
   for (const [key, content] of Object.entries(modules)) {
     const normalizedKey = key.replace(/\\/g, '/')
     const skillsIndex = normalizedKey.lastIndexOf('skills/')
     const relativePath = skillsIndex >= 0 ? normalizedKey.slice(skillsIndex + 7) : normalizedKey
     const standardPath = relativePath.startsWith('./') ? relativePath : `./${relativePath}`
-    result[standardPath] = content
+    const realContent = typeof content === 'string' ? content : await content()
+    result[standardPath] = realContent
   }
   return result
 }
@@ -63,8 +72,8 @@ function normalizeSkillModuleKeys(modules: Record<string, string>): Record<strin
  * 获取所有「主 SKILL.md」的路径（一级子目录下的 SKILL.md）
  * - 对传入的 modules 先做 normalize，兼容任意 import.meta.glob 写法
  */
-export function getMainSkillPaths(modules: Record<string, string>): string[] {
-  const normalized = normalizeSkillModuleKeys(modules)
+export async function getMainSkillPaths(modules: Record<string, string | (() => Promise<string>)>): Promise<string[]> {
+  const normalized = await normalizeSkillModuleKeys(modules)
   return Object.keys(normalized).filter((path) => MAIN_SKILL_PATH_REG.test(path))
 }
 
@@ -72,14 +81,16 @@ export function getMainSkillPaths(modules: Record<string, string>): string[] {
  * 获取所有技能的概况列表（name、description、path），用于 systemPrompt 或列表展示
  * - 内部统一对 modules 做 normalize，避免调用方关心路径细节
  */
-export function getSkillOverviews(modules: Record<string, string>): SkillMeta[] {
-  const normalized = normalizeSkillModuleKeys(modules)
+export async function getSkillOverviews(
+  modules: Record<string, string | (() => Promise<string>)>
+): Promise<SkillMeta[]> {
+  const normalized = await normalizeSkillModuleKeys(modules)
   const mainPaths = Object.keys(normalized).filter((path) => MAIN_SKILL_PATH_REG.test(path))
   const list: SkillMeta[] = []
   for (const path of mainPaths) {
     const content = normalized[path]
     if (!content) continue
-    const parsed = parseSkillFrontMatter(content)
+    const parsed = await parseSkillFrontMatter(content)
     if (!parsed) continue
     list.push({
       name: parsed.name,
@@ -100,21 +111,15 @@ export function formatSkillsForSystemPrompt(skills: SkillMeta[]): string {
   return `## 可用技能\n\n${lines.join('\n')}\n\n当需要用到某技能时，请使用 get_skill_content 工具获取该技能的完整文档内容。`
 }
 
-/**
- * 获取所有已加载的技能文件路径（含主 SKILL.md 与 reference 下的 .md/.json/.xml 等）
- * - 对 modules 做 normalize 后再返回 key 列表
- */
-export function getSkillMdPaths(modules: Record<string, string>): string[] {
-  const normalized = normalizeSkillModuleKeys(modules)
-  return Object.keys(normalized)
-}
-
 /**
  * 根据相对路径获取某个技能文档的原始内容（支持 .md、.json、.xml 等文本格式）
  * - 自动对 modules 做 normalize，再按 path 查找
  */
-export function getSkillMdContent(modules: Record<string, string>, path: string): string | undefined {
-  const normalized = normalizeSkillModuleKeys(modules)
+export async function getSkillMdContent(
+  modules: Record<string, string | (() => Promise<string>)>,
+  path: string
+): Promise<string | undefined> {
+  const normalized = await normalizeSkillModuleKeys(modules)
 
   // 1. 尝试原有的严格匹配
   const exactMatch = normalized[path]
@@ -133,9 +138,12 @@ export function getSkillMdContent(modules: Record<string, string>, path: string)
  * 支持匹配目录名（如 ecommerce）或 SKILL.md 内 frontmatter 定义的 name
  * - 依赖 getMainSkillPaths，内部已做 normalize
  */
-export function getMainSkillPathByName(modules: Record<string, string>, name: string): string | undefined {
-  const normalizedModules = normalizeSkillModuleKeys(modules)
-  const paths = getMainSkillPaths(normalizedModules)
+export async function getMainSkillPathByName(
+  modules: Record<string, string | (() => Promise<string>)>,
+  name: string
+): Promise<string | undefined> {
+  const normalizedModules = await normalizeSkillModuleKeys(modules)
+  const paths = await getMainSkillPaths(normalizedModules)
 
   // 1. 先尝试按目录名精确匹配 (兼容老逻辑)
   const dirMatch = paths.find((p) => p.startsWith(`./${name}/SKILL.md`))
@@ -145,7 +153,7 @@ export function getMainSkillPathByName(modules: Record<string, string>, name: st
   for (const p of paths) {
     const content = normalizedModules[p]
     if (content) {
-      const parsed = parseSkillFrontMatter(content)
+      const parsed = await parseSkillFrontMatter(content)
       if (parsed && parsed.name === name) {
         return p
       }
@@ -186,15 +194,26 @@ const SKILL_INPUT_SCHEMA = z.object({
  * - get_skill_content: 按技能名或路径获取完整文档内容，便于大模型自动识别并加载技能
  * remoter 可将返回的 tools 合并进 extraTools 注入 agent
  */
-export function createSkillTools(modules: Record<string, string>): SkillToolsSet {
-  const normalizedModules = normalizeSkillModuleKeys(modules)
+export function createSkillTools(modules: Record<string, string | (() => Promise<string>)>): SkillToolsSet {
+  let isNormalizeSkillModuleKeys = false
+  let normalizeSkillModuleKeysResult: Record<string, string>
 
   // @ts-ignore ai package 的 tool() 函数类型推断存在"类型实例化过深"的已知限制，无法正确推断包含复杂 Zod 链的 schema
   const getSkillContent = tool({
     description:
       '根据技能名称或文档路径获取该技能的完整文档内容。如果你想根据相对路径查阅文件，请务必同时提供你当前所在的文件路径 currentPath。',
     inputSchema: SKILL_INPUT_SCHEMA,
-    execute: (args: { skillName?: string; path?: string; currentPath?: string }): Record<string, unknown> => {
+    execute: async (args: {
+      skillName?: string
+      path?: string
+      currentPath?: string
+    }): Promise<Record<string, unknown>> => {
+      if (!isNormalizeSkillModuleKeys) {
+        normalizeSkillModuleKeysResult = await normalizeSkillModuleKeys(modules)
+        isNormalizeSkillModuleKeys = true
+      }
+
+      const normalizedModules = normalizeSkillModuleKeysResult
       const { skillName, path: pathArg, currentPath: currentPathArg } = args
       let content: string | undefined
       let resolvedPath = ''
@@ -215,7 +234,7 @@ export function createSkillTools(modules: Record<string, string>): SkillToolsSet
         const dummyBase = `http://localhost/${basePathContext}/`
         const url = new URL(pathArg, dummyBase)
         resolvedPath = '.' + url.pathname
-        content = getSkillMdContent(normalizedModules, resolvedPath)
+        content = await getSkillMdContent(normalizedModules, resolvedPath)
 
         // 尝试 2：如果大模型忘了传正确的 currentPath，或者是强行传错，做个智能根目录回退
         if (content === undefined && (pathArg.startsWith('./') || pathArg.startsWith('../')) && currentPathArg) {
@@ -225,7 +244,7 @@ export function createSkillTools(modules: Record<string, string>): SkillToolsSet
             const fallbackDummyBase = `http://localhost/${skillRoot}/`
             const fallbackUrl = new URL(pathArg, fallbackDummyBase)
             const fallbackPath = '.' + fallbackUrl.pathname
-            content = getSkillMdContent(normalizedModules, fallbackPath)
+            content = await getSkillMdContent(normalizedModules, fallbackPath)
             if (content) {
               resolvedPath = fallbackPath
             }
@@ -241,10 +260,10 @@ export function createSkillTools(modules: Record<string, string>): SkillToolsSet
           }
         }
       } else if (skillName) {
-        const mainPath = getMainSkillPathByName(normalizedModules, skillName)
+        const mainPath = await getMainSkillPathByName(normalizedModules, skillName)
         if (mainPath) {
           resolvedPath = mainPath
-          content = getSkillMdContent(normalizedModules, mainPath)
+          content = await getSkillMdContent(normalizedModules, mainPath)
         }
       }
 

package/utils/builtinProxy.ts

@@ -5,29 +5,37 @@ import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
  * 将发向 remote 的 MCP 请求拦截，代理给所在浏览器的 navigator.modelContextTesting 上执行。
  */
 export const setupBuiltinProxy = (transport: Transport) => {
+  const getNativeCtx = () => {
+    if (typeof navigator === 'undefined') return null
+    const nav = navigator as any
+    return nav.modelContextTesting || null
+  }
+
   transport.onmessage = async (message: any) => {
     if (!message || typeof message !== 'object') return
     const id = message.id
+    const method = message.method
+
     try {
-      if (message.method === 'initialize') {
+      if (method === 'initialize') {
         await transport.send({
           jsonrpc: '2.0',
           id,
           result: {
             protocolVersion: '2024-11-05',
-            capabilities: { tools: {} },
+            capabilities: {
+              tools: { listChanged: true },
+              logging: {}
+            },
             serverInfo: { name: 'browser-builtin-webmcp-proxy', version: '1.0.0' }
           }
         })
-      } else if (message.method === 'notifications/initialized') {
+      } else if (method === 'notifications/initialized') {
         // Ignore
-      } else if (message.method === 'ping' || message.method === 'custom_ping') {
+      } else if (method === 'ping' || method === 'custom_ping') {
         await transport.send({ jsonrpc: '2.0', id, result: {} })
-      } else if (message.method === 'tools/list') {
-        const nativeCtx =
-          typeof navigator !== 'undefined'
-            ? (navigator as any).modelContextTesting || (navigator as any).modelContext
-            : null
+      } else if (method === 'tools/list') {
+        const nativeCtx = getNativeCtx()
         if (nativeCtx && nativeCtx.listTools) {
           const rawTools = await nativeCtx.listTools()
           const tools = rawTools.map((t: any) => {
@@ -55,35 +63,49 @@ export const setupBuiltinProxy = (transport: Transport) => {
         } else {
           await transport.send({ jsonrpc: '2.0', id, result: { tools: [] } })
         }
-      } else if (message.method === 'tools/call') {
-        const nativeCtx = typeof navigator !== 'undefined' ? navigator.modelContextTesting || navigator.modelContext : null
+      } else if (method === 'tools/call') {
+        const nativeCtx = getNativeCtx()
         if (nativeCtx && nativeCtx.executeTool) {
+          if (!message.params || typeof message.params !== 'object' || !message.params.name) {
+            const error: any = new Error('Invalid params: "name" is required and params must be an object')
+            error.code = -32602 // Invalid params
+            throw error
+          }
           const { name, arguments: args } = message.params
           const result = await nativeCtx.executeTool(name, JSON.stringify(args || {}))
-          // 如果结果已经是 MCP 格式 ({ content: [...] })，直接转发；否则包装为 text
           const finalResult =
             result && typeof result === 'object' && 'content' in result
               ? result
               : { content: [{ type: 'text', text: typeof result === 'string' ? result : JSON.stringify(result) }] }
           await transport.send({ jsonrpc: '2.0', id, result: finalResult })
         } else {
-          await transport.send({
-            jsonrpc: '2.0',
-            id,
-            error: { code: -32601, message: 'Browser built-in WebMCP not available' }
-          })
+          const error: any = new Error('executeTool not implemented in Browser built-in WebMCP')
+          error.code = -32601 // Method not found
+          throw error
         }
+      } else if (method === 'logging/setLevel') {
+        // 浏览器内置 WebMCP 不是标准 MCP Server，不支持日志级别设置。
+        // 直接 mock 返回成功，避免严格的 MCP 客户端因未实现该方法而报错。
+        await transport.send({ jsonrpc: '2.0', id, result: {} })
+      } else if (method === 'prompts/list') {
+        await transport.send({ jsonrpc: '2.0', id, result: { prompts: [] } })
+      } else if (method === 'resources/list') {
+        await transport.send({ jsonrpc: '2.0', id, result: { resources: [] } })
       } else if (id !== undefined) {
-        // 符合协议：对于未处理且带有 id 的请求，返回 Method not found
+        // 对于其他不支持但带 id 的请求，返回规范要求的 -32601 Method not found
         await transport.send({
           jsonrpc: '2.0',
           id,
-          error: { code: -32601, message: `Method not found: ${message.method}` }
+          error: { code: -32601, message: `Method not found: ${method}` }
         })
       }
     } catch (err: any) {
       if (id !== undefined) {
-        await transport.send({ jsonrpc: '2.0', id, error: { code: -32000, message: err.message || String(err) } })
+        await transport.send({
+          jsonrpc: '2.0',
+          id,
+          error: { code: err.code || -32000, message: err.message || String(err) }
+        })
       }
     }
   }

package/vite-env.d.ts

@@ -2,4 +2,9 @@
 declare module '*.svg?url' {
   const src: string;
   export default src;
+}
+
+declare module '*.md?raw' {
+  const content: string;
+  export default content;
 }