reuse gallery modal for the artcraft website and app styling aligned

omni gpt image 2 (#1414 )
this will enable it in storyteller-web
2026-10-21 01:12:40 -04:00 · 2026-04-22 17:10:17 +07:00 · 2026-04-22 01:11:42 -04:00 · 2026-04-21 21:53:14 -04:00 · 2026-04-21 21:08:28 -04:00 · 2026-04-21 20:32:41 -04:00
555 changed files with 29606 additions and 7786 deletions
@@ -6,7 +6,11 @@
 - No minimum supported Rust version; use latest stable features freely
 - `#[macro_use] extern crate serde_derive;` is used in binary crates; library crates use `use serde_derive::{Serialize, Deserialize};`
 - Never use `println!` or `eprintln!` outside of tests; use `log` crate macros (`info!`, `warn!`, `error!`, `debug!`, `trace!`) instead
- Use `anyhow::Result` / `AnyhowResult` for fallible functions in application code
+- Use `anyhow::Result` / `AnyhowResult` for fallible functions in application code; new database queries should use `Result<T, sqlx::Error>` instead
+- SQLx queries: prefer `sqlx::query!` and `sqlx::query_as!` compile-time checked macros over 
+  runtime `sqlx::query()` / `sqlx::query_as()`. The macros catch SQL typos, column mismatches, 
+  and type errors at build time. Use runtime queries only when assembling complicated 
+  dynamic/branching queries that cannot be expressed as a compile-time macro.
 - Enum Display/Debug: use `impl_enum_display_and_debug_using_to_str!` macro, not `derive_more::Display` (CLion doesn't understand it)
 - Fields that are optional use the `maybe_` prefix: `maybe_creator_user_token`, `maybe_prompt_token`
 - When implementing `fmt::Display` for error types, use the pattern: `write!(f, "{:?}", self)`
@@ -38,6 +42,21 @@ then the story, then the fine print.
   - A method that calls another method in the same file should appear *above* the method
     it calls. This lets readers follow the call chain downward.

+### Ordering within test modules
+
+Put test cases first, helpers last. A reader opening a test file should immediately see
+*what* is being tested before *how* the test machinery works.
+
+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)
+
+Group related tests into sub-modules (`mod pricing_tests { ... }`) when a category has 2+
+tests. Don't create a sub-module for a single test. Keep nesting to two levels max
+(`mod tests { mod category { ... } }`). Shared helpers go in the parent module so
+sub-modules can reach them via `use super::*`.
+
 ## Naming

 - Handler functions: `{verb}_{noun}_handler` (e.g. `get_health_check_handler`, `login_handler`)
@@ -49,15 +68,24 @@ then the story, then the fine print.
 ## Imports

 - Group imports: std, external crates, internal workspace crates, `crate::` imports
- Use fully qualified paths for one-off references; `use` for repeated references
+- Prefer `use` imports over inline fully-qualified paths. Inline qualification is acceptable
+  only for genuine one-off references where adding an import would be noise, or for types
+  that collide with std prelude names (`Result`, `Option`, `Error`). If you reference a symbol
+  more than once, always import it.
 - Prefer specific imports over wildcards, except in `api_doc.rs` and test modules
 - When two crates export a type with the same name, alias with a suffix describing the source crate:
  `use enums::...::CommonResolution as CommonResolutionEnum;`
  `use artcraft_router::...::CommonResolution as CommonResolutionRouter;`
  This avoids long fully-qualified paths in function signatures and bodies.

+## MySQL 
+
+- MySQL tables: primary key `id` columns must be `BIGINT(20) UNSIGNED`. Do not use signed IDs. 
+- Always create tables with `ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin`.
+
 ## TypeScript / Frontend

 - TypeScript with React, Vite, Zustand, Three.js
 - Nx monorepo under `crates/frontend/`
 - Two spaces for indentation
+
@@ -10,10 +10,28 @@
 ## Test Patterns

 - Tests live in `#[cfg(test)] mod tests { ... }` at the bottom of each file
- Group related tests in sub-modules: `mod explicit_checks`, `mod mechanical_checks`
+- Group related tests into sub-modules by category (e.g. `mod pricing_tests`, `mod resolution_tests`)
+- Only create a sub-module when it has 2+ tests — don't wrap a single test in its own module
+- Keep nesting shallow: `mod tests { mod category { ... } }` is fine; a third level is rarely needed
+- Shared helpers used by multiple sub-modules belong in the parent `mod tests`, not duplicated in each sub-module
 - Enum tests should cover: serialization, deserialization, `to_str`/`from_str` round-trip, variant count
 - Password/crypto tests: be mindful of computation cost, don't add too many bcrypt test cases

+## Test File Layout
+
+Put test cases first, helpers last. Engineers should see the actual tests before scrolling
+to understand helper plumbing.
+
+Within a `mod tests { ... }` block:
+
+1. **Imports** at the top
+2. **Constants** (test data IDs, URLs, etc.) — small context that tests reference
+3. **Test functions** (`#[test]` / `#[tokio::test]`) grouped by category
+4. **Helper functions** (builders, pipeline runners, etc.) at the very bottom
+
+If tests are grouped into sub-modules, the same rule applies within each sub-module:
+constants first, then tests, then helpers at the end of that sub-module.
+
 ## What to Test

 - New error types and their mappings
@@ -21,6 +39,14 @@
 - Hash/deduplication functions with known inputs
 - Edge cases in parsers (empty input, missing fields, malformed data)

+## Imports in Tests
+
+- Import test fixtures and constants with `use`, not inline fully-qualified paths.
+  Write `use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;` at the top,
+  then reference `JUNO_AT_LAKE_IMAGE_URL` in test bodies.
+- Same rule applies to enum variants used in match arms — import them, don't write
+  `crate::some::deep::module::MyEnum::Variant` inline.
+
 ## What Not to Test

 - Don't add integration tests that require a running database unless explicitly asked
@@ -0,0 +1,146 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  uir.id,\n  uir.impersonator_user_token as `impersonator_user_token: UserToken`,\n  impersonator.username as impersonator_username,\n  impersonator.display_name as impersonator_display_name,\n  uir.impersonated_user_token as `impersonated_user_token: UserToken`,\n  impersonated.username as impersonated_username,\n  impersonated.display_name as impersonated_display_name,\n  uir.is_redeemed as `is_redeemed: bool`,\n  (uir.expires_at < NOW()) as `is_expired: bool`,\n  uir.expires_at,\n  uir.created_at,\n  uir.updated_at\nFROM user_impersonation_requests uir\nJOIN users impersonator ON impersonator.token = uir.impersonator_user_token\nJOIN users impersonated ON impersonated.token = uir.impersonated_user_token\nWHERE uir.impersonated_user_token = ?\n  AND uir.id < ?\nORDER BY uir.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "impersonator_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": "impersonator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "impersonator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "impersonated_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "impersonated_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "impersonated_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "is_redeemed: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "is_expired: bool",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "expires_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "27cebaa36f0ec873f86cdf8fa994d499db1a5cc84d2c6fceb3587145eb2f9bec"
+}
@@ -0,0 +1,146 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  uir.id,\n  uir.impersonator_user_token as `impersonator_user_token: UserToken`,\n  impersonator.username as impersonator_username,\n  impersonator.display_name as impersonator_display_name,\n  uir.impersonated_user_token as `impersonated_user_token: UserToken`,\n  impersonated.username as impersonated_username,\n  impersonated.display_name as impersonated_display_name,\n  uir.is_redeemed as `is_redeemed: bool`,\n  (uir.expires_at < NOW()) as `is_expired: bool`,\n  uir.expires_at,\n  uir.created_at,\n  uir.updated_at\nFROM user_impersonation_requests uir\nJOIN users impersonator ON impersonator.token = uir.impersonator_user_token\nJOIN users impersonated ON impersonated.token = uir.impersonated_user_token\nWHERE uir.impersonated_user_token = ?\nORDER BY uir.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "impersonator_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": "impersonator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "impersonator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "impersonated_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "impersonated_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "impersonated_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "is_redeemed: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "is_expired: bool",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "expires_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "381e13ab37a2f4ce39bd6db9d90202c301091376108f645a9bb5264a9cd113d7"
+}
@@ -0,0 +1,146 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  sal.id,\n  sal.token as `token: StaffAuditLogToken`,\n  sal.audit_action,\n  sal.maybe_entity_type,\n  sal.maybe_entity_token,\n  target_user.username as maybe_target_username,\n  target_user.display_name as maybe_target_display_name,\n  sal.staff_user_token as `staff_user_token: UserToken`,\n  staff_user.username as staff_username,\n  staff_user.display_name as staff_display_name,\n  sal.staff_ip_address,\n  sal.created_at\nFROM staff_audit_logs sal\nLEFT JOIN users target_user ON target_user.token = sal.maybe_entity_token\nLEFT JOIN users staff_user ON staff_user.token = sal.staff_user_token\nORDER BY sal.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: StaffAuditLogToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "audit_action",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_entity_type",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_entity_token",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_target_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_target_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "staff_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "staff_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "staff_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "staff_ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "3846628765bd34ea2ce01e15a0db732121ce473c5c542d0e971ad29b2b421193"
+}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nUPDATE users\nSET\n    is_banned = ?,\n    maybe_mod_comments = ?,\n    maybe_mod_user_token  = ?,\n    version = version + 1\n\nWHERE users.token = ?\nLIMIT 1\n        ",
+  "query": "\nUPDATE users\nSET\n    is_banned = ?,\n    maybe_mod_comments = ?,\n    maybe_mod_user_token  = ?,\n    version = version + 1\n\nWHERE users.token = ?\nLIMIT 1\n    ",
  "describe": {
    "columns": [],
    "parameters": {
@@ -8,5 +8,5 @@
    },
    "nullable": []
  },
-  "hash": "eab69a8d679b2dcfb06a9ccc79851f6c693d0c372142ff0e7ded89c95e4bcf44"
+  "hash": "3d746dcb479005f1f4ae5e157a5ace7626eda4849d44c6c2d7079fd346eb4edc"
 }
@@ -0,0 +1,146 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  uir.id,\n  uir.impersonator_user_token as `impersonator_user_token: UserToken`,\n  impersonator.username as impersonator_username,\n  impersonator.display_name as impersonator_display_name,\n  uir.impersonated_user_token as `impersonated_user_token: UserToken`,\n  impersonated.username as impersonated_username,\n  impersonated.display_name as impersonated_display_name,\n  uir.is_redeemed as `is_redeemed: bool`,\n  (uir.expires_at < NOW()) as `is_expired: bool`,\n  uir.expires_at,\n  uir.created_at,\n  uir.updated_at\nFROM user_impersonation_requests uir\nJOIN users impersonator ON impersonator.token = uir.impersonator_user_token\nJOIN users impersonated ON impersonated.token = uir.impersonated_user_token\nWHERE uir.id < ?\nORDER BY uir.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "impersonator_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": "impersonator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "impersonator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "impersonated_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "impersonated_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "impersonated_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "is_redeemed: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "is_expired: bool",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "expires_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "5d45897a5d4c326c8d17f105cae81db7f5878c197b55e8ea61c225e739d11234"
+}
@@ -0,0 +1,146 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  sal.id,\n  sal.token as `token: StaffAuditLogToken`,\n  sal.audit_action,\n  sal.maybe_entity_type,\n  sal.maybe_entity_token,\n  target_user.username as maybe_target_username,\n  target_user.display_name as maybe_target_display_name,\n  sal.staff_user_token as `staff_user_token: UserToken`,\n  staff_user.username as staff_username,\n  staff_user.display_name as staff_display_name,\n  sal.staff_ip_address,\n  sal.created_at\nFROM staff_audit_logs sal\nLEFT JOIN users target_user ON target_user.token = sal.maybe_entity_token\nLEFT JOIN users staff_user ON staff_user.token = sal.staff_user_token\nWHERE sal.id < ?\nORDER BY sal.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: StaffAuditLogToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "audit_action",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_entity_type",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_entity_token",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_target_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_target_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "staff_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "staff_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "staff_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "staff_ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "9132f832752ea40736bedf4729c76af7fe019cc69ed5cc280fce87e68c3f4846"
+}
@@ -0,0 +1,80 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  token,\n  impersonated_user_token as `impersonated_user_token: UserToken`,\n  impersonator_user_token as `impersonator_user_token: UserToken`,\n  user_impersonation_token,\n  is_redeemed as `is_redeemed: bool`,\n  expires_at\nFROM user_impersonation_requests\nWHERE user_impersonation_token = ?\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "impersonated_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": "impersonator_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "user_impersonation_token",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "is_redeemed: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "expires_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "9dc83df0b7f1cf2716352e947b6b7fcb6c455fb0c12d72e584612f35366831f4"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO user_sessions (\n  token,\n  user_token,\n  maybe_impersonation_user_token,\n  ip_address_creation,\n  expires_at\n)\nVALUES (?, ?, ?, ?, ?)\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": []
+  },
+  "hash": "ba5b0a542d4b95b781077b8895529d222dd682eb28c9d00031a820ec6f37e095"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO staff_audit_logs\nSET\n  token = ?,\n  audit_action = ?,\n  maybe_entity_type = ?,\n  maybe_entity_token = ?,\n  staff_user_token = ?,\n  staff_ip_address = ?\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 6
+    },
+    "nullable": []
+  },
+  "hash": "c39800423a5fe0aa324e117e624015f85d039c3ca6833cf6865471345ab0768e"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO user_impersonation_requests\nSET\n  token = ?,\n  impersonated_user_token = ?,\n  impersonator_user_token = ?,\n  user_impersonation_token = ?,\n  ip_address_creation = ?,\n  expires_at = ?\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 6
+    },
+    "nullable": []
+  },
+  "hash": "cc782c807dadcaaaad08f469935f61dc2e9f3217aa01532d6602b8e37cedf92d"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE user_impersonation_requests\nSET\n  is_redeemed = TRUE,\n  ip_address_redemption = ?\nWHERE user_impersonation_token = ?\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "cf4be26ce3a48c7108640faa6c9fc68a48136327a9d374c52c16848c006f0984"
+}
@@ -0,0 +1,146 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  uir.id,\n  uir.impersonator_user_token as `impersonator_user_token: UserToken`,\n  impersonator.username as impersonator_username,\n  impersonator.display_name as impersonator_display_name,\n  uir.impersonated_user_token as `impersonated_user_token: UserToken`,\n  impersonated.username as impersonated_username,\n  impersonated.display_name as impersonated_display_name,\n  uir.is_redeemed as `is_redeemed: bool`,\n  (uir.expires_at < NOW()) as `is_expired: bool`,\n  uir.expires_at,\n  uir.created_at,\n  uir.updated_at\nFROM user_impersonation_requests uir\nJOIN users impersonator ON impersonator.token = uir.impersonator_user_token\nJOIN users impersonated ON impersonated.token = uir.impersonated_user_token\nORDER BY uir.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "impersonator_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": "impersonator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "impersonator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "impersonated_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "impersonated_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "impersonated_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "is_redeemed: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "is_expired: bool",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "expires_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "e72b3dfdd9df4ee10a696faa4dfc3fb8addc9d2b88017f503c339fb616bef6f1"
+}
@@ -58,10 +58,11 @@ artcraft/

 - Rust with no minimum supported version
 - Actix-web for HTTP services
