refactor: use declarative window configuration; correct main window minimizable

Author: typed-sigterm

.github/CONTRIBUTING.md

@@ -174,6 +174,8 @@ pnpm dev:tamagotchi
 > nr dev:tamagotchi
 > ```
 
+If the command gets stuck, remove `cargo` component via `rustup` and re-install it.
+
 ### Stage Web (Browser version for [airi.moeru.ai](https://airi.moeru.ai))
 
 ```shell

apps/stage-tamagotchi/package.json

@@ -12,7 +12,6 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "tauri": "tauri",
     "build:unpack": "tauri build --no-bundle",
     "rename-artifacts": "tsx scripts/rename-artifacts.ts",
     "name-of-artifacts": "tsx scripts/name-of-artifacts.ts"

apps/stage-tamagotchi/src-tauri/src/app/mod.rs

@@ -1,8 +1,6 @@
 use log::debug;
 use tauri::Manager;
 
-use crate::app::windows::{chat, onboarding, settings};
-
 #[tauri::command]
 pub async fn open_settings_window(app: tauri::AppHandle) -> Result<(), tauri::Error> {
   let window = app.get_webview_window("settings");
@@ -11,7 +9,8 @@ pub async fn open_settings_window(app: tauri::AppHandle) -> Result<(), tauri::Er
     return Ok(());
   }
 
-  settings::new_settings_window(&app, None)?;
+  // Settings window should exist as it's declared in tauri.conf.json
+  eprintln!("Settings window not found!");
   Ok(())
 }
 
@@ -23,7 +22,8 @@ pub async fn open_chat_window(app: tauri::AppHandle) -> Result<(), tauri::Error>
     return Ok(());
   }
 
-  chat::new_chat_window(&app, None)?;
+  // Chat window should exist as it's declared in tauri.conf.json
+  eprintln!("Chat window not found!");
   Ok(())
 }
 
@@ -35,7 +35,8 @@ pub async fn open_onboarding_window(app: tauri::AppHandle) -> Result<(), tauri::
     return Ok(());
   }
 
-  onboarding::new_onboarding_window(&app, None)?;
+  // Onboarding window should exist as it's declared in tauri.conf.json
+  eprintln!("Onboarding window not found!");
   Ok(())
 }
 

apps/stage-tamagotchi/src-tauri/src/app/windows/chat.rs

@@ -1,8 +1,6 @@
 use tauri::{
   Emitter,
   Manager,
-  WebviewUrl,
-  WebviewWindowBuilder,
   menu::{Menu, MenuItem, Submenu},
   tray::TrayIconBuilder,
 };
@@ -11,9 +9,7 @@ use tauri_plugin_prevent_default::Flags;
 use tauri_plugin_window_router_link::WindowMatcher;
 use tauri_plugin_window_state::{AppHandleExt, StateFlags};
 
