feat(desktop): offer leftover data as Start fresh, not a refused Start

A fresh install that found a previous installation's data refused Start
and asked for a separate, two-step reset. For somebody who deleted the
folder to start over, that read as an error during normal startup.

The screen now offers one choice instead: Start fresh deletes exactly the
data shown and carries on into Start. How to keep the data (restore the
previous folder) is explained under it, and the volumes and containers it
removes stay listed behind a disclosure. The failure alert is no longer
shown for this case. Errors from the deletion itself are still shown as
failures, and nothing starts.

Starting under new names, so nothing is reused and nothing must be
deleted, is tracked in FOR-345.

Author: dustywusty

CHANGELOG.md

@@ -36,10 +36,11 @@ Newest first. `Unreleased` is what is on `main` and not yet tagged.
 
 A desktop installation set up again after its folder was deleted reused whatever the previous one
 left in the container engine: Bot workspace files, and each Bot's browser profile with its website
-sign-ins, under the same Bot ids. Only the database was checked. Start now lists every volume and
-stopped container the previous installation left, and offers one confirmed reset that removes them;
-nothing is reused without asking. A container from it that is still running stops the reset until it
-is stopped. An installation with its saved key keeps its data as before.
+sign-ins, under the same Bot ids. Only the database was checked. Start now finds every volume and
+stopped container the previous installation left and offers Start fresh, which deletes exactly those
+and then starts; nothing is reused without asking. To keep the data, restore the previous folder
+instead. A container from it that is still running stops the deletion until it is stopped. An
+installation with its saved key keeps its data as before.
 
 ### A new desktop install starts its server again
 

desktop/src-tauri/src/main.rs

