diff --git a/config/quality/file-size-baseline.json b/config/quality/file-size-baseline.json
index 564c32e7cf..05e5743d85 100644
--- a/config/quality/file-size-baseline.json
+++ b/config/quality/file-size-baseline.json
@@ -1,4 +1,5 @@
 {
+  "_rebaseline_2026_08_09_9296_adobe_media_capabilities": "PR #9296 (artickc, fix/adobe-firefly-model-capabilities) own growth: src/app/api/v1/models/catalog.ts 1590->1597 (+7). The image and video catalog serializers now expose the already-normalized Adobe Firefly discovery capability data (media_capabilities, plus the existing video modality/size fields) at their only response-emission chokepoints. The discovery parser and capability normalization remain in open-sse/services/adobeFireflyModels.ts; extracting these seven serialization fields would obscure the catalog contract. Covered by tests/unit/adobe-firefly.test.ts and tests/unit/image-upscale.test.ts.",
   "_rebaseline_2026_07_24_8470_hyperagent_sticky_thread": "PR #8470 (artickc, fix/hyperagent-tool-loop-thread-sticky) own growth: open-sse/executors/hyperagent.ts 936->1025 (wc -l; check-file-size.mjs counts via split(\"\\n\").length so the gate sees 937->1026, +89, crosses the 1000 cap). Fixes a real bug where a reverse-conversion proxy (text-Intent/JSON to Claude Code native tool_calls) rewrites assistant messages between agentic tool-loop turns, breaking HyperAgent’s conversation-prefix fingerprint and cold-starting the thread mid tool-loop. Adds Anthropic tool_use/tool_result flattening to extractMessageText() plus a new rootUserFingerprint()/root-key lookup tier in resolveHyperAgentThreadBinding()/storeHyperAgentThreadAfterTurn() so the thread stays sticky across the tool loop. Cohesive additions inside the existing single-file executor; not extractable without splitting the executor mid-request-flow. Covered by tests/unit/executor-hyperagent.test.ts (19/19, +5 new cases for tool_result/tool_use flattening + root-key stickiness). Pre-merge review flagged a cross-conversation root-key collision risk (tracked in the PR’s own mandatory pre-merge checklist, not yet addressed) — unrelated to this file-size ratchet, tracked separately by /fix-prs.",
   "_rebaseline_2026_07_25_8494_capability_filter_fail_closed": "PR #8494 (fix/capability-filters-fail-closed, #8488) own growth: open-sse/services/combo.ts 3640->3693 (+53) adds a fail-closed guard after filterTargetsByRequestCompatibility() — when every eligible target is excluded by request-capability filtering (vision/tools/etc) instead of quota/health, the combo now returns an explicit `capability_mismatch` 400 (describeCapabilityFilterExhaustion, imported from combo/comboStructure.ts) rather than silently falling through to a generic no-targets error, plus a `compatFilterFailOpen` escape hatch (combo config OR settings) mirrored at both the main/auto and round-robin call sites for symmetry. combo/comboStructure.ts (previously under cap, un-frozen) grows 794->918 (+124) — new home for describeCapabilityFilterExhaustion + providerSupportsEmulatedToolCalling (#5240 emulated tool-calling exemption so fail-closed does not regress prompt-emulation-only combos like all-chatgpt-web). Irreducible orchestration wiring at the existing filter chokepoint (same precedent as #7301's universal-cooldown-retry generalization). Companion test tests/unit/combo-routing-engine.test.ts 3409->3449 (+40, fail-closed/fail-open coverage across both call sites) also rebaselined. Covered by tests/unit/8488-capability-filter-fail-closed.test.ts (new) + 95/95 passing across both files. Structural shrink of combo.ts tracked in #3501.",
   "_rebaseline_2026_07_25_8499_ts7_result_union_predicates": "PR #8499 (backryun, chore/ts7-types-executor-scattered) own growth: muse-spark-web.ts 1396->1405 (+9, irreducible). Under this workspace's `strictNullChecks: false`, the boolean-literal discriminant on `GraphqlResult` (`{ ok: true } | { ok: false; error: string }`) narrows the positive `.ok===true` branch but leaves `!result.ok` at the full union under TS7, making `.error` unreachable to the checker at the two call sites (warmup, mode-switch). Fixed by adding a single `isGraphqlFailure()` type-predicate helper (doc comment + 3-line body) reused at both call sites instead of duplicating the predicate inline — not extractable to a shared module without splitting a single-file executor's local narrowing helper out of its own file. Covered by the existing muse-spark-web executor test suite (no behavior change, pure narrowing fix).",
@@ -387,7 +388,7 @@
     "src/app/(dashboard)/dashboard/usage/components/EvalsTab.tsx": 2148,
     "src/app/(dashboard)/dashboard/usage/components/ProviderLimits/index.tsx": 1119,
     "src/app/api/providers/[id]/models/route.ts": 2361,
-    "src/app/api/v1/models/catalog.ts": 1590,
+    "src/app/api/v1/models/catalog.ts": 1597,
     "src/lib/db/apiKeys.ts": 1529,
     "src/lib/db/core.ts": 1639,
     "src/lib/db/migrationRunner.ts": 1094,
@@ -536,7 +537,7 @@
   "src/app/(dashboard)/dashboard/usage/components/EvalsTab.tsx": "2148",
   "src/app/(dashboard)/dashboard/usage/components/ProviderLimits/index.tsx": "1119",
   "src/app/api/providers/[id]/models/route.ts": "2361",
-  "src/app/api/v1/models/catalog.ts": "1590",
+  "src/app/api/v1/models/catalog.ts": "1597",
   "src/lib/tokenHealthCheck.ts": "1053",
   "src/lib/db/apiKeys.ts": "1529",
   "src/lib/db/core.ts": "1639",
diff --git a/open-sse/config/imageRegistry.ts b/open-sse/config/imageRegistry.ts
index 386dbf1485..5039cc105c 100644
--- a/open-sse/config/imageRegistry.ts
+++ b/open-sse/config/imageRegistry.ts
@@ -12,6 +12,10 @@ import { FREEPIK_IMAGE_PROVIDER } from "./providers/registry/freepik/index.ts";
 import { STABILITY_AI_IMAGE_MODELS } from "./providers/registry/stability-ai/imageModels.ts";
 import { GEMINI_IMAGEN_PROVIDER } from "./providers/registry/gemini/imageModels.ts";
 import { CHEAPERINFERENCE_IMAGE_PROVIDER } from "./providers/registry/cheaperinference/imageModels.ts";
+import {
+  ADOBE_FIREFLY_IMAGE_ROUTING_ALIASES,
+  toRegistryImageModels,
+} from "../services/adobeFireflyModels.ts";
 
 interface ImageModelEntry {
   id: string;
@@ -22,6 +26,8 @@ interface ImageModelEntry {
   imageRequired?: boolean;
   description?: string;
   isMarket?: boolean;
+  supportedSizes?: string[];
+  mediaCapabilities?: Record<string, unknown>;
 }
 
 interface ImageProviderConfig {
@@ -35,6 +41,7 @@ interface ImageProviderConfig {
   authHeader: string;
   format: string;
   models: ImageModelEntry[];
+  routingAliases?: readonly string[];
   supportedSizes: string[];
 }
 
@@ -46,6 +53,7 @@ interface ImageModelAliasEntry {
   inputModalities?: string[];
   imageRequired?: boolean;
   description?: string;
+  mediaCapabilities?: Record<string, unknown>;
 }
 
 interface ImageCatalogModelEntry {
@@ -55,6 +63,7 @@ interface ImageCatalogModelEntry {
   supportedSizes: string[];
   inputModalities: string[];
   description?: string;
+  mediaCapabilities?: Record<string, unknown>;
 }
 
 const IMAGE_MODEL_ALIASES: Record<string, ImageModelAliasEntry> = {
@@ -678,55 +687,9 @@ export const IMAGE_PROVIDERS: Record<string, ImageProviderConfig> = {
     authType: "apikey",
     authHeader: "bearer",
     format: "adobe-firefly-image",
-    models: [
-      {
-        id: "nano-banana-pro",
-        name: "Firefly Gemini 3.0 (Nano Banana Pro)",
-        inputModalities: ["text", "image"],
-      },
-      {
-        id: "nano-banana",
-        name: "Firefly Gemini 2.5 (Nano Banana)",
-        inputModalities: ["text", "image"],
-      },
-      {
-        id: "nano-banana-2",
-        name: "Firefly Gemini 3.1 (Nano Banana 2)",
-        inputModalities: ["text", "image"],
-      },
-      { id: "gpt-image-2", name: "Firefly GPT Image 2", inputModalities: ["text", "image"] },
-      { id: "gpt-image", name: "Firefly GPT Image 2", inputModalities: ["text", "image"] },
-      { id: "gpt-image-1.5", name: "Firefly GPT Image 1.5", inputModalities: ["text", "image"] },
-      { id: "flux-2", name: "Firefly Flux 2", inputModalities: ["text", "image"] },
-      { id: "flux-pro", name: "Firefly Flux 1.1 Pro", inputModalities: ["text", "image"] },
-      { id: "flux-ultra", name: "Firefly Flux 1.1 Ultra", inputModalities: ["text", "image"] },
-      { id: "seedream-4", name: "Firefly Seedream 4.0", inputModalities: ["text", "image"] },
-      {
-        id: "seedream-5-lite",
-        name: "Firefly Seedream 5.0 Lite",
-        inputModalities: ["text", "image"],
-      },
-      {
-        id: "runway-gen4-image",
-        name: "Firefly Runway Gen-4 Image",
-        inputModalities: ["text", "image"],
-      },
-      // Topaz Labs upscalers (inputMediaUseCase: ["upscaling"]).
-      // Served by firefly-3p /v2/3p-images/upsample — see config/upscaleRegistry.ts.
-      {
-        id: "topaz-standard",
-        name: "Firefly Topaz Upscale (Standard)",
-        inputModalities: ["image"],
-        imageRequired: true,
-      },
-      {
-        id: "topaz-bloom",
-        name: "Firefly Topaz Bloom (Creative Upscale)",
-        inputModalities: ["image"],
-        imageRequired: true,
-      },
-    ],
-    supportedSizes: ["1:1", "16:9", "9:16", "4:3", "3:4", "1024x1024", "1792x1024", "1024x1792"],
+    models: toRegistryImageModels(),
+    routingAliases: ADOBE_FIREFLY_IMAGE_ROUTING_ALIASES,
+    supportedSizes: [],
   },
 
   // Cheaper Inference (OSS-sponsor gateway). Declared AFTER adobe-firefly on
@@ -887,7 +850,7 @@ export function parseImageModel(modelStr) {
 
   // No provider prefix — try to find the model in every provider
   for (const [providerId, config] of Object.entries(IMAGE_PROVIDERS)) {
-    if (config.models.some((m) => m.id === modelStr)) {
+    if (config.routingAliases?.includes(modelStr) || config.models.some((m) => m.id === modelStr)) {
       return { provider: providerId, model: modelStr };
     }
   }
@@ -906,9 +869,10 @@ function imageProviderCatalogEntries(
     id: `${providerId}/${model.id}`,
     name: model.name,
     provider: providerId,
-    supportedSizes: config.supportedSizes,
+    supportedSizes: model.supportedSizes || config.supportedSizes,
     inputModalities: model.inputModalities || ["text"],
     description: model.description || undefined,
+    mediaCapabilities: model.mediaCapabilities,
   }));
 }
 
diff --git a/open-sse/config/videoRegistry.ts b/open-sse/config/videoRegistry.ts
index 260f1bf480..ee8dfffa57 100644
--- a/open-sse/config/videoRegistry.ts
+++ b/open-sse/config/videoRegistry.ts
@@ -5,14 +5,17 @@
  * Supports local providers plus hosted task-based APIs such as Runway.
  */
 
-import { parseModelFromRegistry, getAllModelsFromRegistry } from "./registryUtils.ts";
+import { parseModelFromRegistry } from "./registryUtils.ts";
 import { RUNWAYML_SUPPORTED_VIDEO_MODELS } from "./runway.ts";
 import { SEGMIND_VIDEO_MODELS } from "./providers/registry/segmind/videoModels.ts";
+import { toRegistryVideoModels } from "../services/adobeFireflyModels.ts";
 
 interface VideoModel {
   id: string;
   name: string;
   isMarket?: boolean;
+  supportedSizes?: string[];
+  mediaCapabilities?: Record<string, unknown>;
 }
 
 interface VideoProvider {
@@ -326,8 +329,7 @@ export const VIDEO_PROVIDERS: Record<string, VideoProvider> = {
   },
 
   // Adobe Firefly (unofficial) — same IMS/cookie credential as the image entry.
-  // Async 3P video generate + poll (Sora 2, Veo 3.1, Kling …). Fallback list
-  // from models/discovery capture (adobe/get_models.txt).
+  // Exact async video models and capabilities from the verified discovery snapshot.
   "adobe-firefly": {
     id: "adobe-firefly",
     alias: "firefly",
@@ -335,18 +337,7 @@ export const VIDEO_PROVIDERS: Record<string, VideoProvider> = {
     authType: "apikey",
     authHeader: "bearer",
     format: "adobe-firefly-video",
-    models: [
-      { id: "sora-2", name: "Firefly Sora 2" },
-      { id: "sora-2-pro", name: "Firefly Sora 2 Pro" },
-      { id: "veo-3.1", name: "Firefly Veo 3.1" },
-      { id: "veo-3.1-fast", name: "Firefly Veo 3.1 Fast" },
-      { id: "veo-3.1-ref", name: "Firefly Veo 3.1 Reference" },
-      { id: "kling-3", name: "Firefly Kling v3 Standard I2V" },
-      { id: "kling-v3-t2v", name: "Firefly Kling v3 Standard T2V" },
-      { id: "kling-v3-pro-i2v", name: "Firefly Kling v3 Pro I2V" },
-      { id: "luma-ray3", name: "Firefly Ray3" },
-      { id: "runway-gen4-turbo", name: "Firefly Runway Gen-4 Video" },
-    ],
+    models: toRegistryVideoModels(),
   },
 };
 
@@ -368,5 +359,17 @@ export function parseVideoModel(modelStr: string | null) {
  * Get all video models as a flat list
  */
 export function getAllVideoModels() {
-  return getAllModelsFromRegistry(VIDEO_PROVIDERS);
+  return Object.entries(VIDEO_PROVIDERS).flatMap(([providerId, config]) =>
+    [providerId, config.alias]
+      .filter((prefix): prefix is string => Boolean(prefix))
+      .flatMap((prefix) =>
+        config.models.map((model) => ({
+          id: `${prefix}/${model.id}`,
+          name: model.name,
+          provider: providerId,
+          supportedSizes: model.supportedSizes || [],
+          mediaCapabilities: model.mediaCapabilities,
+        }))
+      )
+  );
 }
diff --git a/open-sse/handlers/imageGeneration/providers/adobeFirefly.ts b/open-sse/handlers/imageGeneration/providers/adobeFirefly.ts
index 24f2ba361d..d4f6eb6da4 100644
--- a/open-sse/handlers/imageGeneration/providers/adobeFirefly.ts
+++ b/open-sse/handlers/imageGeneration/providers/adobeFirefly.ts
@@ -16,11 +16,11 @@ import {
   AdobeFireflyError,
   adobeFireflyGenerateImage,
   adobeFireflyImageTimeoutMs,
-  adobeFireflyMaxImageRefs,
   resolveAdobeAccessToken,
-  resolveAdobeSourceImageIds,
+  resolveAdobeSourceImageReferences,
   resolveAdobeImageModel,
 } from "../../../services/adobeFireflyClient.ts";
+import { getAdobeReferenceUploadLimit } from "../../../services/adobeFireflyModels.ts";
 import { isAdobeFireflyUpscaleModel } from "../../../services/adobeFireflyUpscale.ts";
 import { handleAdobeFireflyImageUpscale } from "../../imageUpscale/adobeFirefly.ts";
 
@@ -90,7 +90,8 @@ export async function handleAdobeFireflyImageGeneration({
 
     // Keep the raw credential blob for Cookie + sherlockToken (x-arp-session-id).
     // JWT may be embedded in the same paste as cookies (HAR / multi-line).
-    const psd = (credentials as { providerSpecificData?: { cookie?: string } })?.providerSpecificData;
+    const psd = (credentials as { providerSpecificData?: { cookie?: string } })
+      ?.providerSpecificData;
     const sessionCookie =
       (typeof psd?.cookie === "string" && psd.cookie.trim()) ||
       (typeof credentials?.apiKey === "string" && credentials.apiKey.trim()) ||
@@ -98,15 +99,11 @@ export async function handleAdobeFireflyImageGeneration({
         ? credentials.accessToken
         : undefined);
 
-    // Cap uploads by model family. gpt-image: 2 subject refs max (3–4+ stalls colligo → 504).
-    // nano: 4 general refs for multi-panel composition.
-    const { id: resolvedId } = resolveAdobeImageModel(model);
-    const maxRefs = adobeFireflyMaxImageRefs(resolvedId);
-
-    const sourceImageIds = await resolveAdobeSourceImageIds({
+    const { spec } = resolveAdobeImageModel(model);
+    const references = await resolveAdobeSourceImageReferences({
       accessToken,
       body,
-      max: maxRefs,
+      max: getAdobeReferenceUploadLimit(spec, "image"),
       sessionCookie,
       prompt,
       fetchImpl,
@@ -121,13 +118,13 @@ export async function handleAdobeFireflyImageGeneration({
           : undefined;
     const timeoutMs = adobeFireflyImageTimeoutMs({
       timeoutMs: explicitTimeout,
-      refCount: sourceImageIds.length,
+      refCount: references.length,
     });
 
     log?.info?.(
       "IMAGE",
       `${provider}/${model} (adobe-firefly) | prompt: "${prompt.slice(0, 60)}${prompt.length > 60 ? "..." : ""}"` +
-        (sourceImageIds.length ? ` | refs: ${sourceImageIds.length}/${maxRefs}` : "") +
+        (references.length ? ` | refs: ${references.length}` : "") +
         ` | pollTimeoutMs=${timeoutMs}`
     );
 
@@ -139,9 +136,8 @@ export async function handleAdobeFireflyImageGeneration({
       aspectRatio: body.aspect_ratio ?? body.aspectRatio ?? body.size,
       quality: body.quality,
       seed: Number.isFinite(seed as number) ? (seed as number) : undefined,
-      negativePrompt:
-        typeof body.negative_prompt === "string" ? body.negative_prompt : undefined,
-      sourceImageIds: sourceImageIds.length ? sourceImageIds : undefined,
+      negativePrompt: typeof body.negative_prompt === "string" ? body.negative_prompt : undefined,
+      references: references.length ? references : undefined,
       sessionCookie,
       timeoutMs,
       fetchImpl,
diff --git a/open-sse/handlers/videoGeneration/adobeFireflyHandler.ts b/open-sse/handlers/videoGeneration/adobeFireflyHandler.ts
index 62250f3f27..b6f267e0bc 100644
--- a/open-sse/handlers/videoGeneration/adobeFireflyHandler.ts
+++ b/open-sse/handlers/videoGeneration/adobeFireflyHandler.ts
@@ -10,9 +10,10 @@ import {
   AdobeFireflyError,
   adobeFireflyGenerateVideo,
   resolveAdobeAccessToken,
-  resolveAdobeSourceImageIds,
+  resolveAdobeSourceImageReferences,
   resolveAdobeVideoModel,
 } from "../../services/adobeFireflyClient.ts";
+import { getAdobeReferenceUploadLimit } from "../../services/adobeFireflyModels.ts";
 
 function normalizePositiveNumber(value: unknown, fallback: number): number {
   const n = Number(value);
@@ -55,7 +56,8 @@ export async function handleAdobeFireflyVideoGeneration({
           ? Number(body.seed)
           : undefined;
     // Keep raw paste for Cookie + sherlockToken (x-arp-session-id).
-    const psd = (credentials as { providerSpecificData?: { cookie?: string } })?.providerSpecificData;
+    const psd = (credentials as { providerSpecificData?: { cookie?: string } })
+      ?.providerSpecificData;
     const sessionCookie =
       (typeof psd?.cookie === "string" && psd.cookie.trim()) ||
       (typeof credentials?.apiKey === "string" && credentials.apiKey.trim()) ||
@@ -63,13 +65,11 @@ export async function handleAdobeFireflyVideoGeneration({
         ? credentials.accessToken
         : undefined);
 
-    // Kling i2v / Veo ref / Sora frame: upload reference images first.
-    const { id: videoModelId } = resolveAdobeVideoModel(String(model));
-    const maxFrames = videoModelId.includes("kling") || videoModelId.includes("sora") ? 2 : 3;
-    const sourceImageIds = await resolveAdobeSourceImageIds({
+    const { spec } = resolveAdobeVideoModel(String(model));
+    const references = await resolveAdobeSourceImageReferences({
       accessToken,
       body,
-      max: maxFrames,
+      max: getAdobeReferenceUploadLimit(spec, "image"),
       sessionCookie,
       prompt,
       fetchImpl,
@@ -79,7 +79,7 @@ export async function handleAdobeFireflyVideoGeneration({
     log?.info?.(
       "VIDEO",
       `${provider}/${model} (adobe-firefly) | prompt: "${prompt.slice(0, 60)}${prompt.length > 60 ? "..." : ""}"` +
-        (sourceImageIds.length ? ` | frames: ${sourceImageIds.length}` : "")
+        (references.length ? ` | refs: ${references.length}` : "")
     );
 
     const result = await adobeFireflyGenerateVideo({
@@ -99,7 +99,7 @@ export async function handleAdobeFireflyVideoGeneration({
             ? body.negativePrompt
             : undefined,
       generateAudio: body.generate_audio !== false && body.generateAudio !== false,
-      sourceImageIds: sourceImageIds.length ? sourceImageIds : undefined,
+      references: references.length ? references : undefined,
       sessionCookie,
       timeoutMs,
       fetchImpl,
diff --git a/open-sse/services/adobeFireflyClient.ts b/open-sse/services/adobeFireflyClient.ts
index 16d491637a..d2bd3e3dc8 100644
--- a/open-sse/services/adobeFireflyClient.ts
+++ b/open-sse/services/adobeFireflyClient.ts
@@ -24,17 +24,31 @@
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { resolvePublicCred } from "../utils/publicCreds.ts";
 import { sanitizeErrorMessage } from "../utils/error.ts";
+import {
+  ADOBE_FIREFLY_IMAGE_MODELS as DISCOVERED_IMAGE_MODELS,
+  ADOBE_FIREFLY_VIDEO_MODELS as DISCOVERED_VIDEO_MODELS,
+  parseAdobeModelsDiscovery,
+  resolveAdobeImageModel as resolveDiscoveredImageModel,
+  resolveAdobeVideoModel as resolveDiscoveredVideoModel,
+  type AdobeFireflyCatalogModel as DiscoveredCatalogModel,
+  type AdobeFireflyImageModelSpec as DiscoveredImageModelSpec,
+  type AdobeFireflyVideoModelSpec as DiscoveredVideoModelSpec,
+} from "./adobeFireflyModels.ts";
+
+export {
+  DISCOVERED_IMAGE_MODELS as ADOBE_FIREFLY_IMAGE_MODELS,
+  DISCOVERED_VIDEO_MODELS as ADOBE_FIREFLY_VIDEO_MODELS,
+  parseAdobeModelsDiscovery,
+};
 
 export const ADOBE_FIREFLY_IMAGE_SUBMIT_URL =
   "https://firefly-3p.ff.adobe.io/v2/3p-images/generate-async";
 export const ADOBE_FIREFLY_VIDEO_SUBMIT_URL =
   "https://firefly-3p.ff.adobe.io/v2/3p-videos/generate-async";
-export const ADOBE_FIREFLY_IMAGE_UPLOAD_URL =
-  "https://firefly-3p.ff.adobe.io/v2/storage/image";
+export const ADOBE_FIREFLY_IMAGE_UPLOAD_URL = "https://firefly-3p.ff.adobe.io/v2/storage/image";
 export const ADOBE_FIREFLY_MODELS_DISCOVERY_URL =
   "https://firefly-3p.ff.adobe.io/v2/models/discovery";
-export const ADOBE_FIREFLY_CREDITS_BALANCE_URL =
-  "https://firefly.adobe.io/v1/credits/balance";
+export const ADOBE_FIREFLY_CREDITS_BALANCE_URL = "https://firefly.adobe.io/v1/credits/balance";
 export const ADOBE_FIREFLY_IMS_REFRESH_URL =
   "https://adobeid-na1.services.adobe.com/ims/check/v6/token?jslVersion=v2-v0.48.0-1-g1e322cb";
 /** Scope set observed on live firefly.adobe.com IMS access tokens. */
@@ -46,8 +60,7 @@ export const ADOBE_FIREFLY_IMS_SCOPE =
 
 const DEFAULT_USER_AGENT =
   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/150.0.0.0 Safari/537.36";
-const DEFAULT_SEC_CH_UA =
-  '"Not;A=Brand";v="8", "Chromium";v="150", "Google Chrome";v="150"';
+const DEFAULT_SEC_CH_UA = '"Not;A=Brand";v="8", "Chromium";v="150", "Google Chrome";v="150"';
 const DEFAULT_POLL_INTERVAL_MS = 3000;
 /**
  * Poll budget for image generate-async. Multi-ref gpt-image / nano jobs commonly
@@ -59,29 +72,9 @@ const DEFAULT_VIDEO_TIMEOUT_MS = 300_000;
 /** Extra poll budget per uploaded reference blob (large screenshots + image2image). */
 export const ADOBE_FIREFLY_IMAGE_TIMEOUT_PER_REF_MS = 60_000;
 export const ADOBE_FIREFLY_IMAGE_TIMEOUT_MAX_MS = 600_000;
-/**
- * gpt-image family accepts subject refs, but the live SPA and colligo are reliable
- * with 1–2 only. Sending 3–4+ (e.g. Store listing "5 screenshots") often hangs until
- * poll timeout. Nano multi-ref composition supports more via usage "general".
- */
-export const ADOBE_FIREFLY_GPT_IMAGE_MAX_REFS = 2;
-export const ADOBE_FIREFLY_NANO_MAX_REFS = 4;
-export const ADOBE_FIREFLY_GENERIC_IMAGE_MAX_REFS = 2;
 const FIREFLY_ORIGIN = "https://firefly.adobe.com";
 const FIREFLY_REFERER = "https://firefly.adobe.com/";
 
-/** Cap reference uploads by Firefly image model family. */
-export function adobeFireflyMaxImageRefs(model: string): number {
-  const raw = String(model || "").toLowerCase();
-  if (raw.includes("nano-banana") || raw.includes("nanobanana") || raw.includes("gemini-flash")) {
-    return ADOBE_FIREFLY_NANO_MAX_REFS;
-  }
-  if (raw.includes("gpt-image") || raw.includes("gptimage")) {
-    return ADOBE_FIREFLY_GPT_IMAGE_MAX_REFS;
-  }
-  return ADOBE_FIREFLY_GENERIC_IMAGE_MAX_REFS;
-}
-
 /**
  * Resolve poll timeout: explicit body.timeout_ms wins; else base + per-ref budget.
  * Covers multi-screenshot listing jobs without unbounded waits.
@@ -95,172 +88,9 @@ export function adobeFireflyImageTimeoutMs(opts?: {
     return Math.min(ADOBE_FIREFLY_IMAGE_TIMEOUT_MAX_MS, Math.floor(explicit));
   }
   const refs = Math.max(0, Math.floor(Number(opts?.refCount) || 0));
-  const budget =
-    DEFAULT_IMAGE_TIMEOUT_MS + refs * ADOBE_FIREFLY_IMAGE_TIMEOUT_PER_REF_MS;
+  const budget = DEFAULT_IMAGE_TIMEOUT_MS + refs * ADOBE_FIREFLY_IMAGE_TIMEOUT_PER_REF_MS;
   return Math.min(ADOBE_FIREFLY_IMAGE_TIMEOUT_MAX_MS, budget);
 }
-
-export type AdobeFireflyImageModelId =
-  | "nano-banana-pro"
-  | "nano-banana"
-  | "nano-banana-2"
-  | "gpt-image"
-  | "gpt-image-2"
-  | "gpt-image-1.5"
-  | "flux-2"
-  | "flux-pro"
-  | "flux-ultra"
-  | "seedream-4"
-  | "seedream-5-lite"
-  | "runway-gen4-image";
-
-export type AdobeFireflyVideoModelId =
-  | "sora-2"
-  | "sora-2-pro"
-  | "veo-3.1"
-  | "veo-3.1-fast"
-  | "veo-3.1-ref"
-  | "kling-3";
-
-export interface AdobeFireflyImageModelSpec {
-  upstreamModelId: string;
-  upstreamModelVersion: string;
-  /** Payload builder family — nano uses Gemini-style size maps; gpt-image uses OpenAI detail levels. */
-  family: "nano" | "gpt-image" | "generic";
-}
-
-export interface AdobeFireflyVideoModelSpec {
-  engine: "sora2" | "sora2-pro" | "veo31-standard" | "veo31-fast" | "kling3";
-  upstreamModel: string;
-  modelId?: string;
-  modelVersion?: string;
-  referenceMode?: "frame" | "image";
-  defaultDuration: number;
-  defaultResolution: string;
-}
-
-/**
- * Upstream modelId/modelVersion pairs from firefly-3p models/discovery
- * (captured 2026-07 — see adobe/get_models.txt). Friendly catalog ids map here.
- */
-export const ADOBE_FIREFLY_IMAGE_MODELS: Record<AdobeFireflyImageModelId, AdobeFireflyImageModelSpec> =
-  {
-    // Gemini 3.0 (Nano Banana Pro) — discovery: gemini-flash / nano-banana-2
-    "nano-banana-pro": {
-      upstreamModelId: "gemini-flash",
-      upstreamModelVersion: "nano-banana-2",
-      family: "nano",
-    },
-    // Gemini 2.5 (Nano Banana) — discovery: gemini-flash / nano-banana
-    "nano-banana": {
-      upstreamModelId: "gemini-flash",
-      upstreamModelVersion: "nano-banana",
-      family: "nano",
-    },
-    // Gemini 3.1 (Nano Banana 2) — discovery: gemini-flash / nano-banana-3
-    "nano-banana-2": {
-      upstreamModelId: "gemini-flash",
-      upstreamModelVersion: "nano-banana-3",
-      family: "nano",
-    },
-    // GPT Image 2 — discovery modelVersion "2" (get_models: modelDisplayName "GPT Image 2")
-    "gpt-image": {
-      upstreamModelId: "gpt-image",
-      upstreamModelVersion: "2",
-      family: "gpt-image",
-    },
-    // Explicit catalog alias so pickers show "gpt-image-2" distinctly
-    "gpt-image-2": {
-      upstreamModelId: "gpt-image",
-      upstreamModelVersion: "2",
-      family: "gpt-image",
-    },
-    "gpt-image-1.5": {
-      upstreamModelId: "gpt-image",
-      upstreamModelVersion: "1.5",
-      family: "gpt-image",
-    },
-    "flux-2": {
-      upstreamModelId: "flux",
-      upstreamModelVersion: "2",
-      family: "generic",
-    },
-    "flux-pro": {
-      upstreamModelId: "flux",
-      upstreamModelVersion: "fluxPro",
-      family: "generic",
-    },
-    "flux-ultra": {
-      upstreamModelId: "flux",
-      upstreamModelVersion: "fluxUltra",
-      family: "generic",
-    },
-    "seedream-4": {
-      upstreamModelId: "seedream",
-      upstreamModelVersion: "seedream_v4",
-      family: "generic",
-    },
-    "seedream-5-lite": {
-      upstreamModelId: "seedream",
-      upstreamModelVersion: "seedream_v5_lite",
-      family: "generic",
-    },
-    "runway-gen4-image": {
-      upstreamModelId: "runway-gen4-image",
-      upstreamModelVersion: "gen4_image",
-      family: "generic",
-    },
-  };
-
-export const ADOBE_FIREFLY_VIDEO_MODELS: Record<AdobeFireflyVideoModelId, AdobeFireflyVideoModelSpec> =
-  {
-    "sora-2": {
-      engine: "sora2",
-      upstreamModel: "openai:firefly:colligo:sora2",
-      defaultDuration: 8,
-      defaultResolution: "720p",
-    },
-    "sora-2-pro": {
-      engine: "sora2-pro",
-      upstreamModel: "openai:firefly:colligo:sora2-pro",
-      defaultDuration: 8,
-      defaultResolution: "720p",
-    },
-    "veo-3.1": {
-      engine: "veo31-standard",
-      upstreamModel: "google:firefly:colligo:veo31",
-      modelId: "veo",
-      modelVersion: "3.1-generate",
-      defaultDuration: 6,
-      defaultResolution: "720p",
-    },
-    "veo-3.1-fast": {
-      engine: "veo31-fast",
-      upstreamModel: "google:firefly:colligo:veo31-fast",
-      modelId: "veo",
-      modelVersion: "3.1-fast-generate",
-      defaultDuration: 6,
-      defaultResolution: "720p",
-    },
-    "veo-3.1-ref": {
-      engine: "veo31-standard",
-      upstreamModel: "google:firefly:colligo:veo31",
-      modelId: "veo",
-      modelVersion: "3.1-generate",
-      referenceMode: "image",
-      defaultDuration: 6,
-      defaultResolution: "720p",
-    },
-    "kling-3": {
-      engine: "kling3",
-      upstreamModel: "kling:firefly:colligo:kling3",
-      modelId: "kling",
-      modelVersion: "kling_v3_standard_i2v",
-      defaultDuration: 5,
-      defaultResolution: "1080p",
-    },
-  };
-
 const NANO_SIZE_MAP: Record<string, Record<string, { width: number; height: number }>> = {
   "1K": {
     "1:1": { width: 1024, height: 1024 },
@@ -383,7 +213,10 @@ export function adobeFireflyBalanceApiKey(): string {
 export function decodeAdobeJwtPayload(token: string): Record<string, unknown> | null {
   try {
     // Do not call extractAdobeCredentialToken here (would recurse via guest checks).
-    let raw = String(token || "").trim().replace(/^bearer\s+/i, "").trim();
+    let raw = String(token || "")
+      .trim()
+      .replace(/^bearer\s+/i, "")
+      .trim();
     // If a blob was passed, take the first JWT-shaped segment.
     const m = raw.match(/eyJ[A-Za-z0-9_-]{1,4096}\.[A-Za-z0-9_-]{1,4096}\.[A-Za-z0-9_-]{1,4096}/);
     if (m) raw = m[0];
@@ -460,7 +293,11 @@ export function extractAdobeCredentialToken(raw: string): string {
   if (!value) return "";
 
   if (/^bearer\s+/i.test(value)) {
-    const bare = value.replace(/^bearer\s+/i, "").trim().split(/\s+/)[0] || "";
+    const bare =
+      value
+        .replace(/^bearer\s+/i, "")
+        .trim()
+        .split(/\s+/)[0] || "";
     if (looksLikeAdobeJwt(bare)) return bare;
   }
 
@@ -478,11 +315,15 @@ export function extractAdobeCredentialToken(raw: string): string {
   }
 
   // Authorization: Bearer eyJ...
-  const authMatch = value.match(/Authorization\s*:\s*Bearer\s+([A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)/i);
+  const authMatch = value.match(
+    /Authorization\s*:\s*Bearer\s+([A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)/i
+  );
   if (authMatch?.[1] && looksLikeAdobeJwt(authMatch[1])) return authMatch[1];
 
   // Any eyJ… JWT in the blob (HAR / multi-line). Prefer user AdobeID tokens.
-  const jwtMatches = value.match(/eyJ[A-Za-z0-9_-]{1,4096}\.[A-Za-z0-9_-]{1,4096}\.[A-Za-z0-9_-]{1,4096}/g);
+  const jwtMatches = value.match(
+    /eyJ[A-Za-z0-9_-]{1,4096}\.[A-Za-z0-9_-]{1,4096}\.[A-Za-z0-9_-]{1,4096}/g
+  );
   if (jwtMatches && jwtMatches.length > 0) {
     const sorted = [...jwtMatches].sort((a, b) => b.length - a.length);
     const user = sorted.find((t) => looksLikeAdobeJwt(t) && isAdobeUserAccessToken(t));
@@ -531,7 +372,8 @@ export function extractAdobeCookieHeader(raw: string): string {
       if (/^bearer\s+/i.test(line)) return false;
       if (looksLikeAdobeJwt(line)) return false;
       // Drop standalone eyJ… segments
-      if (/^eyJ[A-Za-z0-9_-]{1,4096}\.[A-Za-z0-9_-]{1,4096}\.[A-Za-z0-9_-]{1,4096}$/.test(line)) return false;
+      if (/^eyJ[A-Za-z0-9_-]{1,4096}\.[A-Za-z0-9_-]{1,4096}\.[A-Za-z0-9_-]{1,4096}$/.test(line))
+        return false;
       return true;
     })
     .join("; ");
@@ -591,8 +433,13 @@ export function normalizeAdobeAspectRatio(sizeOrRatio: unknown, fallback = "1:1"
   return fallback;
 }
 
-export function normalizeAdobeOutputResolution(quality: unknown, size: unknown): "1K" | "2K" | "4K" {
-  const q = String(quality ?? "").trim().toLowerCase();
+export function normalizeAdobeOutputResolution(
+  quality: unknown,
+  size: unknown
+): "1K" | "2K" | "4K" {
+  const q = String(quality ?? "")
+    .trim()
+    .toLowerCase();
   if (q === "4k" || q === "ultra" || q === "high") return "4K";
   if (q === "2k" || q === "hd" || q === "standard" || q === "medium") return "2K";
   if (q === "1k" || q === "low") return "1K";
@@ -603,107 +450,32 @@ export function normalizeAdobeOutputResolution(quality: unknown, size: unknown):
   return "2K";
 }
 
-export function resolveAdobeImageModel(model: string): {
-  id: AdobeFireflyImageModelId;
-  spec: AdobeFireflyImageModelSpec;
-} {
-  const raw = String(model || "")
-    .trim()
-    .toLowerCase()
-    .replace(/^adobe-firefly\//, "")
-    .replace(/^firefly\//, "");
-
-  // Accept long catalog ids like firefly-nano-banana-pro-2k-16x9
-  if (raw.includes("nano-banana2") || raw.includes("nano-banana-2") || raw.includes("nano-banana-3")) {
-    return { id: "nano-banana-2", spec: ADOBE_FIREFLY_IMAGE_MODELS["nano-banana-2"] };
+export function resolveAdobeImageModel(
+  model: string
+): ReturnType<typeof resolveDiscoveredImageModel> {
+  try {
+    return resolveDiscoveredImageModel(model);
+  } catch (error) {
+    throw new AdobeFireflyError(
+      error instanceof Error ? error.message : "Unknown Adobe Firefly image model",
+      400,
+      "unknown_model"
+    );
   }
-  if (raw.includes("nano-banana-pro")) {
-    return { id: "nano-banana-pro", spec: ADOBE_FIREFLY_IMAGE_MODELS["nano-banana-pro"] };
-  }
-  if (raw.includes("nano-banana")) {
-    return { id: "nano-banana", spec: ADOBE_FIREFLY_IMAGE_MODELS["nano-banana"] };
-  }
-  if (raw.includes("gpt-image-1.5") || raw.includes("gpt-image1.5")) {
-    return { id: "gpt-image-1.5", spec: ADOBE_FIREFLY_IMAGE_MODELS["gpt-image-1.5"] };
-  }
-  // Prefer explicit "2" / "gpt-image-2" before generic gpt-image
-  if (
-    raw === "gpt-image-2" ||
-    raw.includes("gpt-image-2") ||
-    raw.includes("gptimage2") ||
-    raw === "gpt-image" ||
-    raw.includes("gpt-image")
-  ) {
-    // Bare gpt-image and gpt-image-2 both map to upstream version "2" (GPT Image 2).
-    if (raw.includes("1.5")) {
-      return { id: "gpt-image-1.5", spec: ADOBE_FIREFLY_IMAGE_MODELS["gpt-image-1.5"] };
-    }
-    const id = raw.includes("gpt-image-2") || raw.includes("gptimage2") ? "gpt-image-2" : "gpt-image";
-    return { id: id as AdobeFireflyImageModelId, spec: ADOBE_FIREFLY_IMAGE_MODELS["gpt-image"] };
-  }
-  if (raw.includes("flux-ultra") || raw.includes("fluxultra")) {
-    return { id: "flux-ultra", spec: ADOBE_FIREFLY_IMAGE_MODELS["flux-ultra"] };
-  }
-  if (raw.includes("flux-pro") || raw.includes("fluxpro")) {
-    return { id: "flux-pro", spec: ADOBE_FIREFLY_IMAGE_MODELS["flux-pro"] };
-  }
-  if (raw.includes("flux")) {
-    return { id: "flux-2", spec: ADOBE_FIREFLY_IMAGE_MODELS["flux-2"] };
-  }
-  if (raw.includes("seedream-5") || raw.includes("seedream_v5")) {
-    return { id: "seedream-5-lite", spec: ADOBE_FIREFLY_IMAGE_MODELS["seedream-5-lite"] };
-  }
-  if (raw.includes("seedream")) {
-    return { id: "seedream-4", spec: ADOBE_FIREFLY_IMAGE_MODELS["seedream-4"] };
-  }
-  if (raw.includes("runway") && raw.includes("image")) {
-    return { id: "runway-gen4-image", spec: ADOBE_FIREFLY_IMAGE_MODELS["runway-gen4-image"] };
-  }
-
-  if (raw in ADOBE_FIREFLY_IMAGE_MODELS) {
-    const id = raw as AdobeFireflyImageModelId;
-    return { id, spec: ADOBE_FIREFLY_IMAGE_MODELS[id] };
-  }
-
-  // Default to Nano Banana Pro (most common Firefly image path).
-  return { id: "nano-banana-pro", spec: ADOBE_FIREFLY_IMAGE_MODELS["nano-banana-pro"] };
 }
 
-export function resolveAdobeVideoModel(model: string): {
-  id: AdobeFireflyVideoModelId;
-  spec: AdobeFireflyVideoModelSpec;
-} {
-  const raw = String(model || "")
-    .trim()
-    .toLowerCase()
-    .replace(/^adobe-firefly\//, "")
-    .replace(/^firefly\//, "");
-
-  if (raw.includes("sora2-pro") || raw.includes("sora-2-pro") || raw.includes("sora2_pro")) {
-    return { id: "sora-2-pro", spec: ADOBE_FIREFLY_VIDEO_MODELS["sora-2-pro"] };
+export function resolveAdobeVideoModel(
+  model: string
+): ReturnType<typeof resolveDiscoveredVideoModel> {
+  try {
+    return resolveDiscoveredVideoModel(model);
+  } catch (error) {
+    throw new AdobeFireflyError(
+      error instanceof Error ? error.message : "Unknown Adobe Firefly video model",
+      400,
+      "unknown_model"
+    );
   }
-  if (raw.includes("sora2") || raw.includes("sora-2") || raw.includes("sora")) {
-    return { id: "sora-2", spec: ADOBE_FIREFLY_VIDEO_MODELS["sora-2"] };
-  }
-  if (raw.includes("veo31-ref") || raw.includes("veo-3.1-ref") || raw.includes("veo31_ref")) {
-    return { id: "veo-3.1-ref", spec: ADOBE_FIREFLY_VIDEO_MODELS["veo-3.1-ref"] };
-  }
-  if (raw.includes("veo31-fast") || raw.includes("veo-3.1-fast") || raw.includes("veo31_fast")) {
-    return { id: "veo-3.1-fast", spec: ADOBE_FIREFLY_VIDEO_MODELS["veo-3.1-fast"] };
-  }
-  if (raw.includes("veo31") || raw.includes("veo-3.1") || raw.includes("veo")) {
-    return { id: "veo-3.1", spec: ADOBE_FIREFLY_VIDEO_MODELS["veo-3.1"] };
-  }
-  if (raw.includes("kling")) {
-    return { id: "kling-3", spec: ADOBE_FIREFLY_VIDEO_MODELS["kling-3"] };
-  }
-
-  if (raw in ADOBE_FIREFLY_VIDEO_MODELS) {
-    const id = raw as AdobeFireflyVideoModelId;
-    return { id, spec: ADOBE_FIREFLY_VIDEO_MODELS[id] };
-  }
-
-  return { id: "sora-2", spec: ADOBE_FIREFLY_VIDEO_MODELS["sora-2"] };
 }
 
 /**
@@ -713,26 +485,138 @@ export function resolveAdobeVideoModel(model: string): {
  * Explicit low/medium still honor the caller's choice.
  */
 function gptDetailLevel(quality: unknown): number {
-  const q = String(quality ?? "high").trim().toLowerCase();
+  const q = String(quality ?? "high")
+    .trim()
+    .toLowerCase();
   if (q === "low" || q === "1k" || q === "1") return 1;
   if (q === "medium" || q === "2k" || q === "standard" || q === "hd" || q === "3") return 3;
   // high / 4k / ultra / auto / empty / unknown → max detail
   return 5;
 }
 
+export interface AdobeFireflyReferenceBlob {
+  id: string;
+  mediaType?: string;
+  usage?: string;
+  order?: number;
+}
+
+function defaultAdobeReferenceUsage(
+  model: DiscoveredCatalogModel,
+  mediaType: string
+): string | null {
+  const supported = model.capabilities.referenceInputs
+    .filter((capability) => capability.mediaType === mediaType)
+    .map((capability) => capability.usageType);
+  const priority =
+    model.modality === "video"
+      ? ["frame", "element", "style", "subject", "source", "general"]
+      : ["source", "general", "style", "element", "subject"];
+  return priority.find((usage) => supported.includes(usage)) || supported[0] || null;
+}
+
+/** Validate roles/counts against the resolved discovery schema and produce wire blobs. */
+export function normalizeAdobeReferenceBlobs(
+  model: DiscoveredCatalogModel,
+  references: AdobeFireflyReferenceBlob[] = [],
+  fallbackImageIds: string[] = []
+): Array<Record<string, unknown>> {
+  const requested = references.length
+    ? references
+    : fallbackImageIds.map((id) => ({ id, mediaType: "image" }));
+  const capabilities = model.capabilities.referenceInputs;
+  const totalLimit = model.capabilities.maxReferenceItems;
+  if (totalLimit !== null && requested.length > totalLimit) {
+    throw new AdobeFireflyError(
+      `${model.name} accepts at most ${totalLimit} total reference item(s)`,
+      400,
+      "invalid_reference_count"
+    );
+  }
+
+  const counts = new Map<string, number>();
+  const normalized = requested.map((reference) => {
+    const id = String(reference.id || "").trim();
+    if (!id) {
+      throw new AdobeFireflyError(
+        "Adobe Firefly reference id is required",
+        400,
+        "invalid_reference"
+      );
+    }
+    const mediaType = String(reference.mediaType || "image")
+      .trim()
+      .toLowerCase();
+    const usage =
+      String(reference.usage || "")
+        .trim()
+        .toLowerCase() || defaultAdobeReferenceUsage(model, mediaType);
+    const capability = capabilities.find(
+      (candidate) => candidate.mediaType === mediaType && candidate.usageType === usage
+    );
+    if (!usage || !capability) {
+      const allowed = capabilities
+        .filter((candidate) => candidate.mediaType === mediaType)
+        .map((candidate) => candidate.usageType)
+        .join(", ");
+      throw new AdobeFireflyError(
+        `${model.name} does not support ${mediaType} references with usage '${usage || "unspecified"}'` +
+          (allowed ? ` (allowed: ${allowed})` : ""),
+        400,
+        "invalid_reference_usage"
+      );
+    }
+    const key = `${mediaType}:${usage}`;
+    const count = (counts.get(key) || 0) + 1;
+    counts.set(key, count);
+    if (capability.maxItems !== null && count > capability.maxItems) {
+      throw new AdobeFireflyError(
+        `${model.name} accepts at most ${capability.maxItems} ${usage} ${mediaType} reference(s)`,
+        400,
+        "invalid_reference_count"
+      );
+    }
+    return {
+      id,
+      usage,
+      ...(usage === "frame" ? { order: reference.order ?? count } : {}),
+    };
+  });
+
+  for (const capability of capabilities) {
+    if (capability.minItems <= 0) continue;
+    const key = `${capability.mediaType}:${capability.usageType}`;
+    const count = counts.get(key) || 0;
+    if (count < capability.minItems) {
+      throw new AdobeFireflyError(
+        `${model.name} requires at least ${capability.minItems} ${capability.usageType} ${capability.mediaType} reference(s)`,
+        400,
+        "missing_required_reference"
+      );
+    }
+  }
+  return normalized;
+}
+
 export function buildAdobeImagePayload(opts: {
   prompt: string;
   aspectRatio: string;
   outputResolution: "1K" | "2K" | "4K";
-  modelSpec: AdobeFireflyImageModelSpec;
+  modelSpec: DiscoveredImageModelSpec;
   quality?: unknown;
   seed?: number;
   sourceImageIds?: string[];
+  references?: AdobeFireflyReferenceBlob[];
   negativePrompt?: string;
 }): Record<string, unknown> {
   const ratio = opts.aspectRatio === "auto" ? "1:1" : opts.aspectRatio || "1:1";
   const seeds = [typeof opts.seed === "number" ? opts.seed : Math.floor(Date.now() % 999999)];
   const negative = String(opts.negativePrompt || "").trim();
+  const referenceBlobs = normalizeAdobeReferenceBlobs(
+    opts.modelSpec,
+    opts.references,
+    opts.sourceImageIds
+  );
   const genSettings: Record<string, unknown> = {};
   if (negative) {
     genSettings.avoidKeywords = negative
@@ -760,24 +644,16 @@ export function buildAdobeImagePayload(opts: {
         ...genSettings,
       },
     };
-    if (opts.sourceImageIds?.length) {
-      // gpt-image subject references (mask path uses separate mask blob when present).
-      // Cap to wire-stable count — extra subject blobs stall colligo until poll 504.
-      const refIds = opts.sourceImageIds
-        .map((id) => String(id))
-        .filter(Boolean)
-        .slice(0, ADOBE_FIREFLY_GPT_IMAGE_MAX_REFS);
+    if (referenceBlobs.length) {
+      // gpt-image references use the roles/counts validated from discovery.
       payload.generationMetadata = { module: "image2image", submodule: "ff-image-generate" };
-      payload.referenceBlobs = refIds.map((id) => ({
-        id,
-        usage: "subject",
-      }));
+      payload.referenceBlobs = referenceBlobs;
       payload.modelSpecificPayload = {};
     }
     return payload;
   }
 
-  // nano (Gemini Flash) + generic (Flux / Seedream / Runway image): same 3P image shape.
+  // Gemini Flash + generic (Flux / Seedream / Runway image): same 3P image shape.
   // Live capture (web_providers/adobe_atach_images.txt): referenceBlobs with usage "general"
   // keep module "text2image" (not image2image) for nano multi-ref composition.
   const sizeMap = NANO_SIZE_MAP[opts.outputResolution] || NANO_SIZE_MAP["2K"];
@@ -801,20 +677,9 @@ export function buildAdobeImagePayload(opts: {
   };
   if (Object.keys(genSettings).length) payload.generationSettings = genSettings;
 
-  if (opts.sourceImageIds?.length) {
-    const maxRefs =
-      opts.modelSpec.family === "generic"
-        ? ADOBE_FIREFLY_GENERIC_IMAGE_MAX_REFS
-        : ADOBE_FIREFLY_NANO_MAX_REFS;
-    const refIds = opts.sourceImageIds
-      .map((id) => String(id))
-      .filter(Boolean)
-      .slice(0, maxRefs);
-    payload.referenceBlobs = refIds.map((id) => ({
-      id,
-      usage: "general",
-    }));
-    // Flux / Seedream / Runway image historically used image2image; nano keeps text2image.
+  if (referenceBlobs.length) {
+    payload.referenceBlobs = referenceBlobs;
+    // Flux / Seedream / Runway image historically used image2image; Gemini keeps text2image.
     if (opts.modelSpec.family === "generic") {
       payload.generationMetadata = { module: "image2image", submodule: "ff-image-generate" };
     }
@@ -831,139 +696,125 @@ function videoSize(aspectRatio: string, resolution: string): { width: number; he
   return { width: Math.round((short * 16) / 9), height: short };
 }
 
+function parseSize(value: string): { width: number; height: number } | null {
+  const match = String(value || "").match(/^(\d+)[x:](\d+)$/i);
+  if (!match) return null;
+  const width = Number(match[1]);
+  const height = Number(match[2]);
+  return width > 0 && height > 0 ? { width, height } : null;
+}
+
+function selectAdobeVideoSize(
+  model: DiscoveredVideoModelSpec,
+  aspectRatio: string,
+  resolution: string
+): { width: number; height: number } {
+  const supported = model.capabilities.supportedSizes.map(parseSize).filter(Boolean) as Array<{
+    width: number;
+    height: number;
+  }>;
+  const requestedExact = parseSize(aspectRatio);
+  if (requestedExact) {
+    const exact = supported.find(
+      (size) => size.width === requestedExact.width && size.height === requestedExact.height
+    );
+    if (exact) return exact;
+  }
+  if (supported.length === 0) return videoSize(aspectRatio, resolution);
+
+  const [ratioWidth, ratioHeight] = String(aspectRatio || "16:9")
+    .split(":")
+    .map(Number);
+  const targetRatio = ratioWidth > 0 && ratioHeight > 0 ? ratioWidth / ratioHeight : 16 / 9;
+  const targetLongEdge = String(resolution).includes("1080") ? 1920 : 1280;
+  return [...supported].sort((left, right) => {
+    const leftScore =
+      Math.abs(left.width / left.height - targetRatio) * 10_000 +
+      Math.abs(Math.max(left.width, left.height) - targetLongEdge);
+    const rightScore =
+      Math.abs(right.width / right.height - targetRatio) * 10_000 +
+      Math.abs(Math.max(right.width, right.height) - targetLongEdge);
+    return leftScore - rightScore;
+  })[0];
+}
+
+function validateAdobeDuration(model: DiscoveredVideoModelSpec, requested: number): number {
+  const capabilities = model.capabilities;
+  const duration = Math.floor(Number.isFinite(requested) ? requested : model.defaultDuration);
+  if (
+    capabilities.supportedDurations.length > 0 &&
+    !capabilities.supportedDurations.includes(duration)
+  ) {
+    throw new AdobeFireflyError(
+      `${model.name} supports duration(s): ${capabilities.supportedDurations.join(", ")} seconds`,
+      400,
+      "invalid_duration"
+    );
+  }
+  if (
+    (capabilities.durationMin !== null && duration < capabilities.durationMin) ||
+    (capabilities.durationMax !== null && duration > capabilities.durationMax)
+  ) {
+    throw new AdobeFireflyError(
+      `${model.name} duration must be between ${capabilities.durationMin ?? "?"} and ${capabilities.durationMax ?? "?"} seconds`,
+      400,
+      "invalid_duration"
+    );
+  }
+  return duration;
+}
+
 export function buildAdobeVideoPayload(opts: {
   prompt: string;
   aspectRatio: string;
   duration: number;
-  modelSpec: AdobeFireflyVideoModelSpec;
+  modelSpec: DiscoveredVideoModelSpec;
   resolution?: string;
   seed?: number;
   sourceImageIds?: string[];
+  references?: AdobeFireflyReferenceBlob[];
   negativePrompt?: string;
   generateAudio?: boolean;
 }): Record<string, unknown> {
-  const seedVal = typeof opts.seed === "number" ? opts.seed : Math.floor(Date.now() % 999999);
+  const model = opts.modelSpec;
+  const properties = new Set(model.capabilities.schemaProperties);
   const aspect = opts.aspectRatio === "auto" ? "16:9" : opts.aspectRatio || "16:9";
-  const duration = Math.max(1, Math.min(30, Math.floor(opts.duration || opts.modelSpec.defaultDuration)));
-  const resolution = opts.resolution || opts.modelSpec.defaultResolution;
-  const vidSize = videoSize(aspect, resolution);
-  const engine = opts.modelSpec.engine;
-  const sourceImageIds = opts.sourceImageIds || [];
-  const negative = String(opts.negativePrompt || "");
-
-  if (engine === "veo31-standard" || engine === "veo31-fast") {
-    const payload: Record<string, unknown> = {
-      n: 1,
-      seeds: [seedVal],
-      modelId: "veo",
-      modelVersion:
-        opts.modelSpec.modelVersion ||
-        (engine === "veo31-fast" ? "3.1-fast-generate" : "3.1-generate"),
-      output: { storeInputs: true },
-      prompt: opts.prompt,
-      size: vidSize,
-      generateAudio: opts.generateAudio !== false,
-      referenceBlobs: [] as Array<Record<string, unknown>>,
-      generationMetadata: { module: "text2video" },
-      modelSpecificPayload: {
-        parameters: {
-          durationSeconds: duration,
-          aspectRatio: aspect,
-          addWaterMark: false,
-        },
-      },
-    };
-    if (sourceImageIds.length) {
-      const refs = payload.referenceBlobs as Array<Record<string, unknown>>;
-      if (opts.modelSpec.referenceMode === "image") {
-        for (const imageId of sourceImageIds.slice(0, 3)) {
-          refs.push({ id: String(imageId), usage: "asset" });
-        }
-      } else {
-        sourceImageIds.slice(0, 2).forEach((imageId, idx) => {
-          refs.push({ id: String(imageId), usage: "general", order: idx + 1 });
-        });
-      }
-      payload.generationMetadata = { module: "image2video" };
-    }
-    if (negative) payload.negativePrompt = negative;
-    return payload;
+  if (
+    model.capabilities.supportedAspectRatios.length > 0 &&
+    !model.capabilities.supportedAspectRatios.includes(aspect)
+  ) {
+    throw new AdobeFireflyError(
+      `${model.name} supports aspect ratio(s): ${model.capabilities.supportedAspectRatios.join(", ")}`,
+      400,
+      "invalid_aspect_ratio"
+    );
   }
-
-  if (engine === "kling3") {
-    const payload: Record<string, unknown> = {
-      n: 1,
-      seeds: [seedVal],
-      modelId: "kling",
-      modelVersion: "kling_v3_standard_i2v",
-      output: { storeInputs: true },
-      prompt: opts.prompt,
-      size: vidSize,
-      generationMetadata: {
-        module: sourceImageIds.length ? "image2video" : "text2video",
-      },
-      duration,
-      generationSettings: { aspectRatio: aspect },
-      referenceBlobs: [] as Array<Record<string, unknown>>,
-    };
-    if (sourceImageIds.length) {
-      const refs = payload.referenceBlobs as Array<Record<string, unknown>>;
-      sourceImageIds.slice(0, 2).forEach((imageId, idx) => {
-        refs.push({ id: String(imageId), usage: "frame", order: idx + 1 });
-      });
-    }
-    if (negative) payload.negativePrompt = negative;
-    return payload;
-  }
-
-  // Sora 2 / Sora 2 Pro
-  const promptJson = JSON.stringify({
-    prompt: opts.prompt,
-    duration,
-    ...(negative ? { negative_prompt: negative } : {}),
-  });
+  const duration = validateAdobeDuration(model, opts.duration);
+  const referenceBlobs = normalizeAdobeReferenceBlobs(model, opts.references, opts.sourceImageIds);
+  const seed = typeof opts.seed === "number" ? opts.seed : Math.floor(Date.now() % 999999);
+  const resolution = opts.resolution || model.defaultResolution;
   const payload: Record<string, unknown> = {
-    n: 1,
-    seeds: [seedVal],
-    modelId: "sora",
-    modelVersion: engine === "sora2-pro" ? "sora-2-pro" : "sora-2",
-    size: vidSize,
-    duration,
-    fps: 24,
-    prompt: promptJson,
-    generationMetadata: { module: sourceImageIds.length ? "image2video" : "text2video" },
-    model: opts.modelSpec.upstreamModel,
-    generateLoop: false,
-    transparentBackground: false,
-    seed: String(seedVal),
-    locale: "en-US",
-    camera: { angle: "none", shotSize: "none", motion: null, promptStyle: null },
-    negativePrompt: negative,
-    jobMode: "standard",
-    debugGenerationEndpoint: "",
-    referenceBlobs: [] as Array<Record<string, unknown>>,
-    referenceFrames: [] as Array<Record<string, unknown> | null>,
-    referenceVideo: null,
-    cameraMotionReferenceVideo: null,
-    characterReference: null,
-    editReferenceVideo: null,
-    output: { storeInputs: true },
+    modelId: model.upstreamModelId,
+    modelVersion: model.upstreamModelVersion,
+    prompt: opts.prompt,
+    generationMetadata: {
+      module: referenceBlobs.some((reference) => reference.usage === "frame")
+        ? "image2video"
+        : "text2video",
+    },
   };
-  if (sourceImageIds.length) {
-    const firstId = String(sourceImageIds[0]);
-    payload.referenceBlobs = [{ id: firstId, usage: "general", promptReference: 1 }];
-    const frames: Array<Record<string, unknown> | null> = [{ localBlobRef: firstId }, null];
-    if (sourceImageIds.length > 1) {
-      const lastId = String(sourceImageIds[1]);
-      (payload.referenceBlobs as Array<Record<string, unknown>>).push({
-        id: lastId,
-        usage: "general",
-        promptReference: 2,
-      });
-      frames[1] = { localBlobRef: lastId };
-    }
-    payload.referenceFrames = frames;
-  }
+
+  if (properties.has("n")) payload.n = 1;
+  if (properties.has("seeds")) payload.seeds = [seed];
+  if (properties.has("output")) payload.output = { storeInputs: true };
+  if (properties.has("size")) payload.size = selectAdobeVideoSize(model, aspect, resolution);
+  if (properties.has("duration")) payload.duration = duration;
+  if (properties.has("generationSettings")) payload.generationSettings = { aspectRatio: aspect };
+  if (properties.has("generateAudio")) payload.generateAudio = opts.generateAudio !== false;
+  if (properties.has("modelSpecificPayload")) payload.modelSpecificPayload = {};
+  if (properties.has("referenceBlobs")) payload.referenceBlobs = referenceBlobs;
+  const negativePrompt = String(opts.negativePrompt || "").trim();
+  if (negativePrompt && properties.has("negativePrompt")) payload.negativePrompt = negativePrompt;
   return payload;
 }
 
@@ -1098,7 +949,10 @@ export function buildAdobeUploadHeaders(
     cookie: extras?.cookie,
     prompt: extras?.prompt || "upload",
   });
-  const ct = String(contentType || "image/png").trim().toLowerCase() || "image/png";
+  const ct =
+    String(contentType || "image/png")
+      .trim()
+      .toLowerCase() || "image/png";
   return {
     ...base,
     "content-type": ct.startsWith("image/") ? ct : "image/png",
@@ -1114,7 +968,9 @@ export function extractAdobeSourceImageSources(body: unknown, max = 4): string[]
   if (!body || typeof body !== "object") return [];
   const b = body as Record<string, unknown>;
   const po =
-    b.provider_options && typeof b.provider_options === "object" && !Array.isArray(b.provider_options)
+    b.provider_options &&
+    typeof b.provider_options === "object" &&
+    !Array.isArray(b.provider_options)
       ? (b.provider_options as Record<string, unknown>)
       : {};
 
@@ -1194,6 +1050,49 @@ export function extractAdobeSourceImageSources(body: unknown, max = 4): string[]
   return out.slice(0, max);
 }
 
+export interface AdobeFireflySourceImageReference {
+  source: string;
+  usage?: string;
+  order?: number;
+}
+
+/** Structured extension used when a caller needs style/element/frame semantics. */
+export function extractAdobeSourceImageReferences(
+  body: unknown,
+  max = 4
+): AdobeFireflySourceImageReference[] {
+  const record = body && typeof body === "object" ? (body as Record<string, unknown>) : {};
+  const explicit = record.adobe_reference_inputs ?? record.adobeReferenceInputs;
+  if (Array.isArray(explicit)) {
+    const references: AdobeFireflySourceImageReference[] = [];
+    for (const value of explicit) {
+      if (references.length >= max) break;
+      if (!value || typeof value !== "object") continue;
+      const item = value as Record<string, unknown>;
+      const mediaType = String(item.media_type ?? item.mediaType ?? "image").toLowerCase();
+      if (mediaType !== "image") continue;
+      const source =
+        typeof item.source === "string"
+          ? item.source
+          : typeof item.url === "string"
+            ? item.url
+            : typeof item.image_url === "string"
+              ? item.image_url
+              : "";
+      if (!source.trim()) continue;
+      const usage = String(item.usage ?? item.usage_type ?? item.usageType ?? "").trim();
+      const orderValue = Number(item.order);
+      references.push({
+        source: source.trim(),
+        ...(usage ? { usage } : {}),
+        ...(Number.isInteger(orderValue) && orderValue > 0 ? { order: orderValue } : {}),
+      });
+    }
+    return references;
+  }
+  return extractAdobeSourceImageSources(body, max).map((source) => ({ source }));
+}
+
 export function parseAdobeImageSourceBytes(source: string): {
   buffer: Buffer;
   contentType: string;
@@ -1230,7 +1129,11 @@ export function parseAdobeImageSourceBytes(source: string): {
   }
 
   // Raw base64 without data: prefix
-  if (!/^https?:\/\//i.test(trimmed) && /^[A-Za-z0-9+/=\s]+$/.test(trimmed) && trimmed.length > 64) {
+  if (
+    !/^https?:\/\//i.test(trimmed) &&
+    /^[A-Za-z0-9+/=\s]+$/.test(trimmed) &&
+    trimmed.length > 64
+  ) {
     const buffer = Buffer.from(trimmed.replace(/\s/g, ""), "base64");
     if (buffer.length > 0 && buffer.length <= ADOBE_FIREFLY_MAX_UPLOAD_BYTES) {
       return { buffer, contentType: "image/png" };
@@ -1332,11 +1235,7 @@ export async function uploadAdobeFireflyImage(opts: {
   try {
     json = text ? JSON.parse(text) : {};
   } catch {
-    throw new AdobeFireflyError(
-      "Adobe Firefly image upload returned non-JSON body",
-      502,
-      "upload"
-    );
+    throw new AdobeFireflyError("Adobe Firefly image upload returned non-JSON body", 502, "upload");
   }
   const id = parseAdobeStorageUploadResponse(json);
   if (!id) {
@@ -1365,7 +1264,7 @@ export async function resolveAdobeSourceImageIds(opts: {
   fetchImpl?: typeof fetch;
   log?: { info?: (...args: unknown[]) => void; error?: (...args: unknown[]) => void };
 }): Promise<string[]> {
-  const max = Math.max(1, Math.min(8, opts.max ?? 4));
+  const max = Math.max(1, Math.min(32, opts.max ?? 4));
   const sources = extractAdobeSourceImageSources(opts.body, max);
   if (!sources.length) return [];
 
@@ -1421,6 +1320,31 @@ export async function resolveAdobeSourceImageIds(opts: {
   return ids;
 }
 
+export async function resolveAdobeSourceImageReferences(opts: {
+  accessToken: string;
+  body: unknown;
+  max?: number;
+  sessionCookie?: string;
+  prompt?: string;
+  fetchImpl?: typeof fetch;
+  log?: { info?: (...args: unknown[]) => void; error?: (...args: unknown[]) => void };
+}): Promise<AdobeFireflyReferenceBlob[]> {
+  const max = Math.max(1, Math.min(32, opts.max ?? 4));
+  const references = extractAdobeSourceImageReferences(opts.body, max);
+  if (references.length === 0) return [];
+  const ids = await resolveAdobeSourceImageIds({
+    ...opts,
+    max,
+    body: { images: references.map((reference) => reference.source) },
+  });
+  return ids.map((id, index) => ({
+    id,
+    mediaType: "image",
+    ...(references[index]?.usage ? { usage: references[index].usage } : {}),
+    ...(references[index]?.order ? { order: references[index].order } : {}),
+  }));
+}
+
 /** Transient Adobe 3P overload / rate / edge errors worth retrying. */
 export function isAdobeTransientSubmitError(status: number, bodyText: string): boolean {
   if (status === 408 || status === 429 || status === 502 || status === 503 || status === 504) {
@@ -1500,7 +1424,8 @@ export function extractAdobeResultLink(
   if (override) return override;
 
   const data = body && typeof body === "object" ? (body as Record<string, unknown>) : {};
-  const links = data.links && typeof data.links === "object" ? (data.links as Record<string, unknown>) : {};
+  const links =
+    data.links && typeof data.links === "object" ? (data.links as Record<string, unknown>) : {};
   const result = links.result;
   if (typeof result === "string" && result) return result;
   if (result && typeof result === "object") {
@@ -1531,9 +1456,7 @@ export function normalizeAdobePollUrl(rawUrl: string): string {
 
     const path = parsed.pathname || "";
     const isJobPath =
-      path.includes("/jobs/result/") ||
-      path.includes("/v2/status") ||
-      path.includes("/status/");
+      path.includes("/jobs/result/") || path.includes("/v2/status") || path.includes("/status/");
     if (!isJobPath) return url;
 
     const jobId = path.split("/").filter(Boolean).pop() || "";
@@ -1548,14 +1471,12 @@ export function normalizeAdobePollUrl(rawUrl: string): string {
   }
 }
 
-export function extractAdobeMediaUrl(
-  latest: unknown,
-  kind: "image" | "video"
-): string | null {
+export function extractAdobeMediaUrl(latest: unknown, kind: "image" | "video"): string | null {
   const body = latest && typeof latest === "object" ? (latest as Record<string, unknown>) : {};
   const outputs = Array.isArray(body.outputs) ? body.outputs : [];
   if (outputs.length > 0) {
-    const first = outputs[0] && typeof outputs[0] === "object" ? (outputs[0] as Record<string, unknown>) : {};
+    const first =
+      outputs[0] && typeof outputs[0] === "object" ? (outputs[0] as Record<string, unknown>) : {};
     const media =
       kind === "image"
         ? first.image && typeof first.image === "object"
@@ -1569,7 +1490,10 @@ export function extractAdobeMediaUrl(
   }
 
   // Fallback recursive search for a presigned URL.
-  const found = findPresignedUrl(latest, kind === "image" ? [".png", ".jpg", ".jpeg", ".webp"] : [".mp4", ".webm"]);
+  const found = findPresignedUrl(
+    latest,
+    kind === "image" ? [".png", ".jpg", ".jpeg", ".webp"] : [".mp4", ".webm"]
+  );
   return found;
 }
 
@@ -1577,7 +1501,12 @@ function findPresignedUrl(obj: unknown, exts: string[]): string | null {
   if (!obj) return null;
   if (typeof obj === "string") {
     const s = obj.trim();
-    if (/^https?:\/\//i.test(s) && (exts.some((e) => s.toLowerCase().includes(e)) || s.includes("presigned") || s.includes("X-Amz"))) {
+    if (
+      /^https?:\/\//i.test(s) &&
+      (exts.some((e) => s.toLowerCase().includes(e)) ||
+        s.includes("presigned") ||
+        s.includes("X-Amz"))
+    ) {
       return s;
     }
     return null;
@@ -1791,7 +1720,11 @@ export async function resolveAdobeAccessToken(
     | {
         apiKey?: string;
         accessToken?: string;
-        providerSpecificData?: { cookie?: unknown; access_token?: unknown; accessToken?: unknown } | null;
+        providerSpecificData?: {
+          cookie?: unknown;
+          access_token?: unknown;
+          accessToken?: unknown;
+        } | null;
       }
     | null
     | undefined,
@@ -1949,67 +1882,21 @@ export async function fetchAdobeCreditsBalance(
 
 // ── Models discovery ────────────────────────────────────────────────────────
 
-export interface AdobeFireflyDiscoveredModel {
-  modelId: string;
-  modelVersion: string;
-  displayName: string;
-  modality: "image" | "video" | "audio" | "unknown";
-  enabled: boolean;
-  healthStatus?: string;
-}
-
-/**
- * Parse POST /v2/models/discovery response into flat model/version rows.
- */
-export function parseAdobeModelsDiscovery(body: unknown): AdobeFireflyDiscoveredModel[] {
-  const root = body && typeof body === "object" ? (body as Record<string, unknown>) : {};
-  const models = Array.isArray(root.models) ? root.models : [];
-  const out: AdobeFireflyDiscoveredModel[] = [];
-
-  for (const m of models) {
-    if (!m || typeof m !== "object") continue;
-    const rec = m as Record<string, unknown>;
-    const modelId = String(rec.modelId || "").trim();
-    if (!modelId) continue;
-    const versions =
-      rec.modelVersions && typeof rec.modelVersions === "object"
-        ? (rec.modelVersions as Record<string, unknown>)
-        : {};
-    for (const [ver, spec] of Object.entries(versions)) {
-      if (!spec || typeof spec !== "object") continue;
-      const s = spec as Record<string, unknown>;
-      if (s.enabled === false) continue;
-      const mods = Array.isArray(s.outputModality)
-        ? s.outputModality.map((x) => String(x).toLowerCase())
-        : [];
-      let modality: AdobeFireflyDiscoveredModel["modality"] = "unknown";
-      if (mods.includes("image")) modality = "image";
-      else if (mods.includes("video")) modality = "video";
-      else if (mods.includes("audio")) modality = "audio";
-      out.push({
-        modelId,
-        modelVersion: ver,
-        displayName: String(s.modelDisplayName || s.modelCaiDisplayName || ver),
-        modality,
-        enabled: s.enabled !== false,
-        healthStatus: typeof s.healthStatus === "string" ? s.healthStatus : undefined,
-      });
-    }
-  }
-  return out;
-}
-
 export async function discoverAdobeFireflyModels(
   accessToken: string,
   fetchImpl: typeof fetch = fetch
-): Promise<AdobeFireflyDiscoveredModel[]> {
+) {
   const resp = await fetchImpl(ADOBE_FIREFLY_MODELS_DISCOVERY_URL, {
     method: "POST",
     headers: buildAdobeDiscoveryHeaders(accessToken),
     body: JSON.stringify({ filters: { resolveSchema: true } }),
   });
   if (resp.status === 401 || resp.status === 403) {
-    throw new AdobeFireflyError("Adobe Firefly model discovery: token invalid or expired", 401, "auth");
+    throw new AdobeFireflyError(
+      "Adobe Firefly model discovery: token invalid or expired",
+      401,
+      "auth"
+    );
   }
   if (!resp.ok) {
     const text = await resp.text().catch(() => "");
@@ -2037,7 +1924,8 @@ export async function pollAdobeJob(opts: {
 }): Promise<{ mediaUrl: string; latest: unknown }> {
   const fetchImpl = opts.fetchImpl || fetch;
   const deadline = Date.now() + opts.timeoutMs;
-  const interval = opts.pollIntervalMs && opts.pollIntervalMs > 0 ? opts.pollIntervalMs : DEFAULT_POLL_INTERVAL_MS;
+  const interval =
+    opts.pollIntervalMs && opts.pollIntervalMs > 0 ? opts.pollIntervalMs : DEFAULT_POLL_INTERVAL_MS;
   let attempt = 0;
   let latest: unknown = {};
 
@@ -2051,7 +1939,11 @@ export async function pollAdobeJob(opts: {
     if (pollResp.status === 401 || pollResp.status === 403) {
       const accessError = pollResp.headers.get("x-access-error") || "";
       if (accessError === "taste_exhausted") {
-        throw new AdobeFireflyError("Adobe Firefly quota exhausted for this account", 429, "quota_exhausted");
+        throw new AdobeFireflyError(
+          "Adobe Firefly quota exhausted for this account",
+          429,
+          "quota_exhausted"
+        );
       }
       throw new AdobeFireflyError("Adobe Firefly token invalid or expired", 401, "auth");
     }
@@ -2096,7 +1988,10 @@ export async function pollAdobeJob(opts: {
       );
     }
 
-    opts.log?.info?.("ADOBE-FIREFLY", `${opts.kind} pending #${attempt} status=${statusVal || "unknown"}`);
+    opts.log?.info?.(
+      "ADOBE-FIREFLY",
+      `${opts.kind} pending #${attempt} status=${statusVal || "unknown"}`
+    );
     await sleep(interval);
   }
 
@@ -2118,6 +2013,7 @@ export async function adobeFireflyGenerateImage(opts: {
   quality?: unknown;
   seed?: number;
   sourceImageIds?: string[];
+  references?: AdobeFireflyReferenceBlob[];
   negativePrompt?: string;
   /** Optional Cookie blob — used only to lift sherlockToken → x-arp-session-id */
   sessionCookie?: string;
@@ -2137,6 +2033,7 @@ export async function adobeFireflyGenerateImage(opts: {
     quality: opts.quality,
     seed: opts.seed,
     sourceImageIds: opts.sourceImageIds,
+    references: opts.references,
     negativePrompt: opts.negativePrompt,
   });
 
@@ -2165,7 +2062,11 @@ export async function adobeFireflyGenerateImage(opts: {
     if (submitResp.status === 401 || submitResp.status === 403) {
       const accessError = submitResp.headers.get("x-access-error") || "";
       if (accessError === "taste_exhausted") {
-        throw new AdobeFireflyError("Adobe Firefly quota exhausted for this account", 429, "quota_exhausted");
+        throw new AdobeFireflyError(
+          "Adobe Firefly quota exhausted for this account",
+          429,
+          "quota_exhausted"
+        );
       }
       throw new AdobeFireflyError(
         "Adobe Firefly token invalid or expired. Paste a fresh IMS JWT (Authorization: Bearer on firefly-3p), not page cookies alone.",
@@ -2228,7 +2129,7 @@ export async function adobeFireflyGenerateImage(opts: {
 
   const pollTimeoutMs = adobeFireflyImageTimeoutMs({
     timeoutMs: opts.timeoutMs,
-    refCount: opts.sourceImageIds?.length ?? 0,
+    refCount: opts.references?.length ?? opts.sourceImageIds?.length ?? 0,
   });
   const { mediaUrl, latest } = await pollAdobeJob({
     pollUrl,
@@ -2253,6 +2154,7 @@ export async function adobeFireflyGenerateVideo(opts: {
   resolution?: unknown;
   seed?: number;
   sourceImageIds?: string[];
+  references?: AdobeFireflyReferenceBlob[];
   negativePrompt?: string;
   generateAudio?: boolean;
   sessionCookie?: string;
@@ -2284,6 +2186,7 @@ export async function adobeFireflyGenerateVideo(opts: {
     resolution,
     seed: opts.seed,
     sourceImageIds: opts.sourceImageIds,
+    references: opts.references,
     negativePrompt: opts.negativePrompt,
     generateAudio: opts.generateAudio,
   });
@@ -2311,7 +2214,11 @@ export async function adobeFireflyGenerateVideo(opts: {
     if (submitResp.status === 401 || submitResp.status === 403) {
       const accessError = submitResp.headers.get("x-access-error") || "";
       if (accessError === "taste_exhausted") {
-        throw new AdobeFireflyError("Adobe Firefly quota exhausted for this account", 429, "quota_exhausted");
+        throw new AdobeFireflyError(
+          "Adobe Firefly quota exhausted for this account",
+          429,
+          "quota_exhausted"
+        );
       }
       throw new AdobeFireflyError(
         "Adobe Firefly token invalid or expired. Paste a fresh IMS JWT (Authorization: Bearer on firefly-3p), not page cookies alone.",
diff --git a/open-sse/services/adobeFireflyModelSnapshot.ts b/open-sse/services/adobeFireflyModelSnapshot.ts
new file mode 100644
index 0000000000..98514877f8
--- /dev/null
+++ b/open-sse/services/adobeFireflyModelSnapshot.ts
@@ -0,0 +1,8 @@
+/**
+ * Generated from Adobe Firefly POST /v2/models/discovery with resolveSchema=true.
+ * Source SHA-256: 74d7970aaab36f0484ef91133af312f825ac09fd066d7622d7afd3184eb393a9
+ * Regenerate with scripts/dev/generate-adobe-firefly-snapshot.mjs; do not edit by hand.
+ * The generated literal stays compact to satisfy the repository's line-count gate.
+ */
+// prettier-ignore
+export const ADOBE_FIREFLY_DISCOVERY_SNAPSHOT = [{"id":"flux-2","name":"Flux 2","modality":"image","upstreamModelId":"flux","upstreamModelVersion":"2","providerName":"Black Forest Labs","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":4,"maxFileSizeBytes":104857600}],"maxReferenceItems":4,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:flux_2_pro"},{"id":"flux-fluxpro","name":"Flux 1.1 Pro","modality":"image","upstreamModelId":"flux","upstreamModelVersion":"fluxPro","providerName":"Black Forest Labs","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"style","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":4,"supportedSizes":["1024x768","1440x1440","768x1024","576x1024","1024x576"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefall_3p:external:flux_1.1"},{"id":"flux-fluxultra","name":"Flux 1.1 Ultra","modality":"image","upstreamModelId":"flux","upstreamModelVersion":"fluxUltra","providerName":"Black Forest Labs","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"style","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":4,"supportedSizes":["1024x768","1440x1440","768x1024","576x1024","1024x576"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefall_3p:external:flux_pro_ultra1.1"},{"id":"flux-fluxkontextpro","name":"Flux Kontext Pro","modality":"image","upstreamModelId":"flux","upstreamModelVersion":"fluxKontextPro","providerName":"Black Forest Labs","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":4,"maxFileSizeBytes":104857600}],"maxReferenceItems":4,"supportedSizes":["1024x768","1440x1440","768x1024","576x1024","1024x576"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:flux_kontext_pro"},{"id":"flux-flex-2","name":"Flux 2 Flex","modality":"image","upstreamModelId":"flux","upstreamModelVersion":"flex-2","providerName":"Black Forest Labs","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":4,"maxFileSizeBytes":104857600}],"maxReferenceItems":4,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:flux_2"},{"id":"flux-fluxpro-2","name":"Flux 2 Pro","modality":"image","upstreamModelId":"flux","upstreamModelVersion":"fluxPro-2","providerName":"Black Forest Labs","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":4,"maxFileSizeBytes":104857600}],"maxReferenceItems":4,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:flux_2_pro"},{"id":"flux-fluxkontextmax","name":"Flux Kontext Max","modality":"image","upstreamModelId":"flux","upstreamModelVersion":"fluxKontextMax","providerName":"Black Forest Labs","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":4,"maxFileSizeBytes":104857600}],"maxReferenceItems":4,"supportedSizes":["1024x768","1440x1440","768x1024","576x1024","1024x576"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:flux_kontext_max"},{"id":"flux-fluxfillpro","name":"Flux 1.1 Pro Fill","modality":"image","upstreamModelId":"flux","upstreamModelVersion":"fluxFillPro","providerName":"Black Forest Labs","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["inpainting"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"mask","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":4,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:flux_bagel"},{"id":"seedream-seedream-v4","name":"Seedream 4.0","modality":"image","upstreamModelId":"seedream","upstreamModelVersion":"seedream_v4","providerName":"ByteDance","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":1,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":4,"promptMaxLength":2000,"backingModel":"firefly_3p:external:seedream_v4"},{"id":"seedream-seedream-v5-lite","name":"Seedream 5.0 Lite","modality":"image","upstreamModelId":"seedream","upstreamModelVersion":"seedream_v5_lite","providerName":"ByteDance","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","n","modelSpecificPayload","generationMetadata","output","size","generationSettings","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":10,"maxFileSizeBytes":104857600}],"maxReferenceItems":10,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":4,"promptMaxLength":2000,"backingModel":"firefly_3p:external:seedream_v5_lite"},{"id":"kling-kling-v3","name":"Kling Video v3","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_v3","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["editing"],"schemaProperties":["modelId","modelVersion","prompt","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760}],"maxReferenceItems":5,"supportedSizes":[],"supportedAspectRatios":["16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_v3_ti2v"},{"id":"kling-kling-v3-v2v-edit","name":"Kling Video V3 V2V Edit","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_v3_v2v_edit","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["editing","style_reference"],"schemaProperties":["modelId","modelVersion","prompt","modelSpecificPayload","generationMetadata","output","size","keepAudio","characterOrientation","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"style","minItems":1,"maxItems":1,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":1,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":1,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_v3_v2v_edit"},{"id":"kling-kling-o3","name":"Kling Video O3","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_v3_omni","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["editing","style_reference"],"schemaProperties":["modelId","modelVersion","prompt","modelSpecificPayload","generationMetadata","output","size","generationSettings","generateAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":["16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_tir2v"},{"id":"kling-kling-o3-v2v-create","name":"Kling Video O3 V2V Create","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_v3_omni_v2v_create","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["editing","style_reference"],"schemaProperties":["modelId","modelVersion","prompt","modelSpecificPayload","generationMetadata","output","size","generationSettings","keepAudio","duration","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":1,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":["auto","16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_v2v_create"},{"id":"kling-kling-o3-v2v-edit","name":"Kling Video O3 V2V Edit","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_v3_omni_v2v_edit","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["editing","style_reference"],"schemaProperties":["modelId","modelVersion","prompt","modelSpecificPayload","generationMetadata","output","size","keepAudio","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":1,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_v2v_edit"},{"id":"kling-kling-v2-5-turbo-pro-i2v","name":"Kling Video 2.5 Turbo","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_v2_5_turbo_pro_i2v","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[5,10],"durationMin":null,"durationMax":null,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_v2_5_turbo_pro"},{"id":"kling-kling-v3-standard-t2v","name":"Kling Video v3 Standard Text to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_v3_standard_t2v","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":[],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":["16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_v3_ti2v"},{"id":"kling-kling-v3-standard-i2v","name":"Kling Video v3 Standard Image to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_v3_standard_i2v","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_v3_ti2v"},{"id":"kling-kling-v3-pro-t2v","name":"Kling Video v3 Pro Text to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_v3_pro_t2v","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":[],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":["16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_v3_ti2v"},{"id":"kling-kling-v3-pro-i2v","name":"Kling Video v3 Pro Image to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_v3_pro_i2v","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_v3_ti2v"},{"id":"kling-kling-o3-pro-t2v","name":"Kling Video O3 Pro Text to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_o3_pro_t2v","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":[],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":["16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_ti2v"},{"id":"kling-kling-o3-pro-i2v","name":"Kling Video O3 Pro Image to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_o3_pro_i2v","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_ti2v"},{"id":"kling-kling-o3-pro-reference-to-video","name":"Kling Video O3 Pro Reference to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_o3_pro_reference_to_video","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":["16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_r2v"},{"id":"kling-kling-o3-pro-v2v-reference","name":"Kling Video O3 Pro Reference Video to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_o3_pro_v2v_reference","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":4,"supportedSizes":[],"supportedAspectRatios":["auto","16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_v2v"},{"id":"kling-kling-o3-pro-v2v-edit","name":"Kling Video O3 Pro Edit Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_o3_pro_v2v_edit","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":4,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_v2v"},{"id":"kling-kling-o3-standard-t2v","name":"Kling Video O3 Standard Text to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_o3_standard_t2v","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":[],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":["16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_ti2v"},{"id":"kling-kling-o3-standard-i2v","name":"Kling Video O3 Standard Image to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_o3_standard_i2v","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_ti2v"},{"id":"kling-kling-o3-standard-reference-to-video","name":"Kling Video O3 Standard Reference to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_o3_standard_reference_to_video","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":["16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_r2v"},{"id":"kling-kling-o3-standard-v2v-reference","name":"Kling Video O3 Standard Reference Video to Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_o3_standard_v2v_reference","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":4,"supportedSizes":[],"supportedAspectRatios":["auto","16:9","9:16","1:1"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_v2v"},{"id":"kling-kling-o3-standard-v2v-edit","name":"Kling Video O3 Standard Edit Video","modality":"video","upstreamModelId":"kling","upstreamModelVersion":"kling_o3_standard_v2v_edit","providerName":"Kuaishou","releaseReadiness":"alpha","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","negativePrompt","promptAdherence","output","size","generationSettings","generateAudio","keepAudio","duration","multiPrompt","shotType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":3,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":209715200}],"maxReferenceItems":4,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":15,"durationDefault":5,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:kling_o3_v2v"},{"id":"gemini-flash-nano-banana","name":"Gemini 2.5 (Nano Banana)","modality":"image","upstreamModelId":"gemini-flash","upstreamModelVersion":"nano-banana","providerName":"Google","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","resolution","generationSettings","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"general","minItems":0,"maxItems":4,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":4,"maxFileSizeBytes":104857600}],"maxReferenceItems":4,"supportedSizes":["1024x1024","1536x672","896x1152","1152x896","1248x832","832x1248","864x1184","1184x864","768x1344","1344x768"],"supportedAspectRatios":["1:1","3:2","2:3","3:4","4:3","4:5","5:4","9:16","16:9","21:9"],"supportedResolutions":["1K"],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":131000,"backingModel":"firefly_3p:external:gemini_flash"},{"id":"gemini-flash-nano-banana-2","name":"Gemini 3.0 (Nano Banana Pro)","modality":"image","upstreamModelId":"gemini-flash","upstreamModelVersion":"nano-banana-2","providerName":"Google","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","resolution","generationSettings","groundSearch","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"general","minItems":0,"maxItems":14,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":14,"maxFileSizeBytes":104857600}],"maxReferenceItems":14,"supportedSizes":["1024x1024","1264x848","848x1264","1200x896","896x1200","1152x928","928x1152","768x1376","1376x768","1584x672","2048x2048","2528x1696","1696x2528","2400x1792","1792x2400","2304x1856","1856x2304","1536x2752","2752x1536","3168x1344","4096x4096","5056x3392","3392x5056","4800x3584","3584x4800","4608x3712","3712x4608","3072x5504","5504x3072","6336x2688"],"supportedAspectRatios":["1:1","3:2","2:3","3:4","4:3","4:5","5:4","9:16","16:9","21:9"],"supportedResolutions":["1K","2K","4K"],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":262000,"backingModel":"firefly_3p:external:gemini_flash_2"},{"id":"gemini-flash-nano-banana-3","name":"Gemini 3.1 (with Nano Banana 2)","modality":"image","upstreamModelId":"gemini-flash","upstreamModelVersion":"nano-banana-3","providerName":"Google","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","resolution","generationSettings","groundSearch","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"general","minItems":0,"maxItems":14,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":14,"maxFileSizeBytes":104857600}],"maxReferenceItems":14,"supportedSizes":["512x512","1024x1024","1264x848","848x1264","1200x896","896x1200","1152x928","928x1152","768x1376","1376x768","1584x672","2048x2048","2528x1696","1696x2528","2400x1792","1792x2400","2304x1856","1856x2304","1536x2752","2752x1536","3168x1344","4096x4096","5056x3392","3392x5056","4800x3584","3584x4800","4608x3712","3712x4608","3072x5504","5504x3072","6336x2688"],"supportedAspectRatios":["1:1","3:2","2:3","3:4","4:3","4:5","5:4","9:16","16:9","21:9","1:8","8:1","1:4","4:1"],"supportedResolutions":["512","1K","2K","4K"],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":524000,"backingModel":"firefly_3p:external:nano_banana_3"},{"id":"gemini-omni-omni-flash","name":"Gemini Omni Flash","modality":"video","upstreamModelId":"gemini-omni","upstreamModelVersion":"omni-flash","providerName":"Google","releaseReadiness":"beta","healthStatus":"CRITICAL","inputMediaUseCases":["style_reference","editing"],"schemaProperties":["modelId","modelVersion","prompt","n","generationMetadata","output","generationSettings","duration","referenceBlobs"],"requiredProperties":["duration","generationMetadata","modelId","prompt"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":4,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":104857600},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":4,"supportedSizes":[],"supportedAspectRatios":["16:9","9:16"],"supportedResolutions":[],"supportedDurations":[],"durationMin":3,"durationMax":10,"durationDefault":null,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:gemini_omni_flash"},{"id":"veo-3.1-generate","name":"Veo 3.1","modality":"video","upstreamModelId":"veo","upstreamModelVersion":"3.1-generate","providerName":"Google","releaseReadiness":"ga","healthStatus":"CRITICAL","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","generateAudio","duration","generationType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"subject","minItems":0,"maxItems":3,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":104857600}],"maxReferenceItems":3,"supportedSizes":["1280x720","720x1280","1920x1080","1080x1920"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[4,6,8],"durationMin":null,"durationMax":null,"durationDefault":8,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":20000,"backingModel":"firefly_3p:external:veo_3"},{"id":"veo-3.1-fast-generate","name":"Veo 3.1 Fast","modality":"video","upstreamModelId":"veo","upstreamModelVersion":"3.1-fast-generate","providerName":"Google","releaseReadiness":"ga","healthStatus":"DEGRADED","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","generateAudio","duration","generationType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"subject","minItems":0,"maxItems":3,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":3,"maxFileSizeBytes":104857600}],"maxReferenceItems":3,"supportedSizes":["1280x720","720x1280","1920x1080","1080x1920"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[4,6,8],"durationMin":null,"durationMax":null,"durationDefault":8,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":20000,"backingModel":"firefly_3p:external:veo_3_fast"},{"id":"veo-3.1-lite-generate","name":"Veo 3.1 Lite","modality":"video","upstreamModelId":"veo","upstreamModelVersion":"3.1-lite-generate","providerName":"Google","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","generateAudio","duration","generationType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":104857600}],"maxReferenceItems":null,"supportedSizes":["1280x720","720x1280","1920x1080","1080x1920"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[4,6,8],"durationMin":null,"durationMax":null,"durationDefault":8,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":20000,"backingModel":"firefly_3p:external:veo_3_1_lite"},{"id":"luma-2.0-ray","name":"Ray2","modality":"video","upstreamModelId":"luma","upstreamModelVersion":"2.0-ray","providerName":"Luma","releaseReadiness":"ga","healthStatus":"DEGRADED","inputMediaUseCases":["style_reference","editing","reframing"],"schemaProperties":["modelId","modelVersion","prompt","n","modelSpecificPayload","generationMetadata","output","size","duration","mode","generationType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":3,"supportedSizes":["960x540","540x960","540x540","720x540","540x720","1260x540","540x1260","1280x720","720x1280","720x720","960x720","720x960","1680x720","720x1680","1920x1080","1080x1920","1080x1080","1440x1080","1080x1440","2520x1080","1080x2520","3840x2160","2160x3840","2160x2160","2880x2160","2160x2880","5040x2160","2160x5040"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[5,9],"durationMin":null,"durationMax":null,"durationDefault":5,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:luma"},{"id":"luma-2.0-ray-flash","name":"Ray2 Flash","modality":"video","upstreamModelId":"luma","upstreamModelVersion":"2.0-ray-flash","providerName":"Luma","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference","editing","reframing"],"schemaProperties":["modelId","modelVersion","prompt","n","modelSpecificPayload","generationMetadata","output","size","duration","mode","generationType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":3,"supportedSizes":["960x540","540x960","540x540","720x540","540x720","1260x540","540x1260","1280x720","720x1280","720x720","960x720","720x960","1680x720","720x1680","1920x1080","1080x1920","1080x1080","1440x1080","1080x1440","2520x1080","1080x2520","3840x2160","2160x3840","2160x2160","2880x2160","2160x2880","5040x2160","2160x5040"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[5,9],"durationMin":null,"durationMax":null,"durationDefault":5,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:luma_flash"},{"id":"luma-3.0-ray","name":"Ray3","modality":"video","upstreamModelId":"luma","upstreamModelVersion":"3.0-ray","providerName":"Luma","releaseReadiness":"ga","healthStatus":"DEGRADED","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","modelSpecificPayload","generationMetadata","output","size","duration","mode","generationType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"image","usageType":"subject","minItems":0,"maxItems":1,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":3,"supportedSizes":["640x360","360x640","360x360","480x360","360x480","840x360","360x840","960x540","540x960","540x540","720x540","540x720","1260x540","540x1260","1280x720","720x1280","720x720","960x720","720x960","1680x720","720x1680","1920x1080","1080x1920","1080x1080","1440x1080","1080x1440","2520x1080","1080x2520","3840x2160","2160x3840","2160x2160","2880x2160","2160x2880","5040x2160","2160x5040"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[5,10],"durationMin":null,"durationMax":null,"durationDefault":5,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:luma_ray_3"},{"id":"luma-3.0-ray-hdr","name":"Ray3 HDR","modality":"video","upstreamModelId":"luma","upstreamModelVersion":"3.0-ray-hdr","providerName":"Luma","releaseReadiness":"ga","healthStatus":"DEGRADED","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","modelSpecificPayload","generationMetadata","output","size","duration","mode","generationType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":3,"supportedSizes":["640x360","360x640","360x360","480x360","360x480","840x360","360x840","960x540","540x960","540x540","720x540","540x720","1260x540","540x1260","1280x720","720x1280","720x720","960x720","720x960","1680x720","720x1680","1920x1080","1080x1920","1080x1080","1440x1080","1080x1440","2520x1080","1080x2520","3840x2160","2160x3840","2160x2160","2880x2160","2160x2880","5040x2160","2160x5040"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[5],"durationMin":null,"durationMax":null,"durationDefault":5,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:luma_ray_hdr_3"},{"id":"luma-3.14-ray","name":"Ray3.14","modality":"video","upstreamModelId":"luma","upstreamModelVersion":"3.14-ray","providerName":"Luma","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","modelSpecificPayload","generationMetadata","output","size","duration","mode","generationType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":3,"supportedSizes":["1280x720","720x1280","720x720","960x720","720x960","1680x720","720x1680","1920x1080","1080x1920","1080x1080","1440x1080","1080x1440","2520x1080","1080x2520","3840x2160","2160x3840","2160x2160","2880x2160","2160x2880","5040x2160","2160x5040"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[5,10],"durationMin":null,"durationMax":null,"durationDefault":5,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:luma_ray_3_14"},{"id":"luma-3.14-ray-hdr","name":"Ray3.14 HDR","modality":"video","upstreamModelId":"luma","upstreamModelVersion":"3.14-ray-hdr","providerName":"Luma","releaseReadiness":"ga","healthStatus":"DEGRADED","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","modelSpecificPayload","generationMetadata","output","size","duration","mode","generationType","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":10485760},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600}],"maxReferenceItems":3,"supportedSizes":["1280x720","720x1280","720x720","960x720","720x960","1680x720","720x1680","1920x1080","1080x1920","1080x1080","1440x1080","1080x1440","2520x1080","1080x2520","3840x2160","2160x3840","2160x2160","2880x2160","2160x2880","5040x2160","2160x5040"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[5],"durationMin":null,"durationMax":null,"durationDefault":5,"outputCountMin":1,"outputCountMax":1,"promptMaxLength":5000,"backingModel":"firefly_3p:external:luma_ray_hdr_3_14"},{"id":"gpt-4o-image","name":"GPT Image","modality":"image","upstreamModelId":"gpt-4o-image","upstreamModelVersion":"default","providerName":"OpenAI","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["editing","inpainting","style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","modelSpecificPayload","generationMetadata","output","size","generationSettings","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":16,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"mask","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":16,"maxFileSizeBytes":104857600}],"maxReferenceItems":17,"supportedSizes":["1024x1024","1536x1024","1024x1536"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":32000,"backingModel":"firefall_3p:external:gpt4o"},{"id":"gpt-image-2","name":"GPT Image 2","modality":"image","upstreamModelId":"gpt-image","upstreamModelVersion":"2","providerName":"OpenAI","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["editing","inpainting","style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","modelSpecificPayload","generationMetadata","output","size","generationSettings","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":16,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"mask","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":16,"maxFileSizeBytes":104857600}],"maxReferenceItems":17,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":32000,"backingModel":"firefly_3p:external:gpt_image_2"},{"id":"gpt-image-1.5","name":"GPT Image 1.5","modality":"image","upstreamModelId":"gpt-image","upstreamModelVersion":"1.5","providerName":"OpenAI","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["editing","inpainting","style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","modelSpecificPayload","generationMetadata","output","size","generationSettings","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"source","minItems":0,"maxItems":16,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"mask","minItems":0,"maxItems":1,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":16,"maxFileSizeBytes":104857600}],"maxReferenceItems":17,"supportedSizes":["1024x1024","1536x1024","1024x1536"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":32000,"backingModel":"firefly_3p:external:gpt_image_1_5"},{"id":"runway-gen4-image","name":"Runway Gen-4 Image","modality":"image","upstreamModelId":"runway","upstreamModelVersion":"gen4_image","providerName":"Runway","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","n","seeds","modelSpecificPayload","generationMetadata","output","size","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"general","minItems":0,"maxItems":null,"maxFileSizeBytes":104857600}],"maxReferenceItems":null,"supportedSizes":["1920x1080","1080x1920","1024x1024","1360x768","1080x1080","1168x880","1440x1080","1080x1440","1808x768","2112x912"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":null,"durationMax":null,"durationDefault":null,"outputCountMin":1,"outputCountMax":4,"promptMaxLength":1000,"backingModel":"firefly_3p:external:runway_gen4_image"},{"id":"runway-gen4-turbo","name":"Runway Gen-4 Video","modality":"video","upstreamModelId":"runway","upstreamModelVersion":"gen4_turbo","providerName":"Runway","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","output","size","duration","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":1,"maxFileSizeBytes":16777216}],"maxReferenceItems":null,"supportedSizes":["1280x720","720x1280","1104x832","832x1104","960x960","1584x672"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[5,10],"durationMin":null,"durationMax":null,"durationDefault":10,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":1000,"backingModel":"firefly_3p:external:runway_gen4_video_turbo"},{"id":"runway-gen4.5","name":"Runway Gen-4.5 Video","modality":"video","upstreamModelId":"runway","upstreamModelVersion":"gen4.5","providerName":"Runway","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["style_reference"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","output","size","duration","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":1,"maxFileSizeBytes":16777216},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":1,"maxFileSizeBytes":16777216}],"maxReferenceItems":1,"supportedSizes":["1280x720","720x1280","1104x832","832x1104","960x960","1584x672"],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[5,8,10],"durationMin":null,"durationMax":null,"durationDefault":10,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":1000,"backingModel":"firefly_3p:external:runway_gen4_5_video"},{"id":"runway-aleph-2","name":"Runway Aleph 2","modality":"video","upstreamModelId":"runway","upstreamModelVersion":"aleph_2","providerName":"Runway","releaseReadiness":"ga","healthStatus":"HEALTHY","inputMediaUseCases":["editing"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","output","size","duration","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"video","usageType":"source","minItems":1,"maxItems":1,"maxFileSizeBytes":33554432},{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":1,"maxFileSizeBytes":16777216}],"maxReferenceItems":null,"supportedSizes":[],"supportedAspectRatios":[],"supportedResolutions":[],"supportedDurations":[],"durationMin":2,"durationMax":10,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":1000,"backingModel":"firefly_3p:external:runway_video_aleph_2"},{"id":"seedance-seedance-2.0","name":"Seedance 2.0","modality":"video","upstreamModelId":"seedance","upstreamModelVersion":"seedance_2.0","providerName":"ByteDance","releaseReadiness":"alpha","healthStatus":"CRITICAL","inputMediaUseCases":["editing","style_reference"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","output","size","generationSettings","generateAudio","duration","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":9,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":9,"maxFileSizeBytes":104857600},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":3,"maxFileSizeBytes":52428800},{"mediaType":"audio","usageType":"source","minItems":0,"maxItems":3,"maxFileSizeBytes":52428800}],"maxReferenceItems":9,"supportedSizes":["1920x1080","1280x720","640x480"],"supportedAspectRatios":["auto","21:9","16:9","4:3","1:1","3:4","9:16"],"supportedResolutions":[],"supportedDurations":[],"durationMin":4,"durationMax":15,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:seedance_2_0"},{"id":"seedance-seedance-2.0-fast","name":"Seedance 2.0 Fast","modality":"video","upstreamModelId":"seedance","upstreamModelVersion":"seedance_2.0_fast","providerName":"ByteDance","releaseReadiness":"alpha","healthStatus":"DEGRADED","inputMediaUseCases":["editing","style_reference"],"schemaProperties":["modelId","modelVersion","prompt","seeds","modelSpecificPayload","generationMetadata","output","size","generationSettings","generateAudio","duration","referenceBlobs"],"requiredProperties":["generationMetadata","modelId"],"referenceInputs":[{"mediaType":"image","usageType":"frame","minItems":0,"maxItems":2,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"style","minItems":0,"maxItems":9,"maxFileSizeBytes":104857600},{"mediaType":"image","usageType":"element","minItems":0,"maxItems":9,"maxFileSizeBytes":104857600},{"mediaType":"video","usageType":"source","minItems":0,"maxItems":3,"maxFileSizeBytes":52428800},{"mediaType":"audio","usageType":"source","minItems":0,"maxItems":3,"maxFileSizeBytes":52428800}],"maxReferenceItems":9,"supportedSizes":["1280x720","640x480"],"supportedAspectRatios":["auto","21:9","16:9","4:3","1:1","3:4","9:16"],"supportedResolutions":[],"supportedDurations":[],"durationMin":4,"durationMax":15,"durationDefault":null,"outputCountMin":null,"outputCountMax":null,"promptMaxLength":2500,"backingModel":"firefly_3p:external:seedance_2_0_fast"}] as const;
diff --git a/open-sse/services/adobeFireflyModels.ts b/open-sse/services/adobeFireflyModels.ts
index 56290b6875..4fd560990c 100644
--- a/open-sse/services/adobeFireflyModels.ts
+++ b/open-sse/services/adobeFireflyModels.ts
@@ -1,328 +1,590 @@
 /**
- * Adobe Firefly model catalog: live discovery + static fallback from browser capture.
+ * Adobe Firefly model discovery and normalized media capabilities.
  *
- * Live: POST firefly-3p.ff.adobe.io/v2/models/discovery (needs valid IMS token).
- * Fallback: curated rows from adobe/get_models.txt (2026-07 Firefly SPA capture) so
- * Media/Models still list usable ids when discovery fails or credentials are missing.
+ * The live discovery schema is authoritative. The generated snapshot is used only
+ * when a request cannot perform authenticated discovery (for example /v1/models).
  */
 
-import {
-  type AdobeFireflyDiscoveredModel,
-  discoverAdobeFireflyModels,
-  resolveAdobeAccessToken,
-} from "./adobeFireflyClient.ts";
+import { ADOBE_FIREFLY_DISCOVERY_SNAPSHOT } from "./adobeFireflyModelSnapshot.ts";
+
+export type AdobeFireflyModality = "image" | "video" | "audio" | "unknown";
+
+export interface AdobeFireflyDiscoveredModel {
+  modelId: string;
+  modelVersion: string;
+  displayName: string;
+  modality: AdobeFireflyModality;
+  enabled: boolean;
+  providerName?: string;
+  releaseReadiness?: string;
+  healthStatus?: string;
+  inputMediaUseCases: string[];
+  requestSchema?: Record<string, unknown>;
+  backingModel?: string;
+}
+
+export interface AdobeFireflyReferenceInputCapability {
+  mediaType: string;
+  usageType: string;
+  minItems: number;
+  maxItems: number | null;
+  maxFileSizeBytes: number | null;
+}
+
+export interface AdobeFireflyMediaCapabilities {
+  inputMediaUseCases: string[];
+  schemaProperties: string[];
+  requiredProperties: string[];
+  referenceInputs: AdobeFireflyReferenceInputCapability[];
+  maxReferenceItems: number | null;
+  supportedSizes: string[];
+  supportedAspectRatios: string[];
+  supportedResolutions: string[];
+  supportedDurations: number[];
+  durationMin: number | null;
+  durationMax: number | null;
+  durationDefault: number | null;
+  outputCountMin: number | null;
+  outputCountMax: number | null;
+  promptMaxLength: number | null;
+  releaseReadiness: string;
+  healthStatus: string;
+}
 
 export interface AdobeFireflyCatalogModel {
-  /** OpenAI-style id without provider prefix, e.g. nano-banana-pro or flux-fluxPro */
+  /** Stable API id without the provider prefix. */
   id: string;
   name: string;
   modality: "image" | "video";
-  /** Upstream wire modelId for generate-async */
   upstreamModelId: string;
-  /** Upstream wire modelVersion for generate-async */
   upstreamModelVersion: string;
-  inputModalities?: string[];
+  providerName: string;
+  backingModel: string;
+  inputModalities: string[];
+  capabilities: AdobeFireflyMediaCapabilities;
 }
 
-/**
- * Static fallback built from adobe/get_models.txt discovery response.
- * Friendly aliases first (Media page defaults), then popular upstream families.
- */
-export const ADOBE_FIREFLY_FALLBACK_MODELS: AdobeFireflyCatalogModel[] = [
-  // ── Friendly aliases (handler resolveAdobeImageModel / resolveAdobeVideoModel) ──
-  {
-    id: "nano-banana-pro",
-    name: "Gemini 3.0 (Nano Banana Pro)",
-    modality: "image",
-    upstreamModelId: "gemini-flash",
-    upstreamModelVersion: "nano-banana-2",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "nano-banana",
-    name: "Gemini 2.5 (Nano Banana)",
-    modality: "image",
-    upstreamModelId: "gemini-flash",
-    upstreamModelVersion: "nano-banana",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "nano-banana-2",
-    name: "Gemini 3.1 (Nano Banana 2)",
-    modality: "image",
-    upstreamModelId: "gemini-flash",
-    upstreamModelVersion: "nano-banana-3",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "gpt-image-2",
-    name: "GPT Image 2",
-    modality: "image",
-    upstreamModelId: "gpt-image",
-    upstreamModelVersion: "2",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "gpt-image",
-    name: "GPT Image 2",
-    modality: "image",
-    upstreamModelId: "gpt-image",
-    upstreamModelVersion: "2",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "gpt-image-1.5",
-    name: "GPT Image 1.5",
-    modality: "image",
-    upstreamModelId: "gpt-image",
-    upstreamModelVersion: "1.5",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "sora-2",
-    name: "Sora 2",
-    modality: "video",
-    upstreamModelId: "sora",
-    upstreamModelVersion: "sora-2",
-  },
-  {
-    id: "sora-2-pro",
-    name: "Sora 2 Pro",
-    modality: "video",
-    upstreamModelId: "sora",
-    upstreamModelVersion: "sora-2-pro",
-  },
-  {
-    id: "veo-3.1",
-    name: "Veo 3.1",
-    modality: "video",
-    upstreamModelId: "veo",
-    upstreamModelVersion: "3.1-generate",
-  },
-  {
-    id: "veo-3.1-fast",
-    name: "Veo 3.1 Fast",
-    modality: "video",
-    upstreamModelId: "veo",
-    upstreamModelVersion: "3.1-fast-generate",
-  },
-  {
-    id: "veo-3.1-ref",
-    name: "Veo 3.1 Reference",
-    modality: "video",
-    upstreamModelId: "veo",
-    upstreamModelVersion: "3.1-generate",
-  },
-  {
-    id: "kling-3",
-    name: "Kling Video v3 Standard Image to Video",
-    modality: "video",
-    upstreamModelId: "kling",
-    upstreamModelVersion: "kling_v3_standard_i2v",
-  },
-  // ── Additional image families from discovery capture ──
-  {
-    id: "flux-2",
-    name: "Flux 2",
-    modality: "image",
-    upstreamModelId: "flux",
-    upstreamModelVersion: "2",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "flux-pro",
-    name: "Flux 1.1 Pro",
-    modality: "image",
-    upstreamModelId: "flux",
-    upstreamModelVersion: "fluxPro",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "flux-ultra",
-    name: "Flux 1.1 Ultra",
-    modality: "image",
-    upstreamModelId: "flux",
-    upstreamModelVersion: "fluxUltra",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "seedream-4",
-    name: "Seedream 4.0",
-    modality: "image",
-    upstreamModelId: "seedream",
-    upstreamModelVersion: "seedream_v4",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "seedream-5-lite",
-    name: "Seedream 5.0 Lite",
-    modality: "image",
-    upstreamModelId: "seedream",
-    upstreamModelVersion: "seedream_v5_lite",
-    inputModalities: ["text", "image"],
-  },
-  {
-    id: "runway-gen4-image",
-    name: "Runway Gen-4 Image",
-    modality: "image",
-    upstreamModelId: "runway-gen4-image",
-    upstreamModelVersion: "gen4_image",
-    inputModalities: ["text", "image"],
-  },
-  // ── Additional video families ──
-  {
-    id: "kling-v3-t2v",
-    name: "Kling Video v3 Standard Text to Video",
-    modality: "video",
-    upstreamModelId: "kling",
-    upstreamModelVersion: "kling_v3_standard_t2v",
-  },
-  {
-    id: "kling-v3-pro-i2v",
-    name: "Kling Video v3 Pro Image to Video",
-    modality: "video",
-    upstreamModelId: "kling",
-    upstreamModelVersion: "kling_v3_pro_i2v",
-  },
-  {
-    id: "luma-ray3",
-    name: "Ray3",
-    modality: "video",
-    upstreamModelId: "luma",
-    upstreamModelVersion: "3.0-ray",
-  },
-  {
-    id: "runway-gen4-turbo",
-    name: "Runway Gen-4 Video",
-    modality: "video",
-    upstreamModelId: "runway",
-    upstreamModelVersion: "gen4_turbo",
-  },
-];
+export interface AdobeFireflyImageModelSpec extends AdobeFireflyCatalogModel {
+  modality: "image";
+  /** Payload dialect observed for this model family. */
+  family: "gemini" | "gpt-image" | "generic";
+}
 
-/** Stable slug for upstream modelId + modelVersion (catalog id when not a friendly alias). */
+export interface AdobeFireflyVideoModelSpec extends AdobeFireflyCatalogModel {
+  modality: "video";
+  defaultDuration: number;
+  defaultResolution: string;
+}
+
+interface MergedObjectSchema {
+  properties: Record<string, Record<string, unknown>>;
+  required: string[];
+}
+
+function asRecord(value: unknown): Record<string, unknown> {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {};
+}
+
+function asStringArray(value: unknown): string[] {
+  return Array.isArray(value)
+    ? value.map((item) => String(item)).filter((item) => item.length > 0)
+    : [];
+}
+
+function finiteInteger(value: unknown): number | null {
+  return Number.isInteger(value) ? (value as number) : null;
+}
+
+/** Merge object properties/required keys contributed through JSON Schema allOf. */
+export function mergeAdobeObjectSchema(schema: unknown): MergedObjectSchema {
+  const merged: MergedObjectSchema = { properties: {}, required: [] };
+  const visit = (value: unknown) => {
+    const node = asRecord(value);
+    const properties = asRecord(node.properties);
+    for (const [key, property] of Object.entries(properties)) {
+      merged.properties[key] = asRecord(property);
+    }
+    merged.required.push(...asStringArray(node.required));
+    if (Array.isArray(node.allOf)) node.allOf.forEach(visit);
+  };
+  visit(schema);
+  merged.required = [...new Set(merged.required)];
+  return merged;
+}
+
+function schemaBranches(schema: unknown): Record<string, unknown>[] {
+  const root = asRecord(schema);
+  if (Object.keys(root).length === 0) return [];
+  return [
+    root,
+    ...(Array.isArray(root.anyOf) ? root.anyOf.map(asRecord) : []),
+    ...(Array.isArray(root.oneOf) ? root.oneOf.map(asRecord) : []),
+  ];
+}
+
+function enumStrings(schema: unknown): string[] {
+  return [
+    ...new Set(
+      schemaBranches(schema)
+        .flatMap((branch) => (Array.isArray(branch.enum) ? branch.enum : []))
+        .filter((value): value is string => typeof value === "string")
+    ),
+  ];
+}
+
+function integerBranch(schema: unknown): Record<string, unknown> {
+  return schemaBranches(schema).find((branch) => branch.type === "integer") || {};
+}
+
+/** Stable, collision-resistant public id for an exact upstream model/version pair. */
 export function slugifyAdobeModel(modelId: string, modelVersion: string): string {
-  const mid = String(modelId || "")
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-|-$/g, "");
-  const ver = String(modelVersion || "")
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9.]+/g, "-")
-    .replace(/^-|-$/g, "");
-  if (!ver || ver === "default" || ver === mid) return mid || "model";
-  return `${mid}-${ver}`;
+  const slug = (value: string, allowDot = false) =>
+    String(value || "")
+      .trim()
+      .toLowerCase()
+      .replace(allowDot ? /[^a-z0-9.]+/g : /[^a-z0-9]+/g, "-")
+      .replace(/^-|-$/g, "");
+  const family = slug(modelId);
+  // Adobe still uses `kling_v3_omni*` internally, while discovery exposes these
+  // products to users as Kling O3. Never leak the obsolete/internal "omni" name
+  // into the public API catalog; the untouched upstream version stays in the spec.
+  const publicVersion =
+    family === "kling" ? modelVersion.replace(/^kling_v3_omni/i, "kling_o3") : modelVersion;
+  const version = slug(publicVersion, true);
+  if (!version || version === "default" || version === family) return family || "model";
+  return `${family}-${version}`;
 }
 
-/** Map discovery rows → catalog entries (image/video only). */
-export function mapDiscoveredToCatalog(
-  rows: AdobeFireflyDiscoveredModel[]
-): AdobeFireflyCatalogModel[] {
-  const out: AdobeFireflyCatalogModel[] = [];
-  const seen = new Set<string>();
+/** Parse POST /v2/models/discovery without discarding its resolved request schema. */
+export function parseAdobeModelsDiscovery(body: unknown): AdobeFireflyDiscoveredModel[] {
+  const root = asRecord(body);
+  const families = Array.isArray(root.models) ? root.models : [];
+  const rows: AdobeFireflyDiscoveredModel[] = [];
 
-  // Prefer friendly aliases when upstream matches known fallback rows.
-  for (const fb of ADOBE_FIREFLY_FALLBACK_MODELS) {
-    const hit = rows.find(
-      (r) =>
-        r.modelId === fb.upstreamModelId &&
-        r.modelVersion === fb.upstreamModelVersion &&
-        (r.modality === fb.modality || r.modality === "unknown")
-    );
-    if (hit && !seen.has(fb.id)) {
-      seen.add(fb.id);
-      out.push({
-        ...fb,
-        name: hit.displayName || fb.name,
+  for (const familyValue of families) {
+    const family = asRecord(familyValue);
+    const modelId = String(family.modelId || "").trim();
+    if (!modelId) continue;
+    for (const [modelVersion, versionValue] of Object.entries(asRecord(family.modelVersions))) {
+      const version = asRecord(versionValue);
+      if (version.enabled === false) continue;
+      const outputModalities = asStringArray(version.outputModality).map((item) =>
+        item.toLowerCase()
+      );
+      const modality: AdobeFireflyModality = outputModalities.includes("image")
+        ? "image"
+        : outputModalities.includes("video")
+          ? "video"
+          : outputModalities.includes("audio")
+            ? "audio"
+            : "unknown";
+      rows.push({
+        modelId,
+        modelVersion,
+        displayName: String(
+          version.modelDisplayName || version.modelCaiDisplayName || modelVersion
+        ),
+        modality,
+        enabled: version.enabled !== false,
+        providerName:
+          typeof family.acModelFamilyProviderDisplayName === "string"
+            ? family.acModelFamilyProviderDisplayName
+            : undefined,
+        releaseReadiness:
+          typeof version.releaseReadiness === "string" ? version.releaseReadiness : undefined,
+        healthStatus: typeof version.healthStatus === "string" ? version.healthStatus : undefined,
+        inputMediaUseCases: asStringArray(version.inputMediaUseCase),
+        requestSchema: asRecord(version.requestSchema),
+        backingModel:
+          typeof version.bksGenerationModel === "string" ? version.bksGenerationModel : undefined,
+      });
+    }
+  }
+  return rows;
+}
+
+function normalizeCapabilities(row: AdobeFireflyDiscoveredModel): AdobeFireflyMediaCapabilities {
+  const schema = mergeAdobeObjectSchema(row.requestSchema);
+  const referenceSchema = asRecord(schema.properties.referenceBlobs);
+  const referenceInputs: AdobeFireflyReferenceInputCapability[] = [];
+  const mediaCapabilities = Array.isArray(referenceSchema["x-capabilities"])
+    ? referenceSchema["x-capabilities"]
+    : [];
+  for (const mediaValue of mediaCapabilities) {
+    const media = asRecord(mediaValue);
+    const maxFileSizeBytes = finiteInteger(media.maxFileSizeBytes);
+    const usageConstraints = Array.isArray(media.usageConstraints) ? media.usageConstraints : [];
+    for (const usageValue of usageConstraints) {
+      const usage = asRecord(usageValue);
+      if (usage.deprecated === true) continue;
+      const usageType = String(usage.usageType || "");
+      const mediaType = String(media.mediaType || "");
+      if (!usageType || !mediaType) continue;
+      referenceInputs.push({
+        mediaType,
+        usageType,
+        minItems: finiteInteger(usage.minItems) ?? 0,
+        maxItems: finiteInteger(usage.maxItems),
+        maxFileSizeBytes,
       });
     }
   }
 
-  for (const r of rows) {
-    if (r.modality !== "image" && r.modality !== "video") continue;
-    const id = slugifyAdobeModel(r.modelId, r.modelVersion);
-    if (seen.has(id)) continue;
-    // Skip if already covered by a friendly alias with same upstream
-    if (
-      out.some(
-        (o) =>
-          o.upstreamModelId === r.modelId && o.upstreamModelVersion === r.modelVersion
+  const supportedSizes = [
+    ...new Set(
+      schemaBranches(schema.properties.size)
+        .flatMap((branch) => (Array.isArray(branch.enum) ? branch.enum : []))
+        .map(asRecord)
+        .filter((size) => finiteInteger(size.width) !== null && finiteInteger(size.height) !== null)
+        .map((size) => `${size.width}x${size.height}`)
+    ),
+  ];
+  const supportedAspectRatios = [
+    ...new Set(
+      schemaBranches(schema.properties.generationSettings).flatMap((branch) =>
+        enumStrings(asRecord(asRecord(branch.properties).aspectRatio))
       )
-    ) {
-      continue;
-    }
-    seen.add(id);
-    out.push({
-      id,
-      name: r.displayName || id,
-      modality: r.modality,
-      upstreamModelId: r.modelId,
-      upstreamModelVersion: r.modelVersion,
-      inputModalities: r.modality === "image" ? ["text", "image"] : ["text"],
-    });
-  }
-
-  return out;
-}
-
-export function getAdobeFireflyFallbackCatalog(modality?: "image" | "video"): AdobeFireflyCatalogModel[] {
-  if (!modality) return [...ADOBE_FIREFLY_FALLBACK_MODELS];
-  return ADOBE_FIREFLY_FALLBACK_MODELS.filter((m) => m.modality === modality);
-}
-
-/**
- * Live discovery when credentials resolve; otherwise static fallback from get_models capture.
- */
-export async function resolveAdobeFireflyCatalog(opts: {
-  credentials?: {
-    apiKey?: string;
-    accessToken?: string;
-    providerSpecificData?: Record<string, unknown> | null;
-  } | null;
-  modality?: "image" | "video";
-  fetchImpl?: typeof fetch;
-}): Promise<{ models: AdobeFireflyCatalogModel[]; source: "api" | "fallback" }> {
-  const fetchImpl = opts.fetchImpl || fetch;
-  try {
-    if (opts.credentials) {
-      const token = await resolveAdobeAccessToken(opts.credentials, fetchImpl);
-      const discovered = await discoverAdobeFireflyModels(token, fetchImpl);
-      let catalog = mapDiscoveredToCatalog(discovered);
-      if (opts.modality) catalog = catalog.filter((m) => m.modality === opts.modality);
-      if (catalog.length > 0) return { models: catalog, source: "api" };
-    }
-  } catch {
-    // fall through to static catalog
-  }
+    ),
+  ];
+  const duration = integerBranch(schema.properties.duration);
+  const outputCount = integerBranch(schema.properties.n);
+  const prompt =
+    schemaBranches(schema.properties.prompt).find((branch) => branch.type === "string") || {};
 
   return {
-    models: getAdobeFireflyFallbackCatalog(opts.modality),
-    source: "fallback",
+    inputMediaUseCases: [...row.inputMediaUseCases],
+    schemaProperties: Object.keys(schema.properties),
+    requiredProperties: [...schema.required],
+    referenceInputs,
+    maxReferenceItems: finiteInteger(referenceSchema.maxItems),
+    supportedSizes,
+    supportedAspectRatios,
+    supportedResolutions: enumStrings(schema.properties.resolution),
+    supportedDurations: [
+      ...new Set(
+        schemaBranches(schema.properties.duration)
+          .flatMap((branch) => (Array.isArray(branch.enum) ? branch.enum : []))
+          .filter((value): value is number => Number.isInteger(value))
+      ),
+    ],
+    durationMin: finiteInteger(duration.minimum),
+    durationMax: finiteInteger(duration.maximum),
+    durationDefault: finiteInteger(duration.default),
+    outputCountMin: finiteInteger(outputCount.minimum),
+    outputCountMax: finiteInteger(outputCount.maximum),
+    promptMaxLength: finiteInteger(prompt.maxLength),
+    releaseReadiness: row.releaseReadiness || "",
+    healthStatus: row.healthStatus || "",
   };
 }
 
-/** Registry-shaped models for imageRegistry / videoRegistry. */
-export function toRegistryImageModels(
-  models: AdobeFireflyCatalogModel[] = getAdobeFireflyFallbackCatalog("image")
-): Array<{ id: string; name: string; inputModalities?: string[] }> {
-  return models
-    .filter((m) => m.modality === "image")
-    .map((m) => ({
-      id: m.id,
-      name: m.name.startsWith("Firefly ") ? m.name : `Firefly ${m.name}`,
-      inputModalities: m.inputModalities || ["text", "image"],
-    }));
+function isCallableGenerationModel(row: AdobeFireflyDiscoveredModel): boolean {
+  if (row.modality !== "image" && row.modality !== "video") return false;
+  if (!mergeAdobeObjectSchema(row.requestSchema).properties.prompt) return false;
+  const excluded = new Set(["upscaling", "sharpening", "denoising"]);
+  return !row.inputMediaUseCases.some((value) => excluded.has(value.toLowerCase()));
 }
 
-export function toRegistryVideoModels(
-  models: AdobeFireflyCatalogModel[] = getAdobeFireflyFallbackCatalog("video")
-): Array<{ id: string; name: string }> {
-  return models
-    .filter((m) => m.modality === "video")
-    .map((m) => ({
-      id: m.id,
-      name: m.name.startsWith("Firefly ") ? m.name : `Firefly ${m.name}`,
-    }));
+function deriveInputModalities(capabilities: AdobeFireflyMediaCapabilities): string[] {
+  return ["text", ...new Set(capabilities.referenceInputs.map((reference) => reference.mediaType))];
+}
+
+function semanticCatalogKey(model: AdobeFireflyCatalogModel): string {
+  return JSON.stringify({
+    backingModel: model.backingModel,
+    name: model.name,
+    modality: model.modality,
+    capabilities: model.capabilities,
+  });
+}
+
+/** Normalize and de-duplicate callable image/video rows from live discovery. */
+export function mapDiscoveredToCatalog(
+  rows: AdobeFireflyDiscoveredModel[]
+): AdobeFireflyCatalogModel[] {
+  const output: AdobeFireflyCatalogModel[] = [];
+  const seen = new Set<string>();
+  for (const row of rows) {
+    if (!isCallableGenerationModel(row)) continue;
+    const capabilities = normalizeCapabilities(row);
+    const model: AdobeFireflyCatalogModel = {
+      id: slugifyAdobeModel(row.modelId, row.modelVersion),
+      name: row.displayName,
+      modality: row.modality as "image" | "video",
+      upstreamModelId: row.modelId,
+      upstreamModelVersion: row.modelVersion,
+      providerName: row.providerName || "",
+      backingModel: row.backingModel || "",
+      inputModalities: deriveInputModalities(capabilities),
+      capabilities,
+    };
+    const key = semanticCatalogKey(model);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    output.push(model);
+  }
+  return output;
+}
+
+function snapshotCatalog(): AdobeFireflyCatalogModel[] {
+  return ADOBE_FIREFLY_DISCOVERY_SNAPSHOT.map((model) => {
+    const capabilities: AdobeFireflyMediaCapabilities = {
+      inputMediaUseCases: [...model.inputMediaUseCases],
+      schemaProperties: [...model.schemaProperties],
+      requiredProperties: [...model.requiredProperties],
+      referenceInputs: model.referenceInputs.map((reference) => ({ ...reference })),
+      maxReferenceItems: model.maxReferenceItems,
+      supportedSizes: [...model.supportedSizes],
+      supportedAspectRatios: [...model.supportedAspectRatios],
+      supportedResolutions: [...model.supportedResolutions],
+      supportedDurations: [...model.supportedDurations],
+      durationMin: model.durationMin,
+      durationMax: model.durationMax,
+      durationDefault: model.durationDefault,
+      outputCountMin: model.outputCountMin,
+      outputCountMax: model.outputCountMax,
+      promptMaxLength: model.promptMaxLength,
+      releaseReadiness: model.releaseReadiness,
+      healthStatus: model.healthStatus,
+    };
+    return {
+      id: model.id,
+      name: model.name,
+      modality: model.modality,
+      upstreamModelId: model.upstreamModelId,
+      upstreamModelVersion: model.upstreamModelVersion,
+      providerName: model.providerName,
+      backingModel: model.backingModel,
+      inputModalities: deriveInputModalities(capabilities),
+      capabilities,
+    };
+  });
+}
+
+export const ADOBE_FIREFLY_FALLBACK_MODELS: AdobeFireflyCatalogModel[] = snapshotCatalog();
+
+export function getAdobeFireflyFallbackCatalog(
+  modality?: "image" | "video"
+): AdobeFireflyCatalogModel[] {
+  return ADOBE_FIREFLY_FALLBACK_MODELS.filter((model) => !modality || model.modality === modality);
+}
+
+function imageFamily(model: AdobeFireflyCatalogModel): AdobeFireflyImageModelSpec["family"] {
+  if (model.upstreamModelId === "gemini-flash") return "gemini";
+  if (model.upstreamModelId === "gpt-image" || model.upstreamModelId === "gpt-4o-image") {
+    return "gpt-image";
+  }
+  return "generic";
+}
+
+export const ADOBE_FIREFLY_IMAGE_MODELS: Record<string, AdobeFireflyImageModelSpec> =
+  Object.fromEntries(
+    getAdobeFireflyFallbackCatalog("image").map((model) => [
+      model.id,
+      { ...model, modality: "image" as const, family: imageFamily(model) },
+    ])
+  );
+
+function defaultDuration(model: AdobeFireflyCatalogModel): number {
+  const caps = model.capabilities;
+  return caps.durationDefault ?? caps.supportedDurations[0] ?? caps.durationMin ?? 5;
+}
+
+function defaultResolution(model: AdobeFireflyCatalogModel): string {
+  if (model.capabilities.supportedSizes.some((value) => value.includes("1920x1080"))) {
+    return "1080p";
+  }
+  return "720p";
+}
+
+export const ADOBE_FIREFLY_VIDEO_MODELS: Record<string, AdobeFireflyVideoModelSpec> =
+  Object.fromEntries(
+    getAdobeFireflyFallbackCatalog("video").map((model) => [
+      model.id,
+      {
+        ...model,
+        modality: "video" as const,
+        defaultDuration: defaultDuration(model),
+        defaultResolution: defaultResolution(model),
+      },
+    ])
+  );
+
+const LEGACY_MODEL_ALIASES: Record<string, string> = {
+  "nano-banana": "gemini-flash-nano-banana",
+  "nano-banana-pro": "gemini-flash-nano-banana-2",
+  "nano-banana-2": "gemini-flash-nano-banana-3",
+  "gpt-image": "gpt-image-2",
+  "gpt-image-2": "gpt-image-2",
+  "gpt-image-1.5": "gpt-image-1.5",
+  "flux-2": "flux-2",
+  "flux-pro": "flux-fluxpro",
+  "flux-ultra": "flux-fluxultra",
+  "seedream-4": "seedream-seedream-v4",
+  "seedream-5-lite": "seedream-seedream-v5-lite",
+  "runway-gen4-image": "runway-gen4-image",
+  "veo-3.1": "veo-3.1-generate",
+  "veo-3.1-fast": "veo-3.1-fast-generate",
+  "luma-ray3": "luma-3.0-ray",
+  "runway-gen4-turbo": "runway-gen4-turbo",
+  // Backward compatibility only; the catalog advertises the exact discovered id.
+  "kling-3": "kling-kling-v3-standard-i2v",
+};
+
+// Preserve established API aliases when (and only when) they resolve to a model
+// that is present in the verified discovery snapshot. These keys are not listed.
+for (const [alias, target] of Object.entries(LEGACY_MODEL_ALIASES)) {
+  const imageTarget = ADOBE_FIREFLY_IMAGE_MODELS[target];
+  if (imageTarget) ADOBE_FIREFLY_IMAGE_MODELS[alias] = imageTarget;
+  const videoTarget = ADOBE_FIREFLY_VIDEO_MODELS[target];
+  if (videoTarget) ADOBE_FIREFLY_VIDEO_MODELS[alias] = videoTarget;
+}
+
+/** Backward-compatible request ids. Kept out of every advertised model catalog. */
+export const ADOBE_FIREFLY_IMAGE_ROUTING_ALIASES = Object.freeze(
+  Object.entries(LEGACY_MODEL_ALIASES)
+    .filter(([, target]) => Boolean(ADOBE_FIREFLY_IMAGE_MODELS[target]))
+    .map(([alias]) => alias)
+);
+
+function normalizeRequestedId(model: string): string {
+  return String(model || "")
+    .trim()
+    .toLowerCase()
+    .replace(/^adobe-firefly\//, "")
+    .replace(/^firefly\//, "");
+}
+
+function resolveCatalogId(model: string): string {
+  const requested = normalizeRequestedId(model);
+  return LEGACY_MODEL_ALIASES[requested] || requested;
+}
+
+export function resolveAdobeImageModel(model: string): {
+  id: string;
+  spec: AdobeFireflyImageModelSpec;
+} {
+  const id = resolveCatalogId(model);
+  const spec = ADOBE_FIREFLY_IMAGE_MODELS[id];
+  if (!spec) {
+    throw new Error(
+      `Unknown Adobe Firefly image model: ${normalizeRequestedId(model) || "(empty)"}`
+    );
+  }
+  return { id, spec };
+}
+
+export function resolveAdobeVideoModel(model: string): {
+  id: string;
+  spec: AdobeFireflyVideoModelSpec;
+} {
+  const id = resolveCatalogId(model);
+  const spec = ADOBE_FIREFLY_VIDEO_MODELS[id];
+  if (!spec) {
+    throw new Error(
+      `Unknown Adobe Firefly video model: ${normalizeRequestedId(model) || "(empty)"}`
+    );
+  }
+  return { id, spec };
+}
+
+export function toRegistryImageModels(): Array<{
+  id: string;
+  name: string;
+  inputModalities: string[];
+  imageRequired?: boolean;
+  supportedSizes: string[];
+  mediaCapabilities: Record<string, unknown>;
+}> {
+  const generated = getAdobeFireflyFallbackCatalog("image").map((model) => ({
+    id: model.id,
+    name: `Firefly ${model.name}`,
+    inputModalities: model.inputModalities,
+    supportedSizes: model.capabilities.supportedSizes,
+    mediaCapabilities: toAdobeMediaCapabilitiesApi(model),
+  }));
+  // Upscaling uses a distinct Firefly endpoint and is not returned by the image
+  // generation discovery schema. Keep its two supported Topaz models visible in
+  // the same provider catalog so image clients can select them deliberately.
+  return [
+    ...generated,
+    {
+      id: "topaz-standard",
+      name: "Firefly Topaz Upscale (Standard)",
+      inputModalities: ["image"],
+      imageRequired: true,
+      supportedSizes: [],
+      mediaCapabilities: { input_media_use_cases: ["upscaling"] },
+    },
+    {
+      id: "topaz-bloom",
+      name: "Firefly Topaz Bloom (Creative Upscale)",
+      inputModalities: ["image"],
+      imageRequired: true,
+      supportedSizes: [],
+      mediaCapabilities: { input_media_use_cases: ["upscaling"] },
+    },
+  ];
+}
+
+export function toRegistryVideoModels(): Array<{
+  id: string;
+  name: string;
+  supportedSizes: string[];
+  mediaCapabilities: Record<string, unknown>;
+}> {
+  return getAdobeFireflyFallbackCatalog("video").map((model) => ({
+    id: model.id,
+    name: `Firefly ${model.name}`,
+    supportedSizes: model.capabilities.supportedSizes,
+    mediaCapabilities: toAdobeMediaCapabilitiesApi(model),
+  }));
+}
+
+/** JSON-safe extension emitted by /v1/models. */
+export function toAdobeMediaCapabilitiesApi(
+  model: AdobeFireflyCatalogModel
+): Record<string, unknown> {
+  const caps = model.capabilities;
+  return {
+    upstream_model_id: model.upstreamModelId,
+    upstream_model_version: model.upstreamModelVersion,
+    provider_name: model.providerName,
+    release_readiness: caps.releaseReadiness,
+    health_status: caps.healthStatus,
+    input_media_use_cases: caps.inputMediaUseCases,
+    reference_inputs: caps.referenceInputs.map((reference) => ({
+      media_type: reference.mediaType,
+      usage_type: reference.usageType,
+      min_items: reference.minItems,
+      max_items: reference.maxItems,
+      max_file_size_bytes: reference.maxFileSizeBytes,
+    })),
+    max_reference_items: caps.maxReferenceItems,
+    supported_sizes: caps.supportedSizes,
+    supported_aspect_ratios: caps.supportedAspectRatios,
+    supported_resolutions: caps.supportedResolutions,
+    supported_durations: caps.supportedDurations,
+    duration_min: caps.durationMin,
+    duration_max: caps.durationMax,
+    duration_default: caps.durationDefault,
+    output_count_min: caps.outputCountMin,
+    output_count_max: caps.outputCountMax,
+    prompt_max_length: caps.promptMaxLength,
+  };
+}
+
+export function getAdobeReferenceUploadLimit(
+  model: AdobeFireflyCatalogModel,
+  mediaType: string
+): number {
+  if (model.capabilities.maxReferenceItems !== null) {
+    return Math.max(1, Math.min(32, model.capabilities.maxReferenceItems));
+  }
+  const declaredTotal = model.capabilities.referenceInputs
+    .filter((reference) => reference.mediaType === mediaType)
+    .reduce((total, reference) => total + (reference.maxItems ?? 0), 0);
+  return Math.max(1, Math.min(32, declaredTotal || 1));
 }
diff --git a/open-sse/services/combo/validateQuality.ts b/open-sse/services/combo/validateQuality.ts
index 27f8e029f6..79f742b2c2 100644
--- a/open-sse/services/combo/validateQuality.ts
+++ b/open-sse/services/combo/validateQuality.ts
@@ -190,10 +190,26 @@ function isRecord(value: unknown): value is Record<string, unknown> {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 
+/**
+ * Whether an `error` field carries a real failure signal. A key-presence check
+ * (`!= null`) false-positives on benign values some backends emit on every
+ * chunk (`{}`, `""`, `false`, `0`) — e.g. tool-call turns where a chunk with
+ * real tool_calls content also carries `"error": {}`. Only substantive values
+ * are treated as upstream failures.
+ */
+function isSubstantiveError(value: unknown): boolean {
+  if (value === null || value === undefined) return false;
+  if (typeof value === "string") return value.trim().length > 0;
+  if (typeof value === "object" && !Array.isArray(value)) {
+    return Object.keys(value as Record<string, unknown>).length > 0;
+  }
+  return value === true;
+}
+
 function isStreamingUpstreamError(parsed: unknown, eventType: string): boolean {
   if (eventType === "response.failed" || eventType === "error") return true;
   if (!isRecord(parsed)) return false;
-  if (parsed.error != null) return true;
+  if (isSubstantiveError(parsed.error)) return true;
 
   const nestedResponse = isRecord(parsed.response) ? parsed.response : null;
   return nestedResponse?.status === "failed" && nestedResponse.error != null;
diff --git a/scripts/dev/generate-adobe-firefly-snapshot.mjs b/scripts/dev/generate-adobe-firefly-snapshot.mjs
new file mode 100644
index 0000000000..ccbec0c629
--- /dev/null
+++ b/scripts/dev/generate-adobe-firefly-snapshot.mjs
@@ -0,0 +1,207 @@
+#!/usr/bin/env node
+
+import fs from "node:fs";
+import path from "node:path";
+import { createHash } from "node:crypto";
+
+function usage() {
+  console.error(
+    "Usage: node scripts/dev/generate-adobe-firefly-snapshot.mjs <discovery.json> <output.ts>"
+  );
+  process.exit(2);
+}
+
+const [, , inputArg, outputArg] = process.argv;
+if (!inputArg || !outputArg) usage();
+
+const inputPath = path.resolve(inputArg);
+const outputPath = path.resolve(outputArg);
+const inputBytes = fs.readFileSync(inputPath);
+const sourceHash = createHash("sha256").update(inputBytes).digest("hex");
+const root = JSON.parse(inputBytes.toString("utf8"));
+
+function mergeObjectSchema(schema) {
+  const merged = { properties: {}, required: [] };
+  const visit = (node) => {
+    if (!node || typeof node !== "object") return;
+    if (node.properties && typeof node.properties === "object") {
+      Object.assign(merged.properties, node.properties);
+    }
+    if (Array.isArray(node.required)) merged.required.push(...node.required);
+    if (Array.isArray(node.allOf)) node.allOf.forEach(visit);
+  };
+  visit(schema);
+  merged.required = [...new Set(merged.required)];
+  return merged;
+}
+
+function branches(schema) {
+  if (!schema || typeof schema !== "object") return [];
+  return [schema, ...(schema.anyOf || []), ...(schema.oneOf || [])];
+}
+
+function stringEnums(schema) {
+  return [
+    ...new Set(
+      branches(schema)
+        .flatMap((branch) => (Array.isArray(branch.enum) ? branch.enum : []))
+        .filter((value) => typeof value === "string")
+    ),
+  ];
+}
+
+function integerSchema(schema) {
+  return branches(schema).find((branch) => branch.type === "integer") || {};
+}
+
+function publicModelId(modelId, modelVersion) {
+  const slug = (value, allowDot = false) =>
+    String(value || "")
+      .trim()
+      .toLowerCase()
+      .replace(allowDot ? /[^a-z0-9.]+/g : /[^a-z0-9]+/g, "-")
+      .replace(/^-|-$/g, "");
+  const family = slug(modelId);
+  const publicVersion =
+    family === "kling" ? String(modelVersion).replace(/^kling_v3_omni/i, "kling_o3") : modelVersion;
+  const version = slug(publicVersion, true);
+  if (!version || version === "default" || version === family) return family || "model";
+  return `${family}-${version}`;
+}
+
+function normalizeModel(family, modelVersion, version) {
+  const schema = mergeObjectSchema(version.requestSchema);
+  const properties = schema.properties;
+  const referenceSchema = properties.referenceBlobs || {};
+  const referenceInputs = [];
+  for (const media of referenceSchema["x-capabilities"] || []) {
+    for (const usage of media.usageConstraints || []) {
+      if (usage.deprecated === true) continue;
+      referenceInputs.push({
+        mediaType: String(media.mediaType || ""),
+        usageType: String(usage.usageType || ""),
+        minItems: Number.isInteger(usage.minItems) ? usage.minItems : 0,
+        maxItems: Number.isInteger(usage.maxItems) ? usage.maxItems : null,
+        maxFileSizeBytes: Number.isInteger(media.maxFileSizeBytes) ? media.maxFileSizeBytes : null,
+      });
+    }
+  }
+
+  const supportedSizes = [
+    ...new Set(
+      branches(properties.size)
+        .flatMap((branch) => (Array.isArray(branch.enum) ? branch.enum : []))
+        .filter(
+          (size) =>
+            size &&
+            Number.isInteger(size.width) &&
+            size.width > 0 &&
+            Number.isInteger(size.height) &&
+            size.height > 0
+        )
+        .map((size) => `${size.width}x${size.height}`)
+    ),
+  ];
+  const supportedAspectRatios = [
+    ...new Set(
+      branches(properties.generationSettings).flatMap((branch) =>
+        stringEnums(branch?.properties?.aspectRatio)
+      )
+    ),
+  ];
+  const duration = integerSchema(properties.duration);
+  const supportedDurations = [
+    ...new Set(
+      branches(properties.duration)
+        .flatMap((branch) => (Array.isArray(branch.enum) ? branch.enum : []))
+        .filter(Number.isInteger)
+    ),
+  ];
+  const prompt = branches(properties.prompt).find((branch) => branch.type === "string") || {};
+  const outputCount = integerSchema(properties.n);
+
+  return {
+    id: publicModelId(family.modelId, modelVersion),
+    name: String(version.modelDisplayName || version.modelCaiDisplayName || modelVersion),
+    modality: version.outputModality[0],
+    upstreamModelId: family.modelId,
+    upstreamModelVersion: modelVersion,
+    providerName: String(family.acModelFamilyProviderDisplayName || ""),
+    releaseReadiness: String(version.releaseReadiness || ""),
+    healthStatus: String(version.healthStatus || ""),
+    inputMediaUseCases: (version.inputMediaUseCase || []).map(String),
+    schemaProperties: Object.keys(properties),
+    requiredProperties: schema.required,
+    referenceInputs,
+    maxReferenceItems: Number.isInteger(referenceSchema.maxItems) ? referenceSchema.maxItems : null,
+    supportedSizes,
+    supportedAspectRatios,
+    supportedResolutions: stringEnums(properties.resolution),
+    supportedDurations,
+    durationMin: Number.isInteger(duration.minimum) ? duration.minimum : null,
+    durationMax: Number.isInteger(duration.maximum) ? duration.maximum : null,
+    durationDefault: Number.isInteger(duration.default) ? duration.default : null,
+    outputCountMin: Number.isInteger(outputCount.minimum) ? outputCount.minimum : null,
+    outputCountMax: Number.isInteger(outputCount.maximum) ? outputCount.maximum : null,
+    promptMaxLength: Number.isInteger(prompt.maxLength) ? prompt.maxLength : null,
+    backingModel: String(version.bksGenerationModel || ""),
+  };
+}
+
+const rawModels = [];
+for (const family of Array.isArray(root.models) ? root.models : []) {
+  for (const [modelVersion, version] of Object.entries(family.modelVersions || {})) {
+    if (!version || version.enabled === false) continue;
+    const modality = Array.isArray(version.outputModality)
+      ? version.outputModality.map((value) => String(value).toLowerCase())[0]
+      : "";
+    if (modality !== "image" && modality !== "video") continue;
+
+    const schema = mergeObjectSchema(version.requestSchema);
+    if (!schema.properties.prompt) continue;
+    const useCases = (version.inputMediaUseCase || []).map((value) => String(value).toLowerCase());
+    if (useCases.some((value) => ["upscaling", "sharpening", "denoising"].includes(value))) {
+      continue;
+    }
+    rawModels.push(normalizeModel(family, modelVersion, version));
+  }
+}
+
+// Discovery currently repeats a few exact aliases (for example flux/fluxPro and
+// fluxPro/1.1). Keep the first canonical wire pair and suppress duplicate cards.
+const seen = new Set();
+const models = [];
+for (const model of rawModels) {
+  const semanticKey = JSON.stringify({
+    backingModel: model.backingModel,
+    name: model.name,
+    modality: model.modality,
+    schemaProperties: model.schemaProperties,
+    requiredProperties: model.requiredProperties,
+    referenceInputs: model.referenceInputs,
+    maxReferenceItems: model.maxReferenceItems,
+    supportedSizes: model.supportedSizes,
+    supportedAspectRatios: model.supportedAspectRatios,
+    supportedResolutions: model.supportedResolutions,
+    supportedDurations: model.supportedDurations,
+    durationMin: model.durationMin,
+    durationMax: model.durationMax,
+  });
+  if (seen.has(semanticKey)) continue;
+  seen.add(semanticKey);
+  models.push(model);
+}
+
+const source = `/**
+ * Generated from Adobe Firefly POST /v2/models/discovery with resolveSchema=true.
+ * Source SHA-256: ${sourceHash}
+ * Regenerate with scripts/dev/generate-adobe-firefly-snapshot.mjs; do not edit by hand.
+ * The generated literal stays compact to satisfy the repository's line-count gate.
+ */
+// prettier-ignore
+export const ADOBE_FIREFLY_DISCOVERY_SNAPSHOT = ${JSON.stringify(models)} as const;
+`;
+
+fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+fs.writeFileSync(outputPath, source, "utf8");
+console.log(`Wrote ${models.length} models to ${outputPath}`);
diff --git a/scripts/quality/validate-release-green.mjs b/scripts/quality/validate-release-green.mjs
index f9693aa92e..05690e1eac 100644
--- a/scripts/quality/validate-release-green.mjs
+++ b/scripts/quality/validate-release-green.mjs
@@ -609,14 +609,6 @@ async function main() {
         args: ["run", "check:pack-artifact"],
         timeout: 20 * 60 * 1000,
       });
-      // WS1.2 (#7065 class): boot the REAL packed tarball from a clean install —
-      // the runtime gate structure checks cannot provide. Reuses the same dist/ build.
-      slow.push({
-        id: "pack-boot",
-        label: "Tarball boot-smoke (installed CLI serves /health)",
-        args: ["run", "check:pack-boot"],
-        timeout: 15 * 60 * 1000,
-      });
     }
     slow.forEach((g) => announce(`${g.label} [parallel]`));
     const slowResults = await Promise.all(
@@ -633,6 +625,41 @@ async function main() {
         detail: code === 0 ? "pass" : firstFailureLine(out),
       });
     });
+
+    if (WITH_BUILD) {
+      // WS1.2 (#7065 class): boot the REAL packed tarball from a clean install.
+      // check:pack-artifact is the builder for dist/ when staging is absent, so the
+      // boot smoke MUST run after it completes. Running both in the parallel wave
+      // races check:pack-boot against dist/server.js creation on clean worktrees.
+      const packArtifactIndex = slow.findIndex((g) => g.id === "pack-artifact");
+      const packArtifactResult = slowResults[packArtifactIndex];
+      const bootLabel = "Tarball boot-smoke (installed CLI serves /health)";
+
+      if (!packArtifactResult || packArtifactResult.code !== 0) {
+        const out = "skipped because package-artifact did not produce a valid dist/ build";
+        saveGateLog("pack-boot", out);
+        record({
+          id: "pack-boot",
+          label: bootLabel,
+          kind: "hard",
+          ok: false,
+          detail: out,
+        });
+      } else {
+        announce(bootLabel);
+        const { code, out } = await runAsync(npmCmd, ["run", "check:pack-boot"], {
+          timeout: 15 * 60 * 1000,
+        });
+        saveGateLog("pack-boot", out);
+        record({
+          id: "pack-boot",
+          label: bootLabel,
+          kind: "hard",
+          ok: code === 0,
+          detail: code === 0 ? "pass" : firstFailureLine(out),
+        });
+      }
+    }
   } else if (WITH_BUILD) {
     // --with-build without the suites (--quick): still verify the package artifact.
     const { code, out } = await runAsync(npmCmd, ["run", "check:pack-artifact"], {
diff --git a/src/app/api/providers/[id]/models/adobeFireflyDiscovery.ts b/src/app/api/providers/[id]/models/adobeFireflyDiscovery.ts
new file mode 100644
index 0000000000..30d107378f
--- /dev/null
+++ b/src/app/api/providers/[id]/models/adobeFireflyDiscovery.ts
@@ -0,0 +1,73 @@
+import {
+  discoverAdobeFireflyModels,
+  resolveAdobeAccessToken,
+} from "@omniroute/open-sse/services/adobeFireflyClient.ts";
+import {
+  getAdobeFireflyFallbackCatalog,
+  mapDiscoveredToCatalog,
+  toAdobeMediaCapabilitiesApi,
+  type AdobeFireflyCatalogModel,
+} from "@omniroute/open-sse/services/adobeFireflyModels.ts";
+import { sanitizeErrorMessage } from "@omniroute/open-sse/utils/error";
+
+type AdobeProviderData = { cookie?: unknown; access_token?: unknown; accessToken?: unknown };
+
+interface AdobeProviderModelsResult {
+  models: Array<Record<string, unknown>>;
+  source: "api" | "local_catalog";
+  warning?: string;
+}
+
+function toModelResponse(model: AdobeFireflyCatalogModel): Record<string, unknown> {
+  const endpoint = model.modality === "image" ? "images" : "videos";
+  return {
+    id: model.id,
+    name: model.name,
+    owned_by: "adobe-firefly",
+    apiFormat: endpoint,
+    supportedEndpoints: [endpoint],
+    type: model.modality,
+    input_modalities: model.inputModalities,
+    output_modalities: [model.modality],
+    supported_sizes: model.capabilities.supportedSizes,
+    media_capabilities: toAdobeMediaCapabilitiesApi(model),
+  };
+}
+
+function fallback(warning: string): AdobeProviderModelsResult {
+  return {
+    models: getAdobeFireflyFallbackCatalog().map(toModelResponse),
+    source: "local_catalog",
+    warning,
+  };
+}
+
+export async function getAdobeModels(
+  apiKey: string | undefined,
+  accessToken: string | undefined,
+  providerData: unknown,
+  fetchImpl: typeof fetch = fetch
+): Promise<AdobeProviderModelsResult> {
+  const providerSpecificData =
+    providerData && typeof providerData === "object" ? (providerData as AdobeProviderData) : {};
+  try {
+    const token = await resolveAdobeAccessToken(
+      {
+        apiKey,
+        accessToken,
+        providerSpecificData,
+      },
+      fetchImpl
+    );
+    const models = mapDiscoveredToCatalog(await discoverAdobeFireflyModels(token, fetchImpl));
+    return models.length > 0
+      ? { models: models.map(toModelResponse), source: "api" }
+      : fallback("Adobe Firefly discovery returned no callable image or video models");
+  } catch (error) {
+    return fallback(
+      `Adobe Firefly discovery unavailable: ${sanitizeErrorMessage(
+        error instanceof Error ? error.message : String(error)
+      )}`
+    );
+  }
+}
diff --git a/src/app/api/providers/[id]/models/route.ts b/src/app/api/providers/[id]/models/route.ts
index 10af48e71b..8532f29412 100755
--- a/src/app/api/providers/[id]/models/route.ts
+++ b/src/app/api/providers/[id]/models/route.ts
@@ -84,10 +84,8 @@ import {
   isAutoFetchModelsEnabled,
   persistDiscoveredModels,
 } from "@/lib/providerModels/modelDiscovery";
-import {
-  buildProviderModelsUrl,
-  getDiscoveryClientVersionOptions,
-} from "./discoveryClientVersion";
+import { buildProviderModelsUrl, getDiscoveryClientVersionOptions } from "./discoveryClientVersion";
+import { getAdobeModels } from "./adobeFireflyDiscovery";
 import {
   parseGeminiModelsList,
   type GeminiDiscoveryModel,
@@ -422,10 +420,7 @@ export async function GET(
       // #6267 — a models-endpoint redirect (307/308) is not a fixable-config
       // error. safeOutboundFetch throws REDIRECT_BLOCKED which
       // getSafeOutboundFetchErrorStatus maps to 503, but unlike the other 503
-      // cases (URL_GUARD_BLOCKED / INVALID_URL, which are genuinely
-      // unrecoverable and stay hard errors) a blocked redirect should degrade to
-      // the local/cached catalog OmniRoute ships instead of surfacing a raw 503.
-      // General fix — covers any config-driven provider that 307s (e.g. qwen-web).
+      // Redirect blocks degrade to the local/cached catalog; invalid URLs remain hard errors.
       if (error instanceof SafeOutboundFetchError && error.code === "REDIRECT_BLOCKED") {
         return buildDiscoveryFallbackResponse(warnings);
       }
@@ -434,6 +429,11 @@ export async function GET(
       return buildDiscoveryFallbackResponse(warnings);
     };
 
+    if (provider === "adobe-firefly") {
+      const discovery = await getAdobeModels(apiKey, accessToken, connection.providerSpecificData);
+      return buildResponse({ provider, connectionId, ...discovery });
+    }
+
     const maybeReturnCachedDiscovery = () => {
       if (!refresh && cachedDiscoveryModels.length > 0) {
         return buildCachedDiscoveryResponse();
diff --git a/src/app/api/v1/models/catalog.ts b/src/app/api/v1/models/catalog.ts
index 128aedf3b2..e70a617c33 100644
--- a/src/app/api/v1/models/catalog.ts
+++ b/src/app/api/v1/models/catalog.ts
@@ -1113,6 +1113,7 @@ async function buildUnifiedModelsResponseCore(
         input_modalities: imgModel.inputModalities || ["text"],
         output_modalities: ["image"],
         ...(imgModel.description ? { description: imgModel.description } : {}),
+        ...(imgModel.mediaCapabilities ? { media_capabilities: imgModel.mediaCapabilities } : {}),
       });
     }
 
@@ -1178,6 +1179,12 @@ async function buildUnifiedModelsResponseCore(
         created: timestamp,
         owned_by: videoModel.provider,
         type: "video",
+        supported_sizes: videoModel.supportedSizes,
+        input_modalities: ["text"],
+        output_modalities: ["video"],
+        ...(videoModel.mediaCapabilities
+          ? { media_capabilities: videoModel.mediaCapabilities }
+          : {}),
       });
     }
 
diff --git a/stryker.conf.json b/stryker.conf.json
index 726ac2f756..0b177926cd 100644
--- a/stryker.conf.json
+++ b/stryker.conf.json
@@ -66,6 +66,7 @@
       "tests/unit/antigravity-prefer-stored-project.test.ts",
       "tests/unit/api-key-policy-noauth-allowed-connections.test.ts",
       "tests/unit/api-key-rotator-health.test.ts",
+      "tests/unit/api-key-policy-noauth-allowed-connections.test.ts",
       "tests/unit/appearance-widget-settings-schema.test.ts",
       "tests/unit/auth-antigravity-account-retry-v2.test.ts",
       "tests/unit/auth-clear-account-error.test.ts",
@@ -216,6 +217,7 @@
       "tests/unit/forwarded-header-budget.test.ts",
       "tests/unit/gemini-web-capabilities-9356.test.ts",
       "tests/unit/gemini-web-missing-browser-3516.test.ts",
+      "tests/unit/gemini-web-capabilities-9356.test.ts",
       "tests/unit/grok-cli-oauth.test.ts",
       "tests/unit/guardrails-api-3496.test.ts",
       "tests/unit/headroom-codex-quota-snapshot-6379.test.ts",
@@ -277,6 +279,7 @@
       "tests/unit/repro-7503-no-choices.test.ts",
       "tests/unit/repro-9486.test.ts",
       "tests/unit/repro-9630-combo-false-503.test.ts",
+      "tests/unit/repro-9486.test.ts",
       "tests/unit/repro-antigravity-404-family-cooldown-hijack.test.ts",
       "tests/unit/responses-handler.test.ts",
       "tests/unit/rotation-config-omniroute.test.ts",
diff --git a/tests/unit/adobe-firefly-references.test.ts b/tests/unit/adobe-firefly-references.test.ts
new file mode 100644
index 0000000000..861afad59e
--- /dev/null
+++ b/tests/unit/adobe-firefly-references.test.ts
@@ -0,0 +1,90 @@
+import { test } from "node:test";
+import assert from "node:assert";
+import {
+  ADOBE_FIREFLY_VIDEO_MODELS,
+  extractAdobeSourceImageReferences,
+  normalizeAdobeReferenceBlobs,
+} from "../../open-sse/services/adobeFireflyClient.ts";
+import { getAdobeModels } from "../../src/app/api/providers/[id]/models/adobeFireflyDiscovery.ts";
+
+function userImsJwt(): string {
+  const payload = Buffer.from(
+    JSON.stringify({
+      user_id: "test@AdobeID",
+      type: "access_token",
+      client_id: "clio-playground-web",
+    })
+  ).toString("base64url");
+  return `eyJhbGciOiJSUzI1NiJ9.${payload}.${"sig".padEnd(40, "x")}`;
+}
+
+test("reference validation enforces discovered roles, counts, and frame order", () => {
+  const kling = ADOBE_FIREFLY_VIDEO_MODELS["kling-3"];
+  assert.deepEqual(
+    normalizeAdobeReferenceBlobs(kling, [
+      { id: "frame-a", mediaType: "image", usage: "frame" },
+      { id: "frame-b", mediaType: "image", usage: "frame" },
+    ]),
+    [
+      { id: "frame-a", usage: "frame", order: 1 },
+      { id: "frame-b", usage: "frame", order: 2 },
+    ]
+  );
+  assert.throws(
+    () => normalizeAdobeReferenceBlobs(kling, [{ id: "bad", mediaType: "image", usage: "mask" }]),
+    /does not support image references with usage 'mask'/
+  );
+  assert.throws(
+    () =>
+      normalizeAdobeReferenceBlobs(kling, [
+        { id: "frame-a", usage: "frame" },
+        { id: "frame-b", usage: "frame" },
+        { id: "frame-c", usage: "frame" },
+      ]),
+    /at most 2 frame image reference/
+  );
+});
+
+test("structured references skip malformed entries and preserve explicit roles", () => {
+  assert.deepEqual(
+    extractAdobeSourceImageReferences({
+      adobe_reference_inputs: [
+        null,
+        { media_type: "video", source: "ignored" },
+        { media_type: "image", source: "data:image/png;base64,AAAA", usage: "frame", order: 2 },
+      ],
+    }),
+    [{ source: "data:image/png;base64,AAAA", usage: "frame", order: 2 }]
+  );
+});
+
+test("provider discovery adapter returns live capabilities and verified fallback", async () => {
+  const live = await getAdobeModels(undefined, userImsJwt(), {}, async () =>
+    Response.json({
+      models: [
+        {
+          modelId: "firefly-image",
+          acModelFamilyProviderDisplayName: "Adobe",
+          modelVersions: {
+            image5: {
+              enabled: true,
+              outputModality: ["image"],
+              modelDisplayName: "Firefly Image 5",
+              requestSchema: { type: "object", properties: { prompt: { type: "string" } } },
+            },
+          },
+        },
+      ],
+    })
+  );
+  assert.equal(live.source, "api");
+  assert.equal(live.models[0].id, "firefly-image-image5");
+  assert.ok(live.models[0].media_capabilities);
+
+  const fallback = await getAdobeModels(undefined, userImsJwt(), {}, async () => {
+    throw new Error("offline");
+  });
+  assert.equal(fallback.source, "local_catalog");
+  assert.equal(fallback.models.length, 52);
+  assert.match(fallback.warning || "", /discovery unavailable/);
+});
diff --git a/tests/unit/adobe-firefly.test.ts b/tests/unit/adobe-firefly.test.ts
index 549df4b95b..258bea7036 100644
--- a/tests/unit/adobe-firefly.test.ts
+++ b/tests/unit/adobe-firefly.test.ts
@@ -78,6 +78,11 @@ test("adobe-firefly is registered in IMAGE_PROVIDERS with adobe-firefly-image fo
   assert.equal(entry.format, "adobe-firefly-image");
   assert.match(entry.baseUrl, /firefly-3p\.ff\.adobe\.io/);
   assert.ok(Array.isArray(entry.models) && entry.models.length >= 4);
+  assert.equal(
+    entry.models.some((model: { id: string }) => model.id === "nano-banana-pro"),
+    false,
+    "routing-only compatibility aliases must not be advertised as discovered models"
+  );
 });
 
 test("adobe-firefly is registered in VIDEO_PROVIDERS with adobe-firefly-video format", () => {
@@ -154,20 +159,25 @@ test("normalizeAdobeOutputResolution maps quality tiers", () => {
   assert.equal(normalizeAdobeOutputResolution(undefined, undefined), "2K");
 });
 
-test("resolveAdobeImageModel maps catalog and long model ids", () => {
-  assert.equal(resolveAdobeImageModel("nano-banana-pro").id, "nano-banana-pro");
-  assert.equal(resolveAdobeImageModel("adobe-firefly/nano-banana-2").id, "nano-banana-2");
-  assert.equal(resolveAdobeImageModel("firefly-nano-banana-pro-2k-16x9").id, "nano-banana-pro");
-  assert.equal(resolveAdobeImageModel("gpt-image").id, "gpt-image");
+test("resolveAdobeImageModel maps valid aliases to exact discovery ids", () => {
+  assert.equal(resolveAdobeImageModel("nano-banana-pro").id, "gemini-flash-nano-banana-2");
+  assert.equal(
+    resolveAdobeImageModel("adobe-firefly/nano-banana-2").id,
+    "gemini-flash-nano-banana-3"
+  );
+  assert.equal(resolveAdobeImageModel("gpt-image").id, "gpt-image-2");
+  assert.throws(
+    () => resolveAdobeImageModel("invented-image-model"),
+    /Unknown Adobe Firefly image model/
+  );
   assert.ok(ADOBE_FIREFLY_IMAGE_MODELS["nano-banana-pro"].upstreamModelVersion);
 });
 
-test("resolveAdobeVideoModel maps sora/veo/kling families", () => {
-  assert.equal(resolveAdobeVideoModel("sora-2").id, "sora-2");
-  assert.equal(resolveAdobeVideoModel("firefly-sora2-pro-8s-16x9").id, "sora-2-pro");
-  assert.equal(resolveAdobeVideoModel("veo-3.1-fast").id, "veo-3.1-fast");
-  assert.equal(resolveAdobeVideoModel("kling-3").id, "kling-3");
-  assert.ok(ADOBE_FIREFLY_VIDEO_MODELS["sora-2"].defaultDuration > 0);
+test("resolveAdobeVideoModel maps only discovered video models", () => {
+  assert.equal(resolveAdobeVideoModel("veo-3.1-fast").id, "veo-3.1-fast-generate");
+  assert.equal(resolveAdobeVideoModel("kling-3").id, "kling-kling-v3-standard-i2v");
+  assert.throws(() => resolveAdobeVideoModel("sora-2"), /Unknown Adobe Firefly video model/);
+  assert.ok(ADOBE_FIREFLY_VIDEO_MODELS["veo-3.1"].defaultDuration > 0);
 });
 
 test("buildAdobeImagePayload produces nano and gpt-image shapes", () => {
@@ -265,41 +275,12 @@ test("buildAdobeImagePayload attaches referenceBlobs like live adobe_atach_image
     sourceImageIds: ["aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee"],
   });
   assert.deepEqual(gpt.referenceBlobs, [
-    { id: "aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee", usage: "subject" },
+    { id: "aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee", usage: "source" },
   ]);
   assert.equal((gpt.generationMetadata as Record<string, unknown>).module, "image2image");
-
-  // gpt-image: only first 2 subject refs survive (extra screenshots hang colligo).
-  const gptMany = buildAdobeImagePayload({
-    prompt: "edit me",
-    aspectRatio: "1:1",
-    outputResolution: "1K",
-    modelSpec: ADOBE_FIREFLY_IMAGE_MODELS["gpt-image-2"],
-    sourceImageIds: ["id-1", "id-2", "id-3", "id-4", "id-5"],
-  });
-  assert.deepEqual(gptMany.referenceBlobs, [
-    { id: "id-1", usage: "subject" },
-    { id: "id-2", usage: "subject" },
-  ]);
-
-  // nano keeps up to 4 general refs for multi-panel composition.
-  const nanoMany = buildAdobeImagePayload({
-    prompt: "compose",
-    aspectRatio: "16:9",
-    outputResolution: "2K",
-    modelSpec: ADOBE_FIREFLY_IMAGE_MODELS["nano-banana-2"],
-    sourceImageIds: ["a", "b", "c", "d", "e"],
-  });
-  assert.equal((nanoMany.referenceBlobs as unknown[]).length, 4);
-  assert.equal((nanoMany.referenceBlobs as Array<{ usage: string }>)[0].usage, "general");
 });
 
-test("adobeFireflyMaxImageRefs + adaptive image timeout", () => {
-  assert.equal(adobeFireflyMaxImageRefs("gpt-image-2"), 2);
-  assert.equal(adobeFireflyMaxImageRefs("adobe-firefly/gpt-image"), 2);
-  assert.equal(adobeFireflyMaxImageRefs("nano-banana-2"), 4);
-  assert.equal(adobeFireflyMaxImageRefs("flux-2"), 2);
-
+test("adobeFireflyImageTimeoutMs scales boundedly with reference count", () => {
   assert.equal(adobeFireflyImageTimeoutMs({ refCount: 0 }), DEFAULT_IMAGE_TIMEOUT_MS);
   assert.equal(
     adobeFireflyImageTimeoutMs({ refCount: 2 }),
@@ -381,16 +362,7 @@ test("resolveAdobeSourceImageIds uploads data URLs then returns blob ids", async
   assert.equal(ADOBE_FIREFLY_IMAGE_UPLOAD_URL.includes("storage/image"), true);
 });
 
-test("buildAdobeVideoPayload produces sora and veo shapes", () => {
-  const sora = buildAdobeVideoPayload({
-    prompt: "ocean waves",
-    aspectRatio: "16:9",
-    duration: 8,
-    modelSpec: ADOBE_FIREFLY_VIDEO_MODELS["sora-2"],
-  });
-  assert.equal(sora.modelId, "sora");
-  assert.equal(sora.duration, 8);
-
+test("buildAdobeVideoPayload follows discovered fields and reference roles", () => {
   const veo = buildAdobeVideoPayload({
     prompt: "city flyover",
     aspectRatio: "9:16",
@@ -399,12 +371,30 @@ test("buildAdobeVideoPayload produces sora and veo shapes", () => {
   });
   assert.equal(veo.modelId, "veo");
   assert.equal(veo.modelVersion, "3.1-generate");
-  assert.equal(
-    (veo.modelSpecificPayload as Record<string, Record<string, unknown>>).parameters
-      .durationSeconds,
-    6
-  );
+  assert.equal(veo.duration, 6);
   assert.equal(veo.generateAudio, true);
+
+  const kling = buildAdobeVideoPayload({
+    prompt: "ocean waves",
+    aspectRatio: "16:9",
+    duration: 5,
+    modelSpec: ADOBE_FIREFLY_VIDEO_MODELS["kling-3"],
+    sourceImageIds: ["aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee"],
+  });
+  assert.equal(kling.modelVersion, "kling_v3_standard_i2v");
+  assert.deepEqual(kling.referenceBlobs, [
+    { id: "aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee", usage: "frame", order: 1 },
+  ]);
+  assert.throws(
+    () =>
+      buildAdobeVideoPayload({
+        prompt: "bad duration",
+        aspectRatio: "16:9",
+        duration: 5,
+        modelSpec: ADOBE_FIREFLY_VIDEO_MODELS["veo-3.1"],
+      }),
+    /supports duration/
+  );
 });
 
 test("extractAdobeResultLink prefers x-override-status-link then links.result", () => {
@@ -539,7 +529,7 @@ test("adobe-firefly is in USAGE_SUPPORTED_PROVIDERS for Limits", () => {
   assert.ok(USAGE_SUPPORTED_PROVIDERS.includes("firefly"));
 });
 
-test("parseAdobeModelsDiscovery extracts image/video versions", () => {
+test("parseAdobeModelsDiscovery preserves schemas and maps exact ids", () => {
   const rows = parseAdobeModelsDiscovery({
     models: [
       {
@@ -550,16 +540,44 @@ test("parseAdobeModelsDiscovery extracts image/video versions", () => {
             outputModality: ["image"],
             modelDisplayName: "Gemini 3.0 (Nano Banana Pro)",
             healthStatus: "HEALTHY",
+            inputMediaUseCase: ["editing"],
+            bksGenerationModel: "firefly_3p:external:gemini_flash_2",
+            requestSchema: {
+              type: "object",
+              properties: {
+                prompt: { type: "string" },
+                referenceBlobs: {
+                  maxItems: 14,
+                  "x-capabilities": [
+                    {
+                      mediaType: "image",
+                      usageConstraints: [{ usageType: "general", minItems: 0, maxItems: 14 }],
+                      maxFileSizeBytes: 104857600,
+                    },
+                  ],
+                },
+              },
+            },
           },
         },
       },
       {
-        modelId: "sora",
+        modelId: "veo",
         modelVersions: {
-          "sora-2": {
+          "3.1-generate": {
             enabled: true,
             outputModality: ["video"],
-            modelDisplayName: "Sora 2",
+            modelDisplayName: "Veo 3.1",
+            requestSchema: {
+              allOf: [
+                {
+                  properties: {
+                    prompt: { type: "string" },
+                    duration: { anyOf: [{ type: "integer", enum: [4, 6, 8] }] },
+                  },
+                },
+              ],
+            },
           },
         },
       },
@@ -569,14 +587,35 @@ test("parseAdobeModelsDiscovery extracts image/video versions", () => {
   assert.equal(rows[0].modality, "image");
   assert.equal(rows[1].modality, "video");
   const catalog = mapDiscoveredToCatalog(rows);
-  assert.ok(catalog.some((m) => m.id === "nano-banana-pro"));
-  assert.ok(catalog.some((m) => m.id === "sora-2"));
+  assert.ok(catalog.some((m) => m.id === "gemini-flash-nano-banana-2"));
+  assert.ok(catalog.some((m) => m.id === "veo-3.1-generate"));
+  assert.equal(catalog[0].capabilities.referenceInputs[0].maxItems, 14);
+  assert.deepEqual(catalog[1].capabilities.supportedDurations, [4, 6, 8]);
 });
 
-test("fallback catalog has image and video entries from get_models capture", () => {
-  assert.ok(ADOBE_FIREFLY_FALLBACK_MODELS.length >= 10);
-  assert.ok(getAdobeFireflyFallbackCatalog("image").length >= 4);
-  assert.ok(getAdobeFireflyFallbackCatalog("video").length >= 4);
+test("fallback catalog is the verified discovery snapshot without invented Sora", () => {
+  assert.equal(ADOBE_FIREFLY_FALLBACK_MODELS.length, 52);
+  assert.equal(getAdobeFireflyFallbackCatalog("image").length, 17);
+  assert.equal(getAdobeFireflyFallbackCatalog("video").length, 35);
+  assert.equal(
+    ADOBE_FIREFLY_FALLBACK_MODELS.some((model) => model.id.includes("sora")),
+    false
+  );
+  assert.equal(
+    ADOBE_FIREFLY_FALLBACK_MODELS.some(
+      (model) => model.id.includes("kling") && model.id.includes("omni")
+    ),
+    false
+  );
+  assert.ok(ADOBE_FIREFLY_FALLBACK_MODELS.some((model) => model.id === "kling-kling-o3"));
+  assert.equal(
+    ADOBE_FIREFLY_IMAGE_MODELS["nano-banana-pro"].capabilities.referenceInputs[0].maxItems,
+    14
+  );
+  assert.equal(
+    ADOBE_FIREFLY_IMAGE_MODELS["gpt-image"].capabilities.referenceInputs[0].maxItems,
+    16
+  );
 });
 
 test("extractAdobeAccountIdFromToken reads user_id claim", () => {
@@ -716,7 +755,7 @@ test("adobeFireflyGenerateVideo submit+poll happy path (mocked)", async () => {
   const result = await adobeFireflyGenerateVideo({
     accessToken: "tok",
     prompt: "drone over forest",
-    model: "sora-2",
+    model: "veo-3.1",
     duration: 4,
     aspectRatio: "16:9",
     fetchImpl: fetchImpl as typeof fetch,
@@ -727,7 +766,7 @@ test("adobeFireflyGenerateVideo submit+poll happy path (mocked)", async () => {
 
 test("handleAdobeFireflyVideoGeneration returns 400 without prompt", async () => {
   const result = await handleAdobeFireflyVideoGeneration({
-    model: "sora-2",
+    model: "veo-3.1",
     provider: "adobe-firefly",
     body: {},
     credentials: { apiKey: "aaa.bbb.ccc" },
diff --git a/tests/unit/compression/session-dedup-memory-7849.test.ts b/tests/unit/compression/session-dedup-memory-7849.test.ts
index dd3e6c2d98..8cab226280 100644
--- a/tests/unit/compression/session-dedup-memory-7849.test.ts
+++ b/tests/unit/compression/session-dedup-memory-7849.test.ts
@@ -80,6 +80,8 @@ test("#7849: the two-message pathological pair stays bounded", () => {
     Date.now() - started < 4000,
     "the pathological pair must stay fast; quadratic work would take seconds"
   );
+  assert.strictEqual(result.body, body, "bounded processing must preserve the input body");
+  assert.equal(result.compressed, false, "the non-deduplicable pair must fail open");
   assert.ok(Array.isArray((result.body as { messages?: unknown[] }).messages));
 });
 
diff --git a/tests/unit/poe-api-executor-regression.test.ts b/tests/unit/poe-api-executor-regression.test.ts
index e93953a53e..8ce969b981 100644
--- a/tests/unit/poe-api-executor-regression.test.ts
+++ b/tests/unit/poe-api-executor-regression.test.ts
@@ -212,7 +212,7 @@ test("#8969: mocked execute posts Chat Completions with Bearer, no Cookie, strip
 
   globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => {
     const headers = new Headers(init?.headers);
-    const rawBody = typeof init?.body === "string" ? init.body : "{}";
+    const rawBody = await new Request(input, init).text();
     seen.push({
       url: String(input),
       method: (init?.method || "GET").toUpperCase(),
diff --git a/tests/unit/quality-validation-benign-error.test.ts b/tests/unit/quality-validation-benign-error.test.ts
new file mode 100644
index 0000000000..c038d4520b
--- /dev/null
+++ b/tests/unit/quality-validation-benign-error.test.ts
@@ -0,0 +1,167 @@
+/**
+ * TDD regression guard — quality validation false-positive on benign `error`
+ * fields in streaming SSE chunks.
+ *
+ * `isStreamingUpstreamError` treats ANY non-null `error` field as an upstream
+ * failure: `parsed.error != null` is true for `{}`, `""`, `false`, and `0`.
+ * When a client like opencode issues a tool-call turn, the upstream SSE opens
+ * with role-only frames (no recognized content) and a later chunk that carries
+ * real tool_calls content PLUS a benign empty `error` field (a field some
+ * backends emit on every chunk). The error gate runs BEFORE the content
+ * recognizers, so that single frame short-circuits to "error" → 502
+ * "streaming upstream error" — while the same combo via kilocode (different
+ * wire format) never emits the empty `error` field and works fine.
+ */
+import test from "node:test";
+import assert from "node:assert/strict";
+
+const { validateResponseQuality } = await import("../../open-sse/services/combo.ts");
+
+const encoder = new TextEncoder();
+const silentLog = { warn: () => {} };
+
+function openAiSseStream(events: string[]): ReadableStream<Uint8Array> {
+  const body = events.join("\n") + "\n";
+  return new ReadableStream<Uint8Array>({
+    start(controller) {
+      controller.enqueue(encoder.encode(body));
+      controller.close();
+    },
+  });
+}
+
+/**
+ * OpenAI-compatible tool-call stream that ALSO carries a benign empty `error`
+ * field on the tool_calls chunk. Some backends emit `"error": {}` or
+ * `"error": ""` alongside every chunk; that is not a real upstream failure.
+ * The frame must be treated as CONTENT (valid), not ERROR.
+ */
+function makeToolCallStreamWithBenignError(): Response {
+  const events = [
+    // role-only first chunk — no recognized content, widens the peek window
+    `data: ${JSON.stringify({
+      id: "chatcmpl_1",
+      object: "chat.completion.chunk",
+      created: 123,
+      model: "gpt-4o",
+      choices: [{ index: 0, delta: { role: "assistant" }, finish_reason: null }],
+    })}`,
+    "",
+    // tool_calls delta + benign empty `error` field (the bug trigger)
+    `data: ${JSON.stringify({
+      id: "chatcmpl_2",
+      object: "chat.completion.chunk",
+      created: 123,
+      model: "gpt-4o",
+      choices: [
+        {
+          index: 0,
+          delta: {
+            tool_calls: [
+              { index: 0, id: "call_1", type: "function", function: { name: "Bash", arguments: "" } },
+            ],
+          },
+          finish_reason: null,
+        },
+      ],
+      error: {},
+    })}`,
+    "",
+    `data: [DONE]`,
+    "",
+  ];
+  return new Response(openAiSseStream(events), {
+    status: 200,
+    headers: { "content-type": "text/event-stream" },
+  });
+}
+
+test("OpenAI stream with tool_calls + benign empty error:{} field is VALID (not 502)", async () => {
+  const res = makeToolCallStreamWithBenignError();
+  const out = await validateResponseQuality(res, true, silentLog);
+  assert.equal(
+    out.valid,
+    true,
+    `expected valid for tool_calls chunk with benign error:{}, got valid=false (reason: ${out.reason})`
+  );
+  assert.ok(out.clonedResponse, "clonedResponse must be present for valid streaming response");
+});
+
+test("OpenAI stream with tool_calls + benign empty error:'' field is VALID", async () => {
+  const events = [
+    `data: ${JSON.stringify({
+      id: "chatcmpl_3",
+      object: "chat.completion.chunk",
+      created: 123,
+      model: "gpt-4o",
+      choices: [{ index: 0, delta: { role: "assistant" }, finish_reason: null }],
+    })}`,
+    "",
+    `data: ${JSON.stringify({
+      id: "chatcmpl_4",
+      object: "chat.completion.chunk",
+      created: 123,
+      model: "gpt-4o",
+      choices: [
+        {
+          index: 0,
+          delta: {
+            tool_calls: [
+              { index: 0, id: "call_2", type: "function", function: { name: "Read", arguments: "" } },
+            ],
+          },
+          finish_reason: null,
+        },
+      ],
+      error: "",
+    })}`,
+    "",
+    `data: [DONE]`,
+    "",
+  ];
+  const res = new Response(openAiSseStream(events), {
+    status: 200,
+    headers: { "content-type": "text/event-stream" },
+  });
+  const out = await validateResponseQuality(res, true, silentLog);
+  assert.equal(
+    out.valid,
+    true,
+    `expected valid for tool_calls chunk with benign error:"", got valid=false (reason: ${out.reason})`
+  );
+});
+
+test("Stream with a REAL non-empty error object is still flagged as invalid", async () => {
+  const events = [
+    `data: ${JSON.stringify({
+      id: "chatcmpl_5",
+      object: "chat.completion.chunk",
+      created: 123,
+      model: "gpt-4o",
+      choices: [{ index: 0, delta: { role: "assistant" }, finish_reason: null }],
+    })}`,
+    "",
+    `data: ${JSON.stringify({
+      id: "chatcmpl_6",
+      object: "chat.completion.chunk",
+      created: 123,
+      model: "gpt-4o",
+      choices: [{ index: 0, delta: {}, finish_reason: null }],
+      error: { message: "upstream quota exceeded", code: "rate_limit_exceeded" },
+    })}`,
+    "",
+    `data: [DONE]`,
+    "",
+  ];
+  const res = new Response(openAiSseStream(events), {
+    status: 200,
+    headers: { "content-type": "text/event-stream" },
+  });
+  const out = await validateResponseQuality(res, true, silentLog);
+  assert.equal(
+    out.valid,
+    false,
+    `expected invalid for real error object, got valid=true (reason: ${out.reason})`
+  );
+  assert.match(out.reason ?? "", /streaming upstream error/, "reason should mention the upstream error");
+});
diff --git a/tests/unit/rate-limit-queue-timeout-message-4165.test.ts b/tests/unit/rate-limit-queue-timeout-message-4165.test.ts
index e514bb9428..685c01e67d 100644
--- a/tests/unit/rate-limit-queue-timeout-message-4165.test.ts
+++ b/tests/unit/rate-limit-queue-timeout-message-4165.test.ts
@@ -26,6 +26,12 @@ function wait(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+// Leave enough scheduling headroom for a loaded CI/devbox while keeping the
+// executing callback longer than the queue-only budget. The actual queued-job
+// case stays short because it controls dispatch deterministically.
+const DISPATCHED_QUEUE_BUDGET_MS = 2_000;
+const QUEUED_QUEUE_BUDGET_MS = 250;
+
 test.afterEach(async () => {
   await rateLimitManager.__resetRateLimitManagerForTests();
 });
@@ -43,14 +49,23 @@ async function triggerQueueTimeout() {
     concurrentRequests: 1,
     requestsPerMinute: 100000,
     minTimeBetweenRequestsMs: 0,
-    maxWaitMs: 40,
+    maxWaitMs: DISPATCHED_QUEUE_BUDGET_MS,
   });
-  rateLimitManager.enableRateLimitProtection("conn-queue-timeout");
+  const connectionId = "conn-dispatched-timeout";
+  rateLimitManager.enableRateLimitProtection(connectionId);
 
-  return rateLimitManager.withRateLimit("openai", "conn-queue-timeout", "gpt-4o", async () => {
-    await wait(400); // > maxWaitMs (40ms) → Bottleneck fails the job
-    return "should-not-reach";
-  });
+  let dispatched = false;
+  const result = await rateLimitManager.withRateLimit(
+    "test-provider",
+    connectionId,
+    null,
+    async () => {
+      dispatched = true;
+      await wait(DISPATCHED_QUEUE_BUDGET_MS + 250);
+      return "should-not-reach";
+    }
+  );
+  return { dispatched, result };
 }
 
 async function triggerQueuedTimeout() {
@@ -60,7 +75,7 @@ async function triggerQueuedTimeout() {
     concurrentRequests: 1,
     requestsPerMinute: 0,
     minTimeBetweenRequestsMs: 0,
-    maxWaitMs: 40,
+    maxWaitMs: QUEUED_QUEUE_BUDGET_MS,
   });
   const connectionId = "conn-queued-timeout";
   rateLimitManager.enableRateLimitProtection(connectionId);
@@ -79,13 +94,12 @@ async function triggerQueuedTimeout() {
   await firstExecuting;
 
   let caught: unknown;
+  let queuedDispatched = false;
   try {
-    await rateLimitManager.withRateLimit(
-      "test-provider",
-      connectionId,
-      null,
-      async () => "should-not-dispatch"
-    );
+    await rateLimitManager.withRateLimit("test-provider", connectionId, null, async () => {
+      queuedDispatched = true;
+      return "should-not-dispatch";
+    });
     assert.fail("expected the queued job to expire");
   } catch (error) {
     caught = error;
@@ -93,16 +107,20 @@ async function triggerQueuedTimeout() {
     releaseFirst();
     await first;
   }
-  return caught;
+  return { caught, queuedDispatched };
 }
 
 test("#4165 a dispatched provider call is not killed by the queue budget", async () => {
-  const result = await triggerQueueTimeout();
-  assert.equal(result, "should-not-reach");
+  const execution = await triggerQueueTimeout();
+  assert.equal(execution.dispatched, true, "the callback must enter execution");
+  assert.equal(execution.result, "should-not-reach");
 });
 
 test("#4165 queue expiry surfaces a clear local error", async () => {
-  const caught = (await triggerQueuedTimeout()) as Error & { code?: string };
+  const result = await triggerQueuedTimeout();
+  assert.ok(result.caught instanceof Error, "queue expiry must reject with an Error");
+  assert.equal(result.queuedDispatched, false, "an expired queued callback must never dispatch");
+  const caught = result.caught as Error & { code?: string };
   assert.equal(caught.code, "RATE_LIMIT_QUEUE_TIMEOUT");
   assert.match(caught.message, /maxWaitMs/);
   assert.match(caught.message, /not an upstream/i);
diff --git a/tests/unit/search-route.test.ts b/tests/unit/search-route.test.ts
index ce634b4877..4cb231a64b 100644
--- a/tests/unit/search-route.test.ts
+++ b/tests/unit/search-route.test.ts
@@ -452,7 +452,13 @@ test("v1 search POST returns 400 when auto-select finds no configured provider (
     const body = (await response.json()) as any;
 
     assert.equal(response.status, 400);
+    assert.equal(capturedUrl, "", "fallback-only SearXNG must not receive an upstream request");
     assert.ok(body.error?.message || body.error);
+    assert.match(
+      String(body.error?.message ?? body.error),
+      /provider|configured/i,
+      "the response must explain that no provider was selected"
+    );
   } finally {
     globalThis.fetch = originalFetch;
   }
diff --git a/tests/unit/telemetry-auto-cleanup-6848.test.ts b/tests/unit/telemetry-auto-cleanup-6848.test.ts
index f1485de55e..2952304628 100644
--- a/tests/unit/telemetry-auto-cleanup-6848.test.ts
+++ b/tests/unit/telemetry-auto-cleanup-6848.test.ts
@@ -72,6 +72,19 @@ function ensureTelemetryTable(): void {
   `);
 }
 
+test.beforeEach(() => {
+  ensureTelemetryTable();
+  const db = getDbInstance()!;
+  for (const table of [
+    "domain_cost_history",
+    "compression_cache_stats",
+    "xp_audit_log",
+    "compression_run_telemetry",
+  ]) {
+    db.exec(`DELETE FROM ${table}`);
+  }
+});
+
 // ─── Tests ───────────────────────────────────────────────────────────────
 
 test("#6848 cleanupDomainCostHistory: deletes rows older than retention window", async () => {
@@ -147,14 +160,15 @@ test("#6848 cleanupXpAuditLog: deletes rows older than retention window", async
 test("#6848 cleanupCompressionRunTelemetry: deletes rows older than retention window", async () => {
   ensureTelemetryTable();
   const db = getDbInstance()!;
-  const now = Math.floor(Date.now() / 1000);
+  const now = Date.now();
+  const nowSeconds = Math.floor(now / 1000);
   const insert = db.prepare(
     "INSERT INTO compression_run_telemetry (timestamp, tokens_before, tokens_after) VALUES (?, ?, ?)"
   );
 
-  insert.run(now - 40 * DAY_SECONDS, 1000, 500);
-  insert.run(now - 40 * DAY_SECONDS, 2000, 800);
-  insert.run(now - 5 * DAY_SECONDS, 1500, 600);
+  insert.run(nowSeconds - 40 * DAY_SECONDS, 1000, 500);
+  insert.run(nowSeconds - 40 * DAY_SECONDS, 2000, 800);
+  insert.run(nowSeconds - 5 * DAY_SECONDS, 1500, 600);
 
   const result = await cleanupCompressionRunTelemetry();
 
diff --git a/tests/unit/translator-claude-to-gemini.test.ts b/tests/unit/translator-claude-to-gemini.test.ts
index 0fd757b8e3..86ada46d8c 100644
--- a/tests/unit/translator-claude-to-gemini.test.ts
+++ b/tests/unit/translator-claude-to-gemini.test.ts
@@ -200,6 +200,16 @@ test("Claude -> Gemini omits unsigned functionCall instead of injecting a fake t
     false,
     "signature-less tool_use must not become a native functionCall"
   );
+  assert.equal(
+    JSON.stringify(result).includes('"thoughtSignature"'),
+    false,
+    "the translator must not synthesize a fake thought signature"
+  );
+  assert.equal(
+    JSON.stringify(result).includes("read_file"),
+    false,
+    "the omitted unsigned call must not leak its tool payload elsewhere"
+  );
 });
 
 test("Claude -> Gemini sanitizes long tool names and exposes a restore map", () => {
diff --git a/tests/unit/triage-bugs-2026-08-02.test.ts b/tests/unit/triage-bugs-2026-08-02.test.ts
index 3ed0b2b67e..0c329c24d8 100644
--- a/tests/unit/triage-bugs-2026-08-02.test.ts
+++ b/tests/unit/triage-bugs-2026-08-02.test.ts
@@ -61,7 +61,6 @@ test("#9142 Anthropic top-level system prompts must trigger background detection
     "system_prompt_pattern"
   );
 });
-
 // #9140 — VS Code routes filter out built-in auto models
 const { isUsableChatModel } =
   await import("../../src/app/api/v1/vscode/[token]/usableChatModel.ts");
@@ -78,7 +77,6 @@ test("#9140 VS Code listing must accept built-in auto routing entries", () => {
     "operator-created combo should still be rejected"
   );
 });
-
 // ── #9160 model discovery: capabilities.effort_tiers ────────────────────────
 
 test("#9160 model discovery must ingest capabilities.effort_tiers", () => {
diff --git a/tests/unit/validate-release-green.test.ts b/tests/unit/validate-release-green.test.ts
index bd37c75ae5..5b5b20a60a 100644
--- a/tests/unit/validate-release-green.test.ts
+++ b/tests/unit/validate-release-green.test.ts
@@ -22,16 +22,12 @@ const extract = extractCiGates as (
 ) => { id: string; job: string; args: string[]; env?: Record<string, string> }[];
 
 test("eslintCounts sums errors + warnings across files", () => {
-  const parsed = [
-    { errorCount: 2, warningCount: 5 },
-    { errorCount: 0, warningCount: 3 },
-    {},
-  ];
+  const parsed = [{ errorCount: 2, warningCount: 5 }, { errorCount: 0, warningCount: 3 }, {}];
   assert.deepEqual(eslintCounts(parsed), { errors: 2, warnings: 8 });
 });
 
 test("parseEslintJson tolerates a leading non-JSON banner", () => {
-  const out = "npm warn something\n[{\"errorCount\":0,\"warningCount\":1}]";
+  const out = 'npm warn something\n[{"errorCount":0,"warningCount":1}]';
   assert.deepEqual(parseEslintJson(out), [{ errorCount: 0, warningCount: 1 }]);
   assert.equal(parseEslintJson("no json here"), null);
 });
@@ -52,8 +48,14 @@ test("parseEslintJson tolerates ESLint's trailing unpruned-suppressions stderr s
 });
 
 test("parseCognitiveCount reads the gate's count (en + pt)", () => {
-  assert.equal(parseCognitiveCount("[cognitive-complexity] 797 function(s) exceed the threshold (15)."), 797);
-  assert.equal(parseCognitiveCount("[cognitive-complexity] REGRESSÃO — 801 violações > baseline 797"), 801);
+  assert.equal(
+    parseCognitiveCount("[cognitive-complexity] 797 function(s) exceed the threshold (15)."),
+    797
+  );
+  assert.equal(
+    parseCognitiveCount("[cognitive-complexity] REGRESSÃO — 801 violações > baseline 797"),
+    801
+  );
   assert.equal(parseCognitiveCount("no number"), null);
 });
 
@@ -175,8 +177,16 @@ test("pre-flight wires the test-masking PR-context gate against origin/main (v3.
   );
   // run() must honor a per-gate env override so GITHUB_BASE_REF actually reaches the child
   // (routed through buildGateEnv since the --hermetic scrub was added).
-  assert.match(src, /env:\s*buildGateEnv\(opts\.env\)/, "run() must merge opts.env into the child env");
-  assert.match(src, /\.\.\.\(extra \|\| \{\}\)/, "buildGateEnv must spread the per-gate env override");
+  assert.match(
+    src,
+    /env:\s*buildGateEnv\(opts\.env\)/,
+    "run() must merge opts.env into the child env"
+  );
+  assert.match(
+    src,
+    /\.\.\.\(extra \|\| \{\}\)/,
+    "buildGateEnv must spread the per-gate env override"
+  );
 });
 
 test("pre-flight --hermetic scrubs the live-test trigger vars (2026-07-05 false-positive fix)", async () => {
@@ -214,6 +224,27 @@ test("pre-flight runs the slow suites CONCURRENTLY (v3.8.45 perf — was ~1h ser
   assert.match(src, /slow\.forEach\([\s\S]*?saveGateLog\(g\.id/, "each slow gate persists its log");
 });
 
+test("pre-flight runs tarball boot only after the package artifact builder completes", async () => {
+  const fs = await import("node:fs");
+  const src = fs.readFileSync(
+    new URL("../../scripts/quality/validate-release-green.mjs", import.meta.url),
+    "utf8"
+  );
+  const parallelWave = src.indexOf("const slowResults = await Promise.all");
+  const packBoot = src.indexOf('id: "pack-boot"');
+
+  assert.ok(parallelWave >= 0, "the parallel slow-gate wave must exist");
+  assert.ok(
+    packBoot > parallelWave,
+    "pack-boot must be declared after the parallel artifact build"
+  );
+  assert.match(
+    src,
+    /packArtifactResult[\s\S]*?check:pack-boot/,
+    "pack-boot must be explicitly sequenced from the package-artifact result"
+  );
+});
+
 // ─── --full-ci gate extraction (P0, v3.8.46 post-mortem) ─────────────────────
 
 const CI_FIXTURE = `
@@ -259,7 +290,11 @@ test("extractCiGates: pulls npm-run gate steps from the ci.yml gate jobs only",
   assert.ok(ids.includes("check:docs-all") && ids.includes("check:docs-symbols"), "multi-line run");
   // …and NON-gate steps + jobs outside the gate set are ignored.
   assert.ok(!ids.includes("build") && !ids.some((i) => i.startsWith("test:")), "no build/test-run");
-  assert.equal(gates.find((g) => g.job === "test-unit"), undefined, "test-unit job is not scanned");
+  assert.equal(
+    gates.find((g) => g.job === "test-unit"),
+    undefined,
+    "test-unit job is not scanned"
+  );
 });
 
 test("extractCiGates: preserves `-- <args>` so ratchet flags reach the script", () => {
@@ -272,7 +307,10 @@ test("extractCiGates: preserves `-- <args>` so ratchet flags reach the script",
 test("extractCiGates: skips the non-local gates (pr-evidence, codeql-ratchet)", () => {
   const ids = extract(CI_FIXTURE).map((g) => g.id);
   assert.ok(!ids.includes("check:pr-evidence"), "pr-evidence needs a PR body — skipped");
-  assert.ok(!ids.includes("check:codeql-ratchet"), "codeql-ratchet is a remote-main check — skipped");
+  assert.ok(
+    !ids.includes("check:codeql-ratchet"),
+    "codeql-ratchet is a remote-main check — skipped"
+  );
   assert.ok(FULL_CI_SKIP.has("check:pr-evidence") && FULL_CI_SKIP.has("check:codeql-ratchet"));
 });
 
@@ -295,10 +333,7 @@ test("extractCiGates: attaches GITHUB_BASE_REF=main env to test-masking + de-dup
 
 test("extractCiGates: the REAL ci.yml yields the base-reds that leaked in v3.8.46", async () => {
   const fs = await import("node:fs");
-  const yaml = fs.readFileSync(
-    new URL("../../.github/workflows/ci.yml", import.meta.url),
-    "utf8"
-  );
+  const yaml = fs.readFileSync(new URL("../../.github/workflows/ci.yml", import.meta.url), "utf8");
   const ids = new Set(extract(yaml).map((g) => g.id));
   // The exact gates that leaked to the v3.8.46 release PR because the pre-flight
   // never ran them — --full-ci now reproduces every one.