Fixup some issues in the auto-updater.

Author: nedtwigg

docs/specs/auto-update.md

@@ -30,7 +30,7 @@ app launch
                          └─ install fails → overwrite with failure marker → exit normally
 ```
 
-The `Update` object from `download()` is held in memory for the session. The close handler intercepts the window close event, writes a success marker to `localStorage` *before* calling `install()` (because on Windows, NSIS force-kills the process), then calls `install()`.
+The `Update` object from `download()` is held in memory for the session. The close handler intercepts the window close event, writes a success marker to `localStorage` *before* calling `install()` (because on Windows, NSIS force-kills the process), then calls `install()`. In Vite dev mode (`pnpm dev:standalone`), the close handler skips `install()` without preventing the close. Dev mode is useful for testing check/download/banner behavior, but install must be tested from a packaged app because the updater resolves its replacement target from the current executable path.
 
 ## Update notice in the Baseboard
 
@@ -57,6 +57,7 @@ The Baseboard is in `lib/` but the updater is standalone-only. The notice is thr
 | Windows | Launches NSIS installer in passive mode (progress bar, no user interaction). Force-kills the app. | Automatic (NSIS) |
 | macOS | Replaces the `.app` bundle in place | `getCurrentWindow().close()` after `install()` returns |
 | Linux | Replaces the AppImage in place | `getCurrentWindow().close()` after `install()` returns |
+| Vite dev mode | Skips `install()` to avoid replacing the dev executable directory | Native close proceeds normally |
 
 Windows uses `"installMode": "passive"` (configured in `tauri.conf.json` under `plugins.updater.windows`).
 
@@ -95,7 +96,7 @@ In `standalone/src-tauri/tauri.conf.json`:
 }
 ```
 
-The Rust side registers the plugin with `tauri_plugin_updater::Builder::new().build()` in `lib.rs`. No custom Rust commands or `on_before_exit` hooks — the JS close handler handles everything.
+The Rust side registers the plugin with `tauri_plugin_updater::Builder::new().build()` in `lib.rs`. No custom Rust commands or `on_before_exit` hooks — the JS close handler handles everything. Capabilities must include `core:window:allow-destroy` as well as `core:window:allow-close`: Tauri's `onCloseRequested` API calls `destroy()` after the handler returns when the close was not prevented.
 
 ## Dependencies
 

standalone/src-tauri/build.rs

@@ -2,7 +2,7 @@ use std::{
     env,
     error::Error,
     fs,
-    path::PathBuf,
+    path::{Path, PathBuf},
     process::Command,
 };
 
@@ -22,6 +22,7 @@ fn bundle_node_runtime() -> Result<(), Box<dyn Error>> {
     let node_source = resolve_node_binary(&host, &target)?;
 
     println!("cargo:rerun-if-changed={}", node_source.display());
+    validate_node_binary(&node_source, &target)?;
 
     let binaries_dir = manifest_dir.join("binaries");
     fs::create_dir_all(&binaries_dir)?;
@@ -41,6 +42,43 @@ fn bundle_node_runtime() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
+#[cfg(target_os = "macos")]
+fn validate_node_binary(node_source: &Path, target: &str) -> Result<(), Box<dyn Error>> {
+    if target.contains("apple-darwin") {
+        reject_macos_dynamic_node(node_source)?;
+    }
+
+    Ok(())
+}
+
+#[cfg(not(target_os = "macos"))]
+fn validate_node_binary(_node_source: &Path, _target: &str) -> Result<(), Box<dyn Error>> {
+    Ok(())
+}
+
+#[cfg(target_os = "macos")]
+fn reject_macos_dynamic_node(node_source: &Path) -> Result<(), Box<dyn Error>> {
+    let output = Command::new("otool").arg("-L").arg(node_source).output()?;
+    if !output.status.success() {
+        return Err(format!(
+            "failed to inspect Node.js runtime at {}",
+            node_source.display()
+        )
+        .into());
+    }
+
+    let deps = String::from_utf8_lossy(&output.stdout);
+    if deps.contains("@rpath/libnode.") {
+        return Err(format!(
+            "{} depends on @rpath/libnode*.dylib and cannot be copied as a self-contained Tauri sidecar. Use a standalone Node.js binary, or set MOUSETERM_NODE_BINARY to one.",
+            node_source.display()
+        )
+        .into());
+    }
+
+    Ok(())
+}
+
 fn resolve_node_binary(host: &str, target: &str) -> Result<PathBuf, Box<dyn Error>> {
     if let Some(path) = env::var_os("MOUSETERM_NODE_BINARY").or_else(|| env::var_os("NODE_BINARY"))
     {

standalone/src-tauri/capabilities/default.json

@@ -3,16 +3,16 @@
   "description": "Default capability set for MouseTerm",
   "windows": ["main"],
   "permissions": [
-    "core:default",
+    "core:app:allow-version",
+    "core:event:allow-listen",
+    "core:event:allow-unlisten",
     "core:window:allow-minimize",
     "core:window:allow-toggle-maximize",
     "core:window:allow-close",
+    "core:window:allow-destroy",
     "core:window:allow-is-maximized",
     "core:window:allow-start-dragging",
-    "shell:allow-spawn",
-    "shell:allow-stdin-write",
-    "shell:allow-kill",
-    "shell:allow-open",
+    "shell:default",
     "updater:default"
   ]
 }

standalone/src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"default":{"identifier":"default","description":"Default capability set for MouseTerm","local":true,"windows":["main"],"permissions":["core:app:allow-version","core:event:allow-listen","core:event:allow-unlisten","core:window:allow-minimize","core:window:allow-toggle-maximize","core:window:allow-close","core:window:allow-is-maximized","core:window:allow-start-dragging","shell:default","updater:default"]}}
+{"default":{"identifier":"default","description":"Default capability set for MouseTerm","local":true,"windows":["main"],"permissions":["core:app:allow-version","core:event:allow-listen","core:event:allow-unlisten","core:window:allow-minimize","core:window:allow-toggle-maximize","core:window:allow-close","core:window:allow-destroy","core:window:allow-is-maximized","core:window:allow-start-dragging","shell:default","updater:default"]}}

standalone/src-tauri/src/lib.rs

@@ -307,11 +307,6 @@ pub fn run() {
 
             Ok(())
         })
-        .on_window_event(|_window, event| {
-            if let tauri::WindowEvent::CloseRequested { .. } = event {
-                std::process::exit(0);
-            }
-        })
         .invoke_handler(tauri::generate_handler![
             pty_spawn,
             pty_write,

standalone/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "MouseTerm",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "identifier": "com.mouseterm.app",
   "build": {
     "beforeDevCommand": "pnpm dev",

standalone/src/updater.ts

@@ -15,6 +15,10 @@ let currentVersion = '';
 
 const listeners = new Set<() => void>();
 
+function shouldSkipInstallInDev(): boolean {
+  return import.meta.env.DEV && import.meta.env.MODE !== 'test';
+}
+
 function setState(next: UpdateBannerState) {
   state = next;
   for (const listener of listeners) {
@@ -123,6 +127,12 @@ function registerCloseHandler(): void {
   getCurrentWindow().onCloseRequested(async (event) => {
     if (!pendingUpdate) return;
 
+    if (shouldSkipInstallInDev()) {
+      console.warn('[updater] Skipping update install in dev mode. Use a packaged app to test install.');
+      pendingUpdate = null;
+      return;
+    }
+
     event.preventDefault();
 
     try {