Fix global worktrees root partial-save state

Author: Reekin

src/features/settings/components/SettingsView.test.tsx

@@ -814,6 +814,40 @@ describe("SettingsView Environments", () => {
     expect(onUpdateAppSettings).not.toHaveBeenCalled();
   });
 
+  it("keeps the global worktrees root marked as saved after workspace save fails", async () => {
+    const onUpdateAppSettings = vi.fn().mockResolvedValue(undefined);
+    const onUpdateWorkspaceSettings = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("Failed to save workspace settings"))
+      .mockResolvedValueOnce(undefined);
+    renderEnvironmentsSection({
+      appSettings: { globalWorktreesFolder: "I:/existing-worktrees" },
+      onUpdateAppSettings,
+      onUpdateWorkspaceSettings,
+    });
+
+    fireEvent.change(screen.getByLabelText("Global worktrees root"), {
+      target: { value: "I:/cm-worktrees" },
+    });
+    fireEvent.change(screen.getByPlaceholderText("pnpm install"), {
+      target: { value: "echo updated" },
+    });
+    fireEvent.click(screen.getByRole("button", { name: "Save" }));
+
+    expect(
+      await screen.findByText("Failed to save workspace settings"),
+    ).toBeTruthy();
+    expect(onUpdateAppSettings).toHaveBeenCalledTimes(1);
+    expect(onUpdateWorkspaceSettings).toHaveBeenCalledTimes(1);
+
+    fireEvent.click(screen.getByRole("button", { name: "Save" }));
+
+    await waitFor(() => {
+      expect(onUpdateWorkspaceSettings).toHaveBeenCalledTimes(2);
+    });
+    expect(onUpdateAppSettings).toHaveBeenCalledTimes(1);
+  });
+
   it("keeps the global worktrees root editable when there are no projects", async () => {
     const onUpdateAppSettings = vi.fn().mockResolvedValue(undefined);
     renderEnvironmentsSection({
@@ -853,6 +887,50 @@ describe("SettingsView Environments", () => {
     ).toBeTruthy();
   });
 
+  it("keeps the new global worktrees root as saved when workspace settings fail afterward", async () => {
+    const onUpdateAppSettings = vi.fn().mockResolvedValue(undefined);
+    const onUpdateWorkspaceSettings = vi
+      .fn()
+      .mockRejectedValue(new Error("Failed to save workspace settings"));
+    renderEnvironmentsSection({
+      appSettings: { globalWorktreesFolder: "I:/existing-worktrees" },
+      onUpdateAppSettings,
+      onUpdateWorkspaceSettings,
+    });
+
+    const input = screen.getByLabelText("Global worktrees root");
+    const textarea = screen.getByPlaceholderText("pnpm install");
+    fireEvent.change(input, { target: { value: "I:/cm-worktrees" } });
+    fireEvent.change(textarea, { target: { value: "echo updated" } });
+    fireEvent.click(screen.getByRole("button", { name: "Save" }));
+
+    expect(
+      await screen.findByText("Failed to save workspace settings"),
+    ).toBeTruthy();
+
+    await waitFor(() => {
+      expect(onUpdateAppSettings).toHaveBeenCalledWith(
+        expect.objectContaining({
+          globalWorktreesFolder: "I:/cm-worktrees",
+        }),
+      );
+      expect(onUpdateWorkspaceSettings).toHaveBeenCalledWith("w1", {
+        worktreeSetupScript: "echo updated",
+        worktreesFolder: null,
+      });
+    });
+
+    expect((input as HTMLInputElement).value).toBe("I:/cm-worktrees");
+
+    onUpdateWorkspaceSettings.mockResolvedValueOnce(undefined);
+    fireEvent.click(screen.getByRole("button", { name: "Save" }));
+
+    await waitFor(() => {
+      expect(onUpdateWorkspaceSettings).toHaveBeenCalledTimes(2);
+    });
+    expect(onUpdateAppSettings).toHaveBeenCalledTimes(1);
+  });
+
   it("saves the setup script for the selected project", async () => {
     const onUpdateWorkspaceSettings = vi.fn().mockResolvedValue(undefined);
     renderEnvironmentsSection({ onUpdateWorkspaceSettings });

src/features/settings/hooks/useSettingsEnvironmentsSection.ts

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import type { Dispatch, SetStateAction } from "react";
 import type { AppSettings, WorkspaceInfo } from "@/types";
 import { normalizeWorktreeSetupScript } from "@settings/components/settingsViewHelpers";
@@ -54,6 +54,7 @@ export const useSettingsEnvironmentsSection = ({
   );
   const [worktreesFolderDraft, setWorktreesFolderDraft] = useState("");
   const [worktreesFolderSaved, setWorktreesFolderSaved] = useState<string | null>(null);
+  const lastGlobalWorktreesFolderProp = useRef(appSettings.globalWorktreesFolder);
 
   const environmentWorkspace = useMemo(() => {
     if (mainWorkspaces.length === 0) return null;
@@ -82,15 +83,16 @@ export const useSettingsEnvironmentsSection = ({
   const worktreesFolderDirty = (worktreesFolderDraft.trim() || null) !== worktreesFolderSaved;
 
   useEffect(() => {
-    if (!globalWorktreesFolderDirty && globalWorktreesFolderSaved !== appSettings.globalWorktreesFolder) {
+    const previousGlobalWorktreesFolder = lastGlobalWorktreesFolderProp.current;
+    lastGlobalWorktreesFolderProp.current = appSettings.globalWorktreesFolder;
+    if (previousGlobalWorktreesFolder === appSettings.globalWorktreesFolder) {
+      return;
+    }
+    if (!globalWorktreesFolderDirty) {
       setGlobalWorktreesFolderSaved(appSettings.globalWorktreesFolder);
       setGlobalWorktreesFolderDraft(appSettings.globalWorktreesFolder ?? "");
     }
-  }, [
-    appSettings.globalWorktreesFolder,
-    globalWorktreesFolderDirty,
-    globalWorktreesFolderSaved,
-  ]);
+  }, [appSettings.globalWorktreesFolder, globalWorktreesFolderDirty]);
 
   useEffect(() => {
     if (!environmentWorkspace) {
@@ -147,28 +149,29 @@ export const useSettingsEnvironmentsSection = ({
     const nextScript = environmentDraftNormalized;
     const nextGlobalFolder = globalWorktreesFolderDraft.trim() || null;
     const nextFolder = worktreesFolderDraft.trim() || null;
+    const globalWorktreesFolderChanged = nextGlobalFolder !== globalWorktreesFolderSaved;
     const workspaceSettingsDirty = environmentDirty || worktreesFolderDirty;
     setEnvironmentSaving(true);
     setEnvironmentError(null);
     try {
-      if (nextGlobalFolder !== globalWorktreesFolderSaved) {
+      if (globalWorktreesFolderChanged) {
         await onUpdateAppSettings({
           ...appSettings,
           globalWorktreesFolder: nextGlobalFolder,
         });
+        setGlobalWorktreesFolderSaved(nextGlobalFolder);
+        setGlobalWorktreesFolderDraft(nextGlobalFolder ?? "");
       }
       if (environmentWorkspace && workspaceSettingsDirty) {
         await onUpdateWorkspaceSettings(environmentWorkspace.id, {
           worktreeSetupScript: nextScript,
           worktreesFolder: nextFolder,
         });
+        setEnvironmentSavedScript(nextScript);
+        setEnvironmentDraftScript(nextScript ?? "");
+        setWorktreesFolderSaved(nextFolder);
+        setWorktreesFolderDraft(nextFolder ?? "");
       }
-      setGlobalWorktreesFolderSaved(nextGlobalFolder);
-      setGlobalWorktreesFolderDraft(nextGlobalFolder ?? "");
-      setEnvironmentSavedScript(nextScript);
-      setEnvironmentDraftScript(nextScript ?? "");
-      setWorktreesFolderSaved(nextFolder);
-      setWorktreesFolderDraft(nextFolder ?? "");
     } catch (error) {
       setEnvironmentError(error instanceof Error ? error.message : String(error));
     } finally {