[eric] overlay: Alt+Space summons a nonactivating slime pill over any app, typed text lands in the composer, Settings-gated off

2026-08-17 18:25:42 +02:00 · 2026-08-06 16:14:44 -07:00
parent 7399076906
commit 1637085b9f
9 changed files with 212 additions and 0 deletions
@@ -1972,6 +1972,18 @@ app.whenReady().then(async () => {
  // (module missing, or macOS without the Accessibility grant). Tiers live in voiceHotkey.js.
  installVoiceHotkey(() => mainWindow);

+  // Quick pill overlay (Alt+Space, Settings-gated, default off): submitted text lands in the main
+  // renderer as a prefilled composer draft through the same seam dictation uses.
+  const { initOverlayPill } = require('./overlayPill');
+  initOverlayPill((text) => {
+    try {
+      if (mainWindow && !mainWindow.isDestroyed()) {
+        mainWindow.show();
+        mainWindow.webContents.send('overlay:submit-text', text);
+      }
+    } catch (_) {}
+  });
+
  // PASSKEY SPIKE (macOS only): turn on the Secure-Enclave/Touch ID WebAuthn authenticator that Electron 42 added. Without this, isUserVerifyingPlatformAuthenticatorAvailable() is hardwired false (why the old reject-shim existed). keychainAccessGroup MUST match the keychain-access-groups entitlement (Y26NUZH4NG.<bundle>.webauthn) or this throws. Windows has no equivalent, so the reject-shim still runs there.
  if (process.platform === 'darwin' && typeof app.configureWebAuthn === 'function') {
    try {
@@ -3287,6 +3299,27 @@ ipcMain.handle('get-webview-preload-path', () => {
  return `file://${path.join(__dirname, 'webview-preload.js')}`;
 });

+// Quick pill overlay: the renderer pushes the Settings toggle here; show is exposed so the
+// renderer (and tests) can summon the pill without the OS-level hotkey.
+ipcMain.handle('overlay:set-enabled', (_e, enabled) => {
+  try {
+    const { setOverlayEnabled } = require('./overlayPill');
+    setOverlayEnabled(Boolean(enabled));
+    return { ok: true };
+  } catch (err) {
+    return { ok: false, error: err && err.message };
+  }
+});
+ipcMain.handle('overlay:show', () => {
+  try {
+    const { showOverlay } = require('./overlayPill');
+    showOverlay();
+    return { ok: true };
+  } catch (err) {
+    return { ok: false, error: err && err.message };
+  }
+});
+
 // Reveal a user-attached composer file in Finder/Explorer. Reveal-only on an existing path:
 // showItemInFolder never opens or executes the file, so the worst misuse is popping a Finder window.
 ipcMain.handle('files:reveal', (event, filePath) => {
@@ -0,0 +1,10 @@
+// The pill page's only powers: hand its text up, ask to be hidden, learn when it was shown.
+'use strict';
+
+const { contextBridge, ipcRenderer } = require('electron');
+
+contextBridge.exposeInMainWorld('overlay', {
+  submit: (text) => ipcRenderer.send('overlay:submit', String(text || '')),
+  dismiss: () => ipcRenderer.send('overlay:dismiss'),
+  onShown: (cb) => { ipcRenderer.on('overlay:shown', () => cb()); },
+});
@@ -0,0 +1,130 @@
+// The quick pill: an Arc/clui-style floating command pill on a global hotkey, with the slime as its
+// idle skin. macOS NSPanel semantics via type:'panel' (nonactivating), so the pill takes KEYBOARD
+// focus while the app the user was in STAYS frontmost; no dock bounce, no space switch. The panel is
+// created hidden at enable time so hotkey-to-visible is a show(), not a window boot.
+
+'use strict';
+
+const path = require('path');
+const { BrowserWindow, globalShortcut, ipcMain, screen } = require('electron');
+
+const OVERLAY_HOTKEY = 'Alt+Space';
+const PANEL_W = 560;
+const PANEL_H = 120;
+
+let p_panel = null;
+let p_enabled = false;
+let p_onSubmit = null;
+
+function p_html() {
+  // Self-contained page: the slime idles beside a bare input. No remote content, no node access.
+  return `<!doctype html><html><head><meta charset="utf-8"><style>
+  html,body{margin:0;background:transparent;overflow:hidden;font-family:-apple-system,BlinkMacSystemFont,sans-serif;-webkit-user-select:none}
+  .pill{display:flex;align-items:center;gap:12px;margin:10px;padding:14px 18px;border-radius:999px;
+    background:rgba(28,25,33,0.92);backdrop-filter:blur(24px);border:1px solid rgba(255,255,255,0.14);
+    box-shadow:0 18px 44px rgba(0,0,0,0.45)}
+  .slime{width:34px;height:30px;position:relative;flex-shrink:0;animation:idle 2.6s ease-in-out infinite;transform-origin:50% 100%}
+  .slime .body{position:absolute;inset:0;background:linear-gradient(180deg,#9ee87c,#5cc94a);border-radius:52% 52% 46% 46%/60% 60% 42% 42%;box-shadow:inset 0 -4px 8px rgba(0,0,0,0.18)}
+  .slime .eye{position:absolute;top:11px;width:5px;height:7px;background:#1c2416;border-radius:50%;animation:blink 4.2s infinite}
+  .slime .eye.l{left:9px}.slime .eye.r{right:9px}
+  @keyframes idle{0%,100%{transform:scaleY(1) scaleX(1)}50%{transform:scaleY(0.92) scaleX(1.05)}}
+  @keyframes blink{0%,92%,100%{transform:scaleY(1)}95%{transform:scaleY(0.1)}}
+  input{flex:1;border:0;outline:0;background:transparent;color:rgba(255,255,255,0.94);font-size:17px}
+  input::placeholder{color:rgba(255,255,255,0.4)}
+  @media (prefers-reduced-motion: reduce){.slime{animation:none}.slime .eye{animation:none}}
+  </style></head><body>
+  <div class="pill"><div class="slime"><div class="body"></div><div class="eye l"></div><div class="eye r"></div></div>
+  <input id="q" placeholder="Ask OpenSwarm anything…" autofocus></div>
+  <script>
+  const q = document.getElementById('q');
+  q.addEventListener('keydown', (e) => {
+    if (e.key === 'Enter' && q.value.trim()) { window.overlay.submit(q.value.trim()); q.value = ''; }
+    if (e.key === 'Escape') { q.value = ''; window.overlay.dismiss(); }
+  });
+  window.overlay.onShown(() => { q.value = ''; q.focus(); });
+  </script></body></html>`;
+}
+
+function p_createPanel() {
+  const panel = new BrowserWindow({
+    width: PANEL_W,
+    height: PANEL_H,
+    show: false,
+    frame: false,
+    transparent: true,
+    resizable: false,
+    movable: true,
+    minimizable: false,
+    maximizable: false,
+    fullscreenable: false,
+    skipTaskbar: true,
+    alwaysOnTop: true,
+    hasShadow: false,
+    // The whole trick: a nonactivating NSPanel takes key WITHOUT activating our app or deactivating theirs.
+    type: 'panel',
+    webPreferences: {
+      preload: path.join(__dirname, 'overlay-preload.js'),
+      contextIsolation: true,
+      nodeIntegration: false,
+      sandbox: true,
+    },
+  });
+  panel.setAlwaysOnTop(true, 'screen-saver');
+  // Re-asserted on every show too: macOS drops this across space changes.
+  panel.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
+  panel.loadURL('data:text/html;charset=utf-8,' + encodeURIComponent(p_html()));
+  panel.on('blur', () => { try { panel.hide(); } catch (_) {} });
+  panel.on('closed', () => { p_panel = null; });
+  return panel;
+}
+
+function showOverlay() {
+  if (!p_enabled) return;
+  if (!p_panel || p_panel.isDestroyed()) p_panel = p_createPanel();
+  const display = screen.getDisplayNearestPoint(screen.getCursorScreenPoint());
+  const { x, y, width } = display.workArea;
+  p_panel.setPosition(Math.round(x + (width - PANEL_W) / 2), Math.round(y + Math.max(80, display.workArea.height * 0.18)));
+  p_panel.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
+  p_panel.show();
+  try { p_panel.webContents.send('overlay:shown'); } catch (_) {}
+  try { p_panel.webContents.focus(); } catch (_) {}
+}
+
+function hideOverlay() {
+  if (p_panel && !p_panel.isDestroyed()) p_panel.hide();
+}
+
+function toggleOverlay() {
+  if (p_panel && !p_panel.isDestroyed() && p_panel.isVisible()) hideOverlay();
+  else showOverlay();
+}
+
+/** Wire the hotkey + IPC once; enable/disable flips registration. onSubmit receives the typed text. */
+function initOverlayPill(onSubmit) {
+  p_onSubmit = onSubmit;
+  ipcMain.on('overlay:submit', (_e, text) => {
+    hideOverlay();
+    try { if (typeof text === 'string' && text.trim() && p_onSubmit) p_onSubmit(text.trim().slice(0, 4000)); } catch (_) {}
+  });
+  ipcMain.on('overlay:dismiss', () => hideOverlay());
+}
+
+function setOverlayEnabled(enabled) {
+  const next = Boolean(enabled);
+  if (next === p_enabled) return;
+  p_enabled = next;
+  if (next) {
+    try {
+      globalShortcut.register(OVERLAY_HOTKEY, toggleOverlay);
+    } catch (err) {
+      console.warn('[overlay] hotkey register failed:', err && err.message);
+    }
+    // Pre-create hidden so the first hotkey is a show(), not a window boot.
+    if (!p_panel || p_panel.isDestroyed()) p_panel = p_createPanel();
+  } else {
+    try { globalShortcut.unregister(OVERLAY_HOTKEY); } catch (_) {}
+    if (p_panel && !p_panel.isDestroyed()) { p_panel.destroy(); p_panel = null; }
+  }
+}
+
+module.exports = { initOverlayPill, setOverlayEnabled, showOverlay, hideOverlay };
@@ -92,6 +92,14 @@ contextBridge.exposeInMainWorld('openswarm', {
  revealBundle: (folderPath) => ipcRenderer.invoke('help:reveal-bundle', folderPath),
  // Reveal a user-attached file in Finder/Explorer (reveal-only; main checks existence).
  revealPath: (filePath) => ipcRenderer.invoke('files:reveal', filePath),
+  // Quick pill overlay: toggle the global hotkey, summon for tests, receive submitted text.
+  setOverlayEnabled: (enabled) => ipcRenderer.invoke('overlay:set-enabled', Boolean(enabled)),
+  showOverlay: () => ipcRenderer.invoke('overlay:show'),
+  onOverlaySubmit: (cb) => {
+    const listener = (_event, text) => cb(String(text || ''));
+    ipcRenderer.on('overlay:submit-text', listener);
+    return () => ipcRenderer.removeListener('overlay:submit-text', listener);
+  },
  // Cmd/Ctrl+1..9: focus the Nth dock tile (0-based index arrives here).
  onDockShortcut: (cb) => {
    const listener = (_event, index) => cb(index);