@opentiny/next-sdk 0.2.4 → 0.2.6

package/dist/index.umd.dev.js

@@ -175,7 +175,7 @@
     (function(exports3) {
       Object.defineProperty(exports3, "__esModule", { value: true });
       exports3.ValueScope = exports3.ValueScopeName = exports3.Scope = exports3.varKinds = exports3.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`);
@@ -321,9 +321,9 @@
     (function(exports3) {
       Object.defineProperty(exports3, "__esModule", { value: true });
       exports3.or = exports3.and = exports3.not = exports3.CodeGen = exports3.operators = exports3.varKinds = exports3.ValueScopeName = exports3.ValueScope = exports3.Scope = exports3.Name = exports3.regexpCode = exports3.stringify = exports3.getProperty = exports3.nil = exports3.strConcat = exports3.str = exports3._ = 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(exports3, "_", { enumerable: true, get: function() {
         return code_2._;
       } });
@@ -348,7 +348,7 @@
       Object.defineProperty(exports3, "Name", { enumerable: true, get: function() {
         return code_2.Name;
       } });
-      var scope_2 = requireScope();
+      var scope_2 = /* @__PURE__ */ requireScope();
       Object.defineProperty(exports3, "Scope", { enumerable: true, get: function() {
         return scope_2.Scope;
       } });
@@ -1042,8 +1042,8 @@
     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)
@@ -1208,7 +1208,7 @@
     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"),
@@ -1248,9 +1248,9 @@
     (function(exports3) {
       Object.defineProperty(exports3, "__esModule", { value: true });
       exports3.extendErrors = exports3.resetErrorsCount = exports3.reportExtraError = exports3.reportError = exports3.keyword$DataError = exports3.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();
       exports3.keywordError = {
         message: ({ keyword: keyword2 }) => (0, codegen_1.str)`must pass "${keyword2}" keyword validation`
       };
@@ -1370,9 +1370,9 @@
     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"
     };
@@ -1475,11 +1475,11 @@
     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";
@@ -1659,8 +1659,8 @@
     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) {
@@ -1697,10 +1697,10 @@
     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), () => {
@@ -1829,10 +1829,10 @@
     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);
@@ -1947,8 +1947,8 @@
     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');
@@ -2153,7 +2153,7 @@
     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([
@@ -2308,18 +2308,18 @@
     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);
@@ -2830,7 +2830,7 @@
     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}`);
@@ -2848,12 +2848,12 @@
     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;
@@ -3819,11 +3819,11 @@
     (function(exports3) {
       Object.defineProperty(exports3, "__esModule", { value: true });
       exports3.CodeGen = exports3.Name = exports3.nil = exports3.stringify = exports3.str = exports3._ = exports3.KeywordCxt = void 0;
-      var validate_1 = requireValidate();
+      var validate_1 = /* @__PURE__ */ requireValidate();
       Object.defineProperty(exports3, "KeywordCxt", { enumerable: true, get: function() {
         return validate_1.KeywordCxt;
       } });
-      var codegen_1 = requireCodegen();
+      var codegen_1 = /* @__PURE__ */ requireCodegen();
       Object.defineProperty(exports3, "_", { enumerable: true, get: function() {
         return codegen_1._;
       } });
@@ -3842,16 +3842,16 @@
       Object.defineProperty(exports3, "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"];
@@ -4448,12 +4448,12 @@
     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",
@@ -4568,8 +4568,8 @@
     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",
@@ -4590,7 +4590,7 @@
     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 },
@@ -4622,7 +4622,7 @@
     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}}`
@@ -4676,9 +4676,9 @@
     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";
@@ -4708,8 +4708,9 @@
     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}}`
@@ -4721,10 +4722,18 @@
       $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;
@@ -4736,7 +4745,7 @@
     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";
@@ -4765,9 +4774,9 @@
     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}}`
@@ -4847,7 +4856,7 @@
     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";
@@ -4887,10 +4896,10 @@
     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}}`
@@ -4954,9 +4963,9 @@
     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}}`
@@ -4983,9 +4992,9 @@
     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}}`
@@ -5031,16 +5040,16 @@
     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,
@@ -5071,8 +5080,8 @@
     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}}`
@@ -5125,9 +5134,9 @@
     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",
@@ -5180,7 +5189,7 @@
     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",
@@ -5197,10 +5206,10 @@
     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}}`
