rename CLAUDE.md to AGENTS.md

Opening a generated image/video and quickly clicking the backdrop to
close left the whole page unclickable, with no visible overlay to
explain why.

**Cause:** `Dialog.Overlay`/`Dialog.Content` are `forceMount`ed so
react-spring owns the leave animation. On close `Dialog.Root`'s `open`
flips false while the layer is still mounted, and Radix derives
`disableOutsidePointerEvents` from that flag, so its cleanup never
restores the `pointer-events: none` it set on `<body>`. Closing slowly
masked it; closing fast interrupts the leave spring so the clearing
render never comes.

**Fix:** `unregisterModal` now schedules `releaseStrandedBodyLock`,
clearing a lock nothing still owns. Bails if a modal is still registered
or a real open Radix dialog exists.

.sqlx/query-03919ba8286d18980ecaa0038df76f43f5388db0d3838181fa8f15f4cbb932af.json

@@ -9,4 +9,4 @@
     "nullable": []
   },
   "hash": "03919ba8286d18980ecaa0038df76f43f5388db0d3838181fa8f15f4cbb932af"
-}
+}

.sqlx/query-258ac40d3fab39f110e1e82d50e73542423bfe9a21f8127e6cd83214c1726e25.json

@@ -9,4 +9,4 @@
     "nullable": []
   },
   "hash": "258ac40d3fab39f110e1e82d50e73542423bfe9a21f8127e6cd83214c1726e25"
-}
+}

.sqlx/query-5ad1951163b15a9e241f949f2e66cde830d51d70b395f93000bc47ecb9c2083f.json

@@ -0,0 +1,135 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  token as `token: McpSessionToken`,\n  user_token as `user_token: UserToken`,\n  maybe_mcp_client_name,\n  maybe_mcp_client_version,\n  maybe_mcp_client_vendor,\n  ip_address_creation,\n  ip_address_update,\n  created_at,\n  updated_at,\n  expires_at,\n  maybe_deleted_at\nFROM mcp_sessions\nWHERE user_token = ?\nORDER BY id DESC\nLIMIT ? OFFSET ?\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: McpSessionToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "maybe_mcp_client_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_mcp_client_version",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_mcp_client_vendor",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "ip_address_creation",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "ip_address_update",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "expires_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "5ad1951163b15a9e241f949f2e66cde830d51d70b395f93000bc47ecb9c2083f"
+}

.sqlx/query-62b3e2e058331a6819acd98c634b3bf2d10aa38d43b49ab69fb8637497beec2f.json

@@ -110,4 +110,4 @@
     ]
   },
   "hash": "62b3e2e058331a6819acd98c634b3bf2d10aa38d43b49ab69fb8637497beec2f"
-}
+}

.sqlx/query-6ca0fcdf495624cf347f612586868f6dea93f52d9f942a92dcd2b3e6aba7c63c.json

@@ -33,4 +33,4 @@
     ]
   },
   "hash": "6ca0fcdf495624cf347f612586868f6dea93f52d9f942a92dcd2b3e6aba7c63c"
-}
+}

.sqlx/query-827eb468e1f732f72e0dc8f655add2b50f12cb933bba230a1fd4abb594a1944a.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE mcp_sessions\nSET maybe_deleted_at = NOW()\nWHERE private_session_token = ?\n  AND maybe_deleted_at IS NULL\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "827eb468e1f732f72e0dc8f655add2b50f12cb933bba230a1fd4abb594a1944a"
+}

.sqlx/query-847acba63c2ee29b5d59bea4cdd88f12ec4b3e8a4317ab26a1e9039c0b66a1b2.json

@@ -0,0 +1,113 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  users.token as `user_token: UserToken`,\n  users.username,\n  users.display_name,\n  users.email_address,\n  users.user_role_slug,\n  users.is_banned,\n  user_roles.can_ban_users,\n  users.maybe_feature_flags,\n  mcp_sessions.token as `mcp_session_token: McpSessionToken`\nFROM mcp_sessions\nINNER JOIN users\n  ON users.token = mcp_sessions.user_token\nLEFT OUTER JOIN user_roles\n  ON users.user_role_slug = user_roles.slug\nWHERE mcp_sessions.private_session_token = ?\n  AND mcp_sessions.maybe_deleted_at IS NULL\n  AND mcp_sessions.expires_at > NOW()\n  AND users.user_deleted_at IS NULL\n  AND users.mod_deleted_at IS NULL\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "email_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "user_role_slug",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "is_banned",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "can_ban_users",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_feature_flags",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "mcp_session_token: McpSessionToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false
+    ]
+  },
+  "hash": "847acba63c2ee29b5d59bea4cdd88f12ec4b3e8a4317ab26a1e9039c0b66a1b2"
+}

.sqlx/query-8b61abdfcfcd5c601489521793ef5c8cbe47f408e5c7e9c9a6bf01c9c8a57247.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE mcp_sessions\nSET maybe_deleted_at = NOW()\nWHERE token = ?\n  AND maybe_deleted_at IS NULL\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "8b61abdfcfcd5c601489521793ef5c8cbe47f408e5c7e9c9a6bf01c9c8a57247"
+}

.sqlx/query-96599b4854248d84188b092db84edb50dc5402bb7771fd8ea96a96ad43e732c0.json

@@ -9,4 +9,4 @@
     "nullable": []
   },
   "hash": "96599b4854248d84188b092db84edb50dc5402bb7771fd8ea96a96ad43e732c0"
-}
+}

.sqlx/query-c59cea297d441b4960074802809af5ff0bdf8969abb34c01101584bffd887010.json

@@ -0,0 +1,135 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  token as `token: McpSessionToken`,\n  user_token as `user_token: UserToken`,\n  maybe_mcp_client_name,\n  maybe_mcp_client_version,\n  maybe_mcp_client_vendor,\n  ip_address_creation,\n  ip_address_update,\n  created_at,\n  updated_at,\n  expires_at,\n  maybe_deleted_at\nFROM mcp_sessions\nWHERE token = ?\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: McpSessionToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "maybe_mcp_client_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_mcp_client_version",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_mcp_client_vendor",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "ip_address_creation",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "ip_address_update",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "expires_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "c59cea297d441b4960074802809af5ff0bdf8969abb34c01101584bffd887010"
+}

.sqlx/query-cd04f4f7b48ae9da53b6a210111f8e3edff94dee30263e22b45d5e29dbe9245a.json

@@ -176,4 +176,4 @@
     ]
   },
   "hash": "cd04f4f7b48ae9da53b6a210111f8e3edff94dee30263e22b45d5e29dbe9245a"
-}
+}

.sqlx/query-cf2794c87868e77dfaa45bdbe630ae276dbb8c2d041442ba465af0b7a6d61af6.json

@@ -99,4 +99,4 @@
     ]
   },
   "hash": "cf2794c87868e77dfaa45bdbe630ae276dbb8c2d041442ba465af0b7a6d61af6"
-}
+}

.sqlx/query-d88098343686ded52a71fc45a1b96d28ea3003975d6e7d20eee2022aa31d8189.json

@@ -9,4 +9,4 @@
     "nullable": []
   },
   "hash": "d88098343686ded52a71fc45a1b96d28ea3003975d6e7d20eee2022aa31d8189"
-}
+}

.sqlx/query-ed8f7ef94099d2dddf50f819316485351e149db72ce8a4f5cff6b57f4b84244d.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE mcp_sessions\nSET\n  expires_at = NOW() + INTERVAL ? DAY,\n  private_refresh_token = ?,\n  ip_address_update = ?\nWHERE private_session_token = ?\n  AND private_refresh_token = ?\n  AND maybe_deleted_at IS NULL\n  AND expires_at > NOW()\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": []
+  },
+  "hash": "ed8f7ef94099d2dddf50f819316485351e149db72ce8a4f5cff6b57f4b84244d"
+}

.sqlx/query-f1d41ad17cb01f5aef0ce2eea042ccb3e5e649365a0befaf0f46492b75523442.json

@@ -121,4 +121,4 @@
     ]
   },
   "hash": "f1d41ad17cb01f5aef0ce2eea042ccb3e5e649365a0befaf0f46492b75523442"
-}
+}

.sqlx/query-f67a73ea3d5751cc76d2d6f954bd939179b3e9005a359e04c3a4dd78f8fe562e.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO mcp_sessions\nSET\n  token = ?,\n  private_session_token = ?,\n  private_refresh_token = ?,\n  user_token = ?,\n  maybe_mcp_client_name = ?,\n  maybe_mcp_client_version = ?,\n  maybe_mcp_client_vendor = ?,\n  ip_address_creation = ?,\n  ip_address_update = ?,\n  created_at = NOW(),\n  expires_at = NOW() + INTERVAL ? DAY\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 10
+    },
+    "nullable": []
+  },
+  "hash": "f67a73ea3d5751cc76d2d6f954bd939179b3e9005a359e04c3a4dd78f8fe562e"
+}

AGENTS.md

@@ -0,0 +1,97 @@
+# AGENTS.md
+
+This file provides guidance for coding agents when working with the Artcraft monorepo.
+
+## Project Overview
+
+Artcraft is a web and desktop application for generating AI image and video. It is written in 
+Rust and TypeScript and contains desktop, server, and frontend components.
+
+## Project Structure
+
+```
+artcraft/
+├── _database/                           # Schema definitions and migrations (MySQL, SQLite, Elasticsearch, etc.)
+│   ├── elasticsearch/                   # Elasticsearch schema and queries
+│   └── sql/                             # MySQL and SQLite schema definitions and migrations
+│       ├── artcraft_migrations/         # ArtCraft desktop app SQLite migrations
+│       ├── migrations/                  # Server MySQL migrations
+│       └── migrations_squashed/         # Fully materialized MySQL schema definitions for most tables
+├── _tools/                              # Various 3rd party tool integrations and configurations
+│   └── postman/                         # Postman configs for test HTTP requests against development and production
+├── build/                               # Dockerfile build instructions for server components
+├── crates/                              # Rust workspace
+│   ├── api_clients/                     # HTTP clients for calling internal and 3rd party services
+│   ├── cli/                             # Command line tools
+│   ├── desktop/                         # Desktop (Tauri) apps
+│   │   └── artcraft/                    # (Important) ArtCraft, the desktop app. This is one of our main pieces of software
+│   ├── lib/                             # Various utility libraries for servers, CLI tools, desktop, etc.
+│   ├── schema/                          # Data definition layer: MySQL, SQlite, Redis, S3/R2 buckets, etc.
+│   │   ├── buckets/                     # Declares R2 cloud bucket topology
+│   │   ├── database/                    # MySQL, SQLite, Elasticsearch, Redis, etc.
+│   │   │   ├── elasticsearch_schema/    # Elasticsearch
+│   │   │   ├── migration/               # (deprecated) Online schema adapters for MySQL 
+│   │   │   ├── mysql_queries/           # Sqlx MySQL queries for our backend monolith `storyteller-web`, jobs, etc.
+│   │   │   ├── redis_common/            # Redis support
+│   │   │   ├── redis_schema/            # Redis key and HKEY topology
+│   │   │   ├── sqlite_queries/          # (deprecated) Sqlite queries
+│   │   │   └── sqlite_tasks/            # Queries for the ArtCraft desktop app's "tasks" database.
+│   │   ├── public/                      # Token identifier and enum variant definitions
+│   │   │   ├── composite_identifier/    # MySQL composite key system
+│   │   │   ├── enums/                   # MySQL "enums" stored in VARCHAR fields.
+│   │   │   └── tokens/                  # Primary database identifiers with Stripe-like ID prefixes, eg. "user_{entropy}"
+│   │   └── service/                     # Backend HTTP services and jobs
+│   │       ├── job/                     # Backend jobs.
+│   │       │   └── video_thumbnail_job/ # Render video thumbnails
+│   │       ├── plugins/                 # Collections of reusable Actix-Web HTTP functions (user and billing systems)
+│   │       └── web/                     # HTTP web servers
+│   │           └── storyteller_web/     # (Important) Our main HTTP API monolith and backend.
+│   └── frontend/                        # Nx typescript monorepo for our websites and Tauri desktop apps
+│       ├── apps/                        # Websites and Tauri desktop apps
+│       │   ├── artcraft/                # ArtCraft the Tauri app's frontend. Used in conjunction with `artcraft` the Rust crate.
+│       │   └── artcraft-website/        # The website for https://getartcraft.com
+│       └── libs/                        # Support libraries, reusable React components, etc.
+└── Cargo.toml                           # Rust monorepo workspace
+```
+
+## Code Style
+
+- Rust with no minimum supported version
+- Actix-web for HTTP services
+- SQLx for MySQL and SQLite; prefer `sqlx::query!` / `sqlx::query_as!` compile-time checked macros over runtime `sqlx::query()` whenever possible
+- MySQL queries belong in the `mysql_queries` crate, not in application/service crates like `storyteller-web` — call those query functions instead of embedding `sqlx::query!` / `sqlx::query()` in handlers. (Query-writing conventions live in `crates/schema/database/mysql_queries/AGENTS.md`.)
+- A mix of wreq and reqwest for Rust HTTP clients
+- Never use `println!` or `eprintln!` outside of tests; use `log` crate macros instead
+- When two crates export the same type name, alias imports with a suffix: `use foo::Bar as BarFoo;`
+- Prefer `use` imports over inline fully-qualified paths; only qualify inline for true one-offs or std collisions
+- TypeScript with Nx, React, Vite, Zustand, and Three.js
+- Use two spaces for indentation
+
+### File Layout
+
+Organize for top-to-bottom reading. Important things first, details later.
+
+- **Constants** at the top (after imports)
+- **Structs/enums** next; outer structs above inner sub-structs
+- **API types** in order: Request, Response, Error
+- **In impl blocks**: constructors first, then public methods, then private helpers
+- Private helpers go *below* the methods that call them
+- Among helpers: meatier logic above leaf-level formatters
+- **In test modules**: constants first, then test cases (grouped into sub-modules when 2+), then helper functions last
+
+## Markdown
+
+- **Tables must be space-padded so columns align in plain text.** Markdown
+  tables are read raw (terminals, diffs, editors) at least as often as
+  rendered, and condensed tables are unreadable there. Pad every cell to its
+  column width:
+
+  ```markdown
+  | Model        | Configuration | Credits    | Speed | Score   |
+  |--------------|---------------|--------------------|---------|
+  | Meshy 6      | text or image | 104        | 80.0  | +24     |
+  | Rodin 2.5    | text or image | 13         | 10.0  | +3      |
+  ```
+
+  Not: `| Model | Configuration | Credits | Speed | Score |` packed tight
+  with varying widths per row.

CLAUDE.md

@@ -1,96 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance for Claude Code when working with the Artcraft monorepo.
-
-## Project Overview
-
-Artcraft is a web and desktop application for generating AI image and video. It is written in 
-Rust and TypeScript and contains desktop, server, and frontend components.
-
-## Project Structure
-
-```
-artcraft/
-├── _database/                           # Schema definitions and migrations (MySQL, SQLite, Elasticsearch, etc.)
-│   ├── elasticsearch/                   # Elasticsearch schema and queries
-│   └── sql/                             # MySQL and SQLite schema definitions and migrations
-│       ├── artcraft_migrations/         # ArtCraft desktop app SQLite migrations
-│       ├── migrations/                  # Server MySQL migrations
-│       └── migrations_squashed/         # Fully materialized MySQL schema definitions for most tables
-├── _tools/                              # Various 3rd party tool integrations and configurations
-│   └── postman/                         # Postman configs for test HTTP requests against development and production
-├── build/                               # Dockerfile build instructions for server components
-├── crates/                              # Rust workspace
-│   ├── api_clients/                     # HTTP clients for calling internal and 3rd party services
-│   ├── cli/                             # Command line tools
-│   ├── desktop/                         # Desktop (Tauri) apps
-│   │   └── artcraft/                    # (Important) ArtCraft, the desktop app. This is one of our main pieces of software
-│   ├── lib/                             # Various utility libraries for servers, CLI tools, desktop, etc.
-│   ├── schema/                          # Data definition layer: MySQL, SQlite, Redis, S3/R2 buckets, etc.
-│   │   ├── buckets/                     # Declares R2 cloud bucket topology
-│   │   ├── database/                    # MySQL, SQLite, Elasticsearch, Redis, etc.
-│   │   │   ├── elasticsearch_schema/    # Elasticsearch
-│   │   │   ├── migration/               # (deprecated) Online schema adapters for MySQL 
-│   │   │   ├── mysql_queries/           # Sqlx MySQL queries for our backend monolith `storyteller-web`, jobs, etc.
-│   │   │   ├── redis_common/            # Redis support
-│   │   │   ├── redis_schema/            # Redis key and HKEY topology
-│   │   │   ├── sqlite_queries/          # (deprecated) Sqlite queries
-│   │   │   └── sqlite_tasks/            # Queries for the ArtCraft desktop app's "tasks" database.
-│   │   ├── public/                      # Token identifier and enum variant definitions
-│   │   │   ├── composite_identifier/    # MySQL composite key system
-│   │   │   ├── enums/                   # MySQL "enums" stored in VARCHAR fields.
-│   │   │   └── tokens/                  # Primary database identifiers with Stripe-like ID prefixes, eg. "user_{entropy}"
-│   │   └── service/                     # Backend HTTP services and jobs
-│   │       ├── job/                     # Backend jobs.
-│   │       │   └── video_thumbnail_job/ # Render video thumbnails
-│   │       ├── plugins/                 # Collections of reusable Actix-Web HTTP functions (user and billing systems)
-│   │       └── web/                     # HTTP web servers
-│   │           └── storyteller_web/     # (Important) Our main HTTP API monolith and backend.
-│   └── frontend/                        # Nx typescript monorepo for our websites and Tauri desktop apps
-│       ├── apps/                        # Websites and Tauri desktop apps
-│       │   ├── artcraft/                # ArtCraft the Tauri app's frontend. Used in conjunction with `artcraft` the Rust crate.
-│       │   └── artcraft-website/        # The website for https://getartcraft.com
-│       └── libs/                        # Support libraries, reusable React components, etc.
-└── Cargo.toml                           # Rust monorepo workspace
-```
-
-## Code Style
-
-- Rust with no minimum supported version
-- Actix-web for HTTP services
-- SQLx for MySQL and SQLite. MySQL queries belong in the `mysql_queries` crate, not in application/service crates like `storyteller-web` — call those query functions instead of embedding `sqlx::query!` / `sqlx::query()` in handlers. (Query-writing conventions live in `crates/schema/database/mysql_queries/CLAUDE.md`.)
-- A mix of wreq and reqwest for Rust HTTP clients
-- Never use `println!` or `eprintln!` outside of tests; use `log` crate macros instead
-- When two crates export the same type name, alias imports with a suffix: `use foo::Bar as BarFoo;`
-- Prefer `use` imports over inline fully-qualified paths; only qualify inline for true one-offs or std collisions
-- TypeScript with Nx, React, Vite, Zustand, and Three.js
-- Use two spaces for indentation
-
-### File Layout
-
-Organize for top-to-bottom reading. Important things first, details later.
-
-- **Constants** at the top (after imports)
-- **Structs/enums** next; outer structs above inner sub-structs
-- **API types** in order: Request, Response, Error
-- **In impl blocks**: constructors first, then public methods, then private helpers
-- Private helpers go *below* the methods that call them
-- Among helpers: meatier logic above leaf-level formatters
-- **In test modules**: constants first, then test cases (grouped into sub-modules when 2+), then helper functions last
-
-## Markdown
-
-- **Tables must be space-padded so columns align in plain text.** Markdown
-  tables are read raw (terminals, diffs, editors) at least as often as
-  rendered, and condensed tables are unreadable there. Pad every cell to its
-  column width:
-
-  ```markdown
-  | Model        | Configuration | Credits    | Speed | Score   |
-  |--------------|---------------|--------------------|---------|
-  | Meshy 6      | text or image | 104        | 80.0  | +24     |
-  | Rodin 2.5    | text or image | 13         | 10.0  | +3      |
-  ```
-
-  Not: `| Model | Configuration | Credits | Speed | Score |` packed tight
-  with varying widths per row.

CLAUDE.md

@@ -0,0 +1 @@
+AGENTS.md

_database/sql/migrations/2026-08-27-084409-0000_create_mcp_sessions/down.sql

@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS mcp_sessions;

_database/sql/migrations/2026-08-27-084409-0000_create_mcp_sessions/up.sql

