fix frontend dev scripts

Co-authored-by: Tanish Manku <tanish2k09.dev@gmail.com>

.sqlx/query-05a880a2ece0236f57fe1c40100cba0c0cdcad2ebee0fecb88f9043ac7b82d8c.json

@@ -0,0 +1,179 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  f.id as `id: u64`,\n  f.token as `token: FolderToken`,\n  f.name,\n  f.owner_user_token as `owner_user_token: UserToken`,\n  f.maybe_parent_folder_token as `maybe_parent_folder_token: FolderToken`,\n  f.maybe_last_media_file_token_1 as `maybe_last_media_file_token_1: MediaFileToken`,\n  f.maybe_last_media_file_token_2 as `maybe_last_media_file_token_2: MediaFileToken`,\n  f.maybe_last_media_file_token_3 as `maybe_last_media_file_token_3: MediaFileToken`,\n  f.maybe_last_media_file_token_4 as `maybe_last_media_file_token_4: MediaFileToken`,\n  f.maybe_cover_image_custom_media_token as `maybe_cover_image_custom_media_token: MediaFileToken`,\n  f.maybe_color_code,\n  f.has_star as `has_star: bool`,\n  f.created_at,\n  f.updated_at,\n  (\n    f.maybe_parent_folder_token IS NOT NULL\n    AND (p.token IS NULL OR p.maybe_deleted_at IS NOT NULL)\n  ) as `is_orphaned: bool`\nFROM folders f\nLEFT JOIN folders p\n  ON p.token = f.maybe_parent_folder_token\nWHERE f.owner_user_token = ?\n  AND f.maybe_deleted_at IS NULL\nORDER BY f.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "owner_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_parent_folder_token: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_last_media_file_token_1: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_last_media_file_token_2: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_last_media_file_token_3: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_last_media_file_token_4: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_cover_image_custom_media_token: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_color_code",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "has_star: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "is_orphaned: bool",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "05a880a2ece0236f57fe1c40100cba0c0cdcad2ebee0fecb88f9043ac7b82d8c"
+}

.sqlx/query-0c918aacf4ce34e1e03d2f9af49dd3138cadf59a28d0917726135ed5f34cba5e.json

@@ -0,0 +1,179 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  f.id as `id: u64`,\n  f.token as `token: FolderToken`,\n  f.name,\n  f.owner_user_token as `owner_user_token: UserToken`,\n  f.maybe_parent_folder_token as `maybe_parent_folder_token: FolderToken`,\n  f.maybe_last_media_file_token_1 as `maybe_last_media_file_token_1: MediaFileToken`,\n  f.maybe_last_media_file_token_2 as `maybe_last_media_file_token_2: MediaFileToken`,\n  f.maybe_last_media_file_token_3 as `maybe_last_media_file_token_3: MediaFileToken`,\n  f.maybe_last_media_file_token_4 as `maybe_last_media_file_token_4: MediaFileToken`,\n  f.maybe_cover_image_custom_media_token as `maybe_cover_image_custom_media_token: MediaFileToken`,\n  f.maybe_color_code,\n  f.has_star as `has_star: bool`,\n  f.created_at,\n  f.updated_at,\n  (\n    f.maybe_parent_folder_token IS NOT NULL\n    AND (p.token IS NULL OR p.maybe_deleted_at IS NOT NULL)\n  ) as `is_orphaned: bool`\nFROM folders f\nLEFT JOIN folders p\n  ON p.token = f.maybe_parent_folder_token\nWHERE f.token = ?\n  AND f.owner_user_token = ?\n  AND f.maybe_deleted_at IS NULL\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "owner_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_parent_folder_token: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_last_media_file_token_1: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_last_media_file_token_2: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_last_media_file_token_3: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_last_media_file_token_4: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_cover_image_custom_media_token: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_color_code",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "has_star: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "is_orphaned: bool",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "0c918aacf4ce34e1e03d2f9af49dd3138cadf59a28d0917726135ed5f34cba5e"
+}

.sqlx/query-108731dc51d915ebb8b6ed391c5bae4c41ae6f2c813be92c07d8a10ca401db53.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  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  platform_type = ?,\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": 30
+      "Right": 31
     },
     "nullable": []
   },
-  "hash": "161febbb30cf6c669a813fe036d405ef428422297440abd240482a6aae51f6f9"
+  "hash": "108731dc51d915ebb8b6ed391c5bae4c41ae6f2c813be92c07d8a10ca401db53"
 }

.sqlx/query-1359fb54af12d78251fe435b063771984ee00d74a71b5d29e9df267991f38522.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO user_email_changes\nSET\n  user_token = ?,\n  old_email = ?,\n  new_email = ?,\n  ip_address = ?,\n  maybe_changed_by_user_token = ?\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": []
+  },
+  "hash": "1359fb54af12d78251fe435b063771984ee00d74a71b5d29e9df267991f38522"
+}

.sqlx/query-197e4fb3822b095cbbf8127493dad91c9254b7c242b8921a8c2df9f5a0e77424.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE folders\nSET maybe_cover_image_custom_media_token = ?\nWHERE token = ?\n  AND owner_user_token = ?\n  AND maybe_deleted_at IS NULL\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "197e4fb3822b095cbbf8127493dad91c9254b7c242b8921a8c2df9f5a0e77424"
+}

.sqlx/query-1a0b60602debe525529f50566fc545f1cb4b77005f423a10464652be7fbfa839.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\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    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    ",
   "describe": {
     "columns": [
       {
@@ -82,6 +82,16 @@
           "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": {
@@ -95,8 +105,9 @@
       false,
       false,
       true,
+      true,
       true
     ]
   },
-  "hash": "1ddb2207db50e2dbfb37d26c006bffe2d8f5fb011855d5a86d01f395c36df759"
+  "hash": "1a0b60602debe525529f50566fc545f1cb4b77005f423a10464652be7fbfa839"
 }

.sqlx/query-24716cfdb77eee365bd605a40cecb02b3a27a90725dbe96e3865545d14839ab8.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE folders\nSET has_star = ?\nWHERE token = ?\n  AND owner_user_token = ?\n  AND maybe_deleted_at IS NULL\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "24716cfdb77eee365bd605a40cecb02b3a27a90725dbe96e3865545d14839ab8"
+}

.sqlx/query-38a1d7b676bb0987fc191bbc8bdeadf6174a19358dff40d9772b9d5824145bbc.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.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.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        ",
   "describe": {
     "columns": [
       {
@@ -95,6 +95,16 @@
       },
       {
         "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",
@@ -104,7 +114,7 @@
         }
       },
       {
-        "ordinal": 10,
+        "ordinal": 11,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -127,9 +137,10 @@
       false,
       true,
       true,
+      true,
       false,
       false
     ]
   },
-  "hash": "31d85cc0013f29e6db2d272ee6e709cca79b46496a2c222960f1a1419175f00b"
+  "hash": "38a1d7b676bb0987fc191bbc8bdeadf6174a19358dff40d9772b9d5824145bbc"
 }

.sqlx/query-3a846909a725eb776b4a4637dc64dcaf1ed70ad8891f9d012c7f3cdcb16a613e.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.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.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        ",
   "describe": {
     "columns": [
       {
@@ -95,6 +95,16 @@
       },
       {
         "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",
@@ -104,7 +114,7 @@
         }
       },
       {
-        "ordinal": 10,
+        "ordinal": 11,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -127,9 +137,10 @@
       false,
       true,
       true,
+      true,
       false,
       false
     ]
   },
-  "hash": "2c98621c08055374fd09502c94ac40bb01d23fcea3f844cceea7446a5c0cb4dc"
+  "hash": "3a846909a725eb776b4a4637dc64dcaf1ed70ad8891f9d012c7f3cdcb16a613e"
 }

.sqlx/query-516db34b6a642a2f7d7107f186905a79ad694c3c86f3078efc77bcaae7f39f3d.json

@@ -0,0 +1,36 @@
+{
+  "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-5606a694c872d868ab3b35f4b3685f86f2b27ad16e741c8b1bf997b613f1b803.json

@@ -0,0 +1,58 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  maybe_creator_user_token as `maybe_creator_user_token: UserToken`,\n  media_class as `media_class: MediaFileClass`,\n  media_type as `media_type: MediaFileType`,\n  maybe_cover_image_media_file_token as `maybe_cover_image_media_file_token: MediaFileToken`\nFROM media_files\nWHERE token = ?\n  AND user_deleted_at IS NULL\n  AND mod_deleted_at IS NULL\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "maybe_creator_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "media_class: MediaFileClass",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "media_type: MediaFileType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_cover_image_media_file_token: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      true,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "5606a694c872d868ab3b35f4b3685f86f2b27ad16e741c8b1bf997b613f1b803"
+}

.sqlx/query-5611678b6c168208ea4da9ef0e3071758c9bb8d89b54e2d3f0fc84bd0a6c915f.json

@@ -0,0 +1,157 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  uec.id as `id: u64`,\n  uec.old_email,\n  uec.new_email,\n  uec.ip_address,\n  uec.created_at,\n\n  u_subject.token as `user_token: tokens::tokens::users::UserToken`,\n  u_subject.username as user_username,\n  u_subject.display_name as user_display_name,\n  u_subject.email_gravatar_hash as user_gravatar_hash,\n\n  u_changer.token as `maybe_changed_by_user_token?: tokens::tokens::users::UserToken`,\n  u_changer.username as `maybe_changed_by_user_username?`,\n  u_changer.display_name as `maybe_changed_by_user_display_name?`,\n  u_changer.email_gravatar_hash as `maybe_changed_by_user_gravatar_hash?`\n\nFROM user_email_changes AS uec\nJOIN users AS u_subject\n  ON uec.user_token = u_subject.token\nLEFT JOIN users AS u_changer\n  ON uec.maybe_changed_by_user_token = u_changer.token\nWHERE uec.user_token = ?\n  AND uec.id < ?\nORDER BY uec.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "old_email",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "new_email",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "user_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "user_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "user_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_changed_by_user_token?: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_changed_by_user_username?",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "maybe_changed_by_user_display_name?",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "maybe_changed_by_user_gravatar_hash?",
+        "type_info": {
+          "type": "String",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "5611678b6c168208ea4da9ef0e3071758c9bb8d89b54e2d3f0fc84bd0a6c915f"
+}

.sqlx/query-5f24aeb12e5a78ffedd1c772c594b668188aaaf01f315a1c41c75610fdfc1b32.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\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    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    ",
   "describe": {
     "columns": [
       {
@@ -82,6 +82,16 @@
           "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": {
@@ -95,8 +105,9 @@
       false,
       false,
       true,
+      true,
       true
     ]
   },
-  "hash": "d56a26a7300495fac9741e77e390f16402e2273dbab9a15d7c17eb1f0da7a1b1"
+  "hash": "5f24aeb12e5a78ffedd1c772c594b668188aaaf01f315a1c41c75610fdfc1b32"
 }

.sqlx/query-6a0e3f012795068a56a0dfaf567d066dc157bb06c736c1c4314b18c8e0356127.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE folders\nSET maybe_color_code = ?\nWHERE token = ?\n  AND owner_user_token = ?\n  AND maybe_deleted_at IS NULL\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "6a0e3f012795068a56a0dfaf567d066dc157bb06c736c1c4314b18c8e0356127"
+}

.sqlx/query-780891e8294b78cc0e5a05a8b5a8949a763bcb8c5d6526a621234020b154bdc9.json

@@ -0,0 +1,25 @@
+{
+  "db_name": "MySQL",
+  "query": "\nWITH RECURSIVE ancestor_chain (token, parent_token, depth) AS (\n  SELECT token, maybe_parent_folder_token, 0\n  FROM folders\n  WHERE token = ?\n    AND owner_user_token = ?\n    AND maybe_deleted_at IS NULL\n  UNION ALL\n  SELECT f.token, f.maybe_parent_folder_token, ac.depth + 1\n  FROM folders f\n  INNER JOIN ancestor_chain ac\n    ON f.token = ac.parent_token\n  WHERE f.owner_user_token = ?\n    AND f.maybe_deleted_at IS NULL\n    AND ac.depth < ?\n)\nSELECT token as `token!: FolderToken`\nFROM ancestor_chain\nWHERE depth > 0\nORDER BY depth ASC\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token!: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "780891e8294b78cc0e5a05a8b5a8949a763bcb8c5d6526a621234020b154bdc9"
+}

.sqlx/query-88673127b54626dc38d28693e709dfaeced9a05300a26b3f3c52a17f28171c9a.json

@@ -0,0 +1,267 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  fmf.id as `membership_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 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_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": 10
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "maybe_frame_width",
+        "type_info": {
+          "type": "Long",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 5
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "maybe_frame_height",
+        "type_info": {
+          "type": "Long",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 5
+        }
+      },
+      {
+        "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": "88673127b54626dc38d28693e709dfaeced9a05300a26b3f3c52a17f28171c9a"
+}

.sqlx/query-a13680fb2b54809b6d9d9356f8eec87cd0f1f37405b84bbf734ed06cc244efb1.json

@@ -0,0 +1,168 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  f.id as `id: u64`,\n  f.token as `token: FolderToken`,\n  f.name,\n  f.owner_user_token as `owner_user_token: UserToken`,\n  f.maybe_parent_folder_token as `maybe_parent_folder_token: FolderToken`,\n  f.maybe_last_media_file_token_1 as `maybe_last_media_file_token_1: MediaFileToken`,\n  f.maybe_last_media_file_token_2 as `maybe_last_media_file_token_2: MediaFileToken`,\n  f.maybe_last_media_file_token_3 as `maybe_last_media_file_token_3: MediaFileToken`,\n  f.maybe_last_media_file_token_4 as `maybe_last_media_file_token_4: MediaFileToken`,\n  f.maybe_cover_image_custom_media_token as `maybe_cover_image_custom_media_token: MediaFileToken`,\n  f.maybe_color_code,\n  f.has_star as `has_star: bool`,\n  f.created_at,\n  f.updated_at\nFROM folders f\nWHERE f.maybe_parent_folder_token = ?\n  AND f.owner_user_token = ?\n  AND f.maybe_deleted_at IS NULL\nORDER BY f.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "owner_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_parent_folder_token: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_last_media_file_token_1: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_last_media_file_token_2: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_last_media_file_token_3: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_last_media_file_token_4: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_cover_image_custom_media_token: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_color_code",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "has_star: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 13,
+        "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,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "a13680fb2b54809b6d9d9356f8eec87cd0f1f37405b84bbf734ed06cc244efb1"
+}

.sqlx/query-ad2ffbd9f48e52678a5c61817bec043bf1df4033463e5c5a18468c04af391e6a.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            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            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        ",
   "describe": {
     "columns": [],
     "parameters": {
-      "Right": 41
+      "Right": 42
     },
     "nullable": []
   },
-  "hash": "a4901f904aa1c00d9afc23faa7008816c6e1b653bd6ad9f0b6772e32000be544"
+  "hash": "ad2ffbd9f48e52678a5c61817bec043bf1df4033463e5c5a18468c04af391e6a"
 }

.sqlx/query-ae417955113b385031181772b29f234ab9297cf583583f74fe287bf9c24b1e6a.json

@@ -0,0 +1,12 @@
+{
+  "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-c099b274026619760f0982f0e5082da1e8de16c26122f2750667b9cdc2c4abf3.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO folders\nSET\n  token = ?,\n  name = ?,\n  owner_user_token = ?,\n  maybe_parent_folder_token = ?,\n  maybe_color_code = ?\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": []
+  },
+  "hash": "c099b274026619760f0982f0e5082da1e8de16c26122f2750667b9cdc2c4abf3"
+}

.sqlx/query-c17e1d6b567dd378bb4cb0478fb9558e907a0f36498bd049c7c526e496e89259.json

@@ -0,0 +1,157 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  uec.id as `id: u64`,\n  uec.old_email,\n  uec.new_email,\n  uec.ip_address,\n  uec.created_at,\n\n  u_subject.token as `user_token: tokens::tokens::users::UserToken`,\n  u_subject.username as user_username,\n  u_subject.display_name as user_display_name,\n  u_subject.email_gravatar_hash as user_gravatar_hash,\n\n  u_changer.token as `maybe_changed_by_user_token?: tokens::tokens::users::UserToken`,\n  u_changer.username as `maybe_changed_by_user_username?`,\n  u_changer.display_name as `maybe_changed_by_user_display_name?`,\n  u_changer.email_gravatar_hash as `maybe_changed_by_user_gravatar_hash?`\n\nFROM user_email_changes AS uec\nJOIN users AS u_subject\n  ON uec.user_token = u_subject.token\nLEFT JOIN users AS u_changer\n  ON uec.maybe_changed_by_user_token = u_changer.token\nWHERE uec.user_token = ?\nORDER BY uec.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "old_email",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "new_email",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "user_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "user_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "user_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_changed_by_user_token?: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_changed_by_user_username?",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "maybe_changed_by_user_display_name?",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "maybe_changed_by_user_gravatar_hash?",
+        "type_info": {
+          "type": "String",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "c17e1d6b567dd378bb4cb0478fb9558e907a0f36498bd049c7c526e496e89259"
+}

.sqlx/query-d2a406bcf08f656fd602aa6ba1124a77d04ad874b15abafca300e8b381c7b211.json

@@ -0,0 +1,267 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  fmf.id as `membership_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 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_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": 10
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "maybe_frame_width",
+        "type_info": {
+          "type": "Long",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 5
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "maybe_frame_height",
+        "type_info": {
+          "type": "Long",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 5
+        }
+      },
+      {
+        "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": "d2a406bcf08f656fd602aa6ba1124a77d04ad874b15abafca300e8b381c7b211"
+}

.sqlx/query-d6f0c65abce2da20fe86805ff053b8c2569bf0095f6245a5529f0c71854a604b.json

@@ -0,0 +1,179 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  f.id as `id: u64`,\n  f.token as `token: FolderToken`,\n  f.name,\n  f.owner_user_token as `owner_user_token: UserToken`,\n  f.maybe_parent_folder_token as `maybe_parent_folder_token: FolderToken`,\n  f.maybe_last_media_file_token_1 as `maybe_last_media_file_token_1: MediaFileToken`,\n  f.maybe_last_media_file_token_2 as `maybe_last_media_file_token_2: MediaFileToken`,\n  f.maybe_last_media_file_token_3 as `maybe_last_media_file_token_3: MediaFileToken`,\n  f.maybe_last_media_file_token_4 as `maybe_last_media_file_token_4: MediaFileToken`,\n  f.maybe_cover_image_custom_media_token as `maybe_cover_image_custom_media_token: MediaFileToken`,\n  f.maybe_color_code,\n  f.has_star as `has_star: bool`,\n  f.created_at,\n  f.updated_at,\n  (\n    f.maybe_parent_folder_token IS NOT NULL\n    AND (p.token IS NULL OR p.maybe_deleted_at IS NOT NULL)\n  ) as `is_orphaned: bool`\nFROM folders f\nLEFT JOIN folders p\n  ON p.token = f.maybe_parent_folder_token\nWHERE f.owner_user_token = ?\n  AND f.maybe_deleted_at IS NULL\n  AND f.id < ?\nORDER BY f.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "owner_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_parent_folder_token: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_last_media_file_token_1: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_last_media_file_token_2: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_last_media_file_token_3: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_last_media_file_token_4: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_cover_image_custom_media_token: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_color_code",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "has_star: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "is_orphaned: bool",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "d6f0c65abce2da20fe86805ff053b8c2569bf0095f6245a5529f0c71854a604b"
+}

.sqlx/query-d85c1a844f14b9416c6260d7a906fec709b50eb4583b98dffb52ebbe6abcb7d5.json

@@ -0,0 +1,168 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  f.id as `id: u64`,\n  f.token as `token: FolderToken`,\n  f.name,\n  f.owner_user_token as `owner_user_token: UserToken`,\n  f.maybe_parent_folder_token as `maybe_parent_folder_token: FolderToken`,\n  f.maybe_last_media_file_token_1 as `maybe_last_media_file_token_1: MediaFileToken`,\n  f.maybe_last_media_file_token_2 as `maybe_last_media_file_token_2: MediaFileToken`,\n  f.maybe_last_media_file_token_3 as `maybe_last_media_file_token_3: MediaFileToken`,\n  f.maybe_last_media_file_token_4 as `maybe_last_media_file_token_4: MediaFileToken`,\n  f.maybe_cover_image_custom_media_token as `maybe_cover_image_custom_media_token: MediaFileToken`,\n  f.maybe_color_code,\n  f.has_star as `has_star: bool`,\n  f.created_at,\n  f.updated_at\nFROM folders f\nWHERE f.maybe_parent_folder_token = ?\n  AND f.owner_user_token = ?\n  AND f.maybe_deleted_at IS NULL\n  AND f.id < ?\nORDER BY f.id DESC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "owner_user_token: UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_parent_folder_token: FolderToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_last_media_file_token_1: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_last_media_file_token_2: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_last_media_file_token_3: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_last_media_file_token_4: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_cover_image_custom_media_token: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_color_code",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "has_star: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 13,
+        "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": 4
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "d85c1a844f14b9416c6260d7a906fec709b50eb4583b98dffb52ebbe6abcb7d5"
+}

.sqlx/query-ddbbd3886c00268edd3993508f635549fc8ddc877bb059fd58f14b8c07586fc9.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\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    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    ",
   "describe": {
     "columns": [
       {
@@ -82,6 +82,16 @@
           "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": {
@@ -95,8 +105,9 @@
       false,
       false,
       true,
+      true,
       true
     ]
   },
-  "hash": "a0002183d4d077b07bb0cd062ca95bf113d1564ce3195f0e62e531ce4297dd76"
+  "hash": "ddbbd3886c00268edd3993508f635549fc8ddc877bb059fd58f14b8c07586fc9"
 }

.sqlx/query-e32e195ef41bc833e5b7fc53cfde8669f88aeb66d279e5213d047f4860ec86ab.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE folders\nSET name = ?\nWHERE token = ?\n  AND owner_user_token = ?\n  AND maybe_deleted_at IS NULL\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "e32e195ef41bc833e5b7fc53cfde8669f88aeb66d279e5213d047f4860ec86ab"
+}

