Refactor agent service

Author: charlesvien

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

@@ -1,5 +1,6 @@
 import "reflect-metadata";
 import { Container } from "inversify";
+import { AgentService } from "../services/agent/service.js";
 import { ContextMenuService } from "../services/context-menu/service.js";
 import { DeepLinkService } from "../services/deep-link/service.js";
 import { DockBadgeService } from "../services/dock-badge/service.js";
@@ -11,6 +12,7 @@ import { GitService } from "../services/git/service.js";
 import { OAuthService } from "../services/oauth/service.js";
 import { ShellService } from "../services/shell/service.js";
 import { TaskLinkService } from "../services/task-link/service.js";
+import { UIService } from "../services/ui/service.js";
 import { UpdatesService } from "../services/updates/service.js";
 import { WorkspaceService } from "../services/workspace/service.js";
 import { MAIN_TOKENS } from "./tokens.js";
@@ -19,6 +21,7 @@ export const container = new Container({
   defaultScope: "Singleton",
 });
 
+container.bind(MAIN_TOKENS.AgentService).to(AgentService);
 container.bind(MAIN_TOKENS.ContextMenuService).to(ContextMenuService);
 container.bind(MAIN_TOKENS.DeepLinkService).to(DeepLinkService);
 container.bind(MAIN_TOKENS.DockBadgeService).to(DockBadgeService);
@@ -29,6 +32,7 @@ container.bind(MAIN_TOKENS.FsService).to(FsService);
 container.bind(MAIN_TOKENS.GitService).to(GitService);
 container.bind(MAIN_TOKENS.OAuthService).to(OAuthService);
 container.bind(MAIN_TOKENS.ShellService).to(ShellService);
+container.bind(MAIN_TOKENS.UIService).to(UIService);
 container.bind(MAIN_TOKENS.UpdatesService).to(UpdatesService);
 container.bind(MAIN_TOKENS.TaskLinkService).to(TaskLinkService);
 container.bind(MAIN_TOKENS.WorkspaceService).to(WorkspaceService);

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