@@ -0,0 +1,65 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Sessions for MCP and other non-human users.
+-- These work like `user_sessions`, but are created and consumed by MCP clients.
+CREATE TABLE mcp_sessions (
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- Non-private "primary key" for the session.
+  -- Used as a key to delete/manage sessions in the dashboard.
+  token VARCHAR(32) NOT NULL,
+
+  -- Private entropy presented by clients; used for lookup of live sessions.
+  private_session_token VARCHAR(64) NOT NULL,
+
+  -- Private refresh credential. Presenting this on the refresh endpoint extends the
+  -- session's expiry and ROTATES this value — the previous refresh token becomes invalid.
+  private_refresh_token VARCHAR(64) NOT NULL,
+
+  -- The user that the session belongs to.
+  user_token VARCHAR(32) NOT NULL,
+
+  -- ========== CLIENT INFO ==========
+
+  -- Trimmed name of the MCP client, if any.
+  maybe_mcp_client_name VARCHAR(255) DEFAULT NULL,
+
+  -- Trimmed version of the MCP client, if any.
+  maybe_mcp_client_version VARCHAR(255) DEFAULT NULL,
+
+  -- Trimmed vendor of the MCP client, if any.
+  maybe_mcp_client_vendor VARCHAR(255) DEFAULT NULL,
+
+  -- ========== IP ADDRESSES ==========
+
+  -- IP address that created the session. Wide enough for IPv4/IPv6.
+  ip_address_creation VARCHAR(40) NOT NULL,
+
+  -- IP address that last updated the session. Wide enough for IPv4/IPv6.
+  ip_address_update VARCHAR(40) NOT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- When the session expires, if not refreshed.
+  -- This must be set by the server code, or the session is invalid.
+  expires_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- Soft-delete timestamp. NULL means the session is live.
+  -- deletion = session termination
+  maybe_deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  UNIQUE KEY (private_session_token),
+  UNIQUE KEY (private_refresh_token),
+  KEY fk_user_token (user_token),
+  KEY index_ip_address_creation (ip_address_creation),
+  KEY index_maybe_deleted_at (maybe_deleted_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations/AGENTS.md

@@ -0,0 +1,38 @@
+# SQL Migrations
+
+Incremental schema changes applied in order by timestamp prefix.
+
+## Naming Convention
+
+Migration directories follow the format:
+
+```
+YYYY-MM-DD-HHMMSS-NNNN_description_goes_here/
+  up.sql
+  down.sql
+```
+
+These are created with the `diesel` tool, and in particular:
+
+> `diesel migration generate description_goes_here`
+
+- `NNNN` is a zero-padded sequence number for ordering multiple migrations on the same timestamp.
+- `up.sql` applies the migration forward.
+- `down.sql` reverses it.
+
+## Table Conventions
+
+- Primary key `id` columns must be `BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT`. Do not use signed IDs.
+- Always create tables with `ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin`.
+- All SQL files should start with the standard IntelliJ noinspection comments:
+  ```sql
+  -- noinspection SqlDialectInspectionForFile
+  -- noinspection SqlNoDataSourceInspectionForFile
+  -- noinspection SqlResolveForFile
+  ```
+
+## Rules
+
+- Every `up.sql` must have a corresponding `down.sql` that cleanly reverses the migration.
+- For `CREATE TABLE` migrations, the `down.sql` is typically `DROP TABLE IF EXISTS table_name;`.
+- For `ALTER TABLE` migrations, the `down.sql` reverses the alteration (e.g. `DROP COLUMN`).

_database/sql/migrations/CLAUDE.md

@@ -1,38 +0,0 @@
-# SQL Migrations
-
-Incremental schema changes applied in order by timestamp prefix.
-
-## Naming Convention
-
-Migration directories follow the format:
-
-```
-YYYY-MM-DD-HHMMSS-NNNN_description_goes_here/
-  up.sql
-  down.sql
-```
-
-These are created with the `diesel` tool, and in particular:
-
-> `diesel migration generate description_goes_here`
-
-- `NNNN` is a zero-padded sequence number for ordering multiple migrations on the same timestamp.
-- `up.sql` applies the migration forward.
-- `down.sql` reverses it.
-
-## Table Conventions
-
-- Primary key `id` columns must be `BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT`. Do not use signed IDs.
-- Always create tables with `ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin`.
-- All SQL files should start with the standard IntelliJ noinspection comments:
-  ```sql
-  -- noinspection SqlDialectInspectionForFile
-  -- noinspection SqlNoDataSourceInspectionForFile
-  -- noinspection SqlResolveForFile
-  ```
-
-## Rules
-
-- Every `up.sql` must have a corresponding `down.sql` that cleanly reverses the migration.
-- For `CREATE TABLE` migrations, the `down.sql` is typically `DROP TABLE IF EXISTS table_name;`.
-- For `ALTER TABLE` migrations, the `down.sql` reverses the alteration (e.g. `DROP COLUMN`).

_database/sql/migrations/CLAUDE.md

@@ -0,0 +1 @@
+AGENTS.md

_database/sql/migrations_squashed/AGENTS.md

@@ -0,0 +1,26 @@
+# Squashed / Materialized Schemas
+
+Fully materialized table definitions representing the current state of each table
+after all migrations have been applied. These are not executed — they exist as
+human-readable documentation of the current schema.
+
+## When to Update
+
+Update the corresponding squashed file whenever a migration changes a table's schema
+(adding columns, changing types, dropping and recreating, etc.).
+
+## Table Conventions
+
+- Primary key `id` columns must be `BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT`. Do not use signed IDs.
+- Always create tables with `ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin`.
+- All SQL files should start with the standard IntelliJ noinspection comments:
+  ```sql
+  -- noinspection SqlDialectInspectionForFile
+  -- noinspection SqlNoDataSourceInspectionForFile
+  -- noinspection SqlResolveForFile
+  ```
+
+## File Organization
+
+Files are named after their table (e.g. `users.sql`, `media_files.sql`).
+Some tables are grouped into subdirectories (e.g. `user_tables/`).

_database/sql/migrations_squashed/CLAUDE.md

@@ -1,26 +0,0 @@
-# Squashed / Materialized Schemas
-
-Fully materialized table definitions representing the current state of each table
-after all migrations have been applied. These are not executed — they exist as
-human-readable documentation of the current schema.
-
-## When to Update
-
-Update the corresponding squashed file whenever a migration changes a table's schema
-(adding columns, changing types, dropping and recreating, etc.).
-
-## Table Conventions
-
-- Primary key `id` columns must be `BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT`. Do not use signed IDs.
-- Always create tables with `ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin`.
-- All SQL files should start with the standard IntelliJ noinspection comments:
-  ```sql
-  -- noinspection SqlDialectInspectionForFile
-  -- noinspection SqlNoDataSourceInspectionForFile
-  -- noinspection SqlResolveForFile
-  ```
-
-## File Organization
-
-Files are named after their table (e.g. `users.sql`, `media_files.sql`).
-Some tables are grouped into subdirectories (e.g. `user_tables/`).

_database/sql/migrations_squashed/CLAUDE.md

@@ -0,0 +1 @@
+AGENTS.md

_database/sql/migrations_squashed/mcp_sessions.sql

@@ -0,0 +1,65 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Sessions for MCP and other non-human users.
+-- These work like `user_sessions`, but are created and consumed by MCP clients.
+CREATE TABLE mcp_sessions (
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- Non-private "primary key" for the session.
+  -- Used as a key to delete/manage sessions in the dashboard.
+  token VARCHAR(32) NOT NULL,
+
+  -- Private entropy presented by clients; used for lookup of live sessions.
+  private_session_token VARCHAR(64) NOT NULL,
+
+  -- Private refresh credential. Presenting this on the refresh endpoint extends the
+  -- session's expiry and ROTATES this value — the previous refresh token becomes invalid.
+  private_refresh_token VARCHAR(64) NOT NULL,
+
+  -- The user that the session belongs to.
+  user_token VARCHAR(32) NOT NULL,
+
+  -- ========== CLIENT INFO ==========
+
+  -- Trimmed name of the MCP client, if any.
+  maybe_mcp_client_name VARCHAR(255) DEFAULT NULL,
+
+  -- Trimmed version of the MCP client, if any.
+  maybe_mcp_client_version VARCHAR(255) DEFAULT NULL,
+
+  -- Trimmed vendor of the MCP client, if any.
+  maybe_mcp_client_vendor VARCHAR(255) DEFAULT NULL,
+
+  -- ========== IP ADDRESSES ==========
+
+  -- IP address that created the session. Wide enough for IPv4/IPv6.
+  ip_address_creation VARCHAR(40) NOT NULL,
+
+  -- IP address that last updated the session. Wide enough for IPv4/IPv6.
+  ip_address_update VARCHAR(40) NOT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- When the session expires, if not refreshed.
+  -- This must be set by the server code, or the session is invalid.
+  expires_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- Soft-delete timestamp. NULL means the session is live.
+  -- deletion = session termination
+  maybe_deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  UNIQUE KEY (private_session_token),
+  UNIQUE KEY (private_refresh_token),
+  KEY fk_user_token (user_token),
+  KEY index_ip_address_creation (ip_address_creation),
+  KEY index_maybe_deleted_at (maybe_deleted_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

crates/AGENTS.md

@@ -0,0 +1,59 @@
+# Rust Workspace
+
+All Rust code lives under `crates/`. The workspace is defined in `Cargo.toml` at the repo root.
+
+## Code Style
+
+- Two spaces for indentation (not four)
+- No minimum supported Rust version; use latest stable features freely
+- Never use `println!` or `eprintln!` outside of tests; use `log` crate macros instead
+- Use `anyhow::Result` / `AnyhowResult` for fallible functions in application code
+- Fields that are optional use the `maybe_` prefix: `maybe_creator_user_token`
+- When two crates export the same type name, alias with a suffix: `use foo::Bar as BarFoo;`
+- Prefer `use` imports over inline fully-qualified paths; only qualify inline for true one-offs or std prelude collisions (`Result`, `Option`, `Error`)
+
+## File Layout
+
+Organize for top-to-bottom reading. Important things first, details later.
+
+1. **Constants** at the top (after imports)
+2. **Primary public type** (the main struct/enum the file defines)
+3. **Supporting types** below the primary type
+4. **API types** in order: Request, Response, Error
+5. **`impl` blocks** after their type definitions
+   - Constructors first, then public methods, then private helpers
+   - Callers above callees — follow the call chain downward
+
+## Test Layout
+
+Within `#[cfg(test)] mod tests { ... }`:
+
+1. **Imports**
+2. **Constants** (test IDs, URLs, fixture data) — small context that tests reference
+3. **Test functions or sub-modules** grouped by category
+4. **Helper functions** (builders, pipeline runners, assertions)
+
+Constants provide small context up front. Test cases come next so engineers see *what* is
+tested before *how* the helpers work.
+
+Group related tests into sub-modules (`mod pricing_tests { ... }`) when a category has 2+
+tests. Don't wrap a single test in its own module. Keep nesting to two levels max. Shared
+helpers go in the parent `mod tests` so sub-modules can `use super::*`.
+
+## Building
+
+- Most crates: `cargo check -p {crate_name}` or `cargo test -p {crate_name}`
+- Crates using SQLx: `SQLX_OFFLINE=true cargo check -p {crate_name}`
+- `storyteller-web` and `mysql_queries` require `SQLX_OFFLINE=true`
+- `storyteller-web` has ~370 pre-existing warnings — check the last few lines for actual errors
+
+## Key Crates
+
+- `storyteller_web` — main HTTP API monolith (actix-web)
+- `artcraft` (desktop) — Tauri desktop app
+- `artcraft_router` — provider routing for image/video generation (Artcraft, Fal, KinoviWeb, Muapi)
+- `artcraft_api_defs` — shared HTTP API type definitions
+- `kinovi_web_client` — HTTP client for the Kinovi/KinoviWeb video generation service
+- `enums` — database-backed enums stored as VARCHAR fields
+- `tokens` — primary key identifiers with Stripe-like prefixes (e.g. `user_`, `mf_`)
+- `mysql_queries` — SQLx MySQL queries for the backend

crates/CLAUDE.md

@@ -1,59 +0,0 @@
-# Rust Workspace
-
-All Rust code lives under `crates/`. The workspace is defined in `Cargo.toml` at the repo root.
-
-## Code Style
-
-- Two spaces for indentation (not four)
-- No minimum supported Rust version; use latest stable features freely
-- Never use `println!` or `eprintln!` outside of tests; use `log` crate macros instead
-- Use `anyhow::Result` / `AnyhowResult` for fallible functions in application code
-- Fields that are optional use the `maybe_` prefix: `maybe_creator_user_token`
-- When two crates export the same type name, alias with a suffix: `use foo::Bar as BarFoo;`
-- Prefer `use` imports over inline fully-qualified paths; only qualify inline for true one-offs or std prelude collisions (`Result`, `Option`, `Error`)
-
-## File Layout
-
-Organize for top-to-bottom reading. Important things first, details later.
-
-1. **Constants** at the top (after imports)
-2. **Primary public type** (the main struct/enum the file defines)
-3. **Supporting types** below the primary type
-4. **API types** in order: Request, Response, Error
-5. **`impl` blocks** after their type definitions
-   - Constructors first, then public methods, then private helpers
-   - Callers above callees — follow the call chain downward
-
-## Test Layout
-
-Within `#[cfg(test)] mod tests { ... }`:
-
-1. **Imports**
-2. **Constants** (test IDs, URLs, fixture data) — small context that tests reference
-3. **Test functions or sub-modules** grouped by category
-4. **Helper functions** (builders, pipeline runners, assertions)
-
-Constants provide small context up front. Test cases come next so engineers see *what* is
-tested before *how* the helpers work.
-
-Group related tests into sub-modules (`mod pricing_tests { ... }`) when a category has 2+
-tests. Don't wrap a single test in its own module. Keep nesting to two levels max. Shared
-helpers go in the parent `mod tests` so sub-modules can `use super::*`.
-
-## Building
-
-- Most crates: `cargo check -p {crate_name}` or `cargo test -p {crate_name}`
-- Crates using SQLx: `SQLX_OFFLINE=true cargo check -p {crate_name}`
-- `storyteller-web` and `mysql_queries` require `SQLX_OFFLINE=true`
-- `storyteller-web` has ~370 pre-existing warnings — check the last few lines for actual errors
-
-## Key Crates
-
-- `storyteller_web` — main HTTP API monolith (actix-web)
-- `artcraft` (desktop) — Tauri desktop app
-- `artcraft_router` — provider routing for image/video generation (Artcraft, Fal, KinoviWeb, Muapi)
-- `artcraft_api_defs` — shared HTTP API type definitions
-- `kinovi_web_client` — HTTP client for the Kinovi/KinoviWeb video generation service
-- `enums` — database-backed enums stored as VARCHAR fields
-- `tokens` — primary key identifiers with Stripe-like prefixes (e.g. `user_`, `mf_`)
-- `mysql_queries` — SQLx MySQL queries for the backend

crates/CLAUDE.md

@@ -0,0 +1 @@
+AGENTS.md

crates/api_clients/artcraft/artcraft_api_defs/AGENTS.md

@@ -0,0 +1,22 @@
+# artcraft_api_defs
+
+Shared HTTP API type definitions used by both the server (`storyteller_web`) and clients.
+
+## Structure
+
+Organized by feature: `users/`, `media_file/`, `jobs/`, `moderation/`, etc.
+
+## Conventions
+
+- Request types: `#[derive(Deserialize, ToSchema)]`
+- Response types: `#[derive(Serialize, ToSchema)]`
+- Path params: `#[derive(Deserialize, ToSchema)]` with `PathInfo` suffix
+- Query params: `#[derive(Deserialize, IntoParams)]`
+
+## Orphan Rule
+
+Types that need `ResponseError` impl (actix-web) CANNOT live here because of Rust's orphan rule. Keep error response types in `storyteller_web` and only put data types here.
+
+## Dependencies
+
+Only `serde`, `serde_derive`, `utoipa`, `chrono`, `url`, and internal schema crates (`enums`, `tokens`). No actix-web dependency.

crates/api_clients/artcraft/artcraft_api_defs/CLAUDE.md

@@ -1,22 +0,0 @@
-# artcraft_api_defs
-
-Shared HTTP API type definitions used by both the server (`storyteller_web`) and clients.
-
-## Structure
-
-Organized by feature: `users/`, `media_file/`, `jobs/`, `moderation/`, etc.
-
-## Conventions
-
-- Request types: `#[derive(Deserialize, ToSchema)]`
-- Response types: `#[derive(Serialize, ToSchema)]`
-- Path params: `#[derive(Deserialize, ToSchema)]` with `PathInfo` suffix
-- Query params: `#[derive(Deserialize, IntoParams)]`
-
-## Orphan Rule
-
-Types that need `ResponseError` impl (actix-web) CANNOT live here because of Rust's orphan rule. Keep error response types in `storyteller_web` and only put data types here.
-
-## Dependencies
-
-Only `serde`, `serde_derive`, `utoipa`, `chrono`, `url`, and internal schema crates (`enums`, `tokens`). No actix-web dependency.

crates/api_clients/artcraft/artcraft_api_defs/CLAUDE.md

@@ -0,0 +1 @@
+AGENTS.md

crates/api_clients/artcraft/artcraft_api_defs/src/lib.rs

@@ -7,6 +7,7 @@ pub mod folders;
 pub mod generate;
 pub mod internal;
 pub mod jobs;
+pub mod mcp_sessions;
 pub mod media_file;
 pub mod moderation;
 pub mod omni_api;

crates/api_clients/artcraft/artcraft_api_defs/src/mcp_sessions/common.rs

@@ -0,0 +1,42 @@
+use chrono::{DateTime, Utc};
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use tokens::tokens::mcp_sessions::McpSessionToken;
+
+/// Canonical wire shape for an MCP session, used by the dashboard list.
+///
+/// NB: the secret `private_session_token` is NEVER included here — it is returned exactly once,
+/// at creation time. The `token` is the non-private management handle.
+#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
+pub struct McpSessionInfo {
+  pub token: McpSessionToken,
+
+  /// Trimmed name of the MCP client that created the session, if any.
+  pub maybe_mcp_client_name: Option<String>,
+
+  /// Trimmed version of the MCP client, if any.
+  pub maybe_mcp_client_version: Option<String>,
+
+  /// Trimmed vendor of the MCP client, if any.
+  pub maybe_mcp_client_vendor: Option<String>,
+
+  pub ip_address_creation: String,
+  pub ip_address_update: String,
+
+  pub created_at: DateTime<Utc>,
+  pub updated_at: DateTime<Utc>,
+
+  /// When the session expires, if not refreshed.
+  pub expires_at: DateTime<Utc>,
+
+  /// Termination timestamp. `None` for live (though possibly expired) sessions.
+  pub maybe_deleted_at: Option<DateTime<Utc>>,
+}
+
+/// Path info for endpoints addressed by the session's management `token` (NOT the secret
+/// `private_session_token`): `POST /v1/mcp/session/{token}/delete`.
+#[derive(Deserialize, ToSchema)]
+pub struct McpSessionPathInfo {
+  pub token: McpSessionToken,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/mcp_sessions/create_mcp_session.rs

@@ -0,0 +1,34 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use tokens::tokens::mcp_session_private::McpSessionPrivateToken;
+use tokens::tokens::mcp_session_refresh::McpSessionRefreshToken;
+
+// ── POST /v1/mcp/session/create ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct CreateMcpSessionRequest {
+  /// Name of the MCP client creating the session, if any.
+  pub maybe_mcp_client_name: Option<String>,
+
+  /// Version of the MCP client, if any.
+  pub maybe_mcp_client_version: Option<String>,
+
+  /// Vendor of the MCP client, if any.
+  pub maybe_mcp_client_vendor: Option<String>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct CreateMcpSessionSuccessResponse {
+  pub success: bool,
+
+  /// The secret credential the MCP client presents in the `Authorization` header. This is the
+  /// ONLY time it is ever returned — the caller must store it now, as it cannot be retrieved
+  /// again.
+  pub private_session_token: McpSessionPrivateToken,
+
+  /// The secret credential the MCP client presents on `/v1/mcp/session/refresh` to extend the
+  /// session. Each successful refresh returns a NEW refresh token and invalidates this one —
+  /// store whichever value is newest.
+  pub private_refresh_token: McpSessionRefreshToken,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/mcp_sessions/delete_mcp_session.rs

@@ -0,0 +1,9 @@
+use serde_derive::Serialize;
+use utoipa::ToSchema;
+
+// ── POST /v1/mcp/session/{token}/delete ──
+
+#[derive(Serialize, ToSchema)]
+pub struct DeleteMcpSessionSuccessResponse {
+  pub success: bool,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/mcp_sessions/list_mcp_sessions.rs

@@ -0,0 +1,24 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::{IntoParams, ToSchema};
+
+use crate::mcp_sessions::common::McpSessionInfo;
+
+// ── GET /v1/mcp/session/list ──
+
+#[derive(Deserialize, ToSchema, IntoParams)]
+pub struct ListMcpSessionsQueryParams {
+  /// Page size. Defaults server-side if omitted.
+  pub limit: Option<u32>,
+
+  /// Number of rows to skip. Defaults to 0.
+  pub offset: Option<u32>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct ListMcpSessionsSuccessResponse {
+  pub success: bool,
+
+  /// The user's MCP sessions (including terminated ones), newest first. The secret
+  /// `private_session_token` is never listed.
+  pub mcp_sessions: Vec<McpSessionInfo>,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/mcp_sessions/mod.rs

@@ -0,0 +1,6 @@
+pub mod common;
+pub mod create_mcp_session;
+pub mod delete_mcp_session;
+pub mod list_mcp_sessions;
+pub mod refresh_mcp_session;
+pub mod revoke_mcp_session;

crates/api_clients/artcraft/artcraft_api_defs/src/mcp_sessions/refresh_mcp_session.rs

@@ -0,0 +1,22 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use tokens::tokens::mcp_session_refresh::McpSessionRefreshToken;
+
+// ── POST /v1/mcp/session/refresh ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct RefreshMcpSessionRequest {
+  /// The session's CURRENT refresh token (from creation, or from the most recent refresh).
+  /// A stale or wrong value is an error — refresh tokens rotate and are never replayable.
+  pub private_refresh_token: McpSessionRefreshToken,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct RefreshMcpSessionSuccessResponse {
+  pub success: bool,
+
+  /// The NEW refresh token to present on the next refresh. The one just used is now invalid —
+  /// the caller must store this replacement.
+  pub private_refresh_token: McpSessionRefreshToken,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/mcp_sessions/revoke_mcp_session.rs

@@ -0,0 +1,9 @@
+use serde_derive::Serialize;
+use utoipa::ToSchema;
+
+// ── POST /v1/mcp/session/revoke ──
+
+#[derive(Serialize, ToSchema)]
+pub struct RevokeMcpSessionSuccessResponse {
+  pub success: bool,
+}

crates/api_clients/artcraft/artcraft_client/src/datatypes/common_enums/generation/api_client_generation_provider.rs

@@ -14,6 +14,14 @@ pub enum ApiClientGenerationProvider {
   Midjourney,
   Sora,
   WorldLabs,
+  Higgsfield,
+  Krea,
+  Leonardo,
+  Magnific,
+  Openart,
+  Picsart,
+  Pixverse,
+  Runway,
   /// A value not known to this client build (preserved as-is).
   Unknown(String),
 }
@@ -27,6 +35,14 @@ impl From<String> for ApiClientGenerationProvider {
       "midjourney" => Self::Midjourney,
       "sora" => Self::Sora,
       "world_labs" => Self::WorldLabs,
+      "higgsfield" => Self::Higgsfield,
+      "krea" => Self::Krea,
+      "leonardo" => Self::Leonardo,
+      "magnific" => Self::Magnific,
+      "openart" => Self::Openart,
+      "picsart" => Self::Picsart,
+      "pixverse" => Self::Pixverse,
+      "runway" => Self::Runway,
       _ => Self::Unknown(value),
     }
   }
@@ -41,6 +57,14 @@ impl From<ApiClientGenerationProvider> for String {
       ApiClientGenerationProvider::Midjourney => "midjourney".to_string(),
       ApiClientGenerationProvider::Sora => "sora".to_string(),
       ApiClientGenerationProvider::WorldLabs => "world_labs".to_string(),
+      ApiClientGenerationProvider::Higgsfield => "higgsfield".to_string(),
+      ApiClientGenerationProvider::Krea => "krea".to_string(),
+      ApiClientGenerationProvider::Leonardo => "leonardo".to_string(),
+      ApiClientGenerationProvider::Magnific => "magnific".to_string(),
+      ApiClientGenerationProvider::Openart => "openart".to_string(),
+      ApiClientGenerationProvider::Picsart => "picsart".to_string(),
+      ApiClientGenerationProvider::Pixverse => "pixverse".to_string(),
+      ApiClientGenerationProvider::Runway => "runway".to_string(),
       ApiClientGenerationProvider::Unknown(other) => other,
     }
   }
@@ -73,6 +97,14 @@ mod tests {
       (ApiClientGenerationProvider::Midjourney, "midjourney"),
       (ApiClientGenerationProvider::Sora, "sora"),
       (ApiClientGenerationProvider::WorldLabs, "world_labs"),
+      (ApiClientGenerationProvider::Higgsfield, "higgsfield"),
+      (ApiClientGenerationProvider::Krea, "krea"),
+      (ApiClientGenerationProvider::Leonardo, "leonardo"),
+      (ApiClientGenerationProvider::Magnific, "magnific"),
+      (ApiClientGenerationProvider::Openart, "openart"),
+      (ApiClientGenerationProvider::Picsart, "picsart"),
+      (ApiClientGenerationProvider::Pixverse, "pixverse"),
+      (ApiClientGenerationProvider::Runway, "runway"),
     ];
     for (variant, s) in all {
       assert_eq!(String::from(variant.clone()), s, "serialize mismatch for {:?}", variant);

crates/api_clients/artcraft/artcraft_client/src/datatypes/common_enums/generation/api_client_image_model.rs

@@ -16,6 +16,8 @@ pub enum ApiClientImageModel {
   GptImage1p5,
   GptImage2,
   GrokImagineImage,
+  GptImage2p5Flare,
+  GptImage2p5Sunburst,
   GrokImagineImageQuality,
   Midjourney7,
   Midjourney7Niji,
@@ -42,6 +44,8 @@ impl From<String> for ApiClientImageModel {
       "gpt_image_1" => Self::GptImage1,
       "gpt_image_1p5" => Self::GptImage1p5,
       "gpt_image_2" => Self::GptImage2,
+      "gpt_image_2p5_flare" => Self::GptImage2p5Flare,
+      "gpt_image_2p5_sunburst" => Self::GptImage2p5Sunburst,
       "grok_imagine_image" => Self::GrokImagineImage,
       "grok_imagine_image_q" => Self::GrokImagineImageQuality,
       "midjourney_7" => Self::Midjourney7,
@@ -70,6 +74,8 @@ impl From<ApiClientImageModel> for String {
       ApiClientImageModel::GptImage1 => "gpt_image_1".to_string(),
       ApiClientImageModel::GptImage1p5 => "gpt_image_1p5".to_string(),
       ApiClientImageModel::GptImage2 => "gpt_image_2".to_string(),
+      ApiClientImageModel::GptImage2p5Flare => "gpt_image_2p5_flare".to_string(),
+      ApiClientImageModel::GptImage2p5Sunburst => "gpt_image_2p5_sunburst".to_string(),
       ApiClientImageModel::GrokImagineImage => "grok_imagine_image".to_string(),
       ApiClientImageModel::GrokImagineImageQuality => "grok_imagine_image_q".to_string(),
       ApiClientImageModel::Midjourney7 => "midjourney_7".to_string(),
@@ -116,6 +122,8 @@ mod tests {
       (ApiClientImageModel::GptImage1, "gpt_image_1"),
       (ApiClientImageModel::GptImage1p5, "gpt_image_1p5"),
       (ApiClientImageModel::GptImage2, "gpt_image_2"),
+      (ApiClientImageModel::GptImage2p5Flare, "gpt_image_2p5_flare"),
+      (ApiClientImageModel::GptImage2p5Sunburst, "gpt_image_2p5_sunburst"),
       (ApiClientImageModel::GrokImagineImage, "grok_imagine_image"),
       (ApiClientImageModel::GrokImagineImageQuality, "grok_imagine_image_q"),
       (ApiClientImageModel::Midjourney7, "midjourney_7"),

crates/api_clients/artcraft/artcraft_client/src/datatypes/common_enums/generation/api_client_video_model.rs

@@ -25,8 +25,6 @@ pub enum ApiClientVideoModel {
   Seedance2p0Fast,
   Seedance2p0BytePlus,
   Seedance2p0BytePlusFast,
-  Seedance2p0Ultra,
-  Seedance2p0UltraFast,
   Seedance2p0BytePlusUltra,
   Seedance2p0BytePlusUltraFast,
   Seedance2p0Mini,
@@ -65,8 +63,6 @@ impl From<String> for ApiClientVideoModel {
       "seedance_2p0_fast" => Self::Seedance2p0Fast,
       "seedance_2p0_bp" => Self::Seedance2p0BytePlus,
       "seedance_2p0_bp_fast" => Self::Seedance2p0BytePlusFast,
-      "seedance_2p0_u" => Self::Seedance2p0Ultra,
-      "seedance_2p0_u_fast" => Self::Seedance2p0UltraFast,
       "seedance_2p0_bpu" => Self::Seedance2p0BytePlusUltra,
       "seedance_2p0_bpu_fast" => Self::Seedance2p0BytePlusUltraFast,
       "seedance_2p0_mini" => Self::Seedance2p0Mini,
@@ -106,8 +102,6 @@ impl From<ApiClientVideoModel> for String {
       ApiClientVideoModel::Seedance2p0Fast => "seedance_2p0_fast".to_string(),
       ApiClientVideoModel::Seedance2p0BytePlus => "seedance_2p0_bp".to_string(),
       ApiClientVideoModel::Seedance2p0BytePlusFast => "seedance_2p0_bp_fast".to_string(),
-      ApiClientVideoModel::Seedance2p0Ultra => "seedance_2p0_u".to_string(),
-      ApiClientVideoModel::Seedance2p0UltraFast => "seedance_2p0_u_fast".to_string(),
       ApiClientVideoModel::Seedance2p0BytePlusUltra => "seedance_2p0_bpu".to_string(),
       ApiClientVideoModel::Seedance2p0BytePlusUltraFast => "seedance_2p0_bpu_fast".to_string(),
       ApiClientVideoModel::Seedance2p0Mini => "seedance_2p0_mini".to_string(),
@@ -165,8 +159,6 @@ mod tests {
       (ApiClientVideoModel::Seedance2p0Fast, "seedance_2p0_fast"),
       (ApiClientVideoModel::Seedance2p0BytePlus, "seedance_2p0_bp"),
       (ApiClientVideoModel::Seedance2p0BytePlusFast, "seedance_2p0_bp_fast"),
-      (ApiClientVideoModel::Seedance2p0Ultra, "seedance_2p0_u"),
-      (ApiClientVideoModel::Seedance2p0UltraFast, "seedance_2p0_u_fast"),
       (ApiClientVideoModel::Seedance2p0BytePlusUltra, "seedance_2p0_bpu"),
       (ApiClientVideoModel::Seedance2p0BytePlusUltraFast, "seedance_2p0_bpu_fast"),
       (ApiClientVideoModel::Seedance2p0Mini, "seedance_2p0_mini"),

crates/api_clients/artcraft/artcraft_router/src/api/router_image_model.rs

@@ -19,6 +19,10 @@ pub enum RouterImageModel {
   GptImage1p5,
   #[serde(rename = "gpt_image_2")]
   GptImage2,
+  #[serde(rename = "gpt_image_2p5_flare")]
+  GptImage2p5Flare,
+  #[serde(rename = "gpt_image_2p5_sunburst")]
+  GptImage2p5Sunburst,
   #[serde(rename = "grok_imagine_image")]
   GrokImagineImage,
   #[serde(rename = "grok_imagine_image_q")]
@@ -87,4 +91,14 @@ mod tests {
   fn seedream_5p0_pro_ultra_serializes_to_seedream_5p0_pro_u() {
     assert_round_trip(RouterImageModel::Seedream5p0ProUltra, "seedream_5p0_pro_u");
   }
+
+  #[test]
+  fn gpt_image_2p5_flare_serializes_to_gpt_image_2p5_flare() {
+    assert_round_trip(RouterImageModel::GptImage2p5Flare, "gpt_image_2p5_flare");
+  }
+
+  #[test]
+  fn gpt_image_2p5_sunburst_serializes_to_gpt_image_2p5_sunburst() {
+    assert_round_trip(RouterImageModel::GptImage2p5Sunburst, "gpt_image_2p5_sunburst");
+  }
 }

crates/api_clients/artcraft/artcraft_router/src/api/router_video_model.rs

@@ -68,11 +68,7 @@ pub enum RouterVideoModel {
   #[serde(rename = "seedance_2p0_bp_fast")]
   Seedance2p0BytePlusFast,
 
-  #[serde(rename = "seedance_2p0_u")]
-  Seedance2p0Ultra,
 
-  #[serde(rename = "seedance_2p0_u_fast")]
-  Seedance2p0UltraFast,
 
   #[serde(rename = "seedance_2p0_bpu")]
   Seedance2p0BytePlusUltra,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/generate_image_request_builder.rs

@@ -16,6 +16,8 @@ use crate::generate::generate_image::providers::artcraft::flux_pro_1p1_ultra::bu
 use crate::generate::generate_image::providers::artcraft::gpt_image_1::build::build_artcraft_gpt_image_1;
 use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::build::build_artcraft_gpt_image_1p5;
 use crate::generate::generate_image::providers::artcraft::gpt_image_2::build::build_artcraft_gpt_image_2;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_flare::build::build_artcraft_gpt_image_2p5_flare;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_sunburst::build::build_artcraft_gpt_image_2p5_sunburst;
 use crate::generate::generate_image::providers::artcraft::midjourney_7::build::build_artcraft_midjourney_7;
 use crate::generate::generate_image::providers::artcraft::midjourney_7_niji::build::build_artcraft_midjourney_7_niji;
 use crate::generate::generate_image::providers::artcraft::midjourney_8::build::build_artcraft_midjourney_8;
@@ -36,6 +38,8 @@ use crate::generate::generate_image::providers::fal::flux_pro_1p1_ultra::build::
 use crate::generate::generate_image::providers::fal::gpt_image_1::build::build_fal_gpt_image_1;
 use crate::generate::generate_image::providers::fal::gpt_image_1p5::build::build_fal_gpt_image_1p5;
 use crate::generate::generate_image::providers::fal::gpt_image_2::build::build_fal_gpt_image_2;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_flare::build::build_fal_gpt_image_2p5_flare;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_sunburst::build::build_fal_gpt_image_2p5_sunburst;
 use crate::generate::generate_image::providers::fal::nano_banana::build::build_fal_nano_banana;
 use crate::generate::generate_image::providers::fal::nano_banana_2::build::build_fal_nano_banana_2;
 use crate::generate::generate_image::providers::fal::nano_banana_pro::build::build_fal_nano_banana_pro;
@@ -116,6 +120,8 @@ impl GenerateImageRequestBuilder {
       (RouterProvider::Artcraft, RouterImageModel::GptImage1) => build_artcraft_gpt_image_1(self),
       (RouterProvider::Artcraft, RouterImageModel::GptImage1p5) => build_artcraft_gpt_image_1p5(self),
       (RouterProvider::Artcraft, RouterImageModel::GptImage2) => build_artcraft_gpt_image_2(self),
+      (RouterProvider::Artcraft, RouterImageModel::GptImage2p5Flare) => build_artcraft_gpt_image_2p5_flare(self),
+      (RouterProvider::Artcraft, RouterImageModel::GptImage2p5Sunburst) => build_artcraft_gpt_image_2p5_sunburst(self),
       (RouterProvider::Artcraft, RouterImageModel::NanoBanana) => build_artcraft_nano_banana(self),
       (RouterProvider::Artcraft, RouterImageModel::NanoBanana2) => build_artcraft_nano_banana_2(self),
       (RouterProvider::Artcraft, RouterImageModel::NanoBananaPro) => build_artcraft_nano_banana_pro(self),
@@ -137,6 +143,8 @@ impl GenerateImageRequestBuilder {
       (RouterProvider::Fal, RouterImageModel::GptImage1) => build_fal_gpt_image_1(self),
       (RouterProvider::Fal, RouterImageModel::GptImage1p5) => build_fal_gpt_image_1p5(self),
       (RouterProvider::Fal, RouterImageModel::GptImage2) => build_fal_gpt_image_2(self),
+      (RouterProvider::Fal, RouterImageModel::GptImage2p5Flare) => build_fal_gpt_image_2p5_flare(self),
+      (RouterProvider::Fal, RouterImageModel::GptImage2p5Sunburst) => build_fal_gpt_image_2p5_sunburst(self),
       (RouterProvider::Fal, RouterImageModel::NanoBanana) => build_fal_nano_banana(self),
       (RouterProvider::Fal, RouterImageModel::NanoBanana2) => build_fal_nano_banana_2(self),
       (RouterProvider::Fal, RouterImageModel::NanoBananaPro) => build_fal_nano_banana_pro(self),

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_request.rs

@@ -19,6 +19,10 @@ use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::cost::A
 use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::request::ArtcraftGptImage1p5RequestState;
 use crate::generate::generate_image::providers::artcraft::gpt_image_2::cost::ArtcraftGptImage2CostState;
 use crate::generate::generate_image::providers::artcraft::gpt_image_2::request::ArtcraftGptImage2RequestState;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_flare::cost::ArtcraftGptImage2p5FlareCostState;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_flare::request::ArtcraftGptImage2p5FlareRequestState;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_sunburst::cost::ArtcraftGptImage2p5SunburstCostState;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_sunburst::request::ArtcraftGptImage2p5SunburstRequestState;
 use crate::generate::generate_image::providers::artcraft::midjourney_7::cost::ArtcraftMidjourney7CostState;
 use crate::generate::generate_image::providers::artcraft::midjourney_7::request::ArtcraftMidjourney7RequestState;
 use crate::generate::generate_image::providers::artcraft::midjourney_7_niji::cost::ArtcraftMidjourney7NijiCostState;
@@ -59,6 +63,10 @@ use crate::generate::generate_image::providers::fal::gpt_image_1p5::cost::FalGpt
 use crate::generate::generate_image::providers::fal::gpt_image_1p5::request::FalGptImage1p5RequestState;
 use crate::generate::generate_image::providers::fal::gpt_image_2::cost::FalGptImage2CostState;
 use crate::generate::generate_image::providers::fal::gpt_image_2::request::FalGptImage2RequestState;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_flare::cost::FalGptImage2p5FlareCostState;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_flare::request::FalGptImage2p5FlareRequestState;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_sunburst::cost::FalGptImage2p5SunburstCostState;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_sunburst::request::FalGptImage2p5SunburstRequestState;
 use crate::generate::generate_image::providers::fal::nano_banana::cost::FalNanoBananaCostState;
 use crate::generate::generate_image::providers::fal::nano_banana::request::FalNanoBananaRequestState;
 use crate::generate::generate_image::providers::fal::nano_banana_2::cost::FalNanoBanana2CostState;
@@ -92,6 +100,8 @@ pub enum ImageGenerationRequest {
   ArtcraftGptImage1(ArtcraftGptImage1RequestState),
   ArtcraftGptImage1p5(ArtcraftGptImage1p5RequestState),
   ArtcraftGptImage2(ArtcraftGptImage2RequestState),
+  ArtcraftGptImage2p5Flare(ArtcraftGptImage2p5FlareRequestState),
+  ArtcraftGptImage2p5Sunburst(ArtcraftGptImage2p5SunburstRequestState),
   ArtcraftNanoBanana(ArtcraftNanoBananaRequestState),
   ArtcraftNanoBanana2(ArtcraftNanoBanana2RequestState),
   ArtcraftNanoBananaPro(ArtcraftNanoBananaProRequestState),
@@ -114,6 +124,8 @@ pub enum ImageGenerationRequest {
   FalGptImage1(FalGptImage1RequestState),
   FalGptImage1p5(FalGptImage1p5RequestState),
   FalGptImage2(FalGptImage2RequestState),
+  FalGptImage2p5Flare(FalGptImage2p5FlareRequestState),
+  FalGptImage2p5Sunburst(FalGptImage2p5SunburstRequestState),
   FalNanoBanana(FalNanoBananaRequestState),
   FalNanoBanana2(FalNanoBanana2RequestState),
   FalNanoBananaPro(FalNanoBananaProRequestState),
@@ -140,6 +152,8 @@ impl ImageGenerationRequest {
       Self::ArtcraftGptImage1(_) => RouterProvider::Artcraft,
       Self::ArtcraftGptImage1p5(_) => RouterProvider::Artcraft,
       Self::ArtcraftGptImage2(_) => RouterProvider::Artcraft,
+      Self::ArtcraftGptImage2p5Flare(_) => RouterProvider::Artcraft,
+      Self::ArtcraftGptImage2p5Sunburst(_) => RouterProvider::Artcraft,
       Self::ArtcraftNanoBanana(_) => RouterProvider::Artcraft,
       Self::ArtcraftNanoBanana2(_) => RouterProvider::Artcraft,
       Self::ArtcraftNanoBananaPro(_) => RouterProvider::Artcraft,
@@ -161,6 +175,8 @@ impl ImageGenerationRequest {
       Self::FalGptImage1(_) => RouterProvider::Fal,
       Self::FalGptImage1p5(_) => RouterProvider::Fal,
       Self::FalGptImage2(_) => RouterProvider::Fal,
+      Self::FalGptImage2p5Flare(_) => RouterProvider::Fal,
+      Self::FalGptImage2p5Sunburst(_) => RouterProvider::Fal,
       Self::FalNanoBanana(_) => RouterProvider::Fal,
       Self::FalNanoBanana2(_) => RouterProvider::Fal,
       Self::FalNanoBananaPro(_) => RouterProvider::Fal,
@@ -201,6 +217,12 @@ impl ImageGenerationRequest {
       Self::ArtcraftGptImage2(request) => {
         Ok(ArtcraftGptImage2CostState::from_request(request).estimate_cost())
       }
+      Self::ArtcraftGptImage2p5Flare(request) => {
+        Ok(ArtcraftGptImage2p5FlareCostState::from_request(request).estimate_cost())
+      }
+      Self::ArtcraftGptImage2p5Sunburst(request) => {
+        Ok(ArtcraftGptImage2p5SunburstCostState::from_request(request).estimate_cost())
+      }
       Self::ArtcraftNanoBanana(request) => {
         Ok(ArtcraftNanoBananaCostState::from_request(request).estimate_cost())
       }
@@ -249,6 +271,8 @@ impl ImageGenerationRequest {
       Self::FalGptImage1(request) => Ok(FalGptImage1CostState::from_request(request).estimate_cost()),
       Self::FalGptImage1p5(request) => Ok(FalGptImage1p5CostState::from_request(request).estimate_cost()),
       Self::FalGptImage2(request) => Ok(FalGptImage2CostState::from_request(request).estimate_cost()),
+      Self::FalGptImage2p5Flare(request) => Ok(FalGptImage2p5FlareCostState::from_request(request).estimate_cost()),
+      Self::FalGptImage2p5Sunburst(request) => Ok(FalGptImage2p5SunburstCostState::from_request(request).estimate_cost()),
       Self::FalNanoBanana(request) => Ok(FalNanoBananaCostState::from_request(request).estimate_cost()),
       Self::FalNanoBanana2(request) => Ok(FalNanoBanana2CostState::from_request(request).estimate_cost()),
       Self::FalNanoBananaPro(request) => Ok(FalNanoBananaProCostState::from_request(request).estimate_cost()),
@@ -296,6 +320,14 @@ impl ImageGenerationRequest {
         let artcraft_client = client.get_artcraft_client_ref()?;
         request.send(artcraft_client).await
       }
+      Self::ArtcraftGptImage2p5Flare(request) => {
+        let artcraft_client = client.get_artcraft_client_ref()?;
+        request.send(artcraft_client).await
+      }
+      Self::ArtcraftGptImage2p5Sunburst(request) => {
+        let artcraft_client = client.get_artcraft_client_ref()?;
+        request.send(artcraft_client).await
+      }
       Self::ArtcraftNanoBanana(request) => {
         let artcraft_client = client.get_artcraft_client_ref()?;
         request.send(artcraft_client).await
@@ -379,6 +411,14 @@ impl ImageGenerationRequest {
         let fal_client = client.get_fal_client_ref()?;
         request.send(fal_client).await
       }
+      Self::FalGptImage2p5Flare(request) => {
+        let fal_client = client.get_fal_client_ref()?;
+        request.send(fal_client).await
+      }
+      Self::FalGptImage2p5Sunburst(request) => {
+        let fal_client = client.get_fal_client_ref()?;
+        request.send(fal_client).await
+      }
       Self::FalNanoBanana(request) => {
         // nano_banana (Gemini 2.5 Flash) is webhook-required.
         let fal_client = client.get_fal_client_ref()?;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/build_common.rs

@@ -22,14 +22,15 @@ use crate::generate::generate_image::generate_image_request_builder::GenerateIma
 /// Per-model build functions are expected to validate model-specific
 /// constraints (e.g. unsupported aspect ratios) BEFORE calling this helper.
 /// Validation that's identical across every Artcraft image model — batch count
-/// (1..=4) and image_inputs shape — lives here.
+/// (1..=[`max_batch_count`]) and image_inputs shape — lives here.
 pub fn build_artcraft_omni_image_request(
   builder: GenerateImageRequestBuilder,
   model: CommonImageModelEnum,
 ) -> Result<OmniGenImageCostAndGenerateRequest, ArtcraftRouterError> {
   let strategy = builder.request_mismatch_mitigation_strategy;
 
-  let image_batch_count = plan_batch_count(builder.image_batch_count, strategy)?;
+  let image_batch_count =
+    plan_batch_count_with_max(builder.image_batch_count, strategy, max_batch_count(model))?;
   let image_media_tokens = resolve_image_list_ref(builder.image_inputs.clone())?;
 
   let aspect_ratio = builder.aspect_ratio.map(to_aspect_ratio_enum);
@@ -52,26 +53,47 @@ pub fn build_artcraft_omni_image_request(
   })
 }
 
+/// The largest batch each Artcraft image model accepts. Seedream 5.0 Pro and
+/// Ultra accept batches of up to 8; every other model caps at 4.
+pub fn max_batch_count(model: CommonImageModelEnum) -> u16 {
+  match model {
+    CommonImageModelEnum::Seedream5p0Pro | CommonImageModelEnum::Seedream5p0ProUltra => 8,
+    _ => 4,
+  }
+}
+
 /// Validate batch count (1..=4). Mirrors the v1 plan-level validation that
 /// every Artcraft image model performs.
 pub fn plan_batch_count(
   image_batch_count: Option<u16>,
   strategy: RequestMismatchMitigationStrategy,
+) -> Result<u16, ArtcraftRouterError> {
+  plan_batch_count_with_max(image_batch_count, strategy, 4)
+}
+
+/// Validate batch count (1..=`max`), clamping or erroring per the mitigation
+/// strategy when the request exceeds the model's cap.
+pub fn plan_batch_count_with_max(
+  image_batch_count: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+  max: u16,
 ) -> Result<u16, ArtcraftRouterError> {
   let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1..=4 => Ok(count),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(4),
-    },
+  if count == 0 {
+    return Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations));
+  }
+  if count <= max {
+    return Ok(count);
+  }
+  match strategy {
+    RequestMismatchMitigationStrategy::ErrorOut => {
+      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+        field: "image_batch_count",
+        value: format!("{}", count),
+      }))
+    }
+    RequestMismatchMitigationStrategy::PayMoreUpgrade
+    | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(max),
   }
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2p5_common_cost.rs

@@ -0,0 +1,290 @@
+use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost_and_generate_request::OmniGenImageCostAndGenerateRequest;
+use enums::common::generation::common_aspect_ratio::CommonAspectRatio as CommonAspectRatioEnum;
+use enums::common::generation::common_quality::CommonQuality as CommonQualityEnum;
+use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
+use fal_client::requests::api::image::common::gpt_image_2_resolution::GptImage2Resolution;
+use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_image_size::GptImage2p5ImageSize;
+
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+
+/// Artcraft price per output image, in hundredths of a US cent, by output dimensions and
+/// quality (`[low, medium, high]`). Rows are stored landscape-first; portrait orientations of
+/// the same dimensions price identically. Dimensions come from the aspect ratio preset and
+/// resolution tier the same way the Fal request builder derives them.
+const OUTPUT_IMAGE_PRICE_TABLE: &[(u32, u32, [u64; 3])] = &[
+  // 1:1
+  (1024, 1024, [ 65, 152,  582]),
+  (2048, 2048, [103, 239,  919]),
+  (2880, 2880, [151, 352, 1357]),
+  // 4:3
+  (1024,  768, [ 46, 105,  400]),
+  (2048, 1536, [ 73, 170,  652]),
+  (3072, 2304, [120, 279, 1073]),
+  (3312, 2480, [134, 311, 1194]),
+  // 16:9
+  (1088,  608, [ 32,  75,  285]),
+  (1920, 1080, [ 49, 114,  436]),
+  (2048, 1152, [ 53, 121,  467]),
+  (3072, 1728, [ 87, 204,  783]),
+  (3840, 2160, [124, 286, 1102]),
+];
+
+/// Artcraft price per reference image on an edit request, in hundredths of a US cent.
+const REFERENCE_IMAGE_PRICE: u64 = 88;
+
+/// The inputs that determine an Artcraft GPT Image 2.5 price. Shared by Flare and Sunburst,
+/// which are priced identically.
+#[derive(Clone, Debug)]
+pub struct ArtcraftGptImage2p5CostInputs {
+  pub quality: Option<CommonQualityEnum>,
+  pub aspect_ratio: Option<CommonAspectRatioEnum>,
+  pub resolution: Option<CommonResolutionEnum>,
+  pub num_reference_images: usize,
+  pub num_images: u16,
+}
+
+impl ArtcraftGptImage2p5CostInputs {
+  pub fn from_omni_request(request: &OmniGenImageCostAndGenerateRequest) -> Self {
+    Self {
+      quality: request.quality,
+      aspect_ratio: request.aspect_ratio,
+      resolution: request.resolution,
+      num_reference_images: request.image_media_tokens.as_ref().map(|tokens| tokens.len()).unwrap_or(0),
+      num_images: request.image_batch_count.unwrap_or(1),
+    }
+  }
+
+  /// Per-image price rounded up to whole cents, times the batch size. Quality defaults to
+  /// high. Without an aspect ratio, text-to-image prices as landscape 4:3 and edit as auto,
+  /// matching the Fal defaults the request would fall back to.
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    let quality = self.quality.unwrap_or(CommonQualityEnum::High);
+    let (width, height) = self.output_dimensions();
+    let hundredths_per_image = output_image_price(quality, width, height)
+      + REFERENCE_IMAGE_PRICE * self.num_reference_images as u64;
+    let cost_in_usd_cents = hundredths_per_image.div_ceil(100) * self.num_images as u64;
+
+    ImageGenerationCostEstimate {
+      cost_in_credits: Some(cost_in_usd_cents),
+      cost_in_usd_cents: Some(cost_in_usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+
+  fn output_dimensions(&self) -> (u32, u32) {
+    let is_edit = self.num_reference_images > 0;
+    let default_size = if is_edit { GptImage2p5ImageSize::Auto } else { GptImage2p5ImageSize::Landscape4x3 };
+    let size = self.aspect_ratio.map(to_image_size).unwrap_or(default_size);
+    size.estimated_output_dimensions(self.resolution.map(to_resolution))
+  }
+}
+
+/// Look up the per-image price. Dimensions not in the table fall back to the largest row,
+/// which is the most expensive.
+fn output_image_price(quality: CommonQualityEnum, width: u32, height: u32) -> u64 {
+  let prices = lookup_price_row(width, height)
+    .unwrap_or_else(|| OUTPUT_IMAGE_PRICE_TABLE[OUTPUT_IMAGE_PRICE_TABLE.len() - 1].2);
+  match quality {
+    CommonQualityEnum::Low => prices[0],
+    CommonQualityEnum::Medium => prices[1],
+    CommonQualityEnum::High => prices[2],
+  }
+}
+
+fn lookup_price_row(width: u32, height: u32) -> Option<[u64; 3]> {
+  let long_edge = width.max(height);
+  let short_edge = width.min(height);
+  OUTPUT_IMAGE_PRICE_TABLE.iter()
+    .find(|(w, h, _)| *w == long_edge && *h == short_edge)
+    .map(|(_, _, prices)| *prices)
+}
+
+/// Mirrors the Fal request builder's aspect ratio mapping.
+fn to_image_size(aspect_ratio: CommonAspectRatioEnum) -> GptImage2p5ImageSize {
+  use CommonAspectRatioEnum as Ar;
+  match aspect_ratio {
+    Ar::Auto | Ar::Auto2k | Ar::Auto3k | Ar::Auto4k => GptImage2p5ImageSize::Auto,
+    Ar::Square => GptImage2p5ImageSize::Square,
+    Ar::SquareHd => GptImage2p5ImageSize::SquareHd,
+    Ar::WideFourByThree | Ar::WideFiveByFour => GptImage2p5ImageSize::Landscape4x3,
+    Ar::WideThreeByTwo | Ar::WideSixteenByNine | Ar::WideTwentyOneByNine | Ar::Wide => GptImage2p5ImageSize::Landscape16x9,
+    Ar::TallThreeByFour | Ar::TallFourByFive => GptImage2p5ImageSize::Portrait4x3,
+    Ar::TallTwoByThree | Ar::TallNineBySixteen | Ar::TallNineByTwentyOne | Ar::Tall => GptImage2p5ImageSize::Portrait16x9,
+  }
+}
+
+/// Mirrors the Fal request builder's resolution mapping.
+fn to_resolution(resolution: CommonResolutionEnum) -> GptImage2Resolution {
+  use CommonResolutionEnum as R;
+  match resolution {
+    R::HalfK | R::FourEightyP | R::SevenTwentyP | R::OneK => GptImage2Resolution::OneK,
+    R::TenEightyP | R::TwoK => GptImage2Resolution::TwoK,
+    R::ThreeK => GptImage2Resolution::ThreeK,
+    R::FourK => GptImage2Resolution::FourK,
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use CommonAspectRatioEnum as Ar;
+  use CommonQualityEnum as Q;
+  use CommonResolutionEnum as R;
+
+  const ALL_ASPECT_RATIOS: &[Ar] = &[
+    Ar::Auto, Ar::Auto2k, Ar::Auto3k, Ar::Auto4k, Ar::Square, Ar::SquareHd,
+    Ar::WideFourByThree, Ar::WideFiveByFour, Ar::WideThreeByTwo, Ar::WideSixteenByNine,
+    Ar::WideTwentyOneByNine, Ar::Wide, Ar::TallThreeByFour, Ar::TallFourByFive,
+    Ar::TallTwoByThree, Ar::TallNineBySixteen, Ar::TallNineByTwentyOne, Ar::Tall,
+  ];
+
+  const ALL_RESOLUTIONS: &[Option<R>] = &[
+    None, Some(R::HalfK), Some(R::FourEightyP), Some(R::SevenTwentyP), Some(R::OneK),
+    Some(R::TenEightyP), Some(R::TwoK), Some(R::ThreeK), Some(R::FourK),
+  ];
+
+  // (aspect_ratio, resolution, [low, medium, high]) — cents per image, text-to-image
+  const TEXT_GRID: &[(Option<Ar>, Option<R>, [u64; 3])] = &[
+    (None,                        None,           [1, 2,  4]), // landscape 4:3 default
+    (Some(Ar::Square),            None,           [1, 2,  6]),
+    (Some(Ar::Square),            Some(R::OneK),  [1, 2,  6]),
+    (Some(Ar::Square),            Some(R::TwoK),  [2, 3, 10]),
+    (Some(Ar::Square),            Some(R::ThreeK), [2, 4, 14]),
+    (Some(Ar::Square),            Some(R::FourK), [2, 4, 14]),
+    (Some(Ar::SquareHd),          None,           [2, 3, 10]),
+    (Some(Ar::SquareHd),          Some(R::OneK),  [1, 2,  6]),
+    (Some(Ar::WideFourByThree),   None,           [1, 2,  4]),
+    (Some(Ar::WideFourByThree),   Some(R::TwoK),  [1, 2,  7]),
+    (Some(Ar::WideFourByThree),   Some(R::ThreeK), [2, 3, 11]),
+    (Some(Ar::WideFourByThree),   Some(R::FourK), [2, 4, 12]),
+    (Some(Ar::TallThreeByFour),   None,           [1, 2,  4]),
+    (Some(Ar::TallFourByFive),    Some(R::FourK), [2, 4, 12]),
+    (Some(Ar::WideSixteenByNine), None,           [1, 2,  5]),
+    (Some(Ar::WideSixteenByNine), Some(R::OneK),  [1, 1,  3]),
+    (Some(Ar::WideSixteenByNine), Some(R::TenEightyP), [1, 2, 5]),
+    (Some(Ar::WideSixteenByNine), Some(R::TwoK),  [1, 2,  5]),
+    (Some(Ar::WideSixteenByNine), Some(R::ThreeK), [1, 3,  8]),
+    (Some(Ar::WideSixteenByNine), Some(R::FourK), [2, 3, 12]),
+    (Some(Ar::TallNineBySixteen), None,           [1, 2,  5]),
+    (Some(Ar::Wide),              Some(R::HalfK), [1, 1,  3]),
+    (Some(Ar::Tall),              Some(R::ThreeK), [1, 3,  8]),
+    (Some(Ar::Auto),              None,           [2, 3, 12]),
+    (Some(Ar::Auto4k),            Some(R::OneK),  [2, 3, 12]),
+  ];
+
+  mod text_to_image_tests {
+    use super::*;
+
+    #[test]
+    fn grid() {
+      for &(aspect_ratio, resolution, expected) in TEXT_GRID {
+        for (quality, expected) in [Q::Low, Q::Medium, Q::High].into_iter().zip(expected) {
+          let actual = make_inputs(0, Some(quality), aspect_ratio, resolution, 1).estimate_cost().cost_in_usd_cents.unwrap();
+          assert_eq!(actual, expected, "{aspect_ratio:?} {resolution:?} {quality:?}");
+        }
+      }
+    }
+
+    #[test]
+    fn quality_defaults_to_high() {
+      assert_eq!(cents(make_inputs(0, None, Some(Ar::Square), None, 1)), 6);
+    }
+
+    #[test]
+    fn batch_multiplies_per_image_cents() {
+      for &(aspect_ratio, resolution, _) in TEXT_GRID {
+        let per_image = cents(make_inputs(0, Some(Q::High), aspect_ratio, resolution, 1));
+        for batch in 2..=4u16 {
+          assert_eq!(cents(make_inputs(0, Some(Q::High), aspect_ratio, resolution, batch)), per_image * batch as u64);
+        }
+      }
+    }
+  }
+
+  mod edit_image_tests {
+    use super::*;
+
+    #[test]
+    fn no_aspect_ratio_prices_as_auto() {
+      // 1102 + 88 = 1190
+      assert_eq!(cents(make_inputs(1, Some(Q::High), None, None, 1)), 12);
+      assert_eq!(cents(make_inputs(1, Some(Q::High), Some(Ar::Auto), None, 1)), 12);
+    }
+
+    #[test]
+    fn reference_images_add_to_price() {
+      // Square high 582, plus 88 per reference image
+      assert_eq!(cents(make_inputs(1, Some(Q::High), Some(Ar::Square), None, 1)), 7);   // 670
+      assert_eq!(cents(make_inputs(4, Some(Q::High), Some(Ar::Square), None, 1)), 10);  // 934
+      assert_eq!(cents(make_inputs(16, Some(Q::High), Some(Ar::Square), None, 1)), 20); // 1990
+      assert_eq!(cents(make_inputs(1, Some(Q::Low), Some(Ar::Square), None, 1)), 2);    // 153
+    }
+
+    #[test]
+    fn batch_multiplies_per_image_cents() {
+      assert_eq!(cents(make_inputs(1, Some(Q::High), Some(Ar::Square), None, 4)), 28);
+    }
+  }
+
+  mod table_coverage_tests {
+    use super::*;
+
+    #[test]
+    fn every_reachable_dimension_has_a_table_row() {
+      for &aspect_ratio in ALL_ASPECT_RATIOS {
+        for &resolution in ALL_RESOLUTIONS {
+          for refs in [0, 1] {
+            let (w, h) = make_inputs(refs, None, Some(aspect_ratio), resolution, 1).output_dimensions();
+            assert!(lookup_price_row(w, h).is_some(), "{aspect_ratio:?} {resolution:?} => {w}x{h} missing from price table");
+          }
+        }
+      }
+      for refs in [0, 1] {
+        for &resolution in ALL_RESOLUTIONS {
+          let (w, h) = make_inputs(refs, None, None, resolution, 1).output_dimensions();
+          assert!(lookup_price_row(w, h).is_some(), "no aspect, {resolution:?}, {refs} refs => {w}x{h} missing from price table");
+        }
+      }
+    }
+
+    #[test]
+    fn unknown_dimensions_fall_back_to_most_expensive_row() {
+      assert_eq!(output_image_price(Q::High, 640, 640), 1102);
+    }
+
+    #[test]
+    fn orientation_does_not_change_price() {
+      assert_eq!(output_image_price(Q::High, 768, 1024), output_image_price(Q::High, 1024, 768));
+      assert_eq!(output_image_price(Q::Medium, 1080, 1920), output_image_price(Q::Medium, 1920, 1080));
+    }
+
+    #[test]
+    fn prices_rise_with_quality_and_size() {
+      for &(_, _, prices) in OUTPUT_IMAGE_PRICE_TABLE {
+        assert!(prices[0] < prices[1] && prices[1] < prices[2], "{prices:?}");
+      }
+      assert!(output_image_price(Q::High, 1024, 1024) < output_image_price(Q::High, 2048, 2048));
+      assert!(output_image_price(Q::High, 2048, 2048) < output_image_price(Q::High, 2880, 2880));
+      assert!(output_image_price(Q::High, 1088, 608) < output_image_price(Q::High, 1920, 1080));
+      assert!(output_image_price(Q::High, 3072, 1728) < output_image_price(Q::High, 3840, 2160));
+    }
+  }
+
+  fn cents(inputs: ArtcraftGptImage2p5CostInputs) -> u64 {
+    inputs.estimate_cost().cost_in_usd_cents.unwrap()
+  }
+
+  fn make_inputs(
+    num_reference_images: usize,
+    quality: Option<Q>,
+    aspect_ratio: Option<Ar>,
+    resolution: Option<R>,
+    num_images: u16,
+  ) -> ArtcraftGptImage2p5CostInputs {
+    ArtcraftGptImage2p5CostInputs { quality, aspect_ratio, resolution, num_reference_images, num_images }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2p5_flare/build.rs

@@ -0,0 +1,114 @@
+use enums::common::generation::common_image_model::CommonImageModel as CommonImageModelEnum;
+
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_flare::request::ArtcraftGptImage2p5FlareRequestState;
+
+pub fn build_artcraft_gpt_image_2p5_flare(
+  builder: GenerateImageRequestBuilder,
+) -> Result<ImageGenerationDraftOrRequest, ArtcraftRouterError> {
+  let request = build_artcraft_omni_image_request(builder, CommonImageModelEnum::GptImage2p5Flare)?;
+  Ok(ImageGenerationDraftOrRequest::Request(
+    ImageGenerationRequest::ArtcraftGptImage2p5Flare(ArtcraftGptImage2p5FlareRequestState { request }),
+  ))
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost_and_generate_request::OmniGenImageCostAndGenerateRequest;
+  use enums::common::generation::common_aspect_ratio::CommonAspectRatio as CommonAspectRatioEnum;
+  use enums::common::generation::common_quality::CommonQuality as CommonQualityEnum;
+  use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_quality::RouterQuality;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::errors::client_error::ClientError;
+
+  #[test]
+  fn build2_routes_to_omni_request_with_flare_model() {
+    let request = unwrap_request(base_builder().build2());
+    assert_eq!(request.model, Some(CommonImageModelEnum::GptImage2p5Flare));
+    assert_eq!(request.prompt.as_deref(), Some("a cat in space"));
+    assert_eq!(request.image_batch_count, Some(1));
+    assert!(request.image_media_tokens.is_none());
+    assert!(request.aspect_ratio.is_none());
+    assert!(request.resolution.is_none());
+    assert!(request.quality.is_none());
+    assert!(request.idempotency_token.is_some());
+  }
+
+  #[test]
+  fn omni_request_carries_all_generation_fields() {
+    let request = unwrap_request(GenerateImageRequestBuilder {
+      aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+      resolution: Some(RouterResolution::TwoK),
+      quality: Some(RouterQuality::Medium),
+      image_batch_count: Some(3),
+      idempotency_token: Some("idem-123".to_string()),
+      image_inputs: Some(ImageListRef::MediaFileTokens(vec![MediaFileToken::generate(), MediaFileToken::generate()])),
+      ..base_builder()
+    }.build2());
+    assert_eq!(request.aspect_ratio, Some(CommonAspectRatioEnum::WideSixteenByNine));
+    assert_eq!(request.resolution, Some(CommonResolutionEnum::TwoK));
+    assert_eq!(request.quality, Some(CommonQualityEnum::Medium));
+    assert_eq!(request.image_batch_count, Some(3));
+    assert_eq!(request.idempotency_token.as_deref(), Some("idem-123"));
+    assert_eq!(request.image_media_tokens.map(|tokens| tokens.len()), Some(2));
+  }
+
+  #[test]
+  fn batch_count_is_validated() {
+    assert!(matches!(
+      GenerateImageRequestBuilder { image_batch_count: Some(0), ..base_builder() }.build2(),
+      Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations))
+    ));
+    assert!(matches!(
+      GenerateImageRequestBuilder { image_batch_count: Some(5), ..base_builder() }.build2(),
+      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. }))
+    ));
+    let request = unwrap_request(GenerateImageRequestBuilder {
+      image_batch_count: Some(5),
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayLessDowngrade,
+      ..base_builder()
+    }.build2());
+    assert_eq!(request.image_batch_count, Some(4));
+  }
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::GptImage2p5Flare,
+      provider: RouterProvider::Artcraft,
+      prompt: Some("a cat in space".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  fn unwrap_request(result: Result<ImageGenerationDraftOrRequest, ArtcraftRouterError>) -> OmniGenImageCostAndGenerateRequest {
+    let ImageGenerationDraftOrRequest::Request(
+      ImageGenerationRequest::ArtcraftGptImage2p5Flare(state)
+    ) = result.expect("build should succeed") else {
+      panic!("expected Artcraft GPT Image 2.5 Flare request")
+    };
+    state.request
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2p5_flare/cost.rs

@@ -0,0 +1,106 @@
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_common_cost::ArtcraftGptImage2p5CostInputs;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_flare::request::ArtcraftGptImage2p5FlareRequestState;
+
+/// Cost state for Artcraft GPT Image 2.5 Flare. The price table is shared with the other
+/// GPT Image 2.5 variant; see `gpt_image_2p5_common_cost`.
+#[derive(Clone, Debug)]
+pub struct ArtcraftGptImage2p5FlareCostState {
+  inputs: ArtcraftGptImage2p5CostInputs,
+}
+
+impl ArtcraftGptImage2p5FlareCostState {
+  pub fn from_request(request: &ArtcraftGptImage2p5FlareRequestState) -> Self {
+    Self { inputs: ArtcraftGptImage2p5CostInputs::from_omni_request(&request.request) }
+  }
+
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    self.inputs.estimate_cost()
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_quality::RouterQuality;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use RouterAspectRatio as Ar;
+  use RouterQuality as Q;
+  use RouterResolution as R;
+
+  // (reference_images, quality, aspect_ratio, resolution, batch, expected_cents)
+  const CASES: &[(usize, Option<Q>, Option<Ar>, Option<R>, u16, u64)] = &[
+    (0, None,            None,                        None,           1,  4),
+    (0, Some(Q::Low),    Some(Ar::Square),            None,           1,  1),
+    (0, Some(Q::Medium), Some(Ar::Square),            None,           1,  2),
+    (0, Some(Q::High),   Some(Ar::Square),            None,           1,  6),
+    (0, Some(Q::High),   Some(Ar::Square),            None,           4, 24),
+    (0, Some(Q::High),   Some(Ar::SquareHd),          None,           1, 10),
+    (0, Some(Q::High),   Some(Ar::Square),            Some(R::TwoK),  1, 10),
+    (0, Some(Q::High),   Some(Ar::Square),            Some(R::FourK), 1, 14),
+    (0, Some(Q::High),   Some(Ar::WideFourByThree),   None,           1,  4),
+    (0, Some(Q::High),   Some(Ar::WideSixteenByNine), None,           1,  5),
+    (0, Some(Q::High),   Some(Ar::WideSixteenByNine), Some(R::OneK),  1,  3),
+    (0, Some(Q::High),   Some(Ar::WideSixteenByNine), Some(R::FourK), 1, 12),
+    (0, Some(Q::Medium), Some(Ar::TallNineBySixteen), Some(R::ThreeK), 2, 6),
+    (0, Some(Q::High),   Some(Ar::Auto),              None,           1, 12),
+    (1, None,            None,                        None,           1, 12),
+    (1, Some(Q::High),   Some(Ar::Square),            None,           1,  7),
+    (4, Some(Q::High),   Some(Ar::Square),            None,           1, 10),
+    (1, Some(Q::High),   Some(Ar::Square),            None,           4, 28),
+    (1, Some(Q::Low),    Some(Ar::Square),            None,           1,  2),
+  ];
+
+  #[test]
+  fn costs_through_build2() {
+    for &(refs, quality, aspect_ratio, resolution, batch, expected) in CASES {
+      assert_eq!(cost_cents(refs, quality, aspect_ratio, resolution, batch), expected, "{refs} refs {quality:?} {aspect_ratio:?} {resolution:?} x{batch}");
+    }
+  }
+
+  #[test]
+  fn estimate_flags() {
+    let cost = builder(0, Some(Q::High), Some(Ar::Square), None, 1).build2().unwrap().estimate_cost().unwrap();
+    assert_eq!(cost.cost_in_credits, cost.cost_in_usd_cents);
+    assert!(!cost.is_free);
+    assert!(!cost.is_unlimited);
+    assert!(!cost.is_rate_limited);
+    assert!(!cost.has_watermark);
+  }
+
+  fn cost_cents(refs: usize, quality: Option<Q>, aspect_ratio: Option<Ar>, resolution: Option<R>, batch: u16) -> u64 {
+    builder(refs, quality, aspect_ratio, resolution, batch)
+      .build2().unwrap().estimate_cost().unwrap().cost_in_usd_cents.unwrap()
+  }
+
+  fn builder(refs: usize, quality: Option<Q>, aspect_ratio: Option<Ar>, resolution: Option<R>, batch: u16) -> GenerateImageRequestBuilder {
+    let image_inputs = if refs == 0 {
+      None
+    } else {
+      Some(ImageListRef::MediaFileTokens((0..refs).map(|_| MediaFileToken::generate()).collect()))
+    };
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::GptImage2p5Flare,
+      provider: RouterProvider::Artcraft,
+      prompt: Some("a cat in space".to_string()),
+      image_inputs,
+      resolution,
+      aspect_ratio,
+      quality,
+      image_batch_count: Some(batch),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2p5_flare/request.rs

@@ -0,0 +1,17 @@
+use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost_and_generate_request::OmniGenImageCostAndGenerateRequest;
+
+use crate::client::router_artcraft_client::RouterArtcraftClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_response::GenerateImageResponse;
+use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request;
+
+#[derive(Clone, Debug)]
+pub struct ArtcraftGptImage2p5FlareRequestState {
+  pub request: OmniGenImageCostAndGenerateRequest,
+}
+
+impl ArtcraftGptImage2p5FlareRequestState {
+  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
+    send_artcraft_omni_image_request(&self.request, client).await
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2p5_sunburst/build.rs

@@ -0,0 +1,114 @@
+use enums::common::generation::common_image_model::CommonImageModel as CommonImageModelEnum;
+
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_sunburst::request::ArtcraftGptImage2p5SunburstRequestState;
+
+pub fn build_artcraft_gpt_image_2p5_sunburst(
+  builder: GenerateImageRequestBuilder,
+) -> Result<ImageGenerationDraftOrRequest, ArtcraftRouterError> {
+  let request = build_artcraft_omni_image_request(builder, CommonImageModelEnum::GptImage2p5Sunburst)?;
+  Ok(ImageGenerationDraftOrRequest::Request(
+    ImageGenerationRequest::ArtcraftGptImage2p5Sunburst(ArtcraftGptImage2p5SunburstRequestState { request }),
+  ))
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost_and_generate_request::OmniGenImageCostAndGenerateRequest;
+  use enums::common::generation::common_aspect_ratio::CommonAspectRatio as CommonAspectRatioEnum;
+  use enums::common::generation::common_quality::CommonQuality as CommonQualityEnum;
+  use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_quality::RouterQuality;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::errors::client_error::ClientError;
+
+  #[test]
+  fn build2_routes_to_omni_request_with_sunburst_model() {
+    let request = unwrap_request(base_builder().build2());
+    assert_eq!(request.model, Some(CommonImageModelEnum::GptImage2p5Sunburst));
+    assert_eq!(request.prompt.as_deref(), Some("a cat in space"));
+    assert_eq!(request.image_batch_count, Some(1));
+    assert!(request.image_media_tokens.is_none());
+    assert!(request.aspect_ratio.is_none());
+    assert!(request.resolution.is_none());
+    assert!(request.quality.is_none());
+    assert!(request.idempotency_token.is_some());
+  }
+
+  #[test]
+  fn omni_request_carries_all_generation_fields() {
+    let request = unwrap_request(GenerateImageRequestBuilder {
+      aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+      resolution: Some(RouterResolution::TwoK),
+      quality: Some(RouterQuality::Medium),
+      image_batch_count: Some(3),
+      idempotency_token: Some("idem-123".to_string()),
+      image_inputs: Some(ImageListRef::MediaFileTokens(vec![MediaFileToken::generate(), MediaFileToken::generate()])),
+      ..base_builder()
+    }.build2());
+    assert_eq!(request.aspect_ratio, Some(CommonAspectRatioEnum::WideSixteenByNine));
+    assert_eq!(request.resolution, Some(CommonResolutionEnum::TwoK));
+    assert_eq!(request.quality, Some(CommonQualityEnum::Medium));
+    assert_eq!(request.image_batch_count, Some(3));
+    assert_eq!(request.idempotency_token.as_deref(), Some("idem-123"));
+    assert_eq!(request.image_media_tokens.map(|tokens| tokens.len()), Some(2));
+  }
+
+  #[test]
+  fn batch_count_is_validated() {
+    assert!(matches!(
+      GenerateImageRequestBuilder { image_batch_count: Some(0), ..base_builder() }.build2(),
+      Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations))
+    ));
+    assert!(matches!(
+      GenerateImageRequestBuilder { image_batch_count: Some(5), ..base_builder() }.build2(),
+      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. }))
+    ));
+    let request = unwrap_request(GenerateImageRequestBuilder {
+      image_batch_count: Some(5),
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayLessDowngrade,
+      ..base_builder()
+    }.build2());
+    assert_eq!(request.image_batch_count, Some(4));
+  }
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::GptImage2p5Sunburst,
+      provider: RouterProvider::Artcraft,
+      prompt: Some("a cat in space".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  fn unwrap_request(result: Result<ImageGenerationDraftOrRequest, ArtcraftRouterError>) -> OmniGenImageCostAndGenerateRequest {
+    let ImageGenerationDraftOrRequest::Request(
+      ImageGenerationRequest::ArtcraftGptImage2p5Sunburst(state)
+    ) = result.expect("build should succeed") else {
+      panic!("expected Artcraft GPT Image 2.5 Sunburst request")
+    };
+    state.request
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2p5_sunburst/cost.rs

@@ -0,0 +1,106 @@
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_common_cost::ArtcraftGptImage2p5CostInputs;
+use crate::generate::generate_image::providers::artcraft::gpt_image_2p5_sunburst::request::ArtcraftGptImage2p5SunburstRequestState;
+
+/// Cost state for Artcraft GPT Image 2.5 Sunburst. The price table is shared with the other
+/// GPT Image 2.5 variant; see `gpt_image_2p5_common_cost`.
+#[derive(Clone, Debug)]
+pub struct ArtcraftGptImage2p5SunburstCostState {
+  inputs: ArtcraftGptImage2p5CostInputs,
+}
+
+impl ArtcraftGptImage2p5SunburstCostState {
+  pub fn from_request(request: &ArtcraftGptImage2p5SunburstRequestState) -> Self {
+    Self { inputs: ArtcraftGptImage2p5CostInputs::from_omni_request(&request.request) }
+  }
+
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    self.inputs.estimate_cost()
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_quality::RouterQuality;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use RouterAspectRatio as Ar;
+  use RouterQuality as Q;
+  use RouterResolution as R;
+
+  // (reference_images, quality, aspect_ratio, resolution, batch, expected_cents)
+  const CASES: &[(usize, Option<Q>, Option<Ar>, Option<R>, u16, u64)] = &[
+    (0, None,            None,                        None,           1,  4),
+    (0, Some(Q::Low),    Some(Ar::Square),            None,           1,  1),
+    (0, Some(Q::Medium), Some(Ar::Square),            None,           1,  2),
+    (0, Some(Q::High),   Some(Ar::Square),            None,           1,  6),
+    (0, Some(Q::High),   Some(Ar::Square),            None,           4, 24),
+    (0, Some(Q::High),   Some(Ar::SquareHd),          None,           1, 10),
+    (0, Some(Q::High),   Some(Ar::Square),            Some(R::TwoK),  1, 10),
+    (0, Some(Q::High),   Some(Ar::Square),            Some(R::FourK), 1, 14),
+    (0, Some(Q::High),   Some(Ar::WideFourByThree),   None,           1,  4),
+    (0, Some(Q::High),   Some(Ar::WideSixteenByNine), None,           1,  5),
+    (0, Some(Q::High),   Some(Ar::WideSixteenByNine), Some(R::OneK),  1,  3),
+    (0, Some(Q::High),   Some(Ar::WideSixteenByNine), Some(R::FourK), 1, 12),
+    (0, Some(Q::Medium), Some(Ar::TallNineBySixteen), Some(R::ThreeK), 2, 6),
+    (0, Some(Q::High),   Some(Ar::Auto),              None,           1, 12),
+    (1, None,            None,                        None,           1, 12),
+    (1, Some(Q::High),   Some(Ar::Square),            None,           1,  7),
+    (4, Some(Q::High),   Some(Ar::Square),            None,           1, 10),
+    (1, Some(Q::High),   Some(Ar::Square),            None,           4, 28),
+    (1, Some(Q::Low),    Some(Ar::Square),            None,           1,  2),
+  ];
+
+  #[test]
+  fn costs_through_build2() {
+    for &(refs, quality, aspect_ratio, resolution, batch, expected) in CASES {
+      assert_eq!(cost_cents(refs, quality, aspect_ratio, resolution, batch), expected, "{refs} refs {quality:?} {aspect_ratio:?} {resolution:?} x{batch}");
+    }
+  }
+
+  #[test]
+  fn estimate_flags() {
+    let cost = builder(0, Some(Q::High), Some(Ar::Square), None, 1).build2().unwrap().estimate_cost().unwrap();
+    assert_eq!(cost.cost_in_credits, cost.cost_in_usd_cents);
+    assert!(!cost.is_free);
+    assert!(!cost.is_unlimited);
+    assert!(!cost.is_rate_limited);
+    assert!(!cost.has_watermark);
+  }
+
+  fn cost_cents(refs: usize, quality: Option<Q>, aspect_ratio: Option<Ar>, resolution: Option<R>, batch: u16) -> u64 {
+    builder(refs, quality, aspect_ratio, resolution, batch)
+      .build2().unwrap().estimate_cost().unwrap().cost_in_usd_cents.unwrap()
+  }
+
+  fn builder(refs: usize, quality: Option<Q>, aspect_ratio: Option<Ar>, resolution: Option<R>, batch: u16) -> GenerateImageRequestBuilder {
+    let image_inputs = if refs == 0 {
+      None
+    } else {
+      Some(ImageListRef::MediaFileTokens((0..refs).map(|_| MediaFileToken::generate()).collect()))
+    };
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::GptImage2p5Sunburst,
+      provider: RouterProvider::Artcraft,
+      prompt: Some("a cat in space".to_string()),
+      image_inputs,
+      resolution,
+      aspect_ratio,
+      quality,
+      image_batch_count: Some(batch),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2p5_sunburst/request.rs

@@ -0,0 +1,17 @@
+use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost_and_generate_request::OmniGenImageCostAndGenerateRequest;
+
+use crate::client::router_artcraft_client::RouterArtcraftClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_response::GenerateImageResponse;
+use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request;
+
+#[derive(Clone, Debug)]
+pub struct ArtcraftGptImage2p5SunburstRequestState {
+  pub request: OmniGenImageCostAndGenerateRequest,
+}
+
+impl ArtcraftGptImage2p5SunburstRequestState {
+  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
+    send_artcraft_omni_image_request(&self.request, client).await
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/mod.rs

@@ -8,6 +8,9 @@ pub mod flux_pro_1p1_ultra;
 pub mod gpt_image_1;
 pub mod gpt_image_1p5;
 pub mod gpt_image_2;
+pub(crate) mod gpt_image_2p5_common_cost;
+pub mod gpt_image_2p5_flare;
+pub mod gpt_image_2p5_sunburst;
 pub mod midjourney_7;
 pub mod midjourney_7_niji;
 pub mod midjourney_8;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2p5_common/mod.rs

@@ -0,0 +1,5 @@
+//! Planning and transport shared by the GPT Image 2.5 Flare and Sunburst Fal providers.
+//! The two models take identical parameters; only the Fal endpoint differs.
+
+pub mod plan;
+pub mod send;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2p5_common/plan.rs

@@ -0,0 +1,330 @@
+use fal_client::requests::api::image::common::gpt_image_2_resolution::GptImage2Resolution;
+use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_edit_image_params::GptImage2p5EditImageParams;
+use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_image_size::GptImage2p5ImageSize;
+use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_num_images::GptImage2p5NumImages;
+use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_quality::GptImage2p5Quality;
+use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_text_to_image_params::GptImage2p5TextToImageParams;
+
+use crate::api::image_list_ref::ImageListRef;
+use crate::api::router_aspect_ratio::RouterAspectRatio;
+use crate::api::router_quality::RouterQuality;
+use crate::api::router_resolution::RouterResolution;
+use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::client_error::ClientError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+
+/// Planned GPT Image 2.5 parameters. The mode is chosen by whether the builder carries
+/// reference images: none means text-to-image, one or more means edit.
+#[derive(Clone, Debug)]
+pub enum PlannedGptImage2p5Params {
+  TextToImage(GptImage2p5TextToImageParams),
+  EditImage(GptImage2p5EditImageParams),
+}
+
+pub fn plan_gpt_image_2p5_params(
+  builder: &GenerateImageRequestBuilder,
+) -> Result<PlannedGptImage2p5Params, ArtcraftRouterError> {
+  let prompt = builder.prompt.clone().unwrap_or_default();
+  let image_urls = resolve_image_urls(builder.image_inputs.clone())?;
+  let num_images = plan_num_images(builder.image_batch_count, builder.request_mismatch_mitigation_strategy)?;
+  let image_size = plan_image_size(builder.aspect_ratio);
+  let resolution = plan_resolution(builder.resolution);
+  let quality = Some(plan_quality(builder.quality));
+
+  if image_urls.is_empty() {
+    Ok(PlannedGptImage2p5Params::TextToImage(GptImage2p5TextToImageParams {
+      prompt,
+      num_images,
+      image_size,
+      resolution,
+      quality,
+      background: None,
+      output_format: None,
+      output_compression: None,
+    }))
+  } else {
+    Ok(PlannedGptImage2p5Params::EditImage(GptImage2p5EditImageParams {
+      prompt,
+      image_urls,
+      mask_url: None,
+      num_images,
+      image_size,
+      resolution,
+      quality,
+      background: None,
+      output_format: None,
+      output_compression: None,
+    }))
+  }
+}
+
+fn plan_num_images(
+  count: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<GptImage2p5NumImages, ArtcraftRouterError> {
+  let count = count.unwrap_or(1);
+  match count {
+    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
+    1 => Ok(GptImage2p5NumImages::One),
+    2 => Ok(GptImage2p5NumImages::Two),
+    3 => Ok(GptImage2p5NumImages::Three),
+    4 => Ok(GptImage2p5NumImages::Four),
+    _ => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "image_batch_count",
+          value: format!("{}", count),
+        }))
+      }
+      _ => Ok(GptImage2p5NumImages::Four),
+    },
+  }
+}
+
+/// The router only exposes low / medium / high; GPT Image 2.5's `xhigh` and `max` tiers are
+/// not reachable through it. Fal's default (`high`) applies when unspecified.
+fn plan_quality(quality: Option<RouterQuality>) -> GptImage2p5Quality {
+  match quality {
+    Some(RouterQuality::Low) => GptImage2p5Quality::Low,
+    Some(RouterQuality::Medium) => GptImage2p5Quality::Medium,
+    Some(RouterQuality::High) | None => GptImage2p5Quality::High,
+  }
+}
+
+fn plan_resolution(resolution: Option<RouterResolution>) -> Option<GptImage2Resolution> {
+  resolution.map(|r| match r {
+    RouterResolution::HalfK
+    | RouterResolution::FourEightyP
+    | RouterResolution::SevenTwentyP
+    | RouterResolution::OneK => GptImage2Resolution::OneK,
+    RouterResolution::TenEightyP | RouterResolution::TwoK => GptImage2Resolution::TwoK,
+    RouterResolution::ThreeK => GptImage2Resolution::ThreeK,
+    RouterResolution::FourK => GptImage2Resolution::FourK,
+  })
+}
+
+/// `None` lets Fal apply its own default (`landscape_4_3` for text-to-image, `auto` for edit).
+fn plan_image_size(aspect_ratio: Option<RouterAspectRatio>) -> Option<GptImage2p5ImageSize> {
+  aspect_ratio.map(|ar| match ar {
+    RouterAspectRatio::Auto
+    | RouterAspectRatio::Auto2k
+    | RouterAspectRatio::Auto3k
+    | RouterAspectRatio::Auto4k => GptImage2p5ImageSize::Auto,
+    RouterAspectRatio::Square => GptImage2p5ImageSize::Square,
+    RouterAspectRatio::SquareHd => GptImage2p5ImageSize::SquareHd,
+    RouterAspectRatio::WideFourByThree
+    | RouterAspectRatio::WideFiveByFour => GptImage2p5ImageSize::Landscape4x3,
+    RouterAspectRatio::WideThreeByTwo
+    | RouterAspectRatio::WideSixteenByNine
+    | RouterAspectRatio::WideTwentyOneByNine
+    | RouterAspectRatio::Wide => GptImage2p5ImageSize::Landscape16x9,
+    RouterAspectRatio::TallThreeByFour
+    | RouterAspectRatio::TallFourByFive => GptImage2p5ImageSize::Portrait4x3,
+    RouterAspectRatio::TallTwoByThree
+    | RouterAspectRatio::TallNineBySixteen
+    | RouterAspectRatio::TallNineByTwentyOne
+    | RouterAspectRatio::Tall => GptImage2p5ImageSize::Portrait16x9,
+  })
+}
+
+fn resolve_image_urls(
+  image_inputs: Option<ImageListRef>,
+) -> Result<Vec<String>, ArtcraftRouterError> {
+  match image_inputs {
+    None => Ok(vec![]),
+    Some(ImageListRef::Urls(urls)) => Ok(urls),
+    Some(ImageListRef::MediaFileTokens(_)) => {
+      Err(ArtcraftRouterError::Client(ClientError::FalOnlySupportsUrls))
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use std::fmt::Debug;
+
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+
+  const IMAGE_URL: &str = "https://example.com/img.jpg";
+
+  #[test]
+  fn mode_is_based_on_image_urls() {
+    let text = unwrap_t2i(plan_gpt_image_2p5_params(&base_builder()));
+    assert_eq!(text.prompt, "a cat in space");
+
+    let edit = unwrap_edit(plan_gpt_image_2p5_params(&with_reference_image(base_builder())));
+    assert_eq!(edit.prompt, "a cat in space");
+    assert_eq!(edit.image_urls, vec![IMAGE_URL]);
+    assert!(edit.mask_url.is_none());
+  }
+
+  #[test]
+  fn optional_fal_fields_are_left_to_fal_defaults() {
+    let text = unwrap_t2i(plan_gpt_image_2p5_params(&base_builder()));
+    assert!(text.background.is_none());
+    assert!(text.output_format.is_none());
+    assert!(text.output_compression.is_none());
+    assert!(text.image_size.is_none());
+    assert!(text.resolution.is_none());
+  }
+
+  #[test]
+  fn media_file_tokens_are_rejected() {
+    let result = plan_gpt_image_2p5_params(&GenerateImageRequestBuilder {
+      image_inputs: Some(ImageListRef::MediaFileTokens(vec![])),
+      ..base_builder()
+    });
+    assert!(matches!(result, Err(ArtcraftRouterError::Client(ClientError::FalOnlySupportsUrls))));
+  }
+
+  #[test]
+  fn num_images_maps_exhaustively_for_text_and_edit() {
+    let cases = [(1, "One"), (2, "Two"), (3, "Three"), (4, "Four")];
+    for (count, expected) in cases {
+      let text = unwrap_t2i(plan_gpt_image_2p5_params(&GenerateImageRequestBuilder {
+        image_batch_count: Some(count),
+        ..base_builder()
+      }));
+      assert_debug(text.num_images, expected);
+
+      let edit = unwrap_edit(plan_gpt_image_2p5_params(&with_reference_image(GenerateImageRequestBuilder {
+        image_batch_count: Some(count),
+        ..base_builder()
+      })));
+      assert_debug(edit.num_images, expected);
+    }
+  }
+
+  #[test]
+  fn num_images_rejects_zero_and_handles_overflow_by_strategy() {
+    assert!(matches!(
+      plan_gpt_image_2p5_params(&GenerateImageRequestBuilder { image_batch_count: Some(0), ..base_builder() }),
+      Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations))
+    ));
+    assert!(matches!(
+      plan_gpt_image_2p5_params(&GenerateImageRequestBuilder { image_batch_count: Some(5), ..base_builder() }),
+      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. }))
+    ));
+    let text = unwrap_t2i(plan_gpt_image_2p5_params(&GenerateImageRequestBuilder {
+      image_batch_count: Some(5),
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
+      ..base_builder()
+    }));
+    assert_debug(text.num_images, "Four");
+  }
+
+  #[test]
+  fn quality_maps_exhaustively_for_text_and_edit() {
+    let cases = [
+      (None, "Some(High)"),
+      (Some(RouterQuality::Low), "Some(Low)"),
+      (Some(RouterQuality::Medium), "Some(Medium)"),
+      (Some(RouterQuality::High), "Some(High)"),
+    ];
+    for (quality, expected) in cases {
+      let text = unwrap_t2i(plan_gpt_image_2p5_params(&GenerateImageRequestBuilder { quality, ..base_builder() }));
+      assert_debug(text.quality, expected);
+      let edit = unwrap_edit(plan_gpt_image_2p5_params(&with_reference_image(GenerateImageRequestBuilder { quality, ..base_builder() })));
+      assert_debug(edit.quality, expected);
+    }
+  }
+
+  #[test]
+  fn resolution_maps_exhaustively_for_text_and_edit() {
+    let cases = [
+      (None, "None"),
+      (Some(RouterResolution::HalfK), "Some(OneK)"),
+      (Some(RouterResolution::FourEightyP), "Some(OneK)"),
+      (Some(RouterResolution::SevenTwentyP), "Some(OneK)"),
+      (Some(RouterResolution::OneK), "Some(OneK)"),
+      (Some(RouterResolution::TenEightyP), "Some(TwoK)"),
+      (Some(RouterResolution::TwoK), "Some(TwoK)"),
+      (Some(RouterResolution::ThreeK), "Some(ThreeK)"),
+      (Some(RouterResolution::FourK), "Some(FourK)"),
+    ];
+    for (resolution, expected) in cases {
+      let text = unwrap_t2i(plan_gpt_image_2p5_params(&GenerateImageRequestBuilder { resolution, ..base_builder() }));
+      assert_debug(text.resolution, expected);
+      let edit = unwrap_edit(plan_gpt_image_2p5_params(&with_reference_image(GenerateImageRequestBuilder { resolution, ..base_builder() })));
+      assert_debug(edit.resolution, expected);
+    }
+  }
+
+  #[test]
+  fn aspect_ratio_maps_exhaustively_for_text_and_edit() {
+    let cases = [
+      (None, "None"),
+      (Some(RouterAspectRatio::Auto), "Some(Auto)"),
+      (Some(RouterAspectRatio::Auto2k), "Some(Auto)"),
+      (Some(RouterAspectRatio::Auto3k), "Some(Auto)"),
+      (Some(RouterAspectRatio::Auto4k), "Some(Auto)"),
+      (Some(RouterAspectRatio::Square), "Some(Square)"),
+      (Some(RouterAspectRatio::SquareHd), "Some(SquareHd)"),
+      (Some(RouterAspectRatio::WideThreeByTwo), "Some(Landscape16x9)"),
+      (Some(RouterAspectRatio::WideFourByThree), "Some(Landscape4x3)"),
+      (Some(RouterAspectRatio::WideFiveByFour), "Some(Landscape4x3)"),
+      (Some(RouterAspectRatio::WideSixteenByNine), "Some(Landscape16x9)"),
+      (Some(RouterAspectRatio::WideTwentyOneByNine), "Some(Landscape16x9)"),
+      (Some(RouterAspectRatio::Wide), "Some(Landscape16x9)"),
+      (Some(RouterAspectRatio::TallTwoByThree), "Some(Portrait16x9)"),
+      (Some(RouterAspectRatio::TallThreeByFour), "Some(Portrait4x3)"),
+      (Some(RouterAspectRatio::TallFourByFive), "Some(Portrait4x3)"),
+      (Some(RouterAspectRatio::TallNineBySixteen), "Some(Portrait16x9)"),
+      (Some(RouterAspectRatio::TallNineByTwentyOne), "Some(Portrait16x9)"),
+      (Some(RouterAspectRatio::Tall), "Some(Portrait16x9)"),
+    ];
+    for (aspect_ratio, expected) in cases {
+      let text = unwrap_t2i(plan_gpt_image_2p5_params(&GenerateImageRequestBuilder { aspect_ratio, ..base_builder() }));
+      assert_debug(text.image_size, expected);
+      let edit = unwrap_edit(plan_gpt_image_2p5_params(&with_reference_image(GenerateImageRequestBuilder { aspect_ratio, ..base_builder() })));
+      assert_debug(edit.image_size, expected);
+    }
+  }
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::GptImage2p5Flare,
+      provider: RouterProvider::Fal,
+      prompt: Some("a cat in space".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  fn with_reference_image(builder: GenerateImageRequestBuilder) -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      image_inputs: Some(ImageListRef::Urls(vec![IMAGE_URL.to_string()])),
+      ..builder
+    }
+  }
+
+  fn unwrap_t2i(result: Result<PlannedGptImage2p5Params, ArtcraftRouterError>) -> GptImage2p5TextToImageParams {
+    match result.expect("plan should succeed") {
+      PlannedGptImage2p5Params::TextToImage(params) => params,
+      PlannedGptImage2p5Params::EditImage(_) => panic!("expected text-to-image"),
+    }
+  }
+
+  fn unwrap_edit(result: Result<PlannedGptImage2p5Params, ArtcraftRouterError>) -> GptImage2p5EditImageParams {
+    match result.expect("plan should succeed") {
+      PlannedGptImage2p5Params::EditImage(params) => params,
+      PlannedGptImage2p5Params::TextToImage(_) => panic!("expected edit-image"),
+    }
+  }
+
+  fn assert_debug<T: Debug>(actual: T, expected: &str) {
+    assert_eq!(format!("{:?}", actual), expected);
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2p5_common/send.rs

@@ -0,0 +1,42 @@
+use std::fmt::Debug;
+use std::sync::Arc;
+
+use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
+
+use crate::client::router_fal_client::RouterFalClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_response::{FalImageResponsePayload, GenerateImageResponse};
+
+/// Send any GPT Image 2.5 request (Flare or Sunburst, text-to-image or edit) to Fal, via
+/// webhook when the client has one configured and via the queue otherwise.
+pub async fn send_gpt_image_2p5_request<T>(
+  request: &T,
+  client: &RouterFalClient,
+) -> Result<GenerateImageResponse, ArtcraftRouterError>
+where
+  T: FalEndpoint + Clone + Debug + Send + Sync + 'static,
+{
+  let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
+
+  let payload = if let Some(webhook_url) = &client.webhook_url {
+    let response = request.send_webhook_request(&client.api_key, webhook_url).await?;
+    FalImageResponsePayload {
+      request_id: response.request_id,
+      gateway_request_id: response.gateway_request_id,
+      maybe_status_url: None,
+      maybe_response_url: None,
+      maybe_outbound_request: Some(outbound),
+    }
+  } else {
+    let response = request.send_queue_request(&client.api_key).await?;
+    FalImageResponsePayload {
+      request_id: Some(response.request_id),
+      gateway_request_id: None,
+      maybe_status_url: Some(response.status_url),
+      maybe_response_url: Some(response.response_url),
+      maybe_outbound_request: Some(outbound),
+    }
+  };
+
+  Ok(GenerateImageResponse::Fal(payload))
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2p5_flare/build.rs

@@ -0,0 +1,129 @@
+use fal_client::requests::api::image::edit::gpt_image_2p5_flare_edit_image::api::GptImage2p5FlareEditImageRequest;
+use fal_client::requests::api::image::text::gpt_image_2p5_flare_text_to_image::api::GptImage2p5FlareTextToImageRequest;
+
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_common::plan::{plan_gpt_image_2p5_params, PlannedGptImage2p5Params};
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_flare::request::FalGptImage2p5FlareRequestState;
+
+/// Text-to-image and edit share one model entry; the mode is chosen by whether the builder
+/// carries reference images. Planning is shared with the other GPT Image 2.5 variant.
+pub fn build_fal_gpt_image_2p5_flare(
+  builder: GenerateImageRequestBuilder,
+) -> Result<ImageGenerationDraftOrRequest, ArtcraftRouterError> {
+  let state = match plan_gpt_image_2p5_params(&builder)? {
+    PlannedGptImage2p5Params::TextToImage(params) => {
+      FalGptImage2p5FlareRequestState::TextToImage(GptImage2p5FlareTextToImageRequest { params })
+    }
+    PlannedGptImage2p5Params::EditImage(params) => {
+      FalGptImage2p5FlareRequestState::EditImage(GptImage2p5FlareEditImageRequest { params })
+    }
+  };
+
+  Ok(ImageGenerationDraftOrRequest::Request(
+    ImageGenerationRequest::FalGptImage2p5Flare(state),
+  ))
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_quality::RouterQuality;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+
+  #[test]
+  fn build2_routes_to_flare_text_to_image() {
+    let request = unwrap_t2i(base_builder().build2());
+    assert_eq!(request.params.prompt, "a cat in space");
+    assert_eq!(GptImage2p5FlareTextToImageRequest::ENDPOINT, "openai/gpt-image-2.5/flare/text-to-image");
+  }
+
+  #[test]
+  fn build2_routes_to_flare_edit_when_reference_images_present() {
+    let request = unwrap_edit(GenerateImageRequestBuilder {
+      image_inputs: Some(ImageListRef::Urls(vec!["https://example.com/img.jpg".to_string()])),
+      ..base_builder()
+    }.build2());
+    assert_eq!(request.params.image_urls, vec!["https://example.com/img.jpg"]);
+    assert_eq!(GptImage2p5FlareEditImageRequest::ENDPOINT, "openai/gpt-image-2.5/flare/edit");
+  }
+
+  #[test]
+  fn planned_fields_reach_the_fal_request() {
+    let request = unwrap_t2i(GenerateImageRequestBuilder {
+      aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+      resolution: Some(RouterResolution::TwoK),
+      quality: Some(RouterQuality::Medium),
+      image_batch_count: Some(3),
+      ..base_builder()
+    }.build2());
+    assert_eq!(format!("{:?}", request.params.image_size), "Some(Landscape16x9)");
+    assert_eq!(format!("{:?}", request.params.resolution), "Some(TwoK)");
+    assert_eq!(format!("{:?}", request.params.quality), "Some(Medium)");
+    assert_eq!(format!("{:?}", request.params.num_images), "Three");
+  }
+
+  #[test]
+  fn raw_wire_request_matches_fal_schema() {
+    let request = unwrap_t2i(GenerateImageRequestBuilder {
+      aspect_ratio: Some(RouterAspectRatio::Square),
+      quality: Some(RouterQuality::High),
+      image_batch_count: Some(2),
+      ..base_builder()
+    }.build2());
+    let json = serde_json::to_value(request.to_raw_request().unwrap()).unwrap();
+    assert_eq!(json, serde_json::json!({
+      "prompt": "a cat in space",
+      "image_size": "square",
+      "quality": "high",
+      "num_images": 2,
+      "output_format": "png",
+    }));
+  }
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::GptImage2p5Flare,
+      provider: RouterProvider::Fal,
+      prompt: Some("a cat in space".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  fn unwrap_t2i(result: Result<ImageGenerationDraftOrRequest, ArtcraftRouterError>) -> GptImage2p5FlareTextToImageRequest {
+    let ImageGenerationDraftOrRequest::Request(
+      ImageGenerationRequest::FalGptImage2p5Flare(FalGptImage2p5FlareRequestState::TextToImage(request))
+    ) = result.expect("build should succeed") else {
+      panic!("expected GPT Image 2.5 Flare text-to-image request")
+    };
+    request
+  }
+
+  fn unwrap_edit(result: Result<ImageGenerationDraftOrRequest, ArtcraftRouterError>) -> GptImage2p5FlareEditImageRequest {
+    let ImageGenerationDraftOrRequest::Request(
+      ImageGenerationRequest::FalGptImage2p5Flare(FalGptImage2p5FlareRequestState::EditImage(request))
+    ) = result.expect("build should succeed") else {
+      panic!("expected GPT Image 2.5 Flare edit-image request")
+    };
+    request
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2p5_flare/cost.rs

@@ -0,0 +1,133 @@
+use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator;
+
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_flare::request::FalGptImage2p5FlareRequestState;
+
+/// Cost state for Fal GPT Image 2.5 Flare. Delegates to `fal_client`'s calculator, which
+/// prices by output dimensions (aspect ratio and resolution tier), quality, batch size and,
+/// for edits, the number of reference images.
+#[derive(Clone, Debug)]
+pub struct FalGptImage2p5FlareCostState {
+  cost_in_usd_cents: u64,
+}
+
+impl FalGptImage2p5FlareCostState {
+  pub fn from_request(request: &FalGptImage2p5FlareRequestState) -> Self {
+    let cost_in_usd_cents = match request {
+      FalGptImage2p5FlareRequestState::TextToImage(request) => request.calculate_cost_in_cents(),
+      FalGptImage2p5FlareRequestState::EditImage(request) => request.calculate_cost_in_cents(),
+    };
+    Self { cost_in_usd_cents }
+  }
+
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    ImageGenerationCostEstimate {
+      cost_in_credits: Some(self.cost_in_usd_cents),
+      cost_in_usd_cents: Some(self.cost_in_usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_quality::RouterQuality;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use RouterAspectRatio as Ar;
+  use RouterQuality as Q;
+  use RouterResolution as R;
+
+  // (quality, aspect_ratio, resolution, batch, expected_cents) — text-to-image
+  const TEXT_CASES: &[(Option<Q>, Option<Ar>, Option<R>, u16, u64)] = &[
+    (None,            None,                    None,          1,  4), // Fal default: landscape_4_3, high
+    (Some(Q::Low),    Some(Ar::Square),        None,          1,  1),
+    (Some(Q::Medium), Some(Ar::Square),        None,          1,  2),
+    (Some(Q::High),   Some(Ar::Square),        None,          1,  6),
+    (Some(Q::High),   Some(Ar::Square),        None,          4, 24),
+    (Some(Q::High),   Some(Ar::SquareHd),      None,          1,  9),
+    (Some(Q::High),   Some(Ar::Square),        Some(R::TwoK), 1,  9),
+    (Some(Q::High),   Some(Ar::Square),        Some(R::FourK), 1, 13),
+    (Some(Q::High),   Some(Ar::WideFourByThree), None,        1,  4),
+    (Some(Q::High),   Some(Ar::TallThreeByFour), None,        1,  4),
+    (Some(Q::High),   Some(Ar::WideSixteenByNine), None,      1,  4),
+    (Some(Q::High),   Some(Ar::WideSixteenByNine), Some(R::OneK), 1, 3),
+    (Some(Q::High),   Some(Ar::WideSixteenByNine), Some(R::FourK), 1, 11),
+    (Some(Q::Medium), Some(Ar::TallNineBySixteen), Some(R::ThreeK), 2, 4),
+    (Some(Q::High),   Some(Ar::Auto),          None,          1, 11),
+    (Some(Q::High),   Some(Ar::Auto4k),        None,          1, 11),
+  ];
+
+  // (reference_images, quality, aspect_ratio, resolution, batch, expected_cents) — edit
+  const EDIT_CASES: &[(usize, Option<Q>, Option<Ar>, Option<R>, u16, u64)] = &[
+    (1, None,          None,             None,          1, 11), // Fal default: auto, high
+    (1, Some(Q::Low),  Some(Ar::Square), None,          1,  2),
+    (1, Some(Q::High), Some(Ar::Square), None,          1,  7),
+    (3, Some(Q::High), Some(Ar::Square), None,          1,  8),
+    (1, Some(Q::High), Some(Ar::Square), None,          4, 28),
+    (1, Some(Q::High), Some(Ar::WideSixteenByNine), Some(R::FourK), 1, 11),
+    (2, Some(Q::High), Some(Ar::Auto),   None,          1, 12),
+  ];
+
+  #[test]
+  fn text_to_image_costs() {
+    for &(quality, aspect_ratio, resolution, batch, expected) in TEXT_CASES {
+      assert_eq!(cost_cents(0, quality, aspect_ratio, resolution, batch), expected, "{quality:?} {aspect_ratio:?} {resolution:?} x{batch}");
+    }
+  }
+
+  #[test]
+  fn edit_image_costs() {
+    for &(refs, quality, aspect_ratio, resolution, batch, expected) in EDIT_CASES {
+      assert_eq!(cost_cents(refs, quality, aspect_ratio, resolution, batch), expected, "{refs} refs {quality:?} {aspect_ratio:?} {resolution:?} x{batch}");
+    }
+  }
+
+  #[test]
+  fn estimate_flags() {
+    let cost = builder(0, Some(Q::High), Some(Ar::Square), None, 1).build2().unwrap().estimate_cost().unwrap();
+    assert_eq!(cost.cost_in_credits, cost.cost_in_usd_cents);
+    assert!(!cost.is_free);
+    assert!(!cost.is_unlimited);
+    assert!(!cost.is_rate_limited);
+    assert!(!cost.has_watermark);
+  }
+
+  fn cost_cents(refs: usize, quality: Option<Q>, aspect_ratio: Option<Ar>, resolution: Option<R>, batch: u16) -> u64 {
+    builder(refs, quality, aspect_ratio, resolution, batch)
+      .build2().unwrap().estimate_cost().unwrap().cost_in_usd_cents.unwrap()
+  }
+
+  fn builder(refs: usize, quality: Option<Q>, aspect_ratio: Option<Ar>, resolution: Option<R>, batch: u16) -> GenerateImageRequestBuilder {
+    let image_inputs = if refs == 0 {
+      None
+    } else {
+      Some(ImageListRef::Urls(vec!["https://example.com/img.jpg".to_string(); refs]))
+    };
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::GptImage2p5Flare,
+      provider: RouterProvider::Fal,
+      prompt: Some("a cat in space".to_string()),
+      image_inputs,
+      resolution,
+      aspect_ratio,
+      quality,
+      image_batch_count: Some(batch),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2p5_flare/request.rs

@@ -0,0 +1,86 @@
+use fal_client::requests::api::image::edit::gpt_image_2p5_flare_edit_image::api::GptImage2p5FlareEditImageRequest;
+use fal_client::requests::api::image::text::gpt_image_2p5_flare_text_to_image::api::GptImage2p5FlareTextToImageRequest;
+
+use crate::client::router_fal_client::RouterFalClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_response::GenerateImageResponse;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_common::send::send_gpt_image_2p5_request;
+
+#[derive(Clone, Debug)]
+pub enum FalGptImage2p5FlareRequestState {
+  TextToImage(GptImage2p5FlareTextToImageRequest),
+  EditImage(GptImage2p5FlareEditImageRequest),
+}
+
+impl FalGptImage2p5FlareRequestState {
+  pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
+    match self {
+      Self::TextToImage(request) => send_gpt_image_2p5_request(request, client).await,
+      Self::EditImage(request) => send_gpt_image_2p5_request(request, client).await,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use fal_client::creds::fal_api_key::FalApiKey;
+  use fal_client::requests::api::image::common::gpt_image_2_resolution::GptImage2Resolution;
+  use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_edit_image_params::GptImage2p5EditImageParams;
+  use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_image_size::GptImage2p5ImageSize;
+  use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_num_images::GptImage2p5NumImages;
+  use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_quality::GptImage2p5Quality;
+  use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_text_to_image_params::GptImage2p5TextToImageParams;
+  use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;
+
+  #[tokio::test]
+  #[ignore] // requires real API key, incurs cost
+  async fn send_text_to_image_webhook() {
+    let request = FalGptImage2p5FlareRequestState::TextToImage(GptImage2p5FlareTextToImageRequest {
+      params: GptImage2p5TextToImageParams {
+        prompt: "a polished product photo of a glass compass".to_string(),
+        num_images: GptImage2p5NumImages::One,
+        image_size: Some(GptImage2p5ImageSize::Square),
+        resolution: Some(GptImage2Resolution::OneK),
+        quality: Some(GptImage2p5Quality::Low),
+        background: None,
+        output_format: None,
+        output_compression: None,
+      },
+    });
+    let response = request.send(&client_with_webhook()).await.expect("send should succeed");
+    let payload = response.get_fal_payload().expect("expected Fal payload");
+    assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
+  }
+
+  #[tokio::test]
+  #[ignore] // requires real API key, incurs cost
+  async fn send_edit_image_webhook() {
+    let request = FalGptImage2p5FlareRequestState::EditImage(GptImage2p5FlareEditImageRequest {
+      params: GptImage2p5EditImageParams {
+        prompt: "make this look like an elegant magazine cover image".to_string(),
+        image_urls: vec![JUNO_AT_LAKE_IMAGE_URL.to_string()],
+        mask_url: None,
+        num_images: GptImage2p5NumImages::One,
+        image_size: Some(GptImage2p5ImageSize::Square),
+        resolution: Some(GptImage2Resolution::OneK),
+        quality: Some(GptImage2p5Quality::Low),
+        background: None,
+        output_format: None,
+        output_compression: None,
+      },
+    });
+    let response = request.send(&client_with_webhook()).await.expect("send should succeed");
+    let payload = response.get_fal_payload().expect("expected Fal payload");
+    assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
+  }
+
+  fn client_with_webhook() -> RouterFalClient {
+    let secret = std::fs::read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")
+      .expect("Failed to read fal_api_key.txt");
+    RouterFalClient::new_with_webhook(
+      FalApiKey::from_str(secret.trim()),
+      "https://example.com/fal-webhook-test".to_string(),
+    )
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2p5_sunburst/build.rs

@@ -0,0 +1,129 @@
+use fal_client::requests::api::image::edit::gpt_image_2p5_sunburst_edit_image::api::GptImage2p5SunburstEditImageRequest;
+use fal_client::requests::api::image::text::gpt_image_2p5_sunburst_text_to_image::api::GptImage2p5SunburstTextToImageRequest;
+
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_common::plan::{plan_gpt_image_2p5_params, PlannedGptImage2p5Params};
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_sunburst::request::FalGptImage2p5SunburstRequestState;
+
+/// Text-to-image and edit share one model entry; the mode is chosen by whether the builder
+/// carries reference images. Planning is shared with the other GPT Image 2.5 variant.
+pub fn build_fal_gpt_image_2p5_sunburst(
+  builder: GenerateImageRequestBuilder,
+) -> Result<ImageGenerationDraftOrRequest, ArtcraftRouterError> {
+  let state = match plan_gpt_image_2p5_params(&builder)? {
+    PlannedGptImage2p5Params::TextToImage(params) => {
+      FalGptImage2p5SunburstRequestState::TextToImage(GptImage2p5SunburstTextToImageRequest { params })
+    }
+    PlannedGptImage2p5Params::EditImage(params) => {
+      FalGptImage2p5SunburstRequestState::EditImage(GptImage2p5SunburstEditImageRequest { params })
+    }
+  };
+
+  Ok(ImageGenerationDraftOrRequest::Request(
+    ImageGenerationRequest::FalGptImage2p5Sunburst(state),
+  ))
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_quality::RouterQuality;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+
+  #[test]
+  fn build2_routes_to_sunburst_text_to_image() {
+    let request = unwrap_t2i(base_builder().build2());
+    assert_eq!(request.params.prompt, "a cat in space");
+    assert_eq!(GptImage2p5SunburstTextToImageRequest::ENDPOINT, "openai/gpt-image-2.5/sunburst/text-to-image");
+  }
+
+  #[test]
+  fn build2_routes_to_sunburst_edit_when_reference_images_present() {
+    let request = unwrap_edit(GenerateImageRequestBuilder {
+      image_inputs: Some(ImageListRef::Urls(vec!["https://example.com/img.jpg".to_string()])),
+      ..base_builder()
+    }.build2());
+    assert_eq!(request.params.image_urls, vec!["https://example.com/img.jpg"]);
+    assert_eq!(GptImage2p5SunburstEditImageRequest::ENDPOINT, "openai/gpt-image-2.5/sunburst/edit");
+  }
+
+  #[test]
+  fn planned_fields_reach_the_fal_request() {
+    let request = unwrap_t2i(GenerateImageRequestBuilder {
+      aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+      resolution: Some(RouterResolution::TwoK),
+      quality: Some(RouterQuality::Medium),
+      image_batch_count: Some(3),
+      ..base_builder()
+    }.build2());
+    assert_eq!(format!("{:?}", request.params.image_size), "Some(Landscape16x9)");
+    assert_eq!(format!("{:?}", request.params.resolution), "Some(TwoK)");
+    assert_eq!(format!("{:?}", request.params.quality), "Some(Medium)");
+    assert_eq!(format!("{:?}", request.params.num_images), "Three");
+  }
+
+  #[test]
+  fn raw_wire_request_matches_fal_schema() {
+    let request = unwrap_t2i(GenerateImageRequestBuilder {
+      aspect_ratio: Some(RouterAspectRatio::Square),
+      quality: Some(RouterQuality::High),
+      image_batch_count: Some(2),
+      ..base_builder()
+    }.build2());
+    let json = serde_json::to_value(request.to_raw_request().unwrap()).unwrap();
+    assert_eq!(json, serde_json::json!({
+      "prompt": "a cat in space",
+      "image_size": "square",
+      "quality": "high",
+      "num_images": 2,
+      "output_format": "png",
+    }));
+  }
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::GptImage2p5Sunburst,
+      provider: RouterProvider::Fal,
+      prompt: Some("a cat in space".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  fn unwrap_t2i(result: Result<ImageGenerationDraftOrRequest, ArtcraftRouterError>) -> GptImage2p5SunburstTextToImageRequest {
+    let ImageGenerationDraftOrRequest::Request(
+      ImageGenerationRequest::FalGptImage2p5Sunburst(FalGptImage2p5SunburstRequestState::TextToImage(request))
+    ) = result.expect("build should succeed") else {
+      panic!("expected GPT Image 2.5 Sunburst text-to-image request")
+    };
+    request
+  }
+
+  fn unwrap_edit(result: Result<ImageGenerationDraftOrRequest, ArtcraftRouterError>) -> GptImage2p5SunburstEditImageRequest {
+    let ImageGenerationDraftOrRequest::Request(
+      ImageGenerationRequest::FalGptImage2p5Sunburst(FalGptImage2p5SunburstRequestState::EditImage(request))
+    ) = result.expect("build should succeed") else {
+      panic!("expected GPT Image 2.5 Sunburst edit-image request")
+    };
+    request
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2p5_sunburst/cost.rs

@@ -0,0 +1,133 @@
+use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator;
+
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_sunburst::request::FalGptImage2p5SunburstRequestState;
+
+/// Cost state for Fal GPT Image 2.5 Sunburst. Delegates to `fal_client`'s calculator, which
+/// prices by output dimensions (aspect ratio and resolution tier), quality, batch size and,
+/// for edits, the number of reference images.
+#[derive(Clone, Debug)]
+pub struct FalGptImage2p5SunburstCostState {
+  cost_in_usd_cents: u64,
+}
+
+impl FalGptImage2p5SunburstCostState {
+  pub fn from_request(request: &FalGptImage2p5SunburstRequestState) -> Self {
+    let cost_in_usd_cents = match request {
+      FalGptImage2p5SunburstRequestState::TextToImage(request) => request.calculate_cost_in_cents(),
+      FalGptImage2p5SunburstRequestState::EditImage(request) => request.calculate_cost_in_cents(),
+    };
+    Self { cost_in_usd_cents }
+  }
+
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    ImageGenerationCostEstimate {
+      cost_in_credits: Some(self.cost_in_usd_cents),
+      cost_in_usd_cents: Some(self.cost_in_usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_quality::RouterQuality;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use RouterAspectRatio as Ar;
+  use RouterQuality as Q;
+  use RouterResolution as R;
+
+  // (quality, aspect_ratio, resolution, batch, expected_cents) — text-to-image
+  const TEXT_CASES: &[(Option<Q>, Option<Ar>, Option<R>, u16, u64)] = &[
+    (None,            None,                    None,          1,  4), // Fal default: landscape_4_3, high
+    (Some(Q::Low),    Some(Ar::Square),        None,          1,  1),
+    (Some(Q::Medium), Some(Ar::Square),        None,          1,  2),
+    (Some(Q::High),   Some(Ar::Square),        None,          1,  6),
+    (Some(Q::High),   Some(Ar::Square),        None,          4, 24),
+    (Some(Q::High),   Some(Ar::SquareHd),      None,          1,  9),
+    (Some(Q::High),   Some(Ar::Square),        Some(R::TwoK), 1,  9),
+    (Some(Q::High),   Some(Ar::Square),        Some(R::FourK), 1, 13),
+    (Some(Q::High),   Some(Ar::WideFourByThree), None,        1,  4),
+    (Some(Q::High),   Some(Ar::TallThreeByFour), None,        1,  4),
+    (Some(Q::High),   Some(Ar::WideSixteenByNine), None,      1,  4),
+    (Some(Q::High),   Some(Ar::WideSixteenByNine), Some(R::OneK), 1, 3),
+    (Some(Q::High),   Some(Ar::WideSixteenByNine), Some(R::FourK), 1, 11),
+    (Some(Q::Medium), Some(Ar::TallNineBySixteen), Some(R::ThreeK), 2, 4),
+    (Some(Q::High),   Some(Ar::Auto),          None,          1, 11),
+    (Some(Q::High),   Some(Ar::Auto4k),        None,          1, 11),
+  ];
+
+  // (reference_images, quality, aspect_ratio, resolution, batch, expected_cents) — edit
+  const EDIT_CASES: &[(usize, Option<Q>, Option<Ar>, Option<R>, u16, u64)] = &[
+    (1, None,          None,             None,          1, 11), // Fal default: auto, high
+    (1, Some(Q::Low),  Some(Ar::Square), None,          1,  2),
+    (1, Some(Q::High), Some(Ar::Square), None,          1,  7),
+    (3, Some(Q::High), Some(Ar::Square), None,          1,  8),
+    (1, Some(Q::High), Some(Ar::Square), None,          4, 28),
+    (1, Some(Q::High), Some(Ar::WideSixteenByNine), Some(R::FourK), 1, 11),
+    (2, Some(Q::High), Some(Ar::Auto),   None,          1, 12),
+  ];
+
+  #[test]
+  fn text_to_image_costs() {
+    for &(quality, aspect_ratio, resolution, batch, expected) in TEXT_CASES {
+      assert_eq!(cost_cents(0, quality, aspect_ratio, resolution, batch), expected, "{quality:?} {aspect_ratio:?} {resolution:?} x{batch}");
+    }
+  }
+
+  #[test]
+  fn edit_image_costs() {
+    for &(refs, quality, aspect_ratio, resolution, batch, expected) in EDIT_CASES {
+      assert_eq!(cost_cents(refs, quality, aspect_ratio, resolution, batch), expected, "{refs} refs {quality:?} {aspect_ratio:?} {resolution:?} x{batch}");
+    }
+  }
+
+  #[test]
+  fn estimate_flags() {
+    let cost = builder(0, Some(Q::High), Some(Ar::Square), None, 1).build2().unwrap().estimate_cost().unwrap();
+    assert_eq!(cost.cost_in_credits, cost.cost_in_usd_cents);
+    assert!(!cost.is_free);
+    assert!(!cost.is_unlimited);
+    assert!(!cost.is_rate_limited);
+    assert!(!cost.has_watermark);
+  }
+
+  fn cost_cents(refs: usize, quality: Option<Q>, aspect_ratio: Option<Ar>, resolution: Option<R>, batch: u16) -> u64 {
+    builder(refs, quality, aspect_ratio, resolution, batch)
+      .build2().unwrap().estimate_cost().unwrap().cost_in_usd_cents.unwrap()
+  }
+
+  fn builder(refs: usize, quality: Option<Q>, aspect_ratio: Option<Ar>, resolution: Option<R>, batch: u16) -> GenerateImageRequestBuilder {
+    let image_inputs = if refs == 0 {
+      None
+    } else {
+      Some(ImageListRef::Urls(vec!["https://example.com/img.jpg".to_string(); refs]))
+    };
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::GptImage2p5Sunburst,
+      provider: RouterProvider::Fal,
+      prompt: Some("a cat in space".to_string()),
+      image_inputs,
+      resolution,
+      aspect_ratio,
+      quality,
+      image_batch_count: Some(batch),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2p5_sunburst/request.rs

@@ -0,0 +1,86 @@
+use fal_client::requests::api::image::edit::gpt_image_2p5_sunburst_edit_image::api::GptImage2p5SunburstEditImageRequest;
+use fal_client::requests::api::image::text::gpt_image_2p5_sunburst_text_to_image::api::GptImage2p5SunburstTextToImageRequest;
+
+use crate::client::router_fal_client::RouterFalClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_response::GenerateImageResponse;
+use crate::generate::generate_image::providers::fal::gpt_image_2p5_common::send::send_gpt_image_2p5_request;
+
+#[derive(Clone, Debug)]
+pub enum FalGptImage2p5SunburstRequestState {
+  TextToImage(GptImage2p5SunburstTextToImageRequest),
+  EditImage(GptImage2p5SunburstEditImageRequest),
+}
+
+impl FalGptImage2p5SunburstRequestState {
+  pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
+    match self {
+      Self::TextToImage(request) => send_gpt_image_2p5_request(request, client).await,
+      Self::EditImage(request) => send_gpt_image_2p5_request(request, client).await,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use fal_client::creds::fal_api_key::FalApiKey;
+  use fal_client::requests::api::image::common::gpt_image_2_resolution::GptImage2Resolution;
+  use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_edit_image_params::GptImage2p5EditImageParams;
+  use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_image_size::GptImage2p5ImageSize;
+  use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_num_images::GptImage2p5NumImages;
+  use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_quality::GptImage2p5Quality;
+  use fal_client::requests::api::image::common::gpt_image_2p5::gpt_image_2p5_text_to_image_params::GptImage2p5TextToImageParams;
+  use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;
+
+  #[tokio::test]
+  #[ignore] // requires real API key, incurs cost
+  async fn send_text_to_image_webhook() {
+    let request = FalGptImage2p5SunburstRequestState::TextToImage(GptImage2p5SunburstTextToImageRequest {
+      params: GptImage2p5TextToImageParams {
+        prompt: "a polished product photo of a glass compass".to_string(),
+        num_images: GptImage2p5NumImages::One,
+        image_size: Some(GptImage2p5ImageSize::Square),
+        resolution: Some(GptImage2Resolution::OneK),
+        quality: Some(GptImage2p5Quality::Low),
+        background: None,
+        output_format: None,
+        output_compression: None,
+      },
+    });
+    let response = request.send(&client_with_webhook()).await.expect("send should succeed");
+    let payload = response.get_fal_payload().expect("expected Fal payload");
+    assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
+  }
+
+  #[tokio::test]
+  #[ignore] // requires real API key, incurs cost
+  async fn send_edit_image_webhook() {
+    let request = FalGptImage2p5SunburstRequestState::EditImage(GptImage2p5SunburstEditImageRequest {
+      params: GptImage2p5EditImageParams {
+        prompt: "make this look like an elegant magazine cover image".to_string(),
+        image_urls: vec![JUNO_AT_LAKE_IMAGE_URL.to_string()],
+        mask_url: None,
+        num_images: GptImage2p5NumImages::One,
+        image_size: Some(GptImage2p5ImageSize::Square),
+        resolution: Some(GptImage2Resolution::OneK),
+        quality: Some(GptImage2p5Quality::Low),
+        background: None,
+        output_format: None,
+        output_compression: None,
+      },
+    });
+    let response = request.send(&client_with_webhook()).await.expect("send should succeed");
+    let payload = response.get_fal_payload().expect("expected Fal payload");
+    assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
+  }
+
+  fn client_with_webhook() -> RouterFalClient {
+    let secret = std::fs::read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")
+      .expect("Failed to read fal_api_key.txt");
+    RouterFalClient::new_with_webhook(
+      FalApiKey::from_str(secret.trim()),
+      "https://example.com/fal-webhook-test".to_string(),
+    )
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/mod.rs

@@ -6,6 +6,9 @@ pub mod flux_pro_1p1_ultra;
 pub mod gpt_image_1;
 pub mod gpt_image_1p5;
 pub mod gpt_image_2;
+pub mod gpt_image_2p5_common;
+pub mod gpt_image_2p5_flare;
+pub mod gpt_image_2p5_sunburst;
 pub mod nano_banana;
 pub mod nano_banana_2;
 pub mod nano_banana_pro;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/AGENTS.md

@@ -0,0 +1,127 @@
+# generate_video
+
+This module implements the v2 video generation pipeline. It replaces the v1 system
+(in `generate_video/`) with a two-phase approach that separates request planning from
+execution, allowing cost estimation and media uploads to happen at the right time.
+
+## Lifecycle
+
+```
+GenerateVideoRequestBuilder
+    │
+    ▼ build2()
+VideoGenerationDraftOrRequest
+    │
+    ├─ Draft(VideoGenerationDraftRequest)
+    │       │
+    │       ▼ estimate_cost()   ← cost estimate from draft state
+    │       │
+    │       ▼ finalize(context) ← uploads media, resolves tokens
+    │       │
+    │       ▼
+    │   VideoGenerationRequest
+    │       │
+    │       ▼ estimate_cost()   ← cost estimate from finalized request
+    │       │
+    │       ▼ send_request()    ← fires the API call
+    │       │
+    │       ▼
+    │   GenerateVideoResponse
+    │
+    └─ Request(VideoGenerationRequest)  ← skips draft phase (used by Artcraft provider)
+```
+
+### Key types
+
+- **`GenerateVideoRequestBuilder`** — generic builder with provider/model/prompt/resolution/etc.
+  Located in `generate_video/generate_video_request_builder.rs`. The `use_new_builder()` method
+  gates which provider+model combos use the v2 path. `build2()` dispatches to the correct
+  provider's build function.
+
+- **`VideoGenerationDraftOrRequest`** — the output of `build2()`. Either `Draft` (for providers
+  that need media upload/resolution, like Kinovi) or `Request` (for providers that work with
+  media file tokens directly, like Artcraft).
+
+- **`VideoGenerationDraftRequest`** — enum with one variant per provider+model. Holds
+  materialized settings (resolution, duration, batch count) plus unresolved media references.
+  Can estimate cost without network calls.
+
+- **`VideoGenerationDraftContext`** — context needed during `finalize()`: the provider client,
+  media file token-to-URL map, and character token-to-ID map.
+
+- **`VideoGenerationRequest`** — enum with one variant per provider+model. Holds a fully
+  materialized request ready to send. All media URLs are resolved and uploaded.
+
+### Cost estimation
+
+Cost can be estimated at two stages:
+1. **From draft** — before `finalize()`. Uses the planned resolution/duration/batch count.
+   Good for showing the user a price before committing.
+2. **From request** — after `finalize()`. Uses the final materialized request. Should match
+   the draft estimate for the same parameters.
+
+## Module layout
+
+```
+generate_video/
+├── mod.rs
+├── video_generation_draft.rs           ← VideoGenerationDraftRequest enum
+├── video_generation_draft_context.rs   ← context for finalize()
+├── video_generation_draft_or_request.rs
+├── video_generation_request.rs         ← VideoGenerationRequest enum
+└── providers/
+    ├── artcraft/                       ← Artcraft provider (uses media file tokens directly)
+    │   ├── seedance_2p0/              ← Seedance 2.0 Pro model (skips draft, returns Request directly)
+    │   │   ├── mod.rs
+    │   │   ├── build.rs               ← builder → Request conversion + plan helpers
+    │   │   ├── cost.rs                ← standalone cost estimation (independent of kinovi_web_client)
+    │   │   └── request.rs             ← request state + send() via Artcraft multi-function API
+    │   └── seedance_2p0_fast/         ← Seedance 2.0 Fast model (skips draft, 480p/720p only)
+    │       ├── mod.rs
+    │       ├── build.rs               ← builder → Request conversion + plan helpers (no 1080p)
+    │       ├── cost.rs                ← standalone cost estimation with Fast-specific pricing
+    │       └── request.rs             ← request state + send() via Artcraft omni-gen API
+    └── kinovi/                         ← Kinovi/KinoviWeb provider
+        ├── mod.rs
+        ├── resolve.rs                  ← shared: media token resolution, upload helpers
+        ├── upload.rs                   ← shared: download + re-upload to KinoviWeb CDN
+        ├── seedance_2p0/              ← Seedance 2.0 Pro model
+        │   ├── mod.rs
+        │   ├── build.rs               ← builder → draft conversion + plan helpers
+        │   ├── cost.rs                ← cost estimation state
+        │   ├── draft.rs               ← draft state + finalize (to_request)
+        │   └── request.rs             ← request state + send()
+        └── seedance_2p0_fast/         ← Seedance 2.0 Fast model
+            ├── mod.rs
+            ├── build.rs
+            ├── cost.rs
+            ├── draft.rs
+            └── request.rs
+```
+
+## Adding a new provider or model
+
+1. **Create the module** under `providers/{provider}/{model}/` with these files:
+   - `mod.rs` — declares sub-modules
+   - `build.rs` — `build_{provider}_{model}(builder) -> VideoGenerationDraftOrRequest`.
+     Contains `plan_*` helpers for aspect ratio, resolution, batch count, duration.
+   - `draft.rs` — draft state struct with `to_request()` async method for finalization.
+     **Not needed** if the provider uses media tokens directly (no upload/resolution needed);
+     in that case `build.rs` returns `VideoGenerationDraftOrRequest::Request(...)` directly.
+   - `cost.rs` — cost state with `from_request()` and `estimate_cost()`. Add `from_draft()`
+     if the provider uses the draft phase.
+   - `request.rs` — request state with `send()` async method.
+
+2. **Register the module** in the parent provider's `mod.rs`.
+
+3. **Add enum variants** in:
+   - `video_generation_draft.rs` — `VideoGenerationDraftRequest` enum + `estimate_cost` + `finalize`
+     (skip if provider has no draft phase)
+   - `video_generation_request.rs` — `VideoGenerationRequest` enum + `estimate_cost` + `send_request`
+
+4. **Wire into the builder** in `generate_video_request_builder.rs`:
+   - Add the `(Provider, Model)` pair to `use_new_builder()` returning `true`
+   - Add the dispatch arm in `build2()`
+
+5. **Tests**: each `build.rs` and `cost.rs` should have comprehensive tests. `request.rs`
+   should have `#[ignore]` live API tests for manual verification.

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/CLAUDE.md

@@ -1,127 +0,0 @@
-# generate_video
-
-This module implements the v2 video generation pipeline. It replaces the v1 system
-(in `generate_video/`) with a two-phase approach that separates request planning from
-execution, allowing cost estimation and media uploads to happen at the right time.
-
-## Lifecycle
-
-```
-GenerateVideoRequestBuilder
-    │
-    ▼ build2()
-VideoGenerationDraftOrRequest
-    │
-    ├─ Draft(VideoGenerationDraftRequest)
-    │       │
-    │       ▼ estimate_cost()   ← cost estimate from draft state
-    │       │
-    │       ▼ finalize(context) ← uploads media, resolves tokens
-    │       │
-    │       ▼
-    │   VideoGenerationRequest
-    │       │
-    │       ▼ estimate_cost()   ← cost estimate from finalized request
-    │       │
-    │       ▼ send_request()    ← fires the API call
-    │       │
-    │       ▼
-    │   GenerateVideoResponse
-    │
-    └─ Request(VideoGenerationRequest)  ← skips draft phase (used by Artcraft provider)
-```
-
-### Key types
-
-- **`GenerateVideoRequestBuilder`** — generic builder with provider/model/prompt/resolution/etc.
-  Located in `generate_video/generate_video_request_builder.rs`. The `use_new_builder()` method
-  gates which provider+model combos use the v2 path. `build2()` dispatches to the correct
-  provider's build function.
-
-- **`VideoGenerationDraftOrRequest`** — the output of `build2()`. Either `Draft` (for providers
-  that need media upload/resolution, like Kinovi) or `Request` (for providers that work with
-  media file tokens directly, like Artcraft).
-
-- **`VideoGenerationDraftRequest`** — enum with one variant per provider+model. Holds
-  materialized settings (resolution, duration, batch count) plus unresolved media references.
-  Can estimate cost without network calls.
-
-- **`VideoGenerationDraftContext`** — context needed during `finalize()`: the provider client,
-  media file token-to-URL map, and character token-to-ID map.
-
-- **`VideoGenerationRequest`** — enum with one variant per provider+model. Holds a fully
-  materialized request ready to send. All media URLs are resolved and uploaded.
-
-### Cost estimation
-
-Cost can be estimated at two stages:
-1. **From draft** — before `finalize()`. Uses the planned resolution/duration/batch count.
-   Good for showing the user a price before committing.
-2. **From request** — after `finalize()`. Uses the final materialized request. Should match
-   the draft estimate for the same parameters.
-
-## Module layout
-
-```
-generate_video/
-├── mod.rs
-├── video_generation_draft.rs           ← VideoGenerationDraftRequest enum
-├── video_generation_draft_context.rs   ← context for finalize()
-├── video_generation_draft_or_request.rs
-├── video_generation_request.rs         ← VideoGenerationRequest enum
-└── providers/
-    ├── artcraft/                       ← Artcraft provider (uses media file tokens directly)
-    │   ├── seedance_2p0/              ← Seedance 2.0 Pro model (skips draft, returns Request directly)
-    │   │   ├── mod.rs
-    │   │   ├── build.rs               ← builder → Request conversion + plan helpers
-    │   │   ├── cost.rs                ← standalone cost estimation (independent of kinovi_web_client)
-    │   │   └── request.rs             ← request state + send() via Artcraft multi-function API
-    │   └── seedance_2p0_fast/         ← Seedance 2.0 Fast model (skips draft, 480p/720p only)
-    │       ├── mod.rs
-    │       ├── build.rs               ← builder → Request conversion + plan helpers (no 1080p)
-    │       ├── cost.rs                ← standalone cost estimation with Fast-specific pricing
-    │       └── request.rs             ← request state + send() via Artcraft omni-gen API
-    └── kinovi/                         ← Kinovi/KinoviWeb provider
-        ├── mod.rs
-        ├── resolve.rs                  ← shared: media token resolution, upload helpers
-        ├── upload.rs                   ← shared: download + re-upload to KinoviWeb CDN
-        ├── seedance_2p0/              ← Seedance 2.0 Pro model
-        │   ├── mod.rs
-        │   ├── build.rs               ← builder → draft conversion + plan helpers
-        │   ├── cost.rs                ← cost estimation state
-        │   ├── draft.rs               ← draft state + finalize (to_request)
-        │   └── request.rs             ← request state + send()
-        └── seedance_2p0_fast/         ← Seedance 2.0 Fast model
-            ├── mod.rs
-            ├── build.rs
-            ├── cost.rs
-            ├── draft.rs
-            └── request.rs
-```
-
-## Adding a new provider or model
-
-1. **Create the module** under `providers/{provider}/{model}/` with these files:
-   - `mod.rs` — declares sub-modules
-   - `build.rs` — `build_{provider}_{model}(builder) -> VideoGenerationDraftOrRequest`.
-     Contains `plan_*` helpers for aspect ratio, resolution, batch count, duration.
-   - `draft.rs` — draft state struct with `to_request()` async method for finalization.
-     **Not needed** if the provider uses media tokens directly (no upload/resolution needed);
-     in that case `build.rs` returns `VideoGenerationDraftOrRequest::Request(...)` directly.
-   - `cost.rs` — cost state with `from_request()` and `estimate_cost()`. Add `from_draft()`
-     if the provider uses the draft phase.
-   - `request.rs` — request state with `send()` async method.
-
-2. **Register the module** in the parent provider's `mod.rs`.
-
-3. **Add enum variants** in:
-   - `video_generation_draft.rs` — `VideoGenerationDraftRequest` enum + `estimate_cost` + `finalize`
-     (skip if provider has no draft phase)
-   - `video_generation_request.rs` — `VideoGenerationRequest` enum + `estimate_cost` + `send_request`
-
-4. **Wire into the builder** in `generate_video_request_builder.rs`:
-   - Add the `(Provider, Model)` pair to `use_new_builder()` returning `true`
-   - Add the dispatch arm in `build2()`
-
-5. **Tests**: each `build.rs` and `cost.rs` should have comprehensive tests. `request.rs`
-   should have `#[ignore]` live API tests for manual verification.

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/CLAUDE.md

@@ -0,0 +1 @@
+AGENTS.md

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request_builder.rs

@@ -26,8 +26,6 @@ use crate::generate::generate_video::providers::artcraft::seedance_1p0_lite::bui
 use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::build::build_artcraft_seedance_1p5_pro;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0::build::build_artcraft_seedance_2p0;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::build::build_artcraft_seedance_2p0_fast;
-use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::build::build_artcraft_seedance_2p0_u;
-use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::build::build_artcraft_seedance_2p0_u_fast;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::build::build_artcraft_seedance_2p0_bp;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::build::build_artcraft_seedance_2p0_bp_fast;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::build::build_artcraft_seedance_2p0_bpu;
@@ -50,8 +48,6 @@ use crate::generate::generate_video::providers::artcraft::vidu_q3::build::build_
 use crate::generate::generate_video::providers::artcraft::vidu_q3_turbo::build::build_artcraft_vidu_q3_turbo;
 use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::build::build_kinovi_happy_horse_1p0;
 use crate::generate::generate_video::providers::kinovi::seedance_2p0::build::build_kinovi_seedance_2p0;
-use crate::generate::generate_video::providers::gmicloud::seedance_2p0_g::build::build_gmicloud_seedance_2p0_u;
-use crate::generate::generate_video::providers::gmicloud::seedance_2p0_fast_g::build::build_gmicloud_seedance_2p0_u_fast;
 use crate::generate::generate_video::providers::grok_api::grok_imagine_video::build::build_grok_api_grok_imagine_video;
 use crate::generate::generate_video::providers::grok_api::grok_imagine_video_1p5::build::build_grok_api_grok_imagine_video_1p5;
 use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::build_fal_kling_1_6_pro;
@@ -201,8 +197,6 @@ impl GenerateVideoRequestBuilder {
       (RouterProvider::Artcraft, RouterVideoModel::MinimaxH3) => build_artcraft_minimax_h3(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0) => build_artcraft_seedance_2p0(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0Fast) => build_artcraft_seedance_2p0_fast(self),
-      (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0Ultra) => build_artcraft_seedance_2p0_u(self),
-      (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0UltraFast) => build_artcraft_seedance_2p0_u_fast(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0BytePlus) => build_artcraft_seedance_2p0_bp(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0BytePlusFast) => build_artcraft_seedance_2p0_bp_fast(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0BytePlusUltra) => build_artcraft_seedance_2p0_bpu(self),
@@ -250,9 +244,6 @@ impl GenerateVideoRequestBuilder {
       (RouterProvider::Fal, RouterVideoModel::Veo3p1Lite) => build_fal_veo_3p1_lite(self),
       (RouterProvider::Fal, RouterVideoModel::ViduQ3) => build_fal_vidu_q3(self),
       (RouterProvider::Fal, RouterVideoModel::ViduQ3Turbo) => build_fal_vidu_q3_turbo(self),
-      // GmiCloud
-      (RouterProvider::GmiCloud, RouterVideoModel::Seedance2p0Ultra) => build_gmicloud_seedance_2p0_u(self),
-      (RouterProvider::GmiCloud, RouterVideoModel::Seedance2p0UltraFast) => build_gmicloud_seedance_2p0_u_fast(self),
       // Grok
       (RouterProvider::GrokApi, RouterVideoModel::GrokImagineVideo) => build_grok_api_grok_imagine_video(self),
       (RouterProvider::GrokApi, RouterVideoModel::GrokImagineVideo1p5) => build_grok_api_grok_imagine_video_1p5(self),

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/build_common.rs

@@ -231,7 +231,7 @@ fn plan_output_resolution(
   }
 }
 
-/// Batch counts: 1, 2, 4.
+/// Batch counts: 1 through 4.
 pub fn plan_batch_count(
   video_batch_count: Option<u16>,
   strategy: RequestMismatchMitigationStrategy,
@@ -239,7 +239,8 @@ pub fn plan_batch_count(
   let count = video_batch_count.unwrap_or(1);
   match count {
     0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 | 2 | 4 => Ok(count),
+    1..=4 => Ok(count),
+    // 5 and above:
     _ => match strategy {
       RequestMismatchMitigationStrategy::ErrorOut => {
         Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
@@ -248,9 +249,7 @@ pub fn plan_batch_count(
         }))
       }
       RequestMismatchMitigationStrategy::PayMoreUpgrade => Ok(4),
-      RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(if count < 4 { 2 } else { 4 })
-      }
+      RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(4),
     },
   }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/mod.rs

@@ -23,8 +23,6 @@ pub mod seedance_1p0_lite;
 pub mod seedance_1p5_pro;
 pub mod seedance_2p0;
 pub mod seedance_2p0_fast;
-pub mod seedance_2p0_u_fast;
-pub mod seedance_2p0_u;
 pub mod seedance_2p0_bp;
 pub mod seedance_2p0_bp_fast;
 pub mod seedance_2p0_bpu;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/cost.rs

@@ -79,6 +79,12 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 2), 750);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 375);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 3), 1125);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 500);
@@ -109,6 +115,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 100);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 150);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 200);
@@ -133,6 +144,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 2), 500);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 3), 750);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 4), 1000);

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/cost.rs

@@ -76,6 +76,12 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 2), 600);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 300);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 3), 900);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 400);
@@ -106,6 +112,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 90);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 135);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 180);

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/cost.rs

@@ -15,7 +15,7 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenera
 /// Kept as f64 because per-second rates are fractional; rounding happens
 /// once at the end after multiplying by duration × batch.
 const CENTS_PER_SECOND_480P: f64 = 7.772;
-const CENTS_PER_SECOND_720P: f64 = 16.0;
+const CENTS_PER_SECOND_720P: f64 = 18.5;
 const CENTS_PER_SECOND_1080P: f64 = 46.632;
 
 /// USD cents per second, in hundredths of a cent, when one or more
@@ -65,7 +65,6 @@ impl ArtcraftSeedance2p0CostState {
       let usd_cents = seedance_2p0_four_k_usd_cents(
         self.duration_seconds,
         self.batch_count,
-        self.has_video_reference,
       );
       return VideoGenerationCostEstimate {
         cost_in_credits: Some(usd_cents),
@@ -132,25 +131,32 @@ mod tests {
 
     #[test]
     fn batch_1() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 1), 64);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 1), 80);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 6, 1), 96);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1), 160);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 1), 240);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 1), 74);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 1), 93);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 6, 1), 111);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1), 185);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 1), 278);
     }
 
     #[test]
     fn batch_2() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 2), 128);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 160);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 2), 480);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 2), 148);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 185);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 2), 555);
