@opentiny/next-sdk 0.2.4 → 0.2.6-beta.0

package/dist/index.es.dev.js

@@ -171,7 +171,7 @@ function requireScope() {
   (function(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.ValueScope = exports.ValueScopeName = exports.Scope = exports.varKinds = exports.UsedValueState = void 0;
-    const code_1 = requireCode$1();
+    const code_1 = /* @__PURE__ */ requireCode$1();
     class ValueError extends Error {
       constructor(name16) {
         super(`CodeGen: "code" for ${name16} not defined`);
@@ -317,9 +317,9 @@ function requireCodegen() {
   (function(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.or = exports.and = exports.not = exports.CodeGen = exports.operators = exports.varKinds = exports.ValueScopeName = exports.ValueScope = exports.Scope = exports.Name = exports.regexpCode = exports.stringify = exports.getProperty = exports.nil = exports.strConcat = exports.str = exports._ = void 0;
-    const code_1 = requireCode$1();
-    const scope_1 = requireScope();
-    var code_2 = requireCode$1();
+    const code_1 = /* @__PURE__ */ requireCode$1();
+    const scope_1 = /* @__PURE__ */ requireScope();
+    var code_2 = /* @__PURE__ */ requireCode$1();
     Object.defineProperty(exports, "_", { enumerable: true, get: function() {
       return code_2._;
     } });
@@ -344,7 +344,7 @@ function requireCodegen() {
     Object.defineProperty(exports, "Name", { enumerable: true, get: function() {
       return code_2.Name;
     } });
-    var scope_2 = requireScope();
+    var scope_2 = /* @__PURE__ */ requireScope();
     Object.defineProperty(exports, "Scope", { enumerable: true, get: function() {
       return scope_2.Scope;
     } });
@@ -1038,8 +1038,8 @@ function requireUtil() {
   hasRequiredUtil = 1;
   Object.defineProperty(util$1, "__esModule", { value: true });
   util$1.checkStrictMode = util$1.getErrorPath = util$1.Type = util$1.useFunc = util$1.setEvaluated = util$1.evaluatedPropsToName = util$1.mergeEvaluated = util$1.eachItem = util$1.unescapeJsonPointer = util$1.escapeJsonPointer = util$1.escapeFragment = util$1.unescapeFragment = util$1.schemaRefOrVal = util$1.schemaHasRulesButRef = util$1.schemaHasRules = util$1.checkUnknownRules = util$1.alwaysValidSchema = util$1.toHash = void 0;
-  const codegen_1 = requireCodegen();
-  const code_1 = requireCode$1();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const code_1 = /* @__PURE__ */ requireCode$1();
   function toHash(arr) {
     const hash = {};
     for (const item of arr)
@@ -1204,7 +1204,7 @@ function requireNames() {
   if (hasRequiredNames) return names;
   hasRequiredNames = 1;
   Object.defineProperty(names, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
   const names$1 = {
     // validation function arguments
     data: new codegen_1.Name("data"),
@@ -1244,9 +1244,9 @@ function requireErrors() {
   (function(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.extendErrors = exports.resetErrorsCount = exports.reportExtraError = exports.reportError = exports.keyword$DataError = exports.keywordError = void 0;
-    const codegen_1 = requireCodegen();
-    const util_1 = requireUtil();
-    const names_1 = requireNames();
+    const codegen_1 = /* @__PURE__ */ requireCodegen();
+    const util_1 = /* @__PURE__ */ requireUtil();
+    const names_1 = /* @__PURE__ */ requireNames();
     exports.keywordError = {
       message: ({ keyword: keyword2 }) => (0, codegen_1.str)`must pass "${keyword2}" keyword validation`
     };
@@ -1366,9 +1366,9 @@ function requireBoolSchema() {
   hasRequiredBoolSchema = 1;
   Object.defineProperty(boolSchema, "__esModule", { value: true });
   boolSchema.boolOrEmptySchema = boolSchema.topBoolOrEmptySchema = void 0;
-  const errors_1 = requireErrors();
-  const codegen_1 = requireCodegen();
-  const names_1 = requireNames();
+  const errors_1 = /* @__PURE__ */ requireErrors();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const names_1 = /* @__PURE__ */ requireNames();
   const boolError = {
     message: "boolean schema is false"
   };
@@ -1471,11 +1471,11 @@ function requireDataType() {
   hasRequiredDataType = 1;
   Object.defineProperty(dataType, "__esModule", { value: true });
   dataType.reportTypeError = dataType.checkDataTypes = dataType.checkDataType = dataType.coerceAndCheckDataType = dataType.getJSONTypes = dataType.getSchemaTypes = dataType.DataType = void 0;
-  const rules_1 = requireRules();
-  const applicability_1 = requireApplicability();
-  const errors_1 = requireErrors();
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
+  const rules_1 = /* @__PURE__ */ requireRules();
+  const applicability_1 = /* @__PURE__ */ requireApplicability();
+  const errors_1 = /* @__PURE__ */ requireErrors();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
   var DataType;
   (function(DataType2) {
     DataType2[DataType2["Correct"] = 0] = "Correct";
@@ -1655,8 +1655,8 @@ function requireDefaults() {
   hasRequiredDefaults = 1;
   Object.defineProperty(defaults, "__esModule", { value: true });
   defaults.assignDefaults = void 0;
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
   function assignDefaults(it, ty) {
     const { properties: properties2, items: items2 } = it.schema;
     if (ty === "object" && properties2) {
@@ -1693,10 +1693,10 @@ function requireCode() {
   hasRequiredCode = 1;
   Object.defineProperty(code, "__esModule", { value: true });
   code.validateUnion = code.validateArray = code.usePattern = code.callValidateCode = code.schemaProperties = code.allSchemaProperties = code.noPropertyInData = code.propertyInData = code.isOwnProperty = code.hasPropFunc = code.reportMissingProp = code.checkMissingProp = code.checkReportMissingProp = void 0;
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
-  const names_1 = requireNames();
-  const util_2 = requireUtil();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const names_1 = /* @__PURE__ */ requireNames();
+  const util_2 = /* @__PURE__ */ requireUtil();
   function checkReportMissingProp(cxt, prop) {
     const { gen, data, it } = cxt;
     gen.if(noPropertyInData(gen, data, prop, it.opts.ownProperties), () => {
@@ -1825,10 +1825,10 @@ function requireKeyword() {
   hasRequiredKeyword = 1;
   Object.defineProperty(keyword, "__esModule", { value: true });
   keyword.validateKeywordUsage = keyword.validSchemaType = keyword.funcKeywordCode = keyword.macroKeywordCode = void 0;
-  const codegen_1 = requireCodegen();
-  const names_1 = requireNames();
-  const code_1 = requireCode();
-  const errors_1 = requireErrors();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const names_1 = /* @__PURE__ */ requireNames();
+  const code_1 = /* @__PURE__ */ requireCode();
+  const errors_1 = /* @__PURE__ */ requireErrors();
   function macroKeywordCode(cxt, def) {
     const { gen, keyword: keyword2, schema, parentSchema, it } = cxt;
     const macroSchema = def.macro.call(it.self, schema, parentSchema, it);
@@ -1943,8 +1943,8 @@ function requireSubschema() {
   hasRequiredSubschema = 1;
   Object.defineProperty(subschema, "__esModule", { value: true });
   subschema.extendSubschemaMode = subschema.extendSubschemaData = subschema.getSubschema = void 0;
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
   function getSubschema(it, { keyword: keyword2, schemaProp, schema, schemaPath, errSchemaPath, topSchemaRef }) {
     if (keyword2 !== void 0 && schema !== void 0) {
       throw new Error('both "keyword" and "schema" passed, only one allowed');
@@ -2149,7 +2149,7 @@ function requireResolve() {
   hasRequiredResolve = 1;
   Object.defineProperty(resolve$1, "__esModule", { value: true });
   resolve$1.getSchemaRefs = resolve$1.resolveUrl = resolve$1.normalizeId = resolve$1._getFullPath = resolve$1.getFullPath = resolve$1.inlineRef = void 0;
-  const util_1 = requireUtil();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const equal2 = requireFastDeepEqual();
   const traverse = requireJsonSchemaTraverse();
   const SIMPLE_INLINED = /* @__PURE__ */ new Set([
@@ -2304,18 +2304,18 @@ function requireValidate() {
   hasRequiredValidate = 1;
   Object.defineProperty(validate, "__esModule", { value: true });
   validate.getData = validate.KeywordCxt = validate.validateFunctionCode = void 0;
-  const boolSchema_1 = requireBoolSchema();
-  const dataType_1 = requireDataType();
-  const applicability_1 = requireApplicability();
-  const dataType_2 = requireDataType();
-  const defaults_1 = requireDefaults();
-  const keyword_1 = requireKeyword();
-  const subschema_1 = requireSubschema();
-  const codegen_1 = requireCodegen();
-  const names_1 = requireNames();
-  const resolve_1 = requireResolve();
-  const util_1 = requireUtil();
-  const errors_1 = requireErrors();
+  const boolSchema_1 = /* @__PURE__ */ requireBoolSchema();
+  const dataType_1 = /* @__PURE__ */ requireDataType();
+  const applicability_1 = /* @__PURE__ */ requireApplicability();
+  const dataType_2 = /* @__PURE__ */ requireDataType();
+  const defaults_1 = /* @__PURE__ */ requireDefaults();
+  const keyword_1 = /* @__PURE__ */ requireKeyword();
+  const subschema_1 = /* @__PURE__ */ requireSubschema();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const names_1 = /* @__PURE__ */ requireNames();
+  const resolve_1 = /* @__PURE__ */ requireResolve();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const errors_1 = /* @__PURE__ */ requireErrors();
   function validateFunctionCode(it) {
     if (isSchemaObj(it)) {
       checkKeywords(it);
@@ -2826,7 +2826,7 @@ function requireRef_error() {
   if (hasRequiredRef_error) return ref_error;
   hasRequiredRef_error = 1;
   Object.defineProperty(ref_error, "__esModule", { value: true });
-  const resolve_1 = requireResolve();
+  const resolve_1 = /* @__PURE__ */ requireResolve();
   class MissingRefError extends Error {
     constructor(resolver, baseId, ref2, msg) {
       super(msg || `can't resolve reference ${ref2} from id ${baseId}`);
@@ -2844,12 +2844,12 @@ function requireCompile() {
   hasRequiredCompile = 1;
   Object.defineProperty(compile, "__esModule", { value: true });
   compile.resolveSchema = compile.getCompilingSchema = compile.resolveRef = compile.compileSchema = compile.SchemaEnv = void 0;
-  const codegen_1 = requireCodegen();
-  const validation_error_1 = requireValidation_error();
-  const names_1 = requireNames();
-  const resolve_1 = requireResolve();
-  const util_1 = requireUtil();
-  const validate_1 = requireValidate();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const validation_error_1 = /* @__PURE__ */ requireValidation_error();
+  const names_1 = /* @__PURE__ */ requireNames();
+  const resolve_1 = /* @__PURE__ */ requireResolve();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const validate_1 = /* @__PURE__ */ requireValidate();
   class SchemaEnv {
     constructor(env) {
       var _a10;
@@ -3083,7 +3083,7 @@ function requireUtils$2() {
   if (hasRequiredUtils$2) return utils$2;
   hasRequiredUtils$2 = 1;
   const isUUID = RegExp.prototype.test.bind(/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu);
-  const isIPv4 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u);
+  const isIPv42 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u);
   function stringArrayToHexStripped(input) {
     let acc = "";
     let code2 = 0;
@@ -3306,7 +3306,7 @@ function requireUtils$2() {
     }
     if (component.host !== void 0) {
       let host = unescape(component.host);
-      if (!isIPv4(host)) {
+      if (!isIPv42(host)) {
         const ipV6res = normalizeIPv6(host);
         if (ipV6res.isIPV6 === true) {
           host = `[${ipV6res.escapedHost}]`;
@@ -3327,7 +3327,7 @@ function requireUtils$2() {
     recomposeAuthority,
     normalizeComponentEncoding,
     removeDotSegments,
-    isIPv4,
+    isIPv4: isIPv42,
     isUUID,
     normalizeIPv6,
     stringArrayToHexStripped
@@ -3548,7 +3548,7 @@ var hasRequiredFastUri;
 function requireFastUri() {
   if (hasRequiredFastUri) return fastUri.exports;
   hasRequiredFastUri = 1;
-  const { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizeComponentEncoding, isIPv4, nonSimpleDomain } = requireUtils$2();
+  const { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizeComponentEncoding, isIPv4: isIPv42, nonSimpleDomain } = requireUtils$2();
   const { SCHEMES, getSchemeHandler } = requireSchemes();
   function normalize(uri2, options) {
     if (typeof uri2 === "string") {
@@ -3729,7 +3729,7 @@ function requireFastUri() {
         parsed.port = matches[5];
       }
       if (parsed.host) {
-        const ipv4result = isIPv4(parsed.host);
+        const ipv4result = isIPv42(parsed.host);
         if (ipv4result === false) {
           const ipv6result = normalizeIPv6(parsed.host);
           parsed.host = ipv6result.host.toLowerCase();
@@ -3815,11 +3815,11 @@ function requireCore$1() {
   (function(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.CodeGen = exports.Name = exports.nil = exports.stringify = exports.str = exports._ = exports.KeywordCxt = void 0;
-    var validate_1 = requireValidate();
+    var validate_1 = /* @__PURE__ */ requireValidate();
     Object.defineProperty(exports, "KeywordCxt", { enumerable: true, get: function() {
       return validate_1.KeywordCxt;
     } });
-    var codegen_1 = requireCodegen();
+    var codegen_1 = /* @__PURE__ */ requireCodegen();
     Object.defineProperty(exports, "_", { enumerable: true, get: function() {
       return codegen_1._;
     } });
@@ -3838,16 +3838,16 @@ function requireCore$1() {
     Object.defineProperty(exports, "CodeGen", { enumerable: true, get: function() {
       return codegen_1.CodeGen;
     } });
-    const validation_error_1 = requireValidation_error();
-    const ref_error_1 = requireRef_error();
-    const rules_1 = requireRules();
-    const compile_1 = requireCompile();
-    const codegen_2 = requireCodegen();
-    const resolve_1 = requireResolve();
-    const dataType_1 = requireDataType();
-    const util_1 = requireUtil();
+    const validation_error_1 = /* @__PURE__ */ requireValidation_error();
+    const ref_error_1 = /* @__PURE__ */ requireRef_error();
+    const rules_1 = /* @__PURE__ */ requireRules();
+    const compile_1 = /* @__PURE__ */ requireCompile();
+    const codegen_2 = /* @__PURE__ */ requireCodegen();
+    const resolve_1 = /* @__PURE__ */ requireResolve();
+    const dataType_1 = /* @__PURE__ */ requireDataType();
+    const util_1 = /* @__PURE__ */ requireUtil();
     const $dataRefSchema = require$$9;
-    const uri_1 = requireUri();
+    const uri_1 = /* @__PURE__ */ requireUri();
     const defaultRegExp = (str, flags) => new RegExp(str, flags);
     defaultRegExp.code = "new RegExp";
     const META_IGNORE_OPTIONS = ["removeAdditional", "useDefaults", "coerceTypes"];
@@ -4444,12 +4444,12 @@ function requireRef() {
   hasRequiredRef = 1;
   Object.defineProperty(ref, "__esModule", { value: true });
   ref.callRef = ref.getValidate = void 0;
-  const ref_error_1 = requireRef_error();
-  const code_1 = requireCode();
-  const codegen_1 = requireCodegen();
-  const names_1 = requireNames();
-  const compile_1 = requireCompile();
-  const util_1 = requireUtil();
+  const ref_error_1 = /* @__PURE__ */ requireRef_error();
+  const code_1 = /* @__PURE__ */ requireCode();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const names_1 = /* @__PURE__ */ requireNames();
+  const compile_1 = /* @__PURE__ */ requireCompile();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const def = {
     keyword: "$ref",
     schemaType: "string",
@@ -4564,8 +4564,8 @@ function requireCore() {
   if (hasRequiredCore) return core;
   hasRequiredCore = 1;
   Object.defineProperty(core, "__esModule", { value: true });
-  const id_1 = requireId();
-  const ref_1 = requireRef();
+  const id_1 = /* @__PURE__ */ requireId();
+  const ref_1 = /* @__PURE__ */ requireRef();
   const core$12 = [
     "$schema",
     "$id",
@@ -4586,7 +4586,7 @@ function requireLimitNumber() {
   if (hasRequiredLimitNumber) return limitNumber;
   hasRequiredLimitNumber = 1;
   Object.defineProperty(limitNumber, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
   const ops = codegen_1.operators;
   const KWDs = {
     maximum: { okStr: "<=", ok: ops.LTE, fail: ops.GT },
@@ -4618,7 +4618,7 @@ function requireMultipleOf() {
   if (hasRequiredMultipleOf) return multipleOf;
   hasRequiredMultipleOf = 1;
   Object.defineProperty(multipleOf, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
   const error = {
     message: ({ schemaCode }) => (0, codegen_1.str)`must be multiple of ${schemaCode}`,
     params: ({ schemaCode }) => (0, codegen_1._)`{multipleOf: ${schemaCode}}`
@@ -4672,9 +4672,9 @@ function requireLimitLength() {
   if (hasRequiredLimitLength) return limitLength;
   hasRequiredLimitLength = 1;
   Object.defineProperty(limitLength, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
-  const ucs2length_1 = requireUcs2length();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const ucs2length_1 = /* @__PURE__ */ requireUcs2length();
   const error = {
     message({ keyword: keyword2, schemaCode }) {
       const comp = keyword2 === "maxLength" ? "more" : "fewer";
@@ -4704,8 +4704,9 @@ function requirePattern() {
   if (hasRequiredPattern) return pattern;
   hasRequiredPattern = 1;
   Object.defineProperty(pattern, "__esModule", { value: true });
-  const code_1 = requireCode();
-  const codegen_1 = requireCodegen();
+  const code_1 = /* @__PURE__ */ requireCode();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
   const error = {
     message: ({ schemaCode }) => (0, codegen_1.str)`must match pattern "${schemaCode}"`,
     params: ({ schemaCode }) => (0, codegen_1._)`{pattern: ${schemaCode}}`
@@ -4717,10 +4718,18 @@ function requirePattern() {
     $data: true,
     error,
     code(cxt) {
-      const { data, $data, schema, schemaCode, it } = cxt;
+      const { gen, data, $data, schema, schemaCode, it } = cxt;
       const u = it.opts.unicodeRegExp ? "u" : "";
-      const regExp = $data ? (0, codegen_1._)`(new RegExp(${schemaCode}, ${u}))` : (0, code_1.usePattern)(cxt, schema);
-      cxt.fail$data((0, codegen_1._)`!${regExp}.test(${data})`);
+      if ($data) {
+        const { regExp } = it.opts.code;
+        const regExpCode = regExp.code === "new RegExp" ? (0, codegen_1._)`new RegExp` : (0, util_1.useFunc)(gen, regExp);
+        const valid = gen.let("valid");
+        gen.try(() => gen.assign(valid, (0, codegen_1._)`${regExpCode}(${schemaCode}, ${u}).test(${data})`), () => gen.assign(valid, false));
+        cxt.fail$data((0, codegen_1._)`!${valid}`);
+      } else {
+        const regExp = (0, code_1.usePattern)(cxt, schema);
+        cxt.fail$data((0, codegen_1._)`!${regExp}.test(${data})`);
+      }
     }
   };
   pattern.default = def;
@@ -4732,7 +4741,7 @@ function requireLimitProperties() {
   if (hasRequiredLimitProperties) return limitProperties;
   hasRequiredLimitProperties = 1;
   Object.defineProperty(limitProperties, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
   const error = {
     message({ keyword: keyword2, schemaCode }) {
       const comp = keyword2 === "maxProperties" ? "more" : "fewer";
@@ -4761,9 +4770,9 @@ function requireRequired() {
   if (hasRequiredRequired) return required$1;
   hasRequiredRequired = 1;
   Object.defineProperty(required$1, "__esModule", { value: true });
-  const code_1 = requireCode();
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
+  const code_1 = /* @__PURE__ */ requireCode();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const error = {
     message: ({ params: { missingProperty } }) => (0, codegen_1.str)`must have required property '${missingProperty}'`,
     params: ({ params: { missingProperty } }) => (0, codegen_1._)`{missingProperty: ${missingProperty}}`
@@ -4843,7 +4852,7 @@ function requireLimitItems() {
   if (hasRequiredLimitItems) return limitItems;
   hasRequiredLimitItems = 1;
   Object.defineProperty(limitItems, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
   const error = {
     message({ keyword: keyword2, schemaCode }) {
       const comp = keyword2 === "maxItems" ? "more" : "fewer";
@@ -4883,10 +4892,10 @@ function requireUniqueItems() {
   if (hasRequiredUniqueItems) return uniqueItems;
   hasRequiredUniqueItems = 1;
   Object.defineProperty(uniqueItems, "__esModule", { value: true });
-  const dataType_1 = requireDataType();
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
-  const equal_1 = requireEqual();
+  const dataType_1 = /* @__PURE__ */ requireDataType();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const equal_1 = /* @__PURE__ */ requireEqual();
   const error = {
     message: ({ params: { i, j } }) => (0, codegen_1.str)`must NOT have duplicate items (items ## ${j} and ${i} are identical)`,
     params: ({ params: { i, j } }) => (0, codegen_1._)`{i: ${i}, j: ${j}}`
@@ -4950,9 +4959,9 @@ function require_const() {
   if (hasRequired_const) return _const;
   hasRequired_const = 1;
   Object.defineProperty(_const, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
-  const equal_1 = requireEqual();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const equal_1 = /* @__PURE__ */ requireEqual();
   const error = {
     message: "must be equal to constant",
     params: ({ schemaCode }) => (0, codegen_1._)`{allowedValue: ${schemaCode}}`
@@ -4979,9 +4988,9 @@ function require_enum() {
   if (hasRequired_enum) return _enum$1;
   hasRequired_enum = 1;
   Object.defineProperty(_enum$1, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
-  const equal_1 = requireEqual();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const equal_1 = /* @__PURE__ */ requireEqual();
   const error = {
     message: "must be equal to one of the allowed values",
     params: ({ schemaCode }) => (0, codegen_1._)`{allowedValues: ${schemaCode}}`
@@ -5027,16 +5036,16 @@ function requireValidation() {
   if (hasRequiredValidation) return validation;
   hasRequiredValidation = 1;
   Object.defineProperty(validation, "__esModule", { value: true });
-  const limitNumber_1 = requireLimitNumber();
-  const multipleOf_1 = requireMultipleOf();
-  const limitLength_1 = requireLimitLength();
-  const pattern_1 = requirePattern();
-  const limitProperties_1 = requireLimitProperties();
-  const required_1 = requireRequired();
-  const limitItems_1 = requireLimitItems();
-  const uniqueItems_1 = requireUniqueItems();
-  const const_1 = require_const();
-  const enum_1 = require_enum();
+  const limitNumber_1 = /* @__PURE__ */ requireLimitNumber();
+  const multipleOf_1 = /* @__PURE__ */ requireMultipleOf();
+  const limitLength_1 = /* @__PURE__ */ requireLimitLength();
+  const pattern_1 = /* @__PURE__ */ requirePattern();
+  const limitProperties_1 = /* @__PURE__ */ requireLimitProperties();
+  const required_1 = /* @__PURE__ */ requireRequired();
+  const limitItems_1 = /* @__PURE__ */ requireLimitItems();
+  const uniqueItems_1 = /* @__PURE__ */ requireUniqueItems();
+  const const_1 = /* @__PURE__ */ require_const();
+  const enum_1 = /* @__PURE__ */ require_enum();
   const validation$1 = [
     // number
     limitNumber_1.default,
@@ -5067,8 +5076,8 @@ function requireAdditionalItems() {
   hasRequiredAdditionalItems = 1;
   Object.defineProperty(additionalItems, "__esModule", { value: true });
   additionalItems.validateAdditionalItems = void 0;
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const error = {
     message: ({ params: { len } }) => (0, codegen_1.str)`must NOT have more than ${len} items`,
     params: ({ params: { len } }) => (0, codegen_1._)`{limit: ${len}}`
@@ -5121,9 +5130,9 @@ function requireItems() {
   hasRequiredItems = 1;
   Object.defineProperty(items, "__esModule", { value: true });
   items.validateTuple = void 0;
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
-  const code_1 = requireCode();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const code_1 = /* @__PURE__ */ requireCode();
   const def = {
     keyword: "items",
     type: "array",
@@ -5176,7 +5185,7 @@ function requirePrefixItems() {
   if (hasRequiredPrefixItems) return prefixItems;
   hasRequiredPrefixItems = 1;
   Object.defineProperty(prefixItems, "__esModule", { value: true });
-  const items_1 = requireItems();
+  const items_1 = /* @__PURE__ */ requireItems();
   const def = {
     keyword: "prefixItems",
     type: "array",
@@ -5193,10 +5202,10 @@ function requireItems2020() {
   if (hasRequiredItems2020) return items2020;
   hasRequiredItems2020 = 1;
   Object.defineProperty(items2020, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
-  const code_1 = requireCode();
-  const additionalItems_1 = requireAdditionalItems();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const code_1 = /* @__PURE__ */ requireCode();
+  const additionalItems_1 = /* @__PURE__ */ requireAdditionalItems();
   const error = {
     message: ({ params: { len } }) => (0, codegen_1.str)`must NOT have more than ${len} items`,
     params: ({ params: { len } }) => (0, codegen_1._)`{limit: ${len}}`
@@ -5228,8 +5237,8 @@ function requireContains() {
   if (hasRequiredContains) return contains;
   hasRequiredContains = 1;
   Object.defineProperty(contains, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const error = {
     message: ({ params: { min, max } }) => max === void 0 ? (0, codegen_1.str)`must contain at least ${min} valid item(s)` : (0, codegen_1.str)`must contain at least ${min} and no more than ${max} valid item(s)`,
     params: ({ params: { min, max } }) => max === void 0 ? (0, codegen_1._)`{minContains: ${min}}` : (0, codegen_1._)`{minContains: ${min}, maxContains: ${max}}`
@@ -5324,9 +5333,9 @@ function requireDependencies() {
   (function(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.validateSchemaDeps = exports.validatePropertyDeps = exports.error = void 0;
-    const codegen_1 = requireCodegen();
-    const util_1 = requireUtil();
-    const code_1 = requireCode();
+    const codegen_1 = /* @__PURE__ */ requireCodegen();
+    const util_1 = /* @__PURE__ */ requireUtil();
+    const code_1 = /* @__PURE__ */ requireCode();
     exports.error = {
       message: ({ params: { property, depsCount, deps } }) => {
         const property_ies = depsCount === 1 ? "property" : "properties";
@@ -5418,8 +5427,8 @@ function requirePropertyNames() {
   if (hasRequiredPropertyNames) return propertyNames;
   hasRequiredPropertyNames = 1;
   Object.defineProperty(propertyNames, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const error = {
     message: "property name must be valid",
     params: ({ params }) => (0, codegen_1._)`{propertyName: ${params.propertyName}}`
@@ -5461,10 +5470,10 @@ function requireAdditionalProperties() {
   if (hasRequiredAdditionalProperties) return additionalProperties;
   hasRequiredAdditionalProperties = 1;
   Object.defineProperty(additionalProperties, "__esModule", { value: true });
-  const code_1 = requireCode();
-  const codegen_1 = requireCodegen();
-  const names_1 = requireNames();
-  const util_1 = requireUtil();
+  const code_1 = /* @__PURE__ */ requireCode();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const names_1 = /* @__PURE__ */ requireNames();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const error = {
     message: "must NOT have additional properties",
     params: ({ params }) => (0, codegen_1._)`{additionalProperty: ${params.additionalProperty}}`
@@ -5567,10 +5576,10 @@ function requireProperties() {
   if (hasRequiredProperties) return properties$1;
   hasRequiredProperties = 1;
   Object.defineProperty(properties$1, "__esModule", { value: true });
-  const validate_1 = requireValidate();
-  const code_1 = requireCode();
-  const util_1 = requireUtil();
-  const additionalProperties_1 = requireAdditionalProperties();
+  const validate_1 = /* @__PURE__ */ requireValidate();
+  const code_1 = /* @__PURE__ */ requireCode();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const additionalProperties_1 = /* @__PURE__ */ requireAdditionalProperties();
   const def = {
     keyword: "properties",
     type: "object",
@@ -5625,10 +5634,10 @@ function requirePatternProperties() {
   if (hasRequiredPatternProperties) return patternProperties;
   hasRequiredPatternProperties = 1;
   Object.defineProperty(patternProperties, "__esModule", { value: true });
-  const code_1 = requireCode();
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
-  const util_2 = requireUtil();
+  const code_1 = /* @__PURE__ */ requireCode();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
+  const util_2 = /* @__PURE__ */ requireUtil();
   const def = {
     keyword: "patternProperties",
     type: "object",
@@ -5699,7 +5708,7 @@ function requireNot() {
   if (hasRequiredNot) return not;
   hasRequiredNot = 1;
   Object.defineProperty(not, "__esModule", { value: true });
-  const util_1 = requireUtil();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const def = {
     keyword: "not",
     schemaType: ["object", "boolean"],
@@ -5730,7 +5739,7 @@ function requireAnyOf() {
   if (hasRequiredAnyOf) return anyOf;
   hasRequiredAnyOf = 1;
   Object.defineProperty(anyOf, "__esModule", { value: true });
-  const code_1 = requireCode();
+  const code_1 = /* @__PURE__ */ requireCode();
   const def = {
     keyword: "anyOf",
     schemaType: "array",
@@ -5747,8 +5756,8 @@ function requireOneOf() {
   if (hasRequiredOneOf) return oneOf;
   hasRequiredOneOf = 1;
   Object.defineProperty(oneOf, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const error = {
     message: "must match exactly one schema in oneOf",
     params: ({ params }) => (0, codegen_1._)`{passingSchemas: ${params.passing}}`
@@ -5805,7 +5814,7 @@ function requireAllOf() {
   if (hasRequiredAllOf) return allOf;
   hasRequiredAllOf = 1;
   Object.defineProperty(allOf, "__esModule", { value: true });
-  const util_1 = requireUtil();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const def = {
     keyword: "allOf",
     schemaType: "array",
@@ -5832,8 +5841,8 @@ function require_if() {
   if (hasRequired_if) return _if;
   hasRequired_if = 1;
   Object.defineProperty(_if, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
-  const util_1 = requireUtil();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const error = {
     message: ({ params }) => (0, codegen_1.str)`must match "${params.ifClause}" schema`,
     params: ({ params }) => (0, codegen_1._)`{failingKeyword: ${params.ifClause}}`
@@ -5901,7 +5910,7 @@ function requireThenElse() {
   if (hasRequiredThenElse) return thenElse;
   hasRequiredThenElse = 1;
   Object.defineProperty(thenElse, "__esModule", { value: true });
-  const util_1 = requireUtil();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const def = {
     keyword: ["then", "else"],
     schemaType: ["object", "boolean"],
@@ -5918,22 +5927,22 @@ function requireApplicator() {
   if (hasRequiredApplicator) return applicator;
   hasRequiredApplicator = 1;
   Object.defineProperty(applicator, "__esModule", { value: true });
-  const additionalItems_1 = requireAdditionalItems();
-  const prefixItems_1 = requirePrefixItems();
-  const items_1 = requireItems();
-  const items2020_1 = requireItems2020();
-  const contains_1 = requireContains();
-  const dependencies_1 = requireDependencies();
-  const propertyNames_1 = requirePropertyNames();
-  const additionalProperties_1 = requireAdditionalProperties();
-  const properties_1 = requireProperties();
-  const patternProperties_1 = requirePatternProperties();
-  const not_1 = requireNot();
-  const anyOf_1 = requireAnyOf();
-  const oneOf_1 = requireOneOf();
-  const allOf_1 = requireAllOf();
-  const if_1 = require_if();
-  const thenElse_1 = requireThenElse();
+  const additionalItems_1 = /* @__PURE__ */ requireAdditionalItems();
+  const prefixItems_1 = /* @__PURE__ */ requirePrefixItems();
+  const items_1 = /* @__PURE__ */ requireItems();
+  const items2020_1 = /* @__PURE__ */ requireItems2020();
+  const contains_1 = /* @__PURE__ */ requireContains();
+  const dependencies_1 = /* @__PURE__ */ requireDependencies();
+  const propertyNames_1 = /* @__PURE__ */ requirePropertyNames();
+  const additionalProperties_1 = /* @__PURE__ */ requireAdditionalProperties();
+  const properties_1 = /* @__PURE__ */ requireProperties();
+  const patternProperties_1 = /* @__PURE__ */ requirePatternProperties();
+  const not_1 = /* @__PURE__ */ requireNot();
+  const anyOf_1 = /* @__PURE__ */ requireAnyOf();
+  const oneOf_1 = /* @__PURE__ */ requireOneOf();
+  const allOf_1 = /* @__PURE__ */ requireAllOf();
+  const if_1 = /* @__PURE__ */ require_if();
+  const thenElse_1 = /* @__PURE__ */ requireThenElse();
   function getApplicator(draft2020 = false) {
     const applicator2 = [
       // any
@@ -5967,7 +5976,7 @@ function requireFormat$1() {
   if (hasRequiredFormat$1) return format;
   hasRequiredFormat$1 = 1;
   Object.defineProperty(format, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
   const error = {
     message: ({ schemaCode }) => (0, codegen_1.str)`must match format "${schemaCode}"`,
     params: ({ schemaCode }) => (0, codegen_1._)`{format: ${schemaCode}}`
@@ -6056,7 +6065,7 @@ function requireFormat() {
   if (hasRequiredFormat) return format$1;
   hasRequiredFormat = 1;
   Object.defineProperty(format$1, "__esModule", { value: true });
-  const format_1 = requireFormat$1();
+  const format_1 = /* @__PURE__ */ requireFormat$1();
   const format2 = [format_1.default];
   format$1.default = format2;
   return format$1;
@@ -6089,11 +6098,11 @@ function requireDraft7() {
   if (hasRequiredDraft7) return draft7;
   hasRequiredDraft7 = 1;
   Object.defineProperty(draft7, "__esModule", { value: true });
-  const core_1 = requireCore();
-  const validation_1 = requireValidation();
-  const applicator_1 = requireApplicator();
-  const format_1 = requireFormat();
-  const metadata_1 = requireMetadata();
+  const core_1 = /* @__PURE__ */ requireCore();
+  const validation_1 = /* @__PURE__ */ requireValidation();
+  const applicator_1 = /* @__PURE__ */ requireApplicator();
+  const format_1 = /* @__PURE__ */ requireFormat();
+  const metadata_1 = /* @__PURE__ */ requireMetadata();
   const draft7Vocabularies = [
     core_1.default,
     validation_1.default,
@@ -6125,11 +6134,11 @@ function requireDiscriminator() {
   if (hasRequiredDiscriminator) return discriminator;
   hasRequiredDiscriminator = 1;
   Object.defineProperty(discriminator, "__esModule", { value: true });
-  const codegen_1 = requireCodegen();
-  const types_1 = requireTypes();
-  const compile_1 = requireCompile();
-  const ref_error_1 = requireRef_error();
-  const util_1 = requireUtil();
+  const codegen_1 = /* @__PURE__ */ requireCodegen();
+  const types_1 = /* @__PURE__ */ requireTypes();
+  const compile_1 = /* @__PURE__ */ requireCompile();
+  const ref_error_1 = /* @__PURE__ */ requireRef_error();
+  const util_1 = /* @__PURE__ */ requireUtil();
   const error = {
     message: ({ params: { discrError, tagName } }) => discrError === types_1.DiscrError.Tag ? `tag "${tagName}" must be string` : `value of tag "${tagName}" must be in oneOf`,
     params: ({ params: { discrError, tag, tagName } }) => (0, codegen_1._)`{error: ${discrError}, tag: ${tagName}, tagValue: ${tag}}`
@@ -6246,9 +6255,9 @@ function requireAjv() {
   (function(module, exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MissingRefError = exports.ValidationError = exports.CodeGen = exports.Name = exports.nil = exports.stringify = exports.str = exports._ = exports.KeywordCxt = exports.Ajv = void 0;
-    const core_1 = requireCore$1();
-    const draft7_1 = requireDraft7();
-    const discriminator_1 = requireDiscriminator();
+    const core_1 = /* @__PURE__ */ requireCore$1();
+    const draft7_1 = /* @__PURE__ */ requireDraft7();
+    const discriminator_1 = /* @__PURE__ */ requireDiscriminator();
     const draft7MetaSchema = require$$3;
     const META_SUPPORT_DATA = ["/properties"];
     const META_SCHEMA_ID = "http://json-schema.org/draft-07/schema";
@@ -6276,11 +6285,11 @@ function requireAjv() {
     module.exports.Ajv = Ajv2;
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Ajv2;
-    var validate_1 = requireValidate();
+    var validate_1 = /* @__PURE__ */ requireValidate();
     Object.defineProperty(exports, "KeywordCxt", { enumerable: true, get: function() {
       return validate_1.KeywordCxt;
     } });
-    var codegen_1 = requireCodegen();
+    var codegen_1 = /* @__PURE__ */ requireCodegen();
     Object.defineProperty(exports, "_", { enumerable: true, get: function() {
       return codegen_1._;
     } });
@@ -6299,18 +6308,18 @@ function requireAjv() {
     Object.defineProperty(exports, "CodeGen", { enumerable: true, get: function() {
       return codegen_1.CodeGen;
     } });
-    var validation_error_1 = requireValidation_error();
+    var validation_error_1 = /* @__PURE__ */ requireValidation_error();
     Object.defineProperty(exports, "ValidationError", { enumerable: true, get: function() {
       return validation_error_1.default;
     } });
-    var ref_error_1 = requireRef_error();
+    var ref_error_1 = /* @__PURE__ */ requireRef_error();
     Object.defineProperty(exports, "MissingRefError", { enumerable: true, get: function() {
       return ref_error_1.default;
     } });
   })(ajv, ajv.exports);
   return ajv.exports;
 }
-var ajvExports = requireAjv();
+var ajvExports = /* @__PURE__ */ requireAjv();
 const Ajv = /* @__PURE__ */ getDefaultExportFromCjs(ajvExports);
 var util;
 (function(util2) {
@@ -18621,8 +18630,8 @@ function requireLimit() {
   (function(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.formatLimitDefinition = void 0;
-    const ajv_1 = requireAjv();
-    const codegen_1 = requireCodegen();
+    const ajv_1 = /* @__PURE__ */ requireAjv();
+    const codegen_1 = /* @__PURE__ */ requireCodegen();
     const ops = codegen_1.operators;
     const KWDs = {
       formatMaximum: { okStr: "<=", ok: ops.LTE, fail: ops.GT },
@@ -18695,7 +18704,7 @@ function requireDist() {
     Object.defineProperty(exports, "__esModule", { value: true });
     const formats_1 = requireFormats();
     const limit_1 = requireLimit();
-    const codegen_1 = requireCodegen();
+    const codegen_1 = /* @__PURE__ */ requireCodegen();
     const fullName = new codegen_1.Name("fullFormats");
     const fastName = new codegen_1.Name("fastFormats");
     const formatsPlugin = (ajv2, opts = { keywords: true }) => {
@@ -28040,25 +28049,30 @@ function combineHeaders$1(...headers) {
 }
 function createToolNameMapping({
   tools = [],
-  providerToolNames
+  providerToolNames,
+  resolveProviderToolName
 }) {
+  var _a22;
   const customToolNameToProviderToolName = {};
   const providerToolNameToCustomToolName = {};
   for (const tool2 of tools) {
-    if (tool2.type === "provider" && tool2.id in providerToolNames) {
-      const providerToolName = providerToolNames[tool2.id];
+    if (tool2.type === "provider") {
+      const providerToolName = (_a22 = resolveProviderToolName == null ? void 0 : resolveProviderToolName(tool2)) != null ? _a22 : tool2.id in providerToolNames ? providerToolNames[tool2.id] : void 0;
+      if (providerToolName == null) {
+        continue;
+      }
       customToolNameToProviderToolName[tool2.name] = providerToolName;
       providerToolNameToCustomToolName[providerToolName] = tool2.name;
     }
   }
   return {
     toProviderToolName: (customToolName) => {
-      var _a22;
-      return (_a22 = customToolNameToProviderToolName[customToolName]) != null ? _a22 : customToolName;
+      var _a32;
+      return (_a32 = customToolNameToProviderToolName[customToolName]) != null ? _a32 : customToolName;
     },
     toCustomToolName: (providerToolName) => {
-      var _a22;
-      return (_a22 = providerToolNameToCustomToolName[providerToolName]) != null ? _a22 : providerToolName;
+      var _a32;
+      return (_a32 = providerToolNameToCustomToolName[providerToolName]) != null ? _a32 : providerToolName;
     }
   };
 }
@@ -28251,8 +28265,103 @@ async function readResponseWithSizeLimit({
   }
   return result;
 }
+function validateDownloadUrl(url2) {
+  let parsed;
+  try {
+    parsed = new URL(url2);
+  } catch (e) {
+    throw new DownloadError({
+      url: url2,
+      message: `Invalid URL: ${url2}`
+    });
+  }
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+    throw new DownloadError({
+      url: url2,
+      message: `URL scheme must be http or https, got ${parsed.protocol}`
+    });
+  }
+  const hostname2 = parsed.hostname;
+  if (!hostname2) {
+    throw new DownloadError({
+      url: url2,
+      message: `URL must have a hostname`
+    });
+  }
+  if (hostname2 === "localhost" || hostname2.endsWith(".local") || hostname2.endsWith(".localhost")) {
+    throw new DownloadError({
+      url: url2,
+      message: `URL with hostname ${hostname2} is not allowed`
+    });
+  }
+  if (hostname2.startsWith("[") && hostname2.endsWith("]")) {
+    const ipv62 = hostname2.slice(1, -1);
+    if (isPrivateIPv6(ipv62)) {
+      throw new DownloadError({
+        url: url2,
+        message: `URL with IPv6 address ${hostname2} is not allowed`
+      });
+    }
+    return;
+  }
+  if (isIPv4(hostname2)) {
+    if (isPrivateIPv4(hostname2)) {
+      throw new DownloadError({
+        url: url2,
+        message: `URL with IP address ${hostname2} is not allowed`
+      });
+    }
+    return;
+  }
+}
+function isIPv4(hostname2) {
+  const parts = hostname2.split(".");
+  if (parts.length !== 4) return false;
+  return parts.every((part) => {
+    const num = Number(part);
+    return Number.isInteger(num) && num >= 0 && num <= 255 && String(num) === part;
+  });
+}
+function isPrivateIPv4(ip) {
+  const parts = ip.split(".").map(Number);
+  const [a, b] = parts;
+  if (a === 0) return true;
+  if (a === 10) return true;
+  if (a === 127) return true;
+  if (a === 169 && b === 254) return true;
+  if (a === 172 && b >= 16 && b <= 31) return true;
+  if (a === 192 && b === 168) return true;
+  return false;
+}
+function isPrivateIPv6(ip) {
+  const normalized = ip.toLowerCase();
+  if (normalized === "::1") return true;
+  if (normalized === "::") return true;
+  if (normalized.startsWith("::ffff:")) {
+    const mappedPart = normalized.slice(7);
+    if (isIPv4(mappedPart)) {
+      return isPrivateIPv4(mappedPart);
+    }
+    const hexParts = mappedPart.split(":");
+    if (hexParts.length === 2) {
+      const high = parseInt(hexParts[0], 16);
+      const low = parseInt(hexParts[1], 16);
+      if (!isNaN(high) && !isNaN(low)) {
+        const a = high >> 8 & 255;
+        const b = high & 255;
+        const c = low >> 8 & 255;
+        const d = low & 255;
+        return isPrivateIPv4(`${a}.${b}.${c}.${d}`);
+      }
+    }
+  }
+  if (normalized.startsWith("fc") || normalized.startsWith("fd")) return true;
+  if (normalized.startsWith("fe80")) return true;
+  return false;
+}
 async function downloadBlob(url2, options) {
   var _a22, _b22;
+  validateDownloadUrl(url2);
   try {
     const response = await fetch(url2, {
       signal: options == null ? void 0 : options.abortSignal
@@ -28418,7 +28527,7 @@ function withUserAgentSuffix$1(headers, ...userAgentSuffixParts) {
   );
   return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION$7 = "4.0.15";
+var VERSION$7 = "4.0.19";
 var getOriginalFetch = () => globalThis.fetch;
 var getFromApi = async ({
   url: url2,
@@ -28561,8 +28670,8 @@ function mediaTypeToExtension(mediaType) {
     "x-m4a": "m4a"
   }[subtype]) != null ? _a22 : subtype;
 }
-var suspectProtoRx$1 = /"__proto__"\s*:/;
-var suspectConstructorRx$1 = /"constructor"\s*:/;
+var suspectProtoRx$1 = /"(?:_|\\u005[Ff])(?:_|\\u005[Ff])(?:p|\\u0070)(?:r|\\u0072)(?:o|\\u006[Ff])(?:t|\\u0074)(?:o|\\u006[Ff])(?:_|\\u005[Ff])(?:_|\\u005[Ff])"\s*:/;
+var suspectConstructorRx$1 = /"(?:c|\\u0063)(?:o|\\u006[Ff])(?:n|\\u006[Ee])(?:s|\\u0073)(?:t|\\u0074)(?:r|\\u0072)(?:u|\\u0075)(?:c|\\u0063)(?:t|\\u0074)(?:o|\\u006[Ff])(?:r|\\u0072)"\s*:/;
 function _parse$1(text2) {
   const obj = JSON.parse(text2);
   if (obj === null || typeof obj !== "object") {
@@ -28582,7 +28691,7 @@ function filter$1(obj) {
       if (Object.prototype.hasOwnProperty.call(node, "__proto__")) {
         throw new SyntaxError("Object contains forbidden prototype property");
       }
-      if (Object.prototype.hasOwnProperty.call(node, "constructor") && Object.prototype.hasOwnProperty.call(node.constructor, "prototype")) {
+      if (Object.prototype.hasOwnProperty.call(node, "constructor") && node.constructor !== null && typeof node.constructor === "object" && Object.prototype.hasOwnProperty.call(node.constructor, "prototype")) {
         throw new SyntaxError("Object contains forbidden prototype property");
       }
       for (const key in node) {
@@ -30069,6 +30178,33 @@ function tool(tool2) {
 function dynamicTool(tool2) {
   return { ...tool2, type: "dynamic" };
 }
+function createProviderToolFactory({
+  id: id2,
+  inputSchema
+}) {
+  return ({
+    execute,
+    outputSchema: outputSchema2,
+    needsApproval,
+    toModelOutput,
+    onInputStart,
+    onInputDelta,
+    onInputAvailable,
+    ...args
+  }) => tool({
+    type: "provider",
+    id: id2,
+    args,
+    inputSchema,
+    outputSchema: outputSchema2,
+    execute,
+    needsApproval,
+    toModelOutput,
+    onInputStart,
+    onInputDelta,
+    onInputAvailable
+  });
+}
 function createProviderToolFactoryWithOutputSchema({
   id: id2,
   inputSchema,
@@ -31193,17 +31329,14 @@ var GatewayVideoModel = class {
     var _a92;
     const resolvedHeaders = await resolve(this.config.headers());
     try {
-      const {
-        responseHeaders,
-        value: responseBody,
-        rawValue
-      } = await postJsonToApi$1({
+      const { responseHeaders, value: responseBody } = await postJsonToApi$1({
         url: this.getUrl(),
         headers: combineHeaders$1(
           resolvedHeaders,
           headers != null ? headers : {},
           this.getModelConfigHeaders(),
-          await resolve(this.config.o11yHeaders)
+          await resolve(this.config.o11yHeaders),
+          { accept: "text/event-stream" }
         ),
         body: {
           prompt,
@@ -31216,9 +31349,70 @@ var GatewayVideoModel = class {
           ...providerOptions && { providerOptions },
           ...image && { image: maybeEncodeVideoFile(image) }
         },
-        successfulResponseHandler: createJsonResponseHandler$1(
-          gatewayVideoResponseSchema
-        ),
+        successfulResponseHandler: async ({
+          response,
+          url: url2,
+          requestBodyValues
+        }) => {
+          if (response.body == null) {
+            throw new APICallError$1({
+              message: "SSE response body is empty",
+              url: url2,
+              requestBodyValues,
+              statusCode: response.status
+            });
+          }
+          const eventStream = parseJsonEventStream$1({
+            stream: response.body,
+            schema: gatewayVideoEventSchema
+          });
+          const reader = eventStream.getReader();
+          const { done, value: parseResult } = await reader.read();
+          reader.releaseLock();
+          if (done || !parseResult) {
+            throw new APICallError$1({
+              message: "SSE stream ended without a data event",
+              url: url2,
+              requestBodyValues,
+              statusCode: response.status
+            });
+          }
+          if (!parseResult.success) {
+            throw new APICallError$1({
+              message: "Failed to parse video SSE event",
+              cause: parseResult.error,
+              url: url2,
+              requestBodyValues,
+              statusCode: response.status
+            });
+          }
+          const event = parseResult.value;
+          if (event.type === "error") {
+            throw new APICallError$1({
+              message: event.message,
+              statusCode: event.statusCode,
+              url: url2,
+              requestBodyValues,
+              responseHeaders: Object.fromEntries([...response.headers]),
+              responseBody: JSON.stringify(event),
+              data: {
+                error: {
+                  message: event.message,
+                  type: event.errorType,
+                  param: event.param
+                }
+              }
+            });
+          }
+          return {
+            value: {
+              videos: event.videos,
+              warnings: event.warnings,
+              providerMetadata: event.providerMetadata
+            },
+            responseHeaders: Object.fromEntries([...response.headers])
+          };
+        },
         failedResponseHandler: createJsonErrorResponseHandler$1({
           errorSchema: any(),
           errorToMessage: (data) => data
@@ -31290,11 +31484,21 @@ var gatewayVideoWarningSchema = discriminatedUnion("type", [
     message: string()
   })
 ]);
-var gatewayVideoResponseSchema = object$2({
-  videos: array$1(gatewayVideoDataSchema),
-  warnings: array$1(gatewayVideoWarningSchema).optional(),
-  providerMetadata: record(string(), providerMetadataEntrySchema2).optional()
-});
+var gatewayVideoEventSchema = discriminatedUnion("type", [
+  object$2({
+    type: literal("result"),
+    videos: array$1(gatewayVideoDataSchema),
+    warnings: array$1(gatewayVideoWarningSchema).optional(),
+    providerMetadata: record(string(), providerMetadataEntrySchema2).optional()
+  }),
+  object$2({
+    type: literal("error"),
+    message: string(),
+    errorType: string(),
+    statusCode: number$1(),
+    param: unknown().nullable()
+  })
+]);
 var parallelSearchInputSchema = lazySchema(
   () => zodSchema(
     objectType({
@@ -31471,7 +31675,7 @@ async function getVercelRequestId() {
   var _a92;
   return (_a92 = indexBrowserExports.getContext().headers) == null ? void 0 : _a92["x-vercel-id"];
 }
-var VERSION$6 = "3.0.45";
+var VERSION$6 = "3.0.66";
 var AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
 function createGatewayProvider(options = {}) {
   var _a92, _b9;
@@ -31514,13 +31718,18 @@ function createGatewayProvider(options = {}) {
       settingValue: void 0,
       environmentVariableName: "VERCEL_REGION"
     });
+    const projectId = loadOptionalSetting({
+      settingValue: void 0,
+      environmentVariableName: "VERCEL_PROJECT_ID"
+    });
     return async () => {
       const requestId = await getVercelRequestId();
       return {
         ...deploymentId && { "ai-o11y-deployment-id": deploymentId },
         ...environment && { "ai-o11y-environment": environment },
         ...region && { "ai-o11y-region": region },
-        ...requestId && { "ai-o11y-request-id": requestId }
+        ...requestId && { "ai-o11y-request-id": requestId },
+        ...projectId && { "ai-o11y-project-id": projectId }
       };
     };
   };
@@ -32599,6 +32808,19 @@ var RetryError = class extends AISDKError$1 {
   }
 };
 _a19 = symbol19;
+function asArray(value) {
+  return value === void 0 ? [] : Array.isArray(value) ? value : [value];
+}
+async function notify(options) {
+  for (const callback of asArray(options.callbacks)) {
+    if (callback == null)
+      continue;
+    try {
+      await callback(options.event);
+    } catch (_ignored) {
+    }
+  }
+}
 function formatWarning({
   warning,
   provider,
@@ -32899,7 +33121,7 @@ function detectMediaType({
   }
   return void 0;
 }
-var VERSION$4 = "6.0.85";
+var VERSION$4 = "6.0.116";
 var download = async ({
   url: url2,
   maxBytes,
@@ -32907,6 +33129,7 @@ var download = async ({
 }) => {
   var _a21;
   const urlText = url2.toString();
+  validateDownloadUrl(urlText);
   try {
     const response = await fetch(urlText, {
       headers: withUserAgentSuffix$1(
@@ -33007,9 +33230,6 @@ function convertDataContentToBase64String(content) {
   }
   return convertUint8ArrayToBase64$1(content);
 }
-function asArray(value) {
-  return value === void 0 ? [] : Array.isArray(value) ? value : [value];
-}
 async function convertToLanguageModelPrompt({
   prompt,
   supportedUrls,
@@ -34015,6 +34235,44 @@ function stringifyForTelemetry(prompt) {
     }))
   );
 }
+function getGlobalTelemetryIntegrations() {
+  var _a21;
+  return (_a21 = globalThis.AI_SDK_TELEMETRY_INTEGRATIONS) != null ? _a21 : [];
+}
+function getGlobalTelemetryIntegration() {
+  const globalIntegrations = getGlobalTelemetryIntegrations();
+  return (integrations) => {
+    const localIntegrations = asArray(integrations);
+    const allIntegrations = [...globalIntegrations, ...localIntegrations];
+    function createTelemetryComposite(getListenerFromIntegration) {
+      const listeners = allIntegrations.map(getListenerFromIntegration).filter(Boolean);
+      return async (event) => {
+        for (const listener of listeners) {
+          try {
+            await listener(event);
+          } catch (_ignored) {
+          }
+        }
+      };
+    }
+    return {
+      onStart: createTelemetryComposite((integration) => integration.onStart),
+      onStepStart: createTelemetryComposite(
+        (integration) => integration.onStepStart
+      ),
+      onToolCallStart: createTelemetryComposite(
+        (integration) => integration.onToolCallStart
+      ),
+      onToolCallFinish: createTelemetryComposite(
+        (integration) => integration.onToolCallFinish
+      ),
+      onStepFinish: createTelemetryComposite(
+        (integration) => integration.onStepFinish
+      ),
+      onFinish: createTelemetryComposite((integration) => integration.onFinish)
+    };
+  };
+}
 function asLanguageModelUsage(usage) {
   return {
     inputTokens: usage.inputTokens.total,
@@ -34324,6 +34582,10 @@ function collectToolApprovals({
   }
   return { approvedToolApprovals, deniedToolApprovals };
 }
+function now() {
+  var _a21, _b9;
+  return (_b9 = (_a21 = globalThis == null ? void 0 : globalThis.performance) == null ? void 0 : _a21.now()) != null ? _b9 : Date.now();
+}
 async function executeToolCall({
   toolCall,
   tools,
@@ -34332,13 +34594,27 @@ async function executeToolCall({
   messages,
   abortSignal,
   experimental_context,
-  onPreliminaryToolResult
+  stepNumber,
+  model,
+  onPreliminaryToolResult,
+  onToolCallStart,
+  onToolCallFinish
 }) {
   const { toolName, toolCallId, input } = toolCall;
   const tool2 = tools == null ? void 0 : tools[toolName];
   if ((tool2 == null ? void 0 : tool2.execute) == null) {
     return void 0;
   }
+  const baseCallbackEvent = {
+    stepNumber,
+    model,
+    toolCall,
+    messages,
+    abortSignal,
+    functionId: telemetry == null ? void 0 : telemetry.functionId,
+    metadata: telemetry == null ? void 0 : telemetry.metadata,
+    experimental_context
+  };
   return recordSpan({
     name: "ai.toolCall",
     attributes: selectTelemetryAttributes({
@@ -34358,6 +34634,8 @@ async function executeToolCall({
     tracer,
     fn: async (span) => {
       let output;
+      await notify({ event: baseCallbackEvent, callbacks: onToolCallStart });
+      const startTime = now();
       try {
         const stream = executeTool({
           execute: tool2.execute.bind(tool2),
@@ -34382,6 +34660,16 @@ async function executeToolCall({
           }
         }
       } catch (error) {
+        const durationMs2 = now() - startTime;
+        await notify({
+          event: {
+            ...baseCallbackEvent,
+            success: false,
+            error,
+            durationMs: durationMs2
+          },
+          callbacks: onToolCallFinish
+        });
         recordErrorOnSpan(span, error);
         return {
           type: "tool-error",
@@ -34393,6 +34681,16 @@ async function executeToolCall({
           ...toolCall.providerMetadata != null ? { providerMetadata: toolCall.providerMetadata } : {}
         };
       }
+      const durationMs = now() - startTime;
+      await notify({
+        event: {
+          ...baseCallbackEvent,
+          success: true,
+          output,
+          durationMs
+        },
+        callbacks: onToolCallFinish
+      });
       try {
         span.setAttributes(
           await selectTelemetryAttributes({
@@ -35256,6 +35554,11 @@ async function doParseToolCall({
 }
 var DefaultStepResult = class {
   constructor({
+    stepNumber,
+    model,
+    functionId,
+    metadata: metadata2,
+    experimental_context,
     content,
     finishReason,
     rawFinishReason,
@@ -35265,6 +35568,11 @@ var DefaultStepResult = class {
     response,
     providerMetadata
   }) {
+    this.stepNumber = stepNumber;
+    this.model = model;
+    this.functionId = functionId;
+    this.metadata = metadata2;
+    this.experimental_context = experimental_context;
     this.content = content;
     this.finishReason = finishReason;
     this.rawFinishReason = rawFinishReason;
@@ -35506,11 +35814,16 @@ async function generateText({
   experimental_context,
   experimental_include: include,
   _internal: { generateId: generateId2 = originalGenerateId } = {},
+  experimental_onStart: onStart,
+  experimental_onStepStart: onStepStart,
+  experimental_onToolCallStart: onToolCallStart,
+  experimental_onToolCallFinish: onToolCallFinish,
   onStepFinish,
   onFinish,
   ...settings
 }) {
   const model = resolveLanguageModel(modelArg);
+  const createGlobalTelemetry = getGlobalTelemetryIntegration();
   const stopConditions = asArray(stopWhen);
   const totalTimeoutMs = getTotalTimeoutMs(timeout);
   const stepTimeoutMs = getStepTimeoutMs(timeout);
@@ -35535,11 +35848,47 @@ async function generateText({
     headers: headersWithUserAgent,
     settings: { ...callSettings, maxRetries }
   });
+  const modelInfo = { provider: model.provider, modelId: model.modelId };
   const initialPrompt = await standardizePrompt({
     system,
     prompt,
     messages
   });
+  const globalTelemetry = createGlobalTelemetry(telemetry == null ? void 0 : telemetry.integrations);
+  await notify({
+    event: {
+      model: modelInfo,
+      system,
+      prompt,
+      messages,
+      tools,
+      toolChoice,
+      activeTools,
+      maxOutputTokens: callSettings.maxOutputTokens,
+      temperature: callSettings.temperature,
+      topP: callSettings.topP,
+      topK: callSettings.topK,
+      presencePenalty: callSettings.presencePenalty,
+      frequencyPenalty: callSettings.frequencyPenalty,
+      stopSequences: callSettings.stopSequences,
+      seed: callSettings.seed,
+      maxRetries,
+      timeout,
+      headers,
+      providerOptions,
+      stopWhen,
+      output,
+      abortSignal,
+      include,
+      functionId: telemetry == null ? void 0 : telemetry.functionId,
+      metadata: telemetry == null ? void 0 : telemetry.metadata,
+      experimental_context
+    },
+    callbacks: [
+      onStart,
+      globalTelemetry.onStart
+    ]
+  });
   const tracer = getTracer(telemetry);
   try {
     return await recordSpan({
@@ -35563,7 +35912,7 @@ async function generateText({
       }),
       tracer,
       fn: async (span) => {
-        var _a21, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+        var _a21, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
         const initialMessages = initialPrompt.messages;
         const responseMessages = [];
         const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({ messages: initialMessages });
@@ -35580,7 +35929,17 @@ async function generateText({
             telemetry,
             messages: initialMessages,
             abortSignal: mergedAbortSignal,
-            experimental_context
+            experimental_context,
+            stepNumber: 0,
+            model: modelInfo,
+            onToolCallStart: [
+              onToolCallStart,
+              globalTelemetry.onToolCallStart
+            ],
+            onToolCallFinish: [
+              onToolCallFinish,
+              globalTelemetry.onToolCallFinish
+            ]
           });
           const toolContent = [];
           for (const output2 of toolOutputs) {
@@ -35589,7 +35948,7 @@ async function generateText({
               input: output2.input,
               tool: tools == null ? void 0 : tools[output2.toolName],
               output: output2.type === "tool-result" ? output2.output : output2.error,
-              errorMode: output2.type === "tool-error" ? "json" : "none"
+              errorMode: output2.type === "tool-error" ? "text" : "none"
             });
             toolContent.push({
               type: "tool-result",
@@ -35660,6 +36019,10 @@ async function generateText({
             const stepModel = resolveLanguageModel(
               (_a21 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a21 : model
             );
+            const stepModelInfo = {
+              provider: stepModel.provider,
+              modelId: stepModel.modelId
+            };
             const promptMessages = await convertToLanguageModelPrompt({
               prompt: {
                 system: (_b9 = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _b9 : initialPrompt.system,
@@ -35669,10 +36032,43 @@ async function generateText({
               download: download2
             });
             experimental_context = (_d = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _d : experimental_context;
+            const stepActiveTools = (_e = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _e : activeTools;
             const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
               tools,
-              toolChoice: (_e = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _e : toolChoice,
-              activeTools: (_f = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _f : activeTools
+              toolChoice: (_f = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _f : toolChoice,
+              activeTools: stepActiveTools
+            });
+            const stepMessages = (_g = prepareStepResult == null ? void 0 : prepareStepResult.messages) != null ? _g : stepInputMessages;
+            const stepSystem = (_h = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _h : initialPrompt.system;
+            const stepProviderOptions = mergeObjects(
+              providerOptions,
+              prepareStepResult == null ? void 0 : prepareStepResult.providerOptions
+            );
+            await notify({
+              event: {
+                stepNumber: steps.length,
+                model: stepModelInfo,
+                system: stepSystem,
+                messages: stepMessages,
+                tools,
+                toolChoice: stepToolChoice,
+                activeTools: stepActiveTools,
+                steps: [...steps],
+                providerOptions: stepProviderOptions,
+                timeout,
+                headers,
+                stopWhen,
+                output,
+                abortSignal,
+                include,
+                functionId: telemetry == null ? void 0 : telemetry.functionId,
+                metadata: telemetry == null ? void 0 : telemetry.metadata,
+                experimental_context
+              },
+              callbacks: [
+                onStepStart,
+                globalTelemetry.onStepStart
+              ]
             });
             currentModelResponse = await retry(
               () => {
@@ -35716,10 +36112,6 @@ async function generateText({
                   tracer,
                   fn: async (span2) => {
                     var _a23, _b22, _c2, _d2, _e2, _f2, _g2, _h2;
-                    const stepProviderOptions = mergeObjects(
-                      providerOptions,
-                      prepareStepResult == null ? void 0 : prepareStepResult.providerOptions
-                    );
                     const result = await stepModel.doGenerate({
                       ...callSettings2,
                       tools: stepTools,
@@ -35851,7 +36243,17 @@ async function generateText({
                   telemetry,
                   messages: stepInputMessages,
                   abortSignal: mergedAbortSignal,
-                  experimental_context
+                  experimental_context,
+                  stepNumber: steps.length,
+                  model: stepModelInfo,
+                  onToolCallStart: [
+                    onToolCallStart,
+                    globalTelemetry.onToolCallStart
+                  ],
+                  onToolCallFinish: [
+                    onToolCallFinish,
+                    globalTelemetry.onToolCallFinish
+                  ]
                 })
               );
             }
@@ -35888,15 +36290,21 @@ async function generateText({
                 tools
               })
             );
-            const stepRequest = ((_g = include == null ? void 0 : include.requestBody) != null ? _g : true) ? (_h = currentModelResponse.request) != null ? _h : {} : { ...currentModelResponse.request, body: void 0 };
+            const stepRequest = ((_i = include == null ? void 0 : include.requestBody) != null ? _i : true) ? (_j = currentModelResponse.request) != null ? _j : {} : { ...currentModelResponse.request, body: void 0 };
             const stepResponse = {
               ...currentModelResponse.response,
               // deep clone msgs to avoid mutating past messages in multi-step:
               messages: structuredClone(responseMessages),
               // Conditionally include response body:
-              body: ((_i = include == null ? void 0 : include.responseBody) != null ? _i : true) ? (_j = currentModelResponse.response) == null ? void 0 : _j.body : void 0
+              body: ((_k = include == null ? void 0 : include.responseBody) != null ? _k : true) ? (_l = currentModelResponse.response) == null ? void 0 : _l.body : void 0
             };
+            const stepNumber = steps.length;
             const currentStepResult = new DefaultStepResult({
+              stepNumber,
+              model: stepModelInfo,
+              functionId: telemetry == null ? void 0 : telemetry.functionId,
+              metadata: telemetry == null ? void 0 : telemetry.metadata,
+              experimental_context,
               content: stepContent,
               finishReason: currentModelResponse.finishReason.unified,
               rawFinishReason: currentModelResponse.finishReason.raw,
@@ -35907,12 +36315,15 @@ async function generateText({
               response: stepResponse
             });
             logWarnings({
-              warnings: (_k = currentModelResponse.warnings) != null ? _k : [],
-              provider: stepModel.provider,
-              model: stepModel.modelId
+              warnings: (_m = currentModelResponse.warnings) != null ? _m : [],
+              provider: stepModelInfo.provider,
+              model: stepModelInfo.modelId
             });
             steps.push(currentStepResult);
-            await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
+            await notify({
+              event: currentStepResult,
+              callbacks: [onStepFinish, globalTelemetry.onStepFinish]
+            });
           } finally {
             if (stepTimeoutId != null) {
               clearTimeout(stepTimeoutId);
@@ -35964,30 +36375,40 @@ async function generateText({
             cachedInputTokens: void 0
           }
         );
-        await (onFinish == null ? void 0 : onFinish({
-          finishReason: lastStep.finishReason,
-          rawFinishReason: lastStep.rawFinishReason,
-          usage: lastStep.usage,
-          content: lastStep.content,
-          text: lastStep.text,
-          reasoningText: lastStep.reasoningText,
-          reasoning: lastStep.reasoning,
-          files: lastStep.files,
-          sources: lastStep.sources,
-          toolCalls: lastStep.toolCalls,
-          staticToolCalls: lastStep.staticToolCalls,
-          dynamicToolCalls: lastStep.dynamicToolCalls,
-          toolResults: lastStep.toolResults,
-          staticToolResults: lastStep.staticToolResults,
-          dynamicToolResults: lastStep.dynamicToolResults,
-          request: lastStep.request,
-          response: lastStep.response,
-          warnings: lastStep.warnings,
-          providerMetadata: lastStep.providerMetadata,
-          steps,
-          totalUsage,
-          experimental_context
-        }));
+        await notify({
+          event: {
+            stepNumber: lastStep.stepNumber,
+            model: lastStep.model,
+            functionId: lastStep.functionId,
+            metadata: lastStep.metadata,
+            experimental_context: lastStep.experimental_context,
+            finishReason: lastStep.finishReason,
+            rawFinishReason: lastStep.rawFinishReason,
+            usage: lastStep.usage,
+            content: lastStep.content,
+            text: lastStep.text,
+            reasoningText: lastStep.reasoningText,
+            reasoning: lastStep.reasoning,
+            files: lastStep.files,
+            sources: lastStep.sources,
+            toolCalls: lastStep.toolCalls,
+            staticToolCalls: lastStep.staticToolCalls,
+            dynamicToolCalls: lastStep.dynamicToolCalls,
+            toolResults: lastStep.toolResults,
+            staticToolResults: lastStep.staticToolResults,
+            dynamicToolResults: lastStep.dynamicToolResults,
+            request: lastStep.request,
+            response: lastStep.response,
+            warnings: lastStep.warnings,
+            providerMetadata: lastStep.providerMetadata,
+            steps,
+            totalUsage
+          },
+          callbacks: [
+            onFinish,
+            globalTelemetry.onFinish
+          ]
+        });
         let resolvedOutput;
         if (lastStep.finishReason === "stop") {
           const outputSpecification = output != null ? output : text();
@@ -36018,7 +36439,11 @@ async function executeTools({
   telemetry,
   messages,
   abortSignal,
-  experimental_context
+  experimental_context,
+  stepNumber,
+  model,
+  onToolCallStart,
+  onToolCallFinish
 }) {
   const toolOutputs = await Promise.all(
     toolCalls.map(
@@ -36029,7 +36454,11 @@ async function executeTools({
         telemetry,
         messages,
         abortSignal,
-        experimental_context
+        experimental_context,
+        stepNumber,
+        model,
+        onToolCallStart,
+        onToolCallFinish
       })
     )
   );
@@ -36597,7 +37026,8 @@ function processUIMessageStream({
               state.message.parts.push({
                 type: "file",
                 mediaType: chunk.mediaType,
-                url: chunk.url
+                url: chunk.url,
+                ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {}
               });
               write();
               break;
@@ -36722,7 +37152,9 @@ function processUIMessageStream({
               break;
             }
             case "tool-input-error": {
-              if (chunk.dynamic) {
+              const existingPart = state.message.parts.filter(isToolUIPart).find((p) => p.toolCallId === chunk.toolCallId);
+              const isDynamic = existingPart != null ? existingPart.type === "dynamic-tool" : !!chunk.dynamic;
+              if (isDynamic) {
                 updateDynamicToolPart({
                   toolCallId: chunk.toolCallId,
                   toolName: chunk.toolName,
@@ -37190,10 +37622,6 @@ function createStitchableStream() {
     terminate
   };
 }
-function now() {
-  var _a21, _b9;
-  return (_b9 = (_a21 = globalThis == null ? void 0 : globalThis.performance) == null ? void 0 : _a21.now()) != null ? _b9 : Date.now();
-}
 function runToolsTransformation({
   tools,
   generatorStream,
@@ -37204,7 +37632,11 @@ function runToolsTransformation({
   abortSignal,
   repairToolCall,
   experimental_context,
-  generateId: generateId2
+  generateId: generateId2,
+  stepNumber,
+  model,
+  onToolCallStart,
+  onToolCallFinish
 }) {
   let toolResultsStreamController = null;
   const toolResultsStream = new ReadableStream({
@@ -37252,7 +37684,8 @@ function runToolsTransformation({
             file: new DefaultGeneratedFileWithType({
               data: chunk.data,
               mediaType: chunk.mediaType
-            })
+            }),
+            ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {}
           });
           break;
         }
@@ -37346,6 +37779,10 @@ function runToolsTransformation({
                 messages,
                 abortSignal,
                 experimental_context,
+                stepNumber,
+                model,
+                onToolCallStart,
+                onToolCallFinish,
                 onPreliminaryToolResult: (result) => {
                   toolResultsStreamController.enqueue(result);
                 }
@@ -37462,6 +37899,10 @@ function streamText({
   onFinish,
   onAbort,
   onStepFinish,
+  experimental_onStart: onStart,
+  experimental_onStepStart: onStepStart,
+  experimental_onToolCallStart: onToolCallStart,
+  experimental_onToolCallFinish: onToolCallFinish,
   experimental_context,
   experimental_include: include,
   _internal: { now: now2 = now, generateId: generateId2 = originalGenerateId2 } = {},
@@ -37501,11 +37942,18 @@ function streamText({
     providerOptions,
     prepareStep,
     includeRawChunks,
+    timeout,
+    stopWhen,
+    originalAbortSignal: abortSignal,
     onChunk,
     onError,
     onFinish,
     onAbort,
     onStepFinish,
+    onStart,
+    onStepStart,
+    onToolCallStart,
+    onToolCallFinish,
     now: now2,
     generateId: generateId2,
     experimental_context,
@@ -37602,11 +38050,18 @@ var DefaultStreamTextResult = class {
     includeRawChunks,
     now: now2,
     generateId: generateId2,
+    timeout,
+    stopWhen,
+    originalAbortSignal,
     onChunk,
     onError,
     onFinish,
     onAbort,
     onStepFinish,
+    onStart,
+    onStepStart,
+    onToolCallStart,
+    onToolCallFinish,
     experimental_context,
     download: download2,
     include
@@ -37618,6 +38073,8 @@ var DefaultStreamTextResult = class {
     this.outputSpecification = output;
     this.includeRawChunks = includeRawChunks;
     this.tools = tools;
+    const createGlobalTelemetry = getGlobalTelemetryIntegration();
+    const globalTelemetry = createGlobalTelemetry(telemetry == null ? void 0 : telemetry.integrations);
     let stepFinish;
     let recordedContent = [];
     const recordedResponseMessages = [];
@@ -37719,7 +38176,11 @@ var DefaultStreamTextResult = class {
           delete activeReasoningContent[part.id];
         }
         if (part.type === "file") {
-          recordedContent.push({ type: "file", file: part.file });
+          recordedContent.push({
+            type: "file",
+            file: part.file,
+            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
+          });
         }
         if (part.type === "source") {
           recordedContent.push(part);
@@ -37749,6 +38210,10 @@ var DefaultStreamTextResult = class {
             tools
           });
           const currentStepResult = new DefaultStepResult({
+            stepNumber: recordedSteps.length,
+            model: modelInfo,
+            ...callbackTelemetryProps,
+            experimental_context,
             content: recordedContent,
             finishReason: part.finishReason,
             rawFinishReason: part.rawFinishReason,
@@ -37761,11 +38226,14 @@ var DefaultStreamTextResult = class {
             },
             providerMetadata: part.providerMetadata
           });
-          await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
+          await notify({
+            event: currentStepResult,
+            callbacks: [onStepFinish, globalTelemetry.onStepFinish]
+          });
           logWarnings({
             warnings: recordedWarnings,
-            provider: model.provider,
-            model: model.modelId
+            provider: modelInfo.provider,
+            model: modelInfo.modelId
           });
           recordedSteps.push(currentStepResult);
           recordedResponseMessages.push(...stepMessages);
@@ -37796,30 +38264,40 @@ var DefaultStreamTextResult = class {
           self2._totalUsage.resolve(totalUsage);
           self2._steps.resolve(recordedSteps);
           const finalStep = recordedSteps[recordedSteps.length - 1];
-          await (onFinish == null ? void 0 : onFinish({
-            finishReason: finalStep.finishReason,
-            rawFinishReason: finalStep.rawFinishReason,
-            totalUsage,
-            usage: finalStep.usage,
-            content: finalStep.content,
-            text: finalStep.text,
-            reasoningText: finalStep.reasoningText,
-            reasoning: finalStep.reasoning,
-            files: finalStep.files,
-            sources: finalStep.sources,
-            toolCalls: finalStep.toolCalls,
-            staticToolCalls: finalStep.staticToolCalls,
-            dynamicToolCalls: finalStep.dynamicToolCalls,
-            toolResults: finalStep.toolResults,
-            staticToolResults: finalStep.staticToolResults,
-            dynamicToolResults: finalStep.dynamicToolResults,
-            request: finalStep.request,
-            response: finalStep.response,
-            warnings: finalStep.warnings,
-            providerMetadata: finalStep.providerMetadata,
-            steps: recordedSteps,
-            experimental_context
-          }));
+          await notify({
+            event: {
+              stepNumber: finalStep.stepNumber,
+              model: finalStep.model,
+              functionId: finalStep.functionId,
+              metadata: finalStep.metadata,
+              experimental_context: finalStep.experimental_context,
+              finishReason: finalStep.finishReason,
+              rawFinishReason: finalStep.rawFinishReason,
+              totalUsage,
+              usage: finalStep.usage,
+              content: finalStep.content,
+              text: finalStep.text,
+              reasoningText: finalStep.reasoningText,
+              reasoning: finalStep.reasoning,
+              files: finalStep.files,
+              sources: finalStep.sources,
+              toolCalls: finalStep.toolCalls,
+              staticToolCalls: finalStep.staticToolCalls,
+              dynamicToolCalls: finalStep.dynamicToolCalls,
+              toolResults: finalStep.toolResults,
+              staticToolResults: finalStep.staticToolResults,
+              dynamicToolResults: finalStep.dynamicToolResults,
+              request: finalStep.request,
+              response: finalStep.response,
+              warnings: finalStep.warnings,
+              providerMetadata: finalStep.providerMetadata,
+              steps: recordedSteps
+            },
+            callbacks: [
+              onFinish,
+              globalTelemetry.onFinish
+            ]
+          });
           rootSpan.setAttributes(
             await selectTelemetryAttributes({
               telemetry,
@@ -37920,6 +38398,11 @@ var DefaultStreamTextResult = class {
       settings: { ...callSettings, maxRetries }
     });
     const self2 = this;
+    const modelInfo = { provider: model.provider, modelId: model.modelId };
+    const callbackTelemetryProps = {
+      functionId: telemetry == null ? void 0 : telemetry.functionId,
+      metadata: telemetry == null ? void 0 : telemetry.metadata
+    };
     recordSpan({
       name: "ai.streamText",
       attributes: selectTelemetryAttributes({
@@ -37942,6 +38425,39 @@ var DefaultStreamTextResult = class {
           prompt,
           messages
         });
+        await notify({
+          event: {
+            model: modelInfo,
+            system,
+            prompt,
+            messages,
+            tools,
+            toolChoice,
+            activeTools,
+            maxOutputTokens: callSettings.maxOutputTokens,
+            temperature: callSettings.temperature,
+            topP: callSettings.topP,
+            topK: callSettings.topK,
+            presencePenalty: callSettings.presencePenalty,
+            frequencyPenalty: callSettings.frequencyPenalty,
+            stopSequences: callSettings.stopSequences,
+            seed: callSettings.seed,
+            maxRetries,
+            timeout,
+            headers,
+            providerOptions,
+            stopWhen,
+            output,
+            abortSignal: originalAbortSignal,
+            include,
+            ...callbackTelemetryProps,
+            experimental_context
+          },
+          callbacks: [
+            onStart,
+            globalTelemetry.onStart
+          ]
+        });
         const initialMessages = initialPrompt.messages;
         const initialResponseMessages = [];
         const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({ messages: initialMessages });
@@ -37988,6 +38504,16 @@ var DefaultStreamTextResult = class {
                   messages: initialMessages,
                   abortSignal,
                   experimental_context,
+                  stepNumber: recordedSteps.length,
+                  model: modelInfo,
+                  onToolCallStart: [
+                    onToolCallStart,
+                    globalTelemetry.onToolCallStart
+                  ],
+                  onToolCallFinish: [
+                    onToolCallFinish,
+                    globalTelemetry.onToolCallFinish
+                  ],
                   onPreliminaryToolResult: (result2) => {
                     toolExecutionStepStreamController == null ? void 0 : toolExecutionStepStreamController.enqueue(result2);
                   }
@@ -38024,7 +38550,7 @@ var DefaultStreamTextResult = class {
                     input: output2.input,
                     tool: tools == null ? void 0 : tools[output2.toolName],
                     output: output2.type === "tool-result" ? output2.output : output2.error,
-                    errorMode: output2.type === "tool-error" ? "json" : "none"
+                    errorMode: output2.type === "tool-error" ? "text" : "none"
                   })
                 });
               }
@@ -38054,7 +38580,7 @@ var DefaultStreamTextResult = class {
           responseMessages,
           usage
         }) {
-          var _a21, _b9, _c, _d, _e, _f, _g;
+          var _a21, _b9, _c, _d, _e, _f, _g, _h, _i;
           const includeRawChunks2 = self2.includeRawChunks;
           const stepTimeoutId = stepTimeoutMs != null ? setTimeout(() => stepAbortController.abort(), stepTimeoutMs) : void 0;
           let chunkTimeoutId = void 0;
@@ -38093,6 +38619,10 @@ var DefaultStreamTextResult = class {
             const stepModel = resolveLanguageModel(
               (_a21 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a21 : model
             );
+            const stepModelInfo = {
+              provider: stepModel.provider,
+              modelId: stepModel.modelId
+            };
             const promptMessages = await convertToLanguageModelPrompt({
               prompt: {
                 system: (_b9 = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _b9 : initialPrompt.system,
@@ -38101,16 +38631,44 @@ var DefaultStreamTextResult = class {
               supportedUrls: await stepModel.supportedUrls,
               download: download2
             });
+            const stepActiveTools = (_d = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _d : activeTools;
             const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
               tools,
-              toolChoice: (_d = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _d : toolChoice,
-              activeTools: (_e = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _e : activeTools
+              toolChoice: (_e = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _e : toolChoice,
+              activeTools: stepActiveTools
             });
             experimental_context = (_f = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _f : experimental_context;
+            const stepMessages = (_g = prepareStepResult == null ? void 0 : prepareStepResult.messages) != null ? _g : stepInputMessages;
+            const stepSystem = (_h = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _h : initialPrompt.system;
             const stepProviderOptions = mergeObjects(
               providerOptions,
               prepareStepResult == null ? void 0 : prepareStepResult.providerOptions
             );
+            await notify({
+              event: {
+                stepNumber: recordedSteps.length,
+                model: stepModelInfo,
+                system: stepSystem,
+                messages: stepMessages,
+                tools,
+                toolChoice: stepToolChoice,
+                activeTools: stepActiveTools,
+                steps: [...recordedSteps],
+                providerOptions: stepProviderOptions,
+                timeout,
+                headers,
+                stopWhen,
+                output,
+                abortSignal: originalAbortSignal,
+                include,
+                ...callbackTelemetryProps,
+                experimental_context
+              },
+              callbacks: [
+                onStepStart,
+                globalTelemetry.onStepStart
+              ]
+            });
             const {
               result: { stream: stream2, response, request },
               doStreamSpan,
@@ -38182,9 +38740,19 @@ var DefaultStreamTextResult = class {
               repairToolCall,
               abortSignal,
               experimental_context,
-              generateId: generateId2
+              generateId: generateId2,
+              stepNumber: recordedSteps.length,
+              model: stepModelInfo,
+              onToolCallStart: [
+                onToolCallStart,
+                globalTelemetry.onToolCallStart
+              ],
+              onToolCallFinish: [
+                onToolCallFinish,
+                globalTelemetry.onToolCallFinish
+              ]
             });
-            const stepRequest = ((_g = include == null ? void 0 : include.requestBody) != null ? _g : true) ? request != null ? request : {} : { ...request, body: void 0 };
+            const stepRequest = ((_i = include == null ? void 0 : include.requestBody) != null ? _i : true) ? request != null ? request : {} : { ...request, body: void 0 };
             const stepToolCalls = [];
             const stepToolOutputs = [];
             let warnings;
@@ -38197,7 +38765,7 @@ var DefaultStreamTextResult = class {
             let stepResponse = {
               id: generateId2(),
               timestamp: /* @__PURE__ */ new Date(),
-              modelId: model.modelId
+              modelId: modelInfo.modelId
             };
             let activeText = "";
             self2.addStream(
@@ -38764,7 +39332,8 @@ var DefaultStreamTextResult = class {
               controller.enqueue({
                 type: "file",
                 mediaType: part.file.mediaType,
-                url: `data:${part.file.mediaType};base64,${part.file.base64}`
+                url: `data:${part.file.mediaType};base64,${part.file.base64}`,
+                ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
               });
               break;
             }
@@ -41086,7 +41655,7 @@ 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 isReasoningModel = modelId.startsWith("o1") || modelId.startsWith("o3") || modelId.startsWith("o4-mini") || modelId.startsWith("codex-mini") || modelId.startsWith("computer-use-preview") || modelId.startsWith("gpt-5") && !modelId.startsWith("gpt-5-chat");
+  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 systemMessageMode = isReasoningModel ? "developer" : "system";
   return {
@@ -42021,7 +42590,7 @@ var OpenAIChatLanguageModel = class {
               for (const toolCallDelta of delta.tool_calls) {
                 const index = toolCallDelta.index;
                 if (toolCalls[index] == null) {
-                  if (toolCallDelta.type !== "function") {
+                  if (toolCallDelta.type != null && toolCallDelta.type !== "function") {
                     throw new InvalidResponseDataError$1({
                       data: toolCallDelta,
                       message: `Expected 'function' type.`
@@ -42711,9 +43280,11 @@ var modelMaxImagesPerCall = {
   "dall-e-2": 10,
   "gpt-image-1": 10,
   "gpt-image-1-mini": 10,
-  "gpt-image-1.5": 10
+  "gpt-image-1.5": 10,
+  "chatgpt-image-latest": 10
 };
 var defaultResponseFormatPrefixes = [
+  "chatgpt-image-",
   "gpt-image-1-mini",
   "gpt-image-1.5",
   "gpt-image-1"
@@ -42812,15 +43383,20 @@ var OpenAIImageModel = class {
         },
         providerMetadata: {
           openai: {
-            images: response2.data.map((item) => {
-              var _a22, _b22, _c2, _d2, _e2;
+            images: response2.data.map((item, index) => {
+              var _a22, _b22, _c2, _d2, _e2, _f2;
               return {
                 ...item.revised_prompt ? { revisedPrompt: item.revised_prompt } : {},
                 created: (_a22 = response2.created) != null ? _a22 : void 0,
                 size: (_b22 = response2.size) != null ? _b22 : void 0,
                 quality: (_c2 = response2.quality) != null ? _c2 : void 0,
                 background: (_d2 = response2.background) != null ? _d2 : void 0,
-                outputFormat: (_e2 = response2.output_format) != null ? _e2 : void 0
+                outputFormat: (_e2 = response2.output_format) != null ? _e2 : void 0,
+                ...distributeTokenDetails(
+                  (_f2 = response2.usage) == null ? void 0 : _f2.input_tokens_details,
+                  index,
+                  response2.data.length
+                )
               };
             })
           }
@@ -42863,15 +43439,20 @@ var OpenAIImageModel = class {
       },
       providerMetadata: {
         openai: {
-          images: response.data.map((item) => {
-            var _a22, _b22, _c2, _d2, _e2;
+          images: response.data.map((item, index) => {
+            var _a22, _b22, _c2, _d2, _e2, _f2;
             return {
               ...item.revised_prompt ? { revisedPrompt: item.revised_prompt } : {},
               created: (_a22 = response.created) != null ? _a22 : void 0,
               size: (_b22 = response.size) != null ? _b22 : void 0,
               quality: (_c2 = response.quality) != null ? _c2 : void 0,
               background: (_d2 = response.background) != null ? _d2 : void 0,
-              outputFormat: (_e2 = response.output_format) != null ? _e2 : void 0
+              outputFormat: (_e2 = response.output_format) != null ? _e2 : void 0,
+              ...distributeTokenDetails(
+                (_f2 = response.usage) == null ? void 0 : _f2.input_tokens_details,
+                index,
+                response.data.length
+              )
             };
           })
         }
@@ -42879,6 +43460,23 @@ var OpenAIImageModel = class {
     };
   }
 };
+function distributeTokenDetails(details, index, total) {
+  if (details == null) {
+    return {};
+  }
+  const result = {};
+  if (details.image_tokens != null) {
+    const base = Math.floor(details.image_tokens / total);
+    const remainder = details.image_tokens - base * (total - 1);
+    result.imageTokens = index === total - 1 ? remainder : base;
+  }
+  if (details.text_tokens != null) {
+    const base = Math.floor(details.text_tokens / total);
+    const remainder = details.text_tokens - base * (total - 1);
+    result.textTokens = index === total - 1 ? remainder : base;
+  }
+  return result;
+}
 async function fileToBlob(file) {
   if (!file) return void 0;
   if (file.type === "url") {
@@ -42964,6 +43562,30 @@ var codeInterpreterToolFactory = createProviderToolFactoryWithOutputSchema({
 var codeInterpreter = (args = {}) => {
   return codeInterpreterToolFactory(args);
 };
+var customArgsSchema = lazySchema(
+  () => zodSchema(
+    object$2({
+      name: string(),
+      description: string().optional(),
+      format: union([
+        object$2({
+          type: literal("grammar"),
+          syntax: _enum(["regex", "lark"]),
+          definition: string()
+        }),
+        object$2({
+          type: literal("text")
+        })
+      ]).optional()
+    })
+  )
+);
+var customInputSchema = lazySchema(() => zodSchema(string()));
+var customToolFactory = createProviderToolFactory({
+  id: "openai.custom",
+  inputSchema: customInputSchema
+});
+var customTool = (args) => customToolFactory(args);
 var comparisonFilterSchema = object$2({
   key: string(),
   type: _enum(["eq", "ne", "gt", "gte", "lt", "lte", "in", "nin"]),
@@ -43089,6 +43711,67 @@ var shellOutputSchema = lazySchema(
     })
   )
 );
+var shellSkillsSchema = array$1(
+  discriminatedUnion("type", [
+    object$2({
+      type: literal("skillReference"),
+      skillId: string(),
+      version: string().optional()
+    }),
+    object$2({
+      type: literal("inline"),
+      name: string(),
+      description: string(),
+      source: object$2({
+        type: literal("base64"),
+        mediaType: literal("application/zip"),
+        data: string()
+      })
+    })
+  ])
+).optional();
+var shellArgsSchema = lazySchema(
+  () => zodSchema(
+    object$2({
+      environment: union([
+        object$2({
+          type: literal("containerAuto"),
+          fileIds: array$1(string()).optional(),
+          memoryLimit: _enum(["1g", "4g", "16g", "64g"]).optional(),
+          networkPolicy: discriminatedUnion("type", [
+            object$2({ type: literal("disabled") }),
+            object$2({
+              type: literal("allowlist"),
+              allowedDomains: array$1(string()),
+              domainSecrets: array$1(
+                object$2({
+                  domain: string(),
+                  name: string(),
+                  value: string()
+                })
+              ).optional()
+            })
+          ]).optional(),
+          skills: shellSkillsSchema
+        }),
+        object$2({
+          type: literal("containerReference"),
+          containerId: string()
+        }),
+        object$2({
+          type: literal("local").optional(),
+          skills: array$1(
+            object$2({
+              name: string(),
+              description: string(),
+              path: string()
+            })
+          ).optional()
+        })
+      ]).optional()
+    })
+  )
+);
 var shell = createProviderToolFactoryWithOutputSchema({
   id: "openai.shell",
   inputSchema: shellInputSchema,
@@ -43128,7 +43811,7 @@ var webSearchOutputSchema = lazySchema(
           url: string().nullish(),
           pattern: string().nullish()
         })
-      ]),
+      ]).optional(),
       sources: array$1(
         discriminatedUnion("type", [
           object$2({ type: literal("url"), url: string() }),
@@ -43178,7 +43861,7 @@ var webSearchPreviewOutputSchema = lazySchema(
           url: string().nullish(),
           pattern: string().nullish()
         })
-      ])
+      ]).optional()
     })
   )
 );
@@ -43255,6 +43938,16 @@ var openaiTools = {
    *
    */
   applyPatch,
+  /**
+   * Custom tools let callers constrain model output to a grammar (regex or
+   * Lark syntax). The model returns a `custom_tool_call` output item whose
+   * `input` field is a string matching the specified grammar.
+   *
+   * @param name - The name of the custom tool.
+   * @param description - An optional description of the tool.
+   * @param format - The output format constraint (grammar type, syntax, and definition).
+   */
+  customTool,
   /**
    * The Code Interpreter tool allows models to write and run Python code in a
    * sandboxed environment to solve complex problems in domains like data analysis,
@@ -43295,7 +43988,7 @@ var openaiTools = {
    * Local shell is a tool that allows agents to run shell commands locally
    * on a machine you or the user provides.
    *
-   * Supported models: `gpt-5-codex` and `codex-mini-latest`
+   * Supported models: `gpt-5-codex`
    */
   localShell,
   /**
@@ -43393,7 +44086,8 @@ async function convertToOpenAIResponsesInput({
   hasConversation = false,
   hasLocalShellTool = false,
   hasShellTool = false,
-  hasApplyPatchTool = false
+  hasApplyPatchTool = false,
+  customProviderToolNames
 }) {
   var _a10, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const input = [];
@@ -43476,7 +44170,9 @@ async function convertToOpenAIResponsesInput({
         for (const part of content) {
           switch (part.type) {
             case "text": {
-              const id2 = (_b9 = (_a10 = part.providerOptions) == null ? void 0 : _a10[providerOptionsName]) == null ? void 0 : _b9.itemId;
+              const providerOpts = (_a10 = part.providerOptions) == null ? void 0 : _a10[providerOptionsName];
+              const id2 = providerOpts == null ? void 0 : providerOpts.itemId;
+              const phase = providerOpts == null ? void 0 : providerOpts.phase;
               if (hasConversation && id2 != null) {
                 break;
               }
@@ -43487,12 +44183,13 @@ async function convertToOpenAIResponsesInput({
               input.push({
                 role: "assistant",
                 content: [{ type: "output_text", text: part.text }],
-                id: id2
+                id: id2,
+                ...phase != null && { phase }
               });
               break;
             }
             case "tool-call": {
-              const id2 = (_g = (_d = (_c = part.providerOptions) == null ? void 0 : _c[providerOptionsName]) == null ? void 0 : _d.itemId) != null ? _g : (_f = (_e = part.providerMetadata) == null ? void 0 : _e[providerOptionsName]) == null ? void 0 : _f.itemId;
+              const id2 = (_f = (_c = (_b9 = part.providerOptions) == null ? void 0 : _b9[providerOptionsName]) == null ? void 0 : _c.itemId) != null ? _f : (_e = (_d = part.providerMetadata) == null ? void 0 : _d[providerOptionsName]) == null ? void 0 : _e.itemId;
               if (hasConversation && id2 != null) {
                 break;
               }
@@ -43561,6 +44258,16 @@ async function convertToOpenAIResponsesInput({
                 });
                 break;
               }
+              if (customProviderToolNames == null ? void 0 : customProviderToolNames.has(resolvedToolName)) {
+                input.push({
+                  type: "custom_tool_call",
+                  call_id: part.toolCallId,
+                  name: resolvedToolName,
+                  input: typeof part.input === "string" ? part.input : JSON.stringify(part.input),
+                  id: id2
+                });
+                break;
+              }
               input.push({
                 type: "function_call",
                 call_id: part.toolCallId,
@@ -43578,8 +44285,32 @@ async function convertToOpenAIResponsesInput({
               if (hasConversation) {
                 break;
               }
+              const resolvedResultToolName = toolNameMapping.toProviderToolName(
+                part.toolName
+              );
+              if (hasShellTool && resolvedResultToolName === "shell") {
+                if (part.output.type === "json") {
+                  const parsedOutput = await validateTypes$1({
+                    value: part.output.value,
+                    schema: shellOutputSchema
+                  });
+                  input.push({
+                    type: "shell_call_output",
+                    call_id: part.toolCallId,
+                    output: parsedOutput.output.map((item) => ({
+                      stdout: item.stdout,
+                      stderr: item.stderr,
+                      outcome: item.outcome.type === "timeout" ? { type: "timeout" } : {
+                        type: "exit",
+                        exit_code: item.outcome.exitCode
+                      }
+                    }))
+                  });
+                }
+                break;
+              }
               if (store) {
-                const itemId = (_j = (_i = (_h = part.providerMetadata) == null ? void 0 : _h[providerOptionsName]) == null ? void 0 : _i.itemId) != null ? _j : part.toolCallId;
+                const itemId = (_i = (_h = (_g = part.providerOptions) == null ? void 0 : _g[providerOptionsName]) == null ? void 0 : _h.itemId) != null ? _i : part.toolCallId;
                 input.push({ type: "item_reference", id: itemId });
               } else {
                 warnings.push({
@@ -43639,10 +44370,26 @@ async function convertToOpenAIResponsesInput({
                   }
                 }
               } else {
-                warnings.push({
-                  type: "other",
-                  message: `Non-OpenAI reasoning parts are not supported. Skipping reasoning part: ${JSON.stringify(part)}.`
-                });
+                const encryptedContent = providerOptions == null ? void 0 : providerOptions.reasoningEncryptedContent;
+                if (encryptedContent != null) {
+                  const summaryParts = [];
+                  if (part.text.length > 0) {
+                    summaryParts.push({
+                      type: "summary_text",
+                      text: part.text
+                    });
+                  }
+                  input.push({
+                    type: "reasoning",
+                    encrypted_content: encryptedContent,
+                    summary: summaryParts
+                  });
+                } else {
+                  warnings.push({
+                    type: "other",
+                    message: `Non-OpenAI reasoning parts are not supported. Skipping reasoning part: ${JSON.stringify(part)}.`
+                  });
+                }
               }
               break;
             }
@@ -43673,7 +44420,7 @@ async function convertToOpenAIResponsesInput({
           }
           const output = part.output;
           if (output.type === "execution-denied") {
-            const approvalId = (_l = (_k = output.providerOptions) == null ? void 0 : _k.openai) == null ? void 0 : _l.approvalId;
+            const approvalId = (_k = (_j = output.providerOptions) == null ? void 0 : _j.openai) == null ? void 0 : _k.approvalId;
             if (approvalId) {
               continue;
             }
@@ -43725,6 +44472,61 @@ async function convertToOpenAIResponsesInput({
             });
             continue;
           }
+          if (customProviderToolNames == null ? void 0 : customProviderToolNames.has(resolvedToolName)) {
+            let outputValue;
+            switch (output.type) {
+              case "text":
+              case "error-text":
+                outputValue = output.value;
+                break;
+              case "execution-denied":
+                outputValue = (_l = output.reason) != null ? _l : "Tool execution denied.";
+                break;
+              case "json":
+              case "error-json":
+                outputValue = JSON.stringify(output.value);
+                break;
+              case "content":
+                outputValue = output.value.map((item) => {
+                  var _a22;
+                  switch (item.type) {
+                    case "text":
+                      return { type: "input_text", text: item.text };
+                    case "image-data":
+                      return {
+                        type: "input_image",
+                        image_url: `data:${item.mediaType};base64,${item.data}`
+                      };
+                    case "image-url":
+                      return {
+                        type: "input_image",
+                        image_url: item.url
+                      };
+                    case "file-data":
+                      return {
+                        type: "input_file",
+                        filename: (_a22 = item.filename) != null ? _a22 : "data",
+                        file_data: `data:${item.mediaType};base64,${item.data}`
+                      };
+                    default:
+                      warnings.push({
+                        type: "other",
+                        message: `unsupported custom tool content part type: ${item.type}`
+                      });
+                      return void 0;
+                  }
+                }).filter(isNonNullable);
+                break;
+              default:
+                outputValue = "";
+            }
+            input.push({
+              type: "custom_tool_call_output",
+              call_id: part.toolCallId,
+              output: outputValue
+            });
+            continue;
+          }
           let contentValue;
           switch (output.type) {
             case "text":
@@ -43859,7 +44661,8 @@ var openaiResponsesChunkSchema = lazySchema(
         item: discriminatedUnion("type", [
           object$2({
             type: literal("message"),
-            id: string()
+            id: string(),
+            phase: _enum(["commentary", "final_answer"]).nullish()
           }),
           object$2({
             type: literal("reasoning"),
@@ -43940,6 +44743,13 @@ var openaiResponsesChunkSchema = lazySchema(
               })
             ])
           }),
+          object$2({
+            type: literal("custom_tool_call"),
+            id: string(),
+            call_id: string(),
+            name: string(),
+            input: string()
+          }),
           object$2({
             type: literal("shell_call"),
             id: string(),
@@ -43948,6 +44758,25 @@ var openaiResponsesChunkSchema = lazySchema(
             action: object$2({
               commands: array$1(string())
             })
+          }),
+          object$2({
+            type: literal("shell_call_output"),
+            id: string(),
+            call_id: string(),
+            status: _enum(["in_progress", "completed", "incomplete"]),
+            output: array$1(
+              object$2({
+                stdout: string(),
+                stderr: string(),
+                outcome: discriminatedUnion("type", [
+                  object$2({ type: literal("timeout") }),
+                  object$2({
+                    type: literal("exit"),
+                    exit_code: number$1()
+                  })
+                ])
+              })
+            )
           })
         ])
       }),
@@ -43957,7 +44786,8 @@ var openaiResponsesChunkSchema = lazySchema(
         item: discriminatedUnion("type", [
           object$2({
             type: literal("message"),
-            id: string()
+            id: string(),
+            phase: _enum(["commentary", "final_answer"]).nullish()
           }),
           object$2({
             type: literal("reasoning"),
@@ -43972,6 +44802,14 @@ var openaiResponsesChunkSchema = lazySchema(
             arguments: string(),
             status: literal("completed")
           }),
+          object$2({
+            type: literal("custom_tool_call"),
+            id: string(),
+            call_id: string(),
+            name: string(),
+            input: string(),
+            status: literal("completed")
+          }),
           object$2({
             type: literal("code_interpreter_call"),
             id: string(),
@@ -44013,7 +44851,7 @@ var openaiResponsesChunkSchema = lazySchema(
                 url: string().nullish(),
                 pattern: string().nullish()
               })
-            ])
+            ]).nullish()
           }),
           object$2({
             type: literal("file_search_call"),
@@ -44127,6 +44965,25 @@ var openaiResponsesChunkSchema = lazySchema(
             action: object$2({
               commands: array$1(string())
             })
+          }),
+          object$2({
+            type: literal("shell_call_output"),
+            id: string(),
+            call_id: string(),
+            status: _enum(["in_progress", "completed", "incomplete"]),
+            output: array$1(
+              object$2({
+                stdout: string(),
+                stderr: string(),
+                outcome: discriminatedUnion("type", [
+                  object$2({ type: literal("timeout") }),
+                  object$2({
+                    type: literal("exit"),
+                    exit_code: number$1()
+                  })
+                ])
+              })
+            )
           })
         ])
       }),
@@ -44136,6 +44993,12 @@ var openaiResponsesChunkSchema = lazySchema(
         output_index: number$1(),
         delta: string()
       }),
+      object$2({
+        type: literal("response.custom_tool_call_input.delta"),
+        item_id: string(),
+        output_index: number$1(),
+        delta: string()
+      }),
       object$2({
         type: literal("response.image_generation_call.partial_image"),
         item_id: string(),
@@ -44250,6 +45113,7 @@ var openaiResponsesResponseSchema = lazySchema(
             type: literal("message"),
             role: literal("assistant"),
             id: string(),
+            phase: _enum(["commentary", "final_answer"]).nullish(),
             content: array$1(
               object$2({
                 type: literal("output_text"),
@@ -44310,7 +45174,10 @@ var openaiResponsesResponseSchema = lazySchema(
                 sources: array$1(
                   discriminatedUnion("type", [
                     object$2({ type: literal("url"), url: string() }),
-                    object$2({ type: literal("api"), name: string() })
+                    object$2({
+                      type: literal("api"),
+                      name: string()
+                    })
                   ])
                 ).nullish()
               }),
@@ -44323,7 +45190,7 @@ var openaiResponsesResponseSchema = lazySchema(
                 url: string().nullish(),
                 pattern: string().nullish()
               })
-            ])
+            ]).nullish()
           }),
           object$2({
             type: literal("file_search_call"),
@@ -44379,6 +45246,13 @@ var openaiResponsesResponseSchema = lazySchema(
             arguments: string(),
             id: string()
           }),
+          object$2({
+            type: literal("custom_tool_call"),
+            call_id: string(),
+            name: string(),
+            input: string(),
+            id: string()
+          }),
           object$2({
             type: literal("computer_call"),
             id: string(),
@@ -44472,6 +45346,25 @@ var openaiResponsesResponseSchema = lazySchema(
             action: object$2({
               commands: array$1(string())
             })
+          }),
+          object$2({
+            type: literal("shell_call_output"),
+            id: string(),
+            call_id: string(),
+            status: _enum(["in_progress", "completed", "incomplete"]),
+            output: array$1(
+              object$2({
+                stdout: string(),
+                stderr: string(),
+                outcome: discriminatedUnion("type", [
+                  object$2({ type: literal("timeout") }),
+                  object$2({
+                    type: literal("exit"),
+                    exit_code: number$1()
+                  })
+                ])
+              })
+            )
           })
         ])
       ).optional(),
@@ -44643,14 +45536,18 @@ var openaiLanguageModelResponsesOptionsSchema = lazySchema(
 );
 async function prepareResponsesTools({
   tools,
-  toolChoice
+  toolChoice,
+  toolNameMapping,
+  customProviderToolNames
 }) {
+  var _a10;
   tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   const toolWarnings = [];
   if (tools == null) {
     return { tools: void 0, toolChoice: void 0, toolWarnings };
   }
   const openaiTools2 = [];
+  const resolvedCustomProviderToolNames = customProviderToolNames != null ? customProviderToolNames : /* @__PURE__ */ new Set();
   for (const tool2 of tools) {
     switch (tool2.type) {
       case "function":
@@ -44688,8 +45585,15 @@ async function prepareResponsesTools({
             break;
           }
           case "openai.shell": {
+            const args = await validateTypes$1({
+              value: tool2.args,
+              schema: shellArgsSchema
+            });
             openaiTools2.push({
-              type: "shell"
+              type: "shell",
+              ...args.environment && {
+                environment: mapShellEnvironment(args.environment)
+              }
             });
             break;
           }
@@ -44785,6 +45689,20 @@ async function prepareResponsesTools({
             });
             break;
           }
+          case "openai.custom": {
+            const args = await validateTypes$1({
+              value: tool2.args,
+              schema: customArgsSchema
+            });
+            openaiTools2.push({
+              type: "custom",
+              name: args.name,
+              description: args.description,
+              format: args.format
+            });
+            resolvedCustomProviderToolNames.add(args.name);
+            break;
+          }
         }
         break;
       }
@@ -44805,12 +45723,14 @@ async function prepareResponsesTools({
     case "none":
     case "required":
       return { tools: openaiTools2, toolChoice: type2, toolWarnings };
-    case "tool":
+    case "tool": {
+      const resolvedToolName = (_a10 = toolNameMapping == null ? void 0 : toolNameMapping.toProviderToolName(toolChoice.toolName)) != null ? _a10 : toolChoice.toolName;
       return {
         tools: openaiTools2,
-        toolChoice: toolChoice.toolName === "code_interpreter" || toolChoice.toolName === "file_search" || toolChoice.toolName === "image_generation" || toolChoice.toolName === "web_search_preview" || toolChoice.toolName === "web_search" || toolChoice.toolName === "mcp" || toolChoice.toolName === "apply_patch" ? { type: toolChoice.toolName } : { type: "function", name: toolChoice.toolName },
+        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 },
         toolWarnings
       };
+    }
     default: {
       const _exhaustiveCheck = type2;
       throw new UnsupportedFunctionalityError$1({
@@ -44819,6 +45739,52 @@ async function prepareResponsesTools({
     }
   }
 }
+function mapShellEnvironment(environment) {
+  if (environment.type === "containerReference") {
+    const env2 = environment;
+    return {
+      type: "container_reference",
+      container_id: env2.containerId
+    };
+  }
+  if (environment.type === "containerAuto") {
+    const env2 = environment;
+    return {
+      type: "container_auto",
+      file_ids: env2.fileIds,
+      memory_limit: env2.memoryLimit,
+      network_policy: env2.networkPolicy == null ? void 0 : env2.networkPolicy.type === "disabled" ? { type: "disabled" } : {
+        type: "allowlist",
+        allowed_domains: env2.networkPolicy.allowedDomains,
+        domain_secrets: env2.networkPolicy.domainSecrets
+      },
+      skills: mapShellSkills(env2.skills)
+    };
+  }
+  const env = environment;
+  return {
+    type: "local",
+    skills: env.skills
+  };
+}
+function mapShellSkills(skills) {
+  return skills == null ? void 0 : skills.map(
+    (skill) => skill.type === "skillReference" ? {
+      type: "skill_reference",
+      skill_id: skill.skillId,
+      version: skill.version
+    } : {
+      type: "inline",
+      name: skill.name,
+      description: skill.description,
+      source: {
+        type: "base64",
+        media_type: skill.source.mediaType,
+        data: skill.source.data
+      }
+    }
+  );
+}
 function extractApprovalRequestIdToToolCallIdMapping(prompt) {
   var _a10, _b9;
   const mapping = {};
@@ -44862,7 +45828,7 @@ var OpenAIResponsesLanguageModel = class {
     toolChoice,
     responseFormat
   }) {
-    var _a10, _b9, _c, _d, _e, _f;
+    var _a10, _b9, _c, _d, _e, _f, _g, _h, _i;
     const warnings = [];
     const modelCapabilities = getOpenAILanguageModelCapabilities(this.modelId);
     if (topK != null) {
@@ -44913,7 +45879,19 @@ var OpenAIResponsesLanguageModel = class {
         "openai.web_search_preview": "web_search_preview",
         "openai.mcp": "mcp",
         "openai.apply_patch": "apply_patch"
-      }
+      },
+      resolveProviderToolName: (tool2) => tool2.id === "openai.custom" ? tool2.args.name : void 0
+    });
+    const customProviderToolNames = /* @__PURE__ */ new Set();
+    const {
+      tools: openaiTools2,
+      toolChoice: openaiToolChoice,
+      toolWarnings
+    } = await prepareResponsesTools({
+      tools,
+      toolChoice,
+      toolNameMapping,
+      customProviderToolNames
     });
     const { input, warnings: inputWarnings } = await convertToOpenAIResponsesInput({
       prompt,
@@ -44925,7 +45903,8 @@ var OpenAIResponsesLanguageModel = class {
       hasConversation: (openaiOptions == null ? void 0 : openaiOptions.conversation) != null,
       hasLocalShellTool: hasOpenAITool("openai.local_shell"),
       hasShellTool: hasOpenAITool("openai.shell"),
-      hasApplyPatchTool: hasOpenAITool("openai.apply_patch")
+      hasApplyPatchTool: hasOpenAITool("openai.apply_patch"),
+      customProviderToolNames: customProviderToolNames.size > 0 ? customProviderToolNames : void 0
     });
     warnings.push(...inputWarnings);
     const strictJsonSchema = (_d = openaiOptions == null ? void 0 : openaiOptions.strictJsonSchema) != null ? _d : true;
@@ -45058,14 +46037,10 @@ var OpenAIResponsesLanguageModel = class {
       });
       delete baseArgs.service_tier;
     }
-    const {
-      tools: openaiTools2,
-      toolChoice: openaiToolChoice,
-      toolWarnings
-    } = await prepareResponsesTools({
-      tools,
-      toolChoice
-    });
+    const shellToolEnvType = (_i = (_h = (_g = tools == null ? void 0 : tools.find(
+      (tool2) => tool2.type === "provider" && tool2.id === "openai.shell"
+    )) == null ? void 0 : _g.args) == null ? void 0 : _h.environment) == null ? void 0 : _i.type;
+    const isShellProviderExecuted = shellToolEnvType === "containerAuto" || shellToolEnvType === "containerReference";
     return {
       webSearchToolName,
       args: {
@@ -45076,7 +46051,8 @@ var OpenAIResponsesLanguageModel = class {
       warnings: [...warnings, ...toolWarnings],
       store,
       toolNameMapping,
-      providerOptionsName
+      providerOptionsName,
+      isShellProviderExecuted
     };
   }
   async doGenerate(options) {
@@ -45086,7 +46062,8 @@ var OpenAIResponsesLanguageModel = class {
       warnings,
       webSearchToolName,
       toolNameMapping,
-      providerOptionsName
+      providerOptionsName,
+      isShellProviderExecuted
     } = await this.getArgs(options);
     const url2 = this.config.url({
       path: "/responses",
@@ -45186,6 +46163,7 @@ var OpenAIResponsesLanguageModel = class {
                 commands: part.action.commands
               }
             }),
+            ...isShellProviderExecuted && { providerExecuted: true },
             providerMetadata: {
               [providerOptionsName]: {
                 itemId: part.id
@@ -45194,6 +46172,24 @@ var OpenAIResponsesLanguageModel = class {
           });
           break;
         }
+        case "shell_call_output": {
+          content.push({
+            type: "tool-result",
+            toolCallId: part.call_id,
+            toolName: toolNameMapping.toCustomToolName("shell"),
+            result: {
+              output: part.output.map((item) => ({
+                stdout: item.stdout,
+                stderr: item.stderr,
+                outcome: item.outcome.type === "exit" ? {
+                  type: "exit",
+                  exitCode: item.outcome.exit_code
+                } : { type: "timeout" }
+              }))
+            }
+          });
+          break;
+        }
         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) {
@@ -45201,6 +46197,7 @@ var OpenAIResponsesLanguageModel = class {
             }
             const providerMetadata2 = {
               itemId: part.id,
+              ...part.phase != null && { phase: part.phase },
               ...contentPart.annotations.length > 0 && {
                 annotations: contentPart.annotations
               }
@@ -45289,6 +46286,22 @@ var OpenAIResponsesLanguageModel = class {
           });
           break;
         }
+        case "custom_tool_call": {
+          hasFunctionCall = true;
+          const toolName = toolNameMapping.toCustomToolName(part.name);
+          content.push({
+            type: "tool-call",
+            toolCallId: part.call_id,
+            toolName,
+            input: JSON.stringify(part.input),
+            providerMetadata: {
+              [providerOptionsName]: {
+                itemId: part.id
+              }
+            }
+          });
+          break;
+        }
         case "web_search_call": {
           content.push({
             type: "tool-call",
@@ -45483,7 +46496,8 @@ var OpenAIResponsesLanguageModel = class {
       webSearchToolName,
       toolNameMapping,
       store,
-      providerOptionsName
+      providerOptionsName,
+      isShellProviderExecuted
     } = await this.getArgs(options);
     const { responseHeaders, value: response } = await postJsonToApi$1({
       url: this.config.url({
@@ -45514,6 +46528,7 @@ var OpenAIResponsesLanguageModel = class {
     let responseId = null;
     const ongoingToolCalls = {};
     const ongoingAnnotations = [];
+    let activeMessagePhase;
     let hasFunctionCall = false;
     const activeReasoning = {};
     let serviceTier;
@@ -45524,7 +46539,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;
+            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;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -45545,6 +46560,19 @@ var OpenAIResponsesLanguageModel = class {
                   id: value.item.call_id,
                   toolName: value.item.name
                 });
+              } else if (value.item.type === "custom_tool_call") {
+                const toolName = toolNameMapping.toCustomToolName(
+                  value.item.name
+                );
+                ongoingToolCalls[value.output_index] = {
+                  toolName,
+                  toolCallId: value.item.call_id
+                };
+                controller.enqueue({
+                  type: "tool-input-start",
+                  id: value.item.call_id,
+                  toolName
+                });
               } else if (value.item.type === "web_search_call") {
                 ongoingToolCalls[value.output_index] = {
                   toolName: toolNameMapping.toCustomToolName(
@@ -45662,14 +46690,19 @@ var OpenAIResponsesLanguageModel = class {
                   toolName: toolNameMapping.toCustomToolName("shell"),
                   toolCallId: value.item.call_id
                 };
-              } else if (value.item.type === "message") {
+              } 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;
                 controller.enqueue({
                   type: "text-start",
                   id: value.item.id,
                   providerMetadata: {
                     [providerOptionsName]: {
-                      itemId: value.item.id
+                      itemId: value.item.id,
+                      ...value.item.phase != null && {
+                        phase: value.item.phase
+                      }
                     }
                   }
                 });
@@ -45684,19 +46717,22 @@ var OpenAIResponsesLanguageModel = class {
                   providerMetadata: {
                     [providerOptionsName]: {
                       itemId: value.item.id,
-                      reasoningEncryptedContent: (_a10 = value.item.encrypted_content) != null ? _a10 : null
+                      reasoningEncryptedContent: (_b9 = value.item.encrypted_content) != null ? _b9 : null
                     }
                   }
                 });
               }
             } else if (isResponseOutputItemDoneChunk(value)) {
               if (value.item.type === "message") {
+                const phase = (_c = value.item.phase) != null ? _c : activeMessagePhase;
+                activeMessagePhase = void 0;
                 controller.enqueue({
                   type: "text-end",
                   id: value.item.id,
                   providerMetadata: {
                     [providerOptionsName]: {
                       itemId: value.item.id,
+                      ...phase != null && { phase },
                       ...ongoingAnnotations.length > 0 && {
                         annotations: ongoingAnnotations
                       }
@@ -45721,6 +46757,27 @@ var OpenAIResponsesLanguageModel = class {
                     }
                   }
                 });
+              } else if (value.item.type === "custom_tool_call") {
+                ongoingToolCalls[value.output_index] = void 0;
+                hasFunctionCall = true;
+                const toolName = toolNameMapping.toCustomToolName(
+                  value.item.name
+                );
+                controller.enqueue({
+                  type: "tool-input-end",
+                  id: value.item.call_id
+                });
+                controller.enqueue({
+                  type: "tool-call",
+                  toolCallId: value.item.call_id,
+                  toolName,
+                  input: JSON.stringify(value.item.input),
+                  providerMetadata: {
+                    [providerOptionsName]: {
+                      itemId: value.item.id
+                    }
+                  }
+                });
               } else if (value.item.type === "web_search_call") {
                 ongoingToolCalls[value.output_index] = void 0;
                 controller.enqueue({
@@ -45761,13 +46818,13 @@ var OpenAIResponsesLanguageModel = class {
                   toolName: toolNameMapping.toCustomToolName("file_search"),
                   result: {
                     queries: value.item.queries,
-                    results: (_c = (_b9 = value.item.results) == null ? void 0 : _b9.map((result) => ({
+                    results: (_e = (_d = value.item.results) == null ? void 0 : _d.map((result) => ({
                       attributes: result.attributes,
                       fileId: result.file_id,
                       filename: result.filename,
                       score: result.score,
                       text: result.text
-                    }))) != null ? _c : null
+                    }))) != null ? _e : null
                   }
                 });
               } else if (value.item.type === "code_interpreter_call") {
@@ -45791,10 +46848,10 @@ var OpenAIResponsesLanguageModel = class {
                 });
               } else if (value.item.type === "mcp_call") {
                 ongoingToolCalls[value.output_index] = void 0;
-                const approvalRequestId = (_d = value.item.approval_request_id) != null ? _d : void 0;
-                const aliasedToolCallId = approvalRequestId != null ? (_f = (_e = approvalRequestIdToDummyToolCallIdFromStream.get(
+                const approvalRequestId = (_f = value.item.approval_request_id) != null ? _f : void 0;
+                const aliasedToolCallId = approvalRequestId != null ? (_h = (_g = approvalRequestIdToDummyToolCallIdFromStream.get(
                   approvalRequestId
-                )) != null ? _e : approvalRequestIdToDummyToolCallIdFromPrompt[approvalRequestId]) != null ? _f : value.item.id : value.item.id;
+                )) != null ? _g : approvalRequestIdToDummyToolCallIdFromPrompt[approvalRequestId]) != null ? _h : value.item.id : value.item.id;
                 const toolName = `mcp.${value.item.name}`;
                 controller.enqueue({
                   type: "tool-call",
@@ -45864,8 +46921,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 = (_i = (_h = (_g = self2.config).generateId) == null ? void 0 : _h.call(_g)) != null ? _i : generateId$1();
-                const approvalRequestId = (_j = value.item.approval_request_id) != null ? _j : value.item.id;
+                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;
                 approvalRequestIdToDummyToolCallIdFromStream.set(
                   approvalRequestId,
                   dummyToolCallId
@@ -45915,10 +46972,31 @@ var OpenAIResponsesLanguageModel = class {
                       commands: value.item.action.commands
                     }
                   }),
+                  ...isShellProviderExecuted && {
+                    providerExecuted: true
+                  },
                   providerMetadata: {
                     [providerOptionsName]: { itemId: value.item.id }
                   }
                 });
+              } else if (value.item.type === "shell_call_output") {
+                controller.enqueue({
+                  type: "tool-result",
+                  toolCallId: value.item.call_id,
+                  toolName: toolNameMapping.toCustomToolName("shell"),
+                  result: {
+                    output: value.item.output.map(
+                      (item) => ({
+                        stdout: item.stdout,
+                        stderr: item.stderr,
+                        outcome: item.outcome.type === "exit" ? {
+                          type: "exit",
+                          exitCode: item.outcome.exit_code
+                        } : { type: "timeout" }
+                      })
+                    )
+                  }
+                });
               } else if (value.item.type === "reasoning") {
                 const activeReasoningPart = activeReasoning[value.item.id];
                 const summaryPartIndices = Object.entries(
@@ -45933,7 +47011,7 @@ var OpenAIResponsesLanguageModel = class {
                     providerMetadata: {
                       [providerOptionsName]: {
                         itemId: value.item.id,
-                        reasoningEncryptedContent: (_k = value.item.encrypted_content) != null ? _k : null
+                        reasoningEncryptedContent: (_m = value.item.encrypted_content) != null ? _m : null
                       }
                     }
                   });
@@ -45949,6 +47027,15 @@ var OpenAIResponsesLanguageModel = class {
                   delta: value.delta
                 });
               }
+            } else if (isResponseCustomToolCallInputDeltaChunk(value)) {
+              const toolCall = ongoingToolCalls[value.output_index];
+              if (toolCall != null) {
+                controller.enqueue({
+                  type: "tool-input-delta",
+                  id: toolCall.toolCallId,
+                  delta: value.delta
+                });
+              }
             } else if (isResponseApplyPatchCallOperationDiffDeltaChunk(value)) {
               const toolCall = ongoingToolCalls[value.output_index];
               if (toolCall == null ? void 0 : toolCall.applyPatch) {
@@ -46037,7 +47124,7 @@ var OpenAIResponsesLanguageModel = class {
                 id: value.item_id,
                 delta: value.delta
               });
-              if (((_m = (_l = options.providerOptions) == null ? void 0 : _l[providerOptionsName]) == null ? void 0 : _m.logprobs) && value.logprobs) {
+              if (((_o = (_n = options.providerOptions) == null ? void 0 : _n[providerOptionsName]) == null ? void 0 : _o.logprobs) && value.logprobs) {
                 logprobs.push(value.logprobs);
               }
             } else if (value.type === "response.reasoning_summary_part.added") {
@@ -46066,7 +47153,7 @@ var OpenAIResponsesLanguageModel = class {
                   providerMetadata: {
                     [providerOptionsName]: {
                       itemId: value.item_id,
-                      reasoningEncryptedContent: (_o = (_n = activeReasoning[value.item_id]) == null ? void 0 : _n.encryptedContent) != null ? _o : null
+                      reasoningEncryptedContent: (_q = (_p = activeReasoning[value.item_id]) == null ? void 0 : _p.encryptedContent) != null ? _q : null
                     }
                   }
                 });
@@ -46100,10 +47187,10 @@ var OpenAIResponsesLanguageModel = class {
             } else if (isResponseFinishedChunk(value)) {
               finishReason = {
                 unified: mapOpenAIResponseFinishReason({
-                  finishReason: (_p = value.response.incomplete_details) == null ? void 0 : _p.reason,
+                  finishReason: (_r = value.response.incomplete_details) == null ? void 0 : _r.reason,
                   hasFunctionCall
                 }),
-                raw: (_r = (_q = value.response.incomplete_details) == null ? void 0 : _q.reason) != null ? _r : void 0
+                raw: (_t = (_s = value.response.incomplete_details) == null ? void 0 : _s.reason) != null ? _t : void 0
               };
               usage = value.response.usage;
               if (typeof value.response.service_tier === "string") {
@@ -46115,7 +47202,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "url",
-                  id: (_u = (_t = (_s = self2.config).generateId) == null ? void 0 : _t.call(_s)) != null ? _u : generateId$1(),
+                  id: (_w = (_v = (_u = self2.config).generateId) == null ? void 0 : _v.call(_u)) != null ? _w : generateId$1(),
                   url: value.annotation.url,
                   title: value.annotation.title
                 });
@@ -46123,7 +47210,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_x = (_w = (_v = self2.config).generateId) == null ? void 0 : _w.call(_v)) != null ? _x : generateId$1(),
+                  id: (_z = (_y = (_x = self2.config).generateId) == null ? void 0 : _y.call(_x)) != null ? _z : generateId$1(),
                   mediaType: "text/plain",
                   title: value.annotation.filename,
                   filename: value.annotation.filename,
@@ -46139,7 +47226,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_A = (_z = (_y = self2.config).generateId) == null ? void 0 : _z.call(_y)) != null ? _A : generateId$1(),
+                  id: (_C = (_B = (_A = self2.config).generateId) == null ? void 0 : _B.call(_A)) != null ? _C : generateId$1(),
                   mediaType: "text/plain",
                   title: value.annotation.filename,
                   filename: value.annotation.filename,
@@ -46155,7 +47242,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_D = (_C = (_B = self2.config).generateId) == null ? void 0 : _C.call(_B)) != null ? _D : generateId$1(),
+                  id: (_F = (_E = (_D = self2.config).generateId) == null ? void 0 : _E.call(_D)) != null ? _F : generateId$1(),
                   mediaType: "application/octet-stream",
                   title: value.annotation.file_id,
                   filename: value.annotation.file_id,
@@ -46209,6 +47296,9 @@ function isResponseCreatedChunk(chunk) {
 function isResponseFunctionCallArgumentsDeltaChunk(chunk) {
   return chunk.type === "response.function_call_arguments.delta";
 }
+function isResponseCustomToolCallInputDeltaChunk(chunk) {
+  return chunk.type === "response.custom_tool_call_input.delta";
+}
 function isResponseImageGenerationCallPartialImageChunk(chunk) {
   return chunk.type === "response.image_generation_call.partial_image";
 }
@@ -46235,6 +47325,9 @@ function isErrorChunk(chunk) {
 }
 function mapWebSearchOutput(action) {
   var _a10;
+  if (action == null) {
+    return {};
+  }
   switch (action.type) {
     case "search":
       return {
@@ -46587,7 +47680,7 @@ var OpenAITranscriptionModel = class {
     };
   }
 };
-var VERSION$2 = "3.0.28";
+var VERSION$2 = "3.0.41";
 function createOpenAI(options = {}) {
   var _a10, _b9;
   const baseURL = (_a10 = withoutTrailingSlash$1(
@@ -48407,9 +49500,13 @@ function generateReActToolsPrompt(tools) {
   if (toolEntries.length === 0) {
     return "";
   }
-  let prompt = "\n\n# 工具调用\n\n";
-  prompt += "你可以根据需要调用以下工具：\n\n";
-  prompt += "<tools>\n";
+  let prompt = `
+# 工具调用
+
+你可以根据需要调用以下工具：
+
+<tools>
+  `;
   toolEntries.forEach(([toolName, tool2]) => {
     const toolInfo = tool2;
     const description2 = toolInfo.description || "无描述";
@@ -48422,23 +49519,36 @@ function generateReActToolsPrompt(tools) {
     prompt += `${JSON.stringify(toolJson, null, 2)}
 `;
   });
-  prompt += "</tools>\n\n";
-  prompt += "## 工具调用格式\n\n";
-  prompt += "要调用工具，请使用以下 XML 格式：\n";
-  prompt += "Thought: [你的思考过程]\n";
-  prompt += '<tool_call>{"name": "toolName", "arguments": {"arg1": "value1"}}</tool_call>\n\n';
-  prompt += "工具执行后，你将收到 <tool_response> 格式的结果。你可以继续思考或调用其他工具。\n\n";
-  prompt += "## 使用示例\n\n";
-  prompt += '如果用户要求"获取今天的日期"，你可以这样调用工具：\n';
-  prompt += "Thought: 用户想要获取今天的日期，我需要调用日期相关的工具。\n";
-  prompt += '<tool_call>{"name": "get-today", "arguments": {}}</tool_call>\n\n';
-  prompt += "然后等待工具返回结果（Observation），再根据结果给出最终答案。\n\n";
-  prompt += "## 任务完成\n\n";
-  prompt += "当任务完成或无法继续时，直接给出最终答案即可。\n\n";
-  prompt += "**重要提示**：\n";
-  prompt += "- 必须严格按照 XML 格式调用工具\n";
-  prompt += "- arguments 必须是有效的 JSON 格式\n";
-  prompt += "- 如果不需要调用工具，直接给出最终答案即可\n";
+  prompt += `
+</tools>
+
+## 工具调用格式
+
+要调用工具，请使用以下 XML 格式：
+Thought: [你的思考过程]
+<tool_call>
+  {"name": "toolName", "arguments": {"arg1": "value1"}}
+</tool_call>
+
+工具执行后，你将收到 <tool_response> 格式的结果。你可以继续思考或调用其他工具。
+
+## 使用示例
+
+如果用户要求"获取今天的日期"，你可以这样调用工具：
+Thought: 用户想要获取今天的日期，我需要调用日期相关的工具。
+<tool_call>{"name": "get-today", "arguments": {}}</tool_call>
+
+然后等待工具返回结果（Observation），再根据结果给出最终答案。
+
+## 任务完成
+
+当任务完成或无法继续时，直接给出最终答案即可。
+
+**重要提示**：
+- 必须严格按照 XML 格式调用工具
+- arguments 必须是有效的 JSON 格式
+- 如果不需要调用工具，直接给出最终答案即可
+`;
   return prompt;
 }
 function parseReActAction(text2, availableTools) {
@@ -49045,6 +50155,122 @@ ${observationText}
     return this._chat(streamText, options);
   }
 }
+const MSG_TOOL_CALL = "next-sdk:tool-call";
+const MSG_TOOL_RESPONSE = "next-sdk:tool-response";
+const MSG_PAGE_READY = "next-sdk:page-ready";
+const activePages = /* @__PURE__ */ new Map();
+let _navigator = null;
+function setNavigator(fn) {
+  _navigator = fn;
+}
+function buildPageHandler(name16, route, timeout = 3e4) {
+  return (input) => {
+    const callId = randomUUID();
+    return new Promise((resolve2, reject) => {
+      let timer;
+      let readyHandler;
+      const cleanup = () => {
+        clearTimeout(timer);
+        window.removeEventListener("message", responseHandler);
+        if (readyHandler) {
+          window.removeEventListener("message", readyHandler);
+        }
+      };
+      timer = setTimeout(() => {
+        cleanup();
+        reject(new Error(`工具 [${name16}] 调用超时 (${timeout}ms)，请检查目标页面是否正确调用了 registerPageTool`));
+      }, timeout);
+      const responseHandler = (event) => {
+        if (event.source === window && event.data?.type === MSG_TOOL_RESPONSE && event.data.callId === callId) {
+          cleanup();
+          event.data.error ? reject(new Error(event.data.error)) : resolve2(event.data.result);
+        }
+      };
+      window.addEventListener("message", responseHandler);
+      const sendCall = () => {
+        window.postMessage({ type: MSG_TOOL_CALL, callId, toolName: name16, route, input }, window.location.origin || "*");
+      };
+      let callSent = false;
+      const sendCallOnce = () => {
+        if (callSent) return;
+        callSent = true;
+        sendCall();
+      };
+      const run = async () => {
+        try {
+          if (activePages.get(route)) {
+            sendCallOnce();
+            return;
+          }
+          readyHandler = (event) => {
+            if (event.source === window && event.data?.type === MSG_PAGE_READY && event.data.route === route) {
+              window.removeEventListener("message", readyHandler);
+              sendCallOnce();
+            }
+          };
+          window.addEventListener("message", readyHandler);
+          if (_navigator) {
+            await _navigator(route);
+          }
+          if (activePages.get(route)) {
+            window.removeEventListener("message", readyHandler);
+            sendCallOnce();
+          }
+        } catch (err) {
+          cleanup();
+          reject(err instanceof Error ? err : new Error(String(err)));
+        }
+      };
+      void run();
+    });
+  };
+}
+function withPageTools(server) {
+  return new Proxy(server, {
+    get(target, prop, receiver) {
+      if (prop === "registerTool") {
+        return (name16, config2, handlerOrRoute) => {
+          if (typeof handlerOrRoute === "function") {
+            return target.registerTool(name16, config2, handlerOrRoute);
+          }
+          const { route, timeout } = handlerOrRoute;
+          return target.registerTool(name16, config2, buildPageHandler(name16, route, timeout));
+        };
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function registerPageTool(options) {
+  const { handlers } = options;
+  const route = window.location.pathname;
+  const handleMessage = async (event) => {
+    if (event.source !== window || event.data?.type !== MSG_TOOL_CALL || event.data?.route !== route || !(event.data.toolName in handlers)) {
+      return;
+    }
+    const { callId, toolName, input } = event.data;
+    try {
+      const result = await handlers[toolName](input);
+      window.postMessage({ type: MSG_TOOL_RESPONSE, callId, result }, window.location.origin || "*");
+    } catch (err) {
+      window.postMessage(
+        {
+          type: MSG_TOOL_RESPONSE,
+          callId,
+          error: err instanceof Error ? err.message : String(err)
+        },
+        window.location.origin || "*"
+      );
+    }
+  };
+  activePages.set(route, true);
+  window.addEventListener("message", handleMessage);
+  window.postMessage({ type: MSG_PAGE_READY, route }, window.location.origin || "*");
+  return () => {
+    activePages.delete(route);
+    window.removeEventListener("message", handleMessage);
+  };
+}
 const MAIN_SKILL_PATH_REG = /^\.\/[^/]+\/SKILL\.md$/;
 const FRONT_MATTER_BLOCK_REG = /^---\s*\n([\s\S]+?)\s*\n---/;
 function parseSkillFrontMatter(content) {
@@ -49057,14 +50283,27 @@ function parseSkillFrontMatter(content) {
   const description2 = descMatch?.[1]?.trim();
   return name16 && description2 ? { name: name16, description: description2 } : null;
 }
+function normalizeSkillModuleKeys(modules) {
+  const result = {};
+  for (const [key, content] of Object.entries(modules)) {
+    const normalizedKey = key.replace(/\\/g, "/");
+    const skillsIndex = normalizedKey.lastIndexOf("skills/");
+    const relativePath = skillsIndex >= 0 ? normalizedKey.slice(skillsIndex + 7) : normalizedKey;
+    const standardPath = relativePath.startsWith("./") ? relativePath : `./${relativePath}`;
+    result[standardPath] = content;
+  }
+  return result;
+}
 function getMainSkillPaths(modules) {
-  return Object.keys(modules).filter((path) => MAIN_SKILL_PATH_REG.test(path));
+  const normalized = normalizeSkillModuleKeys(modules);
+  return Object.keys(normalized).filter((path) => MAIN_SKILL_PATH_REG.test(path));
 }
 function getSkillOverviews(modules) {
-  const mainPaths = getMainSkillPaths(modules);
+  const normalized = normalizeSkillModuleKeys(modules);
+  const mainPaths = Object.keys(normalized).filter((path) => MAIN_SKILL_PATH_REG.test(path));
   const list = [];
   for (const path of mainPaths) {
-    const content = modules[path];
+    const content = normalized[path];
     if (!content) continue;
     const parsed = parseSkillFrontMatter(content);
     if (!parsed) continue;
@@ -49086,34 +50325,38 @@ ${lines.join("\n")}
 当需要用到某技能时，请使用 get_skill_content 工具获取该技能的完整文档内容。`;
 }
 function getSkillMdPaths(modules) {
-  return Object.keys(modules);
+  const normalized = normalizeSkillModuleKeys(modules);
+  return Object.keys(normalized);
 }
 function getSkillMdContent(modules, path) {
-  return modules[path];
+  const normalized = normalizeSkillModuleKeys(modules);
+  return normalized[path];
 }
 function getMainSkillPathByName(modules, name16) {
   return getMainSkillPaths(modules).find((p) => p.startsWith(`./${name16}/SKILL.md`));
 }
+const SKILL_INPUT_SCHEMA = objectType({
+  skillName: stringType().optional().describe("技能名称，与目录名一致，如 calculator"),
+  path: stringType().optional().describe("文档相对路径，如 ./calculator/SKILL.md 或 ./product-guide/reference/xxx.json")
+});
 function createSkillTools(modules) {
+  const normalizedModules = normalizeSkillModuleKeys(modules);
   const getSkillContent = tool({
-    description: "根据技能名称或文档路径获取该技能的完整 Markdown 文档内容。传入 skillName（如 calculator）或 path（如 ./calculator/SKILL.md）",
-    inputSchema: objectType({
-      skillName: stringType().optional().describe("技能名称，与目录名一致，如 calculator"),
-      path: stringType().optional().describe("文档相对路径，如 ./calculator/SKILL.md 或 ./product-guide/reference/xxx.md")
-    }),
+    description: "根据技能名称或文档路径获取该技能的完整文档内容。传入 skillName（如 calculator）或 path（如 ./calculator/SKILL.md）。支持 .md、.json、.xml 等各类文本格式文件。",
+    inputSchema: SKILL_INPUT_SCHEMA,
     execute: (args) => {
       const { skillName, path: pathArg } = args;
       let content;
       if (pathArg) {
-        content = getSkillMdContent(modules, pathArg);
+        content = getSkillMdContent(normalizedModules, pathArg);
       } else if (skillName) {
-        const mainPath = getMainSkillPathByName(modules, skillName);
-        content = mainPath ? getSkillMdContent(modules, mainPath) : void 0;
+        const mainPath = getMainSkillPathByName(normalizedModules, skillName);
+        content = mainPath ? getSkillMdContent(normalizedModules, mainPath) : void 0;
       }
       if (content === void 0) {
         return { error: "未找到对应技能文档", skillName: skillName ?? pathArg };
       }
-      return { content, path: pathArg ?? getMainSkillPathByName(modules, skillName) };
+      return { content, path: pathArg ?? getMainSkillPathByName(normalizedModules, skillName) };
     }
   });
   return {
@@ -49156,5 +50399,8 @@ export {
   isSSEClientTransport,
   isStreamableHTTPClientTransport,
   parseSkillFrontMatter,
+  registerPageTool,
+  setNavigator,
+  withPageTools,
   z
 };