Merge pull request #83 from grimmerk/fix/menubar-shortcut-sync

fix: menubar shortcuts + PR links + active IDE dots

Author: grimmerk

.github/workflows/notarize.yml

@@ -76,13 +76,20 @@ jobs:
       - name: Extract release notes from CHANGELOG.md
         id: changelog
         if: ${{ inputs.create_release && inputs.release_notes == '' }}
+        env:
+          GH_TOKEN: ${{ github.token }}
         run: |
           VERSION="${{ steps.version.outputs.version }}"
-          # Extract section for this version from CHANGELOG.md
-          # Note: can't use awk range pattern /start/,/end/ because the start line
-          # "## 1.0.38" also matches the end pattern /^## [0-9]/ (version starts with digit),
-          # causing awk to treat the range as a single line.
-          NOTES=$(awk -v ver="## ${VERSION}" '$0 == ver {found=1; next} found && /^## / {exit} found' CHANGELOG.md | sed '/^$/d')
+          # Find the last published release version to aggregate all unreleased entries
+          LAST_TAG=$(gh release list --limit 1 --json tagName -q '.[0].tagName' 2>/dev/null || echo "")
+          LAST_VER=$(echo "$LAST_TAG" | sed 's/^v//')
+          # Extract all changelog sections from current version down to (but not including) last release
+          if [ -n "$LAST_VER" ] && [ "$LAST_VER" != "$VERSION" ]; then
+            NOTES=$(awk -v cur="## ${VERSION}" -v prev="## ${LAST_VER}" \
+              '$0 == cur {found=1} found && $0 == prev {exit} found' CHANGELOG.md | sed '/^$/d')
+          else
+            NOTES=$(awk -v ver="## ${VERSION}" '$0 == ver {found=1; next} found && /^## / {exit} found' CHANGELOG.md | sed '/^$/d')
+          fi
           if [ -z "$NOTES" ]; then
             NOTES="Non-App Store notarized build v${VERSION}"
           fi

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.0.57
+
+- Fix: menubar Keyboard Shortcuts submenu now reflects custom shortcuts
+- Fix: GitHub release notes now aggregate all unreleased changelog entries
+- Feat: PR link badge in session list items (clickable, opens browser)
+- Feat: purple dot on projects currently open in VS Code/Cursor
+- Pin axios to 1.14.0 (avoid compromised 1.14.1)
+
 ## 1.0.56
 
 - Feat: embedded Terminal tab (xterm.js + node-pty)

README.md

@@ -114,6 +114,8 @@ Trigger `⌃+⌘+C` shortcut to launch pure AI chat mode, just like the Claude o
       - `db:migrate` will also automatically do this part, `yarn install` will also include generated types in node_modules/.prisma/index.d.ts)
   - `yarn start`
 