+    }
+
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 3), 222);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 278);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 3), 833);
     }
 
     #[test]
     fn batch_4() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 4), 256);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 320);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 4), 960);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 4), 296);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 370);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 4), 1110);
     }
 
     #[test]
@@ -177,6 +183,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 78);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 117);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 155);
@@ -201,6 +212,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 2), 466);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 3), 699);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 4), 933);
@@ -226,10 +242,10 @@ mod tests {
 
     #[test]
     fn explicit_4k_without_video_reference() {
-      assert_eq!(artcraft_4k_cents(4, 1, false), 347);
-      assert_eq!(artcraft_4k_cents(5, 1, false), 433);
-      assert_eq!(artcraft_4k_cents(10, 1, false), 866);
-      assert_eq!(artcraft_4k_cents(15, 1, false), 1299);
+      assert_eq!(artcraft_4k_cents(4, 1, false), 370);
+      assert_eq!(artcraft_4k_cents(5, 1, false), 463);
+      assert_eq!(artcraft_4k_cents(10, 1, false), 925);
+      assert_eq!(artcraft_4k_cents(15, 1, false), 1388);
     }
 
     #[test]
@@ -464,4 +480,74 @@ mod tests {
       .cost_in_usd_cents
       .unwrap()
   }
+
+  // ── Video reference deltas ──
+  //
+  // References price on the with-reference rate card; the delta must be positive at every resolution and duration.
+
+  mod video_reference_deltas {
+    use enums::common::generation::common_resolution::CommonResolution;
+
+    use super::super::ArtcraftSeedance2p0CostState;
+
+    #[test]
+    fn refs_cost_more_at_480p() {
+      assert_ref_delta(CommonResolution::FourEightyP, 5, 39, 45, 6);
+      assert_ref_delta(CommonResolution::FourEightyP, 10, 78, 89, 11);
+      assert_ref_delta(CommonResolution::FourEightyP, 15, 117, 133, 16);
+    }
+
+    #[test]
+    fn refs_cost_more_at_720p() {
+      assert_ref_delta(CommonResolution::SevenTwentyP, 5, 93, 111, 18);
+      assert_ref_delta(CommonResolution::SevenTwentyP, 10, 185, 221, 36);
+      assert_ref_delta(CommonResolution::SevenTwentyP, 15, 278, 331, 53);
+    }
+
+    #[test]
+    fn refs_cost_more_at_1080p() {
+      assert_ref_delta(CommonResolution::TenEightyP, 5, 233, 256, 23);
+      assert_ref_delta(CommonResolution::TenEightyP, 10, 466, 511, 45);
+      assert_ref_delta(CommonResolution::TenEightyP, 15, 699, 767, 68);
+    }
+
+    #[test]
+    fn refs_cost_more_at_4k() {
+      assert_ref_delta(CommonResolution::FourK, 5, 463, 569, 106);
+      assert_ref_delta(CommonResolution::FourK, 10, 925, 1138, 213);
+      assert_ref_delta(CommonResolution::FourK, 15, 1388, 1707, 319);
+    }
+
+    /// Price the same generation with and without a reference video; pin
+    /// both prices and the delta, in USD cents AND credits (credits equal
+    /// cents, and both must show references costing more).
+    fn assert_ref_delta(
+      resolution: CommonResolution,
+      duration_seconds: u16,
+      expected_no_ref: u64,
+      expected_with_ref: u64,
+      expected_delta: u64,
+    ) {
+      let no_ref = ArtcraftSeedance2p0CostState {
+        resolution, duration_seconds, batch_count: 1, has_video_reference: false,
+      }.estimate_cost();
+      let with_ref = ArtcraftSeedance2p0CostState {
+        resolution, duration_seconds, batch_count: 1, has_video_reference: true,
+      }.estimate_cost();
+
+      let no_ref_cents = no_ref.cost_in_usd_cents.unwrap();
+      let with_ref_cents = with_ref.cost_in_usd_cents.unwrap();
+      assert_eq!(no_ref_cents, expected_no_ref);
+      assert_eq!(with_ref_cents, expected_with_ref);
+      assert_eq!(with_ref_cents - no_ref_cents, expected_delta);
+      assert!(with_ref_cents > no_ref_cents, "references must cost more");
+
+      let no_ref_credits = no_ref.cost_in_credits.unwrap();
+      let with_ref_credits = with_ref.cost_in_credits.unwrap();
+      assert_eq!(no_ref_credits, expected_no_ref);
+      assert_eq!(with_ref_credits, expected_with_ref);
+      assert_eq!(with_ref_credits - no_ref_credits, expected_delta);
+    }
+  }
+
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/cost.rs

@@ -1,6 +1,5 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
-use crate::generate::generate_video::providers::artcraft::seedance_common::seedance_2p0_four_k_usd_cents;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 
@@ -12,6 +11,24 @@ const CENTS_PER_SECOND_480P: f64 = 10.0;
 const CENTS_PER_SECOND_720P: f64 = 25.0;
 const CENTS_PER_SECOND_1080P: f64 = 50.0;
 
+/// USD cents per second, in hundredths of a cent, when one or more
+/// reference videos are attached. Held as integer hundredths so the math is
+/// exact; rounded up to whole cents once, after multiplying by
+/// duration × batch.
+///   480p:  10.20 ¢/s
+///   720p:  25.70 ¢/s
+///   1080p: 57.80 ¢/s
+///   4K:   119.00 ¢/s
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P: u64 = 1_020;
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P: u64 = 2_570;
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_1080P: u64 = 5_780;
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_4K: u64 = 11_900;
+
+/// 4K output price with no reference videos, in hundredths of a USD cent
+/// per second (95.00 ¢/s), rounded up to whole cents after multiplying by
+/// duration × batch.
+const CENTI_CENTS_PER_SECOND_4K: u64 = 9_500;
+
 pub struct ArtcraftSeedance2p0BytePlusCostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
@@ -32,12 +49,24 @@ impl ArtcraftSeedance2p0BytePlusCostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
+    if self.has_video_reference {
+      let usd_cents = self.with_video_reference_usd_cents();
+      return VideoGenerationCostEstimate {
+        cost_in_credits: Some(usd_cents),
+        cost_in_usd_cents: Some(usd_cents),
+        is_free: false,
+        is_unlimited: false,
+        is_rate_limited: false,
+        has_watermark: false,
+        failures_are_refunded: None,
+      };
+    }
+
     if self.resolution == CommonResolution::FourK {
-      let usd_cents = seedance_2p0_four_k_usd_cents(
-        self.duration_seconds,
-        self.batch_count,
-        self.has_video_reference,
-      );
+      let total_centi_cents = CENTI_CENTS_PER_SECOND_4K
+        * self.duration_seconds as u64
+        * self.batch_count as u64;
+      let usd_cents = total_centi_cents.div_ceil(100);
       return VideoGenerationCostEstimate {
         cost_in_credits: Some(usd_cents),
         cost_in_usd_cents: Some(usd_cents),
@@ -67,6 +96,22 @@ impl ArtcraftSeedance2p0BytePlusCostState {
       failures_are_refunded: None,
     }
   }
+
+  /// Price when one or more reference videos are attached.
+  fn with_video_reference_usd_cents(&self) -> u64 {
+    let centi_cents_per_second = match self.resolution {
+      CommonResolution::FourEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P,
+      CommonResolution::TenEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_1080P,
+      CommonResolution::FourK => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_4K,
+      // Everything else (including 720p) prices at 720p.
+      _ => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P,
+    };
+
+    let seconds = self.duration_seconds as u64 * self.batch_count as u64;
+
+    // Round up to whole cents.
+    (centi_cents_per_second * seconds).div_ceil(100)
+  }
 }
 
 #[cfg(test)]
@@ -92,6 +137,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 250);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 375);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 500);
@@ -119,6 +169,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 100);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 150);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 200);
@@ -141,6 +196,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 2), 500);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 3), 750);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 4), 1000);
@@ -164,18 +224,20 @@ mod tests {
 
     #[test]
     fn explicit_4k_without_video_reference() {
-      assert_eq!(artcraft_4k_cents(4, 1, false), 347);
-      assert_eq!(artcraft_4k_cents(5, 1, false), 433);
-      assert_eq!(artcraft_4k_cents(10, 1, false), 866);
-      assert_eq!(artcraft_4k_cents(15, 1, false), 1299);
+      // 95.00 ¢/s card, rounded up to whole cents.
+      assert_eq!(artcraft_4k_cents(4, 1, false), 380);
+      assert_eq!(artcraft_4k_cents(5, 1, false), 475);
+      assert_eq!(artcraft_4k_cents(10, 1, false), 950);
+      assert_eq!(artcraft_4k_cents(15, 1, false), 1425);
     }
 
     #[test]
     fn explicit_4k_with_video_reference() {
-      assert_eq!(artcraft_4k_cents(4, 1, true), 416);
-      assert_eq!(artcraft_4k_cents(5, 1, true), 519);
-      assert_eq!(artcraft_4k_cents(10, 1, true), 1038);
-      assert_eq!(artcraft_4k_cents(15, 1, true), 1557);
+      // 119.00 ¢/s with-reference card, rounded up to whole cents.
+      assert_eq!(artcraft_4k_cents(4, 1, true), 476);
+      assert_eq!(artcraft_4k_cents(5, 1, true), 595);
+      assert_eq!(artcraft_4k_cents(10, 1, true), 1190);
+      assert_eq!(artcraft_4k_cents(15, 1, true), 1785);
     }
   }
 
