update download links

This is currently a draft / work in progress.

---------

Co-authored-by: bflatastic <bombayapirat@gmail.com>

.github/workflows/artcraft-macos-publish.yml

@@ -0,0 +1,232 @@
+name: "Artcraft MacOS Publish"
+
+on:
+  push:
+    branches:
+      - release
+      - artcraft-release
+      - artcraft-macos  # Additional branch for MacOS testing
+
+# This workflow creates Universal macOS builds with signing certificate support.
+# On each push to the release branches it will create or update a GitHub release, build your app, and upload the artifacts to the release.
+
+jobs:
+  publish-artcraft:
+    permissions:
+      contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # Universal macOS builds (arm64 and x86_64)
+          - platform: 'macos-latest-xlarge'
+            args: '--target universal-apple-darwin'
+          # Uncomment below for additional platforms
+          # - platform: 'ubuntu-22.04'
+          #   args: ''
+          # - platform: 'windows-latest'
+          #   args: ''
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+
+      - name: install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.platform == 'macos-latest-xlarge' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+
+      - name: install dependencies (ubuntu only)
+        if: matrix.platform == 'ubuntu-22.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+
+      - name: install frontend dependencies
+        run: |
+          # Navigate to the frontend directory to install dependencies
+          cd ./frontend
+
+          npm cache clean --force
+
+          echo "Installing all workspace dependencies..."
+          npm ci
+
+          echo "=== Version Information ==="
+          echo "Node version:"
+          node --version
+          echo "NPM version:"
+          npm --version
+
+          # Remove mismatched @nx packages and reinstall with correct versions
+          npm install --save-dev @nx/remix@21.1.1 @nx/js@21.1.1 @nx/react@21.1.1 @nx/vite@21.1.1 @nx/eslint@21.1.1
+
+          echo "=== Nx versions after adjustment ==="
+          npm list --depth=0 | grep nx
+
+      - name: import Apple Developer Certificate
+        if: matrix.platform == 'macos-latest-xlarge'
+        env:
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          echo "Starting certificate import process..."
+
+          # Create certificate file
+          echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
+
+          # Debug: Check if certificate file exists and has content
+          echo "Certificate file info:"
+          ls -la certificate.p12
+          file certificate.p12
+
+          # Debug: Check certificate contents without password (just structure)
+          echo "Certificate structure (may show error if password protected):"
+          openssl pkcs12 -info -in certificate.p12 -passin pass:$APPLE_CERTIFICATE_PASSWORD -noout || echo "Could not read certificate structure"
+
+          # Debug: Try to list what's in the p12 file
+          echo "Attempting to list certificate contents:"
+          security cms -D -i certificate.p12 || echo "Not a CMS file, trying PKCS12..."
+          openssl pkcs12 -in certificate.p12 -passin pass:$APPLE_CERTIFICATE_PASSWORD -info -nodes 2>&1 | head -20 || echo "Failed to read PKCS12 contents"
+
+          # Debug: Extract certificate details to verify type and expiration
+          echo "Extracting certificate details..."
+          # Extract just the certificate portion and examine it
+          openssl pkcs12 -in certificate.p12 -passin pass:$APPLE_CERTIFICATE_PASSWORD -nokeys 2>/dev/null | openssl x509 -text -noout | grep -E "(Subject:|Issuer:|Not Before|Not After)" || echo "Failed to parse certificate details"
+
+          # Also try to see what type of certificate this is
+          echo "Certificate type check:"
+          openssl pkcs12 -in certificate.p12 -passin pass:$APPLE_CERTIFICATE_PASSWORD -nokeys 2>/dev/null | openssl x509 -text -noout | grep -E "(CN=|OU=)" || echo "Could not determine certificate type"
+
+          # Debug: Check if private key exists
+          echo "Checking for private key..."
+          openssl pkcs12 -in certificate.p12 -passin pass:$APPLE_CERTIFICATE_PASSWORD -nocerts -nodes 2>&1 | grep -E "(PRIVATE KEY|RSA KEY)" | head -5 || echo "No private key found"
+
+          # Create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+          security set-keychain-settings -t 3600 -u build.keychain
+
+          # Import certificate - ensure both certificate and private key are imported
+          echo "Importing certificate into keychain..."
+          # Import the p12 directly - this is the most reliable method
+          security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild
+
+          # Alternative: Try with additional flags if the first import didn't create an identity
+          echo "Verifying import..."
+          if ! security find-identity -v build.keychain | grep -q "1 valid identities found"; then
+            echo "First import didn't create identity, trying with -A flag..."
+            security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -A
+          fi
+
+          # Set trust settings for the certificate
+          echo "Setting trust settings..."
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
+
+          # Unlock the keychain again to ensure it's accessible
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+
+          # Add the keychain to the search list
+          security list-keychains -d user -s build.keychain $(security list-keychains -d user | sed 's/^[[:space:]]*"//;s/"$//')
+
+          # List all certificates to debug
+          echo "Listing all keychains:"
+          security list-keychains
+
+          echo "Listing all certificates in build keychain:"
+          security find-certificate -a -p build.keychain || echo "No certificates found"
+
+          echo "Detailed certificate info:"
+          security find-certificate -c "Learning Machines" build.keychain || echo "Certificate 'Learning Machines' not found"
+
+          # Check certificate trust settings
+          echo "Checking certificate trust settings:"
+          security dump-trust-settings || echo "No custom trust settings"
+
+          # Try to find codesigning identities
+          echo "Finding all identities in keychain:"
+          security find-identity -v build.keychain || echo "No identities found"
+
+          echo "Finding codesigning identities:"
+          security find-identity -v -p codesigning build.keychain || echo "No codesigning identities found"
+
+          # Additional debug: Check if this is a valid Developer ID cert
+          echo "Checking for Developer ID certificates:"
+          security find-certificate -a build.keychain | grep -A 5 -B 5 "Developer ID" || echo "No Developer ID certificates found"
+
+      - name: verify certificate
+        if: matrix.platform == 'macos-latest-xlarge'
+        run: |
+          echo "=== Certificate Verification ==="
+
+          echo "1. Checking codesigning identities:"
+          security find-identity -v -p codesigning build.keychain || echo "No codesigning identities found"
+
+          echo -e "\n2. Checking all identities:"
+          security find-identity -v build.keychain || echo "No identities found"
+
+          echo -e "\n3. Checking certificates in keychain:"
+          security find-certificate -c "Learning Machines" build.keychain -p | openssl x509 -text -noout | grep -E "(Subject:|CN=)" || echo "Could not parse certificate"
+
+          # Set the correct signing identity
+          echo "APPLE_SIGNING_IDENTITY=Developer ID Application: Learning Machines LLC (DJ6XS33FX8)" >> $GITHUB_ENV
+          echo "Proceeding with identity: Developer ID Application: Learning Machines LLC (DJ6XS33FX8)"
+
+          # Also set the team ID
+          echo "APPLE_DEVELOPMENT_TEAM=DJ6XS33FX8" >> $GITHUB_ENV
+
+      - name: Pre-build frontend to avoid Tauri build issues
+        run: |
+          # Build the frontend app from the correct directory
+          cd ./frontend
+
+          # Increase Node.js memory limit for the build
+          export NODE_OPTIONS="--max-old-space-size=8192"
+
+          # Use npx to ensure we use the local nx version
+          echo "Building with npx nx..."
+          npx nx run editor3d:build
+
+          echo "Checking build output..."
+          ls -la apps/editor3d/dist/ | head -10
+
+          # Update Tauri config to skip the build (since we already built)
+          cd ${{ github.workspace }}/crates/desktop/artcraft
+          cp tauri.conf.json tauri.conf.json.bak
+          # Set beforeBuildCommand to empty or a no-op command
+          if command -v jq &> /dev/null; then
+            jq '.build.beforeBuildCommand = ""' tauri.conf.json > tauri.conf.json.tmp
+            mv tauri.conf.json.tmp tauri.conf.json
+          else
+            node -e "const fs = require('fs'); const config = JSON.parse(fs.readFileSync('tauri.conf.json', 'utf8')); config.build.beforeBuildCommand = ''; fs.writeFileSync('tauri.conf.json', JSON.stringify(config, null, 2));"
+          fi
+
+
+      - name: build and publish
+        uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ env.APPLE_SIGNING_IDENTITY }}
+          APPLE_DEVELOPMENT_TEAM: ${{ env.APPLE_DEVELOPMENT_TEAM }}
+          # Use the SQLx query cache for SQLite
+          SQLX_OFFLINE: true
+        with:
+          projectPath: ./crates/desktop/artcraft
+          tagName: artcraft-v__VERSION__ # the action automatically replaces __VERSION__ with the app version.
+          releaseName: "Artcraft v__VERSION__"
+          releaseBody: "See the assets to download this version and install."
+          releaseDraft: true
+          prerelease: false
+          args: ${{ matrix.args }}

.github/workflows/artcraft-publish.yml

@@ -1,107 +0,0 @@
-name: "Artcraft Publish"
-
-on:
-  push:
-    branches:
-      - release
-      - artcraft-release
-
-# This workflow creates Universal macOS builds with signing certificate support.
-# On each push to the release branches it will create or update a GitHub release, build your app, and upload the artifacts to the release.
-
-jobs:
-  publish-artcraft:
-    permissions:
-      contents: write
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # Universal macOS builds (arm64 and x86_64)
-          - platform: 'macos-latest'
-            args: '--target universal-apple-darwin'
-          # Uncomment below for additional platforms
-          # - platform: 'ubuntu-22.04'
-          #   args: ''
-          # - platform: 'windows-latest'
-          #   args: ''
-
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-
-      - name: install Rust stable
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
-
-      - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
-
-      - name: install frontend dependencies
-        run: |
-          cd ./crates/desktop/artcraft
-          yarn install
-
-      - name: import Apple Developer Certificate
-        if: matrix.platform == 'macos-latest'
-        # Prevents keychain from locking automatically for 3600 seconds.
-        env:
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-        run: |
-          echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
-          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
-          security set-keychain-settings -t 3600 -u build.keychain
-          security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
-          security find-identity -v -p codesigning build.keychain
-
-      - name: verify certificate
-        if: matrix.platform == 'macos-latest'
-        run: |
-          echo "Available certificates:"
-          security find-identity -v -p codesigning build.keychain
-          
-          # Try multiple certificate patterns
-          CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep -E "(Developer ID Application|Apple Development|Storyteller Developer)" | head -1)
-          
-          if [ -z "$CERT_INFO" ]; then
-            echo "No matching certificate found. Using first available certificate."
-            CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep -v "Policy" | head -1)
-          fi
-          
-          CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}')
-          echo "CERT_ID=$CERT_ID" >> $GITHUB_ENV
-          echo "Using certificate: $CERT_ID"
-
-      - name: build and publish
-        uses: tauri-apps/tauri-action@v0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_SIGNING_IDENTITY: ${{ env.CERT_ID }}
-        with:
-          projectPath: ./crates/desktop/artcraft
-          tagName: artcraft-v__VERSION__ # the action automatically replaces __VERSION__ with the app version.
-          releaseName: "Artcraft v__VERSION__"
-          releaseBody: "See the assets to download this version and install."
-          releaseDraft: true
-          prerelease: false
-          args: ${{ matrix.args }}

.github/workflows/artcraft-windows-publish.yml

@@ -39,24 +39,22 @@ jobs:
           # Navigate to the frontend directory to install dependencies
           cd ./frontend
 
-          yarn cache clean
+          npm cache clean --force
 
           echo "Installing all workspace dependencies..."
-          yarn install --production=false --frozen-lockfile
+          npm ci
 
           echo "=== Version Information ==="
           echo "Node version:"
           node --version
           echo "NPM version:"
           npm --version
-          echo "Yarn version:"
-          yarn --version
 
           # Remove mismatched @nx packages and reinstall with correct versions
-          yarn add @nx/remix@20.7.2 @nx/js@20.7.2 @nx/react@20.7.2 @nx/vite@20.7.2 @nx/eslint@20.7.2 --dev -W
+          npm install --save-dev @nx/remix@21.1.1 @nx/js@21.1.1 @nx/react@21.1.1 @nx/vite@21.1.1 @nx/eslint@21.1.1
 
           echo "=== Nx versions after adjustment ==="
-          yarn list --pattern "nx" --depth=0
+          npm list --depth=0 | findstr nx
 
       - name: Pre-build frontend to avoid Tauri build issues
         run: |
@@ -76,7 +74,7 @@ jobs:
           # Update Tauri config to skip the build (since we already built)
           cd ${{ github.workspace }}/crates/desktop/artcraft
           Copy-Item tauri.conf.json tauri.conf.json.bak
-          
+
           # Set beforeBuildCommand to empty using PowerShell
           $config = Get-Content tauri.conf.json | ConvertFrom-Json
           $config.build.beforeBuildCommand = ""
@@ -86,6 +84,8 @@ jobs:
         uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Use the SQLx query cache for SQLite
+          SQLX_OFFLINE: true
         with:
           projectPath: ./crates/desktop/artcraft
           tagName: artcraft-windows-v__VERSION__ # the action automatically replaces __VERSION__ with the app version.

.gitignore

@@ -24,11 +24,13 @@ twitch_secrets.toml
 *-secrets.env
 
 # Utilities with secrets
-script/production_database_secret_backup.sh
-script/production_database_secret_connect.sh
 production_database_secret_connect.sh
 production_database_secret_query.sh
 production_database_voice_clone_report_download.sh
+script/artcraft/mac_signing_build.sh
+script/production_database_secret_backup.sh
+script/production_database_secret_connect.sh
+script/socat_dev_database_connect.sh
 
 # Scratch data
 scratch/

.sqlx/query-22b91a21cbb88abc9bc17b338cf2f9418e08e414667d44476623eb141ab17b87.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n    INSERT INTO tasks (\n      id,\n      task_status,\n      task_type,\n      model_type,\n      provider,\n      provider_job_id,\n      frontend_subscriber_id,\n      frontend_subscriber_payload\n    )\n    VALUES (?, ?, ?, ?, ?, ?, ?, ?)\n  ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 8
+    },
+    "nullable": []
+  },
+  "hash": "22b91a21cbb88abc9bc17b338cf2f9418e08e414667d44476623eb141ab17b87"
+}

.sqlx/query-dc0367e9e43c3d7dda3623e77337ab4529eac2192475be7d08589886703ba1cb.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n    UPDATE tasks\n    SET task_status = ?\n    WHERE id = ?\n  ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "dc0367e9e43c3d7dda3623e77337ab4529eac2192475be7d08589886703ba1cb"
+}

Cargo.lock