.sqlx/query-f9e3ff8ca682948076b799d6b2d934be4a87a4e04665d6f12cc32095494129ad.json

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

.sqlx/query-ffb5717340f21f21693bfcade201bc055fb3fb8a26da8d0574e3de44b033586c.json

@@ -0,0 +1,47 @@
+{
+  "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.lock

@@ -809,6 +809,7 @@ dependencies = [
  "seedance2pro_client",
  "serde",
  "serde_derive",
+ "serde_json",
  "strum",
  "test_data",
  "tokens",

_database/sql/migrations/2026-06-03-022928-0000_user_email_changes/down.sql

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

_database/sql/migrations/2026-06-03-022928-0000_user_email_changes/up.sql

@@ -0,0 +1,35 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE user_email_changes (
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- The user whose email was changed.
+  user_token VARCHAR(32) NOT NULL,
+
+  -- The email address before the change.
+  old_email VARCHAR(255) NOT NULL,
+
+  -- The email address after the change.
+  new_email VARCHAR(255) NOT NULL,
+
+  -- The IP address the change was made from.
+  -- Wide enough for IPv4/6.
+  ip_address VARCHAR(40) NOT NULL,
+
+  -- The user that performed the change, if known. NULL when the change was
+  -- performed by the user themselves, by an automated process, or in any
+  -- other context where there is no acting user.
+  maybe_changed_by_user_token VARCHAR(32) DEFAULT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  KEY index_user_token (user_token),
+  KEY index_old_email (old_email),
+  KEY index_new_email (new_email),
+  KEY index_created_at (created_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations/2026-06-08-121056-0000_folders/down.sql

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

_database/sql/migrations/2026-06-08-121056-0000_folders/up.sql

@@ -0,0 +1,56 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE folders (
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- Effective "primary key" (PUBLIC, used by the API).
+  token VARCHAR(32) NOT NULL,
+
+  -- User-supplied folder name.
+  name VARCHAR(255) NOT NULL,
+
+  -- The user that owns this folder.
+  owner_user_token VARCHAR(32) NOT NULL,
+
+  -- Parent folder for nesting, NULL for top-level folders.
+  maybe_parent_folder_token VARCHAR(32) DEFAULT NULL,
+
+  -- The last four media files added to the folder, in order. These are
+  -- denormalized for cheap thumbnail-grid rendering on folder cards
+  -- without a separate fan-out query.
+  maybe_last_media_file_token_1 VARCHAR(32) DEFAULT NULL,
+  maybe_last_media_file_token_2 VARCHAR(32) DEFAULT NULL,
+  maybe_last_media_file_token_3 VARCHAR(32) DEFAULT NULL,
+  maybe_last_media_file_token_4 VARCHAR(32) DEFAULT NULL,
+
+  -- Optional user-chosen cover image (a media file). Overrides the
+  -- auto-grid thumbnail derived from the last-N media files above.
+  maybe_cover_image_custom_media_token VARCHAR(32) DEFAULT NULL,
+
+  -- Optional user-chosen color tag. Wide enough for "#RRGGBBAA" plus a
+  -- short named-color fallback.
+  maybe_color_code VARCHAR(16) DEFAULT NULL,
+
+  -- Whether the user has starred / favorited this folder.
+  has_star BOOLEAN NOT NULL DEFAULT FALSE,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- Soft-delete timestamp. NULL means the folder is live.
+  maybe_deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY fk_owner_user_token (owner_user_token),
+  KEY fk_maybe_parent_folder_token (maybe_parent_folder_token),
+  KEY index_folders_created_at (created_at),
+  KEY index_folders_updated_at (updated_at),
+  KEY index_maybe_deleted_at (maybe_deleted_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations/2026-06-08-124756-0000_folder_media_files/down.sql

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

_database/sql/migrations/2026-06-08-124756-0000_folder_media_files/up.sql

@@ -0,0 +1,27 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE folder_media_files (
+  -- Auto-increment for posterity / row-creation ordering. Not the primary
+  -- key — the composite (folder_token, media_file_token) is. AUTO_INCREMENT
+  -- requires its own key, hence the UNIQUE KEY below.
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- The folder this membership belongs to.
+  folder_token VARCHAR(32) NOT NULL,
+
+  -- The media file in the folder.
+  media_file_token VARCHAR(32) NOT NULL,
+
+  -- When the media file was added to the folder. Rows are hard-deleted
+  -- when a media file is removed, so there is no `maybe_deleted_at`.
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (folder_token, media_file_token),
+  UNIQUE KEY (id),
+  KEY index_folder_token (folder_token),
+  KEY index_media_file_token (media_file_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

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

@@ -0,0 +1,6 @@
+-- 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

@@ -0,0 +1,6 @@
+-- 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

@@ -0,0 +1,6 @@
+-- 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

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

_database/sql/migrations_squashed/folder_media_files.sql

@@ -0,0 +1,32 @@
+-- NB: This is a manually squashed view of all the CREATE and ALTER statements,
+-- with comments attached to the fields for centralized documentation.
+
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- N:M mapping between `folders` and `media_files`. Rows are hard-deleted
+-- when a media file is removed from a folder — no soft-delete column.
+CREATE TABLE folder_media_files (
+  -- Auto-increment for posterity / row-creation ordering. Not the primary
+  -- key — the composite (folder_token, media_file_token) is. AUTO_INCREMENT
+  -- requires its own key, hence the UNIQUE KEY below.
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- The folder this membership belongs to.
+  folder_token VARCHAR(32) NOT NULL,
+
+  -- The media file in the folder.
+  media_file_token VARCHAR(32) NOT NULL,
+
+  -- When the media file was added to the folder. Rows are hard-deleted
+  -- when a media file is removed, so there is no `maybe_deleted_at`.
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (folder_token, media_file_token),
+  UNIQUE KEY (id),
+  KEY index_folder_token (folder_token),
+  KEY index_media_file_token (media_file_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations_squashed/folders.sql

@@ -0,0 +1,59 @@
+-- NB: This is a manually squashed view of all the CREATE and ALTER statements,
+-- with comments attached to the fields for centralized documentation.
+
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE folders (
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- Effective "primary key" (PUBLIC, used by the API).
+  token VARCHAR(32) NOT NULL,
+
+  -- User-supplied folder name.
+  name VARCHAR(255) NOT NULL,
+
+  -- The user that owns this folder.
+  owner_user_token VARCHAR(32) NOT NULL,
+
+  -- Parent folder for nesting, NULL for top-level folders.
+  maybe_parent_folder_token VARCHAR(32) DEFAULT NULL,
+
+  -- The last four media files added to the folder, in order. These are
+  -- denormalized for cheap thumbnail-grid rendering on folder cards
+  -- without a separate fan-out query.
+  maybe_last_media_file_token_1 VARCHAR(32) DEFAULT NULL,
+  maybe_last_media_file_token_2 VARCHAR(32) DEFAULT NULL,
+  maybe_last_media_file_token_3 VARCHAR(32) DEFAULT NULL,
+  maybe_last_media_file_token_4 VARCHAR(32) DEFAULT NULL,
+
+  -- Optional user-chosen cover image (a media file). Overrides the
+  -- auto-grid thumbnail derived from the last-N media files above.
+  maybe_cover_image_custom_media_token VARCHAR(32) DEFAULT NULL,
+
+  -- Optional user-chosen color tag. Wide enough for "#RRGGBBAA" plus a
+  -- short named-color fallback.
+  maybe_color_code VARCHAR(16) DEFAULT NULL,
+
+  -- Whether the user has starred / favorited this folder.
+  has_star BOOLEAN NOT NULL DEFAULT FALSE,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- Soft-delete timestamp. NULL means the folder is live.
+  maybe_deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY fk_owner_user_token (owner_user_token),
+  KEY fk_maybe_parent_folder_token (maybe_parent_folder_token),
+  KEY index_folders_created_at (created_at),
+  KEY index_folders_updated_at (updated_at),
+  KEY index_maybe_deleted_at (maybe_deleted_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations_squashed/generic_inference_jobs.sql

@@ -208,6 +208,11 @@ 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,6 +65,12 @@ 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.

_database/sql/migrations_squashed/user_tables/user_email_changes.sql

@@ -0,0 +1,38 @@
+-- NB: This is a manually squashed view of all the CREATE and ALTER statements,
+-- with comments attached to the fields for centralized documentation.
+
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE user_email_changes (
+  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- The user whose email was changed.
+  user_token VARCHAR(32) NOT NULL,
+
+  -- The email address before the change.
+  old_email VARCHAR(255) NOT NULL,
+
+  -- The email address after the change.
+  new_email VARCHAR(255) NOT NULL,
+
+  -- The IP address the change was made from.
+  -- Wide enough for IPv4/6.
+  ip_address VARCHAR(40) NOT NULL,
+
+  -- The user that performed the change, if known. NULL when the change was
+  -- performed by the user themselves, by an automated process, or in any
+  -- other context where there is no acting user.
+  maybe_changed_by_user_token VARCHAR(32) DEFAULT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  KEY index_user_token (user_token),
+  KEY index_old_email (old_email),
+  KEY index_new_email (new_email),
+  KEY index_created_at (created_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

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

@@ -0,0 +1,69 @@
+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)]
+pub struct FolderInfo {
+  pub token: FolderToken,
+  pub name: String,
+  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>,
+
+  /// 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_color_code: Option<String>,
+  pub has_star: bool,
+
+  pub created_at: DateTime<Utc>,
+  pub updated_at: DateTime<Utc>,
+
+  /// True when `maybe_parent_folder_token` is set but the referenced
+  /// parent row is missing or soft-deleted.
+  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.
+#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
+pub struct FolderThumbnail {
+  pub token: MediaFileToken,
+  pub media_class: MediaFileClass,
+  pub media_type: MediaFileType,
+
+  /// 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.
+  pub maybe_thumbnail_template: Option<String>,
+}

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

@@ -0,0 +1,116 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::{IntoParams, ToSchema};
+
+use tokens::tokens::folders::FolderToken;
+use tokens::tokens::media_files::MediaFileToken;
+
+use crate::folders::common::FolderInfo;
+
+// ── POST /v1/folders/create ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct CreateFolderRequest {
+  pub name: String,
+  pub maybe_parent_folder_token: Option<FolderToken>,
+  pub maybe_color_code: Option<String>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct CreateFolderSuccessResponse {
+  pub success: bool,
+  pub folder: FolderInfo,
+}
+
+// ── GET /v1/folders/list_all ──
+
+#[derive(Deserialize, ToSchema, IntoParams)]
+pub struct ListFoldersQueryParams {
+  pub cursor: Option<String>,
+  pub limit: Option<u32>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct ListFoldersSuccessResponse {
+  pub success: bool,
+  pub folders: Vec<FolderInfo>,
+  pub maybe_cursor: Option<String>,
+}
+
+// ── GET /v1/folders/folder/{folder_token} ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct FolderPathInfo {
+  pub folder_token: FolderToken,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct GetFolderSuccessResponse {
+  pub success: bool,
+  pub folder: FolderInfo,
+}
+
+// ── PUT /v1/folders/folder/{folder_token}/rename ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct RenameFolderRequest {
+  pub new_name: String,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct RenameFolderSuccessResponse {
+  pub success: bool,
+}
+
+// ── PUT /v1/folders/folder/{folder_token}/star ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct SetFolderStarRequest {
+  pub has_star: bool,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct SetFolderStarSuccessResponse {
+  pub success: bool,
+}
+
+// ── PUT /v1/folders/folder/{folder_token}/color_code ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct SetFolderColorCodeRequest {
+  /// `None` clears the color tag.
+  pub maybe_color_code: Option<String>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct SetFolderColorCodeSuccessResponse {
+  pub success: bool,
+}
+
+// ── PUT /v1/folders/folder/{folder_token}/cover_image ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct SetFolderCoverImageRequest {
+  /// `None` clears the cover image. If set, the server resolves it to a
+  /// usable cover-image media file token: image/video media files are
+  /// used directly; other types fall back to the file's own
+  /// `maybe_cover_image_media_file_token` (and fail if neither path
+  /// applies).
+  pub maybe_media_file_token: Option<MediaFileToken>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct SetFolderCoverImageSuccessResponse {
+  pub success: bool,
+
+  /// The media file token that ended up being stored as the cover image
+  /// (may differ from the requested token if the server resolved through
+  /// the file's own cover image). `None` when the cover was cleared.
+  pub maybe_resolved_cover_media_file_token: Option<MediaFileToken>,
+}
+
+// ── DELETE /v1/folders/folder/{folder_token} ──
+
+#[derive(Serialize, ToSchema)]
+pub struct DeleteFolderSuccessResponse {
+  pub success: bool,
+}

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

@@ -0,0 +1,88 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::{IntoParams, ToSchema};
+
+use tokens::tokens::folders::FolderToken;
+use tokens::tokens::media_files::MediaFileToken;
+
+// ── 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 {
+  pub folder_token: FolderToken,
+}
+
+#[derive(Deserialize, ToSchema, IntoParams)]
+pub struct ListFolderMediaFilesQueryParams {
+  pub cursor: Option<String>,
+  pub limit: Option<u32>,
+}
+
+// ── PUT /v1/folders/media_files/{folder_token}/bulk_add ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct BulkAddFolderMediaFilesRequest {
+  /// Media files to add to the folder. Tokens that don't exist or are
+  /// soft-deleted are silently skipped. Already-added rows are no-ops
+  /// (idempotent via INSERT IGNORE on the composite primary key).
+  pub media_file_tokens: Vec<MediaFileToken>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct BulkAddFolderMediaFilesSuccessResponse {
+  pub success: bool,
+  /// Tokens that pre-existed (existed + not deleted). Already-added rows
+  /// are included since the operation is idempotent.
+  pub accepted_media_file_tokens: Vec<MediaFileToken>,
+}
+
+// ── PUT /v1/folders/media_files/{folder_token}/bulk_remove ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct BulkRemoveFolderMediaFilesRequest {
+  pub media_file_tokens: Vec<MediaFileToken>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct BulkRemoveFolderMediaFilesSuccessResponse {
+  pub success: bool,
+  /// 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/folders/mod.rs

@@ -0,0 +1,4 @@
+pub mod common;
+pub mod folder;
+pub mod media_files;
+pub mod subfolder;

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

@@ -0,0 +1,61 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::{IntoParams, ToSchema};
+
+use tokens::tokens::folders::FolderToken;
+
+use crate::folders::common::FolderInfo;
+
+// ── GET /v1/folders/subfolders/{folder_token} ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct SubfolderPathInfo {
+  pub folder_token: FolderToken,
+}
+
+#[derive(Deserialize, ToSchema, IntoParams)]
+pub struct ListSubfoldersQueryParams {
+  pub cursor: Option<String>,
+  pub limit: Option<u32>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct ListSubfoldersSuccessResponse {
+  pub success: bool,
+  pub subfolders: Vec<FolderInfo>,
+  pub maybe_cursor: Option<String>,
+}
+
+// ── PUT /v1/folders/subfolders/{folder_token}/bulk_add ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct BulkAddSubfoldersRequest {
+  /// The folders to reparent under the URL `folder_token`. Tokens that
+  /// don't exist, aren't owned by the caller, are soft-deleted, or are
+  /// the parent itself are silently skipped (idempotent).
+  pub subfolder_tokens: Vec<FolderToken>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct BulkAddSubfoldersSuccessResponse {
+  pub success: bool,
+  /// Tokens that were actually accepted (existed + owned + not deleted +
+  /// not the parent itself). Already-parented tokens are included here
+  /// since the operation is idempotent.
+  pub accepted_subfolder_tokens: Vec<FolderToken>,
+}
+
+// ── PUT /v1/folders/subfolders/{folder_token}/bulk_remove ──
+
+#[derive(Deserialize, ToSchema)]
+pub struct BulkRemoveSubfoldersRequest {
+  /// Folders to unparent. Only rows currently parented to the URL
+  /// `folder_token` are affected; others are silently skipped.
+  pub subfolder_tokens: Vec<FolderToken>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct BulkRemoveSubfoldersSuccessResponse {
+  pub success: bool,
+  /// How many rows were actually unparented.
+  pub removed_count: u64,
+}

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

@@ -2,6 +2,7 @@ pub mod analytics;
 pub mod characters;
 pub mod common;
 pub mod credits;
+pub mod folders;
 pub mod generate;
 pub mod jobs;
 pub mod media_file;

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

@@ -2,5 +2,6 @@ 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

@@ -0,0 +1 @@
+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

@@ -0,0 +1,43 @@
+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/Cargo.toml

@@ -40,4 +40,5 @@ uuid.workspace = true
 [dev-dependencies]
 test_data.workspace = true
 strum.workspace = true
+serde_json.workspace = true
 

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

@@ -2,7 +2,7 @@ use serde_derive::{Deserialize, Serialize};
 
 /// Common image models supported by the router.
 /// Not all models are available through all providers.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum RouterImageModel {
   #[serde(rename = "flux_1_dev")]
@@ -23,6 +23,12 @@ pub enum RouterImageModel {
   GrokImagineImage,
   #[serde(rename = "grok_imagine_image_q")]
   GrokImagineImageQuality,
+  #[serde(rename = "midjourney_7")]
+  Midjourney7,
+  #[serde(rename = "midjourney_7_niji")]
+  Midjourney7Niji,
+  #[serde(rename = "midjourney_8")]
+  Midjourney8,
   #[serde(rename = "nano_banana")]
   NanoBanana,
   #[serde(rename = "nano_banana_2")]
@@ -40,3 +46,31 @@ pub enum RouterImageModel {
   #[serde(rename = "flux_2_lora_angles")]
   Flux2LoraAngles,
 }
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  fn assert_round_trip(model: RouterImageModel, expected_wire: &str) {
+    let json = serde_json::to_string(&model).unwrap();
+    let unquoted = json.trim_matches('"');
+    assert_eq!(unquoted, expected_wire, "serialize {:?}", model);
+    let back: RouterImageModel = serde_json::from_str(&json).unwrap();
+    assert_eq!(back, model, "deserialize round-trip for {:?}", model);
+  }
+
+  #[test]
+  fn midjourney_7_serializes_to_midjourney_7() {
+    assert_round_trip(RouterImageModel::Midjourney7, "midjourney_7");
+  }
+
+  #[test]
+  fn midjourney_7_niji_serializes_to_midjourney_7_niji() {
+    assert_round_trip(RouterImageModel::Midjourney7Niji, "midjourney_7_niji");
+  }
+
+  #[test]
+  fn midjourney_8_serializes_to_midjourney_8() {
+    assert_round_trip(RouterImageModel::Midjourney8, "midjourney_8");
+  }
+}

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

@@ -16,6 +16,9 @@ use crate::generate::generate_image::providers::artcraft::flux_pro_1p1_ultra::bu
 use crate::generate::generate_image::providers::artcraft::gpt_image_1::build::build_artcraft_gpt_image_1;
 use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::build::build_artcraft_gpt_image_1p5;
 use crate::generate::generate_image::providers::artcraft::gpt_image_2::build::build_artcraft_gpt_image_2;
+use crate::generate::generate_image::providers::artcraft::midjourney_7::build::build_artcraft_midjourney_7;
+use crate::generate::generate_image::providers::artcraft::midjourney_7_niji::build::build_artcraft_midjourney_7_niji;
+use crate::generate::generate_image::providers::artcraft::midjourney_8::build::build_artcraft_midjourney_8;
 use crate::generate::generate_image::providers::artcraft::nano_banana::build::build_artcraft_nano_banana;
 use crate::generate::generate_image::providers::artcraft::nano_banana_2::build::build_artcraft_nano_banana_2;
 use crate::generate::generate_image::providers::artcraft::nano_banana_pro::build::build_artcraft_nano_banana_pro;
@@ -38,6 +41,9 @@ use crate::generate::generate_image::providers::fal::qwen_edit_2511_angles::buil
 use crate::generate::generate_image::providers::fal::seedream_4::build::build_fal_seedream_4;
 use crate::generate::generate_image::providers::fal::seedream_4p5::build::build_fal_seedream_4p5;
 use crate::generate::generate_image::providers::fal::seedream_5_lite::build::build_fal_seedream_5_lite;
+use crate::generate::generate_image::providers::kinovi::midjourney_7::build::build_kinovi_midjourney_7;
+use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::build::build_kinovi_midjourney_7_niji;
+use crate::generate::generate_image::providers::kinovi::midjourney_8::build::build_kinovi_midjourney_8;
 
 #[derive(Clone, Debug)]
 pub struct GenerateImageRequestBuilder {
@@ -115,6 +121,9 @@ impl GenerateImageRequestBuilder {
       (RouterProvider::Artcraft, RouterImageModel::Seedream5Lite) => build_artcraft_seedream_5_lite(self),
       (RouterProvider::Artcraft, RouterImageModel::QwenEdit2511Angles) => build_artcraft_qwen_edit_2511_angles(self),
       (RouterProvider::Artcraft, RouterImageModel::Flux2LoraAngles) => build_artcraft_flux_2_lora_angles(self),
+      (RouterProvider::Artcraft, RouterImageModel::Midjourney7) => build_artcraft_midjourney_7(self),
+      (RouterProvider::Artcraft, RouterImageModel::Midjourney7Niji) => build_artcraft_midjourney_7_niji(self),
+      (RouterProvider::Artcraft, RouterImageModel::Midjourney8) => build_artcraft_midjourney_8(self),
 
       (RouterProvider::Fal, RouterImageModel::Flux1Dev) => build_fal_flux_1_dev(self),
       (RouterProvider::Fal, RouterImageModel::Flux1Schnell) => build_fal_flux_1_schnell(self),
@@ -132,6 +141,11 @@ impl GenerateImageRequestBuilder {
       (RouterProvider::Fal, RouterImageModel::QwenEdit2511Angles) => build_fal_qwen_edit_2511_angles(self),
       (RouterProvider::Fal, RouterImageModel::Flux2LoraAngles) => build_fal_flux_2_lora_angles(self),
 
+      // Kinovi / Seedance2Pro (Midjourney)
+      (RouterProvider::Seedance2Pro, RouterImageModel::Midjourney7) => build_kinovi_midjourney_7(self),
+      (RouterProvider::Seedance2Pro, RouterImageModel::Midjourney7Niji) => build_kinovi_midjourney_7_niji(self),
+      (RouterProvider::Seedance2Pro, RouterImageModel::Midjourney8) => build_kinovi_midjourney_8(self),
+
       _ => self.unsupported_provider_and_model(),
     }
   }

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

@@ -25,10 +25,22 @@ pub struct FalImageResponsePayload {
   pub maybe_outbound_request: Option<Arc<dyn Debug + Send + Sync>>,
 }
 
+/// Response from the Seedance2Pro/Kinovi provider (used for Midjourney
+/// image generation). Mirrors `Seedance2proVideoResponsePayload` on the
+/// video side.
+#[derive(Clone, Debug)]
+pub struct Seedance2proImageResponsePayload {
+  pub order_id: String,
+  pub task_id: String,
+  pub maybe_order_ids: Option<Vec<String>>,
+  pub maybe_task_ids: Option<Vec<String>>,
+}
+
 #[derive(Clone, Debug)]
 pub enum GenerateImageResponse {
   Artcraft(ArtcraftImageResponsePayload),
   Fal(FalImageResponsePayload),
+  Seedance2Pro(Seedance2proImageResponsePayload),
 }
 
 impl GenerateImageResponse {
@@ -45,4 +57,11 @@ impl GenerateImageResponse {
       _ => None,
     }
   }
+
+  pub fn get_seedance2pro_payload(&self) -> Option<Seedance2proImageResponsePayload> {
+    match self {
+      Self::Seedance2Pro(p) => Some(p.clone()),
+      _ => None,
+    }
+  }
 }

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

@@ -3,26 +3,58 @@ use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
 use crate::generate::generate_image::image_generation_draft_context::ImageGenerationDraftContext;
 use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::kinovi::midjourney_7::cost::KinoviMidjourney7CostState;
+use crate::generate::generate_image::providers::kinovi::midjourney_7::draft::KinoviMidjourney7DraftState;
+use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::cost::KinoviMidjourney7NijiCostState;
+use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::draft::KinoviMidjourney7NijiDraftState;
+use crate::generate::generate_image::providers::kinovi::midjourney_8::cost::KinoviMidjourney8CostState;
+use crate::generate::generate_image::providers::kinovi::midjourney_8::draft::KinoviMidjourney8DraftState;
 
 /// Wrapper for all image generation draft requests.
 ///
-/// Drafts hold validated/planned parameters but may still need media resolution
-/// (e.g. uploading local files to a provider) before they can be sent.
-/// Currently empty — FAL doesn't need a draft phase.
+/// Drafts hold validated/planned parameters but may still need media
+/// resolution (e.g. uploading local files to a provider) before they can
+/// be sent. Today only Kinovi/Midjourney needs this — when the caller
+/// supplies reference images, we must upload them to the Seedance2Pro
+/// CDN before sending the request.
 #[derive(Clone, Debug)]
 pub enum ImageGenerationDraftRequest {
+  KinoviMidjourney7(KinoviMidjourney7DraftState),
+  KinoviMidjourney7Niji(KinoviMidjourney7NijiDraftState),
+  KinoviMidjourney8(KinoviMidjourney8DraftState),
 }
 
 impl ImageGenerationDraftRequest {
   pub fn get_provider(&self) -> RouterProvider {
-    match *self {}
+    match self {
+      Self::KinoviMidjourney7(_) => RouterProvider::Seedance2Pro,
+      Self::KinoviMidjourney7Niji(_) => RouterProvider::Seedance2Pro,
+      Self::KinoviMidjourney8(_) => RouterProvider::Seedance2Pro,
+    }
   }
 
   pub fn estimate_cost(&self) -> Result<ImageGenerationCostEstimate, ArtcraftRouterError> {
-    match *self {}
+    match self {
+      Self::KinoviMidjourney7(draft) => Ok(KinoviMidjourney7CostState::from_draft(draft).estimate_cost()),
+      Self::KinoviMidjourney7Niji(draft) => Ok(KinoviMidjourney7NijiCostState::from_draft(draft).estimate_cost()),
+      Self::KinoviMidjourney8(draft) => Ok(KinoviMidjourney8CostState::from_draft(draft).estimate_cost()),
+    }
   }
 
-  pub async fn finalize(self, _draft_context: ImageGenerationDraftContext<'_>) -> Result<ImageGenerationRequest, ArtcraftRouterError> {
-    match self {}
+  pub async fn finalize(self, draft_context: ImageGenerationDraftContext<'_>) -> Result<ImageGenerationRequest, ArtcraftRouterError> {
+    match self {
+      Self::KinoviMidjourney7(mut draft) => {
+        let result = draft.to_request(&draft_context).await?;
+        Ok(ImageGenerationRequest::KinoviMidjourney7(result))
+      }
+      Self::KinoviMidjourney7Niji(mut draft) => {
+        let result = draft.to_request(&draft_context).await?;
+        Ok(ImageGenerationRequest::KinoviMidjourney7Niji(result))
+      }
+      Self::KinoviMidjourney8(mut draft) => {
+        let result = draft.to_request(&draft_context).await?;
+        Ok(ImageGenerationRequest::KinoviMidjourney8(result))
+      }
+    }
   }
 }

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

@@ -1,18 +1,46 @@
+use std::collections::HashMap;
 use std::fmt::Debug;
 
-/// Context passed when finalizing a draft into a concrete request.
+use tokens::tokens::media_files::MediaFileToken;
+
+use crate::client::router_client::RouterClient;
+use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::client_error::ClientError;
+
+/// Context passed when finalizing an image draft into a concrete request.
 ///
-/// Currently empty — FAL doesn't need a draft phase so no context is required.
-/// Future providers that need media uploads during finalization will add fields here
-/// (e.g. a router client reference, media-file-to-URL maps, etc.).
+/// Drafts only exist for providers that need to upload assets before
+/// sending the request. Today that's the Seedance2Pro/Kinovi pipeline
+/// (used for Midjourney image generation with reference images); other
+/// providers — Artcraft, Fal — accept image URLs directly and skip the
+/// draft phase entirely.
 #[derive(Clone, Default)]
 pub struct ImageGenerationDraftContext<'a> {
-  /// Prevent construction without Default; reserving the lifetime for future use.
-  _phantom: std::marker::PhantomData<&'a ()>,
+  /// Optional: the router client, needed for providers that require
+  /// authenticated calls (e.g. Seedance2Pro/Kinovi uploads).
+  pub client: Option<&'a RouterClient>,
+
+  /// Optional: a map of Media File Tokens to their ArtCraft URLs.
+  /// Required only when the draft has unresolved `MediaFileToken` image
+  /// inputs that must be downloaded from ArtCraft and re-uploaded to the
+  /// target provider's CDN.
+  pub media_file_to_artcraft_url_map: Option<&'a HashMap<MediaFileToken, String>>,
+}
+
+impl<'a> ImageGenerationDraftContext<'a> {
+  pub fn get_seedance2pro_client_ref(&self) -> Result<&RouterSeedance2ProClient, ArtcraftRouterError> {
+    let client = self.client.ok_or(ArtcraftRouterError::Client(ClientError::RouterClientNotProvided))?;
+    client.get_seedance2pro_client_ref()
+      .map_err(ArtcraftRouterError::Client)
+  }
 }
 
 impl Debug for ImageGenerationDraftContext<'_> {
   fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-    f.debug_struct("ImageGenerationDraftContext").finish()
+    f.debug_struct("ImageGenerationDraftContext")
+      .field("client", &self.client.is_some())
+      .field("media_file_to_artcraft_url_map", &self.media_file_to_artcraft_url_map.map(|m| m.len()))
+      .finish()
   }
 }

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

@@ -19,6 +19,12 @@ use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::cost::A
 use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::request::ArtcraftGptImage1p5RequestState;
 use crate::generate::generate_image::providers::artcraft::gpt_image_2::cost::ArtcraftGptImage2CostState;
 use crate::generate::generate_image::providers::artcraft::gpt_image_2::request::ArtcraftGptImage2RequestState;
+use crate::generate::generate_image::providers::artcraft::midjourney_7::cost::ArtcraftMidjourney7CostState;
+use crate::generate::generate_image::providers::artcraft::midjourney_7::request::ArtcraftMidjourney7RequestState;
+use crate::generate::generate_image::providers::artcraft::midjourney_7_niji::cost::ArtcraftMidjourney7NijiCostState;
+use crate::generate::generate_image::providers::artcraft::midjourney_7_niji::request::ArtcraftMidjourney7NijiRequestState;
+use crate::generate::generate_image::providers::artcraft::midjourney_8::cost::ArtcraftMidjourney8CostState;
+use crate::generate::generate_image::providers::artcraft::midjourney_8::request::ArtcraftMidjourney8RequestState;
 use crate::generate::generate_image::providers::artcraft::nano_banana::cost::ArtcraftNanoBananaCostState;
 use crate::generate::generate_image::providers::artcraft::nano_banana::request::ArtcraftNanoBananaRequestState;
 use crate::generate::generate_image::providers::artcraft::nano_banana_2::cost::ArtcraftNanoBanana2CostState;
@@ -63,6 +69,12 @@ use crate::generate::generate_image::providers::fal::seedream_4p5::cost::FalSeed
 use crate::generate::generate_image::providers::fal::seedream_4p5::request::FalSeedream4p5RequestState;
 use crate::generate::generate_image::providers::fal::seedream_5_lite::cost::FalSeedream5LiteCostState;
 use crate::generate::generate_image::providers::fal::seedream_5_lite::request::FalSeedream5LiteRequestState;
+use crate::generate::generate_image::providers::kinovi::midjourney_7::cost::KinoviMidjourney7CostState;
+use crate::generate::generate_image::providers::kinovi::midjourney_7::request::KinoviMidjourney7RequestState;
+use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::cost::KinoviMidjourney7NijiCostState;
+use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::request::KinoviMidjourney7NijiRequestState;
+use crate::generate::generate_image::providers::kinovi::midjourney_8::cost::KinoviMidjourney8CostState;
+use crate::generate::generate_image::providers::kinovi::midjourney_8::request::KinoviMidjourney8RequestState;
 
 #[derive(Clone, Debug)]
 pub enum ImageGenerationRequest {
@@ -82,6 +94,9 @@ pub enum ImageGenerationRequest {
   ArtcraftSeedream5Lite(ArtcraftSeedream5LiteRequestState),
   ArtcraftQwenEdit2511Angles(ArtcraftQwenEdit2511AnglesRequestState),
   ArtcraftFlux2LoraAngles(ArtcraftFlux2LoraAnglesRequestState),
+  ArtcraftMidjourney7(ArtcraftMidjourney7RequestState),
+  ArtcraftMidjourney7Niji(ArtcraftMidjourney7NijiRequestState),
+  ArtcraftMidjourney8(ArtcraftMidjourney8RequestState),
 
   // ── Fal provider ──
   FalFlux1Dev(FalFlux1DevRequestState),
@@ -99,6 +114,11 @@ pub enum ImageGenerationRequest {
   FalSeedream5Lite(FalSeedream5LiteRequestState),
   FalQwenEdit2511Angles(FalQwenEdit2511AnglesRequestState),
   FalFlux2LoraAngles(FalFlux2LoraAnglesRequestState),
+
+  // ── Kinovi / Seedance2Pro provider (Midjourney image generation) ──
+  KinoviMidjourney7(KinoviMidjourney7RequestState),
+  KinoviMidjourney7Niji(KinoviMidjourney7NijiRequestState),
+  KinoviMidjourney8(KinoviMidjourney8RequestState),
 }
 
 impl ImageGenerationRequest {
@@ -119,6 +139,9 @@ impl ImageGenerationRequest {
       Self::ArtcraftSeedream5Lite(_) => RouterProvider::Artcraft,
       Self::ArtcraftQwenEdit2511Angles(_) => RouterProvider::Artcraft,
       Self::ArtcraftFlux2LoraAngles(_) => RouterProvider::Artcraft,
+      Self::ArtcraftMidjourney7(_) => RouterProvider::Artcraft,
+      Self::ArtcraftMidjourney7Niji(_) => RouterProvider::Artcraft,
+      Self::ArtcraftMidjourney8(_) => RouterProvider::Artcraft,
 
       Self::FalFlux1Dev(_) => RouterProvider::Fal,
       Self::FalFlux1Schnell(_) => RouterProvider::Fal,
@@ -135,6 +158,10 @@ impl ImageGenerationRequest {
       Self::FalSeedream5Lite(_) => RouterProvider::Fal,
       Self::FalQwenEdit2511Angles(_) => RouterProvider::Fal,
       Self::FalFlux2LoraAngles(_) => RouterProvider::Fal,
+
+      Self::KinoviMidjourney7(_) => RouterProvider::Seedance2Pro,
+      Self::KinoviMidjourney7Niji(_) => RouterProvider::Seedance2Pro,
+      Self::KinoviMidjourney8(_) => RouterProvider::Seedance2Pro,
     }
   }
 
@@ -186,6 +213,15 @@ impl ImageGenerationRequest {
       Self::ArtcraftFlux2LoraAngles(request) => {
         Ok(ArtcraftFlux2LoraAnglesCostState::from_request(request).estimate_cost())
       }
+      Self::ArtcraftMidjourney7(request) => {
+        Ok(ArtcraftMidjourney7CostState::from_request(request).estimate_cost())
+      }
+      Self::ArtcraftMidjourney7Niji(request) => {
+        Ok(ArtcraftMidjourney7NijiCostState::from_request(request).estimate_cost())
+      }
+      Self::ArtcraftMidjourney8(request) => {
+        Ok(ArtcraftMidjourney8CostState::from_request(request).estimate_cost())
+      }
 
       // ── Fal ──
       Self::FalFlux1Dev(request) => Ok(FalFlux1DevCostState::from_request(request).estimate_cost()),
@@ -203,6 +239,10 @@ impl ImageGenerationRequest {
       Self::FalSeedream5Lite(request) => Ok(FalSeedream5LiteCostState::from_request(request).estimate_cost()),
       Self::FalQwenEdit2511Angles(request) => Ok(FalQwenEdit2511AnglesCostState::from_request(request).estimate_cost()),
       Self::FalFlux2LoraAngles(request) => Ok(FalFlux2LoraAnglesCostState::from_request(request).estimate_cost()),
+
+      Self::KinoviMidjourney7(request) => Ok(KinoviMidjourney7CostState::from_request(request).estimate_cost()),
+      Self::KinoviMidjourney7Niji(request) => Ok(KinoviMidjourney7NijiCostState::from_request(request).estimate_cost()),
+      Self::KinoviMidjourney8(request) => Ok(KinoviMidjourney8CostState::from_request(request).estimate_cost()),
     }
   }
 
@@ -269,6 +309,18 @@ impl ImageGenerationRequest {
         let artcraft_client = client.get_artcraft_client_ref()?;
         request.send(artcraft_client).await
       }
+      Self::ArtcraftMidjourney7(request) => {
+        let artcraft_client = client.get_artcraft_client_ref()?;
+        request.send(artcraft_client).await
+      }
+      Self::ArtcraftMidjourney7Niji(request) => {
+        let artcraft_client = client.get_artcraft_client_ref()?;
+        request.send(artcraft_client).await
+      }
+      Self::ArtcraftMidjourney8(request) => {
+        let artcraft_client = client.get_artcraft_client_ref()?;
+        request.send(artcraft_client).await
+      }
 
       // ── Fal ──
       Self::FalFlux1Dev(request) => {
@@ -336,6 +388,23 @@ impl ImageGenerationRequest {
         let fal_client = client.get_fal_client_ref()?;
         request.send(fal_client).await
       }
+
+      // ── Kinovi / Seedance2Pro (Midjourney) ──
+      Self::KinoviMidjourney7(request) => {
+        let seedance_client = client.get_seedance2pro_client_ref()
+          .map_err(ArtcraftRouterError::Client)?;
+        request.send(seedance_client).await
+      }
+      Self::KinoviMidjourney7Niji(request) => {
+        let seedance_client = client.get_seedance2pro_client_ref()
+          .map_err(ArtcraftRouterError::Client)?;
+        request.send(seedance_client).await
+      }
+      Self::KinoviMidjourney8(request) => {
+        let seedance_client = client.get_seedance2pro_client_ref()
+          .map_err(ArtcraftRouterError::Client)?;
+        request.send(seedance_client).await
+      }
     }
   }
 }

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

@@ -0,0 +1,17 @@
+use enums::common::generation::common_image_model::CommonImageModel as CommonImageModelEnum;
+
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request;
+use crate::generate::generate_image::providers::artcraft::midjourney_7::request::ArtcraftMidjourney7RequestState;
+
+pub fn build_artcraft_midjourney_7(
+  builder: GenerateImageRequestBuilder,
+) -> Result<ImageGenerationDraftOrRequest, ArtcraftRouterError> {
+  let request = build_artcraft_omni_image_request(builder, CommonImageModelEnum::Midjourney7)?;
+  Ok(ImageGenerationDraftOrRequest::Request(
+    ImageGenerationRequest::ArtcraftMidjourney7(ArtcraftMidjourney7RequestState { request }),
+  ))
+}

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

@@ -0,0 +1,186 @@
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::providers::artcraft::midjourney_7::request::ArtcraftMidjourney7RequestState;
+
+/// Cost state for Artcraft Midjourney 7. Pricing mirrors the Kinovi
+/// midjourney_7 provider 1:1 in USD cents — ArtCraft credits map cent-for-cent.
+///
+/// | batch | credits | USD cents |
+/// |-------|---------|-----------|
+/// |   1   |    6    |    6¢     |
+/// |   2   |   12    |   12¢     |
+/// |   3   |   19    |   19¢     |  (interpolated; Kinovi doesn't expose 3)
+/// |   4   |   25    |   25¢     |
+///
+/// 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,
+}
+
+impl ArtcraftMidjourney7CostState {
+  pub fn from_request(request: &ArtcraftMidjourney7RequestState) -> Self {
+    Self {
+      num_images: request.request.image_batch_count.unwrap_or(1),
+    }
+  }
+
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    let cost_in_usd_cents = midjourney_cost_for_batch(self.num_images);
+    ImageGenerationCostEstimate {
+      cost_in_credits: Some(cost_in_usd_cents),
+      cost_in_usd_cents: Some(cost_in_usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+}
+
+/// Returns the customer-facing midjourney cost in USD cents for a given
+/// batch count. Shared between v7, v7-niji, and v8 (all three Midjourney
+/// models have identical pricing on Kinovi).
+pub(crate) fn midjourney_cost_for_batch(batch_count: u16) -> u64 {
+  match batch_count {
+    0 => 0, // Defensive; the builder rejects zero before reaching cost.
+    1 => 6,
+    2 => 12,
+    3 => 19,
+    4 => 25,
+    // Should never happen — `plan_batch_count` clamps to 1..=4.
+    _ => 25,
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+
+  fn cost_cents(image_batch_count: u16) -> u64 {
+    let builder = GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney7,
+      provider: RouterProvider::Artcraft,
+      prompt: Some("a corgi astronaut".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: Some(image_batch_count),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    };
+    builder.build2().unwrap().estimate_cost().unwrap().cost_in_usd_cents.unwrap()
+  }
+
+  fn cost_credits(image_batch_count: u16) -> u64 {
+    let builder = GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney7,
+      provider: RouterProvider::Artcraft,
+      prompt: Some("a corgi astronaut".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: Some(image_batch_count),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    };
+    builder.build2().unwrap().estimate_cost().unwrap().cost_in_credits.unwrap()
+  }
+
+  // ── Spot checks: each supported batch size ──
+
+  #[test]
+  fn one_image_is_six_cents() { assert_eq!(cost_cents(1), 6); }
+
+  #[test]
+  fn two_images_is_twelve_cents() { assert_eq!(cost_cents(2), 12); }
+
+  #[test]
+  fn three_images_is_nineteen_cents() { assert_eq!(cost_cents(3), 19); }
+
+  #[test]
+  fn four_images_is_twentyfive_cents() { assert_eq!(cost_cents(4), 25); }
+
+  // ── Credits track USD cents exactly (1 credit = 1 cent) ──
+
+  #[test]
+  fn credits_equal_usd_cents() {
+    for batch in 1..=4u16 {
+      assert_eq!(cost_credits(batch), cost_cents(batch),
+        "credits should equal usd cents at batch {}", batch);
+    }
+  }
+
+  // ── 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]
+  fn cost_is_monotonically_increasing() {
+    let c1 = cost_cents(1);
+    let c2 = cost_cents(2);
+    let c3 = cost_cents(3);
+    let c4 = cost_cents(4);
+    assert!(c1 < c2, "{} < {}", c1, c2);
+    assert!(c2 < c3, "{} < {}", c2, c3);
+    assert!(c3 < c4, "{} < {}", c3, c4);
+  }
+
+  // ── Flags ──
+
+  #[test]
+  fn cost_flags_are_correct() {
+    let cost = ArtcraftMidjourney7CostState { num_images: 1 }.estimate_cost();
+    assert!(!cost.is_free);
+    assert!(!cost.is_unlimited);
+    assert!(!cost.is_rate_limited);
+    assert!(!cost.has_watermark);
+    assert_eq!(cost.failures_are_refunded, None);
+  }
+}

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

@@ -0,0 +1,3 @@
+pub mod build;
+pub mod cost;
+pub mod request;

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

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

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

@@ -0,0 +1,17 @@
+use enums::common::generation::common_image_model::CommonImageModel as CommonImageModelEnum;
+
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request;
+use crate::generate::generate_image::providers::artcraft::midjourney_7_niji::request::ArtcraftMidjourney7NijiRequestState;
+
+pub fn build_artcraft_midjourney_7_niji(
+  builder: GenerateImageRequestBuilder,
+) -> Result<ImageGenerationDraftOrRequest, ArtcraftRouterError> {
+  let request = build_artcraft_omni_image_request(builder, CommonImageModelEnum::Midjourney7Niji)?;
+  Ok(ImageGenerationDraftOrRequest::Request(
+    ImageGenerationRequest::ArtcraftMidjourney7Niji(ArtcraftMidjourney7NijiRequestState { request }),
+  ))
+}

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

@@ -0,0 +1,113 @@
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::providers::artcraft::midjourney_7::cost::midjourney_cost_for_batch;
+use crate::generate::generate_image::providers::artcraft::midjourney_7_niji::request::ArtcraftMidjourney7NijiRequestState;
+
+/// Cost state for Artcraft Midjourney 7 Niji. Pricing is identical to v7
+/// and v8 on Kinovi, so we share the per-batch table via
+/// `midjourney_cost_for_batch`.
+#[derive(Clone, Debug)]
+pub struct ArtcraftMidjourney7NijiCostState {
+  pub num_images: u16,
+}
+
+impl ArtcraftMidjourney7NijiCostState {
+  pub fn from_request(request: &ArtcraftMidjourney7NijiRequestState) -> Self {
+    Self {
+      num_images: request.request.image_batch_count.unwrap_or(1),
+    }
+  }
+
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    let cost_in_usd_cents = midjourney_cost_for_batch(self.num_images);
+    ImageGenerationCostEstimate {
+      cost_in_credits: Some(cost_in_usd_cents),
+      cost_in_usd_cents: Some(cost_in_usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+
+  fn cost_cents(image_batch_count: u16) -> u64 {
+    let builder = GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney7Niji,
+      provider: RouterProvider::Artcraft,
+      prompt: Some("anime forest".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: Some(image_batch_count),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    };
+    builder.build2().unwrap().estimate_cost().unwrap().cost_in_usd_cents.unwrap()
+  }
+
+  #[test]
+  fn batch_1_is_6() { assert_eq!(cost_cents(1), 6); }
+
+  #[test]
+  fn batch_2_is_12() { assert_eq!(cost_cents(2), 12); }
+
+  #[test]
+  fn batch_3_is_19() { assert_eq!(cost_cents(3), 19); }
+
+  #[test]
+  fn batch_4_is_25() { assert_eq!(cost_cents(4), 25); }
+
+  #[test]
+  fn niji_pricing_matches_v7() {
+    use crate::generate::generate_image::providers::artcraft::midjourney_7::cost::ArtcraftMidjourney7CostState;
+    for batch in 1..=4u16 {
+      let v7 = ArtcraftMidjourney7CostState { num_images: batch }.estimate_cost();
+      let niji = ArtcraftMidjourney7NijiCostState { num_images: batch }.estimate_cost();
+      assert_eq!(v7.cost_in_usd_cents, niji.cost_in_usd_cents, "batch {}", batch);
+      assert_eq!(v7.cost_in_credits, niji.cost_in_credits, "batch {}", batch);
+    }
+  }
+
+  // ── 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_7_niji/mod.rs

@@ -0,0 +1,3 @@
+pub mod build;
+pub mod cost;
+pub mod request;

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

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

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

@@ -0,0 +1,17 @@
+use enums::common::generation::common_image_model::CommonImageModel as CommonImageModelEnum;
+
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request;
+use crate::generate::generate_image::providers::artcraft::midjourney_8::request::ArtcraftMidjourney8RequestState;
+
+pub fn build_artcraft_midjourney_8(
+  builder: GenerateImageRequestBuilder,
+) -> Result<ImageGenerationDraftOrRequest, ArtcraftRouterError> {
+  let request = build_artcraft_omni_image_request(builder, CommonImageModelEnum::Midjourney8)?;
+  Ok(ImageGenerationDraftOrRequest::Request(
+    ImageGenerationRequest::ArtcraftMidjourney8(ArtcraftMidjourney8RequestState { request }),
+  ))
+}

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

@@ -0,0 +1,113 @@
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::providers::artcraft::midjourney_7::cost::midjourney_cost_for_batch;
+use crate::generate::generate_image::providers::artcraft::midjourney_8::request::ArtcraftMidjourney8RequestState;
+
+/// Cost state for Artcraft Midjourney 8. Pricing is identical to v7 and
+/// v7-niji on Kinovi; shares the per-batch table via
+/// `midjourney_cost_for_batch`.
+#[derive(Clone, Debug)]
+pub struct ArtcraftMidjourney8CostState {
+  pub num_images: u16,
+}
+
+impl ArtcraftMidjourney8CostState {
+  pub fn from_request(request: &ArtcraftMidjourney8RequestState) -> Self {
+    Self {
+      num_images: request.request.image_batch_count.unwrap_or(1),
+    }
+  }
+
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    let cost_in_usd_cents = midjourney_cost_for_batch(self.num_images);
+    ImageGenerationCostEstimate {
+      cost_in_credits: Some(cost_in_usd_cents),
+      cost_in_usd_cents: Some(cost_in_usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+
+  fn cost_cents(image_batch_count: u16) -> u64 {
+    let builder = GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney8,
+      provider: RouterProvider::Artcraft,
+      prompt: Some("a haunted mansion".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: Some(image_batch_count),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    };
+    builder.build2().unwrap().estimate_cost().unwrap().cost_in_usd_cents.unwrap()
+  }
+
+  #[test]
+  fn batch_1_is_6() { assert_eq!(cost_cents(1), 6); }
+
+  #[test]
+  fn batch_2_is_12() { assert_eq!(cost_cents(2), 12); }
+
+  #[test]
+  fn batch_3_is_19() { assert_eq!(cost_cents(3), 19); }
+
+  #[test]
+  fn batch_4_is_25() { assert_eq!(cost_cents(4), 25); }
+
+  #[test]
+  fn v8_pricing_matches_v7() {
+    use crate::generate::generate_image::providers::artcraft::midjourney_7::cost::ArtcraftMidjourney7CostState;
+    for batch in 1..=4u16 {
+      let v7 = ArtcraftMidjourney7CostState { num_images: batch }.estimate_cost();
+      let v8 = ArtcraftMidjourney8CostState { num_images: batch }.estimate_cost();
+      assert_eq!(v7.cost_in_usd_cents, v8.cost_in_usd_cents, "batch {}", batch);
+      assert_eq!(v7.cost_in_credits, v8.cost_in_credits, "batch {}", batch);
+    }
+  }
+
+  // ── 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/artcraft/midjourney_8/mod.rs

@@ -0,0 +1,3 @@
+pub mod build;
+pub mod cost;
+pub mod request;

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

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

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

@@ -8,6 +8,9 @@ pub mod flux_pro_1p1_ultra;
 pub mod gpt_image_1;
 pub mod gpt_image_1p5;
 pub mod gpt_image_2;
+pub mod midjourney_7;
+pub mod midjourney_7_niji;
+pub mod midjourney_8;
 pub mod nano_banana;
 pub mod nano_banana_2;
 pub mod nano_banana_pro;

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

@@ -0,0 +1,460 @@
+use seedance2pro_client::generate::image::generate_midjourney_v7::{
+  GenerateMidjourneyV7AspectRatio, GenerateMidjourneyV7Quality,
+  GenerateMidjourneyV7Request, KinoviMidjourneyBatchCount,
+};
+
+use crate::api::image_list_ref::ImageListRef;
+use crate::api::router_aspect_ratio::RouterAspectRatio;
+use crate::api::router_quality::RouterQuality;
+use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::client_error::ClientError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest;
+use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::kinovi::midjourney_7::draft::{
+  KinoviMidjourney7DraftState, KinoviMidjourney7RemainingItems,
+};
+use crate::generate::generate_image::providers::kinovi::midjourney_7::request::KinoviMidjourney7RequestState;
+
+pub fn build_kinovi_midjourney_7(
+  mut builder: GenerateImageRequestBuilder,
+) -> Result<ImageGenerationDraftOrRequest, ArtcraftRouterError> {
+  let strategy = builder.request_mismatch_mitigation_strategy;
+
+  let aspect_ratio = plan_aspect_ratio(builder.aspect_ratio.take(), strategy)?;
+  let quality = plan_quality(builder.quality.take());
+  let batch_count = plan_batch_count(builder.image_batch_count.take(), strategy)?;
+  let prompt = builder.prompt.take().unwrap_or_default();
+  let image_inputs = builder.image_inputs.take();
+
+  // No image inputs → we can build the final request immediately. No
+  // draft/upload phase needed.
+  if !has_image_inputs(image_inputs.as_ref()) {
+    let request = GenerateMidjourneyV7Request {
+      prompt,
+      aspect_ratio,
+      negative_prompt: None,
+      stylize: None,
+      weird: None,
+      chaos: None,
+      quality,
+      raw_mode: false,
+      batch_count,
+      reference_image_urls: None,
+    };
+    return Ok(ImageGenerationDraftOrRequest::Request(
+      ImageGenerationRequest::KinoviMidjourney7(KinoviMidjourney7RequestState { request }),
+    ));
+  }
+
+  // Image inputs present → must go through the draft phase so we can
+  // upload each image to the Seedance2Pro CDN before sending.
+  let draft = KinoviMidjourney7DraftState {
+    prompt,
+    aspect_ratio,
+    quality,
+    batch_count,
+    unhandled_request_state: Some(KinoviMidjourney7RemainingItems {
+      reference_images: image_inputs,
+    }),
+  };
+  Ok(ImageGenerationDraftOrRequest::Draft(
+    ImageGenerationDraftRequest::KinoviMidjourney7(draft),
+  ))
+}
+
+fn has_image_inputs(image_inputs: Option<&ImageListRef>) -> bool {
+  match image_inputs {
+    None => false,
+    Some(ImageListRef::Urls(urls)) => !urls.is_empty(),
+    Some(ImageListRef::MediaFileTokens(tokens)) => !tokens.is_empty(),
+  }
+}
+
+// ── Plan helpers ──
+
+pub(crate) fn plan_aspect_ratio(
+  aspect_ratio: Option<RouterAspectRatio>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<GenerateMidjourneyV7AspectRatio, ArtcraftRouterError> {
+  use GenerateMidjourneyV7AspectRatio as Ar;
+  match aspect_ratio {
+    // No preference or auto → square, matching Midjourney's own default for new
+    // jobs in their UI.
+    None
+    | Some(RouterAspectRatio::Auto)
+    | Some(RouterAspectRatio::Auto2k)
+    | Some(RouterAspectRatio::Auto3k)
+    | Some(RouterAspectRatio::Auto4k) => Ok(Ar::Square1x1),
+
+    // Direct mappings — Midjourney supports every common ratio.
+    Some(RouterAspectRatio::Square) | Some(RouterAspectRatio::SquareHd) => Ok(Ar::Square1x1),
+    Some(RouterAspectRatio::WideSixteenByNine) | Some(RouterAspectRatio::Wide) => Ok(Ar::Landscape16x9),
+    Some(RouterAspectRatio::WideTwentyOneByNine) => Ok(Ar::UltraWide21x9),
+    Some(RouterAspectRatio::WideFourByThree) => Ok(Ar::Standard4x3),
+    Some(RouterAspectRatio::WideFiveByFour) => Ok(Ar::Wide5x4),
+    Some(RouterAspectRatio::WideThreeByTwo) => Ok(Ar::Wide3x2),
+    Some(RouterAspectRatio::TallNineBySixteen) | Some(RouterAspectRatio::Tall) => Ok(Ar::Portrait9x16),
+    Some(RouterAspectRatio::TallNineByTwentyOne) => Ok(Ar::UltraTall9x21),
+    Some(RouterAspectRatio::TallThreeByFour) => Ok(Ar::Portrait3x4),
+    Some(RouterAspectRatio::TallFourByFive) => Ok(Ar::Tall4x5),
+    Some(RouterAspectRatio::TallTwoByThree) => Ok(Ar::Tall2x3),
+
+    // Every aspect ratio listed in `RouterAspectRatio` has a direct mapping;
+    // the catch-all is reserved for future variants.
+    #[allow(unreachable_patterns)]
+    Some(unsupported) => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "aspect_ratio",
+          value: format!("{:?}", unsupported),
+        }))
+      }
+      _ => Ok(Ar::Square1x1),
+    },
+  }
+}
+
+pub(crate) fn plan_quality(quality: Option<RouterQuality>) -> Option<GenerateMidjourneyV7Quality> {
+  // Midjourney's quality knob is a compute-budget dial that doesn't change
+  // Kinovi pricing — pass through whatever the caller asked for, and let
+  // `None` ride Midjourney's server-side default.
+  match quality {
+    None => None,
+    Some(RouterQuality::Low) => Some(GenerateMidjourneyV7Quality::Quarter),
+    Some(RouterQuality::Medium) => Some(GenerateMidjourneyV7Quality::Half),
+    Some(RouterQuality::High) => Some(GenerateMidjourneyV7Quality::Full),
+  }
+}
+
+pub(crate) fn plan_batch_count(
+  image_batch_count: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<KinoviMidjourneyBatchCount, ArtcraftRouterError> {
+  let count = image_batch_count.unwrap_or(1);
+  match count {
+    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
+    1 => Ok(KinoviMidjourneyBatchCount::One),
+    2 => Ok(KinoviMidjourneyBatchCount::Two),
+    4 => Ok(KinoviMidjourneyBatchCount::Four),
+    other => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "image_batch_count",
+          value: format!("{}", other),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade => {
+        // 3 → 4, anything > 4 → 4
+        Ok(if other < 3 { KinoviMidjourneyBatchCount::Two } else { KinoviMidjourneyBatchCount::Four })
+      }
+      RequestMismatchMitigationStrategy::PayLessDowngrade => {
+        // 3 → 2, anything > 4 → 4
+        Ok(if other < 4 { KinoviMidjourneyBatchCount::Two } else { KinoviMidjourneyBatchCount::Four })
+      }
+    },
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use seedance2pro_client::generate::image::generate_midjourney_v7::KinoviMidjourneyBatchCount;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_quality::RouterQuality;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest;
+  use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+  use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+
+  use super::*;
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney7,
+      provider: RouterProvider::Seedance2Pro,
+      prompt: Some("a corgi astronaut".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  // ── Mode dispatch: no image inputs → Request; with → Draft ──
+
+  mod mode_dispatch {
+    use super::*;
+
+    #[test]
+    fn no_image_inputs_returns_request_directly() {
+      let result = build_kinovi_midjourney_7(base_builder()).expect("build");
+      assert!(matches!(
+        result,
+        ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney7(_)),
+      ));
+    }
+
+    #[test]
+    fn empty_image_inputs_returns_request_directly() {
+      let builder = GenerateImageRequestBuilder {
+        image_inputs: Some(ImageListRef::Urls(vec![])),
+        ..base_builder()
+      };
+      let result = build_kinovi_midjourney_7(builder).expect("build");
+      assert!(matches!(
+        result,
+        ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney7(_)),
+      ));
+    }
+
+    #[test]
+    fn image_url_inputs_returns_draft() {
+      let builder = GenerateImageRequestBuilder {
+        image_inputs: Some(ImageListRef::Urls(vec!["https://example.com/ref.png".to_string()])),
+        ..base_builder()
+      };
+      let result = build_kinovi_midjourney_7(builder).expect("build");
+      assert!(matches!(
+        result,
+        ImageGenerationDraftOrRequest::Draft(ImageGenerationDraftRequest::KinoviMidjourney7(_)),
+      ));
+    }
+
+    #[test]
+    fn image_token_inputs_returns_draft() {
+      let builder = GenerateImageRequestBuilder {
+        image_inputs: Some(ImageListRef::MediaFileTokens(vec![
+          MediaFileToken::new("mf_test".to_string()),
+        ])),
+        ..base_builder()
+      };
+      let result = build_kinovi_midjourney_7(builder).expect("build");
+      assert!(matches!(
+        result,
+        ImageGenerationDraftOrRequest::Draft(ImageGenerationDraftRequest::KinoviMidjourney7(_)),
+      ));
+    }
+
+    #[test]
+    fn draft_remembers_image_inputs() {
+      let builder = GenerateImageRequestBuilder {
+        image_inputs: Some(ImageListRef::Urls(vec![
+          "https://example.com/a.png".to_string(),
+          "https://example.com/b.png".to_string(),
+        ])),
+        ..base_builder()
+      };
+      let draft = unwrap_draft(build_kinovi_midjourney_7(builder));
+      let remaining = draft.unhandled_request_state.as_ref().unwrap();
+      let urls = match remaining.reference_images.as_ref().unwrap() {
+        ImageListRef::Urls(urls) => urls,
+        _ => panic!("expected Urls"),
+      };
+      assert_eq!(urls.len(), 2);
+    }
+  }
+
+  // ── Field passthrough ──
+
+  mod field_passthrough {
+    use super::*;
+
+    #[test]
+    fn prompt_is_passed_through() {
+      let req = unwrap_direct_request(build_kinovi_midjourney_7(base_builder()));
+      assert_eq!(req.request.prompt, "a corgi astronaut");
+    }
+
+    #[test]
+    fn prompt_defaults_to_empty() {
+      let builder = GenerateImageRequestBuilder { prompt: None, ..base_builder() };
+      let req = unwrap_direct_request(build_kinovi_midjourney_7(builder));
+      assert_eq!(req.request.prompt, "");
+    }
+  }
+
+  // ── Aspect ratio ──
+
+  mod aspect_ratio_tests {
+    use super::*;
+    use seedance2pro_client::generate::image::generate_midjourney_v7::GenerateMidjourneyV7AspectRatio as Ar;
+
+    fn aspect_ratio_for(input: Option<RouterAspectRatio>) -> Ar {
+      let builder = GenerateImageRequestBuilder { aspect_ratio: input, ..base_builder() };
+      unwrap_direct_request(build_kinovi_midjourney_7(builder)).request.aspect_ratio
+    }
+
+    #[test]
+    fn none_defaults_to_square() {
+      assert_eq!(aspect_ratio_for(None), Ar::Square1x1);
+    }
+
+    #[test]
+    fn auto_defaults_to_square() {
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::Auto)), Ar::Square1x1);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::Auto2k)), Ar::Square1x1);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::Auto3k)), Ar::Square1x1);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::Auto4k)), Ar::Square1x1);
+    }
+
+    #[test]
+    fn every_ratio_maps_directly() {
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::Square)), Ar::Square1x1);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::SquareHd)), Ar::Square1x1);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::WideSixteenByNine)), Ar::Landscape16x9);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::WideTwentyOneByNine)), Ar::UltraWide21x9);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::WideFourByThree)), Ar::Standard4x3);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::WideFiveByFour)), Ar::Wide5x4);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::WideThreeByTwo)), Ar::Wide3x2);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::Wide)), Ar::Landscape16x9);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::TallNineBySixteen)), Ar::Portrait9x16);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::TallNineByTwentyOne)), Ar::UltraTall9x21);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::TallThreeByFour)), Ar::Portrait3x4);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::TallFourByFive)), Ar::Tall4x5);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::TallTwoByThree)), Ar::Tall2x3);
+      assert_eq!(aspect_ratio_for(Some(RouterAspectRatio::Tall)), Ar::Portrait9x16);
+    }
+  }
+
+  // ── Quality ──
+
+  mod quality_tests {
+    use super::*;
+    use seedance2pro_client::generate::image::generate_midjourney_v7::GenerateMidjourneyV7Quality as Q;
+
+    fn quality_for(input: Option<RouterQuality>) -> Option<Q> {
+      let builder = GenerateImageRequestBuilder { quality: input, ..base_builder() };
+      unwrap_direct_request(build_kinovi_midjourney_7(builder)).request.quality
+    }
+
+    #[test]
+    fn none_passes_through_as_none() {
+      assert_eq!(quality_for(None), None);
+    }
+
+    #[test]
+    fn low_maps_to_quarter() {
+      assert_eq!(quality_for(Some(RouterQuality::Low)), Some(Q::Quarter));
+    }
+
+    #[test]
+    fn medium_maps_to_half() {
+      assert_eq!(quality_for(Some(RouterQuality::Medium)), Some(Q::Half));
+    }
+
+    #[test]
+    fn high_maps_to_full() {
+      assert_eq!(quality_for(Some(RouterQuality::High)), Some(Q::Full));
+    }
+  }
+
+  // ── Batch count ──
+
+  mod batch_count_tests {
+    use super::*;
+
+    fn batch_for(count: Option<u16>) -> KinoviMidjourneyBatchCount {
+      let builder = GenerateImageRequestBuilder { image_batch_count: count, ..base_builder() };
+      unwrap_direct_request(build_kinovi_midjourney_7(builder)).request.batch_count
+    }
+
+    #[test]
+    fn none_defaults_to_one() {
+      assert_eq!(batch_for(None), KinoviMidjourneyBatchCount::One);
+    }
+
+    #[test]
+    fn one_two_four_map_directly() {
+      assert_eq!(batch_for(Some(1)), KinoviMidjourneyBatchCount::One);
+      assert_eq!(batch_for(Some(2)), KinoviMidjourneyBatchCount::Two);
+      assert_eq!(batch_for(Some(4)), KinoviMidjourneyBatchCount::Four);
+    }
+
+    #[test]
+    fn zero_is_rejected() {
+      let builder = GenerateImageRequestBuilder { image_batch_count: Some(0), ..base_builder() };
+      assert!(matches!(
+        build_kinovi_midjourney_7(builder),
+        Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
+      ));
+    }
+
+    #[test]
+    fn three_errors_under_strict() {
+      let builder = GenerateImageRequestBuilder {
+        image_batch_count: Some(3),
+        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+        ..base_builder()
+      };
+      assert!(matches!(
+        build_kinovi_midjourney_7(builder),
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. })),
+      ));
+    }
+
+    #[test]
+    fn three_upgrades_to_four_with_pay_more() {
+      let builder = GenerateImageRequestBuilder {
+        image_batch_count: Some(3),
+        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
+        ..base_builder()
+      };
+      assert_eq!(
+        unwrap_direct_request(build_kinovi_midjourney_7(builder)).request.batch_count,
+        KinoviMidjourneyBatchCount::Four,
+      );
+    }
+
+    #[test]
+    fn three_downgrades_to_two_with_pay_less() {
+      let builder = GenerateImageRequestBuilder {
+        image_batch_count: Some(3),
+        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayLessDowngrade,
+        ..base_builder()
+      };
+      assert_eq!(
+        unwrap_direct_request(build_kinovi_midjourney_7(builder)).request.batch_count,
+        KinoviMidjourneyBatchCount::Two,
+      );
+    }
+  }
+
+  // ── Helpers ──
+
+  fn unwrap_direct_request(
+    result: Result<ImageGenerationDraftOrRequest, ArtcraftRouterError>,
+  ) -> KinoviMidjourney7RequestState {
+    match result.expect("build should succeed") {
+      ImageGenerationDraftOrRequest::Request(
+        ImageGenerationRequest::KinoviMidjourney7(req),
+      ) => req,
+      other => panic!("expected KinoviMidjourney7 Request, got {:?}", other),
+    }
+  }
+
+  fn unwrap_draft(
+    result: Result<ImageGenerationDraftOrRequest, ArtcraftRouterError>,
+  ) -> KinoviMidjourney7DraftState {
+    match result.expect("build should succeed") {
+      ImageGenerationDraftOrRequest::Draft(
+        ImageGenerationDraftRequest::KinoviMidjourney7(draft),
+      ) => draft,
+      other => panic!("expected KinoviMidjourney7 Draft, got {:?}", other),
+    }
+  }
+}

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