@@ -5232,8 +5241,8 @@
     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}}`
@@ -5328,9 +5337,9 @@
     (function(exports3) {
       Object.defineProperty(exports3, "__esModule", { value: true });
       exports3.validateSchemaDeps = exports3.validatePropertyDeps = exports3.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();
       exports3.error = {
         message: ({ params: { property, depsCount, deps } }) => {
           const property_ies = depsCount === 1 ? "property" : "properties";
@@ -5422,8 +5431,8 @@
     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}}`
@@ -5465,10 +5474,10 @@
     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}}`
@@ -5571,10 +5580,10 @@
     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",
@@ -5629,10 +5638,10 @@
     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",
@@ -5703,7 +5712,7 @@
     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"],
@@ -5734,7 +5743,7 @@
     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",
@@ -5751,8 +5760,8 @@
     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}}`
@@ -5809,7 +5818,7 @@
     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",
@@ -5836,8 +5845,8 @@
     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}}`
@@ -5905,7 +5914,7 @@
     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"],
@@ -5922,22 +5931,22 @@
     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
@@ -5971,7 +5980,7 @@
     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}}`
@@ -6060,7 +6069,7 @@
     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;
@@ -6093,11 +6102,11 @@
     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,
@@ -6129,11 +6138,11 @@
     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}}`
@@ -6250,9 +6259,9 @@
     (function(module2, exports3) {
       Object.defineProperty(exports3, "__esModule", { value: true });
       exports3.MissingRefError = exports3.ValidationError = exports3.CodeGen = exports3.Name = exports3.nil = exports3.stringify = exports3.str = exports3._ = exports3.KeywordCxt = exports3.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";
@@ -6280,11 +6289,11 @@
       module2.exports.Ajv = Ajv2;
       Object.defineProperty(exports3, "__esModule", { value: true });
       exports3.default = Ajv2;
-      var validate_1 = requireValidate();
+      var validate_1 = /* @__PURE__ */ requireValidate();
       Object.defineProperty(exports3, "KeywordCxt", { enumerable: true, get: function() {
         return validate_1.KeywordCxt;
       } });
-      var codegen_1 = requireCodegen();
+      var codegen_1 = /* @__PURE__ */ requireCodegen();
       Object.defineProperty(exports3, "_", { enumerable: true, get: function() {
         return codegen_1._;
       } });
@@ -6303,18 +6312,18 @@
       Object.defineProperty(exports3, "CodeGen", { enumerable: true, get: function() {
         return codegen_1.CodeGen;
       } });
-      var validation_error_1 = requireValidation_error();
+      var validation_error_1 = /* @__PURE__ */ requireValidation_error();
       Object.defineProperty(exports3, "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(exports3, "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) {
@@ -18625,8 +18634,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     (function(exports3) {
       Object.defineProperty(exports3, "__esModule", { value: true });
       exports3.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 },
@@ -18699,7 +18708,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       Object.defineProperty(exports3, "__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 }) => {
@@ -31197,17 +31206,14 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
       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,
@@ -31220,9 +31226,70 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
             ...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
@@ -31294,11 +31361,21 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
       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({
@@ -31475,7 +31552,7 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
     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.58";
   var AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
   function createGatewayProvider(options = {}) {
     var _a92, _b9;
@@ -31518,13 +31595,18 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
         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 }
         };
       };
     };
@@ -32992,6 +33074,17 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
     }
   };
   _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)) {
+      try {
+        await callback(options.event);
+      } catch (_ignored) {
+      }
+    }
+  }
   function formatWarning({
     warning,
     provider,
@@ -33292,7 +33385,7 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
     }
     return void 0;
   }
-  var VERSION$4 = "6.0.85";
+  var VERSION$4 = "6.0.104";
   var download = async ({
     url: url2,
     maxBytes,
@@ -33400,9 +33493,6 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
     }
     return convertUint8ArrayToBase64$1(content);
   }
-  function asArray(value) {
-    return value === void 0 ? [] : Array.isArray(value) ? value : [value];
-  }
   async function convertToLanguageModelPrompt({
     prompt,
     supportedUrls,
@@ -34717,6 +34807,10 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
     }
     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,
@@ -34725,13 +34819,27 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
     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({
@@ -34751,6 +34859,8 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
       tracer,
       fn: async (span) => {
         let output;
+        await notify({ event: baseCallbackEvent, callbacks: onToolCallStart });
+        const startTime = now();
         try {
           const stream = executeTool({
             execute: tool2.execute.bind(tool2),
@@ -34775,6 +34885,16 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
             }
           }
         } catch (error) {
+          const durationMs2 = now() - startTime;
+          await notify({
+            event: {
+              ...baseCallbackEvent,
+              success: false,
+              error,
+              durationMs: durationMs2
+            },
+            callbacks: onToolCallFinish
+          });
           recordErrorOnSpan(span, error);
           return {
             type: "tool-error",
@@ -34786,6 +34906,16 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
             ...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({
@@ -35649,6 +35779,11 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
   }
   var DefaultStepResult = class {
     constructor({
+      stepNumber,
+      model,
+      functionId,
+      metadata: metadata2,
+      experimental_context,
       content,
       finishReason,
       rawFinishReason,
@@ -35658,6 +35793,11 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
       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;
@@ -35899,6 +36039,10 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
     experimental_context,
     experimental_include: include,
     _internal: { generateId: generateId2 = originalGenerateId } = {},
+    experimental_onStart: onStart,
+    experimental_onStepStart: onStepStart,
+    experimental_onToolCallStart: onToolCallStart,
+    experimental_onToolCallFinish: onToolCallFinish,
     onStepFinish,
     onFinish,
     ...settings
@@ -35928,11 +36072,43 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
       headers: headersWithUserAgent,
       settings: { ...callSettings, maxRetries }
     });
+    const modelInfo = { provider: model.provider, modelId: model.modelId };
     const initialPrompt = await standardizePrompt({
       system,
       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,
+        include,
+        functionId: telemetry == null ? void 0 : telemetry.functionId,
+        metadata: telemetry == null ? void 0 : telemetry.metadata,
+        experimental_context
+      },
+      callbacks: onStart
+    });
     const tracer = getTracer(telemetry);
     try {
       return await recordSpan({
@@ -35956,7 +36132,7 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
         }),
         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 });
@@ -35973,7 +36149,11 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
               telemetry,
               messages: initialMessages,
               abortSignal: mergedAbortSignal,
-              experimental_context
+              experimental_context,
+              stepNumber: 0,
+              model: modelInfo,
+              onToolCallStart,
+              onToolCallFinish
             });
             const toolContent = [];
             for (const output2 of toolOutputs) {
@@ -36053,6 +36233,10 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
               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,
@@ -36062,10 +36246,40 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                 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
               });
               currentModelResponse = await retry(
                 () => {
@@ -36109,10 +36323,6 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                     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,
@@ -36244,7 +36454,11 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                     telemetry,
                     messages: stepInputMessages,
                     abortSignal: mergedAbortSignal,
-                    experimental_context
+                    experimental_context,
+                    stepNumber: steps.length,
+                    model: stepModelInfo,
+                    onToolCallStart,
+                    onToolCallFinish
                   })
                 );
               }
@@ -36281,15 +36495,21 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                   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,
@@ -36300,12 +36520,12 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                 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 });
             } finally {
               if (stepTimeoutId != null) {
                 clearTimeout(stepTimeoutId);
@@ -36357,30 +36577,37 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
               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
+          });
           let resolvedOutput;
           if (lastStep.finishReason === "stop") {
             const outputSpecification = output != null ? output : text();
@@ -36411,7 +36638,11 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
     telemetry,
     messages,
     abortSignal,
-    experimental_context
+    experimental_context,
+    stepNumber,
+    model,
+    onToolCallStart,
+    onToolCallFinish
   }) {
     const toolOutputs = await Promise.all(
       toolCalls.map(
@@ -36422,7 +36653,11 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
           telemetry,
           messages,
           abortSignal,
-          experimental_context
+          experimental_context,
+          stepNumber,
+          model,
+          onToolCallStart,
+          onToolCallFinish
         })
       )
     );
@@ -37115,7 +37350,9 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                 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,
@@ -37583,10 +37820,6 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
       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,
@@ -37597,7 +37830,11 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
     abortSignal,
     repairToolCall,
     experimental_context,
-    generateId: generateId2
+    generateId: generateId2,
+    stepNumber,
+    model,
+    onToolCallStart,
+    onToolCallFinish
   }) {
     let toolResultsStreamController = null;
     const toolResultsStream = new ReadableStream({
@@ -37739,6 +37976,10 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                   messages,
                   abortSignal,
                   experimental_context,
+                  stepNumber,
+                  model,
+                  onToolCallStart,
+                  onToolCallFinish,
                   onPreliminaryToolResult: (result) => {
                     toolResultsStreamController.enqueue(result);
                   }
@@ -37855,6 +38096,10 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
     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 } = {},
@@ -37894,11 +38139,18 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
       providerOptions,
       prepareStep,
       includeRawChunks,
+      timeout,
+      stopWhen,
+      originalAbortSignal: abortSignal,
       onChunk,
       onError,
       onFinish,
       onAbort,
       onStepFinish,
+      onStart,
+      onStepStart,
+      onToolCallStart,
+      onToolCallFinish,
       now: now2,
       generateId: generateId2,
       experimental_context,
@@ -37995,11 +38247,18 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
       includeRawChunks,
       now: now2,
       generateId: generateId2,
+      timeout,
+      stopWhen,
+      originalAbortSignal,
       onChunk,
       onError,
       onFinish,
       onAbort,
       onStepFinish,
+      onStart,
+      onStepStart,
+      onToolCallStart,
+      onToolCallFinish,
       experimental_context,
       download: download2,
       include
@@ -38142,6 +38401,10 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
               tools
             });
             const currentStepResult = new DefaultStepResult({
+              stepNumber: recordedSteps.length,
+              model: modelInfo,
+              ...callbackTelemetryProps,
+              experimental_context,
               content: recordedContent,
               finishReason: part.finishReason,
               rawFinishReason: part.rawFinishReason,
@@ -38154,11 +38417,11 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
               },
               providerMetadata: part.providerMetadata
             });
-            await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
+            await notify({ event: currentStepResult, callbacks: onStepFinish });
             logWarnings({
               warnings: recordedWarnings,
-              provider: model.provider,
-              model: model.modelId
+              provider: modelInfo.provider,
+              model: modelInfo.modelId
             });
             recordedSteps.push(currentStepResult);
             recordedResponseMessages.push(...stepMessages);
@@ -38189,30 +38452,37 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
             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
+            });
             rootSpan.setAttributes(
               await selectTelemetryAttributes({
                 telemetry,
@@ -38313,6 +38583,11 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
         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({
@@ -38335,6 +38610,36 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
             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
+          });
           const initialMessages = initialPrompt.messages;
           const initialResponseMessages = [];
           const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({ messages: initialMessages });
@@ -38381,6 +38686,10 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                     messages: initialMessages,
                     abortSignal,
                     experimental_context,
+                    stepNumber: recordedSteps.length,
+                    model: modelInfo,
+                    onToolCallStart,
+                    onToolCallFinish,
                     onPreliminaryToolResult: (result2) => {
                       toolExecutionStepStreamController == null ? void 0 : toolExecutionStepStreamController.enqueue(result2);
                     }
@@ -38447,7 +38756,7 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
             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;
@@ -38486,6 +38795,10 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
               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,
@@ -38494,16 +38807,41 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                 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
+              });
               const {
                 result: { stream: stream2, response, request },
                 doStreamSpan,
@@ -38575,9 +38913,13 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                 repairToolCall,
                 abortSignal,
                 experimental_context,
-                generateId: generateId2
+                generateId: generateId2,
+                stepNumber: recordedSteps.length,
+                model: stepModelInfo,
+                onToolCallStart,
+                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;
@@ -38590,7 +38932,7 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
               let stepResponse = {
                 id: generateId2(),
                 timestamp: /* @__PURE__ */ new Date(),
-                modelId: model.modelId
+                modelId: modelInfo.modelId
               };
               let activeText = "";
               self2.addStream(
@@ -42414,7 +42756,7 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
                 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.`