+> **Git worktree note:** Prisma 4.x downloads native engine binaries during postinstall, but `yarn install` in a worktree may not trigger this correctly. If you see `PrismaClientInitializationError: Unable to require libquery_engine-darwin-arm64.dylib.node`, copy the binary from the main repo: `cp <main-repo>/node_modules/@prisma/engines/libquery_engine-darwin-arm64.dylib.node node_modules/@prisma/engines/`
+
 ### SQLite database locations
 
 CodeV uses its own SQLite database (via Prisma) for storing user settings, AI assistant settings, and conversation history. Recent projects data is read directly from VS Code/Cursor's `state.vscdb`.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "CodeV",
   "productName": "CodeV",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "description": "Quick switcher for VS Code, Cursor, and Claude Code sessions",
   "repository": {
     "type": "git",
@@ -74,7 +74,7 @@
     "@prisma/client": "^4.16.1",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/xterm": "^6.0.0",
-    "axios": "^1.14.0",
+    "axios": "1.14.0",
     "better-sqlite3": "^12.8.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.0",

src/TrayGenerator.ts

@@ -10,11 +10,22 @@ export const isMasStr = isMAS() ? 'mas' : 'nonMas';
 
 // ref:
 // https://blog.logrocket.com/building-a-menu-bar-application-with-electron-and-react/
+export interface ShortcutSettings {
+  quickSwitcher: string;
+  aiInsight: string;
+  aiChat: string;
+}
+
 export class TrayGenerator {
   tray: Tray;
   attachedWindow: BrowserWindow;
   onTrayClickCallback: any;
   title: string;
+  shortcuts: ShortcutSettings = {
+    quickSwitcher: 'Command+Control+R',
+    aiInsight: 'Command+Control+E',
+    aiChat: 'Command+Control+C',
+  };
 
   constructor(
     attachedWindow: BrowserWindow,
@@ -28,6 +39,14 @@ export class TrayGenerator {
     this.createTray(title);
   }
 
+  updateShortcuts = (shortcuts: ShortcutSettings) => {
+    this.shortcuts = shortcuts;
+  };
+
+  private acceleratorToMenuLabel = (acc: string): string => {
+    return acc.replace(/Command/g, 'Cmd').replace(/Control/g, 'Ctrl');
+  };
+
   onTrayClick = () => {
     if (this.onTrayClickCallback) {
       this.onTrayClickCallback();
@@ -71,10 +90,10 @@ export class TrayGenerator {
       {
         label: 'Keyboard Shortcuts',
         submenu: [
-          { label: 'Cmd+Ctrl+R: Open CodeV Quick Switcher', enabled: false },
+          { label: `${this.acceleratorToMenuLabel(this.shortcuts.quickSwitcher)}: Open CodeV Quick Switcher`, enabled: false },
           { label: 'Tab: Switch Projects / Sessions', enabled: false },
-          { label: 'Cmd+Ctrl+E: AI Assistant Insight', enabled: false },
-          { label: 'Cmd+Ctrl+C: AI Assistant Smart Chat', enabled: false },
+          { label: `${this.acceleratorToMenuLabel(this.shortcuts.aiInsight)}: AI Assistant Insight`, enabled: false },
+          { label: `${this.acceleratorToMenuLabel(this.shortcuts.aiChat)}: AI Assistant Smart Chat`, enabled: false },
         ],
       },
       { type: 'separator' },

src/claude-session-utility.ts

@@ -865,18 +865,25 @@ end tell`;
  * Reads each session's JSONL file and greps for "custom-title" entries.
  * Returns a map of sessionId -> customTitle.
  */
+export interface PRLinkInfo {
+  prNumber: number;
+  prUrl: string;
+}
+
 export interface SessionEnrichment {
   titles: Map<string, string>;
   branches: Map<string, string>;
+  prLinks: Map<string, PRLinkInfo>;
 }
 
-// Cache for branches
+// Cache for branches and PR links
 let cachedBranches: Map<string, string> | null = null;
+let cachedPRLinks: Map<string, PRLinkInfo> | null = null;
 
 export const loadSessionEnrichment = async (sessions: ClaudeSession[]): Promise<SessionEnrichment> => {
   const now = Date.now();
-  if (cachedCustomTitles && cachedBranches && (now - titlesCacheTimestamp) < CACHE_TTL_MS) {
-    return { titles: cachedCustomTitles, branches: cachedBranches };
+  if (cachedCustomTitles && cachedBranches && cachedPRLinks && (now - titlesCacheTimestamp) < CACHE_TTL_MS) {
+    return { titles: cachedCustomTitles, branches: cachedBranches, prLinks: cachedPRLinks };
   }
 
   const { exec } = require('child_process');
@@ -889,6 +896,7 @@ export const loadSessionEnrichment = async (sessions: ClaudeSession[]): Promise<
 
   const titles = new Map<string, string>();
   const branches = new Map<string, string>();
+  const prLinks = new Map<string, PRLinkInfo>();
   const claudeDir = path.join(os.homedir(), '.claude', 'projects');
 
   const promises = sessions.map(async (session) => {
@@ -897,10 +905,11 @@ export const loadSessionEnrichment = async (sessions: ClaudeSession[]): Promise<
 
     if (!fs.existsSync(jsonlPath)) return;
 
-    // Run title grep and branch tail in parallel for each file
-    const [titleOutput, branchOutput] = await Promise.all([
+    // Run title, branch, and PR link greps in parallel for each file
+    const [titleOutput, branchOutput, prLinkOutput] = await Promise.all([
       execPromise(`grep '"type":"custom-title"' "${jsonlPath}" 2>/dev/null | tail -1`),
       execPromise(`tail -n 5 "${jsonlPath}" 2>/dev/null | grep -o '"gitBranch":"[^"]*"' | tail -1`),
+      execPromise(`grep '"type":"pr-link"' "${jsonlPath}" 2>/dev/null | tail -1`),
     ]);
 
     if (titleOutput.trim()) {
@@ -919,14 +928,24 @@ export const loadSessionEnrichment = async (sessions: ClaudeSession[]): Promise<
         branches.set(session.sessionId, match[1]);
       }
     }
+
+    if (prLinkOutput.trim()) {
+      try {
+        const parsed = JSON.parse(prLinkOutput.trim());
+        if (parsed.prNumber && parsed.prUrl) {
+          prLinks.set(session.sessionId, { prNumber: parsed.prNumber, prUrl: parsed.prUrl });
+        }
+      } catch {}
+    }
   });
 
   await Promise.all(promises);
 
   cachedCustomTitles = titles;
   cachedBranches = branches;
+  cachedPRLinks = prLinks;
   titlesCacheTimestamp = now;
-  return { titles, branches };
+  return { titles, branches, prLinks };
 };
 
 /**

src/electron-api.d.ts

@@ -47,9 +47,10 @@ interface IElectronAPI {
   detectTerminalApps: (pidMap: Record<string, number>) => Promise<Record<string, string>>;
   openClaudeSession: (sessionId: string, projectPath: string, isActive: boolean, activePid?: number, customTitle?: string) => void;
   copyClaudeSessionCommand: (sessionId: string, projectPath: string) => void;
-  loadSessionEnrichment: (sessions: any[]) => Promise<{ titles: Record<string, string>; branches: Record<string, string> }>;
+  loadSessionEnrichment: (sessions: any[]) => Promise<{ titles: Record<string, string>; branches: Record<string, string>; prLinks: Record<string, { prNumber: number; prUrl: string }> }>;
   loadLastAssistantResponses: (sessions: any[]) => Promise<Record<string, string>>;
   loadProjectBranches: (paths: string[]) => Promise<Record<string, string>>;
+  detectActiveIDEProjects: () => Promise<string[]>;
 
   // VS Code SQLite
   fetchVSCodeBasedIDESqlite: () => void;
@@ -58,6 +59,7 @@ interface IElectronAPI {
   onVSCodeBasedSqliteRecordDeleted: (callback: IpcCallback) => void;
 
   // Window events
+  openExternal: (url: string) => void;
   onFolderSelected: (callback: IpcCallback) => void;
   onWorkingFolderIterated: (callback: IpcCallback) => void;
   onFocusWindow: (callback: IpcCallback) => void;

src/main.ts

@@ -12,7 +12,7 @@ import {
 import settings from 'electron-settings';
 import { existsSync, readdirSync } from 'fs';
 import { DBPathMigrationManager } from './DBPathMigrationManager';
-import { isMAS, TrayGenerator } from './TrayGenerator';
+import { isMAS, ShortcutSettings, TrayGenerator } from './TrayGenerator';
 import { bootstrap } from './server/server';
 import { AIAssistantUIMode, isDebug } from './utility';
 import {
@@ -592,6 +592,11 @@ ipcMain.on('hide-app', (event) => {
   hideSwitcherWindow();
 });
 
+ipcMain.on('open-external', (_event, url: string) => {
+  const { shell } = require('electron');
+  shell.openExternal(url);
+});
+
 ipcMain.on('close-app-click', async (event) => {
   // Hide windows before quit to prevent white flash from xterm container
   switcherWindow?.hide();
@@ -630,7 +635,7 @@ const API_URL = 'http://localhost:55688';
 
 // Import the function to update IDE mode and IDE enum
 import { IDEMode } from './ide-enum';
-import { updateCurrentIDEMode } from './vscode-based-ide-utility';
+import { detectActiveIDEProjects, updateCurrentIDEMode } from './vscode-based-ide-utility';
 
 // Track user settings
 let userSettings = {
@@ -1533,15 +1538,22 @@ const trayToggleEvtHandler = async () => {
     }
   };
 
+  const getCurrentShortcuts = async (): Promise<ShortcutSettings> => ({
+    quickSwitcher: ((await settings.get('shortcut-quickSwitcher')) as string) || DEFAULT_SHORTCUTS.quickSwitcher,
+    aiInsight: ((await settings.get('shortcut-aiInsight')) as string) || DEFAULT_SHORTCUTS.aiInsight,
+    aiChat: ((await settings.get('shortcut-aiChat')) as string) || DEFAULT_SHORTCUTS.aiChat,
+  });
+
+  const syncTrayShortcuts = async () => {
+    if (tray) tray.updateShortcuts(await getCurrentShortcuts());
+  };
+
   await registerAllShortcuts();
+  await syncTrayShortcuts();
 
   // IPC handler: get all shortcut accelerators
   ipcMain.handle('get-shortcuts', async () => {
-    return {
-      quickSwitcher: ((await settings.get('shortcut-quickSwitcher')) as string) || DEFAULT_SHORTCUTS.quickSwitcher,
-      aiInsight: ((await settings.get('shortcut-aiInsight')) as string) || DEFAULT_SHORTCUTS.aiInsight,
-      aiChat: ((await settings.get('shortcut-aiChat')) as string) || DEFAULT_SHORTCUTS.aiChat,
-    };
+    return await getCurrentShortcuts();
   });
 
   // IPC handler: temporarily unregister a shortcut (while editing)
@@ -1578,6 +1590,7 @@ const trayToggleEvtHandler = async () => {
     const registered = globalShortcut.register(accelerator, callback);
     if (registered) {
       await settings.set(`shortcut-${key}`, accelerator);
+      await syncTrayShortcuts();
       return { success: true };
     } else {
       // Re-register the old shortcut since the new one failed
@@ -1592,6 +1605,7 @@ const trayToggleEvtHandler = async () => {
       await settings.unset(`shortcut-${key}`);
     }
     await registerAllShortcuts();
+    await syncTrayShortcuts();
     return DEFAULT_SHORTCUTS;
   });
 })();
@@ -1800,10 +1814,11 @@ ipcMain.on('copy-claude-session-command', (_event, sessionId: string, projectPat
 });
 
 ipcMain.handle('load-session-enrichment', async (_event, sessions: any[]) => {
-  const { titles, branches } = await loadSessionEnrichment(sessions);
+  const { titles, branches, prLinks } = await loadSessionEnrichment(sessions);
   return {
     titles: Object.fromEntries(titles),
     branches: Object.fromEntries(branches),
+    prLinks: Object.fromEntries(prLinks),
   };
 });
 
@@ -1833,4 +1848,9 @@ ipcMain.handle('load-project-branches', async (_event, paths: string[]) => {
   return results;
 });
 
+ipcMain.handle('detect-active-ide-projects', async () => {
+  const folderNames = await detectActiveIDEProjects();
+  return Array.from(folderNames);
+});
+
 app.dock.hide();

src/preload.ts

@@ -53,6 +53,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
   loadSessionEnrichment: (sessions: any[]) => ipcRenderer.invoke('load-session-enrichment', sessions),
   loadLastAssistantResponses: (sessions: any[]) => ipcRenderer.invoke('load-last-assistant-responses', sessions),
   loadProjectBranches: (paths: string[]) => ipcRenderer.invoke('load-project-branches', paths),
+  detectActiveIDEProjects: () => ipcRenderer.invoke('detect-active-ide-projects'),
 
   /** for reading VS Code built-in sqlite */
   fetchVSCodeBasedIDESqlite: () => ipcRenderer.send('fetch-vscode-based-sqlite'),
@@ -68,6 +69,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
 
   onWorkingFolderIterated: (callback: any) =>
     ipcRenderer.on('working-folder-iterated', callback),
+  openExternal: (url: string) => ipcRenderer.send('open-external', url),
   onFocusWindow: (callback: any) => ipcRenderer.on('window-focus', callback),
   onXWinNotFound: (callback: any) => ipcRenderer.on('xwin-not-found', callback),