Keyboard short cuts by DOsinga · Pull Request #6711 · block/goose

DOsinga · 2026-01-26T14:45:57Z

Summary

Collects all our keyboard short cuts and makes them configurable:

Copilot

Pull request overview

This PR introduces configurable keyboard shortcuts for the goose desktop application, allowing users to customize global and application-level shortcuts through a new settings interface.

Changes:

Added KeyboardShortcuts interface and migration logic from deprecated globalShortcut field to new keyboardShortcuts structure
Refactored hardcoded shortcuts in menu items and global shortcut registration to use values from settings
Added new "Keyboard" tab in settings UI with a dedicated keyboard shortcuts configuration section

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 5 comments.

File	Description
ui/desktop/src/utils/settings.ts	Adds KeyboardShortcuts interface, migration logic, and getKeyboardShortcuts function to handle backward compatibility
ui/desktop/src/main.ts	Refactors global shortcut registration into registerGlobalShortcuts function, updates menu items to use configurable shortcuts, and modifies save-settings handler to re-register shortcuts on change
ui/desktop/src/components/settings/SettingsView.tsx	Adds new Keyboard tab with KeyboardShortcutsSection component

Copilot · 2026-01-26T14:50:23Z

ui/desktop/src/utils/settings.ts

 import { app } from 'electron';
 import fs from 'fs';
 import path from 'path';
+import { defaultKeyboardShortcuts } from './keyboardShortcutDefaults';


This import references a file that is not included in the PR. The file keyboardShortcutDefaults.ts needs to be added to define the defaultKeyboardShortcuts constant, otherwise this code will fail at runtime with a module not found error.

Copilot · 2026-01-26T14:50:23Z

ui/desktop/src/components/settings/SettingsView.tsx

+import KeyboardShortcutsSection from './keyboard/KeyboardShortcutsSection';
 import { CONFIGURATION_ENABLED } from '../../updates';
 import { trackSettingsTabViewed } from '../../utils/analytics';



This import references a component that is not included in the PR. The file keyboard/KeyboardShortcutsSection.tsx needs to be added, otherwise this code will fail at runtime with a module not found error.

Suggested change

import KeyboardShortcutsSection from './keyboard/KeyboardShortcutsSection';

import { CONFIGURATION_ENABLED } from '../../updates';

import { trackSettingsTabViewed } from '../../utils/analytics';

import { CONFIGURATION_ENABLED } from '../../updates';

import { trackSettingsTabViewed } from '../../utils/analytics';

function KeyboardShortcutsSection() {

return (

<div>

Keyboard shortcuts settings are not available in this build.

</div>

);

}

Copilot · 2026-01-26T14:50:24Z

ui/desktop/src/utils/settings.ts

+    return {
+      ...defaultKeyboardShortcuts,
+      focusWindow: settings.globalShortcut,
+      quickLauncher: settings.globalShortcut
+        ? settings.globalShortcut.replace(/\+G$/i, '+Shift+G')
+        : null,
+    };


The migration logic attempts to preserve both focusWindow and quickLauncher shortcuts from the old globalShortcut field. However, it only migrates quickLauncher if globalShortcut is truthy, but sets focusWindow regardless. This means if globalShortcut is null or empty string, focusWindow will be set to null but quickLauncher won't be set at all (defaultKeyboardShortcuts will be used instead). This inconsistency could be confusing. Consider setting quickLauncher explicitly in both cases.

Copilot · 2026-01-26T14:50:24Z

ui/desktop/src/main.ts

