fix/minor issues (#167)

Author: jonathanlab

apps/array/src/main/index.ts

@@ -87,6 +87,7 @@ function createWindow(): void {
       contextIsolation: true,
       preload: path.join(__dirname, "preload.js"),
       enableBlinkFeatures: "GetDisplayMedia",
+      partition: "persist:main",
     },
   });
 

apps/array/src/main/preload.ts

@@ -437,6 +437,12 @@ contextBridge.exposeInMainWorld("electronAPI", {
       ipcRenderer.invoke("remove-task-association", taskId),
     clearTaskWorktree: (taskId: string): Promise<void> =>
       ipcRenderer.invoke("clear-task-worktree", taskId),
+    cleanupOrphanedWorktrees: (
+      mainRepoPath: string,
+    ): Promise<{
+      deleted: string[];
+      errors: Array<{ path: string; error: string }>;
+    }> => ipcRenderer.invoke("cleanup-orphaned-worktrees", mainRepoPath),
   },
   // Worktree API
   worktree: {

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

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { WorktreeManager } from "@posthog/agent";
 import { type IpcMainInvokeEvent, ipcMain } from "electron";
 import type {
   RegisteredFolder,
@@ -144,6 +145,26 @@ async function clearTaskWorktree(taskId: string): Promise<void> {
   }
 }
 
+async function cleanupOrphanedWorktreesForFolder(
+  mainRepoPath: string,
+): Promise<{
+  deleted: string[];
+  errors: Array<{ path: string; error: string }>;
+}> {
+  const manager = new WorktreeManager({ mainRepoPath });
+
+  const associations = foldersStore.get("taskAssociations", []);
+  const associatedWorktreePaths: string[] = [];
+
+  for (const assoc of associations) {
+    if (assoc.worktree?.worktreePath) {
+      associatedWorktreePaths.push(assoc.worktree.worktreePath);
+    }
+  }
+
+  return await manager.cleanupOrphanedWorktrees(associatedWorktreePaths);
+}
+
 export function registerFoldersIpc(): void {
   ipcMain.handle(
     "get-folders",
@@ -292,4 +313,28 @@ export function registerFoldersIpc(): void {
       }
     },
   );
+
+  ipcMain.handle(
+    "cleanup-orphaned-worktrees",
+    async (
+      _event: IpcMainInvokeEvent,
+      mainRepoPath: string,
+    ): Promise<{
+      deleted: string[];
+      errors: Array<{ path: string; error: string }>;
+    }> => {
+      try {
+        return await cleanupOrphanedWorktreesForFolder(mainRepoPath);
+      } catch (error) {
+        log.error(
+          `Failed to cleanup orphaned worktrees for ${mainRepoPath}:`,
+          error,
+        );
+        return {
+          deleted: [],
+          errors: [{ path: mainRepoPath, error: String(error) }],
+        };
+      }
+    },
+  );
 }

apps/array/src/renderer/features/logs/components/LogEventRenderer.tsx

@@ -13,7 +13,6 @@ import type { AgentEvent } from "@posthog/agent";
 import { Code, ContextMenu } from "@radix-ui/themes";
 import { IS_DEV } from "@/constants/environment";
 
-// biome-ignore lint/suspicious/noExplicitAny: Components are type-safe internally, map handles dispatch
 const EVENT_COMPONENT_MAP: Record<
   string,
   React.ComponentType<{ event: any }>

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

@@ -274,7 +274,7 @@ describe("panelLayoutStore", () => {
       const storedData = localStorage.getItem("panel-layout-store");
       expect(storedData).not.toBeNull();
 
-      const parsed = JSON.parse(storedData!);
+      const parsed = JSON.parse(storedData ?? "");
       expect(parsed.state.taskLayouts["task-1"]).toBeDefined();
       expect(parsed.state.taskLayouts["task-1"].openFiles).toContain(
         "src/App.tsx",

apps/array/src/renderer/features/sidebar/components/SidebarMenu.tsx

@@ -9,7 +9,7 @@ import { useRegisteredFoldersStore } from "@renderer/stores/registeredFoldersSto
 import { useWorktreeStore } from "@renderer/stores/worktreeStore";
 import type { Task } from "@shared/types";
 import { useNavigationStore } from "@stores/navigationStore";
-import { memo, useEffect, useRef } from "react";
+import { memo } from "react";
 import { useSidebarData } from "../hooks/useSidebarData";
 import { useSidebarStore } from "../stores/sidebarStore";
 import { HomeItem } from "./items/HomeItem";
@@ -29,15 +29,13 @@ function SidebarMenuComponent() {
   const { data: allTasks = [] } = useTasks();
   const { folders, removeFolder } = useRegisteredFoldersStore();
 
-  const expandedSections = useSidebarStore((state) => state.expandedSections);
+  const collapsedSections = useSidebarStore((state) => state.collapsedSections);
   const toggleSection = useSidebarStore((state) => state.toggleSection);
   const taskWorktrees = useWorktreeStore((state) => state.taskWorktrees);
 
   const { showContextMenu, renameTask, renameDialogOpen, setRenameDialogOpen } =
     useTaskContextMenu();
 
-  const seenFoldersRef = useRef<Set<string>>(new Set());
-
   const sidebarData = useSidebarData({
     activeView: view,
     activeFilters,
@@ -49,21 +47,6 @@ function SidebarMenuComponent() {
     taskMap.set(task.id, task);
   }
 
-  useEffect(() => {
-    const newFolders = sidebarData.folders.filter(
-      (folder) =>
-        !seenFoldersRef.current.has(folder.id) &&
-        !expandedSections.has(folder.id),
-    );
-
-    if (newFolders.length > 0) {
-      for (const folder of newFolders) {
-        seenFoldersRef.current.add(folder.id);
-        toggleSection(folder.id);
-      }
-    }
-  }, [sidebarData.folders, expandedSections, toggleSection]);
-
   const handleHomeClick = () => {
     navigateToTaskInput();
   };
@@ -169,7 +152,7 @@ function SidebarMenuComponent() {
               id={folder.id}
               label={folder.name}
               icon={<FolderIcon size={14} weight="fill" />}
-              isExpanded={expandedSections.has(folder.id)}
+              isExpanded={!collapsedSections.has(folder.id)}
               onToggle={() => toggleSection(folder.id)}
               addSpacingBefore={index === 0}
               onContextMenu={(e) => handleFolderContextMenu(folder.id, e)}

apps/array/src/renderer/features/sidebar/components/items/ViewItem.tsx

@@ -1,4 +1,4 @@
-import { ListNumbersIcon } from "@phosphor-icons/react";
+import { ListNumbersIcon, UserIcon } from "@phosphor-icons/react";
 import { SidebarItem } from "../SidebarItem";
 
 interface ViewItemProps {
@@ -12,7 +12,11 @@ export function ViewItem({ label, isActive, onClick }: ViewItemProps) {
     <SidebarItem
       depth={0}
       icon={
-        <ListNumbersIcon size={12} weight={isActive ? "fill" : "regular"} />
+        label === "My tasks" ? (
+          <UserIcon size={12} weight={isActive ? "fill" : "regular"} />
+        ) : (
+          <ListNumbersIcon size={12} weight={isActive ? "fill" : "regular"} />
+        )
       }
       label={label}
       isActive={isActive}

apps/array/src/renderer/features/sidebar/stores/sidebarStore.ts

@@ -5,7 +5,7 @@ interface SidebarStoreState {
   open: boolean;
   width: number;
   isResizing: boolean;
-  expandedSections: Set<string>;
+  collapsedSections: Set<string>;
 }
 
 interface SidebarStoreActions {
@@ -23,39 +23,39 @@ export const useSidebarStore = create<SidebarStore>()(
       open: true,
       width: 256,
       isResizing: false,
-      expandedSections: new Set<string>(),
+      collapsedSections: new Set<string>(),
       setOpen: (open) => set({ open }),
       setWidth: (width) => set({ width }),
       setIsResizing: (isResizing) => set({ isResizing }),
       toggleSection: (sectionId) =>
         set((state) => {
-          const newExpandedSections = new Set(state.expandedSections);
-          if (newExpandedSections.has(sectionId)) {
-            newExpandedSections.delete(sectionId);
+          const newCollapsedSections = new Set(state.collapsedSections);
+          if (newCollapsedSections.has(sectionId)) {
+            newCollapsedSections.delete(sectionId);
           } else {
-            newExpandedSections.add(sectionId);
+            newCollapsedSections.add(sectionId);
           }
-          return { expandedSections: newExpandedSections };
+          return { collapsedSections: newCollapsedSections };
         }),
     }),
     {
       name: "sidebar-storage",
       partialize: (state) => ({
         open: state.open,
         width: state.width,
-        expandedSections: Array.from(state.expandedSections),
+        collapsedSections: Array.from(state.collapsedSections),
       }),
       merge: (persisted, current) => {
         const persistedState = persisted as {
           open?: boolean;
           width?: number;
-          expandedSections?: string[];
+          collapsedSections?: string[];
         };
         return {
           ...current,
           open: persistedState.open ?? current.open,
           width: persistedState.width ?? current.width,
-          expandedSections: new Set(persistedState.expandedSections ?? []),
+          collapsedSections: new Set(persistedState.collapsedSections ?? []),
         };
       },
     },

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

@@ -93,7 +93,10 @@ export function FileTreePanel({ taskId, task }: FileTreePanelProps) {
     error,
   } = useQuery({
     queryKey: ["directory", repoPath],
-    queryFn: () => window.electronAPI.listDirectory(repoPath!),
+    queryFn: () => {
+      if (!repoPath) throw new Error("repoPath is required");
+      return window.electronAPI.listDirectory(repoPath);
+    },
     enabled: !!repoPath,
     staleTime: Infinity,
   });

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

@@ -4,6 +4,7 @@ import { ShellTerminal } from "@features/terminal/components/ShellTerminal";
 import { useTerminalStore } from "@features/terminal/stores/terminalStore";
 import { Box } from "@radix-ui/themes";
 import type { Task } from "@shared/types";
+import { useWorktreeStore } from "@stores/worktreeStore";
 import { useEffect } from "react";
 
 interface TaskShellPanelProps {
@@ -17,6 +18,10 @@ export function TaskShellPanel({ taskId, task, shellId }: TaskShellPanelProps) {
   const stateKey = shellId ? `${taskId}-${shellId}` : taskId;
   const tabId = shellId || "shell";
 
+  const worktreePath = useWorktreeStore((state) =>
+    state.getWorktreePathForTask(taskId),
+  );
+
   const processName = useTerminalStore(
     (state) => state.terminalStates[stateKey]?.processName,
   );
@@ -35,9 +40,11 @@ export function TaskShellPanel({ taskId, task, shellId }: TaskShellPanelProps) {
     }
   }, [processName, taskId, tabId, updateTabLabel]);
 
+  const effectiveCwd = worktreePath || taskData.repoPath || undefined;
+
   return (
     <Box height="100%">
-      <ShellTerminal cwd={taskData.repoPath || undefined} stateKey={stateKey} />
+      <ShellTerminal cwd={effectiveCwd} stateKey={stateKey} />
     </Box>
   );
 }