@@ -0,0 +1,211 @@
+use seedance2pro_client::generate::image::generate_midjourney_v7::{
+  GenerateMidjourneyV7AspectRatio, GenerateMidjourneyV7Request, KinoviMidjourneyBatchCount,
+};
+
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::providers::kinovi::midjourney_7::draft::KinoviMidjourney7DraftState;
+use crate::generate::generate_image::providers::kinovi::midjourney_7::request::KinoviMidjourney7RequestState;
+
+/// Midjourney v7 (via Kinovi) cost state. Only `batch_count` matters for
+/// pricing — Midjourney pricing is flat per task regardless of aspect
+/// ratio, quality, or whether reference images were supplied.
+pub struct KinoviMidjourney7CostState {
+  pub batch_count: KinoviMidjourneyBatchCount,
+}
+
+impl KinoviMidjourney7CostState {
+  pub fn from_request(request: &KinoviMidjourney7RequestState) -> Self {
+    Self { batch_count: request.request.batch_count }
+  }
+
+  pub fn from_draft(draft: &KinoviMidjourney7DraftState) -> Self {
+    Self { batch_count: draft.batch_count }
+  }
+
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    let pricing_request = GenerateMidjourneyV7Request {
+      batch_count: self.batch_count,
+      // Cost-irrelevant placeholders below — only `batch_count` matters.
+      prompt: String::new(),
+      aspect_ratio: GenerateMidjourneyV7AspectRatio::Square1x1,
+      negative_prompt: None,
+      stylize: None,
+      weird: None,
+      chaos: None,
+      quality: None,
+      raw_mode: false,
+      reference_image_urls: None,
+    };
+
+    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),
+      cost_in_usd_cents: Some(cost_in_usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest;
+  use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+  use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+
+  // ── Credit pricing (12 per task × batch) ──
+
+  mod credits {
+    use super::*;
+
+    #[test]
+    fn batch_one_is_twelve_credits() {
+      assert_eq!(credits_for(KinoviMidjourneyBatchCount::One), 12);
+    }
+
+    #[test]
+    fn batch_two_is_twentyfour_credits() {
+      assert_eq!(credits_for(KinoviMidjourneyBatchCount::Two), 24);
+    }
+
+    #[test]
+    fn batch_four_is_fortyeight_credits() {
+      assert_eq!(credits_for(KinoviMidjourneyBatchCount::Four), 48);
+    }
+  }
+
+  // ── USD pricing (193 credits per dollar; rounded) ──
+
+  mod usd {
+    use super::*;
+
+    #[test]
+    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_twelve_cents() {
+      // 24 / 193 × 100 = 12.44 → 12¢
+      assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::Two), 12);
+    }
+
+    #[test]
+    fn batch_four_is_twentyfive_cents() {
+      // 48 / 193 × 100 = 24.87 → 25¢
+      assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::Four), 25);
+    }
+  }
+
+  // ── Flags ──
+
+  #[test]
+  fn flags_are_correct() {
+    let cost = KinoviMidjourney7CostState { batch_count: KinoviMidjourneyBatchCount::One }
+      .estimate_cost();
+    assert!(!cost.is_free);
+    assert!(!cost.is_unlimited);
+    assert!(!cost.is_rate_limited);
+    assert!(!cost.has_watermark);
+    assert_eq!(cost.failures_are_refunded, None);
+  }
+
+  // ── from_request / from_draft ──
+
+  mod source_state_round_trip {
+    use super::*;
+
+    #[test]
+    fn from_request_picks_up_batch_count() {
+      let req = build_request_no_image_inputs(2);
+      let state = KinoviMidjourney7CostState::from_request(&req);
+      assert_eq!(state.batch_count, KinoviMidjourneyBatchCount::Two);
+      assert_eq!(state.estimate_cost().cost_in_credits, Some(24));
+    }
+
+    #[test]
+    fn from_draft_picks_up_batch_count() {
+      let draft = build_draft_with_image_inputs(4);
+      let state = KinoviMidjourney7CostState::from_draft(&draft);
+      assert_eq!(state.batch_count, KinoviMidjourneyBatchCount::Four);
+      assert_eq!(state.estimate_cost().cost_in_credits, Some(48));
+    }
+
+    #[test]
+    fn draft_and_request_produce_same_cost() {
+      // Same batch count → same cost, regardless of draft vs request path.
+      let req_cost = KinoviMidjourney7CostState::from_request(&build_request_no_image_inputs(2))
+        .estimate_cost();
+      let draft_cost = KinoviMidjourney7CostState::from_draft(&build_draft_with_image_inputs(2))
+        .estimate_cost();
+      assert_eq!(req_cost.cost_in_credits, draft_cost.cost_in_credits);
+      assert_eq!(req_cost.cost_in_usd_cents, draft_cost.cost_in_usd_cents);
+    }
+  }
+
+  // ── Helpers ──
+
+  fn credits_for(batch: KinoviMidjourneyBatchCount) -> u64 {
+    KinoviMidjourney7CostState { batch_count: batch }
+      .estimate_cost().cost_in_credits.unwrap()
+  }
+
+  fn usd_cents_for(batch: KinoviMidjourneyBatchCount) -> u64 {
+    KinoviMidjourney7CostState { batch_count: batch }
+      .estimate_cost().cost_in_usd_cents.unwrap()
+  }
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney7,
+      provider: RouterProvider::Seedance2Pro,
+      prompt: Some("test".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  fn build_request_no_image_inputs(batch_count: u16) -> KinoviMidjourney7RequestState {
+    let builder = GenerateImageRequestBuilder {
+      image_batch_count: Some(batch_count),
+      ..base_builder()
+    };
+    match builder.build2().expect("build2") {
+      ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney7(r)) => r,
+      _ => panic!("expected Request"),
+    }
+  }
+
+  fn build_draft_with_image_inputs(batch_count: u16) -> KinoviMidjourney7DraftState {
+    let builder = GenerateImageRequestBuilder {
+      image_batch_count: Some(batch_count),
+      image_inputs: Some(ImageListRef::Urls(vec!["https://example.com/ref.png".to_string()])),
+      ..base_builder()
+    };
+    match builder.build2().expect("build2") {
+      ImageGenerationDraftOrRequest::Draft(ImageGenerationDraftRequest::KinoviMidjourney7(d)) => d,
+      _ => panic!("expected Draft"),
+    }
+  }
+}

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

