Merge branch 'main' into feat/delete-recycle

Author: httpsphl

app/src-setup/src/installed.rs

@@ -39,9 +39,10 @@ mod registry {
 
     const UNINSTALL_KEY: &str = r"Software\Microsoft\Windows\CurrentVersion\Uninstall\Botloft";
     /// Tauri's NSIS remembers the install folder under
-    /// `Software\<publisher>\<product>`; the publisher is "github", the second
-    /// part of the identifier (spec 15.4).
-    const FOLDER_KEY: &str = r"Software\github\Botloft";
+    /// `Software\<publisher>\<product>`. The publisher is "Botloft"; installs
+    /// made while it was "github", Tauri's default from the identifier, are
+    /// adopted by the installer's hooks (spec 15.4), which look in this order.
+    const FOLDER_KEYS: [&str; 2] = [r"Software\Botloft\Botloft", r"Software\github\Botloft"];
 
     pub fn entry(name: &str) -> Option<String> {
         RegKey::predef(HKEY_CURRENT_USER)
@@ -52,11 +53,14 @@ mod registry {
     }
 
     pub fn remembered_folder() -> Option<String> {
-        RegKey::predef(HKEY_CURRENT_USER)
-            .open_subkey(FOLDER_KEY)
-            .ok()?
-            .get_value::<String, _>("")
-            .ok()
+        let user = RegKey::predef(HKEY_CURRENT_USER);
+        FOLDER_KEYS.iter().find_map(|key| {
+            user.open_subkey(key)
+                .ok()?
+                .get_value::<String, _>("")
+                .ok()
+                .filter(|folder| !folder.trim().is_empty())
+        })
     }
 }
 

app/src-setup/tauri.conf.json

@@ -13,6 +13,7 @@
     }
   },
   "bundle": {
+    "publisher": "Botloft",
     "copyright": "Copyright 2026 Phelipe Lorran",
     "icon": ["../src-tauri/icons/icon.ico"]
   }

app/src-tauri/tauri.conf.json