-mod app;
-
-use app::windows::{chat, onboarding, settings};
+mod commands;
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
@@ -36,44 +32,27 @@ pub fn run() {
     .plugin(tauri_plugin_rdev::init())
     .plugin(tauri_plugin_window_router_link::init(
       WindowMatcher::new()
-        .register("chat", |app, on_page_load| {
-          chat::new_chat_window(&app, on_page_load)
-            .map_err(|e| e)
+        .register("chat", |app, _| {
+          Ok(app.get_webview_window("chat").unwrap())
         })
-        .register("settings", |app, on_page_load| {
-          settings::new_settings_window(&app, on_page_load)
-            .map_err(|e| e)
+        .register("settings", |app, _| {
+          Ok(app.get_webview_window("settings").unwrap())
         })
-        .register("onboarding", |app, on_page_load| {
-          onboarding::new_onboarding_window(&app, on_page_load)
-            .map_err(|e| e)
+        .register("onboarding", |app, _| {
+          Ok(app.get_webview_window("onboarding").unwrap())
         })
     ))
     .setup(|app| {
-      let mut builder = WebviewWindowBuilder::new(app, "main", WebviewUrl::default());
-
-      builder = builder.title("AIRI")
-        .decorations(false)
-        .inner_size(450.0, 600.0)
-        .shadow(false)
-        .transparent(true)
-        .always_on_top(true);
-
-      #[cfg(target_os = "macos")]
-      {
-        builder = builder.title_bar_style(tauri::TitleBarStyle::Transparent);
-      }
-
-      let window = builder.build().unwrap();
-      #[cfg(debug_assertions)]
-      window.open_devtools();
+      // Main window is now created declaratively via tauri.conf.json
+      let main_window = app.get_webview_window("main").unwrap();
 
       #[cfg(target_os = "macos")]
       {
         app.set_activation_policy(tauri::ActivationPolicy::Accessory); // hide dock icon
       }
 
       if cfg!(debug_assertions) {
+        main_window.open_devtools();
         app.handle().plugin(
           tauri_plugin_log::Builder::default()
             .level(log::LevelFilter::Info)
@@ -133,8 +112,7 @@ pub fn run() {
         ],
       )?;
 
-      #[cfg(debug_assertions)]
-      {
+      if cfg!(debug_assertions) {
         let show_devtools_item =
           MenuItem::with_id(app, "show-devtools", "Show Devtools", true, None::<&str>)?;
         menu.append_items(&[&show_devtools_item])?;
@@ -156,8 +134,8 @@ pub fn run() {
               let _ = window.show();
               return;
             }
-
-            app::windows::settings::new_settings_window(app, None).unwrap();
+            // Settings window should exist as it's declared in tauri.conf.json
+            eprintln!("Settings window not found!");
           }
           "window-mode.fade-on-hover" => {
             let window = app.get_webview_window("main");
@@ -226,10 +204,10 @@ pub fn run() {
       Ok(())
     })
     .invoke_handler(tauri::generate_handler![
-      app::commands::open_settings_window,
-      app::commands::open_chat_window,
-      app::commands::open_onboarding_window,
-      app::commands::debug_println,
+      commands::open_settings_window,
+      commands::open_chat_window,
+      commands::open_onboarding_window,
+      commands::debug_println,
     ])
     .run(tauri::generate_context!())
     .expect("error while running tauri application");

apps/stage-tamagotchi/src-tauri/src/app/windows/mod.rs

@@ -13,7 +13,65 @@
     "security": {
       "csp": null
     },
-    "macOSPrivateApi": true
+    "macOSPrivateApi": true,
+    "windows": [
+      {
+        "label": "main",
+        "title": "AIRI",
+        "width": 450,
+        "height": 600,
+        "decorations": false,
+        "transparent": true,
+        "alwaysOnTop": true,
+        "titleBarStyle": "Transparent",
+        "minimizable": false
+      },
+      {
+        "label": "chat",
+        "title": "AIRI Chat",
+        "url": "#/chat",
+        "width": 600,
+        "height": 800,
+        "visible": false,
+        "titleBarStyle": "Overlay",
+        "hiddenTitle": true,
+        "acceptFirstMouse": true,
+        "trafficLightPosition": {
+          "x": 14.0,
+          "y": 20.0
+        }
+      },
+      {
+        "label": "settings",
+        "title": "AIRI Settings",
+        "url": "#/settings",
+        "width": 550,
+        "height": 900,
+        "visible": false,
+        "titleBarStyle": "Overlay",
+        "hiddenTitle": true,
+        "acceptFirstMouse": true,
+        "trafficLightPosition": {
+          "x": 14.0,
+          "y": 20.0
+        }
+      },
+      {
+        "label": "onboarding",
+        "title": "AIRI Onboarding",
+        "url": "#/onboarding",
+        "width": 800,
+        "height": 600,
+        "visible": false,
+        "titleBarStyle": "Overlay",
+        "hiddenTitle": true,
+        "acceptFirstMouse": true,
+        "trafficLightPosition": {
+          "x": 14.0,
+          "y": 20.0
+        }
+      }
+    ]
   },
   "bundle": {
     "active": true,