Voice-to-text dictation app with local (Nvidia Parakeet/Whisper) and cloud models (BYOK). Privacy-first and available cross-platform.
JavaScript aianthropiccross-platformgeminigroqlinuxmacosnvidiaopen-sourceopenaiparakeetspeech-to-texttranscribewhisperwindows
feat(macos): add a Show Dock Icon setting (#428)
dreasan97938ac11216
diff --git a/CLAUDE.md b/CLAUDE.mdindex d7d71607e..f7d38df90 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -61,6 +61,11 @@ OpenWhispr is an Electron-based desktop dictation application that uses whisper.- **database.js**: SQLite operations for transcription history- **debugLogger.js**: Debug logging system with file output- **devServerManager.js**: Vite dev server integration+- **dockManager.js**: Single owner of the macOS Dock icon+ - Applies the launch activation policy and gates every `app.dock.show()`/`hide()` behind the `SHOW_DOCK_ICON` setting, so no caller can resurrect the icon for a menu-bar-only user+ - The icon tracks the control panel: every path that surfaces or hides it (tray, app menu, deep links, `activate`, `ready-to-show`, `hideControlPanelToTray`) reports that state explicitly+ - Never derive that state from the window's `show`/`hide` events: on macOS those are occlusion events, so they also fire when the panel is merely covered by another window, minimized, or on another Space, and the icon flickers as the user switches windows+ - Decision logic lives in `dockPolicy.js` (pure, unit-tested in `test/helpers/dockPolicy.test.js`)- **dragManager.js**: Window dragging functionality- **environment.js**: Environment variable and OpenAI API management- **hotkeyManager.js**: Global hotkey registration and managementdiff --git a/main.js b/main.jsindex 6ebda5d29..286e3e744 100644--- a/main.js+++ b/main.js@@ -270,6 +270,7 @@ const WhisperManager = require("./src/helpers/whisper");const ParakeetManager = require("./src/helpers/parakeet");const DiarizationManager = require("./src/helpers/diarization");const TrayManager = require("./src/helpers/tray");+const dockManager = require("./src/helpers/dockManager");const IPCHandlers = require("./src/helpers/ipcHandlers");const CliBridge = require("./src/helpers/cliBridge");const UpdateManager = require("./src/updater");@@ -526,6 +527,7 @@ app.on("open-url", (event, url) => {if (windowManager && isLiveWindow(windowManager.controlPanelWindow)) {windowManager.controlPanelWindow.show();windowManager.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);}});@@ -541,6 +543,7 @@ function handleInvitationDeepLink(deepLinkUrl) {if (windowManager && isLiveWindow(windowManager.controlPanelWindow)) {windowManager.controlPanelWindow.show();windowManager.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);windowManager.controlPanelWindow.webContents.send("workspace-invitation-token", token);} else if (windowManager) {windowManager.createControlPanelWindow();@@ -657,6 +660,7 @@ async function applySessionTokenAndRefresh(token) {}windowManager.controlPanelWindow.show();windowManager.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);}async function handleOAuthDeepLink(deepLinkUrl) {@@ -683,6 +687,7 @@ function handleUpgradeDeepLink() {);windowManager.controlPanelWindow.show();windowManager.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);}}@@ -833,6 +838,11 @@ async function startApp() {}});+ ipcMain.on("show-dock-icon-changed", (_event, enabled) => {+ environmentManager.saveShowDockIcon(enabled);+ dockManager.setShowDockIcon(enabled);+ });+ipcMain.on("start-minimized-changed", (_event, enabled) => {if (debugLogger) debugLogger.info("Start minimized changed", { enabled });environmentManager.saveStartMinimized(enabled);@@ -843,9 +853,7 @@ async function startApp() {environmentManager.savePanelStartPosition(position);});- if (process.platform === "darwin") {- app.setActivationPolicy("regular");- }+ dockManager.init(environmentManager.getShowDockIcon());// In development, wait for Vite dev server to be readyif (process.env.NODE_ENV === "development") {@@ -1498,6 +1506,7 @@ if (gotSingleInstanceLock) {}windowManager.controlPanelWindow.show();windowManager.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);if (windowManager.controlPanelWindow.webContents.isCrashed()) {windowManager.loadControlPanel();}@@ -1596,15 +1605,12 @@ if (gotSingleInstanceLock) {} else {// Show control panel when dock icon is clicked (most common user action)if (windowManager && isLiveWindow(windowManager.controlPanelWindow)) {- // Ensure dock icon is visible when control panel opens- if (process.platform === "darwin" && app.dock) {- app.dock.show();- }if (windowManager.controlPanelWindow.isMinimized()) {windowManager.controlPanelWindow.restore();}windowManager.controlPanelWindow.show();windowManager.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);} else if (windowManager) {// If control panel doesn't exist, create itwindowManager.createControlPanelWindow();diff --git a/preload.js b/preload.jsindex 7a14650c1..81a6478a5 100644--- a/preload.js+++ b/preload.js@@ -762,6 +762,9 @@ contextBridge.exposeInMainWorld("electronAPI", {// Start minimizednotifyStartMinimizedChanged: (enabled) => ipcRenderer.send("start-minimized-changed", enabled),+ // Dock icon (macOS)+ notifyShowDockIconChanged: (enabled) => ipcRenderer.send("show-dock-icon-changed", enabled),+// Auto-start managementgetAutoStartEnabled: () => ipcRenderer.invoke("get-auto-start-enabled"),setAutoStartEnabled: (enabled) => ipcRenderer.invoke("set-auto-start-enabled", enabled),diff --git a/src/components/SettingsPage.tsx b/src/components/SettingsPage.tsxindex 2400fb582..db2aff55c 100644--- a/src/components/SettingsPage.tsx+++ b/src/components/SettingsPage.tsx@@ -758,6 +758,8 @@ export default function SettingsPage({setFloatingIconAutoHide,startMinimized,setStartMinimized,+ showDockIcon,+ setShowDockIcon,panelStartPosition,setPanelStartPosition,cloudBackupEnabled,@@ -2690,6 +2692,16 @@ export default function SettingsPage({<Toggle checked={startMinimized} onChange={setStartMinimized} /></SettingsRow></SettingsPanelRow>+ {platform === "darwin" && (+ <SettingsPanelRow>+ <SettingsRow+ label={t("settingsPage.general.startup.showDockIcon")}+ description={t("settingsPage.general.startup.showDockIconDescription")}+ >+ <Toggle checked={showDockIcon} onChange={setShowDockIcon} />+ </SettingsRow>+ </SettingsPanelRow>+ )}</SettingsPanel></div>diff --git a/src/helpers/dockManager.js b/src/helpers/dockManager.jsnew file mode 100644index 000000000..6eea648d0--- /dev/null+++ b/src/helpers/dockManager.js@@ -0,0 +1,74 @@+const { app } = require("electron");+const { resolveDockVisibility, resolveActivationPolicy } = require("./dockPolicy");++// Single owner of the macOS Dock icon. Every caller that wants the icon shown+// or hidden goes through here so the "Show Dock Icon" setting can veto it.+//+// The icon tracks the control panel, and callers report that state explicitly.+// The window's own "show"/"hide" events look like the obvious source to derive+// it from, but on macOS they are occlusion events: Electron only emits them+// from windowDidChangeOcclusionState, so they also fire when the panel is+// merely covered by another window, minimized, or on another Space. Deriving+// from them makes the icon flicker as the user switches windows.+class DockManager {+ constructor() {+ this._showDockIcon = true;+ this._controlPanelVisible = false;+ }++ // Applies the launch activation policy. Called once at startup, before any+ // window exists, so there is no visibility to apply yet.+ init(showDockIcon) {+ this._showDockIcon = showDockIcon !== false;+ this._controlPanelVisible = false;+ this._applyActivationPolicy();+ }++ // Reacts to the user toggling the setting. Turning it off drops the icon+ // immediately; turning it back on restores it if the control panel is open,+ // which it must be for the toggle to have been clicked.+ setShowDockIcon(enabled) {+ this._showDockIcon = enabled !== false;+ // "regular" reveals the icon on its own, so the policy has to be applied+ // before the visibility check that may hide it again.+ this._applyActivationPolicy();+ this._applyVisibility();+ }++ // Reported by every path that surfaces or hides the control panel.+ setControlPanelVisible(visible) {+ this._controlPanelVisible = !!visible;+ this._applyVisibility();+ }++ _applyActivationPolicy() {+ const policy = resolveActivationPolicy({+ platform: process.platform,+ showDockIcon: this._showDockIcon,+ });+ if (policy) {+ app.setActivationPolicy(policy);+ }+ }++ _applyVisibility() {+ const visible = resolveDockVisibility({+ platform: process.platform,+ showDockIcon: this._showDockIcon,+ controlPanelVisible: this._controlPanelVisible,+ });+ if (visible === null || !app.dock) return;++ if (visible) {+ app.dock.show();+ } else {+ // Electron swallows dock.hide() within 1s of a dock.show() (see DockHide+ // in browser_mac.mm), so closing the control panel right after opening it+ // leaves the icon up until the next hide. Working around that throttle+ // risks the macOS bug it exists to prevent: duplicate Dock icons.+ app.dock.hide();+ }+ }+}++module.exports = new DockManager();diff --git a/src/helpers/dockPolicy.js b/src/helpers/dockPolicy.jsnew file mode 100644index 000000000..95a567804--- /dev/null+++ b/src/helpers/dockPolicy.js@@ -0,0 +1,25 @@+// macOS Dock icon policy.+//+// The Dock icon follows the control panel: it appears when the control panel+// opens and goes away when the panel is closed to the tray. The user-facing+// "Show Dock Icon" setting overrides that — with it off, OpenWhispr stays a+// menu-bar-only app and no caller may bring the icon back.+//+// Hiding the dictation panel must never touch the Dock. The panel is hidden+// outright rather than minimized into the Dock, so there is nothing to restore+// from there.++// Whether the Dock icon should be visible right now.+// Returns null off macOS, where there is no Dock to act on.+export function resolveDockVisibility({ platform, showDockIcon, controlPanelVisible }) {+ if (platform !== "darwin") return null;+ if (!showDockIcon) return false;+ return !!controlPanelVisible;+}++// The launch activation policy. "accessory" is the runtime equivalent of+// LSUIElement: no Dock icon and no menu bar.+export function resolveActivationPolicy({ platform, showDockIcon }) {+ if (platform !== "darwin") return null;+ return showDockIcon ? "regular" : "accessory";+}diff --git a/src/helpers/environment.js b/src/helpers/environment.jsindex 5fba38f5b..c6fd8cc69 100644--- a/src/helpers/environment.js+++ b/src/helpers/environment.js@@ -43,6 +43,7 @@ const PERSISTED_KEYS = ["FLOATING_ICON_AUTO_HIDE","PANEL_START_POSITION","START_MINIMIZED",+ "SHOW_DOCK_ICON","UI_LANGUAGE","WHISPER_CUDA_ENABLED","WHISPER_VULKAN_ENABLED",@@ -464,6 +465,17 @@ class EnvironmentManager {return result;}+ // macOS only. Defaults to true so existing installs keep their Dock icon.+ getShowDockIcon() {+ return this._getKey("SHOW_DOCK_ICON") !== "false";+ }++ saveShowDockIcon(enabled) {+ const result = this._saveKey("SHOW_DOCK_ICON", String(enabled));+ this.saveAllKeysToEnvFile().catch(() => {});+ return result;+ }+getPanelStartPosition() {const v = this._getKey("PANEL_START_POSITION");if (v === "bottom-right" || v === "center" || v === "bottom-left") return v;diff --git a/src/helpers/tray.js b/src/helpers/tray.jsindex b80b9eec3..770112fe6 100644--- a/src/helpers/tray.js+++ b/src/helpers/tray.js@@ -2,6 +2,7 @@ const { Tray, Menu, nativeImage, app } = require("electron");const path = require("path");const fs = require("fs");const debugLogger = require("./debugLogger");+const dockManager = require("./dockManager");const { i18nMain } = require("./i18nMain");class TrayManager {@@ -68,10 +69,6 @@ class TrayManager {this.attachControlPanelListeners(this.controlPanelWindow);if (this.controlPanelWindow && !this.controlPanelWindow.isDestroyed()) {- // Show dock icon on macOS when control panel opens- if (process.platform === "darwin" && app.dock) {- app.dock.show();- }if (this.controlPanelWindow.isMinimized()) {this.controlPanelWindow.restore();}@@ -79,6 +76,7 @@ class TrayManager {this.controlPanelWindow.show();}this.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);if (this.controlPanelWindow.webContents.isCrashed()) {this.controlPanelWindow.webContents.reload();}@@ -96,6 +94,7 @@ class TrayManager {if (this.controlPanelWindow && !this.controlPanelWindow.isDestroyed()) {this.controlPanelWindow.show();this.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);}return;}diff --git a/src/helpers/windowManager.js b/src/helpers/windowManager.jsindex d1c869ead..ab70f1bd8 100644--- a/src/helpers/windowManager.js+++ b/src/helpers/windowManager.js@@ -5,6 +5,7 @@ const { isGlobeLikeHotkey } = HotkeyManager;const DragManager = require("./dragManager");const MenuManager = require("./menuManager");const DevServerManager = require("./devServerManager");+const dockManager = require("./dockManager");const { i18nMain } = require("./i18nMain");const { DEV_SERVER_PORT } = DevServerManager;const {@@ -615,6 +616,7 @@ class WindowManager {this.controlPanelWindow.show();}this.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);return;}@@ -655,6 +657,7 @@ class WindowManager {if (!this.controlPanelWindow.isVisible()) {this.controlPanelWindow.show();this.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);}}, 10000);@@ -664,11 +667,9 @@ class WindowManager {this.controlPanelWindow.once("ready-to-show", () => {clearVisibilityTimer();- if (process.platform === "darwin" && app.dock) {- app.dock.show();- }this.controlPanelWindow.show();this.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);});this.controlPanelWindow.on("close", (event) => {@@ -681,6 +682,7 @@ class WindowManager {this.controlPanelWindow.on("closed", () => {clearVisibilityTimer();this.controlPanelWindow = null;+ dockManager.setControlPanelVisible(false);});MenuManager.setupControlPanelMenu(this.controlPanelWindow, () => this.openSettings());@@ -703,6 +705,7 @@ class WindowManager {if (!this.controlPanelWindow.isVisible()) {this.controlPanelWindow.show();this.controlPanelWindow.focus();+ dockManager.setControlPanelVisible(true);}});@@ -1088,10 +1091,7 @@ class WindowManager {}this.controlPanelWindow.hide();-- if (process.platform === "darwin" && app.dock) {- app.dock.hide();- }+ dockManager.setControlPanelVisible(false);}hideDictationPanel() {diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.tsindex 19530a65c..c4ba64f08 100644--- a/src/hooks/useSettings.ts+++ b/src/hooks/useSettings.ts@@ -321,6 +321,8 @@ function useSettingsInternal() {setFloatingIconAutoHide: store.setFloatingIconAutoHide,startMinimized: store.startMinimized,setStartMinimized: store.setStartMinimized,+ showDockIcon: store.showDockIcon,+ setShowDockIcon: store.setShowDockIcon,panelStartPosition: store.panelStartPosition,setPanelStartPosition: store.setPanelStartPosition,preferBuiltInMic: store.preferBuiltInMic,diff --git a/src/locales/de/translation.json b/src/locales/de/translation.jsonindex 75df050f1..a4b04bd0a 100644--- a/src/locales/de/translation.json+++ b/src/locales/de/translation.json@@ -1467,7 +1467,9 @@"title": "Autostart","description": "Steuern Sie das Verhalten von OpenWhispr beim Start","startMinimized": "Minimiert starten",- "startMinimizedDescription": "Starten, ohne das Einstellungsfenster anzuzeigen"+ "startMinimizedDescription": "Starten, ohne das Einstellungsfenster anzuzeigen",+ "showDockIcon": "Dock-Symbol anzeigen",+ "showDockIconDescription": "OpenWhispr im Dock behalten. Deaktivieren, um nur in der Menüleiste zu laufen."},"waylandPaste": {"title": "Wayland-Einfügen einrichten",diff --git a/src/locales/en/translation.json b/src/locales/en/translation.jsonindex 471b324be..1d804ab31 100644--- a/src/locales/en/translation.json+++ b/src/locales/en/translation.json@@ -1640,7 +1640,9 @@"title": "Startup","description": "Control how OpenWhispr behaves when it launches","startMinimized": "Start minimized",- "startMinimizedDescription": "Launch without showing the control panel window"+ "startMinimizedDescription": "Launch without showing the control panel window",+ "showDockIcon": "Show Dock icon",+ "showDockIconDescription": "Keep OpenWhispr in the Dock. Turn off to run from the menu bar only."},"waylandPaste": {"title": "Wayland Paste Setup",diff --git a/src/locales/es/translation.json b/src/locales/es/translation.jsonindex 92d5d61f3..b1e93efc7 100644--- a/src/locales/es/translation.json+++ b/src/locales/es/translation.json@@ -1515,7 +1515,9 @@"title": "Inicio","description": "Controla el comportamiento de OpenWhispr al iniciar","startMinimized": "Iniciar minimizado",- "startMinimizedDescription": "Iniciar sin mostrar la ventana del panel de control"+ "startMinimizedDescription": "Iniciar sin mostrar la ventana del panel de control",+ "showDockIcon": "Mostrar icono en el Dock",+ "showDockIconDescription": "Mantener OpenWhispr en el Dock. Desactívalo para usarlo solo desde la barra de menús."},"waylandPaste": {"title": "Configuración de pegado en Wayland",diff --git a/src/locales/fr/translation.json b/src/locales/fr/translation.jsonindex 155c95777..52cf255c8 100644--- a/src/locales/fr/translation.json+++ b/src/locales/fr/translation.json@@ -1515,7 +1515,9 @@"title": "Démarrage","description": "Contrôlez le comportement d'OpenWhispr au lancement","startMinimized": "Démarrer réduit",- "startMinimizedDescription": "Lancer sans afficher la fenêtre du panneau de contrôle"+ "startMinimizedDescription": "Lancer sans afficher la fenêtre du panneau de contrôle",+ "showDockIcon": "Afficher l'icône dans le Dock",+ "showDockIconDescription": "Garder OpenWhispr dans le Dock. Désactivez pour l'utiliser uniquement depuis la barre des menus."},"waylandPaste": {"title": "Configuration du collage Wayland",diff --git a/src/locales/it/translation.json b/src/locales/it/translation.jsonindex d4555951a..059fdef52 100644--- a/src/locales/it/translation.json+++ b/src/locales/it/translation.json@@ -1467,7 +1467,9 @@"title": "Avvio","description": "Controlla il comportamento di OpenWhispr all'avvio","startMinimized": "Avvia ridotto a icona",- "startMinimizedDescription": "Avvia senza mostrare la finestra del pannello di controllo"+ "startMinimizedDescription": "Avvia senza mostrare la finestra del pannello di controllo",+ "showDockIcon": "Mostra icona nel Dock",+ "showDockIconDescription": "Mantieni OpenWhispr nel Dock. Disattiva per usarlo solo dalla barra dei menu."},"waylandPaste": {"title": "Configurazione incolla su Wayland",diff --git a/src/locales/ja/translation.json b/src/locales/ja/translation.jsonindex 8795482f1..2e538a981 100644--- a/src/locales/ja/translation.json+++ b/src/locales/ja/translation.json@@ -1467,7 +1467,9 @@"title": "起動設定","description": "OpenWhispr の起動時の動作を制御","startMinimized": "最小化で起動",- "startMinimizedDescription": "コントロールパネルウィンドウを表示せずに起動"+ "startMinimizedDescription": "コントロールパネルウィンドウを表示せずに起動",+ "showDockIcon": "Dock アイコンを表示",+ "showDockIconDescription": "OpenWhispr を Dock に表示します。オフにするとメニューバーのみで動作します。"},"waylandPaste": {"title": "Wayland 貼り付け設定",diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.jsonindex 6e2f352b9..b444c6999 100644--- a/src/locales/pt/translation.json+++ b/src/locales/pt/translation.json@@ -1446,7 +1446,9 @@"title": "Inicialização","description": "Controle o comportamento do OpenWhispr ao iniciar","startMinimized": "Iniciar minimizado",- "startMinimizedDescription": "Iniciar sem mostrar a janela do painel de controle"+ "startMinimizedDescription": "Iniciar sem mostrar a janela do painel de controle",+ "showDockIcon": "Mostrar ícone no Dock",+ "showDockIconDescription": "Manter o OpenWhispr no Dock. Desative para usar apenas na barra de menus."},"waylandPaste": {"title": "Configuração de colagem no Wayland",diff --git a/src/locales/ru/translation.json b/src/locales/ru/translation.jsonindex 8f2dbb82c..afad687ca 100644--- a/src/locales/ru/translation.json+++ b/src/locales/ru/translation.json@@ -1467,7 +1467,9 @@"title": "Автозапуск","description": "Управляйте поведением OpenWhispr при запуске","startMinimized": "Запуск в свёрнутом виде",- "startMinimizedDescription": "Запускать без отображения окна панели управления"+ "startMinimizedDescription": "Запускать без отображения окна панели управления",+ "showDockIcon": "Показывать значок в Dock",+ "showDockIconDescription": "Оставлять OpenWhispr в Dock. Отключите, чтобы работать только из строки меню."},"waylandPaste": {"title": "Настройка вставки в Wayland",diff --git a/src/locales/zh-CN/translation.json b/src/locales/zh-CN/translation.jsonindex 167fee06f..a30cdb658 100644--- a/src/locales/zh-CN/translation.json+++ b/src/locales/zh-CN/translation.json@@ -1462,7 +1462,9 @@"title": "启动","description": "控制 OpenWhispr 启动时的行为","startMinimized": "启动时最小化",- "startMinimizedDescription": "启动时不显示控制面板窗口"+ "startMinimizedDescription": "启动时不显示控制面板窗口",+ "showDockIcon": "显示程序坞图标",+ "showDockIconDescription": "在程序坞中保留 OpenWhispr。关闭后仅在菜单栏中运行。"},"waylandPaste": {"title": "Wayland 粘贴设置",diff --git a/src/locales/zh-TW/translation.json b/src/locales/zh-TW/translation.jsonindex 9bad9bdf1..56ffc4b34 100644--- a/src/locales/zh-TW/translation.json+++ b/src/locales/zh-TW/translation.json@@ -1462,7 +1462,9 @@"title": "啟動","description": "控制 OpenWhispr 啟動時的行為","startMinimized": "啟動時最小化",- "startMinimizedDescription": "啟動時不顯示控制面板視窗"+ "startMinimizedDescription": "啟動時不顯示控制面板視窗",+ "showDockIcon": "顯示 Dock 圖示",+ "showDockIconDescription": "在 Dock 中保留 OpenWhispr。關閉後僅在選單列中執行。"},"waylandPaste": {"title": "Wayland 貼上設定",diff --git a/src/stores/settingsStore.ts b/src/stores/settingsStore.tsindex f238d114a..c7a98d94b 100644--- a/src/stores/settingsStore.ts+++ b/src/stores/settingsStore.ts@@ -121,6 +121,7 @@ const BOOLEAN_SETTINGS = new Set(["pauseMediaOnDictation","floatingIconAutoHide","startMinimized",+ "showDockIcon","meetingProcessDetection","speakerDiarizationEnabled","dictationSileroEnabled",@@ -409,6 +410,7 @@ export interface SettingsStatepauseMediaOnDictation: boolean;floatingIconAutoHide: boolean;startMinimized: boolean;+ showDockIcon: boolean;gcalAccounts: GoogleCalendarAccount[];gcalConnected: boolean;gcalEmail: string;@@ -635,6 +637,7 @@ export interface SettingsStatesetPauseMediaOnDictation: (value: boolean) => void;setFloatingIconAutoHide: (enabled: boolean) => void;setStartMinimized: (enabled: boolean) => void;+ setShowDockIcon: (enabled: boolean) => void;setGcalAccounts: (accounts: GoogleCalendarAccount[]) => void;setNotificationsEnabled: (value: boolean) => void;setNotifyMeetingDetection: (value: boolean) => void;@@ -976,6 +979,7 @@ export const useSettingsStore = create<SettingsState>()((set, get) => ({pauseMediaOnDictation: readBoolean("pauseMediaOnDictation", false),floatingIconAutoHide: readBoolean("floatingIconAutoHide", false),startMinimized: readBoolean("startMinimized", false),+ showDockIcon: readBoolean("showDockIcon", true),notificationsEnabled: readBoolean("notificationsEnabled", true),notifyMeetingDetection: readBoolean("notifyMeetingDetection", true),notifyCalendarReminders: readBoolean("notifyCalendarReminders", true),@@ -1522,6 +1526,15 @@ export const useSettingsStore = create<SettingsState>()((set, get) => ({}},+ setShowDockIcon: (enabled: boolean) => {+ if (get().showDockIcon === enabled) return;+ if (isBrowser) localStorage.setItem("showDockIcon", String(enabled));+ set({ showDockIcon: enabled });+ if (isBrowser) {+ window.electronAPI?.notifyShowDockIconChanged?.(enabled);+ }+ },+setGcalAccounts: (accounts: GoogleCalendarAccount[]) => {if (isBrowser) localStorage.setItem("gcalAccounts", JSON.stringify(accounts));useSettingsStore.setState({diff --git a/src/types/electron.ts b/src/types/electron.tsindex b8803c57c..043d8ee46 100644--- a/src/types/electron.ts+++ b/src/types/electron.ts@@ -1210,6 +1210,7 @@ declare global {notifyFloatingIconAutoHideChanged?: (enabled: boolean) => void;onFloatingIconAutoHideChanged?: (callback: (enabled: boolean) => void) => () => void;notifyStartMinimizedChanged?: (enabled: boolean) => void;+ notifyShowDockIconChanged?: (enabled: boolean) => void;notifyPanelStartPositionChanged?: (position: string) => void;// Auto-start at logindiff --git a/test/helpers/dockPolicy.test.js b/test/helpers/dockPolicy.test.jsnew file mode 100644index 000000000..42619f7c6--- /dev/null+++ b/test/helpers/dockPolicy.test.js@@ -0,0 +1,75 @@+const test = require("node:test");+const assert = require("node:assert/strict");++const load = () => import("../../src/helpers/dockPolicy.js");++test("the Dock icon follows the control panel when the setting is on", async () => {+ const { resolveDockVisibility } = await load();++ assert.equal(+ resolveDockVisibility({ platform: "darwin", showDockIcon: true, controlPanelVisible: true }),+ true+ );+ assert.equal(+ resolveDockVisibility({ platform: "darwin", showDockIcon: true, controlPanelVisible: false }),+ false+ );+});++test("the setting overrides an open control panel", async () => {+ const { resolveDockVisibility } = await load();++ // Opening the control panel from the tray or clicking the Dock icon would+ // normally surface the icon; with the setting off the app stays menu-bar-only.+ assert.equal(+ resolveDockVisibility({ platform: "darwin", showDockIcon: false, controlPanelVisible: true }),+ false+ );+});++test("re-enabling the setting with the control panel open restores the icon", async () => {+ const { resolveDockVisibility } = await load();++ // The toggle lives in the control panel, so the panel is open whenever the+ // setting can be switched back on and the icon must come back. This holds+ // only as long as every path that surfaces the panel reports it, including+ // the one that reuses an already-created window.+ assert.equal(+ resolveDockVisibility({ platform: "darwin", showDockIcon: true, controlPanelVisible: true }),+ true+ );+});++test("hiding the dictation panel cannot resurrect the Dock icon", async () => {+ const { resolveDockVisibility } = await load();++ // Regression guard for #428: the auto-hide-when-idle cycle ended every+ // dictation with an app.dock.show(), a leftover from when the macOS branch+ // minimized the panel into the Dock instead of hiding it. The dictation panel+ // is not the control panel, so it cannot affect the icon either way.+ const dockHiddenByClosingControlPanel = {+ platform: "darwin",+ showDockIcon: true,+ controlPanelVisible: false,+ };+ assert.equal(resolveDockVisibility(dockHiddenByClosingControlPanel), false);+});++test("there is no Dock to act on outside macOS", async () => {+ const { resolveDockVisibility, resolveActivationPolicy } = await load();++ for (const platform of ["win32", "linux"]) {+ assert.equal(+ resolveDockVisibility({ platform, showDockIcon: true, controlPanelVisible: true }),+ null+ );+ assert.equal(resolveActivationPolicy({ platform, showDockIcon: true }), null);+ }+});++test("activation policy mirrors the setting", async () => {+ const { resolveActivationPolicy } = await load();++ assert.equal(resolveActivationPolicy({ platform: "darwin", showDockIcon: true }), "regular");+ assert.equal(resolveActivationPolicy({ platform: "darwin", showDockIcon: false }), "accessory");+});