@@ -6,6 +6,7 @@
  */
 export const MAIN_TOKENS = Object.freeze({
   // Services
+  AgentService: Symbol.for("Main.AgentService"),
   ContextMenuService: Symbol.for("Main.ContextMenuService"),
   DockBadgeService: Symbol.for("Main.DockBadgeService"),
   ExternalAppsService: Symbol.for("Main.ExternalAppsService"),
@@ -17,6 +18,7 @@ export const MAIN_TOKENS = Object.freeze({
   OAuthService: Symbol.for("Main.OAuthService"),
   TaskLinkService: Symbol.for("Main.TaskLinkService"),
   ShellService: Symbol.for("Main.ShellService"),
+  UIService: Symbol.for("Main.UIService"),
   UpdatesService: Symbol.for("Main.UpdatesService"),
   WorkspaceService: Symbol.for("Main.WorkspaceService"),
 });

apps/array/src/main/index.ts

@@ -12,7 +12,6 @@ import {
   BrowserWindow,
   clipboard,
   dialog,
-  ipcMain,
   Menu,
   type MenuItemConstructorOptions,
   shell,
@@ -22,17 +21,12 @@ import "./lib/logger";
 import { ANALYTICS_EVENTS } from "../types/analytics.js";
 import { container } from "./di/container.js";
 import { MAIN_TOKENS } from "./di/tokens.js";
+import type { AgentService } from "./services/agent/service.js";
 import type { DockBadgeService } from "./services/dock-badge/service.js";
-import {
-  cleanupAgentSessions,
-  registerAgentIpc,
-} from "./services/session-manager.js";
+import type { UIService } from "./services/ui/service.js";
 import { setMainWindowGetter } from "./trpc/context.js";
 import { trpcRouter } from "./trpc/index.js";
 
-// Legacy type kept for backwards compatibility with taskControllers map
-type TaskController = unknown;
-
 import "./services/index.js";
 import type { DeepLinkService } from "./services/deep-link/service.js";
 import type { ExternalAppsService } from "./services/external-apps/service.js";
@@ -52,7 +46,6 @@ declare const MAIN_WINDOW_VITE_DEV_SERVER_URL: string | undefined;
 declare const MAIN_WINDOW_VITE_NAME: string;
 
 let mainWindow: BrowserWindow | null = null;
-const taskControllers = new Map<string, TaskController>();
 
 // Force IPv4 resolution when "localhost" is used so the agent hits 127.0.0.1
 // instead of ::1. This matches how the renderer already reaches the PostHog API.
@@ -223,7 +216,7 @@ function createWindow(): void {
           label: "Settings...",
           accelerator: "CmdOrCtrl+,",
           click: () => {
-            mainWindow?.webContents.send("open-settings");
+            container.get<UIService>(MAIN_TOKENS.UIService).openSettings();
           },
         },
         { type: "separator" },
@@ -237,7 +230,7 @@ function createWindow(): void {
           label: "New task",
           accelerator: "CmdOrCtrl+N",
           click: () => {
-            mainWindow?.webContents.send("new-task");
+            container.get<UIService>(MAIN_TOKENS.UIService).newTask();
           },
         },
         { type: "separator" },
@@ -247,7 +240,7 @@ function createWindow(): void {
             {
               label: "Clear application storage",
               click: () => {
-                mainWindow?.webContents.send("clear-storage");
+                container.get<UIService>(MAIN_TOKENS.UIService).clearStorage();
               },
             },
           ],
@@ -282,7 +275,7 @@ function createWindow(): void {
         {
           label: "Reset layout",
           click: () => {
-            mainWindow?.webContents.send("reset-layout");
+            container.get<UIService>(MAIN_TOKENS.UIService).resetLayout();
           },
         },
       ],
@@ -356,7 +349,8 @@ app.on("window-all-closed", async () => {
 
 app.on("before-quit", async (event) => {
   event.preventDefault();
-  await cleanupAgentSessions();
+  const agentService = container.get<AgentService>(MAIN_TOKENS.AgentService);
+  await agentService.cleanupAll();
   trackAppEvent(ANALYTICS_EVENTS.APP_QUIT);
   await shutdownPostHog();
   app.exit(0);
@@ -367,8 +361,3 @@ app.on("activate", () => {
     createWindow();
   }
 });
-
-ipcMain.handle("app:get-version", () => app.getVersion());
-
-// Register IPC handlers via services
-registerAgentIpc(taskControllers, () => mainWindow);

apps/array/src/main/ipc/createIpcService.ts

@@ -1,92 +1,6 @@
-import type { ContentBlock } from "@agentclientprotocol/sdk";
-import { contextBridge, type IpcRendererEvent, ipcRenderer } from "electron";
 import { exposeElectronTRPC } from "trpc-electron/main";
 import "electron-log/preload";
 
-process.once("loaded", () => {
+process.once("loaded", async () => {
   exposeElectronTRPC();
 });
-
-/// -- Legacy IPC handlers -- ///
-
-type IpcEventListener<T> = (data: T) => void;
-
-function createIpcListener<T>(
-  channel: string,
-  listener: IpcEventListener<T>,
-): () => void {
-  const wrapped = (_event: IpcRendererEvent, data: T) => listener(data);
-  ipcRenderer.on(channel, wrapped);
-  return () => ipcRenderer.removeListener(channel, wrapped);
-}
-
-function createVoidIpcListener(
-  channel: string,
-  listener: () => void,
-): () => void {
-  ipcRenderer.on(channel, listener);
-  return () => ipcRenderer.removeListener(channel, listener);
-}
-
-interface AgentStartParams {
-  taskId: string;
-  taskRunId: string;
-  repoPath: string;
-  apiKey: string;
-  apiHost: string;
-  projectId: number;
-  permissionMode?: string;
-  autoProgress?: boolean;
-  model?: string;
-  executionMode?: "plan";
-  runMode?: "local" | "cloud";
-  createPR?: boolean;
-}
-
-contextBridge.exposeInMainWorld("electronAPI", {
-  // Agent API
-  agentStart: async (
-    params: AgentStartParams,
-  ): Promise<{ sessionId: string; channel: string }> =>
-    ipcRenderer.invoke("agent-start", params),
-  agentPrompt: async (
-    sessionId: string,
-    prompt: ContentBlock[],
-  ): Promise<{ stopReason: string }> =>
-    ipcRenderer.invoke("agent-prompt", sessionId, prompt),
-  agentCancel: async (sessionId: string): Promise<boolean> =>
-    ipcRenderer.invoke("agent-cancel", sessionId),
-  agentCancelPrompt: async (sessionId: string): Promise<boolean> =>
-    ipcRenderer.invoke("agent-cancel-prompt", sessionId),
-  agentReconnect: async (params: {
-    taskId: string;
-    taskRunId: string;
-    repoPath: string;
-    apiKey: string;
-    apiHost: string;
-    projectId: number;
-    logUrl?: string;
-    sdkSessionId?: string;
-  }): Promise<{ sessionId: string; channel: string } | null> =>
-    ipcRenderer.invoke("agent-reconnect", params),
-  agentTokenRefresh: async (
-    taskRunId: string,
-    newToken: string,
-  ): Promise<void> =>
-    ipcRenderer.invoke("agent-token-refresh", taskRunId, newToken),
-  agentSetModel: async (sessionId: string, modelId: string): Promise<void> =>
-    ipcRenderer.invoke("agent-set-model", sessionId, modelId),
-  onAgentEvent: (
-    channel: string,
-    listener: (payload: unknown) => void,
-  ): (() => void) => createIpcListener(channel, listener),
-  onOpenSettings: (listener: () => void): (() => void) =>
-    createVoidIpcListener("open-settings", listener),
-  onNewTask: (listener: () => void): (() => void) =>
-    createVoidIpcListener("new-task", listener),
-  onResetLayout: (listener: () => void): (() => void) =>
-    createVoidIpcListener("reset-layout", listener),
-  onClearStorage: (listener: () => void): (() => void) =>
-    createVoidIpcListener("clear-storage", listener),
-  getAppVersion: (): Promise<string> => ipcRenderer.invoke("app:get-version"),
-});