@@ -228,4 +290,74 @@ mod tests {
   fn cost_cents(resolution: Option<RouterResolution>, duration_seconds: u16, video_batch_count: u16) -> u64 {
     build_cost(resolution, duration_seconds, video_batch_count).cost_in_usd_cents.unwrap()
   }
+
+  // ── Video reference deltas ──
+  //
+  // References price on the with-reference rate card (10.20/25.70/57.80/113.80 ¢/s); the delta must be positive at every resolution and duration.
+
+  mod video_reference_deltas {
+    use enums::common::generation::common_resolution::CommonResolution;
+
+    use super::super::ArtcraftSeedance2p0BytePlusCostState;
+
+    #[test]
+    fn refs_cost_more_at_480p() {
+      assert_ref_delta(CommonResolution::FourEightyP, 5, 50, 51, 1);
+      assert_ref_delta(CommonResolution::FourEightyP, 10, 100, 102, 2);
+      assert_ref_delta(CommonResolution::FourEightyP, 15, 150, 153, 3);
+    }
+
+    #[test]
+    fn refs_cost_more_at_720p() {
+      assert_ref_delta(CommonResolution::SevenTwentyP, 5, 125, 129, 4);
+      assert_ref_delta(CommonResolution::SevenTwentyP, 10, 250, 257, 7);
+      assert_ref_delta(CommonResolution::SevenTwentyP, 15, 375, 386, 11);
+    }
+
+    #[test]
+    fn refs_cost_more_at_1080p() {
+      assert_ref_delta(CommonResolution::TenEightyP, 5, 250, 289, 39);
+      assert_ref_delta(CommonResolution::TenEightyP, 10, 500, 578, 78);
+      assert_ref_delta(CommonResolution::TenEightyP, 15, 750, 867, 117);
+    }
+
+    #[test]
+    fn refs_cost_more_at_4k() {
+      assert_ref_delta(CommonResolution::FourK, 5, 475, 595, 120);
+      assert_ref_delta(CommonResolution::FourK, 10, 950, 1190, 240);
+      assert_ref_delta(CommonResolution::FourK, 15, 1425, 1785, 360);
+    }
+
+    /// Price the same generation with and without a reference video; pin
+    /// both prices and the delta, in USD cents AND credits (credits equal
+    /// cents, and both must show references costing more).
+    fn assert_ref_delta(
+      resolution: CommonResolution,
+      duration_seconds: u16,
+      expected_no_ref: u64,
+      expected_with_ref: u64,
+      expected_delta: u64,
+    ) {
+      let no_ref = ArtcraftSeedance2p0BytePlusCostState {
+        resolution, duration_seconds, batch_count: 1, has_video_reference: false,
+      }.estimate_cost();
+      let with_ref = ArtcraftSeedance2p0BytePlusCostState {
+        resolution, duration_seconds, batch_count: 1, has_video_reference: true,
+      }.estimate_cost();
+
+      let no_ref_cents = no_ref.cost_in_usd_cents.unwrap();
+      let with_ref_cents = with_ref.cost_in_usd_cents.unwrap();
+      assert_eq!(no_ref_cents, expected_no_ref);
+      assert_eq!(with_ref_cents, expected_with_ref);
+      assert_eq!(with_ref_cents - no_ref_cents, expected_delta);
+      assert!(with_ref_cents > no_ref_cents, "references must cost more");
+
+      let no_ref_credits = no_ref.cost_in_credits.unwrap();
+      let with_ref_credits = with_ref.cost_in_credits.unwrap();
+      assert_eq!(no_ref_credits, expected_no_ref);
+      assert_eq!(with_ref_credits, expected_with_ref);
+      assert_eq!(with_ref_credits - no_ref_credits, expected_delta);
+    }
+  }
+
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/cost.rs

@@ -9,10 +9,20 @@ use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::
 const CENTS_PER_SECOND_480P: f64 = 9.0;
 const CENTS_PER_SECOND_720P: f64 = 20.0;
 
+/// USD cents per second, in hundredths of a cent, when one or more
+/// reference videos are attached. Held as integer hundredths so the math is
+/// exact; rounded up to whole cents once, after multiplying by
+/// duration × batch.
+///   480p:  9.65 ¢/s
+///   720p: 20.50 ¢/s
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P: u64 = 965;
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P: u64 = 2_050;
+
 pub struct ArtcraftSeedance2p0BytePlusFastCostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
   pub batch_count: u16,
+  pub has_video_reference: bool,
 }
 
 impl ArtcraftSeedance2p0BytePlusFastCostState {
@@ -21,10 +31,26 @@ impl ArtcraftSeedance2p0BytePlusFastCostState {
       .unwrap_or(CommonResolution::SevenTwentyP);
     let duration_seconds = request.request.duration_seconds.unwrap_or(5);
     let batch_count = request.request.video_batch_count.unwrap_or(1);
-    Self { resolution, duration_seconds, batch_count }
+    let has_video_reference = request.request.reference_video_media_tokens
+      .as_ref()
+      .is_some_and(|tokens| !tokens.is_empty());
+    Self { resolution, duration_seconds, batch_count, has_video_reference }
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
+    if self.has_video_reference {
+      let usd_cents = self.with_video_reference_usd_cents();
+      return VideoGenerationCostEstimate {
+        cost_in_credits: Some(usd_cents),
+        cost_in_usd_cents: Some(usd_cents),
+        is_free: false,
+        is_unlimited: false,
+        is_rate_limited: false,
+        has_watermark: false,
+        failures_are_refunded: None,
+      };
+    }
+
     let cents_per_second = match self.resolution {
       CommonResolution::FourEightyP => CENTS_PER_SECOND_480P,
       _ => CENTS_PER_SECOND_720P,
@@ -42,6 +68,20 @@ impl ArtcraftSeedance2p0BytePlusFastCostState {
       failures_are_refunded: None,
     }
   }
+
+  /// Price when one or more reference videos are attached.
+  fn with_video_reference_usd_cents(&self) -> u64 {
+    let centi_cents_per_second = match self.resolution {
+      CommonResolution::FourEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P,
+      // Everything else (including 720p) prices at 720p.
+      _ => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P,
+    };
+
+    let seconds = self.duration_seconds as u64 * self.batch_count as u64;
+
+    // Round up to whole cents.
+    (centi_cents_per_second * seconds).div_ceil(100)
+  }
 }
 
 #[cfg(test)]
@@ -67,6 +107,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 200);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 300);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 400);
@@ -94,6 +139,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 90);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 135);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 180);

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_mini/cost.rs