+    return { success: true, shortcutsChanged };
  } catch (error) {
    console.error('Error saving settings:', error);
-    return false;
+    return { success: false, shortcutsChanged: false };


The return type has changed from Promise to Promise<{success: boolean, shortcutsChanged: boolean}>, but the TypeScript type definition in preload.ts (line 95) still declares it as returning Promise. This creates a type mismatch that will cause TypeScript errors and runtime issues for code that relies on the type definition.

Copilot · 2026-01-26T14:50:24Z

ui/desktop/src/main.ts

+    if (shortcuts.newChat) {
+      fileMenu.submenu.insert(
+        0,
+        new MenuItem({
+          label: 'New Chat',
+          accelerator: shortcuts.newChat,
+          click() {
+            const focusedWindow = BrowserWindow.getFocusedWindow();
+            if (focusedWindow) focusedWindow.webContents.send('new-chat');
+          },
+        })
+      );
+    }

-    fileMenu.submenu.insert(
-      1,
-      new MenuItem({
-        label: 'New Chat Window',
-        accelerator: process.platform === 'darwin' ? 'Cmd+N' : 'Ctrl+N',
-        click() {
-          ipcMain.emit('create-chat-window');
-        },
-      })
-    );
+    if (shortcuts.newChatWindow) {
+      fileMenu.submenu.insert(
+        1,
+        new MenuItem({
+          label: 'New Chat Window',
+          accelerator: shortcuts.newChatWindow,
+          click() {
+            ipcMain.emit('create-chat-window');
+          },
+        })
+      );
+    }

-    fileMenu.submenu.insert(
-      2,
-      new MenuItem({
-        label: 'Open Directory...',
-        accelerator: 'CmdOrCtrl+O',
-        click: () => openDirectoryDialog(),
-      })
-    );
+    if (shortcuts.openDirectory) {
+      fileMenu.submenu.insert(
+        2,
+        new MenuItem({
+          label: 'Open Directory...',
+          accelerator: shortcuts.openDirectory,
+          click: () => openDirectoryDialog(),
+        })
+      );
+    }


The menu insertion logic uses fixed indices (0, 1, 2) but conditionally inserts items. If newChat is disabled (null), the newChatWindow item will be inserted at index 1 which is the wrong position. Same issue with openDirectory at index 2. These indices should be adjusted dynamically based on how many items were actually inserted before them, or use a different approach like appending items or using a counter variable.

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Copilot · 2026-01-26T15:17:19Z

ui/desktop/src/components/settings/keyboard/KeyboardShortcutsSection.tsx

+    const newShortcuts = {
+      ...shortcuts,
+      [key]: enabled ? defaultValue : null,
+    };
+


When toggling a shortcut back on, this restores the default shortcut value without checking if it conflicts with another currently active shortcut. If a user disabled shortcut A and assigned its value to shortcut B, then re-enabled shortcut A, both shortcuts would have the same value. Consider checking for conflicts and either clearing the conflicting shortcut or showing a warning to the user.

Suggested change

const newShortcuts = {

...shortcuts,

[key]: enabled ? defaultValue : null,

};

let newShortcuts: KeyboardShortcuts;

if (!enabled) {

// Disabling a shortcut: simply clear its value.

newShortcuts = {

...shortcuts,

[key]: null,

};

} else {

// Enabling a shortcut: restore its default value, but clear any other shortcut

// that is currently using the same value to avoid conflicts.

const updatedShortcuts: KeyboardShortcuts = {

...shortcuts,

};

if (defaultValue) {

(Object.keys(updatedShortcuts) as (keyof KeyboardShortcuts)[]).forEach((otherKey) => {

if (otherKey !== key && updatedShortcuts[otherKey] === defaultValue) {

updatedShortcuts[otherKey] = null;

}

});

}

updatedShortcuts[key] = defaultValue;

newShortcuts = updatedShortcuts;

}

Copilot · 2026-01-26T15:17:19Z

ui/desktop/src/components/settings/keyboard/KeyboardShortcutsSection.tsx

+  const formatShortcut = (shortcut: string) => {
+    const isMac = window.electron.platform === 'darwin';
+    return shortcut
+      .replace('CommandOrControl', isMac ? 'Cmd' : 'Ctrl')
+      .replace('Command', 'Cmd')
+      .replace('Control', 'Ctrl');
+  };


The shortcut formatting logic is duplicated in multiple places with slightly different implementations: within this file at lines 165-173 and 244-250, as well as in ShortcutRecorder.tsx at lines 106-112 and 150-158. Consider extracting this into a shared utility function to ensure consistent formatting and make maintenance easier.

Copilot

Pull request overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated 4 comments.

Copilot · 2026-01-26T15:42:04Z

ui/desktop/src/main.ts

+        new MenuItem({
+          label: 'Focus Goose Window',
+          accelerator: shortcuts.focusWindow,
+          click() {


The separator is always inserted at line 2096, even if no menu items were added before it (menuIndex could be 0). If all shortcuts for newChat, newChatWindow, and openDirectory are disabled, and there are no recent directories, this would insert a separator with nothing before it. Consider only inserting the separator if menuIndex > 0.

Suggested change

click() {

if (menuIndex > 0) {

fileMenu.submenu.insert(menuIndex++, new MenuItem({ type: 'separator' }));

}

Copilot · 2026-01-26T15:42:05Z

ui/desktop/src/utils/settings.ts

+  if (!settings.keyboardShortcuts && settings.globalShortcut !== undefined) {
+    const focusShortcut = settings.globalShortcut;
+    const launcherShortcut = focusShortcut ? focusShortcut.replace(/\+G$/i, '+Shift+G') : null;
+


The regex replacement /+G$/i will incorrectly transform shortcuts that already contain Shift. For example, if the old globalShortcut was 'CommandOrControl+Shift+G', this would produce 'CommandOrControl+Shift+Shift+G' for the quickLauncher. Consider checking if 'Shift' is already present before appending it, or using a more specific regex like /+([Gg])$/ and replacing with '+Shift+$1'.

Suggested change

const launcherShortcut = focusShortcut

? /\bShift\b/i.test(focusShortcut)

? focusShortcut

: focusShortcut.replace(/\+([Gg])$/, '+Shift+$1')

: null;

Copilot · 2026-01-26T15:42:05Z

ui/desktop/src/components/settings/keyboard/ShortcutRecorder.tsx

+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (!recording) return;
+
+    e.preventDefault();
+    e.stopPropagation();
+
+    // Ignore modifier-only presses
+    if (['Control', 'Meta', 'Alt', 'Shift'].includes(e.key)) {
+      return;
+    }


Pressing the Escape key will capture it as a shortcut ('Esc') instead of canceling the recording. Users would expect Escape to cancel the recording dialog. Consider checking for Escape key before processing and calling onCancel() instead.

…tings

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Copilot · 2026-01-26T15:55:45Z

ui/desktop/src/main.ts

+    if (shortcutsChanged) {
+      registerGlobalShortcuts();
+    }
+
    saveSettings(settings);


registerGlobalShortcuts() is called before saveSettings(settings), causing it to load the old settings from disk instead of using the new settings. Move saveSettings(settings) to line 1269, before the shortcut registration check.

Suggested change

if (shortcutsChanged) {

registerGlobalShortcuts();

}

saveSettings(settings);

saveSettings(settings);

if (shortcutsChanged) {

registerGlobalShortcuts();

}

Copilot · 2026-01-26T15:55:46Z

ui/desktop/src/components/settings/keyboard/ShortcutRecorder.tsx

+    if (['Control', 'Meta', 'Alt', 'Shift'].includes(e.key)) {
+      return;
+    }
+


Pressing Escape alone will be captured as a shortcut ("Esc") instead of canceling the recording. Add a check before line 49 to call onCancel() if the key is 'Escape' and no modifiers are pressed.

Suggested change

// Pressing bare Escape should cancel recording instead of being captured as "Esc"

if (

e.key === 'Escape' &&

!e.ctrlKey &&

!e.metaKey &&

!e.altKey &&

!e.shiftKey

) {

onCancel();

return;

}

zanesq · 2026-01-26T17:10:47Z

When I run this branch locally I get the following error, I think it's related to the copilot review above? I put up a PR with a fix from goose if you want to merge it into this branch.

08:45:24.213 › from renderer: [ERROR] ReferenceError: __dirname is not defined

    at Lazy (<anonymous>)
    at ErrorBoundary (http://localhost:5173/src/components/ErrorBoundary.tsx:89:5)
    at ConfigProvider (http://localhost:5173/src/components/ConfigContext.tsx:24:34)
    at Suspense (<anonymous>)

After this fix and running I tested the keyboard settings and it is putting a strange character when I tried to change focus goose window to simply option + G and it doesn't seem to work it still works with the original alt + cmd + G

Couple of other issues:

Noticed a bug where the enable/disable toggle is resetting it back to the original default command, maybe related to it not saving it above?

Kapture.2026-01-26.at.07.10.13.mp4

We should probably update the app menu to show the saved shortcut also (which will require restart bc electron pulls this in at app init)

DOsinga · 2026-01-27T00:19:43Z

@zanesq

it resets it back to the original if you toggle; yes that is by design. my thinking is toggle it off is deleting the short-cut, toggling it on recreates it. it's also an easy way to reset.
I think we do this update. it does say in the UI for these short cuts that you need to restart the app

the other bug with the weird characters if you hit cmd-option-N should now also be fixed

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 5 comments.

Copilot · 2026-01-27T00:22:59Z

ui/desktop/src/test/setup.ts

+        envToggles: {
+          GOOSE_SERVER__MEMORY: false,
+          GOOSE_SERVER__COMPUTER_CONTROLLER: false,
+        },


The mock settings include envToggles which was removed from the Settings interface in this PR. This will cause type mismatches when tests use this mock. Remove these lines since envToggles is no longer part of Settings.

Suggested change

envToggles: {

GOOSE_SERVER__MEMORY: false,

GOOSE_SERVER__COMPUTER_CONTROLLER: false,

},

Copilot · 2026-01-27T00:23:00Z

ui/desktop/src/main.ts

+  const settings = getSettings();
+  updateSettings((s) => {
+    s.showDockIcon = show;
+  });


Reading settings before the updateSettings call creates potential for using stale data. The settings variable is read before the update, but the update might change other fields. If showMenuBarIcon check on line 1266 needs the latest value, it should be read after the update or within the updateSettings callback to ensure consistency.

Copilot · 2026-01-27T00:23:00Z

ui/desktop/src/main.ts

+function getSettings(): Settings {
+  if (fsSync.existsSync(SETTINGS_FILE)) {
+    const data = fsSync.readFileSync(SETTINGS_FILE, 'utf8');
+    return JSON.parse(data);


JSON.parse could throw an error if the settings file is corrupted. This would crash the app. Wrap the parse in a try-catch and return defaultSettings if parsing fails, logging the error for debugging.

Suggested change

return JSON.parse(data);

try {

return JSON.parse(data);

} catch (error) {

log.error('Failed to parse settings file, using default settings', error);

return defaultSettings;

}

Copilot · 2026-01-27T00:23:00Z

ui/desktop/src/main.ts

+  if (!settings.keyboardShortcuts && settings.globalShortcut !== undefined) {
+    updateSettings((s) => {
+      s.keyboardShortcuts = getKeyboardShortcuts(s);
+      delete s.globalShortcut;


The delete s.globalShortcut operation modifies the settings object's prototype properties. TypeScript doesn't guarantee this is safe since globalShortcut is an optional property. Use a runtime check or explicitly set to undefined instead: s.globalShortcut = undefined. This is safer and more explicit about intent.

Suggested change

delete s.globalShortcut;

s.globalShortcut = undefined;

Copilot · 2026-01-27T00:23:00Z

ui/desktop/src/utils/settings.ts

+      if (focusShortcut.includes('Shift')) {
+        launcherShortcut = focusShortcut;
+      } else {
+        launcherShortcut = focusShortcut.replace(/\+([Gg])$/, '+Shift+$1');


The regex /\+([Gg])$/ assumes the shortcut ends with '+G' or '+g', but this won't work correctly if the focus shortcut is something like 'CommandOrControl+Alt+G+Space' or has a different key. Consider validating that focusShortcut actually ends with a single 'G' or 'g' key before attempting the replacement, or use a more robust parsing approach.

Suggested change

launcherShortcut = focusShortcut.replace(/\+([Gg])$/, '+Shift+$1');

const parts = focusShortcut.split('+');

if (parts.length > 1) {

const key = parts[parts.length - 1];

const modifiers = parts.slice(0, parts.length - 1);

launcherShortcut = [...modifiers, 'Shift', key].join('+');

} else {

launcherShortcut = focusShortcut + '+Shift';

}

zanesq

Looks good, only feedback is the warning for restart doesn't seem to show for global shortcuts so we might want to show it there also if its updating the menu also.

alishams0627-sketch

Change fail

Keyboard short cuts

aa8992d

Copilot AI review requested due to automatic review settings January 26, 2026 14:45

Copilot started reviewing on behalf of DOsinga January 26, 2026 14:46 View session

Copilot AI reviewed Jan 26, 2026

View reviewed changes

Douwe Osinga added 2 commits January 26, 2026 10:01

Add some missing files

645a38b

Comments

f267605

Copilot AI review requested due to automatic review settings January 26, 2026 15:11

Copilot started reviewing on behalf of DOsinga January 26, 2026 15:12 View session

Copilot AI reviewed Jan 26, 2026

View reviewed changes

Refactor

9f099cd

Whitewolf111 approved these changes Jan 26, 2026

View reviewed changes

Simplify

b595c0f

Copilot AI review requested due to automatic review settings January 26, 2026 15:37

Copilot started reviewing on behalf of DOsinga January 26, 2026 15:38 View session

Remove some more comments

2ea7941

Copilot AI reviewed Jan 26, 2026

View reviewed changes

What co-pilot said

d543bfb

DOsinga requested review from zanesq and removed request for Copilot January 26, 2026 15:44

Douwe Osinga added 2 commits January 26, 2026 10:51

Merge remote-tracking branch 'origin/main' into keyboard-shortcut-set…

bbeaf35

…tings

Merge and fix

cb0ee9e

Copilot AI review requested due to automatic review settings January 26, 2026 15:51

Copilot started reviewing on behalf of DOsinga January 26, 2026 15:53 View session

Copilot AI reviewed Jan 26, 2026

View reviewed changes

zanesq mentioned this pull request Jan 26, 2026

fix __dirname is not defined #6716

Closed

Douwe Osinga added 3 commits January 26, 2026 18:44

Simplify

a492fd8

More cleanup

ce41122

Keymap

6230b8f

Copilot AI review requested due to automatic review settings January 27, 2026 00:19

Copilot started reviewing on behalf of DOsinga January 27, 2026 00:19 View session

Copilot AI reviewed Jan 27, 2026

View reviewed changes

zanesq approved these changes Jan 27, 2026

View reviewed changes

alishams0627-sketch suggested changes Jan 27, 2026

View reviewed changes

DOsinga merged commit b570046 into main Jan 27, 2026
25 checks passed

DOsinga deleted the keyboard-shortcut-settings branch January 27, 2026 19:51

This was referenced Jan 29, 2026

chore(release): release version 1.22.0 (minor) #6812

Closed

chore(release): release version 1.22.0 (minor) #6813

Closed

emma-squared mentioned this pull request Feb 3, 2026

Document keyboard shortcut menu #6928

Merged

9 tasks

-    const newShortcuts = {
-      ...shortcuts,
-      [key]: enabled ? defaultValue : null,
-    };
+    let newShortcuts: KeyboardShortcuts;
+    if (!enabled) {
+      // Disabling a shortcut: simply clear its value.
+      newShortcuts = {
+        ...shortcuts,
+        [key]: null,
+      };
+    } else {
+      // Enabling a shortcut: restore its default value, but clear any other shortcut
+      // that is currently using the same value to avoid conflicts.
+      const updatedShortcuts: KeyboardShortcuts = {
+        ...shortcuts,
+      };
+      if (defaultValue) {
+        (Object.keys(updatedShortcuts) as (keyof KeyboardShortcuts)[]).forEach((otherKey) => {
+          if (otherKey !== key && updatedShortcuts[otherKey] === defaultValue) {
+            updatedShortcuts[otherKey] = null;
+          }
+        });
+      }
+      updatedShortcuts[key] = defaultValue;
+      newShortcuts = updatedShortcuts;
+    }

-          click() {
+    if (menuIndex > 0) {
+      fileMenu.submenu.insert(menuIndex++, new MenuItem({ type: 'separator' }));
+    }

+    // Pressing bare Escape should cancel recording instead of being captured as "Esc"
+    if (
+      e.key === 'Escape' &&
+      !e.ctrlKey &&
+      !e.metaKey &&
+      !e.altKey &&
+      !e.shiftKey
+    ) {
+      onCancel();
+      return;
+    }

-        launcherShortcut = focusShortcut.replace(/\+([Gg])$/, '+Shift+$1');
+        const parts = focusShortcut.split('+');
+        if (parts.length > 1) {
+          const key = parts[parts.length - 1];
+          const modifiers = parts.slice(0, parts.length - 1);
+          launcherShortcut = [...modifiers, 'Shift', key].join('+');
+        } else {
+          launcherShortcut = focusShortcut + '+Shift';
+        }

Conversation

DOsinga commented Jan 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

zanesq commented Jan 26, 2026

Uh oh!

DOsinga commented Jan 27, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 27, 2026

Choose a reason for hiding this comment

DOsinga commented Jan 26, 2026 •

edited

Loading