more cleanup

Author: jonathanlab

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

@@ -39,6 +39,22 @@ class FileService {
     return path.join(app.getPath("userData"), "snapshots", `${hash}.snapshot`);
   }
 
+  private flushPendingChanges(repoPath: string, state: RepoState): void {
+    for (const dir of state.pendingDirs) {
+      this.emit("fs:directory-changed", { repoPath, dirPath: dir });
+    }
+    for (const filePath of state.pendingFiles) {
+      this.emit("fs:file-changed", { repoPath, filePath });
+    }
+    for (const filePath of state.pendingDeletes) {
+      this.emit("fs:file-deleted", { repoPath, filePath });
+    }
+    state.pendingDirs.clear();
+    state.pendingFiles.clear();
+    state.pendingDeletes.clear();
+    state.debounceTimer = null;
+  }
+
   async listDirectory(dirPath: string): Promise<DirectoryEntry[]> {
     try {
       const entries = await fs.readdir(dirPath, { withFileTypes: true });
@@ -95,23 +111,6 @@ class FileService {
       debounceTimer: null,
     };
 
-    const flushPendingChanges = () => {
-      for (const dir of state.pendingDirs) {
-        this.emit("fs:directory-changed", { repoPath, dirPath: dir });
-      }
-      for (const filePath of state.pendingFiles) {
-        this.emit("fs:file-changed", { repoPath, filePath });
-      }
-      for (const filePath of state.pendingDeletes) {
-        this.emit("fs:file-deleted", { repoPath, filePath });
-      }
-      state.pendingDirs.clear();
-      state.pendingFiles.clear();
-      state.pendingDeletes.clear();
-      state.debounceTimer = null;
-    };
-
-    // Watch repo (excluding .git and node_modules)
     const subscription = await watcher.subscribe(
       repoPath,
       (err, events) => {
@@ -129,15 +128,15 @@ class FileService {
           }
         }
 
-        if (state.debounceTimer) {
-          clearTimeout(state.debounceTimer);
-        }
-        state.debounceTimer = setTimeout(flushPendingChanges, DEBOUNCE_MS);
+        if (state.debounceTimer) clearTimeout(state.debounceTimer);
+        state.debounceTimer = setTimeout(
+          () => this.flushPendingChanges(repoPath, state),
+          DEBOUNCE_MS,
+        );
       },
       { ignore: WATCHER_IGNORE_PATTERNS },
     );
 
-    // Watch .git directory for HEAD and index changes
     const gitDir = path.join(repoPath, ".git");
     let gitSubscription: watcher.AsyncSubscription | null = null;
     try {
@@ -147,16 +146,16 @@ class FileService {
           console.error("Git watcher error:", err);
           return;
         }
-
-        const gitStateChanged = events.some(
-          (e) => e.path.endsWith("/HEAD") || e.path.endsWith("/index"),
-        );
-        if (gitStateChanged) {
+        if (
+          events.some(
+            (e) => e.path.endsWith("/HEAD") || e.path.endsWith("/index"),
+          )
+        ) {
           this.emit("git:state-changed", { repoPath });
         }
       });
     } catch {
-      // .git directory doesn't exist (not a git repo)
+      // .git directory doesn't exist
     }
 
     state.subscription = subscription;

apps/array/src/renderer/features/panels/store/panelLayoutStore.ts

