🤖 Consolidate git utilities by merging gitService into git.ts

Eliminated duplicate WorktreeResult interface and consolidated all git
worktree operations into a single file for better organization.

Changes:
- Moved removeWorktree() and pruneWorktrees() from gitService.ts to git.ts
- Removed duplicate WorktreeResult interface (was in both files)
- Deleted src/services/gitService.ts (36 lines)
- Deleted src/services/gitService.test.ts (10 lines)
- Updated ipcMain.ts to import from @/git instead of gitService

git.ts now exports all git operations:
- listLocalBranches()
- getCurrentBranch()
- detectDefaultTrunkBranch()
- createWorktree()
- getMainWorktreeFromWorktree()
- removeWorktree() [moved from gitService]
- pruneWorktrees() [moved from gitService]

All 796 tests pass, type checking passes.

_Generated with `cmux`_

Author: ammar-agent

src/git.ts

@@ -185,3 +185,32 @@ export async function getMainWorktreeFromWorktree(worktreePath: string): Promise
     return null;
   }
 }
+
+export async function removeWorktree(
+  projectPath: string,
+  workspacePath: string,
+  options: { force: boolean } = { force: false }
+): Promise<WorktreeResult> {
+  try {
+    // Remove the worktree (from the main repository context)
+    using proc = execAsync(
+      `git -C "${projectPath}" worktree remove "${workspacePath}" ${options.force ? "--force" : ""}`
+    );
+    await proc.result;
+    return { success: true };
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return { success: false, error: message };
+  }
+}
+
+export async function pruneWorktrees(projectPath: string): Promise<WorktreeResult> {
+  try {
+    using proc = execAsync(`git -C "${projectPath}" worktree prune`);
+    await proc.result;
+    return { success: true };
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return { success: false, error: message };
+  }
+}

src/services/gitService.test.ts

@@ -10,8 +10,9 @@ import {
   listLocalBranches,
   detectDefaultTrunkBranch,
   getCurrentBranch,
+  removeWorktree,
+  pruneWorktrees,
 } from "@/git";
-import { removeWorktree, pruneWorktrees } from "@/services/gitService";
 import { AIService } from "@/services/aiService";
 import { HistoryService } from "@/services/historyService";
 import { PartialService } from "@/services/partialService";