@@ -43104,9 +43446,11 @@ ${user}:`]
     "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"
@@ -43205,15 +43549,20 @@ ${user}:`]
           },
           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
+                  )
                 };
               })
             }
@@ -43256,15 +43605,20 @@ ${user}:`]
         },
         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
+                )
               };
             })
           }
@@ -43272,6 +43626,23 @@ ${user}:`]
       };
     }
   };
+  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") {
@@ -43482,6 +43853,67 @@ ${user}:`]
       })
     )
   );
+  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,
@@ -43521,7 +43953,7 @@ ${user}:`]
             url: string().nullish(),
             pattern: string().nullish()
           })
-        ]),
+        ]).optional(),
         sources: array$1(
           discriminatedUnion("type", [
             object$2({ type: literal("url"), url: string() }),
@@ -43571,7 +44003,7 @@ ${user}:`]
             url: string().nullish(),
             pattern: string().nullish()
           })
-        ])
+        ]).optional()
       })
     )
   );
@@ -43788,7 +44220,7 @@ ${user}:`]
     hasShellTool = false,
     hasApplyPatchTool = false
   }) {
-    var _a10, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    var _a10, _b9, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const input = [];
     const warnings = [];
     const processedApprovalIds = /* @__PURE__ */ new Set();
@@ -43869,7 +44301,9 @@ ${user}:`]
           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;
                 }
@@ -43880,12 +44314,13 @@ ${user}:`]
                 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;
                 }
