working through a review

src-tauri/src/commands/image_commands.rs

@@ -1,9 +1,11 @@
+use crate::commands::emit_busy;
 use crate::llm::AppState;
 use futures_util::StreamExt;
 use serde::{Deserialize, Serialize};
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
 use tauri::ipc::Channel;
+use tauri::AppHandle;
 
 // ponytail: DefaultHasher is fine for a cache filename — not crypto, just a stable key.
 
@@ -74,8 +76,18 @@ pub enum ImageEvent {
 #[tauri::command]
 pub async fn generate_image(
     state: tauri::State<'_, AppState>,
+    app: AppHandle,
     req: ImageRequest,
 ) -> Result<String, String> {
+    // ponytail: emit a global busy signal so the shell shows a working
+    // indicator even if the DM navigates away. Paired with the false below.
+    emit_busy(&app, true);
+    let result = generate_image_inner(state, req).await;
+    emit_busy(&app, false);
+    result
+}
+
+async fn generate_image_inner(state: tauri::State<'_, AppState>, req: ImageRequest) -> Result<String, String> {
     if cfg!(not(target_os = "macos")) {
         return Err("image generation is macOS-only via Ollama (for now)".into());
     }
@@ -100,6 +112,7 @@ pub async fn generate_image(
 #[tauri::command]
 pub async fn generate_image_stream(
     state: tauri::State<'_, AppState>,
+    app: AppHandle,
     req: ImageRequest,
     channel: Channel<ImageEvent>,
 ) -> Result<(), String> {
@@ -124,6 +137,9 @@ pub async fn generate_image_stream(
     // and progress flows through the channel. Errors become ImageEvent::Error.
     let channel = std::sync::Arc::new(channel);
     let ch = channel.clone();
+    // ponytail: only emit busy around the actual generation (not cache hits),
+    // and always balance it in the spawn — even on error.
+    emit_busy(&app, true);
     tauri::async_runtime::spawn(async move {
         match request_image_bytes(&config, &model, &req.prompt, Some(ch)).await {
             Ok(png_bytes) => {
@@ -134,6 +150,7 @@ pub async fn generate_image_stream(
                 let _ = channel.send(ImageEvent::Error(e));
             }
         }
+        emit_busy(&app, false);
     });
 
     Ok(())