feat: enhance keyboard shortcut management and improve app responsiveness

- Updated the development script to include a build step before launching the app.
- Refactored the registration of quick ask and autocomplete functionalities to be asynchronous, ensuring proper initialization.
- Introduced IPC channels for getting and setting keyboard shortcuts, allowing users to customize their experience.
- Enhanced the platform module to support better interaction with the Electron API for clipboard operations.
- Improved the user interface for managing keyboard shortcuts in the settings dialog, providing a more intuitive experience.

surfsense_desktop/package.json

@@ -4,7 +4,7 @@
   "description": "SurfSense Desktop App",
   "main": "dist/main.js",
   "scripts": {
-    "dev": "concurrently -k \"pnpm --dir ../surfsense_web dev\" \"wait-on http://localhost:3000 && electron .\"",
+    "dev": "pnpm build && concurrently -k \"pnpm --dir ../surfsense_web dev\" \"wait-on http://localhost:3000 && electron .\"",
     "build": "node scripts/build-electron.mjs",
     "pack:dir": "pnpm build && electron-builder --dir --config electron-builder.yml",
     "dist": "pnpm build && electron-builder --config electron-builder.yml",

surfsense_desktop/src/ipc/channels.ts

@@ -35,4 +35,7 @@ export const IPC_CHANNELS = {
   // Auth token sync across windows
   GET_AUTH_TOKENS: 'auth:get-tokens',
   SET_AUTH_TOKENS: 'auth:set-tokens',
+  // Keyboard shortcut configuration
+  GET_SHORTCUTS: 'shortcuts:get',
+  SET_SHORTCUTS: 'shortcuts:set',
 } as const;

surfsense_desktop/src/ipc/handlers.ts

@@ -20,6 +20,9 @@ import {
   browseFiles,
   readLocalFiles,
 } from '../modules/folder-watcher';
+import { getShortcuts, setShortcuts, type ShortcutConfig } from '../modules/shortcuts';
+import { reregisterQuickAsk } from '../modules/quick-ask';
+import { reregisterAutocomplete } from '../modules/autocomplete';
 
 let authTokens: { bearer: string; refresh: string } | null = null;
 
@@ -99,4 +102,13 @@ export function registerIpcHandlers(): void {
   ipcMain.handle(IPC_CHANNELS.GET_AUTH_TOKENS, () => {
     return authTokens;
   });
+
+  ipcMain.handle(IPC_CHANNELS.GET_SHORTCUTS, () => getShortcuts());
+
+  ipcMain.handle(IPC_CHANNELS.SET_SHORTCUTS, async (_event, config: Partial<ShortcutConfig>) => {
+    const updated = await setShortcuts(config);
+    if (config.quickAsk) await reregisterQuickAsk();
+    if (config.autocomplete) await reregisterAutocomplete();
+    return updated;
+  });
 }

surfsense_desktop/src/main.ts

@@ -29,8 +29,8 @@ app.whenReady().then(async () => {
   }
 
   createMainWindow('/dashboard');
-  registerQuickAsk();
-  registerAutocomplete();
+  await registerQuickAsk();
+  await registerAutocomplete();
   registerFolderWatcher();
   setupAutoUpdater();
 

surfsense_desktop/src/modules/autocomplete/index.ts

@@ -5,9 +5,9 @@ import { hasScreenRecordingPermission, requestAccessibility, requestScreenRecord
 import { getMainWindow } from '../window';
 import { captureScreen } from './screenshot';
 import { createSuggestionWindow, destroySuggestion, getSuggestionWindow } from './suggestion-window';
+import { getShortcuts } from '../shortcuts';
 
-const SHORTCUT = 'CommandOrControl+Shift+Space';
-
+let currentShortcut = '';
 let autocompleteEnabled = true;
 let savedClipboard = '';
 let sourceApp = '';
@@ -91,7 +91,12 @@ async function acceptAndInject(text: string): Promise<void> {
   }
 }
 
+let ipcRegistered = false;
+
 function registerIpcHandlers(): void {
+  if (ipcRegistered) return;
+  ipcRegistered = true;
+
   ipcMain.handle(IPC_CHANNELS.ACCEPT_SUGGESTION, async (_event, text: string) => {
     await acceptAndInject(text);
   });
@@ -107,26 +112,39 @@ function registerIpcHandlers(): void {
   ipcMain.handle(IPC_CHANNELS.GET_AUTOCOMPLETE_ENABLED, () => autocompleteEnabled);
 }
 
-export function registerAutocomplete(): void {
-  registerIpcHandlers();
+function autocompleteHandler(): void {
+  const sw = getSuggestionWindow();
+  if (sw && !sw.isDestroyed()) {
+    destroySuggestion();
+    return;
+  }
+  triggerAutocomplete();
+}
 
-  const ok = globalShortcut.register(SHORTCUT, () => {
-    const sw = getSuggestionWindow();
-    if (sw && !sw.isDestroyed()) {
-      destroySuggestion();
-      return;
-    }
-    triggerAutocomplete();
-  });
+async function registerShortcut(): Promise<void> {
+  const shortcuts = await getShortcuts();
+  currentShortcut = shortcuts.autocomplete;
+
+  const ok = globalShortcut.register(currentShortcut, autocompleteHandler);
 
   if (!ok) {
-    console.error(`[autocomplete] Failed to register shortcut ${SHORTCUT}`);
+    console.error(`[autocomplete] Failed to register shortcut ${currentShortcut}`);
   } else {
-    console.log(`[autocomplete] Registered shortcut ${SHORTCUT}`);
+    console.log(`[autocomplete] Registered shortcut ${currentShortcut}`);
   }
 }
 
+export async function registerAutocomplete(): Promise<void> {
+  registerIpcHandlers();
+  await registerShortcut();
+}
+
 export function unregisterAutocomplete(): void {
-  globalShortcut.unregister(SHORTCUT);
+  if (currentShortcut) globalShortcut.unregister(currentShortcut);
   destroySuggestion();
 }
+
+export async function reregisterAutocomplete(): Promise<void> {
+  unregisterAutocomplete();
+  await registerShortcut();
+}

surfsense_desktop/src/modules/platform.ts

@@ -1,16 +1,20 @@
 import { execSync } from 'child_process';
 import { systemPreferences } from 'electron';
 
+const EXEC_OPTS = { windowsHide: true } as const;
+
 export function getFrontmostApp(): string {
   try {
     if (process.platform === 'darwin') {
       return execSync(
-        'osascript -e \'tell application "System Events" to get name of first application process whose frontmost is true\''
+        'osascript -e \'tell application "System Events" to get name of first application process whose frontmost is true\'',
+        EXEC_OPTS,
       ).toString().trim();
     }
     if (process.platform === 'win32') {
       return execSync(
-        'powershell -command "Add-Type \'using System; using System.Runtime.InteropServices; public class W { [DllImport(\\\"user32.dll\\\")] public static extern IntPtr GetForegroundWindow(); }\'; (Get-Process | Where-Object { $_.MainWindowHandle -eq [W]::GetForegroundWindow() }).ProcessName"'
+        'powershell -NoProfile -NonInteractive -command "Add-Type \'using System; using System.Runtime.InteropServices; public class W { [DllImport(\\\"user32.dll\\\")] public static extern IntPtr GetForegroundWindow(); }\'; (Get-Process | Where-Object { $_.MainWindowHandle -eq [W]::GetForegroundWindow() }).ProcessName"',
+        EXEC_OPTS,
       ).toString().trim();
     }
   } catch {
@@ -21,9 +25,23 @@ export function getFrontmostApp(): string {
 
 export function simulatePaste(): void {
   if (process.platform === 'darwin') {
-    execSync('osascript -e \'tell application "System Events" to keystroke "v" using command down\'');
+    execSync('osascript -e \'tell application "System Events" to keystroke "v" using command down\'', EXEC_OPTS);
   } else if (process.platform === 'win32') {
-    execSync('powershell -command "Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.SendKeys]::SendWait(\'^v\')"');
+    execSync('powershell -NoProfile -NonInteractive -command "Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.SendKeys]::SendWait(\'^v\')"', EXEC_OPTS);
+  }
+}
+
+export function simulateCopy(): boolean {
+  try {
+    if (process.platform === 'darwin') {
+      execSync('osascript -e \'tell application "System Events" to keystroke "c" using command down\'', EXEC_OPTS);
+    } else if (process.platform === 'win32') {
+      execSync('powershell -NoProfile -NonInteractive -command "Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.SendKeys]::SendWait(\'^c\')"', EXEC_OPTS);
+    }
+    return true;
+  } catch (err) {
+    console.error('[simulateCopy] Failed:', err);
+    return false;
   }
 }
 
@@ -36,12 +54,14 @@ export function getWindowTitle(): string {
   try {
     if (process.platform === 'darwin') {
       return execSync(
-        'osascript -e \'tell application "System Events" to get title of front window of first application process whose frontmost is true\''
+        'osascript -e \'tell application "System Events" to get title of front window of first application process whose frontmost is true\'',
+        EXEC_OPTS,
       ).toString().trim();
     }
     if (process.platform === 'win32') {
       return execSync(
-        'powershell -command "(Get-Process | Where-Object { $_.MainWindowHandle -eq (Add-Type -MemberDefinition \'[DllImport(\\\"user32.dll\\\")] public static extern IntPtr GetForegroundWindow();\' -Name W -PassThru)::GetForegroundWindow() }).MainWindowTitle"'
+        'powershell -NoProfile -NonInteractive -command "(Get-Process | Where-Object { $_.MainWindowHandle -eq (Add-Type -MemberDefinition \'[DllImport(\\\"user32.dll\\\")] public static extern IntPtr GetForegroundWindow();\' -Name W -PassThru)::GetForegroundWindow() }).MainWindowTitle"',
+        EXEC_OPTS,
       ).toString().trim();
     }
   } catch {

surfsense_desktop/src/modules/quick-ask.ts

@@ -1,10 +1,11 @@
 import { BrowserWindow, clipboard, globalShortcut, ipcMain, screen, shell } from 'electron';
 import path from 'path';
 import { IPC_CHANNELS } from '../ipc/channels';
-import { checkAccessibilityPermission, getFrontmostApp, simulatePaste } from './platform';
+import { checkAccessibilityPermission, getFrontmostApp, simulateCopy, simulatePaste } from './platform';
 import { getServerPort } from './server';
+import { getShortcuts } from './shortcuts';
 
-const SHORTCUT = 'CommandOrControl+Option+S';
+let currentShortcut = '';
 let quickAskWindow: BrowserWindow | null = null;
 let pendingText = '';
 let pendingMode = '';
@@ -77,29 +78,52 @@ function createQuickAskWindow(x: number, y: number): BrowserWindow {
   return quickAskWindow;
 }
 
-export function registerQuickAsk(): void {
-  const ok = globalShortcut.register(SHORTCUT, () => {
-    if (quickAskWindow && !quickAskWindow.isDestroyed()) {
-      destroyQuickAsk();
-      return;
-    }
+function openQuickAsk(text: string): void {
+  pendingText = text;
+  const cursor = screen.getCursorScreenPoint();
+  const pos = clampToScreen(cursor.x, cursor.y, 450, 750);
+  createQuickAskWindow(pos.x, pos.y);
+}
 
-    sourceApp = getFrontmostApp();
-    savedClipboard = clipboard.readText();
+async function quickAskHandler(): Promise<void> {
+  console.log('[quick-ask] Handler triggered');
 
-    const text = savedClipboard.trim();
-    if (!text) return;
-
-    pendingText = text;
-    const cursor = screen.getCursorScreenPoint();
-    const pos = clampToScreen(cursor.x, cursor.y, 450, 750);
-    createQuickAskWindow(pos.x, pos.y);
-  });
-
-  if (!ok) {
-    console.log(`Quick-ask: failed to register ${SHORTCUT}`);
+  if (quickAskWindow && !quickAskWindow.isDestroyed()) {
+    console.log('[quick-ask] Window already open, closing');
+    destroyQuickAsk();
+    return;
   }
 
+  if (!checkAccessibilityPermission()) {
+    console.log('[quick-ask] Accessibility permission denied');
+    return;
+  }
+
+  savedClipboard = clipboard.readText();
+  console.log('[quick-ask] Saved clipboard length:', savedClipboard.length);
+
+  const copyOk = simulateCopy();
+  console.log('[quick-ask] simulateCopy result:', copyOk);
+
+  await new Promise((r) => setTimeout(r, 300));
+
+  const afterCopy = clipboard.readText();
+  const selected = afterCopy.trim();
+  console.log('[quick-ask] Clipboard after copy length:', afterCopy.length, 'changed:', afterCopy !== savedClipboard);
+
+  const text = selected || savedClipboard.trim();
+
+  sourceApp = getFrontmostApp();
+  console.log('[quick-ask] Source app:', sourceApp, '| Opening Quick Ask with', text.length, 'chars', selected ? '(selected)' : text ? '(clipboard fallback)' : '(empty)');
+  openQuickAsk(text);
+}
+
+let ipcRegistered = false;
+
+function registerIpcHandlers(): void {
+  if (ipcRegistered) return;
+  ipcRegistered = true;
+
   ipcMain.handle(IPC_CHANNELS.QUICK_ASK_TEXT, () => {
     const text = pendingText;
     pendingText = '';
@@ -136,6 +160,24 @@ export function registerQuickAsk(): void {
   });
 }
 
-export function unregisterQuickAsk(): void {
-  globalShortcut.unregister(SHORTCUT);
+async function registerShortcut(): Promise<void> {
+  const shortcuts = await getShortcuts();
+  currentShortcut = shortcuts.quickAsk;
+
+  const ok = globalShortcut.register(currentShortcut, () => { quickAskHandler(); });
+  console.log(`[quick-ask] Register ${currentShortcut}: ${ok ? 'OK' : 'FAILED'}`);
+}
+
+export async function registerQuickAsk(): Promise<void> {
+  registerIpcHandlers();
+  await registerShortcut();
+}
+
+export function unregisterQuickAsk(): void {
+  if (currentShortcut) globalShortcut.unregister(currentShortcut);
+}
+
+export async function reregisterQuickAsk(): Promise<void> {
+  unregisterQuickAsk();
+  await registerShortcut();
 }

surfsense_desktop/src/modules/shortcuts.ts

@@ -0,0 +1,42 @@
+export interface ShortcutConfig {
+  quickAsk: string;
+  autocomplete: string;
+}
+
+const DEFAULTS: ShortcutConfig = {
+  quickAsk: 'CommandOrControl+Alt+S',
+  autocomplete: 'CommandOrControl+Shift+Space',
+};
+
+const STORE_KEY = 'shortcuts';
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- lazily imported ESM module; matches folder-watcher.ts pattern
+let store: any = null;
+
+async function getStore() {
+  if (!store) {
+    const { default: Store } = await import('electron-store');
+    store = new Store({
+      name: 'keyboard-shortcuts',
+      defaults: { [STORE_KEY]: DEFAULTS },
+    });
+  }
+  return store;
+}
+
+export async function getShortcuts(): Promise<ShortcutConfig> {
+  const s = await getStore();
+  const stored = s.get(STORE_KEY) as Partial<ShortcutConfig> | undefined;
+  return { ...DEFAULTS, ...stored };
+}
+
+export async function setShortcuts(config: Partial<ShortcutConfig>): Promise<ShortcutConfig> {
+  const s = await getStore();
+  const current = (s.get(STORE_KEY) as ShortcutConfig) ?? DEFAULTS;
+  const merged = { ...current, ...config };
+  s.set(STORE_KEY, merged);
+  return merged;
+}
+
+export function getDefaults(): ShortcutConfig {
+  return { ...DEFAULTS };
+}

surfsense_desktop/src/preload.ts

@@ -73,4 +73,9 @@ contextBridge.exposeInMainWorld('electronAPI', {
   getAuthTokens: () => ipcRenderer.invoke(IPC_CHANNELS.GET_AUTH_TOKENS),
   setAuthTokens: (bearer: string, refresh: string) =>
     ipcRenderer.invoke(IPC_CHANNELS.SET_AUTH_TOKENS, { bearer, refresh }),
+
+  // Keyboard shortcut configuration
+  getShortcuts: () => ipcRenderer.invoke(IPC_CHANNELS.GET_SHORTCUTS),
+  setShortcuts: (config: Record<string, string>) =>
+    ipcRenderer.invoke(IPC_CHANNELS.SET_SHORTCUTS, config),
 });