@@ -43971,8 +44406,32 @@ ${user}:`]
                 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({
@@ -44032,10 +44491,26 @@ ${user}:`]
                     }
                   }
                 } 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;
               }
@@ -44066,7 +44541,7 @@ ${user}:`]
             }
             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;
               }
@@ -44125,7 +44600,7 @@ ${user}:`]
                 contentValue = output.value;
                 break;
               case "execution-denied":
-                contentValue = (_m = output.reason) != null ? _m : "Tool execution denied.";
+                contentValue = (_l = output.reason) != null ? _l : "Tool execution denied.";
                 break;
               case "json":
               case "error-json":
@@ -44252,7 +44727,8 @@ ${user}:`]
           item: discriminatedUnion("type", [
             object$2({
               type: literal("message"),
-              id: string()
+              id: string(),
+              phase: _enum(["commentary", "final_answer"]).nullish()
             }),
             object$2({
               type: literal("reasoning"),
@@ -44341,6 +44817,25 @@ ${user}:`]
               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()
+                    })
+                  ])
+                })
+              )
             })
           ])
         }),
@@ -44350,7 +44845,8 @@ ${user}:`]
           item: discriminatedUnion("type", [
             object$2({
               type: literal("message"),
-              id: string()
+              id: string(),
+              phase: _enum(["commentary", "final_answer"]).nullish()
             }),
             object$2({
               type: literal("reasoning"),
@@ -44406,7 +44902,7 @@ ${user}:`]
                   url: string().nullish(),
                   pattern: string().nullish()
                 })
