fix(tauri): scope Parakeet sidecar to macOS builds and improve UX

moinulmoin · moinulmoin · commit 2f54a5307d5c · 2025-10-08T15:12:23.000+06:00
- Remove externalBin from base config; add macOS-only tauri.macos.conf.json
- Restrict sidecar capabilities to macOS (drop from default/windows)
- Emit friendly 'parakeet-unavailable' event on spawn errors; show toast in UI
- Harden Swift sidecar (avoid force unwraps); fix build.rs invocation
- Update macOS build/release scripts to pass --config tauri.macos.conf.json

Why: prevent non-macOS build failures, enforce least-privilege, and improve error UX per Tauri v2 guidance.
diff --git a/scripts/build-notarized.sh b/scripts/build-notarized.sh
@@ -91,7 +91,7 @@ echo -e "${YELLOW}Cleaning previous builds...${NC}"
 rm -rf target/universal-apple-darwin/release/bundle
 
 # Build universal binary - Tauri will automatically sign and notarize
-cargo tauri build --target universal-apple-darwin --bundles app,dmg
+cargo tauri build --target universal-apple-darwin --bundles app,dmg --config tauri.macos.conf.json
 
 cd ..
 
diff --git a/scripts/rebuild-current-release.sh b/scripts/rebuild-current-release.sh
@@ -22,12 +22,12 @@ export COPYFILE_DISABLE=1
 echo -e "${GREEN}🔨 Building for both architectures...${NC}"
 echo -e "${YELLOW}Building for Intel (x86_64)...${NC}"
 cd src-tauri
-cargo tauri build --target x86_64-apple-darwin --bundles app
+cargo tauri build --target x86_64-apple-darwin --bundles app --config tauri.macos.conf.json
 cd ..
 
 echo -e "${YELLOW}Building for Apple Silicon (aarch64)...${NC}"
 cd src-tauri
-cargo tauri build --target aarch64-apple-darwin --bundles app
+cargo tauri build --target aarch64-apple-darwin --bundles app --config tauri.macos.conf.json
 cd ..
 
 # Create output directory
diff --git a/scripts/release-notarized.sh b/scripts/release-notarized.sh
@@ -132,7 +132,7 @@ echo -e "${GREEN}🔨 Building for both architectures...${NC}"
 # Build Intel version
 echo -e "${YELLOW}Building for Intel (x86_64)...${NC}"
 cd src-tauri
-cargo tauri build --target x86_64-apple-darwin
+cargo tauri build --target x86_64-apple-darwin --config tauri.macos.conf.json
 cd ..
 
 # Sign and notarize Intel build
@@ -147,7 +147,7 @@ fi
 # Build Apple Silicon version
 echo -e "${YELLOW}Building for Apple Silicon (aarch64)...${NC}"
 cd src-tauri
-cargo tauri build --target aarch64-apple-darwin
+cargo tauri build --target aarch64-apple-darwin --config tauri.macos.conf.json
 cd ..
 
 # Sign and notarize Apple Silicon build
diff --git a/scripts/release-separate.sh b/scripts/release-separate.sh
@@ -238,7 +238,7 @@ echo -e "${GREEN}🔨 Building x86_64 binary with notarization...${NC}"
 echo -e "${BLUE}This will take some time as it includes notarization...${NC}"
 
 cd src-tauri
-cargo tauri build --target x86_64-apple-darwin --bundles app,dmg
+cargo tauri build --target x86_64-apple-darwin --bundles app,dmg --config tauri.macos.conf.json
 cd ..
 
 # Find x86_64 build artifacts
@@ -277,7 +277,7 @@ echo -e "${GREEN}🔨 Building aarch64 binary with notarization...${NC}"
 echo -e "${BLUE}This will take some time as it includes notarization...${NC}"
 
 cd src-tauri
-cargo tauri build --target aarch64-apple-darwin --bundles app,dmg
+cargo tauri build --target aarch64-apple-darwin --bundles app,dmg --config tauri.macos.conf.json
 cd ..
 
 # Find aarch64 build artifacts
diff --git a/scripts/release-universal.sh b/scripts/release-universal.sh
@@ -167,7 +167,7 @@ echo -e "${BLUE}This will take some time as it includes notarization...${NC}"
 cd src-tauri
 
 # Build universal binary - Tauri will automatically sign and notarize
