fix: blind windows ci build fixes

.github/workflows/release.yml

@@ -69,19 +69,18 @@ jobs:
             target: "aarch64-unknown-linux-gnu"
             pkg_target: "latest-linux-arm64"
             nodecar_script: "build:linux-arm64"
-          # Future platforms can be added here:
-          # - platform: "windows-latest"
-          #   args: "--target x86_64-pc-windows-msvc"
-          #   arch: "x86_64"
-          #   target: "x86_64-pc-windows-msvc"
-          #   pkg_target: "latest-win-x64"
-          #   nodecar_script: "build:win-x64"
-          # - platform: "windows-latest"
-          #   args: "--target aarch64-pc-windows-msvc"
-          #   arch: "aarch64"
-          #   target: "aarch64-pc-windows-msvc"
-          #   pkg_target: "latest-win-arm64"
-          #   nodecar_script: "build:win-arm64"
+          - platform: "windows-11"
+            args: "--target x86_64-pc-windows-msvc"
+            arch: "x86_64"
+            target: "x86_64-pc-windows-msvc"
+            pkg_target: "latest-win-x64"
+            nodecar_script: "build:win-x64"
+          - platform: "windows-11-arm"
+            args: "--target aarch64-pc-windows-msvc"
+            arch: "aarch64"
+            target: "aarch64-pc-windows-msvc"
+            pkg_target: "latest-win-arm64"
+            nodecar_script: "build:win-arm64"
 
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/rolling-release.yml

@@ -68,6 +68,18 @@ jobs:
             target: "aarch64-unknown-linux-gnu"
             pkg_target: "latest-linux-arm64"
             nodecar_script: "build:linux-arm64"
+          - platform: "windows-11"
+            args: "--target x86_64-pc-windows-msvc"
+            arch: "x86_64"
+            target: "x86_64-pc-windows-msvc"
+            pkg_target: "latest-win-x64"
+            nodecar_script: "build:win-x64"
+          - platform: "windows-11-arm"
+            args: "--target aarch64-pc-windows-msvc"
+            arch: "aarch64"
+            target: "aarch64-pc-windows-msvc"
+            pkg_target: "latest-win-arm64"
+            nodecar_script: "build:win-arm64"
 
     runs-on: ${{ matrix.platform }}
     steps:

.vscode/settings.json

@@ -67,6 +67,7 @@
     "unlisten",
     "unrs",
     "vercel",
+    "winreg",
     "wiremock",
     "xattr",
     "zhom"

src-tauri/src/browser_runner.rs

@@ -3,7 +3,6 @@ use directories::BaseDirs;
 use serde::{Deserialize, Serialize};
 use std::fs::{self, create_dir_all};
 use std::path::{Path, PathBuf};
-use std::process::Command;
 use std::time::{SystemTime, UNIX_EPOCH};
 use sysinfo::{Pid, System};
 use tauri::Emitter;
@@ -35,6 +34,7 @@ pub struct BrowserProfile {
 mod macos {
   use super::*;
   use std::ffi::OsString;
+  use std::process::Command;
 
   pub fn is_tor_or_mullvad_browser(exe_name: &str, cmd: &[OsString], browser_type: &str) -> bool {
     match browser_type {
@@ -605,7 +605,10 @@ mod windows {
 
     if !output.status.success() {
       // Fallback: try without -requestPending
-      let mut fallback_cmd = Command::new(browser.get_executable_path(browser_dir)?);
+      let executable_path = browser
+        .get_executable_path(browser_dir)
+        .map_err(|e| format!("Failed to get executable path: {}", e))?;
+      let mut fallback_cmd = Command::new(executable_path);
       fallback_cmd.args(["-profile", &profile.profile_path, "-new-tab", url]);
 
       if let Some(parent_dir) = browser_dir
@@ -677,7 +680,7 @@ mod windows {
     browser_type: BrowserType,
     browser_dir: &Path,
   ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    let browser = create_browser(browser_type);
+    let browser = create_browser(browser_type.clone());
     let executable_path = browser
       .get_executable_path(browser_dir)
       .map_err(|e| format!("Failed to get executable path: {}", e))?;
@@ -772,6 +775,7 @@ mod windows {
 mod linux {
   use super::*;
   use std::ffi::OsString;
+  use std::process::Command;
 
   pub fn is_tor_or_mullvad_browser(
     _exe_name: &str,

src-tauri/src/default_browser.rs

@@ -305,7 +305,6 @@ mod windows {
     // This helps refresh the system's understanding of the changes
     unsafe {
       use std::ffi::c_void;
-      use std::ptr;
 
       // Declare the Windows API functions
       type UINT = u32;

src-tauri/src/extraction.rs

@@ -453,8 +453,6 @@ impl Extractor {
     zip_path: &Path,
     dest_dir: &Path,
   ) -> Result<PathBuf, Box<dyn std::error::Error + Send + Sync>> {
-    use std::io::Read;
-
     println!("Extracting ZIP archive on Windows: {}", zip_path.display());
 
     // Create destination directory if it doesn't exist
@@ -500,8 +498,6 @@ impl Extractor {
     zip_path: &Path,
     dest_dir: &Path,
   ) -> Result<PathBuf, Box<dyn std::error::Error + Send + Sync>> {
-    use std::io::Read;
-
     println!("Using Rust zip crate for extraction (Windows 7+ compatibility)");
 
     let file = fs::File::open(zip_path)?;