@@ -65,18 +65,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 14);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 17);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 33);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 50);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 15);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 36);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 54);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 17);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 21);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 42);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 63);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 18);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 23);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 45);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 68);
     }
   }
 
@@ -85,18 +85,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 35);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 44);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 88);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 131);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 37);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 46);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 91);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 137);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 42);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 53);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 105);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 158);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 44);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 55);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 110);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 165);
     }
 
     #[test]
@@ -112,31 +112,31 @@ mod tests {
     /// apply). Once, batch 8 executed in full but billed as batch 4.
     #[test]
     fn every_batch_size_720p_5s() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 44);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 2, false), 88);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 3, false), 131);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 4, false), 175);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 5, false), 219);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 6, false), 262);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 7, false), 306);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, false), 349);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 46);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 2, false), 91);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 3, false), 137);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 4, false), 182);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 5, false), 228);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 6, false), 273);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 7, false), 319);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, false), 364);
     }
 
     #[test]
     fn every_batch_size_480p_5s() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 17);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 2, false), 33);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 3, false), 50);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 4, false), 66);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 5, false), 82);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 6, false), 99);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 7, false), 115);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 8, false), 131);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 2, false), 36);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 3, false), 54);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 4, false), 71);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 5, false), 89);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 6, false), 107);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 7, false), 125);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 8, false), 142);
     }
 
     #[test]
     fn batch_eight_with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, true), 419);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, true), 438);
     }
 
     #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/cost.rs