@@ -0,0 +1,94 @@
+use seedance2pro_client::generate::image::generate_midjourney_v7::{
+  GenerateMidjourneyV7AspectRatio, GenerateMidjourneyV7Quality,
+  GenerateMidjourneyV7Request, KinoviMidjourneyBatchCount,
+};
+
+use crate::api::image_list_ref::ImageListRef;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::image_generation_draft_context::ImageGenerationDraftContext;
+use crate::generate::generate_image::providers::kinovi::midjourney_7::request::KinoviMidjourney7RequestState;
+use crate::generate::generate_image::providers::kinovi::resolve::resolve_and_upload_image_list;
+
+#[derive(Debug, Clone)]
+pub struct KinoviMidjourney7DraftState {
+  // Materialized fields — all enums already resolved.
+  pub prompt: String,
+  pub aspect_ratio: GenerateMidjourneyV7AspectRatio,
+  pub quality: Option<GenerateMidjourneyV7Quality>,
+  pub batch_count: KinoviMidjourneyBatchCount,
+
+  /// Image references that still need to be uploaded to Seedance2Pro CDN
+  /// before the request is sendable. `None` once `to_request()` has run.
+  pub unhandled_request_state: Option<KinoviMidjourney7RemainingItems>,
+}
+
+#[derive(Debug, Clone)]
+pub struct KinoviMidjourney7RemainingItems {
+  pub reference_images: Option<ImageListRef>,
+}
+
+impl KinoviMidjourney7DraftState {
+  pub async fn to_request(
+    &mut self,
+    draft_context: &ImageGenerationDraftContext<'_>,
+  ) -> Result<KinoviMidjourney7RequestState, ArtcraftRouterError> {
+    let client = draft_context.get_seedance2pro_client_ref()?;
+    let session = &client.session;
+
+    let mut reference_image_urls = None;
+    if let Some(remaining) = self.unhandled_request_state.take() {
+      let map = draft_context.media_file_to_artcraft_url_map;
+      reference_image_urls = resolve_and_upload_image_list(
+        session, remaining.reference_images, map,
+      ).await?;
+    }
+
+    let request = GenerateMidjourneyV7Request {
+      prompt: self.prompt.clone(),
+      aspect_ratio: self.aspect_ratio,
+      negative_prompt: None,
+      stylize: None,
+      weird: None,
+      chaos: None,
+      quality: self.quality,
+      raw_mode: false,
+      batch_count: self.batch_count,
+      reference_image_urls,
+    };
+
+    Ok(KinoviMidjourney7RequestState { request })
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use seedance2pro_client::generate::image::generate_midjourney_v7::GenerateMidjourneyV7AspectRatio;
+
+  // Note: most behavioral tests live in `build.rs` and `cost.rs`. The
+  // `to_request()` method requires a live Seedance2Pro client to upload
+  // images, so its end-to-end behavior is exercised by the `request.rs`
+  // #[ignore]'d integration tests rather than unit-tested here.
+
+  #[test]
+  fn draft_with_no_image_inputs_finalises_to_empty_reference_image_urls() {
+    // Even when the draft *has* an unhandled state, an empty `ImageListRef`
+    // shouldn't trigger an upload. This is technically not the path the
+    // builder takes (it short-circuits to Request), but we exercise it
+    // here for robustness.
+    let mut draft = KinoviMidjourney7DraftState {
+      prompt: "test".to_string(),
+      aspect_ratio: GenerateMidjourneyV7AspectRatio::Square1x1,
+      quality: None,
+      batch_count: KinoviMidjourneyBatchCount::One,
+      unhandled_request_state: Some(KinoviMidjourney7RemainingItems {
+        reference_images: Some(ImageListRef::Urls(vec![])),
+      }),
+    };
+    // We can't actually call `to_request()` without a client, but the
+    // resolve path returns `None` for empty inputs. Smoke-test the resolve
+    // helper directly via the test_resolve helper.
+    let inputs = draft.unhandled_request_state.take().unwrap().reference_images;
+    assert!(matches!(inputs, Some(ImageListRef::Urls(ref v)) if v.is_empty()));
+  }
+}

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

@@ -0,0 +1,4 @@
+pub mod build;
+pub mod cost;
+pub mod draft;
+pub mod request;

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

@@ -0,0 +1,142 @@
+use seedance2pro_client::generate::image::generate_midjourney_v7::{
+  generate_midjourney_v7, GenerateMidjourneyV7Args, GenerateMidjourneyV7Request,
+};
+
+use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::provider_error::ProviderError;
+use crate::generate::generate_image::generate_image_response::{
+  GenerateImageResponse, Seedance2proImageResponsePayload,
+};
+
+#[derive(Debug, Clone)]
+pub struct KinoviMidjourney7RequestState {
+  /// Final materialized request; ready to fire against Kinovi.
+  pub request: GenerateMidjourneyV7Request,
+}
+
+impl KinoviMidjourney7RequestState {
+  pub async fn send(
+    &self,
+    client: &RouterSeedance2ProClient,
+  ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
+    let args = GenerateMidjourneyV7Args {
+      session: &client.session,
+      host_override: None,
+      request: self.request.clone(),
+    };
+
+    let response = generate_midjourney_v7(args)
+      .await
+      .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Seedance2Pro(err)))?;
+
+    Ok(GenerateImageResponse::Seedance2Pro(Seedance2proImageResponsePayload {
+      order_id: response.order_id,
+      task_id: response.task_id,
+      maybe_order_ids: response.order_ids,
+      maybe_task_ids: response.task_ids,
+    }))
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use std::collections::HashMap;
+
+  use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::client::router_client::RouterClient;
+  use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use crate::generate::generate_image::generate_image_response::GenerateImageResponse;
+  use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest;
+  use crate::generate::generate_image::image_generation_draft_context::ImageGenerationDraftContext;
+  use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+  use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+  use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney7,
+      provider: RouterProvider::Seedance2Pro,
+      prompt: Some("a serene mountain lake at sunrise, cinematic".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+      quality: None,
+      image_batch_count: Some(1),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  fn get_kinovi_client() -> RouterClient {
+    let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/seedance2pro_cookies.txt")
+      .expect("Failed to read seedance2pro cookies");
+    let session = Seedance2ProSession::from_cookies_string(cookies.trim().to_string());
+    RouterClient::Seedance2Pro(RouterSeedance2ProClient::new(session))
+  }
+
+  #[tokio::test]
+  #[ignore] // manually test — requires real cookies; costs credits
+  async fn text_to_image_round_trip() {
+    let client = get_kinovi_client();
+    let result = base_builder().build2().expect("build2");
+
+    let request = match result {
+      ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney7(r)) => r,
+      _ => panic!("expected direct Request for text-to-image"),
+    };
+
+    let response = request.send(client.get_seedance2pro_client_ref().unwrap())
+      .await.expect("send should succeed");
+    let payload = response.get_seedance2pro_payload().expect("expected seedance2pro payload");
+    println!("v7 t2i — task_id={}, order_id={}", payload.task_id, payload.order_id);
+    assert!(!payload.task_id.is_empty());
+  }
+
+  #[tokio::test]
+  #[ignore] // manually test — requires real cookies; costs credits
+  async fn image_reference_round_trip_via_draft() {
+    let client = get_kinovi_client();
+    let token = MediaFileToken::new("mf_test_juno".to_string());
+
+    let mut map = HashMap::new();
+    map.insert(token.clone(), JUNO_AT_LAKE_IMAGE_URL.to_string());
+
+    let builder = GenerateImageRequestBuilder {
+      prompt: Some("a corgi in the style of @1".to_string()),
+      image_inputs: Some(ImageListRef::MediaFileTokens(vec![token])),
+      ..base_builder()
+    };
+
+    let draft_or_request = builder.build2().expect("build2");
+    let draft = match draft_or_request {
+      ImageGenerationDraftOrRequest::Draft(ImageGenerationDraftRequest::KinoviMidjourney7(d)) => d,
+      _ => panic!("expected Draft for image-input flow"),
+    };
+
+    let ctx = ImageGenerationDraftContext {
+      client: Some(&client),
+      media_file_to_artcraft_url_map: Some(&map),
+    };
+
+    let request = ImageGenerationDraftRequest::KinoviMidjourney7(draft)
+      .finalize(ctx).await.expect("finalize");
+
+    let response = request.send_request(&client).await.expect("send_request");
+    let payload = response.get_seedance2pro_payload().expect("expected seedance2pro payload");
+    println!("v7 with ref — task_id={}, order_id={}", payload.task_id, payload.order_id);
+    assert!(!payload.task_id.is_empty());
+  }
+}

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