-              ])
+              ]).nullish()
             }),
             object$2({
               type: literal("file_search_call"),
@@ -44520,6 +45016,25 @@ ${user}:`]
               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()
+                    })
+                  ])
+                })
+              )
             })
           ])
         }),
@@ -44643,6 +45158,7 @@ ${user}:`]
               type: literal("message"),
               role: literal("assistant"),
               id: string(),
+              phase: _enum(["commentary", "final_answer"]).nullish(),
               content: array$1(
                 object$2({
                   type: literal("output_text"),
@@ -44703,7 +45219,10 @@ ${user}:`]
                   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()
                 }),
@@ -44716,7 +45235,7 @@ ${user}:`]
                   url: string().nullish(),
                   pattern: string().nullish()
                 })
-              ])
+              ]).nullish()
             }),
             object$2({
               type: literal("file_search_call"),
@@ -44865,6 +45384,25 @@ ${user}:`]
               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(),
@@ -45081,8 +45619,15 @@ ${user}:`]
               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;
             }
@@ -45212,6 +45757,52 @@ ${user}:`]
       }
     }
   }
+  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 = {};
@@ -45255,7 +45846,7 @@ ${user}:`]
       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) {
@@ -45459,6 +46050,10 @@ ${user}:`]
         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: {
@@ -45469,7 +46064,8 @@ ${user}:`]
         warnings: [...warnings, ...toolWarnings],
         store,
         toolNameMapping,
-        providerOptionsName
+        providerOptionsName,
+        isShellProviderExecuted
       };
     }
     async doGenerate(options) {
@@ -45479,7 +46075,8 @@ ${user}:`]
         warnings,
         webSearchToolName,
         toolNameMapping,
-        providerOptionsName
+        providerOptionsName,
+        isShellProviderExecuted
       } = await this.getArgs(options);
       const url2 = this.config.url({
         path: "/responses",
@@ -45579,6 +46176,7 @@ ${user}:`]
                   commands: part.action.commands
                 }
               }),
