fix: spawn native terminals for local workspaces (#616)

Author: sreya

src/browser/api.ts

@@ -184,6 +184,22 @@ class WebSocketManager {
 
 const wsManager = new WebSocketManager();
 
+// Cache workspace metadata to avoid async lookup during user gestures (popup blocker issue)
+let workspaceMetadataCache: Array<{
+  id: string;
+  runtimeConfig?: { type: "local" | "ssh" };
+}> = [];
+
+// Update cache when workspace metadata changes
+function updateWorkspaceCache() {
+  void invokeIPC(IPC_CHANNELS.WORKSPACE_LIST).then((workspaces) => {
+    workspaceMetadataCache = workspaces as typeof workspaceMetadataCache;
+  });
+}
+
+// Initialize cache
+updateWorkspaceCache();
+
 // Create the Web API implementation
 const webApi: IPCApi = {
   tokenizer: {
@@ -240,7 +256,12 @@ const webApi: IPCApi = {
     },
 
     onMetadata: (callback) => {
-      return wsManager.on(IPC_CHANNELS.WORKSPACE_METADATA, callback as (data: unknown) => void);
+      // Update cache whenever workspace metadata changes
+      const unsubscribe = wsManager.on(IPC_CHANNELS.WORKSPACE_METADATA, (data: unknown) => {
+        updateWorkspaceCache();
+        callback(data as Parameters<typeof callback>[0]);
+      });
+      return unsubscribe;
     },
   },
   window: {
@@ -268,10 +289,18 @@ const webApi: IPCApi = {
       return wsManager.on(channel, callback as (data: unknown) => void);
     },
     openWindow: (workspaceId) => {
-      // In browser mode, open a new window/tab with the terminal page
-      // Use a unique name with timestamp to create a new window each time
-      const url = `/terminal.html?workspaceId=${encodeURIComponent(workspaceId)}`;
-      window.open(url, `terminal-${workspaceId}-${Date.now()}`, "width=1000,height=600");
+      // Check workspace runtime type using cached metadata (synchronous)
+      // This must be synchronous to avoid popup blocker during user gesture
+      const workspace = workspaceMetadataCache.find((ws) => ws.id === workspaceId);
+      const isSSH = workspace?.runtimeConfig?.type === "ssh";
+
+      if (isSSH) {
+        // SSH workspace - open browser tab with terminal UI (must be synchronous)
+        const url = `/terminal.html?workspaceId=${encodeURIComponent(workspaceId)}`;
+        window.open(url, `terminal-${workspaceId}-${Date.now()}`, "width=1000,height=600");
+      }
+      // For local workspaces, the IPC handler will open a native terminal
+
       return invokeIPC(IPC_CHANNELS.TERMINAL_WINDOW_OPEN, workspaceId);
     },
     closeWindow: (workspaceId) => invokeIPC(IPC_CHANNELS.TERMINAL_WINDOW_CLOSE, workspaceId),

src/services/ipcMain.ts

@@ -1565,12 +1565,35 @@ export class IpcMain {
     ipcMain.handle(IPC_CHANNELS.TERMINAL_WINDOW_OPEN, async (_event, workspaceId: string) => {
       console.log(`[BACKEND] TERMINAL_WINDOW_OPEN handler called with: ${workspaceId}`);
       try {
-        if (!this.terminalWindowManager) {
-          throw new Error("Terminal window manager not available (desktop mode only)");
+        // Look up workspace to determine runtime type
+        const allMetadata = await this.config.getAllWorkspaceMetadata();
+        const workspace = allMetadata.find((w) => w.id === workspaceId);
+
+        if (!workspace) {
+          log.error(`Workspace not found: ${workspaceId}`);
+          throw new Error(`Workspace not found: ${workspaceId}`);
         }
-        log.info(`Opening terminal window for workspace: ${workspaceId}`);
-        await this.terminalWindowManager.openTerminalWindow(workspaceId);
-        log.info(`Terminal window opened successfully for workspace: ${workspaceId}`);
+
+        const runtimeConfig = workspace.runtimeConfig;
+
+        // For local workspaces, use native terminal (both desktop and browser mode)
+        // For SSH workspaces, use ghostty-web (desktop) or browser terminal (browser mode)
+        if (!isSSHRuntime(runtimeConfig)) {
+          // Local workspace - use native terminal
+          log.info(`Opening native terminal for local workspace: ${workspaceId}`);
+          await this.openTerminal({ type: "local", workspacePath: workspace.namedWorkspacePath });
+        } else if (this.terminalWindowManager) {
+          // SSH workspace in desktop mode - use ghostty-web Electron window
+          log.info(`Opening ghostty-web terminal for SSH workspace: ${workspaceId}`);
+          await this.terminalWindowManager.openTerminalWindow(workspaceId);
+        } else {
+          // SSH workspace in browser mode - let browser handle it
+          log.info(
+            `Browser mode: terminal UI handled by browser for SSH workspace: ${workspaceId}`
+          );
+        }
+
+        log.info(`Terminal opened successfully for workspace: ${workspaceId}`);
       } catch (err) {
         log.error("Error opening terminal window:", err);
         throw err;