They have to move the folder back or remove the repo

charlesvien · charlesvien · commit ea86ed8681cf · 2026-01-06T19:56:26.000Z
diff --git a/apps/array/src/main/services/folders/schemas.ts b/apps/array/src/main/services/folders/schemas.ts
@@ -28,13 +28,6 @@ export const updateFolderAccessedInput = z.object({
   folderId: z.string(),
 });
 
-export const updateFolderPathInput = z.object({
-  folderId: z.string(),
-  newPath: z.string(),
-});
-
-export const updateFolderPathOutput = registeredFolderWithExistsSchema;
-
 export const cleanupOrphanedWorktreesInput = z.object({
   mainRepoPath: z.string(),
 });
@@ -57,8 +50,6 @@ export type RemoveFolderInput = z.infer<typeof removeFolderInput>;
 export type UpdateFolderAccessedInput = z.infer<
   typeof updateFolderAccessedInput
 >;
-export type UpdateFolderPathInput = z.infer<typeof updateFolderPathInput>;
-export type UpdateFolderPathOutput = z.infer<typeof updateFolderPathOutput>;
 export type CleanupOrphanedWorktreesInput = z.infer<
   typeof cleanupOrphanedWorktreesInput
 >;
diff --git a/apps/array/src/main/services/folders/service.ts b/apps/array/src/main/services/folders/service.ts
@@ -140,53 +140,6 @@ export class FoldersService {
     }
   }
 