@@ -1,6 +1,5 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
-use crate::generate::generate_video::providers::artcraft::seedance_common::seedance_2p0_four_k_usd_cents;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 
@@ -12,6 +11,24 @@ const CENTS_PER_SECOND_480P: f64 = 10.0;
 const CENTS_PER_SECOND_720P: f64 = 25.0;
 const CENTS_PER_SECOND_1080P: f64 = 50.0;
 
+/// USD cents per second, in hundredths of a cent, when one or more
+/// reference videos are attached. Held as integer hundredths so the math is
+/// exact; rounded up to whole cents once, after multiplying by
+/// duration × batch.
+///   480p:  10.20 ¢/s
+///   720p:  25.70 ¢/s
+///   1080p: 57.80 ¢/s
+///   4K:   119.00 ¢/s
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P: u64 = 1_020;
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P: u64 = 2_570;
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_1080P: u64 = 5_780;
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_4K: u64 = 11_900;
+
+/// 4K output price with no reference videos, in hundredths of a USD cent
+/// per second (95.00 ¢/s), rounded up to whole cents after multiplying by
+/// duration × batch.
+const CENTI_CENTS_PER_SECOND_4K: u64 = 9_500;
+
 pub struct ArtcraftSeedance2p0BytePlusUltraCostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
@@ -32,12 +49,24 @@ impl ArtcraftSeedance2p0BytePlusUltraCostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
+    if self.has_video_reference {
+      let usd_cents = self.with_video_reference_usd_cents();
+      return VideoGenerationCostEstimate {
+        cost_in_credits: Some(usd_cents),
+        cost_in_usd_cents: Some(usd_cents),
+        is_free: false,
+        is_unlimited: false,
+        is_rate_limited: false,
+        has_watermark: false,
+        failures_are_refunded: None,
+      };
+    }
+
     if self.resolution == CommonResolution::FourK {
-      let usd_cents = seedance_2p0_four_k_usd_cents(
-        self.duration_seconds,
-        self.batch_count,
-        self.has_video_reference,
-      );
+      let total_centi_cents = CENTI_CENTS_PER_SECOND_4K
+        * self.duration_seconds as u64
+        * self.batch_count as u64;
+      let usd_cents = total_centi_cents.div_ceil(100);
       return VideoGenerationCostEstimate {
         cost_in_credits: Some(usd_cents),
         cost_in_usd_cents: Some(usd_cents),
@@ -67,6 +96,22 @@ impl ArtcraftSeedance2p0BytePlusUltraCostState {
       failures_are_refunded: None,
     }
   }
+
+  /// Price when one or more reference videos are attached.
+  fn with_video_reference_usd_cents(&self) -> u64 {
+    let centi_cents_per_second = match self.resolution {
+      CommonResolution::FourEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P,
+      CommonResolution::TenEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_1080P,
+      CommonResolution::FourK => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_4K,
+      // Everything else (including 720p) prices at 720p.
+      _ => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P,
+    };
+
+    let seconds = self.duration_seconds as u64 * self.batch_count as u64;
+
+    // Round up to whole cents.
+    (centi_cents_per_second * seconds).div_ceil(100)
+  }
 }
 
 #[cfg(test)]
@@ -92,6 +137,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 250);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 375);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 500);
@@ -119,6 +169,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 100);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 150);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 200);
@@ -141,6 +196,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 2), 500);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 3), 750);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 4), 1000);
@@ -164,18 +224,20 @@ mod tests {
 
     #[test]
     fn explicit_4k_without_video_reference() {
-      assert_eq!(artcraft_4k_cents(4, 1, false), 347);
-      assert_eq!(artcraft_4k_cents(5, 1, false), 433);
-      assert_eq!(artcraft_4k_cents(10, 1, false), 866);
-      assert_eq!(artcraft_4k_cents(15, 1, false), 1299);
+      // 95.00 ¢/s card, rounded up to whole cents.
+      assert_eq!(artcraft_4k_cents(4, 1, false), 380);
+      assert_eq!(artcraft_4k_cents(5, 1, false), 475);
+      assert_eq!(artcraft_4k_cents(10, 1, false), 950);
+      assert_eq!(artcraft_4k_cents(15, 1, false), 1425);
     }
 
     #[test]
     fn explicit_4k_with_video_reference() {
-      assert_eq!(artcraft_4k_cents(4, 1, true), 416);
-      assert_eq!(artcraft_4k_cents(5, 1, true), 519);
-      assert_eq!(artcraft_4k_cents(10, 1, true), 1038);
-      assert_eq!(artcraft_4k_cents(15, 1, true), 1557);
+      // 119.00 ¢/s with-reference card, rounded up to whole cents.
+      assert_eq!(artcraft_4k_cents(4, 1, true), 476);
+      assert_eq!(artcraft_4k_cents(5, 1, true), 595);
+      assert_eq!(artcraft_4k_cents(10, 1, true), 1190);
+      assert_eq!(artcraft_4k_cents(15, 1, true), 1785);
     }
   }
 
@@ -228,4 +290,74 @@ mod tests {
   fn cost_cents(resolution: Option<RouterResolution>, duration_seconds: u16, video_batch_count: u16) -> u64 {
     build_cost(resolution, duration_seconds, video_batch_count).cost_in_usd_cents.unwrap()
   }
+
+  // ── Video reference deltas ──
+  //
+  // References price on the with-reference rate card (10.20/25.70/57.80/113.80 ¢/s); the delta must be positive at every resolution and duration.
+
+  mod video_reference_deltas {
+    use enums::common::generation::common_resolution::CommonResolution;
+
+    use super::super::ArtcraftSeedance2p0BytePlusUltraCostState;
+
+    #[test]
+    fn refs_cost_more_at_480p() {
+      assert_ref_delta(CommonResolution::FourEightyP, 5, 50, 51, 1);
+      assert_ref_delta(CommonResolution::FourEightyP, 10, 100, 102, 2);
+      assert_ref_delta(CommonResolution::FourEightyP, 15, 150, 153, 3);
+    }
+
+    #[test]
+    fn refs_cost_more_at_720p() {
+      assert_ref_delta(CommonResolution::SevenTwentyP, 5, 125, 129, 4);
+      assert_ref_delta(CommonResolution::SevenTwentyP, 10, 250, 257, 7);
+      assert_ref_delta(CommonResolution::SevenTwentyP, 15, 375, 386, 11);
+    }
+
+    #[test]
+    fn refs_cost_more_at_1080p() {
+      assert_ref_delta(CommonResolution::TenEightyP, 5, 250, 289, 39);
+      assert_ref_delta(CommonResolution::TenEightyP, 10, 500, 578, 78);
+      assert_ref_delta(CommonResolution::TenEightyP, 15, 750, 867, 117);
+    }
+
+    #[test]
+    fn refs_cost_more_at_4k() {
+      assert_ref_delta(CommonResolution::FourK, 5, 475, 595, 120);
+      assert_ref_delta(CommonResolution::FourK, 10, 950, 1190, 240);
+      assert_ref_delta(CommonResolution::FourK, 15, 1425, 1785, 360);
+    }
+
+    /// Price the same generation with and without a reference video; pin
+    /// both prices and the delta, in USD cents AND credits (credits equal
+    /// cents, and both must show references costing more).
+    fn assert_ref_delta(
+      resolution: CommonResolution,
+      duration_seconds: u16,
+      expected_no_ref: u64,
+      expected_with_ref: u64,
+      expected_delta: u64,
+    ) {
+      let no_ref = ArtcraftSeedance2p0BytePlusUltraCostState {
+        resolution, duration_seconds, batch_count: 1, has_video_reference: false,
+      }.estimate_cost();
+      let with_ref = ArtcraftSeedance2p0BytePlusUltraCostState {
+        resolution, duration_seconds, batch_count: 1, has_video_reference: true,
+      }.estimate_cost();
+
+      let no_ref_cents = no_ref.cost_in_usd_cents.unwrap();
+      let with_ref_cents = with_ref.cost_in_usd_cents.unwrap();
+      assert_eq!(no_ref_cents, expected_no_ref);
+      assert_eq!(with_ref_cents, expected_with_ref);
+      assert_eq!(with_ref_cents - no_ref_cents, expected_delta);
+      assert!(with_ref_cents > no_ref_cents, "references must cost more");
+
+      let no_ref_credits = no_ref.cost_in_credits.unwrap();
+      let with_ref_credits = with_ref.cost_in_credits.unwrap();
+      assert_eq!(no_ref_credits, expected_no_ref);
+      assert_eq!(with_ref_credits, expected_with_ref);
+      assert_eq!(with_ref_credits - no_ref_credits, expected_delta);
+    }
+  }
+
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/cost.rs

@@ -9,10 +9,20 @@ use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_fast:
 const CENTS_PER_SECOND_480P: f64 = 9.0;
 const CENTS_PER_SECOND_720P: f64 = 20.0;
 
+/// USD cents per second, in hundredths of a cent, when one or more
+/// reference videos are attached. Held as integer hundredths so the math is
+/// exact; rounded up to whole cents once, after multiplying by
+/// duration × batch.
+///   480p:  9.65 ¢/s
+///   720p: 20.50 ¢/s
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P: u64 = 965;
+const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P: u64 = 2_050;
+
 pub struct ArtcraftSeedance2p0BytePlusUltraFastCostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
   pub batch_count: u16,
+  pub has_video_reference: bool,
 }
 
 impl ArtcraftSeedance2p0BytePlusUltraFastCostState {
@@ -21,10 +31,26 @@ impl ArtcraftSeedance2p0BytePlusUltraFastCostState {
       .unwrap_or(CommonResolution::SevenTwentyP);
     let duration_seconds = request.request.duration_seconds.unwrap_or(5);
     let batch_count = request.request.video_batch_count.unwrap_or(1);
-    Self { resolution, duration_seconds, batch_count }
+    let has_video_reference = request.request.reference_video_media_tokens
+      .as_ref()
+      .is_some_and(|tokens| !tokens.is_empty());
+    Self { resolution, duration_seconds, batch_count, has_video_reference }
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
+    if self.has_video_reference {
+      let usd_cents = self.with_video_reference_usd_cents();
+      return VideoGenerationCostEstimate {
+        cost_in_credits: Some(usd_cents),
+        cost_in_usd_cents: Some(usd_cents),
+        is_free: false,
+        is_unlimited: false,
+        is_rate_limited: false,
+        has_watermark: false,
+        failures_are_refunded: None,
+      };
+    }
+
     let cents_per_second = match self.resolution {
       CommonResolution::FourEightyP => CENTS_PER_SECOND_480P,
       _ => CENTS_PER_SECOND_720P,
@@ -42,6 +68,20 @@ impl ArtcraftSeedance2p0BytePlusUltraFastCostState {
       failures_are_refunded: None,
     }
   }
+
+  /// Price when one or more reference videos are attached.
+  fn with_video_reference_usd_cents(&self) -> u64 {
+    let centi_cents_per_second = match self.resolution {
+      CommonResolution::FourEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P,
+      // Everything else (including 720p) prices at 720p.
+      _ => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P,
+    };
+
+    let seconds = self.duration_seconds as u64 * self.batch_count as u64;
+
+    // Round up to whole cents.
+    (centi_cents_per_second * seconds).div_ceil(100)
+  }
 }
 
 #[cfg(test)]
@@ -67,6 +107,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 200);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 300);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 400);
@@ -94,6 +139,11 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 90);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 135);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 180);

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_mini/cost.rs

@@ -65,18 +65,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 14);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 17);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 33);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 50);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 15);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 36);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 54);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 17);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 21);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 42);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 63);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 18);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 23);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 45);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 68);
     }
   }
 
@@ -85,18 +85,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 35);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 44);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 88);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 131);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 37);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 46);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 91);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 137);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 42);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 53);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 105);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 158);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 44);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 55);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 110);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 165);
     }
 
     #[test]
@@ -112,31 +112,31 @@ mod tests {
     /// apply). Once, batch 8 executed in full but billed as batch 4.
     #[test]
     fn every_batch_size_720p_5s() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 44);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 2, false), 88);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 3, false), 131);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 4, false), 175);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 5, false), 219);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 6, false), 262);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 7, false), 306);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, false), 349);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 46);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 2, false), 91);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 3, false), 137);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 4, false), 182);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 5, false), 228);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 6, false), 273);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 7, false), 319);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, false), 364);
     }
 
     #[test]
     fn every_batch_size_480p_5s() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 17);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 2, false), 33);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 3, false), 50);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 4, false), 66);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 5, false), 82);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 6, false), 99);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 7, false), 115);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 8, false), 131);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 2, false), 36);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 3, false), 54);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 4, false), 71);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 5, false), 89);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 6, false), 107);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 7, false), 125);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 8, false), 142);
     }
 
     #[test]
     fn batch_eight_with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, true), 419);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, true), 438);
     }
 
     #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/cost.rs

@@ -13,7 +13,7 @@ use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::req
 ///
 /// Kept as f64 because per-second rates are fractional; rounding happens
 /// once at the end after multiplying by duration * batch.
-const CENTS_PER_SECOND_480P: f64 = 5.181;
+const CENTS_PER_SECOND_480P: f64 = 7.13;
 const CENTS_PER_SECOND_720P: f64 = 12.727;
 
 /// USD cents per second, in hundredths of a cent, when one or more
@@ -122,6 +122,13 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 2), 382);
     }
 
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 3), 153);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 191);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 3), 573);
+    }
+
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 4), 204);
@@ -142,20 +149,25 @@ mod tests {
 
     #[test]
     fn batch_1() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 4, 1), 21);
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 1), 26);
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 1), 52);
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 15, 1), 78);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 4, 1), 29);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 1), 36);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 1), 71);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 15, 1), 107);
     }
 
     #[test]
     fn batch_2() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 52);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 71);
+    }
+
+        #[test]
+    fn batch_3() {
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 107);
     }
 
     #[test]
     fn batch_4() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 104);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 143);
     }
   }
 
@@ -263,6 +275,76 @@ mod tests {
       assert!(b1 < b2);
       assert!(b2 < b4);
     }
+
+    /// A video reference must never make a generation cheaper than the same
+    /// generation without one, at any resolution, duration, or batch size.
+    #[test]
+    fn no_reference_cheaper_than_with_reference() {
+      for resolution in [RouterResolution::FourEightyP, RouterResolution::SevenTwentyP] {
+        for duration in 4..=15u16 {
+          for batch in [1, 2, 4] {
+            let no_ref = cost_cents(Some(resolution), duration, batch);
+            let with_ref = cost_cents_with_video_ref(Some(resolution), duration, batch);
+            assert!(
+              no_ref < with_ref,
+              "{resolution:?} {duration}s batch {batch}: no-ref {no_ref}¢ should be cheaper than with-ref {with_ref}¢",
+            );
+          }
+        }
+      }
+    }
+
+    /// 480p must stay cheaper than 720p in the with-reference rate card too
+    /// (the no-reference case is covered by [`cost_480p_cheaper_than_720p`]).
+    #[test]
+    fn cost_480p_cheaper_than_720p_with_reference() {
+      for duration in 4..=15u16 {
+        let c480 = cost_cents_with_video_ref(Some(RouterResolution::FourEightyP), duration, 1);
+        let c720 = cost_cents_with_video_ref(Some(RouterResolution::SevenTwentyP), duration, 1);
+        assert!(c480 < c720, "{duration}s with-ref: 480p ({c480}¢) should be cheaper than 720p ({c720}¢)");
+      }
+    }
+
+    /// The BytePlus variants are premium tiers: plain Fast must stay cheaper
+    /// at every resolution, duration, and reference configuration.
+    #[test]
+    fn fast_cheaper_than_byteplus_variants() {
+      let premium_models = [
+        RouterVideoModel::Seedance2p0BytePlusFast,
+        RouterVideoModel::Seedance2p0BytePlusUltraFast,
+      ];
+      for premium_model in premium_models {
+        for resolution in [RouterResolution::FourEightyP, RouterResolution::SevenTwentyP] {
+          for with_video_reference in [false, true] {
+            for duration in 4..=15u16 {
+              let plain = model_cost_cents(RouterVideoModel::Seedance2p0Fast, resolution, duration, 1, with_video_reference);
+              let premium = model_cost_cents(premium_model, resolution, duration, 1, with_video_reference);
+              assert!(
+                plain < premium,
+                "{premium_model:?} {resolution:?} {duration}s ref={with_video_reference}: plain Fast ({plain}¢) should be cheaper than the premium tier ({premium}¢)",
+              );
+            }
+          }
+        }
+      }
+    }
+
+    /// BytePlus Fast and BytePlus Ultra Fast share one rate card.
+    #[test]
+    fn byteplus_fast_and_ultra_fast_price_identically() {
+      for resolution in [RouterResolution::FourEightyP, RouterResolution::SevenTwentyP] {
+        for with_video_reference in [false, true] {
+          for duration in 4..=15u16 {
+            let bp = model_cost_cents(RouterVideoModel::Seedance2p0BytePlusFast, resolution, duration, 1, with_video_reference);
+            let bpu = model_cost_cents(RouterVideoModel::Seedance2p0BytePlusUltraFast, resolution, duration, 1, with_video_reference);
+            assert_eq!(
+              bp, bpu,
+              "{resolution:?} {duration}s ref={with_video_reference}: BytePlus Fast ({bp}¢) and Ultra Fast ({bpu}¢) should price identically",
+            );
+          }
+        }
+      }
+    }
   }
 
   // -- Credits equal cents --
@@ -347,4 +429,32 @@ mod tests {
       .cost_in_usd_cents
       .unwrap()
   }
+
+  /// Like [`cost_cents`], for any Fast-tier model and reference configuration.
+  fn model_cost_cents(
+    model: RouterVideoModel,
+    resolution: RouterResolution,
+    duration_seconds: u16,
+    video_batch_count: u16,
+    with_video_reference: bool,
+  ) -> u64 {
+    let reference_videos = with_video_reference.then(|| VideoListRef::MediaFileTokens(vec![
+      MediaFileToken::new("mf_ref".to_string()),
+    ]));
+    let builder = GenerateVideoRequestBuilder {
+      model,
+      provider: RouterProvider::Artcraft,
+      resolution: Some(resolution),
+      duration_seconds: Some(duration_seconds),
+      video_batch_count: Some(video_batch_count),
+      reference_videos,
+      ..Default::default()
+    };
+    builder.build2()
+      .expect("build2 should succeed")
+      .estimate_cost()
+      .expect("estimate_cost should succeed")
+      .cost_in_usd_cents
+      .unwrap()
+  }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_mini/cost.rs

