refactor: remove worktree service (#278)

Author: jonathanlab

apps/array/src/main/index.ts

@@ -46,7 +46,6 @@ import {
 import { registerShellIpc } from "./services/shell.js";
 import { registerAutoUpdater } from "./services/updates.js";
 import { registerWorkspaceIpc } from "./services/workspace/index.js";
-import { registerWorktreeIpc } from "./services/worktree.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -298,6 +297,5 @@ registerOAuthHandlers();
 registerGitIpc();
 registerAgentIpc(taskControllers, () => mainWindow);
 registerFoldersIpc(() => mainWindow);
-registerWorktreeIpc();
 registerShellIpc();
 registerWorkspaceIpc(() => mainWindow);

apps/array/src/main/preload.ts

@@ -8,7 +8,6 @@ import type {
   Workspace,
   WorkspaceInfo,
   WorkspaceTerminalInfo,
-  WorktreeInfo,
 } from "../shared/types";
 import type { CloudRegion, OAuthTokenResponse } from "../shared/types/oauth";
 import "electron-log/preload";
@@ -237,29 +236,6 @@ contextBridge.exposeInMainWorld("electronAPI", {
       errors: Array<{ path: string; error: string }>;
     }> => ipcRenderer.invoke("cleanup-orphaned-worktrees", mainRepoPath),
   },
-  // Worktree API
-  worktree: {
-    create: (mainRepoPath: string): Promise<WorktreeInfo> =>
-      ipcRenderer.invoke("worktree-create", mainRepoPath),
-    delete: (mainRepoPath: string, worktreePath: string): Promise<void> =>
-      ipcRenderer.invoke("worktree-delete", mainRepoPath, worktreePath),
-    getInfo: (
-      mainRepoPath: string,
-      worktreePath: string,
-    ): Promise<WorktreeInfo | null> =>
-      ipcRenderer.invoke("worktree-get-info", mainRepoPath, worktreePath),
-    exists: (mainRepoPath: string, name: string): Promise<boolean> =>
-      ipcRenderer.invoke("worktree-exists", mainRepoPath, name),
-    list: (mainRepoPath: string): Promise<WorktreeInfo[]> =>
-      ipcRenderer.invoke("worktree-list", mainRepoPath),
-    isWorktree: (mainRepoPath: string, repoPath: string): Promise<boolean> =>
-      ipcRenderer.invoke("worktree-is-worktree", mainRepoPath, repoPath),
-    getMainRepoPath: (
-      mainRepoPath: string,
-      worktreePath: string,
-    ): Promise<string | null> =>
-      ipcRenderer.invoke("worktree-get-main-repo", mainRepoPath, worktreePath),
-  },
   // Workspace API
   workspace: {
     create: (options: CreateWorkspaceOptions): Promise<WorkspaceInfo> =>

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

@@ -10,7 +10,6 @@ import { logger } from "../lib/logger";
 import { clearAllStoreData, foldersStore } from "../utils/store";
 import { isGitRepository } from "./git";
 import { getWorktreeLocation } from "./settingsStore";
-import { deleteWorktreeIfExists } from "./worktreeUtils";
 
 const execAsync = promisify(exec);
 
@@ -63,10 +62,19 @@ async function removeFolder(folderId: string): Promise<void> {
   );
   for (const assoc of associationsToRemove) {
     if (assoc.worktree) {
-      await deleteWorktreeIfExists(
-        assoc.folderPath,
-        assoc.worktree.worktreePath,
-      );
+      try {
+        const worktreeBasePath = getWorktreeLocation();
+        const manager = new WorktreeManager({
+          mainRepoPath: assoc.folderPath,
+          worktreeBasePath,
+        });
+        await manager.deleteWorktree(assoc.worktree.worktreePath);
+      } catch (error) {
+        log.error(
+          `Failed to delete worktree ${assoc.worktree.worktreePath}:`,
+          error,
+        );
+      }
     }
   }
 

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

@@ -12,5 +12,3 @@ import "./settingsStore.js";
 import "./shell.js";
 import "./transcription-prompts.js";
 import "./updates.js";
-import "./worktree.js";
-import "./worktreeUtils.js";

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

@@ -19,7 +19,6 @@ import { logger } from "../../lib/logger";
 import { foldersStore } from "../../utils/store";
 import type { FileWatcherService } from "../file-watcher/service.js";
 import { getWorktreeLocation } from "../settingsStore";
-import { deleteWorktreeIfExists } from "../worktreeUtils";
 import { loadConfig, normalizeScripts } from "./configLoader";
 import { cleanupWorkspaceSessions, ScriptRunner } from "./scriptRunner";
 import { buildWorkspaceEnv } from "./workspaceEnv";
@@ -688,7 +687,9 @@ export class WorkspaceService {
     }
 
     try {
-      await deleteWorktreeIfExists(mainRepoPath, worktreePath);
+      const worktreeBasePath = getWorktreeLocation();
+      const manager = new WorktreeManager({ mainRepoPath, worktreeBasePath });
+      await manager.deleteWorktree(worktreePath);
     } catch (error) {
       log.error(`Failed to delete worktree for task ${taskId}:`, error);
     }

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

@@ -1,11 +1,13 @@
 import path from "node:path";
+import { WorktreeManager } from "@posthog/agent";
 import { app } from "electron";
 import Store from "electron-store";
 import type {
   RegisteredFolder,
   TaskFolderAssociation,
 } from "../../shared/types";
-import { deleteWorktreeIfExists } from "../services/worktreeUtils";
+import { logger } from "../lib/logger";
+import { getWorktreeLocation } from "../services/settingsStore";
 
 interface FoldersSchema {
   folders: RegisteredFolder[];
@@ -80,15 +82,25 @@ export const foldersStore = new Store<FoldersSchema>({
   },
 });
 
+const log = logger.scope("store");
+
 export async function clearAllStoreData(): Promise<void> {
-  // Delete all worktrees before clearing store
   const associations = foldersStore.get("taskAssociations", []);
   for (const assoc of associations) {
     if (assoc.worktree) {
-      await deleteWorktreeIfExists(
-        assoc.folderPath,
-        assoc.worktree.worktreePath,
-      );
+      try {
+        const worktreeBasePath = getWorktreeLocation();
+        const manager = new WorktreeManager({
+          mainRepoPath: assoc.folderPath,
+          worktreeBasePath,
+        });
+        await manager.deleteWorktree(assoc.worktree.worktreePath);
+      } catch (error) {
+        log.error(
+          `Failed to delete worktree ${assoc.worktree.worktreePath}:`,
+          error,
+        );
+      }
     }
   }