@@ -656,6 +656,7 @@ dependencies = [
  "directories",
  "dirs",
  "discord-rich-presence",
+ "enums",
  "errors",
  "fal_client",
  "filesys",
@@ -675,6 +676,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "serial_test",
+ "sqlite_tasks",
  "storyteller_client",
  "tauri",
  "tauri-build",
@@ -696,11 +698,13 @@ dependencies = [
 name = "artcraft_api_defs"
 version = "0.0.1"
 dependencies = [
+ "chrono",
  "enums",
  "serde",
  "serde_derive",
  "serde_json",
  "tokens",
+ "url",
  "utoipa",
  "workspace-build-acceleration",
 ]
@@ -985,16 +989,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "atomic-write-file"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c232177ba50b16fe7a4588495bd474a62a9e45a8e4ca6fd7d0b7ac29d164631e"
-dependencies = [
- "nix 0.26.4",
- "rand 0.8.5",
-]
-
 [[package]]
 name = "attohttpc"
 version = "0.28.0"
@@ -1924,6 +1918,13 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "cloudflare_errors"
+version = "0.0.1"
+dependencies = [
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "coarsetime"
 version = "0.1.34"
@@ -2285,7 +2286,7 @@ dependencies = [
  "autocfg",
  "cfg-if 1.0.0",
  "crossbeam-utils 0.8.20",
- "memoffset 0.9.0",
+ "memoffset",
  "scopeguard",
 ]
 
@@ -3601,6 +3602,7 @@ dependencies = [
  "log",
  "reqwest 0.12.15",
  "serde",
+ "test_data",
  "testing",
  "tokio",
  "url",
@@ -3666,7 +3668,7 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
 dependencies = [
- "memoffset 0.9.0",
+ "memoffset",
  "rustc_version 0.4.0",
 ]
 
@@ -5987,15 +5989,6 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
-[[package]]
-name = "memoffset"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.9.0"
@@ -6378,19 +6371,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
 
-[[package]]
-name = "nix"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if 1.0.0",
- "libc",
- "memoffset 0.7.1",
- "pin-utils",
-]
-
 [[package]]
 name = "nix"
 version = "0.28.0"
@@ -6401,7 +6381,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "cfg_aliases 0.1.1",
  "libc",
- "memoffset 0.9.0",
+ "memoffset",
 ]
 
 [[package]]
@@ -6868,6 +6848,7 @@ dependencies = [
  "anyhow",
  "base64 0.22.1",
  "chrono",
+ "cloudflare_errors",
  "cookie 0.18.1",
  "errors",
  "idempotency",
@@ -9644,11 +9625,31 @@ dependencies = [
  "unicode_categories",
 ]
 
+[[package]]
+name = "sqlite_tasks"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "enums",
+ "errors",
+ "log",
+ "once_cell",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sqlx",
+ "tempfile",
+ "tokens",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "sqlx"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf"
+checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -9659,9 +9660,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd"
+checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6"
 dependencies = [
  "ahash 0.8.11",
  "atoi",
@@ -9671,7 +9672,6 @@ dependencies = [
  "chrono",
  "crc",
  "crossbeam-queue",
- "dotenvy",
  "either",
  "event-listener 2.5.3",
  "futures-channel",
@@ -9705,9 +9705,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5"
+checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9718,11 +9718,10 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841"
+checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8"
 dependencies = [
- "atomic-write-file",
  "dotenvy",
  "either",
  "heck 0.4.1",
@@ -9745,9 +9744,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4"
+checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418"
 dependencies = [
  "atoi",
  "base64 0.21.7",
@@ -9789,9 +9788,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24"
+checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e"
 dependencies = [
  "atoi",
  "base64 0.21.7",
@@ -9819,7 +9818,6 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "sha1 0.10.6",
  "sha2 0.10.8",
  "smallvec 1.13.2",
  "sqlx-core",
@@ -9831,9 +9829,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490"
+checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa"
 dependencies = [
  "atoi",
  "chrono",
@@ -10001,6 +9999,7 @@ dependencies = [
  "artcraft_api_defs",
  "backoff",
  "chrono",
+ "cloudflare_errors",
  "cookie 0.18.1",
  "enums",
  "enums_public",
@@ -10853,6 +10852,15 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
+[[package]]
+name = "test_data"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "errors",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "testing"
 version = "0.0.1"
@@ -11579,7 +11587,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
 dependencies = [
- "memoffset 0.9.0",
+ "memoffset",
  "tempfile",
  "winapi 0.3.9",
 ]
@@ -13164,7 +13172,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "hex",
- "nix 0.28.0",
+ "nix",
  "ordered-stream",
  "rand 0.8.5",
  "serde",

Cargo.toml

@@ -40,6 +40,7 @@ members = [
   "crates/lib/caching/memory_caching",
   "crates/lib/caching/memory_store",
   "crates/lib/caching/redis_caching",
+  "crates/lib/cloudflare_errors",
   "crates/lib/concurrency",
   "crates/lib/cookies",
   "crates/lib/data/collections",
@@ -76,6 +77,7 @@ members = [
   "crates/lib/sqlx_mysql_helpers",
   "crates/lib/storyteller_root",
   "crates/lib/subprocess_common",
+  "crates/lib/test_data",
   "crates/lib/testing",
   "crates/lib/tts_common",
   "crates/lib/url_config",
@@ -89,6 +91,7 @@ members = [
   "crates/schema/database/mysql_queries",
   "crates/schema/database/redis_common",
   "crates/schema/database/redis_schema",
+  "crates/schema/database/sqlite_tasks",
   #"crates/schema/database/sqlite_queries",
 
   # Schema (public): common strongly-typed tokens, ids, payloads, etc.
@@ -214,6 +217,7 @@ url = { version = "2.5.4", features = ["serde"] }
 artcraft_api_defs = { path = "crates/schema/public/api/artcraft_api_defs" }
 build_metadata = { path = "crates/lib/build_metadata" }
 cloud_storage = { path = "crates/api_clients/cloud_storage" }
+cloudflare_errors = { path = "crates/lib/cloudflare_errors" }
 crockford = { path = "crates/lib/data/crockford" }
 enums = { path = "crates/schema/public/enums" }
 enums_public = { path = "crates/schema/public/enums_public" }
@@ -230,7 +234,9 @@ mimetypes = { path = "crates/lib/files/mimetypes" }
 openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
 primitives = { path = "crates/lib/data/primitives" }
 shared_service_components = { path = "crates/lib/shared_service_components" }
+sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
 storyteller_client = { path = "crates/api_clients/storyteller_client" }
 subprocess_common = { path = "crates/lib/subprocess_common" }
+test_data = { path = "crates/lib/test_data" }
 tokens = { path = "crates/schema/public/tokens" }
 web_base64 = { path = "crates/lib/data/web_base64" }

_sql/artcraft_migrations/20250708000000_create_tasks_table.sql

@@ -0,0 +1,30 @@
+-- noinspection SqlDialectInspectionForFile
+-- Migration history:
+--   tasks_v1.sqlite - initial version
+--   tasks_v2.sqlite - added model_type (nullable)
+
+CREATE TABLE tasks (
+    id TEXT NOT NULL PRIMARY KEY,
+
+    task_status TEXT NOT NULL,
+    task_type TEXT NOT NULL,
+
+    model_type TEXT,
+
+    provider TEXT,
+    provider_job_id TEXT,
+
+    frontend_subscriber_id TEXT,
+    frontend_subscriber_payload TEXT,
+
+    created_at INTEGER NOT NULL DEFAULT (unixepoch('now')),
+    updated_at INTEGER NOT NULL DEFAULT (unixepoch('now')),
+    completed_at INTEGER DEFAULT NULL
+);
+
+-- Unique Indices
+CREATE UNIQUE INDEX idx_tasks_on_provider_job_id ON tasks(provider_job_id);
+
+-- Indices
+CREATE INDEX idx_tasks_on_status ON tasks(task_status);
+CREATE INDEX idx_tasks_on_provider ON tasks(provider);

crates/api_clients/fal_client/Cargo.toml

@@ -16,8 +16,8 @@ path = "src/lib.rs"
 workspace-build-acceleration.workspace = true
 
 # Internal
-file_to_base64_url.workspace = true
 errors.workspace = true
+file_to_base64_url.workspace = true
 
 # External
 anyhow.workspace = true
@@ -35,3 +35,4 @@ fal = { path = "../../vendor/fal-rs", features = ["endpoints"] }
 
 [dev-dependencies]
 testing = { path = "../../lib/testing" }
+test_data.workspace = true

crates/api_clients/fal_client/src/creds/fal_api_key.rs

@@ -8,6 +8,7 @@ impl FalApiKey {
   }
   
   pub fn from_str(api_key: &str) -> Self {
-    Self(api_key.to_string())
+    let api_key = api_key.trim().to_string();
+    Self(api_key)
   }
 }

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

@@ -1 +1,2 @@
-pub mod fal_api_key;
+pub mod fal_api_key;
+pub mod open_ai_api_key;

crates/api_clients/fal_client/src/creds/open_ai_api_key.rs

@@ -0,0 +1,15 @@
+
+/// This is for Fal's OpenAI "Bring Your Own Key" (BYOK) endpoints.
+#[derive(Clone)]
+pub struct OpenAiApiKey(pub String);
+
+impl OpenAiApiKey {
+  pub fn new(api_key: String) -> Self {
+    Self(api_key)
+  }
+
+  pub fn from_str(api_key: &str) -> Self {
+    let api_key = api_key.trim().to_string();
+    Self(api_key)
+  }
+}

crates/api_clients/fal_client/src/requests/webhook/image/enqueue_gpt_image_1_edit_image_webhook.rs

@@ -0,0 +1,133 @@
+use crate::creds::fal_api_key::FalApiKey;
+use crate::creds::open_ai_api_key::OpenAiApiKey;
+use crate::error::classify_fal_error::classify_fal_error;
+use crate::error::fal_error_plus::FalErrorPlus;
+use fal::endpoints::fal_ai::gpt_image_1::edit_image::byok::{gpt_edit_image, GptEditImageRequest};
+use fal::webhook::WebhookResponse;
+use reqwest::IntoUrl;
+
+pub struct GptEditImageByokArgs<'a, V: IntoUrl> {
+  // Request
+  pub image_urls: Vec<String>,
+  pub prompt: &'a str,
+  pub image_size: GptEditImageSize,
+  pub num_images: GptEditImageNumImages,
+  pub quality: GptEditImageQuality,
+  
+  // Fulfillment
+  pub api_key: &'a FalApiKey,
+  pub openai_api_key: &'a OpenAiApiKey,
+  pub webhook_url: V,
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum GptEditImageSize{
+  Auto,
+  Square,
+  Horizontal,
+  Vertical,
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum GptEditImageQuality {
+  Auto,
+  Low,
+  Medium,
+  High,
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum GptEditImageNumImages{
+  One,
+  Two,
+  Three,
+  Four,
+}
+
+pub async fn enqueue_gpt_image_1_edit_image_webhook<V: IntoUrl>(
+  args: GptEditImageByokArgs<'_, V>
+) -> Result<WebhookResponse, FalErrorPlus> {
+
+  // auto, 1024x1024, 1536x1024, 1024x1536
+  let image_size = match args.image_size {
+    GptEditImageSize::Auto => "auto",
+    GptEditImageSize::Square => "1024x1024",
+    GptEditImageSize::Horizontal => "1536x1024",
+    GptEditImageSize::Vertical => "1024x1536",
+  };
+  
+  let quality = match args.quality {
+    GptEditImageQuality::Auto => "auto",
+    GptEditImageQuality::Low => "low",
+    GptEditImageQuality::Medium => "medium",
+    GptEditImageQuality::High => "high",
+  };
+
+  let num_images = match args.num_images {
+    GptEditImageNumImages::One => 1,
+    GptEditImageNumImages::Two => 2,
+    GptEditImageNumImages::Three => 3,
+    GptEditImageNumImages::Four => 4,
+  };
+
+  let request = GptEditImageRequest {
+    image_urls: args.image_urls,
+    prompt: args.prompt.to_string(),
+    image_size: image_size.to_string(),
+    num_images,
+    quality: quality.to_string(),
+    openai_api_key: args.openai_api_key.0.to_string(),
+  };
+
+  let result = gpt_edit_image(request)
+      .with_api_key(&args.api_key.0)
+      .queue_webhook(args.webhook_url)
+      .await;
+
+  result.map_err(|err| classify_fal_error(err))
+}
+
+
+#[cfg(test)]
+mod tests {
+  use crate::creds::fal_api_key::FalApiKey;
+  use crate::creds::open_ai_api_key::OpenAiApiKey;
+  use crate::requests::webhook::image::enqueue_gpt_image_1_edit_image_webhook::{enqueue_gpt_image_1_edit_image_webhook, GptEditImageByokArgs, GptEditImageNumImages, GptEditImageQuality, GptEditImageSize};
+  use errors::AnyhowResult;
+  use std::fs::read_to_string;
+  use test_data::web::image_urls::{ERNEST_SCARED_STUPID_IMAGE_URL, GHOST_IMAGE_URL, GRASSY_HILL_TRANSPARENT_IMAGE_URL};
+
+  #[tokio::test]
+  #[ignore]
+  async fn test_gpt_image_1_edit_image() -> AnyhowResult<()> {
+    let image_url = "https://cdn-2.fakeyou.com/media/3/4/h/f/s/34hfsmt8e38rvne6mwa4pwbxr6292sgy/image_34hfsmt8e38rvne6mwa4pwbxr6292sgy.png";
+
+    // XXX: Don't commit secrets!
+    let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?;
+
+    let fal_api_key = FalApiKey::from_str(&secret);
+
+    let secret = read_to_string("/Users/bt/Artcraft/credentials/openai_api_key.txt")?;
+
+    let open_ai_api_key = OpenAiApiKey::from_str(&secret);
+
+    let args = GptEditImageByokArgs {
+      image_urls: vec![
+        ERNEST_SCARED_STUPID_IMAGE_URL.to_string(),
+        GHOST_IMAGE_URL.to_string(),
+        GRASSY_HILL_TRANSPARENT_IMAGE_URL.to_string(),
+      ],
+      prompt: "put the man and the ghost on the grassy hill. the man is scared of the friendly ghost.",
+      api_key: &fal_api_key,
+      openai_api_key: &open_ai_api_key,
+      webhook_url: "https://example.com/webhook",
+      image_size: GptEditImageSize::Horizontal,
+      num_images: GptEditImageNumImages::One,
+      quality: GptEditImageQuality::High,
+    };
+
+    let result = enqueue_gpt_image_1_edit_image_webhook(args).await?;
+
+    Ok(())
+  }
+}

crates/api_clients/fal_client/src/requests/webhook/image/mod.rs

@@ -2,4 +2,5 @@ pub mod enqueue_flux_1_dev_text_to_image_webhook;
 pub mod enqueue_flux_1_schnell_text_to_image_webhook;
 pub mod enqueue_flux_pro_11_text_to_image_webhook;
 pub mod enqueue_flux_pro_11_ultra_text_to_image_webhook;
-pub mod remove_background_rembg_webhook;
+pub mod enqueue_gpt_image_1_edit_image_webhook;
+pub mod remove_background_rembg_webhook;

crates/api_clients/fal_client/src/requests/webhook/image/remove_background_rembg_webhook.rs

@@ -37,6 +37,7 @@ mod tests {
   use crate::requests::webhook::image::remove_background_rembg_webhook::remove_background_rembg_webhook;
   use crate::requests::webhook::image::remove_background_rembg_webhook::RemoveBackgroundRembgWebhookArgs;
   use std::fs::read_to_string;
+  use test_data::web::image_urls::ERNEST_SCARED_STUPID_IMAGE_URL;
 
   #[tokio::test]
   #[ignore] // NB: Manually test, don't run in CI!
@@ -46,7 +47,7 @@ mod tests {
     let api_key = FalApiKey::from_str(&api_key);
     
     let args = RemoveBackgroundRembgWebhookArgs {
-      image_url: "https://cdn-2.fakeyou.com/media/b/2/p/b/0/b2pb09bcbxdqjzgbnsapvfs1t897wdnx/image_b2pb09bcbxdqjzgbnsapvfs1t897wdnx.png",
+      image_url: ERNEST_SCARED_STUPID_IMAGE_URL,
       webhook_url: "https://api.storyteller.ai/webhook",
       api_key: &api_key,
     };
@@ -55,8 +56,6 @@ mod tests {
 
     println!("{:?}", response);
 
-    assert_eq!(1, 2);
-    
     Ok(())
   }
 }

crates/api_clients/fal_client/src/requests/webhook/video/enqueue_veo_2_image_to_video_webhook.rs

@@ -37,10 +37,10 @@ pub async fn enqueue_veo_2_image_to_video_webhook<U: IntoUrl, V: IntoUrl>(
 ) -> Result<WebhookResponse, FalErrorPlus> {
   let duration = match args.duration {
     Veo2Duration::Default => None,
-    Veo2Duration::FiveSeconds => Some("5".to_string()),
-    Veo2Duration::SixSeconds => Some("6".to_string()),
-    Veo2Duration::SevenSeconds => Some("7".to_string()),
-    Veo2Duration::EightSeconds => Some("8".to_string()),
+    Veo2Duration::FiveSeconds => Some("5s".to_string()),
+    Veo2Duration::SixSeconds => Some("6s".to_string()),
+    Veo2Duration::SevenSeconds => Some("7s".to_string()),
+    Veo2Duration::EightSeconds => Some("8s".to_string()),
   };
   
   let aspect_ratio = match args.aspect_ratio {

crates/api_clients/openai_sora_client/Cargo.toml

@@ -23,6 +23,7 @@ idempotency.workspace = true
 anyhow.workspace = true
 base64.workspace = true
 chrono.workspace = true
+cloudflare_errors.workspace = true
 cookie.workspace = true
 log.workspace = true
 once_cell.workspace = true

crates/api_clients/openai_sora_client/src/sora_error.rs

@@ -1,3 +1,4 @@
+use cloudflare_errors::cloudflare_error::CloudflareError;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
 use std::io;
@@ -42,15 +43,9 @@ pub enum SoraError {
   /// Typically served from Cloudflare
   /// We preserve the message for debugging.
   BadGateway(String),
-  
-  /// HTTP 403 + Cloudflare Challenge Interstitial
-  /// Cloudflare decided to block the request and present a challenge.
-  CloudFlareChallenge,
-  
-  /// HTTP 524 (Cloudflare-specific)
-  /// Cloudflare formed a TCP connection to Sora, but no payload was delivered before timeout
-  /// We preserve the message for debugging
-  CloudFlareTimeout(String),
+
+  /// Specific Cloudflare errors.
+  CloudflareError(CloudflareError),
 
   /// Another error occurred.
   OtherBadStatus(anyhow::Error),
@@ -72,6 +67,17 @@ pub enum SoraError {
   JsonErrorWithBody(serde_json::Error, String),
 }
 
+impl SoraError {
+  pub fn is_sora_having_downtime_issues(&self) -> bool {
+    match self {
+      Self::BadGateway(_) => true,
+      Self::CloudflareError(CloudflareError::GatewayTimeout504) => true,
+      Self::CloudflareError(CloudflareError::TimeoutOccurred524) => true,
+      _ => false,
+    }
+  }
+}
+
 impl Error for SoraError {}
 
 impl Display for SoraError {
@@ -98,11 +104,8 @@ impl Display for SoraError {
       Self::BadGateway(message) => {
         write!(f, "Bad Gateway; Sora is likely having issues: {:?}", message)
       }
-      Self::CloudFlareChallenge => {
-        write!(f, "Cloudflare Challenge (403); Cloudflare wants to verify the request with a CAPTCHA challenge.")
-      }
-      Self::CloudFlareTimeout(message) => {
-        write!(f, "Cloudflare Timeout (524); Sora is likely having issues: {:?}", message)
+      Self::CloudflareError(error) => {
+        write!(f, "Cloudflare error: {}", error)
       }
       Self::OtherBadStatus(err) => {
         write!(f, "Other error: {}", err)
@@ -149,3 +152,9 @@ impl From<serde_json::Error> for SoraError {
     Self::JsonError(err)
   }
 }
+
+impl From<CloudflareError> for SoraError {
+  fn from(err: CloudflareError) -> Self {
+    Self::CloudflareError(err)
+  }
+}

crates/api_clients/openai_sora_client/src/utils/classify_general_http_status_code_and_body.rs

@@ -1,6 +1,6 @@
 use crate::sora_error::SoraError;
+use cloudflare_errors::filter_cloudflare_errors::filter_cloudflare_errors;
 use reqwest::StatusCode;
-
 /*
 
 Old cookie - 
@@ -50,32 +50,15 @@ pub async fn classify_general_http_status_code_and_body(status: StatusCode, resp
   }
 
   let status_code = status.as_u16();
-  
+
+  if let Err(err) = filter_cloudflare_errors(status_code, &response_body) {
+    return SoraError::CloudflareError(err);
+  }
+
   match status_code {
-    403 => {
-      if message.contains("challenge-platform") 
-          || message.contains("challenge-error-text") 
-          || message.contains("cType: 'managed'")
-          || message.contains("Just a moment...") {
-        return SoraError::CloudFlareChallenge;
-      }
-    }
     502 => {
       return SoraError::BadGateway(message);
     }
-    504 => {
-      if message.contains("cloudflare") 
-          || message.contains("Cloudflare") {
-        return SoraError::CloudFlareTimeout(message);
-      }
-    }
-    524 => {
-      // NB: 524 is a cloudflare specific gateway timeout error with slightly different semantics than 504.
-      if message.contains("cloudflare") 
-          || message.contains("Cloudflare") {
-        return SoraError::CloudFlareTimeout(message);
-      }
-    }
     _ => {}, // Fall-through
   }
 

crates/api_clients/storyteller_client/Cargo.toml

@@ -24,12 +24,13 @@ workspace-build-acceleration.workspace = true
 
 # Internal
 artcraft_api_defs.workspace = true
+cloudflare_errors.workspace = true
 enums.workspace = true
 enums_public.workspace = true
 errors.workspace = true
 idempotency.workspace = true
-tokens.workspace = true
 mimetypes.workspace = true
+tokens.workspace = true
 
 # External
 anyhow.workspace = true

crates/api_clients/storyteller_client/src/error/api_error.rs

@@ -1,7 +1,8 @@
+use cloudflare_errors::cloudflare_error::CloudflareError;
+use errors::AnyhowError;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
 use std::io;
-use errors::AnyhowError;
 
 #[derive(Debug)]
 pub enum ApiError {
@@ -26,6 +27,9 @@ pub enum ApiError {
     backend_hostname: Option<String>,
   },
 
+  /// Cloudflare errors.
+  CloudflareError(CloudflareError),
+
   /// A deserialization error with the response.
   DeserializationError(serde_json::Error),
 
@@ -63,6 +67,8 @@ impl Display for ApiError {
       // Network errors
       ApiError::Timeout(msg) => write!(f, "Timeout: {}", msg),
       ApiError::NetworkError(msg) => write!(f, "Network error: {}", msg),
+      // Cloudflare errors
+      ApiError::CloudflareError(error) => write!(f, "Cloudflare Error: {}", error),
       // I/O errors
       ApiError::IoError(error) => write!(f, "IO error: {}", error),
       // Other
@@ -95,3 +101,9 @@ impl From<io::Error> for ApiError {
     ApiError::IoError(error)
   }
 }
+
+impl From<CloudflareError> for ApiError {
+  fn from(error: CloudflareError) -> Self {
+    ApiError::CloudflareError(error)
+  }
+}

crates/api_clients/storyteller_client/src/generate/image/edit/gpt_image_1_edit_image.rs

@@ -0,0 +1,19 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::basic_json_post_request::basic_json_post_request;
+use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageRequest, GptImage1EditImageResponse, GPT_IMAGE_1_EDIT_IMAGE_PATH};
+
+
+pub async fn gpt_image_1_edit_image(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: GptImage1EditImageRequest,
+) -> Result<GptImage1EditImageResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    GPT_IMAGE_1_EDIT_IMAGE_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}

crates/api_clients/storyteller_client/src/generate/image/edit/mod.rs

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

crates/api_clients/storyteller_client/src/generate/image/mod.rs

@@ -1,4 +1,6 @@
+pub mod edit;
 pub mod generate_flux_1_dev_text_to_image;
 pub mod generate_flux_1_schnell_text_to_image;
 pub mod generate_flux_pro_11_text_to_image;
-pub mod generate_flux_pro_11_ultra_text_to_image;
+pub mod generate_flux_pro_11_ultra_text_to_image;
+pub mod remove_image_background;

crates/api_clients/storyteller_client/src/generate/image/remove_image_background.rs

@@ -0,0 +1,18 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::basic_json_post_request::basic_json_post_request;
+use artcraft_api_defs::generate::image::remove_image_background::{RemoveImageBackgroundRequest, RemoveImageBackgroundResponse, REMOVE_IMAGE_BACKGROUND_PATH};
+
+pub async fn remove_image_background(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: RemoveImageBackgroundRequest,
+) -> Result<RemoveImageBackgroundResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    REMOVE_IMAGE_BACKGROUND_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}

crates/api_clients/storyteller_client/src/jobs/list_session_jobs.rs

@@ -0,0 +1,43 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::basic_json_get_request::basic_json_get_request;
+use artcraft_api_defs::jobs::list_session_jobs::{ListSessionJobsSuccessResponse, LIST_SESSION_JOBS_URL_PATH};
+use enums::common::job_status_plus::JobStatusPlus;
+use std::collections::HashSet;
+
+#[derive(Clone)]
+pub enum States {
+  All,
+  Include(HashSet<JobStatusPlus>),
+  Exclude(HashSet<JobStatusPlus>),
+}
+
+pub async fn list_session_jobs(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  job_states: States,
+) -> Result<ListSessionJobsSuccessResponse, StorytellerError> {
+  
+  let url = match job_states {
+    States::All => 
+      LIST_SESSION_JOBS_URL_PATH.to_string(),
+    States::Include(states) => 
+      format!("{}?include_states={}", LIST_SESSION_JOBS_URL_PATH, states_string(&states)),
+    States::Exclude(states) => 
+      format!("{}?exclude_states={}", LIST_SESSION_JOBS_URL_PATH, states_string(&states)),
+  };
+  
+  Ok(basic_json_get_request(
+    api_host,
+    &url,
+    maybe_creds,
+  ).await?)
+}
+
+fn states_string(states: &HashSet<JobStatusPlus>) -> String {
+  states.iter()
+    .map(|state| state.to_str())
+    .collect::<Vec<_>>()
+    .join(",")
+}

crates/api_clients/storyteller_client/src/jobs/mod.rs

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

crates/api_clients/storyteller_client/src/lib.rs

@@ -3,6 +3,7 @@
 pub mod credentials;
 pub mod error;
 pub mod generate;
+pub mod jobs;
 pub mod media_files;
 pub mod recipes;
 pub mod shared_response_types;

crates/api_clients/storyteller_client/src/media_files/get_media_file.rs

@@ -41,9 +41,9 @@ pub async fn get_media_file(api_host: &ApiHost, media_file_token: &MediaFileToke
 }
 
 fn get_media_file_token_route(api_host: &ApiHost, media_file_token: &MediaFileToken) -> String {
-  let api_hostname = api_host.to_api_hostname();
+  let api_hostname_and_scheme = api_host.to_api_hostname_and_scheme();
   let media_file_token = media_file_token.as_str();
-  format!("https://{}/v1/media_files/file/{}", api_hostname, media_file_token)
+  format!("{}/v1/media_files/file/{}", api_hostname_and_scheme, media_file_token)
 }
 
 // TODO(bt,2025-04-22): Share API definitions between client and server in common crate.

crates/api_clients/storyteller_client/src/media_files/upload_image_media_file_from_file.rs

@@ -84,8 +84,8 @@ pub async fn upload_image_media_file_from_file<P: AsRef<Path>>(
 }
 
 fn get_route(api_host: &ApiHost) -> String {
-  let api_hostname = api_host.to_api_hostname();
-  format!("https://{}/v1/media_files/upload/image", api_hostname)
+  let api_hostname_and_scheme = api_host.to_api_hostname_and_scheme();
+  format!("{}/v1/media_files/upload/image", api_hostname_and_scheme)
 }
 
 // TODO(bt,2025-04-22): Share API definitions between client and server in common crate.

crates/api_clients/storyteller_client/src/media_files/upload_new_engine_asset_from_file.rs

@@ -44,8 +44,6 @@ pub async fn upload_new_engine_asset_from_file<P: AsRef<Path>>(
 
   debug!("Requesting {:?}", &url);
 
-  //let mut file = File::open(path)?;
-
   let client = Client::builder()
       .gzip(true)
       .build()?;
@@ -80,8 +78,8 @@ pub async fn upload_new_engine_asset_from_file<P: AsRef<Path>>(
 }
 
 fn get_route(api_host: &ApiHost) -> String {
-  let api_hostname = api_host.to_api_hostname();
-  format!("https://{}/v1/media_files/upload/new_engine_asset", api_hostname)
+  let api_hostname_and_scheme = api_host.to_api_hostname_and_scheme();
+  format!("{}/v1/media_files/upload/new_engine_asset", api_hostname_and_scheme)
 }
 
 // TODO(bt,2025-04-22): Share API definitions between client and server in common crate.

crates/api_clients/storyteller_client/src/media_files/upload_video_media_file_from_file.rs

@@ -50,8 +50,6 @@ pub async fn upload_video_media_file_from_file<P: AsRef<Path>>(
 
   debug!("Requesting {:?}", &url);
 
-  //let mut file = File::open(path)?;
-
   let client = Client::builder()
       .gzip(true)
       .build()?;
@@ -85,7 +83,7 @@ pub async fn upload_video_media_file_from_file<P: AsRef<Path>>(
 }
 
 fn get_route(api_host: &ApiHost) -> String {
-  let api_hostname = api_host.to_api_hostname();
-  format!("https://{}/v1/media_files/upload/new_video", api_hostname)
+  let api_hostname_and_scheme = api_host.to_api_hostname_and_scheme();
+  format!("{}/v1/media_files/upload/new_video", api_hostname_and_scheme)
 }
 

crates/api_clients/storyteller_client/src/utils/basic_json_get_request.rs

@@ -0,0 +1,63 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::api_error::ApiError;
+use crate::error::client_error::ClientError;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
+use crate::utils::filter_bad_response::filter_bad_response;
+use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::{GenerateFlux1SchnellTextToImageRequest, GenerateFlux1SchnellTextToImageResponse, GENERATE_FLUX_1_SCHNELL_TEXT_TO_IMAGE_PATH};
+use log::debug;
+use reqwest::Client;
+use serde::de::DeserializeOwned;
+use serde::{Deserialize, Serialize};
+
+pub async fn basic_json_get_request<Res: DeserializeOwned>(
+  api_host: &ApiHost,
+  route_path: &str,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+) -> Result<Res, StorytellerError> {
+
+  let url = get_route(api_host, route_path);
+
+  debug!("Requesting {:?}", &url);
+
+  let client = Client::builder()
+      .gzip(true)
+      .build()
+      .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
+
+  let mut request_builder = client.get(url)
+      .header("User-Agent", USER_AGENT)
+      .header("Accept", APPLICATION_JSON);
+
+  if let Some(creds) = maybe_creds {
+    if let Some(header) = &creds.maybe_as_cookie_header() {
+      request_builder = request_builder.header("Cookie", header);
+    }
+  }
+
+  let response = request_builder
+      .send()
+      .await
+      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
+
+  let response = filter_bad_response(response)
+      .await
+      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
+
+  let response_body = &response.text()
+      .await
+      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
+
+  debug!("Response body: {:?}", response_body);
+
+  let response = serde_json::from_str(&response_body)
+      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
+
+  Ok(response)
+}
+
+fn get_route(api_host: &ApiHost, route_path: &str) -> String {
+  let api_hostname = api_host.to_api_hostname_and_scheme();
+  format!("{}{}", api_hostname, route_path)
+}

crates/api_clients/storyteller_client/src/utils/filter_bad_response.rs

@@ -1,6 +1,7 @@
 use crate::error::api_error::ApiError;
 use crate::utils::status_codes::*;
 use anyhow::anyhow;
+use cloudflare_errors::filter_cloudflare_errors::filter_cloudflare_errors;
 use log::error;
 
 /// Pass request errors to this method for standard error handling behavior.
@@ -13,30 +14,34 @@ use log::error;
 pub async fn filter_bad_response(response: reqwest::Response) -> Result<reqwest::Response, ApiError> {
   let status = response.status();
 
-  if !status.is_success() {
-    // The host in the fleet that handled the request.
-    let backend_hostname= response.headers()
-        .get("x-backend-hostname")
-        .map(|header| header.to_str().unwrap_or_else(|err| {
-          error!("Failed to parse x-backend-hostname header: {:?}", err);
-          "unknown"
-        }))
-        .map(|s| s.to_string());
-    
-    let response_body = match response.text().await {
-      Ok(text) => text.to_string(),
-      Err(err) => format!("Could not read response body: {:?}", err),
-    };
-
-    return match status.as_u16() {
-      STATUS_401_UNAUTHORIZED => Err(ApiError::Unauthorized(response_body)),
-      STATUS_403_FORBIDDEN => Err(ApiError::Forbidden(response_body)),
-      STATUS_404_NOT_FOUND => Err(ApiError::NotFound(response_body)),
-      STATUS_429_TOO_MANY_REQUESTS => Err(ApiError::TooManyRequests(response_body)),
-      STATUS_500_INTERNAL_SERVER_ERROR => Err(ApiError::InternalServerError { body: response_body, backend_hostname }),
-      _ => Err(ApiError::Other(anyhow!("Bad status code: {}; message: {:?}", status, response_body))),
-    }
+  if status.is_success() {
+    return Ok(response);
   }
 
-  Ok(response)
-}
+  // The host in the fleet that handled the request.
+  let backend_hostname= response.headers()
+      .get("x-backend-hostname")
+      .map(|header| header.to_str().unwrap_or_else(|err| {
+        error!("Failed to parse x-backend-hostname header: {:?}", err);
+        "unknown"
+      }))
+      .map(|s| s.to_string());
+
+  let response_body = match response.text().await {
+    Ok(text) => text.to_string(),
+    Err(err) => format!("Could not read response body: {:?}", err),
+  };
+  
+  let status_code = status.as_u16();
+
+  filter_cloudflare_errors(status_code, &response_body)?;
+
+  match status_code {
+    STATUS_401_UNAUTHORIZED => Err(ApiError::Unauthorized(response_body)),
+    STATUS_403_FORBIDDEN => Err(ApiError::Forbidden(response_body)),
+    STATUS_404_NOT_FOUND => Err(ApiError::NotFound(response_body)),
+    STATUS_429_TOO_MANY_REQUESTS => Err(ApiError::TooManyRequests(response_body)),
+    STATUS_500_INTERNAL_SERVER_ERROR => Err(ApiError::InternalServerError { body: response_body, backend_hostname }),
+    _ => Err(ApiError::Other(anyhow!("Bad status code: {}; message: {:?}", status, response_body))),
+  }
+}

crates/api_clients/storyteller_client/src/utils/mod.rs

@@ -1,4 +1,5 @@
 pub mod api_host;
+pub mod basic_json_get_request;
 pub mod basic_json_post_request;
 pub mod constants;
 pub mod filter_bad_response;

crates/cli/devenv/dev-database-seed/Cargo.toml

@@ -43,7 +43,7 @@ rand.workspace = true
 # NB: We switched to Tokio from `async-std` for broader ecosystem support.
 tokio = { version = "1.38.0", features = ["macros"] }
 
-sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
+sqlx = { version = "0.7.4", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
 
 elasticsearch = "8.5.0-alpha.1"
 

crates/cli/devenv/dev-upload-media-file/Cargo.toml

@@ -39,7 +39,7 @@ log.workspace = true
 # NB: We switched to Tokio from `async-std` for broader ecosystem support.
 tokio.workspace = true
 
-sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
+sqlx = { version = "0.7.4", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
 
 [dev-dependencies]
 # None yet

crates/cli/production/db-backfill/Cargo.toml

@@ -36,7 +36,7 @@ log = "0.4.14"
 
 # Bigger pieces
 futures = { version = "0.3.17", features = ["thread-pool"] }
-sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
+sqlx = { version = "0.7.4", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
 tokio = { version = "1.38.0", features = ["macros"] }
 
 # Serialization

crates/cli/production/db-cleanup/Cargo.toml

@@ -36,7 +36,7 @@ log = "0.4.14"
 
 # Bigger pieces
 tokio = { version = "1.38.0", features = ["macros"] }
-sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
+sqlx = { version = "0.7.4", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
 
 # Serialization
 serde = "1.0.125"

crates/cli/production/elasticsearch-cli/Cargo.toml

@@ -38,7 +38,7 @@ strum = { version = "0.26", features = ["derive"] }
 
 # Bigger pieces
 tokio = { version = "1.38.0", features = ["macros"] }
-sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
+sqlx = { version = "0.7.4", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
 elasticsearch = "8.5.0-alpha.1"
 
 # Serialization

crates/cli/production/migration-tool/Cargo.toml

@@ -40,7 +40,7 @@ tempdir.workspace = true
 
 # Async + clients
 tokio.workspace = true
-sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
+sqlx = { version = "0.7.4", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
 
 # Serialization
 serde.workspace = true

crates/desktop/artcraft/Cargo.toml

@@ -28,6 +28,7 @@ workspace-build-acceleration = { workspace =  true }
 # Internal
 artcraft_api_defs = { workspace = true }
 build_metadata = { workspace = true }
+enums = { workspace = true }
 errors = { workspace = true }
 fal_client = { workspace = true }
 filesys = { workspace = true }
@@ -36,6 +37,7 @@ memory_store = { workspace = true }
 mimetypes = { workspace = true }
 openai_sora_client = { workspace = true }
 primitives = { workspace = true }
+sqlite_tasks.workspace = true
 storyteller_client = { workspace = true }
 tokens = { workspace = true }
 web_base64 = { workspace = true }
@@ -58,6 +60,7 @@ serde = { workspace = true }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }
 tauri = { workspace = true }
+tauri-plugin-dialog = "2"
 tauri-plugin-log = "2.3.1"
 tauri-plugin-upload = "2.2.1"
 tempdir = { workspace = true }
@@ -72,7 +75,6 @@ tauri-plugin-http = { path = "../../vendor/tauri-plugin-http" }
 # NB: The version of the `discord-rich-presence` crate (0.2.5) last published has non-Send/Sync error
 # types and can't do threading. We need to wait for a new version to unpin from Git.
 discord-rich-presence = { git = "https://github.com/vionya/discord-rich-presence" }
-tauri-plugin-dialog = "2"
 
 [dev-dependencies]
 serial_test = "3.2.0"

crates/desktop/artcraft/src/core/commands/enqueue/image/enqueue_text_to_image_command.rs

@@ -1,8 +1,8 @@
-use crate::core::commands::enqueue::image::handle_image_artcraft::handle_image_artcraft;
-use crate::core::commands::enqueue::image::handle_image_fal::handle_image_fal;
-use crate::core::commands::enqueue::image::handle_image_sora::handle_image_sora;
+use crate::core::commands::enqueue::image::generic::handle_image_artcraft::handle_image_artcraft;
+use crate::core::commands::enqueue::image::generic::handle_image_fal::handle_image_fal;
+use crate::core::commands::enqueue::image::gpt_image_1::handle_image_sora::handle_image_sora;
 use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
-use crate::core::commands::enqueue::image::success_event::SuccessEvent;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
 use crate::core::commands::response::shorthand::Response;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
@@ -14,14 +14,19 @@ use crate::core::model::image_models::ImageModel;
 use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
+use crate::core::state::task_database::TaskDatabase;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_status::TaskStatus;
+use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
 use log::{error, info, warn};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
+use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs};
 use tauri::{AppHandle, State};
 
 #[derive(Deserialize)]
@@ -31,8 +36,25 @@ pub struct EnqueueTextToImageRequest {
 
   /// The model to use.
   pub model: Option<ImageModel>,
+
+  /// Aspect ratio.
+  pub aspect_ratio: Option<TextToImageSize>,
 }
 
+// TODO(bt,2025-07-14): Support other aspect ratios / resolutions -
+//  Flux Dev has: 4:3, 16:9, 3:4, 9:16, and custom.
+//  Flux Schnell has: 4:3, 16:9, 3:4, 9:16, and custom.
+//  Flux Pro has: 4:3, 16:9, 3:4, 9:16, and custom.
+//  Flux Pro Ulra has: 4:3, 16:9, 3:4, 9:16, and custom.
+
+#[derive(Deserialize, Debug, Copy, Clone)]
+#[serde(rename_all = "snake_case")]
+pub enum TextToImageSize {
+  Auto,
+  Square,
+  Wide,
+  Tall,
+}
 
 #[derive(Serialize)]
 pub struct EnqueueTextToImageSuccessResponse {
@@ -60,11 +82,12 @@ pub enum EnqueueTextToImageErrorType {
 
 #[tauri::command]
 pub async fn enqueue_text_to_image_command(
-  app: AppHandle,
   request: EnqueueTextToImageRequest,
+  app: AppHandle,
   app_data_root: State<'_, AppDataRoot>,
   app_env_configs: State<'_, AppEnvConfigs>,
   provider_priority_store: State<'_, ProviderPriorityStore>,
+  task_database: State<'_, TaskDatabase>,
   fal_creds_manager: State<'_, FalCredentialManager>,
   storyteller_creds_manager: State<'_, StorytellerCredentialManager>,
   fal_task_queue: State<'_, FalTaskQueue>,
@@ -75,10 +98,11 @@ pub async fn enqueue_text_to_image_command(
   info!("enqueue_text_to_image called");
 
   let result = handle_request(
-    &app,
     request,
+    &app,
     &app_data_root,
     &provider_priority_store,
+    &task_database,
     &fal_creds_manager,
     &storyteller_creds_manager,
     &app_env_configs,
@@ -123,9 +147,9 @@ pub async fn enqueue_text_to_image_command(
     }
     Ok(event) => {
       let event = GenerationEnqueueSuccessEvent {
-        action: GenerationAction::GenerateImage,
-        service: event.service_provider,
-        model: Some(event.tauri_event_model()),
+        action: event.to_frontend_event_action(),
+        service: event.to_frontend_event_service(),
+        model: event.model,
       };
 
       if let Err(err) = event.send(&app) {
@@ -139,8 +163,52 @@ pub async fn enqueue_text_to_image_command(
 
 
 pub async fn handle_request(
-  app: &AppHandle,
   request: EnqueueTextToImageRequest,
+  app: &AppHandle,
+  app_data_root: &AppDataRoot,
+  provider_priority_store: &ProviderPriorityStore,
+  task_database: &TaskDatabase,
+  fal_creds_manager: &FalCredentialManager,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  app_env_configs: &AppEnvConfigs,
+  fal_task_queue: &FalTaskQueue,
+  sora_creds_manager: &SoraCredentialManager,
+  sora_task_queue: &SoraTaskQueue,
+) -> Result<TaskEnqueueSuccess, InternalImageError> {
+  
+  let result = dispatch_request(
+    request,
+    &app,
+    &app_data_root,
+    &provider_priority_store,
+    &fal_creds_manager,
+    &storyteller_creds_manager,
+    &app_env_configs,
+    &fal_task_queue,
+    &sora_creds_manager,
+    &sora_task_queue,
+  ).await;
+  
+  let success_event = match result {
+    Err(err) => return Err(err),
+    Ok(event) => event,
+  };
+
+  let result = success_event
+      .insert_into_task_database(task_database)
+      .await;
+
+  if let Err(err) = result {
+    error!("Failed to create task in database: {:?}", err);
+    // NB: Fail open, but find a way to flag this.
+  }
+  
+  Ok(success_event)
+}
+
+pub async fn dispatch_request(
+  request: EnqueueTextToImageRequest,
+  app: &AppHandle,
   app_data_root: &AppDataRoot,
   provider_priority_store: &ProviderPriorityStore,
   fal_creds_manager: &FalCredentialManager,
@@ -149,18 +217,14 @@ pub async fn handle_request(
   fal_task_queue: &FalTaskQueue,
   sora_creds_manager: &SoraCredentialManager,
   sora_task_queue: &SoraTaskQueue,
-) -> Result<SuccessEvent, InternalImageError> {
+) -> Result<TaskEnqueueSuccess, InternalImageError> {
 
   match request.model {
     None => {
       return Err(InternalImageError::NoModelSpecified);
     }
     Some(ImageModel::GptImage1) => {
-      handle_image_sora(&app, request, sora_creds_manager, sora_task_queue).await?;
-      return Ok(SuccessEvent {
-        service_provider: GenerationServiceProvider::Sora,
-        model: ImageModel::GptImage1,
-      });
+      return handle_image_sora(&app, request, sora_creds_manager, sora_task_queue).await;
     }
     _ => {
       // Fall-through

crates/desktop/artcraft/src/core/commands/enqueue/image/generic/handle_image_artcraft.rs

@@ -1,18 +1,20 @@
-use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
+use crate::core::commands::enqueue::image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize};
 use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
-use crate::core::commands::enqueue::image::success_event::SuccessEvent;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
+use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
 use crate::core::model::image_models::ImageModel;
 use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
-use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::GenerateFlux1DevTextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::GenerateFlux1SchnellTextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageRequest;
+use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::{GenerateFlux1DevTextToImageAspectRatio, GenerateFlux1DevTextToImageRequest};
+use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::{GenerateFlux1SchnellTextToImageAspectRatio, GenerateFlux1SchnellTextToImageRequest};
+use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::{GenerateFluxPro11TextToImageAspectRatio, GenerateFluxPro11TextToImageRequest};
+use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::{GenerateFluxPro11UltraTextToImageAspectRatio, GenerateFluxPro11UltraTextToImageRequest};
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
 use idempotency::uuid::generate_random_uuid;
 use log::{error, info};
@@ -28,7 +30,7 @@ pub async fn handle_image_artcraft(
   app_env_configs: &AppEnvConfigs,
   app_data_root: &AppDataRoot,
   storyteller_creds_manager: &StorytellerCredentialManager,
-) -> Result<SuccessEvent, InternalImageError> {
+) -> Result<TaskEnqueueSuccess, InternalImageError> {
 
   let creds = match storyteller_creds_manager.get_credentials()? {
     Some(creds) => creds,
@@ -63,11 +65,19 @@ pub async fn handle_image_artcraft(
     }
     Some(ImageModel::Flux1Dev) => {
       info!("enqueue Flux 1 Dev");
-      selected_model = ImageModel::Flux1Dev;
+      selected_model = GenerationModel::Flux1Dev;
+      let aspect_ratio = request.aspect_ratio
+          .map(|aspect| match aspect {
+            // TODO(bt,2025-07-14): Support other aspect ratios.
+            TextToImageSize::Tall => GenerateFlux1DevTextToImageAspectRatio::PortraitNineBySixteen,
+            TextToImageSize::Wide => GenerateFlux1DevTextToImageAspectRatio::LandscapeSixteenByNine,
+            TextToImageSize::Auto => GenerateFlux1DevTextToImageAspectRatio::SquareHd,
+            TextToImageSize::Square => GenerateFlux1DevTextToImageAspectRatio::SquareHd,
+          });
       let request = GenerateFlux1DevTextToImageRequest {
         uuid_idempotency_token,
         prompt: request.prompt,
-        aspect_ratio: None,
+        aspect_ratio,
         num_images: None,
       };
       let result = generate_flux_1_dev_text_to_image(
@@ -88,11 +98,19 @@ pub async fn handle_image_artcraft(
     }
     Some(ImageModel::Flux1Schnell) => {
       info!("enqueue Flux 1 Schnell");
-      selected_model = ImageModel::Flux1Schnell;
+      selected_model = GenerationModel::Flux1Schnell;
+      let aspect_ratio = request.aspect_ratio
+          .map(|aspect| match aspect {
+            // TODO(bt,2025-07-14): Support other aspect ratios.
+            TextToImageSize::Tall => GenerateFlux1SchnellTextToImageAspectRatio::PortraitNineBySixteen,
+            TextToImageSize::Wide => GenerateFlux1SchnellTextToImageAspectRatio::LandscapeSixteenByNine,
+            TextToImageSize::Auto => GenerateFlux1SchnellTextToImageAspectRatio::SquareHd,
+            TextToImageSize::Square => GenerateFlux1SchnellTextToImageAspectRatio::SquareHd,
+          });
       let request = GenerateFlux1SchnellTextToImageRequest {
         uuid_idempotency_token,
         prompt: request.prompt,
-        aspect_ratio: None,
+        aspect_ratio,
         num_images: None,
       };
       let result = generate_flux_1_schnell_text_to_image(
@@ -113,11 +131,19 @@ pub async fn handle_image_artcraft(
     }
     Some(ImageModel::FluxPro11) => {
       info!("enqueue Flux Pro 1.1");
-      selected_model = ImageModel::FluxPro11;
+      selected_model = GenerationModel::FluxPro11;
+      let aspect_ratio = request.aspect_ratio
+          .map(|aspect| match aspect {
+            // TODO(bt,2025-07-14): Support other aspect ratios.
+            TextToImageSize::Tall => GenerateFluxPro11TextToImageAspectRatio::PortraitNineBySixteen,
+            TextToImageSize::Wide => GenerateFluxPro11TextToImageAspectRatio::LandscapeSixteenByNine,
+            TextToImageSize::Auto => GenerateFluxPro11TextToImageAspectRatio::Square,
+            TextToImageSize::Square => GenerateFluxPro11TextToImageAspectRatio::Square,
+          });
       let request = GenerateFluxPro11TextToImageRequest {
         uuid_idempotency_token,
         prompt: request.prompt,
-        aspect_ratio: None,
+        aspect_ratio,
         num_images: None,
       };
       let result = generate_flux_pro_11_text_to_image(
@@ -138,11 +164,19 @@ pub async fn handle_image_artcraft(
     }
     Some(ImageModel::FluxPro11Ultra) => {
       info!("enqueue Flux Pro 1.1 Ultra");
-      selected_model = ImageModel::FluxPro11Ultra;
+      selected_model = GenerationModel::FluxPro11Ultra;
+      let aspect_ratio = request.aspect_ratio
+          .map(|aspect| match aspect {
+            // TODO(bt,2025-07-14): Support other aspect ratios.
+            TextToImageSize::Tall => GenerateFluxPro11UltraTextToImageAspectRatio::PortraitNineBySixteen,
+            TextToImageSize::Wide => GenerateFluxPro11UltraTextToImageAspectRatio::LandscapeSixteenByNine,
+            TextToImageSize::Auto => GenerateFluxPro11UltraTextToImageAspectRatio::Square,
+            TextToImageSize::Square => GenerateFluxPro11UltraTextToImageAspectRatio::Square,
+          });
       let request = GenerateFluxPro11UltraTextToImageRequest {
         uuid_idempotency_token,
         prompt: request.prompt,
-        aspect_ratio: None,
+        aspect_ratio,
         num_images: None,
       };
       let result = generate_flux_pro_11_ultra_text_to_image(
@@ -163,8 +197,10 @@ pub async fn handle_image_artcraft(
     }
   };
 
-  Ok(SuccessEvent {
-    service_provider: GenerationServiceProvider::Artcraft,
-    model:selected_model,
+  Ok(TaskEnqueueSuccess {
+    provider: GenerationProvider::Artcraft,
+    task_type: TaskType::ImageGeneration,
+    model: Some(selected_model),
+    provider_job_id: Some(job_token.to_string()),
   })
 }

crates/desktop/artcraft/src/core/commands/enqueue/image/generic/handle_image_fal.rs

@@ -1,13 +1,15 @@
 use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
 use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
-use crate::core::commands::enqueue::image::success_event::SuccessEvent;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
+use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
 use crate::core::model::image_models::ImageModel;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
 use anyhow::anyhow;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
 use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
 use log::{error, info};
@@ -18,7 +20,7 @@ pub async fn handle_image_fal(
   request: EnqueueTextToImageRequest,
   fal_creds_manager: &FalCredentialManager,
   fal_task_queue: &FalTaskQueue,
-) -> Result<SuccessEvent, InternalImageError> {
+) -> Result<TaskEnqueueSuccess, InternalImageError> {
 
   let api_key = match fal_creds_manager.get_key()? {
     Some(key) => key,
@@ -60,7 +62,7 @@ pub async fn handle_image_fal(
       return Err(InternalImageError::AnyhowError(anyhow!("not yet implemented: {:?}", request.model)));
     }
     Some(ImageModel::FluxPro11Ultra) => {
-      model = ImageModel::FluxPro11Ultra;
+      model = GenerationModel::FluxPro11Ultra;
       info!("enqueue Flux Pro 1.1 Ultra text-to-image with prompt: {}", prompt);
       enqueue_flux_pro_11_ultra_text_to_image(FluxPro11UltraTextToImageArgs {
         prompt,
@@ -68,7 +70,7 @@ pub async fn handle_image_fal(
       }).await
     }
     Some(ImageModel::Recraft3) => {
-      model = ImageModel::Recraft3;
+      model = GenerationModel::Recraft3;
       info!("enqueue Recraft v3 text-to-image with prompt: {}", prompt);
       enqueue_recraft3_text_to_image(Recraft3TextToImageArgs {
         prompt,
@@ -77,7 +79,7 @@ pub async fn handle_image_fal(
     }
   };
 
-  match result {
+  let success_result = match result {
     Ok(enqueued) => {
       info!("Successfully enqueued text to image");
 
@@ -95,6 +97,8 @@ pub async fn handle_image_fal(
         error!("Failed to enqueue task: {:?}", err);
         return Err(InternalImageError::AnyhowError(anyhow!("Failed to enqueue task: {:?}", err)));
       }
+      
+      enqueued
     }
     Err(err) => {
       error!("Failed to enqueue text to image: {:?}", err);
@@ -112,10 +116,12 @@ pub async fn handle_image_fal(
 
       return Err(InternalImageError::FalError(err));
     }
-  }
+  };
 
-  Ok(SuccessEvent {
-    service_provider: GenerationServiceProvider::Fal,
-    model,
+  Ok(TaskEnqueueSuccess {
+    provider: GenerationProvider::Fal,
+    task_type: TaskType::ImageGeneration,
+    model: Some(model),
+    provider_job_id: Some(success_result.request_id.to_string()),
   })
 }

crates/desktop/artcraft/src/core/commands/enqueue/image/generic/mod.rs

@@ -0,0 +1,2 @@
+pub mod handle_image_artcraft;
+pub mod handle_image_fal;

crates/desktop/artcraft/src/core/commands/enqueue/image/gpt_image_1/handle_image_sora.rs

@@ -1,10 +1,14 @@
-use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
+use crate::core::commands::enqueue::image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize};
 use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
+use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
+use crate::core::model::image_models::ImageModel;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
 use log::{error, info};
 use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
@@ -20,7 +24,7 @@ pub async fn handle_image_sora(
   request: EnqueueTextToImageRequest,
   sora_creds_manager: &SoraCredentialManager,
   sora_task_queue: &SoraTaskQueue,
-) -> Result<(), InternalImageError> {
+) -> Result<TaskEnqueueSuccess, InternalImageError> {
 
   let mut creds = sora_creds_manager
       .get_credentials_required()
@@ -42,12 +46,20 @@ pub async fn handle_image_sora(
   }
 
   let prompt = request.prompt.as_deref().unwrap_or("");
+  
+  let size = match request.aspect_ratio {
+    None => ImageSize::Square,
+    Some(TextToImageSize::Auto) => ImageSize::Square,
+    Some(TextToImageSize::Square) => ImageSize::Square,
+    Some(TextToImageSize::Tall) => ImageSize::Tall,
+    Some(TextToImageSize::Wide) => ImageSize::Wide,
+  };
 
   let result =
       simple_image_gen_with_session_auto_renew(SimpleImageGenAutoRenewRequest {
         prompt: prompt.to_string(),
         num_images: NumImages::One,
-        image_size: ImageSize::Square,
+        image_size: size,
         credentials: &creds,
         request_timeout: Some(SORA_SIMPLE_IMAGE_GEN_TIMEOUT),
       }).await;
@@ -80,5 +92,10 @@ pub async fn handle_image_sora(
 
   sora_task_queue.insert(&response.task_id)?;
 
-  Ok(())
+  Ok(TaskEnqueueSuccess {
+    provider: GenerationProvider::Sora,
+    task_type: TaskType::ImageGeneration,
+    model: Some(GenerationModel::GptImage1),
+    provider_job_id: Some(response.task_id.to_string()),
+  })
 }

crates/desktop/artcraft/src/core/commands/enqueue/image/gpt_image_1/mod.rs

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

crates/desktop/artcraft/src/core/commands/enqueue/image/mod.rs

@@ -1,6 +1,4 @@
 pub mod enqueue_text_to_image_command;
-pub mod handle_image_artcraft;
-pub mod handle_image_fal;
-pub mod handle_image_sora;
+pub mod generic;
 pub mod internal_image_error;
-mod success_event;
+mod gpt_image_1;

crates/desktop/artcraft/src/core/commands/enqueue/image/success_event.rs

@@ -1,20 +0,0 @@
-use crate::core::events::generation_events::common::{GenerationModel, GenerationServiceProvider};
-use crate::core::model::image_models::ImageModel;
-
-pub struct SuccessEvent {
-  pub service_provider: GenerationServiceProvider,
-  pub model: ImageModel,
-}
-
-impl SuccessEvent {
-  pub fn tauri_event_model(&self) -> GenerationModel {
-    match self.model {
-      ImageModel::Flux1Dev => GenerationModel::Flux1Dev,
-      ImageModel::Flux1Schnell => GenerationModel::Flux1Schnell,
-      ImageModel::FluxPro11 => GenerationModel::FluxPro11,
-      ImageModel::FluxPro11Ultra => GenerationModel::FluxPro11Ultra,
-      ImageModel::GptImage1 => GenerationModel::GptImage1,
-      ImageModel::Recraft3 => GenerationModel::Recraft3,
-    }
-  }
-}

crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/enqueue_image_bg_removal_command.rs

@@ -0,0 +1,181 @@
+use crate::core::commands::enqueue::image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, EnqueueTextToImageSuccessResponse};
+use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
+use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
+use crate::core::commands::enqueue::image_bg_removal::generic::handle_generic_bg_removal::handle_generic_bg_removal;
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
+use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1::handle_gpt_image_1;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
+use crate::core::commands::response::shorthand::{Response, ResponseOrErrorType};
+use crate::core::commands::response::success_response_wrapper::SerializeMarker;
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
+use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
+use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::core::model::contextual_image_edit_models::ContextualImageEditModel;
+use crate::core::model::image_models::ImageModel;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
+use crate::core::state::task_database::TaskDatabase;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::simple_http_download::simple_http_download;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use enums::tauri::tasks::task_status::TaskStatus;
+use enums::tauri::tasks::task_type::TaskType;
+use errors::AnyhowError;
+use log::{error, info, warn};
+use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest};
+use openai_sora_client::recipes::image_upload_from_file_with_session_auto_renew::{image_upload_from_file_with_session_auto_renew, ImageUploadFromFileAutoRenewRequest};
+use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
+use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
+use openai_sora_client::sora_error::SoraError;
+use serde_derive::{Deserialize, Serialize};
+use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs};
+use std::time::Duration;
+use storyteller_client::error::storyteller_error::StorytellerError;
+use storyteller_client::media_files::get_media_file::get_media_file;
+use storyteller_client::utils::api_host::ApiHost;
+use tauri::{AppHandle, Manager, State};
+use tokens::tokens::media_files::MediaFileToken;
+
+#[derive(Deserialize, Debug)]
+pub struct EnqueueImageBgRemovalCommand {
+  // /// The bg removal model to use (optional).
+  // pub model: Option<TODO>,
+
+  /// Image media file; the image to remove the background from.
+  pub image_media_token: Option<MediaFileToken>,
+
+  /// Base64-encoded image
+  pub base64_image: Option<String>,
+}
+
+#[derive(Serialize, Debug)]
+#[serde(rename_all = "snake_case")]
+pub enum EnqueueImageBgRemovalErrorType {
+  /// No model available for image generation
+  NoProviderAvailable,
+
+  /// No image was provided for background removal
+  MissingImage,
+  
+  /// Bad base64 image data
+  Base64DecodeError,
+  
+  /// Generic bad request error
+  BadRequest,
+
+  /// Generic server error
+  ServerError,
+}
+
+#[derive(Serialize)]
+pub struct EnqueueImageBgRemovalSuccessResponse {
+}
+
+impl SerializeMarker for EnqueueImageBgRemovalSuccessResponse {}
+
+#[tauri::command]
+pub async fn enqueue_image_bg_removal_command(
+  app: AppHandle,
+  request: EnqueueImageBgRemovalCommand,
+  app_data_root: State<'_, AppDataRoot>,
+  app_env_configs: State<'_, AppEnvConfigs>,
+  provider_priority_store: State<'_, ProviderPriorityStore>,
+  task_database: State<'_, TaskDatabase>,
+  storyteller_creds_manager: State<'_, StorytellerCredentialManager>,
+  fal_creds_manager: State<'_, FalCredentialManager>,
+  fal_task_queue: State<'_, FalTaskQueue>,
+) -> ResponseOrErrorType<EnqueueImageBgRemovalSuccessResponse, EnqueueImageBgRemovalErrorType> {
+
+  info!("enqueue_image_bg_removal_command called");
+
+  let result = handle_request(
+    &request,
+    &app,
+    &app_data_root,
+    &app_env_configs,
+    &provider_priority_store,
+    &task_database,
+    &storyteller_creds_manager,
+    &fal_creds_manager,
+    &fal_task_queue,
+  ).await;
+
+  match result {
+    Err(err) => {
+      error!("Error removing background: {:?}", err);
+
+      // TODO: Derive from err. Make service provider optional.
+      let event = GenerationEnqueueFailureEvent {
+        action: GenerationAction::RemoveBackground,
+        service: GenerationServiceProvider::Artcraft, // FIXME: This is wrong.
+        model: None,
+        reason: None,
+      };
+
+      if let Err(err) = event.send(&app) {
+        error!("Failed to emit event: {:?}", err); // Fail open.
+      }
+
+      Err(err.to_tauri_response())
+    }
+    Ok(event) => {
+      let event = GenerationEnqueueSuccessEvent {
+        action: event.to_frontend_event_action(),
+        service: event.to_frontend_event_service(),
+        model: None, // FIXME: This isn't right, though we probably don't care for simple bg removal.
+      };
+
+      if let Err(err) = event.send(&app) {
+        error!("Failed to emit event: {:?}", err); // Fail open.
+      }
+
+      Ok(EnqueueImageBgRemovalSuccessResponse {}.into())
+    }
+  }
+}
+
+pub async fn handle_request(
+  request: &EnqueueImageBgRemovalCommand,
+  app: &AppHandle,
+  app_data_root: &AppDataRoot,
+  app_env_configs: &AppEnvConfigs,
+  provider_priority_store: &ProviderPriorityStore,
+  task_database: &TaskDatabase,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  fal_creds_manager: &FalCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+) -> Result<TaskEnqueueSuccess, InternalBgRemovalError> {
+  
+  // TODO(bt,2025-07-07): Other model/provider routing...
+  
+  let success_event = handle_generic_bg_removal(
+    request,
+    app,
+    app_data_root,
+    app_env_configs,
+    provider_priority_store,
+    storyteller_creds_manager,
+    fal_creds_manager,
+    fal_task_queue,
+  ).await?;
+
+  let result = success_event
+      .insert_into_task_database(task_database)
+      .await;
+
+  if let Err(err) = result {
+    error!("Failed to create task in database: {:?}", err);
+    // NB: Fail open, but find a way to flag this.
+  }
+
+  Ok(success_event)
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/errors.rs

@@ -0,0 +1,71 @@
+use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalErrorType;
+use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
+use errors::AnyhowError;
+use serde::Serialize;
+use storyteller_client::error::storyteller_error::StorytellerError;
+
+#[derive(Debug)]
+pub enum InternalBgRemovalError {
+  /// No provider is configured for the model type.
+  NoProviderAvailable,
+  
+  /// No storyteller credentials are set.
+  NeedsStorytellerCredentials,
+  
+  /// No image was provided for background removal.
+  MissingImage,
+  
+  /// Could not decode the base64 image data.
+  Base64DecodeError,
+  
+  AnyhowError(AnyhowError),
+  StorytellerError(StorytellerError),
+}
+
+impl From<AnyhowError> for InternalBgRemovalError {
+  fn from(value: AnyhowError) -> Self {
+    Self::AnyhowError(value)
+  }
+}
+
+impl From<StorytellerError> for InternalBgRemovalError {
+  fn from(value: StorytellerError) -> Self {
+    Self::StorytellerError(value)
+  }
+}
+
+impl InternalBgRemovalError {
+  pub fn to_tauri_response<E: Serialize>(&self) -> CommandErrorResponseWrapper<EnqueueImageBgRemovalErrorType, E> {
+    let mut status = CommandErrorStatus::ServerError;
+    let mut error_type = EnqueueImageBgRemovalErrorType::ServerError;
+    let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.".to_string();
+    
+    match self {
+      InternalBgRemovalError::NoProviderAvailable => {
+        status = CommandErrorStatus::ServerError;
+        error_type = EnqueueImageBgRemovalErrorType::NoProviderAvailable;
+        error_message = "No configured provider available for background removal".to_string();
+      }
+      InternalBgRemovalError::MissingImage => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueImageBgRemovalErrorType::MissingImage;
+        error_message = "No image provided for background removal".to_string();
+      }
+      InternalBgRemovalError::Base64DecodeError => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueImageBgRemovalErrorType::Base64DecodeError;
+        error_message = "Failed to decode base64 image data".to_string();
+      }
+      InternalBgRemovalError::AnyhowError(_) => {}
+      InternalBgRemovalError::StorytellerError(_) => {}
+      InternalBgRemovalError::NeedsStorytellerCredentials => {}
+    }
+    
+    CommandErrorResponseWrapper {
+      status,
+      error_message: Some(error_message.to_string()),
+      error_type: Some(error_type),
+      error_details: None,
+    }
+  }
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/generic/handle_generic_bg_removal.rs

@@ -0,0 +1,69 @@
+use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
+use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
+use crate::core::commands::enqueue::image_bg_removal::generic::handle_generic_bg_removal_artcraft::handle_generic_bg_removal_artcraft;
+use crate::core::commands::enqueue::image_bg_removal::generic::handle_generic_bg_removal_fal::handle_generic_bg_removal_fal;
+use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
+use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_artcraft::handle_gpt_image_1_artcraft;
+use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_sora::handle_gpt_image_1_sora;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use log::info;
+use tauri::AppHandle;
+
+pub async fn handle_generic_bg_removal(
+  request: &EnqueueImageBgRemovalCommand,
+  app: &AppHandle,
+  app_data_root: &AppDataRoot,
+  app_env_configs: &AppEnvConfigs,
+  provider_priority_store: &ProviderPriorityStore,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  fal_creds_manager: &FalCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+) -> Result<TaskEnqueueSuccess, InternalBgRemovalError> {
+
+  let priority = provider_priority_store.get_priority()?;
+
+  // TODO: Check if providers are available before proceeding.
+
+  info!("Providers by priority: {:?}", priority);
+
+  for provider in priority.iter() {
+    match provider {
+      Provider::Sora => {
+        // Fallthrough
+        // Sora doesn't have background removal
+      }
+      Provider::Artcraft => {
+        info!("Removing background via Artcraft...");
+        return handle_generic_bg_removal_artcraft(
+          request,
+          app,
+          app_data_root,
+          app_env_configs,
+          storyteller_creds_manager
+        ).await;
+      }
+      Provider::Fal => {
+        info!("Removing background via Fal...");
+        return handle_generic_bg_removal_fal(
+          request,
+          app,
+          app_data_root,
+          app_env_configs,
+          fal_creds_manager,
+          fal_task_queue,
+        ).await;
+      }
+    }
+  }
+
+  Err(InternalBgRemovalError::NoProviderAvailable)
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/generic/handle_generic_bg_removal_artcraft.rs

@@ -0,0 +1,135 @@
+use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
+use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
+use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
+use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
+use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
+use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
+use crate::core::model::contextual_image_edit_models::ContextualImageEditModel;
+use crate::core::model::image_models::ImageModel;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::provider_priority::ProviderPriorityStore;
+use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use anyhow::anyhow;
+use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest};
+use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::GenerateFlux1DevTextToImageRequest;
+use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::GenerateFlux1SchnellTextToImageRequest;
+use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageRequest;
+use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageRequest;
+use artcraft_api_defs::generate::image::remove_image_background::RemoveImageBackgroundRequest;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
+use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
+use fal_client::requests::webhook::image::enqueue_gpt_image_1_edit_image_webhook::GptEditImageQuality;
+use idempotency::uuid::generate_random_uuid;
+use log::{error, info};
+use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use storyteller_client::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
+use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
+use storyteller_client::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
+use storyteller_client::generate::image::remove_image_background::remove_image_background;
+use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
+use tauri::AppHandle;
+use tokens::tokens::media_files::MediaFileToken;
+
+pub async fn handle_generic_bg_removal_artcraft(
+  request: &EnqueueImageBgRemovalCommand,
+  app: &AppHandle,
+  app_data_root: &AppDataRoot,
+  app_env_configs: &AppEnvConfigs,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+) -> Result<TaskEnqueueSuccess, InternalBgRemovalError> {
+
+  let creds = match storyteller_creds_manager.get_credentials()? {
+    Some(creds) => creds,
+    None => {
+      return Err(InternalBgRemovalError::NeedsStorytellerCredentials);
+    },
+  };
+
+  info!("Calling Artcraft bg removal ...");
+
+  let uuid_idempotency_token = generate_random_uuid();
+
+  let image_media_token = match &request.image_media_token {
+    Some(image_media_token) => image_media_token.clone(),
+    None => {
+      upload_image_from_base64_bytes(&request, &app_data_root, &app_env_configs, &creds).await?
+    }
+  };
+  
+  let request = RemoveImageBackgroundRequest {
+    uuid_idempotency_token,
+    media_file_token: Some(image_media_token),
+  };
+
+  let result = remove_image_background(
+    &app_env_configs.storyteller_host,
+    Some(&creds),
+    request,
+  ).await;
+
+  let success_result = match result {
+    Ok(enqueued) => {
+      // TODO(bt,2025-07-05): Enqueue job token?
+      info!("Successfully enqueued Artcraft background removal. Job token: {}", 
+        enqueued.inference_job_token);
+      enqueued
+    }
+    Err(err) => {
+      error!("Failed to use Artcraft background removal: {:?}", err);
+      return Err(InternalBgRemovalError::StorytellerError(err));
+    }
+  };
+
+  Ok(TaskEnqueueSuccess {
+    provider: GenerationProvider::Artcraft,
+    task_type: TaskType::BackgroundRemoval,
+    provider_job_id: Some(success_result.inference_job_token.to_string()),
+    model: None,
+  })
+}
+
+async fn upload_image_from_base64_bytes(
+  request: &EnqueueImageBgRemovalCommand, 
+  app_data_root: &AppDataRoot, 
+  app_env_configs: &AppEnvConfigs, 
+  creds: &StorytellerCredentialSet
+) -> Result<MediaFileToken, InternalBgRemovalError> {
+  let temp_file;
+  
+  if let Some(base64_bytes) = &request.base64_image {
+    info!("Saving base64 image to temp dir ...");
+    temp_file = save_base64_image_to_temp_dir(&app_data_root, base64_bytes)
+        .await
+        .map_err(|err| {
+          error!("Failed to save base64 image to temp dir: {:?}", err);
+          InternalBgRemovalError::Base64DecodeError
+        })?;
+  } else {
+    return Err(InternalBgRemovalError::MissingImage);
+  };
+
+  info!("Uploading image media file from temp file: {:?}", temp_file.path());
+
+  let result = 
+      upload_image_media_file_from_file(&app_env_configs.storyteller_host, Some(&creds), temp_file)
+          .await
+          .map_err(|err| {
+            error!("Failed to upload image media file: {:?}", err);
+            InternalBgRemovalError::StorytellerError(err)
+          })?;
+  
+  Ok(result.media_file_token)
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/generic/handle_generic_bg_removal_fal.rs

@@ -0,0 +1,19 @@
+use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
+use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use tauri::AppHandle;
+
+pub async fn handle_generic_bg_removal_fal(
+  request: &EnqueueImageBgRemovalCommand,
+  app: &AppHandle,
+  app_data_root: &AppDataRoot,
+  app_env_configs: &AppEnvConfigs,
+  fal_creds_manager: &FalCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+) -> Result<TaskEnqueueSuccess, InternalBgRemovalError> {
+  unimplemented!("TODO: Implement fal background removal handling");
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/generic/mod.rs

@@ -0,0 +1,3 @@
+pub mod handle_generic_bg_removal;
+pub mod handle_generic_bg_removal_artcraft;
+pub mod handle_generic_bg_removal_fal;

crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/mod.rs

@@ -0,0 +1,3 @@
+pub mod enqueue_image_bg_removal_command;
+pub mod errors;
+pub mod generic;

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_contextual_edit_image_command.rs

@@ -0,0 +1,237 @@
+use crate::core::commands::enqueue::image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, EnqueueTextToImageSuccessResponse};
+use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
+use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1::handle_gpt_image_1;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
+use crate::core::commands::response::shorthand::{Response, ResponseOrErrorType};
+use crate::core::commands::response::success_response_wrapper::SerializeMarker;
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
+use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
+use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::core::model::contextual_image_edit_models::ContextualImageEditModel;
+use crate::core::model::image_models::ImageModel;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::provider_priority::ProviderPriorityStore;
+use crate::core::state::task_database::TaskDatabase;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::simple_http_download::simple_http_download;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_status::TaskStatus;
+use enums::tauri::tasks::task_type::TaskType;
+use errors::AnyhowError;
+use log::{error, info, warn};
+use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest};
+use openai_sora_client::recipes::image_upload_from_file_with_session_auto_renew::{image_upload_from_file_with_session_auto_renew, ImageUploadFromFileAutoRenewRequest};
+use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
+use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
+use openai_sora_client::sora_error::SoraError;
+use serde_derive::{Deserialize, Serialize};
+use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs};
+use std::time::Duration;
+use storyteller_client::error::storyteller_error::StorytellerError;
+use storyteller_client::media_files::get_media_file::get_media_file;
+use storyteller_client::utils::api_host::ApiHost;
+use tauri::{AppHandle, Manager, State};
+use tokens::tokens::media_files::MediaFileToken;
+
+#[derive(Deserialize, Debug)]
+pub struct EnqueueContextualEditImageCommand {
+  /// The model to use.
+  pub model: Option<ContextualImageEditModel>,
+
+  /// Images to use for the image edit.
+  /// The first image is typically a 2D canvas or 3D stage, but doesn't have to be.
+  /// There must be at least one image.
+  pub image_media_tokens: Option<Vec<MediaFileToken>>,
+  
+  /// If set, this becomes the first image in the image media tokens (pushing back 
+  /// each of the `image_media_tokens` by one).
+  /// This is useful if we want to do prompt engineering.
+  pub scene_image_media_token: Option<MediaFileToken>,
+
+  /// The user's image generation prompt.
+  pub prompt: String,
+
+  /// Turn off the system prompt.
+  pub disable_system_prompt: Option<bool>,
+
+  /// Number of images to generate.
+  pub image_count: Option<u32>,
+
+  /// Aspect ratio.
+  pub aspect_ratio: Option<EditImageSize>,
+
+  /// Image quality.
+  pub image_quality: Option<EditImageQuality>,
+}
+
+#[derive(Deserialize, Debug, Copy, Clone)]
+#[serde(rename_all = "snake_case")]
+pub enum EditImageSize {
+  Auto,
+  Square,
+  Wide,
+  Tall,
+}
+
+#[derive(Deserialize, Debug, Copy, Clone)]
+#[serde(rename_all = "snake_case")]
+pub enum EditImageQuality {
+  Auto,
+  High,
+  Medium,
+  Low,
+}
+
+#[derive(Serialize, Debug)]
+#[serde(rename_all = "snake_case")]
+pub enum EnqueueContextualEditImageErrorType {
+  /// Caller didn't specify a model
+  ModelNotSpecified,
+
+  /// No model available for image generation
+  NoProviderAvailable,
+
+  /// Generic bad request error
+  BadRequest,
+
+  /// Generic server error
+  ServerError,
+
+  /// The user is sending too many requests
+  TooManyConcurrentTasks,
+  /// User is not logged into Sora!
+  SoraLoginRequired,
+  /// The user needs to create a Sora account
+  SoraUsernameNotYetCreated,
+  /// The Sora service is having problems. Try again soon.
+  SoraIsHavingProblems,
+}
+
+#[derive(Serialize)]
+pub struct EnqueueContextualEditImageSuccessResponse {
+}
+
+impl SerializeMarker for EnqueueContextualEditImageSuccessResponse {}
+
+#[tauri::command]
+pub async fn enqueue_contextual_edit_image_command(
+  app: AppHandle,
+  request: EnqueueContextualEditImageCommand,
+  app_data_root: State<'_, AppDataRoot>,
+  app_env_configs: State<'_, AppEnvConfigs>,
+  provider_priority_store: State<'_, ProviderPriorityStore>,
+  task_database: State<'_, TaskDatabase>,
+  storyteller_creds_manager: State<'_, StorytellerCredentialManager>,
+  fal_creds_manager: State<'_, FalCredentialManager>,
+  fal_task_queue: State<'_, FalTaskQueue>,
+  sora_creds_manager: State<'_, SoraCredentialManager>,
+  sora_task_queue: State<'_, SoraTaskQueue>,
+) -> ResponseOrErrorType<EnqueueContextualEditImageSuccessResponse, EnqueueContextualEditImageErrorType> {
+
+  info!("enqueue_contextual_edit_image_command called; image media tokens : {:?}, full request: {:?}",
+    &request.image_media_tokens, &request);
+
+  let result = handle_request(
+    &request,
+    &app,
+    &app_data_root,
+    &app_env_configs,
+    &provider_priority_store,
+    &task_database,
+    &storyteller_creds_manager,
+    &fal_creds_manager,
+    &fal_task_queue,
+    &sora_creds_manager,
+    &sora_task_queue,
+  ).await;
+
+  match result {
+    Err(err) => {
+      error!("Error enqueuing contextual edit image: {:?}", err);
+
+      // TODO: Derive from err. Make service provider optional.
+      let event = GenerationEnqueueFailureEvent {
+        action: GenerationAction::GenerateImage,
+        service: GenerationServiceProvider::Artcraft, // FIXME: This is wrong.
+        model: None,
+        reason: None,
+      };
+
+      if let Err(err) = event.send(&app) {
+        error!("Failed to emit event: {:?}", err); // Fail open.
+      }
+
+      Err(err.to_tauri_response())
+    }
+    Ok(event) => {
+      let event = GenerationEnqueueSuccessEvent {
+        action: event.to_frontend_event_action(),
+        service: event.to_frontend_event_service(),
+        model: event.model,
+      };
+
+      if let Err(err) = event.send(&app) {
+        error!("Failed to emit event: {:?}", err); // Fail open.
+      }
+
+      Ok(EnqueueContextualEditImageSuccessResponse {}.into())
+    }
+  }
+}
+
+pub async fn handle_request(
+  request: &EnqueueContextualEditImageCommand,
+  app: &AppHandle,
+  app_data_root: &AppDataRoot,
+  app_env_configs: &AppEnvConfigs,
+  provider_priority_store: &ProviderPriorityStore,
+  task_database: &TaskDatabase,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  fal_creds_manager: &FalCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+  sora_creds_manager: &SoraCredentialManager,
+  sora_task_queue: &SoraTaskQueue,
+) -> Result<TaskEnqueueSuccess, InternalContextualEditImageError> {
+  let success_event= match request.model {
+    None => {
+      return Err(InternalContextualEditImageError::NoModelSpecified)
+    }
+    Some(ContextualImageEditModel::GptImage1) => {
+      handle_gpt_image_1(
+        request,
+        app,
+        app_data_root,
+        app_env_configs,
+        provider_priority_store,
+        storyteller_creds_manager,
+        fal_creds_manager,
+        fal_task_queue,
+        sora_creds_manager,
+        sora_task_queue,
+      ).await?
+    }
+    // TODO(bt,2025-07-05): Flux Kontext, etc.
+  };
+  
+  let result = success_event
+      .insert_into_task_database(task_database)
+      .await;
+  
+  if let Err(err) = result {
+    error!("Failed to create task in database: {:?}", err);
+    // NB: Fail open, but find a way to flag this.
+  }
+  
+  Ok(success_event)
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/errors.rs

@@ -0,0 +1,101 @@
+use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageErrorType;
+use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
+use errors::AnyhowError;
+use openai_sora_client::sora_error::SoraError;
+use serde::Serialize;
+use storyteller_client::error::storyteller_error::StorytellerError;
+
+#[derive(Debug)]
+pub enum InternalContextualEditImageError {
+  /// Request did not specify a model.
+  NoModelSpecified,
+
+  /// No provider is configured for the model type.
+  NoProviderAvailable,
+  
+  /// No storyteller credentials are set.
+  NeedsStorytellerCredentials,
+  
+  /// An invalid number of images was requested.
+  InvalidNumberOfRequestedImages {
+    min: u32,
+    max: u32,
+    requested: u32,
+  },
+  
+  /// An invalid number of input images was requested.
+  InvalidNumberOfInputImages {
+    min: u32,
+    max: u32,
+    requested: u32,
+  },
+
+  /// No sora credentials are set.
+  NeedsSoraCredentials,
+  
+  SoraError(SoraError),
+  AnyhowError(AnyhowError),
+  StorytellerError(StorytellerError),
+}
+
+impl From<AnyhowError> for InternalContextualEditImageError {
+  fn from(value: AnyhowError) -> Self {
+    Self::AnyhowError(value)
+  }
+}
+
+impl From<SoraError> for InternalContextualEditImageError {
+  fn from(value: SoraError) -> Self {
+    Self::SoraError(value)
+  }
+}
+
+impl From<StorytellerError> for InternalContextualEditImageError {
+  fn from(value: StorytellerError) -> Self {
+    Self::StorytellerError(value)
+  }
+}
+
+impl InternalContextualEditImageError {
+  pub fn to_tauri_response<E: Serialize>(&self) -> CommandErrorResponseWrapper<EnqueueContextualEditImageErrorType, E> {
+    let mut status = CommandErrorStatus::ServerError;
+    let mut error_type = EnqueueContextualEditImageErrorType::ServerError;
+    let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.".to_string();
+    
+    match self {
+      InternalContextualEditImageError::NoModelSpecified => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueContextualEditImageErrorType::ModelNotSpecified;
+        error_message = "No model specified for image generation".to_string();
+      }
+      InternalContextualEditImageError::NoProviderAvailable => {
+        status = CommandErrorStatus::ServerError;
+        error_type = EnqueueContextualEditImageErrorType::NoProviderAvailable;
+        error_message = "No configured provider available for image generation".to_string();
+      }
+      InternalContextualEditImageError::InvalidNumberOfRequestedImages { min, max, requested } => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueContextualEditImageErrorType::BadRequest;
+        error_message = format!("Invalid number of images requested ({}). Must be between {} and {}", requested, min, max);
+        
+      }
+      InternalContextualEditImageError::InvalidNumberOfInputImages { min, max, requested } => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueContextualEditImageErrorType::BadRequest;
+        error_message = format!("Invalid number of input images ({}). Must be between {} and {}", requested, min, max);
+      }
+      InternalContextualEditImageError::SoraError(_) => {}
+      InternalContextualEditImageError::AnyhowError(_) => {}
+      InternalContextualEditImageError::StorytellerError(_) => {}
+      InternalContextualEditImageError::NeedsStorytellerCredentials => {}
+      InternalContextualEditImageError::NeedsSoraCredentials => {}
+    }
+    
+    CommandErrorResponseWrapper {
+      status,
+      error_message: Some(error_message.to_string()),
+      error_type: Some(error_type),
+      error_details: None,
+    }
+  }
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/gpt_image_1/handle_gpt_image_1.rs

@@ -0,0 +1,71 @@
+use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
+use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_artcraft::handle_gpt_image_1_artcraft;
+use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_sora::handle_gpt_image_1_sora;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use log::info;
+use tauri::AppHandle;
+
+pub(super) const MAX_IMAGES: usize = 10;
+
+pub async fn handle_gpt_image_1(
+  request: &EnqueueContextualEditImageCommand,
+  app: &AppHandle,
+  app_data_root: &AppDataRoot,
+  app_env_configs: &AppEnvConfigs,
+  provider_priority_store: &ProviderPriorityStore,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  fal_creds_manager: &FalCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+  sora_creds_manager: &SoraCredentialManager,
+  sora_task_queue: &SoraTaskQueue,
+) -> Result<TaskEnqueueSuccess, InternalContextualEditImageError> {
+
+  let priority = provider_priority_store.get_priority()?;
+  
+  // TODO: Check if providers are available before proceeding.
+
+  info!("Providers by priority: {:?}", priority);
+
+  for provider in priority.iter() {
+    match provider {
+      Provider::Fal => {
+        // Fallthrough
+        // If in the future we support OpenAI API keys, it's worth considering whether we 
+        // send those requests ourselves, or if we use FAL as an intermediary. FAL makes 
+        // the API nicer to deal with, but the user needs an additional key.
+      }
+      Provider::Artcraft => {
+        info!("Dispatching gpt-image-1 via Artcraft...");
+        return handle_gpt_image_1_artcraft(
+          request, 
+          app,
+          app_data_root,
+          app_env_configs, 
+          storyteller_creds_manager
+        ).await;
+      }
+      Provider::Sora => {
+        info!("Dispatching gpt-image-1 via Sora...");
+        return handle_gpt_image_1_sora(
+          request, 
+          app,
+          app_data_root,
+          app_env_configs, 
+          sora_creds_manager,
+          sora_task_queue,
+        ).await;
+      }
+    }
+  }
+  
+  Err(InternalContextualEditImageError::NoProviderAvailable)
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/gpt_image_1/handle_gpt_image_1_artcraft.rs

@@ -0,0 +1,141 @@
+use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
+use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
+use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
+use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1::MAX_IMAGES;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
+use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
+use crate::core::model::contextual_image_edit_models::ContextualImageEditModel;
+use crate::core::model::image_models::ImageModel;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::provider_priority::ProviderPriorityStore;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use anyhow::anyhow;
+use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest};
+use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::GenerateFlux1DevTextToImageRequest;
+use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::GenerateFlux1SchnellTextToImageRequest;
+use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageRequest;
+use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageRequest;
+use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
+use fal_client::requests::webhook::image::enqueue_gpt_image_1_edit_image_webhook::GptEditImageQuality;
+use idempotency::uuid::generate_random_uuid;
+use log::{error, info};
+use storyteller_client::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
+use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
+use storyteller_client::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
+use tauri::AppHandle;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
+
+pub async fn handle_gpt_image_1_artcraft(
+  request: &EnqueueContextualEditImageCommand,
+  app: &AppHandle,
+  app_data_root: &AppDataRoot,
+  app_env_configs: &AppEnvConfigs,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+) -> Result<TaskEnqueueSuccess, InternalContextualEditImageError> {
+
+  let creds = match storyteller_creds_manager.get_credentials()? {
+    Some(creds) => creds,
+    None => {
+      return Err(InternalContextualEditImageError::NeedsStorytellerCredentials);
+    },
+  };
+
+  info!("Calling Artcraft gpt-image-1 ...");
+
+  let uuid_idempotency_token = generate_random_uuid();
+  
+  let image_quality = request.image_quality
+      .map(|quality| match quality {
+        EditImageQuality::Auto => GptImage1EditImageImageQuality::Auto,
+        EditImageQuality::High => GptImage1EditImageImageQuality::High,
+        EditImageQuality::Medium => GptImage1EditImageImageQuality::Medium,
+        EditImageQuality::Low => GptImage1EditImageImageQuality::Low,
+      });
+  
+  let image_size = request.aspect_ratio
+      .map(|size| match size {
+        EditImageSize::Auto => GptImage1EditImageImageSize::Square,
+        EditImageSize::Square => GptImage1EditImageImageSize::Square,
+        EditImageSize::Tall => GptImage1EditImageImageSize::Vertical,
+        EditImageSize::Wide => GptImage1EditImageImageSize::Horizontal,
+      });
+
+  let num_images = match request.image_count {
+    None => None,
+    Some(1) => Some(GptImage1EditImageNumImages::One),
+    Some(2) => Some(GptImage1EditImageNumImages::Two),
+    Some(3) => Some(GptImage1EditImageNumImages::Three),
+    Some(4) => Some(GptImage1EditImageNumImages::Four),
+    Some(other) => {
+      return Err(InternalContextualEditImageError::InvalidNumberOfRequestedImages {
+        min: 1,
+        max: 4,
+        requested: other,
+      });
+    },
+  };
+  
+  let mut media_tokens = Vec::with_capacity(10);
+  
+  if let Some(scene_image_media_token) = request.scene_image_media_token.clone() {
+    media_tokens.push(scene_image_media_token);
+  }
+  
+  if let Some(image_media_tokens) = request.image_media_tokens.as_ref() {
+    media_tokens.extend_from_slice(image_media_tokens);
+  }
+  
+  if media_tokens.len() > MAX_IMAGES {
+    return Err(InternalContextualEditImageError::InvalidNumberOfInputImages { 
+      min: 1,
+      max: MAX_IMAGES as u32,
+      requested: media_tokens.len() as u32,
+    });
+  }
+
+  let request = GptImage1EditImageRequest {
+    uuid_idempotency_token,
+    prompt: Some(request.prompt.clone()),
+    image_media_tokens: Some(media_tokens),
+    image_size,
+    num_images,
+    image_quality,
+  };
+
+  let result = gpt_image_1_edit_image(
+    &app_env_configs.storyteller_host,
+    Some(&creds),
+    request,
+  ).await;
+  
+  let job_id = match result {
+    Ok(enqueued) => {
+      // TODO(bt,2025-07-05): Enqueue job token?
+      info!("Successfully enqueued Artcraft gpt-image-1. Job token: {}", 
+        enqueued.inference_job_token);
+      enqueued.inference_job_token
+    }
+    Err(err) => {
+      error!("Failed to use Artcraft gpt-image-1: {:?}", err);
+      return Err(InternalContextualEditImageError::StorytellerError(err));
+    }
+  };
+  
+  Ok(TaskEnqueueSuccess {
+    provider: GenerationProvider::Artcraft,
+    model: Some(GenerationModel::GptImage1),
+    provider_job_id: Some(job_id.to_string()),
+    task_type: TaskType::ImageGeneration,
+  })
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/gpt_image_1/handle_gpt_image_1_sora.rs

@@ -0,0 +1,192 @@
+use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
+use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
+use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageSize, EnqueueContextualEditImageCommand, EnqueueContextualEditImageErrorType};
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
+use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1::MAX_IMAGES;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
+use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
+use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
+use crate::core::model::contextual_image_edit_models::ContextualImageEditModel;
+use crate::core::model::image_models::ImageModel;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::provider_priority::ProviderPriorityStore;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::simple_http_download::simple_http_download;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use anyhow::anyhow;
+use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::GenerateFlux1DevTextToImageRequest;
+use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::GenerateFlux1SchnellTextToImageRequest;
+use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageRequest;
+use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageRequest;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
+use errors::AnyhowResult;
+use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
+use idempotency::uuid::generate_random_uuid;
+use log::{error, info, warn};
+use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest};
+use openai_sora_client::recipes::image_upload_from_file_with_session_auto_renew::{image_upload_from_file_with_session_auto_renew, ImageUploadFromFileAutoRenewRequest};
+use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
+use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
+use openai_sora_client::sora_error::SoraError;
+use std::time::Duration;
+use storyteller_client::media_files::get_media_file::get_media_file;
+use tauri::AppHandle;
+
+const SORA_IMAGE_UPLOAD_TIMEOUT: Duration = Duration::from_millis(1000 * 30); // 30 seconds
+
+const SORA_IMAGE_REMIX_TIMEOUT: Duration = Duration::from_millis(1000 * 30); // 30 seconds
+
+const DEFAULT_ASPECT_RATIO : EditImageSize = EditImageSize::Square;
+
+pub async fn handle_gpt_image_1_sora(
+  request: &EnqueueContextualEditImageCommand,
+  app: &AppHandle,
+  app_data_root: &AppDataRoot,
+  app_env_configs: &AppEnvConfigs,
+  sora_creds_manager: &SoraCredentialManager,
+  sora_task_queue: &SoraTaskQueue,
+) -> Result<TaskEnqueueSuccess, InternalContextualEditImageError> {
+
+  let sora_creds = match sora_creds_manager.get_credentials() {
+    Ok(Some(creds)) => creds,
+    Ok(None) => {
+      warn!("No Sora credentials found.");
+      return Err(InternalContextualEditImageError::NeedsSoraCredentials);
+    }
+    Err(err) => {
+      error!("Failed to get Sora credentials: {:?}", err);
+      return Err(InternalContextualEditImageError::AnyhowError(err));
+    }
+  };
+
+  let mut media_tokens = Vec::with_capacity(10);
+
+  if let Some(scene_image_media_token) = request.scene_image_media_token.clone() {
+    media_tokens.push(scene_image_media_token);
+  }
+
+  if let Some(image_media_tokens) = request.image_media_tokens.as_ref() {
+    media_tokens.extend_from_slice(image_media_tokens);
+  }
+
+  if media_tokens.len() > MAX_IMAGES {
+    return Err(InternalContextualEditImageError::InvalidNumberOfInputImages {
+      min: 1,
+      max: MAX_IMAGES as u32,
+      requested: media_tokens.len() as u32,
+    });
+  }
+
+  info!("Calling get media file API: {:?}", app_env_configs.storyteller_host);
+  
+  let mut files_to_upload_to_sora = Vec::with_capacity(10);
+  
+  // TODO(bt,2025-07-07): This is inefficient. Cache and parallelize this.
+  for media_token in media_tokens.iter() {
+    info!("Using media token: {:?}", media_token);
+
+    let response = get_media_file(
+      &app_env_configs.storyteller_host,
+      media_token
+    ).await?;
+
+    let media_file_url = &response.media_file.media_links.cdn_url;
+    let extension_with_dot = get_url_file_extension(media_file_url)
+        .map(|ext| format!(".{}", ext))
+        .unwrap_or_else(|| ".png".to_string());
+
+    let filename = format!("{}{}", response.media_file.token.as_str(), extension_with_dot);
+    let filename = app_data_root.downloads_dir().path().join(&filename);
+
+    simple_http_download(&media_file_url, &filename).await?;
+    
+    files_to_upload_to_sora.push(filename);
+  }
+
+
+  let mut creds = sora_creds_manager.get_credentials_required()?;
+
+  let credential_updated = maybe_upgrade_or_renew_session(&mut creds)
+      .await
+      .map_err(|err| {
+        error!("Failed to upgrade or renew session: {:?}", err);
+        err
+      })?;
+
+  if credential_updated {
+    info!("Storing updated credentials");
+    sora_creds_manager.set_credentials(&creds)?;
+  }
+
+  let mut sora_media_tokens = Vec::with_capacity(files_to_upload_to_sora.len());
+
+  for (i, file_path) in files_to_upload_to_sora.iter().enumerate() {
+    info!("Uploading image {} of {}...", (i+1), files_to_upload_to_sora.len());
+
+    let (response, maybe_new_credentials) =
+        image_upload_from_file_with_session_auto_renew(ImageUploadFromFileAutoRenewRequest {
+          file_path,
+          credentials: &creds,
+          request_timeout: Some(SORA_IMAGE_UPLOAD_TIMEOUT), // TODO: Centralize and make configurable.
+        }).await?;
+
+    if let Some(new_creds) = maybe_new_credentials {
+      info!("Storing updated credentials.");
+      sora_creds_manager.set_credentials(&new_creds)?;
+      creds = new_creds;
+    }
+
+    sora_media_tokens.push(response.id);
+  }
+
+  let aspect_ratio = request.aspect_ratio.unwrap_or(DEFAULT_ASPECT_RATIO);
+
+  let aspect_ratio = match aspect_ratio {
+    EditImageSize::Auto => ImageSize::Square,
+    EditImageSize::Square => ImageSize::Square,
+    EditImageSize::Wide => ImageSize::Wide,
+    EditImageSize::Tall => ImageSize::Tall,
+  };
+
+  info!("Calling Sora image generation...");
+
+  // TODO(bt,2025-04-21): Download media tokens.
+  //  Note: This is incredibly inefficient. We should keep a local cache.
+  //  Also, if they've already been uploaded to OpenAI, we shouldn't continue to re-upload.
+
+  let (response, maybe_new_creds) =
+      image_remix_with_session_auto_renew(ImageRemixAutoRenewRequest {
+        prompt: request.prompt.to_string(),
+        num_images: NumImages::One,
+        image_size: aspect_ratio,
+        sora_media_tokens: sora_media_tokens.clone(),
+        credentials: &creds,
+        request_timeout: Some(SORA_IMAGE_REMIX_TIMEOUT),
+      }).await?;
+
+  if let Some(new_creds) = maybe_new_creds {
+    info!("Storing updated credentials.");
+    sora_creds_manager.set_credentials(&new_creds)?;
+  }
+
+  info!("New Sora Task ID: {:?} ", response.task_id);
+
+  sora_task_queue.insert(&response.task_id)?;
+
+  Ok(TaskEnqueueSuccess {
+    task_type: TaskType::ImageGeneration,
+    model: Some(GenerationModel::GptImage1),
+    provider: GenerationProvider::Sora,
+    provider_job_id: Some(response.task_id.to_string()),
+  })
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/gpt_image_1/mod.rs

@@ -0,0 +1,3 @@
+pub mod handle_gpt_image_1;
+pub mod handle_gpt_image_1_artcraft;
+pub mod handle_gpt_image_1_sora;

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/mod.rs

@@ -0,0 +1,3 @@
+pub mod enqueue_contextual_edit_image_command;
+pub mod errors;
+pub mod gpt_image_1;

crates/desktop/artcraft/src/core/commands/enqueue/mod.rs

@@ -1,3 +1,6 @@
 pub mod image;
+pub mod image_bg_removal;
+pub mod image_edit;
+pub mod task_enqueue_success;
 pub mod object;
 pub mod video;

crates/desktop/artcraft/src/core/commands/enqueue/object/enqueue_image_to_3d_object_command.rs

@@ -1,9 +1,10 @@
-use crate::core::commands::enqueue::object::handle_object_artcraft::handle_object_artcraft;
-use crate::core::commands::enqueue::object::handle_object_fal::handle_object_fal;
+use crate::core::commands::enqueue::object::generic::handle_object::handle_object;
 use crate::core::commands::enqueue::object::internal_object_error::InternalObjectError;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
 use crate::core::commands::response::shorthand::Response;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
@@ -15,6 +16,9 @@ use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
 use tauri::{AppHandle, State};
 use tokens::tokens::media_files::MediaFileToken;
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
+use crate::core::state::task_database::TaskDatabase;
 
 #[derive(Deserialize)]
 pub struct EnqueueImageTo3dObjectRequest {
@@ -65,8 +69,10 @@ pub enum EnqueueImageTo3dObjectErrorType {
 pub async fn enqueue_image_to_3d_object_command(
   app: AppHandle,
   request: EnqueueImageTo3dObjectRequest,
+  app_env_configs: State<'_, AppEnvConfigs>,
   app_data_root: State<'_, AppDataRoot>,
   provider_priority_store: State<'_, ProviderPriorityStore>,
+  task_database: State<'_, TaskDatabase>,
   fal_creds_manager: State<'_, FalCredentialManager>,
   fal_task_queue: State<'_, FalTaskQueue>,
   storyteller_creds_manager: State<'_, StorytellerCredentialManager>,
@@ -76,10 +82,12 @@ pub async fn enqueue_image_to_3d_object_command(
   info!("enqueue_image_to_3d_object_command called");
 
   let result = handle_request(
-    &app,
     request,
+    &app,
+    &app_env_configs,
     &app_data_root,
     &provider_priority_store,
+    &task_database,
     &fal_creds_manager,
     &storyteller_creds_manager,
     &fal_task_queue,
@@ -124,7 +132,17 @@ pub async fn enqueue_image_to_3d_object_command(
         error_details: None,
       })
     }
-    Ok(()) => {
+    Ok(event) => {
+      let event = GenerationEnqueueSuccessEvent {
+        action: event.to_frontend_event_action(),
+        service: event.to_frontend_event_service(),
+        model: event.model,
+      };
+
+      if let Err(err) = event.send(&app) {
+        error!("Failed to emit event: {:?}", err); // Fail open.
+      }
+      
       Ok(EnqueueImageTo3dObjectSuccessResponse {}.into())
     }
   }
@@ -132,32 +150,42 @@ pub async fn enqueue_image_to_3d_object_command(
 
 
 pub async fn handle_request(
-  app: &AppHandle,
   request: EnqueueImageTo3dObjectRequest,
+  app: &AppHandle,
+  app_env_configs: &AppEnvConfigs,
   app_data_root: &AppDataRoot,
   provider_priority_store: &ProviderPriorityStore,
+  task_database: &TaskDatabase,
   fal_creds_manager: &FalCredentialManager,
   storyteller_creds_manager: &StorytellerCredentialManager,
   fal_task_queue: &FalTaskQueue,
-) -> Result<(), InternalObjectError> {
+) -> Result<TaskEnqueueSuccess, InternalObjectError> {
 
-  let priority = provider_priority_store.get_priority()?;
+  let result = handle_object(
+    request,
+    &app,
+    &app_env_configs,
+    &app_data_root,
+    &provider_priority_store,
+    &fal_creds_manager,
+    &storyteller_creds_manager,
+    &fal_task_queue,
+  ).await;
+  
+  let success_event = match result {
+    Err(err) => return Err(err),
+    Ok(event) => event,
+  };
 
-  for provider in priority.iter() {
-    match provider {
-      Provider::Sora => {} // Fallthrough
-      Provider::Artcraft => {
-        return Ok(handle_object_artcraft(
-          request, &app, app_data_root, storyteller_creds_manager).await?);
-      }
-      Provider::Fal => {
-        if fal_creds_manager.has_apparent_api_token()? {
-          return Ok(handle_object_fal(
-            &app, app_data_root, request, fal_creds_manager, fal_task_queue).await?);
-        }
-      }
-    }
+  let result = success_event
+      .insert_into_task_database(task_database)
+      .await;
+
+  if let Err(err) = result {
+    error!("Failed to create task in database: {:?}", err);
+    // NB: Fail open, but find a way to flag this.
   }
 
-  Err(InternalObjectError::NoProviderAvailable)
+
+  Ok(success_event)
 }

crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object.rs

@@ -0,0 +1,55 @@
+use crate::core::commands::enqueue::object::enqueue_image_to_3d_object_command::EnqueueImageTo3dObjectRequest;
+use crate::core::commands::enqueue::object::generic::handle_object_artcraft::handle_object_artcraft;
+use crate::core::commands::enqueue::object::generic::handle_object_fal::handle_object_fal;
+use crate::core::commands::enqueue::object::internal_object_error::InternalObjectError;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use tauri::AppHandle;
+
+pub async fn handle_object(
+  request: EnqueueImageTo3dObjectRequest,
+  app: &AppHandle,
+  app_env_configs: &AppEnvConfigs,
+  app_data_root: &AppDataRoot,
+  provider_priority_store: &ProviderPriorityStore,
+  fal_creds_manager: &FalCredentialManager,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+) -> Result<TaskEnqueueSuccess, InternalObjectError> {
+
+  let priority = provider_priority_store.get_priority()?;
+
+  for provider in priority.iter() {
+    match provider {
+      Provider::Sora => {} // Fallthrough
+      Provider::Artcraft => {
+        return Ok(handle_object_artcraft(
+          request,
+          app,
+          app_env_configs,
+          app_data_root,
+          storyteller_creds_manager
+        ).await?);
+      }
+      Provider::Fal => {
+        if fal_creds_manager.has_apparent_api_token()? {
+          return Ok(handle_object_fal(
+            &app,
+            app_env_configs,
+            app_data_root,
+            request,
+            fal_creds_manager,
+            fal_task_queue
+          ).await?);
+        }
+      }
+    }
+  }
+
+  Err(InternalObjectError::NoProviderAvailable)
+}

crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object_artcraft.rs

@@ -1,27 +1,31 @@
 use crate::core::commands::enqueue::object::enqueue_image_to_3d_object_command::{EnqueueImageTo3dObjectModel, EnqueueImageTo3dObjectRequest};
 use crate::core::commands::enqueue::object::internal_object_error::InternalObjectError;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
+use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
 use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use artcraft_api_defs::generate::object::generate_hunyuan_2_0_image_to_3d::GenerateHunyuan20ImageTo3dRequest;
 use artcraft_api_defs::generate::object::generate_hunyuan_2_1_image_to_3d::GenerateHunyuan21ImageTo3dRequest;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
 use idempotency::uuid::generate_random_uuid;
 use log::{error, info};
 use storyteller_client::generate::object::generate_hunyuan_3d_2_0_image_to_3d::generate_hunyuan3d_2_0_image_to_3d;
 use storyteller_client::generate::object::generate_hunyuan_3d_2_1_image_to_3d::generate_hunyuan3d_2_1_image_to_3d;
-use storyteller_client::utils::api_host::ApiHost;
 use tauri::AppHandle;
 
 pub async fn handle_object_artcraft(
   request: EnqueueImageTo3dObjectRequest,
   app: &AppHandle,
+  app_env_configs: &AppEnvConfigs,
   app_data_root: &AppDataRoot,
   storyteller_creds_manager: &StorytellerCredentialManager,
-) -> Result<(), InternalObjectError> {
+) -> Result<TaskEnqueueSuccess, InternalObjectError> {
 
   let creds = match storyteller_creds_manager.get_credentials()? {
     Some(creds) => creds,
@@ -38,18 +42,12 @@ pub async fn handle_object_artcraft(
     },
   };
   
-  //let api_key = fal_creds_manager.get_key_required()
-  //    .map_err(|err| {
-  //      error!("EnqueueTextToImage FAL api key required: {:?}", err);
-  //      InternalObjectError::NeedsFalApiKey
-  //    })?;
-
-
   info!("Calling Artcraft image to 3d ...");
 
-
   let uuid_idempotency_token = generate_random_uuid();
   
+  let mut used_model = None;
+  
   let job_token = match request.model {
     None => {
       return Err(InternalObjectError::NoModelSpecified);
@@ -59,12 +57,13 @@ pub async fn handle_object_artcraft(
       EnqueueImageTo3dObjectModel::Hunyuan3d2_0
     ) => {
       info!("enqueue Artcraft Hunyuan 3D 2.0");
+      used_model = Some(GenerationModel::Hunyuan3d2_0);
       let request = GenerateHunyuan20ImageTo3dRequest { 
         uuid_idempotency_token,
         media_file_token: request.image_media_token,
       };
       let result = generate_hunyuan3d_2_0_image_to_3d(
-        &ApiHost::Storyteller,
+        &app_env_configs.storyteller_host,
         Some(&creds),
         request,
       ).await;
@@ -81,12 +80,13 @@ pub async fn handle_object_artcraft(
     }
     Some(EnqueueImageTo3dObjectModel::Hunyuan3d2_1) => {
       info!("enqueue Artcraft Hunyuan 3D 2.1");
+      used_model = Some(GenerationModel::Hunyuan3d2_1);
       let request = GenerateHunyuan21ImageTo3dRequest {
         uuid_idempotency_token,
         media_file_token: request.image_media_token,
       };
       let result = generate_hunyuan3d_2_1_image_to_3d(
-        &ApiHost::Storyteller,
+        &app_env_configs.storyteller_host,
         Some(&creds),
         request,
       ).await;
@@ -105,41 +105,20 @@ pub async fn handle_object_artcraft(
 
   info!("Successfully enqueued 3D generation");
   
-  let event = GenerationEnqueueSuccessEvent {
-    action: GenerationAction::ImageTo3d,
-    service: GenerationServiceProvider::Artcraft,
-    model: None,
-  };
-  
-  if let Err(err) = event.send(app) {
-    error!("Failed to emit event: {:?}", err); // Fail open.
-  }
-  
-  //if let Err(err) = fal_task_queue.insert(&enqueued) {
-  //  error!("Failed to enqueue task: {:?}", err);
-  //  return Err(InternalObjectError::AnyhowError(anyhow!("Failed to enqueue task: {:?}", err)));
+  //let event = GenerationEnqueueSuccessEvent {
+  //  action: GenerationAction::ImageTo3d,
+  //  service: GenerationServiceProvider::Artcraft,
+  //  model: None,
+  //};
+  //
+  //if let Err(err) = event.send(app) {
+  //  error!("Failed to emit event: {:?}", err); // Fail open.
   //}
 
-//  match result {
-//    Ok(enqueued) => {
-//    }
-//    Err(err) => {
-//      error!("Failed to enqueue image to 3d: {:?}", err);
-//
-//      let event = GenerationEnqueueFailureEvent {
-//        action: GenerationAction::ImageTo3d,
-//        service: GenerationServiceProvider::Fal,
-//        model: None,
-//        reason: None,
-//      };
-//
-//      if let Err(err) = event.send(app) {
-//        error!("Failed to emit event: {:?}", err); // Fail open.
-//      }
-//
-//      return Err(InternalObjectError::FalError(err));
-//    }
-//  }
-
-  Ok(())
+  Ok(TaskEnqueueSuccess {
+    task_type: TaskType::ObjectGeneration,
+    model: used_model,
+    provider: GenerationProvider::Artcraft,
+    provider_job_id: Some(job_token.to_string()),
+  })
 }

crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object_fal.rs

@@ -1,14 +1,18 @@
 use crate::core::commands::enqueue::object::enqueue_image_to_3d_object_command::{EnqueueImageTo3dObjectModel, EnqueueImageTo3dObjectRequest};
 use crate::core::commands::enqueue::object::internal_object_error::InternalObjectError;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
+use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
 use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
 use anyhow::anyhow;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::enqueue_hunyuan2_image_to_3d::{enqueue_hunyuan2_image_to_3d, Hunyuan2Args};
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
 use log::{error, info};
@@ -16,11 +20,12 @@ use tauri::AppHandle;
 
 pub async fn handle_object_fal(
   app: &AppHandle,
+  app_env_configs: &AppEnvConfigs,
   app_data_root: &AppDataRoot,
   request: EnqueueImageTo3dObjectRequest,
   fal_creds_manager: &FalCredentialManager,
   fal_task_queue: &FalTaskQueue,
-) -> Result<(), InternalObjectError> {
+) -> Result<TaskEnqueueSuccess, InternalObjectError> {
 
   let api_key = match fal_creds_manager.get_key()? {
     Some(key) => key,
@@ -46,8 +51,11 @@ pub async fn handle_object_fal(
   let mut temp_download;
 
   if let Some(media_token) = request.image_media_token {
-    temp_download = download_media_file_to_temp_dir(&app_data_root, &media_token).await?;
-
+    temp_download = download_media_file_to_temp_dir(
+      app_env_configs, 
+      app_data_root, 
+      &media_token
+    ).await?;
   } else {
     return Err(InternalObjectError::AnyhowError(anyhow!("No image media token provided")));
   }
@@ -55,6 +63,8 @@ pub async fn handle_object_fal(
   info!("Calling FAL image to 3d ...");
 
   let filename = temp_download.path().to_path_buf();
+  
+  let mut used_model = None;
 
   let result = match request.model {
     None => {
@@ -64,6 +74,7 @@ pub async fn handle_object_fal(
       EnqueueImageTo3dObjectModel::Hunyuan3d2_0 |
       EnqueueImageTo3dObjectModel::Hunyuan3d2
     ) => {
+      used_model = Some(GenerationModel::Hunyuan3d2_0);
       info!("enqueue Hunyuan 3D 2.0");
       enqueue_hunyuan2_image_to_3d(Hunyuan2Args {
         image_path: filename,
@@ -75,9 +86,13 @@ pub async fn handle_object_fal(
     }
   };
 
+  let mut job_id = None;
+  
   match result {
     Ok(enqueued) => {
       info!("Successfully enqueued text to image");
+      
+      job_id = Some(enqueued.request_id.to_string());
 
       let event = GenerationEnqueueSuccessEvent {
         action: GenerationAction::ImageTo3d,
@@ -112,5 +127,10 @@ pub async fn handle_object_fal(
     }
   }
 
-  Ok(())
+  Ok(TaskEnqueueSuccess {
+    task_type: TaskType::ObjectGeneration,
+    model: used_model,
+    provider: GenerationProvider::Fal,
+    provider_job_id: job_id,
+  })
 }

crates/desktop/artcraft/src/core/commands/enqueue/object/generic/mod.rs

@@ -0,0 +1,3 @@
+pub (super) mod handle_object;
+pub (super) mod handle_object_artcraft;
+pub (super) mod handle_object_fal;

crates/desktop/artcraft/src/core/commands/enqueue/object/mod.rs

@@ -1,4 +1,3 @@
 pub mod enqueue_image_to_3d_object_command;
-pub mod handle_object_artcraft;
-pub mod handle_object_fal;
-pub mod internal_object_error;
+pub mod internal_object_error;
+mod generic;

crates/desktop/artcraft/src/core/commands/enqueue/task_enqueue_success.rs

@@ -0,0 +1,83 @@
+use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
+use crate::core::state::task_database::TaskDatabase;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_model_type::TaskModelType;
+use enums::tauri::tasks::task_status::TaskStatus;
+use enums::tauri::tasks::task_type::TaskType;
+use sqlite_tasks::error::SqliteTasksError;
+use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs};
+use tokens::tokens::sqlite::tasks::TaskId;
+
+pub struct TaskEnqueueSuccess {
+  pub task_type: TaskType,
+  pub model: Option<GenerationModel>,
+  pub provider: GenerationProvider,
+  pub provider_job_id: Option<String>,
+  // TODO: We may want to change the `model` type - this has weird ownership and semantics
+}
+
+impl TaskEnqueueSuccess{
+  pub fn to_frontend_event_action(&self) -> GenerationAction {
+    match self.task_type {
+      TaskType::ImageGeneration => GenerationAction::GenerateImage,
+      TaskType::VideoGeneration => GenerationAction::GenerateVideo,
+      TaskType::BackgroundRemoval => GenerationAction::RemoveBackground,
+      TaskType::ObjectGeneration => GenerationAction::ImageTo3d,
+    }
+  }
+  
+  pub fn to_frontend_event_service(&self) -> GenerationServiceProvider {
+    match self.provider {
+      GenerationProvider::Artcraft => GenerationServiceProvider::Artcraft,
+      GenerationProvider::Fal => GenerationServiceProvider::Fal,
+      GenerationProvider::Sora => GenerationServiceProvider::Sora,
+    }
+  }
+  
+  pub async fn insert_into_task_database(&self, task_database: &TaskDatabase) -> Result<TaskId, SqliteTasksError> {
+    // TODO: Move this mapping elsewhere, or remove the other models.
+    let model_type = match self.model {
+      None => None,
+      Some(GenerationModel::Flux1Dev) => Some(TaskModelType::Flux1Dev),
+      Some(GenerationModel::Flux1Schnell) => Some(TaskModelType::Flux1Schnell),
+      Some(GenerationModel::FluxPro11) => Some(TaskModelType::FluxPro11),
+      Some(GenerationModel::FluxPro11Ultra) => Some(TaskModelType::FluxPro11Ultra),
+      Some(GenerationModel::GptImage1) => Some(TaskModelType::GptImage1),
+      Some(GenerationModel::Recraft3) => Some(TaskModelType::Recraft3),
+      Some(GenerationModel::Kling21Pro) => Some(TaskModelType::Kling21Pro),
+      Some(GenerationModel::Kling21Master) => Some(TaskModelType::Kling21Master),
+      Some(GenerationModel::Seedance10Lite) => Some(TaskModelType::Seedance10Lite),
+      Some(GenerationModel::Veo2) => Some(TaskModelType::Veo2),
+      Some(GenerationModel::Hunyuan3d2_0) => Some(TaskModelType::Hunyuan3d2_0),
+      Some(GenerationModel::Hunyuan3d2_1) => Some(TaskModelType::Hunyuan3d2_1),
+
+      // TODO: These seem wrong -
+      Some(GenerationModel::Kling1_6) => Some(TaskModelType::Kling16Pro), // NB: `VideoModel::Kling16Pro`.
+      Some(GenerationModel::Kling2_0) => None, // TODO: unused elsewhere?
+      Some(GenerationModel::Sora) => None, // TODO: unused elsewhere?
+    };
+
+    create_task(CreateTaskArgs {
+      db: task_database.get_connection(),
+      status: TaskStatus::Pending,
+      task_type: self.task_type,
+      model_type: model_type,
+      provider: self.provider,
+      provider_job_id: self.provider_job_id.as_deref(),
+      frontend_subscriber_id: None,
+      frontend_subscriber_payload: None,
+    }).await
+  }
+  
+//  pub fn tauri_event_model(&self) -> GenerationModel {
+//    match self.model {
+//      ImageModel::Flux1Dev => GenerationModel::Flux1Dev,
+//      ImageModel::Flux1Schnell => GenerationModel::Flux1Schnell,
+//      ImageModel::FluxPro11 => GenerationModel::FluxPro11,
+//      ImageModel::FluxPro11Ultra => GenerationModel::FluxPro11Ultra,
+//      ImageModel::GptImage1 => GenerationModel::GptImage1,
+//      ImageModel::Recraft3 => GenerationModel::Recraft3,
+//    }
+//  }
+  
+}

crates/desktop/artcraft/src/core/commands/enqueue/video/enqueue_image_to_video_command.rs

@@ -1,12 +1,16 @@
-use crate::core::commands::enqueue::video::handle_video_artcraft::handle_video_artcraft;
-use crate::core::commands::enqueue::video::handle_video_fal::handle_video_fal;
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::commands::enqueue::video::generic::handle_video::handle_video;
 use crate::core::commands::enqueue::video::internal_video_error::InternalVideoError;
 use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
 use crate::core::commands::response::shorthand::Response;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::model::video_models::VideoModel;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
+use crate::core::state::task_database::TaskDatabase;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
@@ -25,6 +29,9 @@ pub struct EnqueueImageToVideoRequest {
   
   /// The model to use.
   pub model: Option<VideoModel>,
+  
+  /// Optional text prompt.
+  pub prompt: Option<String>,
 }
 
 #[derive(Serialize)]
@@ -54,8 +61,10 @@ pub enum EnqueueImageToVideoErrorType {
 pub async fn enqueue_image_to_video_command(
   app: AppHandle,
   request: EnqueueImageToVideoRequest,
+  app_env_configs: State<'_, AppEnvConfigs>,
   app_data_root: State<'_, AppDataRoot>,
   provider_priority_store: State<'_, ProviderPriorityStore>,
+  task_database: State<'_, TaskDatabase>,
   fal_creds_manager: State<'_, FalCredentialManager>,
   fal_task_queue: State<'_, FalTaskQueue>,
   storyteller_creds_manager: State<'_, StorytellerCredentialManager>,
@@ -65,10 +74,12 @@ pub async fn enqueue_image_to_video_command(
   info!("enqueue_image_to_video_command called");
 
   let result = handle_request(
-    &app,
     request,
+    &app,
+    &app_env_configs,
     &app_data_root,
     &provider_priority_store,
+    &task_database,
     &fal_creds_manager,
     &storyteller_creds_manager,
     &fal_task_queue,
@@ -113,7 +124,17 @@ pub async fn enqueue_image_to_video_command(
         error_details: None,
       })
     }
-    Ok(()) => {
+    Ok(event) => {
+      let event = GenerationEnqueueSuccessEvent {
+        action: event.to_frontend_event_action(),
+        service: event.to_frontend_event_service(),
+        model: event.model,
+      };
+
+      if let Err(err) = event.send(&app) {
+        error!("Failed to emit event: {:?}", err); // Fail open.
+      }
+      
       Ok(EnqueueImageToVideoSuccessResponse {}.into())
     }
   }
@@ -121,32 +142,41 @@ pub async fn enqueue_image_to_video_command(
 
 
 pub async fn handle_request(
-  app: &AppHandle,
   request: EnqueueImageToVideoRequest,
+  app: &AppHandle,
+  app_env_configs: &AppEnvConfigs,
   app_data_root: &AppDataRoot,
   provider_priority_store: &ProviderPriorityStore,
+  task_database: &TaskDatabase,
   fal_creds_manager: &FalCredentialManager,
   storyteller_creds_manager: &StorytellerCredentialManager,
   fal_task_queue: &FalTaskQueue,
-) -> Result<(), InternalVideoError> {
+) -> Result<TaskEnqueueSuccess, InternalVideoError> {
 
-  let priority = provider_priority_store.get_priority()?;
-  
-  for provider in priority.iter() {
-    match provider {
-      Provider::Sora => {} // Fallthrough
-      Provider::Artcraft => {
-        return Ok(handle_video_artcraft(
-          request, &app, app_data_root, storyteller_creds_manager).await?);
-      }
-      Provider::Fal => {
-        if fal_creds_manager.has_apparent_api_token()? {
-          return Ok(handle_video_fal(
-            &app, app_data_root, request, fal_creds_manager, fal_task_queue).await?);
-        }
-      }
-    }
+  let result = handle_video(
+    request,
+    &app,
+    &app_env_configs,
+    &app_data_root,
+    &provider_priority_store,
+    &fal_creds_manager,
+    &storyteller_creds_manager,
+    &fal_task_queue,
+  ).await;
+
+  let success_event = match result {
+    Err(err) => return Err(err),
+    Ok(event) => event,
+  };
+
+  let result = success_event
+      .insert_into_task_database(task_database)
+      .await;
+
+  if let Err(err) = result {
+    error!("Failed to create task in database: {:?}", err);
+    // NB: Fail open, but find a way to flag this.
   }
 
-  Err(InternalVideoError::NoProviderAvailable)
+  Ok(success_event)
 }

crates/desktop/artcraft/src/core/commands/enqueue/video/generic/handle_video.rs

@@ -0,0 +1,55 @@
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::commands::enqueue::video::enqueue_image_to_video_command::EnqueueImageToVideoRequest;
+use crate::core::commands::enqueue::video::generic::handle_video_artcraft::handle_video_artcraft;
+use crate::core::commands::enqueue::video::generic::handle_video_fal::handle_video_fal;
+use crate::core::commands::enqueue::video::internal_video_error::InternalVideoError;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use tauri::AppHandle;
+
+pub async fn handle_video(
+  request: EnqueueImageToVideoRequest,
+  app: &AppHandle,
+  app_env_configs: &AppEnvConfigs,
+  app_data_root: &AppDataRoot,
+  provider_priority_store: &ProviderPriorityStore,
+  fal_creds_manager: &FalCredentialManager,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+) -> Result<TaskEnqueueSuccess, InternalVideoError> {
+
+  let priority = provider_priority_store.get_priority()?;
+
+  for provider in priority.iter() {
+    match provider {
+      Provider::Sora => {} // Fallthrough
+      Provider::Artcraft => {
+        return Ok(handle_video_artcraft(
+          request,
+          &app,
+          app_env_configs,
+          app_data_root,
+          storyteller_creds_manager
+        ).await?);
+      }
+      Provider::Fal => {
+        if fal_creds_manager.has_apparent_api_token()? {
+          return Ok(handle_video_fal(
+            &app,
+            app_env_configs,
+            app_data_root,
+            request,
+            fal_creds_manager,
+            fal_task_queue
+          ).await?);
+        }
+      }
+    }
+  }
+
+  Err(InternalVideoError::NoProviderAvailable)
+}

crates/desktop/artcraft/src/core/commands/enqueue/video/generic/handle_video_artcraft.rs

@@ -1,3 +1,4 @@
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::commands::enqueue::video::enqueue_image_to_video_command::EnqueueImageToVideoRequest;
 use crate::core::commands::enqueue::video::internal_video_error::InternalVideoError;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
@@ -5,6 +6,7 @@ use crate::core::events::generation_events::common::{GenerationAction, Generatio
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
 use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::model::video_models::VideoModel;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest};
@@ -12,6 +14,8 @@ use artcraft_api_defs::generate::video::generate_kling_2_1_master_image_to_video
 use artcraft_api_defs::generate::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProAspectRatio, GenerateKling21ProImageToVideoRequest};
 use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::GenerateSeedance10LiteImageToVideoRequest;
 use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::{GenerateVeo2AspectRatio, GenerateVeo2ImageToVideoRequest};
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
 use fal_client::requests::queue::video_gen::enqueue_kling_16_pro_image_to_video::Kling16ProAspectRatio;
 use fal_client::requests::webhook::video::enqueue_veo_2_image_to_video_webhook::Veo2AspectRatio;
@@ -28,9 +32,10 @@ use tauri::AppHandle;
 pub async fn handle_video_artcraft(
   request: EnqueueImageToVideoRequest,
   app: &AppHandle,
+  app_env_configs: &AppEnvConfigs,
   app_data_root: &AppDataRoot,
   storyteller_creds_manager: &StorytellerCredentialManager,
-) -> Result<(), InternalVideoError> {
+) -> Result<TaskEnqueueSuccess, InternalVideoError> {
 
   let creds = match storyteller_creds_manager.get_credentials()? {
     Some(creds) => creds,
@@ -72,11 +77,11 @@ pub async fn handle_video_artcraft(
         uuid_idempotency_token,
         media_file_token: request.image_media_token,
         aspect_ratio: Some(GenerateKling16ProAspectRatio::WideSixteenNine),
-        prompt: None,
+        prompt: request.prompt,
         duration: None,
       };
       let result = generate_kling_16_pro_image_to_video(
-        &ApiHost::Storyteller,
+        &app_env_configs.storyteller_host,
         Some(&creds),
         request,
       ).await;
@@ -98,11 +103,11 @@ pub async fn handle_video_artcraft(
         uuid_idempotency_token,
         media_file_token: request.image_media_token,
         aspect_ratio: Some(GenerateKling21MasterAspectRatio::WideSixteenNine),
-        prompt: None,
+        prompt: request.prompt,
         duration: None,
       };
       let result = generate_kling_21_master_image_to_video(
-        &ApiHost::Storyteller,
+        &app_env_configs.storyteller_host,
         Some(&creds),
         request,
       ).await;
@@ -124,11 +129,11 @@ pub async fn handle_video_artcraft(
         uuid_idempotency_token,
         media_file_token: request.image_media_token,
         aspect_ratio: Some(GenerateKling21ProAspectRatio::WideSixteenNine),
-        prompt: None,
+        prompt: request.prompt,
         duration: None,
       };
       let result = generate_kling_21_pro_image_to_video(
-        &ApiHost::Storyteller,
+        &app_env_configs.storyteller_host,
         Some(&creds),
         request,
       ).await;
@@ -149,12 +154,12 @@ pub async fn handle_video_artcraft(
       let request = GenerateSeedance10LiteImageToVideoRequest {
         uuid_idempotency_token,
         media_file_token: request.image_media_token,
-        prompt: None,
+        prompt: request.prompt,
         resolution: None,
         duration: None,
       };
       let result = generate_seedance_1_0_lite_image_to_video(
-        &ApiHost::Storyteller,
+        &app_env_configs.storyteller_host,
         Some(&creds),
         request,
       ).await;
@@ -176,11 +181,11 @@ pub async fn handle_video_artcraft(
         uuid_idempotency_token,
         media_file_token: request.image_media_token,
         aspect_ratio: Some(GenerateVeo2AspectRatio::WideSixteenNine),
-        prompt: None,
+        prompt: request.prompt,
         duration: None,
       };
       let result = generate_veo_2_image_to_video(
-        &ApiHost::Storyteller,
+        &app_env_configs.storyteller_host,
         Some(&creds),
         request,
       ).await;
@@ -199,41 +204,10 @@ pub async fn handle_video_artcraft(
 
   info!("Successfully enqueued video generation");
   
-  let event = GenerationEnqueueSuccessEvent {
-    action: GenerationAction::GenerateVideo,
-    service: GenerationServiceProvider::Artcraft,
+  Ok(TaskEnqueueSuccess {
+    task_type: TaskType::VideoGeneration,
     model: selected_model,
-  };
-  
-  if let Err(err) = event.send(app) {
-    error!("Failed to emit event: {:?}", err); // Fail open.
-  }
-  
-  //if let Err(err) = fal_task_queue.insert(&enqueued) {
-  //  error!("Failed to enqueue task: {:?}", err);
-  //  return Err(InternalVideoError::AnyhowError(anyhow!("Failed to enqueue task: {:?}", err)));
-  //}
-
-//  match result {
-//    Ok(enqueued) => {
-//    }
-//    Err(err) => {
-//      error!("Failed to enqueue image to 3d: {:?}", err);
-//
-//      let event = GenerationEnqueueFailureEvent {
-//        action: GenerationAction::ImageTo3d,
-//        service: GenerationServiceProvider::Fal,
-//        model: None,
-//        reason: None,
-//      };
-//
-//      if let Err(err) = event.send(app) {
-//        error!("Failed to emit event: {:?}", err); // Fail open.
-//      }
-//
-//      return Err(InternalVideoError::FalError(err));
-//    }
-//  }
-
-  Ok(())
+    provider: GenerationProvider::Artcraft,
+    provider_job_id: Some(job_token.to_string()),
+  })
 }

crates/desktop/artcraft/src/core/commands/enqueue/video/generic/handle_video_fal.rs

@@ -1,3 +1,4 @@
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::commands::enqueue::video::enqueue_image_to_video_command::EnqueueImageToVideoRequest;
 use crate::core::commands::enqueue::video::internal_video_error::InternalVideoError;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
@@ -5,11 +6,14 @@ use crate::core::events::generation_events::common::{GenerationAction, Generatio
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
 use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::model::video_models::VideoModel;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
 use anyhow::anyhow;
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
 use fal_client::requests::queue::video_gen::enqueue_kling_16_pro_image_to_video::{enqueue_kling_16_pro_image_to_video, Kling16ProArgs, Kling16ProAspectRatio, Kling16ProDuration};
 use log::{error, info};
@@ -17,11 +21,12 @@ use tauri::AppHandle;
 
 pub async fn handle_video_fal(
   app: &AppHandle,
+  app_env_configs: &AppEnvConfigs,
   app_data_root: &AppDataRoot,
   request: EnqueueImageToVideoRequest,
   fal_creds_manager: &FalCredentialManager,
   fal_task_queue: &FalTaskQueue,
-) -> Result<(), InternalVideoError> {
+) -> Result<TaskEnqueueSuccess, InternalVideoError> {
 
   let api_key = match fal_creds_manager.get_key()? {
     Some(key) => key,
@@ -47,8 +52,11 @@ pub async fn handle_video_fal(
   let mut temp_download;
 
   if let Some(media_token) = request.image_media_token {
-    temp_download = download_media_file_to_temp_dir(&app_data_root, &media_token).await?;
-
+    temp_download = download_media_file_to_temp_dir(
+      app_env_configs,
+      app_data_root, 
+      &media_token
+    ).await?;
   } else {
     return Err(InternalVideoError::AnyhowError(anyhow!("No image media token provided")));
   }
@@ -69,28 +77,22 @@ pub async fn handle_video_fal(
         api_key: &api_key,
         duration: Kling16ProDuration::Default,
         aspect_ratio: Kling16ProAspectRatio::WideSixteenNine,
-        prompt: "",
+        prompt: request.prompt.as_deref().unwrap_or(""),
       }).await
     }
     _ => {
       return Err(InternalVideoError::AnyhowError(anyhow!("Unsupported model: {:?}", request.model)));
     }
   };
+  
+  let mut job_id = None;
 
   match result {
     Ok(enqueued) => {
       info!("Successfully enqueued Kling 1.6 image to video");
 
-      let event = GenerationEnqueueSuccessEvent {
-        action: GenerationAction::GenerateVideo,
-        service: GenerationServiceProvider::Fal,
-        model: selected_model,
-      };
-
-      if let Err(err) = event.send(app) {
-        error!("Failed to emit event: {:?}", err); // Fail open.
-      }
-
+      job_id = Some(enqueued.request_id.to_string());
+      
       if let Err(err) = fal_task_queue.insert(&enqueued) {
         error!("Failed to enqueue task: {:?}", err);
         return Err(InternalVideoError::AnyhowError(anyhow!("Failed to enqueue task: {:?}", err)));
@@ -114,5 +116,10 @@ pub async fn handle_video_fal(
     }
   }
 
-  Ok(())
+  Ok(TaskEnqueueSuccess {
+    task_type: TaskType::VideoGeneration,
+    model: selected_model,
+    provider: GenerationProvider::Fal,
+    provider_job_id: job_id,
+  })
 }

crates/desktop/artcraft/src/core/commands/enqueue/video/generic/mod.rs

@@ -0,0 +1,3 @@
+pub (super) mod handle_video;
+pub (super) mod handle_video_artcraft;
+pub (super) mod handle_video_fal;

crates/desktop/artcraft/src/core/commands/enqueue/video/mod.rs

@@ -1,4 +1,3 @@
 pub mod enqueue_image_to_video_command;
-pub mod handle_video_artcraft;
-pub mod handle_video_fal;
-pub mod internal_video_error;
+pub mod internal_video_error;
+mod generic;

crates/desktop/artcraft/src/core/commands/get_app_info_command.rs

@@ -28,7 +28,7 @@ pub fn get_app_info_command(
   let git_commit_short_id = build_metadata::git_commit_short_id();
   let git_commit_timestamp = build_metadata::git_commit_timestamp();
 
-  let storyteller_host = app_env_configs.storyteller_host.to_api_hostname();
+  let storyteller_host = app_env_configs.storyteller_host.to_api_hostname_and_scheme();
 
   AppInfoResponse {
     build_timestamp,

crates/desktop/artcraft/src/core/commands/response/shorthand.rs

@@ -22,9 +22,18 @@ use crate::core::commands::response::success_response_wrapper::CommandSuccessRes
 //  - sora_image_remix_command
 
 /// Easy to use infallible response.
+/// This always contains a success payload and never results in an error.
 pub type InfallibleResponse<SuccessPayload> = CommandSuccessResponseWrapper<SuccessPayload>;
 
 /// Easy to use Result<T, E> type.
+/// 
+/// There are easier ways to use Response<S, Et, Ep> : 
+///  - `SimpleResponse` just returns strings on success or error (but provides clues to the frontend)
+///  - `SuccessOrErrorMessage` returns an empty success payload or an error message
+///  - `ResponseOrErrorMessage<SuccessPayload>` returns a success payload or an error message
+///  - `ResponseOrErrorType<SuccessPayload, ErrType>` returns a success payload or an error type
+///  - `ResponseOrError<SuccessPayload, ErrPayload>` returns a success payload or an error payload
+/// 
 pub type Response<SuccessPayload, ErrType, ErrPayload> =
   Result<CommandSuccessResponseWrapper<SuccessPayload>, CommandErrorResponseWrapper<ErrType, ErrPayload>>;
 

crates/desktop/artcraft/src/core/events/generation_events/common.rs

@@ -21,8 +21,15 @@ pub enum GenerationModel {
   FluxPro11Ultra,
   #[serde(rename = "gpt_image_1")]
   GptImage1,
+  #[serde(rename = "hunyuan_3d_2_0")]
+  Hunyuan3d2_0,
+  #[serde(rename = "hunyuan_3d_2_1")]
+  Hunyuan3d2_1,
+
+  // TODO: Should be Kling16Pro
   #[serde(rename = "kling_1.6")]
   Kling1_6,
+
   #[serde(rename = "kling_2.0")]
   Kling2_0,
   #[serde(rename = "kling_2.1_master")]

crates/desktop/artcraft/src/core/lifecycle/mod.rs

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

crates/desktop/artcraft/src/core/lifecycle/startup/handle_tauri_startup.rs

@@ -0,0 +1,80 @@
+use crate::core::lifecycle::startup::tasks::bootstrap_task_database::bootstrap_task_database;
+use crate::core::lifecycle::startup::tasks::load_provider_priority_state::load_provider_priority_state;
+use crate::core::lifecycle::startup::tasks::set_app_log_level::set_app_log_level;
+use crate::core::lifecycle::startup::tasks::initially_size_and_position_windows::initially_size_and_position_windows;
+use crate::core::lifecycle::startup::tasks::spawn_discord_presence_thread::spawn_discord_presence_thread;
+use crate::core::lifecycle::startup::tasks::spawn_fal_task_polling_thread::spawn_fal_task_polling_thread;
+use crate::core::lifecycle::startup::tasks::spawn_main_window_thread::spawn_main_window_thread;
+use crate::core::lifecycle::startup::tasks::spawn_sora_task_polling_thread::spawn_sora_task_polling_thread;
+use crate::core::lifecycle::startup::tasks::spawn_storytoller_task_polling_thread::spawn_storyteller_task_polling_thread;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use errors::AnyhowResult;
+use tauri::{AppHandle, Manager};
+
+pub async fn handle_tauri_startup(
+  app: AppHandle,
+  root: AppDataRoot,
+  app_env_configs: AppEnvConfigs,
+  storyteller_creds_manager: StorytellerCredentialManager,
+  sora_credential_manager: SoraCredentialManager,
+  sora_task_queue: SoraTaskQueue,
+  fal_credential_manager: FalCredentialManager,
+  fal_task_queue: FalTaskQueue,
+) -> AnyhowResult<()> {
+
+  set_app_log_level(
+    &app,
+    &root,
+  )?;
+
+  let task_database =
+      bootstrap_task_database(&app, &root).await?;
+
+  load_provider_priority_state(
+    &app,
+    &root,
+  )?;
+
+  spawn_main_window_thread(
+    &app,
+    &root,
+    &storyteller_creds_manager,
+  )?;
+
+  spawn_storyteller_task_polling_thread(
+    &app,
+    &app_env_configs,
+    &task_database,
+    &storyteller_creds_manager,
+  )?;
+
+  spawn_sora_task_polling_thread(
+    &app,
+    &root,
+    &app_env_configs,
+    &sora_credential_manager,
+    &storyteller_creds_manager,
+    &sora_task_queue,
+  )?;
+
+  spawn_fal_task_polling_thread(
+    &app,
+    &root,
+    &app_env_configs,
+    &fal_credential_manager,
+    &fal_task_queue,
+    &storyteller_creds_manager,
+  )?;
+
+  spawn_discord_presence_thread()?;
+
+  initially_size_and_position_windows(&app, &root);
+
+  Ok(())
+}

crates/desktop/artcraft/src/core/lifecycle/startup/mod.rs

@@ -0,0 +1,2 @@
+pub mod handle_tauri_startup;
+mod tasks;

crates/desktop/artcraft/src/core/lifecycle/startup/tasks/bootstrap_task_database.rs

@@ -0,0 +1,10 @@
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::task_database::TaskDatabase;
+use errors::AnyhowResult;
+use tauri::{AppHandle, Manager};
+
+pub async fn bootstrap_task_database(app: &AppHandle, root: &AppDataRoot) -> AnyhowResult<TaskDatabase> {
+  let task_database = TaskDatabase::connect(root).await?;
+  app.manage(task_database.clone());
+  Ok(task_database)
+}

crates/desktop/artcraft/src/core/lifecycle/startup/tasks/initially_size_and_position_windows.rs

@@ -0,0 +1,42 @@
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::window::main_window_position::MainWindowPosition;
+use crate::core::state::window::main_window_size::MainWindowSize;
+use crate::core::utils::window::position_main_window::position_main_window;
+use crate::core::utils::window::resize_main_window::resize_main_window;
+use tauri::AppHandle;
+
+pub fn initially_size_and_position_windows(
+  app: &AppHandle,
+  root: &AppDataRoot,
+) {
+
+  println!("Sizing and positioning window...");
+
+  match MainWindowSize::from_filesystem_configs(&root) {
+    Ok(None) => {}
+    Ok(Some(size)) => {
+      println!("Resizing window to: {:?}", size);
+      let result = resize_main_window(app, &size);
+      if let Err(err) = result {
+        eprintln!("Could not set window size: {:?}", err);
+      }
+    }
+    Err(err) => {
+      eprintln!("Failed to read window size from disk: {:?}", err);
+    }
+  }
+
+  match MainWindowPosition::from_filesystem_configs(&root) {
+    Ok(None) => {}
+    Ok(Some(pos)) => {
+      println!("Moving window to: {:?}", pos);
+      let result = position_main_window(app, &pos);
+      if let Err(err) = result {
+        eprintln!("Could not set window position: {:?}", err);
+      }
+    }
+    Err(err) => {
+      eprintln!("Failed to read window position from disk: {:?}", err);
+    }
+  }
+}

crates/desktop/artcraft/src/core/lifecycle/startup/tasks/load_provider_priority_state.rs

@@ -0,0 +1,34 @@
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::provider_priority::ProviderPriorityStore;
+use anyhow::anyhow;
+use errors::AnyhowResult;
+use tauri::{AppHandle, Manager};
+
+pub fn load_provider_priority_state(
+  app: &AppHandle,
+  root: &AppDataRoot,
+) -> AnyhowResult<()> {
+  let provider_priority = match ProviderPriorityStore::from_filesystem_configs(root) {
+    Ok(Some(priority)) => {
+      println!("Loaded provider priority from disk: {:?}", priority.get_priority());
+      priority
+    }
+    Ok(None) => {
+      println!("No provider priority found on disk, using default.");
+      ProviderPriorityStore::default()
+    }
+    Err(err) => {
+      eprintln!("Failed to read provider priority from disk: {:?}", err);
+      ProviderPriorityStore::default()
+    }
+  };
+
+  let success = app.manage(provider_priority);
+
+  if !success {
+    eprintln!("Failed to manage provider priority state.");
+    return Err(anyhow!("Failed to manage provider priority state."));
+  }
+
+  Ok(())
+}

crates/desktop/artcraft/src/core/lifecycle/startup/tasks/mod.rs

@@ -0,0 +1,9 @@
+pub (super) mod bootstrap_task_database;
+pub (super) mod set_app_log_level;
+pub (super) mod initially_size_and_position_windows;
+pub (super) mod spawn_discord_presence_thread;
+pub (super) mod spawn_fal_task_polling_thread;
+pub (super) mod spawn_main_window_thread;
+pub (super) mod spawn_sora_task_polling_thread;
+pub (super) mod spawn_storytoller_task_polling_thread;
+pub (super) mod load_provider_priority_state;

crates/desktop/artcraft/src/core/lifecycle/startup/tasks/set_app_log_level.rs

@@ -0,0 +1,73 @@
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use errors::AnyhowResult;
+use log::LevelFilter;
+use std::env;
+use std::env::VarError;
+use tauri::AppHandle;
+use tauri_plugin_log::{Target, TargetKind};
+
+const RUST_LOG: &str = "RUST_LOG";
+
+pub fn set_app_log_level(
+  app: &AppHandle,
+  root: &AppDataRoot,
+) -> AnyhowResult<()> {
+
+  //print_env_var(RUST_LOG);
+
+  // NB: The semantics of this do not match `RUST_LOG` exactly as it's not set per-package.
+  let maybe_level = env::var(RUST_LOG)
+      .map(|value| value.trim().to_ascii_lowercase());
+
+  let mut log_level = LevelFilter::Info;
+
+  match maybe_level {
+    Ok(level) => {
+      println!("The `RUST_LOG` environment variable was set to: `{}`.", level);
+
+      if level.contains("debug") {
+        log_level = LevelFilter::Debug;
+      } else if level.contains("info") {
+        log_level = LevelFilter::Info;
+      } else if level.contains("warn") {
+        log_level = LevelFilter::Warn;
+      } else if level.contains("error") {
+        log_level = LevelFilter::Error;
+      } else if level.contains("off") {
+        log_level = LevelFilter::Off;
+      }
+    }
+    Err(VarError::NotPresent) => {
+      // NB: This demonstrably tests stderr output in the default case.
+      eprintln!("No `RUST_LOG` environment variable found.");
+    }
+    Err(VarError::NotUnicode(_)) => {
+      // NB: This demonstrably tests stderr output in the default case.
+      eprintln!("Could not parse `RUST_LOG` environment variable; not unicode.");
+    }
+  }
+
+  println!("Setting app log level to: {:?}", log_level);
+
+  app.plugin(
+    tauri_plugin_log::Builder::default()
+        .level(log_level)
+        .targets(vec![
+          Target::new(TargetKind::Stdout),
+          Target::new(TargetKind::LogDir {
+            file_name: Some(root.log_file_name_str().to_string())
+          }),
+        ])
+        .build(),
+  )?;
+
+  Ok(())
+}
+
+// pub fn print_env_var(var_name: &str) {
+//   match env::var(var_name) {
+//     Ok(value) => println!("Environment variable `{}` = {}", var_name, value),
+//     Err(VarError::NotPresent) => println!("Environment variable `{}` is not set.", var_name),
+//     Err(VarError::NotUnicode(_)) => println!("Environment variable `{}` is not a valid Unicode string", var_name),
+//   }
+// }

crates/desktop/artcraft/src/core/lifecycle/startup/tasks/spawn_discord_presence_thread.rs

@@ -0,0 +1,10 @@
+use crate::core::threads::discord_presence_thread::discord_presence_thread;
+use errors::AnyhowResult;
+
+pub fn spawn_discord_presence_thread(
+) -> AnyhowResult<()> {
+
+  tauri::async_runtime::spawn(discord_presence_thread());
+
+  Ok(())
+}

crates/desktop/artcraft/src/core/lifecycle/startup/tasks/spawn_fal_task_polling_thread.rs

@@ -0,0 +1,29 @@
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::fal::threads::fal_task_polling_thread::fal_task_polling_thread;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use errors::AnyhowResult;
+use tauri::{AppHandle, Manager};
+
+pub fn spawn_fal_task_polling_thread(
+  app: &AppHandle,
+  root: &AppDataRoot,
+  app_env_configs: &AppEnvConfigs,
+  fal_credential_manager: &FalCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+) -> AnyhowResult<()> {
+
+  tauri::async_runtime::spawn(fal_task_polling_thread(
+    app.clone(),
+    app_env_configs.clone(),
+    root.clone(),
+    fal_credential_manager.clone(),
+    fal_task_queue.clone(),
+    storyteller_creds_manager.clone(),
+  ));
+
+  Ok(())
+}

crates/desktop/artcraft/src/core/lifecycle/startup/tasks/spawn_main_window_thread.rs

@@ -0,0 +1,20 @@
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::threads::main_window_thread::main_window_thread::main_window_thread;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use errors::AnyhowResult;
+use tauri::{AppHandle, Manager};
+
+pub fn spawn_main_window_thread(
+  app: &AppHandle,
+  root: &AppDataRoot,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+) -> AnyhowResult<()> {
+
+  tauri::async_runtime::spawn(main_window_thread(
+    app.clone(),
+    root.clone(),
+    storyteller_creds_manager.clone(),
+  ));
+
+  Ok(())
+}

crates/desktop/artcraft/src/core/lifecycle/startup/tasks/spawn_sora_task_polling_thread.rs

@@ -0,0 +1,29 @@
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::sora::threads::sora_task_polling_thread::sora_task_polling_thread;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use errors::AnyhowResult;
+use tauri::{AppHandle, Manager};
+
+pub fn spawn_sora_task_polling_thread(
+  app: &AppHandle,
+  root: &AppDataRoot,
+  app_env_configs: &AppEnvConfigs,
+  sora_credential_manager: &SoraCredentialManager,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  sora_task_queue: &SoraTaskQueue,
+) -> AnyhowResult<()> {
+
+  tauri::async_runtime::spawn(sora_task_polling_thread(
+    app.clone(),
+    app_env_configs.clone(),
+    root.clone(),
+    sora_credential_manager.clone(),
+    storyteller_creds_manager.clone(),
+    sora_task_queue.clone(),
+  ));
+
+  Ok(())
+}

crates/desktop/artcraft/src/core/lifecycle/startup/tasks/spawn_storytoller_task_polling_thread.rs

@@ -0,0 +1,23 @@
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::task_database::TaskDatabase;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use crate::services::storyteller::threads::storyteller_task_polling_thread::storyteller_task_polling_thread;
+use errors::AnyhowResult;
+use tauri::{AppHandle, Manager};
+
+pub fn spawn_storyteller_task_polling_thread(
+  app: &AppHandle,
+  app_env_configs: &AppEnvConfigs,
+  task_database: &TaskDatabase,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+) -> AnyhowResult<()> {
+  
+  tauri::async_runtime::spawn(storyteller_task_polling_thread(
+    app.clone(),
+    app_env_configs.clone(),
+    task_database.clone(),
+    storyteller_creds_manager.clone(),
+  ));
+  
+  Ok(())
+}

crates/desktop/artcraft/src/core/mod.rs

@@ -1,6 +1,7 @@
 pub mod artcraft_error;
 pub mod commands;
 pub mod events;
+pub mod lifecycle;
 pub mod model;
 pub mod state;
 pub mod threads;

crates/desktop/artcraft/src/core/model/contextual_image_edit_models.rs

@@ -0,0 +1,12 @@
+use serde_derive::Deserialize;
+
+/// This is used in the Tauri command bridge. 
+/// Don't change the serializations without coordinating with the frontend.
+#[derive(Deserialize, Debug, Copy, Clone)]
+#[serde(rename_all = "snake_case")]
+pub enum ContextualImageEditModel {
+  #[serde(rename = "gpt_image_1")]
+  GptImage1,
+  
+  // TODO: Flux Kontext models.
+}

crates/desktop/artcraft/src/core/model/mod.rs

@@ -1,2 +1,3 @@
+pub mod contextual_image_edit_models;
 pub mod image_models;
 pub mod video_models;

crates/desktop/artcraft/src/core/state/data_dir/app_data_root.rs

@@ -2,7 +2,7 @@ use crate::core::state::data_dir::app_assets_dir::AppAssetsDir;
 use crate::core::state::data_dir::app_credentials_dir::AppCredentialsDir;
 use crate::core::state::data_dir::app_downloads_dir::AppDownloadsDir;
 use crate::core::state::data_dir::app_settings_dir::AppSettingsDir;
-use crate::core::state::data_dir::app_weights_dir::AppWeightsDir;
+use crate::core::state::data_dir::app_state_dir::AppStateDir;
 use crate::core::state::data_dir::temporary_dir::TemporaryDir;
 use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use crate::core::state::expanduser::expanduser;
@@ -20,14 +20,16 @@ const LOG_FILE_NAME : &str = "application_debug";
 #[derive(Clone)]
 pub struct AppDataRoot {
   path: PathBuf,
+  
+  log_file_name: PathBuf,
+  log_file_name_string: String,
+  
   assets_dir: AppAssetsDir,
   credentials_dir: AppCredentialsDir,
   downloads_dir: AppDownloadsDir,
   settings_dir: AppSettingsDir,
-  weights_dir: AppWeightsDir,
+  state_dir: AppStateDir,
   temp_dir: TemporaryDir,
-  log_file_name: PathBuf,
-  log_file_name_string: String,
 }
 
 impl AppDataRoot {
@@ -65,8 +67,8 @@ impl AppDataRoot {
     let credentials_dir = AppCredentialsDir::get_or_create_in_root_dir(&dir)?;
     let downloads_dir = AppDownloadsDir::get_or_create_in_root_dir(&dir)?;
     let settings_dir = AppSettingsDir::get_or_create_in_root_dir(&dir)?;
+    let state_dir = AppStateDir::get_or_create_in_root_dir(&dir)?;
     let temp_dir = TemporaryDir::get_or_create_in_root_dir(&dir)?;
-    let weights_dir = AppWeightsDir::get_or_create_in_root_dir(&dir)?;
     let log_file_name = dir.join(LOG_FILE_NAME);
     let log_file_name_string = log_file_name
         .to_str()
@@ -75,14 +77,14 @@ impl AppDataRoot {
 
     Ok(Self {
       path: dir,
+      log_file_name,
+      log_file_name_string,
       assets_dir,
       credentials_dir,
       downloads_dir,
       settings_dir,
-      weights_dir,
+      state_dir,
       temp_dir,
-      log_file_name,
-      log_file_name_string,
     })
   }
   
@@ -101,9 +103,9 @@ impl AppDataRoot {
   pub fn settings_dir(&self) -> &AppSettingsDir {
     &self.settings_dir
   }
-
-  pub fn weights_dir(&self) -> &AppWeightsDir {
-    &self.weights_dir
+  
+  pub fn state_dir(&self) -> &AppStateDir {
+    &self.state_dir
   }
 
   pub fn temp_dir(&self) -> &TemporaryDir {
@@ -135,15 +137,15 @@ impl AppDataRoot {
   }
 
   pub fn get_window_size_config_file(&self) -> PathBuf {
-    self.path.join("window_size.json")
+    self.state_dir.get_window_size_config_file()
   }
   
   pub fn get_window_position_config_file(&self) -> PathBuf {
-    self.path.join("window_position.json")
+    self.state_dir.get_window_position_config_file()
   }
 }
 
-// eg. /home/bob/artcraft, /Users/bob/artcraft, or C:\Users\Alice\artcraft
+// eg. /home/bob/artcraft, /Users/alice/artcraft, or C:\Users\Taylor\artcraft
 fn get_default_data_dir() -> anyhow::Result<PathBuf> {
   Ok(UserDirs::new()
       .ok_or_else(|| anyhow!("could not determine user home directory"))?

crates/desktop/artcraft/src/core/state/data_dir/app_state_dir.rs

@@ -0,0 +1,35 @@
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use std::path::{Path, PathBuf};
+
+#[derive(Clone)]
+pub struct AppStateDir {
+  path: PathBuf,
+}
+
+impl DataSubdir for AppStateDir{
+  const DIRECTORY_NAME: &'static str = "state";
+
+  fn new_from<P: AsRef<Path>>(dir: P) -> Self {
+    Self {
+      path: dir.as_ref().to_path_buf(),
+    }
+  }
+
+  fn path(&self) -> &Path {
+    &self.path
+  }
+}
+
+impl AppStateDir {
+  pub fn get_tasks_sqlite_database_path(&self) -> PathBuf {
+    self.path.join("tasks_v2.sqlite")
+  }
+
+  pub fn get_window_size_config_file(&self) -> PathBuf {
+    self.path.join("window_size.json")
+  }
+
+  pub fn get_window_position_config_file(&self) -> PathBuf {
+    self.path.join("window_position.json")
+  }
+}