docs: add PageDraw visual design & architecture review

High-end design pass over the pagedraw editor styling and architecture
(lib + webapp integration). Scores each axis against a Linear/Figma-tier
app-chrome rubric and lays out a P0-P2 roadmap: token sweep to kill
hardcoded greys and unify the accent, an owned type ramp, custom-eased
micro-motion, double-bezel panel surfaces, a concentric radius scale,
z-index hygiene, and module-size/architecture notes.

.gitignore

@@ -38,7 +38,6 @@ script/socat_dev_database_connect.sh
 venv/
 
 # LLM Testing
-/external/
 /prompts/
 /reports/
 /requests/
@@ -103,4 +102,3 @@ windows/sqlite/sqlite3.lib
 # ArtCraft Windows DLLs
 crates/desktop/src-tauri/*.dll
 windows_dlls/
-

.sqlx/query-066c16a04112b0ee83a54e29d5f96125f7c90db89ec9bd16275172d14722a381.json

@@ -120,7 +120,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 3
         }
       },
       {

.sqlx/query-080bd6e83a5a783ce5da4a254f3bbe67991eb0f045c990a586c48b64ef46ab3d.json

@@ -60,7 +60,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {
@@ -70,7 +70,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-1246d346e63efa99516ab4efa2aec90e37322184237d94782f77cf7a7a14d53f.json

@@ -210,7 +210,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {
@@ -220,7 +220,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-161febbb30cf6c669a813fe036d405ef428422297440abd240482a6aae51f6f9.json

@@ -1,12 +1,12 @@
 {
   "db_name": "MySQL",
-  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = ?,\n  maybe_model_token = ?,\n\n  maybe_input_source_token = ?,\n  maybe_input_source_token_type = ?,\n\n  maybe_download_url = ?,\n  maybe_cover_image_media_file_token = ?,\n\n  maybe_prompt_token = ?,\n  maybe_wallet_ledger_entry_token = ?,\n\n  maybe_raw_inference_text = ?,\n\n  maybe_inference_args = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  platform_type = ?,\n\n  maybe_external_third_party_cost_credits = ?,\n  maybe_external_third_party_cost_usd_cents = ?,\n  maybe_system_cost_credits = ?,\n  maybe_system_cost_usd_cents = ?,\n\n  priority_level = ?,\n  is_keepalive_required = ?,\n  max_duration_seconds = ?,\n  is_debug_request = ?,\n\n  maybe_routing_tag = ?,\n\n  maybe_debug_log_event_token = ?,\n\n  frontend_failure_category = ?,\n  failure_reason = ?,\n\n  status = ?\n        ",
+  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = ?,\n  maybe_model_token = ?,\n\n  maybe_input_source_token = ?,\n  maybe_input_source_token_type = ?,\n\n  maybe_download_url = ?,\n  maybe_cover_image_media_file_token = ?,\n\n  maybe_prompt_token = ?,\n  maybe_wallet_ledger_entry_token = ?,\n\n  maybe_raw_inference_text = ?,\n\n  maybe_inference_args = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  priority_level = ?,\n  is_keepalive_required = ?,\n  max_duration_seconds = ?,\n  is_debug_request = ?,\n\n  maybe_routing_tag = ?,\n\n  maybe_debug_log_event_token = ?,\n\n  frontend_failure_category = ?,\n  failure_reason = ?,\n\n  status = ?\n        ",
   "describe": {
     "columns": [],
     "parameters": {
-      "Right": 35
+      "Right": 30
     },
     "nullable": []
   },
-  "hash": "5c67c3dd7f8bb6771c6b058a8cf6ffcc66b2be2bea41bd988070713173982dab"
+  "hash": "161febbb30cf6c669a813fe036d405ef428422297440abd240482a6aae51f6f9"
 }

.sqlx/query-1773939b9f98a452e61728eceed7a7e2936fc12e2e6027a732d56a1d5f2efbf0.json

@@ -30,7 +30,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 3
         }
       },
       {

.sqlx/query-1ddb2207db50e2dbfb37d26c006bffe2d8f5fb011855d5a86d01f395c36df759.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    jobs.maybe_external_third_party_id as `request_id`,\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    jobs.platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    jobs.maybe_external_third_party_id as `request_id`,\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
   "describe": {
     "columns": [
       {
@@ -82,16 +82,6 @@
           "char_set": 224,
           "max_size": 128
         }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_platform_type: enums::common::platform_type::PlatformType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
       }
     ],
     "parameters": {
@@ -105,9 +95,8 @@
       false,
       false,
       true,
-      true,
       true
     ]
   },
-  "hash": "1a0b60602debe525529f50566fc545f1cb4b77005f423a10464652be7fbfa839"
+  "hash": "1ddb2207db50e2dbfb37d26c006bffe2d8f5fb011855d5a86d01f395c36df759"
 }

.sqlx/query-29fe7f8464257537840d7f095ec01f850d79f970109549d14978fc3bed7cef32.json

@@ -180,7 +180,7 @@
           "type": "LongLong",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 20
+          "max_size": 10
         }
       },
       {

.sqlx/query-2c98621c08055374fd09502c94ac40bb01d23fcea3f844cceea7446a5c0cb4dc.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    \n    jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    \n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n\n    jobs.platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`,\n\n    jobs.created_at,\n    jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n        ",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    \n    jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    \n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n\n    jobs.created_at,\n    jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -95,16 +95,6 @@
       },
       {
         "ordinal": 9,
-        "name": "maybe_platform_type: enums::common::platform_type::PlatformType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 10,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -114,7 +104,7 @@
         }
       },
       {
-        "ordinal": 11,
+        "ordinal": 10,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -137,10 +127,9 @@
       false,
       true,
       true,
-      true,
       false,
       false
     ]
   },
-  "hash": "3a846909a725eb776b4a4637dc64dcaf1ed70ad8891f9d012c7f3cdcb16a613e"
+  "hash": "2c98621c08055374fd09502c94ac40bb01d23fcea3f844cceea7446a5c0cb4dc"
 }

.sqlx/query-31d85cc0013f29e6db2d272ee6e709cca79b46496a2c222960f1a1419175f00b.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n\n    jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n\n    jobs.platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`,\n\n    jobs.created_at,\n    jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n        ",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n\n    jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n\n    jobs.created_at,\n    jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -95,16 +95,6 @@
       },
       {
         "ordinal": 9,
-        "name": "maybe_platform_type: enums::common::platform_type::PlatformType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 10,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -114,7 +104,7 @@
         }
       },
       {
-        "ordinal": 11,
+        "ordinal": 10,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -137,10 +127,9 @@
       false,
       true,
       true,
-      true,
       false,
       false
     ]
   },
-  "hash": "38a1d7b676bb0987fc191bbc8bdeadf6174a19358dff40d9772b9d5824145bbc"
+  "hash": "31d85cc0013f29e6db2d272ee6e709cca79b46496a2c222960f1a1419175f00b"
 }

.sqlx/query-34afe8ddbf0fb5d746ec82827166348ae1a0734ca5986a7d696860efd90128ce.json

@@ -40,7 +40,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {
@@ -50,7 +50,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-366bc2a90afff0e0ff6b15d39c6815bf50f116ebdf99485aa909a647d52809dd.json

@@ -50,7 +50,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {
@@ -60,7 +60,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-386edf6842d78c963b0ab35a25b8d00f65abb529e2a5e4c206895ac9a807085a.json

@@ -210,7 +210,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {
@@ -220,7 +220,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-46662ffe56827f98f43968681bfaab2eaa6a73f017a92c3289777f49c115f839.json

@@ -40,7 +40,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {
@@ -50,7 +50,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-491980e0a555a900354e60525947d77548a6cb8e4305d13886c8ad7e6787476c.json

@@ -0,0 +1,157 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  fmf.id as `membership_id: u64`,\n  fmf.created_at as `added_to_folder_at: DateTime<Utc>`,\n  mf.token as `media_file_token: MediaFileToken`,\n  mf.media_type,\n  mf.media_class,\n  mf.maybe_mime_type,\n  mf.public_bucket_directory_hash,\n  mf.maybe_public_bucket_prefix,\n  mf.maybe_public_bucket_extension,\n  mf.maybe_frame_width,\n  mf.maybe_frame_height,\n  mf.maybe_duration_millis,\n  mf.maybe_title\nFROM folder_media_files fmf\nJOIN media_files mf\n  ON mf.token = fmf.media_file_token\nWHERE fmf.folder_token = ?\n  AND mf.user_deleted_at IS NULL\n  AND mf.mod_deleted_at IS NULL\nORDER BY fmf.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "membership_id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | UNIQUE_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "added_to_folder_at: DateTime<Utc>",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "media_file_token: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "media_type",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "media_class",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_mime_type",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "public_bucket_directory_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_frame_width",
+        "type_info": {
+          "type": "Long",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 5
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_frame_height",
+        "type_info": {
+          "type": "Long",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 5
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "maybe_duration_millis",
+        "type_info": {
+          "type": "Long",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "maybe_title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "491980e0a555a900354e60525947d77548a6cb8e4305d13886c8ad7e6787476c"
+}

.sqlx/query-516db34b6a642a2f7d7107f186905a79ad694c3c86f3078efc77bcaae7f39f3d.json

@@ -1,36 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT DISTINCT\n  subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n  maybe_stripe_customer_id as `stripe_customer_id!`\n\nFROM user_subscriptions\n\nWHERE\n  user_token = ?\n  AND maybe_stripe_customer_id IS NOT NULL\n  AND deleted_at IS NULL\nORDER BY subscription_namespace ASC, maybe_stripe_customer_id ASC\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "stripe_customer_id!",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      true
-    ]
-  },
-  "hash": "516db34b6a642a2f7d7107f186905a79ad694c3c86f3078efc77bcaae7f39f3d"
-}

.sqlx/query-53c90f5230aa202aead37a224ec70e350172bc0ec4eeaebde22878ca4aa0f695.json

@@ -180,7 +180,7 @@
           "type": "LongLong",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 20
+          "max_size": 10
         }
       },
       {

.sqlx/query-56a0a2bfc3c73d6845ca9cf1d285b175a40b50a250b7effb9ce6474e58113d6e.json

@@ -30,7 +30,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 3
         }
       },
       {

.sqlx/query-57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2.json

@@ -190,7 +190,7 @@
           "type": "Long",
           "flags": "",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-593f27e96257dd615bd389f5ecc65d2e5e6334fcad8eca384ad5c49849d5ed18.json

@@ -30,7 +30,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 3
         }
       }
     ],

.sqlx/query-6c0a2cb31a3241fc6cd0b6738901a31bd91298f131d3b87744c698e92eaec34b.json

@@ -160,7 +160,7 @@
           "type": "LongLong",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 20
+          "max_size": 10
         }
       },
       {

.sqlx/query-749d970c7aef500416cabffeef7f0d0b0fe618ef6c5d14bd714d6f37ff352c78.json

@@ -60,7 +60,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {
@@ -70,7 +70,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-7ebf5c2b58866413d964a137bce9027289fdc6c84fafc0c773cdedd536c6bf4c.json

@@ -150,7 +150,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 3
         }
       },
       {

.sqlx/query-7fe0ebaab55fdbfd4ab447e872e95a4def5888a0bb9f237d8a13bac8336a534b.json

@@ -160,7 +160,7 @@
           "type": "LongLong",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 20
+          "max_size": 10
         }
       },
       {

.sqlx/query-8aca9bc976b980ea1a3b3052bc8a45dd4d8db55c20fd1aede2a4415cc1395cf3.json

@@ -1,267 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  mf.id as `media_file_id: u64`,\n  fmf.created_at as `added_to_folder_at: DateTime<Utc>`,\n\n  mf.token as `media_file_token: MediaFileToken`,\n  mf.media_class as `media_class: MediaFileClass`,\n  mf.media_type as `media_type: MediaFileType`,\n\n  mf.maybe_batch_token as `maybe_batch_token: BatchGenerationToken`,\n\n  mf.public_bucket_directory_hash,\n  mf.maybe_public_bucket_prefix,\n  mf.maybe_public_bucket_extension,\n\n  cover.public_bucket_directory_hash as `maybe_cover_public_bucket_directory_hash?`,\n  cover.maybe_public_bucket_prefix as `maybe_cover_public_bucket_prefix?`,\n  cover.maybe_public_bucket_extension as `maybe_cover_public_bucket_extension?`,\n\n  mf.creator_set_visibility as `creator_set_visibility: Visibility`,\n  mf.is_user_upload as `is_user_upload: bool`,\n  mf.is_intermediate_system_file as `is_intermediate_system_file: bool`,\n\n  mf.maybe_title,\n  mf.maybe_prompt_token as `maybe_prompt_token: PromptToken`,\n  mf.maybe_origin_filename,\n\n  mf.maybe_duration_millis,\n  mf.maybe_frame_width,\n  mf.maybe_frame_height,\n\n  mf.created_at,\n  mf.updated_at\nFROM folder_media_files fmf\nJOIN media_files mf\n  ON mf.token = fmf.media_file_token\nLEFT JOIN media_files cover\n  ON cover.token = mf.maybe_cover_image_media_file_token\nWHERE fmf.folder_token = ?\n  AND mf.user_deleted_at IS NULL\n  AND mf.mod_deleted_at IS NULL\nORDER BY mf.id DESC\nLIMIT ?\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "media_file_id: u64",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
-          "char_set": 63,
-          "max_size": 20
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "added_to_folder_at: DateTime<Utc>",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "media_file_token: MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "media_class: MediaFileClass",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "media_type: MediaFileType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_batch_token: BatchGenerationToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "public_bucket_directory_hash",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_public_bucket_prefix",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_public_bucket_extension",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "maybe_cover_public_bucket_directory_hash?",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "maybe_cover_public_bucket_prefix?",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "maybe_cover_public_bucket_extension?",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 12,
-        "name": "creator_set_visibility: Visibility",
-        "type_info": {
-          "type": "String",
-          "flags": "NOT_NULL | BINARY | ENUM",
-          "char_set": 224,
-          "max_size": 28
-        }
-      },
-      {
-        "ordinal": 13,
-        "name": "is_user_upload: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL | MULTIPLE_KEY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 14,
-        "name": "is_intermediate_system_file: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL | MULTIPLE_KEY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 15,
-        "name": "maybe_title",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 16,
-        "name": "maybe_prompt_token: PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 17,
-        "name": "maybe_origin_filename",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 18,
-        "name": "maybe_duration_millis",
-        "type_info": {
-          "type": "Long",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 19,
-        "name": "maybe_frame_width",
-        "type_info": {
-          "type": "Long",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 20,
-        "name": "maybe_frame_height",
-        "type_info": {
-          "type": "Long",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 21,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 22,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "8aca9bc976b980ea1a3b3052bc8a45dd4d8db55c20fd1aede2a4415cc1395cf3"
-}

.sqlx/query-8bd7ddec0966c742754a278000902c7d5059237ef312c638817a465dcb1979de.json

@@ -160,7 +160,7 @@
           "type": "LongLong",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 20
+          "max_size": 10
         }
       },
       {

.sqlx/query-8deae5674403372e52eeaf29cb23fe92e562832530eab1e5c7684a10e35c5f36.json

@@ -50,7 +50,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {
@@ -60,7 +60,7 @@
           "type": "Long",
           "flags": "",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-971471f349bcd22364b16b5d6c68e807ed897101eec1e8a62a7b8fab3359fa0c.json

@@ -140,7 +140,7 @@
           "type": "Long",
           "flags": "",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-a0002183d4d077b07bb0cd062ca95bf113d1564ce3195f0e62e531ce4297dd76.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    jobs.maybe_external_third_party_id as `order_id`,\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    jobs.platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.job_type = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    jobs.maybe_external_third_party_id as `order_id`,\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.job_type = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
   "describe": {
     "columns": [
       {
@@ -82,16 +82,6 @@
           "char_set": 224,
           "max_size": 128
         }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_platform_type: enums::common::platform_type::PlatformType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
       }
     ],
     "parameters": {
@@ -105,9 +95,8 @@
       false,
       false,
       true,
-      true,
       true
     ]
   },
-  "hash": "ddbbd3886c00268edd3993508f635549fc8ddc877bb059fd58f14b8c07586fc9"
+  "hash": "a0002183d4d077b07bb0cd062ca95bf113d1564ce3195f0e62e531ce4297dd76"
 }

.sqlx/query-a0e1091c0deaf0265640d0c6d0a862d74172e7adf29c4c8e08e12a3662e323d5.json

@@ -150,7 +150,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 3
         }
       },
       {

.sqlx/query-a2b586dd2120f29dd26281626f7381e292c821f8e826b9bc584b92ffa45035b2.json

@@ -30,7 +30,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 3
         }
       },
       {

.sqlx/query-a3cf13dd4272af3b8fbcddba1f1ea711e64f57fb114886d60d4ae2937c56841d.json

@@ -160,7 +160,7 @@
           "type": "LongLong",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 20
+          "max_size": 10
         }
       },
       {

.sqlx/query-a44c637e84152864a00f0ba58838c2f3888e3061fc8b44291541840fdb706e44.json

@@ -270,7 +270,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-a4901f904aa1c00d9afc23faa7008816c6e1b653bd6ad9f0b6772e32000be544.json

@@ -1,12 +1,12 @@
 {
   "db_name": "MySQL",
-  "query": "\n        INSERT INTO media_files\n        SET\n            token = ?,\n\n            media_class = ?,\n            media_type = ?,\n\n            is_user_upload = ?,\n            is_intermediate_system_file = ?,\n\n            origin_category = ?, \n            origin_product_category = ?, \n            maybe_origin_model_type = ?, \n            maybe_origin_model_token = ?, \n            maybe_origin_filename = ?,\n\n            is_batch_generated = ?,\n            maybe_batch_token = ?,\n\n            maybe_mime_type = ?,\n            file_size_bytes = ?,\n            maybe_duration_millis = ?,\n            maybe_audio_encoding = ?, \n            maybe_video_encoding = ?, \n            maybe_frame_width = ?, \n            maybe_frame_height = ?,\n            maybe_prompt_token = ?,\n            checksum_sha2 = ?,\n            \n            maybe_engine_category = ?,\n\n            maybe_title = ?,\n            maybe_text_transcript = ?,\n\n            maybe_scene_source_media_file_token = ?,\n\n            public_bucket_directory_hash = ?, \n            maybe_public_bucket_prefix = ?, \n            maybe_public_bucket_extension = ?, \n\n            maybe_creator_user_token = ?, \n            maybe_creator_anonymous_visitor_token = ?, \n\n            creator_ip_address = ?, \n            creator_set_visibility = ?, \n\n            maybe_creator_file_synthetic_id = ?, \n            maybe_creator_category_synthetic_id = ?,\n\n            extra_file_modification_info = ?,\n\n            maybe_generation_provider = ?,\n\n            platform_type = ?,\n\n            maybe_cover_image_media_file_token = ?,\n\n            maybe_mod_user_token = ?,\n            is_generated_on_prem = ?,\n            generated_by_worker = ?,\n            generated_by_cluster = ?\n        ",
+  "query": "\n        INSERT INTO media_files\n        SET\n            token = ?,\n\n            media_class = ?,\n            media_type = ?,\n\n            is_user_upload = ?,\n            is_intermediate_system_file = ?,\n\n            origin_category = ?, \n            origin_product_category = ?, \n            maybe_origin_model_type = ?, \n            maybe_origin_model_token = ?, \n            maybe_origin_filename = ?,\n\n            is_batch_generated = ?,\n            maybe_batch_token = ?,\n\n            maybe_mime_type = ?,\n            file_size_bytes = ?,\n            maybe_duration_millis = ?,\n            maybe_audio_encoding = ?, \n            maybe_video_encoding = ?, \n            maybe_frame_width = ?, \n            maybe_frame_height = ?,\n            maybe_prompt_token = ?,\n            checksum_sha2 = ?,\n            \n            maybe_engine_category = ?,\n\n            maybe_title = ?,\n            maybe_text_transcript = ?,\n\n            maybe_scene_source_media_file_token = ?,\n\n            public_bucket_directory_hash = ?, \n            maybe_public_bucket_prefix = ?, \n            maybe_public_bucket_extension = ?, \n\n            maybe_creator_user_token = ?, \n            maybe_creator_anonymous_visitor_token = ?, \n\n            creator_ip_address = ?, \n            creator_set_visibility = ?, \n\n            maybe_creator_file_synthetic_id = ?, \n            maybe_creator_category_synthetic_id = ?,\n\n            extra_file_modification_info = ?,\n\n            maybe_generation_provider = ?,\n\n            maybe_cover_image_media_file_token = ?,\n\n            maybe_mod_user_token = ?,\n            is_generated_on_prem = ?,\n            generated_by_worker = ?,\n            generated_by_cluster = ?\n        ",
   "describe": {
     "columns": [],
     "parameters": {
-      "Right": 42
+      "Right": 41
     },
     "nullable": []
   },
-  "hash": "ad2ffbd9f48e52678a5c61817bec043bf1df4033463e5c5a18468c04af391e6a"
+  "hash": "a4901f904aa1c00d9afc23faa7008816c6e1b653bd6ad9f0b6772e32000be544"
 }

.sqlx/query-ae417955113b385031181772b29f234ab9297cf583583f74fe287bf9c24b1e6a.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE folders\nSET\n  maybe_last_media_file_token_1 = (\n    SELECT mf.token\n    FROM folder_media_files fmf\n    JOIN media_files mf\n      ON mf.token = fmf.media_file_token\n    WHERE fmf.folder_token = ?\n      AND mf.user_deleted_at IS NULL\n      AND mf.mod_deleted_at IS NULL\n    ORDER BY fmf.id DESC\n    LIMIT 1 OFFSET 0\n  ),\n  maybe_last_media_file_token_2 = (\n    SELECT mf.token\n    FROM folder_media_files fmf\n    JOIN media_files mf\n      ON mf.token = fmf.media_file_token\n    WHERE fmf.folder_token = ?\n      AND mf.user_deleted_at IS NULL\n      AND mf.mod_deleted_at IS NULL\n    ORDER BY fmf.id DESC\n    LIMIT 1 OFFSET 1\n  ),\n  maybe_last_media_file_token_3 = (\n    SELECT mf.token\n    FROM folder_media_files fmf\n    JOIN media_files mf\n      ON mf.token = fmf.media_file_token\n    WHERE fmf.folder_token = ?\n      AND mf.user_deleted_at IS NULL\n      AND mf.mod_deleted_at IS NULL\n    ORDER BY fmf.id DESC\n    LIMIT 1 OFFSET 2\n  ),\n  maybe_last_media_file_token_4 = (\n    SELECT mf.token\n    FROM folder_media_files fmf\n    JOIN media_files mf\n      ON mf.token = fmf.media_file_token\n    WHERE fmf.folder_token = ?\n      AND mf.user_deleted_at IS NULL\n      AND mf.mod_deleted_at IS NULL\n    ORDER BY fmf.id DESC\n    LIMIT 1 OFFSET 3\n  )\nWHERE token = ?\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "ae417955113b385031181772b29f234ab9297cf583583f74fe287bf9c24b1e6a"
-}

.sqlx/query-bde5d2fed3508fb2c289fe583f35b0d6e6bb38d15da0271aaed761cbc342dac3.json

@@ -160,7 +160,7 @@
           "type": "LongLong",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 20
+          "max_size": 10
         }
       },
       {

.sqlx/query-c0ba9f9aa3184b1cb3d714173b31e530e201a6c24afd29ad534cf7f3954c7316.json

@@ -1,267 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  mf.id as `media_file_id: u64`,\n  fmf.created_at as `added_to_folder_at: DateTime<Utc>`,\n\n  mf.token as `media_file_token: MediaFileToken`,\n  mf.media_class as `media_class: MediaFileClass`,\n  mf.media_type as `media_type: MediaFileType`,\n\n  mf.maybe_batch_token as `maybe_batch_token: BatchGenerationToken`,\n\n  mf.public_bucket_directory_hash,\n  mf.maybe_public_bucket_prefix,\n  mf.maybe_public_bucket_extension,\n\n  cover.public_bucket_directory_hash as `maybe_cover_public_bucket_directory_hash?`,\n  cover.maybe_public_bucket_prefix as `maybe_cover_public_bucket_prefix?`,\n  cover.maybe_public_bucket_extension as `maybe_cover_public_bucket_extension?`,\n\n  mf.creator_set_visibility as `creator_set_visibility: Visibility`,\n  mf.is_user_upload as `is_user_upload: bool`,\n  mf.is_intermediate_system_file as `is_intermediate_system_file: bool`,\n\n  mf.maybe_title,\n  mf.maybe_prompt_token as `maybe_prompt_token: PromptToken`,\n  mf.maybe_origin_filename,\n\n  mf.maybe_duration_millis,\n  mf.maybe_frame_width,\n  mf.maybe_frame_height,\n\n  mf.created_at,\n  mf.updated_at\nFROM folder_media_files fmf\nJOIN media_files mf\n  ON mf.token = fmf.media_file_token\nLEFT JOIN media_files cover\n  ON cover.token = mf.maybe_cover_image_media_file_token\nWHERE fmf.folder_token = ?\n  AND mf.user_deleted_at IS NULL\n  AND mf.mod_deleted_at IS NULL\n  AND mf.id < ?\nORDER BY mf.id DESC\nLIMIT ?\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "media_file_id: u64",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
-          "char_set": 63,
-          "max_size": 20
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "added_to_folder_at: DateTime<Utc>",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "media_file_token: MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "media_class: MediaFileClass",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "media_type: MediaFileType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_batch_token: BatchGenerationToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "public_bucket_directory_hash",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_public_bucket_prefix",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_public_bucket_extension",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "maybe_cover_public_bucket_directory_hash?",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "maybe_cover_public_bucket_prefix?",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "maybe_cover_public_bucket_extension?",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 12,
-        "name": "creator_set_visibility: Visibility",
-        "type_info": {
-          "type": "String",
-          "flags": "NOT_NULL | BINARY | ENUM",
-          "char_set": 224,
-          "max_size": 28
-        }
-      },
-      {
-        "ordinal": 13,
-        "name": "is_user_upload: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL | MULTIPLE_KEY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 14,
-        "name": "is_intermediate_system_file: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL | MULTIPLE_KEY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 15,
-        "name": "maybe_title",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 16,
-        "name": "maybe_prompt_token: PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 17,
-        "name": "maybe_origin_filename",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 18,
-        "name": "maybe_duration_millis",
-        "type_info": {
-          "type": "Long",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 19,
-        "name": "maybe_frame_width",
-        "type_info": {
-          "type": "Long",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 20,
-        "name": "maybe_frame_height",
-        "type_info": {
-          "type": "Long",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 21,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 22,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "c0ba9f9aa3184b1cb3d714173b31e530e201a6c24afd29ad534cf7f3954c7316"
-}

.sqlx/query-c16ceef6967d2af394da3c5786656fc4fd62bcacdbd9878f99e98208ae285588.json

@@ -150,7 +150,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 3
         }
       },
       {

.sqlx/query-ce4efc266857949e6c99ef845303bfa088feb0b2e0cfa85331946be04f22d799.json

@@ -180,7 +180,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {
@@ -190,7 +190,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c.json

@@ -140,7 +140,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-d56a26a7300495fac9741e77e390f16402e2273dbab9a15d7c17eb1f0da7a1b1.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    jobs.maybe_external_third_party_id as `operation_id`,\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    jobs.platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    jobs.maybe_external_third_party_id as `operation_id`,\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
   "describe": {
     "columns": [
       {
@@ -82,16 +82,6 @@
           "char_set": 224,
           "max_size": 128
         }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_platform_type: enums::common::platform_type::PlatformType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
       }
     ],
     "parameters": {
@@ -105,9 +95,8 @@
       false,
       false,
       true,
-      true,
       true
     ]
   },
-  "hash": "5f24aeb12e5a78ffedd1c772c594b668188aaaf01f315a1c41c75610fdfc1b32"
+  "hash": "d56a26a7300495fac9741e77e390f16402e2273dbab9a15d7c17eb1f0da7a1b1"
 }

.sqlx/query-dbc71553c66ef7e15d31cee5fe55c7ad41bbc95173f60544283563b0c03da45b.json

@@ -180,7 +180,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {
@@ -190,7 +190,7 @@
           "type": "Long",
           "flags": "NOT_NULL",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-ea5f5e5b3caf990e9c25a3e8fe2e9625c12d6a36dd5dd91fc4615a45acdd33b8.json

@@ -0,0 +1,157 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  fmf.id as `membership_id: u64`,\n  fmf.created_at as `added_to_folder_at: DateTime<Utc>`,\n  mf.token as `media_file_token: MediaFileToken`,\n  mf.media_type,\n  mf.media_class,\n  mf.maybe_mime_type,\n  mf.public_bucket_directory_hash,\n  mf.maybe_public_bucket_prefix,\n  mf.maybe_public_bucket_extension,\n  mf.maybe_frame_width,\n  mf.maybe_frame_height,\n  mf.maybe_duration_millis,\n  mf.maybe_title\nFROM folder_media_files fmf\nJOIN media_files mf\n  ON mf.token = fmf.media_file_token\nWHERE fmf.folder_token = ?\n  AND mf.user_deleted_at IS NULL\n  AND mf.mod_deleted_at IS NULL\n  AND fmf.id < ?\nORDER BY fmf.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "membership_id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | UNIQUE_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "added_to_folder_at: DateTime<Utc>",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "media_file_token: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "media_type",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "media_class",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_mime_type",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "public_bucket_directory_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_frame_width",
+        "type_info": {
+          "type": "Long",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 5
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_frame_height",
+        "type_info": {
+          "type": "Long",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 5
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "maybe_duration_millis",
+        "type_info": {
+          "type": "Long",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "maybe_title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "ea5f5e5b3caf990e9c25a3e8fe2e9625c12d6a36dd5dd91fc4615a45acdd33b8"
+}

.sqlx/query-f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6.json

@@ -190,7 +190,7 @@
           "type": "Long",
           "flags": "",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-f75fedb86a93ac2542315ddb7ef0d46aa42ecc25a3cf9856219114064183337a.json

@@ -140,7 +140,7 @@
           "type": "Long",
           "flags": "",
           "char_set": 63,
-          "max_size": 11
+          "max_size": 10
         }
       },
       {

.sqlx/query-ffb5717340f21f21693bfcade201bc055fb3fb8a26da8d0574e3de44b033586c.json

@@ -1,47 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  user_token as `user_token: tokens::tokens::users::UserToken`,\n  payments_namespace as `payments_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n  stripe_customer_id\n\nFROM user_stripe_customer_links\n\nWHERE user_token = ?\nORDER BY id ASC\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "payments_namespace: enums::common::payments_namespace::PaymentsNamespace",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "stripe_customer_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "ffb5717340f21f21693bfcade201bc055fb3fb8a26da8d0574e3de44b033586c"
-}

Cargo.toml

@@ -10,7 +10,6 @@ members = [
   "crates/api_clients/artcraft/artcraft_client",
   "crates/api_clients/artcraft/artcraft_router",
   "crates/api_clients/cloud_storage",
-  "crates/api_clients/comet_api_client",
   "crates/api_clients/datadog_client",
   "crates/api_clients/fal_client",
   "crates/api_clients/google_drive_downloader",
@@ -295,14 +294,16 @@ worldlabs_consumer_client = { path = "crates/api_clients/worldlabs_consumer_clie
 # External libs
 # Centrally pinned versions so that we can uniformly upgrade/downgrade versions across the workspace
 # If a crate needs to use an older/newer version, the dependency should be managed in that crate's own Cargo.toml
-actix-cors = "0.7.1"
-actix-http = "3.12.1"
-actix-multipart = "0.7.2"
-actix-rt = "2.11.0"
+actix = "0.13.5"
+actix-cors = "0.6.4" # TODO(bt): Carefully upgrade this. CORS broke last time.
+actix-http = "3.7.0"
+actix-multipart = "0.6.2"
+actix-rt = "2.10.0"
 actix-service = "2.0.3"
 actix-utils = "3.0.1"
-actix-web = "4.13.0"
-actix-web-lab = "0.26.0"
+actix-web = "4.7.0" # TODO(bt): We're behind and need to bump versions.
+actix-web-actors = "4.3.1+deprecated"
+actix-web-lab = "0.20.2"
 anyhow = "1.0.102"
 assertor = "0.0.3"
 base64 = "0.22.1"
@@ -342,11 +343,11 @@ sha2 = "0.11.0-rc.5"
 sha3 = "0.10.8"
 speculoos = "0.11.0"
 strum = { version = "0.28.0", features = ["derive"] }
-tauri = { version = "2.11.2", features = ["unstable", "devtools", "protocol-asset"] } # NB: "devtools" prevents App Store distribution; "ubstable" is needed for window access
-tauri-plugin-dialog = "2.7.1"
-tauri-plugin-fs = "2.5.1"
-tauri-plugin-log = "2.8.0"
-tauri-plugin-upload = "2.4.0"
+tauri = { version = "2.8.3", features = ["unstable", "devtools", "protocol-asset"] } # NB: "devtools" prevents App Store distribution; "ubstable" is needed for window access
+tauri-plugin-dialog = "2.3.3"
+tauri-plugin-fs = "2.4.2"
+tauri-plugin-log = "2.6.0"
+tauri-plugin-upload = "2.3.1"
 tempdir = "0.3.7"
 tempfile = "3.27.0"
 thiserror = "2.0.18"

_database/sql/migrations/2026-06-09-220754-0000_alter_generic_inference_jobs_add_platform_type/down.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  DROP COLUMN platform_type;

_database/sql/migrations/2026-06-09-220754-0000_alter_generic_inference_jobs_add_platform_type/up.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  ADD COLUMN platform_type VARCHAR(16) DEFAULT NULL;

_database/sql/migrations/2026-06-09-220801-0000_alter_media_files_add_platform_type/down.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE media_files
-  DROP COLUMN platform_type;

_database/sql/migrations/2026-06-09-220801-0000_alter_media_files_add_platform_type/up.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE media_files
-  ADD COLUMN platform_type VARCHAR(16) DEFAULT NULL;

_database/sql/migrations/2026-06-11-201507-0000_alter_generic_inference_jobs_add_maybe_external_third_party_cost_credits/down.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  DROP COLUMN maybe_external_third_party_cost_credits;

_database/sql/migrations/2026-06-11-201507-0000_alter_generic_inference_jobs_add_maybe_external_third_party_cost_credits/up.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  ADD COLUMN maybe_external_third_party_cost_credits INT(10) UNSIGNED DEFAULT NULL;

_database/sql/migrations/2026-06-11-201516-0000_alter_generic_inference_jobs_add_maybe_external_third_party_cost_usd_cents/down.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  DROP COLUMN maybe_external_third_party_cost_usd_cents;

_database/sql/migrations/2026-06-11-201516-0000_alter_generic_inference_jobs_add_maybe_external_third_party_cost_usd_cents/up.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  ADD COLUMN maybe_external_third_party_cost_usd_cents INT(10) UNSIGNED DEFAULT NULL;

_database/sql/migrations/2026-06-11-201528-0000_alter_generic_inference_jobs_add_maybe_system_cost_credits/down.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  DROP COLUMN maybe_system_cost_credits;

_database/sql/migrations/2026-06-11-201528-0000_alter_generic_inference_jobs_add_maybe_system_cost_credits/up.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  ADD COLUMN maybe_system_cost_credits INT(10) UNSIGNED DEFAULT NULL;

_database/sql/migrations/2026-06-11-202630-0000_alter_generic_inference_jobs_add_maybe_system_cost_usd_cents/down.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  DROP COLUMN maybe_system_cost_usd_cents;

_database/sql/migrations/2026-06-11-202630-0000_alter_generic_inference_jobs_add_maybe_system_cost_usd_cents/up.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  ADD COLUMN maybe_system_cost_usd_cents INT(10) UNSIGNED DEFAULT NULL;

_database/sql/migrations_squashed/generic_inference_jobs.sql

@@ -56,19 +56,6 @@ CREATE TABLE generic_inference_jobs (
   -- service uses.
   maybe_external_third_party_id VARCHAR(64) DEFAULT NULL,
 
-  -- What the third-party service charges us for the job, in the service's
-  -- own credit denomination (if it bills in credits).
-  maybe_external_third_party_cost_credits INT(10) UNSIGNED DEFAULT NULL,
-
-  -- What the third-party service charges us for the job, in USD cents.
-  maybe_external_third_party_cost_usd_cents INT(10) UNSIGNED DEFAULT NULL,
-
-  -- What we charge the user for the job, in our own credits.
-  maybe_system_cost_credits INT(10) UNSIGNED DEFAULT NULL,
-
-  -- What we charge the user for the job, in USD cents.
-  maybe_system_cost_usd_cents INT(10) UNSIGNED DEFAULT NULL,
-
   -- There is an index on this column.
   -- NB: See notes on inference_category. This is becoming a problematic field. We're using
   -- this to load the container spin-up arguments and dependencies, but the former is being
@@ -221,11 +208,6 @@ CREATE TABLE generic_inference_jobs (
   -- Multiple debug_logs rows can share the same event token.
   maybe_debug_log_event_token VARCHAR(32) DEFAULT NULL,
 
-  -- The platform the enqueuing request came from ('web', 'desktop_app',
-  -- 'curl', 'python_requests', 'postman'),
-  -- inferred from the request's User-Agent header.
-  platform_type VARCHAR(16) DEFAULT NULL,
-
   -- ========== JOB SYSTEM DETAILS ==========
 
   -- Jobs begin as "pending", then transition to other states.

_database/sql/migrations_squashed/media_files.sql

@@ -65,12 +65,6 @@ CREATE TABLE media_files (
   -- What service provided the generation (if any).
   maybe_generation_provider VARCHAR(16) DEFAULT NULL,
 
-  -- The platform the creating request came from ('web', 'desktop_app',
-  -- 'curl', 'python_requests', 'postman'),
-  -- inferred from the request's User-Agent header. Copied from the originating
-  -- generic_inference_jobs row for inference results.
-  platform_type VARCHAR(16) DEFAULT NULL,
-
   -- For inference that can be tied back to a model, the type of model.
   -- There are multiple indices on this column!
   -- DO NOT EXPOSE THIS TO USERS VIA THE API, as we may leak secrets in doing so.

_docs/pagedraw_design_review.md

@@ -0,0 +1,203 @@
+# PageDraw — Visual Design & Architecture Review
+
+**Surface:** `@storyteller/ui-pagedraw` image editor + its `artcraft-webapp` integration (`/edit-image`).
+**Lens:** Awwwards / Linear-tier "premium app chrome" rubric, adapted for an in-product creative tool.
+**Date:** 2026-06-15 · **Branch:** `worktree-pagedraw-webapp`
+
+---
+
+## 0. How to read this
+
+PageDraw is a **professional canvas tool**, not a marketing page. So the elite-design rubric is
+applied in its *app-chrome* register — the north star is **Figma / Linear / Photoshop-web**, not an
+Awwwards landing page. That means:
+
+- **Applies:** token discipline, concentric radii, hairline + inset-highlight surfaces ("double-bezel"),
+  island/pill controls, custom-eased micro-motion, z-index hygiene, premium type ramp.
+- **Does _not_ apply:** `py-40` macro-whitespace, hero typography, editorial-split layouts, scroll-reveal
+  entrances. A tool surface is dense and persistent by design; forcing landing-page whitespace would hurt it.
+
+Citations are `file:line` against the current tree.
+
+---
+
+## 1. Verdict
+
+| Axis | Score | One-liner |
+|---|---|---|
+| Color system | ⚠️ 5/10 | Good token foundation, but hardcoded greys (`#1b1b1b`, `#303030`, `#404040`) leak through a *themeable lib*. |
+| Typography | ❌ 3/10 | No type ramp, no font-family ownership; rides whatever the host sets. Banned-by-rubric default stack risk. |
+| Radii | ⚠️ 4/10 | Five radius scales in play (`sm`→`2xl`→`full`) with no concentric nesting. |
+| Surfaces (border/shadow) | ⚠️ 5/10 | Flat `shadow-lg` everywhere; no inset highlights; no double-bezel. Reads "functional", not "machined". |
+| Motion | ❌ 3/10 | Only `transition-colors`/`ease-in-out`, durations 75–200ms; **zero custom easing**, no spring, no entrance choreography. |
+| Layout / z-index | ⚠️ 6/10 | Clean fixed-panel composition, but a `z-[9999999]` escape hatch and a 6-tier ad-hoc z-stack. |
+| Icons | ✅ 7/10 | FontAwesome Pro (solid + regular) — acceptable, but solid weight is heavier than the rubric's "ultra-light line" ideal. |
+| Architecture | ⚠️ 5/10 | Clean adapter boundary; but `PaintSurface.tsx` (2005 LOC), `SceneState.ts` (1539), `PageDraw.tsx` (1292) are oversized, and the lib hardcodes host-theme colors. |
+
+**Bottom line:** the editor is *structurally competent and functional* but visually reads as
+"capable internal tool," not "$150k product surface." The single highest-leverage fix is a **shared
+design-token layer** (color + radius + motion + type), because today the lib both (a) reaches for
+host tokens (`bg-ui-panel`, `text-base-fg`) *and* (b) hardcodes its own greys — so it can never be
+fully reskinned by the webapp vs. the desktop app.
+
+---
+
+## 2. What's already good (keep)
+
+- **Token-aware base.** Most surfaces use semantic tokens (`bg-ui-panel`, `bg-ui-controls`,
+  `text-base-fg`, `border-ui-panel-border`) — the right instinct (SideToolbar, PromptEditor, HistoryStack).
+- **Clean platform boundary.** The lib has zero REST/Tauri imports; everything I/O flows through
+  `PageDrawAdapter` (`adapter.ts`). The webapp adapter (`web-adapter.tsx`) and desktop adapter stay
+  swappable. This is genuinely good architecture and should be protected.
+- **Performance-minded canvas.** Composite pre-baking on idle (`PageDraw.tsx` ~661–710) and worker
+  encoding (`generatePipeline.worker.ts`) keep the generate click off the main thread. Don't regress this.
+- **CORS already handled** for browser canvas export (`crossOrigin="anonymous"` in `Node.ts:134`,
+  `SceneState.ts:1473`, `imageHelpers.ts:16`) — the web port works because of this.
+
+---
+
+## 3. Findings & recommendations
+
+### 3.1 Color — stop hardcoding greys in a themeable lib  ⚠️ P0
+**Current:** semantic tokens *and* raw hex coexist:
+- `#1b1b1b` pegboard (`pagedraw.css:6`), `#1A1A1A`/`#333333` context menu (`ContextMenu.tsx:44`),
+  `#303030`/`#404040` dividers + popovers (`SideToolbar.tsx:381,550`), `bg-zinc-700/600` swatch
+  (`SideToolbar.tsx:173`), plus ad-hoc `bg-blue-600/500` accents (`PageDraw.tsx:157`, base selector).
+- Accent color is inconsistent: the lib's primary action uses raw **blue-600**, while the webapp's
+  design system uses `--primary` / `brand-primary`. So the editor's blue doesn't match the product.
+
+**Why it fails the bar:** a premium component library exposes *one* surface ramp and *one* accent, both
+driven by tokens, so it reskins per host. Hardcoded greys mean the desktop and web themes can drift, and
+the raw `blue-600` clashes with `brand-primary` used elsewhere in the webapp.
+
+**Do:**
+- Replace every raw grey with the existing ramp: `#1b1b1b`→`bg-ui-background`, `#1A1A1A`→`bg-ui-panel`,
+  `#303030`/`#404040`→`border-ui-panel-border` / `bg-ui-controls`. For the pegboard, add a token
+  `--st-canvas` so hosts can theme the canvas backdrop.
+- Replace `blue-600/500` accents with `bg-primary` / `text-primary` (the token the rest of the webapp uses),
+  so the Generate/Edit-3D buttons match `brand-primary`.
+- Move the react-colorful overrides off pure `rgb(255,255,255)` borders (`pagedraw.css:15,19`) onto
+  `white/15` hairlines for consistency with the rest of the chrome.
+
+### 3.2 Typography — own a type ramp  ❌ P0
+**Current:** no `font-family` anywhere in the lib (grep: 0 hits); only `text-xs/sm/base/lg/xl` +
+`font-medium/semibold/bold`. The editor inherits whatever the host's body font is.
+
+**Why it fails the bar:** the rubric explicitly bans the default web stack (Inter/Roboto/Arial/Helvetica).
+Inheriting an unspecified stack means the tool can render in a banned font with no recourse, and there's
+no deliberate hierarchy (numerics in sliders, labels, modal titles all share one undifferentiated ramp).
+
+**Do:**
+- Adopt the product's display/grotesk token (e.g. a `font-sans` mapped to Geist / Plus Jakarta Sans at
+  the app level) and reference it in the lib's root container, not per-component.
+- Define a small semantic ramp: `text-[11px] tracking-[0.16em] uppercase` for toolbar/section labels,
+  `text-sm` for controls, `text-base font-semibold` for modal titles. Apply `tabular-nums` to slider
+  read-outs (`SliderWithIndicator.tsx`) and dimension fields (`BlankCanvasModal`) so numbers don't jitter.
+
+### 3.3 Radii — collapse to a concentric scale  ⚠️ P1
+**Current:** `rounded-sm / md / lg / xl / 2xl / full` all appear, with no parent→child relationship
+(e.g. `rounded-2xl` card at `PageDraw.tsx:1123`, `rounded-xl` panels in SideToolbar, `rounded-lg`
+buttons in InpaintToolBar).
+
+**Do:** pick a 3-step system — **`rounded-2xl` shells, `rounded-xl` inner cards, `rounded-lg` controls,
+`rounded-full` pills** — and apply concentrically (the "double-bezel" curve math: inner radius =
+outer − padding). Drop `rounded-sm`/`rounded-md` from the editor entirely.
+
+### 3.4 Surfaces — add the "machined" double-bezel  ⚠️ P1
+**Current:** panels are a single `bg-ui-panel` + `border` + `shadow-lg`. No nested enclosure, no inset
+top-highlight. Reads flat.
+
+**Do (for the four floating panels — SideToolbar, HistoryStack, PromptEditor, InpaintToolBar):**
+- Outer shell: `bg-ui-panel/80 ring-1 ring-white/10 backdrop-blur-xl p-1.5 rounded-2xl`.
+- Inner core: own bg + `shadow-[inset_0_1px_0_rgba(255,255,255,0.08)] rounded-xl`.
+- This is the single change that most moves the surface from "tool" to "premium hardware." The panels are
+  already `fixed` (`PageDraw.tsx:1144,1175,1195`), so `backdrop-blur` here is GPU-safe per the perf rules.
+
+### 3.5 Motion — replace linear/ease with spring-eased micro-motion  ❌ P0 (cheap, high impact)
+**Current:** `transition-colors`/`transition-all` with `ease-in-out` and `duration-75/150/200`
+(`SideToolbar.tsx:381,550`, `SliderWithIndicator.tsx:65`, `ContextMenu.tsx:53`). No custom easing,
+no entrance/exit on popovers, color pickers, or the context menu (they pop instantly).
+
+**Why it fails the bar:** instant state changes and `ease-in-out` are explicitly banned. A pro tool still
+deserves *interpolated* motion — it's what separates Figma from a jQuery plugin.
+
+**Do:**
+- Standardize on one curve: `transition-[transform,opacity,background-color] duration-300
+  ease-[cubic-bezier(0.32,0.72,0,1)]`.
+- Tool buttons: `active:scale-[0.97]` press physics; selected tool gets a spring-eased indicator slide
+  rather than a hard background swap.
+- Popovers / color picker / context menu: animate in with `opacity-0 translate-y-1 scale-[0.98]` →
+  resolved, ~180ms. Transform+opacity only (perf rule).
+- History tiles: stagger their `opacity` reveal when a generation lands (they already use
+  `transition-opacity`, just add per-index delay).
+
+### 3.6 Layout & z-index — tame the stack  ⚠️ P1
+**Current:** clean fixed-panel composition, but z-index is ad-hoc across 6 tiers and includes a
+`z-[9999999]` on the context menu (`ContextMenu.tsx:44`) and a one-off `z-[60]` (`PageDraw.tsx:237`).
+
+**Do:** define a named scale in one place — `canvas:0, chrome:10, floating-controls:20, overlay-button:40,
+menu:50` — and replace the magic numbers. The portal menu only needs to clear the chrome, not `9999999`.
+
+### 3.7 Responsive — declare intent  ⚠️ P2
+**Current:** essentially desktop-only; fixed sidebars assume a wide viewport; only LightboxDetails has
+`sm:` variants. The webapp wrapper scopes the lib correctly (`pagedraw.tsx` `translateZ(0)` containing
+block) but there's no mobile story.
+
+**Do:** mirror the Edit-3D page's explicit **mobile gate** (`pagescene.tsx` `MobileGate`) on `/edit-image`
+rather than letting fixed toolbars overlap on touch. A precision canvas tool is legitimately desktop-first;
+just say so deliberately instead of degrading silently.
+
+---
+
+## 4. Architecture notes
+
+- **Oversized modules.** `PaintSurface.tsx` (2005 LOC), `SceneState.ts` (1539), `PageDraw.tsx` (1292).
+  These are review/maintenance hotspots. Suggest extracting from `SceneState.ts`: history/undo slice,
+  base-image-load slice, and generation/pending slice into composable Zustand slices. `PageDraw.tsx`'s
+  generate-flow (cases 1–3, ~780–868) could move to a `useGenerate()` hook.
+- **Theme ownership.** Per §3.1, the lib should *only* consume tokens. Today it mixes tokens + hex, which
+  defeats the adapter pattern's promise (one component, many themed hosts).
+- **Adapter surface is healthy.** `PageDrawAdapter` is small and intentional; the web vs. Tauri split is
+  clean. The webapp's `enqueueInpaint` stub and 402→credits-modal handling are explicit and documented.
+- **Icon weight.** FontAwesome **solid** is the heaviest option; if a line/light set is available
+  (Phosphor/Remix or FA light), the toolbar would read more refined. Low priority.
+
+---
+
+## 5. Prioritized roadmap
+
+| P | Item | Effort | Payoff |
+|---|---|---|---|
+| **P0** | Token sweep: kill hardcoded greys; unify accent on `--primary` (§3.1) | M | Highest — enables true theming + product-consistent accent |
+| **P0** | Own a font-family + semantic type ramp at the lib root (§3.2) | S | High — removes banned-font risk, adds hierarchy |
+| **P0** | One custom easing curve + press/popover micro-motion (§3.5) | S | High — cheapest "feels expensive" win |
+| **P1** | Double-bezel + inset highlights on the 4 floating panels (§3.4) | M | High — "machined" surface upgrade |
+| **P1** | Concentric 3-step radius system (§3.3) | S | Medium — visual coherence |
+| **P1** | Named z-index scale; remove `z-[9999999]` (§3.6) | S | Medium — maintainability |
+| **P2** | Explicit mobile gate on `/edit-image` (§3.7) | S | Medium — correctness on touch |
+| **P2** | Split `SceneState.ts` / `PaintSurface.tsx` into slices (§4) | L | Medium — maintainability |
+
+---
+
+## 6. Appendix — proposed token additions
+
+```css
+/* canvas + chrome surface ramp (lib should consume only these) */
+--st-canvas:        <theme>;   /* replaces #1b1b1b pegboard */
+--st-accent:        var(--primary);        /* replaces blue-600/500 */
+--st-hairline:      rgb(255 255 255 / 0.10);
+--st-inset-hi:      inset 0 1px 0 rgb(255 255 255 / 0.08);
+
+/* motion */
+--st-ease:          cubic-bezier(0.32, 0.72, 0, 1);
+--st-dur-fast:      180ms;
+--st-dur:           300ms;
+
+/* radius scale (concentric) */
+--st-r-shell:       1.25rem;  /* rounded-2xl */
+--st-r-card:        0.875rem; /* rounded-xl  */
+--st-r-control:     0.5rem;   /* rounded-lg  */
+```
+
+> Scope note: every recommendation here is **styling/architecture only** — none change the generate,
+> polling, upload, bg-removal, or adapter contracts validated during the functional debug pass.

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

@@ -1,19 +1,11 @@
 use chrono::{DateTime, Utc};
 use serde_derive::{Deserialize, Serialize};
-use url::Url;
 use utoipa::ToSchema;
 
-use enums::by_table::media_files::media_file_class::MediaFileClass;
-use enums::by_table::media_files::media_file_type::MediaFileType;
 use tokens::tokens::folders::FolderToken;
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::users::UserToken;
 
-// NB: The "folder media file" list-item shape lives in storyteller_web
-// (see `endpoints/folders/media_files/list_folder_media_files_handler.rs`)
-// because it embeds `MediaFileCoverImageDetails` and other domain types
-// that depend on the request's `MediaDomain` + `ServerEnvironment`.
-
 /// Canonical wire shape for a folder. Used by single-folder GETs, create
 /// responses, list rows, and subfolder list rows.
 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
@@ -23,16 +15,12 @@ pub struct FolderInfo {
   pub owner_user_token: UserToken,
   pub maybe_parent_folder_token: Option<FolderToken>,
 
-  /// The four most-recent media files added to the folder, in slot order
-  /// (the schema stores them as `maybe_last_media_file_token_1..4`).
-  /// Slots whose media file has been deleted are skipped, so the vec
-  /// may contain 0-4 entries.
-  pub last_media_thumbnails: Vec<FolderThumbnail>,
+  pub maybe_last_media_file_token_1: Option<MediaFileToken>,
+  pub maybe_last_media_file_token_2: Option<MediaFileToken>,
+  pub maybe_last_media_file_token_3: Option<MediaFileToken>,
+  pub maybe_last_media_file_token_4: Option<MediaFileToken>,
 
-  /// User-chosen cover image. When present, the frontend should use this
-  /// as the folder's primary thumbnail instead of the
-  /// `last_media_thumbnails` grid.
-  pub maybe_custom_cover_thumbnail: Option<FolderThumbnail>,
+  pub maybe_cover_image_custom_media_token: Option<MediaFileToken>,
 
   pub maybe_color_code: Option<String>,
   pub has_star: bool,
@@ -45,50 +33,22 @@ pub struct FolderInfo {
   pub is_orphaned: bool,
 }
 
-/// A compact thumbnail descriptor for a media file referenced by a
-/// folder (either one of the `last_media_*` slots or the custom cover).
-///
-/// Intentionally narrower than `MediaLinks` / `CoverImageLinks` — folders
-/// only need the bare minimum to render a thumbnail card. The CDN URL is
-/// the direct asset link; `maybe_thumbnail_template` carries the resizing
-/// template URL (with `{{width}}` / `{{height}}` placeholders) when the
-/// media class supports it.
+/// Canonical wire shape for a media file inside a folder. Lean enough for
+/// thumbnail rendering; callers that need richer fields should hit the
+/// media-file batch-get endpoint.
 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct FolderThumbnail {
-  pub token: MediaFileToken,
-  pub media_class: MediaFileClass,
-  pub media_type: MediaFileType,
+pub struct FolderMediaFileInfo {
+  pub media_file_token: MediaFileToken,
+  pub added_to_folder_at: DateTime<Utc>,
 
-  /// Direct CDN URL to the underlying media asset.
-  pub cdn_url: Url,
-
-  /// Resizing template URL (with `{{width}}` / `{{height}}` placeholders)
-  /// when the media class supports it. `None` for media classes without
-  /// a thumbnail variant. (Video media files instead have video previews,
-  /// which, in turn, have their own thumbnail templates.)
-  pub maybe_thumbnail_template: Option<String>,
-
-  /// Video preview images (still and animated gif) for mp4 video files.
-  /// These are only set for video media files.
-  pub maybe_video_previews: Option<FolderThumbnailVideoPreviews>,
-}
-
-/// Video preview images for a video media file referenced by a folder.
-/// Mirrors the shape of `MediaLinks`' video previews, but is its own type
-/// so the folder wire shape can evolve independently.
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct FolderThumbnailVideoPreviews {
-  /// A static single frame preview image of the video.
-  pub still: Url,
-
-  /// An animated gif preview of the video.
-  pub animated: Url,
-
-  /// A template used to construct the still thumbnail URL.
-  /// Replace the string `{WIDTH}` with the desired width.
-  pub still_thumbnail_template: String,
-
-  /// A template used to construct the animated thumbnail URL.
-  /// Replace the string `{WIDTH}` with the desired width.
-  pub animated_thumbnail_template: String,
+  pub media_type: String,
+  pub media_class: String,
+  pub maybe_mime_type: Option<String>,
+  pub public_bucket_directory_hash: String,
+  pub maybe_public_bucket_prefix: Option<String>,
+  pub maybe_public_bucket_extension: Option<String>,
+  pub maybe_frame_width: Option<i32>,
+  pub maybe_frame_height: Option<i32>,
+  pub maybe_duration_millis: Option<i32>,
+  pub maybe_title: Option<String>,
 }

crates/api_clients/artcraft/artcraft_api_defs/src/folders/media_files.rs

@@ -4,12 +4,9 @@ use utoipa::{IntoParams, ToSchema};
 use tokens::tokens::folders::FolderToken;
 use tokens::tokens::media_files::MediaFileToken;
 
+use crate::folders::common::FolderMediaFileInfo;
+
 // ── GET /v1/folders/media_files/{folder_token} ──
-//
-// NB: `ListFolderMediaFilesSuccessResponse` and `FolderMediaFileListItem`
-// live in `storyteller_web`'s handler because the wire shape embeds
-// `MediaFileCoverImageDetails` and `MediaLinks` constructors that depend
-// on the request's `MediaDomain` + `ServerEnvironment`.
 
 #[derive(Deserialize, ToSchema)]
 pub struct FolderMediaFilesPathInfo {
@@ -22,6 +19,13 @@ pub struct ListFolderMediaFilesQueryParams {
   pub limit: Option<u32>,
 }
 
+#[derive(Serialize, ToSchema)]
+pub struct ListFolderMediaFilesSuccessResponse {
+  pub success: bool,
+  pub media_files: Vec<FolderMediaFileInfo>,
+  pub maybe_cursor: Option<String>,
+}
+
 // ── PUT /v1/folders/media_files/{folder_token}/bulk_add ──
 
 #[derive(Deserialize, ToSchema)]
@@ -53,36 +57,3 @@ pub struct BulkRemoveFolderMediaFilesSuccessResponse {
   /// How many membership rows were actually hard-deleted.
   pub removed_count: u64,
 }
-
-// ── POST /v1/folders/media_files/{folder_token}/bulk_move ──
-
-/// Atomically move the listed media files from `source_folder` to the
-/// URL `folder_token` (destination). Idempotent on both sides: tokens
-/// that aren't currently in the source are silently skipped, and tokens
-/// that are already in the destination stay there.
-#[derive(Deserialize, ToSchema)]
-pub struct BulkMoveFolderMediaFilesRequest {
-  pub source_folder: FolderToken,
-  pub media_file_tokens: Vec<MediaFileToken>,
-}
-
-#[derive(Serialize, ToSchema)]
-pub struct BulkMoveFolderMediaFilesSuccessResponse {
-  pub success: bool,
-
-  /// Number of membership rows actually deleted from the source folder.
-  pub removed_from_source_count: u64,
-
-  /// Number of membership rows actually inserted into the destination
-  /// folder. May be lower than the input length because (a) tokens that
-  /// were already present in the destination don't insert, and (b)
-  /// tokens whose media file doesn't exist / is soft-deleted are filtered
-  /// out before the insert.
-  pub added_to_destination_count: u64,
-
-  /// The media file tokens that ended up resident in the destination
-  /// folder after the move — i.e. the subset of the input that actually
-  /// referred to live media files. Includes both newly-inserted rows and
-  /// rows that were already there.
-  pub accepted_media_file_tokens: Vec<MediaFileToken>,
-}

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

@@ -2,6 +2,5 @@ pub mod alerts;
 pub mod jobs;
 pub mod user;
 pub mod user_referrals;
-pub mod user_stripe_data;
 pub mod wallet_ledger_entries;
 pub mod wallets;

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user_stripe_data/mod.rs

@@ -1 +0,0 @@
-pub mod moderator_get_user_stripe_customer_ids;

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user_stripe_data/moderator_get_user_stripe_customer_ids.rs

@@ -1,43 +0,0 @@
-use enums::common::payments_namespace::PaymentsNamespace;
-use serde_derive::{Deserialize, Serialize};
-use tokens::tokens::users::UserToken;
-use utoipa::ToSchema;
-
-pub const MODERATOR_GET_USER_STRIPE_CUSTOMER_IDS_PATH: &str =
-    "/v1/moderation/user_stripe_data/{user_token}/customer_ids";
-
-#[derive(Deserialize, ToSchema)]
-pub struct ModeratorGetUserStripeCustomerIdsPathInfo {
-  pub user_token: UserToken,
-}
-
-#[derive(Serialize, ToSchema)]
-pub struct ModeratorGetUserStripeCustomerIdsResponse {
-  pub success: bool,
-
-  /// All stripe customer ids we have on file for the user, across payments
-  /// namespaces. A user may have zero or several: a customer link and/or
-  /// subscriptions per namespace (eg. artcraft), plus legacy fakeyou
-  /// subscriptions. The same customer id can appear once per source.
-  pub customer_ids: Vec<ModeratorUserStripeCustomerIdEntry>,
-}
-
-#[derive(Serialize, ToSchema)]
-pub struct ModeratorUserStripeCustomerIdEntry {
-  pub stripe_customer_id: String,
-  pub payments_namespace: PaymentsNamespace,
-  pub source: ModeratorStripeCustomerIdSource,
-
-  /// Link to the customer in the Stripe dashboard for the namespace's account.
-  pub stripe_dashboard_url: String,
-}
-
-/// Which table the customer id was found in.
-#[derive(Serialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ModeratorStripeCustomerIdSource {
-  /// From the `user_stripe_customer_links` table (1:1 per namespace).
-  CustomerLink,
-  /// From the user's rows in the `user_subscriptions` table.
-  Subscription,
-}

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

@@ -11,11 +11,9 @@ use crate::generate::generate_image::providers::artcraft::midjourney_7::request:
 /// |   3   |   19    |   19¢     |  (interpolated; Kinovi doesn't expose 3)
 /// |   4   |   25    |   25¢     |
 ///
-/// Kinovi-side math (historical, 22,000-credit package at 193 credits/$1):
-/// 12 Kinovi credits per Midjourney task → batches 1/2/4 land on 6/12/25¢;
-/// batch 3 is `ceil((12 × 3 / 193) × 100) = 19`. Under the current
-/// 525,000-credit package (243 credits/$1) Kinovi costs only 5/10/20¢ —
-/// user pricing is intentionally kept at the 193-derived values.
+/// Kinovi-side math: 12 Kinovi credits per Midjourney task; 193 Kinovi
+/// credits per USD. Kinovi rounds to nearest cent, so batches 1/2/4 land
+/// on 6/12/25. Batch 3 is `ceil((12 × 3 / 193) × 100) = 19`.
 #[derive(Clone, Debug)]
 pub struct ArtcraftMidjourney7CostState {
   pub num_images: u16,
@@ -129,6 +127,38 @@ mod tests {
     }
   }
 
+  // ── 1:1 cost parity with Kinovi for batches 1/2/4 ──
+  //
+  // Kinovi midjourney_7 returns 6/12/25¢ for batches 1/2/4. The artcraft
+  // provider must match those values byte-for-byte so users pay the same.
+
+  mod kinovi_parity {
+    use super::*;
+    use crate::generate::generate_image::providers::kinovi::midjourney_7::cost::KinoviMidjourney7CostState;
+    use seedance2pro_client::generate::image::generate_midjourney_v7::KinoviMidjourneyBatchCount;
+
+    #[test]
+    fn batch_1_matches_kinovi() {
+      let kinovi = KinoviMidjourney7CostState { batch_count: KinoviMidjourneyBatchCount::One }
+        .estimate_cost();
+      assert_eq!(cost_cents(1), kinovi.cost_in_usd_cents.unwrap());
+    }
+
+    #[test]
+    fn batch_2_matches_kinovi() {
+      let kinovi = KinoviMidjourney7CostState { batch_count: KinoviMidjourneyBatchCount::Two }
+        .estimate_cost();
+      assert_eq!(cost_cents(2), kinovi.cost_in_usd_cents.unwrap());
+    }
+
+    #[test]
+    fn batch_4_matches_kinovi() {
+      let kinovi = KinoviMidjourney7CostState { batch_count: KinoviMidjourneyBatchCount::Four }
+        .estimate_cost();
+      assert_eq!(cost_cents(4), kinovi.cost_in_usd_cents.unwrap());
+    }
+  }
+
   // ── Monotonicity ──
 
   #[test]

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

@@ -82,4 +82,32 @@ mod tests {
     }
   }
 
+  // ── 1:1 cost parity with Kinovi 7-niji ──
+
+  mod kinovi_parity {
+    use super::*;
+    use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::cost::KinoviMidjourney7NijiCostState;
+    use seedance2pro_client::generate::image::generate_midjourney_v7_niji::KinoviMidjourneyBatchCount;
+
+    #[test]
+    fn batch_1_matches_kinovi() {
+      let kinovi = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::One }
+        .estimate_cost();
+      assert_eq!(cost_cents(1), kinovi.cost_in_usd_cents.unwrap());
+    }
+
+    #[test]
+    fn batch_2_matches_kinovi() {
+      let kinovi = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::Two }
+        .estimate_cost();
+      assert_eq!(cost_cents(2), kinovi.cost_in_usd_cents.unwrap());
+    }
+
+    #[test]
+    fn batch_4_matches_kinovi() {
+      let kinovi = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::Four }
+        .estimate_cost();
+      assert_eq!(cost_cents(4), kinovi.cost_in_usd_cents.unwrap());
+    }
+  }
 }

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

@@ -82,4 +82,32 @@ mod tests {
     }
   }
 
+  // ── 1:1 cost parity with Kinovi v8 ──
+
+  mod kinovi_parity {
+    use super::*;
+    use crate::generate::generate_image::providers::kinovi::midjourney_8::cost::KinoviMidjourney8CostState;
+    use seedance2pro_client::generate::image::generate_midjourney_v8::KinoviMidjourneyBatchCount;
+
+    #[test]
+    fn batch_1_matches_kinovi() {
+      let kinovi = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::One }
+        .estimate_cost();
+      assert_eq!(cost_cents(1), kinovi.cost_in_usd_cents.unwrap());
+    }
+
+    #[test]
+    fn batch_2_matches_kinovi() {
+      let kinovi = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::Two }
+        .estimate_cost();
+      assert_eq!(cost_cents(2), kinovi.cost_in_usd_cents.unwrap());
+    }
+
+    #[test]
+    fn batch_4_matches_kinovi() {
+      let kinovi = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::Four }
+        .estimate_cost();
+      assert_eq!(cost_cents(4), kinovi.cost_in_usd_cents.unwrap());
+    }
+  }
 }

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

@@ -37,9 +37,8 @@ impl KinoviMidjourney7CostState {
       reference_image_urls: None,
     };
 
-    let costs = pricing_request.calculate_costs();
-    let cost_in_credits = costs.kinovi_credits;
-    let cost_in_usd_cents = costs.usd_cents_rounded_up;
+    let cost_in_credits = pricing_request.estimate_credits() as u64;
+    let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
 
     ImageGenerationCostEstimate {
       cost_in_credits: Some(cost_in_credits),
@@ -86,27 +85,27 @@ mod tests {
     }
   }
 
-  // ── USD pricing (243 credits per dollar; rounded up) ──
+  // ── USD pricing (193 credits per dollar; rounded) ──
 
   mod usd {
     use super::*;
 
     #[test]
-    fn batch_one_is_five_cents() {
-      // 12/243 × 100 = 4.94 → 5¢
-      assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::One), 5); // rounds UP
+    fn batch_one_is_six_cents() {
+      // 12 / 193 × 100 = 6.21 → 6¢
+      assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::One), 6);
     }
 
     #[test]
-    fn batch_two_is_ten_cents() {
-      // 24/243 × 100 = 9.88 → 10¢
-      assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::Two), 10); // rounds UP
+    fn batch_two_is_twelve_cents() {
+      // 24 / 193 × 100 = 12.44 → 12¢
+      assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::Two), 12);
     }
 
     #[test]
-    fn batch_four_is_twenty_cents() {
-      // 48/243 × 100 = 19.75 → 20¢
-      assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::Four), 20);
+    fn batch_four_is_twentyfive_cents() {
+      // 48 / 193 × 100 = 24.87 → 25¢
+      assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::Four), 25);
     }
   }
 

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

@@ -35,9 +35,8 @@ impl KinoviMidjourney7NijiCostState {
       reference_image_urls: None,
     };
 
-    let costs = pricing_request.calculate_costs();
-    let cost_in_credits = costs.kinovi_credits;
-    let cost_in_usd_cents = costs.usd_cents_rounded_up;
+    let cost_in_credits = pricing_request.estimate_credits() as u64;
+    let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
 
     ImageGenerationCostEstimate {
       cost_in_credits: Some(cost_in_credits),
@@ -56,11 +55,11 @@ mod tests {
   use super::*;
 
   #[test]
-  fn batch_one_is_twelve_credits_and_five_cents() {
+  fn batch_one_is_twelve_credits_and_six_cents() {
     let cost = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::One }
       .estimate_cost();
     assert_eq!(cost.cost_in_credits, Some(12));
-    assert_eq!(cost.cost_in_usd_cents, Some(5)); // 1200/243 = 4.94 -> rounds UP
+    assert_eq!(cost.cost_in_usd_cents, Some(6));
   }
 
   #[test]
@@ -68,7 +67,7 @@ mod tests {
     let cost = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::Two }
       .estimate_cost();
     assert_eq!(cost.cost_in_credits, Some(24));
-    assert_eq!(cost.cost_in_usd_cents, Some(10)); // 2400/243 = 9.88 -> rounds UP
+    assert_eq!(cost.cost_in_usd_cents, Some(12));
   }
 
   #[test]
@@ -76,7 +75,7 @@ mod tests {
     let cost = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::Four }
       .estimate_cost();
     assert_eq!(cost.cost_in_credits, Some(48));
-    assert_eq!(cost.cost_in_usd_cents, Some(20));
+    assert_eq!(cost.cost_in_usd_cents, Some(25));
   }
 
   #[test]

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

@@ -35,9 +35,8 @@ impl KinoviMidjourney8CostState {
       reference_image_urls: None,
     };
 
-    let costs = pricing_request.calculate_costs();
-    let cost_in_credits = costs.kinovi_credits;
-    let cost_in_usd_cents = costs.usd_cents_rounded_up;
+    let cost_in_credits = pricing_request.estimate_credits() as u64;
+    let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
 
     ImageGenerationCostEstimate {
       cost_in_credits: Some(cost_in_credits),
@@ -56,11 +55,11 @@ mod tests {
   use super::*;
 
   #[test]
-  fn batch_one_is_twelve_credits_and_five_cents() {
+  fn batch_one_is_twelve_credits_and_six_cents() {
     let cost = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::One }
       .estimate_cost();
     assert_eq!(cost.cost_in_credits, Some(12));
-    assert_eq!(cost.cost_in_usd_cents, Some(5)); // 1200/243 = 4.94 -> rounds UP
+    assert_eq!(cost.cost_in_usd_cents, Some(6));
   }
 
   #[test]
@@ -68,7 +67,7 @@ mod tests {
     let cost = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::Two }
       .estimate_cost();
     assert_eq!(cost.cost_in_credits, Some(24));
-    assert_eq!(cost.cost_in_usd_cents, Some(10)); // 2400/243 = 9.88 -> rounds UP
+    assert_eq!(cost.cost_in_usd_cents, Some(12));
   }
 
   #[test]
@@ -76,6 +75,6 @@ mod tests {
     let cost = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::Four }
       .estimate_cost();
     assert_eq!(cost.cost_in_credits, Some(48));
-    assert_eq!(cost.cost_in_usd_cents, Some(20));
+    assert_eq!(cost.cost_in_usd_cents, Some(25));
   }
 }

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

@@ -231,6 +231,176 @@ mod tests {
     }
   }
 
+  // ── Cross-provider margin: ArtCraft is consistently ~30% above GrokApi ──
+
+  mod small_margin {
+    use super::*;
+    use crate::api::router_aspect_ratio::RouterAspectRatio;
+
+    #[test]
+    fn small_margin() {
+      let resolutions = [
+        None,
+        Some(RouterResolution::FourEightyP),
+        Some(RouterResolution::SevenTwentyP),
+        Some(RouterResolution::TenEightyP), // clamps to 720p on both sides
+      ];
+      let durations: &[u16] = &[1, 4, 5, 8, 10, 12, 15];
+      let aspect_ratios = [
+        None,
+        Some(RouterAspectRatio::Auto),
+        Some(RouterAspectRatio::Square),
+        Some(RouterAspectRatio::WideSixteenByNine),
+        Some(RouterAspectRatio::TallNineBySixteen),
+        Some(RouterAspectRatio::WideFourByThree),
+        Some(RouterAspectRatio::TallThreeByFour),
+        Some(RouterAspectRatio::WideThreeByTwo),
+        Some(RouterAspectRatio::TallTwoByThree),
+      ];
+      // (has_start_frame, num_reference_images). At most one of the two is
+      // non-default — start_frame and reference_images are mutually exclusive
+      // on the GrokApi wire (image-to-video vs reference-to-video), so we
+      // don't mix them here to keep the comparison apples-to-apples.
+      let image_combos: &[(bool, usize)] = &[
+        (false, 0),  // text-to-video
+        (true,  0),  // image-to-video, 1 source image
+        (false, 1),  // reference-to-video, 1 ref image
+        (false, 2),
+        (false, 3),
+      ];
+
+      let mut total_cases = 0;
+      let mut failures = Vec::new();
+
+      for &res in &resolutions {
+        for &dur in durations {
+          for &ar in &aspect_ratios {
+            for &(has_start, num_refs) in image_combos {
+              total_cases += 1;
+              let artcraft = artcraft_cents(res, dur, ar, has_start, num_refs);
+              let grokapi  = grokapi_cents(res, dur, ar, has_start, num_refs);
+
+              // Margin requirement: artcraft / max(grokapi - 1, 1) >= 1.29.
+              // The (-1, 1) floor accounts for one cent of GrokApi-side
+              // ceiling-rounding noise (see test doc comment above).
+              let grokapi_compare = grokapi.saturating_sub(1).max(1);
+              let lhs = artcraft.saturating_mul(100);
+              let rhs = grokapi_compare.saturating_mul(129);
+
+              if lhs < rhs {
+                let pct = if grokapi == 0 { 0.0 }
+                  else { (artcraft as f64 / grokapi as f64 - 1.0) * 100.0 };
+                failures.push(format!(
+                  "res={:?} dur={}s ar={:?} start={} refs={} → \
+                   artcraft={}¢ vs grokapi={}¢ (margin {:.1}%, want ≥ 29% after 1¢ tolerance)",
+                  res, dur, ar, has_start, num_refs, artcraft, grokapi, pct,
+                ));
+              }
+
+              // Defense in depth: ArtCraft must always cost at least as
+              // much as GrokApi, regardless of rounding noise.
+              assert!(
+                artcraft >= grokapi,
+                "ArtCraft ({artcraft}¢) cheaper than GrokApi ({grokapi}¢) for \
+                 res={res:?} dur={dur}s ar={ar:?} start={has_start} refs={num_refs}",
+              );
+            }
+          }
+        }
+      }
+
+      if !failures.is_empty() {
+        let summary = failures.iter().take(10).cloned().collect::<Vec<_>>().join("\n  ");
+        panic!(
+          "{} / {} (res × duration × aspect × image_combo) tuples failed \
+           the ≥29% (with 1¢ tolerance) margin check.\nFirst 10:\n  {}",
+          failures.len(), total_cases, summary,
+        );
+      }
+    }
+
+    // ── Cross-provider helpers ──
+
+    fn artcraft_cents(
+      resolution: Option<RouterResolution>,
+      duration_seconds: u16,
+      aspect_ratio: Option<RouterAspectRatio>,
+      has_start_frame: bool,
+      num_reference_images: usize,
+    ) -> u64 {
+      let start_frame = if has_start_frame {
+        // ArtCraft's omni endpoint takes MediaFileTokens for image refs.
+        Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_start".to_string())))
+      } else { None };
+      let reference_images = if num_reference_images > 0 {
+        Some(ImageListRef::MediaFileTokens(
+          (0..num_reference_images)
+            .map(|i| MediaFileToken::new(format!("mf_ref_{i}")))
+            .collect(),
+        ))
+      } else { None };
+
+      let builder = GenerateVideoRequestBuilder {
+        model: RouterVideoModel::GrokImagineVideo,
+        provider: RouterProvider::Artcraft,
+        resolution,
+        aspect_ratio,
+        duration_seconds: Some(duration_seconds),
+        // Batch is fixed at 1 because GrokApi's per-request cost calculator
+        // doesn't multiply by batch (Grok returns one video per call); the
+        // markup test would compare apples to oranges otherwise.
+        video_batch_count: Some(1),
+        start_frame,
+        reference_images,
+        ..Default::default()
+      };
+      builder.build2()
+        .expect("build2 (artcraft) should succeed")
+        .estimate_cost()
+        .expect("estimate_cost (artcraft) should succeed")
+        .cost_in_usd_cents
+        .unwrap()
+    }
+
+    fn grokapi_cents(
+      resolution: Option<RouterResolution>,
+      duration_seconds: u16,
+      aspect_ratio: Option<RouterAspectRatio>,
+      has_start_frame: bool,
+      num_reference_images: usize,
+    ) -> u64 {
+      let start_frame = if has_start_frame {
+        // GrokApi (direct xAI) takes URLs for image refs.
+        Some(ImageRef::Url("https://example.com/start.png".to_string()))
+      } else { None };
+      let reference_images = if num_reference_images > 0 {
+        Some(ImageListRef::Urls(
+          (0..num_reference_images)
+            .map(|i| format!("https://example.com/ref_{i}.png"))
+            .collect(),
+        ))
+      } else { None };
+
+      let builder = GenerateVideoRequestBuilder {
+        model: RouterVideoModel::GrokImagineVideo,
+        provider: RouterProvider::GrokApi,
+        resolution,
+        aspect_ratio,
+        duration_seconds: Some(duration_seconds),
+        video_batch_count: Some(1),
+        start_frame,
+        reference_images,
+        ..Default::default()
+      };
+      builder.build2()
+        .expect("build2 (grokapi) should succeed")
+        .estimate_cost()
+        .expect("estimate_cost (grokapi) should succeed")
+        .cost_in_usd_cents
+        .unwrap()
+    }
+  }
+
   // ── Helpers ──
 
   fn build_cost(

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

@@ -144,6 +144,113 @@ mod tests {
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
   use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 
+  // ── Base cost parity with grok_api_client ─────────────────────────────
+  //
+  // The base cost (before ArtCraft markup, batch=1) must equal exactly what
+  // grok_api_client's calculator returns for an equivalent direct-Grok
+  // request. This protects against the artcraft and grok-api implementations
+  // silently drifting apart.
+
+  mod grok_api_parity {
+    use super::*;
+
+    // (resolution, duration, image_count)
+    //
+    // Durations are confined to [4, 15] because the ArtCraft pipeline clamps
+    // outside that range (see `plan_duration` in artcraft/build_common.rs).
+    // Every case carries exactly one image. v1.5 rejects text-to-video, AND
+    // the GrokApi build step collapses multi-image reference-to-video
+    // requests down to one `image` (promote-first; see grok_api side
+    // build.rs). So the only request shape where both sides agree on the
+    // input image count is the single-image case.
+    const PARITY_CASES: &[(Option<RouterResolution>, u16, u64)] = &[
+      // 480p variations
+      (Some(RouterResolution::FourEightyP),  4, 1),
+      (Some(RouterResolution::FourEightyP),  5, 1),
+      (Some(RouterResolution::FourEightyP),  8, 1),
+      (Some(RouterResolution::FourEightyP), 15, 1),
+      // 720p variations
+      (Some(RouterResolution::SevenTwentyP),  4, 1),
+      (Some(RouterResolution::SevenTwentyP),  5, 1),
+      (Some(RouterResolution::SevenTwentyP),  8, 1),
+      (Some(RouterResolution::SevenTwentyP), 15, 1),
+      // None defaults to 720p in our `from_request`, which matches the
+      // assumption Grok's calculator makes when fed a 720p request.
+      (None,                                  5, 1),
+    ];
+
+    #[test]
+    fn base_cost_for_one_video_matches_grok_api_client() {
+      for &(router_res, duration, image_count) in PARITY_CASES {
+        let artcraft = artcraft_state(router_res, duration, image_count, 1);
+        let grok_cents = grok_cents(router_res, duration, image_count);
+
+        assert_eq!(
+          artcraft.base_cost_in_cents_for_one_video(),
+          grok_cents,
+          "parity mismatch at res={router_res:?} dur={duration} images={image_count}: \
+           artcraft_base={} grok={}",
+          artcraft.base_cost_in_cents_for_one_video(),
+          grok_cents,
+        );
+      }
+    }
+
+    #[test]
+    fn batch_one_base_total_equals_one_video_base() {
+      let s = artcraft_state(Some(RouterResolution::SevenTwentyP), 5, 1, 1);
+      assert_eq!(s.base_cost_in_cents_for_batch(), s.base_cost_in_cents_for_one_video());
+    }
+
+    #[test]
+    fn batch_scales_base_linearly() {
+      // The ArtCraft pipeline only accepts batch counts of 1, 2, or 4 (see
+      // `plan_batch_count` in artcraft/build_common.rs); anything else gets
+      // clamped, so we can only meaningfully test those values.
+      let per_one = artcraft_state(Some(RouterResolution::SevenTwentyP), 5, 1, 1)
+        .base_cost_in_cents_for_one_video();
+      for batch in [1u16, 2, 4] {
+        let s = artcraft_state(Some(RouterResolution::SevenTwentyP), 5, 1, batch);
+        assert_eq!(
+          s.base_cost_in_cents_for_batch(),
+          per_one * batch as u64,
+          "batch={batch}",
+        );
+      }
+    }
+
+    /// Builder-driven parity — exercises the full pipeline (build2 →
+    /// estimate_cost) on both providers and compares ArtCraft's base cost
+    /// (final / 1.05, accounting for ceiling) against GrokApi's direct
+    /// cost.
+    ///
+    /// We verify the markup rather than the base here because the public
+    /// `estimate_cost()` returns the marked-up number; the explicit
+    /// `base_cost_in_cents_*` API is tested above.
+    #[test]
+    fn end_to_end_markup_is_at_least_five_percent_over_grok() {
+      // Single-image cases only — see PARITY_CASES comment above for why
+      // multi-image rows can't be apples-to-apples between the two sides.
+      let cases: &[(Option<RouterResolution>, u16, bool, usize)] = &[
+        (Some(RouterResolution::FourEightyP),  5, true,  0),
+        (Some(RouterResolution::FourEightyP), 10, true,  0),
+        (Some(RouterResolution::SevenTwentyP), 5, true,  0),
+        (Some(RouterResolution::SevenTwentyP), 8, true,  0),
+        (Some(RouterResolution::SevenTwentyP),15, true,  0),
+      ];
+      for &(res, duration, has_start, refs) in cases {
+        let artcraft_cents = artcraft_end_to_end_cents(res, duration, 1, has_start, refs);
+        let grok_cents = grok_cents(res, duration, has_start as u64 + refs as u64);
+        let want_minimum = grok_cents.saturating_mul(MARKUP_NUMERATOR).div_ceil(MARKUP_DENOMINATOR);
+        assert_eq!(
+          artcraft_cents, want_minimum,
+          "res={res:?} dur={duration} start={has_start} refs={refs}: \
+           artcraft={artcraft_cents}¢ vs ceil(grok({grok_cents})×1.05)={want_minimum}¢",
+        );
+      }
+    }
+  }
+
   // ── Markup correctness ─────────────────────────────────────────────────
 
   mod markup {
@@ -377,6 +484,42 @@ mod tests {
     }
   }
 
+  fn artcraft_end_to_end_cents(
+    resolution: Option<RouterResolution>,
+    duration_seconds: u16,
+    batch_count: u16,
+    has_start_frame: bool,
+    num_reference_images: usize,
+  ) -> u64 {
+    let start_frame = if has_start_frame {
+      Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_start".to_string())))
+    } else { None };
+    let reference_images = if num_reference_images > 0 {
+      Some(ImageListRef::MediaFileTokens(
+        (0..num_reference_images)
+          .map(|i| MediaFileToken::new(format!("mf_ref_{i}")))
+          .collect(),
+      ))
+    } else { None };
+
+    let builder = GenerateVideoRequestBuilder {
+      model: RouterVideoModel::GrokImagineVideo1p5,
+      provider: RouterProvider::Artcraft,
+      resolution,
+      duration_seconds: Some(duration_seconds),
+      video_batch_count: Some(batch_count),
+      start_frame,
+      reference_images,
+      ..Default::default()
+    };
+    builder.build2()
+      .expect("build2 should succeed")
+      .estimate_cost()
+      .expect("estimate_cost should succeed")
+      .cost_in_usd_cents
+      .unwrap()
+  }
+
   fn build_cost_via_builder(
     resolution: Option<RouterResolution>,
     duration_seconds: u16,
@@ -399,4 +542,40 @@ mod tests {
       .expect("estimate_cost should succeed")
   }
 
+  /// Reference value: what GrokApi's own pipeline would charge for one
+  /// equivalent video. Used by parity tests.
+  ///
+  /// The Grok build step prefers `start_frame` over `reference_images` when
+  /// both are supplied and drops the latter (see grok_api/grok_imagine_video_1p5/build.rs).
+  /// To keep parity with the ArtCraft input-image *count*, we put all source
+  /// images in `reference_images` only — the cost calculator counts the total
+  /// either way.
+  fn grok_cents(
+    resolution: Option<RouterResolution>,
+    duration_seconds: u16,
+    image_count: u64,
+  ) -> u64 {
+    let reference_images = if image_count >= 1 {
+      Some(ImageListRef::Urls(
+        (0..image_count).map(|i| format!("https://example.com/ref_{i}.png")).collect(),
+      ))
+    } else { None };
+
+    let builder = GenerateVideoRequestBuilder {
+      model: RouterVideoModel::GrokImagineVideo1p5,
+      provider: RouterProvider::GrokApi,
+      resolution,
+      duration_seconds: Some(duration_seconds),
+      video_batch_count: Some(1),
+      start_frame: None,
+      reference_images,
+      ..Default::default()
+    };
+    builder.build2()
+      .expect("build2 (grokapi) should succeed")
+      .estimate_cost()
+      .expect("estimate_cost (grokapi) should succeed")
+      .cost_in_usd_cents
+      .unwrap()
+  }
 }

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

@@ -14,16 +14,13 @@ use crate::generate::generate_video::providers::artcraft::happy_horse_1p0::reque
 //
 // Default resolution (None) is 720p.
 // Batch count multiplies the total cost.
-// Credit package (historical): 22,000 credits for $114 (~193 credits/$1).
-// The upstream package is now 525,000 credits for $2,159.0909 (~243 credits/$1),
-// but user pricing is intentionally kept at the 193-derived rates.
+// Credit package: 22,000 credits for $114 (~192.98 credits/$1, rounded to 193).
 //
 // ArtCraft credits: 100 credits = $1.00, so ArtCraft credits = USD cents.
 // We compute USD cents from upstream credits ÷ credits_per_dollar × 100.
 
 const UPSTREAM_CREDITS_PER_SECOND_720P: u32 = 33;
 const UPSTREAM_CREDITS_PER_SECOND_1080P: u32 = 66;
-// Frozen at the historical rate so user pricing doesn't shift with the package deal.
 const UPSTREAM_CREDITS_PER_DOLLAR: f64 = 193.0;
 
 pub struct ArtcraftHappyHorse1p0CostState {
@@ -204,6 +201,50 @@ mod tests {
     }
   }
 
+  // ── Cross-check with Kinovi ──
+
+  mod cross_check_with_kinovi {
+    use super::*;
+
+    #[test]
+    fn artcraft_matches_kinovi_all_combos() {
+      let resolutions = [
+        Some(RouterResolution::SevenTwentyP),
+        None,
+        Some(RouterResolution::TenEightyP),
+      ];
+      let durations: [u16; 4] = [4, 5, 10, 15];
+      let batches: [u16; 3] = [1, 2, 4];
+
+      for res in &resolutions {
+        for dur in &durations {
+          for batch in &batches {
+            let artcraft_cost = build_cost(*res, *dur, *batch);
+
+            let kinovi = GenerateVideoRequestBuilder {
+              model: RouterVideoModel::HappyHorse1p0,
+              provider: RouterProvider::Seedance2Pro,
+              resolution: *res,
+              duration_seconds: Some(*dur),
+              video_batch_count: Some(*batch),
+              ..Default::default()
+            };
+            let kinovi_cost = kinovi.build2()
+              .expect("kinovi build2")
+              .estimate_cost()
+              .expect("kinovi estimate_cost");
+
+            assert_eq!(
+              artcraft_cost.cost_in_usd_cents, kinovi_cost.cost_in_usd_cents,
+              "USD cents mismatch: res={:?} dur={}s batch={}",
+              res, dur, batch,
+            );
+          }
+        }
+      }
+    }
+  }
+
   // ── Helpers ──
 
   fn build_cost(

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

@@ -18,10 +18,6 @@ use crate::generate::generate_video::providers::artcraft::seedance_2p0::request:
 ///
 /// We keep these as f64 because per-second rates are fractional; rounding
 /// happens once at the end after multiplying by duration × batch.
-///
-/// NB: Derivation is historical (193 credits/$1 package). The upstream
-/// package is now 525,000 credits for $2,159.0909 (~243 credits/$1), but
-/// user pricing is intentionally kept at these 193-derived rates.
 const CENTS_PER_SECOND_480P: f64 = 7.772;
 const CENTS_PER_SECOND_720P: f64 = 16.0;
 const CENTS_PER_SECOND_1080P: f64 = 46.632;
@@ -218,6 +214,51 @@ mod tests {
     }
   }
 
+  // -- Cross-check with Kinovi via builder --
+
+  mod cross_check_with_kinovi {
+    use super::*;
+
+    #[test]
+    fn artcraft_matches_kinovi_all_combos() {
+      let resolutions = [
+        Some(RouterResolution::FourEightyP),
+        Some(RouterResolution::TenEightyP),
+        // NB: These are underpriced (for now)
+        //Some(RouterResolution::SevenTwentyP),
+        //None,
+      ];
+      let durations: [u16; 4] = [4, 5, 10, 15];
+      let batches: [u16; 3] = [1, 2, 4];
+
+      for res in &resolutions {
+        for dur in &durations {
+          for batch in &batches {
+            let artcraft_cost = build_cost(*res, *dur, *batch);
+
+            let kinovi = GenerateVideoRequestBuilder {
+              provider: RouterProvider::Seedance2Pro,
+              resolution: *res,
+              duration_seconds: Some(*dur),
+              video_batch_count: Some(*batch),
+              ..Default::default()
+            };
+            let kinovi_cost = kinovi.build2()
+              .expect("kinovi build2")
+              .estimate_cost()
+              .expect("kinovi estimate_cost");
+
+            assert_eq!(
+              artcraft_cost.cost_in_usd_cents, kinovi_cost.cost_in_usd_cents,
+              "USD cents mismatch: res={:?} dur={}s batch={}",
+              res, dur, batch,
+            );
+          }
+        }
+      }
+    }
+  }
+
   // -- Helpers --
 
   /// Build a cost estimate end-to-end: GenerateVideoRequestBuilder → build2 → estimate_cost.

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

@@ -154,8 +154,6 @@ mod tests {
     }
   }
 
-  // -- Helpers --
-
   fn build_cost(
     resolution: Option<RouterResolution>,
     duration_seconds: u16,

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

@@ -125,8 +125,6 @@ mod tests {
     }
   }
 
-  // -- Helpers --
-
   fn build_cost(
     resolution: Option<RouterResolution>,
     duration_seconds: u16,

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

@@ -154,8 +154,6 @@ mod tests {
     }
   }
 
-  // -- Helpers --
-
   fn build_cost(
     resolution: Option<RouterResolution>,
     duration_seconds: u16,

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

@@ -125,8 +125,6 @@ mod tests {
     }
   }
 
-  // -- Helpers --
-
   fn build_cost(
     resolution: Option<RouterResolution>,
     duration_seconds: u16,

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

@@ -13,8 +13,6 @@ use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::req
 
 /// USD cents per second by resolution, derived from upstream Fast rates:
 ///   480p:  10 upstream-credits/sec / 193 upstream-credits/$1 * 100 ~= 5.181 c/s
-///   (historical 193 credits/$1 derivation; the upstream package is now
-///   ~243 credits/$1 but user pricing is intentionally unchanged)
 ///   720p:  28 upstream-credits/sec / 220 upstream-credits/$1 * 100 ~= 12.727 c/s
 ///
 /// We keep these as f64 because per-second rates are fractional; rounding
@@ -186,6 +184,50 @@ mod tests {
     }
   }
 
+  // -- Cross-check with Kinovi Fast via builder --
+
+  //mod cross_check_with_kinovi {
+  //  use super::*;
+  //
+  //  #[test]
+  //  fn artcraft_fast_matches_kinovi_fast_all_combos() {
+  //    let resolutions = [
+  //      Some(RouterResolution::FourEightyP),
+  //      Some(RouterResolution::SevenTwentyP),
+  //      None,
+  //    ];
+  //    let durations: [u16; 4] = [4, 5, 10, 15];
+  //    let batches: [u16; 3] = [1, 2, 4];
+  //
+  //    for res in &resolutions {
+  //      for dur in &durations {
+  //        for batch in &batches {
+  //          let artcraft_cost = build_cost(*res, *dur, *batch);
+  //
+  //          let kinovi = GenerateVideoRequestBuilder {
+  //            model: RouterVideoModel::Seedance2p0Fast,
+  //            provider: RouterProvider::Seedance2Pro,
+  //            resolution: *res,
+  //            duration_seconds: Some(*dur),
+  //            video_batch_count: Some(*batch),
+  //            ..Default::default()
+  //          };
+  //          let kinovi_cost = kinovi.build2()
+  //            .expect("kinovi build2")
+  //            .estimate_cost()
+  //            .expect("kinovi estimate_cost");
+  //
+  //          assert_eq!(
+  //            artcraft_cost.cost_in_usd_cents, kinovi_cost.cost_in_usd_cents,
+  //            "USD cents mismatch: res={:?} dur={}s batch={}",
+  //            res, dur, batch,
+  //          );
+  //        }
+  //      }
+  //    }
+  //  }
+  //}
+
   // -- Helpers --
 
   fn build_cost(

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

@@ -159,8 +159,6 @@ mod tests {
     }
   }
 
-  // -- Helpers --
-
   fn build_cost(
     resolution: Option<RouterResolution>,
     duration_seconds: u16,

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

@@ -144,8 +144,6 @@ mod tests {
     }
   }
 
-  // -- Helpers --
-
   fn build_cost(
     resolution: Option<RouterResolution>,
     duration_seconds: u16,

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

@@ -42,12 +42,11 @@ impl KinoviHappyHorse1p0CostState {
       start_frame_url: None,
     };
 
-    let costs = pricing_request.calculate_costs();
-    let cost_in_credits = costs.kinovi_credits;
-    let cost_in_usd_cents = costs.usd_cents_rounded_up;
+    let cost_in_credits = pricing_request.estimate_credits();
+    let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
 
     VideoGenerationCostEstimate {
-      cost_in_credits: Some(cost_in_credits),
+      cost_in_credits: Some(cost_in_credits as u64),
       cost_in_usd_cents: Some(cost_in_usd_cents),
       is_free: false,
       is_unlimited: false,
@@ -98,8 +97,10 @@ mod tests {
 
     #[test]
     fn usd_cents_720p() {
-      assert_eq!(usd_cents(None, 5, None), 68); // 16500/243 = 67.90 -> rounds UP
-      assert_eq!(usd_cents(None, 15, None), 204); // 49500/243 = 203.70 -> rounds UP
+      // 165 credits / 193 * 100 = 85.49 → 85¢
+      assert_eq!(usd_cents(None, 5, None), 85);
+      // 495 credits / 193 * 100 = 256.48 → 256¢
+      assert_eq!(usd_cents(None, 15, None), 256);
     }
   }
 
@@ -129,10 +130,10 @@ mod tests {
     #[test]
     fn usd_cents_1080p() {
       let r = Some(KinoviHappyHorse1p0OutputResolution::TenEightyP);
-      // 330 credits; 33000/243 = 135.80 → rounds UP to 136¢
-      assert_eq!(usd_cents(r, 5, None), 136);
-      // 990 credits; 99000/243 = 407.41 → rounds UP to 408¢
-      assert_eq!(usd_cents(r, 15, None), 408);
+      // 330 credits / 193 * 100 = 170.98 → 171¢
+      assert_eq!(usd_cents(r, 5, None), 171);
+      // 990 credits / 193 * 100 = 512.95 → 513¢
+      assert_eq!(usd_cents(r, 15, None), 513);
     }
   }
 
@@ -236,7 +237,7 @@ mod tests {
       );
       let cost = KinoviHappyHorse1p0CostState::from_request(&req);
       assert_eq!(cost.estimate_cost().cost_in_credits, Some(330));
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(136));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(171));
     }
   }
 

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

@@ -46,31 +46,23 @@ impl KinoviSeedance2p0CostState {
       duration_seconds: self.duration_seconds,
       batch_count: self.batch_count,
 
-      // PRESENCE of reference videos changes the price (per-second
-      // surcharge); the URL contents don't.
-      reference_video_urls: if self.has_video_reference {
-        Some(vec!["pricing-placeholder".to_string()])
-      } else {
-        None
-      },
-
       // No impact on price
       prompt: String::new(),
       aspect_ratio: None,
       start_frame_url: None,
       end_frame_url: None,
       reference_image_urls: None,
+      reference_video_urls: None,
       reference_audio_urls: None,
       character_ids: None,
       use_face_blur_hack: None,
     };
 
-    let costs = pricing_request.calculate_costs();
-    let cost_in_credits = costs.total_cost.kinovi_credits;
-    let cost_in_usd_cents = costs.total_cost.usd_cents_rounded_up;
+    let cost_in_credits = pricing_request.estimate_credits();
+    let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
 
     VideoGenerationCostEstimate {
-      cost_in_credits: Some(cost_in_credits),
+      cost_in_credits: Some(cost_in_credits as u64),
       cost_in_usd_cents: Some(cost_in_usd_cents),
       is_free: false,
       is_unlimited: false,
@@ -103,26 +95,26 @@ mod tests {
 
     #[test]
     fn cost_720p_batch_1() {
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::One), 66);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::One), 83);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 6, KinoviBatchCount::One), 99);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 7, KinoviBatchCount::One), 116);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 10, KinoviBatchCount::One), 165);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::One), 247);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::One), 83);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::One), 104);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 6, KinoviBatchCount::One), 124);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 7, KinoviBatchCount::One), 145);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 10, KinoviBatchCount::One), 207);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::One), 311);
     }
 
     #[test]
     fn cost_720p_batch_2() {
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::Two), 132);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Two), 165);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::Two), 494);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::Two), 166);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Two), 207);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::Two), 622);
     }
 
     #[test]
     fn cost_720p_batch_4() {
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::Four), 264);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Four), 330);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::Four), 988);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::Four), 332);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Four), 415);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::Four), 1244);
     }
   }
 
@@ -133,20 +125,20 @@ mod tests {
 
     #[test]
     fn cost_480p_batch_1() {
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 4, KinoviBatchCount::One), 25);
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::One), 31);
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 10, KinoviBatchCount::One), 62);
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 15, KinoviBatchCount::One), 93);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 4, KinoviBatchCount::One), 31);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::One), 39);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 10, KinoviBatchCount::One), 78);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 15, KinoviBatchCount::One), 117);
     }
 
     #[test]
     fn cost_480p_batch_2() {
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Two), 62);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Two), 78);
     }
 
     #[test]
     fn cost_480p_batch_4() {
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Four), 124);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Four), 155);
     }
   }
 
@@ -157,20 +149,20 @@ mod tests {
 
     #[test]
     fn cost_1080p_batch_1() {
-      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 4, KinoviBatchCount::One), 149);
-      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 5, KinoviBatchCount::One), 186);
-      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 10, KinoviBatchCount::One), 371);
-      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 15, KinoviBatchCount::One), 556);
+      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 4, KinoviBatchCount::One), 187);
+      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 5, KinoviBatchCount::One), 233);
+      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 10, KinoviBatchCount::One), 466);
+      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 15, KinoviBatchCount::One), 699);
     }
 
     #[test]
     fn cost_1080p_batch_2() {
-      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 5, KinoviBatchCount::Two), 371);
+      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 5, KinoviBatchCount::Two), 466);
     }
 
     #[test]
     fn cost_1080p_batch_4() {
-      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 5, KinoviBatchCount::Four), 741);
+      assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 5, KinoviBatchCount::Four), 933);
     }
   }
 
@@ -210,7 +202,7 @@ mod tests {
   // -- Video reference does NOT affect cost (yet) --
 
   #[test]
-  fn video_reference_adds_surcharge() {
+  fn video_reference_does_not_affect_cost() {
     let base = KinoviSeedance2p0CostState {
       resolution: Some(KinoviOutputResolution::SevenTwentyP),
       duration_seconds: 5,
@@ -219,10 +211,8 @@ mod tests {
     };
     let without = base.estimate_cost();
     let with = KinoviSeedance2p0CostState { has_video_reference: true, ..base }.estimate_cost();
-    // 720p surcharge is +8 credits/s: 200 -> 240 credits (24000/243 = 98.77 -> 99 cents).
-    assert_eq!(without.cost_in_credits, Some(200));
-    assert_eq!(with.cost_in_credits, Some(240));
-    assert_eq!(with.cost_in_usd_cents, Some(99));
+    assert_eq!(without.cost_in_usd_cents, with.cost_in_usd_cents);
+    assert_eq!(without.cost_in_credits, with.cost_in_credits);
   }
 
   // ── from_request() tests ──
@@ -238,7 +228,7 @@ mod tests {
       assert_eq!(cost.duration_seconds, 5);
       assert!(matches!(cost.batch_count, Some(KinoviBatchCount::One)));
       assert!(!cost.has_video_reference);
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(83));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(104));
     }
 
     #[test]
@@ -246,21 +236,21 @@ mod tests {
       let req = make_request_state(None, 5, KinoviBatchCount::One, false);
       let cost = KinoviSeedance2p0CostState::from_request(&req);
       assert!(cost.resolution.is_none()); // None defaults to 720p pricing
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(83));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(104));
     }
 
     #[test]
     fn from_request_480p() {
       let req = make_request_state(Some(KinoviOutputResolution::FourEightyP), 5, KinoviBatchCount::One, false);
       let cost = KinoviSeedance2p0CostState::from_request(&req);
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(31));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(39));
     }
 
     #[test]
     fn from_request_1080p_batch_2() {
       let req = make_request_state(Some(KinoviOutputResolution::TenEightyP), 5, KinoviBatchCount::Two, false);
       let cost = KinoviSeedance2p0CostState::from_request(&req);
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(371));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(466));
     }
 
     #[test]
@@ -268,9 +258,8 @@ mod tests {
       let req = make_request_state(Some(KinoviOutputResolution::SevenTwentyP), 5, KinoviBatchCount::One, true);
       let cost = KinoviSeedance2p0CostState::from_request(&req);
       assert!(cost.has_video_reference);
-      // Video refs add a +8 credits/s surcharge at 720p: 240 credits -> 125 cents.
-      assert_eq!(cost.estimate_cost().cost_in_credits, Some(240));
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(99));
+      // Video refs don't affect cost yet
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(104));
     }
 
     #[test]
@@ -294,7 +283,7 @@ mod tests {
       assert_eq!(cost.duration_seconds, 5);
       assert!(matches!(cost.batch_count, Some(KinoviBatchCount::One)));
       assert!(!cost.has_video_reference);
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(83));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(104));
     }
 
     #[test]
@@ -302,7 +291,7 @@ mod tests {
       let draft = make_draft(5, 1, Some(RouterResolution::FourEightyP), false);
       let cost = KinoviSeedance2p0CostState::from_draft(&draft);
       assert!(matches!(cost.resolution, Some(KinoviOutputResolution::FourEightyP)));
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(31));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(39));
     }
 
     #[test]
@@ -311,7 +300,7 @@ mod tests {
       let cost = KinoviSeedance2p0CostState::from_draft(&draft);
       assert!(matches!(cost.resolution, Some(KinoviOutputResolution::TenEightyP)));
       assert!(matches!(cost.batch_count, Some(KinoviBatchCount::Four)));
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(741));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(933));
     }
 
     #[test]
@@ -319,9 +308,8 @@ mod tests {
       let draft = make_draft(5, 1, None, true);
       let cost = KinoviSeedance2p0CostState::from_draft(&draft);
       assert!(cost.has_video_reference);
-      // Video refs add a +8 credits/s surcharge at 720p: 240 credits -> 125 cents.
-      assert_eq!(cost.estimate_cost().cost_in_credits, Some(240));
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(99));
+      // Video refs don't affect cost yet
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(104));
     }
 
     #[test]
@@ -337,7 +325,7 @@ mod tests {
       let cost = KinoviSeedance2p0CostState::from_draft(&draft);
       assert_eq!(cost.duration_seconds, 15);
       assert!(matches!(cost.batch_count, Some(KinoviBatchCount::Two)));
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(494));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(622));
     }
   }
 

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

@@ -46,31 +46,23 @@ impl KinoviSeedance2p0FastCostState {
       duration_seconds: self.duration_seconds,
       batch_count: self.batch_count,
 
-      // PRESENCE of reference videos changes the price (per-second
-      // surcharge); the URL contents don't.
-      reference_video_urls: if self.has_video_reference {
-        Some(vec!["pricing-placeholder".to_string()])
-      } else {
-        None
-      },
-
       // No impact on price
       prompt: String::new(),
       aspect_ratio: None,
       start_frame_url: None,
       end_frame_url: None,
       reference_image_urls: None,
+      reference_video_urls: None,
       reference_audio_urls: None,
       character_ids: None,
       use_face_blur_hack: None,
     };
 
-    let costs = pricing_request.calculate_costs();
-    let cost_in_credits = costs.total_cost.kinovi_credits;
-    let cost_in_usd_cents = costs.total_cost.usd_cents_rounded_up;
+    let cost_in_credits = pricing_request.estimate_credits();
+    let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
 
     VideoGenerationCostEstimate {
-      cost_in_credits: Some(cost_in_credits),
+      cost_in_credits: Some(cost_in_credits as u64),
       cost_in_usd_cents: Some(cost_in_usd_cents),
       is_free: false,
       is_unlimited: false,
@@ -100,51 +92,51 @@ mod tests {
   // ── Direct estimate_cost() tests ──
   // These must match the reference implementation values exactly.
 
-  // -- 720p (28 credits/sec, 243 credits/$1) --
+  // -- 720p (28 credits/sec, 193 credits/$1) --
 
   mod pricing_720p {
     use super::*;
 
     #[test]
     fn cost_720p_batch_1() {
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::One), 47);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::One), 58);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 10, KinoviBatchCount::One), 116);
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::One), 173);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::One), 58);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::One), 73);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 10, KinoviBatchCount::One), 145);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::One), 218);
     }
 
     #[test]
     fn cost_720p_batch_2() {
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Two), 116);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Two), 145);
     }
 
     #[test]
     fn cost_720p_batch_4() {
-      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Four), 231);
+      assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Four), 290);
     }
   }
 
-  // -- 480p (14 credits/sec, 243 credits/$1) --
+  // -- 480p (14 credits/sec, 193 credits/$1) --
 
   mod pricing_480p {
     use super::*;
 
     #[test]
     fn cost_480p_batch_1() {
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 4, KinoviBatchCount::One), 24);
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::One), 29);
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 10, KinoviBatchCount::One), 58);
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 15, KinoviBatchCount::One), 87);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 4, KinoviBatchCount::One), 29);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::One), 36);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 10, KinoviBatchCount::One), 73);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 15, KinoviBatchCount::One), 109);
     }
 
     #[test]
     fn cost_480p_batch_2() {
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Two), 58);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Two), 73);
     }
 
     #[test]
     fn cost_480p_batch_4() {
-      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Four), 116);
+      assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Four), 145);
     }
   }
 
@@ -182,7 +174,7 @@ mod tests {
   // -- Video reference does NOT affect cost (yet) --
 
   #[test]
-  fn video_reference_adds_surcharge() {
+  fn video_reference_does_not_affect_cost() {
     let base = KinoviSeedance2p0FastCostState {
       resolution: Some(KinoviOutputResolution::SevenTwentyP),
       duration_seconds: 5,
@@ -191,10 +183,8 @@ mod tests {
     };
     let without = base.estimate_cost();
     let with = KinoviSeedance2p0FastCostState { has_video_reference: true, ..base }.estimate_cost();
-    // Fast 720p surcharge is +6 credits/s: 140 -> 170 credits (17000/243 = 69.96 -> 70 cents).
-    assert_eq!(without.cost_in_credits, Some(140));
-    assert_eq!(with.cost_in_credits, Some(170));
-    assert_eq!(with.cost_in_usd_cents, Some(70));
+    assert_eq!(without.cost_in_usd_cents, with.cost_in_usd_cents);
+    assert_eq!(without.cost_in_credits, with.cost_in_credits);
   }
 
   // ── from_request() tests ──
@@ -210,7 +200,7 @@ mod tests {
       assert_eq!(cost.duration_seconds, 5);
       assert!(matches!(cost.batch_count, Some(KinoviBatchCount::One)));
       assert!(!cost.has_video_reference);
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(58));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(73));
     }
 
     #[test]
@@ -218,14 +208,14 @@ mod tests {
       let req = make_request_state(None, 5, KinoviBatchCount::One, false);
       let cost = KinoviSeedance2p0FastCostState::from_request(&req);
       assert!(cost.resolution.is_none());
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(58));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(73));
     }
 
     #[test]
     fn from_request_480p() {
       let req = make_request_state(Some(KinoviOutputResolution::FourEightyP), 5, KinoviBatchCount::One, false);
       let cost = KinoviSeedance2p0FastCostState::from_request(&req);
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(29));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(36));
     }
 
     #[test]
@@ -233,9 +223,8 @@ mod tests {
       let req = make_request_state(Some(KinoviOutputResolution::SevenTwentyP), 5, KinoviBatchCount::One, true);
       let cost = KinoviSeedance2p0FastCostState::from_request(&req);
       assert!(cost.has_video_reference);
-      // Video refs add a +6 credits/s surcharge at 720p: 170 credits -> 89 cents.
-      assert_eq!(cost.estimate_cost().cost_in_credits, Some(170));
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(70));
+      // Video refs don't affect cost yet
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(73));
     }
 
     #[test]
@@ -259,7 +248,7 @@ mod tests {
       assert_eq!(cost.duration_seconds, 5);
       assert!(matches!(cost.batch_count, Some(KinoviBatchCount::One)));
       assert!(!cost.has_video_reference);
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(58));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(73));
     }
 
     #[test]
@@ -267,7 +256,7 @@ mod tests {
       let draft = make_draft(5, 1, Some(RouterResolution::FourEightyP), false);
       let cost = KinoviSeedance2p0FastCostState::from_draft(&draft);
       assert!(matches!(cost.resolution, Some(KinoviOutputResolution::FourEightyP)));
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(29));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(36));
     }
 
     #[test]
@@ -275,9 +264,8 @@ mod tests {
       let draft = make_draft(5, 1, None, true);
       let cost = KinoviSeedance2p0FastCostState::from_draft(&draft);
       assert!(cost.has_video_reference);
-      // Video refs add a +6 credits/s surcharge at 720p: 170 credits -> 89 cents.
-      assert_eq!(cost.estimate_cost().cost_in_credits, Some(170));
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(70));
+      // Video refs don't affect cost yet
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(73));
     }
 
     #[test]
@@ -293,7 +281,7 @@ mod tests {
       let cost = KinoviSeedance2p0FastCostState::from_draft(&draft);
       assert_eq!(cost.duration_seconds, 15);
       assert!(matches!(cost.batch_count, Some(KinoviBatchCount::Two)));
-      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(346));
+      assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(435));
     }
   }
 

crates/api_clients/comet_api_client/Cargo.toml

@@ -1,30 +0,0 @@
-[package]
-name = "comet_api_client"
-edition = "2024"
-version = "0.0.1"
-publish = false
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
-[lib]
-name = "comet_api_client"
-path = "src/lib.rs"
-
-[dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration.workspace = true
-
-# External
-log.workspace = true
-# `multipart` is enabled on top of the workspace feature set because the
-# CometAPI video creation endpoint takes `multipart/form-data` (the
-# `input_reference` image fields are binary parts).
-reqwest = { workspace = true, features = ["multipart"] }
-serde.workspace = true
-serde_derive.workspace = true
-serde_json.workspace = true
-
-[dev-dependencies]
-test_data = { path = "../../testing/test_data" }
-tokio = { version = "1", features = ["full"] }

crates/api_clients/comet_api_client/src/creds/comet_api_key.rs

@@ -1,17 +0,0 @@
-/// A CometAPI key used for Bearer token authentication.
-#[derive(Clone)]
-pub struct CometApiKey(pub String);
-
-impl CometApiKey {
-  pub fn new(api_key: String) -> Self {
-    Self(api_key.trim().to_string())
-  }
-
-  pub fn from_str(api_key: &str) -> Self {
-    Self(api_key.trim().to_string())
-  }
-
-  pub fn as_str(&self) -> &str {
-    &self.0
-  }
-}

crates/api_clients/comet_api_client/src/creds/mod.rs

@@ -1 +0,0 @@
-pub mod comet_api_key;

crates/api_clients/comet_api_client/src/error/categorize_comet_error.rs

@@ -1,157 +0,0 @@
-use reqwest::StatusCode;
-
-use crate::error::comet_bad_request_api_error::CometBadRequestApiError;
-use crate::error::comet_error::CometError;
-use crate::error::comet_generic_api_error::CometGenericApiError;
-use crate::error::comet_specific_api_error::CometSpecificApiError;
-
-/// Marker CometAPI returns from `GET /v1/videos/{id}` for unknown task ids.
-const TASK_NOT_EXIST_MARKER: &str = "task_not_exist";
-
-/// Categorize a non-success response from the video creation endpoint
-/// (`POST /v1/videos`).
-///
-/// Per the docs, 400s from this endpoint mean the request itself was invalid
-/// (missing prompt, out-of-range duration, image input on an unsupported
-/// model) — the caller's fault, surfaced as [`CometBadRequestApiError`].
-pub fn categorize_create_video_error(
-  status_code: StatusCode,
-  body: String,
-) -> CometError {
-  if status_code == StatusCode::UNAUTHORIZED {
-    return CometSpecificApiError::UnauthorizedInvalidApiKey { raw_body: body }.into();
-  }
-
-  if status_code == StatusCode::BAD_REQUEST {
-    return CometBadRequestApiError::InvalidRequestParameters { raw_body: body }.into();
-  }
-
-  CometGenericApiError::UncategorizedBadResponseWithStatusAndBody {
-    status_code,
-    body,
-  }.into()
-}
-
-/// Categorize a non-success response from the poll endpoint
-/// (`GET /v1/videos/{id}`).
-///
-/// Unlike the creation endpoint, a 400 here means the task id is unknown
-/// ("task_not_exist") — a specific, well-known cause rather than a
-/// user-facing bad request.
-pub fn categorize_get_video_task_error(
-  status_code: StatusCode,
-  body: String,
-  task_id: &str,
-) -> CometError {
-  if status_code == StatusCode::UNAUTHORIZED {
-    return CometSpecificApiError::UnauthorizedInvalidApiKey { raw_body: body }.into();
-  }
-
-  if status_code == StatusCode::BAD_REQUEST && body.contains(TASK_NOT_EXIST_MARKER) {
-    return CometSpecificApiError::TaskNotFound {
-      task_id: task_id.to_string(),
-      raw_body: body,
-    }.into();
-  }
-
-  CometGenericApiError::UncategorizedBadResponseWithStatusAndBody {
-    status_code,
-    body,
-  }.into()
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-
-  mod create_video_tests {
-    use super::*;
-
-    #[test]
-    fn bad_request_is_caller_fault() {
-      let body = r#"{"error":{"message":"seconds must be between 4 and 15","type":"invalid_request_error"}}"#.to_string();
-
-      let error = categorize_create_video_error(StatusCode::BAD_REQUEST, body.clone());
-
-      match error {
-        CometError::ApiBadRequest(CometBadRequestApiError::InvalidRequestParameters { raw_body }) => {
-          assert_eq!(raw_body, body);
-        }
-        other => panic!("Expected InvalidRequestParameters, got: {:?}", other),
-      }
-    }
-
-    #[test]
-    fn unauthorized_is_specific() {
-      let body = r#"{"error":{"message":"invalid token","type":"cometapi_error"}}"#.to_string();
-
-      let error = categorize_create_video_error(StatusCode::UNAUTHORIZED, body);
-
-      match error {
-        CometError::ApiSpecific(CometSpecificApiError::UnauthorizedInvalidApiKey { raw_body }) => {
-          assert!(raw_body.contains("invalid token"));
-        }
-        other => panic!("Expected UnauthorizedInvalidApiKey, got: {:?}", other),
-      }
-    }
-
-    #[test]
-    fn server_errors_fall_back_to_uncategorized() {
-      let error = categorize_create_video_error(
-        StatusCode::BAD_GATEWAY,
-        "upstream timeout".to_string(),
-      );
-
-      match &error {
-        CometError::ApiGeneric(CometGenericApiError::UncategorizedBadResponseWithStatusAndBody { status_code, .. }) => {
-          assert_eq!(*status_code, StatusCode::BAD_GATEWAY);
-        }
-        other => panic!("Expected UncategorizedBadResponseWithStatusAndBody, got: {:?}", other),
-      }
-      assert!(error.is_having_downtime_issues());
-    }
-  }
-
-  mod get_video_task_tests {
-    use super::*;
-
-    #[test]
-    fn task_not_exist_is_task_not_found() {
-      let body = r#"{"error":{"message":"task_not_exist","type":"cometapi_error"}}"#.to_string();
-
-      let error = categorize_get_video_task_error(StatusCode::BAD_REQUEST, body, "task_abc123");
-
-      match error {
-        CometError::ApiSpecific(CometSpecificApiError::TaskNotFound { task_id, raw_body }) => {
-          assert_eq!(task_id, "task_abc123");
-          assert!(raw_body.contains("task_not_exist"));
-        }
-        other => panic!("Expected TaskNotFound, got: {:?}", other),
-      }
-    }
-
-    #[test]
-    fn other_bad_requests_fall_back_to_uncategorized() {
-      let body = r#"{"error":{"message":"something else"}}"#.to_string();
-
-      let error = categorize_get_video_task_error(StatusCode::BAD_REQUEST, body, "task_abc123");
-
-      match error {
-        CometError::ApiGeneric(CometGenericApiError::UncategorizedBadResponseWithStatusAndBody { .. }) => {}
-        other => panic!("Expected UncategorizedBadResponseWithStatusAndBody, got: {:?}", other),
-      }
-    }
-
-    #[test]
-    fn unauthorized_is_specific() {
-      let body = r#"{"error":{"message":"invalid token"}}"#.to_string();
-
-      let error = categorize_get_video_task_error(StatusCode::UNAUTHORIZED, body, "task_abc123");
-
-      match error {
-        CometError::ApiSpecific(CometSpecificApiError::UnauthorizedInvalidApiKey { .. }) => {}
-        other => panic!("Expected UnauthorizedInvalidApiKey, got: {:?}", other),
-      }
-    }
-  }
-}

crates/api_clients/comet_api_client/src/error/comet_bad_request_api_error.rs

@@ -1,22 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-/// These represent known "400s" that are the fault of the client sending a
-/// bad request. They should surface to the end user as 400s.
-#[derive(Debug)]
-pub enum CometBadRequestApiError {
-  /// The video creation request was rejected for invalid parameters (eg.
-  /// missing prompt, out-of-range duration, an `input_reference` image on a
-  /// model that doesn't support image input).
-  InvalidRequestParameters { raw_body: String },
-}
-
-impl Error for CometBadRequestApiError {}
-
-impl Display for CometBadRequestApiError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::InvalidRequestParameters { raw_body } => write!(f, "Invalid request parameters: {}", raw_body),
-    }
-  }
-}

crates/api_clients/comet_api_client/src/error/comet_client_error.rs

@@ -1,26 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-#[derive(Debug)]
-pub enum CometClientError {
-  /// An error was encountered building the reqwest client or the request.
-  ReqwestClientError(reqwest::Error),
-
-  /// A request field couldn't be validated or converted to the value
-  /// expected on the wire. Carries the field name and the raw input the
-  /// caller supplied.
-  InvalidRequestField { field: &'static str, raw_value: String, reason: String },
-}
-
-impl Error for CometClientError {}
-
-impl Display for CometClientError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::ReqwestClientError(err) => write!(f, "Reqwest client error: {}", err),
-      Self::InvalidRequestField { field, raw_value, reason } => {
-        write!(f, "Invalid value for request field `{}`: {:?} ({})", field, raw_value, reason)
-      }
-    }
-  }
-}

crates/api_clients/comet_api_client/src/error/comet_error.rs

@@ -1,71 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-use crate::error::comet_bad_request_api_error::CometBadRequestApiError;
-use crate::error::comet_client_error::CometClientError;
-use crate::error::comet_generic_api_error::CometGenericApiError;
-use crate::error::comet_specific_api_error::CometSpecificApiError;
-
-#[derive(Debug)]
-pub enum CometError {
-  /// An error that happened client-side (before or while making the request).
-  Client(CometClientError),
-
-  /// Known "400s" that are the fault of the client sending a bad request.
-  /// These should surface to the end user as 400s.
-  ApiBadRequest(CometBadRequestApiError),
-
-  /// Server-side errors with specific, well-known causes.
-  ApiSpecific(CometSpecificApiError),
-
-  /// Server-side errors with unknown / grab-bag causes.
-  ApiGeneric(CometGenericApiError),
-}
-
-impl CometError {
-  pub fn is_having_downtime_issues(&self) -> bool {
-    match self {
-      Self::ApiGeneric(CometGenericApiError::UncategorizedBadResponseWithStatusAndBody { status_code, body: _ }) => {
-        matches!(status_code.as_u16(), 502 | 503 | 504 | 524)
-      },
-      _ => false,
-    }
-  }
-}
-
-impl Error for CometError {}
-
-impl Display for CometError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::Client(e) => write!(f, "CometClientError: {:?}", e),
-      Self::ApiBadRequest(e) => write!(f, "CometBadRequestApiError: {:?}", e),
-      Self::ApiSpecific(e) => write!(f, "CometSpecificApiError: {:?}", e),
-      Self::ApiGeneric(e) => write!(f, "CometGenericApiError: {:?}", e),
-    }
-  }
-}
-
-impl From<CometClientError> for CometError {
-  fn from(error: CometClientError) -> Self {
-    Self::Client(error)
-  }
-}
-
-impl From<CometBadRequestApiError> for CometError {
-  fn from(error: CometBadRequestApiError) -> Self {
-    Self::ApiBadRequest(error)
-  }
-}
-
-impl From<CometSpecificApiError> for CometError {
-  fn from(error: CometSpecificApiError) -> Self {
-    Self::ApiSpecific(error)
-  }
-}
-
-impl From<CometGenericApiError> for CometError {
-  fn from(error: CometGenericApiError) -> Self {
-    Self::ApiGeneric(error)
-  }
-}

crates/api_clients/comet_api_client/src/error/comet_generic_api_error.rs

@@ -1,33 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-use reqwest::StatusCode;
-
-/// Server-side errors with unknown / grab-bag causes.
-#[derive(Debug)]
-pub enum CometGenericApiError {
-  /// serde_json::Error, likely from a JSON deserialization schema mismatch.
-  /// Includes the original body.
-  SerdeResponseParseErrorWithBody(serde_json::Error, String),
-
-  /// An uncategorized bad HTTP response with status code and body.
-  UncategorizedBadResponseWithStatusAndBody {
-    status_code: StatusCode,
-    body: String,
-  },
-
-  /// An uncaught error from the HTTP client (network failures, timeouts, etc.)
-  ReqwestError(reqwest::Error),
-}
-
-impl Error for CometGenericApiError {}
-
-impl Display for CometGenericApiError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::SerdeResponseParseErrorWithBody(err, body) => write!(f, "Failed to parse response body: {:?}. Body: {}", err, body),
-      Self::UncategorizedBadResponseWithStatusAndBody { status_code, body } => write!(f, "Uncategorized bad response: status code {}, body: {}", status_code, body),
-      Self::ReqwestError(err) => write!(f, "Reqwest error: {}", err),
-    }
-  }
-}

crates/api_clients/comet_api_client/src/error/comet_specific_api_error.rs

@@ -1,23 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-/// Server-side errors with specific, well-known causes.
-#[derive(Debug)]
-pub enum CometSpecificApiError {
-  /// 401: the API key is missing or invalid.
-  UnauthorizedInvalidApiKey { raw_body: String },
-
-  /// The poll endpoint responded "task_not_exist" for the given task id.
-  TaskNotFound { task_id: String, raw_body: String },
-}
-
-impl Error for CometSpecificApiError {}
-
-impl Display for CometSpecificApiError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::UnauthorizedInvalidApiKey { raw_body } => write!(f, "Unauthorized: invalid or missing API key: {}", raw_body),
-      Self::TaskNotFound { task_id, raw_body } => write!(f, "Task not found: {} ({})", task_id, raw_body),
-    }
-  }
-}

crates/api_clients/comet_api_client/src/error/mod.rs

@@ -1,6 +0,0 @@
-pub mod categorize_comet_error;
-pub mod comet_bad_request_api_error;
-pub mod comet_client_error;
-pub mod comet_error;
-pub mod comet_generic_api_error;
-pub mod comet_specific_api_error;

crates/api_clients/comet_api_client/src/generate/mod.rs

@@ -1 +0,0 @@
-pub mod video;

crates/api_clients/comet_api_client/src/generate/video/generate_doubao_seedance_1p0_pro.rs

@@ -1,146 +0,0 @@
-use crate::creds::comet_api_key::CometApiKey;
-use crate::error::comet_client_error::CometClientError;
-use crate::error::comet_error::CometError;
-use crate::requests::create_video::create_video::{
-  create_video, CometVideoModelRaw, CometVideoSize, CreateVideoArgs, CreateVideoRequest,
-};
-use crate::requests::video_task_status::CometVideoTaskStatus;
-
-/// Seedance 1.0 Pro supports 2-10 second durations.
-const MIN_DURATION_SECONDS: u8 = 2;
-const MAX_DURATION_SECONDS: u8 = 10;
-
-// ── Args ──
-
-pub struct GenerateDoubaoSeedance1p0ProArgs<'a> {
-  pub request: GenerateDoubaoSeedance1p0ProRequest,
-  pub api_key: &'a CometApiKey,
-}
-
-// ── Request ──
-
-/// NB: Seedance 1.0 Pro is text-only — `input_reference` images are not
-/// supported, so this request deliberately has no image field.
-#[derive(Clone, Debug)]
-pub struct GenerateDoubaoSeedance1p0ProRequest {
-  pub prompt: String,
-
-  /// 2-10 seconds. `None` uses the API default (5).
-  pub duration_seconds: Option<u8>,
-
-  pub size: Option<DoubaoSeedance1p0ProSize>,
-}
-
-// ── Enums ──
-
-#[derive(Debug, Clone, Copy)]
-pub enum DoubaoSeedance1p0ProSize {
-  Landscape16x9,
-  Standard4x3,
-  Square1x1,
-  Portrait3x4,
-  Portrait9x16,
-  UltraWide21x9,
-  Exact { width: u32, height: u32 },
-}
-
-// ── Response ──
-
-pub struct GenerateDoubaoSeedance1p0ProResponse {
-  /// Poll `GET /v1/videos/{task_id}` until terminal.
-  pub task_id: String,
-  pub status: CometVideoTaskStatus,
-}
-
-// ── Entry point ──
-
-pub async fn generate_doubao_seedance_1p0_pro(
-  args: GenerateDoubaoSeedance1p0ProArgs<'_>,
-) -> Result<GenerateDoubaoSeedance1p0ProResponse, CometError> {
-  let raw_request = args.request.to_create_video_request()?;
-
-  let result = create_video(CreateVideoArgs {
-    api_key: args.api_key,
-    request: raw_request,
-  }).await?;
-
-  Ok(GenerateDoubaoSeedance1p0ProResponse {
-    task_id: result.task_id,
-    status: result.status,
-  })
-}
-
-impl GenerateDoubaoSeedance1p0ProRequest {
-  /// Validate and lower to the generic wire request.
-  pub fn to_create_video_request(&self) -> Result<CreateVideoRequest, CometClientError> {
-    if let Some(seconds) = self.duration_seconds {
-      if !(MIN_DURATION_SECONDS..=MAX_DURATION_SECONDS).contains(&seconds) {
-        return Err(CometClientError::InvalidRequestField {
-          field: "duration_seconds",
-          raw_value: seconds.to_string(),
-          reason: format!("Seedance 1.0 Pro supports {MIN_DURATION_SECONDS}-{MAX_DURATION_SECONDS} second durations"),
-        });
-      }
-    }
-
-    Ok(CreateVideoRequest {
-      model: CometVideoModelRaw::DoubaoSeedance1p0Pro,
-      prompt: self.prompt.clone(),
-      maybe_seconds: self.duration_seconds,
-      maybe_size: self.size.map(map_size),
-      input_reference_images: vec![],
-    })
-  }
-}
-
-fn map_size(size: DoubaoSeedance1p0ProSize) -> CometVideoSize {
-  match size {
-    DoubaoSeedance1p0ProSize::Landscape16x9 => CometVideoSize::Landscape16x9,
-    DoubaoSeedance1p0ProSize::Standard4x3 => CometVideoSize::Standard4x3,
-    DoubaoSeedance1p0ProSize::Square1x1 => CometVideoSize::Square,
-    DoubaoSeedance1p0ProSize::Portrait3x4 => CometVideoSize::Portrait3x4,
-    DoubaoSeedance1p0ProSize::Portrait9x16 => CometVideoSize::Portrait9x16,
-    DoubaoSeedance1p0ProSize::UltraWide21x9 => CometVideoSize::UltraWide21x9,
-    DoubaoSeedance1p0ProSize::Exact { width, height } => CometVideoSize::Exact { width, height },
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-
-  #[test]
-  fn maps_to_wire_request() {
-    let request = GenerateDoubaoSeedance1p0ProRequest {
-      prompt: "time lapse of a city at dusk".to_string(),
-      duration_seconds: Some(2),
-      size: Some(DoubaoSeedance1p0ProSize::Square1x1),
-    };
-
-    let raw = request.to_create_video_request().expect("should validate");
-    assert_eq!(raw.text_form_fields(), vec![
-      ("model", "doubao-seedance-1-0-pro".to_string()),
-      ("prompt", "time lapse of a city at dusk".to_string()),
-      ("seconds", "2".to_string()),
-      ("size", "1:1".to_string()),
-    ]);
-    assert!(raw.input_reference_images.is_empty());
-  }
-
-  #[test]
-  fn duration_bounds() {
-    assert!(request_with_seconds(Some(1)).to_create_video_request().is_err());
-    assert!(request_with_seconds(Some(2)).to_create_video_request().is_ok());
-    assert!(request_with_seconds(Some(10)).to_create_video_request().is_ok());
-    assert!(request_with_seconds(Some(11)).to_create_video_request().is_err());
-    assert!(request_with_seconds(None).to_create_video_request().is_ok());
-  }
-
-  fn request_with_seconds(duration_seconds: Option<u8>) -> GenerateDoubaoSeedance1p0ProRequest {
-    GenerateDoubaoSeedance1p0ProRequest {
-      prompt: "ok".to_string(),
-      duration_seconds,
-      size: None,
-    }
-  }
-}