@@ -37,6 +37,7 @@
   },
   "bundle": {
     "active": true,
+    "publisher": "Botloft",
     "copyright": "Copyright 2026 Phelipe Lorran",
     "targets": [
       "nsis"

app/src-tauri/windows/hooks.nsh

@@ -6,19 +6,64 @@
 ; next to the title, as the Botloft mascot on the page's white.
 !define MUI_HEADERIMAGE_RIGHT
 
+; The installer's own file properties name the publisher too; Tauri's
+; template leaves the company out.
+VIAddVersionKey "CompanyName" "Botloft"
+
+; Tauri keeps the install folder in the registry under
+; Software\<publisher>\<product>. The publisher used to be "github", Tauri's
+; default from the identifier; it is "Botloft" now (`bundle.publisher`).
+; An install made under the old name is adopted under the new one, so an
+; update goes to the folder Botloft is in, and "uninstall before installing"
+; still finds that folder.
+!ifndef BOTLOFT_FOLDER_KEY
+  !define BOTLOFT_FOLDER_KEY "Software\Botloft\Botloft"
+!endif
+!ifndef BOTLOFT_OLD_FOLDER_KEY
+  !define BOTLOFT_OLD_FOLDER_KEY "Software\github\Botloft"
+!endif
+!ifndef BOTLOFT_OLD_PUBLISHER_KEY
+  !define BOTLOFT_OLD_PUBLISHER_KEY "Software\github"
+!endif
+
+; Copies the folder of an install made under the old publisher to the new
+; key, and installs there unless /D chose another folder. It does nothing
+; once the new key exists.
+Function BotloftAdoptOldFolder
+  Push $0
+  ReadRegStr $0 SHCTX "${BOTLOFT_FOLDER_KEY}" ""
+  StrCmp $0 "" 0 botloft_adopt_done
+  ReadRegStr $0 SHCTX "${BOTLOFT_OLD_FOLDER_KEY}" ""
+  StrCmp $0 "" botloft_adopt_done 0
+  WriteRegStr SHCTX "${BOTLOFT_FOLDER_KEY}" "" $0
+  ; Only when the installer is still on its default folder: /D wins.
+  StrCmp $INSTDIR "$LOCALAPPDATA\Botloft" 0 botloft_adopt_done
+  StrCpy $INSTDIR $0
+  botloft_adopt_done:
+  Pop $0
+FunctionEnd
+
+; Before the first page, so the pages and "uninstall before installing" see
+; the adopted folder.
+!define MUI_CUSTOMFUNCTION_GUIINIT BotloftAdoptOldFolder
+
+!macro NSIS_HOOK_PREINSTALL
+  ; The quiet installer (/S) has no pages, so nothing adopted the folder yet.
+  ; The install section already set its output to the default folder.
+  Call BotloftAdoptOldFolder
+  SetOutPath $INSTDIR
+!macroend
+
 !macro NSIS_HOOK_POSTINSTALL
-  ; Installed apps shows Botloft as the publisher. `bundle.publisher` stays
-  ; unset on purpose: Tauri also names the key that keeps the install folder
-  ; after it (Software\<publisher>\Botloft), so a new name would make the
-  ; first update of an existing install run the old uninstaller without its
-  ; folder.
-  WriteRegStr SHCTX "${UNINSTKEY}" "Publisher" "Botloft"
+  ; The folder is under the new name now; the old key goes.
+  DeleteRegKey SHCTX "${BOTLOFT_OLD_FOLDER_KEY}"
+  DeleteRegKey /ifempty SHCTX "${BOTLOFT_OLD_PUBLISHER_KEY}"
 !macroend
 
 !macro NSIS_HOOK_PREUNINSTALL
   ; A real uninstall stops the daemon and removes its scheduled task and
-  ; binary. Bots and data stay in %LOCALAPPDATA%\Botloft. An update runs
-  ; this uninstaller too, with /UPDATE: then the daemon keeps running.
+  ; binary. Bots and data stay in %LOCALAPPDATA%\Botloft. An uninstaller run
+  ; with /UPDATE leaves the daemon running.
   ${If} $UpdateMode <> 1
     nsExec::Exec '"$INSTDIR\botloftd.exe" service uninstall'
     Pop $0

app/src/dev/seedBrowser.ts

@@ -1,12 +1,16 @@
 // Dev only: Scout searching in its browser in the fake preview, so the
-// browser panel has something live to show. The "page" is drawn on a
-// canvas and sent as JPEG frames, like the daemon's screencast.
+// browser panel has something live to show: three tabs, the search in the
+// active one. The "page" is drawn on a canvas, the size the panel asks for,
+// and sent as JPEG frames, like the daemon's screencast.
 
 import type { FakeBotloft } from "../lib/fake";
+import type { PageSize } from "../lib/fakePages";
 import type { BotId } from "../lib/protocol.gen";
+import { activeTab, drawPage } from "./seedPage";
 
-const W = 1280;
-const H = 800;
+const SITE = "https://recipes.example/";
+
+const RECIPES = ["Classic sourdough loaf", "Starter in 5 days", "No-knead rye", "Focaccia"];
 
 interface Scene {
   url: string;
@@ -15,16 +19,16 @@ interface Scene {
   results: boolean;
 }
 
-function draw(scene: Scene): string {
+function draw(scene: Scene, size: PageSize): string {
   const canvas = document.createElement("canvas");
-  canvas.width = W;
-  canvas.height = H;
+  canvas.width = size.width;
+  canvas.height = size.height;
   const g = canvas.getContext("2d");
   if (!g) {
     return "";
   }
   g.fillStyle = "#ffffff";
-  g.fillRect(0, 0, W, H);
+  g.fillRect(0, 0, size.width, size.height);
   g.fillStyle = "#1f2937";
   g.font = "600 34px system-ui, sans-serif";
   g.fillText(scene.results ? "Results" : "Find a recipe", 120, 150);
@@ -43,15 +47,12 @@ function draw(scene: Scene): string {
   g.fillStyle = "#ffffff";
   g.fillText("Search", 938, 226);
   if (scene.results) {
-    for (let row = 0; row < 4; row++) {
+    // A taller page shows more of the list.
+    for (let row = 0; 300 + row * 110 < size.height - 60; row++) {
       const y = 300 + row * 110;
       g.fillStyle = "#1d4ed8";
       g.font = "600 24px system-ui, sans-serif";
-      g.fillText(
-        ["Classic sourdough loaf", "Starter in 5 days", "No-knead rye", "Focaccia"][row] ?? "",
-        120,
-        y,
-      );
+      g.fillText(RECIPES[row % RECIPES.length] ?? "", 120, y);
       g.fillStyle = "#e5e7eb";
       g.fillRect(120, y + 18, 820, 14);
       g.fillRect(120, y + 42, 560, 14);
@@ -60,10 +61,10 @@ function draw(scene: Scene): string {
   return canvas.toDataURL("image/jpeg", 0.7).split(",")[1] ?? "";
 }
 
-/** Scout searches for a recipe, over and over. */
+/** Scout searches for a recipe, over and over, while the browser is its. */
 export function seedBrowser(fake: FakeBotloft, scout: BotId): void {
   const home: Scene = {
-    url: "https://recipes.example/",
+    url: SITE,
     title: "Recipes",
     query: "",
     results: false,
@@ -116,15 +117,25 @@ export function seedBrowser(fake: FakeBotloft, scout: BotId): void {
   );
   let scene = home;
   let step = 0;
-  fake.browser.open(scout, home.url, home.title);
-  fake.browser.frame(scout, draw(scene));
+  // Two pages it opened on the way, then the one it works in.
+  fake.browser.open(scout, "https://bakers.example/forum/hydration", "Hydration tips · Bakers");
+  fake.browser.openTab(scout, "https://mill.example/flour/rye", "Rye flour · The Mill");
+  fake.browser.openTab(scout, home.url, home.title);
+  fake.browser.paint(scout, (size) => {
+    const tab = activeTab(fake, scout);
+    return tab?.url.startsWith(SITE) ? draw(scene, size) : drawPage(tab, size);
+  });
   setInterval(() => {
+    // In the owner's hands, the bot waits.
+    if (fake.browser.state(scout).control === "owner") {
+      return;
+    }
     const next = steps[step % steps.length];
     step += 1;
     if (next) {
       scene = next(scene);
       fake.browser.open(scout, scene.url, scene.title);
-      fake.browser.frame(scout, draw(scene));
+      fake.browser.repaint(scout);
     }
   }, 2200);
 }

app/src/dev/seedHands.ts

@@ -3,10 +3,12 @@
 // the owner's clicks and keys, so taking the browser can be tried end to end.
 
 import type { FakeBotloft } from "../lib/fake";
+import type { PageSize } from "../lib/fakePages";
 import type { BrowserInput, CrewId } from "../lib/protocol.gen";
+import { activeTab, drawPage } from "./seedPage";
+
+const SITE = "https://flour.example/";
 
-const W = 1280;
-const H = 800;
 const FIELDS = { user: 300, password: 390 } as const;
 type Field = keyof typeof FIELDS;
 
@@ -17,16 +19,16 @@ interface Form {
   signedIn: boolean;
 }
 
-function draw(form: Form): string {
+function draw(form: Form, size: PageSize): string {
   const canvas = document.createElement("canvas");
-  canvas.width = W;
-  canvas.height = H;
+  canvas.width = size.width;
+  canvas.height = size.height;
   const g = canvas.getContext("2d");
   if (!g) {
     return "";
   }
   g.fillStyle = "#f7f4ee";
-  g.fillRect(0, 0, W, H);
+  g.fillRect(0, 0, size.width, size.height);
   g.fillStyle = "#3b2a1a";
   g.font = "600 36px Georgia, serif";
   if (form.signedIn) {
@@ -90,21 +92,24 @@ export function seedHands(fake: FakeBotloft, crewId: CrewId): void {
   const clerk = fake.addBot(crewId, "Clerk", "Places the bakery's orders");
   fake.setBotState(clerk.id, "needs_approval", 2);
   const form: Form = { user: "", password: "", field: null, signedIn: false };
-  const login = "https://flour.example/login";
+  const login = `${SITE}login`;
+  const onSite = () => activeTab(fake, clerk.id)?.url.startsWith(SITE) ?? false;
   fake.browser.open(clerk.id, login, "Sign in · Flour Co.");
-  fake.browser.frame(clerk.id, draw(form));
+  fake.browser.paint(clerk.id, (size) =>
+    onSite() ? draw(form, size) : drawPage(activeTab(fake, clerk.id), size),
+  );
   fake.chat.tool(clerk.id, "mcp__botloft__browser_open", { summary: login, status: "done" });
   const task = "Sign in to Flour Co. with the bakery's account";
   fake.chat.tool(clerk.id, "mcp__botloft__browser_ask_owner", { summary: task, status: "running" });
   fake.browser.ask(clerk.id, task);
   fake.browser.onInput(clerk.id, (input) => {
-    if (form.signedIn) {
+    if (form.signedIn || !onSite()) {
       return;
     }
     if (handle(form, input)) {
       form.signedIn = true;
-      fake.browser.open(clerk.id, "https://flour.example/orders", "Orders · Flour Co.");
+      fake.browser.open(clerk.id, `${SITE}orders`, "Orders · Flour Co.");
     }
-    fake.browser.frame(clerk.id, draw(form));
+    fake.browser.repaint(clerk.id);
   });
 }

app/src/dev/seedPage.ts

@@ -0,0 +1,37 @@
+// Dev only: any page of the fake preview's browsers that no seed draws
+// itself, such as a tab in the background or an address the owner typed.
+// A heading with the tab's title, its site, and lines of grey "text".
+
+import type { FakeBotloft } from "../lib/fake";
+import type { PageSize } from "../lib/fakePages";
+import type { BotId, BrowserTab } from "../lib/protocol.gen";
+
+/** The bot's active tab, if its browser has any. */
+export function activeTab(fake: FakeBotloft, botId: BotId): BrowserTab | null {
+  return fake.browser.state(botId).tabs.find((tab) => tab.active) ?? null;
+}
+
+export function drawPage(tab: BrowserTab | null, size: PageSize): string {
+  const canvas = document.createElement("canvas");
+  canvas.width = size.width;
+  canvas.height = size.height;
+  const g = canvas.getContext("2d");
+  if (!g) {
+    return "";
+  }
+  g.fillStyle = "#ffffff";
+  g.fillRect(0, 0, size.width, size.height);
+  if (tab && tab.url !== "about:blank") {
+    g.fillStyle = "#111827";
+    g.font = "600 40px Georgia, serif";
+    g.fillText(tab.title || tab.url, 120, 160);
+    g.fillStyle = "#6b7280";
+    g.font = "20px system-ui, sans-serif";
+    g.fillText(tab.url, 120, 204);
+    g.fillStyle = "#e5e7eb";
+    for (let y = 270; y < size.height - 80; y += 34) {
+      g.fillRect(120, y, y % 5 === 0 ? 640 : 960, 14);
+    }
+  }
+  return canvas.toDataURL("image/jpeg", 0.7).split(",")[1] ?? "";
+}