@@ -1134,7 +1134,7 @@ fn require_existing_encryption_key_with_recovery(
             if found.volumes.is_empty() {
                 return Ok(());
             }
-            let mut problem = Problem::plain("OpenBot found data from a previous installation, such as Bots' files and browser sign-ins. OpenBot will not reuse it in a new installation. Restore the previous installation's folder to keep it, or reset the leftover data to start fresh.");
+            let mut problem = Problem::plain("OpenBot found data from a previous installation, such as Bots' files and browser sign-ins. OpenBot will not reuse it in a new installation. Restore the previous installation's folder to keep it, or choose Start fresh to delete it.");
             match fresh_root_without_encryption_key(root, secrets) {
                 Ok(true) if found.resettable() => {
                     problem.leftover = Some(Box::new(LeftoverReset {
@@ -1163,9 +1163,9 @@ fn require_existing_encryption_key_with_recovery(
     match recovery {
         Ok(Some(found)) if found.database.is_some() && found.resettable() => {
             problem.said = if found.volumes.len() > 1 {
-                "OpenBot found a database and other data from a previous installation, but its encryption key is unavailable. Restore the original key to keep its saved data, or reset the leftover data to start fresh."
+                "OpenBot found a database and other data from a previous installation, but its encryption key is unavailable. Restore the original key to keep its saved data, or choose Start fresh to delete it."
             } else {
-                "OpenBot found a database from a previous installation, but its encryption key is unavailable. Restore the original key to keep its saved data, or reset the leftover database to start fresh."
+                "OpenBot found a database from a previous installation, but its encryption key is unavailable. Restore the original key to keep its saved data, or choose Start fresh to delete it."
             }
             .into();
             problem.leftover = Some(Box::new(LeftoverReset {
@@ -1271,7 +1271,9 @@ fn reset_leftover_database_with(
         .as_ref()
         .is_some_and(|selected| selected != root)
     {
-        return Err(Problem::plain("The selected installation changed. Try Start again before resetting its leftover data."));
+        return Err(Problem::plain(
+            "The selected installation changed. Try Start again.",
+        ));
     }
     let sorted = |names: &[String]| {
         let mut names = names.to_vec();
@@ -1288,7 +1290,7 @@ fn reset_leftover_database_with(
                 && offer.containers == containers
         })
         .cloned()
-        .ok_or_else(|| Problem::plain("The leftover data reset offer is no longer current. Try Start again before confirming a reset."))?;
+        .ok_or_else(|| Problem::plain("The leftover data changed after it was shown. Try Start again to see what is left now."))?;
     let secrets = read_secrets()?;
     if !fresh_root_without_encryption_key(root, &secrets)? {
         return Err(Problem::plain("This installation is already configured or has its original encryption key. Its data cannot be reset here."));

desktop/src/App.test.tsx

@@ -1227,7 +1227,7 @@ function emptyConfiguration() {
   };
 }
 
-test("leftover database recovery requires confirmation and keeps setup ready to retry", async () => {
+test("leftover database is offered as a fresh start that carries on into Start", async () => {
   useCompatibleEndpointSetup({});
   const previous = invokeHandler;
   const reset = deferred<void>();
@@ -1250,21 +1250,15 @@ test("leftover database recovery requires confirmation and keeps setup ready to
   await userEvent.click(view.getByRole("button", { name: "Start OpenBot" }));
   const resets = () =>
     invokeCalls.filter((call) => call.command === "reset_leftover_database");
-  await userEvent.click(
-    await view.findByRole("button", { name: "Reset leftover database" }),
-  );
+  const startFresh = await view.findByRole("button", { name: "Start fresh" });
+  // A choice, not a failure: nothing announces that Start did not finish.
+  expect(view.queryByRole("alert")).toBeNull();
+  expect(view.getByText(/saved chats, Bots, and settings/)).toBeTruthy();
   expect(view.getByText(/permanently deletes/)).toBeTruthy();
+  expect(view.getByText(/with its original encryption key/)).toBeTruthy();
   expect(view.getByText("fixture_postgres-data")).toBeTruthy();
   expect(resets()).toHaveLength(0);
-  await userEvent.click(view.getByRole("button", { name: "Keep saved data" }));
-  expect(resets()).toHaveLength(0);
-  expect(view.queryByRole("button", { name: "Delete saved data" })).toBeNull();
-  await userEvent.click(
-    view.getByRole("button", { name: "Reset leftover database" }),
-  );
-  await userEvent.click(
-    view.getByRole("button", { name: "Delete saved data" }),
-  );
+  await userEvent.click(startFresh);
   expect(resets()).toEqual([
     {
       command: "reset_leftover_database",
@@ -1276,25 +1270,22 @@ test("leftover database recovery requires confirmation and keeps setup ready to
       },
     },
   ]);
-  expect(
-    view.getByRole("button", { name: "Deleting saved data…" }),
-  ).toHaveProperty("disabled", true);
+  expect(view.getByRole("button", { name: "Starting fresh…" })).toHaveProperty(
+    "disabled",
+    true,
+  );
   expect(view.getByRole("button", { name: "Working…" })).toHaveProperty(
     "disabled",
     true,
   );
-  await act(async () => reset.resolve());
-  expect(
-    view.queryByRole("button", { name: "Reset leftover database" }),
-  ).toBeNull();
-  expect(view.queryByRole("alert")).toBeNull();
   expect(starts).toBe(1);
-  await userEvent.click(view.getByRole("button", { name: "Start OpenBot" }));
+  await act(async () => reset.resolve());
   await view.findByRole("button", { name: "Ask" });
+  expect(starts).toBe(2);
   expect(installationCalls()).toHaveLength(1);
 });
 
-test("leftover data recovery names every container and volume and removes only that list", async () => {
+test("starting fresh names every container and volume and removes only that list", async () => {
   useCompatibleEndpointSetup({});
   const previous = invokeHandler;
   const volumes = [
@@ -1322,18 +1313,18 @@ test("leftover data recovery names every container and volume and removes only t
   );
   await userEvent.click(view.getByRole("button", { name: "Continue" }));
   await userEvent.click(view.getByRole("button", { name: "Start OpenBot" }));
-  await userEvent.click(
-    await view.findByRole("button", { name: "Reset leftover data" }),
-  );
-  expect(view.queryByText(/local OpenBot database/)).toBeNull();
+  const startFresh = await view.findByRole("button", { name: "Start fresh" });
+  expect(view.queryByText(/saved chats/)).toBeNull();
+  expect(view.queryByText(/encryption key/)).toBeNull();
   expect(view.getByText(/browser sign-ins/)).toBeTruthy();
+  expect(
+    view.getByText(/Restore the previous installation’s folder/),
+  ).toBeTruthy();
   for (const volume of volumes) expect(view.getByText(volume)).toBeTruthy();
   expect(view.getByText(/stopped containers/)).toBeTruthy();
   for (const container of containers)
     expect(view.getByText(container)).toBeTruthy();
-  await userEvent.click(
-    view.getByRole("button", { name: "Delete saved data" }),
-  );
+  await userEvent.click(startFresh);
   expect(
     invokeCalls.filter((call) => call.command === "reset_leftover_database"),
   ).toEqual([
@@ -1349,7 +1340,7 @@ test("leftover data recovery names every container and volume and removes only t
   ]);
 });
 
-test("database recovery failure is shown without restarting services", async () => {
+test("a fresh start that cannot delete the leftovers is shown without starting", async () => {
   useCompatibleEndpointSetup({});
   const previous = invokeHandler;
   invokeHandler = async (command, args) => {
@@ -1371,12 +1362,10 @@ test("database recovery failure is shown without restarting services", async ()
   await userEvent.click(view.getByRole("button", { name: "Continue" }));
   await userEvent.click(view.getByRole("button", { name: "Start OpenBot" }));
   await userEvent.click(
-    await view.findByRole("button", { name: "Reset leftover database" }),
-  );
-  await userEvent.click(
-    view.getByRole("button", { name: "Delete saved data" }),
+    await view.findByRole("button", { name: "Start fresh" }),
   );
   expect(await view.findByText(/database is still in use/)).toBeTruthy();
+  expect(view.getByRole("alert")).toBeTruthy();
   expect(
     invokeCalls.filter((call) => call.command === "start_stack"),
   ).toHaveLength(1);

desktop/src/App.tsx

@@ -2,7 +2,7 @@ import { invoke } from "@tauri-apps/api/core";
 import { listen } from "@tauri-apps/api/event";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Ask } from "./Ask";
-import { DatabaseReset } from "./DatabaseReset";
+import { StartFresh } from "./StartFresh";
 import {
   DEFAULT_HARNESS,
   type HarnessChoice,
@@ -609,7 +609,8 @@ export function App() {
     }
   }
 
-  async function resetLeftoverData(volumes: string[], containers: string[]) {
+  /** The leftovers go first, then Start carries on: starting fresh is one choice, not two. */
+  async function startFresh(volumes: string[], containers: string[]) {
     setBusy(true);
     try {
       await invoke("reset_leftover_database", {
@@ -618,14 +619,17 @@ export function App() {
         containers,
         confirmed: true,
       });
-      setFailure(null);
-      setRecoveryFailure(null);
-      setSteps([]);
     } catch (error) {
       setFailure(asProblem(error));
+      return;
     } finally {
+      // `start` sets `busy` itself, and its early return would never clear it.
       setBusy(false);
     }
+    setFailure(null);
+    setRecoveryFailure(null);
+    setSteps([]);
+    await start();
   }
 
   function modelCanStart() {
@@ -991,13 +995,13 @@ export function App() {
           back here, and a heading that still says everything is running while the box underneath
           names the process that stopped is a screen arguing with itself. */}
         {!running && leftoverVolumes.length > 0 && (
-          <DatabaseReset
+          <StartFresh
             key={`${root}:${leftoverVolumes.join(",")}:${leftoverContainers.join(",")}`}
             busy={busy}
             containers={leftoverContainers}
             database={Boolean(displayedFailure?.database_reset)}
             volumes={leftoverVolumes}
-            onReset={resetLeftoverData}
+            onStartFresh={startFresh}
           />
         )}
 
@@ -1270,7 +1274,10 @@ export function App() {
 
         <SetupProgress steps={steps} />
 
-        {displayedFailure && <Failure problem={displayedFailure} />}
+        {/* Leftover data is a choice, offered above, not a failure to report here. */}
+        {displayedFailure && leftoverVolumes.length === 0 && (
+          <Failure problem={displayedFailure} />
+        )}
 
         {!running && !returningToInstallation && (
           <details>