refactor: move external-apps service to trpc

Author: jonathanlab

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

@@ -1,6 +1,7 @@
 import "reflect-metadata";
 import { Container } from "inversify";
 import { ContextMenuService } from "../services/context-menu/service.js";
+import { ExternalAppsService } from "../services/external-apps/service.js";
 import { GitService } from "../services/git/service.js";
 import { MAIN_TOKENS } from "./tokens.js";
 
@@ -15,6 +16,9 @@ export const container = new Container({
 container
   .bind<ContextMenuService>(MAIN_TOKENS.ContextMenuService)
   .to(ContextMenuService);
+container
+  .bind<ExternalAppsService>(MAIN_TOKENS.ExternalAppsService)
+  .to(ExternalAppsService);
 container.bind<GitService>(MAIN_TOKENS.GitService).to(GitService);
 
 export function get<T>(token: symbol): T {

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

@@ -7,5 +7,6 @@
 export const MAIN_TOKENS = Object.freeze({
   // Services
   ContextMenuService: Symbol.for("Main.ContextMenuService"),
+  ExternalAppsService: Symbol.for("Main.ExternalAppsService"),
   GitService: Symbol.for("Main.GitService"),
 });

apps/array/src/main/index.ts

@@ -36,10 +36,7 @@ import { registerFoldersIpc } from "./services/folders.js";
 import { registerFsIpc } from "./services/fs.js";
 import { registerGitIpc } from "./services/git.js";
 import "./services/index.js";
-import {
-  getOrRefreshApps,
-  registerExternalAppsIpc,
-} from "./services/externalApps.js";
+import { ExternalAppsService } from "./services/external-apps/service.js";
 import { registerOAuthHandlers } from "./services/oauth.js";
 import {
   initializePostHog,
@@ -264,7 +261,7 @@ app.whenReady().then(() => {
   trackAppEvent(ANALYTICS_EVENTS.APP_STARTED);
 
   // Preload external app icons in background
-  getOrRefreshApps().catch(() => {
+  new ExternalAppsService().getDetectedApps().catch(() => {
     // Silently fail, will retry on first use
   });
 });
@@ -305,5 +302,4 @@ registerFileWatcherIpc(() => mainWindow);
 registerFoldersIpc(() => mainWindow);
 registerWorktreeIpc();
 registerShellIpc();
-registerExternalAppsIpc();
 registerWorkspaceIpc(() => mainWindow);

apps/array/src/main/preload.ts

@@ -295,31 +295,6 @@ contextBridge.exposeInMainWorld("electronAPI", {
     ): Promise<string | null> =>
       ipcRenderer.invoke("worktree-get-main-repo", mainRepoPath, worktreePath),
   },
-  // External Apps API
-  externalApps: {
-    getDetectedApps: (): Promise<
-      Array<{
-        id: string;
-        name: string;
-        type: "editor" | "terminal";
-        path: string;
-        command: string;
-        icon?: string;
-      }>
-    > => ipcRenderer.invoke("external-apps:get-detected-apps"),
-    openInApp: (
-      appId: string,
-      path: string,
-    ): Promise<{ success: boolean; error?: string }> =>
-      ipcRenderer.invoke("external-apps:open-in-app", appId, path),
-    setLastUsed: (appId: string): Promise<void> =>
-      ipcRenderer.invoke("external-apps:set-last-used", appId),
-    getLastUsed: (): Promise<{
-      lastUsedApp?: string;
-    }> => ipcRenderer.invoke("external-apps:get-last-used"),
-    copyPath: (path: string): Promise<void> =>
-      ipcRenderer.invoke("external-apps:copy-path", path),
-  },
   // Workspace API
   workspace: {
     create: (options: CreateWorkspaceOptions): Promise<WorkspaceInfo> =>

apps/array/src/main/services/context-menu/service.ts

@@ -6,8 +6,10 @@ import {
 } from "electron";
 import { injectable } from "inversify";
 import type { DetectedApplication } from "../../../shared/types.js";
+import { get } from "../../di/container.js";
+import { MAIN_TOKENS } from "../../di/tokens.js";
 import { getMainWindow } from "../../trpc/context.js";
-import { externalAppsStore, getOrRefreshApps } from "../externalApps.js";
+import type { ExternalAppsService } from "../external-apps/service.js";
 import type {
   ActionItemDef,
   ConfirmOptions,
@@ -33,11 +35,24 @@ import type {
 export class ContextMenuService {
   private readonly ICON_SIZE = 16;
 
+  private getExternalAppsService() {
+    return get<ExternalAppsService>(MAIN_TOKENS.ExternalAppsService);
+  }
+
+  private async getExternalAppsData() {
+    const service = this.getExternalAppsService();
+    const [apps, lastUsed] = await Promise.all([
+      service.getDetectedApps(),
+      service.getLastUsed(),
+    ]);
+    return { apps, lastUsedAppId: lastUsed.lastUsedApp };
+  }
+
   async showTaskContextMenu(
     input: TaskContextMenuInput,
   ): Promise<TaskContextMenuResult> {
     const { taskTitle, worktreePath } = input;
-    const apps = await getOrRefreshApps();
+    const { apps, lastUsedAppId } = await this.getExternalAppsData();
 
     return this.showMenu<TaskAction>([
       this.item("Rename", { type: "rename" }),
@@ -58,7 +73,10 @@ export class ContextMenuService {
         },
       ),
       ...(worktreePath
-        ? [this.separator(), ...this.externalAppItems<TaskAction>(apps)]
+        ? [
+            this.separator(),
+            ...this.externalAppItems<TaskAction>(apps, lastUsedAppId),
+          ]
         : []),
     ]);
   }
@@ -67,7 +85,7 @@ export class ContextMenuService {
     input: FolderContextMenuInput,
   ): Promise<FolderContextMenuResult> {
     const { folderName, folderPath } = input;
-    const apps = await getOrRefreshApps();
+    const { apps, lastUsedAppId } = await this.getExternalAppsData();
 
     return this.showMenu<FolderAction>([
       this.item(
@@ -84,7 +102,10 @@ export class ContextMenuService {
         },
       ),
       ...(folderPath
-        ? [this.separator(), ...this.externalAppItems<FolderAction>(apps)]
+        ? [
+            this.separator(),
+            ...this.externalAppItems<FolderAction>(apps, lastUsedAppId),
+          ]
         : []),
     ]);
   }
@@ -93,7 +114,7 @@ export class ContextMenuService {
     input: TabContextMenuInput,
   ): Promise<TabContextMenuResult> {
     const { canClose, filePath } = input;
-    const apps = await getOrRefreshApps();
+    const { apps, lastUsedAppId } = await this.getExternalAppsData();
 
     return this.showMenu<TabAction>([
       this.item(
@@ -107,7 +128,10 @@ export class ContextMenuService {
       this.item("Close other tabs", { type: "close-others" }),
       this.item("Close tabs to the right", { type: "close-right" }),
       ...(filePath
-        ? [this.separator(), ...this.externalAppItems<TabAction>(apps)]
+        ? [
+            this.separator(),
+            ...this.externalAppItems<TabAction>(apps, lastUsedAppId),
+          ]
         : []),
     ]);
   }
@@ -125,7 +149,7 @@ export class ContextMenuService {
   async showFileContextMenu(
     input: FileContextMenuInput,
   ): Promise<FileContextMenuResult> {
-    const apps = await getOrRefreshApps();
+    const { apps, lastUsedAppId } = await this.getExternalAppsData();
 
     return this.showMenu<FileAction>([
       ...(input.showCollapseAll
@@ -134,17 +158,18 @@ export class ContextMenuService {
             this.separator(),
           ]
         : []),
-      ...this.externalAppItems<FileAction>(apps),
+      ...this.externalAppItems<FileAction>(apps, lastUsedAppId),
     ]);
   }
 
-  private externalAppItems<T>(apps: DetectedApplication[]): MenuItemDef<T>[] {
+  private externalAppItems<T>(
+    apps: DetectedApplication[],
+    lastUsedAppId?: string,
+  ): MenuItemDef<T>[] {
     if (apps.length === 0) {
       return [this.disabled("No external apps detected")];
     }
 
-    const lastUsedAppId =
-      externalAppsStore.get("externalAppsPrefs")?.lastUsedApp;
     const lastUsedApp = apps.find((app) => app.id === lastUsedAppId) || apps[0];
     const openIn = (appId: string): T =>
       ({ type: "external-app", action: { type: "open-in-app", appId } }) as T;