Share Workspace membership checks across teardown consent gates

Author: nedtwigg

standalone/src/quit-confirm-store.ts

@@ -75,13 +75,18 @@ function ownDialog(): void {
 function captureWorkspaces(): void {
   const workspaces = getWorkspacesSnapshot().workspaces;
   workspaceNames = workspaces.map((workspace) => workspace.name);
-  const ids = new Set(workspaces.map((workspace) => workspace.id));
-  unsubscribeWorkspaces = subscribeToWorkspaces(() => {
+  unsubscribeWorkspaces = watchWorkspaceMembership(cancelQuit);
+}
+
+/** Both teardown consent gates keep the Workspace membership they asked about. */
+export function watchWorkspaceMembership(onChange: () => void): () => void {
+  const ids = new Set(getWorkspacesSnapshot().workspaces.map(workspace => workspace.id));
+  return subscribeToWorkspaces(() => {
     const current = getWorkspacesSnapshot().workspaces;
     // A changed destination invalidates consent; focus, rename and order do not.
-    // Every exit from 'open' stops this watch, so no phase check is needed.
+    // Each gate releases its watch before settling or committing.
     if (current.length !== ids.size || current.some((workspace) => !ids.has(workspace.id))) {
-      cancelQuit();
+      onChange();
     }
   });
 }

standalone/src/teardown-flow.ts

@@ -1,10 +1,10 @@
 import { invoke } from "@tauri-apps/api/core";
-import { getWorkspacesSnapshot, subscribeToWorkspaces } from "dormouse-lib/lib/workspace-store";
 import { listWallHandles } from "dormouse-lib/components/wall/wall-handles";
 import { cancelEditorClose, confirmToolEditorsClose } from "dormouse-lib/lib/tool-editor";
 import {
   beginQuitProgress,
   dismissQuitConfirm,
+  watchWorkspaceMembership,
   type QuitConfirmIntent,
 } from "./quit-confirm-store";
 
@@ -164,13 +164,7 @@ export function createTeardownFlow(options: {
       const dirty = listWallHandles().flatMap((wall) => wall.dirtyToolIds());
       if (dirty.length) {
         enter("confirming");
-        const ids = new Set(getWorkspacesSnapshot().workspaces.map(workspace => workspace.id));
-        const mine = { stopWatching: subscribeToWorkspaces(() => {
-          const current = getWorkspacesSnapshot().workspaces;
-          // The unsaved-file question precedes the running-work dialog, but
-          // its consent is already scoped to the Workspaces present now.
-          if (current.length !== ids.size || current.some(workspace => !ids.has(workspace.id))) cancel();
-        }) };
+        const mine = { stopWatching: watchWorkspaceMembership(cancel) };
         editorWait = mine;
         void confirmToolEditorsClose(dirty).then((accepted) => {
           if (editorWait !== mine) return;