fix: address review — banner timeout, dock await, startup timing, shortcut resume

- Clear banner timeout before scheduling new one (cubic P2)
- Await app.dock.show() (cubic P2)
- Delay showSwitcherWindow to after bootstrap (CodeRabbit)
- Resume paused shortcut when switching settings tabs (CodeRabbit)
- Use actual shortcut key in mode switch banner (CodeRabbit)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: grimmerk

src/main.ts

@@ -1081,9 +1081,10 @@ const trayToggleEvtHandler = async () => {
   }
 
   switcherWindow = createSwitcherWindow();
-  // Normal mode: show window immediately on startup
+  // Normal mode: show window after bootstrap (server must be ready for API calls)
   if (appMode === 'normal') {
-    showSwitcherWindow();
+    // Delay show to ensure bootstrap() has completed (runs earlier in this block)
+    setTimeout(() => showSwitcherWindow(), 100);
   }
   if (isDebug) {
     console.log('when ready');
@@ -1973,7 +1974,7 @@ ipcMain.on('set-app-mode', async (_event, mode: string) => {
   if (newMode === 'menubar') {
     app.dock.hide();
   } else {
-    app.dock.show();
+    await app.dock.show();
   }
   // Notify renderer to update drag region
   const window = getSwitcherWindow();

src/popup.tsx

@@ -327,7 +327,15 @@ const PopupDefaultExample = ({
             {(['general', 'sessions', 'shortcuts'] as const).map((tab) => (
               <button
                 key={tab}
-                onClick={() => setSettingsTab(tab)}
+                onClick={() => {
+                  // Resume any paused shortcut when switching away from Shortcuts tab
+                  if (editingShortcut) {
+                    window.electronAPI.resumeShortcut(editingShortcut);
+                    setEditingShortcut(null);
+                    setShortcutError('');
+                  }
+                  setSettingsTab(tab);
+                }}
                 style={{
                   padding: '6px 12px',
                   fontSize: '12px',

src/switcher-ui.tsx

@@ -363,6 +363,7 @@ function SwitcherApp() {
   const [currentAppMode, setCurrentAppMode] = useState('menubar');
   const [modeBanner, setModeBanner] = useState<string | null>(null);
   const [quickSwitcherShortcut, setQuickSwitcherShortcut] = useState('');
+  const bannerTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   const updateWorkingPathUIAndList = async (path: string) => {
     setWorkingFolderPath(path);
@@ -674,40 +675,44 @@ function SwitcherApp() {
     // Load shortcut for display
     window.electronAPI.getShortcuts().then((s: any) => {
       if (s?.quickSwitcher) {
-        // Convert Electron accelerator to display format
         const display = s.quickSwitcher
           .replace('Command', 'Cmd')
           .replace('Control', 'Ctrl')
           .replace(/\+/g, '+');
         setQuickSwitcherShortcut(display);
+        shortcutDisplay = display;
       }
     });
 
+    const showBanner = (msg: string, durationMs = 5000) => {
+      if (bannerTimeoutRef.current) clearTimeout(bannerTimeoutRef.current);
+      setModeBanner(msg);
+      bannerTimeoutRef.current = setTimeout(() => setModeBanner(null), durationMs);
+    };
+
     // Listen for app mode changes to enable/disable drag
+    let shortcutDisplay = ''; // will be set by getShortcuts
     window.electronAPI.getAppMode().then((mode: string) => {
       const m = mode || 'normal';
       setCurrentAppMode(m);
-      // Show banner on first launch for new users
       if (m === 'normal') {
-        setModeBanner('Normal App mode — drag to reposition. Switch to Menu Bar mode in Settings.');
-        setTimeout(() => setModeBanner(null), 6000);
+        showBanner('Normal App mode — drag to reposition. Switch to Menu Bar mode in Settings.', 6000);
       }
     });
     window.electronAPI.onShortcutsUpdated((_event: any, s: any) => {
       if (s?.quickSwitcher) {
-        const display = s.quickSwitcher.replace('Command', 'Cmd').replace('Control', 'Ctrl').replace(/\+/g, '+');
-        setQuickSwitcherShortcut(display);
+        shortcutDisplay = s.quickSwitcher.replace('Command', 'Cmd').replace('Control', 'Ctrl').replace(/\+/g, '+');
+        setQuickSwitcherShortcut(shortcutDisplay);
       }
     });
     window.electronAPI.onAppModeChanged((_event: any, mode: string) => {
       setCurrentAppMode(mode);
-      // Show banner on mode change
+      const key = shortcutDisplay || 'Cmd+Ctrl+R';
       if (mode === 'normal') {
-        setModeBanner('Switched to Normal App mode — window stays visible and is draggable.');
+        showBanner('Switched to Normal App mode — window stays visible and is draggable.');
       } else {
-        setModeBanner('Switched to Menu Bar mode — window auto-hides. Use Cmd+Ctrl+R to toggle.');
+        showBanner(`Switched to Menu Bar mode — window auto-hides. Use ${key} to toggle.`);
       }
-      setTimeout(() => setModeBanner(null), 5000);
     });
 
     window.electronAPI.onCheckTerminalAndHide(() => {