Move rebuild into the Leaflet menu and sidebar icon row

README.md

@@ -35,7 +35,8 @@ Package this feature once with `pnpm tauri build --bundles app`, then open
 `src-tauri/target/release/bundle/macos/Leaflet.app` or copy it into Applications.
 An older installed version must be replaced once to gain the rebuild control.
 
-Click **Rebuild app** at the bottom of the sidebar, or use **Cmd+K → Rebuild app**.
+Use **Leaflet → Rebuild app…**, the hammer icon at the bottom of the sidebar,
+or **Cmd+K → Rebuild app**.
 Choose the Leaflet workspace with the native folder picker, then
 click **Rebuild & restart**. The folder is remembered by the native app. Rebuilds
 only use this selection; a webview cannot submit a different build path. The build uses the current

src-tauri/src/lib.rs

@@ -3,7 +3,9 @@ mod watch;
 
 use serde::Serialize;
 use std::{fs, path::PathBuf};
-use tauri::Manager;
+#[cfg(target_os = "macos")]
+use tauri::menu::{Menu, MenuItem, PredefinedMenuItem};
+use tauri::{Emitter, Manager};
 
 #[derive(Serialize)]
 struct Entry {
@@ -115,6 +117,46 @@ pub fn run() {
         .manage(rebuild::RebuildState::default())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_opener::init())
+        .setup(|app| {
+            #[cfg(target_os = "macos")]
+            {
+                let menu = Menu::default(app.handle())?;
+                let mut added_rebuild_item = false;
+                for item in menu.items()? {
+                    if let Some(submenu) = item.as_submenu() {
+                        if submenu.text()? == app.package_info().name {
+                            let rebuild = MenuItem::with_id(
+                                app,
+                                "rebuild",
+                                "Rebuild app…",
+                                true,
+                                None::<&str>,
+                            )?;
+                            // The default Leaflet menu starts with About and a separator.
+                            submenu.insert_items(
+                                &[&rebuild, &PredefinedMenuItem::separator(app)?],
+                                2,
+                            )?;
+                            added_rebuild_item = true;
+                            break;
+                        }
+                    }
+                }
+                if !added_rebuild_item {
+                    eprintln!("Could not add Rebuild app to the Leaflet menu: submenu not found");
+                }
+                app.set_menu(menu)?;
+            }
+            Ok(())
+        })
+        .on_menu_event(|app, event| {
+            if event.id().as_ref() == "rebuild" {
+                if let Some(window) = app.get_webview_window("main") {
+                    let _ = window.set_focus();
+                    let _ = window.emit("open-rebuild", ());
+                }
+            }
+        })
         .invoke_handler(tauri::generate_handler![
             load_archive,
             watch::watch_archive,

src/App.tsx

@@ -23,6 +23,7 @@ import {
   X,
 } from 'lucide-react';
 import { getCurrentWindow } from '@tauri-apps/api/window';
+import { listen } from '@tauri-apps/api/event';
 import {
   chooseArchive,
   desktop,
@@ -149,6 +150,13 @@ export default function App() {
   useEffect(() => {
     void load(readPreference<string>('root', ''));
   }, [load]);
+  useEffect(() => {
+    if (!desktop) return;
+    const unlisten = listen('open-rebuild', () => setRebuildOpen(true));
+    return () => {
+      void unlisten.then((stop) => stop());
+    };
+  }, []);
   useEffect(() => {
     if (!desktop || !rootKey || busy) return;
     setSyncError(null);
@@ -433,12 +441,6 @@ export default function App() {
           })}
         </div>
         <div className="sidebar-bottom">
-          {desktop && (
-            <button className="surprise" onClick={() => setRebuildOpen(true)}>
-              <Hammer size={16} />
-              Rebuild app
-            </button>
-          )}
           <button
             className="surprise"
             onClick={randomEntry}
@@ -467,6 +469,15 @@ export default function App() {
                     : 'Auto-refresh · 1 min'
                 : 'Demo journal'}
             </span>
+            {desktop && (
+              <button
+                title="Rebuild app"
+                aria-label="Rebuild app"
+                onClick={() => setRebuildOpen(true)}
+              >
+                <Hammer size={14} />
+              </button>
+            )}
             <button
               title="Refresh journal"
               aria-label="Refresh journal"

tests/fixtures/desktop.ts

@@ -119,6 +119,9 @@ const harness = {
   get subscriptions() {
     return subscriptions.size;
   },
+  async openRebuildFromMenu() {
+    await emit('open-rebuild');
+  },
 };
 Object.assign(window, { journalTest: harness });
 declare global {

tests/rebuild.spec.ts

@@ -62,6 +62,16 @@ test('rebuild remembers the workspace and stays busy across closing and reopenin
     .toBe(2);
 });
 
+test('native rebuild menu event opens the rebuild dialog', async ({ page }) => {
+  await expect(
+    page.getByRole('button', { name: 'Rebuild app', exact: true }),
+  ).toBeVisible();
+  await page.evaluate(() => window.journalTest.openRebuildFromMenu());
+  await expect(
+    page.getByRole('heading', { name: 'Rebuild app', exact: true }),
+  ).toBeVisible();
+});
+
 test('command palette opens rebuild and unavailable runtimes cannot start it', async ({
   page,
 }) => {