- SQLx for MySQL and SQLite
+- SQLx for MySQL and SQLite; prefer `sqlx::query!` / `sqlx::query_as!` compile-time checked macros over runtime `sqlx::query()` whenever possible
 - 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

@@ -75,3 +76,4 @@ Organize for top-to-bottom reading. Important things first, details later.
 - **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
@@ -770,6 +770,7 @@ dependencies = [
 "anyhow",
 "artcraft_api_defs",
 "artcraft_client",
+ "enums",
 "fal_client",
 "log",
 "muapi_client",
@@ -3876,6 +3877,13 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

+[[package]]
+name = "error_utils"
+version = "0.0.1"
+dependencies = [
+ "regex",
+]
+
 [[package]]
 name = "errors"
 version = "0.0.1"
@@ -7743,6 +7751,17 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

+[[package]]
+name = "opaque_cursors"
+version = "0.0.1"
+dependencies = [
+ "base64 0.22.1",
+ "magic-crypt",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
 [[package]]
 name = "open"
 version = "5.3.3"
@@ -11234,6 +11253,7 @@ dependencies = [
 "elasticsearch",
 "elasticsearch_schema",
 "enums",
+ "error_utils",
 "errors",
 "fal_client",
 "ffmpeg_utils",
@@ -11261,6 +11281,7 @@ dependencies = [
 "mimetypes",
 "mysql_queries",
 "once_cell",
+ "opaque_cursors",
 "pager",
 "password",
 "primitives",
@@ -14772,6 +14793,7 @@ dependencies = [
 "serde",
 "serde_json",
 "strum",
+ "test_data",
 "tokio",
 "uuid 1.22.0",
 "workspace-build-acceleration",
@@ -59,6 +59,7 @@ members = [
  "crates/lib/data/primitives",
  "crates/lib/data/web_base64",
  "crates/lib/easyenv", # NB: Vendored version of https://github.com/echelon/easyenv.rs that we'll improve.
+  "crates/lib/error_utils",
  "crates/lib/errors",
  "crates/lib/ffmpeg_utils",
  "crates/lib/files/file_to_base64_url",
@@ -72,6 +73,7 @@ members = [
  "crates/lib/http_headers",
  "crates/lib/jobs_common",
  "crates/lib/jwt_light",
+  "crates/lib/opaque_cursors",
  "crates/lib/jwt_signer",
  "crates/lib/logging",
  "crates/lib/markdown",
@@ -236,6 +238,7 @@ cookie_store = { path = "crates/lib/cookie_store" }
 crockford = { path = "crates/lib/data/crockford" }
 easyenv = { path = "crates/lib/easyenv" }
 enums = { path = "crates/schema/public/enums" }
+error_utils = { path = "crates/lib/error_utils" }
 errors = { path = "crates/lib/errors" }
 fal_client = { path = "crates/api_clients/fal_client" }
 ffmpeg_utils = { path = "crates/lib/ffmpeg_utils" }
@@ -250,6 +253,7 @@ images = { path = "crates/lib/files/images" }
 jobs_common = { path = "crates/lib/jobs_common" }
 jwt_light = { path = "crates/lib/jwt_light" }
 jwt_signer = { path = "crates/lib/jwt_signer" }
+opaque_cursors = { path = "crates/lib/opaque_cursors" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
 memory_store = { path = "crates/lib/caching/memory_store" }
 midjourney_client = { path = "crates/api_clients/midjourney_client" }
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS staff_audit_logs;
@@ -0,0 +1,39 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE staff_audit_logs (
+
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Effective "primary key" of the audit log item (in case we add a UI or notes)
+  token VARCHAR(32) NOT NULL,
+
+  -- The type of action taken
+  audit_action VARCHAR(32) NOT NULL,
+
+  -- The type of entity acted upon (if any)
+  maybe_entity_type VARCHAR(16) DEFAULT NULL,
+
+  -- The token of the entity mutated (if any)
+  maybe_entity_token VARCHAR(32) NOT NULL,
+
+  -- The staff user who performed the action.
+  staff_user_token VARCHAR(32) DEFAULT NULL,
+
+  -- For abuse tracking.
+  -- Wide enough for IPv4/6
+  staff_ip_address VARCHAR(40) NOT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY index_maybe_entity_type (maybe_entity_type),
+  KEY index_maybe_entity_token (maybe_entity_token),
+  KEY index_staff_user_token (staff_user_token),
+  KEY index_created_at (created_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,6 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE user_sessions
+  DROP COLUMN maybe_impersonation_user_token;
@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE user_sessions
+  ADD COLUMN maybe_impersonation_user_token VARCHAR(32) DEFAULT NULL
+  AFTER user_token;
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS user_impersonation_requests;
@@ -0,0 +1,44 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE user_impersonation_requests (
+
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Internal "primary key"
+  token VARCHAR(32) NOT NULL,
+
+  -- The user being impersonated.
+  impersonated_user_token VARCHAR(32) NOT NULL,
+
+  -- The staff user who initiated the impersonation.
+  impersonator_user_token VARCHAR(32) NOT NULL,
+
+  -- The actual secret that must be presented to redeem the impersonation.
+  user_impersonation_token VARCHAR(32) NOT NULL,
+
+  -- Whether this request has been redeemed (used to create a session).
+  is_redeemed BOOLEAN NOT NULL DEFAULT FALSE,
+
+  -- IP address of the staff user who created the request.
+  ip_address_creation VARCHAR(40) NOT NULL,
+
+  -- IP address from which the request was redeemed, if redeemed.
+  ip_address_redemption VARCHAR(40) DEFAULT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- The request expires after this time if not redeemed.
+  expires_at TIMESTAMP NOT NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  UNIQUE KEY (user_impersonation_token),
+  KEY index_impersonated_user_token (impersonated_user_token),
+  KEY index_impersonator_user_token (impersonator_user_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,35 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Recreate with the original signed BIGINT id.
+CREATE TABLE user_impersonation_requests (
+
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  token VARCHAR(32) NOT NULL,
+
+  impersonated_user_token VARCHAR(32) NOT NULL,
+
+  impersonator_user_token VARCHAR(32) NOT NULL,
+
+  user_impersonation_token VARCHAR(32) NOT NULL,
+
+  is_redeemed BOOLEAN NOT NULL DEFAULT FALSE,
+
+  ip_address_creation VARCHAR(40) NOT NULL,
+
+  ip_address_redemption VARCHAR(40) DEFAULT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  expires_at TIMESTAMP NOT NULL,
+
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  UNIQUE KEY (user_impersonation_token),
+  KEY index_impersonated_user_token (impersonated_user_token),
+  KEY index_impersonator_user_token (impersonator_user_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS user_impersonation_requests;
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS user_impersonation_requests;
@@ -0,0 +1,44 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE user_impersonation_requests (
+
+  -- Not used for anything except replication.
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- Internal "primary key"
+  token VARCHAR(32) NOT NULL,
+
+  -- The user being impersonated.
+  impersonated_user_token VARCHAR(32) NOT NULL,
+
+  -- The staff user who initiated the impersonation.
+  impersonator_user_token VARCHAR(32) NOT NULL,
+
+  -- The actual secret that must be presented to redeem the impersonation.
+  user_impersonation_token VARCHAR(32) NOT NULL,
+
+  -- Whether this request has been redeemed (used to create a session).
+  is_redeemed BOOLEAN NOT NULL DEFAULT FALSE,
+
+  -- IP address of the staff user who created the request.
+  ip_address_creation VARCHAR(40) NOT NULL,
+
+  -- IP address from which the request was redeemed, if redeemed.
+  ip_address_redemption VARCHAR(40) DEFAULT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- The request expires after this time if not redeemed.
+  expires_at TIMESTAMP NOT NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  UNIQUE KEY (user_impersonation_token),
+  KEY index_impersonated_user_token (impersonated_user_token),
+  KEY index_impersonator_user_token (impersonator_user_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,31 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Recreate with the original signed BIGINT id.
+CREATE TABLE staff_audit_logs (
+
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  token VARCHAR(32) NOT NULL,
+
+  audit_action VARCHAR(32) NOT NULL,
+
+  maybe_entity_type VARCHAR(16) DEFAULT NULL,
+
+  maybe_entity_token VARCHAR(32) NOT NULL,
+
+  staff_user_token VARCHAR(32) DEFAULT NULL,
+
+  staff_ip_address VARCHAR(40) NOT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY index_maybe_entity_type (maybe_entity_type),
+  KEY index_maybe_entity_token (maybe_entity_token),
+  KEY index_staff_user_token (staff_user_token),
+  KEY index_created_at (created_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS staff_audit_logs;
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS staff_audit_logs;
@@ -0,0 +1,39 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE staff_audit_logs (
+
+  -- Not used for anything except replication.
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- Effective "primary key" of the audit log item (in case we add a UI or notes)
+  token VARCHAR(32) NOT NULL,
+
+  -- The type of action taken
+  audit_action VARCHAR(32) NOT NULL,
+
+  -- The type of entity acted upon (if any)
+  maybe_entity_type VARCHAR(16) DEFAULT NULL,
+
+  -- The token of the entity mutated (if any)
+  maybe_entity_token VARCHAR(32) NOT NULL,
+
+  -- The staff user who performed the action.
+  staff_user_token VARCHAR(32) DEFAULT NULL,
+
+  -- For abuse tracking.
+  -- Wide enough for IPv4/6
+  staff_ip_address VARCHAR(40) NOT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY index_maybe_entity_type (maybe_entity_type),
+  KEY index_maybe_entity_token (maybe_entity_token),
+  KEY index_staff_user_token (staff_user_token),
+  KEY index_created_at (created_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -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`).
@@ -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/`).
@@ -0,0 +1,39 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE staff_audit_logs (
+
+  -- Not used for anything except replication.
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- Effective "primary key" of the audit log item (in case we add a UI or notes)
+  token VARCHAR(32) NOT NULL,
+
+  -- The type of action taken
+  audit_action VARCHAR(32) NOT NULL,
+
+  -- The type of entity acted upon (if any)
+  maybe_entity_type VARCHAR(16) DEFAULT NULL,
+
+  -- The token of the entity mutated (if any)
+  maybe_entity_token VARCHAR(32) NOT NULL,
+
+  -- The staff user who performed the action.
+  staff_user_token VARCHAR(32) DEFAULT NULL,
+
+  -- For abuse tracking.
+  -- Wide enough for IPv4/6
+  staff_ip_address VARCHAR(40) NOT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY index_maybe_entity_type (maybe_entity_type),
+  KEY index_maybe_entity_token (maybe_entity_token),
+  KEY index_staff_user_token (staff_user_token),
+  KEY index_created_at (created_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,44 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE user_impersonation_requests (
+
+  -- Not used for anything except replication.
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- Internal "primary key"
+  token VARCHAR(32) NOT NULL,
+
+  -- The user being impersonated.
+  impersonated_user_token VARCHAR(32) NOT NULL,
+
+  -- The staff user who initiated the impersonation.
+  impersonator_user_token VARCHAR(32) NOT NULL,
+
+  -- The actual secret that must be presented to redeem the impersonation.
+  user_impersonation_token VARCHAR(32) NOT NULL,
+
+  -- Whether this request has been redeemed (used to create a session).
+  is_redeemed BOOLEAN NOT NULL DEFAULT FALSE,
+
+  -- IP address of the staff user who created the request.
+  ip_address_creation VARCHAR(40) NOT NULL,
+
+  -- IP address from which the request was redeemed, if redeemed.
+  ip_address_redemption VARCHAR(40) DEFAULT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- The request expires after this time if not redeemed.
+  expires_at TIMESTAMP NOT NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  UNIQUE KEY (user_impersonation_token),
+  KEY index_impersonated_user_token (impersonated_user_token),
+  KEY index_impersonator_user_token (impersonator_user_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,50 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE user_sessions (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Session primary key
+  token VARCHAR(32) NOT NULL,
+
+  -- The user that the session belongs to.
+  user_token VARCHAR(32) NOT NULL,
+
+  -- NEVER IMPERSONATE A USER'S ACCOUNT WITHOUT THEIR CONSENT!
+  --
+  -- For support requests and inquiries, we can have staff log into user accounts
+  -- to verify and debug possible broken states. The user is always told about
+  -- this if we are to use this for support cases.
+  --
+  -- Every action performed by impersonated sessions is logged for auditing.
+  --
+  -- If this session is impersonating another user, this is the token of
+  -- the staff user who initiated the impersonation.
+  maybe_impersonation_user_token VARCHAR(32) DEFAULT NULL,
+
+  -- Track each session's creation IP.
+  -- Wide enough for IPv4/6
+  ip_address_creation VARCHAR(40) NOT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- Session termination time.
+  -- This must be set by the server code, or the session is invalid
+  expires_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- deletion = session termination
+  -- Typically these are destroyed by users, but if in the future we allow mods to
+  -- delete them, it doesn't really matter who did the deletion: sessions are not
+  -- designed to be recoverable.
+  deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY fk_user_token (user_token),
+  KEY index_ip_address_creation (ip_address_creation)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -15,7 +15,7 @@ body:
  type: json
  content: |
    {
-        "user_token": "user_jg7ng4kdt2x5y", // newuser946
+        "user_token": "user_rtdhen9kz73kx", // 
        "payments_namespace": "artcraft"
    }
 order: 4100053395280358
@@ -0,0 +1,11 @@
+$kind: http-request
+name: Impersonate User Request
+url: "{{api_host}}/v1/moderation/user_sessions/impersonate"
+method: POST
+body:
+  type: json
+  content: |-
+    {
+        "username": "newuser3"
+    }
+order: 4318829221021218
@@ -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, Seedance2Pro, Muapi)
+- `artcraft_api_defs` — shared HTTP API type definitions
+- `seedance2pro_client` — HTTP client for the Kinovi/Seedance2Pro 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
@@ -16,7 +16,8 @@ pub struct GenerateVeo2ImageToVideoRequest {
  
  /// Optional text prompt.
  pub prompt: Option<String>,
-  
+
+  /// **NB(bt): ASPECT RATIO IS ACTUALLY NOT USED IN VEO 2 IMAGE-TO-VIDEO**
  /// Optional: aspect ratio of the generated video.
  pub aspect_ratio: Option<GenerateVeo2AspectRatio>,

@@ -21,6 +21,9 @@ pub struct GenerateVeo3FastImageToVideoRequest {
  pub resolution: Option<GenerateVeo3FastResolution>,

  /// Optional: aspect ratio of the generated video.
+  pub aspect_ratio: Option<GenerateVeo3FastAspectRatio>,
+
+  /// Optional: duration of the generated video.
  pub duration: Option<GenerateVeo3FastDuration>,

  /// Optional: Generate an audio track along with the video
@@ -34,6 +37,14 @@ pub enum GenerateVeo3FastResolution {
  TenEightyP, // 1080p
 }

+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum GenerateVeo3FastAspectRatio {
+  Auto,
+  SixteenByNine,
+  NineBySixteen,
+}
+
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateVeo3FastDuration {
@@ -42,6 +42,10 @@ pub struct GenerateVeo3ImageToVideoRequest {
 pub enum GenerateVeo3AspectRatio {
  WideSixteenNine, // 16:9
  TallNineSixteen, // 9:16
+  
+  /// NB: DO NOT REMOVE. This is an unsupported resolution for Veo 3, but we can't 
+  /// impact existing callers by removing it. The handler will convert this to a 
+  /// supported resolution or 400 the request instead.
  Square, // 1:1
 }

@@ -7,7 +7,7 @@ use utoipa::ToSchema;
 pub const SEEDANCE_2P0_MULTI_FUNCTION_VIDEO_GEN_PATH: &str = "/v1/generate/video/multi_function/seedance_2p0";

 /// Seedance 2.0 multi-function video generation (text-to-video, image-to-video, and reference-based).
-#[derive(Serialize, Deserialize, ToSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
 pub struct Seedance2p0MultiFunctionVideoGenRequest {
  /// Idempotency token to prevent duplicate requests.
  pub uuid_idempotency_token: String,
@@ -37,6 +37,9 @@ pub struct Seedance2p0MultiFunctionVideoGenRequest {
  /// Video aspect ratio / resolution.
  pub aspect_ratio: Option<Seedance2p0AspectRatio>,

+  /// Output resolution quality tier (480p, 720p, 1080p).
+  pub output_resolution: Option<Seedance2p0OutputResolution>,
+
  /// Duration in seconds (4–15).
  pub duration_seconds: Option<u8>,

@@ -67,6 +70,17 @@ pub enum Seedance2p0BatchCount {
  Four,
 }

+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum Seedance2p0OutputResolution {
+  /// 480p
+  FourEightyP,
+  /// 720p (default)
+  SevenTwentyP,
+  /// 1080p
+  TenEightyP,
+}
+
 #[derive(Serialize, Deserialize, ToSchema)]
 pub struct Seedance2p0MultiFunctionVideoGenResponse {
  pub success: bool,
@@ -2,6 +2,7 @@ use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
 use enums::common::generation::common_image_model::CommonImageModel;
 use enums::common::generation::common_quality::CommonQuality;
 use enums::common::generation::common_resolution::CommonResolution;
+use enums::common::generation::model_creator::ModelCreator;
 use enums::common::generation_provider::GenerationProvider;
 use serde_derive::{Deserialize, Serialize};
 use utoipa::{IntoParams, ToSchema};
@@ -56,6 +57,9 @@ pub struct OmniGenImageProviderModelDetails {
 pub struct OmniGenImageModelDetails {
  pub model: CommonImageModel,

+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub model_creator: Option<ModelCreator>,
+
  #[serde(skip_serializing_if = "Option::is_none")]
  pub full_name: Option<String>,

@@ -120,12 +124,16 @@ pub struct OmniGenImageModelDetails {

  #[serde(skip_serializing_if = "Option::is_none")]
  pub batch_size_default: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub is_disabled: Option<bool>,
 }

 impl Default for OmniGenImageModelDetails {
  fn default() -> Self {
    Self {
      model: CommonImageModel::NanoBananaPro,
+      model_creator: None,
      full_name: None,
      text_prompt_supported: None,
      text_prompt_max_length: None,
@@ -145,6 +153,7 @@ impl Default for OmniGenImageModelDetails {
      batch_size_max: None,
      batch_size_options: None,
      batch_size_default: None,
+      is_disabled: None,
    }
  }
 }
@@ -2,6 +2,7 @@ use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
 use enums::common::generation::common_quality::CommonQuality;
 use enums::common::generation::common_resolution::CommonResolution;
 use enums::common::generation::common_video_model::CommonVideoModel;
+use enums::common::generation::model_creator::ModelCreator;
 use enums::common::generation_provider::GenerationProvider;
 use serde_derive::{Deserialize, Serialize};
 use utoipa::{IntoParams, ToSchema};
@@ -65,6 +66,9 @@ pub struct OmniGenVideoModelDetails {

  pub model: CommonVideoModel,
  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub model_creator: Option<ModelCreator>,
+  
  #[serde(skip_serializing_if = "Option::is_none")]
  pub full_name: Option<String>,
  
@@ -163,12 +167,16 @@ pub struct OmniGenVideoModelDetails {
  
  #[serde(skip_serializing_if = "Option::is_none")]
  pub batch_size_default: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub is_disabled: Option<bool>,
 }

 impl Default for OmniGenVideoModelDetails {
  fn default() -> Self {
    Self {
      model: DEFAULT_VIDEO_MODEL,
+      model_creator: None,
      full_name: None,
      text_prompt_supported: None,
      text_prompt_max_length: None,
@@ -202,6 +210,7 @@ impl Default for OmniGenVideoModelDetails {
      batch_size_max: None,
      batch_size_options: None,
      batch_size_default: None,
+      is_disabled: None,
    }
  }
 }
@@ -2,6 +2,7 @@ pub mod analytics;
 pub mod credits;
 pub mod generate;
 pub mod jobs;
+pub mod omni_gen;
 pub mod media_files;
 pub mod prompts;
 pub mod stripe_artcraft;
@@ -0,0 +1 @@
+pub mod omni_gen_image;
@@ -0,0 +1,21 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::basic_json_post_request::basic_json_post_request;
+use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost_and_generate_request::OmniGenImageCostAndGenerateRequest;
+use artcraft_api_defs::omni_gen::generate_response::omni_gen_image_generate_response::OmniGenImageGenerateResponse;
+
+pub const OMNI_GEN_IMAGE_GENERATE_PATH: &str = "/v1/omni_gen/generate/image";
+
+pub async fn omni_gen_image_generate(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: OmniGenImageCostAndGenerateRequest,
+) -> Result<OmniGenImageGenerateResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    OMNI_GEN_IMAGE_GENERATE_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}
@@ -0,0 +1,2 @@
+pub mod image;
+pub mod video;
@@ -0,0 +1 @@
+pub mod omni_gen_video;
@@ -0,0 +1,21 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::basic_json_post_request::basic_json_post_request;
+use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
+use artcraft_api_defs::omni_gen::generate_response::omni_gen_video_generate_response::OmniGenVideoGenerateResponse;
+
+pub const OMNI_GEN_VIDEO_GENERATE_PATH: &str = "/v1/omni_gen/generate/video";
+
+pub async fn omni_gen_video_generate(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: OmniGenVideoCostAndGenerateRequest,
+) -> Result<OmniGenVideoGenerateResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    OMNI_GEN_VIDEO_GENERATE_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}
@@ -0,0 +1 @@
+pub mod generate;
@@ -17,6 +17,7 @@ workspace-build-acceleration.workspace = true

 # Internal
 artcraft_api_defs.workspace = true
+enums.workspace = true
 artcraft_client.workspace = true
 fal_client.workspace = true
 muapi_client.workspace = true
@@ -1,7 +1,7 @@
 use tokens::tokens::media_files::MediaFileToken;

-#[derive(Copy, Clone, Debug)]
-pub enum AudioListRef<'a> {
-  MediaFileTokens(&'a Vec<MediaFileToken>),
-  Urls(&'a Vec<String>),
+#[derive(Clone, Debug)]
+pub enum AudioListRef {
+  MediaFileTokens(Vec<MediaFileToken>),
+  Urls(Vec<String>),
 }
@@ -1,9 +1,9 @@
 use tokens::tokens::characters::CharacterToken;

 /// Forward-compatible character reference list.
-#[derive(Copy, Clone, Debug)]
-pub enum CharacterListRef<'a> {
-  CharacterTokens(&'a Vec<CharacterToken>),
-  
+#[derive(Clone, Debug)]
+pub enum CharacterListRef {
+  CharacterTokens(Vec<CharacterToken>),
+
  // In the future, we may have other identifiers for characters.
 }
@@ -17,6 +17,8 @@ pub enum CommonImageModel {
  GptImage1,
  #[serde(rename = "gpt_image_1p5")]
  GptImage1p5,
+  #[serde(rename = "gpt_image_2")]
+  GptImage2,
  #[serde(rename = "nano_banana")]
  NanoBanana,
  #[serde(rename = "nano_banana_2")]
@@ -38,6 +38,9 @@ pub enum CommonVideoModel {
  #[serde(rename = "seedance_2p0")]
  Seedance2p0,

+  #[serde(rename = "seedance_2p0_fast")]
+  Seedance2p0Fast,
+
  #[serde(rename = "sora_2")]
  Sora2,

@@ -1,7 +1,7 @@
 use tokens::tokens::media_files::MediaFileToken;

-#[derive(Copy, Clone, Debug)]
-pub enum ImageListRef<'a> {
-  MediaFileTokens(&'a Vec<MediaFileToken>),
-  Urls(&'a Vec<String>),
+#[derive(Clone, Debug)]
+pub enum ImageListRef {
+  MediaFileTokens(Vec<MediaFileToken>),
+  Urls(Vec<String>),
 }
@@ -1,7 +1,7 @@
 use tokens::tokens::media_files::MediaFileToken;

-#[derive(Copy, Clone, Debug)]
-pub enum ImageRef<'a> {
-  MediaFileToken(&'a MediaFileToken),
-  Url(&'a str),
+#[derive(Clone, Debug)]
+pub enum ImageRef {
+  MediaFileToken(MediaFileToken),
+  Url(String),
 }
@@ -1,7 +1,7 @@
 use tokens::tokens::media_files::MediaFileToken;

-#[derive(Copy, Clone, Debug)]
-pub enum VideoListRef<'a> {
-  MediaFileTokens(&'a Vec<MediaFileToken>),
-  Urls(&'a Vec<String>),
+#[derive(Clone, Debug)]
+pub enum VideoListRef {
+  MediaFileTokens(Vec<MediaFileToken>),
+  Urls(Vec<String>),
 }
@@ -15,6 +15,9 @@ pub enum ArtcraftRouterError {
  /// The requested model is not yet supported by the router.
  UnsupportedModel(String),

+  /// [Temporary during migration] The requested model/provider is not yet supported by the router.
+  UnsupportedProviderAndModelForNewApi(String),
+
  /// Invalid or missing input arguments.
  InvalidInput(String),

@@ -30,6 +33,7 @@ impl Display for ArtcraftRouterError {
      Self::Client(e) => write!(f, "Client error: {}", e),
      Self::Download(e) => write!(f, "Download error: {}", e),
      Self::UnsupportedModel(model) => write!(f, "Unsupported model: {}", model),
+      Self::UnsupportedProviderAndModelForNewApi(msg) => write!(f, "Unsupported provider/model (for new API during migration): {}", msg),
      Self::InvalidInput(msg) => write!(f, "Invalid input: {}", msg),
      Self::Provider(e) => write!(f, "Provider error: {}", e),
    }
@@ -1,5 +1,7 @@
 use std::error::Error;
 use std::fmt::{Display, Formatter};
+use tokens::tokens::characters::CharacterToken;
+use tokens::tokens::media_files::MediaFileToken;

 #[derive(Debug, Clone, Copy)]
 pub enum ClientType {
@@ -22,6 +24,9 @@ impl Display for ClientType {

 #[derive(Debug)]
 pub enum ClientError {
+  /// A RouterClient was required but not provided on the draft context.
+  RouterClientNotProvided,
+
  /// The requested client is not configured on the RouterClient.
  ClientNotConfigured(ClientType),

@@ -43,6 +48,18 @@ pub enum ClientError {

  /// Seedance2Pro only accepts URLs for media inputs, not media tokens.
  Seedance2ProOnlySupportsUrls,
+  
+  /// The pre-dispatch context of media file token to URL map was not supplied.
+  MediaFileToUrlMapNotProvided,
+
+  /// A media file token was not found in the provided media-file-to-URL map.
+  MediaFileTokenNotFoundInMap { token: MediaFileToken },
+
+  /// The pre-dispatch context of character token to ID map was not supplied.
+  CharacterTokenToKinoviCharacterIdNotProvided,
+
+  /// A character token was not found in the provided character-token-to-id map
+  CharacterTokenNotFoundInMap { token: CharacterToken },
 }

 impl Error for ClientError {}
@@ -50,6 +67,9 @@ impl Error for ClientError {}
 impl Display for ClientError {
  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
    match self {
+      Self::RouterClientNotProvided => {
+        write!(f, "A RouterClient is required but was not provided on the draft context")
+      }
      Self::ClientNotConfigured(client_type) => {
        write!(f, "{} client is not configured on the RouterClient", client_type)
      }
@@ -71,6 +91,18 @@ impl Display for ClientError {
      Self::Seedance2ProOnlySupportsUrls => {
        write!(f, "Seedance2Pro only supports URLs for media inputs; resolve media tokens to URLs before calling this provider")
      }
+      Self::MediaFileToUrlMapNotProvided => {
+        write!(f, "Media file to URL map was not provided")
+      }
+      Self::MediaFileTokenNotFoundInMap { token } => {
+        write!(f, "Media file token '{}' was not found in the provided URL map", token.as_str())
+      }
+      Self::CharacterTokenToKinoviCharacterIdNotProvided => {
+        write!(f, "Character token to Kinovi character ID map was not provided")
+      }
+      Self::CharacterTokenNotFoundInMap { token } => {
+        write!(f, "Character token '{}' was not found in the provided character-token-to-id map", token.as_str())
+      }
    }
  }
 }
@@ -4,7 +4,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_1_dev::PlanArtcraftFlux1Dev;

 pub(crate) fn estimate_image_cost_artcraft_flux_1_dev(
-  plan: &PlanArtcraftFlux1Dev<'_>,
+  plan: &PlanArtcraftFlux1Dev,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.02/image (2 cents). 1 credit = 1 USD cent.
  let cost_per_image: u64 = 2;
@@ -2,7 +2,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_1_schnell::PlanArtcraftFlux1Schnell;

 pub(crate) fn estimate_image_cost_artcraft_flux_1_schnell(
-  _plan: &PlanArtcraftFlux1Schnell<'_>,
+  _plan: &PlanArtcraftFlux1Schnell,
 ) -> ImageGenerationCostEstimate {
  // Pricing: not available
  ImageGenerationCostEstimate {
@@ -4,7 +4,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_2_lora_angles::PlanArtcraftFlux2LoraAngles;

 pub(crate) fn estimate_image_cost_artcraft_flux_2_lora_angles(
-  plan: &PlanArtcraftFlux2LoraAngles<'_>,
+  plan: &PlanArtcraftFlux2LoraAngles,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.04/image (4 cents). 1 credit = 1 USD cent.
  let cost_per_image: u64 = 4;
@@ -43,7 +43,7 @@ mod tests {
      model: CommonImageModel::Flux2LoraAngles,
      provider: Provider::Artcraft,
      prompt: None,
-      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      image_inputs: Some(ImageListRef::MediaFileTokens(tokens.clone())),
      resolution: None,
      aspect_ratio: None,
      quality: None,
@@ -4,7 +4,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_pro_1p1::PlanArtcraftFluxPro11;

 pub(crate) fn estimate_image_cost_artcraft_flux_pro_1p1(
-  plan: &PlanArtcraftFluxPro11<'_>,
+  plan: &PlanArtcraftFluxPro11,
 ) -> ImageGenerationCostEstimate {
  // Fal pricing: $0.04 per megapixel, billed by rounding up to the nearest
  // megapixel. The default image_size values are ~1MP, so 4 cents per image.
@@ -4,7 +4,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_pro_1p1_ultra::PlanArtcraftFluxPro11Ultra;

 pub(crate) fn estimate_image_cost_artcraft_flux_pro_1p1_ultra(
-  plan: &PlanArtcraftFluxPro11Ultra<'_>,
+  plan: &PlanArtcraftFluxPro11Ultra,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.06/image (6 cents). 1 credit = 1 USD cent.
  let cost_per_image: u64 = 6;
@@ -4,7 +4,7 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf
 };

 pub(crate) fn estimate_image_cost_artcraft_gpt_image_1(
-  plan: &PlanArtcraftGptImage1<'_>,
+  plan: &PlanArtcraftGptImage1,
 ) -> ImageGenerationCostEstimate {
  // Pricing per the fal-ai GPT Image 1 docs, adapted for our artcraft billing:
  //
@@ -62,7 +62,7 @@ mod tests {
  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
  use tokens::tokens::media_files::MediaFileToken;

-  fn base() -> GenerateImageRequest<'static> {
+  fn base() -> GenerateImageRequest {
    GenerateImageRequest {
      model: CommonImageModel::GptImage1,
      provider: Provider::Artcraft,
@@ -109,7 +109,7 @@ mod tests {
      quality,
      aspect_ratio,
      image_batch_count: Some(batch),
-      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      image_inputs: Some(ImageListRef::MediaFileTokens(tokens.clone())),
      ..base()
    };
    request.build().unwrap().estimate_costs()
@@ -7,7 +7,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_1p5::PlanArtcraftGptImage1p5;

 pub(crate) fn estimate_image_cost_artcraft_gpt_image_1p5(
-  plan: &PlanArtcraftGptImage1p5<'_>,
+  plan: &PlanArtcraftGptImage1p5,
 ) -> ImageGenerationCostEstimate {
  // Per fal docs (fal-ai/gpt-image-1.5 and fal-ai/gpt-image-1.5/edit):
  //
@@ -0,0 +1,210 @@
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_2::{
+  ArtcraftGptImage2ImageSize, ArtcraftGptImage2Quality, PlanArtcraftGptImage2,
+};
+
+pub(crate) fn estimate_image_cost_artcraft_gpt_image_2(
+  plan: &PlanArtcraftGptImage2,
+) -> ImageGenerationCostEstimate {
+  // Same cost table as the Fal GPT Image 2 estimator.
+  //
+  //   Output image cost (per output image), rounded up to whole cents:
+  //     Low:    all sizes                        →  1¢
+  //     Medium: landscape_4_3/portrait_4_3       →  4¢
+  //             landscape_16_9/portrait_16_9     →  4¢
+  //             square                           →  6¢
+  //             square_hd                        →  6¢
+  //     High:   landscape_4_3/portrait_4_3       → 15¢
+  //             landscape_16_9/portrait_16_9     → 16¢
+  //             square                           → 22¢
+  //             square_hd                        → 23¢
+  //
+  use ArtcraftGptImage2ImageSize as S;
+
+  let cost_per_image: u64 = match (plan.quality, plan.image_size) {
+    // Low quality
+    (ArtcraftGptImage2Quality::Low, _) => 1,
+
+    // Medium quality
+    (ArtcraftGptImage2Quality::Medium, None | Some(S::Square) | Some(S::SquareHd)) => 6,
+    (ArtcraftGptImage2Quality::Medium, Some(S::Landscape4x3) | Some(S::Portrait4x3)) => 4,
+    (ArtcraftGptImage2Quality::Medium, Some(S::Landscape16x9) | Some(S::Portrait16x9)) => 4,
+    (ArtcraftGptImage2Quality::Medium, Some(S::Auto)) => 6,
+
+    // High quality
+    (ArtcraftGptImage2Quality::High, None | Some(S::Square)) => 22,
+    (ArtcraftGptImage2Quality::High, Some(S::SquareHd)) => 23,
+    (ArtcraftGptImage2Quality::High, Some(S::Landscape4x3) | Some(S::Portrait4x3)) => 15,
+    (ArtcraftGptImage2Quality::High, Some(S::Landscape16x9) | Some(S::Portrait16x9)) => 16,
+    (ArtcraftGptImage2Quality::High, Some(S::Auto)) => 23,
+  };
+  let cost_in_usd_cents = cost_per_image * plan.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,
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_2::ArtcraftGptImage2NumImages;
+
+  fn plan(
+    quality: ArtcraftGptImage2Quality,
+    image_size: Option<ArtcraftGptImage2ImageSize>,
+    num_images: ArtcraftGptImage2NumImages,
+  ) -> PlanArtcraftGptImage2 {
+    PlanArtcraftGptImage2 {
+      prompt: Some("p".to_string()),
+      image_inputs: None,
+      image_size,
+      quality,
+      num_images,
+      idempotency_token: "test".to_string(),
+    }
+  }
+
+  fn cents(
+    quality: ArtcraftGptImage2Quality,
+    image_size: Option<ArtcraftGptImage2ImageSize>,
+    num_images: ArtcraftGptImage2NumImages,
+  ) -> u64 {
+    estimate_image_cost_artcraft_gpt_image_2(&plan(quality, image_size, num_images))
+      .cost_in_usd_cents.unwrap()
+  }
+
+  // -- Low quality (1c for all sizes) -------------------------------------------
+
+  #[test]
+  fn low_square() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Low, Some(ArtcraftGptImage2ImageSize::Square), ArtcraftGptImage2NumImages::One), 1);
+  }
+
+  #[test]
+  fn low_square_hd() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Low, Some(ArtcraftGptImage2ImageSize::SquareHd), ArtcraftGptImage2NumImages::One), 1);
+  }
+
+  #[test]
+  fn low_unset() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Low, None, ArtcraftGptImage2NumImages::One), 1);
+  }
+
+  #[test]
+  fn low_landscape_4x3() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Low, Some(ArtcraftGptImage2ImageSize::Landscape4x3), ArtcraftGptImage2NumImages::One), 1);
+  }
+
+  #[test]
+  fn low_four() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Low, None, ArtcraftGptImage2NumImages::Four), 4);
+  }
+
+  // -- Medium quality -----------------------------------------------------------
+
+  #[test]
+  fn medium_square() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Square), ArtcraftGptImage2NumImages::One), 6);
+  }
+
+  #[test]
+  fn medium_square_hd() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::SquareHd), ArtcraftGptImage2NumImages::One), 6);
+  }
+
+  #[test]
+  fn medium_unset() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, None, ArtcraftGptImage2NumImages::One), 6);
+  }
+
+  #[test]
+  fn medium_landscape_4x3() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Landscape4x3), ArtcraftGptImage2NumImages::One), 4);
+  }
+
+  #[test]
+  fn medium_portrait_4x3() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Portrait4x3), ArtcraftGptImage2NumImages::One), 4);
+  }
+
+  #[test]
+  fn medium_landscape_16x9() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Landscape16x9), ArtcraftGptImage2NumImages::One), 4);
+  }
+
+  #[test]
+  fn medium_portrait_16x9() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Portrait16x9), ArtcraftGptImage2NumImages::One), 4);
+  }
+
+  #[test]
+  fn medium_square_four() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Square), ArtcraftGptImage2NumImages::Four), 24);
+  }
+
+  // -- High quality -------------------------------------------------------------
+
+  #[test]
+  fn high_square() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Square), ArtcraftGptImage2NumImages::One), 22);
+  }
+
+  #[test]
+  fn high_square_hd() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::SquareHd), ArtcraftGptImage2NumImages::One), 23);
+  }
+
+  #[test]
+  fn high_unset() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::High, None, ArtcraftGptImage2NumImages::One), 22);
+  }
+
+  #[test]
+  fn high_landscape_4x3() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Landscape4x3), ArtcraftGptImage2NumImages::One), 15);
+  }
+
+  #[test]
+  fn high_portrait_4x3() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Portrait4x3), ArtcraftGptImage2NumImages::One), 15);
+  }
+
+  #[test]
+  fn high_landscape_16x9() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Landscape16x9), ArtcraftGptImage2NumImages::One), 16);
+  }
+
+  #[test]
+  fn high_portrait_16x9() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Portrait16x9), ArtcraftGptImage2NumImages::One), 16);
+  }
+
+  #[test]
+  fn high_square_four() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Square), ArtcraftGptImage2NumImages::Four), 88);
+  }
+
+  #[test]
+  fn high_square_hd_four() {
+    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::SquareHd), ArtcraftGptImage2NumImages::Four), 92);
+  }
+
+  // -- Metadata flags -----------------------------------------------------------
+
+  #[test]
+  fn metadata_flags_are_default() {
+    let estimate = estimate_image_cost_artcraft_gpt_image_2(&plan(
+      ArtcraftGptImage2Quality::Medium, None, ArtcraftGptImage2NumImages::One,
+    ));
+    assert!(!estimate.is_free);
+    assert!(!estimate.is_unlimited);
+    assert!(!estimate.is_rate_limited);
+    assert!(!estimate.has_watermark);
+  }
+}
@@ -4,7 +4,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana::PlanArtcraftNanaBanana;

 pub(crate) fn estimate_image_cost_artcraft_nano_banana(
-  plan: &PlanArtcraftNanaBanana<'_>,
+  plan: &PlanArtcraftNanaBanana,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.04/image (4 cents). 1 credit = 1 USD cent.
  let cost_per_image: u64 = 4;
@@ -6,7 +6,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_2::PlanArtcraftNanaBanana2;

 pub(crate) fn estimate_image_cost_artcraft_nano_banana_2(
-  plan: &PlanArtcraftNanaBanana2<'_>,
+  plan: &PlanArtcraftNanaBanana2,
 ) -> ImageGenerationCostEstimate {
  // Pricing (USD cents per image), scaled off the 1K base cost of $0.08:
  //   0.5K → $0.06 (0.75×)
@@ -6,7 +6,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_pro::PlanArtcraftNanaBananaPro;

 pub(crate) fn estimate_image_cost_artcraft_nano_banana_pro(
-  plan: &PlanArtcraftNanaBananaPro<'_>,
+  plan: &PlanArtcraftNanaBananaPro,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.15/image at 1K or 2K resolution, $0.30/image at 4K.
  // (Stored as USD cents.)
@@ -4,7 +4,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_qwen_edit_2511_angles::PlanArtcraftQwenEdit2511Angles;

 pub(crate) fn estimate_image_cost_artcraft_qwen_edit_2511_angles(
-  plan: &PlanArtcraftQwenEdit2511Angles<'_>,
+  plan: &PlanArtcraftQwenEdit2511Angles,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.04/image (4 cents). 1 credit = 1 USD cent.
  let cost_per_image: u64 = 4;
@@ -43,7 +43,7 @@ mod tests {
      model: CommonImageModel::QwenEdit2511Angles,
      provider: Provider::Artcraft,
      prompt: None,
-      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      image_inputs: Some(ImageListRef::MediaFileTokens(tokens.clone())),
      resolution: None,
      aspect_ratio: None,
      quality: None,
@@ -4,7 +4,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_4::PlanArtcraftSeedream4;

 pub(crate) fn estimate_image_cost_artcraft_seedream_4(
-  plan: &PlanArtcraftSeedream4<'_>,
+  plan: &PlanArtcraftSeedream4,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.03/image (3 cents). 1 credit = 1 USD cent.
  let cost_per_image: u64 = 3;
@@ -4,7 +4,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_4p5::PlanArtcraftSeedream4p5;

 pub(crate) fn estimate_image_cost_artcraft_seedream_4p5(
-  plan: &PlanArtcraftSeedream4p5<'_>,
+  plan: &PlanArtcraftSeedream4p5,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.04/image (4 cents). 1 credit = 1 USD cent.
  let cost_per_image: u64 = 4;
@@ -4,7 +4,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_5_lite::PlanArtcraftSeedream5Lite;

 pub(crate) fn estimate_image_cost_artcraft_seedream_5_lite(
-  plan: &PlanArtcraftSeedream5Lite<'_>,
+  plan: &PlanArtcraftSeedream5Lite,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.04/image (4 cents). 1 credit = 1 USD cent.
  let cost_per_image: u64 = 4;
@@ -4,6 +4,7 @@ pub mod estimate_image_cost_artcraft_flux_pro_1p1;
 pub mod estimate_image_cost_artcraft_flux_pro_1p1_ultra;
 pub mod estimate_image_cost_artcraft_gpt_image_1;
 pub mod estimate_image_cost_artcraft_gpt_image_1p5;
+pub mod estimate_image_cost_artcraft_gpt_image_2;
 pub mod estimate_image_cost_artcraft_nano_banana;
 pub mod estimate_image_cost_artcraft_nano_banana_2;
 pub mod estimate_image_cost_artcraft_nano_banana_pro;
@@ -2,7 +2,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_dev::PlanFalFlux1Dev;

 pub(crate) fn estimate_image_cost_fal_flux_1_dev(
-  plan: &PlanFalFlux1Dev<'_>,
+  plan: &PlanFalFlux1Dev,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.025 per megapixel, billed by rounding up to nearest megapixel.
  // Default image sizes are ~1MP (1024x1024), so ~$0.025/image = 3 cents rounded up.
@@ -2,7 +2,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_schnell::PlanFalFlux1Schnell;

 pub(crate) fn estimate_image_cost_fal_flux_1_schnell(
-  plan: &PlanFalFlux1Schnell<'_>,
+  plan: &PlanFalFlux1Schnell,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.003 per megapixel, billed by rounding up to nearest megapixel.
  // Default image sizes are ~1MP (1024x1024), so ~$0.003/image = 1 cent rounded up.
@@ -2,7 +2,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1::PlanFalFluxPro11;

 pub(crate) fn estimate_image_cost_fal_flux_pro_1p1(
-  plan: &PlanFalFluxPro11<'_>,
+  plan: &PlanFalFluxPro11,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.04 per megapixel, billed by rounding up to nearest megapixel.
  // Default image sizes are ~1MP (1024x1024), so ~$0.04/image = 4 cents.
@@ -2,7 +2,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::PlanFalFluxPro11Ultra;

 pub(crate) fn estimate_image_cost_fal_flux_pro_1p1_ultra(
-  plan: &PlanFalFluxPro11Ultra<'_>,
+  plan: &PlanFalFluxPro11Ultra,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.06 per image.
  let cost_per_image: u64 = 6;
@@ -4,7 +4,7 @@ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_imag
 };

 pub(crate) fn estimate_image_cost_fal_gpt_image_1(
-  plan: &PlanFalGptImage1<'_>,
+  plan: &PlanFalGptImage1,
 ) -> ImageGenerationCostEstimate {
  // Per fal docs (fal-ai/gpt-image-1/{text-to-image,edit-image}):
  //
@@ -59,9 +59,9 @@ mod tests {
    quality: FalGptImage1Quality,
    image_size: Option<FalGptImage1ImageSize>,
    num_images: FalGptImage1NumImages,
-  ) -> PlanFalGptImage1<'static> {
+  ) -> PlanFalGptImage1 {
    PlanFalGptImage1 {
-      prompt: Some("p"),
+      prompt: Some("p".to_string()),
      image_urls: vec![],
      image_size,
      quality,
@@ -74,12 +74,12 @@ mod tests {
    image_size: Option<FalGptImage1ImageSize>,
    num_images: FalGptImage1NumImages,
    num_input_images: usize,
-  ) -> PlanFalGptImage1<'static> {
+  ) -> PlanFalGptImage1 {
    let image_urls = (0..num_input_images)
      .map(|i| format!("https://fake.example.com/img{}.png", i))
      .collect();
    PlanFalGptImage1 {
-      prompt: Some("p"),
+      prompt: Some("p".to_string()),
      image_urls,
      image_size,
      quality,
@@ -4,7 +4,7 @@ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_imag
 };

 pub(crate) fn estimate_image_cost_fal_gpt_image_1p5(
-  plan: &PlanFalGptImage1p5<'_>,
+  plan: &PlanFalGptImage1p5,
 ) -> ImageGenerationCostEstimate {
  // Per fal docs (fal-ai/gpt-image-1.5 and fal-ai/gpt-image-1.5/edit):
  //
@@ -50,9 +50,9 @@ mod tests {
    quality: FalGptImage1p5Quality,
    image_size: Option<FalGptImage1p5ImageSize>,
    num_images: FalGptImage1p5NumImages,
-  ) -> PlanFalGptImage1p5<'static> {
+  ) -> PlanFalGptImage1p5 {
    PlanFalGptImage1p5 {
-      prompt: Some("p"),
+      prompt: Some("p".to_string()),
      image_urls: vec![],
      image_size,
      quality,
@@ -0,0 +1,209 @@
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_2::{
+  FalGptImage2ImageSize, FalGptImage2Quality, PlanFalGptImage2,
+};
+
+pub(crate) fn estimate_image_cost_fal_gpt_image_2(
+  plan: &PlanFalGptImage2,
+) -> ImageGenerationCostEstimate {
+  // Per fal docs (fal-ai/gpt-image-2 and fal-ai/gpt-image-2/edit):
+  //
+  //   Output image cost (per output image), rounded up to whole cents:
+  //     Low:    all sizes                        →  1¢
+  //     Medium: landscape_4_3/portrait_4_3       →  4¢
+  //             landscape_16_9/portrait_16_9     →  4¢
+  //             square                           →  6¢
+  //             square_hd                        →  6¢
+  //     High:   landscape_4_3/portrait_4_3       → 15¢
+  //             landscape_16_9/portrait_16_9     → 16¢
+  //             square                           → 22¢
+  //             square_hd                        → 23¢
+  //
+  use FalGptImage2ImageSize as S;
+
+  let cost_per_image: u64 = match (plan.quality, plan.image_size) {
+    // Low quality
+    (FalGptImage2Quality::Low, _) => 1,
+
+    // Medium quality
+    (FalGptImage2Quality::Medium, None | Some(S::Square) | Some(S::SquareHd)) => 6,
+    (FalGptImage2Quality::Medium, Some(S::Landscape4x3) | Some(S::Portrait4x3)) => 4,
+    (FalGptImage2Quality::Medium, Some(S::Landscape16x9) | Some(S::Portrait16x9)) => 4,
+    (FalGptImage2Quality::Medium, Some(S::Auto)) => 6, // TODO: Not checked
+
+    // High quality
+    (FalGptImage2Quality::High, None | Some(S::Square)) => 22,
+    (FalGptImage2Quality::High, Some(S::SquareHd)) => 23,
+    (FalGptImage2Quality::High, Some(S::Landscape4x3) | Some(S::Portrait4x3)) => 15,
+    (FalGptImage2Quality::High, Some(S::Landscape16x9) | Some(S::Portrait16x9)) => 16,
+    (FalGptImage2Quality::High, Some(S::Auto)) => 23, // TODO: Not checked
+  };
+  let cost_in_usd_cents = cost_per_image * plan.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,
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_2::FalGptImage2NumImages;
+
+  fn plan(
+    quality: FalGptImage2Quality,
+    image_size: Option<FalGptImage2ImageSize>,
+    num_images: FalGptImage2NumImages,
+  ) -> PlanFalGptImage2 {
+    PlanFalGptImage2 {
+      prompt: Some("p".to_string()),
+      image_urls: vec![],
+      image_size,
+      quality,
+      num_images,
+    }
+  }
+
+  fn cents(
+    quality: FalGptImage2Quality,
+    image_size: Option<FalGptImage2ImageSize>,
+    num_images: FalGptImage2NumImages,
+  ) -> u64 {
+    estimate_image_cost_fal_gpt_image_2(&plan(quality, image_size, num_images))
+      .cost_in_usd_cents.unwrap()
+  }
+
+  // -- Low quality (1c for all sizes) -------------------------------------------
+
+  #[test]
+  fn low_square() {
+    assert_eq!(cents(FalGptImage2Quality::Low, Some(FalGptImage2ImageSize::Square), FalGptImage2NumImages::One), 1);
+  }
+
+  #[test]
+  fn low_square_hd() {
+    assert_eq!(cents(FalGptImage2Quality::Low, Some(FalGptImage2ImageSize::SquareHd), FalGptImage2NumImages::One), 1);
+  }
+
+  #[test]
+  fn low_unset() {
+    assert_eq!(cents(FalGptImage2Quality::Low, None, FalGptImage2NumImages::One), 1);
+  }
+
+  #[test]
+  fn low_landscape_4x3() {
+    assert_eq!(cents(FalGptImage2Quality::Low, Some(FalGptImage2ImageSize::Landscape4x3), FalGptImage2NumImages::One), 1);
+  }
+
+  #[test]
+  fn low_four() {
+    assert_eq!(cents(FalGptImage2Quality::Low, None, FalGptImage2NumImages::Four), 4);
+  }
+
+  // -- Medium quality -----------------------------------------------------------
+
+  #[test]
+  fn medium_square() {
+    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Square), FalGptImage2NumImages::One), 6);
+  }
+
+  #[test]
+  fn medium_square_hd() {
+    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::SquareHd), FalGptImage2NumImages::One), 6);
+  }
+
+  #[test]
+  fn medium_unset() {
+    assert_eq!(cents(FalGptImage2Quality::Medium, None, FalGptImage2NumImages::One), 6);
+  }
+
+  #[test]
+  fn medium_landscape_4x3() {
+    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Landscape4x3), FalGptImage2NumImages::One), 4);
+  }
+
+  #[test]
+  fn medium_portrait_4x3() {
+    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Portrait4x3), FalGptImage2NumImages::One), 4);
+  }
+
+  #[test]
+  fn medium_landscape_16x9() {
+    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Landscape16x9), FalGptImage2NumImages::One), 4);
+  }
+
+  #[test]
+  fn medium_portrait_16x9() {
+    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Portrait16x9), FalGptImage2NumImages::One), 4);
+  }
+
+  #[test]
+  fn medium_square_four() {
+    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Square), FalGptImage2NumImages::Four), 24);
+  }
+
+  // -- High quality -------------------------------------------------------------
+
+  #[test]
+  fn high_square() {
+    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Square), FalGptImage2NumImages::One), 22);
+  }
+
+  #[test]
+  fn high_square_hd() {
+    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::SquareHd), FalGptImage2NumImages::One), 23);
+  }
+
+  #[test]
+  fn high_unset() {
+    assert_eq!(cents(FalGptImage2Quality::High, None, FalGptImage2NumImages::One), 22);
+  }
+
+  #[test]
+  fn high_landscape_4x3() {
+    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Landscape4x3), FalGptImage2NumImages::One), 15);
+  }
+
+  #[test]
+  fn high_portrait_4x3() {
+    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Portrait4x3), FalGptImage2NumImages::One), 15);
+  }
+
+  #[test]
+  fn high_landscape_16x9() {
+    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Landscape16x9), FalGptImage2NumImages::One), 16);
+  }
+
+  #[test]
+  fn high_portrait_16x9() {
+    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Portrait16x9), FalGptImage2NumImages::One), 16);
+  }
+
+  #[test]
+  fn high_square_four() {
+    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Square), FalGptImage2NumImages::Four), 88);
+  }
+
+  #[test]
+  fn high_square_hd_four() {
+    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::SquareHd), FalGptImage2NumImages::Four), 92);
+  }
+
+  // -- Metadata flags -----------------------------------------------------------
+
+  #[test]
+  fn metadata_flags_are_default() {
+    let estimate = estimate_image_cost_fal_gpt_image_2(&plan(
+      FalGptImage2Quality::Medium, None, FalGptImage2NumImages::One,
+    ));
+    assert!(!estimate.is_free);
+    assert!(!estimate.is_unlimited);
+    assert!(!estimate.is_rate_limited);
+    assert!(!estimate.has_watermark);
+  }
+}
@@ -4,7 +4,7 @@ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_ban
 };

 pub(crate) fn estimate_image_cost_fal_nano_banana(
-  plan: &PlanFalNanoBanana<'_>,
+  plan: &PlanFalNanoBanana,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.039/image (no resolution multiplier — Gemini 25 Flash has no resolution option).
  // Rounded to 4 cents per image.
@@ -4,7 +4,7 @@ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_ban
 };

 pub(crate) fn estimate_image_cost_fal_nano_banana_2(
-  plan: &PlanFalNanaBanana2<'_>,
+  plan: &PlanFalNanaBanana2,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.08/image base (1K). Multipliers: 0.5K = 0.75x, 2K = 1.5x, 4K = 2x.
  // (Stored as USD cents.)
@@ -4,7 +4,7 @@ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_ban
 };

 pub(crate) fn estimate_image_cost_fal_nano_banana_pro(
-  plan: &PlanFalNanaBananaPro<'_>,
+  plan: &PlanFalNanaBananaPro,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.15/image at 1K or 2K resolution, $0.30/image at 4K.
  // (Stored as USD cents.)
@@ -2,7 +2,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4::PlanFalSeedream4;

 pub(crate) fn estimate_image_cost_fal_seedream_4(
-  plan: &PlanFalSeedream4<'_>,
+  plan: &PlanFalSeedream4,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.03 per image.
  let cost_per_image: u64 = 3;
@@ -2,7 +2,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4p5::PlanFalSeedream4p5;

 pub(crate) fn estimate_image_cost_fal_seedream_4p5(
-  plan: &PlanFalSeedream4p5<'_>,
+  plan: &PlanFalSeedream4p5,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.04 per image.
  let cost_per_image: u64 = 4;
@@ -2,7 +2,7 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenera
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_5_lite::PlanFalSeedream5Lite;

 pub(crate) fn estimate_image_cost_fal_seedream_5_lite(
-  plan: &PlanFalSeedream5Lite<'_>,
+  plan: &PlanFalSeedream5Lite,
 ) -> ImageGenerationCostEstimate {
  // Pricing: $0.035 per image — round up to 4 cents.
  let cost_per_image: u64 = 4;
@@ -4,6 +4,7 @@ pub(crate) mod estimate_image_cost_fal_flux_pro_1p1;
 pub(crate) mod estimate_image_cost_fal_flux_pro_1p1_ultra;
 pub(crate) mod estimate_image_cost_fal_gpt_image_1;
 pub(crate) mod estimate_image_cost_fal_gpt_image_1p5;
+pub(crate) mod estimate_image_cost_fal_gpt_image_2;
 pub(crate) mod estimate_image_cost_fal_seedream_4;
 pub(crate) mod estimate_image_cost_fal_seedream_4p5;
 pub(crate) mod estimate_image_cost_fal_seedream_5_lite;
@@ -9,12 +9,12 @@ use artcraft_api_defs::generate::image::text::generate_flux_1_dev_text_to_image:
 use artcraft_client::endpoints::generate::image::text::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;

 pub async fn execute_artcraft_flux_1_dev(
-  plan: &PlanArtcraftFlux1Dev<'_>,
+  plan: &PlanArtcraftFlux1Dev,
  artcraft_client: &RouterArtcraftClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
  let request = GenerateFlux1DevTextToImageRequest {
    uuid_idempotency_token: plan.idempotency_token.clone(),
-    prompt: plan.prompt.map(|p| p.to_string()),
+    prompt: plan.prompt.clone(),
    aspect_ratio: plan.aspect_ratio,
    num_images: Some(plan.num_images),
  };
@@ -49,7 +49,7 @@ mod tests {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
      quality: None,
      image_batch_count: Some(1),
-      prompt: Some("a cat walking through a cyberpunk city at night"),
+      prompt: Some("a cat walking through a cyberpunk city at night".to_string()),
      ..base_flux_1_dev_image_request()
    };

@@ -72,7 +72,7 @@ mod tests {
      aspect_ratio: Some(CommonAspectRatio::Square),
      quality: None,
      image_batch_count: Some(4),
-      prompt: Some("a dog surfing a wave, cinematic"),
+      prompt: Some("a dog surfing a wave, cinematic".to_string()),
      ..base_flux_1_dev_image_request()
    };

@@ -98,7 +98,7 @@ mod tests {
        aspect_ratio: Some(ar),
        quality: None,
        image_batch_count: Some(1),
-        prompt: Some("a bear walking through an abandoned desert city at night"),
+        prompt: Some("a bear walking through an abandoned desert city at night".to_string()),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
        ..base_flux_1_dev_image_request()
      };
@@ -9,12 +9,12 @@ use artcraft_api_defs::generate::image::text::generate_flux_1_schnell_text_to_im
 use artcraft_client::endpoints::generate::image::text::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;

 pub async fn execute_artcraft_flux_1_schnell(
-  plan: &PlanArtcraftFlux1Schnell<'_>,
+  plan: &PlanArtcraftFlux1Schnell,
  artcraft_client: &RouterArtcraftClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
  let request = GenerateFlux1SchnellTextToImageRequest {
    uuid_idempotency_token: plan.idempotency_token.clone(),
-    prompt: plan.prompt.map(|p| p.to_string()),
+    prompt: plan.prompt.clone(),
    aspect_ratio: plan.aspect_ratio,
    num_images: Some(plan.num_images),
  };
@@ -48,7 +48,7 @@ mod tests {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
      quality: None,
      image_batch_count: Some(1),
-      prompt: Some("a man and woman walking through a cyberpunk city at night"),
+      prompt: Some("a man and woman walking through a cyberpunk city at night".to_string()),
      ..base_flux_1_schnell_image_request()
    };

@@ -71,7 +71,7 @@ mod tests {
      aspect_ratio: Some(CommonAspectRatio::Square),
      quality: None,
      image_batch_count: Some(4),
-      prompt: Some("a dog surfing a wave, cinematic"),
+      prompt: Some("a dog surfing a wave, cinematic".to_string()),
      ..base_flux_1_schnell_image_request()
    };

@@ -97,7 +97,7 @@ mod tests {
        aspect_ratio: Some(ar),
        quality: None,
        image_batch_count: Some(1),
-        prompt: Some("a man and woman walking through a futuristic city at evening"),
+        prompt: Some("a man and woman walking through a futuristic city at evening".to_string()),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
        ..base_flux_1_schnell_image_request()
      };
@@ -9,7 +9,7 @@ use artcraft_api_defs::generate::image::angle::flux_2_lora_edit_image_angle::Flu
 use artcraft_client::endpoints::generate::image::angle::flux_2_lora_edit_image_angle::flux_2_lora_edit_image_angle;

 pub async fn execute_artcraft_flux_2_lora_angles(
-  plan: &PlanArtcraftFlux2LoraAngles<'_>,
+  plan: &PlanArtcraftFlux2LoraAngles,
  artcraft_client: &RouterArtcraftClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
  let request = Flux2LoraEditImageAngleRequest {
@@ -53,7 +53,7 @@ mod tests {
      aspect_ratio: Some(CommonAspectRatio::SquareHd),
      quality: None,
      image_batch_count: Some(1),
-      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      image_inputs: Some(ImageListRef::MediaFileTokens(tokens.clone())),
      horizontal_angle: Some(30.0),
      vertical_angle: Some(0.0),
      zoom: Some(1.0),
@@ -9,12 +9,12 @@ use artcraft_api_defs::generate::image::text::generate_flux_pro_11_text_to_image
 use artcraft_client::endpoints::generate::image::text::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;

 pub async fn execute_artcraft_flux_pro_1p1(
-  plan: &PlanArtcraftFluxPro11<'_>,
+  plan: &PlanArtcraftFluxPro11,
  artcraft_client: &RouterArtcraftClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
  let request = GenerateFluxPro11TextToImageRequest {
    uuid_idempotency_token: plan.idempotency_token.clone(),
-    prompt: plan.prompt.map(|p| p.to_string()),
+    prompt: plan.prompt.clone(),
    aspect_ratio: plan.aspect_ratio,
    num_images: Some(plan.num_images),
  };
@@ -49,7 +49,7 @@ mod tests {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
      quality: None,
      image_batch_count: Some(1),
-      prompt: Some("a cat walking through a cyberpunk city at night"),
+      prompt: Some("a cat walking through a cyberpunk city at night".to_string()),
      ..base_flux_pro_1p1_image_request()
    };

@@ -72,7 +72,7 @@ mod tests {
      aspect_ratio: Some(CommonAspectRatio::Square),
      quality: None,
      image_batch_count: Some(4),
-      prompt: Some("a dog surfing a wave, cinematic"),
+      prompt: Some("a dog surfing a wave, cinematic".to_string()),
      ..base_flux_pro_1p1_image_request()
    };

@@ -98,7 +98,7 @@ mod tests {
        aspect_ratio: Some(ar),
        quality: None,
        image_batch_count: Some(1),
-        prompt: Some("a bear walking through an abandoned desert city at night"),
+        prompt: Some("a bear walking through an abandoned desert city at night".to_string()),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
        ..base_flux_pro_1p1_image_request()
      };
@@ -9,12 +9,12 @@ use artcraft_api_defs::generate::image::text::generate_flux_pro_11_ultra_text_to
 use artcraft_client::endpoints::generate::image::text::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;

 pub async fn execute_artcraft_flux_pro_1p1_ultra(
-  plan: &PlanArtcraftFluxPro11Ultra<'_>,
+  plan: &PlanArtcraftFluxPro11Ultra,
  artcraft_client: &RouterArtcraftClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
  let request = GenerateFluxPro11UltraTextToImageRequest {
    uuid_idempotency_token: plan.idempotency_token.clone(),
-    prompt: plan.prompt.map(|p| p.to_string()),
+    prompt: plan.prompt.clone(),
    aspect_ratio: plan.aspect_ratio,
    num_images: Some(plan.num_images),
  };
@@ -49,7 +49,7 @@ mod tests {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
      quality: None,
      image_batch_count: Some(1),
-      prompt: Some("a cat walking through a cyberpunk city at night"),
+      prompt: Some("a cat walking through a cyberpunk city at night".to_string()),
      ..base_flux_pro_1p1_ultra_image_request()
    };

@@ -72,7 +72,7 @@ mod tests {
      aspect_ratio: Some(CommonAspectRatio::Square),
      quality: None,
      image_batch_count: Some(4),
-      prompt: Some("a dog surfing a wave, cinematic"),
+      prompt: Some("a dog surfing a wave, cinematic".to_string()),
      ..base_flux_pro_1p1_ultra_image_request()
    };

@@ -98,7 +98,7 @@ mod tests {
        aspect_ratio: Some(ar),
        quality: None,
        image_batch_count: Some(1),
-        prompt: Some("a t-rex walking through an abandoned desert city at night"),
+        prompt: Some("a t-rex walking through an abandoned desert city at night".to_string()),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
        ..base_flux_pro_1p1_ultra_image_request()
      };
@@ -14,14 +14,14 @@ use artcraft_client::endpoints::generate::image::text::generate_gpt_image_1_text
 /// text-to-image, one for image-edit), so we dispatch on whether image refs
 /// are present rather than calling a single multi-function endpoint.
 pub async fn execute_artcraft_gpt_image_1(
-  plan: &PlanArtcraftGptImage1<'_>,
+  plan: &PlanArtcraftGptImage1,
  artcraft_client: &RouterArtcraftClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let inference_job_token = match plan.image_inputs {
+  let inference_job_token = match plan.image_inputs.clone() {
    Some(image_inputs) => {
      let request = GptImage1EditImageRequest {
        uuid_idempotency_token: plan.idempotency_token.clone(),
-        prompt: plan.prompt.map(|p| p.to_string()),
+        prompt: plan.prompt.clone(),
        image_media_tokens: Some(image_inputs.to_owned()),
        image_size: plan.image_size.map(|s| s.to_edit()),
        num_images: Some(plan.num_images.to_edit()),
@@ -39,7 +39,7 @@ pub async fn execute_artcraft_gpt_image_1(
    None => {
      let request = GenerateGptImage1TextToImageRequest {
        uuid_idempotency_token: plan.idempotency_token.clone(),
-        prompt: plan.prompt.map(|p| p.to_string()),
+        prompt: plan.prompt.clone(),
        image_size: plan.image_size.map(|s| s.to_t2i()),
        num_images: Some(plan.num_images.to_t2i()),
        image_quality: Some(plan.quality.to_t2i()),
@@ -89,7 +89,7 @@ mod tests {
  fn build_edit_image_plan_smoke() {
    let tokens = vec![MediaFileToken::new_from_str("mf_test00000000000000000000000000")];
    let request = GenerateImageRequest {
-      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      image_inputs: Some(ImageListRef::MediaFileTokens(tokens.clone())),
      ..base_gpt_image_1_image_request()
    };
    let plan = request.build().expect("plan should build");
@@ -106,7 +106,7 @@ mod tests {
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
      image_batch_count: Some(1),
-      prompt: Some("a horse walking through a cyberpunk city at night"),
+      prompt: Some("a horse walking through a cyberpunk city at night".to_string()),
      ..base_gpt_image_1_image_request()
    };

@@ -129,8 +129,8 @@ mod tests {
    ];

    let request = GenerateImageRequest {
-      prompt: Some("Change the background to a desert with cacti"),
-      image_inputs: Some(ImageListRef::MediaFileTokens(&image_tokens)),
+      prompt: Some("Change the background to a desert with cacti".to_string()),
+      image_inputs: Some(ImageListRef::MediaFileTokens(image_tokens.clone())),
      aspect_ratio: Some(CommonAspectRatio::Square),
      image_batch_count: Some(1),
      ..base_gpt_image_1_image_request()
@@ -9,13 +9,13 @@ use artcraft_api_defs::generate::image::multi_function::gpt_image_1p5_multi_func
 use artcraft_client::endpoints::generate::image::multi_function::gpt_image_1p5_multi_function_image_gen_image::gpt_image_1p5_multi_function_image_gen;

 pub async fn execute_artcraft_gpt_image_1p5(
-  plan: &PlanArtcraftGptImage1p5<'_>,
+  plan: &PlanArtcraftGptImage1p5,
  artcraft_client: &RouterArtcraftClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
  let request = GptImage1p5MultiFunctionImageGenRequest {
    uuid_idempotency_token: plan.idempotency_token.clone(),
-    prompt: plan.prompt.map(|p| p.to_string()),
-    image_media_tokens: plan.image_inputs.map(|tokens| tokens.to_owned()),
+    prompt: plan.prompt.clone(),
+    image_media_tokens: plan.image_inputs.clone(),
    mask_image_token: None,
    num_images: Some(plan.num_images),
    image_size: plan.image_size,
@@ -56,7 +56,7 @@ mod tests {
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
      image_batch_count: Some(1),
-      prompt: Some("a horse walking through a cyberpunk city at night"),
+      prompt: Some("a horse walking through a cyberpunk city at night".to_string()),
      ..base_gpt_image_1p5_image_request()
    };

@@ -81,8 +81,8 @@ mod tests {
    ];

    let request = GenerateImageRequest {
-      prompt: Some("Change the background to a desert with cacti"),
-      image_inputs: Some(ImageListRef::MediaFileTokens(&image_tokens)),
+      prompt: Some("Change the background to a desert with cacti".to_string()),
+      image_inputs: Some(ImageListRef::MediaFileTokens(image_tokens.clone())),
      aspect_ratio: Some(CommonAspectRatio::Auto),
      image_batch_count: Some(1),
      ..base_gpt_image_1p5_image_request()
@@ -109,7 +109,7 @@ mod tests {
      let request = GenerateImageRequest {
        aspect_ratio: Some(ar),
        image_batch_count: Some(1),
-        prompt: Some("a bear walking through a abandoned desert city at night"),
+        prompt: Some("a bear walking through a abandoned desert city at night".to_string()),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
        ..base_gpt_image_1p5_image_request()
      };
@@ -140,8 +140,8 @@ mod tests {
    for ar in CommonAspectRatio::iter() {
      println!("--- image-edit aspect ratio: {:?} ---", ar);
      let request = GenerateImageRequest {
-        prompt: Some("Change the background to an alien world"),
-        image_inputs: Some(ImageListRef::MediaFileTokens(&image_tokens)),
+        prompt: Some("Change the background to an alien world".to_string()),
+        image_inputs: Some(ImageListRef::MediaFileTokens(image_tokens.clone())),
        aspect_ratio: Some(ar),
        image_batch_count: Some(1),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
@@ -0,0 +1,145 @@
+use crate::client::router_artcraft_client::RouterArtcraftClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::provider_error::ProviderError;
+use crate::generate::generate_image::generate_image_response::{
+  ArtcraftImageResponsePayload, GenerateImageResponse,
+};
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_2::PlanArtcraftGptImage2;
+use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost_and_generate_request::OmniGenImageCostAndGenerateRequest;
+use artcraft_client::endpoints::omni_gen::generate::image::omni_gen_image::omni_gen_image_generate;
+use enums::common::generation::common_image_model::CommonImageModel;
+
+/// Execute GPT Image 2 via the Artcraft omni-gen image endpoint.
+pub async fn execute_artcraft_gpt_image_2(
+  plan: &PlanArtcraftGptImage2,
+  artcraft_client: &RouterArtcraftClient,
+) -> Result<GenerateImageResponse, ArtcraftRouterError> {
+  let request = OmniGenImageCostAndGenerateRequest {
+    idempotency_token: Some(plan.idempotency_token.clone()),
+    model: Some(CommonImageModel::GptImage2),
+    prompt: plan.prompt.clone(),
+    image_media_tokens: plan.image_inputs.clone(),
+    resolution: None,
+    aspect_ratio: plan.aspect_ratio_enum(),
+    quality: Some(plan.quality_enum()),
+    image_batch_count: Some(plan.num_images_u16()),
+    adjust_horizontal_angle: None,
+    adjust_vertical_angle: None,
+    adjust_zoom: None,
+  };
+
+  let response = omni_gen_image_generate(
+    &artcraft_client.api_host,
+    Some(&artcraft_client.credentials),
+    request,
+  )
+    .await
+    .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Storyteller(err)))?;
+
+  Ok(GenerateImageResponse::Artcraft(ArtcraftImageResponsePayload {
+    inference_job_token: response.inference_job_token,
+  }))
+}
+
+#[cfg(test)]
+mod tests {
+  use artcraft_client::utils::api_host::ApiHost;
+  use crate::api::common_aspect_ratio::CommonAspectRatio;
+  use crate::api::common_quality::CommonQuality;
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
+  use crate::test_helpers::{get_artcraft_client, get_artcraft_client_for_env};
+  use tokens::tokens::media_files::MediaFileToken;
+
+  fn base_gpt_image_2_request() -> GenerateImageRequest {
+    GenerateImageRequest {
+      model: crate::api::common_image_model::CommonImageModel::GptImage2,
+      provider: crate::api::provider::Provider::Artcraft,
+      prompt: Some("a t-rex walking through a cyberpunk city at night".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+    }
+  }
+
+  #[tokio::test]
+  #[ignore] // manually run — fires a real API request and incurs cost
+  async fn test_text_to_image_gpt_image_2() {
+    let client = get_artcraft_client_for_env(ApiHost::Localhost { port: 12345 });
+    let request = GenerateImageRequest {
+      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
+      image_batch_count: Some(1),
+      ..base_gpt_image_2_request()
+    };
+
+    let plan = request.build().unwrap();
+    let result = plan.generate_image(&client).await;
+
+    println!("Result: {:?}", result);
+    let response = result.expect("generate_image request failed");
+    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
+    println!("Job token: {:?}", payload.inference_job_token);
+
+    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
+  }
+
+  #[tokio::test]
+  #[ignore] // manually run — fires a real API request and incurs cost
+  async fn test_edit_image_gpt_image_2() {
+    let client = get_artcraft_client();
+
+    let image_tokens = vec![
+      MediaFileToken::new_from_str("m_r45apt2swza6wp8j2z10237t92kkr8"),
+    ];
+
+    let request = GenerateImageRequest {
+      prompt: Some("Change the background to a desert with cacti".to_string()),
+      image_inputs: Some(ImageListRef::MediaFileTokens(image_tokens)),
+      aspect_ratio: Some(CommonAspectRatio::Auto),
+      image_batch_count: Some(1),
+      ..base_gpt_image_2_request()
+    };
+
+    let plan = request.build().unwrap();
+    let result = plan.generate_image(&client).await;
+
+    println!("Result: {:?}", result);
+    let response = result.expect("generate_image request failed");
+    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
+    println!("Job token: {:?}", payload.inference_job_token);
+
+    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
+  }
+
+  #[tokio::test]
+  #[ignore] // manually run — fires a real API request and incurs cost
+  async fn test_text_to_image_gpt_image_2_high_quality() {
+    let client = get_artcraft_client();
+    let request = GenerateImageRequest {
+      aspect_ratio: Some(CommonAspectRatio::Square),
+      quality: Some(CommonQuality::High),
+      image_batch_count: Some(1),
+      ..base_gpt_image_2_request()
+    };
+
+    let plan = request.build().unwrap();
+    let result = plan.generate_image(&client).await;
+
+    println!("Result: {:?}", result);
+    let response = result.expect("generate_image request failed");
+    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
+    println!("Job token: {:?}", payload.inference_job_token);
+
+    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
BFlat	aa5fad440f	reuse gallery modal for the artcraft website and app styling aligned	2026-04-22 17:10:17 +07:00
Brandon Thomas	bc226fb361	omni gpt image 2 (#1414 ) this will enable it in storyteller-web	2026-04-22 01:11:42 -04:00
Brandon Thomas	7817f3af70	fal gpt image 2 (#1413 )	2026-04-21 21:53:14 -04:00
Brandon Thomas	cf1f4eb8c8	gpt image 2 enum (#1412 )	2026-04-21 21:08:28 -04:00
Brandon Thomas	2e6ccf0d00	artcraft v2 router for seedance 2.0 (non-fast) (#1411 )	2026-04-21 20:32:41 -04:00
Brandon Thomas	a560541b62	import cleanup	2026-04-21 18:43:20 -04:00
Brandon Thomas	df4e300119	artcraft_router v2 kinovi seedance 2 fast (#1410 )	2026-04-21 18:34:49 -04:00
Brandon Thomas	9bd3726d7a	artcraft router redesign (#1409 )	2026-04-21 17:45:54 -04:00
BFlat	fc0f4b7f5c	fix: prevent character mention from matching wrong character	2026-04-21 23:20:00 +07:00
Brandon Thomas	94fdd6cb72	rename struct to better enable a state machine flow (#1406 )	2026-04-20 18:14:24 -04:00
BFlat	0d235bfe27	gallery card action buttons (#1405 ) - Quick actions on gallery cards: Recreate, Share, and Download buttons now appear on hover directly on every image/video card, so users can act on content without opening the lightbox first. - Media type and model badges are larger and restyled for better readability on thumbnails. - The library page now uses the same card component as the generation gallery, so any future card improvements land everywhere at once. - Library grid tightened from up to 6 columns to a cleaner max of 5 per row. - Removed the dotted background on the library page so skeletons and cards sit on a solid surface.	2026-04-20 23:58:24 +07:00
BFlat	6883b64276	website: unified lightbox, recreate, desktop CTA, prompt fixes (#1404 ) ## Artcraft website: unified lightbox, recreate, desktop CTA, prompt fixes Lightbox - Gallery modal and `/media/:id` page now share one details component - no more drift. - Author sticks to the top when you scroll; `X` moved to the details panel; "Show more" prompt toggle added to the media page. - Shows aspect ratio, resolution, duration, and audio on/off. Recreate (new) - Button in the lightbox restores prompt, refs (image / end-frame / video / audio), model, aspect, resolution, duration, audio toggle, and input mode from a past generation. - Routes to Create Image vs Create Video based on the saved model class, not URL guessing. - Does not auto-generate. Desktop CTA - Dismissible banner above the promptbox linking to the desktop app. Hidden on mobile, reappears 24h after dismissal. Model names - Model selector uses `full_name` from the OmniGen API so new models show up correctly without a code change. - Added Seedance 2.0 Fast to the shared model list for the lightbox details panel. Promptbox `@mentions` - Triggers correctly after Chinese, punctuation, or emoji - not just whitespace. - Case-insensitive: `@image1` highlights as `@Image1`.	2026-04-20 21:20:27 +07:00
Brandon Thomas	2c9a78b802	rename struct	2026-04-19 22:04:43 -04:00
BFlat	6542834336	fix: video promptbox layout bugs (#1403 ) fixes: - prompt box no longer overlaps bottom buttons or wastes space on big screens - long unbroken text wraps instead of escaping the box - resizing the window updates the layout without needing to refocus	2026-04-20 07:36:47 +07:00
bflatastic	6a2719c742	website download link update	2026-04-20 06:57:24 +07:00
Brandon Thomas	38219a4abf	link website omni video jobs to ledger entries for refunds (#1402 )	2026-04-19 15:03:20 -04:00
Brandon Thomas	3fc002d793	quick refunds hack for kinovi (#1401 ) code is actually solid, but the old omni pipeline itself is a hack on top of an incomplete artcraft_router, so this will be replaced when we're done.	2026-04-19 13:51:57 -04:00
Brandon Thomas	c0c17b27b5	1080p support (quick) (#1400 )	2026-04-18 18:15:35 -04:00
Brandon Thomas	b68b8f7d71	simplify artcraft_router (#1399 )	2026-04-18 08:40:49 -04:00
Brandon Thomas	3d9b4be7ab	rename field (#1398 )	2026-04-18 08:10:36 -04:00
Brandon Thomas	489390c881	refacor kinovi generate_video request (#1397 )	2026-04-18 07:48:52 -04:00
Brandon Thomas	f5338611ac	seedance 2.0 resolution options (#1396 )	2026-04-17 20:51:17 -04:00
Brandon Thomas	11fc5746ec	seedance 1080p (#1395 )	2026-04-17 20:31:01 -04:00
Tanish Manku	47383daba8	Experimental: Storyboard page (#1394 )	2026-04-17 15:32:04 -07:00
Tanish Manku	9166985418	Experimental Menu: Hidden experimental settings menu via 7x version click (#1393 )	2026-04-17 14:17:34 -07:00
BFlat	8fc488551f	website: bug fixes (#1391 ) ## Website bug fixes: Seedance Fast + Characters + Toasts ### Create Video page - Switching between Seedance and Seedance Fast no longer loses your attached references - Seedance Fast now supports Characters (was missing from the UI) - Characters work in both Keyframe and Reference modes - Fixed a bug where typing `@Bob2` could accidentally attach an older character named `@Bob` ### Task queue notifications - No more ghost "job complete" toasts every time you reload the site - Cleaner wording: "Image creation complete" instead of "Image complete — Image Generation" - Character jobs now say "Character" instead of the generic "Task" ### Toast redesign - Matches the prompt box style instead of the old bright green - Success = green circle with a white checkmark, error = red circle with a white exclamation - Centered on mobile, stays top-right on desktop - Message no longer awkwardly wraps onto multiple lines on mobile	2026-04-17 15:39:20 +07:00
Brandon Thomas	3a9cebc1b8	omni character support (#1390 )	2026-04-17 03:48:35 -04:00
Brandon Thomas	72a2d956b9	cleanup seedance 2.0 in omni generation (#1389 )	2026-04-17 02:23:09 -04:00
Brandon Thomas	62a02c07df	artcraft_router: simpler interface based on ownership instead of refs (#1388 ) Should have done this all along for ease of development. - Gets rid of refs between data structures. - Clones won't impact our SLA or performance at our scale, this isn't systems programming.	2026-04-17 00:04:05 -04:00
Brandon Thomas	ec991185c6	website dynamically targets development in dev mode (#1387 )	2026-04-16 18:32:57 -04:00
Brandon Thomas	fc3423d05e	model creator + name metadata for omni endpoints (#1386 )	2026-04-16 18:02:00 -04:00
bflatastic	98cd19bd40	website: video thumbnail loading spinner	2026-04-17 01:17:06 +07:00
Tanish Manku	94d9de09cc	Fix video aspect ratio icon not updating on gallery recreate (#1384 ) getCurrentAspectRatioIcon() was reading from aspectRatioList (useState), which is only updated on manual picker clicks, not external store writes. Reading aspectRatio from the store directly fixes the stale icon.	2026-04-16 09:58:04 -07:00
Brandon Thomas	7d788bff62	omni router seedance 2.0 fast (#1382 )	2026-04-16 02:59:50 -04:00
BFlat	d0e2ad9269	website: credits purchasable from pricing page (#1381 ) - only visible when logged in	2026-04-16 11:35:25 +07:00
BFlat	6d9401c1f1	website: promptbox resizable and expandable via chevron icon button (#1380 )	2026-04-16 11:00:12 +07:00
Brandon Thomas	49e49efa3c	worldlabs marble 1.1 client library (#1379 )	2026-04-15 22:01:13 -04:00
BFlat	d51c001835	video ref select video from library support (#1378 ) ## Video reference library picker - Added "Pick from library" option to the Video Ref slot, with gallery filtered to videos - Added loading state to "Use selected" button in gallery modal - Enforced seedance-2 limits (max 3 videos / 15s total) for both upload and library flows, with a deduped video-ref-limit toast so users see a warning on count overflow, duration overflow, or submitting when already at max	2026-04-16 07:49:48 +07:00
BFlat	f94fc5bf07	Fix @mention tagging in prompts with CJK characters (#1376 ) Two bugs were preventing @image / @video / @character references from being tagged in prompts written with Chinese, Japanese, or Korean text: 1. The mention-highlight regex was built with just the "g" flag, so a user-typed "@image6" never matched the canonical label "@Image6" and the reference was rendered as plain text. Make the regex case-insensitive and do the colorMap lookup via a lowercase-keyed table so "@image6" still finds the color for "@Image6". 2. detectMention required the character immediately before "@" to match /\s/, which never matches CJK characters. Typing "@" right after a Chinese character like "从" therefore never opened the autocomplete dropdown, leaving users to type the mention by hand (which then hit bug 1). Replace the whitespace check with a "not an ASCII identifier char" check so CJK, quotes, and punctuation all count as valid word boundaries before an @mention.	2026-04-16 07:05:21 +07:00
Brandon Thomas	f397ad825c	worldlabs fixes for nsfw 500ing (#1377 )	2026-04-15 20:05:07 -04:00
Brandon Thomas	7eea797883	more logging (endpoint failing without debugging info) (#1373 )	2026-04-15 17:49:21 -04:00
bflatastic	73856fca85	loading spinner to wait for video thumbnail to return	2026-04-16 01:48:29 +07:00
bflatastic	3d27c620e4	site video time progress update	2026-04-16 01:35:28 +07:00
Brandon Thomas	062b23d3a0	omni seedance 2 (#1372 )	2026-04-15 13:15:20 -04:00
BFlat	129fc3d593	enable omni gen api on website (#1370 )	2026-04-15 01:58:56 -04:00
Brandon Thomas	ad40798a12	chrome launch script (#1371 )	2026-04-15 01:44:39 -04:00
bflatastic	3db8e66204	gallery to clear cache and reset after logout/login with new account	2026-04-14 23:35:52 +07:00
Brandon Thomas	963521d87b	temporary disable video models (omni / website gens only - app unaffected) (#1369 )	2026-04-14 11:53:11 -04:00
Brandon Thomas	4323743fe7	bump artcraft 0.27 -> 0.28 (#1368 )	2026-04-14 11:49:12 -04:00
Brandon Thomas	752fad12b3	fix build issue	2026-04-14 11:47:16 -04:00
BFlat	99b831c3b0	duration slider for video gen website (#1367 )	2026-04-14 21:31:45 +07:00
BFlat	4a1d1acddd	Omni API UI updates, styling updates, mobile reponsiveness (website) (#1340 ) - Characters for Seedance 2.0 - Character creation/selection modal, @-mention support with colored inline highlights via contentEditable MentionTextarea, character tokens sent in video generation API requests - Mobile responsive navbar - Hamburger menu with slide-down panel, all nav items accessible, credits/library/sign out included - Mobile responsive PromptBox - Tighter padding, stacked toolbar on small screens, flex-wrap for option buttons - Mobile responsive library - Proper sticky header offset, icon-only filter tabs on mobile - Task queue overhaul - Prompt text with marquee hover, copy button, model creator icons, detailed failure reasons on all card types (matching desktop app) - Gallery improvements - 512px thumbnails (was 250px), 12px grid gap, model + media type badges on hover, model icon + prompt on in-progress cards - Quality selector - QualityPicker for image models (High/Medium/Low), wired to cost estimate and generation API - Video batch enqueue - Multiple videos enqueue as separate jobs so each completes independently - Form consistency - All auth pages use shared `<Input>` component, `<form onSubmit>` for Enter key, consistent styling - Bug fixes - Lightbox type error, library carousel disabled, popover icon alignment, end frame library picker, image ref max default (1 → 6), task queue mobile overflow, clear session button removed - Mobile model selector - Model picker now appears in the PromptBox toolbar on mobile/tablet (`lg:hidden`), since the floating bottom-left selector is desktop-only - Responsive image prompt row - Start frame and end frame sections stack vertically on mobile with a horizontal divider, instead of side-by-side - Responsive lightbox - Stacks vertically on mobile (media top, info below), nav arrows always visible (not hover-only), sidebar goes full-width, darker backdrop (`bg-black/80`) - Safari video inline playback - Lightbox videos use `disablePictureInPicture`, `controlsList` restrictions, and vendor-prefixed attributes to prevent fullscreen/PiP pop-out on Safari	2026-04-14 20:51:06 +07:00
bflatastic	47d6ac6841	text to image to properly use the shared upload media api + delete double toast fix	2026-04-14 20:24:24 +07:00
BFlat	689bda8bf3	image ref uploads to show in gallery, media delete not disappearing fix (#1366 )	2026-04-14 20:02:47 +07:00
Brandon Thomas	7e36149d13	more omni gen video models, client bindings, tests (#1365 )	2026-04-14 04:48:59 -04:00
Brandon Thomas	2bbeb3de78	more support audit logs while we're at it (#1364 )	2026-04-14 03:44:48 -04:00
Brandon Thomas	eeacbf6719	ban users handler update / modernization (#1363 )	2026-04-14 03:19:59 -04:00
Brandon Thomas	af763669cc	staff audit logs list (#1362 )	2026-04-14 02:52:56 -04:00
Brandon Thomas	7ff78c6d94	audit impersonation (#1361 )	2026-04-14 02:18:52 -04:00
Brandon Thomas	588478da73	cursors (#1359 )	2026-04-14 01:00:01 -04:00
Brandon Thomas	5cb7b80b44	add api docs for impersonation (#1358 )	2026-04-13 22:58:09 -04:00
Brandon Thomas	50b1a7ed06	user impersonation for support inquiries (#1357 ) - only done with user consent - only available to support staff - thoroughly audited	2026-04-13 22:49:14 -04:00
Tanish Manku	44cadf84cc	Surface gallery load errors with message and copy-to-clipboard (#1356 ) When listUserMediaFiles fails (HTTP error, network error, null reference, or any other exception), the gallery now shows the error message with a "Copy error" button instead of silently falling through to "No items yet". This is a diagnostic aid for a macOS-only blank gallery bug where the root cause is unknown (CORS, session cookie, or runtime exception) and there is no access to production logs.	2026-04-13 16:23:49 -07:00
Brandon Thomas	b7c8151d28	error utils (reusable) (#1355 )	2026-04-13 17:47:06 -04:00