@@ -0,0 +1,267 @@
+use seedance2pro_client::generate::image::generate_midjourney_v7_niji::{
+  GenerateMidjourneyV7NijiAspectRatio, GenerateMidjourneyV7NijiQuality,
+  GenerateMidjourneyV7NijiRequest, KinoviMidjourneyBatchCount,
+};
+
+use crate::api::image_list_ref::ImageListRef;
+use crate::api::router_aspect_ratio::RouterAspectRatio;
+use crate::api::router_quality::RouterQuality;
+use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::client_error::ClientError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest;
+use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::draft::{
+  KinoviMidjourney7NijiDraftState, KinoviMidjourney7NijiRemainingItems,
+};
+use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::request::KinoviMidjourney7NijiRequestState;
+
+pub fn build_kinovi_midjourney_7_niji(
+  mut builder: GenerateImageRequestBuilder,
+) -> Result<ImageGenerationDraftOrRequest, ArtcraftRouterError> {
+  let strategy = builder.request_mismatch_mitigation_strategy;
+
+  let aspect_ratio = plan_aspect_ratio(builder.aspect_ratio.take(), strategy)?;
+  let quality = plan_quality(builder.quality.take());
+  let batch_count = plan_batch_count(builder.image_batch_count.take(), strategy)?;
+  let prompt = builder.prompt.take().unwrap_or_default();
+  let image_inputs = builder.image_inputs.take();
+
+  if !has_image_inputs(image_inputs.as_ref()) {
+    let request = GenerateMidjourneyV7NijiRequest {
+      prompt,
+      aspect_ratio,
+      negative_prompt: None,
+      stylize: None,
+      weird: None,
+      chaos: None,
+      quality,
+      raw_mode: false,
+      batch_count,
+      reference_image_urls: None,
+    };
+    return Ok(ImageGenerationDraftOrRequest::Request(
+      ImageGenerationRequest::KinoviMidjourney7Niji(KinoviMidjourney7NijiRequestState { request }),
+    ));
+  }
+
+  let draft = KinoviMidjourney7NijiDraftState {
+    prompt,
+    aspect_ratio,
+    quality,
+    batch_count,
+    unhandled_request_state: Some(KinoviMidjourney7NijiRemainingItems {
+      reference_images: image_inputs,
+    }),
+  };
+  Ok(ImageGenerationDraftOrRequest::Draft(
+    ImageGenerationDraftRequest::KinoviMidjourney7Niji(draft),
+  ))
+}
+
+fn has_image_inputs(image_inputs: Option<&ImageListRef>) -> bool {
+  match image_inputs {
+    None => false,
+    Some(ImageListRef::Urls(urls)) => !urls.is_empty(),
+    Some(ImageListRef::MediaFileTokens(tokens)) => !tokens.is_empty(),
+  }
+}
+
+// ── Plan helpers ──
+
+pub(crate) fn plan_aspect_ratio(
+  aspect_ratio: Option<RouterAspectRatio>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<GenerateMidjourneyV7NijiAspectRatio, ArtcraftRouterError> {
+  use GenerateMidjourneyV7NijiAspectRatio as Ar;
+  match aspect_ratio {
+    None
+    | Some(RouterAspectRatio::Auto)
+    | Some(RouterAspectRatio::Auto2k)
+    | Some(RouterAspectRatio::Auto3k)
+    | Some(RouterAspectRatio::Auto4k) => Ok(Ar::Square1x1),
+
+    Some(RouterAspectRatio::Square) | Some(RouterAspectRatio::SquareHd) => Ok(Ar::Square1x1),
+    Some(RouterAspectRatio::WideSixteenByNine) | Some(RouterAspectRatio::Wide) => Ok(Ar::Landscape16x9),
+    Some(RouterAspectRatio::WideTwentyOneByNine) => Ok(Ar::UltraWide21x9),
+    Some(RouterAspectRatio::WideFourByThree) => Ok(Ar::Standard4x3),
+    Some(RouterAspectRatio::WideFiveByFour) => Ok(Ar::Wide5x4),
+    Some(RouterAspectRatio::WideThreeByTwo) => Ok(Ar::Wide3x2),
+    Some(RouterAspectRatio::TallNineBySixteen) | Some(RouterAspectRatio::Tall) => Ok(Ar::Portrait9x16),
+    Some(RouterAspectRatio::TallNineByTwentyOne) => Ok(Ar::UltraTall9x21),
+    Some(RouterAspectRatio::TallThreeByFour) => Ok(Ar::Portrait3x4),
+    Some(RouterAspectRatio::TallFourByFive) => Ok(Ar::Tall4x5),
+    Some(RouterAspectRatio::TallTwoByThree) => Ok(Ar::Tall2x3),
+
+    #[allow(unreachable_patterns)]
+    Some(unsupported) => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "aspect_ratio",
+          value: format!("{:?}", unsupported),
+        }))
+      }
+      _ => Ok(Ar::Square1x1),
+    },
+  }
+}
+
+pub(crate) fn plan_quality(quality: Option<RouterQuality>) -> Option<GenerateMidjourneyV7NijiQuality> {
+  match quality {
+    None => None,
+    Some(RouterQuality::Low) => Some(GenerateMidjourneyV7NijiQuality::Quarter),
+    Some(RouterQuality::Medium) => Some(GenerateMidjourneyV7NijiQuality::Half),
+    Some(RouterQuality::High) => Some(GenerateMidjourneyV7NijiQuality::Full),
+  }
+}
+
+pub(crate) fn plan_batch_count(
+  image_batch_count: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<KinoviMidjourneyBatchCount, ArtcraftRouterError> {
+  let count = image_batch_count.unwrap_or(1);
+  match count {
+    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
+    1 => Ok(KinoviMidjourneyBatchCount::One),
+    2 => Ok(KinoviMidjourneyBatchCount::Two),
+    4 => Ok(KinoviMidjourneyBatchCount::Four),
+    other => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "image_batch_count",
+          value: format!("{}", other),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade => {
+        Ok(if other < 3 { KinoviMidjourneyBatchCount::Two } else { KinoviMidjourneyBatchCount::Four })
+      }
+      RequestMismatchMitigationStrategy::PayLessDowngrade => {
+        Ok(if other < 4 { KinoviMidjourneyBatchCount::Two } else { KinoviMidjourneyBatchCount::Four })
+      }
+    },
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use seedance2pro_client::generate::image::generate_midjourney_v7_niji::KinoviMidjourneyBatchCount;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_quality::RouterQuality;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest;
+  use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+  use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+
+  use super::*;
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney7Niji,
+      provider: RouterProvider::Seedance2Pro,
+      prompt: Some("a magical anime forest scene".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  #[test]
+  fn no_image_inputs_returns_request_directly() {
+    let result = build_kinovi_midjourney_7_niji(base_builder()).expect("build");
+    assert!(matches!(
+      result,
+      ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney7Niji(_)),
+    ));
+  }
+
+  #[test]
+  fn image_inputs_returns_draft() {
+    let builder = GenerateImageRequestBuilder {
+      image_inputs: Some(ImageListRef::Urls(vec!["https://example.com/ref.png".to_string()])),
+      ..base_builder()
+    };
+    let result = build_kinovi_midjourney_7_niji(builder).expect("build");
+    assert!(matches!(
+      result,
+      ImageGenerationDraftOrRequest::Draft(ImageGenerationDraftRequest::KinoviMidjourney7Niji(_)),
+    ));
+  }
+
+  #[test]
+  fn batch_count_zero_errors() {
+    let builder = GenerateImageRequestBuilder { image_batch_count: Some(0), ..base_builder() };
+    assert!(matches!(
+      build_kinovi_midjourney_7_niji(builder),
+      Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
+    ));
+  }
+
+  #[test]
+  fn batch_count_four_is_accepted() {
+    let builder = GenerateImageRequestBuilder { image_batch_count: Some(4), ..base_builder() };
+    let req = match build_kinovi_midjourney_7_niji(builder).expect("build") {
+      ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney7Niji(r)) => r,
+      _ => panic!("expected Request"),
+    };
+    assert_eq!(req.request.batch_count, KinoviMidjourneyBatchCount::Four);
+  }
+
+  #[test]
+  fn aspect_ratio_passes_through_to_niji_enum() {
+    use seedance2pro_client::generate::image::generate_midjourney_v7_niji::GenerateMidjourneyV7NijiAspectRatio as Ar;
+    let builder = GenerateImageRequestBuilder {
+      aspect_ratio: Some(RouterAspectRatio::WideTwentyOneByNine),
+      ..base_builder()
+    };
+    let req = match build_kinovi_midjourney_7_niji(builder).expect("build") {
+      ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney7Niji(r)) => r,
+      _ => panic!("expected Request"),
+    };
+    assert_eq!(req.request.aspect_ratio, Ar::UltraWide21x9);
+  }
+
+  #[test]
+  fn quality_high_maps_to_full() {
+    use seedance2pro_client::generate::image::generate_midjourney_v7_niji::GenerateMidjourneyV7NijiQuality as Q;
+    let builder = GenerateImageRequestBuilder {
+      quality: Some(RouterQuality::High),
+      ..base_builder()
+    };
+    let req = match build_kinovi_midjourney_7_niji(builder).expect("build") {
+      ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney7Niji(r)) => r,
+      _ => panic!("expected Request"),
+    };
+    assert_eq!(req.request.quality, Some(Q::Full));
+  }
+
+  #[test]
+  fn media_file_tokens_route_through_draft() {
+    let builder = GenerateImageRequestBuilder {
+      image_inputs: Some(ImageListRef::MediaFileTokens(vec![
+        MediaFileToken::new("mf_x".to_string()),
+      ])),
+      ..base_builder()
+    };
+    let draft = match build_kinovi_midjourney_7_niji(builder).expect("build") {
+      ImageGenerationDraftOrRequest::Draft(ImageGenerationDraftRequest::KinoviMidjourney7Niji(d)) => d,
+      _ => panic!("expected Draft"),
+    };
+    assert!(draft.unhandled_request_state.is_some());
+  }
+}

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

