diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a90d2cc4f..e13c732f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,3 +92,29 @@ jobs: run: npm ci - name: Tauri debug build run: npm run tauri -- build --debug --no-bundle + + build-windows: + runs-on: windows-latest + needs: + - lint + - typecheck + - test-js + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: "20" + cache: "npm" + - uses: dtolnay/rust-toolchain@stable + - name: Install LLVM (bindgen) + run: choco install llvm -y --no-progress + - name: Configure LLVM (bindgen) + run: | + echo "LIBCLANG_PATH=C:\\Program Files\\LLVM\\bin" >> $env:GITHUB_ENV + echo "C:\\Program Files\\LLVM\\bin" >> $env:GITHUB_PATH + - name: Install dependencies + run: npm ci + - name: Doctor (Windows) + run: npm run doctor:win + - name: Tauri debug build (Windows) + run: npm run tauri -- build --debug --no-bundle --config src-tauri/tauri.windows.conf.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 16995297c..d961f5cc5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -235,12 +235,74 @@ jobs: src-tauri/target/release/bundle/appimage/*.AppImage* src-tauri/target/release/bundle/rpm/*.rpm + build_windows: + runs-on: windows-latest + environment: release + env: + TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }} + TAURI_SIGNING_PRIVATE_KEY_B64: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_B64 }} + steps: + - uses: actions/checkout@v4 + + - name: setup node + uses: actions/setup-node@v4 + with: + node-version: lts/* + cache: npm + + - name: install Rust stable + uses: dtolnay/rust-toolchain@stable + + - name: Install LLVM (bindgen) + run: choco install llvm -y --no-progress + + - name: Configure LLVM (bindgen) + run: | + echo "LIBCLANG_PATH=C:\\Program Files\\LLVM\\bin" >> $env:GITHUB_ENV + echo "C:\\Program Files\\LLVM\\bin" >> $env:GITHUB_PATH + + - name: install frontend dependencies + run: npm ci + + - name: Write Tauri signing key + shell: bash + run: | + set -euo pipefail + python - <<'PY' + import base64 + import os + from pathlib import Path + + raw = base64.b64decode(os.environ["TAURI_SIGNING_PRIVATE_KEY_B64"]) + home = Path.home() + target = home / ".tauri" + target.mkdir(parents=True, exist_ok=True) + (target / "codexmonitor.key").write_bytes(raw) + PY + + - name: build windows bundles + shell: bash + run: | + set -euo pipefail + export TAURI_SIGNING_PRIVATE_KEY + TAURI_SIGNING_PRIVATE_KEY="$(cat "$HOME/.tauri/codexmonitor.key")" + npm run tauri:build:win + + - name: Upload Windows artifacts + uses: actions/upload-artifact@v4 + with: + name: windows-artifacts + path: | + src-tauri/target/release/bundle/nsis/*.exe* + src-tauri/target/release/bundle/msi/*.msi* + release: runs-on: ubuntu-latest environment: release needs: - build_macos - build_linux + - build_windows steps: - name: Checkout uses: actions/checkout@v4 @@ -260,6 +322,11 @@ jobs: path: release-artifacts merge-multiple: true + - name: Download Windows artifacts + uses: actions/download-artifact@v4 + with: + name: windows-artifacts + path: release-artifacts - name: Validate RPM artifacts run: | set -euo pipefail @@ -377,6 +444,37 @@ jobs: "signature": sig_path.read_text().strip(), } + exe_candidates = sorted(artifacts_dir.rglob("*.exe"), key=lambda p: p.name.lower()) + windows_installer = None + preferred_installers = [] + for candidate in exe_candidates: + lowered = candidate.name.lower() + if "codexmonitor" in lowered and ("setup" in lowered or "installer" in lowered): + preferred_installers.append(candidate) + if preferred_installers: + windows_installer = preferred_installers[0] + else: + for candidate in exe_candidates: + lowered = candidate.name.lower() + if "setup" in lowered or "installer" in lowered: + windows_installer = candidate + break + if windows_installer is None and exe_candidates: + windows_installer = exe_candidates[0] + if windows_installer is None: + raise SystemExit("No Windows installer (.exe) found for latest.json") + + print(f"Selected Windows installer for latest.json: {windows_installer.name}") + + win_sig_path = windows_installer.with_suffix(windows_installer.suffix + ".sig") + if not win_sig_path.exists(): + raise SystemExit(f"Missing signature for {windows_installer.name}") + + platforms["windows-x86_64"] = { + "url": f"https://github.com/Dimillian/CodexMonitor/releases/download/v${VERSION}/{windows_installer.name}", + "signature": win_sig_path.read_text().strip(), + } + payload = { "version": "${VERSION}", "notes": notes, @@ -404,11 +502,23 @@ jobs: shopt -s nullglob globstar appimages=(release-artifacts/**/*.AppImage*) mapfile -t rpms < <(find release-artifacts -type f -name '*.rpm' | sort) + mapfile -t windows_exes < <(find release-artifacts -type f -name '*.exe*' | sort) + mapfile -t windows_msis < <(find release-artifacts -type f -name '*.msi*' | sort) if [ ${#rpms[@]} -eq 0 ]; then echo "No RPM artifacts found for release upload" find release-artifacts -type f | sort exit 1 fi + if [ ${#windows_exes[@]} -eq 0 ]; then + echo "No Windows .exe artifacts found for release upload" + find release-artifacts -type f | sort + exit 1 + fi + if [ ${#windows_msis[@]} -eq 0 ]; then + echo "No Windows .msi artifacts found for release upload" + find release-artifacts -type f | sort + exit 1 + fi gh release create "v${VERSION}" \ --title "v${VERSION}" \ @@ -420,6 +530,8 @@ jobs: release-artifacts/CodexMonitor.app.tar.gz.sig \ "${appimages[@]}" \ "${rpms[@]}" \ + "${windows_exes[@]}" \ + "${windows_msis[@]}" \ release-artifacts/latest.json - name: Bump version and open PR diff --git a/README.md b/README.md index 9c46250ef..6e45a0f7e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![CodexMonitor](screenshot.png) -CodexMonitor is a macOS Tauri app for orchestrating multiple Codex agents across local workspaces. It provides a sidebar to manage projects, a home screen for quick actions, and a conversation view backed by the Codex app-server protocol. +CodexMonitor is a Tauri app for orchestrating multiple Codex agents across local workspaces. It provides a sidebar to manage projects, a home screen for quick actions, and a conversation view backed by the Codex app-server protocol. ## Features @@ -31,7 +31,7 @@ CodexMonitor is a macOS Tauri app for orchestrating multiple Codex agents across ### Files & Prompts -- File tree with search, file-type icons, and Reveal in Finder. +- File tree with search, file-type icons, and Reveal in Finder/Explorer. - Prompt library for global/workspace prompts: create/edit/delete/move and run in current or new threads. ### UI & Experience @@ -40,13 +40,14 @@ CodexMonitor is a macOS Tauri app for orchestrating multiple Codex agents across - Responsive layouts (desktop/tablet/phone) with tabbed navigation. - Sidebar usage and credits meter for account rate limits plus a home usage snapshot. - Terminal dock with multiple tabs for background commands (experimental). -- In-app updates with toast-driven download/install, debug panel copy/clear, sound notifications, and macOS overlay title bar with vibrancy + reduced transparency toggle. +- In-app updates with toast-driven download/install, debug panel copy/clear, sound notifications, plus platform-specific window effects (macOS overlay title bar + vibrancy) and a reduced transparency toggle. ## Requirements - Node.js + npm - Rust toolchain (stable) -- CMake (required for native dependencies; Whisper/dictation uses it on non-Windows) +- CMake (required for native dependencies; dictation/Whisper uses it) +- LLVM/Clang (required on Windows to build dictation dependencies via bindgen) - Codex installed on your system and available as `codex` in `PATH` - Git CLI (used for worktree operations) - GitHub CLI (`gh`) for the Issues panel (optional) @@ -74,13 +75,13 @@ npm run tauri dev ## Release Build -Build the production Tauri bundle (app + dmg): +Build the production Tauri bundle: ```bash npm run tauri build ``` -The macOS app bundle will be in `src-tauri/target/release/bundle/macos/`. +Artifacts will be in `src-tauri/target/release/bundle/` (platform-specific subfolders). ### Windows (opt-in) @@ -94,8 +95,8 @@ Artifacts will be in: - `src-tauri/target/release/bundle/nsis/` (installer exe) - `src-tauri/target/release/bundle/msi/` (msi) - -Note: dictation is currently disabled on Windows builds (to avoid requiring LLVM/libclang for `whisper-rs`/bindgen). + +Note: building from source on Windows requires LLVM/Clang (for `bindgen` / `libclang`) in addition to CMake. ## Type Checking diff --git a/docs/changelog.html b/docs/changelog.html index 52df64ca8..d90c6c331 100644 --- a/docs/changelog.html +++ b/docs/changelog.html @@ -81,7 +81,7 @@

Changelog

Codex Monitor app icon Codex Monitor -

macOS Codex agents orchestration, built by and for individuals who ship fast.

+

Desktop Codex agent orchestration, built by and for individuals who ship fast.

Features diff --git a/docs/index.html b/docs/index.html index 892eda6a9..dac37be0c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ Codex Monitor - Orchestrate Codex agents across your workspaces
-
macOS command center for Codex
+
Desktop command center for Codex

Monitor your Codex situation.

Orchestrate any number of Codex agents across any number of projects in a beautifully crafted @@ -77,7 +77,7 @@

Monitor your Codex situation.

Platform - macOS + Linux + macOS + Windows + Linux
@@ -129,7 +129,7 @@

Skills + prompts

Updater + polish

-

Toast-driven updates, resizable panels, and a macOS overlay title bar.

+

Toast-driven updates, resizable panels, and platform-specific window chrome.

@@ -412,7 +412,7 @@

Ready to monitor every agent run?

Codex Monitor app icon Codex Monitor -

macOS Codex agents orchestration, built by and for individuals who ship fast.

+

Desktop Codex agent orchestration, built by and for individuals who ship fast.

Features diff --git a/scripts/doctor.mjs b/scripts/doctor.mjs index b247cb4ad..e351a1105 100644 --- a/scripts/doctor.mjs +++ b/scripts/doctor.mjs @@ -1,16 +1,50 @@ -import { spawnSync } from "node:child_process"; +import fs from "node:fs"; +import path from "node:path"; const strict = process.argv.includes("--strict"); +function isExecutableFile(filePath) { + try { + const stat = fs.statSync(filePath); + if (!stat.isFile()) return false; + if (process.platform === "win32") return true; + fs.accessSync(filePath, fs.constants.X_OK); + return true; + } catch { + return false; + } +} + function hasCommand(command) { - const checker = process.platform === "win32" ? "where" : "command"; - const checkerArgs = process.platform === "win32" ? [command] : ["-v", command]; - const result = spawnSync(checker, checkerArgs, { stdio: "ignore" }); - return result.status === 0; + const pathValue = process.env.PATH; + if (!pathValue) return false; + + const dirs = pathValue.split(path.delimiter).filter(Boolean); + + if (process.platform !== "win32") { + return dirs.some((dir) => isExecutableFile(path.join(dir, command))); + } + + const pathExtValue = process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM"; + const exts = pathExtValue.split(";").filter(Boolean); + const hasExtension = path.extname(command) !== ""; + + for (const dir of dirs) { + if (hasExtension) { + if (isExecutableFile(path.join(dir, command))) return true; + continue; + } + for (const ext of exts) { + if (isExecutableFile(path.join(dir, `${command}${ext}`))) return true; + } + } + + return false; } const missing = []; if (!hasCommand("cmake")) missing.push("cmake"); +if (process.platform === "win32" && !hasCommand("clang")) missing.push("llvm"); if (missing.length === 0) { console.log("Doctor: OK"); @@ -29,8 +63,9 @@ switch (process.platform) { console.log("Arch: sudo pacman -S cmake"); break; case "win32": - console.log("Install: choco install cmake"); + console.log("Install: choco install cmake llvm"); console.log("Or download from: https://cmake.org/download/"); + console.log("If bindgen fails, set LIBCLANG_PATH to your LLVM bin directory."); break; default: console.log("Install CMake from: https://cmake.org/download/"); @@ -38,4 +73,3 @@ switch (process.platform) { } process.exit(strict ? 1 : 0); - diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 809ce302f..9762b1534 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -46,8 +46,6 @@ toml = "0.8" [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies] tauri-plugin-updater = "2" tauri-plugin-window-state = "2" - -[target."cfg(not(target_os = \"windows\"))".dependencies] cpal = "0.15" whisper-rs = "0.12" sha2 = "0.10" diff --git a/src-tauri/src/backend/app_server.rs b/src-tauri/src/backend/app_server.rs index a0eb1c8e7..552430c25 100644 --- a/src-tauri/src/backend/app_server.rs +++ b/src-tauri/src/backend/app_server.rs @@ -13,10 +13,13 @@ use tokio::sync::{mpsc, oneshot, Mutex}; use tokio::time::timeout; use crate::backend::events::{AppServerEvent, EventSink}; -use crate::shared::process_core::tokio_command; -use crate::codex::args::apply_codex_args; +use crate::shared::process_core::{kill_child_process_tree, tokio_command}; +use crate::codex::args::parse_codex_args; use crate::types::WorkspaceEntry; +#[cfg(target_os = "windows")] +use crate::shared::process_core::{build_cmd_c_command, resolve_windows_executable}; + fn extract_thread_id(value: &Value) -> Option { let params = value.get("params")?; @@ -97,73 +100,143 @@ impl WorkspaceSession { } pub(crate) fn build_codex_path_env(codex_bin: Option<&str>) -> Option { - let mut paths: Vec = env::var("PATH") - .unwrap_or_default() - .split(':') - .filter(|value| !value.is_empty()) - .map(|value| value.to_string()) - .collect(); - let mut extras = vec![ - "/opt/homebrew/bin", - "/usr/local/bin", - "/usr/bin", - "/bin", - "/usr/sbin", - "/sbin", - ] - .into_iter() - .map(|value| value.to_string()) - .collect::>(); - if let Ok(home) = env::var("HOME") { - extras.push(format!("{home}/.local/bin")); - extras.push(format!("{home}/.local/share/mise/shims")); - extras.push(format!("{home}/.cargo/bin")); - extras.push(format!("{home}/.bun/bin")); - let nvm_root = Path::new(&home).join(".nvm/versions/node"); - if let Ok(entries) = std::fs::read_dir(nvm_root) { - for entry in entries.flatten() { - let bin_path = entry.path().join("bin"); - if bin_path.is_dir() { - extras.push(bin_path.to_string_lossy().to_string()); + let mut paths: Vec = env::var_os("PATH") + .map(|value| env::split_paths(&value).collect()) + .unwrap_or_default(); + + let mut extras: Vec = Vec::new(); + + #[cfg(not(target_os = "windows"))] + { + extras.extend([ + "/opt/homebrew/bin", + "/usr/local/bin", + "/usr/bin", + "/bin", + "/usr/sbin", + "/sbin", + ].into_iter().map(PathBuf::from)); + + if let Ok(home) = env::var("HOME") { + let home_path = Path::new(&home); + extras.push(home_path.join(".local/bin")); + extras.push(home_path.join(".local/share/mise/shims")); + extras.push(home_path.join(".cargo/bin")); + extras.push(home_path.join(".bun/bin")); + let nvm_root = home_path.join(".nvm/versions/node"); + if let Ok(entries) = std::fs::read_dir(nvm_root) { + for entry in entries.flatten() { + let bin_path = entry.path().join("bin"); + if bin_path.is_dir() { + extras.push(bin_path); + } } } } } + + #[cfg(target_os = "windows")] + { + if let Ok(appdata) = env::var("APPDATA") { + extras.push(Path::new(&appdata).join("npm")); + } + if let Ok(local_app_data) = env::var("LOCALAPPDATA") { + extras.push( + Path::new(&local_app_data) + .join("Microsoft") + .join("WindowsApps"), + ); + } + if let Ok(home) = env::var("USERPROFILE").or_else(|_| env::var("HOME")) { + let home_path = Path::new(&home); + extras.push(home_path.join(".cargo").join("bin")); + extras.push(home_path.join("scoop").join("shims")); + } + if let Ok(program_data) = env::var("PROGRAMDATA") { + extras.push(Path::new(&program_data).join("chocolatey").join("bin")); + } + } + if let Some(bin_path) = codex_bin.filter(|value| !value.trim().is_empty()) { - let parent = Path::new(bin_path).parent(); - if let Some(parent) = parent { - extras.push(parent.to_string_lossy().to_string()); + if let Some(parent) = Path::new(bin_path).parent() { + extras.push(parent.to_path_buf()); } } + for extra in extras { - if !paths.contains(&extra) { + if !paths.iter().any(|path| path == &extra) { paths.push(extra); } } + if paths.is_empty() { - None - } else { - Some(paths.join(":")) + return None; } + + env::join_paths(paths) + .ok() + .map(|joined| joined.to_string_lossy().to_string()) } -pub(crate) fn build_codex_command_with_bin(codex_bin: Option) -> Command { +pub(crate) fn build_codex_command_with_bin( + codex_bin: Option, + codex_args: Option<&str>, + args: Vec, +) -> Result { let bin = codex_bin .clone() .filter(|value| !value.trim().is_empty()) .unwrap_or_else(|| "codex".into()); - let mut command = tokio_command(bin); - if let Some(path_env) = build_codex_path_env(codex_bin.as_deref()) { + + let path_env = build_codex_path_env(codex_bin.as_deref()); + let mut command_args = parse_codex_args(codex_args)?; + command_args.extend(args); + + #[cfg(target_os = "windows")] + let mut command = { + let bin_trimmed = bin.trim(); + let resolved = resolve_windows_executable(bin_trimmed, path_env.as_deref()); + let resolved_path = resolved + .as_deref() + .unwrap_or_else(|| Path::new(bin_trimmed)); + let ext = resolved_path + .extension() + .and_then(|ext| ext.to_str()) + .map(|ext| ext.to_ascii_lowercase()); + + if matches!(ext.as_deref(), Some("cmd") | Some("bat")) { + let mut command = tokio_command("cmd"); + let command_line = build_cmd_c_command(resolved_path, &command_args)?; + command.arg("/D"); + command.arg("/S"); + command.arg("/C"); + command.arg(command_line); + command + } else { + let mut command = tokio_command(resolved_path); + command.args(command_args); + command + } + }; + + #[cfg(not(target_os = "windows"))] + let mut command = { + let mut command = tokio_command(bin.trim()); + command.args(command_args); + command + }; + + if let Some(path_env) = path_env { command.env("PATH", path_env); } - command + Ok(command) } pub(crate) async fn check_codex_installation( codex_bin: Option, ) -> Result, String> { - let mut command = build_codex_command_with_bin(codex_bin); - command.arg("--version"); + let mut command = + build_codex_command_with_bin(codex_bin, None, vec!["--version".to_string()])?; command.stdout(std::process::Stdio::piped()); command.stderr(std::process::Stdio::piped()); @@ -222,10 +295,12 @@ pub(crate) async fn spawn_workspace_session( .or(default_codex_bin); let _ = check_codex_installation(codex_bin.clone()).await?; - let mut command = build_codex_command_with_bin(codex_bin); - apply_codex_args(&mut command, codex_args.as_deref())?; + let mut command = build_codex_command_with_bin( + codex_bin, + codex_args.as_deref(), + vec!["app-server".to_string()], + )?; command.current_dir(&entry.path); - command.arg("app-server"); if let Some(codex_home) = codex_home { command.env("CODEX_HOME", codex_home); } @@ -355,7 +430,7 @@ pub(crate) async fn spawn_workspace_session( Ok(response) => response, Err(_) => { let mut child = session.child.lock().await; - let _ = child.kill().await; + kill_child_process_tree(&mut child).await; return Err( "Codex app-server did not respond to initialize. Check that `codex app-server` works in Terminal." .to_string(), diff --git a/src-tauri/src/codex/args.rs b/src-tauri/src/codex/args.rs index 8c4cd6d83..c0fb0b9f2 100644 --- a/src-tauri/src/codex/args.rs +++ b/src-tauri/src/codex/args.rs @@ -1,5 +1,3 @@ -use tokio::process::Command; - use crate::types::{AppSettings, WorkspaceEntry}; pub(crate) fn parse_codex_args(value: Option<&str>) -> Result, String> { @@ -12,14 +10,6 @@ pub(crate) fn parse_codex_args(value: Option<&str>) -> Result, Strin .map(|args| args.into_iter().filter(|arg| !arg.is_empty()).collect()) } -pub(crate) fn apply_codex_args(command: &mut Command, value: Option<&str>) -> Result<(), String> { - let args = parse_codex_args(value)?; - if !args.is_empty() { - command.args(args); - } - Ok(()) -} - pub(crate) fn resolve_workspace_codex_args( entry: &WorkspaceEntry, parent_entry: Option<&WorkspaceEntry>, diff --git a/src-tauri/src/codex/mod.rs b/src-tauri/src/codex/mod.rs index 9f6423d20..a93953a3e 100644 --- a/src-tauri/src/codex/mod.rs +++ b/src-tauri/src/codex/mod.rs @@ -24,7 +24,6 @@ use crate::remote_backend; use crate::shared::codex_core; use crate::state::AppState; use crate::types::WorkspaceEntry; -use self::args::apply_codex_args; pub(crate) async fn spawn_workspace_session( entry: WorkspaceEntry, @@ -66,10 +65,11 @@ pub(crate) async fn codex_doctor( .or(default_args); let path_env = build_codex_path_env(resolved.as_deref()); let version = check_codex_installation(resolved.clone()).await?; - let mut command = build_codex_command_with_bin(resolved.clone()); - apply_codex_args(&mut command, resolved_args.as_deref())?; - command.arg("app-server"); - command.arg("--help"); + let mut command = build_codex_command_with_bin( + resolved.clone(), + resolved_args.as_deref(), + vec!["app-server".to_string(), "--help".to_string()], + )?; command.stdout(std::process::Stdio::piped()); command.stderr(std::process::Stdio::piped()); let app_server_ok = match timeout(Duration::from_secs(5), command.output()).await { diff --git a/src-tauri/src/dictation/mod.rs b/src-tauri/src/dictation/mod.rs index 8fe265c37..fe9b8f970 100644 --- a/src-tauri/src/dictation/mod.rs +++ b/src-tauri/src/dictation/mod.rs @@ -1,9 +1,4 @@ -#[cfg(not(target_os = "windows"))] #[path = "real.rs"] mod imp; -#[cfg(target_os = "windows")] -#[path = "stub.rs"] -mod imp; - pub(crate) use imp::*; diff --git a/src-tauri/src/dictation/stub.rs b/src-tauri/src/dictation/stub.rs deleted file mode 100644 index 5cb8a14ee..000000000 --- a/src-tauri/src/dictation/stub.rs +++ /dev/null @@ -1,195 +0,0 @@ -use serde::Serialize; -use tauri::{AppHandle, Emitter, State}; - -use crate::state::AppState; - -const DEFAULT_MODEL_ID: &str = "base"; -const UNSUPPORTED_MESSAGE: &str = "Dictation is not supported on Windows builds."; - -#[derive(Debug, Serialize, Clone, Copy, PartialEq, Eq)] -#[serde(rename_all = "lowercase")] -pub(crate) enum DictationModelState { - Missing, - Downloading, - Ready, - Error, -} - -#[derive(Debug, Serialize, Clone)] -pub(crate) struct DictationDownloadProgress { - #[serde(rename = "downloadedBytes")] - pub(crate) downloaded_bytes: u64, - #[serde(rename = "totalBytes")] - pub(crate) total_bytes: Option, -} - -#[derive(Debug, Serialize, Clone)] -pub(crate) struct DictationModelStatus { - pub(crate) state: DictationModelState, - #[serde(rename = "modelId")] - pub(crate) model_id: String, - pub(crate) progress: Option, - pub(crate) error: Option, - pub(crate) path: Option, -} - -#[derive(Debug, Serialize, Clone, Copy, PartialEq, Eq)] -#[serde(rename_all = "lowercase")] -pub(crate) enum DictationSessionState { - Idle, - Listening, - Processing, -} - -#[derive(Debug, Serialize, Clone)] -#[serde(tag = "type", rename_all = "snake_case")] -pub(crate) enum DictationEvent { - State { state: DictationSessionState }, - Level { value: f32 }, - Transcript { text: String }, - Error { message: String }, - Canceled { message: String }, -} - -pub(crate) struct DictationState { - pub(crate) model_status: DictationModelStatus, - pub(crate) session_state: DictationSessionState, -} - -impl Default for DictationState { - fn default() -> Self { - Self { - model_status: DictationModelStatus { - state: DictationModelState::Error, - model_id: DEFAULT_MODEL_ID.to_string(), - progress: None, - error: Some(UNSUPPORTED_MESSAGE.to_string()), - path: None, - }, - session_state: DictationSessionState::Idle, - } - } -} - -fn emit_status(app: &AppHandle, status: &DictationModelStatus) { - let _ = app.emit("dictation-download", status); -} - -fn emit_event(app: &AppHandle, event: DictationEvent) { - let _ = app.emit("dictation-event", event); -} - -fn windows_unsupported_status(model_id: Option) -> DictationModelStatus { - DictationModelStatus { - state: DictationModelState::Error, - model_id: model_id.unwrap_or_else(|| DEFAULT_MODEL_ID.to_string()), - progress: None, - error: Some(UNSUPPORTED_MESSAGE.to_string()), - path: None, - } -} - -#[tauri::command] -pub(crate) async fn dictation_model_status( - app: AppHandle, - state: State<'_, AppState>, - model_id: Option, -) -> Result { - let status = windows_unsupported_status(model_id); - { - let mut dictation = state.dictation.lock().await; - dictation.model_status = status.clone(); - dictation.session_state = DictationSessionState::Idle; - } - emit_status(&app, &status); - Ok(status) -} - -#[tauri::command] -pub(crate) async fn dictation_download_model( - app: AppHandle, - state: State<'_, AppState>, - model_id: Option, -) -> Result { - let status = dictation_model_status(app.clone(), state, model_id).await?; - emit_event( - &app, - DictationEvent::Error { - message: status - .error - .clone() - .unwrap_or_else(|| "Dictation is unavailable on Windows.".to_string()), - }, - ); - Ok(status) -} - -#[tauri::command] -pub(crate) async fn dictation_cancel_download( - app: AppHandle, - state: State<'_, AppState>, - model_id: Option, -) -> Result { - dictation_model_status(app, state, model_id).await -} - -#[tauri::command] -pub(crate) async fn dictation_remove_model( - app: AppHandle, - state: State<'_, AppState>, - model_id: Option, -) -> Result { - dictation_model_status(app, state, model_id).await -} - -#[tauri::command] -pub(crate) async fn dictation_start( - _preferred_language: Option, - app: AppHandle, - state: State<'_, AppState>, -) -> Result { - { - let mut dictation = state.dictation.lock().await; - dictation.session_state = DictationSessionState::Idle; - } - let message = UNSUPPORTED_MESSAGE.to_string(); - emit_event(&app, DictationEvent::Error { message: message.clone() }); - Err(message) -} - -#[tauri::command] -pub(crate) async fn dictation_request_permission(_app: AppHandle) -> Result { - Err(UNSUPPORTED_MESSAGE.to_string()) -} - -#[tauri::command] -pub(crate) async fn dictation_stop( - app: AppHandle, - state: State<'_, AppState>, -) -> Result { - { - let mut dictation = state.dictation.lock().await; - dictation.session_state = DictationSessionState::Idle; - } - let message = UNSUPPORTED_MESSAGE.to_string(); - emit_event(&app, DictationEvent::Error { message: message.clone() }); - Err(message) -} - -#[tauri::command] -pub(crate) async fn dictation_cancel( - app: AppHandle, - state: State<'_, AppState>, -) -> Result { - { - let mut dictation = state.dictation.lock().await; - dictation.session_state = DictationSessionState::Idle; - } - emit_event( - &app, - DictationEvent::Canceled { - message: "Canceled".to_string(), - }, - ); - Ok(DictationSessionState::Idle) -} diff --git a/src-tauri/src/shared/process_core.rs b/src-tauri/src/shared/process_core.rs index d9eb90eb8..f4684fe1e 100644 --- a/src-tauri/src/shared/process_core.rs +++ b/src-tauri/src/shared/process_core.rs @@ -1,6 +1,12 @@ +#[cfg(target_os = "windows")] +use std::env; use std::ffi::OsStr; +#[cfg(target_os = "windows")] +use std::path::{Path, PathBuf}; +#[cfg(windows)] +use std::process::Stdio; -use tokio::process::Command; +use tokio::process::{Child, Command}; /// On Windows, spawning a console app from a GUI subsystem app will open a new /// console window unless we explicitly disable it. @@ -17,4 +23,135 @@ pub(crate) fn tokio_command(program: impl AsRef) -> Command { let mut command = Command::new(program); hide_console_on_windows(command.as_std_mut()); command -} \ No newline at end of file +} + +pub(crate) async fn kill_child_process_tree(child: &mut Child) { + #[cfg(windows)] + { + if let Some(pid) = child.id() { + let _ = tokio_command("taskkill") + .arg("/PID") + .arg(pid.to_string()) + .arg("/T") + .arg("/F") + .stdout(Stdio::null()) + .stderr(Stdio::null()) + .status() + .await; + } + } + + let _ = child.kill().await; +} + +#[cfg(target_os = "windows")] +pub(crate) fn resolve_windows_executable(program: &str, path_env: Option<&str>) -> Option { + let trimmed = program.trim(); + if trimmed.is_empty() { + return None; + } + + let program = trimmed + .strip_prefix('"') + .and_then(|value| value.strip_suffix('"')) + .unwrap_or(trimmed) + .trim(); + + if program.is_empty() { + return None; + } + + let has_separators = program.contains('\\') || program.contains('/'); + let has_drive = matches!(program.as_bytes().get(1), Some(b':')); + let looks_like_path = has_separators || has_drive; + + let path_candidates = if Path::new(program).extension().is_some() { + vec![program.to_string()] + } else { + vec![ + format!("{program}.exe"), + format!("{program}.cmd"), + format!("{program}.bat"), + format!("{program}.com"), + ] + }; + + if looks_like_path { + for candidate in path_candidates { + let path = PathBuf::from(candidate); + if path.is_file() { + return Some(path); + } + } + return None; + } + + let paths: Vec = if let Some(value) = path_env { + let trimmed = value.trim(); + if trimmed.is_empty() { + Vec::new() + } else { + env::split_paths(trimmed).collect() + } + } else { + env::var_os("PATH") + .map(|value| env::split_paths(&value).collect()) + .unwrap_or_default() + }; + + for root in paths { + for candidate in &path_candidates { + let path = root.join(candidate); + if path.is_file() { + return Some(path); + } + } + } + + None +} + +#[cfg(target_os = "windows")] +fn validate_cmd_token(value: &str) -> Result<(), String> { + if value.contains('\0') { + return Err("Windows cmd wrapper does not support NUL bytes.".to_string()); + } + if value.contains('\n') || value.contains('\r') { + return Err("Windows cmd wrapper does not support newline characters.".to_string()); + } + Ok(()) +} + +#[cfg(target_os = "windows")] +fn quote_cmd_token(value: &str) -> Result { + validate_cmd_token(value)?; + let mut escaped = String::with_capacity(value.len()); + for ch in value.chars() { + match ch { + '^' => escaped.push_str("^^"), + '"' => escaped.push_str("^\""), + '%' => escaped.push_str("^%"), + '!' => escaped.push_str("^!"), + _ => escaped.push(ch), + } + } + Ok(format!("\"{escaped}\"")) +} + +/// Builds a single `cmd.exe /C ""` payload that safely treats each argument as data +/// (protects cmd metacharacters like `&`, `|`, `>`, `<`) by always quoting tokens and escaping +/// command-processor syntax in the token text (`^`, `"`, `%`, `!`). +/// +/// Returns a string that already includes the required outer quotes, suitable to be passed as +/// *one* argument after `/C` (usually with `/S`). +#[cfg(target_os = "windows")] +pub(crate) fn build_cmd_c_command(program: &Path, args: &[String]) -> Result { + let program_str = program.to_string_lossy(); + let mut parts: Vec = Vec::with_capacity(args.len() + 1); + parts.push(quote_cmd_token(program_str.as_ref())?); + for arg in args { + parts.push(quote_cmd_token(arg)?); + } + let inner = parts.join(" "); + Ok(format!("\"{inner}\"")) +} diff --git a/src-tauri/src/shared/workspaces_core.rs b/src-tauri/src/shared/workspaces_core.rs index 49a6c7aaf..e93fe3846 100644 --- a/src-tauri/src/shared/workspaces_core.rs +++ b/src-tauri/src/shared/workspaces_core.rs @@ -8,6 +8,7 @@ use tokio::sync::Mutex; use crate::backend::app_server::WorkspaceSession; use crate::codex::args::resolve_workspace_codex_args; use crate::codex::home::resolve_workspace_codex_home; +use crate::shared::process_core::kill_child_process_tree; use crate::storage::write_workspaces; use crate::types::{ AppSettings, WorkspaceEntry, WorkspaceInfo, WorkspaceKind, WorkspaceSettings, WorktreeInfo, @@ -234,7 +235,7 @@ where workspaces.remove(&entry.id); } let mut child = session.child.lock().await; - let _ = child.kill().await; + kill_child_process_tree(&mut child).await; return Err(error); } @@ -466,7 +467,7 @@ async fn kill_session_by_id( ) { if let Some(session) = sessions.lock().await.remove(id) { let mut child = session.child.lock().await; - let _ = child.kill().await; + kill_child_process_tree(&mut child).await; } } @@ -1016,7 +1017,7 @@ where .insert(entry_snapshot.id.clone(), new_session) { let mut child = old_session.child.lock().await; - let _ = child.kill().await; + kill_child_process_tree(&mut child).await; } } if codex_home_changed || codex_args_changed { @@ -1059,7 +1060,7 @@ where .insert(child.id.clone(), new_session) { let mut child = old_session.child.lock().await; - let _ = child.kill().await; + kill_child_process_tree(&mut child).await; } } } diff --git a/src-tauri/src/types.rs b/src-tauri/src/types.rs index 5a17c8453..6340c6a9b 100644 --- a/src-tauri/src/types.rs +++ b/src-tauri/src/types.rs @@ -552,12 +552,11 @@ fn default_usage_show_remaining() -> bool { } fn default_ui_font_family() -> String { - "\"SF Pro Text\", \"SF Pro Display\", -apple-system, \"Helvetica Neue\", sans-serif" - .to_string() + "system-ui, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, sans-serif".to_string() } fn default_code_font_family() -> String { - "\"SF Mono\", \"SFMono-Regular\", Menlo, Monaco, monospace".to_string() + "ui-monospace, \"Cascadia Mono\", \"Segoe UI Mono\", Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace".to_string() } fn default_code_font_size() -> u8 { @@ -565,15 +564,30 @@ fn default_code_font_size() -> u8 { } fn default_composer_model_shortcut() -> Option { - Some("cmd+shift+m".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+shift+m" + } else { + "ctrl+shift+m" + }; + Some(value.to_string()) } fn default_composer_access_shortcut() -> Option { - Some("cmd+shift+a".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+shift+a" + } else { + "ctrl+shift+a" + }; + Some(value.to_string()) } fn default_composer_reasoning_shortcut() -> Option { - Some("cmd+shift+r".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+shift+r" + } else { + "ctrl+shift+r" + }; + Some(value.to_string()) } fn default_interrupt_shortcut() -> Option { @@ -590,51 +604,107 @@ fn default_composer_collaboration_shortcut() -> Option { } fn default_new_agent_shortcut() -> Option { - Some("cmd+n".to_string()) + let value = if cfg!(target_os = "macos") { "cmd+n" } else { "ctrl+n" }; + Some(value.to_string()) } fn default_new_worktree_agent_shortcut() -> Option { - Some("cmd+shift+n".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+shift+n" + } else { + "ctrl+shift+n" + }; + Some(value.to_string()) } fn default_new_clone_agent_shortcut() -> Option { - Some("cmd+alt+n".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+alt+n" + } else { + "ctrl+alt+n" + }; + Some(value.to_string()) } fn default_archive_thread_shortcut() -> Option { - Some("cmd+ctrl+a".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+ctrl+a" + } else { + "ctrl+alt+a" + }; + Some(value.to_string()) } fn default_toggle_projects_sidebar_shortcut() -> Option { - Some("cmd+shift+p".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+shift+p" + } else { + "ctrl+shift+p" + }; + Some(value.to_string()) } fn default_toggle_git_sidebar_shortcut() -> Option { - Some("cmd+shift+g".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+shift+g" + } else { + "ctrl+shift+g" + }; + Some(value.to_string()) } fn default_toggle_debug_panel_shortcut() -> Option { - Some("cmd+shift+d".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+shift+d" + } else { + "ctrl+shift+d" + }; + Some(value.to_string()) } fn default_toggle_terminal_shortcut() -> Option { - Some("cmd+shift+t".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+shift+t" + } else { + "ctrl+shift+t" + }; + Some(value.to_string()) } fn default_cycle_agent_next_shortcut() -> Option { - Some("cmd+ctrl+down".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+ctrl+down" + } else { + "ctrl+alt+down" + }; + Some(value.to_string()) } fn default_cycle_agent_prev_shortcut() -> Option { - Some("cmd+ctrl+up".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+ctrl+up" + } else { + "ctrl+alt+up" + }; + Some(value.to_string()) } fn default_cycle_workspace_next_shortcut() -> Option { - Some("cmd+shift+down".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+shift+down" + } else { + "ctrl+alt+shift+down" + }; + Some(value.to_string()) } fn default_cycle_workspace_prev_shortcut() -> Option { - Some("cmd+shift+up".to_string()) + let value = if cfg!(target_os = "macos") { + "cmd+shift+up" + } else { + "ctrl+alt+shift+up" + }; + Some(value.to_string()) } fn default_notification_sounds_enabled() -> bool { @@ -730,50 +800,109 @@ fn default_workspace_groups() -> Vec { } fn default_open_app_targets() -> Vec { + if cfg!(target_os = "macos") { + return vec![ + OpenAppTarget { + id: "vscode".to_string(), + label: "VS Code".to_string(), + kind: "app".to_string(), + app_name: Some("Visual Studio Code".to_string()), + command: None, + args: Vec::new(), + }, + OpenAppTarget { + id: "cursor".to_string(), + label: "Cursor".to_string(), + kind: "app".to_string(), + app_name: Some("Cursor".to_string()), + command: None, + args: Vec::new(), + }, + OpenAppTarget { + id: "zed".to_string(), + label: "Zed".to_string(), + kind: "app".to_string(), + app_name: Some("Zed".to_string()), + command: None, + args: Vec::new(), + }, + OpenAppTarget { + id: "ghostty".to_string(), + label: "Ghostty".to_string(), + kind: "app".to_string(), + app_name: Some("Ghostty".to_string()), + command: None, + args: Vec::new(), + }, + OpenAppTarget { + id: "antigravity".to_string(), + label: "Antigravity".to_string(), + kind: "app".to_string(), + app_name: Some("Antigravity".to_string()), + command: None, + args: Vec::new(), + }, + OpenAppTarget { + id: "finder".to_string(), + label: "Finder".to_string(), + kind: "finder".to_string(), + app_name: None, + command: None, + args: Vec::new(), + }, + ]; + } + + let file_manager_label = if cfg!(target_os = "windows") { + "Explorer" + } else { + "File Manager" + }; + vec![ OpenAppTarget { id: "vscode".to_string(), label: "VS Code".to_string(), - kind: "app".to_string(), - app_name: Some("Visual Studio Code".to_string()), - command: None, + kind: "command".to_string(), + app_name: None, + command: Some("code".to_string()), args: Vec::new(), }, OpenAppTarget { id: "cursor".to_string(), label: "Cursor".to_string(), - kind: "app".to_string(), - app_name: Some("Cursor".to_string()), - command: None, + kind: "command".to_string(), + app_name: None, + command: Some("cursor".to_string()), args: Vec::new(), }, OpenAppTarget { id: "zed".to_string(), label: "Zed".to_string(), - kind: "app".to_string(), - app_name: Some("Zed".to_string()), - command: None, + kind: "command".to_string(), + app_name: None, + command: Some("zed".to_string()), args: Vec::new(), }, OpenAppTarget { id: "ghostty".to_string(), label: "Ghostty".to_string(), - kind: "app".to_string(), - app_name: Some("Ghostty".to_string()), - command: None, + kind: "command".to_string(), + app_name: None, + command: Some("ghostty".to_string()), args: Vec::new(), }, OpenAppTarget { id: "antigravity".to_string(), label: "Antigravity".to_string(), - kind: "app".to_string(), - app_name: Some("Antigravity".to_string()), - command: None, + kind: "command".to_string(), + app_name: None, + command: Some("antigravity".to_string()), args: Vec::new(), }, OpenAppTarget { id: "finder".to_string(), - label: "Finder".to_string(), + label: file_manager_label.to_string(), kind: "finder".to_string(), app_name: None, command: None, @@ -783,7 +912,11 @@ fn default_open_app_targets() -> Vec { } fn default_selected_open_app_id() -> String { - "vscode".to_string() + if cfg!(target_os = "windows") { + "finder".to_string() + } else { + "vscode".to_string() + } } impl Default for AppSettings { @@ -866,17 +999,23 @@ mod tests { assert!(settings.remote_backend_token.is_none()); assert_eq!(settings.default_access_mode, "current"); assert_eq!(settings.review_delivery_mode, "inline"); + let expected_primary = if cfg!(target_os = "macos") { "cmd" } else { "ctrl" }; + let expected_model = format!("{expected_primary}+shift+m"); + let expected_access = format!("{expected_primary}+shift+a"); + let expected_reasoning = format!("{expected_primary}+shift+r"); + let expected_toggle_debug = format!("{expected_primary}+shift+d"); + let expected_toggle_terminal = format!("{expected_primary}+shift+t"); assert_eq!( settings.composer_model_shortcut.as_deref(), - Some("cmd+shift+m") + Some(expected_model.as_str()) ); assert_eq!( settings.composer_access_shortcut.as_deref(), - Some("cmd+shift+a") + Some(expected_access.as_str()) ); assert_eq!( settings.composer_reasoning_shortcut.as_deref(), - Some("cmd+shift+r") + Some(expected_reasoning.as_str()) ); assert_eq!( settings.composer_collaboration_shortcut.as_deref(), @@ -890,39 +1029,59 @@ mod tests { assert_eq!(settings.interrupt_shortcut.as_deref(), Some(expected_interrupt)); assert_eq!( settings.archive_thread_shortcut.as_deref(), - Some("cmd+ctrl+a") + Some(if cfg!(target_os = "macos") { + "cmd+ctrl+a" + } else { + "ctrl+alt+a" + }) ); assert_eq!( settings.toggle_debug_panel_shortcut.as_deref(), - Some("cmd+shift+d") + Some(expected_toggle_debug.as_str()) ); assert_eq!( settings.toggle_terminal_shortcut.as_deref(), - Some("cmd+shift+t") + Some(expected_toggle_terminal.as_str()) ); assert_eq!( settings.cycle_agent_next_shortcut.as_deref(), - Some("cmd+ctrl+down") + Some(if cfg!(target_os = "macos") { + "cmd+ctrl+down" + } else { + "ctrl+alt+down" + }) ); assert_eq!( settings.cycle_agent_prev_shortcut.as_deref(), - Some("cmd+ctrl+up") + Some(if cfg!(target_os = "macos") { + "cmd+ctrl+up" + } else { + "ctrl+alt+up" + }) ); assert_eq!( settings.cycle_workspace_next_shortcut.as_deref(), - Some("cmd+shift+down") + Some(if cfg!(target_os = "macos") { + "cmd+shift+down" + } else { + "ctrl+alt+shift+down" + }) ); assert_eq!( settings.cycle_workspace_prev_shortcut.as_deref(), - Some("cmd+shift+up") + Some(if cfg!(target_os = "macos") { + "cmd+shift+up" + } else { + "ctrl+alt+shift+up" + }) ); assert!(settings.last_composer_model_id.is_none()); assert!(settings.last_composer_reasoning_effort.is_none()); assert!((settings.ui_scale - 1.0).abs() < f64::EPSILON); assert_eq!(settings.theme, "system"); assert!(!settings.usage_show_remaining); - assert!(settings.ui_font_family.contains("SF Pro Text")); - assert!(settings.code_font_family.contains("SF Mono")); + assert!(settings.ui_font_family.contains("system-ui")); + assert!(settings.code_font_family.contains("ui-monospace")); assert_eq!(settings.code_font_size, 11); assert!(settings.notification_sounds_enabled); assert!(settings.system_notifications_enabled); @@ -947,7 +1106,12 @@ mod tests { assert!(!settings.composer_list_continuation); assert!(!settings.composer_code_block_copy_use_modifier); assert!(settings.workspace_groups.is_empty()); - assert_eq!(settings.selected_open_app_id, "vscode"); + let expected_open_id = if cfg!(target_os = "windows") { + "finder" + } else { + "vscode" + }; + assert_eq!(settings.selected_open_app_id, expected_open_id); assert_eq!(settings.open_app_targets.len(), 6); assert_eq!(settings.open_app_targets[0].id, "vscode"); } diff --git a/src-tauri/src/workspaces/commands.rs b/src-tauri/src/workspaces/commands.rs index 14d5ff9d6..6221c8498 100644 --- a/src-tauri/src/workspaces/commands.rs +++ b/src-tauri/src/workspaces/commands.rs @@ -1,4 +1,7 @@ use std::path::PathBuf; + +#[cfg(target_os = "windows")] +use std::path::Path; use std::process::Stdio; use std::sync::Arc; @@ -27,7 +30,9 @@ use crate::codex::args::resolve_workspace_codex_args; use crate::codex::home::resolve_workspace_codex_home; use crate::git_utils::resolve_git_root; use crate::remote_backend; -use crate::shared::process_core::tokio_command; +use crate::shared::process_core::{kill_child_process_tree, tokio_command}; +#[cfg(target_os = "windows")] +use crate::shared::process_core::{build_cmd_c_command, resolve_windows_executable}; use crate::shared::workspaces_core; use crate::state::AppState; use crate::storage::write_workspaces; @@ -255,7 +260,7 @@ pub(crate) async fn add_clone( workspaces.remove(&entry.id); } let mut child = session.child.lock().await; - let _ = child.kill().await; + kill_child_process_tree(&mut child).await; let _ = tokio::fs::remove_dir_all(&destination_path).await; return Err(error); } @@ -826,17 +831,74 @@ pub(crate) async fn open_workspace_in( .unwrap_or_else(|| "target".to_string()); let status = if let Some(command) = command { - let mut cmd = std::process::Command::new(command); - cmd.args(args).arg(path); + let trimmed = command.trim(); + if trimmed.is_empty() { + return Err("Missing app or command".to_string()); + } + + #[cfg(target_os = "windows")] + let mut cmd = { + let resolved = resolve_windows_executable(trimmed, None); + let resolved_path = resolved + .as_deref() + .unwrap_or_else(|| Path::new(trimmed)); + let ext = resolved_path + .extension() + .and_then(|ext| ext.to_str()) + .map(|ext| ext.to_ascii_lowercase()); + + if matches!(ext.as_deref(), Some("cmd") | Some("bat")) { + let mut cmd = tokio_command("cmd"); + let mut command_args = args.clone(); + command_args.push(path.clone()); + let command_line = build_cmd_c_command(resolved_path, &command_args)?; + cmd.arg("/D"); + cmd.arg("/S"); + cmd.arg("/C"); + cmd.arg(command_line); + cmd + } else { + let mut cmd = tokio_command(resolved_path); + cmd.args(&args).arg(&path); + cmd + } + }; + + #[cfg(not(target_os = "windows"))] + let mut cmd = { + let mut cmd = tokio_command(trimmed); + cmd.args(&args).arg(&path); + cmd + }; + cmd.status() + .await .map_err(|error| format!("Failed to open app ({target_label}): {error}"))? } else if let Some(app) = app { - let mut cmd = std::process::Command::new("open"); - cmd.arg("-a").arg(app).arg(path); - if !args.is_empty() { - cmd.arg("--args").args(args); + let trimmed = app.trim(); + if trimmed.is_empty() { + return Err("Missing app or command".to_string()); } + + #[cfg(target_os = "macos")] + let mut cmd = { + let mut cmd = tokio_command("open"); + cmd.arg("-a").arg(trimmed).arg(&path); + if !args.is_empty() { + cmd.arg("--args").args(&args); + } + cmd + }; + + #[cfg(not(target_os = "macos"))] + let mut cmd = { + let mut cmd = tokio_command(trimmed); + cmd.args(&args).arg(&path); + cmd + }; + cmd.status() + .await .map_err(|error| format!("Failed to open app ({target_label}): {error}"))? } else { return Err("Missing app or command".to_string()); diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index e86fdb959..440e84ee0 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -17,6 +17,6 @@ ] }, "bundle": { - "createUpdaterArtifacts": false + "createUpdaterArtifacts": true } } diff --git a/src/features/app/components/MainHeader.tsx b/src/features/app/components/MainHeader.tsx index 9ba416fc9..f6c86c193 100644 --- a/src/features/app/components/MainHeader.tsx +++ b/src/features/app/components/MainHeader.tsx @@ -5,6 +5,7 @@ import Terminal from "lucide-react/dist/esm/icons/terminal"; import { revealItemInDir } from "@tauri-apps/plugin-opener"; import type { BranchInfo, OpenAppTarget, WorkspaceInfo } from "../../../types"; import type { ReactNode } from "react"; +import { revealInFileManagerLabel } from "../../../utils/platformPaths"; import { BranchList } from "../../git/components/BranchList"; import { filterBranches, findExactBranch } from "../../git/utils/branchSearch"; import { validateBranchName } from "../../git/utils/branchValidation"; @@ -339,7 +340,7 @@ export function MainHeader({ }} data-tauri-drag-region="false" > - Reveal in Finder + {revealInFileManagerLabel()}
diff --git a/src/features/app/components/OpenAppMenu.tsx b/src/features/app/components/OpenAppMenu.tsx index 616b14628..d6defb714 100644 --- a/src/features/app/components/OpenAppMenu.tsx +++ b/src/features/app/components/OpenAppMenu.tsx @@ -61,9 +61,14 @@ export function OpenAppMenu({ const fallbackTarget: OpenTarget = { id: DEFAULT_OPEN_APP_ID, - label: DEFAULT_OPEN_APP_TARGETS[0]?.label ?? "Open", + label: + DEFAULT_OPEN_APP_TARGETS.find((target) => target.id === DEFAULT_OPEN_APP_ID) + ?.label ?? + DEFAULT_OPEN_APP_TARGETS[0]?.label ?? + "Open", icon: getKnownOpenAppIcon(DEFAULT_OPEN_APP_ID) ?? GENERIC_APP_ICON, target: + DEFAULT_OPEN_APP_TARGETS.find((target) => target.id === DEFAULT_OPEN_APP_ID) ?? DEFAULT_OPEN_APP_TARGETS[0] ?? { id: DEFAULT_OPEN_APP_ID, label: "VS Code", diff --git a/src/features/app/constants.ts b/src/features/app/constants.ts index 1f06f4ad0..dacc6d2a2 100644 --- a/src/features/app/constants.ts +++ b/src/features/app/constants.ts @@ -1,50 +1,99 @@ import type { OpenAppTarget } from "../../types"; +import { + fileManagerName, + isMacPlatform, + isWindowsPlatform, +} from "../../utils/platformPaths"; export const OPEN_APP_STORAGE_KEY = "open-workspace-app"; -export const DEFAULT_OPEN_APP_ID = "vscode"; +export const DEFAULT_OPEN_APP_ID = isWindowsPlatform() ? "finder" : "vscode"; export type OpenAppId = string; -export const DEFAULT_OPEN_APP_TARGETS: OpenAppTarget[] = [ - { - id: "vscode", - label: "VS Code", - kind: "app", - appName: "Visual Studio Code", - args: [], - }, - { - id: "cursor", - label: "Cursor", - kind: "app", - appName: "Cursor", - args: [], - }, - { - id: "zed", - label: "Zed", - kind: "app", - appName: "Zed", - args: [], - }, - { - id: "ghostty", - label: "Ghostty", - kind: "app", - appName: "Ghostty", - args: [], - }, - { - id: "antigravity", - label: "Antigravity", - kind: "app", - appName: "Antigravity", - args: [], - }, - { - id: "finder", - label: "Finder", - kind: "finder", - args: [], - }, -]; +export const DEFAULT_OPEN_APP_TARGETS: OpenAppTarget[] = isMacPlatform() + ? [ + { + id: "vscode", + label: "VS Code", + kind: "app", + appName: "Visual Studio Code", + args: [], + }, + { + id: "cursor", + label: "Cursor", + kind: "app", + appName: "Cursor", + args: [], + }, + { + id: "zed", + label: "Zed", + kind: "app", + appName: "Zed", + args: [], + }, + { + id: "ghostty", + label: "Ghostty", + kind: "app", + appName: "Ghostty", + args: [], + }, + { + id: "antigravity", + label: "Antigravity", + kind: "app", + appName: "Antigravity", + args: [], + }, + { + id: "finder", + label: fileManagerName(), + kind: "finder", + args: [], + }, + ] + : [ + { + id: "vscode", + label: "VS Code", + kind: "command", + command: "code", + args: [], + }, + { + id: "cursor", + label: "Cursor", + kind: "command", + command: "cursor", + args: [], + }, + { + id: "zed", + label: "Zed", + kind: "command", + command: "zed", + args: [], + }, + { + id: "ghostty", + label: "Ghostty", + kind: "command", + command: "ghostty", + args: [], + }, + { + id: "antigravity", + label: "Antigravity", + kind: "command", + command: "antigravity", + args: [], + }, + { + id: "finder", + label: fileManagerName(), + kind: "finder", + args: [], + }, + ]; diff --git a/src/features/app/hooks/useNewAgentShortcut.ts b/src/features/app/hooks/useNewAgentShortcut.ts index 52db7e9ed..9675fa753 100644 --- a/src/features/app/hooks/useNewAgentShortcut.ts +++ b/src/features/app/hooks/useNewAgentShortcut.ts @@ -1,4 +1,5 @@ import { useEffect } from "react"; +import { isMacPlatform } from "../../../utils/shortcuts"; type UseNewAgentShortcutOptions = { isEnabled: boolean; @@ -13,8 +14,8 @@ export function useNewAgentShortcut({ if (!isEnabled) { return; } + const isMac = isMacPlatform(); function handleKeyDown(event: KeyboardEvent) { - const isMac = navigator.platform.toUpperCase().includes("MAC"); const modifierKey = isMac ? event.metaKey : event.ctrlKey; if (modifierKey && event.key === "n" && !event.shiftKey) { event.preventDefault(); diff --git a/src/features/app/hooks/useOpenAppIcons.ts b/src/features/app/hooks/useOpenAppIcons.ts index e10e3e104..0cbcca3de 100644 --- a/src/features/app/hooks/useOpenAppIcons.ts +++ b/src/features/app/hooks/useOpenAppIcons.ts @@ -2,6 +2,7 @@ import { useEffect, useMemo, useRef, useState } from "react"; import { getOpenAppIcon } from "../../../services/tauri"; import type { OpenAppTarget } from "../../../types"; import { getKnownOpenAppIcon } from "../utils/openAppIcons"; +import { isMacPlatform } from "../../../utils/platformPaths"; type OpenAppIconMap = Record; @@ -10,18 +11,8 @@ type ResolvedAppTarget = { appName: string; }; -function detectMacOS(): boolean { - if (typeof navigator === "undefined") { - return false; - } - const platform = - (navigator as Navigator & { userAgentData?: { platform?: string } }).userAgentData - ?.platform ?? navigator.platform ?? ""; - return platform.toLowerCase().includes("mac"); -} - export function useOpenAppIcons(openTargets: OpenAppTarget[]): OpenAppIconMap { - const isMacOS = detectMacOS(); + const isMacOS = isMacPlatform(); const iconCacheRef = useRef>(new Map()); const inFlightRef = useRef>>(new Map()); const [iconById, setIconById] = useState({}); diff --git a/src/features/app/hooks/useSidebarMenus.test.tsx b/src/features/app/hooks/useSidebarMenus.test.tsx index 01189fa11..9e26d47d1 100644 --- a/src/features/app/hooks/useSidebarMenus.test.tsx +++ b/src/features/app/hooks/useSidebarMenus.test.tsx @@ -5,6 +5,7 @@ import { describe, expect, it, vi } from "vitest"; import type { WorkspaceInfo } from "../../../types"; import { useSidebarMenus } from "./useSidebarMenus"; +import { fileManagerName } from "../../../utils/platformPaths"; const menuNew = vi.hoisted(() => vi.fn(async ({ items }) => ({ popup: vi.fn(), items })), @@ -42,7 +43,7 @@ vi.mock("../../../services/toasts", () => ({ })); describe("useSidebarMenus", () => { - it("adds a show in finder option for worktrees", async () => { + it("adds a show in file manager option for worktrees", async () => { const onDeleteThread = vi.fn(); const onSyncThread = vi.fn(); const onPinThread = vi.fn(); @@ -91,7 +92,7 @@ describe("useSidebarMenus", () => { const menuArgs = menuNew.mock.calls[0]?.[0]; const revealItem = menuArgs.items.find( - (item: { text: string }) => item.text === "Show in Finder", + (item: { text: string }) => item.text === `Show in ${fileManagerName()}`, ); expect(revealItem).toBeDefined(); diff --git a/src/features/app/hooks/useSidebarMenus.ts b/src/features/app/hooks/useSidebarMenus.ts index ff4f1eba5..19b69dfbc 100644 --- a/src/features/app/hooks/useSidebarMenus.ts +++ b/src/features/app/hooks/useSidebarMenus.ts @@ -5,6 +5,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window"; import type { WorkspaceInfo } from "../../../types"; import { pushErrorToast } from "../../../services/toasts"; +import { fileManagerName } from "../../../utils/platformPaths"; type SidebarMenuHandlers = { onDeleteThread: (workspaceId: string, threadId: string) => void; @@ -116,12 +117,13 @@ export function useSidebarMenus({ async (event: MouseEvent, worktree: WorkspaceInfo) => { event.preventDefault(); event.stopPropagation(); + const fileManagerLabel = fileManagerName(); const reloadItem = await MenuItem.new({ text: "Reload threads", action: () => onReloadWorkspaceThreads(worktree.id), }); const revealItem = await MenuItem.new({ - text: "Show in Finder", + text: `Show in ${fileManagerLabel}`, action: async () => { if (!worktree.path) { return; @@ -134,7 +136,7 @@ export function useSidebarMenus({ } catch (error) { const message = error instanceof Error ? error.message : String(error); pushErrorToast({ - title: "Couldn't show worktree in Finder", + title: `Couldn't show worktree in ${fileManagerLabel}`, message, }); console.warn("Failed to reveal worktree", { diff --git a/src/features/app/utils/openAppIcons.ts b/src/features/app/utils/openAppIcons.ts index 82d8e9675..836520b90 100644 --- a/src/features/app/utils/openAppIcons.ts +++ b/src/features/app/utils/openAppIcons.ts @@ -4,6 +4,7 @@ import antigravityIcon from "../../../assets/app-icons/antigravity.png"; import ghosttyIcon from "../../../assets/app-icons/ghostty.png"; import vscodeIcon from "../../../assets/app-icons/vscode.png"; import zedIcon from "../../../assets/app-icons/zed.png"; +import { isMacPlatform } from "../../../utils/platformPaths"; const GENERIC_APP_SVG = ""; @@ -12,6 +13,13 @@ export const GENERIC_APP_ICON = `data:image/svg+xml;utf8,${encodeURIComponent( GENERIC_APP_SVG, )}`; +const GENERIC_FOLDER_SVG = + ""; + +export const GENERIC_FOLDER_ICON = `data:image/svg+xml;utf8,${encodeURIComponent( + GENERIC_FOLDER_SVG, +)}`; + export function getKnownOpenAppIcon(id: string): string | null { switch (id) { case "vscode": @@ -25,7 +33,7 @@ export function getKnownOpenAppIcon(id: string): string | null { case "antigravity": return antigravityIcon; case "finder": - return finderIcon; + return isMacPlatform() ? finderIcon : GENERIC_FOLDER_ICON; default: return null; } diff --git a/src/features/files/components/FileTreePanel.tsx b/src/features/files/components/FileTreePanel.tsx index a7fd87661..c479bdc3a 100644 --- a/src/features/files/components/FileTreePanel.tsx +++ b/src/features/files/components/FileTreePanel.tsx @@ -18,6 +18,7 @@ import { readWorkspaceFile } from "../../../services/tauri"; import type { OpenAppTarget } from "../../../types"; import { useDebouncedValue } from "../../../hooks/useDebouncedValue"; import { languageFromPath } from "../../../utils/syntax"; +import { joinWorkspacePath, revealInFileManagerLabel } from "../../../utils/platformPaths"; import { getFileTypeIconUrl } from "../../../utils/fileTypeIcons"; import { FilePreviewPopover } from "./FilePreviewPopover"; @@ -326,10 +327,7 @@ export function FileTreePanel({ const resolvePath = useCallback( (relativePath: string) => { - const base = workspacePath.endsWith("/") - ? workspacePath.slice(0, -1) - : workspacePath; - return `${base}/${relativePath}`; + return joinWorkspacePath(workspacePath, relativePath); }, [workspacePath], ); @@ -563,7 +561,7 @@ export function FileTreePanel({ }, }), await MenuItem.new({ - text: "Reveal in Finder", + text: revealInFileManagerLabel(), action: async () => { await revealItemInDir(resolvePath(relativePath)); }, diff --git a/src/features/git/components/GitDiffPanel.test.tsx b/src/features/git/components/GitDiffPanel.test.tsx index bd309af66..d713edbdb 100644 --- a/src/features/git/components/GitDiffPanel.test.tsx +++ b/src/features/git/components/GitDiffPanel.test.tsx @@ -3,6 +3,7 @@ import { fireEvent, render, screen, waitFor } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import type { GitLogEntry } from "../../../types"; import { GitDiffPanel } from "./GitDiffPanel"; +import { fileManagerName } from "../../../utils/platformPaths"; const menuNew = vi.hoisted(() => vi.fn(async ({ items }) => ({ popup: vi.fn(), items })), @@ -87,7 +88,7 @@ describe("GitDiffPanel", () => { expect(onCommit).toHaveBeenCalledTimes(1); }); - it("adds a show in finder option for file context menus", async () => { + it("adds a show in file manager option for file context menus", async () => { clipboardWriteText.mockClear(); const { container } = render( { await waitFor(() => expect(menuNew).toHaveBeenCalled()); const menuArgs = menuNew.mock.calls[0]?.[0]; const revealItem = menuArgs.items.find( - (item: { text: string }) => item.text === "Show in Finder", + (item: { text: string }) => item.text === `Show in ${fileManagerName()}`, ); expect(revealItem).toBeDefined(); @@ -172,7 +173,7 @@ describe("GitDiffPanel", () => { await waitFor(() => expect(menuNew).toHaveBeenCalled()); const menuArgs = menuNew.mock.calls[menuNew.mock.calls.length - 1]?.[0]; const revealItem = menuArgs.items.find( - (item: { text: string }) => item.text === "Show in Finder", + (item: { text: string }) => item.text === `Show in ${fileManagerName()}`, ); expect(revealItem).toBeDefined(); diff --git a/src/features/git/components/GitDiffPanel.tsx b/src/features/git/components/GitDiffPanel.tsx index 3c0100a14..cbd9db364 100644 --- a/src/features/git/components/GitDiffPanel.tsx +++ b/src/features/git/components/GitDiffPanel.tsx @@ -22,6 +22,10 @@ import { useMemo, useState, useCallback, useEffect, useRef } from "react"; import { formatRelativeTime } from "../../../utils/time"; import { PanelTabs, type PanelTabId } from "../../layout/components/PanelTabs"; import { pushErrorToast } from "../../../services/toasts"; +import { + fileManagerName, + isAbsolutePath as isAbsolutePathForPlatform, +} from "../../../utils/platformPaths"; type GitDiffPanelProps = { workspaceId?: string | null; @@ -168,17 +172,12 @@ function getRelativePathWithin(base: string, target: string) { } return targetSegments.slice(baseSegments.length).join("/"); } - -function isAbsolutePath(value: string) { - return value.startsWith("/") || /^[A-Za-z]:\//.test(value); -} - function resolveRootPath(root: string | null | undefined, workspacePath: string | null | undefined) { const normalized = normalizeRootPath(root); if (!normalized) { return ""; } - if (workspacePath && !isAbsolutePath(normalized)) { + if (workspacePath && !isAbsolutePathForPlatform(normalized)) { return joinRootAndPath(workspacePath, normalized); } return normalized; @@ -1071,6 +1070,7 @@ export function GitDiffPanel({ } if (targetPaths.length === 1) { + const fileManagerLabel = fileManagerName(); const rawPath = targetPaths[0]; const absolutePath = resolvedRoot ? joinRootAndPath(resolvedRoot, rawPath) @@ -1084,12 +1084,12 @@ export function GitDiffPanel({ const fileName = getFileName(rawPath); items.push( await MenuItem.new({ - text: "Show in Finder", + text: `Show in ${fileManagerLabel}`, action: async () => { try { - if (!resolvedRoot && !absolutePath.startsWith("/")) { + if (!resolvedRoot && !isAbsolutePathForPlatform(absolutePath)) { pushErrorToast({ - title: "Couldn't show file in Finder", + title: `Couldn't show file in ${fileManagerLabel}`, message: "Select a git root first.", }); return; @@ -1102,7 +1102,7 @@ export function GitDiffPanel({ const message = error instanceof Error ? error.message : String(error); pushErrorToast({ - title: "Couldn't show file in Finder", + title: `Couldn't show file in ${fileManagerLabel}`, message, }); console.warn("Failed to reveal file", { diff --git a/src/features/home/components/Home.tsx b/src/features/home/components/Home.tsx index d96640210..a3c56b75f 100644 --- a/src/features/home/components/Home.tsx +++ b/src/features/home/components/Home.tsx @@ -1,3 +1,4 @@ +import FolderOpen from "lucide-react/dist/esm/icons/folder-open"; import RefreshCw from "lucide-react/dist/esm/icons/refresh-cw"; import type { LocalUsageSnapshot } from "../../../types"; import { formatRelativeTime } from "../../../utils/time"; @@ -243,7 +244,7 @@ export function Home({ data-tauri-drag-region="false" > - ⌘ + Open Project diff --git a/src/features/layout/hooks/useUiScaleShortcuts.ts b/src/features/layout/hooks/useUiScaleShortcuts.ts index c94269e03..55d8038dd 100644 --- a/src/features/layout/hooks/useUiScaleShortcuts.ts +++ b/src/features/layout/hooks/useUiScaleShortcuts.ts @@ -3,6 +3,7 @@ import type { Dispatch, SetStateAction } from "react"; import { getCurrentWebview } from "@tauri-apps/api/webview"; import type { AppSettings } from "../../../types"; import { clampUiScale, UI_SCALE_STEP } from "../../../utils/uiScale"; +import { isMacPlatform } from "../../../utils/shortcuts"; type UseUiScaleShortcutsOptions = { settings: AppSettings; @@ -34,10 +35,7 @@ export function useUiScaleShortcuts({ }, [uiScale]); const scaleShortcutLabel = useMemo(() => { - if (typeof navigator === "undefined") { - return "Ctrl"; - } - return /Mac|iPhone|iPad|iPod/.test(navigator.platform) ? "Cmd" : "Ctrl"; + return isMacPlatform() ? "Cmd" : "Ctrl"; }, []); const scaleShortcutTitle = `${scaleShortcutLabel}+ and ${scaleShortcutLabel}-, ${scaleShortcutLabel}+0 to reset.`; diff --git a/src/features/messages/hooks/useFileLinkOpener.ts b/src/features/messages/hooks/useFileLinkOpener.ts index a4da2c256..00ca4a9b0 100644 --- a/src/features/messages/hooks/useFileLinkOpener.ts +++ b/src/features/messages/hooks/useFileLinkOpener.ts @@ -7,6 +7,11 @@ import { revealItemInDir } from "@tauri-apps/plugin-opener"; import { openWorkspaceIn } from "../../../services/tauri"; import { pushErrorToast } from "../../../services/toasts"; import type { OpenAppTarget } from "../../../types"; +import { + isAbsolutePath, + joinWorkspacePath, + revealInFileManagerLabel, +} from "../../../utils/platformPaths"; type OpenTarget = { id: string; @@ -43,11 +48,10 @@ function resolveFilePath(path: string, workspacePath?: string | null) { if (!workspacePath) { return trimmed; } - if (trimmed.startsWith("/") || trimmed.startsWith("~/")) { + if (isAbsolutePath(trimmed)) { return trimmed; } - const base = workspacePath.replace(/\/+$/, ""); - return `${base}/${trimmed}`; + return joinWorkspacePath(workspacePath, trimmed); } function stripLineSuffix(path: string) { @@ -55,20 +59,6 @@ function stripLineSuffix(path: string) { return match ? match[1] : path; } -function revealLabel() { - const platform = - (navigator as Navigator & { userAgentData?: { platform?: string } }) - .userAgentData?.platform ?? navigator.platform ?? ""; - const normalized = platform.toLowerCase(); - if (normalized.includes("mac")) { - return "Reveal in Finder"; - } - if (normalized.includes("win")) { - return "Show in Explorer"; - } - return "Reveal in File Manager"; -} - export function useFileLinkOpener( workspacePath: string | null, openTargets: OpenAppTarget[], @@ -154,7 +144,7 @@ export function useFileLinkOpener( const canOpen = canOpenTarget(target); const openLabel = target.kind === "finder" - ? revealLabel() + ? revealInFileManagerLabel() : target.kind === "command" ? command ? `Open in ${target.label}` @@ -174,7 +164,7 @@ export function useFileLinkOpener( ? [] : [ await MenuItem.new({ - text: revealLabel(), + text: revealInFileManagerLabel(), action: async () => { try { await revealItemInDir(resolvedPath); diff --git a/src/features/settings/components/SettingsView.test.tsx b/src/features/settings/components/SettingsView.test.tsx index 2a1ec1375..f9348f353 100644 --- a/src/features/settings/components/SettingsView.test.tsx +++ b/src/features/settings/components/SettingsView.test.tsx @@ -49,9 +49,9 @@ const baseSettings: AppSettings = { theme: "system", usageShowRemaining: false, uiFontFamily: - "\"SF Pro Text\", \"SF Pro Display\", -apple-system, \"Helvetica Neue\", sans-serif", + 'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif', codeFontFamily: - "\"SF Mono\", \"SFMono-Regular\", Menlo, Monaco, monospace", + 'ui-monospace, "Cascadia Mono", "Segoe UI Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace', codeFontSize: 11, notificationSoundsEnabled: true, systemNotificationsEnabled: true, @@ -408,12 +408,12 @@ describe("SettingsView Display", () => { await waitFor(() => { expect(onUpdateAppSettings).toHaveBeenCalledWith( expect.objectContaining({ - uiFontFamily: expect.stringContaining("SF Pro Text"), + uiFontFamily: expect.stringContaining("system-ui"), }), ); expect(onUpdateAppSettings).toHaveBeenCalledWith( expect.objectContaining({ - codeFontFamily: expect.stringContaining("SF Mono"), + codeFontFamily: expect.stringContaining("ui-monospace"), }), ); }); diff --git a/src/features/settings/components/SettingsView.tsx b/src/features/settings/components/SettingsView.tsx index e0a49df48..1233171cc 100644 --- a/src/features/settings/components/SettingsView.tsx +++ b/src/features/settings/components/SettingsView.tsx @@ -26,6 +26,12 @@ import type { WorkspaceInfo, } from "../../../types"; import { formatDownloadSize } from "../../../utils/formatting"; +import { + fileManagerName, + isMacPlatform, + isWindowsPlatform, + openInFileManagerLabel, +} from "../../../utils/platformPaths"; import { buildShortcutValue, formatShortcut, @@ -451,6 +457,12 @@ export function SettingsView({ const globalConfigSaveLabel = globalConfigExists ? "Save" : "Create"; const globalConfigSaveDisabled = globalConfigLoading || globalConfigSaving || !globalConfigDirty; const globalConfigRefreshDisabled = globalConfigLoading || globalConfigSaving; + const optionKeyLabel = isMacPlatform() ? "Option" : "Alt"; + const metaKeyLabel = isMacPlatform() + ? "Command" + : isWindowsPlatform() + ? "Windows" + : "Meta"; const selectedDictationModel = useMemo(() => { return ( DICTATION_MODELS.find( @@ -1795,7 +1807,7 @@ export function SettingsView({
System notifications
- Show a macOS notification when a long-running agent finishes while the window is unfocused. + Show a system notification when a long-running agent finishes while the window is unfocused.
- Default: {formatShortcut("cmd+ctrl+a")} + Default:{" "} + {formatShortcut(isMacPlatform() ? "cmd+ctrl+a" : "ctrl+alt+a")}
@@ -2627,7 +2640,10 @@ export function SettingsView({
- Default: {formatShortcut("cmd+ctrl+down")} + Default:{" "} + {formatShortcut( + isMacPlatform() ? "cmd+ctrl+down" : "ctrl+alt+down", + )}
@@ -2651,7 +2667,10 @@ export function SettingsView({
- Default: {formatShortcut("cmd+ctrl+up")} + Default:{" "} + {formatShortcut( + isMacPlatform() ? "cmd+ctrl+up" : "ctrl+alt+up", + )}
@@ -2675,7 +2694,12 @@ export function SettingsView({
- Default: {formatShortcut("cmd+shift+down")} + Default:{" "} + {formatShortcut( + isMacPlatform() + ? "cmd+shift+down" + : "ctrl+alt+shift+down", + )}
@@ -2699,7 +2723,10 @@ export function SettingsView({
- Default: {formatShortcut("cmd+shift+up")} + Default:{" "} + {formatShortcut( + isMacPlatform() ? "cmd+shift+up" : "ctrl+alt+shift+up", + )}
@@ -2779,7 +2806,7 @@ export function SettingsView({ > - + {target.kind === "app" && ( @@ -2906,8 +2933,10 @@ export function SettingsView({ Add app
- Commands receive the selected path as the final argument. Apps use macOS open - with optional args. + Commands receive the selected path as the final argument.{" "} + {isMacPlatform() + ? "Apps open via `open -a` with optional args." + : "Apps run as an executable with optional args."}
@@ -3408,11 +3437,11 @@ export function SettingsView({
Config file
- Open the Codex config in Finder. + Open the Codex config in {fileManagerName()}.
{openConfigError && ( diff --git a/src/features/settings/hooks/useAppSettings.test.ts b/src/features/settings/hooks/useAppSettings.test.ts index 8f554f13c..bac9399c0 100644 --- a/src/features/settings/hooks/useAppSettings.test.ts +++ b/src/features/settings/hooks/useAppSettings.test.ts @@ -49,8 +49,8 @@ describe("useAppSettings", () => { expect(result.current.settings.uiScale).toBe(UI_SCALE_MAX); expect(result.current.settings.theme).toBe("system"); - expect(result.current.settings.uiFontFamily).toContain("SF Pro Text"); - expect(result.current.settings.codeFontFamily).toContain("SF Mono"); + expect(result.current.settings.uiFontFamily).toContain("system-ui"); + expect(result.current.settings.codeFontFamily).toContain("ui-monospace"); expect(result.current.settings.codeFontSize).toBe(16); expect(result.current.settings.personality).toBe("friendly"); expect(result.current.settings.backendMode).toBe("remote"); @@ -66,8 +66,8 @@ describe("useAppSettings", () => { expect(result.current.settings.uiScale).toBe(UI_SCALE_DEFAULT); expect(result.current.settings.theme).toBe("system"); - expect(result.current.settings.uiFontFamily).toContain("SF Pro Text"); - expect(result.current.settings.codeFontFamily).toContain("SF Mono"); + expect(result.current.settings.uiFontFamily).toContain("system-ui"); + expect(result.current.settings.codeFontFamily).toContain("ui-monospace"); expect(result.current.settings.backendMode).toBe("local"); expect(result.current.settings.dictationModelId).toBe("base"); expect(result.current.settings.interruptShortcut).toBeTruthy(); @@ -110,8 +110,8 @@ describe("useAppSettings", () => { expect.objectContaining({ theme: "system", uiScale: 0.1, - uiFontFamily: expect.stringContaining("SF Pro Text"), - codeFontFamily: expect.stringContaining("SF Mono"), + uiFontFamily: expect.stringContaining("system-ui"), + codeFontFamily: expect.stringContaining("ui-monospace"), codeFontSize: 9, notificationSoundsEnabled: false, }), diff --git a/src/features/settings/hooks/useAppSettings.ts b/src/features/settings/hooks/useAppSettings.ts index 882757343..f5f4185bb 100644 --- a/src/features/settings/hooks/useAppSettings.ts +++ b/src/features/settings/hooks/useAppSettings.ts @@ -1,4 +1,4 @@ -import { useCallback, useEffect, useState } from "react"; +import { useCallback, useEffect, useMemo, useState } from "react"; import type { AppSettings } from "../../../types"; import { getAppSettings, runCodexDoctor, updateAppSettings } from "../../../services/tauri"; import { clampUiScale, UI_SCALE_DEFAULT } from "../../../utils/uiScale"; @@ -15,72 +15,75 @@ import { OPEN_APP_STORAGE_KEY, } from "../../app/constants"; import { normalizeOpenAppTargets } from "../../app/utils/openApp"; -import { getDefaultInterruptShortcut } from "../../../utils/shortcuts"; +import { getDefaultInterruptShortcut, isMacPlatform } from "../../../utils/shortcuts"; const allowedThemes = new Set(["system", "light", "dark", "dim"]); const allowedPersonality = new Set(["friendly", "pragmatic"]); -const defaultSettings: AppSettings = { - codexBin: null, - codexArgs: null, - backendMode: "local", - remoteBackendHost: "127.0.0.1:4732", - remoteBackendToken: null, - defaultAccessMode: "current", - reviewDeliveryMode: "inline", - composerModelShortcut: "cmd+shift+m", - composerAccessShortcut: "cmd+shift+a", - composerReasoningShortcut: "cmd+shift+r", - composerCollaborationShortcut: "shift+tab", - interruptShortcut: getDefaultInterruptShortcut(), - newAgentShortcut: "cmd+n", - newWorktreeAgentShortcut: "cmd+shift+n", - newCloneAgentShortcut: "cmd+alt+n", - archiveThreadShortcut: "cmd+ctrl+a", - toggleProjectsSidebarShortcut: "cmd+shift+p", - toggleGitSidebarShortcut: "cmd+shift+g", - branchSwitcherShortcut: "cmd+b", - toggleDebugPanelShortcut: "cmd+shift+d", - toggleTerminalShortcut: "cmd+shift+t", - cycleAgentNextShortcut: "cmd+ctrl+down", - cycleAgentPrevShortcut: "cmd+ctrl+up", - cycleWorkspaceNextShortcut: "cmd+shift+down", - cycleWorkspacePrevShortcut: "cmd+shift+up", - lastComposerModelId: null, - lastComposerReasoningEffort: null, - uiScale: UI_SCALE_DEFAULT, - theme: "system", - usageShowRemaining: false, - uiFontFamily: DEFAULT_UI_FONT_FAMILY, - codeFontFamily: DEFAULT_CODE_FONT_FAMILY, - codeFontSize: CODE_FONT_SIZE_DEFAULT, - notificationSoundsEnabled: true, - systemNotificationsEnabled: true, - preloadGitDiffs: true, - gitDiffIgnoreWhitespaceChanges: false, - experimentalCollabEnabled: false, - collaborationModesEnabled: true, - steerEnabled: true, - unifiedExecEnabled: true, - experimentalAppsEnabled: false, - personality: "friendly", - dictationEnabled: false, - dictationModelId: "base", - dictationPreferredLanguage: null, - dictationHoldKey: "alt", - composerEditorPreset: "default", - composerFenceExpandOnSpace: false, - composerFenceExpandOnEnter: false, - composerFenceLanguageTags: false, - composerFenceWrapSelection: false, - composerFenceAutoWrapPasteMultiline: false, - composerFenceAutoWrapPasteCodeLike: false, - composerListContinuation: false, - composerCodeBlockCopyUseModifier: false, - workspaceGroups: [], - openAppTargets: DEFAULT_OPEN_APP_TARGETS, - selectedOpenAppId: DEFAULT_OPEN_APP_ID, -}; +function buildDefaultSettings(): AppSettings { + const isMac = isMacPlatform(); + return { + codexBin: null, + codexArgs: null, + backendMode: "local", + remoteBackendHost: "127.0.0.1:4732", + remoteBackendToken: null, + defaultAccessMode: "current", + reviewDeliveryMode: "inline", + composerModelShortcut: isMac ? "cmd+shift+m" : "ctrl+shift+m", + composerAccessShortcut: isMac ? "cmd+shift+a" : "ctrl+shift+a", + composerReasoningShortcut: isMac ? "cmd+shift+r" : "ctrl+shift+r", + composerCollaborationShortcut: "shift+tab", + interruptShortcut: getDefaultInterruptShortcut(), + newAgentShortcut: isMac ? "cmd+n" : "ctrl+n", + newWorktreeAgentShortcut: isMac ? "cmd+shift+n" : "ctrl+shift+n", + newCloneAgentShortcut: isMac ? "cmd+alt+n" : "ctrl+alt+n", + archiveThreadShortcut: isMac ? "cmd+ctrl+a" : "ctrl+alt+a", + toggleProjectsSidebarShortcut: isMac ? "cmd+shift+p" : "ctrl+shift+p", + toggleGitSidebarShortcut: isMac ? "cmd+shift+g" : "ctrl+shift+g", + branchSwitcherShortcut: isMac ? "cmd+b" : "ctrl+b", + toggleDebugPanelShortcut: isMac ? "cmd+shift+d" : "ctrl+shift+d", + toggleTerminalShortcut: isMac ? "cmd+shift+t" : "ctrl+shift+t", + cycleAgentNextShortcut: isMac ? "cmd+ctrl+down" : "ctrl+alt+down", + cycleAgentPrevShortcut: isMac ? "cmd+ctrl+up" : "ctrl+alt+up", + cycleWorkspaceNextShortcut: isMac ? "cmd+shift+down" : "ctrl+alt+shift+down", + cycleWorkspacePrevShortcut: isMac ? "cmd+shift+up" : "ctrl+alt+shift+up", + lastComposerModelId: null, + lastComposerReasoningEffort: null, + uiScale: UI_SCALE_DEFAULT, + theme: "system", + usageShowRemaining: false, + uiFontFamily: DEFAULT_UI_FONT_FAMILY, + codeFontFamily: DEFAULT_CODE_FONT_FAMILY, + codeFontSize: CODE_FONT_SIZE_DEFAULT, + notificationSoundsEnabled: true, + systemNotificationsEnabled: true, + preloadGitDiffs: true, + gitDiffIgnoreWhitespaceChanges: false, + experimentalCollabEnabled: false, + collaborationModesEnabled: true, + steerEnabled: true, + unifiedExecEnabled: true, + experimentalAppsEnabled: false, + personality: "friendly", + dictationEnabled: false, + dictationModelId: "base", + dictationPreferredLanguage: null, + dictationHoldKey: "alt", + composerEditorPreset: "default", + composerFenceExpandOnSpace: false, + composerFenceExpandOnEnter: false, + composerFenceLanguageTags: false, + composerFenceWrapSelection: false, + composerFenceAutoWrapPasteMultiline: false, + composerFenceAutoWrapPasteCodeLike: false, + composerListContinuation: false, + composerCodeBlockCopyUseModifier: false, + workspaceGroups: [], + openAppTargets: DEFAULT_OPEN_APP_TARGETS, + selectedOpenAppId: DEFAULT_OPEN_APP_ID, + }; +} function normalizeAppSettings(settings: AppSettings): AppSettings { const normalizedTargets = @@ -129,6 +132,7 @@ function normalizeAppSettings(settings: AppSettings): AppSettings { } export function useAppSettings() { + const defaultSettings = useMemo(() => buildDefaultSettings(), []); const [settings, setSettings] = useState(defaultSettings); const [isLoading, setIsLoading] = useState(true); @@ -156,7 +160,7 @@ export function useAppSettings() { return () => { active = false; }; - }, []); + }, [defaultSettings]); const saveSettings = useCallback(async (next: AppSettings) => { const normalized = normalizeAppSettings(next); @@ -168,7 +172,7 @@ export function useAppSettings() { }), ); return saved; - }, []); + }, [defaultSettings]); const doctor = useCallback( async (codexBin: string | null, codexArgs: string | null) => { diff --git a/src/styles/approval-toasts.css b/src/styles/approval-toasts.css index ff71a5a13..a488dfabf 100644 --- a/src/styles/approval-toasts.css +++ b/src/styles/approval-toasts.css @@ -77,7 +77,7 @@ } .approval-toast-detail-code { - font-family: "SF Mono", Menlo, monospace; + font-family: var(--code-font-family); font-size: 11px; color: var(--text-muted); white-space: pre-wrap; diff --git a/src/styles/plan.css b/src/styles/plan.css index 9f4770de8..162e96cd1 100644 --- a/src/styles/plan.css +++ b/src/styles/plan.css @@ -60,7 +60,7 @@ } .plan-step-status { - font-family: "SF Mono", Menlo, monospace; + font-family: var(--code-font-family); font-size: 11px; color: var(--text-faint); flex: 0 0 auto; diff --git a/src/styles/settings.css b/src/styles/settings.css index ee5b88d74..1ddb92090 100644 --- a/src/styles/settings.css +++ b/src/styles/settings.css @@ -259,7 +259,7 @@ } .settings-input--shortcut { - font-family: "SF Mono", "Fira Mono", "Menlo", monospace; + font-family: var(--code-font-family); letter-spacing: 0.02em; } @@ -286,6 +286,11 @@ font-size: 12px; } +.settings-select option { + background-color: var(--surface-popover); + color: var(--text-strong); +} + .settings-select--compact { padding: 6px 8px; font-size: 11px; diff --git a/src/styles/themes.dark.css b/src/styles/themes.dark.css index 73ac753cd..6fb78809b 100644 --- a/src/styles/themes.dark.css +++ b/src/styles/themes.dark.css @@ -1,14 +1,15 @@ :root { - font-family: "SF Pro Text", "SF Pro Display", -apple-system, "Helvetica Neue", - sans-serif; + font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + "Helvetica Neue", Arial, sans-serif; color: var(--text-primary); background-color: transparent; font-synthesis: none; text-rendering: optimizeLegibility; color-scheme: light dark; - --ui-font-family: "SF Pro Text", "SF Pro Display", -apple-system, "Helvetica Neue", - sans-serif; - --code-font-family: "SF Mono", "SFMono-Regular", Menlo, Monaco, monospace; + --ui-font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + "Helvetica Neue", Arial, sans-serif; + --code-font-family: ui-monospace, "Cascadia Mono", "Segoe UI Mono", Menlo, + Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --code-font-size: 11px; --code-font-weight: 400; --code-line-height: 1.28; diff --git a/src/styles/update-toasts.css b/src/styles/update-toasts.css index 79768a83b..581fd3b4a 100644 --- a/src/styles/update-toasts.css +++ b/src/styles/update-toasts.css @@ -71,7 +71,7 @@ } .update-toast-error { - font-family: "SF Mono", Menlo, monospace; + font-family: var(--code-font-family); font-size: 11px; color: var(--text-muted); white-space: pre-wrap; diff --git a/src/utils/fonts.ts b/src/utils/fonts.ts index 2a1a45846..f086f62dc 100644 --- a/src/utils/fonts.ts +++ b/src/utils/fonts.ts @@ -1,8 +1,8 @@ export const DEFAULT_UI_FONT_FAMILY = - "\"SF Pro Text\", \"SF Pro Display\", -apple-system, \"Helvetica Neue\", sans-serif"; + 'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif'; export const DEFAULT_CODE_FONT_FAMILY = - "\"SF Mono\", \"SFMono-Regular\", Menlo, Monaco, monospace"; + 'ui-monospace, "Cascadia Mono", "Segoe UI Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace'; export const CODE_FONT_SIZE_DEFAULT = 11; export const CODE_FONT_SIZE_MIN = 9; diff --git a/src/utils/platformPaths.ts b/src/utils/platformPaths.ts new file mode 100644 index 000000000..7d7799dee --- /dev/null +++ b/src/utils/platformPaths.ts @@ -0,0 +1,113 @@ +type PlatformKind = "mac" | "windows" | "linux" | "unknown"; + +function platformKind(): PlatformKind { + if (typeof navigator === "undefined") { + return "unknown"; + } + const platform = + (navigator as Navigator & { userAgentData?: { platform?: string } }) + .userAgentData?.platform ?? navigator.platform ?? ""; + const normalized = platform.toLowerCase(); + if (normalized.includes("mac")) { + return "mac"; + } + if (normalized.includes("win")) { + return "windows"; + } + if (normalized.includes("linux")) { + return "linux"; + } + return "unknown"; +} + +export function isMacPlatform(): boolean { + return platformKind() === "mac"; +} + +export function isWindowsPlatform(): boolean { + return platformKind() === "windows"; +} + +export function fileManagerName(): string { + const platform = platformKind(); + if (platform === "mac") { + return "Finder"; + } + if (platform === "windows") { + return "Explorer"; + } + return "File Manager"; +} + +export function revealInFileManagerLabel(): string { + const platform = platformKind(); + if (platform === "mac") { + return "Reveal in Finder"; + } + if (platform === "windows") { + return "Show in Explorer"; + } + return "Reveal in File Manager"; +} + +export function openInFileManagerLabel(): string { + return `Open in ${fileManagerName()}`; +} + +function looksLikeWindowsAbsolutePath(value: string): boolean { + if (/^[A-Za-z]:[\\/]/.test(value)) { + return true; + } + if (value.startsWith("\\\\") || value.startsWith("//")) { + return true; + } + if (value.startsWith("\\\\?\\")) { + return true; + } + return false; +} + +export function isAbsolutePath(value: string): boolean { + const trimmed = value.trim(); + if (!trimmed) { + return false; + } + if (trimmed.startsWith("/") || trimmed.startsWith("~/") || trimmed.startsWith("~\\")) { + return true; + } + return looksLikeWindowsAbsolutePath(trimmed); +} + +function stripTrailingSeparators(value: string) { + return value.replace(/[\\/]+$/, ""); +} + +function stripLeadingSeparators(value: string) { + return value.replace(/^[\\/]+/, ""); +} + +function looksLikeWindowsPathPrefix(value: string): boolean { + const trimmed = value.trim(); + return looksLikeWindowsAbsolutePath(trimmed) || trimmed.includes("\\"); +} + +export function joinWorkspacePath(base: string, path: string): string { + const trimmedBase = base.trim(); + const trimmedPath = path.trim(); + if (!trimmedBase) { + return trimmedPath; + } + if (!trimmedPath || isAbsolutePath(trimmedPath)) { + return trimmedPath; + } + + const isWindows = looksLikeWindowsPathPrefix(trimmedBase); + const baseWithoutTrailing = stripTrailingSeparators(trimmedBase); + const pathWithoutLeading = stripLeadingSeparators(trimmedPath); + if (isWindows) { + const normalizedRelative = pathWithoutLeading.replace(/\//g, "\\"); + return `${baseWithoutTrailing}\\${normalizedRelative}`; + } + const normalizedRelative = pathWithoutLeading.replace(/\\/g, "/"); + return `${baseWithoutTrailing}/${normalizedRelative}`; +} diff --git a/src/utils/shortcuts.test.ts b/src/utils/shortcuts.test.ts new file mode 100644 index 000000000..1751b402a --- /dev/null +++ b/src/utils/shortcuts.test.ts @@ -0,0 +1,67 @@ +// @vitest-environment jsdom + +import { describe, expect, it } from "vitest"; +import { formatShortcut, matchesShortcut, toMenuAccelerator } from "./shortcuts"; + +function withNavigatorPlatform(platform: string, fn: () => void) { + const originalUserAgentData = Object.getOwnPropertyDescriptor(navigator, "userAgentData"); + + Object.defineProperty(navigator, "userAgentData", { + value: { platform }, + configurable: true, + }); + + try { + fn(); + } finally { + if (originalUserAgentData) { + Object.defineProperty(navigator, "userAgentData", originalUserAgentData); + } else { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + delete (navigator as any).userAgentData; + } + } +} + +describe("shortcuts", () => { + it("maps cmd+ctrl to Ctrl+Alt on non-mac platforms", () => { + withNavigatorPlatform("Win32", () => { + expect(formatShortcut("cmd+ctrl+a")).toBe("Ctrl+Alt+A"); + expect(toMenuAccelerator("cmd+ctrl+a")).toBe("Ctrl+Alt+A"); + + const ctrlOnly = new KeyboardEvent("keydown", { key: "a", ctrlKey: true }); + expect(matchesShortcut(ctrlOnly, "cmd+ctrl+a")).toBe(false); + + const ctrlAlt = new KeyboardEvent("keydown", { + key: "a", + ctrlKey: true, + altKey: true, + }); + expect(matchesShortcut(ctrlAlt, "cmd+ctrl+a")).toBe(true); + }); + }); + + it("keeps cmd as CmdOrCtrl on non-mac platforms", () => { + withNavigatorPlatform("Win32", () => { + const ctrlEvent = new KeyboardEvent("keydown", { key: "n", ctrlKey: true }); + expect(matchesShortcut(ctrlEvent, "cmd+n")).toBe(true); + }); + }); + + it("requires both cmd and ctrl on macOS", () => { + withNavigatorPlatform("MacIntel", () => { + expect(formatShortcut("cmd+ctrl+a")).toBe("⌘⌃A"); + expect(toMenuAccelerator("cmd+ctrl+a")).toBe("Cmd+Ctrl+A"); + + const cmdCtrl = new KeyboardEvent("keydown", { + key: "a", + metaKey: true, + ctrlKey: true, + }); + expect(matchesShortcut(cmdCtrl, "cmd+ctrl+a")).toBe(true); + + const ctrlOnly = new KeyboardEvent("keydown", { key: "a", ctrlKey: true }); + expect(matchesShortcut(ctrlOnly, "cmd+ctrl+a")).toBe(false); + }); + }); +}); diff --git a/src/utils/shortcuts.ts b/src/utils/shortcuts.ts index 0d6eb1cf6..0972be4f2 100644 --- a/src/utils/shortcuts.ts +++ b/src/utils/shortcuts.ts @@ -1,3 +1,5 @@ +import { isMacPlatform as isMacPlatformFromPaths } from "./platformPaths"; + export type ShortcutDefinition = { key: string; meta: boolean; @@ -6,14 +8,34 @@ export type ShortcutDefinition = { shift: boolean; }; +function normalizeShortcutDefinitionForPlatform( + value: ShortcutDefinition, + isMac: boolean, +): ShortcutDefinition { + if (isMac) { + return value; + } + if (value.meta && value.ctrl) { + return { ...value, meta: false, alt: true }; + } + return value; +} + const MODIFIER_ORDER = ["cmd", "ctrl", "alt", "shift"] as const; -const MODIFIER_LABELS: Record = { +const MODIFIER_LABELS_MAC: Record = { cmd: "⌘", ctrl: "⌃", alt: "⌥", shift: "⇧", }; +const MODIFIER_LABELS_OTHER: Record = { + cmd: "Ctrl", + ctrl: "Ctrl", + alt: "Alt", + shift: "Shift", +}; + const KEY_LABELS: Record = { " ": "Space", space: "Space", @@ -85,25 +107,33 @@ export function formatShortcut(value: string | null | undefined): string { if (!parsed) { return value; } + const useSymbols = isMacPlatform(); + const normalized = normalizeShortcutDefinitionForPlatform(parsed, useSymbols); + const modifierLabels = useSymbols ? MODIFIER_LABELS_MAC : MODIFIER_LABELS_OTHER; const modifiers = MODIFIER_ORDER.flatMap((modifier) => { - if (modifier === "cmd" && parsed.meta) { - return MODIFIER_LABELS.cmd; + if (modifier === "cmd" && normalized.meta) { + return modifierLabels.cmd; } - if (modifier === "ctrl" && parsed.ctrl) { - return MODIFIER_LABELS.ctrl; + if (modifier === "ctrl" && normalized.ctrl) { + return modifierLabels.ctrl; } - if (modifier === "alt" && parsed.alt) { - return MODIFIER_LABELS.alt; + if (modifier === "alt" && normalized.alt) { + return modifierLabels.alt; } - if (modifier === "shift" && parsed.shift) { - return MODIFIER_LABELS.shift; + if (modifier === "shift" && normalized.shift) { + return modifierLabels.shift; } return []; }); + const uniqueModifiers = useSymbols + ? modifiers + : modifiers.filter((modifier, index) => modifiers.indexOf(modifier) === index); const keyLabel = KEY_LABELS[parsed.key] ?? (parsed.key.length === 1 ? parsed.key.toUpperCase() : parsed.key); - return [...modifiers, keyLabel].join(""); + return useSymbols + ? [...uniqueModifiers, keyLabel].join("") + : [...uniqueModifiers, keyLabel].join("+"); } export function buildShortcutValue(event: KeyboardEvent): string | null { @@ -137,23 +167,35 @@ export function matchesShortcut(event: KeyboardEvent, value: string | null | und if (!parsed) { return false; } + const isMac = isMacPlatform(); + const normalized = normalizeShortcutDefinitionForPlatform(parsed, isMac); const key = normalizeKey(event.key); - if (!key || key !== parsed.key) { + if (!key || key !== normalized.key) { + return false; + } + const metaMatches = normalized.meta + ? isMac + ? event.metaKey + : event.ctrlKey || event.metaKey + : !event.metaKey; + if (!metaMatches) { return false; } + + const ctrlMatches = normalized.ctrl + ? event.ctrlKey + : normalized.meta && !isMac + ? true + : !event.ctrlKey; return ( - parsed.meta === event.metaKey && - parsed.ctrl === event.ctrlKey && - parsed.alt === event.altKey && - parsed.shift === event.shiftKey + ctrlMatches && + normalized.alt === event.altKey && + normalized.shift === event.shiftKey ); } export function isMacPlatform(): boolean { - if (typeof navigator === "undefined") { - return false; - } - return /Mac|iPhone|iPad|iPod/.test(navigator.platform); + return isMacPlatformFromPaths(); } export function getDefaultInterruptShortcut(): string { @@ -165,24 +207,26 @@ export function toMenuAccelerator(value: string | null | undefined): string | nu if (!parsed) { return null; } + const isMac = isMacPlatform(); + const normalized = normalizeShortcutDefinitionForPlatform(parsed, isMac); const parts: string[] = []; - if (parsed.meta && parsed.ctrl) { + if (normalized.meta && normalized.ctrl) { parts.push("Cmd"); parts.push("Ctrl"); - } else if (parsed.meta) { + } else if (normalized.meta) { parts.push("CmdOrCtrl"); - } else if (parsed.ctrl) { + } else if (normalized.ctrl) { parts.push("Ctrl"); } - if (parsed.alt) { + if (normalized.alt) { parts.push("Alt"); } - if (parsed.shift) { + if (normalized.shift) { parts.push("Shift"); } const key = - ACCELERATOR_KEYS[parsed.key] ?? - (parsed.key.length === 1 ? parsed.key.toUpperCase() : parsed.key); + ACCELERATOR_KEYS[normalized.key] ?? + (normalized.key.length === 1 ? normalized.key.toUpperCase() : normalized.key); if (!key) { return null; }