+              ...isShellProviderExecuted && { providerExecuted: true },
               providerMetadata: {
                 [providerOptionsName]: {
                   itemId: part.id
@@ -45587,6 +46185,24 @@ ${user}:`]
             });
             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) {
@@ -45594,6 +46210,7 @@ ${user}:`]
               }
               const providerMetadata2 = {
                 itemId: part.id,
+                ...part.phase != null && { phase: part.phase },
                 ...contentPart.annotations.length > 0 && {
                   annotations: contentPart.annotations
                 }
@@ -45876,7 +46493,8 @@ ${user}:`]
         webSearchToolName,
         toolNameMapping,
         store,
-        providerOptionsName
+        providerOptionsName,
+        isShellProviderExecuted
       } = await this.getArgs(options);
       const { responseHeaders, value: response } = await postJsonToApi$1({
         url: this.config.url({
@@ -45907,6 +46525,7 @@ ${user}:`]
       let responseId = null;
       const ongoingToolCalls = {};
       const ongoingAnnotations = [];
+      let activeMessagePhase;
       let hasFunctionCall = false;
       const activeReasoning = {};
       let serviceTier;
@@ -45917,7 +46536,7 @@ ${user}:`]
               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 });
               }
@@ -46055,14 +46674,19 @@ ${user}:`]
                     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
+                        }
                       }
                     }
                   });
@@ -46077,19 +46701,22 @@ ${user}:`]
                     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
                         }
@@ -46154,13 +46781,13 @@ ${user}:`]
                     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") {
@@ -46184,10 +46811,10 @@ ${user}:`]
                   });
                 } 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",
@@ -46257,8 +46884,8 @@ ${user}:`]
                   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
@@ -46308,10 +46935,31 @@ ${user}:`]
                         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(
@@ -46326,7 +46974,7 @@ ${user}:`]
                       providerMetadata: {
                         [providerOptionsName]: {
                           itemId: value.item.id,
-                          reasoningEncryptedContent: (_k = value.item.encrypted_content) != null ? _k : null
+                          reasoningEncryptedContent: (_m = value.item.encrypted_content) != null ? _m : null
                         }
                       }
                     });
@@ -46430,7 +47078,7 @@ ${user}:`]
                   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") {
@@ -46459,7 +47107,7 @@ ${user}:`]
                     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
                       }
                     }
                   });
@@ -46493,10 +47141,10 @@ ${user}:`]
               } 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") {
@@ -46508,7 +47156,7 @@ ${user}:`]
                   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
                   });
@@ -46516,7 +47164,7 @@ ${user}:`]
                   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,
@@ -46532,7 +47180,7 @@ ${user}:`]
                   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,
@@ -46548,7 +47196,7 @@ ${user}:`]
                   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,
@@ -46628,6 +47276,9 @@ ${user}:`]
   }
   function mapWebSearchOutput(action) {
     var _a10;
+    if (action == null) {
+      return {};
+    }
     switch (action.type) {
       case "search":
         return {
@@ -46980,7 +47631,7 @@ ${user}:`]
       };
     }
   };
-  var VERSION$2 = "3.0.28";
+  var VERSION$2 = "3.0.36";
   function createOpenAI(options = {}) {
     var _a10, _b9;
     const baseURL = (_a10 = withoutTrailingSlash$1(
@@ -49489,10 +50140,10 @@ ${lines.join("\n")}
   }
   function createSkillTools(modules) {
     const getSkillContent = tool({
-      description: "根据技能名称或文档路径获取该技能的完整 Markdown 文档内容。传入 skillName（如 calculator）或 path（如 ./calculator/SKILL.md）",
+      description: "根据技能名称或文档路径获取该技能的完整文档内容。传入 skillName（如 calculator）或 path（如 ./calculator/SKILL.md）。支持 .md、.json、.xml 等各类文本格式文件。",
       inputSchema: objectType({
         skillName: stringType().optional().describe("技能名称，与目录名一致，如 calculator"),
-        path: stringType().optional().describe("文档相对路径，如 ./calculator/SKILL.md 或 ./product-guide/reference/xxx.md")
+        path: stringType().optional().describe("文档相对路径，如 ./calculator/SKILL.md 或 ./product-guide/reference/xxx.json")
       }),
       execute: (args) => {
         const { skillName, path: pathArg } = args;