Fix global worktrees root resync after dirty edits

Author: Reekin

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

@@ -440,32 +440,38 @@ const renderEnvironmentsSection = (
     options.onUpdateAppSettings ?? vi.fn().mockResolvedValue(undefined);
   const onUpdateWorkspaceSettings =
     options.onUpdateWorkspaceSettings ?? vi.fn().mockResolvedValue(undefined);
-
-  const props: ComponentProps<typeof SettingsView> = {
+  const defaultGroupedWorkspaces =
+    options.groupedWorkspaces ??
+    [
+      {
+        id: null,
+        name: "Ungrouped",
+        workspaces: [
+          workspace({
+            id: "w1",
+            name: "Project One",
+            settings: {
+              sidebarCollapsed: false,
+              worktreeSetupScript: "echo one",
+            },
+          }),
+        ],
+      },
+    ];
+
+  const buildProps = (
+    nextOptions: {
+      appSettings?: Partial<AppSettings>;
+      groupedWorkspaces?: ComponentProps<typeof SettingsView>["groupedWorkspaces"];
+    } = {},
+  ): ComponentProps<typeof SettingsView> => ({
     reduceTransparency: false,
     onToggleTransparency: vi.fn(),
-    appSettings: { ...baseSettings, ...options.appSettings },
+    appSettings: { ...baseSettings, ...options.appSettings, ...nextOptions.appSettings },
     openAppIconById: {},
     onUpdateAppSettings,
     workspaceGroups: [],
-    groupedWorkspaces:
-      options.groupedWorkspaces ??
-      [
-        {
-          id: null,
-          name: "Ungrouped",
-          workspaces: [
-            workspace({
-              id: "w1",
-              name: "Project One",
-              settings: {
-                sidebarCollapsed: false,
-                worktreeSetupScript: "echo one",
-              },
-            }),
-          ],
-        },
-      ],
+    groupedWorkspaces: nextOptions.groupedWorkspaces ?? defaultGroupedWorkspaces,
     ungroupedLabel: "Ungrouped",
     onClose: vi.fn(),
     onMoveWorkspace: vi.fn(),
@@ -486,10 +492,19 @@ const renderEnvironmentsSection = (
     onCancelDictationDownload: vi.fn(),
     onRemoveDictationModel: vi.fn(),
     initialSection: "environments",
-  };
+  });
 
-  render(<SettingsView {...props} />);
-  return { onUpdateAppSettings, onUpdateWorkspaceSettings };
+  const renderResult = render(<SettingsView {...buildProps()} />);
+  return {
+    onUpdateAppSettings,
+    onUpdateWorkspaceSettings,
+    rerender: (
+      nextOptions: {
+        appSettings?: Partial<AppSettings>;
+        groupedWorkspaces?: ComponentProps<typeof SettingsView>["groupedWorkspaces"];
+      } = {},
+    ) => renderResult.rerender(<SettingsView {...buildProps(nextOptions)} />),
+  };
 };
 
 describe("SettingsView Display", () => {
@@ -869,6 +884,33 @@ describe("SettingsView Environments", () => {
     });
   });
 
+  it("resyncs the global worktrees root baseline after dirty state clears", async () => {
+    const { rerender } = renderEnvironmentsSection({
+      groupedWorkspaces: [],
+      appSettings: { globalWorktreesFolder: null },
+    });
+
+    const input = screen.getByLabelText("Global worktrees root");
+    fireEvent.change(input, { target: { value: "I:/typing" } });
+
+    rerender({
+      groupedWorkspaces: [],
+      appSettings: { globalWorktreesFolder: "I:/loaded-from-settings" },
+    });
+
+    expect((screen.getByLabelText("Global worktrees root") as HTMLInputElement).value).toBe(
+      "I:/typing",
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "Reset" }));
+
+    await waitFor(() => {
+      expect((screen.getByLabelText("Global worktrees root") as HTMLInputElement).value).toBe(
+        "I:/loaded-from-settings",
+      );
+    });
+  });
+
   it("shows save errors for the global worktrees root when there are no projects", async () => {
     const onUpdateAppSettings = vi
       .fn()

src/features/settings/hooks/useSettingsEnvironmentsSection.ts

@@ -54,7 +54,7 @@ export const useSettingsEnvironmentsSection = ({
   );
   const [worktreesFolderDraft, setWorktreesFolderDraft] = useState("");
   const [worktreesFolderSaved, setWorktreesFolderSaved] = useState<string | null>(null);
-  const lastGlobalWorktreesFolderProp = useRef(appSettings.globalWorktreesFolder);
+  const lastSyncedGlobalWorktreesFolderProp = useRef(appSettings.globalWorktreesFolder);
 
   const environmentWorkspace = useMemo(() => {
     if (mainWorkspaces.length === 0) return null;
@@ -83,15 +83,15 @@ export const useSettingsEnvironmentsSection = ({
   const worktreesFolderDirty = (worktreesFolderDraft.trim() || null) !== worktreesFolderSaved;
 
   useEffect(() => {
-    const previousGlobalWorktreesFolder = lastGlobalWorktreesFolderProp.current;
-    lastGlobalWorktreesFolderProp.current = appSettings.globalWorktreesFolder;
-    if (previousGlobalWorktreesFolder === appSettings.globalWorktreesFolder) {
+    if (lastSyncedGlobalWorktreesFolderProp.current === appSettings.globalWorktreesFolder) {
       return;
     }
-    if (!globalWorktreesFolderDirty) {
-      setGlobalWorktreesFolderSaved(appSettings.globalWorktreesFolder);
-      setGlobalWorktreesFolderDraft(appSettings.globalWorktreesFolder ?? "");
+    if (globalWorktreesFolderDirty) {
+      return;
     }
+    lastSyncedGlobalWorktreesFolderProp.current = appSettings.globalWorktreesFolder;
+    setGlobalWorktreesFolderSaved(appSettings.globalWorktreesFolder);
+    setGlobalWorktreesFolderDraft(appSettings.globalWorktreesFolder ?? "");
   }, [appSettings.globalWorktreesFolder, globalWorktreesFolderDirty]);
 
   useEffect(() => {
@@ -102,16 +102,24 @@ export const useSettingsEnvironmentsSection = ({
       setEnvironmentDraftScript("");
       setEnvironmentError(null);
       setEnvironmentSaving(false);
-      setGlobalWorktreesFolderDraft(appSettings.globalWorktreesFolder ?? "");
-      setGlobalWorktreesFolderSaved(appSettings.globalWorktreesFolder);
+      if (!globalWorktreesFolderDirty) {
+        lastSyncedGlobalWorktreesFolderProp.current = appSettings.globalWorktreesFolder;
+        setGlobalWorktreesFolderDraft(appSettings.globalWorktreesFolder ?? "");
+        setGlobalWorktreesFolderSaved(appSettings.globalWorktreesFolder);
+      }
       setWorktreesFolderDraft("");
       setWorktreesFolderSaved(null);
       return;
     }
     if (environmentWorkspaceId !== environmentWorkspace.id) {
       setEnvironmentWorkspaceId(environmentWorkspace.id);
     }
-  }, [appSettings.globalWorktreesFolder, environmentWorkspace, environmentWorkspaceId]);
+  }, [
+    appSettings.globalWorktreesFolder,
+    environmentWorkspace,
+    environmentWorkspaceId,
+    globalWorktreesFolderDirty,
+  ]);
 
   useEffect(() => {
     if (!environmentWorkspace) return;