Summary

• Restore the sidebar header to the single unified Workspace options button instead of separate Edit filters and View options controls.
• Keep the Settings shortcut recorder from being preempted by main-process and renderer app shortcut routing, so existing app shortcuts can be captured for rebinding.
• Add regression coverage for the main-process shortcut interception case.

PR #2581 audit

• Reviewed the Add customizable keyboard shortcuts #2581 merge commit, file list, and current post-merge state for keybinding registry/config IPC, main-window shortcut interception, renderer/global shortcut routing, terminal/browser/editor shortcut paths, Settings shortcut UI, web preload adapter, and the sidebar conflict area.
• Found and fixed two current regressions: the revived split sidebar controls, and the shortcut recorder losing to app shortcut interception.
• I did not find additional current regressions in the reviewed Add customizable keyboard shortcuts #2581 paths. A few risky Add customizable keyboard shortcuts #2581 shortcut-routing areas had already been changed by later follow-up PRs, especially Add terminal shortcut routing policy #2610.

Testing

• pnpm exec vitest run --config config/vitest.config.ts src/main/window/createMainWindow.test.ts src/shared/keybindings.test.ts src/main/keybindings/keybinding-file.test.ts src/main/ipc/keybindings.test.ts src/main/menu/register-app-menu.test.ts src/shared/window-shortcut-policy.test.ts src/renderer/src/web/web-preload-api.test.ts src/renderer/src/components/terminal-pane/keyboard-handlers.test.ts src/renderer/src/components/terminal-pane/terminal-shortcut-policy.test.ts src/main/browser/browser-manager.test.ts src/main/browser/browser-manager-grab.test.ts
• pnpm run typecheck:web
• pnpm run typecheck:node
• pnpm exec oxlint src/main/window/createMainWindow.test.ts src/main/window/createMainWindow.ts src/preload/api-types.ts src/preload/index.ts src/renderer/src/App.tsx src/renderer/src/components/settings/ShortcutBindingRow.tsx src/renderer/src/components/sidebar/SidebarHeader.tsx src/renderer/src/web/web-preload-api.ts
• git diff --check
• Electron visual verification on this worktree via CDP: saw one Workspace options button, no Edit filters or View options buttons, and verified the unified menu contains grouping, sort, filters, properties, and project controls. Also verified the Shortcuts recorder enters the focused Press keys state and cancels cleanly.