From 779ffc3d5540f9d5370902c04ec957950563ae0a Mon Sep 17 00:00:00 2001 From: YokiiroBW Date: Mon, 27 Jul 2026 01:19:42 +0800 Subject: [PATCH] fix(tauri): grant the window controls the permissions they call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The minimize, maximize and close buttons did nothing. They were wired correctly; the ACL rejected them. core:default resolves to core:window:default, which grants only read-only queries — is-maximized is in it, which is why the maximize icon tracked state correctly, but minimize, toggle-maximize, close and start-dragging are not. Both windows are decorations: false, so with close denied the main window could not be closed at all except through the tray. Add two capabilities rather than widening the shared one: the main window gets the four controls it draws, and the pet window gets dragging alone, since it is moved by dragging its body and must not be able to close or resize itself. Every one of these calls was a bare void expression, so the rejection was swallowed and looked identical to an unwired button. Route them through a helper that reports the failure in the shell error banner. This is the second time a missing capability has surfaced as a silent no-op — the pet window previously had no entry at all. Add tests that read the shipped capability files and assert each permission the UI calls is granted to the window that calls it. Also translate the TypeError the Tauri shim throws outside the application into a sentence a user can act on. The dev server is reachable at 127.0.0.1:1420, so opening it in a browser and hitting save produced "Cannot read properties of undefined (reading 'invoke')". Co-Authored-By: Claude Opus 5 --- .../capabilities/main-window-controls.json | 12 +++ src-tauri/capabilities/pet-window-drag.json | 7 ++ src-tauri/tests/capabilities.rs | 77 +++++++++++++++++++ src/App.tsx | 30 ++++++-- src/lib/errorMessage.test.ts | 37 +++++++++ src/lib/errorMessage.ts | 14 ++++ 6 files changed, 171 insertions(+), 6 deletions(-) create mode 100644 src-tauri/capabilities/main-window-controls.json create mode 100644 src-tauri/capabilities/pet-window-drag.json create mode 100644 src-tauri/tests/capabilities.rs create mode 100644 src/lib/errorMessage.test.ts diff --git a/src-tauri/capabilities/main-window-controls.json b/src-tauri/capabilities/main-window-controls.json new file mode 100644 index 0000000..dbbff86 --- /dev/null +++ b/src-tauri/capabilities/main-window-controls.json @@ -0,0 +1,12 @@ +{ + "$schema": "../gen/schemas/desktop-schema.json", + "identifier": "main-window-controls", + "description": "Window controls for the main window, which is decorationless and therefore draws its own title bar. core:window:default grants only read-only queries, so without these the minimize, maximize and close buttons are rejected by the ACL and the window cannot be closed except through the tray.", + "windows": ["main"], + "permissions": [ + "core:window:allow-minimize", + "core:window:allow-toggle-maximize", + "core:window:allow-close", + "core:window:allow-start-dragging" + ] +} diff --git a/src-tauri/capabilities/pet-window-drag.json b/src-tauri/capabilities/pet-window-drag.json new file mode 100644 index 0000000..5fe3e96 --- /dev/null +++ b/src-tauri/capabilities/pet-window-drag.json @@ -0,0 +1,7 @@ +{ + "$schema": "../gen/schemas/desktop-schema.json", + "identifier": "pet-window-drag", + "description": "The desktop pet is decorationless and is moved by dragging its body. Scoped to dragging alone: the pet must not be able to close or resize itself, which is why this is separate from the main window capability.", + "windows": ["desktop-pet"], + "permissions": ["core:window:allow-start-dragging"] +} diff --git a/src-tauri/tests/capabilities.rs b/src-tauri/tests/capabilities.rs new file mode 100644 index 0000000..cef83d4 --- /dev/null +++ b/src-tauri/tests/capabilities.rs @@ -0,0 +1,77 @@ +//! Guards the capability set against the recurring "silent no-op" defect. +//! +//! A Tauri command that the ACL rejects fails at the IPC boundary, and every +//! rejection the UI does not explicitly catch looks exactly like an unwired +//! button. This class has now bitten twice: the desktop pet window had no +//! capability entry at all (F-03), and the main window's title bar controls were +//! rejected because `core:window:default` grants only read-only queries. +//! +//! These tests read the shipped capability files, so a permission removed while +//! the UI still calls it fails here rather than in someone's hands. + +use serde::Deserialize; + +#[derive(Debug, Deserialize)] +struct Capability { + identifier: String, + windows: Vec, + permissions: Vec, +} + +fn capability(source: &str) -> Capability { + serde_json::from_str(source).expect("capability file must be valid JSON") +} + +const DEFAULT: &str = include_str!("../capabilities/default.json"); +const MAIN_CONTROLS: &str = include_str!("../capabilities/main-window-controls.json"); +const PET_DRAG: &str = include_str!("../capabilities/pet-window-drag.json"); + +#[test] +fn the_main_window_may_drive_its_own_title_bar() { + let capability = capability(MAIN_CONTROLS); + + assert_eq!(capability.identifier, "main-window-controls"); + assert!(capability.windows.iter().any(|label| label == "main")); + + // Each entry corresponds to a call in `WindowChrome` in src/App.tsx. The + // window is `decorations: false`, so without `allow-close` there is no way + // to close it other than the tray. + for permission in [ + "core:window:allow-minimize", + "core:window:allow-toggle-maximize", + "core:window:allow-close", + "core:window:allow-start-dragging", + ] { + assert!( + capability.permissions.iter().any(|held| held == permission), + "{permission} is called by the title bar but not granted" + ); + } +} + +#[test] +fn the_pet_window_may_drag_itself_and_nothing_more() { + let capability = capability(PET_DRAG); + + assert_eq!(capability.windows, vec!["desktop-pet".to_owned()]); + assert_eq!( + capability.permissions, + vec!["core:window:allow-start-dragging".to_owned()], + "the pet is moved by dragging its body; it must not gain close or resize" + ); +} + +#[test] +fn every_declared_window_carries_the_base_capability() { + let capability = capability(DEFAULT); + + // Missing a label here is what left the pet window unable to receive events + // or use IPC at all. + for label in ["main", "quick-chat", "status-bubble", "desktop-pet"] { + assert!( + capability.windows.iter().any(|held| held == label), + "window {label} has no base capability" + ); + } + assert_eq!(capability.permissions, vec!["core:default".to_owned()]); +} diff --git a/src/App.tsx b/src/App.tsx index 86dbc8f..4230742 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -151,6 +151,7 @@ export function App() { onToggleTheme={() => setTheme((current) => (current === "dark" ? "light" : "dark")) } + onError={setError} />