@@ -0,0 +1,90 @@
+use seedance2pro_client::generate::image::generate_midjourney_v7_niji::{
+  GenerateMidjourneyV7NijiAspectRatio, GenerateMidjourneyV7NijiRequest, KinoviMidjourneyBatchCount,
+};
+
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::draft::KinoviMidjourney7NijiDraftState;
+use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::request::KinoviMidjourney7NijiRequestState;
+
+/// Midjourney v7 Niji (via Kinovi) cost state. Pricing is flat per task
+/// regardless of aspect ratio or quality, identical to v7 / v8.
+pub struct KinoviMidjourney7NijiCostState {
+  pub batch_count: KinoviMidjourneyBatchCount,
+}
+
+impl KinoviMidjourney7NijiCostState {
+  pub fn from_request(request: &KinoviMidjourney7NijiRequestState) -> Self {
+    Self { batch_count: request.request.batch_count }
+  }
+
+  pub fn from_draft(draft: &KinoviMidjourney7NijiDraftState) -> Self {
+    Self { batch_count: draft.batch_count }
+  }
+
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    let pricing_request = GenerateMidjourneyV7NijiRequest {
+      batch_count: self.batch_count,
+      prompt: String::new(),
+      aspect_ratio: GenerateMidjourneyV7NijiAspectRatio::Square1x1,
+      negative_prompt: None,
+      stylize: None,
+      weird: None,
+      chaos: None,
+      quality: None,
+      raw_mode: false,
+      reference_image_urls: None,
+    };
+
+    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),
+      cost_in_usd_cents: Some(cost_in_usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  #[test]
+  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(6));
+  }
+
+  #[test]
+  fn batch_two_doubles() {
+    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(12));
+  }
+
+  #[test]
+  fn batch_four_quadruples() {
+    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(25));
+  }
+
+  #[test]
+  fn flags_are_correct() {
+    let cost = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::One }
+      .estimate_cost();
+    assert!(!cost.is_free);
+    assert!(!cost.is_unlimited);
+    assert!(!cost.is_rate_limited);
+    assert!(!cost.has_watermark);
+  }
+}

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

@@ -0,0 +1,58 @@
+use seedance2pro_client::generate::image::generate_midjourney_v7_niji::{
+  GenerateMidjourneyV7NijiAspectRatio, GenerateMidjourneyV7NijiQuality,
+  GenerateMidjourneyV7NijiRequest, KinoviMidjourneyBatchCount,
+};
+
+use crate::api::image_list_ref::ImageListRef;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::image_generation_draft_context::ImageGenerationDraftContext;
+use crate::generate::generate_image::providers::kinovi::midjourney_7_niji::request::KinoviMidjourney7NijiRequestState;
+use crate::generate::generate_image::providers::kinovi::resolve::resolve_and_upload_image_list;
+
+#[derive(Debug, Clone)]
+pub struct KinoviMidjourney7NijiDraftState {
+  pub prompt: String,
+  pub aspect_ratio: GenerateMidjourneyV7NijiAspectRatio,
+  pub quality: Option<GenerateMidjourneyV7NijiQuality>,
+  pub batch_count: KinoviMidjourneyBatchCount,
+
+  pub unhandled_request_state: Option<KinoviMidjourney7NijiRemainingItems>,
+}
+
+#[derive(Debug, Clone)]
+pub struct KinoviMidjourney7NijiRemainingItems {
+  pub reference_images: Option<ImageListRef>,
+}
+
+impl KinoviMidjourney7NijiDraftState {
+  pub async fn to_request(
+    &mut self,
+    draft_context: &ImageGenerationDraftContext<'_>,
+  ) -> Result<KinoviMidjourney7NijiRequestState, ArtcraftRouterError> {
+    let client = draft_context.get_seedance2pro_client_ref()?;
+    let session = &client.session;
+
+    let mut reference_image_urls = None;
+    if let Some(remaining) = self.unhandled_request_state.take() {
+      let map = draft_context.media_file_to_artcraft_url_map;
+      reference_image_urls = resolve_and_upload_image_list(
+        session, remaining.reference_images, map,
+      ).await?;
+    }
+
+    let request = GenerateMidjourneyV7NijiRequest {
+      prompt: self.prompt.clone(),
+      aspect_ratio: self.aspect_ratio,
+      negative_prompt: None,
+      stylize: None,
+      weird: None,
+      chaos: None,
+      quality: self.quality,
+      raw_mode: false,
+      batch_count: self.batch_count,
+      reference_image_urls,
+    };
+
+    Ok(KinoviMidjourney7NijiRequestState { request })
+  }
+}

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

@@ -0,0 +1,4 @@
+pub mod build;
+pub mod cost;
+pub mod draft;
+pub mod request;

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

@@ -0,0 +1,140 @@
+use seedance2pro_client::generate::image::generate_midjourney_v7_niji::{
+  generate_midjourney_v7_niji, GenerateMidjourneyV7NijiArgs, GenerateMidjourneyV7NijiRequest,
+};
+
+use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::provider_error::ProviderError;
+use crate::generate::generate_image::generate_image_response::{
+  GenerateImageResponse, Seedance2proImageResponsePayload,
+};
+
+#[derive(Debug, Clone)]
+pub struct KinoviMidjourney7NijiRequestState {
+  pub request: GenerateMidjourneyV7NijiRequest,
+}
+
+impl KinoviMidjourney7NijiRequestState {
+  pub async fn send(
+    &self,
+    client: &RouterSeedance2ProClient,
+  ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
+    let args = GenerateMidjourneyV7NijiArgs {
+      session: &client.session,
+      host_override: None,
+      request: self.request.clone(),
+    };
+
+    let response = generate_midjourney_v7_niji(args)
+      .await
+      .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Seedance2Pro(err)))?;
+
+    Ok(GenerateImageResponse::Seedance2Pro(Seedance2proImageResponsePayload {
+      order_id: response.order_id,
+      task_id: response.task_id,
+      maybe_order_ids: response.order_ids,
+      maybe_task_ids: response.task_ids,
+    }))
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use std::collections::HashMap;
+
+  use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::client::router_client::RouterClient;
+  use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest;
+  use crate::generate::generate_image::image_generation_draft_context::ImageGenerationDraftContext;
+  use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+  use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+  use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney7Niji,
+      provider: RouterProvider::Seedance2Pro,
+      prompt: Some("a magical anime fox spirit in a moonlit bamboo forest".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+      quality: None,
+      image_batch_count: Some(1),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  fn get_kinovi_client() -> RouterClient {
+    let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/seedance2pro_cookies.txt")
+      .expect("Failed to read seedance2pro cookies");
+    let session = Seedance2ProSession::from_cookies_string(cookies.trim().to_string());
+    RouterClient::Seedance2Pro(RouterSeedance2ProClient::new(session))
+  }
+
+  #[tokio::test]
+  #[ignore] // manually test — requires real cookies; costs credits
+  async fn text_to_image_round_trip() {
+    let client = get_kinovi_client();
+    let result = base_builder().build2().expect("build2");
+
+    let request = match result {
+      ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney7Niji(r)) => r,
+      _ => panic!("expected direct Request for text-to-image"),
+    };
+
+    let response = request.send(client.get_seedance2pro_client_ref().unwrap())
+      .await.expect("send should succeed");
+    let payload = response.get_seedance2pro_payload().expect("expected seedance2pro payload");
+    println!("v7-niji t2i — task_id={}, order_id={}", payload.task_id, payload.order_id);
+    assert!(!payload.task_id.is_empty());
+  }
+
+  #[tokio::test]
+  #[ignore] // manually test — requires real cookies; costs credits
+  async fn image_reference_round_trip_via_draft() {
+    let client = get_kinovi_client();
+    let token = MediaFileToken::new("mf_test_juno_niji".to_string());
+
+    let mut map = HashMap::new();
+    map.insert(token.clone(), JUNO_AT_LAKE_IMAGE_URL.to_string());
+
+    let builder = GenerateImageRequestBuilder {
+      prompt: Some("an anime corgi sorcerer inspired by @1".to_string()),
+      image_inputs: Some(ImageListRef::MediaFileTokens(vec![token])),
+      ..base_builder()
+    };
+
+    let draft_or_request = builder.build2().expect("build2");
+    let draft = match draft_or_request {
+      ImageGenerationDraftOrRequest::Draft(ImageGenerationDraftRequest::KinoviMidjourney7Niji(d)) => d,
+      _ => panic!("expected Draft for image-input flow"),
+    };
+
+    let ctx = ImageGenerationDraftContext {
+      client: Some(&client),
+      media_file_to_artcraft_url_map: Some(&map),
+    };
+
+    let request = ImageGenerationDraftRequest::KinoviMidjourney7Niji(draft)
+      .finalize(ctx).await.expect("finalize");
+
+    let response = request.send_request(&client).await.expect("send_request");
+    let payload = response.get_seedance2pro_payload().expect("expected seedance2pro payload");
+    println!("v7-niji with ref — task_id={}, order_id={}", payload.task_id, payload.order_id);
+    assert!(!payload.task_id.is_empty());
+  }
+}

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

@@ -0,0 +1,228 @@
+use seedance2pro_client::generate::image::generate_midjourney_v8::{
+  GenerateMidjourneyV8AspectRatio, GenerateMidjourneyV8Quality,
+  GenerateMidjourneyV8Request, KinoviMidjourneyBatchCount,
+};
+
+use crate::api::image_list_ref::ImageListRef;
+use crate::api::router_aspect_ratio::RouterAspectRatio;
+use crate::api::router_quality::RouterQuality;
+use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::client_error::ClientError;
+use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest;
+use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+use crate::generate::generate_image::providers::kinovi::midjourney_8::draft::{
+  KinoviMidjourney8DraftState, KinoviMidjourney8RemainingItems,
+};
+use crate::generate::generate_image::providers::kinovi::midjourney_8::request::KinoviMidjourney8RequestState;
+
+pub fn build_kinovi_midjourney_8(
+  mut builder: GenerateImageRequestBuilder,
+) -> Result<ImageGenerationDraftOrRequest, ArtcraftRouterError> {
+  let strategy = builder.request_mismatch_mitigation_strategy;
+
+  let aspect_ratio = plan_aspect_ratio(builder.aspect_ratio.take(), strategy)?;
+  let quality = plan_quality(builder.quality.take());
+  let batch_count = plan_batch_count(builder.image_batch_count.take(), strategy)?;
+  let prompt = builder.prompt.take().unwrap_or_default();
+  let image_inputs = builder.image_inputs.take();
+
+  if !has_image_inputs(image_inputs.as_ref()) {
+    let request = GenerateMidjourneyV8Request {
+      prompt,
+      aspect_ratio,
+      negative_prompt: None,
+      stylize: None,
+      weird: None,
+      chaos: None,
+      quality,
+      raw_mode: false,
+      batch_count,
+      reference_image_urls: None,
+    };
+    return Ok(ImageGenerationDraftOrRequest::Request(
+      ImageGenerationRequest::KinoviMidjourney8(KinoviMidjourney8RequestState { request }),
+    ));
+  }
+
+  let draft = KinoviMidjourney8DraftState {
+    prompt,
+    aspect_ratio,
+    quality,
+    batch_count,
+    unhandled_request_state: Some(KinoviMidjourney8RemainingItems {
+      reference_images: image_inputs,
+    }),
+  };
+  Ok(ImageGenerationDraftOrRequest::Draft(
+    ImageGenerationDraftRequest::KinoviMidjourney8(draft),
+  ))
+}
+
+fn has_image_inputs(image_inputs: Option<&ImageListRef>) -> bool {
+  match image_inputs {
+    None => false,
+    Some(ImageListRef::Urls(urls)) => !urls.is_empty(),
+    Some(ImageListRef::MediaFileTokens(tokens)) => !tokens.is_empty(),
+  }
+}
+
+// ── Plan helpers ──
+
+pub(crate) fn plan_aspect_ratio(
+  aspect_ratio: Option<RouterAspectRatio>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<GenerateMidjourneyV8AspectRatio, ArtcraftRouterError> {
+  use GenerateMidjourneyV8AspectRatio as Ar;
+  match aspect_ratio {
+    None
+    | Some(RouterAspectRatio::Auto)
+    | Some(RouterAspectRatio::Auto2k)
+    | Some(RouterAspectRatio::Auto3k)
+    | Some(RouterAspectRatio::Auto4k) => Ok(Ar::Square1x1),
+
+    Some(RouterAspectRatio::Square) | Some(RouterAspectRatio::SquareHd) => Ok(Ar::Square1x1),
+    Some(RouterAspectRatio::WideSixteenByNine) | Some(RouterAspectRatio::Wide) => Ok(Ar::Landscape16x9),
+    Some(RouterAspectRatio::WideTwentyOneByNine) => Ok(Ar::UltraWide21x9),
+    Some(RouterAspectRatio::WideFourByThree) => Ok(Ar::Standard4x3),
+    Some(RouterAspectRatio::WideFiveByFour) => Ok(Ar::Wide5x4),
+    Some(RouterAspectRatio::WideThreeByTwo) => Ok(Ar::Wide3x2),
+    Some(RouterAspectRatio::TallNineBySixteen) | Some(RouterAspectRatio::Tall) => Ok(Ar::Portrait9x16),
+    Some(RouterAspectRatio::TallNineByTwentyOne) => Ok(Ar::UltraTall9x21),
+    Some(RouterAspectRatio::TallThreeByFour) => Ok(Ar::Portrait3x4),
+    Some(RouterAspectRatio::TallFourByFive) => Ok(Ar::Tall4x5),
+    Some(RouterAspectRatio::TallTwoByThree) => Ok(Ar::Tall2x3),
+
+    #[allow(unreachable_patterns)]
+    Some(unsupported) => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "aspect_ratio",
+          value: format!("{:?}", unsupported),
+        }))
+      }
+      _ => Ok(Ar::Square1x1),
+    },
+  }
+}
+
+pub(crate) fn plan_quality(quality: Option<RouterQuality>) -> Option<GenerateMidjourneyV8Quality> {
+  match quality {
+    None => None,
+    Some(RouterQuality::Low) => Some(GenerateMidjourneyV8Quality::Quarter),
+    Some(RouterQuality::Medium) => Some(GenerateMidjourneyV8Quality::Half),
+    Some(RouterQuality::High) => Some(GenerateMidjourneyV8Quality::Full),
+  }
+}
+
+pub(crate) fn plan_batch_count(
+  image_batch_count: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<KinoviMidjourneyBatchCount, ArtcraftRouterError> {
+  let count = image_batch_count.unwrap_or(1);
+  match count {
+    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
+    1 => Ok(KinoviMidjourneyBatchCount::One),
+    2 => Ok(KinoviMidjourneyBatchCount::Two),
+    4 => Ok(KinoviMidjourneyBatchCount::Four),
+    other => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "image_batch_count",
+          value: format!("{}", other),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade => {
+        Ok(if other < 3 { KinoviMidjourneyBatchCount::Two } else { KinoviMidjourneyBatchCount::Four })
+      }
+      RequestMismatchMitigationStrategy::PayLessDowngrade => {
+        Ok(if other < 4 { KinoviMidjourneyBatchCount::Two } else { KinoviMidjourneyBatchCount::Four })
+      }
+    },
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use seedance2pro_client::generate::image::generate_midjourney_v8::KinoviMidjourneyBatchCount;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest;
+  use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+  use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+
+  use super::*;
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney8,
+      provider: RouterProvider::Seedance2Pro,
+      prompt: Some("a spooky horror scene".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: None,
+      quality: None,
+      image_batch_count: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  #[test]
+  fn no_image_inputs_returns_request_directly() {
+    let result = build_kinovi_midjourney_8(base_builder()).expect("build");
+    assert!(matches!(
+      result,
+      ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney8(_)),
+    ));
+  }
+
+  #[test]
+  fn image_inputs_returns_draft() {
+    let builder = GenerateImageRequestBuilder {
+      image_inputs: Some(ImageListRef::Urls(vec!["https://example.com/ref.png".to_string()])),
+      ..base_builder()
+    };
+    let result = build_kinovi_midjourney_8(builder).expect("build");
+    assert!(matches!(
+      result,
+      ImageGenerationDraftOrRequest::Draft(ImageGenerationDraftRequest::KinoviMidjourney8(_)),
+    ));
+  }
+
+  #[test]
+  fn batch_count_four_is_accepted() {
+    let builder = GenerateImageRequestBuilder { image_batch_count: Some(4), ..base_builder() };
+    let req = match build_kinovi_midjourney_8(builder).expect("build") {
+      ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney8(r)) => r,
+      _ => panic!("expected Request"),
+    };
+    assert_eq!(req.request.batch_count, KinoviMidjourneyBatchCount::Four);
+  }
+
+  #[test]
+  fn media_file_token_route_through_draft() {
+    let builder = GenerateImageRequestBuilder {
+      image_inputs: Some(ImageListRef::MediaFileTokens(vec![
+        MediaFileToken::new("mf_x".to_string()),
+      ])),
+      ..base_builder()
+    };
+    let draft = match build_kinovi_midjourney_8(builder).expect("build") {
+      ImageGenerationDraftOrRequest::Draft(ImageGenerationDraftRequest::KinoviMidjourney8(d)) => d,
+      _ => panic!("expected Draft"),
+    };
+    assert!(draft.unhandled_request_state.is_some());
+  }
+}

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