-cargo tauri build --target universal-apple-darwin --bundles app,dmg
+cargo tauri build --target universal-apple-darwin --bundles app,dmg --config tauri.macos.conf.json
 
 cd ..
 
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -80,10 +80,10 @@ git push origin "v${NEW_VERSION}"
 echo -e "${GREEN}🔨 Building for both architectures...${NC}"
 echo -e "${YELLOW}Building for Intel (x86_64)...${NC}"
 cd src-tauri
-cargo tauri build --target x86_64-apple-darwin
+cargo tauri build --target x86_64-apple-darwin --config tauri.macos.conf.json
 
 echo -e "${YELLOW}Building for Apple Silicon (aarch64)...${NC}"
-cargo tauri build --target aarch64-apple-darwin
+cargo tauri build --target aarch64-apple-darwin --config tauri.macos.conf.json
 cd ..
 
 # Fix archives to remove AppleDouble files
diff --git a/sidecar/parakeet-swift/Sources/main.swift b/sidecar/parakeet-swift/Sources/main.swift
@@ -79,8 +79,15 @@ struct ParakeetSidecar {
             guard !trimmed.isEmpty else { continue }
 
             do {
-                let data = trimmed.data(using: .utf8)!
-                let json = try JSONSerialization.jsonObject(with: data) as! [String: Any]
+                guard let data = trimmed.data(using: .utf8) else {
+                    sendError("invalid_encoding", message: "Failed to parse command payload", encoder: encoder)
+                    continue
+                }
+
+                guard let json = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+                    sendError("invalid_payload", message: "Command payload must be a JSON object", encoder: encoder)
+                    continue
+                }
 
                 switch json["type"] as? String {
                 case "load_model", "download_model":
@@ -153,8 +160,9 @@ struct ParakeetSidecar {
             isModelDownloaded = true
 
             // Initialize ASR manager with downloaded models
-            asrManager = AsrManager(config: .default)
-            try await asrManager!.initialize(models: models)
+            let manager = AsrManager(config: .default)
+            try await manager.initialize(models: models)
+            asrManager = manager
 
             log("✅ ASR manager initialized, model ready for use!")
             isModelLoaded = true
@@ -216,9 +224,14 @@ struct ParakeetSidecar {
             return
         }
 
+        guard let manager = asrManager else {
+            sendError("model_not_loaded", message: "Parakeet engine is not initialized", encoder: encoder)
+            return
+        }
+
         do {
             // Transcribe the audio file (returns ASRResult)
-            let result = try await asrManager!.transcribe(fileURL)
+            let result = try await manager.transcribe(fileURL)
 
             // Send transcription response
             let response = TranscriptionResponse(
diff --git a/src-tauri/build.rs b/src-tauri/build.rs
@@ -18,7 +18,7 @@ fn main() {
             std::fs::create_dir_all(&dist_dir).ok();
             
             let output = Command::new("bash")
-                .arg(&build_script)
+                .arg("build.sh")
                 .arg("release")
                 .current_dir(&sidecar_dir)
                 .output();
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
@@ -27,20 +27,6 @@
     "dialog:default",
     "fs:scope-appdata",
     "shell:allow-open",
-    {
-      "identifier": "shell:allow-spawn",
-      "allow": [
-        { "name": "parakeet-sidecar", "sidecar": true },
-        { "name": "parakeet-sidecar-aarch64-apple-darwin", "sidecar": true }
-      ]
-    },
-    {
-      "identifier": "shell:allow-stdin-write",
-      "allow": [
-        { "name": "parakeet-sidecar", "sidecar": true },
-        { "name": "parakeet-sidecar-aarch64-apple-darwin", "sidecar": true }
-      ]
-    },
     "autostart:allow-enable",
     "autostart:allow-disable",
     "autostart:allow-is-enabled",
diff --git a/src-tauri/capabilities/windows.json b/src-tauri/capabilities/windows.json
@@ -28,14 +28,6 @@
     "dialog:default",
     "fs:scope-appdata",
     "shell:allow-open",
-    { "identifier": "shell:allow-spawn", "allow": [
-      { "name": "parakeet-sidecar", "sidecar": true },
-      { "name": "parakeet-sidecar-x86_64-pc-windows-msvc", "sidecar": true }
-    ] },
-    { "identifier": "shell:allow-stdin-write", "allow": [
-      { "name": "parakeet-sidecar", "sidecar": true },
-      { "name": "parakeet-sidecar-x86_64-pc-windows-msvc", "sidecar": true }
-    ] },
     "autostart:allow-enable",
     "autostart:allow-disable",
     "autostart:allow-is-enabled",
diff --git a/src-tauri/src/parakeet/error.rs b/src-tauri/src/parakeet/error.rs
@@ -14,4 +14,6 @@ pub enum ParakeetError {
     Terminated,
     #[error("invalid transcription response payload")]
     InvalidResponse,
+    #[error("{0}")]
+    Unavailable(String),
 }
diff --git a/src-tauri/src/parakeet/manager.rs b/src-tauri/src/parakeet/manager.rs
@@ -1,12 +1,11 @@
 use std::path::PathBuf;
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
 use log::{info, warn};
 use reqwest::Client;
 use serde::Serialize;
-use tauri::AppHandle;
-use tokio::io::AsyncWriteExt;
+use tauri::{AppHandle, Emitter};
 
 use super::error::ParakeetError;
 use super::messages::{ParakeetCommand, ParakeetResponse};
@@ -33,6 +32,8 @@ pub struct ParakeetManager {
     http: Client,
 }
 
+const PARAKEET_UNAVAILABLE_EVENT: &str = "parakeet-unavailable";
+
 impl ParakeetManager {
     pub fn new(root_dir: PathBuf) -> Self {
         Self {
@@ -142,7 +143,7 @@ impl ParakeetManager {
         };
 
         // Send to sidecar and let it handle the download
-        match self.client.send(app, &command).await {
+        match self.send_command(app, &command).await {
             Ok(ParakeetResponse::Ok { .. }) | Ok(ParakeetResponse::Status { loaded_model: Some(_), .. }) => {
                 // Swift sidecar returns StatusResponse with loaded_model when download completes
                 // Mark as downloaded since Swift handles it
@@ -163,7 +164,7 @@ impl ParakeetManager {
         };
 
         // Send delete_model command to Swift sidecar to remove FluidAudio cached files
-        match self.client.send(app, &ParakeetCommand::DeleteModel {}).await {
+        match self.send_command(app, &ParakeetCommand::DeleteModel {}).await {
             Ok(ParakeetResponse::Ok { .. }) | Ok(ParakeetResponse::Status { .. }) => {
                 // Successfully deleted
             }
@@ -212,7 +213,7 @@ impl ParakeetManager {
             eager_unload: Some(false),
         };
 
-        match self.client.send(app, &command).await? {
+        match self.send_command(app, &command).await? {
             ParakeetResponse::Ok { .. } => Ok(()),
             ParakeetResponse::Error { code, message, .. } => {
                 Err(ParakeetError::SidecarError { code, message })
@@ -244,7 +245,7 @@ impl ParakeetManager {
             local_attention_context: None,
         };
 
-        self.client.send(app, &command).await
+        self.send_command(app, &command).await
     }
 
     fn file_url(&self, definition: &ParakeetModelDefinition, filename: &str) -> String {
@@ -256,7 +257,7 @@ impl ParakeetManager {
 
     /// Check if the Parakeet sidecar is healthy and can respond to commands
     pub async fn health_check(&self, app: &AppHandle) -> Result<bool, ParakeetError> {
-        match self.client.send(app, &ParakeetCommand::Status {}).await {
+        match self.send_command(app, &ParakeetCommand::Status {}).await {
             Ok(ParakeetResponse::Status { .. }) => Ok(true),
             Ok(_) => Ok(true), // Any successful response is good
             Err(e) => {
@@ -269,4 +270,33 @@ impl ParakeetManager {
     pub async fn shutdown(&self) {
         self.client.shutdown().await;
     }
+
+    fn friendly_spawn_message(details: &str) -> String {
+        format!(
+            "Parakeet is unavailable. Please reinstall VoiceTypr or remove the quarantine flag by running `xattr -dr com.apple.quarantine /Applications/VoiceTypr.app`. Details: {}",
+            details
+        )
+    }
+
+    fn emit_unavailable(app: &AppHandle, message: &str) {
+        if let Err(err) = app.emit(PARAKEET_UNAVAILABLE_EVENT, message.to_string()) {
+            warn!("Failed to emit Parakeet unavailable event: {err:?}");
+        }
+    }
+
+    async fn send_command(
+        &self,
+        app: &AppHandle,
+        command: &ParakeetCommand,
+    ) -> Result<ParakeetResponse, ParakeetError> {
+        match self.client.send(app, command).await {
+            Ok(response) => Ok(response),
+            Err(ParakeetError::SpawnError(details)) => {
+                let message = Self::friendly_spawn_message(&details);
+                Self::emit_unavailable(app, &message);
+                Err(ParakeetError::Unavailable(message))
+            }
+            Err(err) => Err(err),
+        }
+    }
 }
diff --git a/src-tauri/src/tests/settings_commands.rs b/src-tauri/src/tests/settings_commands.rs
@@ -22,6 +22,7 @@ mod tests {
         let settings = Settings {
             hotkey: "CommandOrControl+A".to_string(),
             current_model: "base".to_string(),
+            current_model_engine: "whisper".to_string(),
             language: "es".to_string(),
             theme: "dark".to_string(),
             transcription_cleanup_days: Some(7),
@@ -78,6 +79,7 @@ mod tests {
         let settings = Settings {
             hotkey: "CommandOrControl+B".to_string(),
             current_model: "tiny".to_string(),
+            current_model_engine: "whisper".to_string(),
             language: "fr".to_string(),
             theme: "light".to_string(),
             transcription_cleanup_days: Some(30),
@@ -155,13 +157,15 @@ mod tests {
         // Empty model means auto-select
         let auto_settings = Settings {
             current_model: "".to_string(),
+            current_model_engine: "whisper".to_string(),
             ..Settings::default()
         };
         assert_eq!(auto_settings.current_model, "");
 
         // Specific model
         let specific_settings = Settings {
             current_model: "base".to_string(),
+            current_model_engine: "whisper".to_string(),
             ..Settings::default()
         };
         assert_eq!(specific_settings.current_model, "base");
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -45,9 +45,6 @@
       "app",
       "dmg"
     ],
-    "externalBin": [
-      "../sidecar/parakeet-swift/dist/parakeet-sidecar"
-    ],
     "icon": [
       "icons/32x32.png",
       "icons/128x128.png",
diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://schema.tauri.app/config/2",
+  "bundle": {
+    "externalBin": [
+      "../sidecar/parakeet-swift/dist/parakeet-sidecar"
+    ]
+  }
+}
diff --git a/src/components/AppContainer.tsx b/src/components/AppContainer.tsx
@@ -86,6 +86,17 @@ export function AppContainer() {
           toast.error(event.payload as string);
         });
 
+        registerEvent<string>("parakeet-unavailable", (message) => {
+          const description = typeof message === "string" && message.trim().length > 0
+            ? message
+            : "Parakeet is unavailable on this Mac. Please reinstall VoiceTypr or remove the quarantine flag.";
+          console.error("Parakeet unavailable:", description);
+          toast.error("Parakeet Unavailable", {
+            description,
+            duration: 8000
+          });
+        });
+
         // Listen for license-required event and navigate to License section
         registerEvent<{ title: string; message: string; action?: string }>(
           "license-required", 
diff --git a/src/components/onboarding/OnboardingDesktop.tsx b/src/components/onboarding/OnboardingDesktop.tsx
@@ -245,7 +245,13 @@ export const OnboardingDesktop = function OnboardingDesktop({
       // automation check removed for now
       case "models":
         // User can proceed if they have selected a model that is downloaded
-        return settings?.current_model !== null && settings?.current_model !== "" && models[settings.current_model]?.downloaded === true;
+        {
+          const currentModel = settings?.current_model;
+          if (!currentModel) {
+            return false;
+          }
+          return models[currentModel]?.downloaded === true;
+        }
       default:
         return true;
     }
diff --git a/src/lib/EventCoordinator.ts b/src/lib/EventCoordinator.ts
@@ -154,6 +154,7 @@ export class EventCoordinator {
       // Error events go to pill window (where recording UI is shown)
       "transcription-error": "pill",
       "recording-error": "pill",
+      "parakeet-unavailable": "main",
       
       // Debug events
       "test-event": "pill",
