Fix worktree deletion caused by stale-read race in removeFolder

Author: charlesvien

apps/twig/src/main/services/folders/service.ts

@@ -101,14 +101,17 @@ export class FoldersService {
   }
 
   async removeFolder(folderId: string): Promise<void> {
-    const folders = foldersStore.get("folders", []);
-    const folder = folders.find((f) => f.id === folderId);
-    const associations = foldersStore.get("taskAssociations", []);
+    const folder = foldersStore
+      .get("folders", [])
+      .find((f) => f.id === folderId);
+    const worktreeAssocs = foldersStore
+      .get("taskAssociations", [])
+      .filter(
+        (a) =>
+          a.folderId === folderId && a.mode === "worktree" && "worktree" in a,
+      );
 
-    const associationsToRemove = associations.filter(
-      (a) => a.folderId === folderId,
-    );
-    for (const assoc of associationsToRemove) {
+    for (const assoc of worktreeAssocs) {
       if (assoc.mode === "worktree" && folder) {
         const worktreeBasePath = getWorktreeLocation();
         const worktreePath = path.join(
@@ -128,13 +131,17 @@ export class FoldersService {
       }
     }
 
-    const filtered = folders.filter((f) => f.id !== folderId);
-    const filteredAssociations = associations.filter(
-      (a) => a.folderId !== folderId,
-    );
+    const currentFolders = foldersStore.get("folders", []);
+    const currentAssociations = foldersStore.get("taskAssociations", []);
 
-    foldersStore.set("folders", filtered);
-    foldersStore.set("taskAssociations", filteredAssociations);
+    foldersStore.set(
+      "folders",
+      currentFolders.filter((f) => f.id !== folderId),
+    );
+    foldersStore.set(
+      "taskAssociations",
+      currentAssociations.filter((a) => a.folderId !== folderId),
+    );
     log.debug(`Removed folder with ID: ${folderId}`);
   }
 

apps/twig/src/main/utils/store.ts

@@ -172,22 +172,32 @@ function getWorktreePath(folderPath: string, worktreeName: string): string {
 
 export async function clearAllStoreData(): Promise<void> {
   const associations = foldersStore.get("taskAssociations", []);
+  const worktreesToDelete: Array<{
+    worktreePath: string;
+    mainRepoPath: string;
+  }> = [];
+
   for (const assoc of associations) {
     if (assoc.mode === "worktree") {
       const folderPath = getFolderPath(assoc.folderId);
       if (!folderPath) continue;
+      worktreesToDelete.push({
+        worktreePath: getWorktreePath(folderPath, assoc.worktree),
+        mainRepoPath: folderPath,
+      });
+    }
+  }
 
-      const worktreePath = getWorktreePath(folderPath, assoc.worktree);
-      try {
-        const worktreeBasePath = getWorktreeLocation();
-        const manager = new WorktreeManager({
-          mainRepoPath: folderPath,
-          worktreeBasePath,
-        });
-        await manager.deleteWorktree(worktreePath);
-      } catch (error) {
-        log.error(`Failed to delete worktree ${worktreePath}:`, error);
-      }
+  for (const { worktreePath, mainRepoPath } of worktreesToDelete) {
+    try {
+      const worktreeBasePath = getWorktreeLocation();
+      const manager = new WorktreeManager({
+        mainRepoPath,
+        worktreeBasePath,
+      });
+      await manager.deleteWorktree(worktreePath);
+    } catch (error) {
+      log.error(`Failed to delete worktree ${worktreePath}:`, error);
     }
   }
 

apps/twig/src/renderer/stores/registeredFoldersStore.ts

@@ -45,14 +45,20 @@ export const useRegisteredFoldersStore = create<RegisteredFoldersState>()(
       try {
         const loadedFolders = await loadFolders();
 
-        // Remove folders that no longer exist on disk
         const deletedFolders = loadedFolders.filter((f) => f.exists === false);
-        for (const folder of deletedFolders) {
-          trpcVanilla.folders.removeFolder
-            .mutate({ folderId: folder.id })
-            .catch((err) =>
-              log.error(`Failed to remove deleted folder ${folder.path}:`, err),
-            );
+        if (deletedFolders.length > 0) {
+          await Promise.all(
+            deletedFolders.map((folder) =>
+              trpcVanilla.folders.removeFolder
+                .mutate({ folderId: folder.id })
+                .catch((err) =>
+                  log.error(
+                    `Failed to remove deleted folder ${folder.path}:`,
+                    err,
+                  ),
+                ),
+            ),
+          );
         }
         const existingFolders = loadedFolders.filter((f) => f.exists !== false);