@@ -318,24 +318,20 @@ export const usePanelLayoutStore = createWithEqualityFn<PanelLayoutStore>()(
       },
 
       closeTabsForFile: (taskId, filePath) => {
-        // Try all possible diff tab statuses
-        const statuses = [
-          "modified",
-          "deleted",
-          "added",
-          "untracked",
-          "renamed",
-          undefined,
-        ];
+        const layout = get().taskLayouts[taskId];
+        if (!layout) return;
+
         const tabIds = [
           createFileTabId(filePath),
-          ...statuses.map((status) => createDiffTabId(filePath, status)),
+          createDiffTabId(filePath),
+          createDiffTabId(filePath, "modified"),
+          createDiffTabId(filePath, "deleted"),
+          createDiffTabId(filePath, "added"),
+          createDiffTabId(filePath, "untracked"),
+          createDiffTabId(filePath, "renamed"),
         ];
 
         for (const tabId of tabIds) {
-          const layout = get().taskLayouts[taskId];
-          if (!layout) continue;
-
           const tabLocation = findTabInTree(layout.panelTree, tabId);
           if (tabLocation) {
             get().closeTab(taskId, tabLocation.panelId, tabId);

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

@@ -81,14 +81,9 @@ export function ChangesPanel({ taskId, task }: ChangesPanelProps) {
 
   const { data: changedFiles = [], isLoading } = useQuery({
     queryKey: ["changed-files-head", repoPath],
+    queryFn: () => window.electronAPI.getChangedFilesHead(repoPath!),
     enabled: !!repoPath,
     staleTime: Infinity,
-    queryFn: async () => {
-      if (!window.electronAPI || !repoPath) {
-        return [];
-      }
-      return window.electronAPI.getChangedFilesHead(repoPath);
-    },
   });
 
   if (!repoPath) {

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

@@ -7,49 +7,43 @@ export function useFileWatcher(repoPath: string | null, taskId?: string) {
   const closeTabsForFile = usePanelLayoutStore((s) => s.closeTabsForFile);
 
   useEffect(() => {
-    if (!repoPath || !window.electronAPI) return;
+    if (!repoPath) return;
 
-    const currentRepoPath = repoPath;
-
-    window.electronAPI.watcherStart(currentRepoPath).catch((error) => {
+    window.electronAPI.watcherStart(repoPath).catch((error) => {
       console.error("Failed to start file watcher:", error);
     });
 
     const unsubFile = window.electronAPI.onFileChanged(
       ({ repoPath: rp, filePath }) => {
-        if (rp !== currentRepoPath) return;
-        const relativePath = filePath.replace(`${currentRepoPath}/`, "");
+        if (rp !== repoPath) return;
+        const relativePath = filePath.replace(`${repoPath}/`, "");
         queryClient.invalidateQueries({
-          queryKey: ["repo-file", currentRepoPath, relativePath],
+          queryKey: ["repo-file", repoPath, relativePath],
         });
-        // Also refresh the changed files list since git status output changed
         queryClient.invalidateQueries({
-          queryKey: ["changed-files-head", currentRepoPath],
+          queryKey: ["changed-files-head", repoPath],
         });
       },
     );
 
     const unsubDelete = window.electronAPI.onFileDeleted(
       ({ repoPath: rp, filePath }) => {
-        if (rp !== currentRepoPath) return;
-        // Refresh the changed files list
+        if (rp !== repoPath) return;
         queryClient.invalidateQueries({
-          queryKey: ["changed-files-head", currentRepoPath],
+          queryKey: ["changed-files-head", repoPath],
         });
         if (!taskId) return;
-        const relativePath = filePath.replace(`${currentRepoPath}/`, "");
+        const relativePath = filePath.replace(`${repoPath}/`, "");
         closeTabsForFile(taskId, relativePath);
       },
     );
 
     const unsubGit = window.electronAPI.onGitStateChanged(
       ({ repoPath: rp }) => {
-        if (rp !== currentRepoPath) return;
-        queryClient.invalidateQueries({
-          queryKey: ["file-at-head", currentRepoPath],
-        });
+        if (rp !== repoPath) return;
+        queryClient.invalidateQueries({ queryKey: ["file-at-head", repoPath] });
         queryClient.invalidateQueries({
-          queryKey: ["changed-files-head", currentRepoPath],
+          queryKey: ["changed-files-head", repoPath],
         });
       },
     );
@@ -58,7 +52,7 @@ export function useFileWatcher(repoPath: string | null, taskId?: string) {
       unsubFile();
       unsubDelete();
       unsubGit();
-      window.electronAPI.watcherStop(currentRepoPath);
+      window.electronAPI.watcherStop(repoPath);
     };
   }, [repoPath, taskId, queryClient, closeTabsForFile]);
 }