@@ -65,18 +65,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 13);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 17);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 33);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 49);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 14);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 35);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 52);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 17);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 21);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 42);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 62);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 18);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 22);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 44);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 66);
     }
   }
 
@@ -85,18 +85,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 35);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 44);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 87);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 130);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 36);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 45);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 89);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 134);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 42);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 52);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 104);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 156);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 43);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 54);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 108);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 161);
     }
 
     #[test]
@@ -112,31 +112,31 @@ mod tests {
     /// apply). Once, batch 8 executed in full but billed as batch 4.
     #[test]
     fn every_batch_size_720p_5s() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 44);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 2, false), 87);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 3, false), 130);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 4, false), 173);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 5, false), 217);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 6, false), 260);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 7, false), 303);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, false), 346);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 45);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 2, false), 89);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 3, false), 134);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 4, false), 178);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 5, false), 223);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 6, false), 267);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 7, false), 312);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, false), 356);
     }
 
     #[test]
     fn every_batch_size_480p_5s() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 17);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 2, false), 33);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 3, false), 49);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 4, false), 65);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 5, false), 82);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 6, false), 98);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 7, false), 114);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 8, false), 130);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 2, false), 35);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 3, false), 52);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 4, false), 69);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 5, false), 87);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 6, false), 104);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 7, false), 121);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 8, false), 138);
     }
 
     #[test]
     fn batch_eight_with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, true), 415);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, true), 429);
     }
 
     #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/build.rs

@@ -1,189 +0,0 @@
-use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video::providers::artcraft::build_common::{
-  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
-};
-use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState;
-use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-pub fn build_artcraft_seedance_2p0_u(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
-  let request = build_artcraft_omni_video_request(
-    builder,
-    CommonVideoModelEnum::Seedance2p0Ultra,
-    SupportedResolutions::FullWith4k,
-    UltraWideSupport::Supported,
-  )?;
-  let state = ArtcraftSeedance2p0UltraRequestState { request };
-  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0Ultra(state)))
-}
-
-#[cfg(test)]
-mod tests {
-  use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
-  use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-  use enums::common::generation::common_bitrate::CommonBitrate as CommonBitrateEnum;
-  use crate::api::router_bitrate::RouterBitrate;
-  use tokens::tokens::characters::CharacterToken;
-  use tokens::tokens::media_files::MediaFileToken;
-
-  use crate::api::character_list_ref::CharacterListRef;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::image_ref::ImageRef;
-  use crate::api::router_provider::RouterProvider;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-  use super::*;
-
-  // ── Field conversions ──
-
-  mod field_conversions {
-    use super::*;
-
-    #[test]
-    fn model_is_seedance_2p0() {
-      let req = unwrap_request(make_builder(|_| {}));
-      assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0Ultra)));
-    }
-
-    #[test]
-    fn prompt_passed_through() {
-      let req = unwrap_request(make_builder(|b| { b.prompt = Some("test".to_string()); }));
-      assert_eq!(req.request.prompt, Some("test".to_string()));
-    }
-
-    #[test]
-    fn duration_passed_through() {
-      let req = unwrap_request(make_builder(|b| { b.duration_seconds = Some(10); }));
-      assert_eq!(req.request.duration_seconds, Some(10));
-    }
-
-    #[test]
-    fn duration_clamped_to_max() {
-      let req = unwrap_request(make_builder(|b| { b.duration_seconds = Some(99); }));
-      assert_eq!(req.request.duration_seconds, Some(15));
-    }
-
-    #[test]
-    fn batch_count_passed_through() {
-      let req = unwrap_request(make_builder(|b| { b.video_batch_count = Some(4); }));
-      assert_eq!(req.request.video_batch_count, Some(4));
-    }
-
-    #[test]
-    fn bitrate_passed_through() {
-      let req = unwrap_request(make_builder(|b| { b.bitrate = Some(RouterBitrate::High); }));
-      assert_eq!(req.request.bitrate, Some(CommonBitrateEnum::High));
-    }
-  }
-
-  // ── Resolution ──
-
-  mod resolution_tests {
-    use super::*;
-
-    #[test]
-    fn res_480p() {
-      let req = unwrap_request(make_builder(|b| { b.resolution = Some(RouterResolution::FourEightyP); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::FourEightyP));
-    }
-
-    #[test]
-    fn res_720p() {
-      let req = unwrap_request(make_builder(|b| { b.resolution = Some(RouterResolution::SevenTwentyP); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::SevenTwentyP));
-    }
-
-    #[test]
-    fn res_1080p() {
-      let req = unwrap_request(make_builder(|b| { b.resolution = Some(RouterResolution::TenEightyP); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::TenEightyP));
-    }
-
-    #[test]
-    fn res_4k() {
-      let req = unwrap_request(make_builder(|b| { b.resolution = Some(RouterResolution::FourK); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::FourK));
-    }
-
-    #[test]
-    fn none_stays_none() {
-      let req = unwrap_request(make_builder(|_| {}));
-      assert!(req.request.resolution.is_none());
-    }
-  }
-
-  // ── Media tokens ──
-
-  mod media_token_tests {
-    use super::*;
-
-    #[test]
-    fn start_frame_token_passed_through() {
-      let token = MediaFileToken::new("mf_start".to_string());
-      let req = unwrap_request(make_builder(|b| {
-        b.start_frame = Some(ImageRef::MediaFileToken(token.clone()));
-      }));
-      assert_eq!(req.request.start_frame_image_media_token, Some(token));
-    }
-
-    #[test]
-    fn url_start_frame_rejected() {
-      let result = build_artcraft_seedance_2p0_u(GenerateVideoRequestBuilder {
-        start_frame: Some(ImageRef::Url("https://example.com".to_string())),
-        ..base_builder()
-      });
-      assert!(result.is_err());
-    }
-
-    #[test]
-    fn reference_image_tokens_passed_through() {
-      let tokens = vec![MediaFileToken::new("mf_a".to_string()), MediaFileToken::new("mf_b".to_string())];
-      let req = unwrap_request(make_builder(|b| {
-        b.reference_images = Some(ImageListRef::MediaFileTokens(tokens.clone()));
-      }));
-      assert_eq!(req.request.reference_image_media_tokens, Some(tokens));
-    }
-
-    #[test]
-    fn character_tokens_passed_through() {
-      let tokens = vec![CharacterToken::new("char_a".to_string()), CharacterToken::new("char_b".to_string())];
-      let req = unwrap_request(make_builder(|b| {
-        b.reference_character_tokens = Some(CharacterListRef::CharacterTokens(tokens.clone()));
-      }));
-      assert_eq!(req.request.reference_character_tokens, Some(tokens));
-    }
-  }
-
-  // ── Helpers ──
-
-  fn base_builder() -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(5),
-      video_batch_count: Some(1),
-      ..Default::default()
-    }
-  }
-
-  fn make_builder(f: impl FnOnce(&mut GenerateVideoRequestBuilder)) -> GenerateVideoRequestBuilder {
-    let mut builder = base_builder();
-    f(&mut builder);
-    builder
-  }
-
-  fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0UltraRequestState {
-    let result = build_artcraft_seedance_2p0_u(builder).expect("build should succeed");
-    match result {
-      VideoGenerationDraftOrRequest::Request(
-        VideoGenerationRequest::ArtcraftSeedance2p0Ultra(state)
-      ) => state,
-      _ => panic!("expected ArtcraftSeedance2p0 request"),
-    }
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/cost.rs

@@ -1,237 +0,0 @@
-use enums::common::generation::common_resolution::CommonResolution;
-
-use crate::generate::generate_video::providers::artcraft::seedance_common::seedance_2p0_four_k_usd_cents;
-use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState;
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-// ── Pricing constants ──
-
-const CENTS_PER_SECOND_480P: f64 = 5.4404;
-const CENTS_PER_SECOND_720P: f64 = 11.2;
-const CENTS_PER_SECOND_1080P: f64 = 32.6424;
-
-pub struct ArtcraftSeedance2p0UltraCostState {
-  pub resolution: CommonResolution,
-  pub duration_seconds: u16,
-  pub batch_count: u16,
-  pub has_video_reference: bool,
-}
-
-impl ArtcraftSeedance2p0UltraCostState {
-  pub fn from_request(request: &ArtcraftSeedance2p0UltraRequestState) -> Self {
-    let resolution = request.request.resolution
-      .unwrap_or(CommonResolution::SevenTwentyP);
-    let duration_seconds = request.request.duration_seconds.unwrap_or(5);
-    let batch_count = request.request.video_batch_count.unwrap_or(1);
-    let has_video_reference = request.request.reference_video_media_tokens
-      .as_ref()
-      .is_some_and(|tokens| !tokens.is_empty());
-
-    Self { resolution, duration_seconds, batch_count, has_video_reference }
-  }
-
-  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    if self.resolution == CommonResolution::FourK {
-      let usd_cents = seedance_2p0_four_k_usd_cents(
-        self.duration_seconds,
-        self.batch_count,
-        self.has_video_reference,
-      );
-      return VideoGenerationCostEstimate {
-        cost_in_credits: Some(usd_cents),
-        cost_in_usd_cents: Some(usd_cents),
-        is_free: false,
-        is_unlimited: false,
-        is_rate_limited: false,
-        has_watermark: false,
-        failures_are_refunded: None,
-      };
-    }
-
-    let cents_per_second = match self.resolution {
-      CommonResolution::FourEightyP => CENTS_PER_SECOND_480P,
-      CommonResolution::TenEightyP => CENTS_PER_SECOND_1080P,
-      _ => CENTS_PER_SECOND_720P,
-    };
-
-    let cents_per_video = (cents_per_second * self.duration_seconds as f64).ceil() as u64;
-    let usd_cents = cents_per_video * self.batch_count as u64;
-
-    VideoGenerationCostEstimate {
-      cost_in_credits: Some(usd_cents),
-      cost_in_usd_cents: Some(usd_cents),
-      is_free: false,
-      is_unlimited: false,
-      is_rate_limited: false,
-      has_watermark: false,
-      failures_are_refunded: None,
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-
-  mod pricing_720p {
-    use super::*;
-
-    #[test]
-    fn batch_1() {
-      // 11.2 * 5 = 56¢
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 1), 56);
-      // 11.2 * 10 = 112¢
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1), 112);
-      // 11.2 * 15 = 168¢
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 1), 168);
-    }
-
-    #[test]
-    fn batch_2() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 112);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 2), 224);
-    }
-
-    #[test]
-    fn batch_4() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 224);
-    }
-
-    #[test]
-    fn none_defaults_to_720p() {
-      assert_eq!(cost_cents(None, 10, 1), cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1));
-    }
-  }
-
-  mod pricing_480p {
-    use super::*;
-
-    #[test]
-    fn batch_1() {
-      // 5.4404 * 5 = 27.202 → ceil = 28¢
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 1), 28);
-      // 5.4404 * 10 = 54.404 → ceil = 55¢
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 1), 55);
-      // 5.4404 * 15 = 81.606 → ceil = 82¢
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 15, 1), 82);
-    }
-
-    #[test]
-    fn batch_4() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 4), 220);
-    }
-  }
-
-  mod pricing_1080p {
-    use super::*;
-
-    #[test]
-    fn batch_1() {
-      // 32.6424 * 5 = 163.212 → ceil = 164¢
-      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 1), 164);
-      // 32.6424 * 10 = 326.424 → ceil = 327¢
-      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 10, 1), 327);
-      // 32.6424 * 15 = 489.636 → ceil = 490¢
-      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 15, 1), 490);
-    }
-
-    #[test]
-    fn batch_4() {
-      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 10, 4), 1308);
-    }
-  }
-
-  mod four_k_pricing {
-    use enums::common::generation::common_resolution::CommonResolution;
-
-    fn artcraft_4k_cents(duration_seconds: u16, batch_count: u16, has_video_reference: bool) -> u64 {
-      super::super::ArtcraftSeedance2p0UltraCostState {
-        resolution: CommonResolution::FourK,
-        duration_seconds,
-        batch_count,
-        has_video_reference,
-      }
-      .estimate_cost()
-      .cost_in_usd_cents
-      .unwrap()
-    }
-
-    #[test]
-    fn explicit_4k_without_video_reference() {
-      assert_eq!(artcraft_4k_cents(4, 1, false), 347);
-      assert_eq!(artcraft_4k_cents(5, 1, false), 433);
-      assert_eq!(artcraft_4k_cents(10, 1, false), 866);
-      assert_eq!(artcraft_4k_cents(15, 1, false), 1299);
-    }
-
-    #[test]
-    fn explicit_4k_with_video_reference() {
-      assert_eq!(artcraft_4k_cents(4, 1, true), 416);
-      assert_eq!(artcraft_4k_cents(5, 1, true), 519);
-      assert_eq!(artcraft_4k_cents(10, 1, true), 1038);
-      assert_eq!(artcraft_4k_cents(15, 1, true), 1557);
-    }
-  }
-
-  mod relative_pricing {
-    use super::*;
-
-    #[test]
-    fn cost_480p_cheaper_than_720p_cheaper_than_1080p() {
-      let c480 = cost_cents(Some(RouterResolution::FourEightyP), 10, 1);
-      let c720 = cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1);
-      let c1080 = cost_cents(Some(RouterResolution::TenEightyP), 10, 1);
-      assert!(c480 < c720);
-      assert!(c720 < c1080);
-    }
-
-    #[test]
-    fn cost_scales_with_duration() {
-      let c5 = cost_cents(None, 5, 1);
-      let c10 = cost_cents(None, 10, 1);
-      let c15 = cost_cents(None, 15, 1);
-      assert!(c5 < c10);
-      assert!(c10 < c15);
-    }
-
-    #[test]
-    fn cost_scales_with_batch() {
-      let b1 = cost_cents(None, 10, 1);
-      let b2 = cost_cents(None, 10, 2);
-      let b4 = cost_cents(None, 10, 4);
-      assert!(b1 < b2);
-      assert!(b2 < b4);
-    }
-
-    #[test]
-    fn credits_equal_usd_cents() {
-      let cost = build_cost(None, 10, 1);
-      assert_eq!(cost.cost_in_credits, cost.cost_in_usd_cents);
-    }
-  }
-
-  // -- Helpers --
-
-  fn build_cost(
-    resolution: Option<RouterResolution>,
-    duration_seconds: u16,
-    video_batch_count: u16,
-  ) -> crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate {
-    let builder = GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Seedance2p0Ultra,
-      provider: RouterProvider::Artcraft,
-      resolution,
-      duration_seconds: Some(duration_seconds),
-      video_batch_count: Some(video_batch_count),
-      ..Default::default()
-    };
-    builder.build2().expect("build2").estimate_cost().expect("estimate_cost")
-  }
-
-  fn cost_cents(resolution: Option<RouterResolution>, duration_seconds: u16, batch: u16) -> u64 {
-    build_cost(resolution, duration_seconds, batch).cost_in_usd_cents.unwrap()
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/request.rs

@@ -1,237 +0,0 @@
-use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
-
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftSeedance2p0UltraRequestState {
-  pub request: OmniGenVideoCostAndGenerateRequest,
-}
-
-impl ArtcraftSeedance2p0UltraRequestState {
-  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-    send_artcraft_omni_video_request(&self.request, client).await
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use tokens::tokens::characters::CharacterToken;
-  use tokens::tokens::media_files::MediaFileToken;
-
-  use crate::api::character_list_ref::CharacterListRef;
-  use crate::api::router_aspect_ratio::RouterAspectRatio;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::image_ref::ImageRef;
-  use crate::api::router_provider::RouterProvider;
-  use crate::client::router_artcraft_client::RouterArtcraftClient;
-  use crate::client::router_client::RouterClient;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-  use artcraft_client::utils::api_host::ApiHost;
-
-  use test_data::web::character_tokens::{JIM, KNIGHT};
-  use test_data::web::image_media_tokens::{
-    FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN,
-    JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN,
-    WHITE_HOUSE_SUNSET_PRODUCTION_MEDIA_TOKEN,
-  };
-
-  // -- Aspect ratio tests --
-
-  mod aspect_ratio_tests {
-    use super::*;
-
-    #[tokio::test]
-    #[ignore]
-    async fn landscape() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A corgi running through a field of wildflowers at sunset.".to_string()),
-        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-        ..artcraft_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore]
-    async fn portrait() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A cat sitting on a windowsill watching rain.".to_string()),
-        aspect_ratio: Some(RouterAspectRatio::TallNineBySixteen),
-        ..artcraft_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore]
-    async fn square() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A hummingbird hovering near a flower.".to_string()),
-        aspect_ratio: Some(RouterAspectRatio::Square),
-        ..artcraft_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-  }
-
-  // -- Resolution tests --
-
-  mod resolution_tests {
-    use super::*;
-
-    #[tokio::test]
-    #[ignore]
-    async fn res_480p() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A shiba inu playing in autumn leaves.".to_string()),
-        resolution: Some(RouterResolution::FourEightyP),
-        ..artcraft_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore]
-    async fn res_720p() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A golden retriever catching a frisbee on the beach.".to_string()),
-        resolution: Some(RouterResolution::SevenTwentyP),
-        ..artcraft_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore]
-    async fn res_1080p() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A fox walking through a snowy forest.".to_string()),
-        resolution: Some(RouterResolution::TenEightyP),
-        ..artcraft_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-  }
-
-  // -- Modality tests --
-
-  mod modality_tests {
-    use super::*;
-    use test_data::web::image_media_tokens::TALL_MOCHI_WITH_GLASSES_PRODUCTION_MEDIA_TOKEN;
-
-    #[tokio::test]
-    #[ignore]
-    async fn text_to_video() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A whale breaching in the open ocean at dawn, cinematic.".to_string()),
-        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-        ..artcraft_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore]
-    async fn keyframe_start_and_end_frame() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("The dog walks from the lake to the forest.".to_string()),
-        start_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new(JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN.to_string()))),
-        end_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new(FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN.to_string()))),
-        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-        ..artcraft_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore]
-    async fn image_references() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("The dog in @2 runs through the scenery in @1 towards the building in @3.".to_string()),
-        reference_images: Some(ImageListRef::MediaFileTokens(vec![
-          MediaFileToken::new(FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN.to_string()),
-          MediaFileToken::new(TALL_MOCHI_WITH_GLASSES_PRODUCTION_MEDIA_TOKEN.to_string()),
-          MediaFileToken::new(WHITE_HOUSE_SUNSET_PRODUCTION_MEDIA_TOKEN.to_string()),
-        ])),
-        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-        ..artcraft_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore]
-    async fn character_references() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("@Jim and @Knight are sparring in a medieval arena.".to_string()),
-        reference_character_tokens: Some(CharacterListRef::CharacterTokens(vec![
-          CharacterToken::new(JIM.token.to_string()),
-          CharacterToken::new(KNIGHT.token.to_string()),
-        ])),
-        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-        ..artcraft_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-  }
-
-  // -- Helpers --
-
-  fn artcraft_builder() -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(4),
-      video_batch_count: Some(1),
-      ..Default::default()
-    }
-  }
-
-  fn get_artcraft_client() -> RouterClient {
-    let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/artcraft_cookies.txt")
-      .expect("Failed to read artcraft cookies");
-    let cookies = cookies.trim().to_string();
-    let credentials = StorytellerCredentialSet::parse_multi_cookie_header(&cookies)
-      .expect("Failed to parse cookies")
-      .expect("No credentials found");
-    RouterClient::Artcraft(RouterArtcraftClient::new(ApiHost::Storyteller, credentials))
-  }
-
-  async fn run_pipeline(builder: GenerateVideoRequestBuilder) -> GenerateVideoResponse {
-    let client = get_artcraft_client();
-
-    let draft_or_request = builder.build2().expect("build2 should succeed");
-    let request = match draft_or_request {
-      VideoGenerationDraftOrRequest::Request(r) => r,
-      _ => panic!("expected Request variant (Artcraft skips draft)"),
-    };
-
-    let response = request.send_request(&client).await.expect("send_request should succeed");
-
-    match &response {
-      GenerateVideoResponse::Artcraft(p) => {
-        println!("inference_job_token={:?}", p.inference_job_token);
-        println!("all_inference_job_tokens={:?}", p.all_inference_job_tokens);
-      }
-      other => println!("response: {:?}", other),
-    }
-
-    response
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/build.rs

@@ -1,253 +0,0 @@
-use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video::providers::artcraft::build_common::{
-  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
-};
-use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState;
-use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-pub fn build_artcraft_seedance_2p0_u_fast(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
-  let request = build_artcraft_omni_video_request(
-    builder,
-    CommonVideoModelEnum::Seedance2p0UltraFast,
-    SupportedResolutions::Fast,
-    UltraWideSupport::Supported,
-  )?;
-  let state = ArtcraftSeedance2p0UltraFastRequestState { request };
-  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0UltraFast(state)))
-}
-
-#[cfg(test)]
-mod tests {
-  use enums::common::generation::common_aspect_ratio::CommonAspectRatio as CommonAspectRatioEnum;
-  use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
-  use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-  use enums::common::generation::common_bitrate::CommonBitrate as CommonBitrateEnum;
-  use crate::api::router_bitrate::RouterBitrate;
-  use tokens::tokens::characters::CharacterToken;
-  use tokens::tokens::media_files::MediaFileToken;
-
-  use crate::api::character_list_ref::CharacterListRef;
-  use crate::api::router_aspect_ratio::RouterAspectRatio;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::image_ref::ImageRef;
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::video_list_ref::VideoListRef;
-  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-  use super::*;
-
-  // ── Field conversions ──
-
-  mod field_conversions {
-    use super::*;
-
-    #[test]
-    fn prompt_is_passed_through() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| { b.prompt = Some("test".to_string()); }));
-      assert_eq!(req.request.prompt, Some("test".to_string()));
-    }
-
-    #[test]
-    fn prompt_none_stays_none() {
-      let req = unwrap_request(artcraft_fast_builder_with(|_| {}));
-      assert!(req.request.prompt.is_none());
-    }
-
-    #[test]
-    fn model_is_seedance_2p0_fast() {
-      let req = unwrap_request(artcraft_fast_builder_with(|_| {}));
-      assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0UltraFast)));
-    }
-
-    #[test]
-    fn duration_passed_through() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| { b.duration_seconds = Some(10); }));
-      assert_eq!(req.request.duration_seconds, Some(10));
-    }
-
-    #[test]
-    fn duration_clamped_to_max() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| { b.duration_seconds = Some(99); }));
-      assert_eq!(req.request.duration_seconds, Some(15));
-    }
-
-    #[test]
-    fn batch_count_passed_through() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| { b.video_batch_count = Some(4); }));
-      assert_eq!(req.request.video_batch_count, Some(4));
-    }
-
-    #[test]
-    fn bitrate_passed_through() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| { b.bitrate = Some(RouterBitrate::High); }));
-      assert_eq!(req.request.bitrate, Some(CommonBitrateEnum::High));
-    }
-  }
-
-  // ── Aspect ratio ──
-
-  mod aspect_ratio_tests {
-    use super::*;
-
-    #[test]
-    fn wide() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| {
-        b.aspect_ratio = Some(RouterAspectRatio::WideSixteenByNine);
-      }));
-      assert_eq!(req.request.aspect_ratio, Some(CommonAspectRatioEnum::WideSixteenByNine));
-    }
-
-    #[test]
-    fn tall() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| {
-        b.aspect_ratio = Some(RouterAspectRatio::TallNineBySixteen);
-      }));
-      assert_eq!(req.request.aspect_ratio, Some(CommonAspectRatioEnum::TallNineBySixteen));
-    }
-
-    #[test]
-    fn square() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| {
-        b.aspect_ratio = Some(RouterAspectRatio::Square);
-      }));
-      assert_eq!(req.request.aspect_ratio, Some(CommonAspectRatioEnum::Square));
-    }
-
-    #[test]
-    fn none_stays_none() {
-      let req = unwrap_request(artcraft_fast_builder_with(|_| {}));
-      assert!(req.request.aspect_ratio.is_none());
-    }
-  }
-
-  // ── Resolution ──
-
-  mod resolution_tests {
-    use super::*;
-
-    #[test]
-    fn res_480p() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| {
-        b.resolution = Some(RouterResolution::FourEightyP);
-      }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::FourEightyP));
-    }
-
-    #[test]
-    fn res_720p() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| {
-        b.resolution = Some(RouterResolution::SevenTwentyP);
-      }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::SevenTwentyP));
-    }
-
-    #[test]
-    fn res_1080p_downgrades_to_720p() {
-      let req = unwrap_request(artcraft_fast_builder_with(|b| {
-        b.resolution = Some(RouterResolution::TenEightyP);
-      }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::SevenTwentyP));
-    }
-
-    #[test]
-    fn res_1080p_error_out() {
-      let result = build_artcraft_seedance_2p0_u_fast(GenerateVideoRequestBuilder {
-        model: RouterVideoModel::Seedance2p0UltraFast,
-        provider: RouterProvider::Artcraft,
-        resolution: Some(RouterResolution::TenEightyP),
-        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-        ..Default::default()
-      });
-      assert!(result.is_err());
-    }
-
-    #[test]
-    fn none_stays_none() {
-      let req = unwrap_request(artcraft_fast_builder_with(|_| {}));
-      assert!(req.request.resolution.is_none());
-    }
-  }
-
-  // ── Media tokens ──
-
-  mod media_token_tests {
-    use super::*;
-
-    #[test]
-    fn start_frame_token_passed_through() {
-      let token = MediaFileToken::new("mf_start".to_string());
-      let req = unwrap_request(artcraft_fast_builder_with(|b| {
-        b.start_frame = Some(ImageRef::MediaFileToken(token.clone()));
-      }));
-      assert_eq!(req.request.start_frame_image_media_token, Some(token));
-    }
-
-    #[test]
-    fn url_start_frame_rejected() {
-      let result = build_artcraft_seedance_2p0_u_fast(GenerateVideoRequestBuilder {
-        model: RouterVideoModel::Seedance2p0UltraFast,
-        provider: RouterProvider::Artcraft,
-        start_frame: Some(ImageRef::Url("https://example.com".to_string())),
-        ..Default::default()
-      });
-      assert!(result.is_err());
-    }
-
-    #[test]
-    fn reference_image_tokens_passed_through() {
-      let tokens = vec![
-        MediaFileToken::new("mf_a".to_string()),
-        MediaFileToken::new("mf_b".to_string()),
-      ];
-      let req = unwrap_request(artcraft_fast_builder_with(|b| {
-        b.reference_images = Some(ImageListRef::MediaFileTokens(tokens.clone()));
-      }));
-      assert_eq!(req.request.reference_image_media_tokens, Some(tokens));
-    }
-
-    #[test]
-    fn character_tokens_passed_through() {
-      let tokens = vec![
-        CharacterToken::new("char_a".to_string()),
-        CharacterToken::new("char_b".to_string()),
-      ];
-      let req = unwrap_request(artcraft_fast_builder_with(|b| {
-        b.reference_character_tokens = Some(CharacterListRef::CharacterTokens(tokens.clone()));
-      }));
-      assert_eq!(req.request.reference_character_tokens, Some(tokens));
-    }
-  }
-
-  // ── Helpers ──
-
-  fn artcraft_fast_builder_with(f: impl FnOnce(&mut GenerateVideoRequestBuilder)) -> GenerateVideoRequestBuilder {
-    let mut builder = GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Seedance2p0UltraFast,
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(5),
-      video_batch_count: Some(1),
-      ..Default::default()
-    };
-    f(&mut builder);
-    builder
-  }
-
-  fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0UltraFastRequestState {
-    let result = build_artcraft_seedance_2p0_u_fast(builder).expect("build should succeed");
-    match result {
-      VideoGenerationDraftOrRequest::Request(
-        VideoGenerationRequest::ArtcraftSeedance2p0UltraFast(state)
-      ) => state,
-      _ => panic!("expected ArtcraftSeedance2p0Fast request"),
-    }
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/cost.rs

@@ -1,168 +0,0 @@
-use enums::common::generation::common_resolution::CommonResolution;
-
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState;
-
-// ── Pricing constants ──
-
-const CENTS_PER_SECOND_480P: f64 = 3.6267;
-const CENTS_PER_SECOND_720P: f64 = 8.9089;
-
-pub struct ArtcraftSeedance2p0UltraFastCostState {
-  pub resolution: CommonResolution,
-  pub duration_seconds: u16,
-  pub batch_count: u16,
-}
-
-impl ArtcraftSeedance2p0UltraFastCostState {
-  pub fn from_request(request: &ArtcraftSeedance2p0UltraFastRequestState) -> Self {
-    let resolution = request.request.resolution
-      .unwrap_or(CommonResolution::SevenTwentyP);
-    let duration_seconds = request.request.duration_seconds.unwrap_or(5);
-    let batch_count = request.request.video_batch_count.unwrap_or(1);
-
-    Self { resolution, duration_seconds, batch_count }
-  }
-
-  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    let cents_per_second = match self.resolution {
-      CommonResolution::FourEightyP => CENTS_PER_SECOND_480P,
-      // Fast model doesn't support 1080p; all non-480p resolves to 720p pricing
-      _ => CENTS_PER_SECOND_720P,
-    };
-
-    let cents_per_video = (cents_per_second * self.duration_seconds as f64).ceil() as u64;
-    let usd_cents = cents_per_video * self.batch_count as u64;
-
-    VideoGenerationCostEstimate {
-      cost_in_credits: Some(usd_cents),
-      cost_in_usd_cents: Some(usd_cents),
-      is_free: false,
-      is_unlimited: false,
-      is_rate_limited: false,
-      has_watermark: false,
-      failures_are_refunded: None,
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::api::router_provider::RouterProvider;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-
-  mod pricing_720p {
-    use super::*;
-
-    #[test]
-    fn batch_1() {
-      // 8.9089 * 5 = 44.5445 → ceil = 45¢
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 1), 45);
-      // 8.9089 * 10 = 89.089 → ceil = 90¢
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1), 90);
-      // 8.9089 * 15 = 133.6335 → ceil = 134¢
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 1), 134);
-    }
-
-    #[test]
-    fn batch_2() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 2), 180);
-    }
-
-    #[test]
-    fn batch_4() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 4), 360);
-    }
-
-    #[test]
-    fn none_defaults_to_720p() {
-      assert_eq!(cost_cents(None, 10, 1), cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1));
-    }
-  }
-
-  mod pricing_480p {
-    use super::*;
-
-    #[test]
-    fn batch_1() {
-      // 3.6267 * 5 = 18.1335 → ceil = 19¢
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 1), 19);
-      // 3.6267 * 10 = 36.267 → ceil = 37¢
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 1), 37);
-      // 3.6267 * 15 = 54.4005 → ceil = 55¢
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 15, 1), 55);
-    }
-
-    #[test]
-    fn batch_4() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 4), 148);
-    }
-  }
-
-  mod relative_pricing {
-    use super::*;
-
-    #[test]
-    fn cost_480p_cheaper_than_720p() {
-      let c480 = cost_cents(Some(RouterResolution::FourEightyP), 10, 1);
-      let c720 = cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1);
-      assert!(c480 < c720, "480p ({c480}) should be < 720p ({c720})");
-    }
-
-    #[test]
-    fn cost_scales_with_duration() {
-      let c5 = cost_cents(None, 5, 1);
-      let c10 = cost_cents(None, 10, 1);
-      let c15 = cost_cents(None, 15, 1);
-      assert!(c5 < c10);
-      assert!(c10 < c15);
-    }
-
-    #[test]
-    fn fast_g_cheaper_than_standard_g() {
-      let fast = cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1);
-      let standard = {
-        let builder = GenerateVideoRequestBuilder {
-          model: RouterVideoModel::Seedance2p0Ultra,
-          provider: RouterProvider::Artcraft,
-          resolution: Some(RouterResolution::SevenTwentyP),
-          duration_seconds: Some(10),
-          video_batch_count: Some(1),
-          ..Default::default()
-        };
-        builder.build2().unwrap().estimate_cost().unwrap().cost_in_usd_cents.unwrap()
-      };
-      assert!(fast < standard, "Fast ({fast}¢) should be < Standard ({standard}¢)");
-    }
-
-    #[test]
-    fn credits_equal_usd_cents() {
-      let cost = build_cost(None, 10, 1);
-      assert_eq!(cost.cost_in_credits, cost.cost_in_usd_cents);
-    }
-  }
-
-  // -- Helpers --
-
-  fn build_cost(
-    resolution: Option<RouterResolution>,
-    duration_seconds: u16,
-    video_batch_count: u16,
-  ) -> crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate {
-    let builder = GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Seedance2p0UltraFast,
-      provider: RouterProvider::Artcraft,
-      resolution,
-      duration_seconds: Some(duration_seconds),
-      video_batch_count: Some(video_batch_count),
-      ..Default::default()
-    };
-    builder.build2().expect("build2").estimate_cost().expect("estimate_cost")
-  }
-
-  fn cost_cents(resolution: Option<RouterResolution>, duration_seconds: u16, batch: u16) -> u64 {
-    build_cost(resolution, duration_seconds, batch).cost_in_usd_cents.unwrap()
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/request.rs

@@ -1,227 +0,0 @@
-use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
-
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftSeedance2p0UltraFastRequestState {
-  pub request: OmniGenVideoCostAndGenerateRequest,
-}
-
-impl ArtcraftSeedance2p0UltraFastRequestState {
-  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-    send_artcraft_omni_video_request(&self.request, client).await
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use tokens::tokens::characters::CharacterToken;
-  use tokens::tokens::media_files::MediaFileToken;
-
-  use crate::api::character_list_ref::CharacterListRef;
-  use crate::api::router_aspect_ratio::RouterAspectRatio;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::image_ref::ImageRef;
-  use crate::api::router_provider::RouterProvider;
-  use crate::client::router_artcraft_client::RouterArtcraftClient;
-  use crate::client::router_client::RouterClient;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-  use artcraft_client::utils::api_host::ApiHost;
-
-  use test_data::web::character_tokens::{JIM, KNIGHT};
-  use test_data::web::image_media_tokens::{
-    FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN,
-    JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN,
-    WHITE_HOUSE_SUNSET_PRODUCTION_MEDIA_TOKEN,
-  };
-
-  // -- Aspect ratio tests --
-
-  mod aspect_ratio_tests {
-    use super::*;
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real API request and incurs cost
-    async fn landscape() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A corgi running through a field of wildflowers at sunset.".to_string()),
-        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-        ..artcraft_fast_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real API request and incurs cost
-    async fn portrait() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A cat sitting on a windowsill watching rain.".to_string()),
-        aspect_ratio: Some(RouterAspectRatio::TallNineBySixteen),
-        ..artcraft_fast_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real API request and incurs cost
-    async fn square() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A hummingbird hovering near a flower.".to_string()),
-        aspect_ratio: Some(RouterAspectRatio::Square),
-        ..artcraft_fast_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-  }
-
-  // -- Resolution tests --
-
-  mod resolution_tests {
-    use super::*;
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real API request and incurs cost
-    async fn res_480p() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A shiba inu playing in autumn leaves.".to_string()),
-        resolution: Some(RouterResolution::FourEightyP),
-        ..artcraft_fast_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real API request and incurs cost
-    async fn res_720p() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A golden retriever catching a frisbee on the beach.".to_string()),
-        resolution: Some(RouterResolution::SevenTwentyP),
-        ..artcraft_fast_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-  }
-
-  // -- Modality tests --
-
-  mod modality_tests {
-    use super::*;
-    use test_data::web::image_media_tokens::TALL_MOCHI_WITH_GLASSES_PRODUCTION_MEDIA_TOKEN;
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real API request and incurs cost
-    async fn text_to_video() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("A sky whale breaching in the open sky, pink clouds at dawn, cinematic.".to_string()),
-        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-        ..artcraft_fast_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real API request and incurs cost
-    async fn keyframe_start_and_end_frame() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("The dog walks from the lake to the forest.".to_string()),
-        start_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new(JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN.to_string()))),
-        end_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new(FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN.to_string()))),
-        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-        ..artcraft_fast_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real API request and incurs cost
-    async fn image_references() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("The dog in @2 runs through the scenery in @1 towards the building in @3.".to_string()),
-        reference_images: Some(ImageListRef::MediaFileTokens(vec![
-          MediaFileToken::new(FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN.to_string()),
-          MediaFileToken::new(TALL_MOCHI_WITH_GLASSES_PRODUCTION_MEDIA_TOKEN.to_string()),
-          MediaFileToken::new(WHITE_HOUSE_SUNSET_PRODUCTION_MEDIA_TOKEN.to_string()),
-        ])),
-        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-        ..artcraft_fast_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real API request and incurs cost
-    async fn character_references() {
-      let response = run_pipeline(GenerateVideoRequestBuilder {
-        prompt: Some("@Jim and @Knight are sparring in a medieval arena.".to_string()),
-        reference_character_tokens: Some(CharacterListRef::CharacterTokens(vec![
-          CharacterToken::new(JIM.token.to_string()),
-          CharacterToken::new(KNIGHT.token.to_string()),
-        ])),
-        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-        ..artcraft_fast_builder()
-      }).await;
-      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-      assert_eq!(1, 2, "Inspect output above");
-    }
-  }
-
-  // -- Helpers --
-
-  fn artcraft_fast_builder() -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Seedance2p0UltraFast,
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(4),
-      video_batch_count: Some(1),
-      ..Default::default()
-    }
-  }
-
-  fn get_artcraft_client() -> RouterClient {
-    let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/artcraft_cookies.txt")
-      .expect("Failed to read artcraft cookies");
-    let cookies = cookies.trim().to_string();
-    let credentials = StorytellerCredentialSet::parse_multi_cookie_header(&cookies)
-      .expect("Failed to parse cookies")
-      .expect("No credentials found");
-    RouterClient::Artcraft(RouterArtcraftClient::new(ApiHost::Storyteller, credentials))
-  }
-
-  async fn run_pipeline(builder: GenerateVideoRequestBuilder) -> GenerateVideoResponse {
-    let client = get_artcraft_client();
-
-    let draft_or_request = builder.build2().expect("build2 should succeed");
-    let request = match draft_or_request {
-      VideoGenerationDraftOrRequest::Request(r) => r,
-      _ => panic!("expected Request variant (Artcraft skips draft)"),
-    };
-
-    let response = request.send_request(&client).await.expect("send_request should succeed");
-
-    match &response {
-      GenerateVideoResponse::Artcraft(p) => {
-        println!("inference_job_token={:?}", p.inference_job_token);
-        println!("all_inference_job_tokens={:?}", p.all_inference_job_tokens);
-      }
-      other => println!("response: {:?}", other),
-    }
-
-    response
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5/build.rs

@@ -53,7 +53,7 @@ pub fn build_artcraft_seedance_2p5(mut builder: GenerateVideoRequestBuilder) ->
   let mut request = build_artcraft_omni_video_request(
     builder,
     CommonVideoModelEnum::Seedance2p5,
-    SupportedResolutions::Fast,
+    SupportedResolutions::Full,
     UltraWideSupport::Supported,
   )?;
   request.duration_seconds = duration_seconds;
@@ -216,9 +216,15 @@ mod tests {
     }
 
     #[test]
-    fn res_1080p_downgrades_to_720p() {
+    fn res_1080p_maps_directly() {
       let req = unwrap_request(builder_with(|b| { b.resolution = Some(RouterResolution::TenEightyP); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::SevenTwentyP));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::TenEightyP));
+    }
+
+    #[test]
+    fn res_4k_downgrades_to_1080p() {
+      let req = unwrap_request(builder_with(|b| { b.resolution = Some(RouterResolution::FourK); }));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::TenEightyP));
     }
   }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5/cost.rs

