Used Aspect Ratio to fix.

Prompt box handles both web and desktop.
2026-10-24 10:39:28 -04:00 · 2025-04-21 16:58:02 -04:00
572 changed files with 5982 additions and 16620 deletions
@@ -1,63 +0,0 @@
-name: 'publish'
-
-on:
-  push:
-    branches:
-      - tauri-prod-release
-
-# This workflow will trigger on each push to the `release` branch to create or update a GitHub release, build your app, and upload the artifacts to the release.
-
-jobs:
-  publish-tauri:
-    permissions:
-      contents: write
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - platform: 'macos-latest' # for Arm based macs (M1 and above).
-            args: '--target aarch64-apple-darwin'
-          # - platform: 'macos-latest' # for Intel based macs.
-          #   args: '--target x86_64-apple-darwin'
-          # - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.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:
-          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
-          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
-
-      - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
-        # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
-        # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
-
-      - name: install frontend dependencies
-        run: cd ./crates/desktop/artcraft && yarn install # change this to npm, pnpm or bun depending on which one you use.
-
-      - uses: tauri-apps/tauri-action@v0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          projectPath: ./crates/desktop/artcraft
-          tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
-          releaseName: 'App v__VERSION__'
-          releaseBody: 'See the assets to download this version and install.'
-          releaseDraft: true
-          prerelease: false
-          args: ${{ matrix.args }}
@@ -1,13 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="Rust">
-      <option name="RIGHT_MARGIN" value="180" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="false" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = \"complete_success\",\n  on_success_result_entity_type = ?,\n  on_success_result_entity_token = ?,\n  failure_reason = NULL,\n  internal_debugging_failure_reason = NULL,\n  success_execution_millis = ?,\n  success_inference_execution_millis = ?,\n  retry_at = NULL,\n  successfully_completed_at = NOW()\nWHERE token = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "2bd7a5b886c9624ae48533ddac409cfca0668f30ab1f7016c412876b5904168b"
-}
@@ -24,7 +24,7 @@ members = [
  "crates/cli/production/migration-tool",

  # Desktop apps
-  "crates/desktop/artcraft",
+  "crates/desktop/tauri-artcraft",
  "crates/desktop/tauri-realtime",

  # Shared libraries
@@ -34,12 +34,10 @@ members = [
  "crates/lib/api_clients/google_drive_common",
  "crates/lib/api_clients/google_sign_in",
  "crates/lib/api_clients/openai_sora_client",
-  "crates/lib/api_clients/storyteller_client",
  "crates/lib/api_clients/thumbnail_generator",
  "crates/lib/bootstrap",
  "crates/lib/bucket_paths",
  "crates/lib/caching/memory_caching",
-  "crates/lib/caching/memory_store",
  "crates/lib/caching/redis_caching",
  "crates/lib/concurrency",
  "crates/lib/cookies",
@@ -118,7 +116,6 @@ members = [
  "crates/vendor/candle/candle-transformers",
  "crates/vendor/candle/tensor-tools",
  "crates/vendor/limitation",
-  "crates/vendor/tauri-plugin-http",
  # NB(bt,2023-12-12): Newrelic keeps breaking with upgrades. Kill for now.
  #"crates/vendor/newrelic-telemetry-sdk-rust",

@@ -149,10 +146,6 @@ publish = false
 #  - tauri-runtime-wry
 #  - tauri-utils
 #
-# Broken on Windows:
-#  - core-foundation
-#  - core-foundation-sys
-#
 workspace-build-acceleration = { path = "crates/workspace-build-acceleration" }

 # External libs
@@ -161,9 +154,7 @@ workspace-build-acceleration = { path = "crates/workspace-build-acceleration" }
 anyhow = "1.0.97"
 base64 = "0.22.1"
 chrono = { version = "0.4.40", features = ["serde"] }
-cookie = "0.18.1"
 hex-literal = "1.0.0"
-indexmap = "2.9.0"
 log = "0.4.27"
 once_cell = "1.21.3"
 rand = "0.9.0"
@@ -174,25 +165,15 @@ serde_derive = "1.0.219"
 serde_json = "1.0.140"
 serde_yaml = "0.9.1"
 sha3 = "0.10.8"
-tauri = { version = "2.4.1", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution
-thiserror = "2.0.12"
-toml = "0.8.20"
-url = { version = "2.5.4", features = ["serde"] }
-
+thiserror = "2"
+toml = "0.7.4"
+url = "2.5.4"
 # Internal libs
 crockford = { path = "crates/lib/data/crockford" }
-enums = { path = "crates/_types/enums" }
-enums_public = { path = "crates/_types/enums_public" }
 errors = { path = "crates/lib/errors" }
 filesys = { path = "crates/lib/files/filesys" }
-idempotency = { path = "crates/lib/idempotency" }
-images = { path = "crates/lib/files/images" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
-memory_store = { path = "crates/lib/caching/memory_store" }
-mimetypes = { path = "crates/lib/files/mimetypes" }
+shared_service_components = { path = "crates/lib/shared_service_components" }
 openai_sora_client = { path = "crates/lib/api_clients/openai_sora_client" }
 primitives = { path = "crates/lib/data/primitives" }
-shared_service_components = { path = "crates/lib/shared_service_components" }
-storyteller_client = { path = "crates/lib/api_clients/storyteller_client" }
 subprocess_common = { path = "crates/lib/subprocess_common" }
-tokens = { path = "crates/_types/tokens" }
@@ -28,12 +28,11 @@ pub enum MediaFileOriginCategory {
  DeviceApi,

  /// From Storyteller Studio Engine
-  #[deprecated(note="This db field should only denote file provenance, not the product.")]
  #[serde(rename = "studio")]
  StorytellerStudio,

  /// From Storyteller Studio Engine
-  #[deprecated(note = "DO NOT USE. Originally deprecated in favor of `StorytellerStudio`.")]
+  #[deprecated(note = "Use StorytellerStudio instead")]
  StoryEngine,
 }

@@ -39,10 +39,6 @@ pub enum MediaFileOriginProductCategory {
  #[serde(rename = "vst")]
  VideoStyleTransfer,

-  /// Image Studio
-  #[serde(rename = "image_studio")]
-  ImageStudio,
-
  /// Storyteller Studio
  #[serde(rename = "studio")]
  StorytellerStudio,
@@ -91,7 +87,6 @@ impl MediaFileOriginProductCategory {
      Self::FaceFusion => "face_fusion",
      Self::FaceMirror => "face_mirror",
      Self::VideoStyleTransfer => "vst",
-      Self::ImageStudio => "image_studio",
      Self::StorytellerStudio => "studio",
      Self::TextToSpeech => "tts",
      Self::VoiceConversion => "voice_conversion",
@@ -110,7 +105,6 @@ impl MediaFileOriginProductCategory {
      "face_fusion" => Ok(Self::FaceFusion),
      "face_mirror" => Ok(Self::FaceMirror),
      "vst" => Ok(Self::VideoStyleTransfer),
-      "image_studio" => Ok(Self::ImageStudio),
      "studio" => Ok(Self::StorytellerStudio),
      "tts" => Ok(Self::TextToSpeech),
      "voice_conversion" => Ok(Self::VoiceConversion),
@@ -132,7 +126,6 @@ impl MediaFileOriginProductCategory {
      Self::FaceFusion,
      Self::FaceMirror,
      Self::VideoStyleTransfer,
-      Self::ImageStudio,
      Self::StorytellerStudio,
      Self::TextToSpeech,
      Self::VoiceConversion,
@@ -160,7 +153,6 @@ mod tests {
      assert_serialization(MediaFileOriginProductCategory::FaceFusion, "face_fusion");
      assert_serialization(MediaFileOriginProductCategory::FaceMirror, "face_mirror");
      assert_serialization(MediaFileOriginProductCategory::VideoStyleTransfer, "vst");
-      assert_serialization(MediaFileOriginProductCategory::ImageStudio, "image_studio");
      assert_serialization(MediaFileOriginProductCategory::StorytellerStudio, "studio");
      assert_serialization(MediaFileOriginProductCategory::TextToSpeech, "tts");
      assert_serialization(MediaFileOriginProductCategory::VoiceConversion, "voice_conversion");
@@ -178,7 +170,6 @@ mod tests {
      assert_eq!(MediaFileOriginProductCategory::FaceFusion.to_str(), "face_fusion");
      assert_eq!(MediaFileOriginProductCategory::FaceMirror.to_str(), "face_mirror");
      assert_eq!(MediaFileOriginProductCategory::VideoStyleTransfer.to_str(), "vst");
-      assert_eq!(MediaFileOriginProductCategory::ImageStudio.to_str(), "image_studio");
      assert_eq!(MediaFileOriginProductCategory::StorytellerStudio.to_str(), "studio");
      assert_eq!(MediaFileOriginProductCategory::TextToSpeech.to_str(), "tts");
      assert_eq!(MediaFileOriginProductCategory::VoiceConversion.to_str(), "voice_conversion");
@@ -196,7 +187,6 @@ mod tests {
      assert_eq!(MediaFileOriginProductCategory::from_str("face_fusion").unwrap(), MediaFileOriginProductCategory::FaceFusion);
      assert_eq!(MediaFileOriginProductCategory::from_str("face_mirror").unwrap(), MediaFileOriginProductCategory::FaceMirror);
      assert_eq!(MediaFileOriginProductCategory::from_str("vst").unwrap(), MediaFileOriginProductCategory::VideoStyleTransfer);
-      assert_eq!(MediaFileOriginProductCategory::from_str("image_studio").unwrap(), MediaFileOriginProductCategory::ImageStudio);
      assert_eq!(MediaFileOriginProductCategory::from_str("studio").unwrap(), MediaFileOriginProductCategory::StorytellerStudio);
      assert_eq!(MediaFileOriginProductCategory::from_str("tts").unwrap(), MediaFileOriginProductCategory::TextToSpeech);
      assert_eq!(MediaFileOriginProductCategory::from_str("voice_conversion").unwrap(), MediaFileOriginProductCategory::VoiceConversion);
@@ -210,13 +200,12 @@ mod tests {
    #[test]
    fn all_variants() {
      let mut variants = MediaFileOriginProductCategory::all_variants();
-      assert_eq!(variants.len(), 14);
+      assert_eq!(variants.len(), 13);
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::Unknown));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::FaceAnimator));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::FaceFusion));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::FaceMirror));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::VideoStyleTransfer));
-      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::ImageStudio));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::StorytellerStudio));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::TextToSpeech));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::VoiceConversion));
@@ -1,30 +0,0 @@
-{
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
-  "description": "enables the default permissions",
-  "windows": [
-    "main"
-  ],
-  "permissions": [
-    "core:default",
-    "log:default",
-    "upload:allow-download",
-    "upload:default",
-    {
-      "identifier": "http:default",
-      "allow": [
-        {
-          "url": "https://*.storyteller.ai"
-        },
-        {
-          "url": "https://*.fakeyou.com"
-        }
-      ],
-      "deny": [
-        {
-          "url": "https://private.tauri.app"
-        }
-      ]
-    }
-  ]
-}
@@ -1,46 +0,0 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use errors::AnyhowResult;
-use log::{error, info};
-use serde_derive::Serialize;
-use tauri::{AppHandle, State};
-
-#[derive(Serialize)]
-pub struct GetAppPreferencesResponse {
-  pub preferences: AppPreferencesPayload,
-}
-
-#[derive(Serialize)]
-pub struct AppPreferencesPayload {
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: PreferredDownloadDirectory,
-  /// Play sounds on events.
-  pub play_sounds: bool,
-}
-
-
-#[tauri::command]
-pub async fn get_app_preferences_command(
-  app_prefs: State<'_, AppPreferencesManager>,
-) -> Result<GetAppPreferencesResponse, String> {
-  info!("get_app_preferences_command called");
-
-  let result = get_prefs(&app_prefs)
-      .await
-      .map_err(|err| {
-        error!("Error getting app preferences: {:?}", err);
-        format!("Error getting app preferences: {:?}", err)
-      })?;
-
-  Ok(GetAppPreferencesResponse {
-    preferences: result,
-  })
-}
-
-async fn get_prefs(app_prefs: &AppPreferencesManager) -> AnyhowResult<AppPreferencesPayload> {
-  let prefs = app_prefs.get_clone()?;
-  Ok(AppPreferencesPayload {
-    preferred_download_directory: prefs.preferred_download_directory,
-    play_sounds: prefs.play_sounds,
-  })
-}
@@ -1,2 +0,0 @@
-pub mod get_app_preferences_command;
-pub mod update_app_preference_command;
@@ -1,70 +0,0 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use errors::AnyhowResult;
-use log::{error, info};
-use serde_derive::{Deserialize, Serialize};
-use tauri::{AppHandle, State};
-
-/// For now, we'll only update a single preference at a time.
-#[derive(Deserialize)]
-pub struct UpdateAppPreferencesRequest {
-  pub preference: PreferenceName,
-  /// We'll decode this with respect to the preference value.
-  pub value: String,
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum PreferenceName {
-  PreferredDownloadDirectory,
-  PlaySounds,
-}
-
-#[derive(Serialize)]
-pub struct UpdateAppPreferencesResponse {
-  pub success: bool,
-}
-
-
-#[tauri::command]
-pub async fn update_app_preferences_command(
-  request: UpdateAppPreferencesRequest,
-  app_prefs: State<'_, AppPreferencesManager>,
-  app_data_root: State<'_, AppDataRoot>,
-) -> Result<UpdateAppPreferencesResponse, String> {
-  info!("update_app_preferences_command called");
-
-  update_prefs(request, &app_prefs, &app_data_root)
-      .await
-      .map_err(|err| {
-        error!("Error getting app preferences: {:?}", err);
-        format!("Error getting app preferences: {:?}", err)
-      })?;
-
-  Ok(UpdateAppPreferencesResponse {
-    success: true,
-  })
-}
-
-async fn update_prefs(
-  request: UpdateAppPreferencesRequest, 
-  app_prefs: &AppPreferencesManager,
-  app_data_root: &AppDataRoot,
-) -> AnyhowResult<()> {
-  let mut prefs = app_prefs.get_clone()?;
-  
-  match request.preference {
-    PreferenceName::PreferredDownloadDirectory => {
-      prefs.preferred_download_directory = request.value.parse::<PreferredDownloadDirectory>()?;
-    }
-    PreferenceName::PlaySounds => {
-      prefs.play_sounds = request.value.parse::<bool>()?;
-    }
-  }
-  
-  app_prefs.set_clone(&prefs)?;
-  app_data_root.settings_dir().write_app_preferences(&prefs)?;
-  
-  Ok(())
-}
@@ -1,4 +0,0 @@
-pub mod app_preferences;
-pub mod flip_image;
-pub mod platform_info_command;
-pub mod sora;
@@ -1,63 +0,0 @@
-use crate::state::os_platform::OsPlatform;
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::ImageReader;
-use log::info;
-use serde_derive::Serialize;
-use std::io::Cursor;
-
-#[derive(Debug, Serialize)]
-pub struct PlatformInfoResponse {
-  pub os_platform: DetectedOs,
-  pub webview_runtime: WebviewRuntime,
-}
-
-#[derive(Copy, Clone, Debug, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum DetectedOs {
-  Windows,
-  #[serde(rename = "macos")]
-  MacOS,
-  Linux,
-  Unknown,
-}
-
-#[derive(Copy, Clone, Debug, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum WebviewRuntime {
-  #[serde(rename = "webkit_safari")]
-  WebkitSafari,
-  #[serde(rename = "webkit_gtk")]
-  WebkitGtk,
-  #[serde(rename = "edge_webview_2")]
-  EdgeWebview2,
-  Unknown,
-}
-
-#[tauri::command]
-pub fn platform_info_command() -> Result<PlatformInfoResponse, String> {
-  info!("platform_info_command called...");
-
-  let os_platform = match OsPlatform::maybe_get() {
-    Some(OsPlatform::Linux) => DetectedOs::Linux,
-    Some(OsPlatform::MacOs) => DetectedOs::MacOS,
-    Some(OsPlatform::Windows) => DetectedOs::Windows,
-    None => DetectedOs::Unknown,
-  };
-
-  // These are the webviews that Tauri uses on each OS:
-  // https://tauri.app/reference/webview-versions/
-  let webview_runtime = match os_platform {
-    DetectedOs::Windows => WebviewRuntime::EdgeWebview2,
-    DetectedOs::MacOS => WebviewRuntime::WebkitSafari,
-    DetectedOs::Linux => WebviewRuntime::WebkitGtk,
-    DetectedOs::Unknown => WebviewRuntime::Unknown,
-  };
-
-  Ok(PlatformInfoResponse {
-    os_platform,
-    webview_runtime,
-  })
-}
-
@@ -1,3 +0,0 @@
-pub mod open_sora_login_command;
-pub mod sora_image_generation_command;
-pub mod sora_image_remix_command;
@@ -1,84 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-use errors::AnyhowResult;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, ImageReader};
-use log::{error, info};
-use openai_sora_client::credentials::SoraCredentials;
-use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
-use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
-use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
-use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use std::fs::read_to_string;
-use std::io::Cursor;
-use tauri::{AppHandle, Manager, State};
-
-#[tauri::command]
-pub async fn sora_image_generation_command(
-  prompt: &str,
-  image: Option<&str>,
-  _app: AppHandle,
-  app_data_root: State<'_, AppDataRoot>,
-  sora_creds_holder: State<'_, SoraCredentialHolder>,
-) -> Result<String, String> {
-  info!("image_generation_command called; processing image...");
-
-  generate_image(image, prompt, &app_data_root, &sora_creds_holder)
-    .await
-    .map_err(|err| {
-      error!("error: {:?}", err);
-      "there was an error".to_string()
-    })?;
-
-  Ok("success".to_string())
-}
-
-pub async fn generate_image(
-  maybe_image: Option<&str>,
-  prompt: &str,
-  app_data_root: &AppDataRoot,
-  sora_creds_holder: &SoraCredentialHolder,
-) -> AnyhowResult<()> {
-
-  let creds = read_sora_credentials_from_disk(app_data_root)
-      .map_err(|err| {
-        error!("Failed to read Sora credentials from disk: {:?}", err);
-        err
-      })?;
-
-  let mut sora_media_tokens = vec![];
-
-  if let Some(image) = maybe_image {
-    let image_bytes = BASE64_STANDARD.decode(image)?;
-
-    let filename = "image.png".to_string();
-
-    let response = sora_media_upload_from_bytes(image_bytes, filename, CredentialMigrationRef::New(&creds))
-        .await
-        .map_err(|err| {
-          error!("Failed to upload image to Sora: {:?}", err);
-          err
-        })?;
-
-    sora_media_tokens.push(response.id);
-  }
-
-  let response = sora_image_gen_remix(SoraImageGenRemixRequest {
-    prompt: prompt.to_string(),
-    num_images: NumImages::One,
-    image_size: ImageSize::Square,
-    sora_media_tokens: sora_media_tokens.clone(),
-    credentials: CredentialMigrationRef::New(&creds),
-  }).await
-      .map_err(|err| {
-        error!("Failed to call Sora image generation: {:?}", err);
-        err
-      })?;
-
-  println!(">> TASK ID: {:?} ", response.task_id);
-
-  Ok(())
-}
@@ -1,153 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::state::sora::sora_task_queue::SoraTaskQueue;
-use crate::utils::get_url_file_extension::get_url_file_extension;
-use crate::utils::simple_http_download::simple_http_download;
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-use errors::AnyhowResult;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, ImageReader};
-use log::{debug, error, info};
-use openai_sora_client::credentials::SoraCredentials;
-use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
-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::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
-use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
-use serde_derive::Deserialize;
-use std::fs::read_to_string;
-use std::io::Cursor;
-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)]
-pub struct SoraImageRemixCommand {
-  /// Image media file; the engine or canvas snapshot (screenshot).
-  pub snapshot_media_token: MediaFileToken,
-
-  /// The user's image generation prompt.
-  pub prompt: String,
-
-  /// Turn off the system prompt.
-  pub disable_system_prompt: Option<bool>,
-
-  /// Additional images to include (optional). Up to nine images.
-  pub maybe_additional_images: Option<Vec<MediaFileToken>>,
-
-  pub maybe_number_of_samples: Option<u32>,
-}
-
-#[tauri::command]
-pub async fn sora_image_remix_command(
-  _app: AppHandle,
-  request: SoraImageRemixCommand,
-  app_data_root: State<'_, AppDataRoot>,
-  sora_creds_manager: State<'_, SoraCredentialManager>,
-  sora_task_queue: State<'_, SoraTaskQueue>,
-) -> Result<String, String> {
-  
-  info!("image_generation_command called; scene media token: {:?}, additional images: {:?}", 
-    request.snapshot_media_token, request.maybe_additional_images);
-
-  // TODO(bt,2025-04-24): Better error messages to caller
-
-  generate_image(request, &app_data_root, &sora_creds_manager, &sora_task_queue)
-    .await
-    .map_err(|err| {
-      error!("error: {:?}", err);
-      "there was an error".to_string()
-    })?;
-
-  Ok("success".to_string())
-}
-
-pub async fn generate_image(
-  request: SoraImageRemixCommand,
-  app_data_root: &AppDataRoot,
-  sora_creds_manager: &SoraCredentialManager,
-  sora_task_queue: &SoraTaskQueue,
-) -> AnyhowResult<()> {
-
-  let response = get_media_file(&ApiHost::Storyteller, &request.snapshot_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?;
-
-  let files_to_upload = vec![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.len());
-
-  for (i, file_path) in files_to_upload.iter().enumerate() {
-    info!("Uploading image {} of {}...", (i+1), files_to_upload.len());
-
-    let (response, maybe_new_credentials) =
-        image_upload_from_file_with_session_auto_renew(ImageUploadFromFileAutoRenewRequest {
-          file_path,
-          credentials: &creds,
-        }).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);
-  }
-
-  info!("Calling 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: ImageSize::Square,
-        sora_media_tokens: sora_media_tokens.clone(),
-        credentials: &creds,
-      }).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(())
-}
@@ -1,129 +0,0 @@
-pub mod commands;
-pub mod events;
-pub mod state;
-pub mod threads;
-pub mod utils;
-
-use tauri::Manager;
-
-use crate::commands::flip_image::flip_image;
-use crate::commands::platform_info_command::platform_info_command;
-use crate::commands::sora::open_sora_login_command::open_sora_login_command;
-use crate::commands::sora::sora_image_generation_command::sora_image_generation_command;
-use crate::commands::sora::sora_image_remix_command::sora_image_remix_command;
-use crate::commands::app_preferences::get_app_preferences_command::get_app_preferences_command;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::main_window_size::MainWindowSize;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::state::sora::sora_task_queue::SoraTaskQueue;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::threads::discord_presence_thread::discord_presence_thread;
-use crate::threads::main_window_thread::main_window_thread::main_window_thread;
-use crate::threads::sora_session_login_thread::sora_session_login_thread;
-use crate::threads::sora_task_polling_thread::sora_task_polling_thread;
-use crate::utils::webview_unsafe::webview_unsafe_for_app;
-
-use crate::state::app_preferences::app_preferences_manager::load_app_preferences_or_default;
-use tauri_plugin_http;
-use tauri_plugin_log::Target;
-use tauri_plugin_log::TargetKind;
-
-#[cfg_attr(mobile, tauri::mobile_entry_point)]
-pub fn run() {
-  // NB: Tauri wants to install the logger itself, so we can't rely on the logger crate
-  // until the tauri runtime begins.
-  println!("Loading config...");
-  let app_data_root = AppDataRoot::create_default().expect("data directory should be created");
-  let app_data_root_2 = app_data_root.clone();
-
-  println!("Loading app preferences...");
-  let app_preferences = load_app_preferences_or_default(&app_data_root);
-  
-  println!("Attempting to read existing artcraft credentials...");
-  let storyteller_creds_manager = StorytellerCredentialManager::initialize_from_disk_infallible(&app_data_root);
-  let storyteller_creds_manager_2 = storyteller_creds_manager.clone();
-  
-  println!("Attempting to read existing credentials...");
-  let sora_creds_manager = SoraCredentialManager::initialize_from_disk_infallible(&app_data_root);
-  let sora_creds_manager_2 = sora_creds_manager.clone();
-
-  // Other state
-  let sora_task_queue = SoraTaskQueue::new();
-  let sora_task_queue_2 = sora_task_queue.clone();
-
-  println!("Initializing backend runtime...");
-
-  tauri::Builder::default()
-    .plugin(tauri_plugin_http::init())
-    .plugin(tauri_plugin_upload::init())
-    .plugin(tauri_plugin_log::Builder::new()
-      .level(log::LevelFilter::Info)
-      .targets(vec![
-        Target::new(TargetKind::Stdout),
-        Target::new(TargetKind::LogDir {
-          file_name: Some(app_data_root.log_file_name_str().to_string())
-        }),
-      ])
-      .build())
-    .setup(move |app| {
-      // TODO(bt): This is broken on windows
-      // log_environment_details();
-
-      //if cfg!(debug_assertions) {
-      //  app.handle().plugin(
-      //    tauri_plugin_log::Builder::default()
-      //      .level(log::LevelFilter::Info)
-      //      .build(),
-      //  )?;
-      //}
-      let app = app.handle().clone();
-      
-      let result = webview_unsafe_for_app(&app);
-      if let Err(err) = result {
-        eprintln!("Error setting webview unsafe: {:?}", err);
-      }
-
-      let app_2 = app.clone();
-      let app_3 = app.clone();
-      let app_4 = app.clone();
-      let app_data_root_3 = app_data_root_2.clone();
-      let app_data_root_4 = app_data_root_2.clone();
-      let sora_creds_manager_3 = sora_creds_manager_2.clone();
-      let storyteller_creds_manager_3 = storyteller_creds_manager.clone();
-
-      match MainWindowSize::from_filesystem_configs(&app_data_root_3) {
-        Ok(None) => {}
-        Ok(Some(size)) => {
-          println!("Resizing window to: {:?}", size);
-          let result = size.apply_to_main_window(&app);
-          if let Err(err) = result {
-            eprintln!("Could not set window size: {:?}", err);
-          }
-        }
-        Err(err) => {
-          eprintln!("Failed to read window size from disk: {:?}", err);
-        }
-      }
-
-      tauri::async_runtime::spawn(sora_session_login_thread(app_2, app_data_root_2, sora_creds_manager_2));
-      tauri::async_runtime::spawn(main_window_thread(app_3, app_data_root_3, storyteller_creds_manager_2));
-      tauri::async_runtime::spawn(sora_task_polling_thread(app_4, app_data_root_4, sora_creds_manager_3, storyteller_creds_manager_3, sora_task_queue_2));
-      tauri::async_runtime::spawn(discord_presence_thread());
-
-      Ok(())
-    })
-    .manage(app_data_root)
-    .manage(app_preferences)
-    .manage(sora_creds_manager)
-    .manage(sora_task_queue)
-    .invoke_handler(tauri::generate_handler![
-      flip_image,
-      get_app_preferences_command,
-      open_sora_login_command,
-      platform_info_command,
-      sora_image_generation_command,
-      sora_image_remix_command,
-    ])
-    .run(tauri::generate_context!("tauri.conf.json"))
-    .expect("error while running tauri application");
-}
@@ -1,50 +0,0 @@
-use crate::state::app_preferences::app_preferences_serializable::AppPreferencesSerializable;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-
-#[derive(Clone)]
-pub struct AppPreferences {
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: PreferredDownloadDirectory,
-
-  /// Play sounds on events.
-  pub play_sounds: bool,
-}
-
-impl Default for AppPreferences {
-  fn default() -> Self {
-    Self {
-      preferred_download_directory: PreferredDownloadDirectory::SystemDefault,
-      play_sounds: true,
-    }
-  }
-}
-
-impl AppPreferences {
-  pub fn load_from_file_or_default(data_root: &AppDataRoot) -> Self {
-    let filename = data_root.settings_dir().get_app_preferences_path();
-    if !filename.exists() {
-      return Self::default();
-    }
-
-    match AppPreferencesSerializable::load_from_file(data_root) {
-      Ok(Some(serializable)) => {
-        serializable.to_preferences()
-      }
-      Ok(None) => {
-        Self::default()
-      }
-      Err(err) => {
-        println!("Error loading app preferences: {}", err);
-        Self::default()
-      }
-    }
-  }
-  
-  pub fn to_serializable(&self) -> AppPreferencesSerializable {
-    AppPreferencesSerializable {
-      preferred_download_directory: Some(self.preferred_download_directory.clone()),
-      play_sounds: Some(self.play_sounds),
-    }
-  }
-}
@@ -1,10 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use memory_store::clone_cell::CloneCell;
-
-pub type AppPreferencesManager = CloneCell<AppPreferences>;
-
-pub fn load_app_preferences_or_default(data_root: &AppDataRoot) -> AppPreferencesManager {
-  let prefs = AppPreferences::load_from_file_or_default(data_root);
-  AppPreferencesManager::with_owned(prefs)
-}
@@ -1,48 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use errors::AnyhowResult;
-use serde_derive::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AppPreferencesSerializable {
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: Option<PreferredDownloadDirectory>,
-
-  /// Play sounds on events.
-  pub play_sounds: Option<bool>,
-}
-
-impl AppPreferencesSerializable {
-  pub fn load_from_file(app_data_root: &AppDataRoot) -> AnyhowResult<Option<Self>> {
-    let filename = app_data_root.settings_dir().get_app_preferences_path();
-    if !filename.exists() {
-      return Ok(None);
-    }
-
-    let contents = std::fs::read_to_string(filename)?;
-    let data: Self = serde_json::from_str(&contents)?;
-    Ok(Some(data))
-  }
-
-  pub fn save_to_file(&self, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-    let filename = app_data_root.settings_dir().get_app_preferences_path();
-    let json = serde_json::to_string(self)?;
-    std::fs::write(filename, json)?;
-    Ok(())
-  }
-
-  pub fn to_preferences(&self) -> AppPreferences {
-    let mut preferences = AppPreferences::default();
-
-    if let Some(preferred_download_directory) = &self.preferred_download_directory {
-      preferences.preferred_download_directory = preferred_download_directory.clone();
-    }
-
-    if let Some(play_sounds) = self.play_sounds {
-      preferences.play_sounds = play_sounds;
-    }
-    
-    preferences
-  }
-}
@@ -1,4 +0,0 @@
-pub mod app_preferences;
-pub mod app_preferences_manager;
-pub mod app_preferences_serializable;
-pub mod preferred_download_directory;
@@ -1,100 +0,0 @@
-use errors::AnyhowError;
-use serde_derive::{Deserialize, Serialize};
-use std::fmt::{Display, Formatter};
-use std::path::PathBuf;
-use std::str::FromStr;
-
-const SYSTEM_DEFAULT_SENTINEL_VALUE: &str = "system_default";
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub enum PreferredDownloadDirectory {
-  /// The system-default downloads directory, which varies by OS.
-  /// NB: Serializes as `"system_default"` in JSON.
-  SystemDefault,
-  
-  /// A user-defined path
-  /// NB: Serializes as `{"custom": "/path/to/dir"}` in JSON.
-  Custom(PathBuf),
-}
-
-impl FromStr for PreferredDownloadDirectory {
-  type Err = AnyhowError;
-
-  fn from_str(s: &str) -> Result<Self, Self::Err> {
-    if s == SYSTEM_DEFAULT_SENTINEL_VALUE || s == "\"system_default\"" {
-      Ok(PreferredDownloadDirectory::SystemDefault)
-    } else {
-      // TODO: If it gets serialized as JSON, we may need to remove the `{"custom": ...` wrapping layer.
-      let path = PathBuf::from(s);
-      Ok(PreferredDownloadDirectory::Custom(path))
-    }
-  }
-}
-
-impl Display for PreferredDownloadDirectory {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      PreferredDownloadDirectory::SystemDefault => write!(f, "{}", SYSTEM_DEFAULT_SENTINEL_VALUE),
-      PreferredDownloadDirectory::Custom(path) => write!(f, "{}", path.to_string_lossy()),
-    }
-  }
-}
-
-
-#[cfg(test)]
-mod tests {
-  use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-  use std::path::PathBuf;
-  use std::str::FromStr;
-
-  mod json {
-    use super::*;
-
-    #[test]
-    fn to_json_system_default() {
-      let val = PreferredDownloadDirectory::SystemDefault;
-      let val = serde_json::to_string(&val).unwrap();
-      assert_eq!(&val, "\"system_default\"");
-    }
-    
-    #[test]
-    fn to_json_custom() {
-      let val = PreferredDownloadDirectory::Custom("/tmp".into());
-      let val = serde_json::to_string(&val).unwrap();
-      assert_eq!(&val, "{\"custom\":\"/tmp\"}");
-    }
-  }
-
-  mod string {
-    use super::*;
-
-    #[test]
-    fn to_string_system_default() {
-      let val = PreferredDownloadDirectory::SystemDefault;
-      let val = val.to_string();
-      assert_eq!(&val, "system_default");
-    }
-
-    #[test]
-    fn to_string_custom() {
-      let val = PreferredDownloadDirectory::Custom("/tmp/foo".into());
-      let val = val.to_string();
-      assert_eq!(&val, "/tmp/foo");
-    }
-  }
-
-  #[test]
-  fn from_string_system_default() {
-    let val = "system_default";
-    let val = PreferredDownloadDirectory::from_str(val).unwrap();
-    assert_eq!(val, PreferredDownloadDirectory::SystemDefault);
-  }
-
-  #[test]
-  fn from_string_custom() {
-    let val = "/tmp/foo";
-    let val = PreferredDownloadDirectory::from_str(val).unwrap();
-    assert_eq!(val, PreferredDownloadDirectory::Custom(PathBuf::from("/tmp/foo")));
-  }
-}
@@ -1,22 +0,0 @@
-use chrono::{DateTime, TimeDelta, Utc};
-
-pub struct AppStartupTime {
-  startup_time: DateTime<Utc>,
-}
-
-impl AppStartupTime {
-  pub fn new() -> Self {
-    Self {
-      startup_time: Utc::now(),
-    }
-  }
-
-  pub fn get_startup_time(&self) -> DateTime<Utc> {
-    self.startup_time
-  }
-  
-  pub fn time_delta_since(&self) -> TimeDelta {
-    let now = Utc::now();
-    now.signed_duration_since(self.startup_time)
-  }
-}
@@ -1,36 +0,0 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use chrono::{DateTime, Local};
-use std::path::{Path, PathBuf};
-
-#[derive(Clone)]
-pub struct AppAssetsDir {
-  path: PathBuf,
-}
-
-impl  DataSubdir for AppAssetsDir {
-  const DIRECTORY_NAME: &'static str = "assets";
-
-  fn new_from<P: AsRef<Path>>(dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl AppAssetsDir {
-  /// Return the current date asset directory
-  /// If it doesn't exist, create it.
-  pub fn make_or_get_current_date_dir(&self) -> anyhow::Result<PathBuf> {
-    let format: DateTime<Local> = Local::now();
-    let date_directory_name = format.format("%Y-%d-%m").to_string();
-    let full_path = self.path.join(date_directory_name);
-    if !full_path.exists() {
-      std::fs::create_dir(&full_path)?;
-    }
-    Ok(full_path)
-  }
-}
@@ -1,43 +0,0 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use std::path::{Path, PathBuf};
-
-#[derive(Clone)]
-pub struct AppCredentialsDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for AppCredentialsDir {
-  const DIRECTORY_NAME: &'static str = "credentials";
-
-  fn new_from<P: AsRef<Path>> (dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl AppCredentialsDir {
-  pub fn get_sora_cookie_file_path(&self) -> PathBuf {
-    self.path.join("sora_cookies.txt")
-  }
-
-  pub fn get_sora_bearer_token_file_path(&self) -> PathBuf {
-    self.path.join("sora_bearer_token.txt")
-  }
-
-  pub fn get_sora_sentinel_file_path(&self) -> PathBuf {
-    self.path.join("sora_sentinel.txt")
-  }
-
-  pub fn get_storyteller_avt_cookie_file_path(&self) -> PathBuf {
-    self.path.join("artcraft_avt.txt")
-  }
-  
-  pub fn get_storyteller_session_cookie_file_path(&self) -> PathBuf {
-    self.path.join("artcraft_session.txt")
-  }
-}
@@ -1,147 +0,0 @@
-use crate::state::data_dir::app_assets_dir::AppAssetsDir;
-use crate::state::data_dir::app_credentials_dir::AppCredentialsDir;
-use crate::state::data_dir::app_downloads_dir::AppDownloadsDir;
-use crate::state::data_dir::app_settings_dir::AppSettingsDir;
-use crate::state::data_dir::app_weights_dir::AppWeightsDir;
-use crate::state::data_dir::temporary_dir::TemporaryDir;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::expanduser::expanduser;
-use crate::state::os_platform::OsPlatform;
-use anyhow::anyhow;
-use directories::UserDirs;
-use std::path::{Path, PathBuf};
-
-const DEFAULT_DATA_DIR : &str = "Artcraft";
-
-/// Note: Tauri appends ".log" to the end of the filename.
-const LOG_FILE_NAME : &str = "application_debug";
-
-/// The path to the application data directory, which includes "asset" and "weights" data.
-#[derive(Clone)]
-pub struct AppDataRoot {
-  path: PathBuf,
-  assets_dir: AppAssetsDir,
-  credentials_dir: AppCredentialsDir,
-  downloads_dir: AppDownloadsDir,
-  settings_dir: AppSettingsDir,
-  weights_dir: AppWeightsDir,
-  temp_dir: TemporaryDir,
-  log_file_name: PathBuf,
-  log_file_name_string: String,
-}
-
-impl AppDataRoot {
-  pub fn create_default() -> anyhow::Result<Self> {
-    let directory = get_default_data_dir()?;
-    Self::create_existing(directory)
-  }
-
-  pub fn create_existing<P: AsRef<Path>>(dir: P) -> anyhow::Result<Self> {
-    let mut dir = dir.as_ref().to_path_buf();
-    
-    match OsPlatform::get() {
-      OsPlatform::Linux | OsPlatform::MacOs => {
-        if let Some(d) = dir.as_os_str().to_str() {
-          dir = expanduser(d)?;
-        }
-      },
-      OsPlatform::Windows => {}
-    }
-    
-    if !dir.is_dir() {
-      println!("Creating directory {:?}", dir);
-      std::fs::create_dir_all(&dir)?;
-    }
-
-    match dir.canonicalize() {
-      Ok(d) => dir = d,
-      Err(err) => {
-        println!("Error canonicalizing {:?}: {}", dir, err);
-      }
-    }
-    
-    let assets_dir = AppAssetsDir::get_or_create_in_root_dir(&dir)?;
-    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 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()
-        .ok_or(anyhow!("couldn't convert log path to str"))?
-        .to_string();
-
-    Ok(Self {
-      path: dir,
-      assets_dir,
-      credentials_dir,
-      downloads_dir,
-      settings_dir,
-      weights_dir,
-      temp_dir,
-      log_file_name,
-      log_file_name_string,
-    })
-  }
-  
-  pub fn assets_dir(&self) -> &AppAssetsDir {
-    &self.assets_dir
-  }
-
-  pub fn credentials_dir(&self) -> &AppCredentialsDir {
-    &self.credentials_dir
-  }
-
-  pub fn downloads_dir(&self) -> &AppDownloadsDir {
-    &self.downloads_dir
-  }
-
-  pub fn settings_dir(&self) -> &AppSettingsDir {
-    &self.settings_dir
-  }
-
-  pub fn weights_dir(&self) -> &AppWeightsDir {
-    &self.weights_dir
-  }
-
-  pub fn temp_dir(&self) -> &TemporaryDir {
-    &self.temp_dir
-  }
-
-  pub fn path(&self) -> &Path {
-    &self.path
-  }
-
-  pub fn log_file_name(&self) -> &Path {
-    &self.log_file_name
-  }
-
-  pub fn log_file_name_str(&self) -> &str {
-    &self.log_file_name_string
-  }
-
-  pub fn get_sora_cookie_file_path(&self) -> PathBuf {
-    self.credentials_dir().get_sora_cookie_file_path()
-  }
-
-  pub fn get_sora_bearer_token_file_path(&self) -> PathBuf {
-    self.credentials_dir().get_sora_bearer_token_file_path()
-  }
-
-  pub fn get_sora_sentinel_file_path(&self) -> PathBuf {
-    self.credentials_dir().get_sora_sentinel_file_path()
-  }
-
-  pub fn get_window_size_config_file(&self) -> PathBuf {
-    self.path.join("window_size.json")
-  }
-}
-
-// eg. /home/bob/artcraft, /Users/bob/artcraft, or C:\Users\Alice\artcraft
-fn get_default_data_dir() -> anyhow::Result<PathBuf> {
-  Ok(UserDirs::new()
-      .ok_or_else(|| anyhow!("could not determine user home directory"))?
-      .home_dir()
-      .join(DEFAULT_DATA_DIR))
-}
@@ -1,21 +0,0 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use std::path::{Path, PathBuf};
-
-#[derive(Clone)]
-pub struct AppDownloadsDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for AppDownloadsDir {
-  const DIRECTORY_NAME: &'static str = "downloads";
-
-  fn new_from<P: AsRef<Path>>(dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
@@ -1,51 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use errors::AnyhowResult;
-use std::fs::OpenOptions;
-use std::io::Write;
-use std::path::{Path, PathBuf};
-
-/// For now, let's just keep a collection of loose json files in a settings dir.
-/// Once we know the structure and schema, we can standardize on a single json file.
-#[derive(Clone)]
-pub struct AppSettingsDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for AppSettingsDir {
-  const DIRECTORY_NAME: &'static str = "settings";
-
-  fn new_from<P: AsRef<Path>> (dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl AppSettingsDir {
-  pub fn get_app_preferences_path(&self) -> PathBuf {
-    self.path.join("app_preferences.json")
-  }
-  
-  pub fn write_app_preferences(&self, prefs: &AppPreferences) -> AnyhowResult<()> {
-    let serializable = prefs.to_serializable();
-    let serializable = serde_json::to_string(&serializable)?;
-    
-    let filename = self.get_app_preferences_path();
-
-    let mut file = OpenOptions::new()
-        .create(true)
-        .write(true)
-        .truncate(true)
-        .open(filename)?;
-
-    file.write_all(serializable.as_bytes())?;
-    file.flush()?;
-    
-    Ok(())
-  }
-}
@@ -1,21 +0,0 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use std::path::{Path, PathBuf};
-
-#[derive(Clone)]
-pub struct AppWeightsDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for AppWeightsDir {
-  const DIRECTORY_NAME: &'static str = "weights";
-
-  fn new_from<P: AsRef<Path>>(dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
@@ -1,8 +0,0 @@
-pub mod app_assets_dir;
-pub mod app_credentials_dir;
-pub mod app_data_root;
-pub mod app_downloads_dir;
-pub mod app_settings_dir;
-pub mod app_weights_dir;
-pub mod temporary_dir;
-pub mod trait_data_subdir;
@@ -1,38 +0,0 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use std::path::{Path, PathBuf};
-use tempdir::TempDir;
-use tempfile::{Builder, NamedTempFile};
-
-#[derive(Clone)]
-pub struct TemporaryDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for TemporaryDir {
-  const DIRECTORY_NAME: &'static str = "temp";
-
-  fn new_from<P: AsRef<Path>>(dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl TemporaryDir {
-  pub fn with_prefix(&self, prefix: &str) -> anyhow::Result<TempDir> {
-    let tempdir = TempDir::new_in(&self.path, prefix)?;
-    Ok(tempdir)
-  }
-
-  pub fn new_named_temp_file(&self) -> anyhow::Result<NamedTempFile> {
-    let tempfile = Builder::new()
-        .prefix("temp_")
-        .suffix(".bin")
-        .tempfile_in(&self.path)?;
-    Ok(tempfile)
-  }
-}
@@ -1,31 +0,0 @@
-use std::path::Path;
-
-pub trait DataSubdir  : Sized {
-  const DIRECTORY_NAME: &'static str;
-
-  fn new_from<P: AsRef<Path>>(dir: P) -> Self;
-
-  fn path(&self) -> &Path;
-
-  fn get_or_create_in_root_dir<P: AsRef<Path>>(root_dir: P) -> anyhow::Result<Self> {
-    Self::get_or_create_dir(root_dir.as_ref().join(Self::DIRECTORY_NAME))
-  }
-
-  fn get_or_create_dir<P: AsRef<Path>>(dir: P) -> anyhow::Result<Self> {
-    let mut dir = dir.as_ref().to_path_buf();
-
-    match dir.canonicalize() {
-      Ok(d) => dir = d,
-      Err(err) => {
-        println!("Error canonicalizing {:?}: {}", dir, err);
-      }
-    }
-
-    if !dir.exists() {
-      println!("Creating directory {:?}", dir);
-      std::fs::create_dir(&dir)?;
-    }
-
-    Ok(Self::new_from(dir))
-  }
-}
@@ -1,74 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use errors::AnyhowResult;
-use serde_derive::{Deserialize, Serialize};
-use std::fs::OpenOptions;
-use std::io::Write;
-use tauri::{AppHandle, Manager, PhysicalSize, Window};
-
-const MAIN_WINDOW_NAME: &str = "main";
-
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
-pub struct MainWindowSize {
-  pub width: u32,
-  pub height: u32,
-}
-
-impl MainWindowSize {
-  pub fn new(width: u32, height: u32) -> Self {
-    Self { width, height }
-  }
-
-  pub fn from_main_window(app: &AppHandle) -> AnyhowResult<Self> {
-    let windows = app.windows();
-    windows.get(MAIN_WINDOW_NAME)
-        .map(|window| Self::from_window(window))
-        .unwrap_or_else(|| Err(anyhow::anyhow!("Main window not found")))
-  }
-
-  pub fn from_window(window: &Window) -> AnyhowResult<Self> {
-    let size = window.inner_size()?;
-    Ok(Self {
-      width: size.width,
-      height: size.height,
-    })
-  }
-
-  pub fn from_filesystem_configs(app_data_root: &AppDataRoot) -> AnyhowResult<Option<Self>> {
-    let filename = app_data_root.get_window_size_config_file();
-    if !filename.exists() {
-      return Ok(None);
-    }
-    let contents = std::fs::read_to_string(filename)?;
-    let size: MainWindowSize = serde_json::from_str(&contents)?;
-    Ok(Some(size))
-  }
-
-  pub fn apply_to_main_window(&self, app: &AppHandle) -> AnyhowResult<()> {
-    let windows = app.windows();
-    let window = windows.get(MAIN_WINDOW_NAME)
-        .ok_or_else(|| anyhow::anyhow!("Main window not found"))?;
-    window.set_size(PhysicalSize::new(self.width, self.height))?;
-    Ok(())
-  }
-
-  pub fn persist_to_filesystem(&self, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-    let filename = app_data_root.get_window_size_config_file();
-    let json = serde_json::to_string(self)?;
-    let mut file = OpenOptions::new()
-        .create(true)
-        .write(true)
-        .truncate(true)
-        .open(filename)?;
-    file.write_all(json.as_bytes())?;
-    file.flush()?;
-    Ok(())
-  }
-
-  pub fn to_physical_size(&self) -> PhysicalSize<u32> {
-    PhysicalSize::new(self.width, self.height)
-  }
-
-  pub fn matches_physical_size(&self, size: &PhysicalSize<u32>) -> bool {
-    self.width == size.width && self.height == size.height
-  }
-}
@@ -1,8 +0,0 @@
-pub mod app_preferences;
-pub mod app_startup_time;
-pub mod data_dir;
-pub mod expanduser;
-pub mod main_window_size;
-pub mod os_platform;
-pub mod sora;
-pub mod storyteller;
@@ -1,24 +0,0 @@
-
-#[derive(Copy,Clone,Eq,PartialEq,Debug)]
-pub enum OsPlatform {
-  Linux,
-  MacOs,
-  Windows,
-}
-
-impl OsPlatform {
-  pub fn maybe_get() -> Option<Self> {
-    // Totally scientific.
-    // https://doc.rust-lang.org/std/env/consts/constant.OS.html
-    match std::env::consts::OS {
-      "linux" => Some(Self::Linux),
-      "windows" => Some(Self::Windows),
-      "macos" | "apple" => Some(Self::MacOs),
-      _ => None,
-    }
-  }
-
-  pub fn get() -> Self {
-    Self::maybe_get().unwrap_or(Self::Linux)
-  }
-}
@@ -1,5 +0,0 @@
-pub mod read_sora_credentials_from_disk;
-pub mod read_sora_credentials_from_disk_with_upgrade;
-pub mod sora_credential_holder;
-pub mod sora_credential_manager;
-pub mod sora_task_queue;
@@ -1,48 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use openai_sora_client::creds::sora_cookies::SoraCookies;
-use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
-use openai_sora_client::creds::sora_jwt_bearer_token::SoraJwtBearerToken;
-use openai_sora_client::creds::sora_sentinel::SoraSentinel;
-use std::fs::read_to_string;
-
-pub fn read_sora_credentials_from_disk(app_data_root: &AppDataRoot) -> AnyhowResult<SoraCredentialSet> {
-  let cookie_file = app_data_root.get_sora_cookie_file_path();
-  let bearer_file = app_data_root.get_sora_bearer_token_file_path();
-  let sentinel_file = app_data_root.get_sora_sentinel_file_path();
-
-  if !cookie_file.exists() {
-    return Err(anyhow!("Cookie file does not exist: {:?}", cookie_file));
-  }
-
-  let value = read_to_string(cookie_file)?
-      .trim()
-      .to_string();
-
-  let cookie = SoraCookies::new(value);
-
-  let mut bearer = None;
-  let mut sentinel = None;
-
-  if bearer_file.exists() {
-    let value = read_to_string(&bearer_file)?
-        .trim()
-        .to_string();
-    bearer = Some(SoraJwtBearerToken::new(value)?);
-  }
-
-  if sentinel_file.exists() {
-    let value = read_to_string(&sentinel_file)?
-        .trim()
-        .to_string();
-
-    sentinel = Some(SoraSentinel::new(value));
-  }
-
-  Ok(SoraCredentialSet::initialize(
-    cookie,
-    bearer,
-    sentinel,
-  ))
-}
@@ -1,92 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use log::{info, warn};
-use openai_sora_client::creds::sora_cookies::SoraCookies;
-use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
-use openai_sora_client::creds::sora_jwt_bearer_token::SoraJwtBearerToken;
-use openai_sora_client::creds::sora_sentinel::SoraSentinel;
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use std::fs::{read_to_string, OpenOptions};
-use std::io::Write;
-
-pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDataRoot) -> AnyhowResult<SoraCredentialSet> {
-  let cookie_file = app_data_root.get_sora_cookie_file_path();
-  let bearer_file = app_data_root.get_sora_bearer_token_file_path();
-  let sentinel_file = app_data_root.get_sora_sentinel_file_path();
-
-  if !cookie_file.exists() {
-    return Err(anyhow!("Cookie file does not exist: {:?}", cookie_file));
-  }
-
-  let value = read_to_string(cookie_file)?
-      .trim()
-      .to_string();
-
-  let cookie = SoraCookies::new(value);
-
-  let mut bearer = None;
-  let mut sentinel = None;
-
-  if bearer_file.exists() {
-    let value = read_to_string(&bearer_file)?
-        .trim()
-        .to_string();
-    bearer = Some(SoraJwtBearerToken::new(value)?);
-  }
-
-  if sentinel_file.exists() {
-    let value = read_to_string(&sentinel_file)?
-        .trim()
-        .to_string();
-
-    sentinel = Some(SoraSentinel::new(value));
-  }
-
-  let mut credentials = SoraCredentialSet::initialize(
-    cookie,
-    bearer,
-    sentinel,
-  );
-
-  let response = maybe_upgrade_or_renew_session(&mut credentials).await;
-
-  if let Err(err) = response {
-    // NB: Make this portion infallible. Don't die on setup. We can recover downstream.
-    warn!("Failed to upgrade or renew session: {:?}", err);
-  }
-
-  if !bearer_file.exists() {
-    if let Some(bearer) = &credentials.jwt_bearer_token {
-      info!("Persisting bearer token value...");
-      let value = bearer.token_str();
-
-      let mut file = OpenOptions::new()
-          .create(true)
-          .write(true)
-          .truncate(true)
-          .open(&bearer_file)?;
-
-      file.write_all(value.as_bytes())?;
-      file.flush()?;
-    }
-  }
-
-  if !sentinel_file.exists() {
-    if let Some(sentinel) = &credentials.sora_sentinel {
-      info!("Persisting sentinel value...");
-      let value = sentinel.get_sentinel();
-
-      let mut file = OpenOptions::new()
-          .create(true)
-          .write(true)
-          .truncate(true)
-          .open(&sentinel_file)?;
-
-      file.write_all(value.as_bytes())?;
-      file.flush()?;
-    }
-  }
-
-  Ok(credentials)
-}
@@ -1,57 +0,0 @@
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
-use std::sync::{Arc, RwLock};
-
-/// Hold credentials for the application.
-#[derive(Clone)]
-pub struct SoraCredentialHolder {
-  credentials: Arc<RwLock<Option<SoraCredentialSet>>>,
-}
-
-impl SoraCredentialHolder {
-  pub fn new() -> Self {
-    Self {
-      credentials: Arc::new(RwLock::new(None)),
-    }
-  }
-
-  pub fn set_credentials(&self, credentials: &SoraCredentialSet) -> AnyhowResult<()> {
-    match self.credentials.write() {
-      Err(err) => Err(anyhow!("Failed to acquire write lock: {:?}", err)),
-      Ok(mut creds) => {
-        *creds = Some(credentials.clone());
-        Ok(())
-      }
-    }
-  }
-
-  pub fn clear_credentials(&self) -> AnyhowResult<()> {
-    match self.credentials.write() {
-      Err(err) => Err(anyhow!("Failed to acquire write lock: {:?}", err)),
-      Ok(mut creds) => {
-        *creds = None;
-        Ok(())
-      }
-    }
-  }
-
-  pub fn get_credentials(&self) -> AnyhowResult<Option<SoraCredentialSet>> {
-    match self.credentials.read() {
-      Err(err) => Err(anyhow!("Failed to acquire read lock: {:?}", err)),
-      Ok(creds) => {
-        Ok(creds.clone())
-      }
-    }
-  }
-
-  pub fn get_credentials_required(&self) -> AnyhowResult<SoraCredentialSet> {
-    match self.credentials.read() {
-      Err(err) => Err(anyhow!("Failed to acquire read lock: {:?}", err)),
-      Ok(creds) => match &*creds {
-        None => Err(anyhow!("Credentials not set")),
-        Some(creds) => Ok(creds.clone()),
-      }
-    }
-  }
-}
@@ -1,157 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use log::{error, info, warn};
-use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
-use openai_sora_client::creds::sora_sentinel::SoraSentinel;
-use openai_sora_client::requests::sentinel_refresh::generate::token::generate_token;
-use std::fs::OpenOptions;
-use std::io::Write;
-use openai_sora_client::creds::sora_cookies::SoraCookies;
-use openai_sora_client::creds::sora_jwt_bearer_token::SoraJwtBearerToken;
-
-#[derive(Clone)]
-pub struct SoraCredentialManager {
-  holder: SoraCredentialHolder,
-  app_data_root: AppDataRoot,
-}
-
-impl SoraCredentialManager {
-
-  pub fn initialize_from_disk_infallible(app_data_root: &AppDataRoot) -> Self {
-    let holder = SoraCredentialHolder::new();
-
-    match read_sora_credentials_from_disk(app_data_root) {
-      Err(err) => warn!("Failed to read credentials from disk: {:?}", err),
-      Ok(creds) => {
-        holder.set_credentials(&creds).expect("Failed to set credentials");
-      }
-    }
-
-    Self {
-      holder,
-      app_data_root: app_data_root.clone(),
-    }
-  }
-
-  pub fn set_credentials(&self, creds: &SoraCredentialSet) -> AnyhowResult<()> {
-    self.holder.set_credentials(creds)
-  }
-
-  pub fn clear_credentials(&self) -> AnyhowResult<()> {
-    self.holder.clear_credentials()?;
-    Ok(())
-  }
-
-  pub fn get_credentials(&self) -> AnyhowResult<Option<SoraCredentialSet>> {
-    self.holder.get_credentials()
-  }
-
-  pub fn get_credentials_required(&self) -> AnyhowResult<SoraCredentialSet> {
-    self.holder.get_credentials_required()
-  }
-
-  pub fn reset_from_disk(&self) -> AnyhowResult<SoraCredentialSet> {
-    let creds = read_sora_credentials_from_disk(&self.app_data_root)?;
-    self.holder.set_credentials(&creds)?;
-    Ok(creds)
-  }
-
-  pub fn persist_all_to_disk(&self) -> AnyhowResult<()> {
-    let credentials = self.holder.get_credentials_required()?;
-
-    info!("Persisting cookies to disk...");
-    persist_cookies_to_disk(&credentials.cookies, &self.app_data_root)?;
-
-    if let Some(bearer) = &credentials.jwt_bearer_token {
-      info!("Persisting JWT to disk...");
-      persist_jwt_bearer_to_disk(bearer, &self.app_data_root)?;
-    }
-
-    if let Some(sentinel) = &credentials.sora_sentinel {
-      info!("Persisting sentinel to disk...");
-      persist_sentinel_to_disk(sentinel, &self.app_data_root)?;
-    }
-
-    Ok(())
-  }
-
-  /// Refresh the sentinel token from Sora's API
-  pub async fn call_sentinel_refresh(&self) -> AnyhowResult<SoraCredentialSet> {
-    // NB(bt,2025-04-21): Technically we don't need credentials to get a sentinel.
-    let mut creds = self.holder.get_credentials_required()?;
-
-    info!("Generating token...");
-
-    let sentinel = generate_token()
-        .await
-        .map_err(|err| {
-          error!("Failed to refresh: {:?}", err);
-          err
-        })?;
-
-    info!("Token obtained.");
-
-    creds.sora_sentinel = Some(SoraSentinel::new(sentinel.clone()));
-
-    self.holder.set_credentials(&creds)?;
-
-    let mut file = OpenOptions::new()
-        .create(true)
-        .write(true)
-        .truncate(true)
-        .open(self.app_data_root.get_sora_sentinel_file_path())?;
-
-    file.write_all(sentinel.as_bytes())?;
-    file.flush()?;
-
-    Ok(creds)
-  }
-}
-
-fn persist_cookies_to_disk(cookies: &SoraCookies, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-  let filename = app_data_root.get_sora_cookie_file_path();
-
-  let mut file = OpenOptions::new()
-      .create(true)
-      .write(true)
-      .truncate(true)
-      .open(filename)?;
-
-  file.write_all(cookies.as_bytes())?;
-  file.flush()?;
-
-  Ok(())
-}
-
-fn persist_jwt_bearer_to_disk(bearer: &SoraJwtBearerToken, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-  let filename = app_data_root.get_sora_bearer_token_file_path();
-
-  let mut file = OpenOptions::new()
-      .create(true)
-      .write(true)
-      .truncate(true)
-      .open(filename)?;
-
-  file.write_all(bearer.as_bytes())?;
-  file.flush()?;
-
-  Ok(())
-}
-
-fn persist_sentinel_to_disk(sentinel: &SoraSentinel, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-  let filename = app_data_root.get_sora_sentinel_file_path();
-
-  let mut file = OpenOptions::new()
-      .create(true)
-      .write(true)
-      .truncate(true)
-      .open(filename)?;
-
-  file.write_all(sentinel.as_bytes())?;
-  file.flush()?;
-
-  Ok(())
-}
@@ -1,231 +0,0 @@
-use std::collections::HashSet;
-use chrono::{DateTime, Utc};
-use errors::AnyhowResult;
-use indexmap::IndexMap;
-use openai_sora_client::requests::image_gen::image_gen_status::TaskId;
-use std::sync::{Arc, RwLock};
-
-#[derive(Clone)]
-pub struct TaskDetails {
-  pub enqueue_time: DateTime<Utc>
-}
-
-impl TaskDetails {
-  pub fn new() -> Self {
-    Self {
-      enqueue_time: Utc::now()
-    }
-  }
-}
-
-#[derive(Clone)]
-pub struct TaskIdAndDetails {
-  pub task_id: TaskId,
-  pub details: TaskDetails,
-}
-
-#[derive(Clone)]
-pub struct SoraTaskQueue {
-  // Insertion-order map of task IDs to task details
-  queue: Arc<RwLock<IndexMap<TaskId, TaskDetails>>>
-}
-
-impl SoraTaskQueue {
-  pub fn new() -> Self {
-    Self {
-      queue: Arc::new(RwLock::new(IndexMap::new()))
-    }
-  }
-
-  /// Determine if queue is empty
-  /// This is an O(1) operation.
-  pub fn is_empty(&self) -> AnyhowResult<bool> {
-    match self.queue.read() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
-      }
-      Ok(lock) => Ok(lock.is_empty())
-    }
-  }
-
-  /// Get length of set
-  /// This is an O(1) operation.
-  pub fn len(&self) -> AnyhowResult<usize> {
-    match self.queue.read() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
-      }
-      Ok(lock) => Ok(lock.len())
-    }
-  }
-
-  /// Determine if the key is in the queue
-  /// This is an O(1) operation.
-  pub fn contains_key(&self, task_id: &TaskId) -> AnyhowResult<bool> {
-    match self.queue.read() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
-      }
-      Ok(lock) => Ok(lock.contains_key(task_id))
-    }
-  }
-
-  /// Get the first enqueued task
-  /// This is an O(1) operation.
-  pub fn first(&self) -> AnyhowResult<Option<TaskIdAndDetails>> {
-    match self.queue.read() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
-      }
-      Ok(lock) => match lock.first() {
-        None => Ok(None),
-        Some((task_id, task_details)) => Ok(Some(TaskIdAndDetails {
-          task_id: task_id.clone(),
-          details: task_details.clone(),
-        }))
-      }
-    }
-  }
-
-  /// Get the last enqueued task
-  /// This is an O(1) operation.
-  pub fn last(&self) -> AnyhowResult<Option<TaskIdAndDetails>> {
-    match self.queue.read() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
-      }
-      Ok(lock) => match lock.last() {
-        None => Ok(None),
-        Some((task_id, task_details)) => Ok(Some(TaskIdAndDetails {
-          task_id: task_id.clone(),
-          details: task_details.clone(),
-        }))
-      }
-    }
-  }
-
-  /// Insert a new task. If a task already exists, we update its value.
-  /// This is an O(1) operation.
-  pub fn insert(&self, task_id: &TaskId) -> AnyhowResult<Option<TaskDetails>> {
-    match self.queue.write() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire write lock: {:?}", err))
-      }
-      Ok(mut lock) => {
-        // NB: Probably fine to compute TaskDetails here for now. We may eventually expose this if we include additional info.
-        let task_details = TaskDetails::new();
-        Ok(lock.insert(task_id.clone(), task_details))
-      }
-    }
-  }
-
-  /// Remove a task by ID.
-  /// This is an O(n) operation.
-  pub fn remove(&self, task_id: &TaskId) -> AnyhowResult<Option<TaskDetails>> {
-    match self.queue.write() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire write lock: {:?}", err))
-      }
-      Ok(mut lock) => {
-        Ok(lock.shift_remove(task_id))
-      }
-    }
-  }
-
-  /// Remove a list of tasks by ID.
-  /// This is an O(n) operation.
-  pub fn remove_list(&self, task_ids: &[&TaskId]) -> AnyhowResult<()> {
-    match self.queue.write() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire write lock: {:?}", err))
-      }
-      Ok(mut lock) => {
-        // TODO: Cleaner way to do this?
-        let mut set : HashSet<&TaskId, _> = HashSet::with_capacity(task_ids.len());
-        set.extend(task_ids);
-        lock.retain(|k, v| !set.contains(k));
-        Ok(())
-      }
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use errors::AnyhowResult;
-  use openai_sora_client::requests::image_gen::image_gen_status::TaskId;
-  use crate::state::sora::sora_task_queue::SoraTaskQueue;
-
-  #[test]
-  fn remove_list() -> AnyhowResult<()> {
-    let task_queue = SoraTaskQueue::new();
-
-    assert!(task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 0);
-
-    task_queue.insert(&TaskId("a".to_string()))?;
-    task_queue.insert(&TaskId("b".to_string()))?;
-    task_queue.insert(&TaskId("c".to_string()))?;
-    task_queue.insert(&TaskId("d".to_string()))?;
-    task_queue.insert(&TaskId("e".to_string()))?;
-    task_queue.insert(&TaskId("f".to_string()))?;
-
-    assert!(!task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 6);
-
-    task_queue.insert(&TaskId("a".to_string()))?;
-    task_queue.insert(&TaskId("b".to_string()))?;
-    task_queue.insert(&TaskId("c".to_string()))?;
-    task_queue.insert(&TaskId("d".to_string()))?;
-    task_queue.insert(&TaskId("e".to_string()))?;
-    task_queue.insert(&TaskId("f".to_string()))?;
-
-    assert!(!task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 6);
-
-    task_queue.remove_list(&[
-      &TaskId("a".to_string()),
-      &TaskId("c".to_string()),
-      &TaskId("e".to_string()),
-    ])?;
-
-    assert!(!task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 3);
-
-    assert!(task_queue.contains_key(&TaskId("b".to_string()))?);
-    assert!(task_queue.contains_key(&TaskId("d".to_string()))?);
-    assert!(task_queue.contains_key(&TaskId("f".to_string()))?);
-
-    assert!(!task_queue.contains_key(&TaskId("a".to_string()))?);
-    assert!(!task_queue.contains_key(&TaskId("c".to_string()))?);
-    assert!(!task_queue.contains_key(&TaskId("e".to_string()))?);
-
-    task_queue.remove_list(&[
-      &TaskId("foo".to_string()),
-      &TaskId("bar".to_string()),
-      &TaskId("baz".to_string()),
-    ])?;
-
-    assert!(!task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 3);
-
-    assert!(task_queue.contains_key(&TaskId("b".to_string()))?);
-    assert!(task_queue.contains_key(&TaskId("d".to_string()))?);
-    assert!(task_queue.contains_key(&TaskId("f".to_string()))?);
-
-    task_queue.remove_list(&[
-      &TaskId("b".to_string()),
-      &TaskId("d".to_string()),
-      &TaskId("f".to_string()),
-    ])?;
-
-    assert!(task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 0);
-
-    assert!(!task_queue.contains_key(&TaskId("b".to_string()))?);
-    assert!(!task_queue.contains_key(&TaskId("d".to_string()))?);
-    assert!(!task_queue.contains_key(&TaskId("f".to_string()))?);
-
-    Ok(())
-  }
-}
@@ -1,3 +0,0 @@
-pub mod read_storyteller_credentials_from_disk;
-pub mod storyteller_credential_holder;
-pub mod storyteller_credential_manager;
@@ -1,39 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use errors::AnyhowResult;
-use std::fs::read_to_string;
-use storyteller_client::credentials::storyteller_avt_cookie::StorytellerAvtCookie;
-use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use storyteller_client::credentials::storyteller_session_cookie::StorytellerSessionCookie;
-
-pub fn read_storyteller_credentials_from_disk(app_data_root: &AppDataRoot) -> AnyhowResult<StorytellerCredentialSet> {
-  let creds_dir= app_data_root.credentials_dir();
-
-  let mut avt = None;
-
-  {
-    let avt_file = creds_dir.get_storyteller_avt_cookie_file_path();
-    if avt_file.exists() {
-      let contents = read_to_string(&avt_file)?
-          .trim()
-          .to_string();
-      avt = Some(StorytellerAvtCookie::new(contents));
-    }
-  }  
-
-  let mut session = None;
-
-  {
-    let session_file = creds_dir.get_storyteller_session_cookie_file_path();
-    if session_file.exists() {
-      let contents = read_to_string(&session_file)?
-          .trim()
-          .to_string();
-      session = Some(StorytellerSessionCookie::new(contents));
-    }
-  }
-
-  Ok(StorytellerCredentialSet::initialize(
-    avt,
-    session,
-  ))
-}
@@ -1,57 +0,0 @@
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use std::sync::{Arc, RwLock};
-use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-
-/// Hold credentials for the application.
-#[derive(Clone)]
-pub struct StorytellerCredentialHolder {
-  credentials: Arc<RwLock<Option<StorytellerCredentialSet>>>,
-}
-
-impl StorytellerCredentialHolder {
-  pub fn new() -> Self {
-    Self {
-      credentials: Arc::new(RwLock::new(None)),
-    }
-  }
-
-  pub fn set_credentials(&self, credentials: &StorytellerCredentialSet) -> AnyhowResult<()> {
-    match self.credentials.write() {
-      Err(err) => Err(anyhow!("Failed to acquire write lock: {:?}", err)),
-      Ok(mut creds) => {
-        *creds = Some(credentials.clone());
-        Ok(())
-      }
-    }
-  }
-
-  pub fn clear_credentials(&self) -> AnyhowResult<()> {
-    match self.credentials.write() {
-      Err(err) => Err(anyhow!("Failed to acquire write lock: {:?}", err)),
-      Ok(mut creds) => {
-        *creds = None;
-        Ok(())
-      }
-    }
-  }
-
-  pub fn get_credentials(&self) -> AnyhowResult<Option<StorytellerCredentialSet>> {
-    match self.credentials.read() {
-      Err(err) => Err(anyhow!("Failed to acquire read lock: {:?}", err)),
-      Ok(creds) => {
-        Ok(creds.clone())
-      }
-    }
-  }
-
-  pub fn get_credentials_required(&self) -> AnyhowResult<StorytellerCredentialSet> {
-    match self.credentials.read() {
-      Err(err) => Err(anyhow!("Failed to acquire read lock: {:?}", err)),
-      Ok(creds) => match &*creds {
-        None => Err(anyhow!("Credentials not set")),
-        Some(creds) => Ok(creds.clone()),
-      }
-    }
-  }
-}
@@ -1,109 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use crate::state::storyteller::read_storyteller_credentials_from_disk::read_storyteller_credentials_from_disk;
-use crate::state::storyteller::storyteller_credential_holder::StorytellerCredentialHolder;
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use log::{error, info, warn};
-use std::fs::OpenOptions;
-use std::io::Write;
-use storyteller_client::credentials::storyteller_avt_cookie::StorytellerAvtCookie;
-use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use storyteller_client::credentials::storyteller_session_cookie::StorytellerSessionCookie;
-
-#[derive(Clone)]
-pub struct StorytellerCredentialManager {
-  holder: StorytellerCredentialHolder,
-  app_data_root: AppDataRoot,
-}
-
-impl StorytellerCredentialManager {
-
-  pub fn initialize_from_disk_infallible(app_data_root: &AppDataRoot) -> Self {
-    let holder = StorytellerCredentialHolder::new();
-
-    match read_storyteller_credentials_from_disk(app_data_root) {
-      Err(err) => warn!("Failed to read credentials from disk: {:?}", err),
-      Ok(creds) => {
-        holder.set_credentials(&creds).expect("Failed to set credentials");
-      }
-    }
-
-    Self {
-      holder,
-      app_data_root: app_data_root.clone(),
-    }
-  }
-
-  pub fn set_credentials(&self, creds: &StorytellerCredentialSet) -> AnyhowResult<()> {
-    self.holder.set_credentials(creds)
-  }
-
-  pub fn clear_credentials(&self) -> AnyhowResult<()> {
-    self.holder.clear_credentials()?;
-    Ok(())
-  }
-
-  pub fn get_credentials(&self) -> AnyhowResult<Option<StorytellerCredentialSet>> {
-    self.holder.get_credentials()
-  }
-
-  pub fn get_credentials_required(&self) -> AnyhowResult<StorytellerCredentialSet> {
-    self.holder.get_credentials_required()
-  }
-
-  pub fn reset_from_disk(&self) -> AnyhowResult<StorytellerCredentialSet> {
-    let creds = read_storyteller_credentials_from_disk(&self.app_data_root)?;
-    self.holder.set_credentials(&creds)?;
-    Ok(creds)
-  }
-
-  pub fn persist_all_to_disk(&self) -> AnyhowResult<()> {
-    let credentials = self.holder.get_credentials_required()?;
-
-    info!("Persisting avt cookie to disk...");
-    if let Some(avt) = credentials.avt.as_ref() {
-      persist_avt_to_disk(&avt, &self.app_data_root)?;
-    }
-
-    info!("Persisting session cookie to disk...");
-    if let Some(session) = credentials.session.as_ref() {
-      persist_session_to_disk(&session, &self.app_data_root)?;
-    }
-
-    Ok(())
-  }
-}
-
-fn persist_session_to_disk(session: &StorytellerSessionCookie, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-  let creds_dir = app_data_root.credentials_dir();
-  let filename = creds_dir.get_storyteller_session_cookie_file_path();
-
-  let mut file = OpenOptions::new()
-      .create(true)
-      .write(true)
-      .truncate(true)
-      .open(filename)?;
-
-  file.write_all(session.as_bytes())?;
-  file.flush()?;
-
-  Ok(())
-}
-
-fn persist_avt_to_disk(avt: &StorytellerAvtCookie, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-  let creds_dir = app_data_root.credentials_dir();
-  let filename = creds_dir.get_storyteller_avt_cookie_file_path();
-
-  let mut file = OpenOptions::new()
-      .create(true)
-      .write(true)
-      .truncate(true)
-      .open(filename)?;
-
-  file.write_all(avt.as_bytes())?;
-  file.flush()?;
-
-  Ok(())
-}
@@ -1,42 +0,0 @@
-use anyhow::anyhow;
-use discord_rich_presence::{DiscordIpc, DiscordIpcClient};
-use errors::AnyhowResult;
-use log::info;
-
-/// Our Discord App ID. Not sure if this is a secret.
-const DISCORD_APP_ID : &str = "1366596912593113138";
-
-pub async fn discord_presence_thread() -> ! {
-  loop {
-    let client = DiscordIpcClient::new(DISCORD_APP_ID);
-    let _err = discord_main_loop(client).await;
-    tokio::time::sleep(std::time::Duration::from_millis(10_000)).await;
-  }
-}
-
-async fn discord_main_loop(mut client: DiscordIpcClient) -> AnyhowResult<()> {
-  info!("Connecting Discord IPC client");
-
-  client.connect()
-      .map_err(|err| anyhow!("Error connecting to Discord IPC: {:?}", err))?;
-
-  loop {
-    info!("Notifying discord...");
-
-    let assets = discord_rich_presence::activity::Assets::new()
-        .large_image("https://storyteller.ai/android-chrome-512x512.png")
-        .large_text("https://GetArtCraft.com");
-        //.small_image("https://storyteller.ai/android-chrome-192x192.png")
-        //.small_text("small text");
-
-    client.set_activity(discord_rich_presence::activity::Activity::new()
-        //.state("Anyone can make arts!")
-        .state("GetArtCraft.com")
-        .details("Making Arts with ArtCraft")
-        .activity_type(discord_rich_presence::activity::ActivityType::Playing)
-        .assets(assets))
-        .map_err(|err| anyhow!("Error setting Discord activity: {:?}", err))?;
-
-    tokio::time::sleep(std::time::Duration::from_millis(30_000)).await;
-  }
-}
@@ -1,62 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::main_window_size::MainWindowSize;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::threads::main_window_thread::persist_storyteller_cookies_task::persist_storyteller_cookies_task;
-use crate::threads::main_window_thread::persist_window_resize_task::persist_window_resize_task;
-use errors::AnyhowResult;
-use log::{error, info};
-use memory_store::clone_slot::CloneSlot;
-use tauri::{AppHandle, Manager, Webview, Window};
-use crate::state::app_startup_time::AppStartupTime;
-
-const MAIN_WINDOW_NAME : &str = "main";
-
-pub async fn main_window_thread(
-  app: AppHandle,
-  app_data_root: AppDataRoot,
-  storyteller_creds_manager: StorytellerCredentialManager,
-) -> ! {
-  // TODO: Move these into some kind of dependency injection framework
-  let window_size_slot: CloneSlot<MainWindowSize> = CloneSlot::empty();
-  let app_startup_time = AppStartupTime::new();
-
-  loop {
-    for (window_name, window) in app.windows() {
-      if window_name == MAIN_WINDOW_NAME {
-        let result = handle_main_window(
-          &app,
-          &window,
-          &app_data_root,
-          &storyteller_creds_manager,
-          &window_size_slot,
-          &app_startup_time,
-        ).await;
-        if let Err(err) = result {
-          error!("Error handling main window: {:?}", err);
-        }
-      }
-    }
-    tokio::time::sleep(std::time::Duration::from_millis(1_000)).await;
-  }
-}
-
-pub async fn handle_main_window(
-  app: &AppHandle,
-  window: &Window,
-  app_data_root: &AppDataRoot,
-  storyteller_creds_manager: &StorytellerCredentialManager,
-  window_size_slot: &CloneSlot<MainWindowSize>,
-  app_startup_time: &AppStartupTime,
-) -> AnyhowResult<()> {
-  loop {
-    log_errors(persist_window_resize_task(window, app_data_root, window_size_slot).await);
-    log_errors(persist_storyteller_cookies_task(app, storyteller_creds_manager, app_startup_time).await);
-    tokio::time::sleep(std::time::Duration::from_millis(1_000)).await;
-  }
-}
-
-pub fn log_errors<T>(result: AnyhowResult<T>) {
-  if let Err(err) = result {
-    error!("Error persisting window size: {:?}", err);
-  }
-}
@@ -1,3 +0,0 @@
-pub mod main_window_thread;
-pub mod persist_storyteller_cookies_task;
-pub mod persist_window_resize_task;
@@ -1,114 +0,0 @@
-use crate::state::app_startup_time::AppStartupTime;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::threads::sora_session_login_thread::LOGIN_WINDOW_NAME;
-use anyhow::anyhow;
-use chrono::TimeDelta;
-use errors::AnyhowResult;
-use log::{debug, error, info};
-use once_cell::sync::Lazy;
-use reqwest::Url;
-use std::fs;
-use std::sync::LockResult;
-use storyteller_client::credentials::storyteller_avt_cookie::StorytellerAvtCookie;
-use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use storyteller_client::credentials::storyteller_session_cookie::StorytellerSessionCookie;
-use tauri::{AppHandle, Manager, Webview, Window};
-use tauri_plugin_http::reqwest_cookie_store::CookieStore;
-use tauri_plugin_http::Http;
-
-const MAIN_WEBVIEW_NAME: &str = "main";
-
-const STORYTELLER_ROOT_COOKIE_URL_STR: &str = "https://api.storyteller.ai/";
-
-static STORYTELLER_ROOT_COOKIE_URL: Lazy<Url> = Lazy::new(|| {
-  Url::parse(STORYTELLER_ROOT_COOKIE_URL_STR).expect("URL should parse")
-});
-
-const AVT_COOKIE_NAME : &str = "visitor";
-const SESSION_COOKIE_NAME : &str = "session";
-
-/// There's some kind of race condition that we need to wait for before inspecting cookies.
-const RACE_CONDITION_WAIT_TIME: TimeDelta = TimeDelta::milliseconds(5000);
-
-pub async fn persist_storyteller_cookies_task(
-  app: &AppHandle,
-  storyteller_credential_manager: &StorytellerCredentialManager,
-  app_startup_time: &AppStartupTime,
-) -> AnyhowResult<()> {
-
-  //if app_startup_time.time_delta_since() < RACE_CONDITION_WAIT_TIME {
-  //  // NB:     There's an issue when the "main window thread" inquires about the
-  //  //     webview cookies shortly after app startup. When it attempts to dump the
-  //  //     cookies within a few milliseconds of app launch, it deadlocks and the
-  //  //     app never launches correctly. The entire webview goes blank and the app
-  //  //     freezes. This hack seems to fix the problem.
-  //  return Ok(())
-  //}
-
-  let maybe_http = app.try_state::<Http>();
-  
-  let http = match maybe_http {
-    None => {
-      error!("No HTTP plugin found");
-      return Err(anyhow!("No HTTP plugin found"));
-    }
-    Some(http) => http,
-  };
-  
-  match http.cookies_jar.store.lock() {
-    Err(err) => {
-      error!("Failed to lock cookie jar: {:?}", err);
-      return Err(anyhow!("Failed to lock cookie jar"));
-    }
-    Ok(cookie_jar) => {
-      sync_tauri_credentials(&cookie_jar, storyteller_credential_manager)?;
-    }
-  }
-  
-  Ok(())
-}
-
-fn sync_tauri_credentials(
-  cookie_store: &CookieStore,
-  storyteller_credential_manager: &StorytellerCredentialManager,
-) -> AnyhowResult<()> {
-  let current_http_plugin_credentials = get_credentials_from_cookie_store(cookie_store)?;
-
-  let mut replace_credentials = true;
-
-  let maybe_old_credentials = storyteller_credential_manager.get_credentials()?;
-
-  if let Some(old_credentials) = maybe_old_credentials {
-    if old_credentials.equals(&current_http_plugin_credentials) {
-      replace_credentials = false;
-    }
-  }
-  
-  if replace_credentials {
-    info!("Syncing ArtCraft credentials ...");
-    storyteller_credential_manager.set_credentials(&current_http_plugin_credentials)?;
-    // NB: tauri-plugin-http stores the credentials on disk, so we can defer to that for now.
-    //storyteller_credential_manager.persist_all_to_disk()?;
-  }
-  
-  Ok(())
-}
-
-pub fn get_credentials_from_cookie_store(cookie_jar: &CookieStore) -> AnyhowResult<StorytellerCredentialSet> {
-  let mut avt_cookie = None;
-  let mut session_cookie = None;
-
-  for cookie in cookie_jar.iter_unexpired() {
-    if let Some(avt) = StorytellerAvtCookie::maybe_from_cookie(&cookie) {
-      avt_cookie = Some(avt);
-    } else if let Some(session) = StorytellerSessionCookie::maybe_from_cookie(&cookie) {
-      session_cookie = Some(session);
-    }
-  }
-
-  Ok(StorytellerCredentialSet::initialize(
-    avt_cookie,
-    session_cookie,
-  ))
-}
--- a/Show More
+++ b/Show More