@@ -0,0 +1,80 @@
+use seedance2pro_client::generate::image::generate_midjourney_v8::{
+  GenerateMidjourneyV8AspectRatio, GenerateMidjourneyV8Request, KinoviMidjourneyBatchCount,
+};
+
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::providers::kinovi::midjourney_8::draft::KinoviMidjourney8DraftState;
+use crate::generate::generate_image::providers::kinovi::midjourney_8::request::KinoviMidjourney8RequestState;
+
+/// Midjourney v8 (via Kinovi) cost state. Pricing is flat per task,
+/// identical to v7 / v7 niji.
+pub struct KinoviMidjourney8CostState {
+  pub batch_count: KinoviMidjourneyBatchCount,
+}
+
+impl KinoviMidjourney8CostState {
+  pub fn from_request(request: &KinoviMidjourney8RequestState) -> Self {
+    Self { batch_count: request.request.batch_count }
+  }
+
+  pub fn from_draft(draft: &KinoviMidjourney8DraftState) -> Self {
+    Self { batch_count: draft.batch_count }
+  }
+
+  pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
+    let pricing_request = GenerateMidjourneyV8Request {
+      batch_count: self.batch_count,
+      prompt: String::new(),
+      aspect_ratio: GenerateMidjourneyV8AspectRatio::Square1x1,
+      negative_prompt: None,
+      stylize: None,
+      weird: None,
+      chaos: None,
+      quality: None,
+      raw_mode: false,
+      reference_image_urls: None,
+    };
+
+    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),
+      cost_in_usd_cents: Some(cost_in_usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  #[test]
+  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(6));
+  }
+
+  #[test]
+  fn batch_two_doubles() {
+    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(12));
+  }
+
+  #[test]
+  fn batch_four_quadruples() {
+    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(25));
+  }
+}

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

@@ -0,0 +1,58 @@
+use seedance2pro_client::generate::image::generate_midjourney_v8::{
+  GenerateMidjourneyV8AspectRatio, GenerateMidjourneyV8Quality,
+  GenerateMidjourneyV8Request, KinoviMidjourneyBatchCount,
+};
+
+use crate::api::image_list_ref::ImageListRef;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_image::image_generation_draft_context::ImageGenerationDraftContext;
+use crate::generate::generate_image::providers::kinovi::midjourney_8::request::KinoviMidjourney8RequestState;
+use crate::generate::generate_image::providers::kinovi::resolve::resolve_and_upload_image_list;
+
+#[derive(Debug, Clone)]
+pub struct KinoviMidjourney8DraftState {
+  pub prompt: String,
+  pub aspect_ratio: GenerateMidjourneyV8AspectRatio,
+  pub quality: Option<GenerateMidjourneyV8Quality>,
+  pub batch_count: KinoviMidjourneyBatchCount,
+
+  pub unhandled_request_state: Option<KinoviMidjourney8RemainingItems>,
+}
+
+#[derive(Debug, Clone)]
+pub struct KinoviMidjourney8RemainingItems {
+  pub reference_images: Option<ImageListRef>,
+}
+
+impl KinoviMidjourney8DraftState {
+  pub async fn to_request(
+    &mut self,
+    draft_context: &ImageGenerationDraftContext<'_>,
+  ) -> Result<KinoviMidjourney8RequestState, ArtcraftRouterError> {
+    let client = draft_context.get_seedance2pro_client_ref()?;
+    let session = &client.session;
+
+    let mut reference_image_urls = None;
+    if let Some(remaining) = self.unhandled_request_state.take() {
+      let map = draft_context.media_file_to_artcraft_url_map;
+      reference_image_urls = resolve_and_upload_image_list(
+        session, remaining.reference_images, map,
+      ).await?;
+    }
+
+    let request = GenerateMidjourneyV8Request {
+      prompt: self.prompt.clone(),
+      aspect_ratio: self.aspect_ratio,
+      negative_prompt: None,
+      stylize: None,
+      weird: None,
+      chaos: None,
+      quality: self.quality,
+      raw_mode: false,
+      batch_count: self.batch_count,
+      reference_image_urls,
+    };
+
+    Ok(KinoviMidjourney8RequestState { request })
+  }
+}

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

@@ -0,0 +1,4 @@
+pub mod build;
+pub mod cost;
+pub mod draft;
+pub mod request;

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

@@ -0,0 +1,140 @@
+use seedance2pro_client::generate::image::generate_midjourney_v8::{
+  generate_midjourney_v8, GenerateMidjourneyV8Args, GenerateMidjourneyV8Request,
+};
+
+use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::provider_error::ProviderError;
+use crate::generate::generate_image::generate_image_response::{
+  GenerateImageResponse, Seedance2proImageResponsePayload,
+};
+
+#[derive(Debug, Clone)]
+pub struct KinoviMidjourney8RequestState {
+  pub request: GenerateMidjourneyV8Request,
+}
+
+impl KinoviMidjourney8RequestState {
+  pub async fn send(
+    &self,
+    client: &RouterSeedance2ProClient,
+  ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
+    let args = GenerateMidjourneyV8Args {
+      session: &client.session,
+      host_override: None,
+      request: self.request.clone(),
+    };
+
+    let response = generate_midjourney_v8(args)
+      .await
+      .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Seedance2Pro(err)))?;
+
+    Ok(GenerateImageResponse::Seedance2Pro(Seedance2proImageResponsePayload {
+      order_id: response.order_id,
+      task_id: response.task_id,
+      maybe_order_ids: response.order_ids,
+      maybe_task_ids: response.task_ids,
+    }))
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use std::collections::HashMap;
+
+  use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_image_model::RouterImageModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::client::router_client::RouterClient;
+  use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
+  use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
+  use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest;
+  use crate::generate::generate_image::image_generation_draft_context::ImageGenerationDraftContext;
+  use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
+  use crate::generate::generate_image::image_generation_request::ImageGenerationRequest;
+  use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;
+
+  fn base_builder() -> GenerateImageRequestBuilder {
+    GenerateImageRequestBuilder {
+      model: RouterImageModel::Midjourney8,
+      provider: RouterProvider::Seedance2Pro,
+      prompt: Some("a spooky horror scene with ghosts in an abandoned mansion".to_string()),
+      image_inputs: None,
+      resolution: None,
+      aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+      quality: None,
+      image_batch_count: Some(1),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    }
+  }
+
+  fn get_kinovi_client() -> RouterClient {
+    let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/seedance2pro_cookies.txt")
+      .expect("Failed to read seedance2pro cookies");
+    let session = Seedance2ProSession::from_cookies_string(cookies.trim().to_string());
+    RouterClient::Seedance2Pro(RouterSeedance2ProClient::new(session))
+  }
+
+  #[tokio::test]
+  #[ignore] // manually test — requires real cookies; costs credits
+  async fn text_to_image_round_trip() {
+    let client = get_kinovi_client();
+    let result = base_builder().build2().expect("build2");
+
+    let request = match result {
+      ImageGenerationDraftOrRequest::Request(ImageGenerationRequest::KinoviMidjourney8(r)) => r,
+      _ => panic!("expected direct Request for text-to-image"),
+    };
+
+    let response = request.send(client.get_seedance2pro_client_ref().unwrap())
+      .await.expect("send should succeed");
+    let payload = response.get_seedance2pro_payload().expect("expected seedance2pro payload");
+    println!("v8 t2i — task_id={}, order_id={}", payload.task_id, payload.order_id);
+    assert!(!payload.task_id.is_empty());
+  }
+
+  #[tokio::test]
+  #[ignore] // manually test — requires real cookies; costs credits
+  async fn image_reference_round_trip_via_draft() {
+    let client = get_kinovi_client();
+    let token = MediaFileToken::new("mf_test_juno_v8".to_string());
+
+    let mut map = HashMap::new();
+    map.insert(token.clone(), JUNO_AT_LAKE_IMAGE_URL.to_string());
+
+    let builder = GenerateImageRequestBuilder {
+      prompt: Some("a dramatic painterly portrait inspired by @1".to_string()),
+      image_inputs: Some(ImageListRef::MediaFileTokens(vec![token])),
+      ..base_builder()
+    };
+
+    let draft_or_request = builder.build2().expect("build2");
+    let draft = match draft_or_request {
+      ImageGenerationDraftOrRequest::Draft(ImageGenerationDraftRequest::KinoviMidjourney8(d)) => d,
+      _ => panic!("expected Draft for image-input flow"),
+    };
+
+    let ctx = ImageGenerationDraftContext {
+      client: Some(&client),
+      media_file_to_artcraft_url_map: Some(&map),
+    };
+
+    let request = ImageGenerationDraftRequest::KinoviMidjourney8(draft)
+      .finalize(ctx).await.expect("finalize");
+
+    let response = request.send_request(&client).await.expect("send_request");
+    let payload = response.get_seedance2pro_payload().expect("expected seedance2pro payload");
+    println!("v8 with ref — task_id={}, order_id={}", payload.task_id, payload.order_id);
+    assert!(!payload.task_id.is_empty());
+  }
+}

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

@@ -0,0 +1,6 @@
+pub mod midjourney_7;
+pub mod midjourney_7_niji;
+pub mod midjourney_8;
+
+pub(crate) mod resolve;
+pub(crate) mod upload;

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

@@ -0,0 +1,51 @@
+use std::collections::HashMap;
+
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+use tokens::tokens::media_files::MediaFileToken;
+
+use crate::api::image_list_ref::ImageListRef;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::client_error::ClientError;
+use crate::generate::generate_image::providers::kinovi::upload::upload_to_seedance2pro;
+
+/// Resolve an [`ImageListRef`] to a list of public Seedance2Pro CDN URLs,
+/// uploading each image one at a time. Preserves order.
+///
+/// Returns `Ok(None)` when the input is `None` or an empty list — the
+/// caller can then omit the field from the wire request entirely. (The
+/// downstream Midjourney API rejects empty arrays.)
+pub(crate) async fn resolve_and_upload_image_list(
+  session: &Seedance2ProSession,
+  list: Option<ImageListRef>,
+  maybe_map: Option<&HashMap<MediaFileToken, String>>,
+) -> Result<Option<Vec<String>>, ArtcraftRouterError> {
+  let source_urls = match list {
+    None => return Ok(None),
+    Some(ImageListRef::Urls(urls)) if urls.is_empty() => return Ok(None),
+    Some(ImageListRef::Urls(urls)) => urls,
+    Some(ImageListRef::MediaFileTokens(tokens)) if tokens.is_empty() => return Ok(None),
+    Some(ImageListRef::MediaFileTokens(tokens)) => resolve_tokens(maybe_map, &tokens)?,
+  };
+
+  let mut uploaded = Vec::with_capacity(source_urls.len());
+  for url in &source_urls {
+    uploaded.push(upload_to_seedance2pro(session, url).await?);
+  }
+  Ok(Some(uploaded))
+}
+
+fn resolve_tokens(
+  maybe_map: Option<&HashMap<MediaFileToken, String>>,
+  tokens: &[MediaFileToken],
+) -> Result<Vec<String>, ArtcraftRouterError> {
+  let map = maybe_map.ok_or(ArtcraftRouterError::Client(ClientError::MediaFileToUrlMapNotProvided))?;
+  tokens.iter()
+    .map(|token| {
+      map.get(token).cloned().ok_or_else(|| {
+        ArtcraftRouterError::Client(ClientError::MediaFileTokenNotFoundInMap {
+          token: token.clone(),
+        })
+      })
+    })
+    .collect()
+}

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

@@ -0,0 +1,44 @@
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro_client::requests::prepare_file_upload::prepare_file_upload::{prepare_file_upload, PrepareFileUploadArgs};
+use seedance2pro_client::requests::upload_file::upload_file::{upload_file, UploadFileArgs};
+use url_utils::extension::extract_extension_from_url::{extract_extension_from_url_str, ExtractExtensions};
+
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::provider_error::ProviderError;
+use crate::utils::download_file::download_file;
+
+/// Downloads an image from a source URL and re-uploads it to the
+/// Seedance2Pro/Kinovi CDN. Returns the public URL.
+///
+/// This is the image-side twin of `generate_video::providers::kinovi::upload`.
+/// The actual upload path doesn't care whether the file is a video or an
+/// image, but keeping the two helpers separate lets each side evolve
+/// independently and makes intent clear at call sites.
+pub(crate) async fn upload_to_seedance2pro(
+  session: &Seedance2ProSession,
+  source_url: &str,
+) -> Result<String, ArtcraftRouterError> {
+  let extension = extract_extension_from_url_str(source_url, &ExtractExtensions::All)
+    .map(|ext| ext.without_period().to_string())
+    .unwrap_or_else(|| "jpg".to_string());
+
+  let file_bytes = download_file(source_url).await?;
+
+  let prepare_response = prepare_file_upload(PrepareFileUploadArgs {
+    session,
+    extension,
+    host_override: None,
+  })
+    .await
+    .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Seedance2Pro(err)))?;
+
+  let upload_response = upload_file(UploadFileArgs {
+    upload_url: prepare_response.upload_url,
+    file_bytes,
+    host_override: None,
+  })
+    .await
+    .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Seedance2Pro(err)))?;
+
+  Ok(upload_response.public_url)
+}

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

@@ -1,2 +1,3 @@
 pub mod artcraft;
 pub mod fal;
+pub mod kinovi;

crates/api_clients/grok_api_client/src/api/requests/videos/video_status/video_status.rs

@@ -1,10 +1,11 @@
 use log::info;
 use serde_derive::Serialize;
+use serde_json::Value as JsonValue;
 
 use crate::api::requests::videos::video_status::request_types::*;
 use crate::api::requests::xai_host::XAI_API_BASE_URL;
 use crate::creds::grok_api_key::GrokApiKey;
-use crate::error::classify_grok_http_error::classify_grok_http_error;
+use crate::error::classify_grok_http_error::{body_indicates_moderation, classify_grok_http_error};
 use crate::error::grok_client_error::GrokClientError;
 use crate::error::grok_error::GrokError;
 use crate::error::grok_generic_api_error::GrokGenericApiError;