-  async updateFolderPath(
-    folderId: string,
-    newPath: string,
-  ): Promise<RegisteredFolder & { exists: boolean }> {
-    const folders = foldersStore.get("folders", []);
-    const folder = folders.find((f) => f.id === folderId);
-
-    if (!folder) {
-      throw new Error(`Folder with ID ${folderId} not found`);
-    }
-
-    // Validate the new path exists
-    if (!fs.existsSync(newPath)) {
-      throw new Error(`Path does not exist: ${newPath}`);
-    }
-
-    // Check if it's a git repository
-    const isRepo = await isGitRepository(newPath);
-    if (!isRepo) {
-      throw new Error("The selected folder is not a git repository");
-    }
-
-    // Update the folder
-    folder.path = newPath;
-    folder.name = path.basename(newPath);
-    folder.lastAccessed = new Date().toISOString();
-    foldersStore.set("folders", folders);
-
-    // Update all task associations that reference this folder
-    const associations = foldersStore.get("taskAssociations", []);
-    let hasChanges = false;
-    for (const assoc of associations) {
-      if (assoc.folderId === folderId) {
-        assoc.folderPath = newPath;
-        hasChanges = true;
-      }
-    }
-    if (hasChanges) {
-      foldersStore.set("taskAssociations", associations);
-      log.debug(
-        `Updated folder path for ${associations.filter((a) => a.folderId === folderId).length} task associations`,
-      );
-    }
-
-    return { ...folder, exists: true };
-  }
-
   async cleanupOrphanedWorktrees(
     mainRepoPath: string,
   ): Promise<CleanupOrphanedWorktreesOutput> {
diff --git a/apps/array/src/main/trpc/routers/folders.ts b/apps/array/src/main/trpc/routers/folders.ts
@@ -8,8 +8,6 @@ import {
   getFoldersOutput,
   removeFolderInput,
   updateFolderAccessedInput,
-  updateFolderPathInput,
-  updateFolderPathOutput,
 } from "../../services/folders/schemas.js";
 import type { FoldersService } from "../../services/folders/service.js";
 import { publicProcedure, router } from "../trpc.js";
@@ -41,13 +39,6 @@ export const foldersRouter = router({
       return getService().updateFolderAccessed(input.folderId);
     }),
 
-  updateFolderPath: publicProcedure
-    .input(updateFolderPathInput)
-    .output(updateFolderPathOutput)
-    .mutation(({ input }) => {
-      return getService().updateFolderPath(input.folderId, input.newPath);
-    }),
-
   cleanupOrphanedWorktrees: publicProcedure
     .input(cleanupOrphanedWorktreesInput)
     .output(cleanupOrphanedWorktreesOutput)
diff --git a/apps/array/src/renderer/features/folder-picker/components/FolderPicker.tsx b/apps/array/src/renderer/features/folder-picker/components/FolderPicker.tsx
@@ -14,15 +14,13 @@ interface FolderPickerProps {
   onChange: (path: string) => void;
   placeholder?: string;
   size?: Responsive<"1" | "2">;
-  skipRegister?: boolean;
 }
 
 export function FolderPicker({
   value,
   onChange,
   placeholder = "Select folder...",
   size = "1",
-  skipRegister = false,
 }: FolderPickerProps) {
   const recentFolders = useRegisteredFoldersStore((state) =>
     state.getRecentFolders(),
@@ -49,9 +47,7 @@ export function FolderPicker({
   const handleOpenFilePicker = async () => {
     const selectedPath = await trpcVanilla.os.selectDirectory.query();
     if (selectedPath) {
-      if (!skipRegister) {
-        await addFolder(selectedPath);
-      }
+      await addFolder(selectedPath);
       onChange(selectedPath);
     }
   };
diff --git a/apps/array/src/renderer/features/settings/components/FolderSettingsView.tsx b/apps/array/src/renderer/features/settings/components/FolderSettingsView.tsx
@@ -1,86 +1,33 @@
-import { FolderPicker } from "@features/folder-picker/components/FolderPicker";
-import { useWorkspaceStore } from "@features/workspace/stores/workspaceStore";
 import { useSetHeaderContent } from "@hooks/useSetHeaderContent";
 import { Warning } from "@phosphor-icons/react";
 import {
   Box,
   Button,
   Callout,
   Card,
+  Code,
   Flex,
   Heading,
   Text,
 } from "@radix-ui/themes";
 import { logger } from "@renderer/lib/logger";
 import { useNavigationStore } from "@renderer/stores/navigationStore";
 import { useRegisteredFoldersStore } from "@renderer/stores/registeredFoldersStore";
-import { trpcVanilla } from "@renderer/trpc";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 
 const log = logger.scope("folder-settings");
 
 export function FolderSettingsView() {
   useSetHeaderContent(null);
 
   const { view, navigateToTaskInput } = useNavigationStore();
-  const { folders, removeFolder, loadFolders } = useRegisteredFoldersStore();
-  const queryClient = useQueryClient();
+  const { folders, removeFolder } = useRegisteredFoldersStore();
 
   const folderId = view.type === "folder-settings" ? view.folderId : undefined;
   const folder = folders.find((f) => f.id === folderId);
 
-  const [newPath, setNewPath] = useState(folder?.path ?? "");
   const [error, setError] = useState<string | null>(null);
 
-  // Reset form when folder changes
-  useEffect(() => {
-    if (folder) {
-      setNewPath(folder.path);
-    }
-  }, [folder]);
-
-  const updatePathMutation = useMutation({
-    mutationFn: async (path: string) => {
-      if (!folderId) throw new Error("No folder selected");
-      return await trpcVanilla.folders.updateFolderPath.mutate({
-        folderId,
-        newPath: path,
-      });
-    },
-    onSuccess: async (_, newPath) => {
-      await loadFolders();
-      queryClient.invalidateQueries({ queryKey: ["folders"] });
-      setError(null);
-
-      if (folderId) {
-        const { workspaces, updateWorkspace } = useWorkspaceStore.getState();
-        for (const [taskId, workspace] of Object.entries(workspaces)) {
-          if (workspace.folderId === folderId) {
-            updateWorkspace(taskId, { ...workspace, folderPath: newPath });
-          }
-        }
-        await useWorkspaceStore.getState().loadWorkspaces();
-      }
-    },
-    onError: (err) => {
-      log.error("Failed to update folder path:", err);
-      setError(err instanceof Error ? err.message : "Failed to update path");
-    },
-  });
-
-  const handlePathChange = async (path: string) => {
-    setNewPath(path);
-    if (folder && !folder.exists && path !== folder.path) {
-      await updatePathMutation.mutateAsync(path);
-    }
-  };
-
-  const handleUpdatePath = async () => {
-    if (!newPath || newPath === folder?.path) return;
-    await updatePathMutation.mutateAsync(newPath);
-  };
-
   const handleRemoveFolder = async () => {
     if (!folderId) return;
     try {
@@ -107,75 +54,112 @@ export function FolderSettingsView() {
     );
   }
 
-  return (
-    <Box height="100%" overflowY="auto">
-      <Box p="6" style={{ maxWidth: "600px", margin: "0 auto" }}>
-        <Flex direction="column" gap="6">
-          <Flex direction="column" gap="2">
-            <Heading size="4">Repository Settings</Heading>
-            <Text size="1" color="gray">
-              Manage settings for {folder.name}
-            </Text>
-          </Flex>
+  // When folder doesn't exist, show message to restore or remove
+  if (!folder.exists) {
+    return (
+      <Box height="100%" overflowY="auto">
+        <Box p="6" style={{ maxWidth: "600px", margin: "0 auto" }}>
+          <Flex direction="column" gap="6">
+            <Flex direction="column" gap="2">
+              <Heading size="4">Repository Not Found</Heading>
+              <Text size="1" color="gray">
+                {folder.name}
+              </Text>
+            </Flex>
 
-          {!folder.exists && (
             <Callout.Root color="amber">
               <Callout.Icon>
                 <Warning />
               </Callout.Icon>
               <Callout.Text>
                 <Flex direction="column" gap="1">
                   <Text weight="medium">
-                    Repository path needs to be updated
+                    The repository folder could not be found
                   </Text>
                   <Text size="1">
-                    The folder at "{folder.path}" was not found. If you moved
-                    this repository, select the new location below to continue
-                    working on tasks in this repository.
+                    The folder at <Code>{folder.path}</Code> no longer exists or
+                    has been moved.
                   </Text>
                 </Flex>
               </Callout.Text>
             </Callout.Root>
-          )}
 
-          {error && (
-            <Callout.Root color="red">
-              <Callout.Text>{error}</Callout.Text>
-            </Callout.Root>
-          )}
+            {error && (
+              <Callout.Root color="red">
+                <Callout.Text>{error}</Callout.Text>
+              </Callout.Root>
+            )}
 
-          <Flex direction="column" gap="3">
-            <Heading size="3">Location</Heading>
             <Card>
               <Flex direction="column" gap="4">
                 <Flex direction="column" gap="2">
                   <Text size="1" weight="medium">
-                    Root path
+                    Option 1: Restore the folder
                   </Text>
-                  <FolderPicker
-                    value={newPath}
-                    onChange={handlePathChange}
-                    placeholder={folder.path}
-                    size="1"
-                    skipRegister
-                  />
                   <Text size="1" color="gray">
-                    The main repository directory
+                    Move or restore the repository folder back to its original
+                    location:
+                  </Text>
+                  <Code size="1">{folder.path}</Code>
+                </Flex>
+              </Flex>
+            </Card>
+
+            <Card>
+              <Flex direction="column" gap="4">
+                <Flex direction="column" gap="2">
+                  <Text size="1" weight="medium">
+                    Option 2: Remove the repository
+                  </Text>
+                  <Text size="1" color="gray">
+                    This will remove the repository from Array, including all
+                    associated tasks and their workspaces. This action cannot be
+                    undone.
                   </Text>
                 </Flex>
-                {newPath && newPath !== folder.path && folder.exists && (
-                  <Button
-                    variant="classic"
-                    size="1"
-                    onClick={handleUpdatePath}
-                    disabled={updatePathMutation.isPending}
-                    style={{ alignSelf: "flex-start" }}
-                  >
-                    {updatePathMutation.isPending
-                      ? "Updating..."
-                      : "Update path"}
-                  </Button>
-                )}
+                <Button
+                  variant="soft"
+                  color="red"
+                  size="1"
+                  onClick={handleRemoveFolder}
+                  style={{ alignSelf: "flex-start" }}
+                >
+                  Remove repository
+                </Button>
+              </Flex>
+            </Card>
+          </Flex>
+        </Box>
+      </Box>
+    );
+  }
+
+  // Normal settings view when folder exists
+  return (
+    <Box height="100%" overflowY="auto">
+      <Box p="6" style={{ maxWidth: "600px", margin: "0 auto" }}>
+        <Flex direction="column" gap="6">
+          <Flex direction="column" gap="2">
+            <Heading size="4">Repository Settings</Heading>
+            <Text size="1" color="gray">
+              Manage settings for {folder.name}
+            </Text>
+          </Flex>
+
+          {error && (
+            <Callout.Root color="red">
+              <Callout.Text>{error}</Callout.Text>
+            </Callout.Root>
+          )}
+
+          <Flex direction="column" gap="3">
+            <Heading size="3">Location</Heading>
+            <Card>
+              <Flex direction="column" gap="2">
+                <Text size="1" weight="medium">
+                  Root path
+                </Text>
+                <Code size="1">{folder.path}</Code>
               </Flex>
             </Card>
           </Flex>
