@opentiny/next-sdk 0.2.8 → 0.2.10

package/agent/AgentModelProvider.ts

@@ -2,6 +2,7 @@ import { streamText, stepCountIs, generateText } from 'ai'
 import { MCPClientConfig, createMCPClient } from '@ai-sdk/mcp'
 import type { ToolSet } from 'ai'
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
+import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'
 import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js'
 import type { IAgentModelProviderOption, McpServerConfig } from './type'
 import { ProviderV2 } from '@ai-sdk/provider'
@@ -81,15 +82,21 @@ export class AgentModelProvider {
   private async _createOneClient(serverConfig: McpServerConfig) {
     try {
       let transport: MCPClientConfig['transport']
-      // transport 一定是 streamableHttp 或者就是： ai-sdk允许的 transport
+      // transport 一定是 streamableHttp/sse 或者就是： ai-sdk允许的 transport
       if ('type' in serverConfig && serverConfig.type.toLocaleLowerCase() === 'streamablehttp') {
-        transport = new StreamableHTTPClientTransport(new URL((serverConfig as { url: string }).url))
+        const configWithHeaders = serverConfig as { url: string; headers?: Record<string, string> }
+        const requestInit = configWithHeaders.headers ? { headers: configWithHeaders.headers } : undefined
+        transport = new StreamableHTTPClientTransport(new URL(configWithHeaders.url), { requestInit })
+      } else if ('type' in serverConfig && serverConfig.type === 'sse') {
+        const configWithHeaders = serverConfig as { url: string; headers?: Record<string, string> }
+        const requestInit = configWithHeaders.headers ? { headers: configWithHeaders.headers } : undefined
+        transport = new SSEClientTransport(new URL(configWithHeaders.url), { requestInit })
       } else if ('type' in serverConfig && serverConfig.type === 'extension') {
         transport = new ExtensionClientTransport(serverConfig.sessionId)
       } else if ('transport' in serverConfig) {
         transport = serverConfig.transport
       } else {
-        transport = serverConfig as MCPClientConfig['transport']
+        transport = serverConfig as unknown as MCPClientConfig['transport']
       }
 
       // 根据 useAISdkClient 配置决定使用哪种 client 创建方式

package/agent/type.ts

@@ -35,9 +35,9 @@ export type IAgentModelProviderLlmConfig = LlmFactoryConfig | LlmInstanceConfig
 
 /** Mcp Server的配置对象 */
 export type McpServerConfig =
-  | { type: 'streamableHttp'; url: string; useAISdkClient?: boolean }
-  | { type: 'sse'; url: string; useAISdkClient?: boolean }
-  | { type: 'extension'; url: string; sessionId: string; useAISdkClient?: boolean }
+  | { 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 }
 
 /** */

package/dist/agent/type.d.ts

@@ -32,15 +32,18 @@ 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;

package/dist/index.es.dev.js

@@ -27069,27 +27069,27 @@ class FloatingBlock {
   }
   /**
    * 合并菜单项配置。
-   * - 有 sessionId：使用默认菜单 + 用户配置（可定制每一项的 show/text/icon 等）
-   * - 无 sessionId：不渲染任何下拉菜单，仅保留点击浮标打开对话框的能力
+   * - 用户明确传入 menuItems：直接使用用户配置，不受 sessionId 限制；未传 icon 时自动补充默认图标
+   * - 有 sessionId 且未传 menuItems：使用默认菜单
+   * - 无 sessionId 且未传 menuItems：不渲染任何下拉菜单，仅保留点击浮标打开对话框的能力
    */
   mergeMenuItems(userMenuItems) {
+    const defaultIcons = {
+      "qr-code": qrCode,
+      "ai-chat": chat,
+      "remote-url": link,
+      "remote-control": scan
+    };
+    if (userMenuItems) {
+      return userMenuItems.map((item) => ({
+        ...item,
+        icon: item.icon ?? defaultIcons[item.action]
+      }));
+    }
     if (!this.options.sessionId) {
       return [];
     }
-    if (!userMenuItems) {
-      return getDefaultMenuItems(this.options);
-    }
-    return getDefaultMenuItems(this.options).map((defaultItem) => {
-      const userItem = userMenuItems.find((item) => item.action === defaultItem.action);
-      if (userItem) {
-        return {
-          ...defaultItem,
-          ...userItem,
-          show: userItem.show !== void 0 ? userItem.show : defaultItem.show
-        };
-      }
-      return defaultItem;
-    });
+    return getDefaultMenuItems(this.options);
   }
   init() {
     this.createFloatingBlock();
@@ -27120,7 +27120,7 @@ class FloatingBlock {
           <div class="tiny-remoter-dropdown-item__content">
             <div title="${item.tip}">${item.text}</div>
             <div class="tiny-remoter-dropdown-item__desc-wrapper">
-              <div class="tiny-remoter-dropdown-item__desc ${item.active ? "tiny-remoter-dropdown-item__desc--active" : ""} ${item.know ? "tiny-remoter-dropdown-item__desc--know" : ""}">${item.desc}</div>
+              <div class="tiny-remoter-dropdown-item__desc ${item.active ? "tiny-remoter-dropdown-item__desc--active" : ""} ${item.know ? "tiny-remoter-dropdown-item__desc--know" : ""}">${item.desc ?? ""}</div>
               <div>
                 ${item.showCopyIcon ? `
                    <div class="tiny-remoter-copy-icon" id="${item.action}" data-action="${item.action}">
@@ -27228,12 +27228,20 @@ class FloatingBlock {
     this.closeDropdown();
   }
   copyRemoteControl() {
-    if (!this.options.sessionId) return;
-    this.copyToClipboard(this.options.sessionId.slice(-6));
+    const menuItem = this.menuItems.find((item) => item.action === "remote-control");
+    const codeToCopy = menuItem?.desc || menuItem?.text || (this.options.sessionId ? this.options.sessionId.slice(-6) : "");
+    if (codeToCopy) {
+      this.copyToClipboard(codeToCopy);
+    }
   }
   copyRemoteURL() {
-    if (!this.options.sessionId) return;
-    this.copyToClipboard(this.options.remoteUrl + this.sessionPrefix + this.options.sessionId);
+    const menuItem = this.menuItems.find((item) => item.action === "remote-url");
+    const sessionUrl = this.options.sessionId ? this.options.remoteUrl + this.sessionPrefix + this.options.sessionId : "";
+    const customDesc = menuItem?.desc && menuItem.desc !== this.options.remoteUrl ? menuItem.desc : void 0;
+    const urlToCopy = customDesc || sessionUrl || menuItem?.text || "";
+    if (urlToCopy) {
+      this.copyToClipboard(urlToCopy);
+    }
   }
   // 实现复制到剪贴板功能
   async copyToClipboard(text2) {
@@ -49629,7 +49637,13 @@ class AgentModelProvider {
     try {
       let transport;
       if ("type" in serverConfig && serverConfig.type.toLocaleLowerCase() === "streamablehttp") {
-        transport = new StreamableHTTPClientTransport(new URL(serverConfig.url));
+        const configWithHeaders = serverConfig;
+        const requestInit = configWithHeaders.headers ? { headers: configWithHeaders.headers } : void 0;
+        transport = new StreamableHTTPClientTransport(new URL(configWithHeaders.url), { requestInit });
+      } else if ("type" in serverConfig && serverConfig.type === "sse") {
+        const configWithHeaders = serverConfig;
+        const requestInit = configWithHeaders.headers ? { headers: configWithHeaders.headers } : void 0;
+        transport = new SSEClientTransport(new URL(configWithHeaders.url), { requestInit });
       } else if ("type" in serverConfig && serverConfig.type === "extension") {
         transport = new ExtensionClientTransport(serverConfig.sessionId);
       } else if ("transport" in serverConfig) {
@@ -50466,6 +50480,7 @@ const MSG_PAGE_LEAVE = "next-sdk:page-leave";
 const MSG_REMOTER_READY = "next-sdk:remoter-ready";
 const MSG_ROUTE_STATE_INITIAL = "next-sdk:route-state-initial";
 const activePages = /* @__PURE__ */ new Map();
+const normalizeRoute = (value) => value.replace(/\/+$/, "") || "/";
 const broadcastTargets = /* @__PURE__ */ new Set();
 function initBroadcastTargets() {
   if (typeof window !== "undefined") {
@@ -50512,6 +50527,88 @@ let _navigator = null;
 function setNavigator(fn) {
   _navigator = fn;
 }
+function waitForPageReady(path, timeoutMs = 1500) {
+  if (typeof window === "undefined") {
+    return Promise.resolve();
+  }
+  const target = normalizeRoute(path);
+  return new Promise((resolve2) => {
+    let done = false;
+    const cleanup = () => {
+      if (done) return;
+      done = true;
+      window.removeEventListener("message", handleMessage);
+      resolve2();
+    };
+    const handleMessage = (event) => {
+      if (event.source !== window || event.data?.type !== MSG_PAGE_READY) return;
+      const route = normalizeRoute(String(event.data.route ?? ""));
+      if (route === target) {
+        cleanup();
+      }
+    };
+    window.addEventListener("message", handleMessage);
+    setTimeout(cleanup, timeoutMs);
+  });
+}
+function registerNavigateTool(server, options) {
+  const name16 = options?.name ?? "navigate_to_page";
+  const title2 = options?.title ?? "页面跳转";
+  const description2 = options?.description ?? '当需要的工具在当前页面不可用时，使用此工具跳转到特定页面。例如：要查询订单时跳转到 "/orders"，要创建价保时跳转到 "/price-protection"。';
+  const timeoutMs = options?.timeoutMs ?? 1500;
+  return server.registerTool(
+    name16,
+    {
+      title: title2,
+      description: description2,
+      inputSchema: {
+        path: stringType().describe('目标页面的路由地址，例如 "/orders"、"/inventory"、"/price-protection" 等。')
+      }
+    },
+    async ({ path }) => {
+      if (typeof window === "undefined") {
+        return {
+          content: [{ type: "text", text: "当前环境不支持页面跳转（window 不存在）。" }]
+        };
+      }
+      if (!_navigator) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: "页面跳转失败：尚未在应用入口调用 setNavigator 注册导航函数，无法执行路由跳转。"
+            }
+          ]
+        };
+      }
+      try {
+        const target = normalizeRoute(path);
+        const current = normalizeRoute(window.location.pathname);
+        const isAlreadyOnTarget = current === target || current.endsWith(target) && (current.length === target.length || current[current.lastIndexOf(target) - 1] === "/");
+        if (isAlreadyOnTarget) {
+          return {
+            content: [{ type: "text", text: `当前已在页面：${path}。请继续你的下一步操作。` }]
+          };
+        }
+        const readyPromise = waitForPageReady(path, timeoutMs);
+        await _navigator(path);
+        await readyPromise;
+        return {
+          content: [{ type: "text", text: `已成功跳转至页面：${path}。请继续你的下一步操作。` }]
+        };
+      } catch (err) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `页面跳转失败：${err instanceof Error ? err.message : String(err)}。`
+            }
+          ]
+        };
+      }
+    }
+  );
+}
 function buildPageHandler(name16, route, timeout = 3e4, effectConfig) {
   return (input) => {
     const callId = randomUUID();
@@ -50601,10 +50698,10 @@ function withPageTools(server) {
 }
 function registerPageTool(options) {
   const { route: routeOption, handlers } = options;
-  const normalizeRoute = (value) => value.replace(/\/+$/, "") || "/";
-  const route = normalizeRoute(routeOption ?? window.location.pathname);
+  const normalizeRoute2 = (value) => value.replace(/\/+$/, "") || "/";
+  const route = normalizeRoute2(routeOption ?? window.location.pathname);
   const handleMessage = async (event) => {
-    if (event.source !== window || event.data?.type !== MSG_TOOL_CALL || normalizeRoute(String(event.data?.route ?? "")) !== route || !(event.data.toolName in handlers)) {
+    if (event.source !== window || event.data?.type !== MSG_TOOL_CALL || normalizeRoute2(String(event.data?.route ?? "")) !== route || !(event.data.toolName in handlers)) {
       return;
     }
     const { callId, toolName, input } = event.data;
@@ -50826,6 +50923,7 @@ export {
   isSSEClientTransport,
   isStreamableHTTPClientTransport,
   parseSkillFrontMatter,
+  registerNavigateTool,
   registerPageTool,
   setNavigator,
   withPageTools,