Validate that the last used directory still exists when rehydrating it

Author: charlesvien

apps/array/src/renderer/features/task-detail/components/TaskInput.tsx

@@ -25,7 +25,7 @@ export function TaskInput() {
 
   const { view } = useNavigationStore();
   const { lastUsedDirectory } = useTaskDirectoryStore();
-  const { folders, isLoaded: foldersLoaded } = useRegisteredFoldersStore();
+  const { folders } = useRegisteredFoldersStore();
   const { lastUsedRunMode, lastUsedLocalWorkspaceMode } = useSettingsStore();
 
   const [selectedDirectory, setSelectedDirectory] = useState(
@@ -41,35 +41,6 @@ export function TaskInput() {
     useState<LocalWorkspaceMode>(lastUsedLocalWorkspaceMode);
   const [selectedBranch, setSelectedBranch] = useState<string | null>(null);
 
-  useEffect(() => {
-    if (!foldersLoaded || selectedDirectory) return;
-
-    if (view.folderId) {
-      const folder = folders.find((f) => f.id === view.folderId);
-      if (folder) {
-        setSelectedDirectory(folder.path);
-        return;
-      }
-    }
-
-    if (lastUsedDirectory) {
-      const folderExists = folders.some((f) => f.path === lastUsedDirectory);
-      if (folderExists) {
-        setSelectedDirectory(lastUsedDirectory);
-      } else if (folders.length > 0) {
-        setSelectedDirectory(folders[0].path);
-      }
-    } else if (folders.length > 0) {
-      setSelectedDirectory(folders[0].path);
-    }
-  }, [
-    foldersLoaded,
-    folders,
-    lastUsedDirectory,
-    view.folderId,
-    selectedDirectory,
-  ]);
-
   const { githubIntegration } = useRepositoryIntegration();
 
   useEffect(() => {

apps/array/src/renderer/stores/taskDirectoryStore.ts

@@ -10,6 +10,7 @@ interface TaskDirectoryState {
   getTaskDirectory: (taskId: string, repoKey?: string) => string | null;
   setRepoDirectory: (repoKey: string, directory: string) => void;
   clearRepoDirectory: (repoKey: string) => void;
+  validateLastUsedDirectory: () => Promise<void>;
 }
 
 const isValidPath = (path: string): boolean => {
@@ -54,6 +55,17 @@ export const useTaskDirectoryStore = create<TaskDirectoryState>()(
           repoDirectories: omitKey(state.repoDirectories, repoKey),
         }));
       },
+
+      validateLastUsedDirectory: async () => {
+        const { lastUsedDirectory } = get();
+        if (!lastUsedDirectory) return;
+
+        const exists =
+          await window.electronAPI?.validateRepo(lastUsedDirectory);
+        if (!exists) {
+          set({ lastUsedDirectory: null });
+        }
+      },
     }),
     {
       name: "task-directory-mappings",
@@ -84,6 +96,9 @@ export const useTaskDirectoryStore = create<TaskDirectoryState>()(
           state.repoDirectories = cleanedRepoDirs;
           state.lastUsedDirectory = cleanedLastUsed;
         }
+
+        // Validate that lastUsedDirectory still exists on disk
+        state.validateLastUsedDirectory();
       },
     },
   ),