Merge pull request #96 from grimmerk/fix/codev-terminal-detection

fix: detect CodeV embedded terminal sessions correctly

Author: grimmerk

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.63
+
+- Fix: Terminal tab sessions correctly detected as CODEV (not parent terminal)
+- Click Terminal tab session → switches to Term tab instead of external terminal
+
 ## 1.0.62
 
 - Feat: session status hooks — colored dots for working (pulse) / idle / needs-attention (blink)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "CodeV",
   "productName": "CodeV",
-  "version": "1.0.62",
+  "version": "1.0.63",
   "description": "Quick switcher for VS Code, Cursor, and Claude Code sessions",
   "repository": {
     "type": "git",

src/claude-session-utility.ts

@@ -185,6 +185,13 @@ export const detectTerminalApp = async (pid: number): Promise<string> => {
     if (!comm) break;
 
     const commLower = comm.toLowerCase();
+    // CodeV's embedded terminal (node-pty runs under Electron)
+    if (commLower.includes('codev')) return 'codev';
+    // Check if this Electron process is CodeV by inspecting command line
+    if (commLower.includes('electron')) {
+      const cmdline = (await execPromise(`ps -o command= -p ${currentPid} 2>/dev/null`)).trim();
+      if (cmdline.toLowerCase().includes('codev')) return 'codev';
+    }
     if (commLower.includes('iterm') || commLower.includes('iterm2')) return 'iterm2';
     if (commLower.includes('cmux')) return 'cmux';
     if (commLower.includes('ghostty')) return 'ghostty';
@@ -578,7 +585,7 @@ end tell`);
 
   // Ghostty + unknown terminals: cwd fallback (no async work, runs after cross-ref)
   for (const [terminal, items] of Object.entries(byTerminal)) {
-    if (terminal === 'iterm2' || terminal === 'cmux' || terminal === 'terminal') continue;
+    if (terminal === 'iterm2' || terminal === 'cmux' || terminal === 'terminal' || terminal === 'codev') continue;
     for (const item of items) {
       const fallback = item.candidates.find(s => !activeMap.has(s.sessionId));
       if (fallback) {
@@ -747,6 +754,10 @@ export const openSession = async (
   }
 
   switch (effectiveTerminal) {
+    case 'codev':
+      // Session is in CodeV's embedded terminal — notify renderer to switch to Term tab
+      openSessionInCodeV(sessionId);
+      break;
     case 'cmux':
       openSessionInCmux(sessionId, projectPath, isActive, activePid, customTitle);
       break;
@@ -768,6 +779,26 @@ export const openSession = async (
  * If the session is already active, switch to its tab
  * Otherwise, open a new tab and run claude --resume
  */
+/**
+ * Callback for opening sessions in CodeV's embedded terminal.
+ * Set by main.ts to avoid circular dependency.
+ */
+let codevTerminalCallback: ((sessionId: string) => void) | null = null;
+
+export const setCodevTerminalCallback = (cb: (sessionId: string) => void) => {
+  codevTerminalCallback = cb;
+};
+
+/**
+ * "Open" a session that's running in CodeV's embedded terminal.
+ * Switches to the Terminal tab instead of opening an external terminal.
+ */
+export const openSessionInCodeV = (sessionId: string): void => {
+  if (codevTerminalCallback) {
+    codevTerminalCallback(sessionId);
+  }
+};
+
 export const openSessionInITerm2 = (
   sessionId: string,
   projectPath: string,

src/main.ts

@@ -25,6 +25,7 @@ import {
   invalidateSessionCache,
   loadSessionEnrichment,
   loadLastAssistantResponses,
+  setCodevTerminalCallback,
 } from './claude-session-utility';
 import {
   installHooks,
@@ -1059,6 +1060,15 @@ const trayToggleEvtHandler = async () => {
     console.log('when ready');
   }
 
+  // Set callback for CodeV embedded terminal sessions
+  setCodevTerminalCallback((_sessionId: string) => {
+    showSwitcherWindow();
+    // Send after show to ensure window exists and is ready
+    setTimeout(() => {
+      switcherWindow?.webContents.send('switch-to-terminal');
+    }, 50);
+  });
+
   // Pre-initialize aiAssistantWindow for faster first open
   // This is done after mainWindow is created, but before showing it
   // so that initial startup isn't slowed down