@@ -13,7 +13,7 @@ pub struct ArtcraftSeedance2p5CostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
   pub has_video_references: bool,
-  pub total_input_seconds: u16,
+  pub maybe_total_input_seconds: Option<u16>,
 }
 
 impl ArtcraftSeedance2p5CostState {
@@ -30,20 +30,21 @@ impl ArtcraftSeedance2p5CostState {
       resolution,
       duration_seconds,
       has_video_references,
-      total_input_seconds: request.total_input_seconds.unwrap_or(0),
+      maybe_total_input_seconds: request.total_input_seconds,
     }
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    // Input-second clamping (the 4..=30 billing range) happens inside the
-    // shared pricing function.
-    let total_input_seconds = self.total_input_seconds;
+    // Input-second clamping (the 4..=30 billing range) and the
+    // unknown-or-zero-input failsafe happen inside the shared pricing
+    // function.
+    let maybe_total_input_seconds = self.maybe_total_input_seconds;
 
     let usd_cents = seedance_2p5_usd_cents(
       self.resolution,
       self.duration_seconds,
       self.has_video_references,
-      total_input_seconds,
+      maybe_total_input_seconds,
     );
 
     // ArtCraft credits: 100 credits = $1.00, so credits = cents.
@@ -91,6 +92,20 @@ mod tests {
       assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 30), 802);
     }
 
+    #[test]
+    fn table_1080p() {
+      // 45.85869386 ¢/s, rounded up.
+      assert_eq!(cents(Some(RouterResolution::TenEightyP), 4), 184);
+      assert_eq!(cents(Some(RouterResolution::TenEightyP), 5), 230);
+      assert_eq!(cents(Some(RouterResolution::TenEightyP), 10), 459);
+      assert_eq!(cents(Some(RouterResolution::TenEightyP), 30), 1376);
+    }
+
+    #[test]
+    fn four_k_downgrades_to_1080p_and_prices_accordingly() {
+      assert_eq!(cents(Some(RouterResolution::FourK), 10), cents(Some(RouterResolution::TenEightyP), 10));
+    }
+
     #[test]
     fn none_defaults_to_720p() {
       assert_eq!(cents(None, 10), cents(Some(RouterResolution::SevenTwentyP), 10));
@@ -106,6 +121,16 @@ mod tests {
       assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(10)), 290);
       // 15.84362140 ¢/s × 40 = 633.74 → 634¢.
       assert_eq!(cents_with_video_refs(Some(RouterResolution::SevenTwentyP), 30, Some(10)), 634);
+      // 27.39973680 ¢/s × 40 = 1095.99 → 1096¢.
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 30, Some(10)), 1096);
+    }
+
+    #[test]
+    fn table_1080p_with_ten_input_seconds() {
+      // 27.39973680 ¢/s over (output + 10) billed seconds, rounded up.
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 5, Some(10)), 411);
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 10, Some(10)), 548);
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 30, Some(10)), 1096);
     }
 
     #[test]
@@ -115,10 +140,12 @@ mod tests {
     }
 
     #[test]
-    fn missing_input_seconds_bill_the_four_second_minimum() {
-      // No measured input still bills the 4-second total minimum:
-      // 7.24279835 ¢/s × (10+4) = 101.40 → 102¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, None), 102);
+    fn missing_or_zero_input_seconds_bill_the_thirty_second_maximum() {
+      // FAILSAFE: an unmeasured (or zero) input bills the 30-second MAXIMUM,
+      // matching the provider client's fallback:
+      // 7.24279835 ¢/s × (10+30) = 289.71 → 290¢.
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, None), 290);
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(0)), 290);
     }
 
     #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/build.rs

@@ -53,7 +53,7 @@ pub fn build_artcraft_seedance_2p5_u(mut builder: GenerateVideoRequestBuilder) -
   let mut request = build_artcraft_omni_video_request(
     builder,
     CommonVideoModelEnum::Seedance2p5Ultra,
-    SupportedResolutions::Fast,
+    SupportedResolutions::Full,
     UltraWideSupport::Supported,
   )?;
   request.duration_seconds = duration_seconds;
@@ -216,9 +216,15 @@ mod tests {
     }
 
     #[test]
-    fn res_1080p_downgrades_to_720p() {
+    fn res_1080p_maps_directly() {
       let req = unwrap_request(builder_with(|b| { b.resolution = Some(RouterResolution::TenEightyP); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::SevenTwentyP));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::TenEightyP));
+    }
+
+    #[test]
+    fn res_4k_downgrades_to_1080p() {
+      let req = unwrap_request(builder_with(|b| { b.resolution = Some(RouterResolution::FourK); }));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::TenEightyP));
     }
   }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/cost.rs

@@ -14,7 +14,7 @@ pub struct ArtcraftSeedance2p5UltraCostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
   pub has_video_references: bool,
-  pub total_input_seconds: u16,
+  pub maybe_total_input_seconds: Option<u16>,
 }
 
 impl ArtcraftSeedance2p5UltraCostState {
@@ -31,20 +31,21 @@ impl ArtcraftSeedance2p5UltraCostState {
       resolution,
       duration_seconds,
       has_video_references,
-      total_input_seconds: request.total_input_seconds.unwrap_or(0),
+      maybe_total_input_seconds: request.total_input_seconds,
     }
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    // Input-second clamping (the 4..=30 billing range) happens inside the
-    // shared pricing function.
-    let total_input_seconds = self.total_input_seconds;
+    // Input-second clamping (the 4..=30 billing range) and the
+    // unknown-or-zero-input failsafe happen inside the shared pricing
+    // function.
+    let maybe_total_input_seconds = self.maybe_total_input_seconds;
 
     let usd_cents = seedance_2p5_ultra_usd_cents(
       self.resolution,
       self.duration_seconds,
       self.has_video_references,
-      total_input_seconds,
+      maybe_total_input_seconds,
     );
 
     // ArtCraft credits: 100 credits = $1.00, so credits = cents.
@@ -92,6 +93,20 @@ mod tests {
       assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 30), 947);
     }
 
+    #[test]
+    fn table_1080p() {
+      // 50.10486922 ¢/s, rounded up.
+      assert_eq!(cents(Some(RouterResolution::TenEightyP), 4), 201);
+      assert_eq!(cents(Some(RouterResolution::TenEightyP), 5), 251);
+      assert_eq!(cents(Some(RouterResolution::TenEightyP), 10), 502);
+      assert_eq!(cents(Some(RouterResolution::TenEightyP), 30), 1504);
+    }
+
+    #[test]
+    fn four_k_downgrades_to_1080p_and_prices_accordingly() {
+      assert_eq!(cents(Some(RouterResolution::FourK), 10), cents(Some(RouterResolution::TenEightyP), 10));
+    }
+
     #[test]
     fn none_defaults_to_720p() {
       assert_eq!(cents(None, 10), cents(Some(RouterResolution::SevenTwentyP), 10));
@@ -104,6 +119,8 @@ mod tests {
         (RouterResolution::FourEightyP, 30),
         (RouterResolution::SevenTwentyP, 5),
         (RouterResolution::SevenTwentyP, 30),
+        (RouterResolution::TenEightyP, 5),
+        (RouterResolution::TenEightyP, 30),
       ] {
         let ultra = cents(Some(resolution), duration);
         let regular = estimate_for_model(RouterVideoModel::Seedance2p5, |b| {
@@ -124,6 +141,16 @@ mod tests {
       assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(10)), 343);
       // 18.72427984 ¢/s × 40 = 748.97 → 749¢.
       assert_eq!(cents_with_video_refs(Some(RouterResolution::SevenTwentyP), 30, Some(10)), 749);
+      // 29.93674947 ¢/s × 40 = 1197.47 → 1198¢.
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 30, Some(10)), 1198);
+    }
+
+    #[test]
+    fn table_1080p_with_ten_input_seconds() {
+      // 29.93674947 ¢/s over (output + 10) billed seconds, rounded up.
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 5, Some(10)), 450);
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 10, Some(10)), 599);
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 30, Some(10)), 1198);
     }
 
     #[test]
@@ -133,10 +160,12 @@ mod tests {
     }
 
     #[test]
-    fn missing_input_seconds_bill_the_four_second_minimum() {
-      // No measured input still bills the 4-second total minimum:
-      // 8.55967078 ¢/s × (10+4) = 119.84 → 120¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, None), 120);
+    fn missing_or_zero_input_seconds_bill_the_thirty_second_maximum() {
+      // FAILSAFE: an unmeasured (or zero) input bills the 30-second MAXIMUM,
+      // matching the provider client's fallback:
+      // 8.55967078 ¢/s × (10+30) = 342.39 → 343¢.
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, None), 343);
+      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(0)), 343);
     }
 
     #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_common.rs

@@ -11,30 +11,19 @@ use kinovi_web_client::generate::video::generate_seedance_2p5::{
 // in hundredths of a USD cent per second so the math is exact integer arithmetic
 // (no floating point), then rounded up to whole cents.
 
-/// 4K output price, in hundredths of a USD cent per second (86.60 ¢/s).
-const FOUR_K_CENTI_CENTS_PER_SECOND: u64 = 8660;
+/// 4K output price, in hundredths of a USD cent per second (92.50 ¢/s).
+const FOUR_K_CENTI_CENTS_PER_SECOND: u64 = 9250;
 
-/// Extra hundredths of a USD cent per second when a reference video is attached
-/// at 4K (17.20 ¢/s surcharge).
-const FOUR_K_VIDEO_REFERENCE_SURCHARGE_CENTI_CENTS_PER_SECOND: u64 = 1720;
-
-/// ArtCraft's price (USD cents) for Seedance 2.0 at 4K.
-///
-/// A reference video adds a per-second surcharge (4K with and without a video
-/// reference are priced differently). The cost scales with duration and batch
-/// count, rounded up to whole cents.
+/// ArtCraft's price (USD cents) for Seedance 2.0 at 4K with no reference
+/// videos attached. Each model prices reference videos through its own
+/// with-reference rate card. The cost scales with duration and batch count,
+/// rounded up to whole cents.
 pub fn seedance_2p0_four_k_usd_cents(
   duration_seconds: u16,
   batch_count: u16,
-  has_video_reference: bool,
 ) -> u64 {
-  let mut centi_cents_per_second = FOUR_K_CENTI_CENTS_PER_SECOND;
-  if has_video_reference {
-    centi_cents_per_second += FOUR_K_VIDEO_REFERENCE_SURCHARGE_CENTI_CENTS_PER_SECOND;
-  }
-
   let total_centi_cents =
-    centi_cents_per_second * duration_seconds as u64 * batch_count as u64;
+    FOUR_K_CENTI_CENTS_PER_SECOND * duration_seconds as u64 * batch_count as u64;
 
   // Round up to whole cents.
   total_centi_cents.div_ceil(100)
@@ -51,22 +40,22 @@ pub fn seedance_2p0_four_k_usd_cents(
 // rate sets and helpers below.
 
 /// Regular Mini — 480p price, USD cents per second.
-const MINI_CENTS_PER_SECOND_480P: f64 = 3.24074074;
+const MINI_CENTS_PER_SECOND_480P: f64 = 3.45;
 /// Regular Mini — 480p reference-video surcharge, USD cents per second.
-const MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_480P: f64 = 0.86419753;
+const MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_480P: f64 = 0.90;
 /// Regular Mini — 720p price, USD cents per second.
-const MINI_CENTS_PER_SECOND_720P: f64 = 8.64197531;
+const MINI_CENTS_PER_SECOND_720P: f64 = 8.90;
 /// Regular Mini — 720p reference-video surcharge, USD cents per second.
-const MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_720P: f64 = 1.72839506;
+const MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_720P: f64 = 1.80;
 
 /// BytePlus / BytePlus Ultra Mini — 480p price, USD cents per second.
-const BYTEPLUS_MINI_CENTS_PER_SECOND_480P: f64 = 3.27160494;
+const BYTEPLUS_MINI_CENTS_PER_SECOND_480P: f64 = 3.55;
 /// BytePlus / BytePlus Ultra Mini — 480p reference-video surcharge, USD cents per second.
-const BYTEPLUS_MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_480P: f64 = 0.87242798;
+const BYTEPLUS_MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_480P: f64 = 0.95;
 /// BytePlus / BytePlus Ultra Mini — 720p price, USD cents per second.
-const BYTEPLUS_MINI_CENTS_PER_SECOND_720P: f64 = 8.72427984;
+const BYTEPLUS_MINI_CENTS_PER_SECOND_720P: f64 = 9.10;
 /// BytePlus / BytePlus Ultra Mini — 720p reference-video surcharge, USD cents per second.
-const BYTEPLUS_MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_720P: f64 = 1.74485597;
+const BYTEPLUS_MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_720P: f64 = 1.85;
 
 /// ArtCraft's price (USD cents) for the regular Seedance 2.0 Mini.
 ///
@@ -148,39 +137,56 @@ pub fn seedance_2p5_preview_usd_cents(
 const SEEDANCE_2P5_CENTS_PER_SECOND_480P: f64 = 11.76954733;
 /// Seedance 2.5 — 720p price, USD cents per second.
 const SEEDANCE_2P5_CENTS_PER_SECOND_720P: f64 = 26.70781893;
+/// Seedance 2.5 — 1080p price, USD cents per second.
+const SEEDANCE_2P5_CENTS_PER_SECOND_1080P: f64 = 45.85869386;
 /// Seedance 2.5 — 480p price with video references, USD cents per second.
 const SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_480P: f64 = 7.24279835;
 /// Seedance 2.5 — 720p price with video references, USD cents per second.
 const SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_720P: f64 = 15.84362140;
+/// Seedance 2.5 — 1080p price with video references, USD cents per second.
+const SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_1080P: f64 = 27.39973680;
 
 /// ArtCraft's price (USD cents) for Seedance 2.5.
 ///
-/// Only 480p and 720p are offered; any other resolution prices at 720p.
-/// Without video references, billed seconds = output duration. With video
-/// references, the per-second rate drops but the billed seconds are the
-/// output duration PLUS the total seconds of reference video input (clamped
-/// to the 4..=30 second billing range). The fractional total is rounded UP
-/// to a whole cent. No batching.
+/// 480p, 720p, and 1080p are offered; any other resolution prices at 720p
+/// (the request planner maps unsupported resolutions before pricing, so
+/// this fallback is only a failsafe). Without video references, billed
+/// seconds = output duration. With video references, the per-second rate
+/// drops but the billed seconds are the output duration PLUS the total
+/// seconds of reference video input (clamped to the 4..=30 second billing
+/// range). The fractional total is rounded UP to a whole cent. No batching.
 pub fn seedance_2p5_usd_cents(
   resolution: CommonResolution,
   duration_seconds: u16,
   has_video_references: bool,
-  total_input_seconds: u16,
+  maybe_total_input_seconds: Option<u16>,
 ) -> u64 {
   let (cents_per_second, billed_seconds) = if has_video_references {
     let rate = match resolution {
       CommonResolution::FourEightyP => SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_480P,
+      CommonResolution::TenEightyP => SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_1080P,
       // Everything else (including 720p and unsupported resolutions) prices at 720p.
       _ => SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_720P,
     };
     // The TOTAL input duration clamps to the 4..=30 second billing range
     // (three 1s videos sum to 3 and bill 4; three 3s videos bill 9).
-    let billed_input_seconds = total_input_seconds
-      .clamp(u16::from(MIN_BILLED_INPUT_SECONDS), u16::from(MAX_BILLED_INPUT_SECONDS));
+    //
+    // FAILSAFE: an unknown (never probed) or zero input duration bills the
+    // 30-second MAXIMUM, matching the provider client's own fallback. It
+    // must never default toward the minimum — billing 4 input seconds for
+    // an unmeasured input while the provider assumes 30 sells input seconds
+    // far below cost.
+    let billed_input_seconds = match maybe_total_input_seconds {
+      None | Some(0) => u16::from(MAX_BILLED_INPUT_SECONDS),
+      Some(seconds) => {
+        seconds.clamp(u16::from(MIN_BILLED_INPUT_SECONDS), u16::from(MAX_BILLED_INPUT_SECONDS))
+      }
+    };
     (rate, u64::from(duration_seconds) + u64::from(billed_input_seconds))
   } else {
     let rate = match resolution {
       CommonResolution::FourEightyP => SEEDANCE_2P5_CENTS_PER_SECOND_480P,
+      CommonResolution::TenEightyP => SEEDANCE_2P5_CENTS_PER_SECOND_1080P,
       _ => SEEDANCE_2P5_CENTS_PER_SECOND_720P,
     };
     (rate, u64::from(duration_seconds))
@@ -193,38 +199,56 @@ pub fn seedance_2p5_usd_cents(
 const SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_480P: f64 = 13.90946502;
 /// Seedance 2.5 Ultra — 720p price, USD cents per second.
 const SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_720P: f64 = 31.56378601;
+/// Seedance 2.5 Ultra — 1080p price, USD cents per second.
+const SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_1080P: f64 = 50.10486922;
 /// Seedance 2.5 Ultra — 480p price with video references, USD cents per second.
 const SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_480P: f64 = 8.55967078;
 /// Seedance 2.5 Ultra — 720p price with video references, USD cents per second.
 const SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_720P: f64 = 18.72427984;
+/// Seedance 2.5 Ultra — 1080p price with video references, USD cents per second.
+const SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_1080P: f64 = 29.93674947;
 
 /// ArtCraft's price (USD cents) for Seedance 2.5 Ultra.
 ///
-/// Only 480p and 720p are offered; any other resolution prices at 720p.
-/// Without video references, billed seconds = output duration. With video
-/// references, the per-second rate drops but the billed seconds are the
-/// output duration PLUS the total seconds of reference video input. The
-/// fractional total is rounded UP to a whole cent. No batching.
+/// 480p, 720p, and 1080p are offered; any other resolution prices at 720p
+/// (the request planner maps unsupported resolutions before pricing, so
+/// this fallback is only a failsafe). Without video references, billed
+/// seconds = output duration. With video references, the per-second rate
+/// drops but the billed seconds are the output duration PLUS the total
+/// seconds of reference video input. The fractional total is rounded UP to
+/// a whole cent. No batching.
 pub fn seedance_2p5_ultra_usd_cents(
   resolution: CommonResolution,
   duration_seconds: u16,
   has_video_references: bool,
-  total_input_seconds: u16,
+  maybe_total_input_seconds: Option<u16>,
 ) -> u64 {
   let (cents_per_second, billed_seconds) = if has_video_references {
     let rate = match resolution {
       CommonResolution::FourEightyP => SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_480P,
+      CommonResolution::TenEightyP => SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_1080P,
       // Everything else (including 720p and unsupported resolutions) prices at 720p.
       _ => SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_720P,
     };
     // The TOTAL input duration clamps to the 4..=30 second billing range
     // (three 1s videos sum to 3 and bill 4; three 3s videos bill 9).
-    let billed_input_seconds = total_input_seconds
-      .clamp(u16::from(MIN_BILLED_INPUT_SECONDS), u16::from(MAX_BILLED_INPUT_SECONDS));
+    //
+    // FAILSAFE: an unknown (never probed) or zero input duration bills the
+    // 30-second MAXIMUM, matching the provider client's own fallback. It
+    // must never default toward the minimum — billing 4 input seconds for
+    // an unmeasured input while the provider assumes 30 sells input seconds
+    // far below cost.
+    let billed_input_seconds = match maybe_total_input_seconds {
+      None | Some(0) => u16::from(MAX_BILLED_INPUT_SECONDS),
+      Some(seconds) => {
+        seconds.clamp(u16::from(MIN_BILLED_INPUT_SECONDS), u16::from(MAX_BILLED_INPUT_SECONDS))
+      }
+    };
     (rate, u64::from(duration_seconds) + u64::from(billed_input_seconds))
   } else {
     let rate = match resolution {
       CommonResolution::FourEightyP => SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_480P,
+      CommonResolution::TenEightyP => SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_1080P,
       _ => SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_720P,
     };
     (rate, u64::from(duration_seconds))
@@ -263,37 +287,17 @@ mod tests {
   use super::*;
 
   #[test]
-  fn four_k_without_video_reference() {
-    assert_eq!(seedance_2p0_four_k_usd_cents(4, 1, false), 347);
-    assert_eq!(seedance_2p0_four_k_usd_cents(5, 1, false), 433);
-    assert_eq!(seedance_2p0_four_k_usd_cents(10, 1, false), 866);
-    assert_eq!(seedance_2p0_four_k_usd_cents(15, 1, false), 1299);
-  }
-
-  #[test]
-  fn four_k_with_video_reference() {
-    assert_eq!(seedance_2p0_four_k_usd_cents(4, 1, true), 416);
-    assert_eq!(seedance_2p0_four_k_usd_cents(5, 1, true), 519);
-    assert_eq!(seedance_2p0_four_k_usd_cents(10, 1, true), 1038);
-    assert_eq!(seedance_2p0_four_k_usd_cents(15, 1, true), 1557);
-  }
-
-  #[test]
-  fn video_reference_always_costs_more() {
-    for &duration in &[4u16, 5, 10, 15] {
-      assert!(
-        seedance_2p0_four_k_usd_cents(duration, 1, true)
-          > seedance_2p0_four_k_usd_cents(duration, 1, false),
-        "video reference should cost more at {duration}s",
-      );
-    }
+  fn four_k_base_prices() {
+    assert_eq!(seedance_2p0_four_k_usd_cents(4, 1), 370);
+    assert_eq!(seedance_2p0_four_k_usd_cents(5, 1), 463);
+    assert_eq!(seedance_2p0_four_k_usd_cents(10, 1), 925);
+    assert_eq!(seedance_2p0_four_k_usd_cents(15, 1), 1388);
   }
 
   #[test]
   fn batch_count_multiplies() {
-    assert_eq!(seedance_2p0_four_k_usd_cents(5, 2, false), 866);
-    assert_eq!(seedance_2p0_four_k_usd_cents(5, 4, false), 1732);
-    assert_eq!(seedance_2p0_four_k_usd_cents(5, 2, true), 1038);
+    assert_eq!(seedance_2p0_four_k_usd_cents(5, 2), 925);
+    assert_eq!(seedance_2p0_four_k_usd_cents(5, 4), 1850);
   }
 
   // ── Seedance 2.0 Mini ──
@@ -310,34 +314,34 @@ mod tests {
 
     #[test]
     fn four_eighty_p_without_video_reference() {
-      assert_eq!(cents(CommonResolution::FourEightyP, 4, false), 13);
-      assert_eq!(cents(CommonResolution::FourEightyP, 5, false), 17);
-      assert_eq!(cents(CommonResolution::FourEightyP, 10, false), 33);
-      assert_eq!(cents(CommonResolution::FourEightyP, 15, false), 49);
+      assert_eq!(cents(CommonResolution::FourEightyP, 4, false), 14);
+      assert_eq!(cents(CommonResolution::FourEightyP, 5, false), 18);
+      assert_eq!(cents(CommonResolution::FourEightyP, 10, false), 35);
+      assert_eq!(cents(CommonResolution::FourEightyP, 15, false), 52);
     }
 
     #[test]
     fn four_eighty_p_with_video_reference() {
-      assert_eq!(cents(CommonResolution::FourEightyP, 4, true), 17);
-      assert_eq!(cents(CommonResolution::FourEightyP, 5, true), 21);
-      assert_eq!(cents(CommonResolution::FourEightyP, 10, true), 42);
-      assert_eq!(cents(CommonResolution::FourEightyP, 15, true), 62);
+      assert_eq!(cents(CommonResolution::FourEightyP, 4, true), 18);
+      assert_eq!(cents(CommonResolution::FourEightyP, 5, true), 22);
+      assert_eq!(cents(CommonResolution::FourEightyP, 10, true), 44);
+      assert_eq!(cents(CommonResolution::FourEightyP, 15, true), 66);
     }
 
     #[test]
     fn seven_twenty_p_without_video_reference() {
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, false), 35);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, false), 44);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, false), 87);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, false), 130);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, false), 36);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, false), 45);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, false), 89);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, false), 134);
     }
 
     #[test]
     fn seven_twenty_p_with_video_reference() {
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, true), 42);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, true), 52);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, true), 104);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, true), 156);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, true), 43);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, true), 54);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, true), 108);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, true), 161);
     }
 
     #[test]
@@ -364,9 +368,9 @@ mod tests {
     fn batch_count_scales_the_total() {
       // Batch is baked in before the single round-up, so batched totals can be
       // a cent under N× the single price.
-      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 2, false), 87);
-      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 4, false), 173);
-      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::FourEightyP, 5, 2, false), 33);
+      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 2, false), 89);
+      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 4, false), 178);
+      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::FourEightyP, 5, 2, false), 35);
     }
   }
 
@@ -384,34 +388,34 @@ mod tests {
 
     #[test]
     fn four_eighty_p_without_video_reference() {
-      assert_eq!(cents(CommonResolution::FourEightyP, 4, false), 14);
-      assert_eq!(cents(CommonResolution::FourEightyP, 5, false), 17);
-      assert_eq!(cents(CommonResolution::FourEightyP, 10, false), 33);
-      assert_eq!(cents(CommonResolution::FourEightyP, 15, false), 50);
+      assert_eq!(cents(CommonResolution::FourEightyP, 4, false), 15);
+      assert_eq!(cents(CommonResolution::FourEightyP, 5, false), 18);
+      assert_eq!(cents(CommonResolution::FourEightyP, 10, false), 36);
+      assert_eq!(cents(CommonResolution::FourEightyP, 15, false), 54);
     }
 
     #[test]
     fn four_eighty_p_with_video_reference() {
-      assert_eq!(cents(CommonResolution::FourEightyP, 4, true), 17);
-      assert_eq!(cents(CommonResolution::FourEightyP, 5, true), 21);
-      assert_eq!(cents(CommonResolution::FourEightyP, 10, true), 42);
-      assert_eq!(cents(CommonResolution::FourEightyP, 15, true), 63);
+      assert_eq!(cents(CommonResolution::FourEightyP, 4, true), 18);
+      assert_eq!(cents(CommonResolution::FourEightyP, 5, true), 23);
+      assert_eq!(cents(CommonResolution::FourEightyP, 10, true), 45);
+      assert_eq!(cents(CommonResolution::FourEightyP, 15, true), 68);
     }
 
     #[test]
     fn seven_twenty_p_without_video_reference() {
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, false), 35);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, false), 44);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, false), 88);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, false), 131);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, false), 37);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, false), 46);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, false), 91);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, false), 137);
     }
 
     #[test]
     fn seven_twenty_p_with_video_reference() {
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, true), 42);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, true), 53);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, true), 105);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, true), 158);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, true), 44);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, true), 55);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, true), 110);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, true), 165);
     }
 
     #[test]
@@ -439,9 +443,9 @@ mod tests {
 
     #[test]
     fn batch_count_scales_the_total() {
-      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 2, false), 88);
-      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 4, false), 175);
-      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::FourEightyP, 5, 2, false), 33);
+      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 2, false), 91);
+      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 4, false), 182);
+      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::FourEightyP, 5, 2, false), 36);
     }
   }
 }