@@ -31,31 +32,46 @@ pub struct VideoStatusRequest {
 
 // ── Public response ──
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum VideoStatusState {
-  /// Still working.
-  Pending,
-  /// Finished successfully — `video.url` is populated.
-  Done,
-  /// xAI couldn't render this — see `VideoJobFailed` in the error path.
-  Failed,
+#[derive(Debug, Clone)]
+pub struct VideoStatusResponse {
+  pub status: VideoStatus,
 }
 
+/// The lifecycle state of a video job. `Failed` is a *status*, not an error —
+/// xAI accepted the job and (usually) billed for it, but didn't produce a
+/// usable video.
 #[derive(Debug, Clone)]
-pub struct VideoStatusSuccess {
-  pub state: VideoStatusState,
+pub enum VideoStatus {
+  /// Still working. `progress` is 0–100 when xAI provides it.
+  Pending {
+    progress: Option<u8>,
+  },
+  /// Finished successfully — `video.url` is typically populated.
+  Complete {
+    model: Option<String>,
+    video: Option<VideoOutputInfo>,
+    cost_in_usd_ticks: Option<u64>,
+  },
+  /// xAI couldn't render this. `reason` is our best classification; the
+  /// remaining fields surface whatever xAI told us so the caller can log,
+  /// mark the row failed, and (where applicable) refund / surface a
+  /// user-facing message.
+  Failed {
+    reason: FailureReason,
+    code: Option<String>,
+    error: Option<String>,
+    cost_in_usd_ticks: Option<u64>,
+    full_error_json_payload: Option<String>,
+  },
+}
 
-  /// 0–100, may be `None` while still queued.
-  pub progress: Option<u8>,
-
-  /// The model that fulfilled the request.
-  pub model: Option<String>,
-
-  /// Populated when `state == Done`.
-  pub video: Option<VideoOutputInfo>,
-
-  /// xAI cost reporting (in micro-dollars / "USD ticks").
-  pub cost_in_usd_ticks: Option<u64>,
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum FailureReason {
+  /// xAI's safety filter rejected the prompt or the generated video.
+  ContentModerated,
+  /// Anything else: invalid argument we can't recover from, internal error,
+  /// expired job, etc.
+  Unknown,
 }
 
 #[derive(Debug, Clone)]
@@ -72,15 +88,13 @@ pub struct VideoOutputInfo {
 /// GET https://api.x.ai/v1/videos/{request_id} — poll a video generation /
 /// edit / extension job for its current status.
 ///
-/// Returns:
-/// - `Ok(VideoStatusSuccess { state: Pending, .. })` while the job is in flight
-/// - `Ok(VideoStatusSuccess { state: Done, video: Some(..), .. })` when finished
-/// - `Err(GrokSpecificApiError::VideoJobFailed { code, message })` when xAI
-///   reports the job as failed
-/// - `Err(GrokSpecificApiError::VideoJobExpired)` when the job expired
+/// Returns `Ok(VideoStatusResponse)` for any well-formed xAI response,
+/// including jobs that failed or were moderated — those come back as
+/// `VideoStatus::Failed`. Only infrastructure problems (auth, network, 404
+/// for unknown request_id, 5xx) bubble up as `Err(GrokError)`.
 ///
 /// Docs: <https://docs.x.ai/developers/model-capabilities/video/generation>
-pub async fn video_status(args: VideoStatusArgs<'_>) -> Result<VideoStatusSuccess, GrokError> {
+pub async fn video_status(args: VideoStatusArgs<'_>) -> Result<VideoStatusResponse, GrokError> {
   let req = args.request;
   let url = format!("{}/v1/videos/{}", XAI_API_BASE_URL, req.request_id);
 
@@ -98,55 +112,155 @@ pub async fn video_status(args: VideoStatusArgs<'_>) -> Result<VideoStatusSucces
     .await
     .map_err(GrokGenericApiError::ReqwestError)?;
 
-  let status = response.status();
+  let http_status = response.status();
   let response_body = response.text()
     .await
     .map_err(GrokGenericApiError::ReqwestError)?;
 
-  info!("Grok video_status response: http_status={}", status);
+  info!("Grok video_status response: http_status={}", http_status);
 
-  classify_grok_http_error(status, Some(&response_body))?;
+  if http_status.is_success() {
+    let parsed: VideoStatusResponseBody = serde_json::from_str(&response_body)
+      .map_err(|err| GrokGenericApiError::SerdeResponseParseErrorWithBody(err, response_body.clone()))?;
+    return classify_status_field(&parsed, &response_body);
+  }
 
-  let parsed: VideoStatusResponseBody = serde_json::from_str(&response_body)
-    .map_err(|err| GrokGenericApiError::SerdeResponseParseErrorWithBody(err, response_body.clone()))?;
+  // Non-2xx. xAI returns 4xx for some failure modes that are really "the job
+  // failed" rather than "something is wrong with your request" — most
+  // notably content moderation. Recognize those and return them as a Failed
+  // status so callers don't have to thread an error path.
+  if body_indicates_moderation(&response_body) {
+    return Ok(build_moderated_failed_response(&response_body));
+  }
 
-  classify_status_field(&parsed)
+  // Anything else (401, 402, 404, 429, plain 400/403, 5xx) is a real error.
+  Err(unwrap_classify_err(classify_grok_http_error(http_status, Some(&response_body))))
 }
 
-fn classify_status_field(parsed: &VideoStatusResponseBody) -> Result<VideoStatusSuccess, GrokError> {
-  let state = match parsed.status.as_str() {
-    "pending" | "queued" | "in_progress" | "processing" => VideoStatusState::Pending,
-    "done" | "completed" | "succeeded" => VideoStatusState::Done,
+fn classify_status_field(
+  parsed: &VideoStatusResponseBody,
+  raw_body: &str,
+) -> Result<VideoStatusResponse, GrokError> {
+  let cost = parsed.usage.as_ref().and_then(|u| u.cost_in_usd_ticks);
+
+  match parsed.status.as_str() {
+    "pending" | "queued" | "in_progress" | "processing" => Ok(VideoStatusResponse {
+      status: VideoStatus::Pending { progress: parsed.progress },
+    }),
+    "done" | "completed" | "succeeded" => {
+      let video = parsed.video.as_ref().map(|v| VideoOutputInfo {
+        url: v.url.clone(),
+        duration: v.duration,
+        respect_moderation: v.respect_moderation,
+      });
+      Ok(VideoStatusResponse {
+        status: VideoStatus::Complete {
+          model: parsed.model.clone(),
+          video,
+          cost_in_usd_ticks: cost,
+        },
+      })
+    }
     "failed" => {
-      let (code, message) = parsed.error.as_ref()
-        .map(|e| (e.code.clone(), e.message.clone()))
-        .unwrap_or_else(|| ("unknown".to_string(), "video job failed without details".to_string()));
-      return Err(crate::error::grok_specific_api_error::GrokSpecificApiError::VideoJobFailed { code, message }.into());
-    }
-    "expired" => {
-      return Err(crate::error::grok_specific_api_error::GrokSpecificApiError::VideoJobExpired.into());
-    }
-    other => {
-      return Err(GrokGenericApiError::UncategorizedBadResponseWithStatusAndBody {
-        status_code: reqwest::StatusCode::OK,
-        body: format!("unknown video status: {:?}", other),
-      }.into());
+      let code = parsed.error.as_ref().map(|e| e.code.clone());
+      let error_msg = parsed.error.as_ref().map(|e| e.message.clone());
+      let reason = if text_indicates_moderation(error_msg.as_deref())
+        || body_indicates_moderation(raw_body)
+      {
+        FailureReason::ContentModerated
+      } else {
+        FailureReason::Unknown
+      };
+      Ok(VideoStatusResponse {
+        status: VideoStatus::Failed {
+          reason,
+          code,
+          error: error_msg,
+          cost_in_usd_ticks: cost,
+          full_error_json_payload: Some(raw_body.to_string()),
+        },
+      })
     }
+    "expired" => Ok(VideoStatusResponse {
+      status: VideoStatus::Failed {
+        reason: FailureReason::Unknown,
+        code: Some("expired".to_string()),
+        error: Some("video job expired".to_string()),
+        cost_in_usd_ticks: cost,
+        full_error_json_payload: Some(raw_body.to_string()),
+      },
+    }),
+    other => Err(GrokGenericApiError::UncategorizedBadResponseWithStatusAndBody {
+      status_code: reqwest::StatusCode::OK,
+      body: format!("unknown video status: {:?}", other),
+    }.into()),
+  }
+}
+
+fn build_moderated_failed_response(raw_body: &str) -> VideoStatusResponse {
+  let (code, error_msg, cost) = parse_error_body(raw_body);
+  VideoStatusResponse {
+    status: VideoStatus::Failed {
+      reason: FailureReason::ContentModerated,
+      code,
+      error: error_msg,
+      cost_in_usd_ticks: cost,
+      full_error_json_payload: Some(raw_body.to_string()),
+    },
+  }
+}
+
+/// Best-effort extraction of `{code, error, usage.cost_in_usd_ticks}` from
+/// the two error-body shapes xAI uses:
+///
+/// 1. Status-poll 4xx:
+///    `{"code":"...", "error":"<string>", "usage":{"cost_in_usd_ticks":...}}`
+/// 2. OpenAI-compatible:
+///    `{"error":{"code":"...", "message":"..."}}`
+fn parse_error_body(body: &str) -> (Option<String>, Option<String>, Option<u64>) {
+  let parsed: JsonValue = match serde_json::from_str(body) {
+    Ok(v) => v,
+    Err(_) => return (None, None, None),
   };
 
-  let video = parsed.video.as_ref().map(|v| VideoOutputInfo {
-    url: v.url.clone(),
-    duration: v.duration,
-    respect_moderation: v.respect_moderation,
-  });
+  let top_level_code = parsed.get("code")
+    .and_then(JsonValue::as_str)
+    .map(str::to_string);
 
-  Ok(VideoStatusSuccess {
-    state,
-    progress: parsed.progress,
-    model: parsed.model.clone(),
-    video,
-    cost_in_usd_ticks: parsed.usage.as_ref().and_then(|u| u.cost_in_usd_ticks),
-  })
+  let (error_msg, nested_code) = match parsed.get("error") {
+    Some(JsonValue::String(s)) => (Some(s.clone()), None),
+    Some(obj @ JsonValue::Object(_)) => {
+      let msg = obj.get("message").and_then(JsonValue::as_str).map(str::to_string);
+      let nested = obj.get("code").and_then(JsonValue::as_str).map(str::to_string);
+      (msg, nested)
+    }
+    _ => (None, None),
+  };
+
+  let code = top_level_code.or(nested_code);
+
+  let cost = parsed.get("usage")
+    .and_then(|u| u.get("cost_in_usd_ticks"))
+    .and_then(JsonValue::as_u64);
+
+  (code, error_msg, cost)
+}
+
+fn text_indicates_moderation(maybe_text: Option<&str>) -> bool {
+  maybe_text.map(body_indicates_moderation).unwrap_or(false)
+}
+
+/// `classify_grok_http_error` always returns `Err` when the status is non-2xx,
+/// so this is infallible in our call path. Spelled out for clarity at the call
+/// site rather than `.unwrap_err()` on the inline expression.
+fn unwrap_classify_err(result: Result<(), GrokError>) -> GrokError {
+  match result {
+    Ok(()) => GrokGenericApiError::UncategorizedBadResponseWithStatusAndBody {
+      status_code: reqwest::StatusCode::OK,
+      body: "classify_grok_http_error returned Ok for a non-2xx response".to_string(),
+    }.into(),
+    Err(err) => err,
+  }
 }
 
 #[cfg(test)]
@@ -156,36 +270,30 @@ mod tests {
 
   use crate::error::grok_specific_api_error::GrokSpecificApiError;
 
-  // ── Shape tests ──
+  // ── Status-field dispatch (HTTP 200) ──
 
   #[test]
   fn pending_response_classifies_as_pending() {
     let json = r#"{ "status": "pending", "progress": 12, "model": "grok-imagine-video" }"#;
     let parsed: VideoStatusResponseBody = serde_json::from_str(json).unwrap();
-    let result = classify_status_field(&parsed).unwrap();
-    assert_eq!(result.state, VideoStatusState::Pending);
-    assert_eq!(result.progress, Some(12));
-    assert_eq!(result.model.as_deref(), Some("grok-imagine-video"));
-    assert!(result.video.is_none());
+    let result = classify_status_field(&parsed, json).unwrap();
+    match result.status {
+      VideoStatus::Pending { progress } => assert_eq!(progress, Some(12)),
+      other => panic!("expected Pending, got: {:?}", other),
+    }
   }
 
   #[test]
-  fn pending_response_with_v1p5_model_passes_model_string_through() {
-    // The `model` field is opaque Option<String>; the v1.5 preview model
-    // identifier (and its dated alias) flow through unchanged.
+  fn pending_response_with_v1p5_model_does_not_break_dispatch() {
+    // `model` doesn't surface on Pending; it flows through on Complete only.
     let json = r#"{ "status": "pending", "progress": 5, "model": "grok-imagine-video-1.5-preview" }"#;
     let parsed: VideoStatusResponseBody = serde_json::from_str(json).unwrap();
-    let result = classify_status_field(&parsed).unwrap();
-    assert_eq!(result.model.as_deref(), Some("grok-imagine-video-1.5-preview"));
-
-    let json_alias = r#"{ "status": "pending", "progress": 5, "model": "grok-imagine-video-1.5-2026-05-30" }"#;
-    let parsed_alias: VideoStatusResponseBody = serde_json::from_str(json_alias).unwrap();
-    let result_alias = classify_status_field(&parsed_alias).unwrap();
-    assert_eq!(result_alias.model.as_deref(), Some("grok-imagine-video-1.5-2026-05-30"));
+    let result = classify_status_field(&parsed, json).unwrap();
+    assert!(matches!(result.status, VideoStatus::Pending { .. }));
   }
 
   #[test]
-  fn done_response_classifies_as_done_with_video() {
+  fn done_response_classifies_as_complete_with_video() {
     let json = r#"{
       "status": "done",
       "progress": 100,
@@ -194,62 +302,150 @@ mod tests {
       "usage": { "cost_in_usd_ticks": 42 }
     }"#;
     let parsed: VideoStatusResponseBody = serde_json::from_str(json).unwrap();
-    let result = classify_status_field(&parsed).unwrap();
-    assert_eq!(result.state, VideoStatusState::Done);
-    let video = result.video.unwrap();
-    assert_eq!(video.url.as_deref(), Some("https://imagine.x.ai/v.mp4"));
-    assert_eq!(video.duration, Some(5));
-    assert_eq!(video.respect_moderation, Some(true));
-    assert_eq!(result.cost_in_usd_ticks, Some(42));
+    let result = classify_status_field(&parsed, json).unwrap();
+    match result.status {
+      VideoStatus::Complete { model, video, cost_in_usd_ticks } => {
+        assert_eq!(model.as_deref(), Some("grok-imagine-video"));
+        let video = video.unwrap();
+        assert_eq!(video.url.as_deref(), Some("https://imagine.x.ai/v.mp4"));
+        assert_eq!(video.duration, Some(5));
+        assert_eq!(video.respect_moderation, Some(true));
+        assert_eq!(cost_in_usd_ticks, Some(42));
+      }
+      other => panic!("expected Complete, got: {:?}", other),
+    }
   }
 
   #[test]
-  fn failed_response_returns_video_job_failed_error() {
+  fn failed_response_returns_ok_failed_unknown() {
     let json = r#"{
       "status": "failed",
       "progress": 50,
-      "error": { "code": "invalid_argument", "message": "duration too long" }
+      "error": { "code": "invalid_argument", "message": "duration too long" },
+      "usage": { "cost_in_usd_ticks": 7 }
     }"#;
     let parsed: VideoStatusResponseBody = serde_json::from_str(json).unwrap();
-    let err = classify_status_field(&parsed).unwrap_err();
-    match err {
-      GrokError::ApiSpecific(GrokSpecificApiError::VideoJobFailed { code, message }) => {
-        assert_eq!(code, "invalid_argument");
-        assert_eq!(message, "duration too long");
+    let result = classify_status_field(&parsed, json).unwrap();
+    match result.status {
+      VideoStatus::Failed { reason, code, error, cost_in_usd_ticks, full_error_json_payload } => {
+        assert_eq!(reason, FailureReason::Unknown);
+        assert_eq!(code.as_deref(), Some("invalid_argument"));
+        assert_eq!(error.as_deref(), Some("duration too long"));
+        assert_eq!(cost_in_usd_ticks, Some(7));
+        assert_eq!(full_error_json_payload.as_deref(), Some(json));
       }
-      other => panic!("expected VideoJobFailed, got: {:?}", other),
+      other => panic!("expected Failed, got: {:?}", other),
     }
   }
 
   #[test]
-  fn failed_response_without_error_object_uses_unknown() {
+  fn failed_response_with_moderation_message_is_classified_as_content_moderated() {
+    let json = r#"{
+      "status": "failed",
+      "error": { "code": "permission_denied", "message": "Video rejected by safety moderation" },
+      "usage": { "cost_in_usd_ticks": 11 }
+    }"#;
+    let parsed: VideoStatusResponseBody = serde_json::from_str(json).unwrap();
+    let result = classify_status_field(&parsed, json).unwrap();
+    match result.status {
+      VideoStatus::Failed { reason, code, cost_in_usd_ticks, .. } => {
+        assert_eq!(reason, FailureReason::ContentModerated);
+        assert_eq!(code.as_deref(), Some("permission_denied"));
+        assert_eq!(cost_in_usd_ticks, Some(11));
+      }
+      other => panic!("expected Failed, got: {:?}", other),
+    }
+  }
+
+  #[test]
+  fn failed_response_without_error_object_yields_none_code_and_error() {
     let json = r#"{ "status": "failed", "progress": 0 }"#;
     let parsed: VideoStatusResponseBody = serde_json::from_str(json).unwrap();
-    let err = classify_status_field(&parsed).unwrap_err();
-    match err {
-      GrokError::ApiSpecific(GrokSpecificApiError::VideoJobFailed { code, .. }) => {
-        assert_eq!(code, "unknown");
+    let result = classify_status_field(&parsed, json).unwrap();
+    match result.status {
+      VideoStatus::Failed { reason, code, error, .. } => {
+        assert_eq!(reason, FailureReason::Unknown);
+        assert!(code.is_none());
+        assert!(error.is_none());
       }
-      other => panic!("expected VideoJobFailed(unknown), got: {:?}", other),
+      other => panic!("expected Failed, got: {:?}", other),
     }
   }
 
   #[test]
-  fn expired_response_returns_expired_error() {
-    let json = r#"{ "status": "expired" }"#;
+  fn expired_response_classifies_as_failed_unknown() {
+    let json = r#"{ "status": "expired", "usage": { "cost_in_usd_ticks": 3 } }"#;
     let parsed: VideoStatusResponseBody = serde_json::from_str(json).unwrap();
-    let err = classify_status_field(&parsed).unwrap_err();
-    assert!(matches!(err, GrokError::ApiSpecific(GrokSpecificApiError::VideoJobExpired)));
+    let result = classify_status_field(&parsed, json).unwrap();
+    match result.status {
+      VideoStatus::Failed { reason, code, cost_in_usd_ticks, .. } => {
+        assert_eq!(reason, FailureReason::Unknown);
+        assert_eq!(code.as_deref(), Some("expired"));
+        assert_eq!(cost_in_usd_ticks, Some(3));
+      }
+      other => panic!("expected Failed, got: {:?}", other),
+    }
   }
 
   #[test]
   fn unknown_status_field_returns_generic_error() {
     let json = r#"{ "status": "magnificent" }"#;
     let parsed: VideoStatusResponseBody = serde_json::from_str(json).unwrap();
-    let err = classify_status_field(&parsed).unwrap_err();
+    let err = classify_status_field(&parsed, json).unwrap_err();
     assert!(matches!(err, GrokError::ApiGeneric(_)));
   }
 
+  // ── Error-body dispatch (HTTP 4xx) ──
+
+  #[test]
+  fn moderation_4xx_body_becomes_failed_content_moderated() {
+    // The real-world body that previously surfaced as
+    // `Err(GrokSpecificApiError::PromptModerated(..))`. It should now be
+    // an Ok(Failed { ContentModerated }) with all fields populated from
+    // the JSON.
+    let body = r#"{"code":"Client specified an invalid argument","error":"Generated video rejected by content moderation.","usage":{"cost_in_usd_ticks":11300000000}}"#;
+    let response = build_moderated_failed_response(body);
+    match response.status {
+      VideoStatus::Failed { reason, code, error, cost_in_usd_ticks, full_error_json_payload } => {
+        assert_eq!(reason, FailureReason::ContentModerated);
+        assert_eq!(code.as_deref(), Some("Client specified an invalid argument"));
+        assert_eq!(error.as_deref(), Some("Generated video rejected by content moderation."));
+        assert_eq!(cost_in_usd_ticks, Some(11_300_000_000));
+        assert_eq!(full_error_json_payload.as_deref(), Some(body));
+      }
+      other => panic!("expected Failed, got: {:?}", other),
+    }
+  }
+
+  #[test]
+  fn moderation_openai_shape_body_extracts_nested_code_and_message() {
+    let body = r#"{"error":{"code":"content_policy","message":"Content moderation blocked this prompt"}}"#;
+    let response = build_moderated_failed_response(body);
+    match response.status {
+      VideoStatus::Failed { reason, code, error, .. } => {
+        assert_eq!(reason, FailureReason::ContentModerated);
+        assert_eq!(code.as_deref(), Some("content_policy"));
+        assert_eq!(error.as_deref(), Some("Content moderation blocked this prompt"));
+      }
+      other => panic!("expected Failed, got: {:?}", other),
+    }
+  }
+
+  #[test]
+  fn moderation_unparseable_body_still_yields_failed_with_payload() {
+    let body = "totally not json but mentions moderation";
+    let response = build_moderated_failed_response(body);
+    match response.status {
+      VideoStatus::Failed { reason, code, error, full_error_json_payload, .. } => {
+        assert_eq!(reason, FailureReason::ContentModerated);
+        assert!(code.is_none());
+        assert!(error.is_none());
+        assert_eq!(full_error_json_payload.as_deref(), Some(body));
+      }
+      other => panic!("expected Failed, got: {:?}", other),
+    }
+  }
+
   // ── Public Request shape ──
 
   #[test]
@@ -284,7 +480,7 @@ mod tests {
       },
     }).await;
 
-    println!("Result: {:?}", result.as_ref().map(|s| (&s.state, s.progress)));
+    println!("Result: {:?}", result.as_ref().map(|r| &r.status));
     let err = result.unwrap_err();
     assert!(matches!(err, GrokError::ApiSpecific(GrokSpecificApiError::NotFound)),
       "expected NotFound, got: {:?}", err);
@@ -292,8 +488,8 @@ mod tests {
   }
 
   /// Polls a known request_id and prints the result. Doesn't assert a
-  /// specific state — depending on when the test runs, the job may be
-  /// pending, done, failed, or expired. The point is to exercise the
+  /// specific status — depending on when the test runs, the job may be
+  /// pending, complete, or failed. The point is to exercise the
   /// happy-path against the real xAI API.
   #[tokio::test]
   #[ignore] // manually test — requires real API key
@@ -306,26 +502,19 @@ mod tests {
     let result = video_status(VideoStatusArgs {
       api_key: &api_key,
       request: VideoStatusRequest {
-        //request_id: "e397ac83-c22f-90b1-9831-900c01497345".to_string(),
         request_id: "ce681bd0-133d-9cf3-975c-422d292d4e8e".to_string(),
       },
     }).await;
 
     match &result {
-      Ok(s) => println!(
-        "status: state={:?} progress={:?} model={:?} video={:?} cost_in_usd_ticks={:?}",
-        s.state, s.progress, s.model, s.video, s.cost_in_usd_ticks,
-      ),
+      Ok(r) => println!("status: {:?}", r.status),
       Err(e) => println!("status error: {:?}", e),
     }
-    // No assertion on the specific state — the job may have completed,
-    // failed, or expired by the time this runs. We just want to confirm
-    // the request_id was accepted and parsed.
     Ok(())
   }
 
   /// Polls another known request_id. Same lax assertions as the test above
-  /// — state varies with time.
+  /// — status varies with time.
   #[tokio::test]
   #[ignore] // manually test — requires real API key
   async fn live_test_video_status_known_id_2() -> AnyhowResult<()> {
@@ -342,10 +531,7 @@ mod tests {
     }).await;
 
     match &result {
-      Ok(s) => println!(
-        "status: state={:?} progress={:?} model={:?} video={:?} cost_in_usd_ticks={:?}",
-        s.state, s.progress, s.model, s.video, s.cost_in_usd_ticks,
-      ),
+      Ok(r) => println!("status: {:?}", r.status),
       Err(e) => println!("status error: {:?}", e),
     }
     Ok(())
@@ -363,17 +549,12 @@ mod tests {
     let result = video_status(VideoStatusArgs {
       api_key: &api_key,
       request: VideoStatusRequest {
-        //request_id: "ff94f941-62a7-9966-92da-6b84d9eedb50".to_string(),
-        //request_id: "4eea215a-9d21-9261-be1a-324409ec22c5".to_string(),
         request_id: "4d4a6185-209e-95f3-942b-510042637839".to_string(),
       },
     }).await;
 
     match &result {
-      Ok(s) => println!(
-        "status: state={:?} progress={:?} model={:?} video={:?} cost_in_usd_ticks={:?}",
-        s.state, s.progress, s.model, s.video, s.cost_in_usd_ticks,
-      ),
+      Ok(r) => println!("status: {:?}", r.status),
       Err(e) => println!("status error: {:?}", e),
     }
     Ok(())

crates/api_clients/grok_api_client/src/error/classify_grok_http_error.rs

@@ -68,7 +68,7 @@ fn extract_xai_error_message(body: &str) -> Option<String> {
 /// Heuristic: does this response body mention content moderation? xAI's
 /// safety filter rejections include words like "moderation", "safety",
 /// "content_policy", or "blocked".
-fn body_indicates_moderation(body: &str) -> bool {
+pub(crate) fn body_indicates_moderation(body: &str) -> bool {
   let lower = body.to_lowercase();
   lower.contains("moderat")          // moderation / moderated
     || lower.contains("safety")

crates/api_clients/grok_api_client/src/error/grok_specific_api_error.rs

@@ -29,19 +29,6 @@ pub enum GrokSpecificApiError {
   /// 400 Bad Request — the request body shape was invalid (e.g. missing
   /// required field, unsupported model, invalid aspect ratio).
   BadRequest(String),
-
-  /// The video generation/edit/extension job finished with `status:"failed"`.
-  ///
-  /// The `code` mirrors xAI's machine-readable error code
-  /// (`invalid_argument`, `permission_denied`, `failed_precondition`,
-  /// `internal_error`); `message` is the human-readable description.
-  VideoJobFailed {
-    code: String,
-    message: String,
-  },
-
-  /// The video job expired (poll status was `"expired"`).
-  VideoJobExpired,
 }
 
 impl Error for GrokSpecificApiError {}
@@ -56,10 +43,6 @@ impl Display for GrokSpecificApiError {
       Self::RateLimited => write!(f, "Grok API: Rate limited"),
       Self::PromptModerated(msg) => write!(f, "Grok API: Prompt moderated: {}", msg),
       Self::BadRequest(msg) => write!(f, "Grok API: Bad request: {}", msg),
-      Self::VideoJobFailed { code, message } => {
-        write!(f, "Grok API: Video job failed ({}): {}", code, message)
-      }
-      Self::VideoJobExpired => write!(f, "Grok API: Video job expired"),
     }
   }
 }

crates/api_clients/grok_consumer_client/src/requests/image_websocket/messages/websocket_server_message.rs

@@ -87,7 +87,8 @@ mod tests {
   use crate::requests::image_websocket::messages::websocket_server_message::WebsocketServerMessage;
 
   fn json_path(file_name: &str) -> String {
-    format!("/Users/bt/dev/storyteller/storyteller-rust/crates/api_clients/grok_consumer_client/test_data/websocket_messages/{}", file_name)
+    // NB: Cargo runs tests with the crate root as the working directory.
+    format!("test_data/websocket_messages/{}", file_name)
   }
 
   #[test]

crates/api_clients/grok_consumer_client/test_data/websocket_messages/create_image_complete_status_notification.json

@@ -0,0 +1,25 @@
+{
+  "type": "json",
+  "current_status": "completed",
+  "percentage_complete": 100,
+  "job_id": "c1bed796-3f05-4716-8ef0-a4d4900dfc6e",
+  "elapsed": null,
+  "prompt": "a dog typing on a keyboard",
+  "confirmation": "Drew a dog typing",
+  "full_prompt": "a dog typing on a keyboard",
+  "flags": null,
+  "is_alteration": false,
+  "section_id": 0,
+  "input_type": "text",
+  "request_id": "fc39cefd-fcf9-4775-b490-7e17ce670060",
+  "asr_transcript": null,
+  "asr_accepted": null,
+  "seed": null,
+  "image_reference": null,
+  "is_image_edit": null,
+  "moderated": false,
+  "r_rated": false,
+  "order": 1,
+  "model_name": "imagine_h_1",
+  "image_id": "78b3e6ef-defc-41a6-a9ac-b7a370d26ce5"
+}

crates/api_clients/grok_consumer_client/test_data/websocket_messages/create_image_in_progress_response.json

@@ -0,0 +1,25 @@
+{
+  "type": "json",
+  "current_status": "start_stage",
+  "percentage_complete": 0,
+  "job_id": "57baeffe-d5cf-483b-a5bb-7794899f905c",
+  "elapsed": null,
+  "prompt": "a dog typing on a keyboard",
+  "confirmation": "Drew a dog typing",
+  "full_prompt": "a dog typing on a keyboard",
+  "flags": null,
+  "is_alteration": true,
+  "section_id": 0,
+  "input_type": "text",
+  "request_id": "fc39cefd-fcf9-4775-b490-7e17ce670060",
+  "asr_transcript": null,
+  "asr_accepted": null,
+  "seed": null,
+  "image_reference": null,
+  "is_image_edit": null,
+  "moderated": false,
+  "r_rated": null,
+  "order": 7,
+  "model_name": "imagine_h_1",
+  "image_id": null
+}

crates/api_clients/grok_consumer_client/test_data/websocket_messages/create_image_request.json

@@ -0,0 +1,21 @@
+{
+  "type": "conversation.item.create",
+  "timestamp": 1761010203630,
+  "item": {
+    "type": "message",
+    "content": [
+      {
+        "requestId": "fc39cefd-fcf9-4775-b490-7e17ce670060",
+        "text": "a dog typing on a keyboard",
+        "type": "input_text",
+        "properties": {
+          "section_count": 0,
+          "is_kids_mode": false,
+          "enable_nsfw": true,
+          "skip_upsampler": false,
+          "is_initial": false
+        }
+      }
+    ]
+  }
+}