@shop-os/modelkit 0.1.3 → 0.1.5

package/dist/index.js

@@ -83,7 +83,19 @@ var Catalog = class _Catalog {
 
 // src/catalog/image.ts
 var IMAGE_USAGE = { unit: "images", modality: "IMAGE" };
-var GEMINI_RATIOS = ["1:1", "16:9", "9:16", "4:3", "3:4", "21:9", "4:5", "5:4"];
+var GEMINI_RATIOS = [
+  "1:1",
+  "2:3",
+  "3:2",
+  "16:9",
+  "9:16",
+  "4:3",
+  "3:4",
+  "21:9",
+  "4:5",
+  "5:4",
+  "adaptive"
+];
 function geminiImage(id, label, aliases, sizes) {
   const model = {
     id,
@@ -93,7 +105,7 @@ function geminiImage(id, label, aliases, sizes) {
     adapter: "google-image",
     providerModelId: id,
     lifecycle: "active",
-    constraints: { aspectRatios: [...GEMINI_RATIOS], sizes },
+    constraints: { aspectRatios: [...GEMINI_RATIOS], sizes, supports: ["safetySettings"] },
     defaults: { size: "1K", aspectRatio: "1:1" },
     usage: { ...IMAGE_USAGE },
     pricingKind: "image_size"
@@ -106,7 +118,8 @@ var IMAGE_MODELS = [
     "gemini-3.1-flash-image-preview",
     "Nano Banana Flash",
     ["nb-2"],
-    ["1K", "2K", "4K"]
+    // Flash 3.1 is the only Gemini image model with the 512 tier.
+    ["512", "1K", "2K", "4K"]
   ),
   geminiImage("gemini-3.1-flash-lite-image", "Nano Banana Lite", ["nb-lite"], ["1K"]),
   // trigger-workflows validates 1K only; pricing seeds 2K/4K rows so allow all three.
@@ -189,7 +202,8 @@ var IMAGE_MODELS = [
         "9:16",
         "4:5",
         "5:4",
-        "9:21"
+        "9:21",
+        "adaptive"
       ],
       sizes: ["1K"],
       references: { images: 10 },
@@ -250,9 +264,10 @@ var IMAGE_MODELS = [
     constraints: {
       aspectRatios: ["1:1", "2:3", "3:2", "16:9", "9:16", "4:3", "3:4", "4:5", "5:4", "21:9"],
       sizes: ["1K"],
-      supports: ["outputFormat"]
+      // flux-2-pro's job type always returns image/png; only the seed is forwarded.
+      supports: ["seed"]
     },
-    defaults: { size: "1K", aspectRatio: "1:1", outputFormat: "png" },
+    defaults: { size: "1K", aspectRatio: "1:1" },
     usage: { ...IMAGE_USAGE },
     pricingKind: "image_size"
   },
@@ -270,7 +285,8 @@ var IMAGE_MODELS = [
     constraints: {
       aspectRatios: ["1:1", "2:3", "3:2", "4:3", "3:4", "4:5", "5:4", "9:16", "16:9", "21:9"],
       sizes: ["1K", "2K", "4K"],
-      requires: ["references"]
+      requires: ["references"],
+      supports: ["seed"]
     },
     defaults: { size: "1K", aspectRatio: "1:1" },
     usage: { ...IMAGE_USAGE },
@@ -289,7 +305,8 @@ var IMAGE_MODELS = [
     constraints: {
       aspectRatios: ["1:1", "2:3", "3:4", "4:3", "9:16", "16:9", "21:9"],
       sizes: ["1K"],
-      requires: ["references"]
+      requires: ["references"],
+      supports: ["seed"]
     },
     defaults: { size: "1K", aspectRatio: "1:1" },
     usage: { ...IMAGE_USAGE },
@@ -309,7 +326,8 @@ var IMAGE_MODELS = [
     constraints: {
       aspectRatios: ["1:1", "16:9", "9:16", "4:3", "3:4"],
       sizes: ["1K", "2K", "4K"],
-      references: { images: 9 }
+      references: { images: 9 },
+      supports: []
     },
     defaults: { size: "1K", aspectRatio: "1:1" },
     usage: { unit: "compute_seconds", modality: "IMAGE" },
@@ -330,7 +348,8 @@ var IMAGE_MODELS = [
       aspectRatios: ["1:1", "16:9", "9:16", "4:3", "3:4", "3:2", "2:3"],
       sizes: [],
       references: { images: 1 },
-      requires: ["references"]
+      requires: ["references"],
+      supports: []
     },
     defaults: { aspectRatio: "1:1" },
     usage: { unit: "compute_seconds", modality: "IMAGE" },
@@ -372,7 +391,8 @@ var OTHER_MODELS = [
     lifecycle: "active",
     constraints: {
       durations: [30],
-      references: { images: 10 }
+      references: { images: 10 },
+      supports: []
     },
     defaults: {},
     usage: { unit: "images", modality: "AUDIO" },
@@ -387,7 +407,8 @@ var OTHER_MODELS = [
     providerModelId: "lyria-3-pro-preview",
     lifecycle: "active",
     constraints: {
-      references: { images: 10 }
+      references: { images: 10 },
+      supports: []
     },
     defaults: {},
     usage: { unit: "images", modality: "AUDIO" },
@@ -451,8 +472,12 @@ var OTHER_MODELS = [
     adapter: "replicate",
     providerModelId: "topazlabs/image-upscale",
     lifecycle: "active",
-    constraints: {},
-    defaults: {},
+    constraints: {
+      references: { images: 1 },
+      requires: ["references"],
+      supports: ["scaleFactor", "outputFormat"]
+    },
+    defaults: { scaleFactor: 2, outputFormat: "png" },
     usage: { unit: "compute_seconds", modality: "IMAGE" },
     pricingKind: "flat"
   },
@@ -466,7 +491,8 @@ var OTHER_MODELS = [
     lifecycle: "active",
     constraints: {
       references: { images: 1 },
-      requires: ["references"]
+      requires: ["references"],
+      supports: []
     },
     defaults: {},
     usage: { unit: "images", modality: "IMAGE" },
@@ -485,7 +511,7 @@ function text(id, label, providerModelId, extra) {
     adapter: "ai-sdk-text",
     providerModelId,
     lifecycle: "active",
-    constraints: {},
+    constraints: { supports: [] },
     defaults: {},
     usage: { ...TEXT_USAGE },
     pricingKind: "token",
@@ -508,7 +534,7 @@ var TEXT_MODELS = [
   text("gpt-5.6-sol", "GPT-5.6 Sol", "gpt-5.6-sol"),
   // Library key "claude-sonnet-4.5" maps to the SDK id "claude-sonnet-4-5".
   text("claude-sonnet-4-5", "Claude Sonnet 4.5", "claude-sonnet-4-5", {
-    aliases: ["claude-sonnet-4.5"]
+    aliases: ["claude-sonnet-4.5", "claude-sonnet-4-5-20250929"]
   }),
   // Anthropic retired the dated 4.0 ids; callers that still send them get 4.6.
   text("claude-sonnet-4-6", "Claude Sonnet 4.6", "claude-sonnet-4-6", {
@@ -524,7 +550,7 @@ var TEXT_MODELS = [
     aliases: ["claude-opus-4.8", "claude-opus-4", "claude-opus-4.0", "claude-opus-4-20250514"]
   }),
   text("claude-haiku-4-5", "Claude Haiku 4.5", "claude-haiku-4-5", {
-    aliases: ["claude-haiku-4.5", "claude-haiku-4-5-20251001"]
+    aliases: ["claude-haiku-4.5", "claude-haiku-4-5-20251001", "claude-haiku-4"]
   }),
   text("claude-opus-5", "Claude Opus 5", "claude-opus-5", {
     aliases: ["claude-opus-5.0"]
@@ -558,7 +584,7 @@ var TEXT_MODELS = [
 // src/catalog/video.ts
 var VIDEO_USAGE = { unit: "seconds", modality: "VIDEO" };
 var SEEDANCE_RATIOS = ["21:9", "16:9", "4:3", "1:1", "3:4", "9:16", "adaptive"];
-var KLING_RATIOS = ["16:9", "9:16", "1:1"];
+var KLING_RATIOS = ["16:9", "9:16", "1:1", "adaptive"];
 var OMNI_RATIOS = ["16:9", "9:16"];
 var GROK_RATIOS = ["1:1", "16:9", "9:16", "4:3", "3:4", "3:2", "2:3"];
 var H3_RATIOS = ["21:9", "16:9", "4:3", "1:1", "3:4", "9:16"];
@@ -650,12 +676,15 @@ var VIDEO_MODELS = [
     providerModelId: "gemini-omni-flash-preview",
     lifecycle: "active",
     constraints: {
+      // 1.0 rejects `resolution`; it renders 720p. No defaults: the adapter
+      // sends ratio and duration only when the caller set them, so a
+      // reference clip keeps its own framing.
       aspectRatios: [...OMNI_RATIOS],
-      resolutions: ["720p"],
       durations: [3, 4, 5, 6, 7, 8, 9, 10],
-      references: { images: 6, videos: 1 }
+      references: { images: 6, videos: 1 },
+      supports: []
     },
-    defaults: { durationSeconds: 8, resolution: "720p", aspectRatio: "16:9" },
+    defaults: {},
     usage: { ...VIDEO_USAGE },
     pricingKind: "video_per_second"
   },
@@ -671,9 +700,10 @@ var VIDEO_MODELS = [
       aspectRatios: [...OMNI_RATIOS],
       resolutions: ["360p", "720p", "1080p", "4k"],
       durations: [3, 4, 5, 6, 7, 8, 9, 10],
-      references: { images: 6, videos: 1 }
+      references: { images: 6, videos: 1 },
+      supports: []
     },
-    defaults: { durationSeconds: 8, resolution: "720p", aspectRatio: "16:9" },
+    defaults: {},
     usage: { ...VIDEO_USAGE },
     pricingKind: "video_per_second"
   },
@@ -767,7 +797,8 @@ var VIDEO_MODELS = [
       aspectRatios: [...GROK_RATIOS],
       resolutions: ["480p", "720p"],
       durations: { min: 1, max: 15 },
-      references: { images: 7 }
+      references: { images: 7 },
+      supports: []
     },
     defaults: { durationSeconds: 8, resolution: "720p", aspectRatio: "16:9" },
     usage: { unit: "reported_cost_usd", modality: "VIDEO" },
@@ -957,7 +988,8 @@ var VIDEO_MODELS = [
     constraints: {
       aspectRatios: [...KLING_RATIOS],
       durations: { min: 3, max: 10 },
-      requires: ["sourceVideo"]
+      requires: ["sourceVideo"],
+      supports: []
     },
     defaults: { durationSeconds: 5, aspectRatio: "16:9" },
     usage: { ...VIDEO_USAGE },
@@ -990,7 +1022,7 @@ var VIDEO_MODELS = [
     lifecycle: "active",
     constraints: {
       requires: ["firstFrame"],
-      supports: ["seed"]
+      supports: ["seed", "lastFrame"]
     },
     defaults: {},
     usage: { ...VIDEO_USAGE },
@@ -1007,7 +1039,7 @@ var MODELS = [
 ];
 
 // src/resolve-options.ts
-var SIZE_ORDER = ["1K", "2K", "4K"];
+var SIZE_ORDER = ["512", "1K", "2K", "4K"];
 var RESOLUTION_ORDER = ["360p", "480p", "720p", "768p", "1080p", "2k", "4k"];
 function ratioValue(r) {
   if (r === "adaptive") return 1;
@@ -1101,7 +1133,7 @@ function resolveImageOptions(model, request, onUnsupported = "error") {
   const warnings = [];
   const c = model.constraints;
   const merged = { ...model.defaults, ...stripUndefined(request), model: model.id };
-  if (merged.aspectRatio && c.aspectRatios && !c.aspectRatios.includes(merged.aspectRatio)) {
+  if (merged.aspectRatio !== void 0 && merged.aspectRatio !== "adaptive" && c.aspectRatios !== void 0 && !c.aspectRatios.includes(merged.aspectRatio)) {
     const to = nearestAspectRatio(merged.aspectRatio, c.aspectRatios);
     warnings.push({
       code: "ratio_coerced",
@@ -1139,7 +1171,14 @@ function resolveImageOptions(model, request, onUnsupported = "error") {
       model: model.id
     });
   }
-  dropUnsupported(merged, model, warnings, ["seed", "quality", "count", "outputFormat"]);
+  dropUnsupported(merged, model, warnings, [
+    "seed",
+    "quality",
+    "count",
+    "outputFormat",
+    "scaleFactor",
+    "safetySettings"
+  ]);
   return { request: merged, warnings };
 }
 function resolveVideoOptions(model, request, onUnsupported = "error") {
@@ -1168,7 +1207,7 @@ function resolveVideoOptions(model, request, onUnsupported = "error") {
       delete merged.aspectRatio;
     }
   }
-  if (merged.aspectRatio && c.aspectRatios && !c.aspectRatios.includes(merged.aspectRatio)) {
+  if (merged.aspectRatio !== void 0 && merged.aspectRatio !== "adaptive" && c.aspectRatios !== void 0 && !c.aspectRatios.includes(merged.aspectRatio)) {
     const to = nearestAspectRatio(merged.aspectRatio, c.aspectRatios);
     warnings.push({
       code: "ratio_coerced",
@@ -1250,8 +1289,7 @@ function resolveVideoOptions(model, request, onUnsupported = "error") {
   return { request: merged, warnings };
 }
 function dropUnsupported(req, model, warnings, fields) {
-  const supports = model.constraints.supports;
-  if (!supports) return;
+  const supports = model.constraints.supports ?? [];
   for (const field of fields) {
     if (req[field] !== void 0 && !supports.includes(field)) {
       warnings.push({
@@ -1329,8 +1367,45 @@ function keysFromEnv(env, prefix = "") {
 }
 
 // src/retry.ts
+import { z as z2 } from "zod";
+
+// src/json.ts
 import { z } from "zod";
-var textBody = z.string();
+var JsonValueSchema = z.lazy(
+  () => z.union([
+    z.string(),
+    z.number(),
+    z.boolean(),
+    z.null(),
+    z.array(JsonValueSchema),
+    z.record(z.string(), JsonValueSchema)
+  ])
+);
+var JsonObjectSchema = z.record(z.string(), JsonValueSchema);
+async function readErrorBody(res) {
+  const text2 = await res.text().catch(() => "");
+  try {
+    return JsonValueSchema.parse(JSON.parse(text2));
+  } catch {
+    return text2;
+  }
+}
+var thrownErrorSchema = z.object({
+  message: z.string().optional(),
+  status: z.number().optional(),
+  statusCode: z.number().optional(),
+  responseBody: z.string().optional()
+});
+function describeThrown(cause) {
+  const parsed = thrownErrorSchema.safeParse(cause);
+  if (!parsed.success) return { message: String(cause), status: void 0, body: String(cause) };
+  const { message, status, statusCode, responseBody } = parsed.data;
+  const body = responseBody ?? message ?? String(cause);
+  return { message: message ?? String(cause), status: status ?? statusCode, body };
+}
+
+// src/retry.ts
+var textBody = z2.string();
 function classifyHttpError(status, body, provider, model) {
   const asText = textBody.safeParse(body);
   const text2 = asText.success ? asText.data : JSON.stringify(body);
@@ -1413,6 +1488,13 @@ function transportError(provider, cause, model) {
   if (model !== void 0) init.model = model;
   return new ModelKitError(init);
 }
+function classifyThrown(provider, cause, model, override = {}) {
+  if (cause instanceof ModelKitError) return cause;
+  const info = describeThrown(cause);
+  const status = override.status ?? info.status;
+  if (status === void 0) return transportError(provider, cause, model);
+  return classifyHttpError(status, override.body ?? info.body, provider, model);
+}
 async function pollUntil(check, opts) {
   const start = Date.now();
   let interval = opts.intervalMs;
@@ -1535,7 +1617,7 @@ import {
   streamObject as aiStreamObject2,
   streamText as aiStreamText2
 } from "ai";
-import { z as z3 } from "zod";
+import { z as z4 } from "zod";
 
 // src/adapters/media-ref.ts
 function isUrlRef(ref) {
@@ -1590,7 +1672,7 @@ import { createPerplexity } from "@ai-sdk/perplexity";
 import { createXai } from "@ai-sdk/xai";
 import { createDeepSeek } from "@ai-sdk/deepseek";
 import { createMoonshotAI } from "@ai-sdk/moonshotai";
-import { z as z2 } from "zod";
+import { z as z3 } from "zod";
 var TEXT_PROVIDERS = [
   "openai",
   "anthropic",
@@ -1601,7 +1683,7 @@ var TEXT_PROVIDERS = [
   "moonshot",
   "minimax"
 ];
-var textProviderSchema = z2.enum(TEXT_PROVIDERS);
+var textProviderSchema = z3.enum(TEXT_PROVIDERS);
 function isTextProvider(value) {
   return textProviderSchema.safeParse(value).success;
 }
@@ -1610,9 +1692,9 @@ var OPENAI_COMPATIBLE_BASE_URLS = {
 };
 var GATEWAY_SLUGS = {
   openai: "openai",
-  anthropic: "anthropic",
+  anthropic: "anthropic/v1",
   google: "google-ai-studio/v1beta",
-  xai: "grok",
+  xai: "grok/v1",
   perplexity: "perplexity-ai",
   deepseek: "deepseek"
 };
@@ -1787,10 +1869,10 @@ function textAbortOptions(sdk, context) {
   if (abortSignal) return { abortSignal };
   return {};
 }
-var catalogId = z3.string();
-var exactSize = z3.templateLiteral([z3.number(), "x", z3.number()]);
-var sdkRatio = z3.templateLiteral([z3.number(), ":", z3.number()]);
-var sizeTier = z3.enum(["1K", "2K", "4K"]);
+var catalogId = z4.string();
+var exactSize = z4.templateLiteral([z4.number(), "x", z4.number()]);
+var sdkRatio = z4.templateLiteral([z4.number(), ":", z4.number()]);
+var sizeTier = z4.enum(["512", "1K", "2K", "4K"]);
 function isCatalogId(model) {
   return catalogId.safeParse(model).success;
 }
@@ -1847,6 +1929,10 @@ function pushIgnored(warnings, field, from, modelId) {
     message: `${modelId} provider instance does not support ${field}; ignored`
   });
 }
+function logCoercions(logger, modelId, warnings) {
+  if (warnings.length === 0) return;
+  logger.warn(`[modelkit] ${modelId} request coerced`, { model: modelId, warnings });
+}
 function createModelKit(config, adapters) {
   const catalog = new Catalog(MODELS).withOverrides(config.catalogOverride ?? []);
   const logger = config.logger ?? console;
@@ -1880,6 +1966,10 @@ function createModelKit(config, adapters) {
       logger.warn("[modelkit] usage emit failed", err);
     }
   }
+  function withRowUnit(event) {
+    const row = catalog.get(event.model);
+    return row ? { ...event, unit: row.usage.unit } : event;
+  }
   function textTarget(model, call) {
     if (!isCatalogId(model)) {
       return {
@@ -1920,6 +2010,7 @@ function createModelKit(config, adapters) {
       providerOptions,
       references,
       exactSize: exactSizeField,
+      scaleFactor,
       quality: _quality,
       outputFormat: _outputFormat
     } = req;
@@ -1945,6 +2036,9 @@ function createModelKit(config, adapters) {
     if (_quality !== void 0) pushIgnored(warnings, "quality", _quality, model.modelId);
     if (_outputFormat !== void 0)
       pushIgnored(warnings, "outputFormat", _outputFormat, model.modelId);
+    if (scaleFactor !== void 0)
+      pushIgnored(warnings, "scaleFactor", scaleFactor, model.modelId);
+    logCoercions(logger, model.modelId, warnings);
     const abortSignal = combineSignals(req.abortSignal, call.signal);
     if (abortSignal) options.abortSignal = abortSignal;
     const result = await aiGenerateImage(options);
@@ -2028,6 +2122,7 @@ function createModelKit(config, adapters) {
     if (_mode !== void 0) pushIgnored(warnings, "mode", _mode, model.modelId);
     if (providerOptions) options.providerOptions = providerOptions;
     if (abortSignal) options.abortSignal = abortSignal;
+    logCoercions(logger, model.modelId, warnings);
     const pending = aiGenerateVideo(options);
     let settled;
     let failed = false;
@@ -2086,6 +2181,7 @@ function createModelKit(config, adapters) {
         call.onUnsupported ?? "error"
       );
       warnings.push(...inputWarnings);
+      logCoercions(logger, model.id, warnings);
       const signal = combineSignals(req.abortSignal, call.signal);
       const { adapter, ctx } = context(model, signal ? { ...call, signal } : call, warnings);
       if (!adapter.generateImage)
@@ -2095,7 +2191,7 @@ function createModelKit(config, adapters) {
           model: model.id
         });
       const result = await adapter.generateImage(request, ctx);
-      const usage2 = { ...result.usage, model: model.id };
+      const usage2 = { ...result.usage, model: model.id, unit: model.usage.unit };
       await emit(usage2);
       const images = result.images.map(toGeneratedImage);
       const first = images[0];
@@ -2128,6 +2224,7 @@ function createModelKit(config, adapters) {
         call.onUnsupported ?? "error"
       );
       warnings.push(...inputWarnings);
+      logCoercions(logger, model.id, warnings);
       const signal = combineSignals(req.abortSignal, call.signal);
       const { adapter, ctx } = context(model, signal ? { ...call, signal } : call, warnings);
       if (!adapter.generateVideo)
@@ -2145,7 +2242,11 @@ function createModelKit(config, adapters) {
         result(opts) {
           if (settled) return settled;
           const pending = result(opts).then(
-            (out) => emit({ ...out.usage, model: model.id }).then(() => out),
+            (out) => emit({
+              ...out.usage,
+              model: model.id,
+              unit: model.usage.unit
+            }).then(() => out),
             (cause) => {
               settled = void 0;
               throw cause;
@@ -2165,7 +2266,8 @@ function createModelKit(config, adapters) {
           model: model.id
         });
       }
-      const { adapter, ctx } = context(model, call, []);
+      const warnings = [];
+      const { adapter, ctx } = context(model, call, warnings);
       if (!adapter.generateAudio) {
         throw new ModelKitError({
           code: "unsupported_option",
@@ -2177,7 +2279,8 @@ function createModelKit(config, adapters) {
         { ...model.defaults, ...req, model: model.id },
         ctx
       );
-      await emit({ ...result.usage, model: model.id });
+      logCoercions(logger, model.id, warnings);
+      await emit({ ...result.usage, model: model.id, unit: model.usage.unit });
       return result;
     },
     async prepareMediaPart(modelId, ref, mediaType, call = {}) {
@@ -2217,7 +2320,7 @@ function createModelKit(config, adapters) {
           options.prepareStep ?? options.experimental_prepareStep
         )
       });
-      for (const event of steps.usage(result.steps)) await emit(event);
+      for (const event of steps.usage(result.steps)) await emit(withRowUnit(event));
       return result;
     },
     streamText(options, call = {}) {
@@ -2235,7 +2338,7 @@ function createModelKit(config, adapters) {
         providerOptions: {},
         prepareStep: steps.wrap(options.prepareStep),
         onFinish: async (event) => {
-          for (const usage2 of steps.usage(event.steps)) await emit(usage2);
+          for (const usage2 of steps.usage(event.steps)) await emit(withRowUnit(usage2));
           await callerOnFinish?.(event);
         }
       });
@@ -2249,7 +2352,7 @@ function createModelKit(config, adapters) {
         providerOptions: mergeTextProviderOptions(entry, options.providerOptions)
       };
       const result = await aiGenerateObject2(sdkOptions);
-      await emit(textUsageEvent(entry, provider, result.usage));
+      await emit(withRowUnit(textUsageEvent(entry, provider, result.usage)));
       return result;
     },
     streamObject(options, call = {}) {
@@ -2261,7 +2364,7 @@ function createModelKit(config, adapters) {
         model: languageModel2,
         providerOptions: mergeTextProviderOptions(entry, options.providerOptions),
         onFinish: async (event) => {
-          await emit(textUsageEvent(entry, provider, event.usage));
+          await emit(withRowUnit(textUsageEvent(entry, provider, event.usage)));
           await callerOnFinish?.(event);
         }
       };
@@ -2271,7 +2374,7 @@ function createModelKit(config, adapters) {
 }
 
 // src/adapters/ark.ts
-import { z as z4 } from "zod";
+import { z as z5 } from "zod";
 var ARK_BASE_URL = "https://ark.ap-southeast.bytepluses.com/api/v3";
 var SUBMIT_PATH = "/contents/generations/tasks";
 var SEEDANCE_POLL_INTERVAL_MS = 15e3;
@@ -2329,7 +2432,7 @@ function arkKey(ctx) {
   return key;
 }
 function throwArkError(status, body, model) {
-  const parsed = z4.string().safeParse(body);
+  const parsed = z5.string().safeParse(body);
   const text2 = parsed.success ? parsed.data : JSON.stringify(body ?? "");
   if (/sensitive.?content|inputimage|human.?face/i.test(text2)) {
     const init = {
@@ -2343,6 +2446,16 @@ function throwArkError(status, body, model) {
     if (status !== void 0) init.status = status;
     throw new ModelKitError(init);
   }
+  if (status === void 0) {
+    throw new ModelKitError({
+      code: "provider_rejected",
+      message: `ark rejected the request: ${text2.slice(0, 500)}`,
+      provider: "ark",
+      model,
+      body,
+      retryable: false
+    });
+  }
   throw classifyHttpError(status, body, "ark", model);
 }
 function seedreamSize(aspect, size) {
@@ -2361,13 +2474,13 @@ function arkUrl(ref) {
   if ("url" in ref) return ref.url;
   return `data:${ref.mime};base64,${Buffer.from(ref.bytes).toString("base64")}`;
 }
-var SeedreamImageSchema = z4.object({
-  url: z4.string().optional(),
-  b64_json: z4.string().optional()
+var SeedreamImageSchema = z5.object({
+  url: z5.string().optional(),
+  b64_json: z5.string().optional()
 });
-var SeedreamResponseSchema = z4.object({
-  data: z4.array(SeedreamImageSchema).optional(),
-  error: z4.object({ message: z4.string().optional(), code: z4.string().optional() }).optional()
+var SeedreamResponseSchema = z5.object({
+  data: z5.array(SeedreamImageSchema).optional(),
+  error: z5.object({ message: z5.string().optional(), code: z5.string().optional() }).optional()
 });
 function retryOptsFor(ctx, attempts = 3) {
   const opts = { attempts };
@@ -2378,6 +2491,11 @@ function fetchInitFor(ctx, init) {
   if (ctx.signal !== void 0) init.signal = ctx.signal;
   return init;
 }
+function arkFetch(ctx, url, init) {
+  return ctx.fetch(url, fetchInitFor(ctx, init)).catch((cause) => {
+    throw classifyThrown("ark", cause, ctx.model.id);
+  });
+}
 async function generateSeedreamImage(req, ctx) {
   const key = arkKey(ctx);
   const modelId = ctx.model.id;
@@ -2395,14 +2513,11 @@ async function generateSeedreamImage(req, ctx) {
   if (refs.length === 1 && firstRef !== void 0) body.image = firstRef;
   else if (refs.length > 1) body.image = refs;
   const data = await withRetry(async () => {
-    const res = await ctx.fetch(
-      `${arkBaseUrl(ctx)}/images/generations`,
-      fetchInitFor(ctx, {
-        method: "POST",
-        headers: { Authorization: `Bearer ${key}`, "Content-Type": "application/json" },
-        body: JSON.stringify(body)
-      })
-    );
+    const res = await arkFetch(ctx, `${arkBaseUrl(ctx)}/images/generations`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${key}`, "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
     if (!res.ok) {
       const text2 = await res.text().catch(() => "");
       throwArkError(res.status, text2, modelId);
@@ -2417,7 +2532,7 @@ async function generateSeedreamImage(req, ctx) {
     bytes = Buffer.from(first.b64_json, "base64");
   } else if (first?.url) {
     const imageUrl = first.url;
-    const res = await ctx.fetch(imageUrl, fetchInitFor(ctx, {}));
+    const res = await arkFetch(ctx, imageUrl, {});
     if (!res.ok) {
       const text2 = await res.text().catch(() => "");
       throwArkError(res.status, text2, modelId);
@@ -2437,13 +2552,13 @@ async function generateSeedreamImage(req, ctx) {
   if (req.quality !== void 0) usage2.imageQuality = req.quality;
   return { images: [{ bytes, mime: sniffedImageMime(bytes) }], usage: usage2, raw: data };
 }
-var SeedanceResponseSchema = z4.object({
-  id: z4.string().optional(),
-  status: z4.string().optional(),
-  content: z4.object({ video_url: z4.string().optional() }).optional(),
-  error: z4.union([z4.string(), z4.object({ message: z4.string().optional() })]).optional()
+var SeedanceResponseSchema = z5.object({
+  id: z5.string().optional(),
+  status: z5.string().optional(),
+  content: z5.object({ video_url: z5.string().optional() }).optional(),
+  error: z5.union([z5.string(), z5.object({ message: z5.string().optional() })]).optional()
 });
-var SeedanceErrorMessageSchema = z4.object({ message: z4.string().optional() });
+var SeedanceErrorMessageSchema = z5.object({ message: z5.string().optional() });
 function seedanceUsage(ctx, req, duration) {
   const usage2 = {
     model: ctx.model.id,
@@ -2457,7 +2572,7 @@ function seedanceUsage(ctx, req, duration) {
   return usage2;
 }
 function seedanceErrorMessage(error, status) {
-  const asString = z4.string().safeParse(error);
+  const asString = z5.string().safeParse(error);
   if (asString.success) return asString.data;
   const asObject = SeedanceErrorMessageSchema.safeParse(error);
   if (asObject.success && asObject.data.message !== void 0) return asObject.data.message;
@@ -2522,14 +2637,11 @@ async function generateSeedanceVideo(req, ctx) {
   if (req.generateAudio !== void 0) body.generate_audio = req.generateAudio;
   if (req.seed !== void 0) body.seed = req.seed;
   const submit = await withRetry(async () => {
-    const res = await ctx.fetch(
-      `${arkBaseUrl(ctx)}${SUBMIT_PATH}`,
-      fetchInitFor(ctx, {
-        method: "POST",
-        headers: { Authorization: `Bearer ${key}`, "Content-Type": "application/json" },
-        body: JSON.stringify(body)
-      })
-    );
+    const res = await arkFetch(ctx, `${arkBaseUrl(ctx)}${SUBMIT_PATH}`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${key}`, "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
     if (!res.ok) {
       const text2 = await res.text().catch(() => "");
       throwArkError(res.status, text2, modelId);
@@ -2542,12 +2654,9 @@ async function generateSeedanceVideo(req, ctx) {
   const jobId = submit.id;
   const usage2 = seedanceUsage(ctx, req, duration);
   const fetchStatus = async () => {
-    const res = await ctx.fetch(
-      `${arkBaseUrl(ctx)}${SUBMIT_PATH}/${jobId}`,
-      fetchInitFor(ctx, {
-        headers: { Authorization: `Bearer ${key}` }
-      })
-    );
+    const res = await arkFetch(ctx, `${arkBaseUrl(ctx)}${SUBMIT_PATH}/${jobId}`, {
+      headers: { Authorization: `Bearer ${key}` }
+    });
     if (!res.ok) {
       if (res.status === 429 || res.status >= 500) return void 0;
       const text2 = await res.text().catch(() => "");
@@ -2608,43 +2717,6 @@ async function generateSeedanceVideo(req, ctx) {
 // src/adapters/fal.ts
 import { z as z6 } from "zod";
 import { createFalClient } from "@fal-ai/client";
-
-// src/json.ts
-import { z as z5 } from "zod";
-var JsonValueSchema = z5.lazy(
-  () => z5.union([
-    z5.string(),
-    z5.number(),
-    z5.boolean(),
-    z5.null(),
-    z5.array(JsonValueSchema),
-    z5.record(z5.string(), JsonValueSchema)
-  ])
-);
-var JsonObjectSchema = z5.record(z5.string(), JsonValueSchema);
-async function readErrorBody(res) {
-  const text2 = await res.text().catch(() => "");
-  try {
-    return JsonValueSchema.parse(JSON.parse(text2));
-  } catch {
-    return text2;
-  }
-}
-var thrownErrorSchema = z5.object({
-  message: z5.string().optional(),
-  status: z5.number().optional(),
-  statusCode: z5.number().optional(),
-  responseBody: z5.string().optional()
-});
-function describeThrown(cause) {
-  const parsed = thrownErrorSchema.safeParse(cause);
-  if (!parsed.success) return { message: String(cause), status: void 0, body: String(cause) };
-  const { message, status, statusCode, responseBody } = parsed.data;
-  const body = responseBody ?? message ?? String(cause);
-  return { message: message ?? String(cause), status: status ?? statusCode, body };
-}
-
-// src/adapters/fal.ts
 var MUSE_T2I_ENDPOINT = "meta/muse-image/text-to-image";
 var MUSE_EDIT_ENDPOINT = "meta/muse-image/edit";
 var KLING_O1_ENDPOINT = "fal-ai/kling-video/o1/video-to-video/reference";
@@ -2656,10 +2728,33 @@ function defaultCreateFalClient(opts) {
   const client2 = createFalClient(opts);
   return {
     async subscribe(endpoint, options) {
-      const outcome = await client2.subscribe(endpoint, { input: options.input });
+      const outcome = await client2.subscribe(endpoint, options);
       const unwrapped = falSubscribePayloadSchema.safeParse(outcome);
       if (unwrapped.success) return unwrapped.data.data;
       return JsonValueSchema.parse(outcome);
+    },
+    queue: {
+      async submit(endpoint, options) {
+        const submitted = await client2.queue.submit(endpoint, {
+          input: options.input,
+          ...options.abortSignal !== void 0 ? { abortSignal: options.abortSignal } : {}
+        });
+        return { requestId: submitted.request_id };
+      },
+      async status(endpoint, options) {
+        const current = await client2.queue.status(endpoint, {
+          requestId: options.requestId,
+          ...options.abortSignal !== void 0 ? { abortSignal: options.abortSignal } : {}
+        });
+        return { status: current.status };
+      },
+      async result(endpoint, options) {
+        const outcome = await client2.queue.result(endpoint, {
+          requestId: options.requestId,
+          ...options.abortSignal !== void 0 ? { abortSignal: options.abortSignal } : {}
+        });
+        return JsonValueSchema.parse(outcome.data);
+      }
     }
   };
 }
@@ -2701,15 +2796,17 @@ var falSdkThrownSchema = z6.object({
   message: z6.string().optional()
 });
 function falSdkError(cause, model) {
-  if (isModelKitError(cause)) return cause;
   const parsed = falSdkThrownSchema.safeParse(cause);
   if (parsed.success) {
     const status = parsed.data.status ?? parsed.data.statusCode;
     const body = parsed.data.body ?? parsed.data.message ?? String(cause);
-    return falError(status, body, model);
+    return classifyThrown("fal", cause, model, { status, body: liftDetail(body) });
   }
   const info = describeThrown(cause);
-  return falError(info.status, info.body, model);
+  return classifyThrown("fal", cause, model, {
+    status: info.status,
+    body: liftDetail(info.body)
+  });
 }
 function gatewayConfig(ctx) {
   const cf = ctx.routing.cloudflare;
@@ -2791,7 +2888,7 @@ async function passthroughRequest(ctx, endpoint, input) {
   }
   return JsonValueSchema.parse(await resultRes.json());
 }
-async function subscribe(ctx, deps, endpoint, input) {
+function falClientOf(ctx, deps) {
   const falKey = ctx.keys.fal;
   if (!falKey) {
     throw new ModelKitError({
@@ -2802,12 +2899,19 @@ async function subscribe(ctx, deps, endpoint, input) {
       retryable: false
     });
   }
-  const client2 = deps.createFalClient({ credentials: falKey });
+  return deps.createFalClient({ credentials: falKey, fetch: ctx.fetch });
+}
+async function subscribe(ctx, deps, endpoint, input) {
+  const client2 = falClientOf(ctx, deps);
+  const options = {
+    input,
+    ...ctx.signal !== void 0 ? { abortSignal: ctx.signal } : {}
+  };
   try {
     return await withRetry(
       async () => {
         try {
-          return await client2.subscribe(endpoint, { input });
+          return await client2.subscribe(endpoint, options);
         } catch (cause) {
           throw falSdkError(cause, ctx.model.id);
         }
@@ -2941,13 +3045,14 @@ function klingO1Input(req) {
     });
   }
   const duration = Math.min(10, Math.max(3, Math.round(req.durationSeconds ?? 5)));
-  const ratio = req.aspectRatio === "16:9" || req.aspectRatio === "9:16" || req.aspectRatio === "1:1" ? req.aspectRatio : "auto";
   const input = {
     prompt: req.prompt,
     video_url: source,
-    duration: String(duration),
-    aspect_ratio: ratio
+    duration: String(duration)
   };
+  if (req.aspectRatio !== "adaptive") {
+    input.aspect_ratio = req.aspectRatio === "16:9" || req.aspectRatio === "9:16" || req.aspectRatio === "1:1" ? req.aspectRatio : "auto";
+  }
   const refs = (req.referenceImages ?? []).map(refToUrl);
   if (refs.length > 0) input.image_urls = refs;
   return input;
@@ -2976,13 +3081,7 @@ async function generateFalVideo(req, ctx, deps) {
     if (ctx.routing.fal === "cloudflare-passthrough") {
       return await passthroughVideoJob(ctx, req, KLING_O1_ENDPOINT, input);
     }
-    const result2 = await runJob(ctx, deps, KLING_O1_ENDPOINT, input);
-    return completedVideoJob(
-      ctx,
-      req,
-      extractVideoUrl(result2, KLING_O1_ENDPOINT, ctx.model.id),
-      result2
-    );
+    return await submitQueueJob(ctx, req, deps, KLING_O1_ENDPOINT, input);
   }
   const family = minimaxFamily(providerModelId);
   const refs = {
@@ -3011,19 +3110,81 @@ async function generateFalVideo(req, ctx, deps) {
   if (ctx.routing.fal === "cloudflare-passthrough") {
     return await passthroughVideoJob(ctx, req, endpoint, base);
   }
-  const result = await runJob(ctx, deps, endpoint, base);
-  return completedVideoJob(ctx, req, extractVideoUrl(result, endpoint, ctx.model.id), result);
+  return await submitQueueJob(ctx, req, deps, endpoint, base);
+}
+async function submitQueueJob(ctx, req, deps, endpoint, input) {
+  const client2 = falClientOf(ctx, deps);
+  let submitted;
+  try {
+    submitted = await withRetry(
+      async () => {
+        try {
+          return await client2.queue.submit(endpoint, {
+            input,
+            ...ctx.signal !== void 0 ? { abortSignal: ctx.signal } : {}
+          });
+        } catch (cause) {
+          throw falSdkError(cause, ctx.model.id);
+        }
+      },
+      ctx.signal !== void 0 ? { signal: ctx.signal } : {}
+    );
+  } catch (cause) {
+    throw falSdkError(cause, ctx.model.id);
+  }
+  return queuedVideoJob(ctx, req, client2, endpoint, submitted.requestId);
 }
-function completedVideoJob(ctx, req, url, raw) {
+function queuedVideoJob(ctx, req, client2, endpoint, requestId) {
+  const readStatus = async () => {
+    try {
+      const options = {
+        requestId,
+        ...ctx.signal !== void 0 ? { abortSignal: ctx.signal } : {}
+      };
+      return (await client2.queue.status(endpoint, options)).status;
+    } catch (cause) {
+      throw falSdkError(cause, ctx.model.id);
+    }
+  };
   const duration = req.durationSeconds ?? 5;
-  const result = { video: { url }, usage: videoUsage(ctx, req, duration), raw };
   return {
-    jobId: url,
+    jobId: requestId,
     async poll() {
-      return { status: "succeeded", raw };
+      try {
+        const status = await readStatus();
+        if (status === "COMPLETED") return { status: "succeeded" };
+        if (status === "IN_QUEUE") return { status: "pending" };
+        return { status: "running" };
+      } catch (cause) {
+        if (isModelKitError(cause) && !cause.retryable)
+          return { status: "failed" };
+        return { status: "pending" };
+      }
     },
-    async result() {
-      return result;
+    async result(opts) {
+      const signal = opts?.signal ?? ctx.signal;
+      const pollOptions = {
+        intervalMs: opts?.pollIntervalMs ?? PASSTHROUGH_POLL_MS,
+        timeoutMs: opts?.timeoutMs ?? 15 * 6e4
+      };
+      if (signal !== void 0) pollOptions.signal = signal;
+      const queueOptions = {
+        requestId,
+        ...signal !== void 0 ? { abortSignal: signal } : {}
+      };
+      const payload = await pollUntil(async () => {
+        try {
+          const current = await client2.queue.status(endpoint, queueOptions);
+          if (current.status !== "COMPLETED") return void 0;
+          return await client2.queue.result(endpoint, queueOptions);
+        } catch (cause) {
+          const err = falSdkError(cause, ctx.model.id);
+          if (err.retryable) return void 0;
+          throw err;
+        }
+      }, pollOptions);
+      const url = extractVideoUrl(payload, endpoint, ctx.model.id);
+      return { video: { url }, usage: videoUsage(ctx, req, duration), raw: payload };
     }
   };
 }
@@ -3376,9 +3537,7 @@ function sdkStatus(cause) {
   return describeThrown(cause).status;
 }
 function throwSdkError(cause, model) {
-  if (cause instanceof ModelKitError) throw cause;
-  const info = describeThrown(cause);
-  throw classifyHttpError(info.status, info.body, "google-genai", model);
+  throw classifyThrown("google-genai", cause, model);
 }
 function toBase64(bytes) {
   return Buffer.from(bytes).toString("base64");
@@ -3582,12 +3741,17 @@ async function generateOmniVideo(req, ctx, createGenAIClient) {
   const duration = req.durationSeconds ?? 8;
   const images = req.referenceImages ?? [];
   const videos = req.referenceVideos ?? [];
-  const task = req.sourceVideo ? "edit" : videos.length > 0 || images.length > 1 ? "reference_to_video" : req.firstFrame || images.length === 1 ? "image_to_video" : "text_to_video";
-  const responseFormat = { type: "video" };
-  if (req.sourceVideo === void 0) responseFormat.aspect_ratio = toOmniAspect(req.aspectRatio);
-  const omniResolution = toOmniResolution(req.resolution);
-  if (omniResolution !== void 0) responseFormat.resolution = omniResolution;
-  responseFormat.duration = `${duration}s`;
+  const task = req.sourceVideo ? "edit" : req.firstFrame ? "image_to_video" : images.length > 0 || videos.length > 0 ? "reference_to_video" : "text_to_video";
+  const isOmniV1 = providerModelId === "gemini-omni-flash-preview";
+  const responseFormat = { type: "video", delivery: "uri" };
+  if (req.sourceVideo === void 0 && req.aspectRatio !== void 0 && req.aspectRatio !== "adaptive") {
+    responseFormat.aspect_ratio = toOmniAspect(req.aspectRatio);
+  }
+  if (!isOmniV1) {
+    const omniResolution = toOmniResolution(req.resolution);
+    if (omniResolution !== void 0) responseFormat.resolution = omniResolution;
+  }
+  if (req.durationSeconds !== void 0) responseFormat.duration = `${req.durationSeconds}s`;
   const client2 = createGenAIClient({ apiKey });
   const uploadedByUri = /* @__PURE__ */ new Map();
   const uploadedNames = [];
@@ -3611,7 +3775,8 @@ async function generateOmniVideo(req, ctx, createGenAIClient) {
     model: providerModelId,
     input,
     response_format: responseFormat,
-    generation_config: { video_config: { task } }
+    generation_config: { video_config: { task } },
+    store: true
   });
   const createRetryOptions = { attempts: 3 };
   if (ctx.signal !== void 0) createRetryOptions.signal = ctx.signal;
@@ -3693,23 +3858,14 @@ async function generateOmniVideo(req, ctx, createGenAIClient) {
         };
         return inline;
       });
-      const inlineRetryOptions = { attempts: 3 };
-      if (ctx.signal !== void 0) inlineRetryOptions.signal = ctx.signal;
       try {
-        interaction = await withRetry(async () => {
-          try {
-            return await callCreate(inlineParts);
-          } catch (inlineCause) {
-            throwSdkError(inlineCause, modelId);
-          }
-        }, inlineRetryOptions);
+        interaction = await callCreate(inlineParts);
       } catch (inlineCause) {
         throwSdkError(inlineCause, modelId);
       }
     }
-  } catch (cause) {
+  } finally {
     await cleanupUploads();
-    throw cause;
   }
   const jobId = interaction.id ?? "gemini-omni-interaction";
   const usage2 = videoUsage2(ctx, req, duration);
@@ -3738,47 +3894,43 @@ async function generateOmniVideo(req, ctx, createGenAIClient) {
         timeoutMs: opts?.timeoutMs ?? RESULT_TIMEOUT_MS2
       };
       if (signal !== void 0) pollOptions.signal = signal;
-      try {
-        const done = await pollUntil(async () => {
-          const current = await getInteraction();
-          const status = (current.status ?? "").toUpperCase();
-          if (status === "COMPLETED") return current;
-          if (status === "FAILED") {
-            throw classifyHttpError(
-              void 0,
-              `Gemini Omni interaction failed: ${JSON.stringify(current).slice(0, 500)}`,
-              "google-genai",
-              modelId
-            );
-          }
-          return void 0;
-        }, pollOptions);
-        const video = extractOmniVideo(done, modelId);
-        if (video.data) {
-          return {
-            video: {
-              bytes: Buffer.from(video.data, "base64"),
-              mime: video.mime_type ?? "video/mp4"
-            },
-            usage: usage2,
-            raw: done
-          };
+      const done = await pollUntil(async () => {
+        const current = await getInteraction();
+        const status = (current.status ?? "").toUpperCase();
+        if (status === "COMPLETED") return current;
+        if (status === "FAILED") {
+          throw classifyHttpError(
+            void 0,
+            `Gemini Omni interaction failed: ${JSON.stringify(current).slice(0, 500)}`,
+            "google-genai",
+            modelId
+          );
         }
-        if (video.uri)
-          return {
-            video: await downloadVideo(ctx, video.uri, apiKey, signal),
-            usage: usage2,
-            raw: done
-          };
-        throw classifyHttpError(
-          void 0,
-          "No video content in Gemini Omni response",
-          "google-genai",
-          modelId
-        );
-      } finally {
-        await cleanupUploads();
+        return void 0;
+      }, pollOptions);
+      const video = extractOmniVideo(done, modelId);
+      if (video.data) {
+        return {
+          video: {
+            bytes: Buffer.from(video.data, "base64"),
+            mime: video.mime_type ?? "video/mp4"
+          },
+          usage: usage2,
+          raw: done
+        };
       }
+      if (video.uri)
+        return {
+          video: await downloadVideo(ctx, video.uri, apiKey, signal),
+          usage: usage2,
+          raw: done
+        };
+      throw classifyHttpError(
+        void 0,
+        "No video content in Gemini Omni response",
+        "google-genai",
+        modelId
+      );
     }
   };
 }
@@ -3947,8 +4099,14 @@ function createGoogleImageAdapter(deps = defaultGoogleImageDeps) {
       content.push({ type: "text", text: req.prompt });
       void ctx.call.postCropToAspect;
       const imageConfig = {};
-      if (req.aspectRatio !== void 0) imageConfig.aspectRatio = req.aspectRatio;
+      if (req.aspectRatio !== void 0 && req.aspectRatio !== "adaptive")
+        imageConfig.aspectRatio = req.aspectRatio;
       if (req.size !== void 0) imageConfig.imageSize = req.size;
+      const googleOptions = {
+        imageConfig,
+        responseModalities: ["IMAGE"]
+      };
+      if (req.safetySettings !== void 0) googleOptions.safetySettings = req.safetySettings;
       const retryOptions = {};
       if (ctx.signal !== void 0) retryOptions.signal = ctx.signal;
       const result = await withRetry(async () => {
@@ -3960,22 +4118,7 @@ function createGoogleImageAdapter(deps = defaultGoogleImageDeps) {
             messages: [{ role: "user", content }],
             maxRetries: 0,
             providerOptions: {
-              google: {
-                imageConfig,
-                responseModalities: ["IMAGE"],
-                safetySettings: [
-                  {
-                    category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-                    threshold: "OFF"
-                  },
-                  { category: "HARM_CATEGORY_HATE_SPEECH", threshold: "OFF" },
-                  {
-                    category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-                    threshold: "OFF"
-                  },
-                  { category: "HARM_CATEGORY_HARASSMENT", threshold: "OFF" }
-                ]
-              }
+              google: googleOptions
             },
             abortSignal: signal
           });
@@ -4004,6 +4147,10 @@ function createGoogleImageAdapter(deps = defaultGoogleImageDeps) {
         imageQuality: "auto"
       };
       if (req.size !== void 0) usage2.imageSize = req.size;
+      if (result.usage?.inputTokens !== void 0)
+        usage2.inputTokens = result.usage.inputTokens;
+      if (result.usage?.outputTokens !== void 0)
+        usage2.outputTokens = result.usage.outputTokens;
       return { images, usage: usage2, raw: result };
     }
   };
@@ -4158,6 +4305,7 @@ var KLING_MAX_INTERVAL_MS = 1e4;
 var KLING_TIMEOUT_MS = 15 * 6e4;
 var DOP_INTERVAL_MS = 5e3;
 var DOP_TIMEOUT_MS = 5 * 6e4;
+var DOP_FALLBACK_DURATION_SECONDS = 5;
 var DEFAULT_NEGATIVE_PROMPT = "text, watermark, copyright, blur, low quality, distortion, abstract, weird, deformed";
 function credentials(ctx) {
   const key = ctx.keys.higgsfield;
@@ -4232,6 +4380,18 @@ function requestInit(ctx, init) {
   if (ctx.signal !== void 0) request.signal = ctx.signal;
   return request;
 }
+async function createRequest(ctx, url, init) {
+  let res;
+  try {
+    res = await ctx.fetch(url, requestInit(ctx, init));
+  } catch (cause) {
+    throw classifyThrown("higgsfield", cause, ctx.model.id);
+  }
+  if (!res.ok) {
+    throw classifyHttpError(res.status, await readBody2(res), "higgsfield", ctx.model.id);
+  }
+  return res;
+}
 async function generateKlingVideo(req, ctx) {
   const firstFrame = req.firstFrame ? refToUrl2(req.firstFrame) : void 0;
   if (!firstFrame) {
@@ -4250,26 +4410,16 @@ async function generateKlingVideo(req, ctx) {
     negative_prompt: req.negativePrompt ?? DEFAULT_NEGATIVE_PROMPT
   };
   if (req.durationSeconds !== void 0) body.duration = req.durationSeconds;
-  if (req.aspectRatio !== void 0) body.aspect_ratio = req.aspectRatio;
+  if (req.aspectRatio !== void 0 && req.aspectRatio !== "adaptive")
+    body.aspect_ratio = req.aspectRatio;
   if (req.lastFrame) body.last_image_url = refToUrl2(req.lastFrame);
   const endpoint = klingEndpoint(ctx.model.providerModelId);
-  let createRes;
-  try {
-    createRes = await ctx.fetch(
-      endpoint,
-      requestInit(ctx, { method: "POST", body: JSON.stringify(body) })
-    );
-  } catch (cause) {
-    throw networkError(cause, ctx);
-  }
-  if (!createRes.ok) {
-    throw classifyHttpError(
-      createRes.status,
-      await readBody2(createRes),
-      "higgsfield",
-      ctx.model.id
-    );
-  }
+  const retryOptions = {};
+  if (ctx.signal !== void 0) retryOptions.signal = ctx.signal;
+  const createRes = await withRetry(
+    () => createRequest(ctx, endpoint, { method: "POST", body: JSON.stringify(body) }),
+    retryOptions
+  );
   const created = klingCreateSchema.safeParse(await createRes.json());
   if (!created.success) {
     throw new ModelKitError({
@@ -4349,11 +4499,6 @@ async function generateKlingVideo(req, ctx) {
     }
   };
 }
-function networkError(cause, ctx) {
-  if (isModelKitError(cause)) return cause;
-  const info = describeThrown(cause);
-  return classifyHttpError(info.status, info.body, "higgsfield", ctx.model.id);
-}
 var dopMotionOptionsSchema = z10.object({
   modelkit: z10.object({ motion: z10.string().optional() }).optional()
 });
@@ -4425,26 +4570,15 @@ async function generateDopVideo(req, ctx) {
     params.input_images_end = [{ type: "image_url", image_url: refToUrl2(req.lastFrame) }];
   }
   if (req.seed !== void 0) params.seed = req.seed;
-  let createRes;
-  try {
-    createRes = await ctx.fetch(
-      DOP_ENDPOINT,
-      requestInit(ctx, {
-        method: "POST",
-        body: JSON.stringify({ params, webhook: null })
-      })
-    );
-  } catch (cause) {
-    throw networkError(cause, ctx);
-  }
-  if (!createRes.ok) {
-    throw classifyHttpError(
-      createRes.status,
-      await readBody2(createRes),
-      "higgsfield",
-      ctx.model.id
-    );
-  }
+  const retryOptions = {};
+  if (ctx.signal !== void 0) retryOptions.signal = ctx.signal;
+  const createRes = await withRetry(
+    () => createRequest(ctx, DOP_ENDPOINT, {
+      method: "POST",
+      body: JSON.stringify({ params, webhook: null })
+    }),
+    retryOptions
+  );
   const created = dopCreateSchema.safeParse(await createRes.json());
   if (!created.success) {
     throw new ModelKitError({
@@ -4513,7 +4647,10 @@ async function generateDopVideo(req, ctx) {
       };
       if (dopSignal !== void 0) pollSettings.signal = dopSignal;
       const url = await pollUntil(check, pollSettings);
-      const result = { video: { url }, usage: videoUsage3(ctx, req) };
+      const result = {
+        video: { url },
+        usage: videoUsage3(ctx, req, req.durationSeconds ?? DOP_FALLBACK_DURATION_SECONDS)
+      };
       return result;
     }
   };
@@ -4535,7 +4672,7 @@ function aspectRatioToSize(ratio, tier) {
   };
   const MIN_PIXELS = 655360;
   const MAX_PIXELS = 8294400;
-  const maxLong = TIER_LONG_EDGE[tier];
+  const maxLong = TIER_LONG_EDGE[tier] ?? 1024;
   const RATIO_MAP = /* @__PURE__ */ new Map([
     ["1:1", [1, 1]],
     ["16:9", [16, 9]],
@@ -4695,28 +4832,16 @@ var openaiImageAdapter = {
     const usageParsed = openaiUsageSchema.safeParse(response.usage);
     const inputTokens = usageParsed.success ? usageParsed.data.input_tokens : void 0;
     const outputTokens = usageParsed.success ? usageParsed.data.output_tokens : void 0;
-    let usage2;
-    if (inputTokens !== void 0 || outputTokens !== void 0) {
-      usage2 = {
-        model: ctx.model.id,
-        provider: "openai-image",
-        modality: "IMAGE",
-        unit: "tokens",
-        quantity: (inputTokens ?? 0) + (outputTokens ?? 0),
-        imageQuality: quality
-      };
-      if (inputTokens !== void 0) usage2.inputTokens = inputTokens;
-      if (outputTokens !== void 0) usage2.outputTokens = outputTokens;
-    } else {
-      usage2 = {
-        model: ctx.model.id,
-        provider: "openai-image",
-        modality: "IMAGE",
-        unit: "images",
-        quantity: images.length,
-        imageQuality: quality
-      };
-    }
+    const usage2 = {
+      model: ctx.model.id,
+      provider: "openai-image",
+      modality: "IMAGE",
+      unit: "images",
+      quantity: images.length,
+      imageQuality: quality
+    };
+    if (inputTokens !== void 0) usage2.inputTokens = inputTokens;
+    if (outputTokens !== void 0) usage2.outputTokens = outputTokens;
     if (req.size !== void 0) usage2.imageSize = req.size;
     return { images, usage: usage2, raw: response };
   }
@@ -4769,7 +4894,12 @@ var NANO_BANANA_RATIOS = /* @__PURE__ */ new Set([
 ]);
 async function refToBytes(ctx, ref) {
   if ("bytes" in ref) return { bytes: ref.bytes, mime: ref.mime };
-  const res = await ctx.fetch(ref.url);
+  let res;
+  try {
+    res = await ctx.fetch(ref.url);
+  } catch (cause) {
+    throw classifyThrown("prodia", cause, ctx.model.id);
+  }
   if (!res.ok) {
     const text2 = await res.text().catch(() => "");
     throw classifyHttpError(res.status, text2, "prodia", ctx.model.id);
@@ -4939,8 +5069,7 @@ async function generateProdiaImage(req, ctx) {
           body: form
         });
       } catch (err) {
-        if (isModelKitError(err)) throw err;
-        throw transportError("prodia", err, ctx.model.id);
+        throw classifyThrown("prodia", err, ctx.model.id);
       }
       if (!attemptRes.ok) {
         const text2 = await attemptRes.text().catch(() => "");
@@ -4949,8 +5078,7 @@ async function generateProdiaImage(req, ctx) {
       return attemptRes;
     }, retryOpts);
   } catch (err) {
-    if (isModelKitError(err)) throw err;
-    throw transportError("prodia", err, ctx.model.id);
+    throw classifyThrown("prodia", err, ctx.model.id);
   }
   const bytes = parseImageResponse(
     new Uint8Array(await res.arrayBuffer()),
@@ -5022,7 +5150,7 @@ function replicateError(cause, ctx) {
   const info = describeThrown(cause);
   const nested = replicateResponseStatusSchema.safeParse(cause);
   const status = info.status ?? (nested.success ? nested.data.response?.status : void 0);
-  return classifyHttpError(status, info.body, "replicate", ctx.model.id);
+  return classifyThrown("replicate", cause, ctx.model.id, { status, body: info.body });
 }
 function isLower(id) {
   return id.toLowerCase();
@@ -5169,6 +5297,9 @@ function isUpscaler(providerModelId) {
   const id = isLower(providerModelId);
   return id.includes("upscal") || id.includes("crystal") || id.includes("topaz");
 }
+function isTopazUpscaler(providerModelId) {
+  return isLower(providerModelId).includes("topazlabs/image-upscale");
+}
 function isQwen(providerModelId) {
   return isLower(providerModelId).includes("qwen");
 }
@@ -5218,8 +5349,36 @@ function wanImageSize(aspectRatio, size) {
 }
 async function generateReplicateImage(req, ctx, deps) {
   const id = ctx.model.providerModelId;
-  const input = { prompt: req.prompt };
-  if (isUpscaler(id)) {
+  let input;
+  if (isTopazUpscaler(id)) {
+    const first = (req.references ?? [])[0];
+    if (!first) {
+      throw new ModelKitError({
+        code: "missing_input",
+        message: `${ctx.model.id} requires a reference image to upscale`,
+        provider: "replicate",
+        model: ctx.model.id,
+        retryable: false
+      });
+    }
+    let format = req.outputFormat === "jpeg" ? "jpg" : req.outputFormat ?? "png";
+    if (format !== "png" && format !== "jpg") {
+      ctx.warnings.push({
+        code: "option_ignored",
+        field: "outputFormat",
+        from: format,
+        message: "topazlabs/image-upscale supports only png and jpg; using png"
+      });
+      format = "png";
+    }
+    input = {
+      image: refToUrl3(first),
+      enhance_model: "Standard V2",
+      output_format: format,
+      upscale_factor: `${req.scaleFactor ?? 2}x`,
+      face_enhancement: true
+    };
+  } else if (isUpscaler(id)) {
     const refs = req.references ?? [];
     const first = refs[0];
     if (!first) {
@@ -5231,24 +5390,29 @@ async function generateReplicateImage(req, ctx, deps) {
         retryable: false
       });
     }
-    input.image = refToUrl3(first);
-    input.creativity = 0;
-    input.scale_factor = 2;
-    input.output_format = "png";
+    const imageInput = { prompt: req.prompt };
+    imageInput.image = refToUrl3(first);
+    imageInput.creativity = 0;
+    imageInput.scale_factor = 2;
+    imageInput.output_format = "png";
+    input = imageInput;
   } else if (isWanImage(id)) {
     const refs = (req.references ?? []).map(refToUrl3);
-    if (refs.length > 0) input.images = refs;
-    input.size = wanImageSize(req.aspectRatio, req.size);
+    const imageInput = { prompt: req.prompt };
+    if (refs.length > 0) imageInput.images = refs;
+    imageInput.size = wanImageSize(req.aspectRatio, req.size);
+    input = imageInput;
   } else if (isQwen(id)) {
     const refs = (req.references ?? []).map(refToUrl3);
     const firstUrl = refs[0];
+    const imageInput = { prompt: req.prompt };
     if (firstUrl !== void 0) {
-      input.image = firstUrl;
-      if (!isQwenEditPlus(id)) input.match_input_image = true;
+      imageInput.image = firstUrl;
+      if (!isQwenEditPlus(id)) imageInput.match_input_image = true;
     }
     const ratios = isQwenEditPlus(id) ? QWEN_EDIT_RATIOS : QWEN_IMAGE_RATIOS;
     if (req.aspectRatio !== void 0) {
-      if (ratios.has(req.aspectRatio)) input.aspect_ratio = req.aspectRatio;
+      if (ratios.has(req.aspectRatio)) imageInput.aspect_ratio = req.aspectRatio;
       else
         ctx.warnings.push({
           code: "option_ignored",
@@ -5258,18 +5422,21 @@ async function generateReplicateImage(req, ctx, deps) {
         });
     }
     if (isQwenEditPlus(id) && req.outputFormat !== void 0) {
-      input.output_format = req.outputFormat === "jpeg" ? "jpg" : req.outputFormat;
+      imageInput.output_format = req.outputFormat === "jpeg" ? "jpg" : req.outputFormat;
     }
+    input = imageInput;
   } else {
     const refs = req.references ?? [];
     const first = refs[0];
-    if (first) input.image = refToUrl3(first);
+    const imageInput = { prompt: req.prompt };
+    if (first) imageInput.image = refToUrl3(first);
+    input = imageInput;
   }
   const { url, predictTime, raw } = await runPrediction(ctx, input, deps);
   const file = await download(ctx, url);
   const usage2 = imageUsage2(ctx, req);
   usage2.quantity = predictTime;
-  return { images: [{ bytes: file.bytes, mime: file.mime }], usage: usage2, raw };
+  return { images: [{ bytes: file.bytes, mime: file.mime }], usage: usage2, raw, outputUrl: url };
 }
 function wanSize(aspectRatio) {
   if (!aspectRatio || aspectRatio === "adaptive" || aspectRatio === "1:1") return "2K";
@@ -5293,7 +5460,7 @@ function klingInput(req) {
     input.start_image = startImage;
     const endImage = images[1];
     if (endImage !== void 0) input.end_image = endImage;
-  } else {
+  } else if (req.aspectRatio !== "adaptive") {
     input.aspect_ratio = req.aspectRatio ?? "16:9";
   }
   if (req.negativePrompt !== void 0) input.negative_prompt = req.negativePrompt;
@@ -5313,7 +5480,7 @@ function klingOmniInput(req) {
     input.start_image = startImage;
     const endImage = images[1];
     if (endImage !== void 0) input.end_image = endImage;
-  } else {
+  } else if (req.aspectRatio !== "adaptive") {
     input.aspect_ratio = req.aspectRatio ?? "16:9";
   }
   const refs = (req.referenceImages ?? []).map(refToUrl3);
@@ -5522,11 +5689,10 @@ var xaiResponseStatusSchema = z13.object({
   response: z13.object({ status: z13.number() }).partial()
 });
 function xaiError(cause, ctx) {
-  if (isModelKitError(cause)) return cause;
   const info = describeThrown(cause);
   const nested = xaiResponseStatusSchema.safeParse(cause);
   const status = info.status ?? (nested.success ? nested.data.response?.status : void 0);
-  return classifyHttpError(status, info.body, "xai-video", ctx.model.id);
+  return classifyThrown("xai-video", cause, ctx.model.id, { status, body: info.body });
 }
 var xaiMetaSchema = z13.object({
   videoUrl: JsonValueSchema.optional(),
@@ -5550,10 +5716,7 @@ async function generateXaiVideo(req, ctx, deps) {
       retryable: false
     });
   }
-  const frames = [req.firstFrame, req.lastFrame, ...req.referenceImages ?? []].filter(
-    (r) => r !== void 0
-  );
-  const refUrls = frames.map(refToUrl4).slice(0, 5);
+  const refUrls = (req.referenceImages ?? []).map(refToUrl4).slice(0, 7);
   const resolution = req.resolution === "480p" ? "480p" : "720p";
   const xaiOptions = {
     resolution,
@@ -5564,13 +5727,23 @@ async function generateXaiVideo(req, ctx, deps) {
     xaiOptions.mode = "reference-to-video";
     xaiOptions.referenceImageUrls = refUrls;
   }
+  if (req.lastFrame !== void 0) {
+    ctx.warnings.push({
+      code: "option_ignored",
+      field: "lastFrame",
+      message: "xai-video does not support lastFrame; ignored"
+    });
+  }
   const client2 = deps.createXaiClient({ apiKey });
-  const model = createXai2({ apiKey }).video(ctx.model.providerModelId);
+  const model = createXai2({ apiKey, fetch: ctx.fetch }).video(ctx.model.providerModelId);
   const callBody = {
     model,
     prompt: req.prompt,
     providerOptions: { xai: xaiOptions }
   };
+  if (req.firstFrame) {
+    callBody.frameImages = [{ image: refToUrl4(req.firstFrame), frameType: "first_frame" }];
+  }
   if (req.aspectRatio !== void 0 && req.aspectRatio !== "adaptive") {
     callBody.aspectRatio = req.aspectRatio;
   }
@@ -5656,26 +5829,14 @@ async function mapResult(ctx, req, result) {
 function usage(ctx, req, meta) {
   const costTicks = z13.number().safeParse(meta.costInUsdTicks);
   const cost = costTicks.success ? costTicks.data / 1e10 : void 0;
-  if (cost !== void 0) {
-    const event2 = {
-      model: ctx.model.id,
-      provider: "xai-video",
-      modality: "VIDEO",
-      unit: "reported_cost_usd",
-      quantity: cost,
-      reportedCostUsd: cost
-    };
-    if (req.durationSeconds !== void 0) event2.durationSeconds = req.durationSeconds;
-    if (req.resolution !== void 0) event2.resolution = req.resolution;
-    return event2;
-  }
   const event = {
     model: ctx.model.id,
     provider: "xai-video",
     modality: "VIDEO",
-    unit: "seconds",
-    quantity: req.durationSeconds ?? 0
+    unit: "reported_cost_usd",
+    quantity: cost ?? 0
   };
+  if (cost !== void 0) event.reportedCostUsd = cost;
   if (req.durationSeconds !== void 0) event.durationSeconds = req.durationSeconds;
   if (req.resolution !== void 0) event.resolution = req.resolution;
   return event;