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

package/dist/index.es.dev.js

@@ -16196,7 +16196,7 @@ function getParseErrorMessage(error) {
   }
   return String(error);
 }
-function getSchemaDescription(schema) {
+function getSchemaDescription$1(schema) {
   return schema.description;
 }
 function isSchemaOptional(schema) {
@@ -23670,7 +23670,7 @@ function promptArgumentsFromSchema(schema) {
   if (!shape)
     return [];
   return Object.entries(shape).map(([name16, field]) => {
-    const description2 = getSchemaDescription(field);
+    const description2 = getSchemaDescription$1(field);
     const isOptional = isSchemaOptional(field);
     return {
       name: name16,
@@ -24319,7 +24319,7 @@ class ExtensionClientTransport {
           console.log("【Client Transport】处理server消息错误：", error);
         }
       },
-      "content->side"
+      "content->bg"
     );
   }
   // 是否已关闭
@@ -24342,13 +24342,21 @@ class ExtensionClientTransport {
   async send(message, _options) {
     this._throwError(() => !this._isStarted, "【Client Transport】 未启动，无法发送消息");
     this._throwError(() => this._isClosed, "【Client Transport】 已关闭，无法发送消息");
-    const sessionInfo = chrome.sessionRegistry.get(this.targetSessionId);
-    this._throwError(() => !sessionInfo, `【Client Transport】sessionRegistry中未找到${this.targetSessionId}`);
-    const tabId = sessionInfo.tabIds[sessionInfo.tabIds.length - 1];
+    let tabId;
+    if (chrome.sessionRegistry) {
+      const sessionInfo = chrome.sessionRegistry.get(this.targetSessionId);
+      if (sessionInfo && sessionInfo.tabIds.length > 0) {
+        tabId = sessionInfo.tabIds[sessionInfo.tabIds.length - 1];
+      }
+    }
+    if (tabId == null) {
+      tabId = await chrome.runtime.sendMessage({ type: "get-session-tab-id", sessionId: this.targetSessionId });
+    }
+    this._throwError(() => tabId == null, `【Client Transport】后台未找到活动的tabId用于${this.targetSessionId}`);
     sendRuntimeMessage(
       "mcp-client-to-server",
       { sessionId: this.targetSessionId, tabId, mcpMessage: message },
-      "side->content"
+      "bg->content"
     );
   }
   /** 关闭 transport   */
@@ -24380,17 +24388,6 @@ class ExtensionPageServerTransport {
     this._isClosed = false;
     this._lastRegistration = null;
     this.sessionId = sessionId || randomUUID();
-    this._messageListener1 = onWindowMessage(
-      "sidepanel-ready-to-page",
-      () => {
-        if (this._lastRegistration && this._isStarted) {
-          this.notifyRegistration(this._lastRegistration).catch((error) => {
-            console.error("【Page Svr Transport】 notifyRegistration失败:", error);
-          });
-        }
-      },
-      "content->page"
-    );
     this._messageListener2 = onWindowMessage(
       "mcp-client-to-server-to-page",
       (data) => {
@@ -24473,7 +24470,6 @@ class ExtensionPageServerTransport {
   async close() {
     if (this._isClosed) return;
     try {
-      this._messageListener1 && this._messageListener1();
       this._messageListener2 && this._messageListener2();
       this._isClosed = true;
       this._isStarted = false;
@@ -24490,18 +24486,6 @@ class ContentScriptServerTransport {
     this._lastRegistration = null;
     this.sessionId = sessionId || randomUUID();
     this.tabId = tabId;
-    onRuntimeMessage(
-      "sidepanel-ready",
-      () => {
-        if (this._lastRegistration && this._isStarted) {
-          this.notifyRegistration(this._lastRegistration).catch((error) => {
-            console.log("【Content Svr Transport】 notifyRegistration 失败", error);
-          });
-        }
-      },
-      "side->content",
-      this.tabId
-    );
   }
   // 最后一次注册信息（用于 Sidepanel 刷新后重新注册）
   _throwError(whenFn, message) {
@@ -24540,7 +24524,7 @@ class ContentScriptServerTransport {
           console.log("【Content Svr Transport】 处理消息时发生错误:", error);
         }
       },
-      "side->content",
+      "bg->content",
       this.tabId
     );
     this._isStarted = true;
@@ -24557,7 +24541,7 @@ class ContentScriptServerTransport {
           sessionId: this.sessionId,
           mcpMessage: message
         },
-        "content->side"
+        "content->bg"
       );
       if ("result" in message && message.result?.content) {
         sendWindowMessage(
@@ -24585,7 +24569,7 @@ class ContentScriptServerTransport {
           title: document.title
         }
       },
-      "content->side"
+      "content->bg"
     );
   }
   async close() {
@@ -28391,6 +28375,9 @@ async function downloadBlob(url2, options) {
     const response = await fetch(url2, {
       signal: options == null ? void 0 : options.abortSignal
     });
+    if (response.redirected) {
+      validateDownloadUrl(response.url);
+    }
     if (!response.ok) {
       throw new DownloadError({
         url: url2,
@@ -28552,7 +28539,7 @@ function withUserAgentSuffix$1(headers, ...userAgentSuffixParts) {
   );
   return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION$7 = "4.0.19";
+var VERSION$7 = "4.0.21";
 var getOriginalFetch = () => globalThis.fetch;
 var getFromApi = async ({
   url: url2,
@@ -28776,7 +28763,7 @@ function visit(def) {
   if (typeof def === "boolean") return def;
   return addAdditionalPropertiesToJsonSchema(def);
 }
-var ignoreOverride = Symbol(
+var ignoreOverride = /* @__PURE__ */ Symbol(
   "Let zodToJsonSchema decide on which parser to use"
 );
 var defaultOptions = {
@@ -29868,7 +29855,7 @@ var zod3ToJsonSchema = (schema, options) => {
   combined.$schema = "http://json-schema.org/draft-07/schema#";
   return combined;
 };
-var schemaSymbol = Symbol.for("vercel.ai.schema");
+var schemaSymbol = /* @__PURE__ */ Symbol.for("vercel.ai.schema");
 function lazySchema(createSchema) {
   let schema;
   return () => {
@@ -30976,6 +30963,187 @@ var gatewayCreditsResponseSchema = lazySchema(
     }))
   )
 );
+var GatewaySpendReport = class {
+  constructor(config2) {
+    this.config = config2;
+  }
+  async getSpendReport(params) {
+    try {
+      const baseUrl = new URL(this.config.baseURL);
+      const searchParams = new URLSearchParams();
+      searchParams.set("start_date", params.startDate);
+      searchParams.set("end_date", params.endDate);
+      if (params.groupBy) {
+        searchParams.set("group_by", params.groupBy);
+      }
+      if (params.datePart) {
+        searchParams.set("date_part", params.datePart);
+      }
+      if (params.userId) {
+        searchParams.set("user_id", params.userId);
+      }
+      if (params.model) {
+        searchParams.set("model", params.model);
+      }
+      if (params.provider) {
+        searchParams.set("provider", params.provider);
+      }
+      if (params.credentialType) {
+        searchParams.set("credential_type", params.credentialType);
+      }
+      if (params.tags && params.tags.length > 0) {
+        searchParams.set("tags", params.tags.join(","));
+      }
+      const { value } = await getFromApi({
+        url: `${baseUrl.origin}/v1/report?${searchParams.toString()}`,
+        headers: await resolve(this.config.headers()),
+        successfulResponseHandler: createJsonResponseHandler$1(
+          gatewaySpendReportResponseSchema
+        ),
+        failedResponseHandler: createJsonErrorResponseHandler$1({
+          errorSchema: any(),
+          errorToMessage: (data) => data
+        }),
+        fetch: this.config.fetch
+      });
+      return value;
+    } catch (error) {
+      throw await asGatewayError(error);
+    }
+  }
+};
+var gatewaySpendReportResponseSchema = lazySchema(
+  () => zodSchema(
+    object$2({
+      results: array$1(
+        object$2({
+          day: string().optional(),
+          hour: string().optional(),
+          user: string().optional(),
+          model: string().optional(),
+          tag: string().optional(),
+          provider: string().optional(),
+          credential_type: _enum(["byok", "system"]).optional(),
+          total_cost: number$1(),
+          market_cost: number$1().optional(),
+          input_tokens: number$1().optional(),
+          output_tokens: number$1().optional(),
+          cached_input_tokens: number$1().optional(),
+          cache_creation_input_tokens: number$1().optional(),
+          reasoning_tokens: number$1().optional(),
+          request_count: number$1().optional()
+        }).transform(
+          ({
+            credential_type,
+            total_cost,
+            market_cost,
+            input_tokens,
+            output_tokens,
+            cached_input_tokens,
+            cache_creation_input_tokens,
+            reasoning_tokens,
+            request_count,
+            ...rest
+          }) => ({
+            ...rest,
+            ...credential_type !== void 0 ? { credentialType: credential_type } : {},
+            totalCost: total_cost,
+            ...market_cost !== void 0 ? { marketCost: market_cost } : {},
+            ...input_tokens !== void 0 ? { inputTokens: input_tokens } : {},
+            ...output_tokens !== void 0 ? { outputTokens: output_tokens } : {},
+            ...cached_input_tokens !== void 0 ? { cachedInputTokens: cached_input_tokens } : {},
+            ...cache_creation_input_tokens !== void 0 ? { cacheCreationInputTokens: cache_creation_input_tokens } : {},
+            ...reasoning_tokens !== void 0 ? { reasoningTokens: reasoning_tokens } : {},
+            ...request_count !== void 0 ? { requestCount: request_count } : {}
+          })
+        )
+      )
+    })
+  )
+);
+var GatewayGenerationInfoFetcher = class {
+  constructor(config2) {
+    this.config = config2;
+  }
+  async getGenerationInfo(params) {
+    try {
+      const baseUrl = new URL(this.config.baseURL);
+      const { value } = await getFromApi({
+        url: `${baseUrl.origin}/v1/generation?id=${encodeURIComponent(params.id)}`,
+        headers: await resolve(this.config.headers()),
+        successfulResponseHandler: createJsonResponseHandler$1(
+          gatewayGenerationInfoResponseSchema
+        ),
+        failedResponseHandler: createJsonErrorResponseHandler$1({
+          errorSchema: any(),
+          errorToMessage: (data) => data
+        }),
+        fetch: this.config.fetch
+      });
+      return value;
+    } catch (error) {
+      throw await asGatewayError(error);
+    }
+  }
+};
+var gatewayGenerationInfoResponseSchema = lazySchema(
+  () => zodSchema(
+    object$2({
+      data: object$2({
+        id: string(),
+        total_cost: number$1(),
+        upstream_inference_cost: number$1(),
+        usage: number$1(),
+        created_at: string(),
+        model: string(),
+        is_byok: boolean(),
+        provider_name: string(),
+        streamed: boolean(),
+        finish_reason: string(),
+        latency: number$1(),
+        generation_time: number$1(),
+        native_tokens_prompt: number$1(),
+        native_tokens_completion: number$1(),
+        native_tokens_reasoning: number$1(),
+        native_tokens_cached: number$1(),
+        native_tokens_cache_creation: number$1(),
+        billable_web_search_calls: number$1()
+      }).transform(
+        ({
+          total_cost,
+          upstream_inference_cost,
+          created_at,
+          is_byok,
+          provider_name,
+          finish_reason,
+          generation_time,
+          native_tokens_prompt,
+          native_tokens_completion,
+          native_tokens_reasoning,
+          native_tokens_cached,
+          native_tokens_cache_creation,
+          billable_web_search_calls,
+          ...rest
+        }) => ({
+          ...rest,
+          totalCost: total_cost,
+          upstreamInferenceCost: upstream_inference_cost,
+          createdAt: created_at,
+          isByok: is_byok,
+          providerName: provider_name,
+          finishReason: finish_reason,
+          generationTime: generation_time,
+          promptTokens: native_tokens_prompt,
+          completionTokens: native_tokens_completion,
+          reasoningTokens: native_tokens_reasoning,
+          cachedTokens: native_tokens_cached,
+          cacheCreationTokens: native_tokens_cache_creation,
+          billableWebSearchCalls: billable_web_search_calls
+        })
+      )
+    }).transform(({ data }) => data)
+  )
+);
 var GatewayLanguageModel = class {
   constructor(modelId, config2) {
     this.modelId = modelId;
@@ -31700,7 +31868,7 @@ async function getVercelRequestId() {
   var _a92;
   return (_a92 = indexBrowserExports.getContext().headers) == null ? void 0 : _a92["x-vercel-id"];
 }
-var VERSION$6 = "3.0.66";
+var VERSION$6 = "3.0.83";
 var AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
 function createGatewayProvider(options = {}) {
   var _a92, _b9;
@@ -31800,6 +31968,30 @@ function createGatewayProvider(options = {}) {
       );
     });
   };
+  const getSpendReport = async (params) => {
+    return new GatewaySpendReport({
+      baseURL,
+      headers: getHeaders,
+      fetch: options.fetch
+    }).getSpendReport(params).catch(async (error) => {
+      throw await asGatewayError(
+        error,
+        await parseAuthMethod(await getHeaders())
+      );
+    });
+  };
+  const getGenerationInfo = async (params) => {
+    return new GatewayGenerationInfoFetcher({
+      baseURL,
+      headers: getHeaders,
+      fetch: options.fetch
+    }).getGenerationInfo(params).catch(async (error) => {
+      throw await asGatewayError(
+        error,
+        await parseAuthMethod(await getHeaders())
+      );
+    });
+  };
   const provider = function(modelId) {
     if (new.target) {
       throw new Error(
@@ -31811,6 +32003,8 @@ function createGatewayProvider(options = {}) {
   provider.specificationVersion = "v3";
   provider.getAvailableModels = getAvailableModels;
   provider.getCredits = getCredits;
+  provider.getSpendReport = getSpendReport;
+  provider.getGenerationInfo = getGenerationInfo;
   provider.imageModel = (modelId) => {
     return new GatewayImageModel(modelId, {
       provider: "gateway",
@@ -33146,7 +33340,7 @@ function detectMediaType({
   }
   return void 0;
 }
-var VERSION$4 = "6.0.116";
+var VERSION$4 = "6.0.141";
 var download = async ({
   url: url2,
   maxBytes,
@@ -33164,6 +33358,9 @@ var download = async ({
       ),
       signal: abortSignal
     });
+    if (response.redirected) {
+      validateDownloadUrl(response.url);
+    }
     if (!response.ok) {
       throw new DownloadError({
         url: urlText,
@@ -35937,7 +36134,7 @@ async function generateText({
       }),
       tracer,
       fn: async (span) => {
-        var _a21, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+        var _a21, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
         const initialMessages = initialPrompt.messages;
         const responseMessages = [];
         const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({ messages: initialMessages });
@@ -36154,6 +36351,7 @@ async function generateText({
                       headers: (_g2 = result.response) == null ? void 0 : _g2.headers,
                       body: (_h2 = result.response) == null ? void 0 : _h2.body
                     };
+                    const usage = asLanguageModelUsage(result.usage);
                     span2.setAttributes(
                       await selectTelemetryAttributes({
                         telemetry,
@@ -36177,9 +36375,16 @@ async function generateText({
                           "ai.response.providerMetadata": JSON.stringify(
                             result.providerMetadata
                           ),
-                          // TODO rename telemetry attributes to inputTokens and outputTokens
-                          "ai.usage.promptTokens": result.usage.inputTokens.total,
-                          "ai.usage.completionTokens": result.usage.outputTokens.total,
+                          "ai.usage.inputTokens": result.usage.inputTokens.total,
+                          "ai.usage.inputTokenDetails.noCacheTokens": result.usage.inputTokens.noCache,
+                          "ai.usage.inputTokenDetails.cacheReadTokens": result.usage.inputTokens.cacheRead,
+                          "ai.usage.inputTokenDetails.cacheWriteTokens": result.usage.inputTokens.cacheWrite,
+                          "ai.usage.outputTokens": result.usage.outputTokens.total,
+                          "ai.usage.outputTokenDetails.textTokens": result.usage.outputTokens.text,
+                          "ai.usage.outputTokenDetails.reasoningTokens": result.usage.outputTokens.reasoning,
+                          "ai.usage.totalTokens": usage.totalTokens,
+                          "ai.usage.reasoningTokens": result.usage.outputTokens.reasoning,
+                          "ai.usage.cachedInputTokens": result.usage.inputTokens.cacheRead,
                           // standardized gen-ai llm span attributes:
                           "gen_ai.response.finish_reasons": [
                             result.finishReason.unified
@@ -36380,10 +36585,7 @@ async function generateText({
               },
               "ai.response.providerMetadata": JSON.stringify(
                 currentModelResponse.providerMetadata
-              ),
-              // TODO rename telemetry attributes to inputTokens and outputTokens
-              "ai.usage.promptTokens": currentModelResponse.usage.inputTokens.total,
-              "ai.usage.completionTokens": currentModelResponse.usage.outputTokens.total
+              )
             }
           })
         );
@@ -36400,6 +36602,23 @@ async function generateText({
             cachedInputTokens: void 0
           }
         );
+        span.setAttributes(
+          await selectTelemetryAttributes({
+            telemetry,
+            attributes: {
+              "ai.usage.inputTokens": totalUsage.inputTokens,
+              "ai.usage.inputTokenDetails.noCacheTokens": (_n = totalUsage.inputTokenDetails) == null ? void 0 : _n.noCacheTokens,
+              "ai.usage.inputTokenDetails.cacheReadTokens": (_o = totalUsage.inputTokenDetails) == null ? void 0 : _o.cacheReadTokens,
+              "ai.usage.inputTokenDetails.cacheWriteTokens": (_p = totalUsage.inputTokenDetails) == null ? void 0 : _p.cacheWriteTokens,
+              "ai.usage.outputTokens": totalUsage.outputTokens,
+              "ai.usage.outputTokenDetails.textTokens": (_q = totalUsage.outputTokenDetails) == null ? void 0 : _q.textTokens,
+              "ai.usage.outputTokenDetails.reasoningTokens": (_r = totalUsage.outputTokenDetails) == null ? void 0 : _r.reasoningTokens,
+              "ai.usage.totalTokens": totalUsage.totalTokens,
+              "ai.usage.reasoningTokens": (_s = totalUsage.outputTokenDetails) == null ? void 0 : _s.reasoningTokens,
+              "ai.usage.cachedInputTokens": (_t = totalUsage.inputTokenDetails) == null ? void 0 : _t.cacheReadTokens
+            }
+          })
+        );
         await notify({
           event: {
             stepNumber: lastStep.stepNumber,
@@ -36627,7 +36846,8 @@ function asContent({
               input: void 0,
               error: part.result,
               providerExecuted: true,
-              dynamic: part.dynamic
+              dynamic: part.dynamic,
+              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
             });
           } else {
             contentParts.push({
@@ -36637,7 +36857,8 @@ function asContent({
               input: void 0,
               output: part.result,
               providerExecuted: true,
-              dynamic: part.dynamic
+              dynamic: part.dynamic,
+              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
             });
           }
           break;
@@ -36650,7 +36871,8 @@ function asContent({
             input: toolCall.input,
             error: part.result,
             providerExecuted: true,
-            dynamic: toolCall.dynamic
+            dynamic: toolCall.dynamic,
+            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
           });
         } else {
           contentParts.push({
@@ -36660,7 +36882,8 @@ function asContent({
             input: toolCall.input,
             output: part.result,
             providerExecuted: true,
-            dynamic: toolCall.dynamic
+            dynamic: toolCall.dynamic,
+            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
           });
         }
         break;
@@ -36891,8 +37114,14 @@ function processUIMessageStream({
                 anyPart.title = options.title;
               }
               anyPart.providerExecuted = (_a22 = anyOptions.providerExecuted) != null ? _a22 : part.providerExecuted;
-              if (anyOptions.providerMetadata != null) {
-                part.callProviderMetadata = anyOptions.providerMetadata;
+              const providerMetadata = anyOptions.providerMetadata;
+              if (providerMetadata != null) {
+                if (options.state === "output-available" || options.state === "output-error") {
+                  const resultPart = part;
+                  resultPart.resultProviderMetadata = providerMetadata;
+                } else {
+                  part.callProviderMetadata = providerMetadata;
+                }
               }
             } else {
               state.message.parts.push({
@@ -36906,7 +37135,8 @@ function processUIMessageStream({
                 errorText: anyOptions.errorText,
                 providerExecuted: anyOptions.providerExecuted,
                 preliminary: anyOptions.preliminary,
-                ...anyOptions.providerMetadata != null ? { callProviderMetadata: anyOptions.providerMetadata } : {}
+                ...anyOptions.providerMetadata != null && (options.state === "output-available" || options.state === "output-error") ? { resultProviderMetadata: anyOptions.providerMetadata } : {},
+                ...anyOptions.providerMetadata != null && !(options.state === "output-available" || options.state === "output-error") ? { callProviderMetadata: anyOptions.providerMetadata } : {}
               });
             }
           }
@@ -36929,8 +37159,14 @@ function processUIMessageStream({
                 anyPart.title = options.title;
               }
               anyPart.providerExecuted = (_b22 = anyOptions.providerExecuted) != null ? _b22 : part.providerExecuted;
-              if (anyOptions.providerMetadata != null) {
-                part.callProviderMetadata = anyOptions.providerMetadata;
+              const providerMetadata = anyOptions.providerMetadata;
+              if (providerMetadata != null) {
+                if (options.state === "output-available" || options.state === "output-error") {
+                  const resultPart = part;
+                  resultPart.resultProviderMetadata = providerMetadata;
+                } else {
+                  part.callProviderMetadata = providerMetadata;
+                }
               }
             } else {
               state.message.parts.push({
@@ -36944,7 +37180,8 @@ function processUIMessageStream({
                 preliminary: anyOptions.preliminary,
                 providerExecuted: anyOptions.providerExecuted,
                 title: options.title,
-                ...anyOptions.providerMetadata != null ? { callProviderMetadata: anyOptions.providerMetadata } : {}
+                ...anyOptions.providerMetadata != null && (options.state === "output-available" || options.state === "output-error") ? { resultProviderMetadata: anyOptions.providerMetadata } : {},
+                ...anyOptions.providerMetadata != null && !(options.state === "output-available" || options.state === "output-error") ? { callProviderMetadata: anyOptions.providerMetadata } : {}
               });
             }
           }
@@ -37228,6 +37465,7 @@ function processUIMessageStream({
                   output: chunk.output,
                   preliminary: chunk.preliminary,
                   providerExecuted: chunk.providerExecuted,
+                  providerMetadata: chunk.providerMetadata,
                   title: toolInvocation.title
                 });
               } else {
@@ -37239,6 +37477,7 @@ function processUIMessageStream({
                   output: chunk.output,
                   providerExecuted: chunk.providerExecuted,
                   preliminary: chunk.preliminary,
+                  providerMetadata: chunk.providerMetadata,
                   title: toolInvocation.title
                 });
               }
@@ -37255,6 +37494,7 @@ function processUIMessageStream({
                   input: toolInvocation.input,
                   errorText: chunk.errorText,
                   providerExecuted: chunk.providerExecuted,
+                  providerMetadata: chunk.providerMetadata,
                   title: toolInvocation.title
                 });
               } else {
@@ -37266,6 +37506,7 @@ function processUIMessageStream({
                   rawInput: toolInvocation.rawInput,
                   errorText: chunk.errorText,
                   providerExecuted: chunk.providerExecuted,
+                  providerMetadata: chunk.providerMetadata,
                   title: toolInvocation.title
                 });
               }
@@ -37838,7 +38079,8 @@ function runToolsTransformation({
               input: toolInputs.get(chunk.toolCallId),
               providerExecuted: true,
               error: chunk.result,
-              dynamic: chunk.dynamic
+              dynamic: chunk.dynamic,
+              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {}
             });
           } else {
             controller.enqueue({
@@ -37848,7 +38090,8 @@ function runToolsTransformation({
               input: toolInputs.get(chunk.toolCallId),
               output: chunk.result,
               providerExecuted: true,
-              dynamic: chunk.dynamic
+              dynamic: chunk.dynamic,
+              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {}
             });
           }
           break;
@@ -38271,6 +38514,7 @@ var DefaultStreamTextResult = class {
         }
       },
       async flush(controller) {
+        var _a21, _b9, _c, _d, _e, _f, _g;
         try {
           if (recordedSteps.length === 0) {
             const error = (abortSignal == null ? void 0 : abortSignal.aborted) ? abortSignal.reason : new NoOutputGeneratedError({
@@ -38334,18 +38578,23 @@ var DefaultStreamTextResult = class {
                 },
                 "ai.response.toolCalls": {
                   output: () => {
-                    var _a21;
-                    return ((_a21 = finalStep.toolCalls) == null ? void 0 : _a21.length) ? JSON.stringify(finalStep.toolCalls) : void 0;
+                    var _a22;
+                    return ((_a22 = finalStep.toolCalls) == null ? void 0 : _a22.length) ? JSON.stringify(finalStep.toolCalls) : void 0;
                   }
                 },
                 "ai.response.providerMetadata": JSON.stringify(
                   finalStep.providerMetadata
                 ),
                 "ai.usage.inputTokens": totalUsage.inputTokens,
+                "ai.usage.inputTokenDetails.noCacheTokens": (_a21 = totalUsage.inputTokenDetails) == null ? void 0 : _a21.noCacheTokens,
+                "ai.usage.inputTokenDetails.cacheReadTokens": (_b9 = totalUsage.inputTokenDetails) == null ? void 0 : _b9.cacheReadTokens,
+                "ai.usage.inputTokenDetails.cacheWriteTokens": (_c = totalUsage.inputTokenDetails) == null ? void 0 : _c.cacheWriteTokens,
                 "ai.usage.outputTokens": totalUsage.outputTokens,
+                "ai.usage.outputTokenDetails.textTokens": (_d = totalUsage.outputTokenDetails) == null ? void 0 : _d.textTokens,
+                "ai.usage.outputTokenDetails.reasoningTokens": (_e = totalUsage.outputTokenDetails) == null ? void 0 : _e.reasoningTokens,
                 "ai.usage.totalTokens": totalUsage.totalTokens,
-                "ai.usage.reasoningTokens": totalUsage.reasoningTokens,
-                "ai.usage.cachedInputTokens": totalUsage.cachedInputTokens
+                "ai.usage.reasoningTokens": (_f = totalUsage.outputTokenDetails) == null ? void 0 : _f.reasoningTokens,
+                "ai.usage.cachedInputTokens": (_g = totalUsage.inputTokenDetails) == null ? void 0 : _g.cacheReadTokens
               }
             })
           );
@@ -38957,6 +39206,7 @@ var DefaultStreamTextResult = class {
                   },
                   // invoke onFinish callback and resolve toolResults promise when the stream is about to close:
                   async flush(controller) {
+                    var _a22, _b22, _c2, _d2, _e2, _f2, _g2;
                     const stepToolCallsJson = stepToolCalls.length > 0 ? JSON.stringify(stepToolCalls) : void 0;
                     try {
                       doStreamSpan.setAttributes(
@@ -38964,29 +39214,22 @@ var DefaultStreamTextResult = class {
                           telemetry,
                           attributes: {
                             "ai.response.finishReason": stepFinishReason,
-                            "ai.response.text": {
-                              output: () => activeText
-                            },
-                            "ai.response.reasoning": {
-                              output: () => {
-                                const reasoningParts = recordedContent.filter(
-                                  (c) => c.type === "reasoning"
-                                );
-                                return reasoningParts.length > 0 ? reasoningParts.map((r) => r.text).join("\n") : void 0;
-                              }
-                            },
                             "ai.response.toolCalls": {
                               output: () => stepToolCallsJson
                             },
                             "ai.response.id": stepResponse.id,
                             "ai.response.model": stepResponse.modelId,
                             "ai.response.timestamp": stepResponse.timestamp.toISOString(),
-                            "ai.response.providerMetadata": JSON.stringify(stepProviderMetadata),
                             "ai.usage.inputTokens": stepUsage.inputTokens,
+                            "ai.usage.inputTokenDetails.noCacheTokens": (_a22 = stepUsage.inputTokenDetails) == null ? void 0 : _a22.noCacheTokens,
+                            "ai.usage.inputTokenDetails.cacheReadTokens": (_b22 = stepUsage.inputTokenDetails) == null ? void 0 : _b22.cacheReadTokens,
+                            "ai.usage.inputTokenDetails.cacheWriteTokens": (_c2 = stepUsage.inputTokenDetails) == null ? void 0 : _c2.cacheWriteTokens,
                             "ai.usage.outputTokens": stepUsage.outputTokens,
+                            "ai.usage.outputTokenDetails.textTokens": (_d2 = stepUsage.outputTokenDetails) == null ? void 0 : _d2.textTokens,
+                            "ai.usage.outputTokenDetails.reasoningTokens": (_e2 = stepUsage.outputTokenDetails) == null ? void 0 : _e2.reasoningTokens,
                             "ai.usage.totalTokens": stepUsage.totalTokens,
-                            "ai.usage.reasoningTokens": stepUsage.reasoningTokens,
-                            "ai.usage.cachedInputTokens": stepUsage.cachedInputTokens,
+                            "ai.usage.reasoningTokens": (_f2 = stepUsage.outputTokenDetails) == null ? void 0 : _f2.reasoningTokens,
+                            "ai.usage.cachedInputTokens": (_g2 = stepUsage.inputTokenDetails) == null ? void 0 : _g2.cacheReadTokens,
                             // standardized gen-ai llm span attributes:
                             "gen_ai.response.finish_reasons": [
                               stepFinishReason
@@ -38999,8 +39242,6 @@ var DefaultStreamTextResult = class {
                         })
                       );
                     } catch (error) {
-                    } finally {
-                      doStreamSpan.end();
                     }
                     controller.enqueue({
                       type: "finish-step",
@@ -39018,6 +39259,28 @@ var DefaultStreamTextResult = class {
                       stepUsage
                     );
                     await stepFinish.promise;
+                    const processedStep = recordedSteps[recordedSteps.length - 1];
+                    try {
+                      doStreamSpan.setAttributes(
+                        await selectTelemetryAttributes({
+                          telemetry,
+                          attributes: {
+                            "ai.response.text": {
+                              output: () => processedStep.text
+                            },
+                            "ai.response.reasoning": {
+                              output: () => processedStep.reasoningText
+                            },
+                            "ai.response.providerMetadata": JSON.stringify(
+                              processedStep.providerMetadata
+                            )
+                          }
+                        })
+                      );
+                    } catch (error) {
+                    } finally {
+                      doStreamSpan.end();
+                    }
                     const clientToolCalls = stepToolCalls.filter(
                       (toolCall) => toolCall.providerExecuted !== true
                     );
@@ -39448,6 +39711,7 @@ var DefaultStreamTextResult = class {
                 toolCallId: part.toolCallId,
                 output: part.output,
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
+                ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
                 ...part.preliminary != null ? { preliminary: part.preliminary } : {},
                 ...dynamic != null ? { dynamic } : {}
               });
@@ -39458,8 +39722,9 @@ var DefaultStreamTextResult = class {
               controller.enqueue({
                 type: "tool-output-error",
                 toolCallId: part.toolCallId,
-                errorText: onError(part.error),
+                errorText: part.providerExecuted ? typeof part.error === "string" ? part.error : JSON.stringify(part.error) : onError(part.error),
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
+                ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
                 ...dynamic != null ? { dynamic } : {}
               });
               break;
@@ -39632,9 +39897,10 @@ var MCPClientError = class extends (_b = AISDKError$1, _a$1 = symbol$1, _b) {
     return AISDKError$1.hasMarker(error, marker$1);
   }
 };
-var LATEST_PROTOCOL_VERSION = "2025-06-18";
+var LATEST_PROTOCOL_VERSION = "2025-11-25";
 var SUPPORTED_PROTOCOL_VERSIONS = [
   LATEST_PROTOCOL_VERSION,
+  "2025-06-18",
   "2025-03-26",
   "2024-11-05"
 ];
@@ -40489,6 +40755,7 @@ async function selectResourceURL(serverUrl, provider, resourceMetadata) {
 async function authInternal(provider, {
   serverUrl,
   authorizationCode,
+  callbackState,
   scope: scope2,
   resourceMetadataUrl,
   fetchFn
@@ -40541,6 +40808,14 @@ async function authInternal(provider, {
     clientInformation = fullInformation;
   }
   if (authorizationCode !== void 0) {
+    if (provider.storedState) {
+      const expectedState = await provider.storedState();
+      if (expectedState !== void 0 && expectedState !== callbackState) {
+        throw new Error(
+          "OAuth state parameter mismatch - possible CSRF attack"
+        );
+      }
+    }
     const codeVerifier2 = await provider.codeVerifier();
     const tokens2 = await exchangeAuthorization(authorizationServerUrl, {
       metadata: metadata2,
@@ -40579,6 +40854,9 @@ async function authInternal(provider, {
     }
   }
   const state = provider.state ? await provider.state() : void 0;
+  if (state && provider.saveState) {
+    await provider.saveState(state);
+  }
   const { authorizationUrl, codeVerifier } = await startAuthorization(
     authorizationServerUrl,
     {
@@ -40598,12 +40876,14 @@ var SseMCPTransport = class {
   constructor({
     url: url2,
     headers,
-    authProvider
+    authProvider,
+    redirect = "follow"
   }) {
     this.connected = false;
     this.url = new URL(url2);
     this.headers = headers;
     this.authProvider = authProvider;
+    this.redirectMode = redirect;
   }
   async commonHeaders(base) {
     const headers = {
@@ -40637,7 +40917,8 @@ var SseMCPTransport = class {
           });
           const response = await fetch(this.url.href, {
             headers,
-            signal: (_a32 = this.abortController) == null ? void 0 : _a32.signal
+            signal: (_a32 = this.abortController) == null ? void 0 : _a32.signal,
+            redirect: this.redirectMode
           });
           if (response.status === 401 && this.authProvider && !triedAuth) {
             this.resourceMetadataUrl = extractResourceMetadataUrl(response);
@@ -40756,7 +41037,8 @@ var SseMCPTransport = class {
           method: "POST",
           headers,
           body: JSON.stringify(message),
-          signal: (_a32 = this.abortController) == null ? void 0 : _a32.signal
+          signal: (_a32 = this.abortController) == null ? void 0 : _a32.signal,
+          redirect: this.redirectMode
         };
         const response = await fetch(endpoint, init);
         if (response.status === 401 && this.authProvider && !triedAuth) {
@@ -40797,7 +41079,8 @@ var HttpMCPTransport = class {
   constructor({
     url: url2,
     headers,
-    authProvider
+    authProvider,
+    redirect = "follow"
   }) {
     this.inboundReconnectAttempts = 0;
     this.reconnectionOptions = {
@@ -40809,6 +41092,7 @@ var HttpMCPTransport = class {
     this.url = new URL(url2);
     this.headers = headers;
     this.authProvider = authProvider;
+    this.redirectMode = redirect;
   }
   async commonHeaders(base) {
     const headers = {
@@ -40849,7 +41133,8 @@ var HttpMCPTransport = class {
         await fetch(this.url, {
           method: "DELETE",
           headers,
-          signal: this.abortController.signal
+          signal: this.abortController.signal,
+          redirect: this.redirectMode
         }).catch(() => void 0);
       }
     } catch (e) {
@@ -40869,7 +41154,8 @@ var HttpMCPTransport = class {
           method: "POST",
           headers,
           body: JSON.stringify(message),
-          signal: (_a32 = this.abortController) == null ? void 0 : _a32.signal
+          signal: (_a32 = this.abortController) == null ? void 0 : _a32.signal,
+          redirect: this.redirectMode
         };
         const response = await fetch(this.url, init);
         const sessionId = response.headers.get("mcp-session-id");
@@ -41018,7 +41304,8 @@ var HttpMCPTransport = class {
       const response = await fetch(this.url.href, {
         method: "GET",
         headers,
-        signal: (_a32 = this.abortController) == null ? void 0 : _a32.signal
+        signal: (_a32 = this.abortController) == null ? void 0 : _a32.signal,
+        redirect: this.redirectMode
       });
       const sessionId = response.headers.get("mcp-session-id");
       if (sessionId) {
@@ -41679,9 +41966,9 @@ var openaiFailedResponseHandler = createJsonErrorResponseHandler$1({
 });
 function getOpenAILanguageModelCapabilities(modelId) {
   const supportsFlexProcessing = modelId.startsWith("o3") || modelId.startsWith("o4-mini") || modelId.startsWith("gpt-5") && !modelId.startsWith("gpt-5-chat");
-  const supportsPriorityProcessing = modelId.startsWith("gpt-4") || modelId.startsWith("gpt-5-mini") || modelId.startsWith("gpt-5") && !modelId.startsWith("gpt-5-nano") && !modelId.startsWith("gpt-5-chat") || modelId.startsWith("o3") || modelId.startsWith("o4-mini");
+  const supportsPriorityProcessing = modelId.startsWith("gpt-4") || modelId.startsWith("gpt-5") && !modelId.startsWith("gpt-5-nano") && !modelId.startsWith("gpt-5-chat") && !modelId.startsWith("gpt-5.4-nano") || modelId.startsWith("o3") || modelId.startsWith("o4-mini");
   const isReasoningModel = modelId.startsWith("o1") || modelId.startsWith("o3") || modelId.startsWith("o4-mini") || modelId.startsWith("gpt-5") && !modelId.startsWith("gpt-5-chat");
-  const supportsNonReasoningParameters = modelId.startsWith("gpt-5.1") || modelId.startsWith("gpt-5.2");
+  const supportsNonReasoningParameters = modelId.startsWith("gpt-5.1") || modelId.startsWith("gpt-5.2") || modelId.startsWith("gpt-5.3") || modelId.startsWith("gpt-5.4");
   const systemMessageMode = isReasoningModel ? "developer" : "system";
   return {
     supportsFlexProcessing,
@@ -43802,6 +44089,36 @@ var shell = createProviderToolFactoryWithOutputSchema({
   inputSchema: shellInputSchema,
   outputSchema: shellOutputSchema
 });
+var toolSearchArgsSchema = lazySchema(
+  () => zodSchema(
+    object$2({
+      execution: _enum(["server", "client"]).optional(),
+      description: string().optional(),
+      parameters: record(string(), unknown()).optional()
+    })
+  )
+);
+var toolSearchInputSchema = lazySchema(
+  () => zodSchema(
+    object$2({
+      arguments: unknown().optional(),
+      call_id: string().nullish()
+    })
+  )
+);
+var toolSearchOutputSchema = lazySchema(
+  () => zodSchema(
+    object$2({
+      tools: array$1(record(string(), unknown()))
+    })
+  )
+);
+var toolSearchToolFactory = createProviderToolFactoryWithOutputSchema({
+  id: "openai.tool_search",
+  inputSchema: toolSearchInputSchema,
+  outputSchema: toolSearchOutputSchema
+});
+var toolSearch = (args = {}) => toolSearchToolFactory(args);
 var webSearchArgsSchema = lazySchema(
   () => zodSchema(
     object$2({
@@ -44058,7 +44375,17 @@ var openaiTools = {
    * @param serverDescription - Optional description of the server.
    * @param serverUrl - URL for the MCP server.
    */
-  mcp
+  mcp,
+  /**
+   * Tool search allows the model to dynamically search for and load deferred
+   * tools into the model's context as needed. This helps reduce overall token
+   * usage, cost, and latency by only loading tools when the model needs them.
+   *
+   * To use tool search, mark functions or namespaces with `defer_loading: true`
+   * in the tools array. The model will use tool search to load these tools
+   * when it determines they are needed.
+   */
+  toolSearch
 };
 function convertOpenAIResponsesUsage(usage) {
   var _a10, _b9, _c, _d;
@@ -44114,8 +44441,8 @@ async function convertToOpenAIResponsesInput({
   hasApplyPatchTool = false,
   customProviderToolNames
 }) {
-  var _a10, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
-  const input = [];
+  var _a10, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+  let input = [];
   const warnings = [];
   const processedApprovalIds = /* @__PURE__ */ new Set();
   for (const { role, content } of prompt) {
@@ -44218,6 +44545,32 @@ async function convertToOpenAIResponsesInput({
               if (hasConversation && id2 != null) {
                 break;
               }
+              const resolvedToolName = toolNameMapping.toProviderToolName(
+                part.toolName
+              );
+              if (resolvedToolName === "tool_search") {
+                if (store && id2 != null) {
+                  input.push({ type: "item_reference", id: id2 });
+                  break;
+                }
+                const parsedInput = typeof part.input === "string" ? await parseJSON$1({
+                  text: part.input,
+                  schema: toolSearchInputSchema
+                }) : await validateTypes$1({
+                  value: part.input,
+                  schema: toolSearchInputSchema
+                });
+                const execution = parsedInput.call_id != null ? "client" : "server";
+                input.push({
+                  type: "tool_search_call",
+                  id: id2 != null ? id2 : part.toolCallId,
+                  execution,
+                  call_id: (_g = parsedInput.call_id) != null ? _g : null,
+                  status: "completed",
+                  arguments: parsedInput.arguments
+                });
+                break;
+              }
               if (part.providerExecuted) {
                 if (store && id2 != null) {
                   input.push({ type: "item_reference", id: id2 });
@@ -44228,9 +44581,6 @@ async function convertToOpenAIResponsesInput({
                 input.push({ type: "item_reference", id: id2 });
                 break;
               }
-              const resolvedToolName = toolNameMapping.toProviderToolName(
-                part.toolName
-              );
               if (hasLocalShellTool && resolvedToolName === "local_shell") {
                 const parsedInput = await validateTypes$1({
                   value: part.input,
@@ -44313,6 +44663,26 @@ async function convertToOpenAIResponsesInput({
               const resolvedResultToolName = toolNameMapping.toProviderToolName(
                 part.toolName
               );
+              if (resolvedResultToolName === "tool_search") {
+                const itemId = (_j = (_i = (_h = part.providerOptions) == null ? void 0 : _h[providerOptionsName]) == null ? void 0 : _i.itemId) != null ? _j : part.toolCallId;
+                if (store) {
+                  input.push({ type: "item_reference", id: itemId });
+                } else if (part.output.type === "json") {
+                  const parsedOutput = await validateTypes$1({
+                    value: part.output.value,
+                    schema: toolSearchOutputSchema
+                  });
+                  input.push({
+                    type: "tool_search_output",
+                    id: itemId,
+                    execution: "server",
+                    call_id: null,
+                    status: "completed",
+                    tools: parsedOutput.tools
+                  });
+                }
+                break;
+              }
               if (hasShellTool && resolvedResultToolName === "shell") {
                 if (part.output.type === "json") {
                   const parsedOutput = await validateTypes$1({
@@ -44335,7 +44705,7 @@ async function convertToOpenAIResponsesInput({
                 break;
               }
               if (store) {
-                const itemId = (_i = (_h = (_g = part.providerOptions) == null ? void 0 : _g[providerOptionsName]) == null ? void 0 : _h.itemId) != null ? _i : part.toolCallId;
+                const itemId = (_m = (_l = (_k = part.providerOptions) == null ? void 0 : _k[providerOptionsName]) == null ? void 0 : _l.itemId) != null ? _m : part.toolCallId;
                 input.push({ type: "item_reference", id: itemId });
               } else {
                 warnings.push({
@@ -44445,7 +44815,7 @@ async function convertToOpenAIResponsesInput({
           }
           const output = part.output;
           if (output.type === "execution-denied") {
-            const approvalId = (_k = (_j = output.providerOptions) == null ? void 0 : _j.openai) == null ? void 0 : _k.approvalId;
+            const approvalId = (_o = (_n = output.providerOptions) == null ? void 0 : _n.openai) == null ? void 0 : _o.approvalId;
             if (approvalId) {
               continue;
             }
@@ -44453,6 +44823,20 @@ async function convertToOpenAIResponsesInput({
           const resolvedToolName = toolNameMapping.toProviderToolName(
             part.toolName
           );
+          if (resolvedToolName === "tool_search" && output.type === "json") {
+            const parsedOutput = await validateTypes$1({
+              value: output.value,
+              schema: toolSearchOutputSchema
+            });
+            input.push({
+              type: "tool_search_output",
+              execution: "client",
+              call_id: part.toolCallId,
+              status: "completed",
+              tools: parsedOutput.tools
+            });
+            continue;
+          }
           if (hasLocalShellTool && resolvedToolName === "local_shell" && output.type === "json") {
             const parsedOutput = await validateTypes$1({
               value: output.value,
@@ -44505,7 +44889,7 @@ async function convertToOpenAIResponsesInput({
                 outputValue = output.value;
                 break;
               case "execution-denied":
-                outputValue = (_l = output.reason) != null ? _l : "Tool execution denied.";
+                outputValue = (_p = output.reason) != null ? _p : "Tool execution denied.";
                 break;
               case "json":
               case "error-json":
@@ -44559,7 +44943,7 @@ async function convertToOpenAIResponsesInput({
               contentValue = output.value;
               break;
             case "execution-denied":
-              contentValue = (_m = output.reason) != null ? _m : "Tool execution denied.";
+              contentValue = (_q = output.reason) != null ? _q : "Tool execution denied.";
               break;
             case "json":
             case "error-json":
@@ -44616,6 +45000,17 @@ async function convertToOpenAIResponsesInput({
       }
     }
   }
+  if (!store && input.some(
+    (item) => "type" in item && item.type === "reasoning" && item.encrypted_content == null
+  )) {
+    warnings.push({
+      type: "other",
+      message: "Reasoning parts without encrypted content are not supported when store is false. Skipping reasoning parts."
+    });
+    input = input.filter(
+      (item) => !("type" in item) || item.type !== "reasoning" || item.encrypted_content != null
+    );
+  }
   return { input, warnings };
 }
 var openaiResponsesReasoningProviderOptionsSchema = object$2({
@@ -44638,6 +45033,16 @@ function mapOpenAIResponseFinishReason({
       return hasFunctionCall ? "tool-calls" : "other";
   }
 }
+var jsonValueSchema2 = lazy(
+  () => union([
+    string(),
+    number$1(),
+    boolean(),
+    _null(),
+    array$1(jsonValueSchema2),
+    record(string(), jsonValueSchema2.optional())
+  ])
+);
 var openaiResponsesChunkSchema = lazySchema(
   () => zodSchema(
     union([
@@ -44671,6 +45076,23 @@ var openaiResponsesChunkSchema = lazySchema(
           service_tier: string().nullish()
         })
       }),
+      object$2({
+        type: literal("response.failed"),
+        response: object$2({
+          error: object$2({
+            code: string().nullish(),
+            message: string()
+          }).nullish(),
+          incomplete_details: object$2({ reason: string() }).nullish(),
+          usage: object$2({
+            input_tokens: number$1(),
+            input_tokens_details: object$2({ cached_tokens: number$1().nullish() }).nullish(),
+            output_tokens: number$1(),
+            output_tokens_details: object$2({ reasoning_tokens: number$1().nullish() }).nullish()
+          }).nullish(),
+          service_tier: string().nullish()
+        })
+      }),
       object$2({
         type: literal("response.created"),
         response: object$2({
@@ -44802,6 +45224,22 @@ var openaiResponsesChunkSchema = lazySchema(
                 ])
               })
             )
+          }),
+          object$2({
+            type: literal("tool_search_call"),
+            id: string(),
+            execution: _enum(["server", "client"]),
+            call_id: string().nullable(),
+            status: _enum(["in_progress", "completed", "incomplete"]),
+            arguments: unknown()
+          }),
+          object$2({
+            type: literal("tool_search_output"),
+            id: string(),
+            execution: _enum(["server", "client"]),
+            call_id: string().nullable(),
+            status: _enum(["in_progress", "completed", "incomplete"]),
+            tools: array$1(record(string(), jsonValueSchema2.optional()))
           })
         ])
       }),
@@ -45009,6 +45447,22 @@ var openaiResponsesChunkSchema = lazySchema(
                 ])
               })
             )
+          }),
+          object$2({
+            type: literal("tool_search_call"),
+            id: string(),
+            execution: _enum(["server", "client"]),
+            call_id: string().nullable(),
+            status: _enum(["in_progress", "completed", "incomplete"]),
+            arguments: unknown()
+          }),
+          object$2({
+            type: literal("tool_search_output"),
+            id: string(),
+            execution: _enum(["server", "client"]),
+            call_id: string().nullable(),
+            status: _enum(["in_progress", "completed", "incomplete"]),
+            tools: array$1(record(string(), jsonValueSchema2.optional()))
           })
         ])
       }),
@@ -45390,6 +45844,22 @@ var openaiResponsesResponseSchema = lazySchema(
                 ])
               })
             )
+          }),
+          object$2({
+            type: literal("tool_search_call"),
+            id: string(),
+            execution: _enum(["server", "client"]),
+            call_id: string().nullable(),
+            status: _enum(["in_progress", "completed", "incomplete"]),
+            arguments: unknown()
+          }),
+          object$2({
+            type: literal("tool_search_output"),
+            id: string(),
+            execution: _enum(["server", "client"]),
+            call_id: string().nullable(),
+            status: _enum(["in_progress", "completed", "incomplete"]),
+            tools: array$1(record(string(), jsonValueSchema2.optional()))
           })
         ])
       ).optional(),
@@ -45565,7 +46035,7 @@ async function prepareResponsesTools({
   toolNameMapping,
   customProviderToolNames
 }) {
-  var _a10;
+  var _a10, _b9;
   tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   const toolWarnings = [];
   if (tools == null) {
@@ -45575,15 +46045,19 @@ async function prepareResponsesTools({
   const resolvedCustomProviderToolNames = customProviderToolNames != null ? customProviderToolNames : /* @__PURE__ */ new Set();
   for (const tool2 of tools) {
     switch (tool2.type) {
-      case "function":
+      case "function": {
+        const openaiOptions = (_a10 = tool2.providerOptions) == null ? void 0 : _a10.openai;
+        const deferLoading = openaiOptions == null ? void 0 : openaiOptions.deferLoading;
         openaiTools2.push({
           type: "function",
           name: tool2.name,
           description: tool2.description,
           parameters: tool2.inputSchema,
-          ...tool2.strict != null ? { strict: tool2.strict } : {}
+          ...tool2.strict != null ? { strict: tool2.strict } : {},
+          ...deferLoading != null ? { defer_loading: deferLoading } : {}
         });
         break;
+      }
       case "provider": {
         switch (tool2.id) {
           case "openai.file_search": {
@@ -45728,6 +46202,19 @@ async function prepareResponsesTools({
             resolvedCustomProviderToolNames.add(args.name);
             break;
           }
+          case "openai.tool_search": {
+            const args = await validateTypes$1({
+              value: tool2.args,
+              schema: toolSearchArgsSchema
+            });
+            openaiTools2.push({
+              type: "tool_search",
+              ...args.execution != null ? { execution: args.execution } : {},
+              ...args.description != null ? { description: args.description } : {},
+              ...args.parameters != null ? { parameters: args.parameters } : {}
+            });
+            break;
+          }
         }
         break;
       }
@@ -45749,7 +46236,7 @@ async function prepareResponsesTools({
     case "required":
       return { tools: openaiTools2, toolChoice: type2, toolWarnings };
     case "tool": {
-      const resolvedToolName = (_a10 = toolNameMapping == null ? void 0 : toolNameMapping.toProviderToolName(toolChoice.toolName)) != null ? _a10 : toolChoice.toolName;
+      const resolvedToolName = (_b9 = toolNameMapping == null ? void 0 : toolNameMapping.toProviderToolName(toolChoice.toolName)) != null ? _b9 : toolChoice.toolName;
       return {
         tools: openaiTools2,
         toolChoice: resolvedToolName === "code_interpreter" || resolvedToolName === "file_search" || resolvedToolName === "image_generation" || resolvedToolName === "web_search_preview" || resolvedToolName === "web_search" || resolvedToolName === "mcp" || resolvedToolName === "apply_patch" ? { type: resolvedToolName } : resolvedCustomProviderToolNames.has(resolvedToolName) ? { type: "custom", name: resolvedToolName } : { type: "function", name: resolvedToolName },
@@ -45903,7 +46390,8 @@ var OpenAIResponsesLanguageModel = class {
         "openai.web_search": "web_search",
         "openai.web_search_preview": "web_search_preview",
         "openai.mcp": "mcp",
-        "openai.apply_patch": "apply_patch"
+        "openai.apply_patch": "apply_patch",
+        "openai.tool_search": "tool_search"
       },
       resolveProviderToolName: (tool2) => tool2.id === "openai.custom" ? tool2.args.name : void 0
     });
@@ -46081,7 +46569,7 @@ var OpenAIResponsesLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a10, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+    var _a10, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
     const {
       args: body,
       warnings,
@@ -46124,6 +46612,7 @@ var OpenAIResponsesLanguageModel = class {
     const content = [];
     const logprobs = [];
     let hasFunctionCall = false;
+    const hostedToolSearchCallIds = [];
     for (const part of response.output) {
       switch (part.type) {
         case "reasoning": {
@@ -46162,6 +46651,46 @@ var OpenAIResponsesLanguageModel = class {
           });
           break;
         }
+        case "tool_search_call": {
+          const toolCallId = (_b9 = part.call_id) != null ? _b9 : part.id;
+          const isHosted = part.execution === "server";
+          if (isHosted) {
+            hostedToolSearchCallIds.push(toolCallId);
+          }
+          content.push({
+            type: "tool-call",
+            toolCallId,
+            toolName: toolNameMapping.toCustomToolName("tool_search"),
+            input: JSON.stringify({
+              arguments: part.arguments,
+              call_id: part.call_id
+            }),
+            ...isHosted ? { providerExecuted: true } : {},
+            providerMetadata: {
+              [providerOptionsName]: {
+                itemId: part.id
+              }
+            }
+          });
+          break;
+        }
+        case "tool_search_output": {
+          const toolCallId = (_d = (_c = part.call_id) != null ? _c : hostedToolSearchCallIds.shift()) != null ? _d : part.id;
+          content.push({
+            type: "tool-result",
+            toolCallId,
+            toolName: toolNameMapping.toCustomToolName("tool_search"),
+            result: {
+              tools: part.tools
+            },
+            providerMetadata: {
+              [providerOptionsName]: {
+                itemId: part.id
+              }
+            }
+          });
+          break;
+        }
         case "local_shell_call": {
           content.push({
             type: "tool-call",
@@ -46217,7 +46746,7 @@ var OpenAIResponsesLanguageModel = class {
         }
         case "message": {
           for (const contentPart of part.content) {
-            if (((_c = (_b9 = options.providerOptions) == null ? void 0 : _b9[providerOptionsName]) == null ? void 0 : _c.logprobs) && contentPart.logprobs) {
+            if (((_f = (_e = options.providerOptions) == null ? void 0 : _e[providerOptionsName]) == null ? void 0 : _f.logprobs) && contentPart.logprobs) {
               logprobs.push(contentPart.logprobs);
             }
             const providerMetadata2 = {
@@ -46239,7 +46768,7 @@ var OpenAIResponsesLanguageModel = class {
                 content.push({
                   type: "source",
                   sourceType: "url",
-                  id: (_f = (_e = (_d = this.config).generateId) == null ? void 0 : _e.call(_d)) != null ? _f : generateId$1(),
+                  id: (_i = (_h = (_g = this.config).generateId) == null ? void 0 : _h.call(_g)) != null ? _i : generateId$1(),
                   url: annotation.url,
                   title: annotation.title
                 });
@@ -46247,7 +46776,7 @@ var OpenAIResponsesLanguageModel = class {
                 content.push({
                   type: "source",
                   sourceType: "document",
-                  id: (_i = (_h = (_g = this.config).generateId) == null ? void 0 : _h.call(_g)) != null ? _i : generateId$1(),
+                  id: (_l = (_k = (_j = this.config).generateId) == null ? void 0 : _k.call(_j)) != null ? _l : generateId$1(),
                   mediaType: "text/plain",
                   title: annotation.filename,
                   filename: annotation.filename,
@@ -46263,7 +46792,7 @@ var OpenAIResponsesLanguageModel = class {
                 content.push({
                   type: "source",
                   sourceType: "document",
-                  id: (_l = (_k = (_j = this.config).generateId) == null ? void 0 : _k.call(_j)) != null ? _l : generateId$1(),
+                  id: (_o = (_n = (_m = this.config).generateId) == null ? void 0 : _n.call(_m)) != null ? _o : generateId$1(),
                   mediaType: "text/plain",
                   title: annotation.filename,
                   filename: annotation.filename,
@@ -46279,7 +46808,7 @@ var OpenAIResponsesLanguageModel = class {
                 content.push({
                   type: "source",
                   sourceType: "document",
-                  id: (_o = (_n = (_m = this.config).generateId) == null ? void 0 : _n.call(_m)) != null ? _o : generateId$1(),
+                  id: (_r = (_q = (_p = this.config).generateId) == null ? void 0 : _q.call(_p)) != null ? _r : generateId$1(),
                   mediaType: "application/octet-stream",
                   title: annotation.file_id,
                   filename: annotation.file_id,
@@ -46348,7 +46877,7 @@ var OpenAIResponsesLanguageModel = class {
           break;
         }
         case "mcp_call": {
-          const toolCallId = part.approval_request_id != null ? (_p = approvalRequestIdToDummyToolCallIdFromPrompt[part.approval_request_id]) != null ? _p : part.id : part.id;
+          const toolCallId = part.approval_request_id != null ? (_s = approvalRequestIdToDummyToolCallIdFromPrompt[part.approval_request_id]) != null ? _s : part.id : part.id;
           const toolName = `mcp.${part.name}`;
           content.push({
             type: "tool-call",
@@ -46382,8 +46911,8 @@ var OpenAIResponsesLanguageModel = class {
           break;
         }
         case "mcp_approval_request": {
-          const approvalRequestId = (_q = part.approval_request_id) != null ? _q : part.id;
-          const dummyToolCallId = (_t = (_s = (_r = this.config).generateId) == null ? void 0 : _s.call(_r)) != null ? _t : generateId$1();
+          const approvalRequestId = (_t = part.approval_request_id) != null ? _t : part.id;
+          const dummyToolCallId = (_w = (_v = (_u = this.config).generateId) == null ? void 0 : _v.call(_u)) != null ? _w : generateId$1();
           const toolName = `mcp.${part.name}`;
           content.push({
             type: "tool-call",
@@ -46433,13 +46962,13 @@ var OpenAIResponsesLanguageModel = class {
             toolName: toolNameMapping.toCustomToolName("file_search"),
             result: {
               queries: part.queries,
-              results: (_v = (_u = part.results) == null ? void 0 : _u.map((result) => ({
+              results: (_y = (_x = part.results) == null ? void 0 : _x.map((result) => ({
                 attributes: result.attributes,
                 fileId: result.file_id,
                 filename: result.filename,
                 score: result.score,
                 text: result.text
-              }))) != null ? _v : null
+              }))) != null ? _y : null
             }
           });
           break;
@@ -46496,10 +47025,10 @@ var OpenAIResponsesLanguageModel = class {
       content,
       finishReason: {
         unified: mapOpenAIResponseFinishReason({
-          finishReason: (_w = response.incomplete_details) == null ? void 0 : _w.reason,
+          finishReason: (_z = response.incomplete_details) == null ? void 0 : _z.reason,
           hasFunctionCall
         }),
-        raw: (_y = (_x = response.incomplete_details) == null ? void 0 : _x.reason) != null ? _y : void 0
+        raw: (_B = (_A = response.incomplete_details) == null ? void 0 : _A.reason) != null ? _B : void 0
       },
       usage: convertOpenAIResponsesUsage(usage),
       request: { body },
@@ -46557,6 +47086,7 @@ var OpenAIResponsesLanguageModel = class {
     let hasFunctionCall = false;
     const activeReasoning = {};
     let serviceTier;
+    const hostedToolSearchCallIds = [];
     return {
       stream: response.pipeThrough(
         new TransformStream({
@@ -46564,7 +47094,7 @@ var OpenAIResponsesLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a10, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F;
+            var _a10, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -46672,7 +47202,25 @@ var OpenAIResponsesLanguageModel = class {
                   input: "{}",
                   providerExecuted: true
                 });
-              } else if (value.item.type === "mcp_call" || value.item.type === "mcp_list_tools" || value.item.type === "mcp_approval_request") ;
+              } else if (value.item.type === "tool_search_call") {
+                const toolCallId = value.item.id;
+                const toolName = toolNameMapping.toCustomToolName("tool_search");
+                const isHosted = value.item.execution === "server";
+                ongoingToolCalls[value.output_index] = {
+                  toolName,
+                  toolCallId,
+                  toolSearchExecution: (_a10 = value.item.execution) != null ? _a10 : "server"
+                };
+                if (isHosted) {
+                  controller.enqueue({
+                    type: "tool-input-start",
+                    id: toolCallId,
+                    toolName,
+                    providerExecuted: true
+                  });
+                }
+              } else if (value.item.type === "tool_search_output") ;
+              else if (value.item.type === "mcp_call" || value.item.type === "mcp_list_tools" || value.item.type === "mcp_approval_request") ;
               else if (value.item.type === "apply_patch_call") {
                 const { call_id: callId, operation } = value.item;
                 ongoingToolCalls[value.output_index] = {
@@ -46718,7 +47266,7 @@ var OpenAIResponsesLanguageModel = class {
               } else if (value.item.type === "shell_call_output") ;
               else if (value.item.type === "message") {
                 ongoingAnnotations.splice(0, ongoingAnnotations.length);
-                activeMessagePhase = (_a10 = value.item.phase) != null ? _a10 : void 0;
+                activeMessagePhase = (_b9 = value.item.phase) != null ? _b9 : void 0;
                 controller.enqueue({
                   type: "text-start",
                   id: value.item.id,
@@ -46742,14 +47290,14 @@ var OpenAIResponsesLanguageModel = class {
                   providerMetadata: {
                     [providerOptionsName]: {
                       itemId: value.item.id,
-                      reasoningEncryptedContent: (_b9 = value.item.encrypted_content) != null ? _b9 : null
+                      reasoningEncryptedContent: (_c = value.item.encrypted_content) != null ? _c : null
                     }
                   }
                 });
               }
             } else if (isResponseOutputItemDoneChunk(value)) {
               if (value.item.type === "message") {
-                const phase = (_c = value.item.phase) != null ? _c : activeMessagePhase;
+                const phase = (_d = value.item.phase) != null ? _d : activeMessagePhase;
                 activeMessagePhase = void 0;
                 controller.enqueue({
                   type: "text-end",
@@ -46843,13 +47391,13 @@ var OpenAIResponsesLanguageModel = class {
                   toolName: toolNameMapping.toCustomToolName("file_search"),
                   result: {
                     queries: value.item.queries,
-                    results: (_e = (_d = value.item.results) == null ? void 0 : _d.map((result) => ({
+                    results: (_f = (_e = value.item.results) == null ? void 0 : _e.map((result) => ({
                       attributes: result.attributes,
                       fileId: result.file_id,
                       filename: result.filename,
                       score: result.score,
                       text: result.text
-                    }))) != null ? _e : null
+                    }))) != null ? _f : null
                   }
                 });
               } else if (value.item.type === "code_interpreter_call") {
@@ -46871,12 +47419,62 @@ var OpenAIResponsesLanguageModel = class {
                     result: value.item.result
                   }
                 });
+              } else if (value.item.type === "tool_search_call") {
+                const toolCall = ongoingToolCalls[value.output_index];
+                const isHosted = value.item.execution === "server";
+                if (toolCall != null) {
+                  const toolCallId = isHosted ? toolCall.toolCallId : (_g = value.item.call_id) != null ? _g : value.item.id;
+                  if (isHosted) {
+                    hostedToolSearchCallIds.push(toolCallId);
+                  } else {
+                    controller.enqueue({
+                      type: "tool-input-start",
+                      id: toolCallId,
+                      toolName: toolCall.toolName
+                    });
+                  }
+                  controller.enqueue({
+                    type: "tool-input-end",
+                    id: toolCallId
+                  });
+                  controller.enqueue({
+                    type: "tool-call",
+                    toolCallId,
+                    toolName: toolCall.toolName,
+                    input: JSON.stringify({
+                      arguments: value.item.arguments,
+                      call_id: isHosted ? null : toolCallId
+                    }),
+                    ...isHosted ? { providerExecuted: true } : {},
+                    providerMetadata: {
+                      [providerOptionsName]: {
+                        itemId: value.item.id
+                      }
+                    }
+                  });
+                }
+                ongoingToolCalls[value.output_index] = void 0;
+              } else if (value.item.type === "tool_search_output") {
+                const toolCallId = (_i = (_h = value.item.call_id) != null ? _h : hostedToolSearchCallIds.shift()) != null ? _i : value.item.id;
+                controller.enqueue({
+                  type: "tool-result",
+                  toolCallId,
+                  toolName: toolNameMapping.toCustomToolName("tool_search"),
+                  result: {
+                    tools: value.item.tools
+                  },
+                  providerMetadata: {
+                    [providerOptionsName]: {
+                      itemId: value.item.id
+                    }
+                  }
+                });
               } else if (value.item.type === "mcp_call") {
                 ongoingToolCalls[value.output_index] = void 0;
-                const approvalRequestId = (_f = value.item.approval_request_id) != null ? _f : void 0;
-                const aliasedToolCallId = approvalRequestId != null ? (_h = (_g = approvalRequestIdToDummyToolCallIdFromStream.get(
+                const approvalRequestId = (_j = value.item.approval_request_id) != null ? _j : void 0;
+                const aliasedToolCallId = approvalRequestId != null ? (_l = (_k = approvalRequestIdToDummyToolCallIdFromStream.get(
                   approvalRequestId
-                )) != null ? _g : approvalRequestIdToDummyToolCallIdFromPrompt[approvalRequestId]) != null ? _h : value.item.id : value.item.id;
+                )) != null ? _k : approvalRequestIdToDummyToolCallIdFromPrompt[approvalRequestId]) != null ? _l : value.item.id : value.item.id;
                 const toolName = `mcp.${value.item.name}`;
                 controller.enqueue({
                   type: "tool-call",
@@ -46946,8 +47544,8 @@ var OpenAIResponsesLanguageModel = class {
                 ongoingToolCalls[value.output_index] = void 0;
               } else if (value.item.type === "mcp_approval_request") {
                 ongoingToolCalls[value.output_index] = void 0;
-                const dummyToolCallId = (_k = (_j = (_i = self2.config).generateId) == null ? void 0 : _j.call(_i)) != null ? _k : generateId$1();
-                const approvalRequestId = (_l = value.item.approval_request_id) != null ? _l : value.item.id;
+                const dummyToolCallId = (_o = (_n = (_m = self2.config).generateId) == null ? void 0 : _n.call(_m)) != null ? _o : generateId$1();
+                const approvalRequestId = (_p = value.item.approval_request_id) != null ? _p : value.item.id;
                 approvalRequestIdToDummyToolCallIdFromStream.set(
                   approvalRequestId,
                   dummyToolCallId
@@ -47036,7 +47634,7 @@ var OpenAIResponsesLanguageModel = class {
                     providerMetadata: {
                       [providerOptionsName]: {
                         itemId: value.item.id,
-                        reasoningEncryptedContent: (_m = value.item.encrypted_content) != null ? _m : null
+                        reasoningEncryptedContent: (_q = value.item.encrypted_content) != null ? _q : null
                       }
                     }
                   });
@@ -47149,7 +47747,7 @@ var OpenAIResponsesLanguageModel = class {
                 id: value.item_id,
                 delta: value.delta
               });
-              if (((_o = (_n = options.providerOptions) == null ? void 0 : _n[providerOptionsName]) == null ? void 0 : _o.logprobs) && value.logprobs) {
+              if (((_s = (_r = options.providerOptions) == null ? void 0 : _r[providerOptionsName]) == null ? void 0 : _s.logprobs) && value.logprobs) {
                 logprobs.push(value.logprobs);
               }
             } else if (value.type === "response.reasoning_summary_part.added") {
@@ -47178,7 +47776,7 @@ var OpenAIResponsesLanguageModel = class {
                   providerMetadata: {
                     [providerOptionsName]: {
                       itemId: value.item_id,
-                      reasoningEncryptedContent: (_q = (_p = activeReasoning[value.item_id]) == null ? void 0 : _p.encryptedContent) != null ? _q : null
+                      reasoningEncryptedContent: (_u = (_t = activeReasoning[value.item_id]) == null ? void 0 : _t.encryptedContent) != null ? _u : null
                     }
                   }
                 });
@@ -47212,22 +47810,32 @@ var OpenAIResponsesLanguageModel = class {
             } else if (isResponseFinishedChunk(value)) {
               finishReason = {
                 unified: mapOpenAIResponseFinishReason({
-                  finishReason: (_r = value.response.incomplete_details) == null ? void 0 : _r.reason,
+                  finishReason: (_v = value.response.incomplete_details) == null ? void 0 : _v.reason,
                   hasFunctionCall
                 }),
-                raw: (_t = (_s = value.response.incomplete_details) == null ? void 0 : _s.reason) != null ? _t : void 0
+                raw: (_x = (_w = value.response.incomplete_details) == null ? void 0 : _w.reason) != null ? _x : void 0
               };
               usage = value.response.usage;
               if (typeof value.response.service_tier === "string") {
                 serviceTier = value.response.service_tier;
               }
+            } else if (isResponseFailedChunk(value)) {
+              const incompleteReason = (_y = value.response.incomplete_details) == null ? void 0 : _y.reason;
+              finishReason = {
+                unified: incompleteReason ? mapOpenAIResponseFinishReason({
+                  finishReason: incompleteReason,
+                  hasFunctionCall
+                }) : "error",
+                raw: incompleteReason != null ? incompleteReason : "error"
+              };
+              usage = (_z = value.response.usage) != null ? _z : void 0;
             } else if (isResponseAnnotationAddedChunk(value)) {
               ongoingAnnotations.push(value.annotation);
               if (value.annotation.type === "url_citation") {
                 controller.enqueue({
                   type: "source",
                   sourceType: "url",
-                  id: (_w = (_v = (_u = self2.config).generateId) == null ? void 0 : _v.call(_u)) != null ? _w : generateId$1(),
+                  id: (_C = (_B = (_A = self2.config).generateId) == null ? void 0 : _B.call(_A)) != null ? _C : generateId$1(),
                   url: value.annotation.url,
                   title: value.annotation.title
                 });
@@ -47235,7 +47843,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_z = (_y = (_x = self2.config).generateId) == null ? void 0 : _y.call(_x)) != null ? _z : generateId$1(),
+                  id: (_F = (_E = (_D = self2.config).generateId) == null ? void 0 : _E.call(_D)) != null ? _F : generateId$1(),
                   mediaType: "text/plain",
                   title: value.annotation.filename,
                   filename: value.annotation.filename,
@@ -47251,7 +47859,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_C = (_B = (_A = self2.config).generateId) == null ? void 0 : _B.call(_A)) != null ? _C : generateId$1(),
+                  id: (_I = (_H = (_G = self2.config).generateId) == null ? void 0 : _H.call(_G)) != null ? _I : generateId$1(),
                   mediaType: "text/plain",
                   title: value.annotation.filename,
                   filename: value.annotation.filename,
@@ -47267,7 +47875,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_F = (_E = (_D = self2.config).generateId) == null ? void 0 : _E.call(_D)) != null ? _F : generateId$1(),
+                  id: (_L = (_K = (_J = self2.config).generateId) == null ? void 0 : _K.call(_J)) != null ? _L : generateId$1(),
                   mediaType: "application/octet-stream",
                   title: value.annotation.file_id,
                   filename: value.annotation.file_id,
@@ -47315,6 +47923,9 @@ function isResponseOutputItemDoneChunk(chunk) {
 function isResponseFinishedChunk(chunk) {
   return chunk.type === "response.completed" || chunk.type === "response.incomplete";
 }
+function isResponseFailedChunk(chunk) {
+  return chunk.type === "response.failed";
+}
 function isResponseCreatedChunk(chunk) {
   return chunk.type === "response.created";
 }
@@ -47705,7 +48316,7 @@ var OpenAITranscriptionModel = class {
     };
   }
 };
-var VERSION$2 = "3.0.41";
+var VERSION$2 = "3.0.48";
 function createOpenAI(options = {}) {
   var _a10, _b9;
   const baseURL = (_a10 = withoutTrailingSlash$1(
@@ -49755,6 +50366,11 @@ class AgentModelProvider {
     await this._createMpcTools();
     this.onUpdatedTools?.();
   }
+  /** 仅刷新已连接 clients 的 tools（不重建 client，适合工具目录动态变化场景） */
+  async refreshTools() {
+    await this._createMpcTools();
+    this.onUpdatedTools?.();
+  }
   /** 全量更新所有的 mcpServers */
   async updateMcpServers(mcpServers) {
     await this.closeAll();
@@ -50160,13 +50776,37 @@ ${observationText}
       throw new Error("LLM is not initialized");
     }
     await this.initClientsAndTools();
-    const allTools = this._tempMergeTools(options.tools, false);
+    const extraTools = options.tools || {};
+    const allTools = this._tempMergeTools(extraTools, false);
+    const syncToolsForStep = () => {
+      const latestTools = this._tempMergeTools(extraTools, false);
+      Object.entries(latestTools).forEach(([name16, tool2]) => {
+        allTools[name16] = tool2;
+      });
+      Object.keys(allTools).forEach((name16) => {
+        if (!(name16 in latestTools)) {
+          delete allTools[name16];
+        }
+      });
+    };
+    const userPrepareStep = options.prepareStep;
+    const wrappedPrepareStep = async (stepOptions) => {
+      syncToolsForStep();
+      const latestActiveTools = this._getActiveToolNames(allTools);
+      const userStepPatch = typeof userPrepareStep === "function" ? await userPrepareStep(stepOptions) : void 0;
+      const safeUserStepPatch = userStepPatch && typeof userStepPatch === "object" ? userStepPatch : {};
+      return {
+        ...safeUserStepPatch,
+        activeTools: Array.isArray(safeUserStepPatch.activeTools) ? safeUserStepPatch.activeTools.filter((name16) => latestActiveTools.includes(name16)) : latestActiveTools
+      };
+    };
     const chatOptions = {
       // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
       model: this.llm(model),
       stopWhen: stepCountIs(maxSteps),
       ...options,
       tools: allTools,
+      prepareStep: wrappedPrepareStep,
       activeTools: this._getActiveToolNames(allTools)
     };
     let lastUserMessage = null;
@@ -50479,6 +51119,7 @@ const MSG_PAGE_READY = "next-sdk:page-ready";
 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 MSG_TOOL_CATALOG_CHANGED = "next-sdk:tool-catalog-changed";
 const activePages = /* @__PURE__ */ new Map();
 const normalizeRoute = (value) => value.replace(/\/+$/, "") || "/";
 const broadcastTargets = /* @__PURE__ */ new Set();
@@ -50488,8 +51129,8 @@ function initBroadcastTargets() {
   }
 }
 initBroadcastTargets();
-function broadcastRouteChange(type2, route) {
-  const msg = { type: type2, route };
+function broadcastRouteChange(type2, route, extra = {}) {
+  const msg = { type: type2, route, ...extra };
   broadcastTargets.forEach(({ win, origin }) => {
     try {
       win.postMessage(msg, origin);
@@ -50504,30 +51145,413 @@ function setupIframeRemoterBridge() {
     if (event.origin !== window.location.origin) return;
     const target = event.source;
     broadcastTargets.add({ win: target, origin: event.origin || "*" });
-    const payload = {
-      type: MSG_ROUTE_STATE_INITIAL,
-      toolRouteMap: Array.from(toolRouteMap.entries()),
-      activeRoutes: Array.from(activePages.keys())
-    };
+  });
+}
+setupIframeRemoterBridge();
+const runtimeRegisteredTools = /* @__PURE__ */ new Map();
+function broadcastToolCatalogChanged() {
+  if (typeof window === "undefined") return;
+  const payload = {
+    type: MSG_TOOL_CATALOG_CHANGED
+  };
+  broadcastTargets.forEach(({ win, origin }) => {
     try {
-      target.postMessage(payload, event.origin || "*");
+      win.postMessage(payload, origin);
     } catch {
     }
   });
 }
-setupIframeRemoterBridge();
-const toolRouteMap = /* @__PURE__ */ new Map();
+function notifyServerToolListChanged(server) {
+  const maybeServer = server;
+  try {
+    maybeServer.sendToolListChanged?.();
+  } catch {
+  }
+}
 function getToolRouteMap() {
-  return new Map(toolRouteMap);
+  return /* @__PURE__ */ new Map();
 }
 function getActiveRoutes() {
   return new Set(activePages.keys());
 }
+function getActivePageTools() {
+  const snapshot = /* @__PURE__ */ new Map();
+  activePages.forEach((toolNames, route) => {
+    snapshot.set(route, Array.from(toolNames));
+  });
+  return snapshot;
+}
+function isToolReadyOnRoute(route, toolName) {
+  const toolNames = activePages.get(route);
+  return !!toolNames && toolNames.has(toolName);
+}
+const nativeRegisteredTools = /* @__PURE__ */ new Set();
+const nativeToolDisposers = /* @__PURE__ */ new Map();
+const nativeRegisteredToolDefs = /* @__PURE__ */ new Map();
+const nativeRegisterTasks = /* @__PURE__ */ new Map();
+const BUILTIN_REMOVE_PATCH_SYMBOL = Symbol("builtin-remove-patched");
+function attachBuiltinUnregisterOnRemove(name16, tool2) {
+  const mutableTool = tool2;
+  if (mutableTool[BUILTIN_REMOVE_PATCH_SYMBOL]) return tool2;
+  if (typeof mutableTool.remove !== "function") return tool2;
+  const originalRemove = mutableTool.remove.bind(mutableTool);
+  mutableTool.remove = () => {
+    try {
+      originalRemove();
+    } finally {
+      void unregisterBuiltinWebMcpTool(name16);
+    }
+  };
+  mutableTool[BUILTIN_REMOVE_PATCH_SYMBOL] = true;
+  return mutableTool;
+}
+function getBuiltinModelContext() {
+  if (typeof navigator === "undefined") return null;
+  const nav = navigator;
+  if (!nav.modelContext?.registerTool) return null;
+  return nav.modelContext;
+}
+function getBuiltinModelContextTesting() {
+  if (typeof navigator === "undefined") return null;
+  const nav = navigator;
+  return nav.modelContextTesting ?? null;
+}
+function isWebMcpDebugEnabled() {
+  if (typeof window === "undefined") return false;
+  const w = window;
+  if (w.__NEXT_SDK_WEBMCP_DEBUG__ === true) return true;
+  try {
+    return window.localStorage?.getItem("next-sdk:webmcp-debug") === "1";
+  } catch {
+    return false;
+  }
+}
+function debugWebMcpLog(event, payload = {}) {
+  if (!isWebMcpDebugEnabled()) return;
+  try {
+    console.info("[next-sdk/webmcp]", event, payload);
+  } catch {
+  }
+}
+async function debugBuiltinToolSnapshot(event) {
+  if (!isWebMcpDebugEnabled()) return;
+  const testingApi = getBuiltinModelContextTesting();
+  if (!testingApi) {
+    debugWebMcpLog(`${event}:snapshot`, { available: false });
+    return;
+  }
+  try {
+    const list = testingApi.listTools ?? testingApi.getTools;
+    if (!list) {
+      debugWebMcpLog(`${event}:snapshot`, { available: false, reason: "no-list-method" });
+      return;
+    }
+    const result = await list();
+    const tools = Array.isArray(result) ? result : [];
+    const names2 = tools.map((item) => {
+      if (!item || typeof item !== "object") return "";
+      return String(item.name ?? "");
+    }).filter(Boolean);
+    debugWebMcpLog(`${event}:snapshot`, { count: names2.length, names: names2 });
+  } catch (error) {
+    debugWebMcpLog(`${event}:snapshot-error`, { error: error instanceof Error ? error.message : String(error) });
+  }
+}
+function tryDirectBuiltinUnregisterByName(name16) {
+  const modelContext = getBuiltinModelContext();
+  if (!modelContext?.unregisterTool) {
+    debugWebMcpLog("direct-unregister-skip", { name: name16, reason: "missing-unregister" });
+    return;
+  }
+  debugWebMcpLog("direct-unregister-start", { name: name16 });
+  try {
+    const result = modelContext.unregisterTool.call(modelContext, name16);
+    if (result && typeof result === "object" && "then" in result) {
+      void result.then(() => {
+        debugWebMcpLog("direct-unregister-done", { name: name16, async: true });
+        void debugBuiltinToolSnapshot(`direct-unregister-done:${name16}`);
+      }).catch((error) => {
+        debugWebMcpLog("direct-unregister-error", { name: name16, async: true, error: error instanceof Error ? error.message : String(error) });
+      });
+      return;
+    }
+    debugWebMcpLog("direct-unregister-done", { name: name16, async: false });
+    void debugBuiltinToolSnapshot(`direct-unregister-done:${name16}`);
+  } catch {
+    debugWebMcpLog("direct-unregister-error", { name: name16, async: false });
+  }
+}
+function resolveBuiltinToolDisposer(result) {
+  if (typeof result === "function") {
+    return result;
+  }
+  if (!result || typeof result !== "object") {
+    return null;
+  }
+  const value = result;
+  if (typeof value.unregister === "function") return value.unregister.bind(value);
+  if (typeof value.remove === "function") return value.remove.bind(value);
+  if (typeof value.dispose === "function") return value.dispose.bind(value);
+  if (typeof value.close === "function") return value.close.bind(value);
+  return null;
+}
+function isBuiltinWebMcpSupported() {
+  return !!getBuiltinModelContext();
+}
+function getSchemaTypeName(schema) {
+  return schema._def?.typeName;
+}
+function getSchemaDescription(schema) {
+  return schema.description;
+}
+function withSchemaDescription(schema, base) {
+  const description2 = getSchemaDescription(schema);
+  return description2 ? { ...base, description: description2 } : base;
+}
+function isOptionalSchema(schema) {
+  const typeName = getSchemaTypeName(schema);
+  if (typeName === ZodFirstPartyTypeKind.ZodOptional || typeName === ZodFirstPartyTypeKind.ZodDefault) {
+    return true;
+  }
+  if (typeName === ZodFirstPartyTypeKind.ZodEffects) {
+    const inner = schema._def.schema;
+    return isOptionalSchema(inner);
+  }
+  return false;
+}
+function toPrimitiveJsonType(value) {
+  if (typeof value === "string") return "string";
+  if (typeof value === "number") return "number";
+  if (typeof value === "boolean") return "boolean";
+  if (value === null) return "null";
+  return void 0;
+}
+function zodTypeToJsonSchema(schema) {
+  const typeName = getSchemaTypeName(schema);
+  switch (typeName) {
+    case ZodFirstPartyTypeKind.ZodString:
+      return withSchemaDescription(schema, { type: "string" });
+    case ZodFirstPartyTypeKind.ZodNumber:
+      return withSchemaDescription(schema, { type: "number" });
+    case ZodFirstPartyTypeKind.ZodBoolean:
+      return withSchemaDescription(schema, { type: "boolean" });
+    case ZodFirstPartyTypeKind.ZodArray: {
+      const itemSchema = schema._def.type;
+      return withSchemaDescription(schema, { type: "array", items: zodTypeToJsonSchema(itemSchema) });
+    }
+    case ZodFirstPartyTypeKind.ZodEnum: {
+      const values = schema.options ?? [];
+      return withSchemaDescription(schema, { type: "string", enum: values });
+    }
+    case ZodFirstPartyTypeKind.ZodNativeEnum: {
+      const rawValues = Object.values(schema._def.values);
+      const enumValues = rawValues.filter(
+        (value) => typeof value === "string" || typeof value === "number"
+      );
+      return withSchemaDescription(schema, { enum: enumValues });
+    }
+    case ZodFirstPartyTypeKind.ZodLiteral: {
+      const literalValue = schema._def.value;
+      const primitiveType = toPrimitiveJsonType(literalValue);
+      return withSchemaDescription(schema, {
+        ...primitiveType ? { type: primitiveType } : {},
+        const: literalValue ?? null
+      });
+    }
+    case ZodFirstPartyTypeKind.ZodUnion: {
+      const options = schema._def.options ?? [];
+      return withSchemaDescription(schema, { anyOf: options.map((item) => zodTypeToJsonSchema(item)) });
+    }
+    case ZodFirstPartyTypeKind.ZodNullable: {
+      const inner = schema._def.innerType;
+      return withSchemaDescription(schema, { anyOf: [zodTypeToJsonSchema(inner), { type: "null" }] });
+    }
+    case ZodFirstPartyTypeKind.ZodObject: {
+      const schemaDef = schema;
+      const shape = schemaDef.shape ?? (typeof schemaDef._def?.shape === "function" ? schemaDef._def.shape() : schemaDef._def?.shape) ?? {};
+      return withSchemaDescription(schema, zodShapeToJsonSchema(shape));
+    }
+    case ZodFirstPartyTypeKind.ZodEffects: {
+      const inner = schema._def.schema;
+      return withSchemaDescription(schema, zodTypeToJsonSchema(inner));
+    }
+    case ZodFirstPartyTypeKind.ZodOptional:
+    case ZodFirstPartyTypeKind.ZodDefault: {
+      const inner = schema._def.innerType;
+      return withSchemaDescription(schema, zodTypeToJsonSchema(inner));
+    }
+    default:
+      return withSchemaDescription(schema, {});
+  }
+}
+function zodShapeToJsonSchema(shape = {}) {
+  const properties2 = {};
+  const required2 = [];
+  Object.entries(shape).forEach(([key, schema]) => {
+    properties2[key] = zodTypeToJsonSchema(schema);
+    if (!isOptionalSchema(schema)) {
+      required2.push(key);
+    }
+  });
+  return {
+    type: "object",
+    properties: properties2,
+    ...required2.length ? { required: required2 } : {},
+    additionalProperties: false
+  };
+}
+async function registerBuiltinWebMcpTool(options) {
+  const modelContext = getBuiltinModelContext();
+  if (!modelContext) {
+    debugWebMcpLog("register-builtin-skip", { name: options.name, reason: "unsupported" });
+    return false;
+  }
+  if (nativeRegisteredTools.has(options.name)) {
+    debugWebMcpLog("register-builtin-skip", { name: options.name, reason: "already-registered" });
+    return true;
+  }
+  const cleanupLocalRegisterState = () => {
+    nativeToolDisposers.delete(options.name);
+    nativeRegisteredToolDefs.delete(options.name);
+    nativeRegisteredTools.delete(options.name);
+  };
+  debugWebMcpLog("register-builtin-start", { name: options.name });
+  const task = (async () => {
+    const toolDefinition = {
+      name: options.name,
+      description: options.description,
+      inputSchema: zodShapeToJsonSchema(options.inputSchema ?? {}),
+      execute: options.execute
+    };
+    const result = await modelContext.registerTool(toolDefinition);
+    const disposer = resolveBuiltinToolDisposer(result);
+    if (disposer) {
+      nativeToolDisposers.set(options.name, disposer);
+    }
+    nativeRegisteredToolDefs.set(options.name, toolDefinition);
+    nativeRegisteredTools.add(options.name);
+    debugWebMcpLog("register-builtin-success", { name: options.name, hasDisposer: !!disposer });
+    void debugBuiltinToolSnapshot(`register-success:${options.name}`);
+  })();
+  nativeRegisterTasks.set(options.name, task);
+  try {
+    await task;
+    return true;
+  } catch (error) {
+    cleanupLocalRegisterState();
+    debugWebMcpLog("register-builtin-error", {
+      name: options.name,
+      error: error instanceof Error ? error.message : String(error)
+    });
+    return false;
+  } finally {
+    nativeRegisterTasks.delete(options.name);
+  }
+}
+async function unregisterBuiltinWebMcpTool(name16) {
+  debugWebMcpLog("unregister-builtin-start", { name: name16 });
+  const cleanup = () => {
+    nativeToolDisposers.delete(name16);
+    nativeRegisteredToolDefs.delete(name16);
+    nativeRegisteredTools.delete(name16);
+  };
+  const pendingRegister = nativeRegisterTasks.get(name16);
+  if (pendingRegister) {
+    try {
+      await pendingRegister;
+    } catch {
+    }
+  }
+  const disposer = nativeToolDisposers.get(name16);
+  if (disposer) {
+    try {
+      await disposer();
+      cleanup();
+      debugWebMcpLog("unregister-builtin-success", { name: name16, method: "disposer" });
+      void debugBuiltinToolSnapshot(`unregister-success:${name16}`);
+      return true;
+    } catch (error) {
+      debugWebMcpLog("unregister-builtin-disposer-error", {
+        name: name16,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  const modelContext = getBuiltinModelContext();
+  if (!modelContext) {
+    cleanup();
+    debugWebMcpLog("unregister-builtin-skip", { name: name16, reason: "unsupported" });
+    return false;
+  }
+  if (!modelContext.unregisterTool) {
+    cleanup();
+    debugWebMcpLog("unregister-builtin-skip", { name: name16, reason: "missing-unregister" });
+    return false;
+  }
+  const definition = nativeRegisteredToolDefs.get(name16);
+  const candidates = [name16, { name: name16 }, { toolName: name16 }, { tool: { name: name16 } }, definition].filter(Boolean);
+  for (const candidate of candidates) {
+    try {
+      debugWebMcpLog("unregister-builtin-try", { name: name16, candidate });
+      const result = await modelContext.unregisterTool.call(modelContext, candidate);
+      if (result === false) continue;
+      cleanup();
+      debugWebMcpLog("unregister-builtin-success", { name: name16, method: "unregisterTool", candidate });
+      void debugBuiltinToolSnapshot(`unregister-success:${name16}`);
+      return true;
+    } catch (error) {
+      debugWebMcpLog("unregister-builtin-try-error", {
+        name: name16,
+        candidate,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  cleanup();
+  debugWebMcpLog("unregister-builtin-failed", { name: name16 });
+  void debugBuiltinToolSnapshot(`unregister-failed:${name16}`);
+  return false;
+}
+function hasBuiltinWebMcpTool(name16) {
+  return nativeRegisteredTools.has(name16);
+}
+async function forceResetBuiltinWebMcpTools() {
+  const names2 = Array.from(nativeRegisteredTools);
+  for (const name16 of names2) {
+    try {
+      await unregisterBuiltinWebMcpTool(name16);
+    } catch {
+    }
+  }
+}
+async function listBuiltinWebMcpTools() {
+  const testingApi = getBuiltinModelContextTesting();
+  if (!testingApi?.listTools) return [];
+  try {
+    const result = await testingApi.listTools();
+    return Array.isArray(result) ? result : [];
+  } catch {
+    return [];
+  }
+}
+async function executeBuiltinWebMcpTool(name16, input) {
+  const testingApi = getBuiltinModelContextTesting();
+  if (!testingApi?.executeTool) {
+    throw new Error("当前浏览器不支持 navigator.modelContextTesting.executeTool。");
+  }
+  return await testingApi.executeTool(name16, JSON.stringify(input ?? {}));
+}
 let _navigator = null;
 function setNavigator(fn) {
   _navigator = fn;
 }
-function waitForPageReady(path, timeoutMs = 1500) {
+function isCurrentPathMatched(path) {
+  if (typeof window === "undefined") return false;
+  const target = normalizeRoute(path);
+  const current = normalizeRoute(window.location.pathname);
+  return current === target || current.endsWith(target) && (current.length === target.length || current[current.lastIndexOf(target) - 1] === "/");
+}
+function waitForNavigationReady(path, timeoutMs = 1500) {
   if (typeof window === "undefined") {
     return Promise.resolve();
   }
@@ -50541,9 +51565,15 @@ function waitForPageReady(path, timeoutMs = 1500) {
       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) {
+      if (event.source !== window) return;
+      if (event.data?.type === MSG_PAGE_READY) {
+        const route = normalizeRoute(String(event.data.route ?? ""));
+        if (route === target) {
+          cleanup();
+        }
+        return;
+      }
+      if (event.data?.type === MSG_TOOL_CATALOG_CHANGED && isCurrentPathMatched(target)) {
         cleanup();
       }
     };
@@ -50551,63 +51581,144 @@ function waitForPageReady(path, timeoutMs = 1500) {
     setTimeout(cleanup, timeoutMs);
   });
 }
+function definePageTool(definition) {
+  return definition;
+}
+function registerPageTools(server, definitions2) {
+  return definitions2.map(
+    (definition) => server.registerTool(definition.name, definition.config, {
+      route: definition.route,
+      timeout: definition.timeout,
+      invokeEffect: definition.invokeEffect
+    })
+  );
+}
+function mountPageTools(options) {
+  return registerPageTool(options);
+}
+function registerRuntimePageTools(server, options) {
+  const allTools = options.tools ?? [];
+  if (!allTools.length) {
+    throw new Error("registerRuntimePageTools: tools 不能为空。");
+  }
+  const explicitRoute = options.route ? normalizeRoute(options.route) : null;
+  const routes = new Set(allTools.map((tool2) => normalizeRoute(tool2.route)));
+  if (!explicitRoute && routes.size > 1) {
+    throw new Error("registerRuntimePageTools: tools 包含多个 route，请显式传入 route。");
+  }
+  const mountRoute = explicitRoute ?? Array.from(routes)[0];
+  const routeTools = allTools.filter((tool2) => normalizeRoute(tool2.route) === mountRoute);
+  if (!routeTools.length) {
+    throw new Error(`registerRuntimePageTools: route "${mountRoute}" 下未找到工具定义。`);
+  }
+  routeTools.forEach((definition) => {
+    const route = normalizeRoute(definition.route);
+    const existing = runtimeRegisteredTools.get(definition.name);
+    if (existing) {
+      if (existing.route !== route) {
+        throw new Error(
+          `registerRuntimePageTools: 工具 "${definition.name}" 已绑定路由 "${existing.route}"，不能重复绑定到 "${route}"。`
+        );
+      }
+      existing.refCount += 1;
+      return;
+    }
+    const tool2 = server.registerTool(definition.name, definition.config, {
+      route,
+      timeout: definition.timeout,
+      invokeEffect: definition.invokeEffect
+    });
+    runtimeRegisteredTools.set(definition.name, { tool: tool2, route, refCount: 1 });
+  });
+  const cleanupHandlers = registerPageTool({
+    route: mountRoute,
+    tools: routeTools,
+    context: options.context
+  });
+  return () => {
+    cleanupHandlers();
+    if (options.removeOnUnmount === false) return;
+    routeTools.forEach((definition) => {
+      const existing = runtimeRegisteredTools.get(definition.name);
+      if (!existing) return;
+      existing.refCount -= 1;
+      if (existing.refCount > 0) return;
+      runtimeRegisteredTools.delete(definition.name);
+      server.unregisterTool(definition.name);
+    });
+  };
+}
 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(
+  const inputSchema = {
+    path: stringType().describe('目标页面的路由地址，例如 "/orders"、"/inventory"、"/price-protection" 等。')
+  };
+  const handler = async ({
+    path
+  }) => {
+    if (typeof window === "undefined") {
+      return {
+        content: [{ type: "text", text: "当前环境不支持页面跳转（window 不存在）。" }]
+      };
+    }
+    if (!_navigator) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: "页面跳转失败：尚未在应用入口调用 setNavigator 注册导航函数，无法执行路由跳转。"
+          }
+        ]
+      };
+    }
+    try {
+      if (isCurrentPathMatched(path)) {
+        return {
+          content: [{ type: "text", text: `当前已在页面：${path}。请继续你的下一步操作。` }]
+        };
+      }
+      const readyPromise = waitForNavigationReady(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)}。`
+          }
+        ]
+      };
+    }
+  };
+  const registeredTool = server.registerTool(
     name16,
     {
       title: title2,
       description: description2,
-      inputSchema: {
-        path: stringType().describe('目标页面的路由地址，例如 "/orders"、"/inventory"、"/price-protection" 等。')
-      }
+      inputSchema
     },
-    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)}。`
-            }
-          ]
-        };
-      }
-    }
+    handler
   );
+  const managedByPageTools = typeof server.unregisterTool === "function";
+  if (!managedByPageTools) {
+    void registerBuiltinWebMcpTool({
+      name: name16,
+      description: description2,
+      inputSchema,
+      execute: async (input) => {
+        return await handler(input);
+      }
+    });
+    return attachBuiltinUnregisterOnRemove(name16, registeredTool);
+  }
+  return registeredTool;
 }
 function buildPageHandler(name16, route, timeout = 3e4, effectConfig) {
   return (input) => {
@@ -50650,21 +51761,24 @@ function buildPageHandler(name16, route, timeout = 3e4, effectConfig) {
           if (effectConfig) {
             showToolInvokeEffect(effectConfig);
           }
-          if (activePages.get(route)) {
+          if (isToolReadyOnRoute(route, name16)) {
             sendCallOnce();
             return;
           }
           readyHandler = (event) => {
-            if (event.source === window && event.data?.type === MSG_PAGE_READY && event.data.route === route) {
-              window.removeEventListener("message", readyHandler);
-              sendCallOnce();
-            }
+            if (event.source !== window || event.data?.type !== MSG_PAGE_READY) return;
+            const readyRoute = normalizeRoute(String(event.data.route ?? ""));
+            if (readyRoute !== route) return;
+            const readyTools = Array.isArray(event.data.toolNames) ? new Set(event.data.toolNames.map((item) => String(item))) : null;
+            if (readyTools && !readyTools.has(name16)) return;
+            window.removeEventListener("message", readyHandler);
+            sendCallOnce();
           };
           window.addEventListener("message", readyHandler);
           if (_navigator) {
             await _navigator(route);
           }
-          if (activePages.get(route)) {
+          if (isToolReadyOnRoute(route, name16)) {
             window.removeEventListener("message", readyHandler);
             sendCallOnce();
           }
@@ -50677,31 +51791,125 @@ function buildPageHandler(name16, route, timeout = 3e4, effectConfig) {
     });
   };
 }
-function withPageTools(server) {
+function withPageTools(server, options) {
+  const nativeMode = options?.nativeWebMcp?.mode ?? "auto";
+  const shouldRegisterBuiltin = nativeMode !== "disabled";
+  const proxyRegisteredTools = /* @__PURE__ */ new Map();
+  const unregisterByName = (target, name16, silent = false) => {
+    const existing = proxyRegisteredTools.get(name16);
+    const hadTrackedState = !!existing;
+    debugWebMcpLog("proxy-unregister-start", { name: name16, hasExisting: !!existing, silent });
+    tryDirectBuiltinUnregisterByName(name16);
+    proxyRegisteredTools.delete(name16);
+    runtimeRegisteredTools.delete(name16);
+    if (existing) {
+      try {
+        existing.remove();
+      } catch {
+      }
+    }
+    void unregisterBuiltinWebMcpTool(name16);
+    if (!silent && hadTrackedState) {
+      notifyServerToolListChanged(target);
+      broadcastToolCatalogChanged();
+    }
+    debugWebMcpLog("proxy-unregister-done", { name: name16, removed: !!existing, silent });
+    return !!existing;
+  };
   return new Proxy(server, {
     get(target, prop, receiver) {
+      if (prop === "unregisterTool") {
+        return (name16) => unregisterByName(target, name16, false);
+      }
       if (prop === "registerTool") {
         return (name16, config2, handlerOrRoute) => {
+          debugWebMcpLog("proxy-register-start", {
+            name: name16,
+            mode: typeof handlerOrRoute === "function" ? "callback" : "route",
+            shouldRegisterBuiltin
+          });
+          unregisterByName(target, name16, true);
           const rawRegister = target.registerTool.bind(target);
           if (typeof handlerOrRoute === "function") {
-            return rawRegister(name16, config2, handlerOrRoute);
+            const registeredTool2 = rawRegister(name16, config2, handlerOrRoute);
+            const wrapped2 = shouldRegisterBuiltin ? attachBuiltinUnregisterOnRemove(name16, registeredTool2) : registeredTool2;
+            proxyRegisteredTools.set(name16, wrapped2);
+            notifyServerToolListChanged(target);
+            broadcastToolCatalogChanged();
+            if (shouldRegisterBuiltin) {
+              void registerBuiltinWebMcpTool({
+                name: name16,
+                description: config2?.description,
+                inputSchema: config2?.inputSchema,
+                execute: async (input) => {
+                  return await handlerOrRoute(input);
+                }
+              });
+            }
+            debugWebMcpLog("proxy-register-done", { name: name16, mode: "callback" });
+            return wrapped2;
           }
           const { route, timeout, invokeEffect } = handlerOrRoute;
-          toolRouteMap.set(name16, route);
+          const normalizedRoute = normalizeRoute(route);
           const effectConfig = resolveRuntimeEffectConfig(name16, config2?.title, invokeEffect);
-          return rawRegister(name16, config2, buildPageHandler(name16, route, timeout, effectConfig));
+          const pageHandler = buildPageHandler(name16, normalizedRoute, timeout, effectConfig);
+          const registeredTool = rawRegister(name16, config2, pageHandler);
+          const wrapped = shouldRegisterBuiltin ? attachBuiltinUnregisterOnRemove(name16, registeredTool) : registeredTool;
+          proxyRegisteredTools.set(name16, wrapped);
+          notifyServerToolListChanged(target);
+          broadcastToolCatalogChanged();
+          if (shouldRegisterBuiltin) {
+            void registerBuiltinWebMcpTool({
+              name: name16,
+              description: config2?.description,
+              inputSchema: config2?.inputSchema,
+              execute: async (input) => {
+                return await pageHandler(input);
+              }
+            });
+          }
+          debugWebMcpLog("proxy-register-done", { name: name16, mode: "route" });
+          return wrapped;
         };
       }
       return Reflect.get(target, prop, receiver);
     }
   });
 }
+function resolveRouteAndHandlers(options) {
+  if ("handlers" in options) {
+    return {
+      route: normalizeRoute(options.route ?? window.location.pathname),
+      handlers: options.handlers
+    };
+  }
+  const tools = options.tools ?? [];
+  if (!tools.length) {
+    throw new Error("registerPageTool: tools 不能为空。");
+  }
+  const targetRoute = options.route ? normalizeRoute(options.route) : null;
+  const uniqueRoutes = new Set(tools.map((item) => normalizeRoute(item.route)));
+  if (!targetRoute && uniqueRoutes.size > 1) {
+    throw new Error("registerPageTool: tools 包含多个 route，请显式传入 route 参数。");
+  }
+  const route = targetRoute ?? Array.from(uniqueRoutes)[0];
+  const handlers = {};
+  tools.filter((item) => normalizeRoute(item.route) === route).forEach((item) => {
+    if (handlers[item.name]) {
+      throw new Error(`registerPageTool: 工具 "${item.name}" 在 route "${route}" 上重复定义。`);
+    }
+    handlers[item.name] = (input) => item.handler(input, options.context);
+  });
+  if (!Object.keys(handlers).length) {
+    throw new Error(`registerPageTool: route "${route}" 下未找到可激活的工具定义。`);
+  }
+  return { route, handlers };
+}
 function registerPageTool(options) {
-  const { route: routeOption, handlers } = options;
-  const normalizeRoute2 = (value) => value.replace(/\/+$/, "") || "/";
-  const route = normalizeRoute2(routeOption ?? window.location.pathname);
+  const { route, handlers } = resolveRouteAndHandlers(options);
+  const toolNames = Object.keys(handlers);
   const handleMessage = async (event) => {
-    if (event.source !== window || event.data?.type !== MSG_TOOL_CALL || normalizeRoute2(String(event.data?.route ?? "")) !== route || !(event.data.toolName in handlers)) {
+    if (event.source !== window || event.data?.type !== MSG_TOOL_CALL || normalizeRoute(String(event.data?.route ?? "")) !== route || !(event.data.toolName in handlers)) {
       return;
     }
     const { callId, toolName, input } = event.data;
@@ -50719,9 +51927,9 @@ function registerPageTool(options) {
       );
     }
   };
-  activePages.set(route, true);
+  activePages.set(route, new Set(toolNames));
   window.addEventListener("message", handleMessage);
-  broadcastRouteChange(MSG_PAGE_READY, route);
+  broadcastRouteChange(MSG_PAGE_READY, route, { toolNames });
   return () => {
     activePages.delete(route);
     window.removeEventListener("message", handleMessage);
@@ -50893,6 +52101,7 @@ export {
   MSG_PAGE_LEAVE,
   MSG_REMOTER_READY,
   MSG_ROUTE_STATE_INITIAL,
+  MSG_TOOL_CATALOG_CHANGED,
   QrCode,
   ResourceTemplate,
   UriTemplate,
@@ -50906,8 +52115,12 @@ export {
   createSSEClientTransport,
   createSkillTools,
   createStreamableHTTPClientTransport,
+  definePageTool,
+  executeBuiltinWebMcpTool,
+  forceResetBuiltinWebMcpTools,
   formatSkillsForSystemPrompt,
   getAISDKTools,
+  getActivePageTools,
   getActiveRoutes,
   getDisplayName,
   getMainSkillPathByName,
@@ -50916,16 +52129,24 @@ export {
   getSkillMdPaths,
   getSkillOverviews,
   getToolRouteMap,
+  hasBuiltinWebMcpTool,
+  isBuiltinWebMcpSupported,
   isMcpClient,
   isMcpServer,
   isMessageChannelClientTransport,
   isMessageChannelServerTransport,
   isSSEClientTransport,
   isStreamableHTTPClientTransport,
+  listBuiltinWebMcpTools,
+  mountPageTools,
   parseSkillFrontMatter,
+  registerBuiltinWebMcpTool,
   registerNavigateTool,
   registerPageTool,
+  registerPageTools,
+  registerRuntimePageTools,
   setNavigator,
+  unregisterBuiltinWebMcpTool,
   withPageTools,
   z
 };