Merge branch 'main' into peter/safely-delete

Author: k11kirky

apps/array/src/main/services/fileWatcher.ts

@@ -1,3 +1,4 @@
+import fsSync from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import * as watcher from "@parcel/watcher";
@@ -118,6 +119,17 @@ class FileService {
       repoPath,
       (err, events) => {
         if (err) {
+          if (!fsSync.existsSync(repoPath)) {
+            log.info(
+              `Watched directory no longer exists, stopping watcher: ${repoPath}`,
+            );
+            this.stopWatching(repoPath).catch((stopErr) => {
+              log.warn(
+                `Failed to stop watcher for deleted directory: ${stopErr}`,
+              );
+            });
+            return;
+          }
           log.error("Watcher error:", err);
           return;
         }

apps/array/src/main/services/workspace/workspaceService.ts

@@ -14,6 +14,7 @@ import type {
   WorktreeInfo,
 } from "../../../shared/types";
 import { logger } from "../../lib/logger";
+import { fileService } from "../fileWatcher";
 import { getWorktreeLocation } from "../settingsStore";
 import { foldersStore } from "../store";
 import { deleteWorktreeIfExists } from "../worktreeUtils";
@@ -650,6 +651,15 @@ export class WorkspaceService {
     mainRepoPath: string,
     worktreePath: string,
   ): Promise<void> {
+    try {
+      await fileService.stopWatching(worktreePath);
+    } catch (error) {
+      log.warn(
+        `Failed to stop file watcher for worktree ${worktreePath}:`,
+        error,
+      );
+    }
+
     try {
       await deleteWorktreeIfExists(mainRepoPath, worktreePath);
     } catch (error) {

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

@@ -29,7 +29,7 @@ export function TaskInput() {
     lastUsedDirectory || "",
   );
   const [runMode, setRunMode] = useState<RunMode>(
-    import.meta.env.DEV ? lastUsedRunMode : "cloud",
+    import.meta.env.DEV ? lastUsedRunMode : "local",
   );
   const [localWorkspaceMode, setLocalWorkspaceMode] =
     useState<LocalWorkspaceMode>(lastUsedLocalWorkspaceMode);

apps/array/src/renderer/hooks/useTaskContextMenu.ts

@@ -3,6 +3,7 @@ import {
   useDuplicateTask,
 } from "@features/tasks/hooks/useTasks";
 import { logger } from "@renderer/lib/logger";
+import { useNavigationStore } from "@renderer/stores/navigationStore";
 import type { Task } from "@shared/types";
 import { handleExternalAppAction } from "@utils/handleExternalAppAction";
 import { useCallback, useState } from "react";
@@ -15,6 +16,7 @@ export function useTaskContextMenu() {
   const [renameDialogOpen, setRenameDialogOpen] = useState(false);
   const duplicateTask = useDuplicateTask();
   const deleteTask = useDeleteTask();
+  const { view, navigateToTaskInput } = useNavigationStore();
 
   const showContextMenu = useCallback(
     async (task: Task, event: React.MouseEvent, worktreePath?: string) => {
@@ -48,6 +50,10 @@ export function useTaskContextMenu() {
               await duplicateTask.mutateAsync(task.id);
               break;
             case "delete":
+              // navigate away first if we are viewing this task
+              if (view.type === "task-detail" && view.data?.id === task.id) {
+                navigateToTaskInput();
+              }
               await deleteTask.mutateAsync(task.id);
               break;
           }
@@ -68,7 +74,7 @@ export function useTaskContextMenu() {
         log.error("Failed to show context menu", error);
       }
     },
-    [duplicateTask, deleteTask],
+    [duplicateTask, deleteTask, view, navigateToTaskInput],
   );
 
   return {