Update task creation to new saga, service and thin hook

Author: charlesvien

apps/array/src/main/di/container.ts

@@ -1,7 +1,7 @@
 import "reflect-metadata";
 import { Container } from "inversify";
-import { TaskService } from "../services/task.service.js";
-import { TOKENS } from "./tokens.js";
+import { GitService } from "../services/git/service.js";
+import { MAIN_TOKENS } from "./tokens.js";
 
 /**
  * Main process dependency injection container
@@ -11,7 +11,7 @@ export const container = new Container({
 });
 
 // Bind services
-container.bind<TaskService>(TOKENS.TaskService).to(TaskService);
+container.bind<GitService>(MAIN_TOKENS.GitService).to(GitService);
 
 export function get<T>(token: symbol): T {
   return container.get<T>(token);

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

@@ -1,2 +1,2 @@
 export { container, get } from "./container.js";
-export { TOKENS } from "./tokens.js";
+export { MAIN_TOKENS } from "./tokens.js";

apps/array/src/main/di/tokens.ts

@@ -1,4 +1,10 @@
-export const TOKENS = {
+/**
+ * Main process DI tokens.
+ *
+ * IMPORTANT: These tokens are for main process only.
+ * Never import this file from renderer code.
+ */
+export const MAIN_TOKENS = Object.freeze({
   // Services
-  TaskService: Symbol.for("TaskService"),
-} as const;
+  GitService: Symbol.for("Main.GitService"),
+});

apps/array/src/main/preload.ts

@@ -76,14 +76,6 @@ contextBridge.exposeInMainWorld("electronAPI", {
   // Repo API
   validateRepo: (directoryPath: string): Promise<boolean> =>
     ipcRenderer.invoke("validate-repo", directoryPath),
-  detectRepo: (
-    directoryPath: string,
-  ): Promise<{
-    organization: string;
-    repository: string;
-    branch?: string;
-    remote?: string;
-  } | null> => ipcRenderer.invoke("detect-repo", directoryPath),
   cloneRepository: (
     repoUrl: string,
     targetPath: string,

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

@@ -6,6 +6,7 @@ import { promisify } from "node:util";
 import type { ChangedFile, GitFileStatus } from "@shared/types";
 import { type IpcMainInvokeEvent, ipcMain } from "electron";
 import { logger } from "../lib/logger";
+import { parseGitHubUrl } from "./git/utils";
 
 const log = logger.scope("git");
 
@@ -51,24 +52,6 @@ const getAllFilesInDirectory = async (
   return files;
 };
 
-export interface GitHubRepo {
-  organization: string;
-  repository: string;
-}
-
-export const parseGitHubUrl = (url: string): GitHubRepo | null => {
-  const match =
-    url.match(/github\.com[:/](.+?)\/(.+?)(\.git)?$/) ||
-    url.match(/git@github\.com:(.+?)\/(.+?)(\.git)?$/);
-
-  if (!match) return null;
-
-  return {
-    organization: match[1],
-    repository: match[2].replace(/\.git$/, ""),
-  };
-};
-
 export const isGitRepository = async (
   directoryPath: string,
 ): Promise<boolean> => {
@@ -690,31 +673,6 @@ export function registerGitIpc(): void {
     },
   );
 
-  ipcMain.handle(
-    "detect-repo",
-    async (
-      _event: IpcMainInvokeEvent,
-      directoryPath: string,
-    ): Promise<{
-      organization: string;
-      repository: string;
-      branch?: string;
-      remote?: string;
-    } | null> => {
-      if (!directoryPath) return null;
-
-      const remoteUrl = await getRemoteUrl(directoryPath);
-      if (!remoteUrl) return null;
-
-      const repo = parseGitHubUrl(remoteUrl);
-      if (!repo) return null;
-
-      const branch = await getCurrentBranch(directoryPath);
-
-      return { ...repo, branch, remote: remoteUrl };
-    },
-  );
-
   ipcMain.handle(
     "get-changed-files-head",
     async (

apps/array/src/main/services/git/service.ts

@@ -0,0 +1,54 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { injectable } from "inversify";
+import type { DetectRepoResult } from "./types";
+import { parseGitHubUrl } from "./utils";
+
+const execFileAsync = promisify(execFile);
+
+@injectable()
+export class GitService {
+  public async detectRepo(
+    directoryPath: string,
+  ): Promise<DetectRepoResult | null> {
+    if (!directoryPath) return null;
+
+    const remoteUrl = await this.getRemoteUrl(directoryPath);
+    if (!remoteUrl) return null;
+
+    const repo = await parseGitHubUrl(remoteUrl);
+    if (!repo) return null;
+
+    const branch = await this.getCurrentBranch(directoryPath);
+    if (!branch) return null;
+
+    return {
+      organization: repo.organization,
+      repository: repo.repository,
+      remote: remoteUrl,
+      branch,
+    };
+  }
+
+  public async getRemoteUrl(directoryPath: string): Promise<string | null> {
+    try {
+      const { stdout } = await execFileAsync("git remote get-url origin", {
+        cwd: directoryPath,
+      });
+      return stdout.trim();
+    } catch {
+      return null;
+    }
+  }
+
+  public async getCurrentBranch(directoryPath: string): Promise<string | null> {
+    try {
+      const { stdout } = await execFileAsync("git branch --show-current", {
+        cwd: directoryPath,
+      });
+      return stdout.trim();
+    } catch {
+      return null;
+    }
+  }
+}

apps/array/src/main/services/git/types.ts

@@ -0,0 +1,11 @@
+export interface GitHubRepo {
+  organization: string;
+  repository: string;
+}
+
+export interface DetectRepoResult {
+  organization: string;
+  repository: string;
+  remote?: string;
+  branch?: string;
+}

apps/array/src/main/services/git/utils.ts

@@ -0,0 +1,11 @@
+import type { GitHubRepo } from "./types";
+
+export function parseGitHubUrl(url: string): GitHubRepo | null {
+  const match =
+    url.match(/github\.com[:/](.+?)\/(.+?)(\.git)?$/) ||
+    url.match(/git@github\.com:(.+?)\/(.+?)(\.git)?$/);
+
+  if (!match) return null;
+
+  return { organization: match[1], repository: match[2].replace(/\.git$/, "") };
+}

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

@@ -15,7 +15,6 @@ import "./posthog-analytics.js";
 import "./session-manager.js";
 import "./settingsStore.js";
 import "./shell.js";
-import "./task.service.js";
 import "./transcription-prompts.js";
 import "./updates.js";
 import "./worktree.js";

apps/array/src/main/trpc/router.ts

@@ -1,4 +1,5 @@
 import { encryptionRouter } from "./routers/encryption.js";
+import { gitRouter } from "./routers/git.js";
 import { logsRouter } from "./routers/logs.js";
 import { osRouter } from "./routers/os.js";
 import { secureStoreRouter } from "./routers/secure-store.js";
@@ -9,6 +10,7 @@ export const trpcRouter = router({
   logs: logsRouter,
   secureStore: secureStoreRouter,
   encryption: encryptionRouter,
+  git: gitRouter,
 });
 
 export type TrpcRouter = typeof trpcRouter;