From 6745108708a602e800fc7dba0a247afae1cf237b Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Wed, 3 Jun 2026 07:49:41 +0800
Subject: [PATCH 01/55] feat(desktop): add search shortcut settings

Make SearchView command shortcuts configurable via persisted keybindings.
Add settings UI and tests for shortcut routing and validation.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 apps/desktop/src/config/searchKeybindings.ts  | 121 ++++++
 apps/desktop/src/database/schema.ts           |   1 +
 apps/desktop/src/i18n/messages.ts             |  34 ++
 .../src/services/EventService/types.ts        |   4 +-
 apps/desktop/src/stores/settings.ts           |  51 +++
 apps/desktop/src/utils/shortcuts.ts           | 306 +++++++++++++
 .../interaction/useSearchKeyboardRouter.ts    | 142 ++++--
 .../composables/searchInteraction.ts          | 406 ++----------------
 apps/desktop/src/views/SearchView/index.vue   |   3 +-
 .../SettingsView/components/General/index.vue | 320 ++++++++++++++
 .../SearchView/searchInteraction.test.ts      | 153 -------
 .../useSearchKeyboardRouter.test.ts           |  89 ++--
 .../tests/stores/settings-keybindings.test.ts | 125 ++++++
 .../settingsGeneralComponent.test.ts          |  15 +-
 14 files changed, 1175 insertions(+), 595 deletions(-)
 create mode 100644 apps/desktop/src/config/searchKeybindings.ts
 create mode 100644 apps/desktop/src/utils/shortcuts.ts
 create mode 100644 apps/desktop/tests/stores/settings-keybindings.test.ts

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
new file mode 100644
index 00000000..b54295c6
--- /dev/null
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -0,0 +1,121 @@
+import type { MessageKey } from '@/i18n';
+import { normalizeLocalShortcutString } from '@/utils/shortcuts';
+
+export const SEARCH_KEYBINDING_ACTION_IDS = [
+    'search.history.open',
+    'search.input.focus',
+    'search.session.new',
+    'search.model.toggle',
+    'search.window.pin',
+    'search.request.cancel',
+    'search.draft.clearAll',
+] as const;
+
+export type SearchKeybindingActionId = (typeof SEARCH_KEYBINDING_ACTION_IDS)[number];
+
+export interface SearchKeybindingDefinition {
+    id: SearchKeybindingActionId;
+    labelKey: MessageKey;
+    defaultShortcut: string | null;
+    allowDisable: boolean;
+}
+
+export type SearchKeybindings = Record<SearchKeybindingActionId, string | null>;
+
+export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
+    {
+        id: 'search.history.open',
+        labelKey: 'settings.general.searchActions.history',
+        defaultShortcut: 'Mod+H',
+        allowDisable: true,
+    },
+    {
+        id: 'search.input.focus',
+        labelKey: 'settings.general.searchActions.focusInput',
+        defaultShortcut: 'Mod+L',
+        allowDisable: true,
+    },
+    {
+        id: 'search.session.new',
+        labelKey: 'settings.general.searchActions.newSession',
+        defaultShortcut: 'Mod+N',
+        allowDisable: true,
+    },
+    {
+        id: 'search.model.toggle',
+        labelKey: 'settings.general.searchActions.modelToggle',
+        defaultShortcut: 'Mod+M',
+        allowDisable: true,
+    },
+    {
+        id: 'search.window.pin',
+        labelKey: 'settings.general.searchActions.windowPin',
+        defaultShortcut: 'Mod+P',
+        allowDisable: true,
+    },
+    {
+        id: 'search.request.cancel',
+        labelKey: 'settings.general.searchActions.cancelRequest',
+        defaultShortcut: 'Mod+.',
+        allowDisable: true,
+    },
+    {
+        id: 'search.draft.clearAll',
+        labelKey: 'settings.general.searchActions.clearAll',
+        defaultShortcut: 'Mod+Backspace',
+        allowDisable: true,
+    },
+];
+
+const SEARCH_KEYBINDING_DEFINITION_MAP = new Map(
+    SEARCH_KEYBINDING_DEFINITIONS.map((definition) => [definition.id, definition])
+);
+
+const SEARCH_KEYBINDING_ACTION_ID_SET = new Set<string>(SEARCH_KEYBINDING_ACTION_IDS);
+
+export function isSearchKeybindingActionId(value: string): value is SearchKeybindingActionId {
+    return SEARCH_KEYBINDING_ACTION_ID_SET.has(value);
+}
+
+export function getSearchKeybindingDefinition(
+    actionId: SearchKeybindingActionId
+): SearchKeybindingDefinition {
+    const definition = SEARCH_KEYBINDING_DEFINITION_MAP.get(actionId);
+    if (!definition) {
+        throw new Error(`Unknown search keybinding action: ${actionId}`);
+    }
+    return definition;
+}
+
+export function createDefaultSearchKeybindings(): SearchKeybindings {
+    return SEARCH_KEYBINDING_DEFINITIONS.reduce<SearchKeybindings>((accumulator, definition) => {
+        accumulator[definition.id] = definition.defaultShortcut;
+        return accumulator;
+    }, {} as SearchKeybindings);
+}
+
+export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
+    const normalized = createDefaultSearchKeybindings();
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return normalized;
+    }
+
+    for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
+        const candidate = (value as Record<string, unknown>)[definition.id];
+        if (candidate === null && definition.allowDisable) {
+            normalized[definition.id] = null;
+            continue;
+        }
+
+        if (typeof candidate !== 'string') {
+            continue;
+        }
+
+        const shortcut = normalizeLocalShortcutString(candidate);
+        if (shortcut) {
+            normalized[definition.id] = shortcut;
+        }
+    }
+
+    return normalized;
+}
diff --git a/apps/desktop/src/database/schema.ts b/apps/desktop/src/database/schema.ts
index 5f94c259..49ae142e 100644
--- a/apps/desktop/src/database/schema.ts
+++ b/apps/desktop/src/database/schema.ts
@@ -26,6 +26,7 @@ export enum SettingKey {
     AUTO_START = 'auto_start',
     OUTPUT_SCROLL_BEHAVIOR = 'output_scroll_behavior',
     SEARCH_WINDOW_SIZE_PRESET = 'search_window_size_preset',
+    SEARCH_KEYBINDINGS = 'search_keybindings',
 }
 
 export type ToolLogKind = 'mcp' | 'builtin';
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 7e3f242b..5dd69641 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -87,6 +87,22 @@ const zhCNMessages = {
         '点击输入框后按下您想要设置的快捷键组合。支持的修饰键：Ctrl、Alt、Shift',
     'settings.general.winKeyUnsupported': '不支持 Win 键组合，请使用 Ctrl、Alt、Shift',
     'settings.general.shortcutSaved': '快捷键保存成功',
+    'settings.general.searchShortcuts': '搜索页快捷键',
+    'settings.general.searchShortcutsDescription':
+        '自定义搜索窗口内的命令型快捷键，不会影响输入导航与全局唤起。',
+    'settings.general.searchActions.history': '打开会话历史',
+    'settings.general.searchActions.focusInput': '聚焦输入框',
+    'settings.general.searchActions.newSession': '开始新会话',
+    'settings.general.searchActions.modelToggle': '切换模型选择',
+    'settings.general.searchActions.windowPin': '切换窗口置顶',
+    'settings.general.searchActions.cancelRequest': '取消当前请求',
+    'settings.general.searchActions.clearAll': '清空草稿与上下文',
+    'settings.general.searchShortcuts.errors.modifierRequired': '快捷键至少需要一个修饰键',
+    'settings.general.searchShortcuts.errors.reserved':
+        '该快捷键保留给输入/导航行为，请选择其他组合',
+    'settings.general.searchShortcuts.errors.duplicate': '该快捷键已被“{action}”使用，请换一个组合',
+    'settings.general.searchShortcuts.errors.globalConflict':
+        '该快捷键与全局唤起快捷键冲突，请换一个组合',
     'settings.general.saveShortcutFailed': '保存快捷键到数据库失败',
     'settings.general.loadSettingsFailed': '加载设置失败',
     'settings.general.saveStartOnBootFailed': '保存开机自启动设置失败',
@@ -816,6 +832,24 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.winKeyUnsupported':
         'Win key combinations are not supported. Use Ctrl, Alt, or Shift.',
     'settings.general.shortcutSaved': 'Shortcut saved',
+    'settings.general.searchShortcuts': 'Search shortcuts',
+    'settings.general.searchShortcutsDescription':
+        'Customize command shortcuts inside the search window without changing typing, navigation, or the global activation shortcut.',
+    'settings.general.searchActions.history': 'Open session history',
+    'settings.general.searchActions.focusInput': 'Focus input',
+    'settings.general.searchActions.newSession': 'Start new session',
+    'settings.general.searchActions.modelToggle': 'Toggle model picker',
+    'settings.general.searchActions.windowPin': 'Toggle window pin',
+    'settings.general.searchActions.cancelRequest': 'Cancel current request',
+    'settings.general.searchActions.clearAll': 'Clear draft and context',
+    'settings.general.searchShortcuts.errors.modifierRequired':
+        'A shortcut must include at least one modifier key',
+    'settings.general.searchShortcuts.errors.reserved':
+        'This shortcut is reserved for typing or navigation. Choose another combination.',
+    'settings.general.searchShortcuts.errors.duplicate':
+        'This shortcut is already used by "{action}". Choose another combination.',
+    'settings.general.searchShortcuts.errors.globalConflict':
+        'This shortcut conflicts with the global activation shortcut. Choose another combination.',
     'settings.general.saveShortcutFailed': 'Failed to save shortcut to database',
     'settings.general.loadSettingsFailed': 'Failed to load settings',
     'settings.general.saveStartOnBootFailed': 'Failed to save start-on-boot setting',
diff --git a/apps/desktop/src/services/EventService/types.ts b/apps/desktop/src/services/EventService/types.ts
index 36558d81..33da3bb6 100644
--- a/apps/desktop/src/services/EventService/types.ts
+++ b/apps/desktop/src/services/EventService/types.ts
@@ -11,6 +11,7 @@ import type {
     PopupSessionSearchQueryChangePayload,
 } from '@services/PopupService/types';
 
+import type { SearchKeybindings } from '@/config/searchKeybindings';
 import type { SessionStatusReminderKind } from '@/utils/session';
 
 export type { SessionStatusReminderKind } from '@/utils/session';
@@ -72,6 +73,7 @@ export interface McpStatusChangeEvent {
 
 export type GeneralSettingKey =
     | 'global_shortcut'
+    | 'search_keybindings'
     | 'start_on_boot'
     | 'start_minimized'
     | 'output_scroll_behavior'
@@ -85,7 +87,7 @@ export interface SettingsGeneralUpdatedEvent {
     sourceId: string;
     windowLabel: string;
     key: GeneralSettingKey;
-    value: string | number | boolean | null;
+    value: string | number | boolean | SearchKeybindings | null;
 }
 
 export interface AiModelsUpdatedEvent {
diff --git a/apps/desktop/src/stores/settings.ts b/apps/desktop/src/stores/settings.ts
index 260c7b8a..50861aaa 100644
--- a/apps/desktop/src/stores/settings.ts
+++ b/apps/desktop/src/stores/settings.ts
@@ -12,6 +12,11 @@ import {
     DEFAULT_APP_UPDATE_CHANNEL,
     normalizeAppUpdateChannel,
 } from '@/config/appUpdate';
+import {
+    createDefaultSearchKeybindings,
+    normalizeSearchKeybindings,
+    type SearchKeybindings,
+} from '@/config/searchKeybindings';
 import {
     DEFAULT_SEARCH_WINDOW_SIZE_PRESET,
     resolveSearchWindowDefaultSize,
@@ -26,6 +31,7 @@ export type OutputScrollBehavior = 'follow_output' | 'stay_position' | 'jump_to_
 
 export interface GeneralSettingsData {
     globalShortcut: string;
+    searchKeybindings: SearchKeybindings;
     startOnBoot: boolean;
     startMinimized: boolean;
     outputScrollBehavior: OutputScrollBehavior;
@@ -39,6 +45,7 @@ export interface GeneralSettingsData {
 
 const DEFAULT_GENERAL_SETTINGS: GeneralSettingsData = {
     globalShortcut: 'Alt+Space',
+    searchKeybindings: createDefaultSearchKeybindings(),
     startOnBoot: false,
     startMinimized: true,
     outputScrollBehavior: 'follow_output',
@@ -53,6 +60,9 @@ const DEFAULT_GENERAL_SETTINGS: GeneralSettingsData = {
 function createDefaultGeneralSettings(): GeneralSettingsData {
     return {
         ...DEFAULT_GENERAL_SETTINGS,
+        searchKeybindings: {
+            ...DEFAULT_GENERAL_SETTINGS.searchKeybindings,
+        },
         searchWindowDefaultSize: {
             ...DEFAULT_GENERAL_SETTINGS.searchWindowDefaultSize,
         },
@@ -112,9 +122,28 @@ export const useSettingsStore = defineStore('settings', () => {
         };
     }
 
+    function applySearchKeybindings(value: unknown): void {
+        settings.value.searchKeybindings = normalizeSearchKeybindings(value);
+    }
+
+    function parsePersistedSearchKeybindings(value: string | null): SearchKeybindings {
+        if (!value) {
+            return createDefaultSearchKeybindings();
+        }
+
+        try {
+            return normalizeSearchKeybindings(JSON.parse(value));
+        } catch {
+            return createDefaultSearchKeybindings();
+        }
+    }
+
     function cloneSettingsSnapshot(): GeneralSettingsData {
         return {
             ...settings.value,
+            searchKeybindings: {
+                ...settings.value.searchKeybindings,
+            },
             searchWindowDefaultSize: {
                 ...settings.value.searchWindowDefaultSize,
             },
@@ -128,6 +157,11 @@ export const useSettingsStore = defineStore('settings', () => {
                     value || DEFAULT_GENERAL_SETTINGS.globalShortcut
                 );
                 break;
+            case 'search_keybindings':
+                applySearchKeybindings(
+                    typeof value === 'string' ? parsePersistedSearchKeybindings(value) : value
+                );
+                break;
             case 'start_on_boot':
                 settings.value.startOnBoot =
                     typeof value === 'boolean' ? value : String(value) === 'true';
@@ -164,6 +198,8 @@ export const useSettingsStore = defineStore('settings', () => {
         switch (key) {
             case 'global_shortcut':
                 return settings.value.globalShortcut;
+            case 'search_keybindings':
+                return JSON.stringify(settings.value.searchKeybindings);
             case 'start_on_boot':
                 return String(settings.value.startOnBoot);
             case 'start_minimized':
@@ -189,6 +225,10 @@ export const useSettingsStore = defineStore('settings', () => {
         switch (key) {
             case 'global_shortcut':
                 return settings.value.globalShortcut;
+            case 'search_keybindings':
+                return {
+                    ...settings.value.searchKeybindings,
+                };
             case 'start_on_boot':
                 return settings.value.startOnBoot;
             case 'start_minimized':
@@ -222,6 +262,7 @@ export const useSettingsStore = defineStore('settings', () => {
         try {
             const [
                 globalShortcut,
+                searchKeybindings,
                 startOnBoot,
                 startMinimized,
                 outputScroll,
@@ -232,6 +273,7 @@ export const useSettingsStore = defineStore('settings', () => {
                 appUpdateLastCheckedAt,
             ] = await Promise.all([
                 getSettingValue({ key: 'global_shortcut' }),
+                getSettingValue({ key: 'search_keybindings' }),
                 getSettingValue({ key: 'start_on_boot' }),
                 getSettingValue({ key: 'start_minimized' }),
                 getSettingValue({ key: 'output_scroll_behavior' }),
@@ -244,6 +286,7 @@ export const useSettingsStore = defineStore('settings', () => {
 
             settings.value.globalShortcut =
                 globalShortcut || DEFAULT_GENERAL_SETTINGS.globalShortcut;
+            settings.value.searchKeybindings = parsePersistedSearchKeybindings(searchKeybindings);
             settings.value.startOnBoot =
                 startOnBoot === null
                     ? DEFAULT_GENERAL_SETTINGS.startOnBoot
@@ -264,6 +307,7 @@ export const useSettingsStore = defineStore('settings', () => {
 
             await Promise.allSettled([
                 persistDefaultIfMissing('global_shortcut', globalShortcut),
+                persistDefaultIfMissing('search_keybindings', searchKeybindings),
                 persistDefaultIfMissing('start_on_boot', startOnBoot),
                 persistDefaultIfMissing('start_minimized', startMinimized),
                 persistDefaultIfMissing('output_scroll_behavior', outputScroll),
@@ -372,6 +416,10 @@ export const useSettingsStore = defineStore('settings', () => {
         await updateSetting('global_shortcut', shortcut);
     }
 
+    async function updateSearchKeybindings(searchKeybindings: SearchKeybindings) {
+        await updateSetting('search_keybindings', normalizeSearchKeybindings(searchKeybindings));
+    }
+
     async function updateStartOnBoot(enabled: boolean) {
         await updateSetting('start_on_boot', enabled);
     }
@@ -406,6 +454,7 @@ export const useSettingsStore = defineStore('settings', () => {
 
     const outputScrollBehavior = computed(() => settings.value.outputScrollBehavior);
     const globalShortcut = computed(() => settings.value.globalShortcut);
+    const searchKeybindings = computed(() => settings.value.searchKeybindings);
     const searchWindowSizePreset = computed(() => settings.value.searchWindowSizePreset);
     const searchWindowDefaultSize = computed(() => settings.value.searchWindowDefaultSize);
     const language = computed(() => settings.value.language);
@@ -419,6 +468,7 @@ export const useSettingsStore = defineStore('settings', () => {
         loading,
         outputScrollBehavior,
         globalShortcut,
+        searchKeybindings,
         searchWindowSizePreset,
         searchWindowDefaultSize,
         language,
@@ -429,6 +479,7 @@ export const useSettingsStore = defineStore('settings', () => {
         dispose,
         refresh,
         updateGlobalShortcut,
+        updateSearchKeybindings,
         updateStartOnBoot,
         updateStartMinimized,
         updateOutputScrollBehavior,
diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
new file mode 100644
index 00000000..8dd73ae8
--- /dev/null
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -0,0 +1,306 @@
+export interface ShortcutMatchInput {
+    key: string;
+    ctrlKey?: boolean;
+    metaKey?: boolean;
+    altKey?: boolean;
+    shiftKey?: boolean;
+}
+
+export interface CapturedShortcutResult {
+    shortcut: string;
+    displayShortcut: string;
+}
+
+const MODIFIER_DISPLAY_ORDER = ['Mod', 'Ctrl', 'Alt', 'Shift'] as const;
+const SUPPORTED_CAPTURE_MODIFIERS = new Set(['Ctrl', 'Alt', 'Shift', 'Mod']);
+const RESERVED_LOCAL_SHORTCUT_KEYS = new Set([
+    'Enter',
+    'Esc',
+    'Tab',
+    'Up',
+    'Down',
+    'Left',
+    'Right',
+]);
+const MODIFIER_KEYS = new Set(['Control', 'Alt', 'Shift', 'Meta', 'OS']);
+
+const KEY_DISPLAY_MAP: Record<string, string> = {
+    ' ': 'Space',
+    Spacebar: 'Space',
+    ArrowUp: 'Up',
+    ArrowDown: 'Down',
+    ArrowLeft: 'Left',
+    ArrowRight: 'Right',
+    Escape: 'Esc',
+    Esc: 'Esc',
+    Delete: 'Del',
+    Del: 'Del',
+    '.': '.',
+};
+
+const ALIAS_MAP: Record<string, string> = {
+    cmd: 'Mod',
+    command: 'Mod',
+    meta: 'Mod',
+    win: 'Mod',
+    super: 'Mod',
+    ctrl: 'Ctrl',
+    control: 'Ctrl',
+    option: 'Alt',
+    alt: 'Alt',
+    shift: 'Shift',
+    esc: 'Esc',
+    escape: 'Esc',
+    delete: 'Del',
+    del: 'Del',
+    return: 'Enter',
+    enter: 'Enter',
+    pageup: 'PageUp',
+    pagedown: 'PageDown',
+    arrowup: 'Up',
+    up: 'Up',
+    arrowdown: 'Down',
+    down: 'Down',
+    arrowleft: 'Left',
+    left: 'Left',
+    arrowright: 'Right',
+    right: 'Right',
+    backspace: 'Backspace',
+    space: 'Space',
+};
+
+function isMacPlatform(): boolean {
+    if (typeof navigator === 'undefined') {
+        return false;
+    }
+
+    return /(Mac|iPhone|iPad|iPod)/i.test(navigator.platform);
+}
+
+function getPrimaryModifierLabel(): 'Cmd' | 'Ctrl' {
+    return isMacPlatform() ? 'Cmd' : 'Ctrl';
+}
+
+function usesPrimaryModifier(input: ShortcutMatchInput): boolean {
+    return isMacPlatform() ? Boolean(input.metaKey) : Boolean(input.ctrlKey);
+}
+
+function normalizeShortcutToken(token: string): string | null {
+    const trimmed = token.trim();
+    if (!trimmed) {
+        return null;
+    }
+
+    const alias = ALIAS_MAP[trimmed.toLowerCase()];
+    if (alias) {
+        return alias;
+    }
+
+    if (trimmed.length === 1) {
+        return trimmed.toUpperCase();
+    }
+
+    if (/^f\d{1,2}$/i.test(trimmed)) {
+        return trimmed.toUpperCase();
+    }
+
+    return trimmed;
+}
+
+function normalizeEventKey(key: string): string | null {
+    if (!key) {
+        return null;
+    }
+
+    const mappedKey = KEY_DISPLAY_MAP[key] ?? key;
+    return normalizeShortcutToken(mappedKey);
+}
+
+function createShortcutParts(shortcut: string): { modifiers: string[]; key: string | null } {
+    const parts = shortcut
+        .split('+')
+        .map((part) => normalizeShortcutToken(part))
+        .filter((part): part is string => Boolean(part));
+
+    const modifierSet = new Set<string>();
+    let key: string | null = null;
+    for (const part of parts) {
+        if (SUPPORTED_CAPTURE_MODIFIERS.has(part)) {
+            modifierSet.add(part);
+            continue;
+        }
+
+        key = part;
+    }
+
+    const modifiers = MODIFIER_DISPLAY_ORDER.filter((modifier) => modifierSet.has(modifier));
+    return { modifiers, key };
+}
+
+export function normalizeLocalShortcutString(shortcut: string | null | undefined): string | null {
+    if (!shortcut) {
+        return null;
+    }
+
+    const { modifiers, key } = createShortcutParts(shortcut);
+    if (!key) {
+        return null;
+    }
+
+    return [...modifiers, key].join('+');
+}
+
+export function formatShortcutForDisplay(shortcut: string | null | undefined): string {
+    const normalized = normalizeLocalShortcutString(shortcut);
+    if (!normalized) {
+        return '—';
+    }
+
+    const { modifiers, key } = createShortcutParts(normalized);
+    const displayModifiers = modifiers.map((modifier) => {
+        if (modifier === 'Mod') {
+            return getPrimaryModifierLabel();
+        }
+        return modifier;
+    });
+
+    return [...displayModifiers, key].join('+');
+}
+
+export function toCurrentPlatformShortcut(shortcut: string | null | undefined): string | null {
+    const normalized = normalizeLocalShortcutString(shortcut);
+    if (!normalized) {
+        return null;
+    }
+
+    return formatShortcutForDisplay(normalized);
+}
+
+export function matchShortcut(
+    shortcut: string | null | undefined,
+    input: ShortcutMatchInput
+): boolean {
+    const normalized = normalizeLocalShortcutString(shortcut);
+    if (!normalized) {
+        return false;
+    }
+
+    const { modifiers, key } = createShortcutParts(normalized);
+    const eventKey = normalizeEventKey(input.key);
+    if (!eventKey || eventKey !== key) {
+        return false;
+    }
+
+    const isMac = isMacPlatform();
+    const expectsMod = modifiers.includes('Mod');
+    const expectsCtrl = modifiers.includes('Ctrl');
+    const expectsAlt = modifiers.includes('Alt');
+    const expectsShift = modifiers.includes('Shift');
+
+    if (expectsMod !== usesPrimaryModifier(input)) {
+        return false;
+    }
+
+    const effectiveCtrl = isMac
+        ? Boolean(input.ctrlKey)
+        : expectsMod
+          ? false
+          : Boolean(input.ctrlKey);
+    if (expectsCtrl !== effectiveCtrl) {
+        return false;
+    }
+
+    if (expectsAlt !== Boolean(input.altKey)) {
+        return false;
+    }
+
+    if (expectsShift !== Boolean(input.shiftKey)) {
+        return false;
+    }
+
+    if (!isMac && input.metaKey) {
+        return false;
+    }
+
+    return true;
+}
+
+export function captureShortcutFromKeyboardEvent(
+    event: KeyboardEvent
+): CapturedShortcutResult | null {
+    if (MODIFIER_KEYS.has(event.key)) {
+        return null;
+    }
+
+    if (!isMacPlatform() && event.metaKey) {
+        return null;
+    }
+
+    const key = normalizeEventKey(event.key);
+    if (!key) {
+        return null;
+    }
+
+    const modifiers: string[] = [];
+    if (usesPrimaryModifier(event)) {
+        modifiers.push('Mod');
+    }
+    if (event.ctrlKey && isMacPlatform()) {
+        modifiers.push('Ctrl');
+    }
+    if (event.altKey) {
+        modifiers.push('Alt');
+    }
+    if (event.shiftKey) {
+        modifiers.push('Shift');
+    }
+
+    const shortcut = [...modifiers, key].join('+');
+    return {
+        shortcut,
+        displayShortcut: formatShortcutForDisplay(shortcut),
+    };
+}
+
+export function isReservedLocalShortcut(shortcut: string | null | undefined): boolean {
+    const normalized = normalizeLocalShortcutString(shortcut);
+    if (!normalized) {
+        return false;
+    }
+
+    const { key } = createShortcutParts(normalized);
+    return key ? RESERVED_LOCAL_SHORTCUT_KEYS.has(key) : false;
+}
+
+export function hasRequiredModifier(shortcut: string | null | undefined): boolean {
+    const normalized = normalizeLocalShortcutString(shortcut);
+    if (!normalized) {
+        return false;
+    }
+
+    const { modifiers } = createShortcutParts(normalized);
+    return modifiers.length > 0;
+}
+
+export function findShortcutConflict<T extends string>(
+    shortcut: string | null | undefined,
+    entries: Array<{ id: T; shortcut: string | null | undefined }>,
+    excludeId?: T
+): T | null {
+    const normalized = normalizeLocalShortcutString(shortcut);
+    if (!normalized) {
+        return null;
+    }
+
+    for (const entry of entries) {
+        if (excludeId && entry.id === excludeId) {
+            continue;
+        }
+
+        if (normalizeLocalShortcutString(entry.shortcut) === normalized) {
+            return entry.id;
+        }
+    }
+
+    return null;
+}
diff --git a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
index 64193b17..6b8fef4e 100644
--- a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
+++ b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
@@ -1,15 +1,18 @@
-import type { SearchPopupSurfaceType } from '../searchInteraction';
+import type { SearchKeybindingActionId, SearchKeybindings } from '@/config/searchKeybindings';
+import { matchShortcut } from '@/utils/shortcuts';
 
+export type SearchPopupSurfaceType = 'model-dropdown-surface' | 'session-history-surface';
 type SearchKeyboardSurface = 'search-surface' | SearchPopupSurfaceType;
 type SearchQuickSearchDirection = 'up' | 'down' | 'left' | 'right';
-type SearchPrimaryShortcutKey = 'h' | 'l' | 'n' | 'm' | 'p' | '.' | 'backspace';
+export type SessionInputHistoryDirection = 'older' | 'newer';
+export type SessionInputHistoryNavigationResult = 'navigated' | 'blocked' | 'ignored';
 
 interface PendingApprovalState {
     callId?: string;
     keyboardApproveAt: number;
 }
 
-interface SearchKeyboardRouteInput {
+export interface SearchKeyboardRouteInput {
     key: string;
     shiftKey?: boolean;
     ctrlKey?: boolean;
@@ -18,6 +21,7 @@ interface SearchKeyboardRouteInput {
 }
 
 interface CreateSearchKeyboardRouterOptions {
+    getSearchKeybindings: () => SearchKeybindings;
     getPendingApproval: () => PendingApprovalState | null;
     getActiveSurface: () => SearchKeyboardSurface;
     hasActivePopupWindowFocus: () => boolean;
@@ -27,6 +31,8 @@ interface CreateSearchKeyboardRouterOptions {
     hasQuickSearchHighlight: () => boolean;
     shouldTriggerQuickSearch: (query: string) => boolean;
     isMultiLineCursor: () => boolean;
+    isCursorAtTextStart: () => boolean;
+    isCursorAtEnd: () => boolean;
     hasModelOverride: () => boolean;
     getSessionHistoryCount: () => number;
     isLoading: () => boolean;
@@ -39,6 +45,14 @@ interface CreateSearchKeyboardRouterOptions {
     onMoveQuickSearchSelection: (direction: SearchQuickSearchDirection) => void;
     onOpenHighlightedQuickSearchItem: () => void | Promise<void>;
     onCloseQuickSearch: () => void;
+    onQuickSearchPageUp: () => void;
+    onQuickSearchPageDown: () => void;
+    onQuickSearchContextMenu: () => void;
+    onQuickSearchToggleView: () => void;
+    onQuickSearchCollapse: () => void;
+    onNavigateInputHistory: (
+        direction: SessionInputHistoryDirection
+    ) => SessionInputHistoryNavigationResult;
     onHideAllPopups: () => void | Promise<void>;
     onCancelRequest: () => void;
     onClearModelOverride: () => void;
@@ -46,7 +60,7 @@ interface CreateSearchKeyboardRouterOptions {
     onClearSession: () => void;
     onClearDraft: () => void;
     onClearAll: () => void;
-    onPrimaryShortcut: (key: SearchPrimaryShortcutKey) => void | Promise<void>;
+    onSearchKeybindingAction: (actionId: SearchKeybindingActionId) => void | Promise<void>;
 }
 
 /**
@@ -69,30 +83,30 @@ function isTypingAttemptDuringApproval(input: SearchKeyboardRouteInput) {
     return input.key.length === 1 || input.key === 'Backspace' || input.key === 'Delete';
 }
 
-/**
- * 判断是否命中 Ctrl/Cmd 主修饰键快捷键。
- */
-function resolvePrimaryShortcutKey(
+function resolveSearchKeybindingAction(
     input: SearchKeyboardRouteInput,
-    queryText: string,
-    isLoading: boolean
-): SearchPrimaryShortcutKey | null {
-    const hasPrimaryModifier = input.ctrlKey || input.metaKey;
-    if (!hasPrimaryModifier || input.altKey || input.shiftKey) {
-        return null;
+    keybindings: SearchKeybindings,
+    context: {
+        isLoading: boolean;
+        hasClearableState: boolean;
     }
+): SearchKeybindingActionId | null {
+    for (const [actionId, shortcut] of Object.entries(keybindings) as Array<
+        [SearchKeybindingActionId, string | null]
+    >) {
+        if (!matchShortcut(shortcut, input)) {
+            continue;
+        }
 
-    const normalizedKey = input.key.toLowerCase();
-    if (normalizedKey === '.') {
-        return isLoading ? '.' : null;
-    }
+        if (actionId === 'search.request.cancel' && !context.isLoading) {
+            continue;
+        }
 
-    if (normalizedKey === 'backspace') {
-        return queryText.trim() ? 'backspace' : null;
-    }
+        if (actionId === 'search.draft.clearAll' && !context.hasClearableState) {
+            continue;
+        }
 
-    if (['h', 'l', 'n', 'm', 'p'].includes(normalizedKey)) {
-        return normalizedKey as SearchPrimaryShortcutKey;
+        return actionId;
     }
 
     return null;
@@ -103,6 +117,7 @@ function resolvePrimaryShortcutKey(
  */
 export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOptions) {
     const {
+        getSearchKeybindings,
         getPendingApproval,
         getActiveSurface,
         hasActivePopupWindowFocus,
@@ -112,6 +127,8 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
         hasQuickSearchHighlight,
         shouldTriggerQuickSearch,
         isMultiLineCursor,
+        isCursorAtTextStart,
+        isCursorAtEnd,
         hasModelOverride,
         getSessionHistoryCount,
         isLoading,
@@ -124,18 +141,21 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
         onMoveQuickSearchSelection,
         onOpenHighlightedQuickSearchItem,
         onCloseQuickSearch,
+        onQuickSearchPageUp,
+        onQuickSearchPageDown,
+        onQuickSearchContextMenu,
+        onQuickSearchToggleView,
+        onQuickSearchCollapse,
+        onNavigateInputHistory,
         onHideAllPopups,
         onCancelRequest,
         onClearModelOverride,
         onHideWindow,
         onClearSession,
         onClearDraft,
-        onPrimaryShortcut,
+        onSearchKeybindingAction,
     } = options;
 
-    /**
-     * 根据当前 surface 和审批状态解释一次键盘输入。
-     */
     function route(input: SearchKeyboardRouteInput) {
         const queryText = getQueryText();
         const pendingApproval = getPendingApproval();
@@ -160,9 +180,20 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
             }
         }
 
-        const primaryShortcut = resolvePrimaryShortcutKey(input, queryText, isLoading());
-        if (primaryShortcut) {
-            runKeyboardEffect(() => onPrimaryShortcut(primaryShortcut));
+        const searchKeybindingAction = resolveSearchKeybindingAction(
+            input,
+            getSearchKeybindings(),
+            {
+                isLoading: isLoading(),
+                hasClearableState:
+                    Boolean(queryText.trim()) ||
+                    hasAttachments() ||
+                    hasModelOverride() ||
+                    getSessionHistoryCount() > 0,
+            }
+        );
+        if (searchKeybindingAction) {
+            runKeyboardEffect(() => onSearchKeybindingAction(searchKeybindingAction));
             return true;
         }
 
@@ -171,6 +202,11 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
         }
 
         if (input.key === 'Escape' || input.key === 'Esc') {
+            if (isQuickSearchOpen() && hasQuickSearchHighlight()) {
+                onQuickSearchCollapse();
+                return true;
+            }
+
             if (getActiveSurface() !== 'search-surface') {
                 runKeyboardEffect(onHideAllPopups);
                 return true;
@@ -181,25 +217,21 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
                 return true;
             }
 
-            // Step 1: Clear input text first without exiting the current conversation
             if (queryText.trim()) {
                 onClearDraft();
                 return true;
             }
 
-            // Step 2: Clear model selection
             if (hasModelOverride()) {
                 onClearModelOverride();
                 return true;
             }
 
-            // Step 3: Exit conversation if session exists
             if (getSessionHistoryCount() > 0) {
                 onClearSession();
                 return true;
             }
 
-            // Step 4: Hide window if no session
             runKeyboardEffect(onHideWindow);
             return true;
         }
@@ -213,6 +245,26 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
         }
 
         if (isQuickSearchOpen()) {
+            if (input.key === 'PageUp') {
+                onQuickSearchPageUp();
+                return true;
+            }
+
+            if (input.key === 'PageDown') {
+                onQuickSearchPageDown();
+                return true;
+            }
+
+            if (input.key === 'ContextMenu' || (input.key === 'F10' && input.shiftKey)) {
+                onQuickSearchContextMenu();
+                return true;
+            }
+
+            if (input.key.toLowerCase() === 'g' && (input.ctrlKey || input.metaKey)) {
+                onQuickSearchToggleView();
+                return true;
+            }
+
             if (hasQuickSearchHighlight()) {
                 const directionMap: Partial<Record<string, SearchQuickSearchDirection>> = {
                     ArrowUp: 'up',
@@ -247,23 +299,33 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
         }
 
         if (getActiveSurface() === 'search-surface' && !isQuickSearchOpen()) {
-            if (input.key === 'ArrowDown') {
-                if (!shouldTriggerQuickSearch(queryText)) {
+            if (input.key === 'ArrowUp') {
+                if (isMultiLineCursor() && !isCursorAtTextStart()) {
                     return false;
                 }
 
-                onOpenQuickSearch();
-                return true;
+                return onNavigateInputHistory('older') !== 'ignored';
             }
 
-            if (input.key === 'ArrowUp') {
-                if (isMultiLineCursor()) {
+            if (input.key === 'ArrowDown') {
+                if (isMultiLineCursor() && !isCursorAtEnd()) {
+                    return false;
+                }
+
+                if (onNavigateInputHistory('newer') === 'navigated') {
+                    return true;
+                }
+
+                if (!shouldTriggerQuickSearch(queryText)) {
                     return false;
                 }
 
                 if (queryText.trim() || hasAttachments()) {
                     runKeyboardEffect(onSubmit);
+                    return true;
                 }
+
+                onOpenQuickSearch();
                 return true;
             }
         }
diff --git a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
index eaea8da4..eb79ce15 100644
--- a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
+++ b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
@@ -7,6 +7,7 @@ import { AppEvent, eventService } from '@services/EventService';
 import type { PopupKeydownPayload } from '@services/PopupService';
 import { computed, type ComputedRef, reactive, type Ref, ref, watch } from 'vue';
 
+import type { SearchKeybindings } from '@/config/searchKeybindings';
 import { useAskUserStore } from '@/stores/askUser';
 import {
     cloneInputHistorySnapshot,
@@ -25,6 +26,7 @@ import type {
     SearchOverlayState,
     SearchPageController,
 } from '../types';
+import { createSearchKeyboardRouter as createConfigurableSearchKeyboardRouter } from './interaction/useSearchKeyboardRouter';
 
 export type SearchActivationSource = 'shortcut' | 'manual' | 'unknown';
 
@@ -97,70 +99,12 @@ interface SyncOverlayStateOptions {
     force?: boolean;
 }
 
-type SearchKeyboardSurface = 'search-surface' | SearchPopupSurfaceType;
-type SearchQuickSearchDirection = 'up' | 'down' | 'left' | 'right';
-type SearchPrimaryShortcutKey = 'h' | 'l' | 'n' | 'm' | 'p' | '.' | 'backspace';
 export type SessionInputHistoryDirection = 'older' | 'newer';
 export type SessionInputHistoryNavigationResult = 'navigated' | 'blocked' | 'ignored';
 
-interface PendingApprovalState {
-    callId?: string;
-    keyboardApproveAt: number;
-}
-
-interface SearchKeyboardRouteInput {
-    key: string;
-    shiftKey?: boolean;
-    ctrlKey?: boolean;
-    metaKey?: boolean;
-    altKey?: boolean;
-}
-
-interface CreateSearchKeyboardRouterOptions {
-    getPendingApproval: () => PendingApprovalState | null;
-    getActiveSurface: () => SearchKeyboardSurface;
-    hasActivePopupWindowFocus: () => boolean;
-    getQueryText: () => string;
-    hasAttachments: () => boolean;
-    isQuickSearchOpen: () => boolean;
-    hasQuickSearchHighlight: () => boolean;
-    shouldTriggerQuickSearch: (query: string) => boolean;
-    isMultiLineCursor: () => boolean;
-    isCursorAtStart: () => boolean;
-    isCursorAtTextStart: () => boolean;
-    isCursorAtEnd: () => boolean;
-    hasModelOverride: () => boolean;
-    getSessionHistoryCount: () => number;
-    isLoading: () => boolean;
-    onPromptApprovalAttention: () => void;
-    onRejectApproval: (callId?: string) => void;
-    onApproveApproval: (callId?: string) => void;
-    onForwardToPopup: (key: string) => void;
-    onSubmit: () => void | Promise<void>;
-    onOpenQuickSearch: () => void;
-    onMoveQuickSearchSelection: (direction: SearchQuickSearchDirection) => void;
-    onOpenHighlightedQuickSearchItem: () => void | Promise<void>;
-    onCloseQuickSearch: () => void;
-    onQuickSearchPageUp: () => void;
-    onQuickSearchPageDown: () => void;
-    onQuickSearchContextMenu: () => void;
-    onQuickSearchToggleView: () => void;
-    onQuickSearchCollapse: () => void;
-    onNavigateInputHistory: (
-        direction: SessionInputHistoryDirection
-    ) => SessionInputHistoryNavigationResult;
-    onHideAllPopups: () => void | Promise<void>;
-    onCancelRequest: () => void;
-    onClearModelOverride: () => void;
-    onHideWindow: () => void | Promise<void>;
-    onClearSession: () => void;
-    onClearDraft: () => void;
-    onClearAll: () => void;
-    onPrimaryShortcut: (key: SearchPrimaryShortcutKey) => void | Promise<void>;
-}
-
 export interface UseSearchKeyboardOptions {
     viewReady: Ref<boolean>;
+    searchKeybindings: Readonly<Ref<SearchKeybindings>>;
     queryText: Ref<string>;
     attachments: Ref<unknown[]>;
     cursorContext: Ref<SearchCursorContext>;
@@ -697,289 +641,13 @@ export function useSearchOverlayMachine(options: UseSearchOverlayMachineOptions)
     };
 }
 
-/**
- * 在同步键盘路由中启动可能异步的副作用。
- */
-function runKeyboardEffect(effect: () => void | Promise<void>) {
-    void Promise.resolve(effect()).catch((error) => {
-        console.error('[SearchKeyboardRouter] Failed to handle keyboard effect:', error);
-    });
-}
-
-/**
- * 判断审批态下是否属于“误输入”。
- */
-function isTypingAttemptDuringApproval(input: SearchKeyboardRouteInput) {
-    if (input.ctrlKey || input.metaKey || input.altKey) {
-        return false;
-    }
-
-    return input.key.length === 1 || input.key === 'Backspace' || input.key === 'Delete';
-}
-
-/**
- * 判断是否命中 Ctrl/Cmd 主修饰键快捷键。
- */
-function resolvePrimaryShortcutKey(
-    input: SearchKeyboardRouteInput,
-    queryText: string,
-    isLoading: boolean
-): SearchPrimaryShortcutKey | null {
-    const hasPrimaryModifier = input.ctrlKey || input.metaKey;
-    if (!hasPrimaryModifier || input.altKey || input.shiftKey) {
-        return null;
-    }
-
-    const normalizedKey = input.key.toLowerCase();
-    if (normalizedKey === '.') {
-        return isLoading ? '.' : null;
-    }
-
-    if (normalizedKey === 'backspace') {
-        return queryText.trim() ? 'backspace' : null;
-    }
-
-    if (['h', 'l', 'n', 'm', 'p'].includes(normalizedKey)) {
-        return normalizedKey as SearchPrimaryShortcutKey;
-    }
-
-    return null;
-}
-
-/**
- * 纯键盘语义路由器。
- */
-export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOptions) {
-    const {
-        getPendingApproval,
-        getActiveSurface,
-        hasActivePopupWindowFocus,
-        getQueryText,
-        hasAttachments,
-        isQuickSearchOpen,
-        hasQuickSearchHighlight,
-        shouldTriggerQuickSearch,
-        isMultiLineCursor,
-        isCursorAtTextStart,
-        isCursorAtEnd,
-        hasModelOverride,
-        getSessionHistoryCount,
-        isLoading,
-        onPromptApprovalAttention,
-        onRejectApproval,
-        onApproveApproval,
-        onForwardToPopup,
-        onSubmit,
-        onOpenQuickSearch,
-        onMoveQuickSearchSelection,
-        onOpenHighlightedQuickSearchItem,
-        onCloseQuickSearch,
-        onQuickSearchPageUp,
-        onQuickSearchPageDown,
-        onQuickSearchContextMenu,
-        onQuickSearchToggleView,
-        onQuickSearchCollapse,
-        onNavigateInputHistory,
-        onHideAllPopups,
-        onCancelRequest,
-        onClearModelOverride,
-        onHideWindow,
-        onClearSession,
-        onClearDraft,
-        onPrimaryShortcut,
-    } = options;
-
-    function route(input: SearchKeyboardRouteInput) {
-        const queryText = getQueryText();
-        const pendingApproval = getPendingApproval();
-        if (pendingApproval) {
-            if (input.key === 'Escape' || input.key === 'Esc') {
-                onRejectApproval(pendingApproval.callId);
-                return true;
-            }
-
-            if (input.key === 'Enter') {
-                if (!input.shiftKey && Date.now() >= pendingApproval.keyboardApproveAt) {
-                    onApproveApproval(pendingApproval.callId);
-                } else {
-                    onPromptApprovalAttention();
-                }
-                return true;
-            }
-
-            if (isTypingAttemptDuringApproval(input)) {
-                onPromptApprovalAttention();
-                return true;
-            }
-        }
-
-        const primaryShortcut = resolvePrimaryShortcutKey(input, queryText, isLoading());
-        if (primaryShortcut) {
-            runKeyboardEffect(() => onPrimaryShortcut(primaryShortcut));
-            return true;
-        }
-
-        if (hasActivePopupWindowFocus()) {
-            return true;
-        }
-
-        if (input.key === 'Escape' || input.key === 'Esc') {
-            // 快速搜索有高亮时，Escape 只收缩面板、清除高亮，不走清空输入链路。
-            if (isQuickSearchOpen() && hasQuickSearchHighlight()) {
-                onQuickSearchCollapse();
-                return true;
-            }
-
-            if (getActiveSurface() !== 'search-surface') {
-                runKeyboardEffect(onHideAllPopups);
-                return true;
-            }
-
-            if (isLoading()) {
-                onCancelRequest();
-                return true;
-            }
-
-            // Step 1: Clear input text first without exiting the current conversation
-            if (queryText.trim()) {
-                onClearDraft();
-                return true;
-            }
-
-            // Step 2: Clear model selection
-            if (hasModelOverride()) {
-                onClearModelOverride();
-                return true;
-            }
-
-            // Step 3: Exit conversation if session exists
-            if (getSessionHistoryCount() > 0) {
-                onClearSession();
-                return true;
-            }
-
-            // Step 4: Hide window if no session
-            runKeyboardEffect(onHideWindow);
-            return true;
-        }
-
-        if (
-            getActiveSurface() === 'model-dropdown-surface' &&
-            ['ArrowUp', 'ArrowDown', 'Enter'].includes(input.key)
-        ) {
-            onForwardToPopup(input.key);
-            return true;
-        }
-
-        if (isQuickSearchOpen()) {
-            // PageUp/PageDown 翻页
-            if (input.key === 'PageUp') {
-                onQuickSearchPageUp();
-                return true;
-            }
-            if (input.key === 'PageDown') {
-                onQuickSearchPageDown();
-                return true;
-            }
-
-            // Menu 键或 Shift+F10 打开右键菜单
-            if (input.key === 'ContextMenu' || (input.key === 'F10' && input.shiftKey)) {
-                onQuickSearchContextMenu();
-                return true;
-            }
-
-            // Ctrl+G 切换网格/列表视图
-            if (input.key === 'g' && (input.ctrlKey || input.metaKey)) {
-                onQuickSearchToggleView();
-                return true;
-            }
-
-            if (hasQuickSearchHighlight()) {
-                const directionMap: Partial<Record<string, SearchQuickSearchDirection>> = {
-                    ArrowUp: 'up',
-                    ArrowDown: 'down',
-                    ArrowLeft: 'left',
-                    ArrowRight: 'right',
-                };
-                const direction = directionMap[input.key];
-                if (direction) {
-                    onMoveQuickSearchSelection(direction);
-                    return true;
-                }
-
-                if (input.key === 'Enter') {
-                    runKeyboardEffect(onOpenHighlightedQuickSearchItem);
-                    return true;
-                }
-            } else {
-                if (input.key === 'ArrowDown') {
-                    onMoveQuickSearchSelection('down');
-                    return true;
-                }
-
-                if (input.key === 'Enter' && !input.shiftKey) {
-                    onCloseQuickSearch();
-                    if (queryText.trim()) {
-                        runKeyboardEffect(onSubmit);
-                    }
-                    return true;
-                }
-            }
-        }
-
-        if (getActiveSurface() === 'search-surface' && !isQuickSearchOpen()) {
-            if (input.key === 'ArrowUp') {
-                if (isMultiLineCursor() && !isCursorAtTextStart()) {
-                    return false;
-                }
-
-                return onNavigateInputHistory('older') !== 'ignored';
-            }
-
-            if (input.key === 'ArrowDown') {
-                if (isMultiLineCursor() && !isCursorAtEnd()) {
-                    return false;
-                }
-
-                if (onNavigateInputHistory('newer') === 'navigated') {
-                    return true;
-                }
-
-                if (!shouldTriggerQuickSearch(queryText)) {
-                    return false;
-                }
-
-                if (queryText.trim() || hasAttachments()) {
-                    runKeyboardEffect(onSubmit);
-                    return true;
-                }
-
-                onOpenQuickSearch();
-                return true;
-            }
-        }
-
-        if (getActiveSurface() === 'search-surface' && input.key === 'Enter' && !input.shiftKey) {
-            if (queryText.trim() || hasAttachments()) {
-                runKeyboardEffect(onSubmit);
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    return {
-        route,
-    };
-}
-
 /**
  * 创建 SearchView 页面级键盘处理器。
  */
 export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
     const {
         viewReady,
+        searchKeybindings,
         queryText,
         attachments,
         cursorContext,
@@ -1015,7 +683,8 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
     } = options;
 
     let lastBackspaceTime = 0;
-    const keyboardRouter = createSearchKeyboardRouter({
+    const keyboardRouter = createConfigurableSearchKeyboardRouter({
+        getSearchKeybindings: () => searchKeybindings.value,
         getPendingApproval: () =>
             pendingToolApproval.value
                 ? {
@@ -1043,7 +712,6 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
         hasQuickSearchHighlight: () => controller.isQuickSearchItemHighlighted(),
         shouldTriggerQuickSearch,
         isMultiLineCursor: () => cursorContext.value.isMultiLine,
-        isCursorAtStart: () => cursorContext.value.cursorAtStart,
         isCursorAtTextStart: () => cursorContext.value.cursorAtTextStart,
         isCursorAtEnd: () => cursorContext.value.cursorAtEnd,
         hasModelOverride: () => Boolean(modelOverride.value.modelId),
@@ -1113,41 +781,35 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
         onClearAll: () => {
             clearAll();
         },
-        onPrimaryShortcut: async (key) => {
-            if (key === 'h') {
-                await openHistoryDialog();
-                return;
-            }
-
-            if (key === 'l') {
-                await hideAllPopups();
-                await controller.focusSearchInput();
-                return;
-            }
-
-            if (key === 'n') {
-                if (sessionHistory.value.length > 0) {
-                    await startNewSession();
-                }
-                return;
-            }
-
-            if (key === 'm') {
-                await toggleModelDropdown();
-                return;
-            }
-
-            if (key === 'p') {
-                await toggleWindowPin();
-                return;
-            }
-
-            if (key === '.') {
-                cancelRequest();
-                return;
+        onSearchKeybindingAction: async (actionId) => {
+            switch (actionId) {
+                case 'search.history.open':
+                    await openHistoryDialog();
+                    return;
+                case 'search.input.focus':
+                    await hideAllPopups();
+                    await controller.focusSearchInput();
+                    return;
+                case 'search.session.new':
+                    if (sessionHistory.value.length > 0) {
+                        await startNewSession();
+                    }
+                    return;
+                case 'search.model.toggle':
+                    await toggleModelDropdown();
+                    return;
+                case 'search.window.pin':
+                    await toggleWindowPin();
+                    return;
+                case 'search.request.cancel':
+                    cancelRequest();
+                    return;
+                case 'search.draft.clearAll':
+                    clearAll();
+                    return;
+                default:
+                    return;
             }
-
-            clearAll();
         },
     });
 
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index 1cf2a4d6..d210456a 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -115,7 +115,7 @@
     const inputHistoryRestoreVersion = ref(0);
     const mcpStore = useMcpStore();
     const settingsStore = useSettingsStore();
-    const { searchWindowDefaultSize } = storeToRefs(settingsStore);
+    const { searchWindowDefaultSize, searchKeybindings } = storeToRefs(settingsStore);
     const { sessionStatuses, refreshAllStatuses: refreshSessionStatuses } = useSessionStatus();
     const { isPinned, syncWindowPinState, setWindowPinned, toggleWindowPin } = useSearchWindowPin();
     const widgetBridgeWindow = window as Window & {
@@ -508,6 +508,7 @@
 
     useSearchKeyboard({
         viewReady,
+        searchKeybindings,
         queryText,
         attachments,
         cursorContext,
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index fe8aaed8..5ac0ec3e 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -7,6 +7,11 @@
     import { storeToRefs } from 'pinia';
     import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 
+    import {
+        getSearchKeybindingDefinition,
+        SEARCH_KEYBINDING_DEFINITIONS,
+        type SearchKeybindingActionId,
+    } from '@/config/searchKeybindings';
     import {
         resolveSearchWindowDefaultSize,
         type SearchWindowSizePreset,
@@ -20,6 +25,15 @@
         t,
     } from '@/i18n';
     import { type OutputScrollBehavior, useSettingsStore } from '@/stores/settings';
+    import {
+        captureShortcutFromKeyboardEvent,
+        findShortcutConflict,
+        formatShortcutForDisplay,
+        hasRequiredModifier,
+        isReservedLocalShortcut,
+        normalizeLocalShortcutString,
+        toCurrentPlatformShortcut,
+    } from '@/utils/shortcuts';
 
     import { resolveShortcutCaptureCompletion } from './shortcutCapture';
     import UpdateSettingsSection from './UpdateSettingsSection.vue';
@@ -74,6 +88,17 @@
         label: LOCALE_LABELS[value],
     }));
 
+    const searchShortcutRows = computed(() =>
+        SEARCH_KEYBINDING_DEFINITIONS.map((definition) => ({
+            ...definition,
+            label: t(definition.labelKey),
+            displayValue: searchShortcutDisplayMap.value[definition.id],
+            isCapturing: activeSearchShortcutActionId.value === definition.id,
+            hasError: searchShortcutErrorActionId.value === definition.id,
+            defaultDisplay: formatShortcutForDisplay(definition.defaultShortcut),
+        }))
+    );
+
     const shortcutInput = ref<HTMLInputElement | null>(null);
     const isSaving = ref(false);
     const isCapturing = ref(false);
@@ -83,6 +108,50 @@
     const pendingLanguage = ref<AppLocale>(settings.value.language);
     const alertMessage = ref<InstanceType<typeof AlertMessage> | null>(null);
     const shortcutRegistrationFailed = ref(false);
+    const activeSearchShortcutActionId = ref<SearchKeybindingActionId | null>(null);
+    const searchShortcutCapturedValue = ref<string | null>(null);
+    const hasCapturedSearchShortcut = ref(false);
+    const searchShortcutErrorActionId = ref<SearchKeybindingActionId | null>(null);
+    const searchShortcutDisplayMap = ref<Record<SearchKeybindingActionId, string>>(
+        SEARCH_KEYBINDING_DEFINITIONS.reduce(
+            (accumulator, definition) => {
+                accumulator[definition.id] = formatShortcutForDisplay(
+                    settings.value.searchKeybindings[definition.id]
+                );
+                return accumulator;
+            },
+            {} as Record<SearchKeybindingActionId, string>
+        )
+    );
+
+    function updateSearchShortcutDisplay(actionId: SearchKeybindingActionId, value: string) {
+        searchShortcutDisplayMap.value = {
+            ...searchShortcutDisplayMap.value,
+            [actionId]: value,
+        };
+    }
+
+    function syncSearchShortcutDisplays() {
+        const next = { ...searchShortcutDisplayMap.value };
+        for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
+            if (activeSearchShortcutActionId.value === definition.id) {
+                continue;
+            }
+            next[definition.id] = formatShortcutForDisplay(
+                settings.value.searchKeybindings[definition.id]
+            );
+        }
+        searchShortcutDisplayMap.value = next;
+    }
+
+    function reportSearchShortcutError(
+        actionId: SearchKeybindingActionId,
+        messageKey: MessageKey,
+        params?: MessageParams
+    ) {
+        searchShortcutErrorActionId.value = actionId;
+        alertMessage.value?.error(t(messageKey, params), 3000);
+    }
 
     // 键名映射表
     const keyNameMap: Record<string, string> = {
@@ -212,6 +281,172 @@
         await saveNewShortcut(shortcut);
     };
 
+    const captureSearchShortcut = (event: KeyboardEvent) => {
+        const actionId = activeSearchShortcutActionId.value;
+        if (!actionId) {
+            return;
+        }
+
+        event.preventDefault();
+        event.stopPropagation();
+
+        const captured = captureShortcutFromKeyboardEvent(event);
+        if (!captured) {
+            if (event.metaKey) {
+                alertMessage.value?.warning(t('settings.general.winKeyUnsupported'), 3000);
+            }
+            return;
+        }
+
+        searchShortcutCapturedValue.value = captured.shortcut;
+        hasCapturedSearchShortcut.value = true;
+        searchShortcutErrorActionId.value = null;
+        updateSearchShortcutDisplay(actionId, captured.displayShortcut);
+    };
+
+    const saveSearchShortcut = async (
+        actionId: SearchKeybindingActionId,
+        shortcut: string | null
+    ) => {
+        const normalizedShortcut =
+            shortcut === null ? null : normalizeLocalShortcutString(shortcut);
+        if (normalizedShortcut) {
+            if (!hasRequiredModifier(normalizedShortcut)) {
+                reportSearchShortcutError(
+                    actionId,
+                    'settings.general.searchShortcuts.errors.modifierRequired'
+                );
+                updateSearchShortcutDisplay(
+                    actionId,
+                    formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                );
+                return;
+            }
+
+            if (isReservedLocalShortcut(normalizedShortcut)) {
+                reportSearchShortcutError(
+                    actionId,
+                    'settings.general.searchShortcuts.errors.reserved'
+                );
+                updateSearchShortcutDisplay(
+                    actionId,
+                    formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                );
+                return;
+            }
+
+            const conflictActionId = findShortcutConflict(
+                normalizedShortcut,
+                SEARCH_KEYBINDING_DEFINITIONS.map((definition) => ({
+                    id: definition.id,
+                    shortcut: settings.value.searchKeybindings[definition.id],
+                })),
+                actionId
+            );
+            if (conflictActionId) {
+                reportSearchShortcutError(
+                    actionId,
+                    'settings.general.searchShortcuts.errors.duplicate',
+                    {
+                        action: t(getSearchKeybindingDefinition(conflictActionId).labelKey),
+                    }
+                );
+                updateSearchShortcutDisplay(
+                    actionId,
+                    formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                );
+                return;
+            }
+
+            const comparableGlobalShortcut = normalizeLocalShortcutString(
+                settings.value.globalShortcut
+            );
+            const comparableLocalShortcut = normalizeLocalShortcutString(
+                toCurrentPlatformShortcut(normalizedShortcut)
+            );
+            if (
+                comparableGlobalShortcut &&
+                comparableLocalShortcut &&
+                comparableGlobalShortcut === comparableLocalShortcut
+            ) {
+                reportSearchShortcutError(
+                    actionId,
+                    'settings.general.searchShortcuts.errors.globalConflict'
+                );
+                updateSearchShortcutDisplay(
+                    actionId,
+                    formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                );
+                return;
+            }
+        }
+
+        isSaving.value = true;
+        searchShortcutErrorActionId.value = null;
+        try {
+            await settingsStore.updateSearchKeybindings({
+                ...settings.value.searchKeybindings,
+                [actionId]: normalizedShortcut,
+            });
+            updateSearchShortcutDisplay(actionId, formatShortcutForDisplay(normalizedShortcut));
+            alertMessage.value?.success(t('common.saved'), 2000);
+        } catch (error) {
+            console.error('Failed to save search shortcut:', error);
+            reportSearchShortcutError(actionId, 'settings.general.saveSettingsFailed');
+            updateSearchShortcutDisplay(
+                actionId,
+                formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+            );
+        } finally {
+            isSaving.value = false;
+        }
+    };
+
+    const startSearchShortcutCapture = (actionId: SearchKeybindingActionId) => {
+        activeSearchShortcutActionId.value = actionId;
+        hasCapturedSearchShortcut.value = false;
+        searchShortcutCapturedValue.value = null;
+        searchShortcutErrorActionId.value = null;
+        updateSearchShortcutDisplay(actionId, shortcutCapturePrompt.value);
+    };
+
+    const stopSearchShortcutCaptureAndSave = async (actionId: SearchKeybindingActionId) => {
+        if (activeSearchShortcutActionId.value !== actionId) {
+            return;
+        }
+
+        activeSearchShortcutActionId.value = null;
+
+        if (!hasCapturedSearchShortcut.value || !searchShortcutCapturedValue.value) {
+            updateSearchShortcutDisplay(
+                actionId,
+                formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+            );
+            return;
+        }
+
+        if (
+            normalizeLocalShortcutString(searchShortcutCapturedValue.value) ===
+            normalizeLocalShortcutString(settings.value.searchKeybindings[actionId])
+        ) {
+            updateSearchShortcutDisplay(
+                actionId,
+                formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+            );
+            return;
+        }
+
+        await saveSearchShortcut(actionId, searchShortcutCapturedValue.value);
+    };
+
+    const resetSearchShortcut = async (actionId: SearchKeybindingActionId) => {
+        await saveSearchShortcut(actionId, getSearchKeybindingDefinition(actionId).defaultShortcut);
+    };
+
+    const disableSearchShortcut = async (actionId: SearchKeybindingActionId) => {
+        await saveSearchShortcut(actionId, null);
+    };
+
     // 监听 isCapturing 状态，添加/移除全局键盘监听
     watch(isCapturing, (newValue) => {
         if (newValue) {
@@ -221,6 +456,13 @@
         }
     });
 
+    watch(activeSearchShortcutActionId, (actionId) => {
+        window.removeEventListener('keydown', captureSearchShortcut);
+        if (actionId) {
+            window.addEventListener('keydown', captureSearchShortcut);
+        }
+    });
+
     watch(
         () => settings.value.globalShortcut,
         (shortcut) => {
@@ -230,6 +472,14 @@
         }
     );
 
+    watch(
+        () => settings.value.searchKeybindings,
+        () => {
+            syncSearchShortcutDisplays();
+        },
+        { deep: true, immediate: true }
+    );
+
     watch(
         () => settings.value.language,
         (language) => {
@@ -415,6 +665,7 @@
     // 组件卸载时清理事件监听
     onUnmounted(() => {
         window.removeEventListener('keydown', captureShortcut);
+        window.removeEventListener('keydown', captureSearchShortcut);
     });
 </script>
 
@@ -524,6 +775,75 @@
                         </div>
                     </div>
                 </div>
+
+                <div>
+                    <h3 class="settings-section-title text-[14px]">
+                        {{ t('settings.general.searchShortcuts') }}
+                    </h3>
+                    <p class="settings-section-description">
+                        {{ t('settings.general.searchShortcutsDescription') }}
+                    </p>
+                </div>
+
+                <div class="settings-row-group divide-y divide-neutral-200/70">
+                    <div
+                        v-for="row in searchShortcutRows"
+                        :key="row.id"
+                        class="grid min-w-0 gap-4 px-5 py-4 sm:grid-cols-[minmax(0,1fr)_420px] sm:items-center"
+                    >
+                        <div
+                            data-testid="settings-general-row-label"
+                            class="min-w-0 text-[13px] leading-6 font-normal text-neutral-900"
+                        >
+                            <div>{{ row.label }}</div>
+                            <div class="text-[11px] text-neutral-500">
+                                {{ t('common.default') }} · {{ row.defaultDisplay }}
+                            </div>
+                        </div>
+                        <div class="min-w-0 justify-self-end">
+                            <div class="flex min-w-0 items-center justify-end gap-2">
+                                <div class="relative w-[180px] shrink-0">
+                                    <input
+                                        :value="row.displayValue"
+                                        :data-testid="`settings-search-shortcut-input-${row.id}`"
+                                        type="text"
+                                        readonly
+                                        :class="[
+                                            'w-full rounded-[10px] border px-3 py-2 text-center font-mono text-[12px] shadow-none [box-shadow:none] transition-colors focus:shadow-none focus:[box-shadow:none] focus:outline-none',
+                                            row.hasError
+                                                ? 'border-red-300 bg-red-50 text-red-600'
+                                                : row.isCapturing
+                                                  ? 'border-primary-300 bg-white text-neutral-950'
+                                                  : 'focus:border-primary-300 border-transparent bg-[#f0f0ef] text-neutral-900 hover:bg-[#ececea]',
+                                            isSaving ? 'cursor-wait opacity-50' : 'cursor-pointer',
+                                        ]"
+                                        :disabled="isSaving"
+                                        :placeholder="t('settings.general.shortcutPlaceholder')"
+                                        @focus="startSearchShortcutCapture(row.id)"
+                                        @blur="stopSearchShortcutCaptureAndSave(row.id)"
+                                    />
+                                </div>
+                                <button
+                                    class="rounded-[10px] border border-neutral-200 px-3 py-2 text-[12px] text-neutral-700 transition-colors hover:bg-neutral-50 disabled:cursor-not-allowed disabled:opacity-50"
+                                    :disabled="isSaving"
+                                    :data-testid="`settings-search-shortcut-reset-${row.id}`"
+                                    @click="resetSearchShortcut(row.id)"
+                                >
+                                    {{ t('common.default') }}
+                                </button>
+                                <button
+                                    v-if="row.allowDisable"
+                                    class="rounded-[10px] border border-neutral-200 px-3 py-2 text-[12px] text-neutral-700 transition-colors hover:bg-neutral-50 disabled:cursor-not-allowed disabled:opacity-50"
+                                    :disabled="isSaving"
+                                    :data-testid="`settings-search-shortcut-disable-${row.id}`"
+                                    @click="disableSearchShortcut(row.id)"
+                                >
+                                    {{ t('common.disabled') }}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </section>
 
             <section class="space-y-4">
diff --git a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
index 5f357024..461287c1 100644
--- a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
+++ b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
@@ -7,7 +7,6 @@ import {
     createPopupSurfaceCoordinator,
     createSearchEntryPolicy,
     createSearchInteractionContext,
-    createSearchKeyboardRouter,
     createSessionInputHistoryBrowseState,
     extractSessionInputHistoryEntries,
     navigateSessionInputHistory,
@@ -66,11 +65,6 @@ function createControllerStub() {
     } satisfies SearchPageController;
 }
 
-async function flushMicrotasks() {
-    await Promise.resolve();
-    await Promise.resolve();
-}
-
 describe('extractSessionInputHistoryEntries', () => {
     it('returns only user prompts that still have visible input history content', () => {
         const entries = extractSessionInputHistoryEntries([
@@ -329,150 +323,3 @@ describe('useSearchOverlayMachine', () => {
         mounted.unmount();
     });
 });
-
-describe('createSearchKeyboardRouter', () => {
-    function createKeyboardRouter(
-        overrides: Partial<Parameters<typeof createSearchKeyboardRouter>[0]> = {}
-    ) {
-        const callbacks = {
-            onPromptApprovalAttention: vi.fn(),
-            onRejectApproval: vi.fn(),
-            onApproveApproval: vi.fn(),
-            onForwardToPopup: vi.fn(),
-            onSubmit: vi.fn(),
-            onOpenQuickSearch: vi.fn(),
-            onMoveQuickSearchSelection: vi.fn(),
-            onOpenHighlightedQuickSearchItem: vi.fn(),
-            onCloseQuickSearch: vi.fn(),
-            onQuickSearchPageUp: vi.fn(),
-            onQuickSearchPageDown: vi.fn(),
-            onQuickSearchContextMenu: vi.fn(),
-            onQuickSearchToggleView: vi.fn(),
-            onQuickSearchCollapse: vi.fn(),
-            onNavigateInputHistory: vi.fn(() => 'ignored' as const),
-            onHideAllPopups: vi.fn(),
-            onCancelRequest: vi.fn(),
-            onClearModelOverride: vi.fn(),
-            onHideWindow: vi.fn(),
-            onClearSession: vi.fn(),
-            onClearDraft: vi.fn(),
-            onClearAll: vi.fn(),
-            onPrimaryShortcut: vi.fn(),
-        };
-
-        return {
-            callbacks,
-            router: createSearchKeyboardRouter({
-                getPendingApproval: () => null,
-                getActiveSurface: () => 'search-surface',
-                hasActivePopupWindowFocus: () => false,
-                getQueryText: () => '',
-                hasAttachments: () => false,
-                isQuickSearchOpen: () => false,
-                hasQuickSearchHighlight: () => false,
-                shouldTriggerQuickSearch: () => false,
-                isMultiLineCursor: () => false,
-                isCursorAtStart: () => true,
-                isCursorAtTextStart: () => true,
-                isCursorAtEnd: () => true,
-                hasModelOverride: () => false,
-                getSessionHistoryCount: () => 0,
-                isLoading: () => false,
-                ...callbacks,
-                ...overrides,
-            }),
-        };
-    }
-
-    it('rejects pending approval with escape before normal surface handling', () => {
-        const { router, callbacks } = createKeyboardRouter({
-            getPendingApproval: () => ({
-                callId: 'approval-1',
-                keyboardApproveAt: Date.now() + 1_000,
-            }),
-        });
-
-        const handled = router.route({ key: 'Escape' });
-
-        expect(handled).toBe(true);
-        expect(callbacks.onRejectApproval).toHaveBeenCalledWith('approval-1');
-    });
-
-    it('submits when ArrowDown cannot navigate newer history and query text is present', () => {
-        const { router, callbacks } = createKeyboardRouter({
-            getQueryText: () => 'touch',
-            shouldTriggerQuickSearch: () => true,
-            onNavigateInputHistory: vi.fn(() => 'ignored' as const),
-        });
-
-        const handled = router.route({ key: 'ArrowDown' });
-
-        expect(handled).toBe(true);
-        expect(callbacks.onSubmit).toHaveBeenCalledTimes(1);
-        expect(callbacks.onOpenQuickSearch).not.toHaveBeenCalled();
-    });
-
-    it('opens quick search when ArrowDown cannot navigate newer history and query is empty with eligible trigger', () => {
-        const { router, callbacks } = createKeyboardRouter({
-            getQueryText: () => '',
-            shouldTriggerQuickSearch: () => true,
-            hasAttachments: () => false,
-            onNavigateInputHistory: vi.fn(() => 'ignored' as const),
-        });
-
-        const handled = router.route({ key: 'ArrowDown' });
-
-        expect(handled).toBe(true);
-        expect(callbacks.onOpenQuickSearch).toHaveBeenCalledTimes(1);
-    });
-
-    it('does not navigate input history when multiline cursor is not at the text start', () => {
-        const { router, callbacks } = createKeyboardRouter({
-            isMultiLineCursor: () => true,
-            isCursorAtTextStart: () => false,
-        });
-
-        const handled = router.route({ key: 'ArrowUp' });
-
-        expect(handled).toBe(false);
-        expect(callbacks.onNavigateInputHistory).not.toHaveBeenCalled();
-    });
-
-    it('forwards model-dropdown arrow keys to the popup surface contract', () => {
-        const { router, callbacks } = createKeyboardRouter({
-            getActiveSurface: () => 'model-dropdown-surface',
-        });
-
-        const handled = router.route({ key: 'ArrowDown' });
-
-        expect(handled).toBe(true);
-        expect(callbacks.onForwardToPopup).toHaveBeenCalledWith('ArrowDown');
-    });
-
-    it('clears the draft before model/session/window dismissal on escape', () => {
-        const { router, callbacks } = createKeyboardRouter({
-            getQueryText: () => 'hello',
-        });
-
-        const handled = router.route({ key: 'Escape' });
-
-        expect(handled).toBe(true);
-        expect(callbacks.onClearDraft).toHaveBeenCalledTimes(1);
-        expect(callbacks.onClearModelOverride).not.toHaveBeenCalled();
-        expect(callbacks.onClearSession).not.toHaveBeenCalled();
-        expect(callbacks.onHideWindow).not.toHaveBeenCalled();
-    });
-
-    it('fires the stop-request primary shortcut only while the request is still loading', async () => {
-        const { router, callbacks } = createKeyboardRouter({
-            getQueryText: () => '',
-            isLoading: () => true,
-        });
-
-        const handled = router.route({ key: '.', ctrlKey: true });
-        await flushMicrotasks();
-
-        expect(handled).toBe(true);
-        expect(callbacks.onPrimaryShortcut).toHaveBeenCalledWith('.');
-    });
-});
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index e186d6ae..f140538d 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -1,5 +1,6 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
+import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
 import { createSearchKeyboardRouter } from '@/views/SearchView/composables/interaction/useSearchKeyboardRouter';
 
 async function flushAsyncWork() {
@@ -10,7 +11,7 @@ async function flushAsyncWork() {
 function createKeyboardRouter(
     overrides: Partial<Parameters<typeof createSearchKeyboardRouter>[0]> = {}
 ) {
-    const callbacks = {
+    const defaultCallbacks = {
         onPromptApprovalAttention: vi.fn(),
         onRejectApproval: vi.fn(),
         onApproveApproval: vi.fn(),
@@ -20,6 +21,12 @@ function createKeyboardRouter(
         onMoveQuickSearchSelection: vi.fn(),
         onOpenHighlightedQuickSearchItem: vi.fn(),
         onCloseQuickSearch: vi.fn(),
+        onQuickSearchPageUp: vi.fn(),
+        onQuickSearchPageDown: vi.fn(),
+        onQuickSearchContextMenu: vi.fn(),
+        onQuickSearchToggleView: vi.fn(),
+        onQuickSearchCollapse: vi.fn(),
+        onNavigateInputHistory: vi.fn(() => 'ignored' as const),
         onHideAllPopups: vi.fn(),
         onCancelRequest: vi.fn(),
         onClearModelOverride: vi.fn(),
@@ -27,27 +34,31 @@ function createKeyboardRouter(
         onClearSession: vi.fn(),
         onClearDraft: vi.fn(),
         onClearAll: vi.fn(),
-        onPrimaryShortcut: vi.fn(),
+        onSearchKeybindingAction: vi.fn(),
+    };
+    const routerOptions = {
+        getSearchKeybindings: () => createDefaultSearchKeybindings(),
+        getPendingApproval: () => null,
+        getActiveSurface: () => 'search-surface' as const,
+        hasActivePopupWindowFocus: () => false,
+        getQueryText: () => '',
+        hasAttachments: () => false,
+        isQuickSearchOpen: () => false,
+        hasQuickSearchHighlight: () => false,
+        shouldTriggerQuickSearch: () => false,
+        isMultiLineCursor: () => false,
+        isCursorAtTextStart: () => true,
+        isCursorAtEnd: () => true,
+        hasModelOverride: () => false,
+        getSessionHistoryCount: () => 0,
+        isLoading: () => false,
+        ...defaultCallbacks,
+        ...overrides,
     };
 
     return {
-        callbacks,
-        router: createSearchKeyboardRouter({
-            getPendingApproval: () => null,
-            getActiveSurface: () => 'search-surface',
-            hasActivePopupWindowFocus: () => false,
-            getQueryText: () => '',
-            hasAttachments: () => false,
-            isQuickSearchOpen: () => false,
-            hasQuickSearchHighlight: () => false,
-            shouldTriggerQuickSearch: () => false,
-            isMultiLineCursor: () => false,
-            hasModelOverride: () => false,
-            getSessionHistoryCount: () => 0,
-            isLoading: () => false,
-            ...callbacks,
-            ...overrides,
-        }),
+        callbacks: routerOptions,
+        router: createSearchKeyboardRouter(routerOptions),
     };
 }
 
@@ -89,8 +100,23 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onApproveApproval).toHaveBeenCalledWith('approval-2');
     });
 
-    it('runs primary shortcuts only when their guard conditions are satisfied', async () => {
+    it('routes configurable command shortcuts through the action callback', async () => {
+        const { router, callbacks } = createKeyboardRouter({
+            getSearchKeybindings: () => ({
+                ...createDefaultSearchKeybindings(),
+                'search.history.open': 'Mod+Y',
+            }),
+        });
+
+        expect(router.route({ key: 'y', ctrlKey: true })).toBe(true);
+        await flushAsyncWork();
+
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.history.open');
+    });
+
+    it('only routes cancel and clear actions when their guard conditions are satisfied', async () => {
         const { router, callbacks } = createKeyboardRouter({
+            getSearchKeybindings: () => createDefaultSearchKeybindings(),
             getQueryText: () => 'touchai',
             isLoading: () => true,
         });
@@ -100,8 +126,14 @@ describe('createSearchKeyboardRouter', () => {
         expect(router.route({ key: '.', ctrlKey: true, shiftKey: true })).toBe(false);
         await flushAsyncWork();
 
-        expect(callbacks.onPrimaryShortcut).toHaveBeenNthCalledWith(1, 'backspace');
-        expect(callbacks.onPrimaryShortcut).toHaveBeenNthCalledWith(2, '.');
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenNthCalledWith(
+            1,
+            'search.draft.clearAll'
+        );
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenNthCalledWith(
+            2,
+            'search.request.cancel'
+        );
     });
 
     it('applies the escape fallback order on the search surface', async () => {
@@ -181,27 +213,30 @@ describe('createSearchKeyboardRouter', () => {
         expect(quickSearchRouter.callbacks.onSubmit).toHaveBeenCalledTimes(1);
 
         const openRouter = createKeyboardRouter({
-            getQueryText: () => 'touch',
+            getQueryText: () => '',
             shouldTriggerQuickSearch: () => true,
         });
         expect(openRouter.router.route({ key: 'ArrowDown' })).toBe(true);
         expect(openRouter.callbacks.onOpenQuickSearch).toHaveBeenCalledTimes(1);
     });
 
-    it('submits ArrowUp on a single-line cursor and leaves multiline editing alone', async () => {
+    it('uses input-history navigation for ArrowUp and leaves multiline editing alone', async () => {
         const singleLineRouter = createKeyboardRouter({
             getQueryText: () => 'submit me',
             isMultiLineCursor: () => false,
+            isCursorAtTextStart: () => true,
+            onNavigateInputHistory: vi.fn(() => 'navigated' as const),
         });
         expect(singleLineRouter.router.route({ key: 'ArrowUp' })).toBe(true);
-        await flushAsyncWork();
-        expect(singleLineRouter.callbacks.onSubmit).toHaveBeenCalledTimes(1);
+        expect(singleLineRouter.callbacks.onNavigateInputHistory).toHaveBeenCalledWith('older');
 
         const multiLineRouter = createKeyboardRouter({
             getQueryText: () => 'keep editing',
             isMultiLineCursor: () => true,
+            isCursorAtTextStart: () => false,
         });
         expect(multiLineRouter.router.route({ key: 'ArrowUp' })).toBe(false);
-        expect(multiLineRouter.callbacks.onSubmit).not.toHaveBeenCalled();
+        expect(multiLineRouter.callbacks.onNavigateInputHistory).not.toHaveBeenCalled();
+        await flushAsyncWork();
     });
 });
diff --git a/apps/desktop/tests/stores/settings-keybindings.test.ts b/apps/desktop/tests/stores/settings-keybindings.test.ts
new file mode 100644
index 00000000..a7ac425a
--- /dev/null
+++ b/apps/desktop/tests/stores/settings-keybindings.test.ts
@@ -0,0 +1,125 @@
+import { AppEvent } from '@services/EventService';
+import { createPinia, setActivePinia } from 'pinia';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
+
+const { eventHandlers, eventServiceMock, getSettingValueMock, setSettingMock, windowMock } =
+    vi.hoisted(() => ({
+        eventHandlers: new Map<string, (payload: unknown) => void>(),
+        eventServiceMock: {
+            emit: vi.fn(),
+            on: vi.fn(async (event: string, handler: (payload: unknown) => void) => {
+                eventHandlers.set(event, handler);
+                return () => {
+                    eventHandlers.delete(event);
+                };
+            }),
+        },
+        getSettingValueMock: vi.fn(),
+        setSettingMock: vi.fn(),
+        windowMock: {
+            label: 'settings',
+        },
+    }));
+
+vi.mock('@database/queries', () => ({
+    getSettingValue: getSettingValueMock,
+    setSetting: setSettingMock,
+}));
+
+vi.mock('@services/EventService', async () => {
+    const actual =
+        await vi.importActual<typeof import('@services/EventService')>('@services/EventService');
+    return {
+        ...actual,
+        eventService: eventServiceMock,
+    };
+});
+
+vi.mock('@tauri-apps/api/window', () => ({
+    getCurrentWindow: () => windowMock,
+}));
+
+function mockSettings(values: Record<string, string | null>) {
+    getSettingValueMock.mockImplementation(async ({ key }: { key: string }) => values[key] ?? null);
+    setSettingMock.mockImplementation(async ({ key, value }: { key: string; value: string }) => ({
+        id: 1,
+        key,
+        value,
+        created_at: '2026-06-03 00:00:00',
+        updated_at: '2026-06-03 00:00:00',
+    }));
+}
+
+describe('settings search keybindings state', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        eventHandlers.clear();
+        setActivePinia(createPinia());
+        windowMock.label = 'settings';
+    });
+
+    it('persists default search keybindings when the row is missing', async () => {
+        mockSettings({});
+
+        const { useSettingsStore } = await import('@/stores/settings');
+        const store = useSettingsStore();
+
+        await store.initialize();
+
+        expect(store.settings.searchKeybindings).toEqual(createDefaultSearchKeybindings());
+        expect(setSettingMock).toHaveBeenCalledWith({
+            key: 'search_keybindings',
+            value: JSON.stringify(createDefaultSearchKeybindings()),
+        });
+    });
+
+    it('loads persisted search keybindings and merges missing defaults', async () => {
+        mockSettings({
+            search_keybindings: JSON.stringify({
+                'search.history.open': 'Mod+Y',
+                'search.request.cancel': null,
+            }),
+        });
+
+        const { useSettingsStore } = await import('@/stores/settings');
+        const store = useSettingsStore();
+
+        await store.initialize();
+
+        expect(store.settings.searchKeybindings['search.history.open']).toBe('Mod+Y');
+        expect(store.settings.searchKeybindings['search.request.cancel']).toBeNull();
+        expect(store.settings.searchKeybindings['search.input.focus']).toBe(
+            createDefaultSearchKeybindings()['search.input.focus']
+        );
+    });
+
+    it('updates search keybindings, persists them, and broadcasts the change', async () => {
+        mockSettings({});
+
+        const { useSettingsStore } = await import('@/stores/settings');
+        const store = useSettingsStore();
+        await store.initialize();
+
+        const nextKeybindings = {
+            ...createDefaultSearchKeybindings(),
+            'search.input.focus': 'Mod+K',
+            'search.request.cancel': null,
+        };
+
+        await store.updateSearchKeybindings(nextKeybindings);
+
+        expect(store.settings.searchKeybindings).toEqual(nextKeybindings);
+        expect(setSettingMock).toHaveBeenLastCalledWith({
+            key: 'search_keybindings',
+            value: JSON.stringify(nextKeybindings),
+        });
+        expect(eventServiceMock.emit).toHaveBeenLastCalledWith(AppEvent.SETTINGS_GENERAL_UPDATED, {
+            sourceId: expect.any(String),
+            windowLabel: 'settings',
+            key: 'search_keybindings',
+            value: nextKeybindings,
+        });
+    });
+});
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 05b0bd40..b0ec16b0 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -8,6 +8,15 @@ const settingsStoreMock = vi.hoisted(() => ({
     settings: {
         value: {
             globalShortcut: 'Alt+Space',
+            searchKeybindings: {
+                'search.history.open': 'Mod+H',
+                'search.input.focus': 'Mod+L',
+                'search.session.new': 'Mod+N',
+                'search.model.toggle': 'Mod+M',
+                'search.window.pin': 'Mod+P',
+                'search.request.cancel': 'Mod+.',
+                'search.draft.clearAll': 'Mod+Backspace',
+            },
             startOnBoot: false,
             startMinimized: true,
             language: 'zh-CN',
@@ -21,6 +30,7 @@ const settingsStoreMock = vi.hoisted(() => ({
     },
     initialize: vi.fn().mockResolvedValue(undefined),
     updateGlobalShortcut: vi.fn().mockResolvedValue(undefined),
+    updateSearchKeybindings: vi.fn().mockResolvedValue(undefined),
     updateStartOnBoot: vi.fn().mockResolvedValue(undefined),
     updateStartMinimized: vi.fn().mockResolvedValue(undefined),
     updateOutputScrollBehavior: vi.fn().mockResolvedValue(undefined),
@@ -162,6 +172,9 @@ describe('SettingsGeneralSection', () => {
         expect(wrapper.text()).toContain('唤起快捷键');
         expect(wrapper.text()).toContain('Alt+Space');
         expect(wrapper.text()).toContain('Ctrl+Space');
+        expect(wrapper.text()).toContain('搜索页快捷键');
+        expect(wrapper.text()).toContain('打开会话历史');
+        expect(wrapper.text()).toContain('开始新会话');
         expect(wrapper.text()).toContain('启动与窗口');
         expect(wrapper.text()).toContain('开机自启动');
         expect(wrapper.text()).toContain('启动时最小化');
@@ -187,7 +200,7 @@ describe('SettingsGeneralSection', () => {
         expect(controls.length).toBeGreaterThanOrEqual(3);
 
         const rowLabels = wrapper.findAll('[data-testid="settings-general-row-label"]');
-        expect(rowLabels).toHaveLength(8);
+        expect(rowLabels.length).toBeGreaterThanOrEqual(13);
     });
 
     it('shows the current version in the latest update details', async () => {

From 70d89aaec1ee3f5ee3023dc60add245fff6eab54 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Thu, 4 Jun 2026 22:59:30 +0800
Subject: [PATCH 02/55] feat: customize shortcut settings UI

---
 apps/desktop/src/components/appIconMap.ts     |   2 +
 apps/desktop/src/config/searchKeybindings.ts  |   9 +
 apps/desktop/src/i18n/messages.ts             |  14 +-
 apps/desktop/src/utils/shortcuts.ts           |  15 +
 .../composables/searchInteraction.ts          |  10 +-
 .../SettingsView/components/General/index.vue | 386 +++++++++++++-----
 .../SettingsView/general-language.test.ts     |   2 +
 .../SearchView/searchInteraction.test.ts      |  68 ++-
 .../useSearchKeyboardRouter.test.ts           |  27 ++
 .../tests/stores/settings-keybindings.test.ts |   4 +
 .../settingsGeneralComponent.test.ts          | 287 +++++++++++--
 11 files changed, 662 insertions(+), 162 deletions(-)

diff --git a/apps/desktop/src/components/appIconMap.ts b/apps/desktop/src/components/appIconMap.ts
index b91e1752..8421d3d4 100644
--- a/apps/desktop/src/components/appIconMap.ts
+++ b/apps/desktop/src/components/appIconMap.ts
@@ -39,6 +39,7 @@ import IconShow from '~icons/bx/show';
 import IconStop from '~icons/bx/stop';
 import IconTrash from '~icons/bx/trash';
 import IconTrashAlt from '~icons/bx/trash-alt';
+import IconUndo from '~icons/bx/undo';
 import IconWrench from '~icons/bx/wrench';
 import IconX from '~icons/bx/x';
 import IconXCircle from '~icons/bx/x-circle';
@@ -82,6 +83,7 @@ export const appIconMap = {
     stop: IconStop,
     tool: IconBriefcase,
     trash: IconTrash,
+    undo: IconUndo,
     bug: IconBug,
     wrench: IconWrench,
     x: IconX,
diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index b54295c6..13fff367 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -7,6 +7,7 @@ export const SEARCH_KEYBINDING_ACTION_IDS = [
     'search.session.new',
     'search.model.toggle',
     'search.window.pin',
+    'search.window.maximize',
     'search.request.cancel',
     'search.draft.clearAll',
 ] as const;
@@ -18,6 +19,7 @@ export interface SearchKeybindingDefinition {
     labelKey: MessageKey;
     defaultShortcut: string | null;
     allowDisable: boolean;
+    allowModifierlessFunctionKey?: boolean;
 }
 
 export type SearchKeybindings = Record<SearchKeybindingActionId, string | null>;
@@ -53,6 +55,13 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         defaultShortcut: 'Mod+P',
         allowDisable: true,
     },
+    {
+        id: 'search.window.maximize',
+        labelKey: 'settings.general.searchActions.windowMaximize',
+        defaultShortcut: 'F11',
+        allowDisable: true,
+        allowModifierlessFunctionKey: true,
+    },
     {
         id: 'search.request.cancel',
         labelKey: 'settings.general.searchActions.cancelRequest',
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 5dd69641..b6e16954 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -75,7 +75,6 @@ const zhCNMessages = {
     'settings.general.title': '常规设置',
     'settings.general.description': '配置应用的基本行为和外观',
     'settings.general.shortcuts': '快捷键',
-    'settings.general.shortcutsDescription': '设置桌面唤起 TouchAI 的全局入口',
     'settings.general.globalShortcut': '全局快捷键',
     'settings.general.activationShortcut': '唤起快捷键',
     'settings.general.shortcutPlaceholder': '点击输入框设置快捷键',
@@ -87,14 +86,18 @@ const zhCNMessages = {
         '点击输入框后按下您想要设置的快捷键组合。支持的修饰键：Ctrl、Alt、Shift',
     'settings.general.winKeyUnsupported': '不支持 Win 键组合，请使用 Ctrl、Alt、Shift',
     'settings.general.shortcutSaved': '快捷键保存成功',
-    'settings.general.searchShortcuts': '搜索页快捷键',
+    'settings.general.globalShortcutGroup': '全局唤起',
     'settings.general.searchShortcutsDescription':
         '自定义搜索窗口内的命令型快捷键，不会影响输入导航与全局唤起。',
+    'settings.general.searchShortcutGroups.session': '会话',
+    'settings.general.searchShortcutGroups.inputAndRequest': '输入与请求',
+    'settings.general.searchShortcutGroups.window': '窗口',
     'settings.general.searchActions.history': '打开会话历史',
     'settings.general.searchActions.focusInput': '聚焦输入框',
     'settings.general.searchActions.newSession': '开始新会话',
     'settings.general.searchActions.modelToggle': '切换模型选择',
     'settings.general.searchActions.windowPin': '切换窗口置顶',
+    'settings.general.searchActions.windowMaximize': '切换窗口最大化',
     'settings.general.searchActions.cancelRequest': '取消当前请求',
     'settings.general.searchActions.clearAll': '清空草稿与上下文',
     'settings.general.searchShortcuts.errors.modifierRequired': '快捷键至少需要一个修饰键',
@@ -818,7 +821,6 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.title': 'General settings',
     'settings.general.description': 'Configure basic app behavior and appearance',
     'settings.general.shortcuts': 'Shortcuts',
-    'settings.general.shortcutsDescription': 'Set the global entry point for opening TouchAI',
     'settings.general.globalShortcut': 'Global shortcut',
     'settings.general.activationShortcut': 'Activation shortcut',
     'settings.general.shortcutPlaceholder': 'Click the field to set a shortcut',
@@ -832,14 +834,18 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.winKeyUnsupported':
         'Win key combinations are not supported. Use Ctrl, Alt, or Shift.',
     'settings.general.shortcutSaved': 'Shortcut saved',
-    'settings.general.searchShortcuts': 'Search shortcuts',
+    'settings.general.globalShortcutGroup': 'Global activation',
     'settings.general.searchShortcutsDescription':
         'Customize command shortcuts inside the search window without changing typing, navigation, or the global activation shortcut.',
+    'settings.general.searchShortcutGroups.session': 'Session',
+    'settings.general.searchShortcutGroups.inputAndRequest': 'Input and request',
+    'settings.general.searchShortcutGroups.window': 'Window',
     'settings.general.searchActions.history': 'Open session history',
     'settings.general.searchActions.focusInput': 'Focus input',
     'settings.general.searchActions.newSession': 'Start new session',
     'settings.general.searchActions.modelToggle': 'Toggle model picker',
     'settings.general.searchActions.windowPin': 'Toggle window pin',
+    'settings.general.searchActions.windowMaximize': 'Toggle window maximize',
     'settings.general.searchActions.cancelRequest': 'Cancel current request',
     'settings.general.searchActions.clearAll': 'Clear draft and context',
     'settings.general.searchShortcuts.errors.modifierRequired':
diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index 8dd73ae8..a01f86cc 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -282,6 +282,21 @@ export function hasRequiredModifier(shortcut: string | null | undefined): boolea
     return modifiers.length > 0;
 }
 
+export function isModifierlessFunctionShortcut(shortcut: string | null | undefined): boolean {
+    const normalized = normalizeLocalShortcutString(shortcut);
+    if (!normalized) {
+        return false;
+    }
+
+    const match = /^F(\d{1,2})$/.exec(normalized);
+    if (!match) {
+        return false;
+    }
+
+    const functionKeyNumber = Number(match[1]);
+    return functionKeyNumber >= 1 && functionKeyNumber <= 12;
+}
+
 export function findShortcutConflict<T extends string>(
     shortcut: string | null | undefined,
     entries: Array<{ id: T; shortcut: string | null | undefined }>,
diff --git a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
index eb79ce15..97c19b31 100644
--- a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
+++ b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
@@ -801,6 +801,9 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
                 case 'search.window.pin':
                     await toggleWindowPin();
                     return;
+                case 'search.window.maximize':
+                    await toggleWindowMaximize();
+                    return;
                 case 'search.request.cancel':
                     cancelRequest();
                     return;
@@ -840,13 +843,6 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
             return;
         }
 
-        if (event.key === 'F11') {
-            event.preventDefault();
-            event.stopPropagation();
-            await toggleWindowMaximize();
-            return;
-        }
-
         const handledByRouter = keyboardRouter.route({
             key: event.key,
             shiftKey: event.shiftKey,
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 5ac0ec3e..ef0aa8c0 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
     import AlertMessage from '@components/AlertMessage.vue';
     import AppIcon from '@components/AppIcon.vue';
     import CustomSelect from '@components/CustomSelect.vue';
@@ -30,6 +30,7 @@
         findShortcutConflict,
         formatShortcutForDisplay,
         hasRequiredModifier,
+        isModifierlessFunctionShortcut,
         isReservedLocalShortcut,
         normalizeLocalShortcutString,
         toCurrentPlatformShortcut,
@@ -44,6 +45,7 @@
 
     const settingsStore = useSettingsStore();
     const { settings } = storeToRefs(settingsStore);
+    type SearchShortcutIconAction = 'clear' | 'restore';
 
     const outputScrollBehaviorOptions = computed(
         (): Array<{
@@ -88,17 +90,69 @@
         label: LOCALE_LABELS[value],
     }));
 
+    function formatSearchShortcutForSettings(shortcut: string | null | undefined): string {
+        const normalizedShortcut = normalizeLocalShortcutString(shortcut);
+        return normalizedShortcut ? formatShortcutForDisplay(normalizedShortcut) : '无';
+    }
+
     const searchShortcutRows = computed(() =>
-        SEARCH_KEYBINDING_DEFINITIONS.map((definition) => ({
-            ...definition,
-            label: t(definition.labelKey),
-            displayValue: searchShortcutDisplayMap.value[definition.id],
-            isCapturing: activeSearchShortcutActionId.value === definition.id,
-            hasError: searchShortcutErrorActionId.value === definition.id,
-            defaultDisplay: formatShortcutForDisplay(definition.defaultShortcut),
-        }))
+        SEARCH_KEYBINDING_DEFINITIONS.map((definition) => {
+            const currentShortcut = settings.value.searchKeybindings[definition.id];
+            const isDefaultShortcut =
+                normalizeLocalShortcutString(currentShortcut) ===
+                normalizeLocalShortcutString(definition.defaultShortcut);
+            const shortcutAction: SearchShortcutIconAction = isDefaultShortcut
+                ? 'clear'
+                : 'restore';
+
+            return {
+                ...definition,
+                label: t(definition.labelKey),
+                displayValue: searchShortcutDisplayMap.value[definition.id],
+                isCapturing: activeSearchShortcutActionId.value === definition.id,
+                hasError: searchShortcutErrorActionId.value === definition.id,
+                shortcutAction,
+                shortcutActionLabel:
+                    shortcutAction === 'clear'
+                        ? t('common.clear')
+                        : `${t('window.restore')} ${t('common.default')}`,
+            };
+        })
     );
 
+    const searchShortcutGroups = computed(() => {
+        const rowById = new Map(searchShortcutRows.value.map((row) => [row.id, row]));
+        const groups: Array<{
+            title: string;
+            actionIds: SearchKeybindingActionId[];
+        }> = [
+            {
+                title: t('settings.general.searchShortcutGroups.session'),
+                actionIds: ['search.history.open', 'search.session.new'],
+            },
+            {
+                title: t('settings.general.searchShortcutGroups.inputAndRequest'),
+                actionIds: [
+                    'search.input.focus',
+                    'search.model.toggle',
+                    'search.request.cancel',
+                    'search.draft.clearAll',
+                ],
+            },
+            {
+                title: t('settings.general.searchShortcutGroups.window'),
+                actionIds: ['search.window.pin', 'search.window.maximize'],
+            },
+        ];
+
+        return groups.map((group) => ({
+            title: group.title,
+            rows: group.actionIds
+                .map((actionId) => rowById.get(actionId))
+                .filter((row): row is NonNullable<typeof row> => Boolean(row)),
+        }));
+    });
+
     const shortcutInput = ref<HTMLInputElement | null>(null);
     const isSaving = ref(false);
     const isCapturing = ref(false);
@@ -108,6 +162,8 @@
     const pendingLanguage = ref<AppLocale>(settings.value.language);
     const alertMessage = ref<InstanceType<typeof AlertMessage> | null>(null);
     const shortcutRegistrationFailed = ref(false);
+    const showGlobalShortcutPresetMenu = ref(false);
+    const globalShortcutPresetOptions = ['Alt+Space', 'Ctrl+Space'] as const;
     const activeSearchShortcutActionId = ref<SearchKeybindingActionId | null>(null);
     const searchShortcutCapturedValue = ref<string | null>(null);
     const hasCapturedSearchShortcut = ref(false);
@@ -115,7 +171,7 @@
     const searchShortcutDisplayMap = ref<Record<SearchKeybindingActionId, string>>(
         SEARCH_KEYBINDING_DEFINITIONS.reduce(
             (accumulator, definition) => {
-                accumulator[definition.id] = formatShortcutForDisplay(
+                accumulator[definition.id] = formatSearchShortcutForSettings(
                     settings.value.searchKeybindings[definition.id]
                 );
                 return accumulator;
@@ -137,7 +193,7 @@
             if (activeSearchShortcutActionId.value === definition.id) {
                 continue;
             }
-            next[definition.id] = formatShortcutForDisplay(
+            next[definition.id] = formatSearchShortcutForSettings(
                 settings.value.searchKeybindings[definition.id]
             );
         }
@@ -153,6 +209,24 @@
         alertMessage.value?.error(t(messageKey, params), 3000);
     }
 
+    function findGlobalShortcutSearchConflict(shortcut: string) {
+        const normalizedShortcut = normalizeLocalShortcutString(shortcut);
+        if (!normalizedShortcut) {
+            return null;
+        }
+
+        for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
+            const searchShortcut = normalizeLocalShortcutString(
+                toCurrentPlatformShortcut(settings.value.searchKeybindings[definition.id])
+            );
+            if (searchShortcut && searchShortcut === normalizedShortcut) {
+                return definition;
+            }
+        }
+
+        return null;
+    }
+
     // 键名映射表
     const keyNameMap: Record<string, string> = {
         Control: 'Ctrl',
@@ -204,6 +278,8 @@
         const shortcut = [...modifiers, keyName].join('+');
         displayShortcut.value = shortcut;
         hasCapturedShortcut.value = true;
+        showGlobalShortcutPresetMenu.value = false;
+        void confirmCapturedShortcut(shortcut);
     };
 
     // 开始捕获（输入框获得焦点）
@@ -211,6 +287,21 @@
         isCapturing.value = true;
         hasCapturedShortcut.value = false;
         displayShortcut.value = shortcutCapturePrompt.value;
+        showGlobalShortcutPresetMenu.value = true;
+    };
+
+    const confirmCapturedShortcut = async (shortcut: string) => {
+        if (!isCapturing.value) return;
+
+        isCapturing.value = false;
+        showGlobalShortcutPresetMenu.value = false;
+
+        if (shortcut === settings.value.globalShortcut) {
+            displayShortcut.value = settings.value.globalShortcut;
+            return;
+        }
+
+        await saveNewShortcut(shortcut);
     };
 
     // 停止捕获并保存（输入框失去焦点）
@@ -218,6 +309,7 @@
         if (!isCapturing.value) return;
 
         isCapturing.value = false;
+        showGlobalShortcutPresetMenu.value = false;
 
         const completion = resolveShortcutCaptureCompletion({
             currentShortcut: settings.value.globalShortcut,
@@ -236,6 +328,19 @@
 
     // 保存新快捷键的通用函数
     const saveNewShortcut = async (newShortcut: string) => {
+        const searchConflict = findGlobalShortcutSearchConflict(newShortcut);
+        if (searchConflict) {
+            shortcutRegistrationFailed.value = false;
+            displayShortcut.value = settings.value.globalShortcut;
+            alertMessage.value?.error(
+                t('settings.general.searchShortcuts.errors.duplicate', {
+                    action: t(searchConflict.labelKey),
+                }),
+                3000
+            );
+            return;
+        }
+
         isSaving.value = true;
         shortcutRegistrationFailed.value = false;
 
@@ -268,6 +373,8 @@
 
     // 使用建议的快捷键
     const useSuggestedShortcut = async (shortcut: string) => {
+        showGlobalShortcutPresetMenu.value = false;
+
         // 如果正在捕获，先取消捕获
         if (isCapturing.value) {
             isCapturing.value = false;
@@ -302,6 +409,7 @@
         hasCapturedSearchShortcut.value = true;
         searchShortcutErrorActionId.value = null;
         updateSearchShortcutDisplay(actionId, captured.displayShortcut);
+        void confirmCapturedSearchShortcut(actionId, captured.shortcut);
     };
 
     const saveSearchShortcut = async (
@@ -311,14 +419,19 @@
         const normalizedShortcut =
             shortcut === null ? null : normalizeLocalShortcutString(shortcut);
         if (normalizedShortcut) {
-            if (!hasRequiredModifier(normalizedShortcut)) {
+            const definition = getSearchKeybindingDefinition(actionId);
+            const allowsModifierlessFunctionShortcut =
+                definition.allowModifierlessFunctionKey &&
+                isModifierlessFunctionShortcut(normalizedShortcut);
+
+            if (!hasRequiredModifier(normalizedShortcut) && !allowsModifierlessFunctionShortcut) {
                 reportSearchShortcutError(
                     actionId,
                     'settings.general.searchShortcuts.errors.modifierRequired'
                 );
                 updateSearchShortcutDisplay(
                     actionId,
-                    formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                    formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
                 );
                 return;
             }
@@ -330,7 +443,7 @@
                 );
                 updateSearchShortcutDisplay(
                     actionId,
-                    formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                    formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
                 );
                 return;
             }
@@ -353,7 +466,7 @@
                 );
                 updateSearchShortcutDisplay(
                     actionId,
-                    formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                    formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
                 );
                 return;
             }
@@ -375,7 +488,7 @@
                 );
                 updateSearchShortcutDisplay(
                     actionId,
-                    formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                    formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
                 );
                 return;
             }
@@ -388,14 +501,17 @@
                 ...settings.value.searchKeybindings,
                 [actionId]: normalizedShortcut,
             });
-            updateSearchShortcutDisplay(actionId, formatShortcutForDisplay(normalizedShortcut));
+            updateSearchShortcutDisplay(
+                actionId,
+                formatSearchShortcutForSettings(normalizedShortcut)
+            );
             alertMessage.value?.success(t('common.saved'), 2000);
         } catch (error) {
             console.error('Failed to save search shortcut:', error);
             reportSearchShortcutError(actionId, 'settings.general.saveSettingsFailed');
             updateSearchShortcutDisplay(
                 actionId,
-                formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
             );
         } finally {
             isSaving.value = false;
@@ -410,6 +526,32 @@
         updateSearchShortcutDisplay(actionId, shortcutCapturePrompt.value);
     };
 
+    const confirmCapturedSearchShortcut = async (
+        actionId: SearchKeybindingActionId,
+        shortcut: string
+    ) => {
+        if (activeSearchShortcutActionId.value !== actionId) {
+            return;
+        }
+
+        activeSearchShortcutActionId.value = null;
+        hasCapturedSearchShortcut.value = false;
+        searchShortcutCapturedValue.value = null;
+
+        if (
+            normalizeLocalShortcutString(shortcut) ===
+            normalizeLocalShortcutString(settings.value.searchKeybindings[actionId])
+        ) {
+            updateSearchShortcutDisplay(
+                actionId,
+                formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
+            );
+            return;
+        }
+
+        await saveSearchShortcut(actionId, shortcut);
+    };
+
     const stopSearchShortcutCaptureAndSave = async (actionId: SearchKeybindingActionId) => {
         if (activeSearchShortcutActionId.value !== actionId) {
             return;
@@ -420,7 +562,7 @@
         if (!hasCapturedSearchShortcut.value || !searchShortcutCapturedValue.value) {
             updateSearchShortcutDisplay(
                 actionId,
-                formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
             );
             return;
         }
@@ -431,7 +573,7 @@
         ) {
             updateSearchShortcutDisplay(
                 actionId,
-                formatShortcutForDisplay(settings.value.searchKeybindings[actionId])
+                formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
             );
             return;
         }
@@ -447,6 +589,28 @@
         await saveSearchShortcut(actionId, null);
     };
 
+    const handleSearchShortcutIconAction = async (
+        actionId: SearchKeybindingActionId,
+        action: SearchShortcutIconAction
+    ) => {
+        if (activeSearchShortcutActionId.value === actionId) {
+            activeSearchShortcutActionId.value = null;
+            hasCapturedSearchShortcut.value = false;
+            searchShortcutCapturedValue.value = null;
+            updateSearchShortcutDisplay(
+                actionId,
+                formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
+            );
+        }
+
+        if (action === 'clear') {
+            await disableSearchShortcut(actionId);
+            return;
+        }
+
+        await resetSearchShortcut(actionId);
+    };
+
     // 监听 isCapturing 状态，添加/移除全局键盘监听
     watch(isCapturing, (newValue) => {
         if (newValue) {
@@ -683,14 +847,15 @@
                     <h2 class="settings-section-title">
                         {{ t('settings.general.shortcuts') }}
                     </h2>
-                    <p class="settings-section-description">
-                        {{ t('settings.general.shortcutsDescription') }}
-                    </p>
+                </div>
+
+                <div class="px-1 text-[12px] leading-5 font-medium text-neutral-500">
+                    {{ t('settings.general.globalShortcutGroup') }}
                 </div>
 
                 <div
                     data-testid="settings-general-card-shortcut"
-                    class="settings-row-group divide-y divide-neutral-200/70"
+                    class="settings-row-group divide-y divide-neutral-200/70 overflow-visible"
                 >
                     <div
                         class="grid min-w-0 gap-4 px-5 py-4 sm:grid-cols-[minmax(0,1fr)_360px] sm:items-center"
@@ -704,35 +869,12 @@
                         <div class="min-w-0 justify-self-end">
                             <div
                                 data-testid="settings-shortcut-control-row"
-                                class="flex min-w-0 items-center justify-end gap-3 text-[11px]"
+                                class="flex min-w-0 items-center justify-end text-[11px]"
                             >
-                                <div
-                                    data-testid="settings-shortcut-suggestions"
-                                    class="shrink-0 text-left whitespace-nowrap"
-                                >
-                                    <span class="text-[11px] text-neutral-400">
-                                        {{ t('settings.general.suggestionsShort') }}
-                                    </span>
-                                    <button
-                                        class="text-primary-700 decoration-primary-300 hover:text-primary-600 ml-2 font-mono text-[11px] underline underline-offset-2 transition-colors disabled:cursor-not-allowed disabled:opacity-50"
-                                        :disabled="isSaving"
-                                        @click="useSuggestedShortcut('Alt+Space')"
-                                    >
-                                        Alt+Space
-                                    </button>
-                                    <span class="mx-1.5 text-neutral-300">|</span>
-                                    <button
-                                        class="text-primary-700 decoration-primary-300 hover:text-primary-600 font-mono text-[11px] underline underline-offset-2 transition-colors disabled:cursor-not-allowed disabled:opacity-50"
-                                        :disabled="isSaving"
-                                        @click="useSuggestedShortcut('Ctrl+Space')"
-                                    >
-                                        Ctrl+Space
-                                    </button>
-                                </div>
-                                <div data-testid="settings-general-control" class="w-[180px]">
+                                <div data-testid="settings-general-control" class="w-[220px]">
                                     <div
                                         data-testid="settings-general-shortcut-input-wrap"
-                                        class="relative ml-auto w-[180px] shrink-0"
+                                        class="relative ml-auto w-[220px] shrink-0"
                                     >
                                         <input
                                             ref="shortcutInput"
@@ -741,7 +883,10 @@
                                             type="text"
                                             readonly
                                             :class="[
-                                                'w-full rounded-[10px] border px-3 py-2 text-center font-mono text-[12px] shadow-none [box-shadow:none] transition-colors focus:shadow-none focus:[box-shadow:none] focus:outline-none',
+                                                'w-full rounded-[10px] border px-3 py-2 text-center text-[12px] shadow-none [box-shadow:none] transition-colors focus:shadow-none focus:[box-shadow:none] focus:outline-none',
+                                                showGlobalShortcutPresetMenu
+                                                    ? 'rounded-b-none border-b-0'
+                                                    : '',
                                                 shortcutRegistrationFailed
                                                     ? 'border-red-300 bg-red-50 text-red-600'
                                                     : isCapturing
@@ -769,6 +914,24 @@
                                                 class="h-3.5 w-3.5"
                                             />
                                         </span>
+                                        <div
+                                            v-if="showGlobalShortcutPresetMenu"
+                                            data-testid="settings-global-shortcut-preset-menu"
+                                            class="border-primary-300 absolute top-full right-0 z-20 w-full overflow-hidden rounded-[10px] rounded-t-none border border-t-0 bg-white py-1 shadow-lg"
+                                        >
+                                            <button
+                                                v-for="shortcut in globalShortcutPresetOptions"
+                                                :key="shortcut"
+                                                type="button"
+                                                class="block w-full px-3 py-2 text-center text-[12px] text-neutral-800 transition-colors hover:bg-neutral-100 disabled:cursor-not-allowed disabled:opacity-50"
+                                                :disabled="isSaving"
+                                                :data-testid="`settings-global-shortcut-preset-${shortcut}`"
+                                                @mousedown.prevent
+                                                @click="useSuggestedShortcut(shortcut)"
+                                            >
+                                                {{ shortcut }}
+                                            </button>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -776,70 +939,71 @@
                     </div>
                 </div>
 
-                <div>
-                    <h3 class="settings-section-title text-[14px]">
-                        {{ t('settings.general.searchShortcuts') }}
-                    </h3>
-                    <p class="settings-section-description">
-                        {{ t('settings.general.searchShortcutsDescription') }}
-                    </p>
-                </div>
-
-                <div class="settings-row-group divide-y divide-neutral-200/70">
-                    <div
-                        v-for="row in searchShortcutRows"
-                        :key="row.id"
-                        class="grid min-w-0 gap-4 px-5 py-4 sm:grid-cols-[minmax(0,1fr)_420px] sm:items-center"
-                    >
+                <div v-for="group in searchShortcutGroups" :key="group.title" class="space-y-2">
+                    <div class="px-1 text-[12px] leading-5 font-medium text-neutral-500">
+                        {{ group.title }}
+                    </div>
+                    <div class="settings-row-group divide-y divide-neutral-200/70">
                         <div
-                            data-testid="settings-general-row-label"
-                            class="min-w-0 text-[13px] leading-6 font-normal text-neutral-900"
+                            v-for="row in group.rows"
+                            :key="row.id"
+                            class="grid min-w-0 gap-4 px-5 py-4 sm:grid-cols-[minmax(0,1fr)_220px] sm:items-center"
                         >
-                            <div>{{ row.label }}</div>
-                            <div class="text-[11px] text-neutral-500">
-                                {{ t('common.default') }} · {{ row.defaultDisplay }}
+                            <div
+                                data-testid="settings-general-row-label"
+                                class="min-w-0 text-[13px] leading-6 font-normal text-neutral-900"
+                            >
+                                <div>{{ row.label }}</div>
                             </div>
-                        </div>
-                        <div class="min-w-0 justify-self-end">
-                            <div class="flex min-w-0 items-center justify-end gap-2">
-                                <div class="relative w-[180px] shrink-0">
-                                    <input
-                                        :value="row.displayValue"
-                                        :data-testid="`settings-search-shortcut-input-${row.id}`"
-                                        type="text"
-                                        readonly
-                                        :class="[
-                                            'w-full rounded-[10px] border px-3 py-2 text-center font-mono text-[12px] shadow-none [box-shadow:none] transition-colors focus:shadow-none focus:[box-shadow:none] focus:outline-none',
-                                            row.hasError
-                                                ? 'border-red-300 bg-red-50 text-red-600'
-                                                : row.isCapturing
-                                                  ? 'border-primary-300 bg-white text-neutral-950'
-                                                  : 'focus:border-primary-300 border-transparent bg-[#f0f0ef] text-neutral-900 hover:bg-[#ececea]',
-                                            isSaving ? 'cursor-wait opacity-50' : 'cursor-pointer',
-                                        ]"
-                                        :disabled="isSaving"
-                                        :placeholder="t('settings.general.shortcutPlaceholder')"
-                                        @focus="startSearchShortcutCapture(row.id)"
-                                        @blur="stopSearchShortcutCaptureAndSave(row.id)"
-                                    />
+                            <div class="min-w-0 justify-self-end">
+                                <div class="flex min-w-0 items-center justify-end">
+                                    <div class="relative w-[220px] shrink-0">
+                                        <input
+                                            :value="row.displayValue"
+                                            :data-testid="`settings-search-shortcut-input-${row.id}`"
+                                            type="text"
+                                            readonly
+                                            :class="[
+                                                'w-full rounded-[10px] border px-9 py-2 text-center text-[12px] shadow-none [box-shadow:none] transition-colors focus:shadow-none focus:[box-shadow:none] focus:outline-none',
+                                                row.hasError
+                                                    ? 'border-red-300 bg-red-50 text-red-600'
+                                                    : row.isCapturing
+                                                      ? 'border-primary-300 bg-white text-neutral-950'
+                                                      : 'focus:border-primary-300 border-transparent bg-[#f0f0ef] text-neutral-900 hover:bg-[#ececea]',
+                                                isSaving
+                                                    ? 'cursor-wait opacity-50'
+                                                    : 'cursor-pointer',
+                                            ]"
+                                            :disabled="isSaving"
+                                            :placeholder="t('settings.general.shortcutPlaceholder')"
+                                            @focus="startSearchShortcutCapture(row.id)"
+                                            @blur="stopSearchShortcutCaptureAndSave(row.id)"
+                                        />
+                                        <button
+                                            type="button"
+                                            class="absolute top-1/2 right-2.5 flex h-6 w-6 -translate-y-1/2 items-center justify-center rounded-md text-neutral-500 transition-colors hover:bg-neutral-200/70 hover:text-neutral-900 disabled:cursor-not-allowed disabled:opacity-50"
+                                            :disabled="isSaving"
+                                            :title="row.shortcutActionLabel"
+                                            :aria-label="row.shortcutActionLabel"
+                                            :data-testid="`settings-search-shortcut-action-${row.id}`"
+                                            :data-shortcut-action="row.shortcutAction"
+                                            @mousedown.prevent
+                                            @click="
+                                                handleSearchShortcutIconAction(
+                                                    row.id,
+                                                    row.shortcutAction
+                                                )
+                                            "
+                                        >
+                                            <AppIcon
+                                                :name="
+                                                    row.shortcutAction === 'clear' ? 'x' : 'undo'
+                                                "
+                                                class="h-4 w-4"
+                                            />
+                                        </button>
+                                    </div>
                                 </div>
-                                <button
-                                    class="rounded-[10px] border border-neutral-200 px-3 py-2 text-[12px] text-neutral-700 transition-colors hover:bg-neutral-50 disabled:cursor-not-allowed disabled:opacity-50"
-                                    :disabled="isSaving"
-                                    :data-testid="`settings-search-shortcut-reset-${row.id}`"
-                                    @click="resetSearchShortcut(row.id)"
-                                >
-                                    {{ t('common.default') }}
-                                </button>
-                                <button
-                                    v-if="row.allowDisable"
-                                    class="rounded-[10px] border border-neutral-200 px-3 py-2 text-[12px] text-neutral-700 transition-colors hover:bg-neutral-50 disabled:cursor-not-allowed disabled:opacity-50"
-                                    :disabled="isSaving"
-                                    :data-testid="`settings-search-shortcut-disable-${row.id}`"
-                                    @click="disableSearchShortcut(row.id)"
-                                >
-                                    {{ t('common.disabled') }}
-                                </button>
                             </div>
                         </div>
                     </div>
diff --git a/apps/desktop/tests/SettingsView/general-language.test.ts b/apps/desktop/tests/SettingsView/general-language.test.ts
index 07da4c83..f716f726 100644
--- a/apps/desktop/tests/SettingsView/general-language.test.ts
+++ b/apps/desktop/tests/SettingsView/general-language.test.ts
@@ -166,6 +166,8 @@ describe('Settings General shortcut capture i18n', () => {
 
         expect(wrapper.text()).toContain('General');
         expect(wrapper.text()).toContain('Shortcuts');
+        expect(wrapper.text()).toContain('Search shortcuts');
+        expect(wrapper.text()).toContain('Toggle window maximize');
         expect(wrapper.text()).toContain('Set the global entry point for opening TouchAI');
         expect(wrapper.text()).toContain('Activation shortcut');
         expect(wrapper.text()).toContain('Startup and window');
diff --git a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
index 461287c1..28a4ac65 100644
--- a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
+++ b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
@@ -1,12 +1,15 @@
 import { mountComposable } from '@tests/utils/composables';
-import { afterEach, describe, expect, it, vi } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { computed, nextTick, ref } from 'vue';
 
+import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
 import { createInputHistorySnapshot, type SessionMessage } from '@/types/session';
 import {
     createPopupSurfaceCoordinator,
     createSearchEntryPolicy,
     createSearchInteractionContext,
+    createSearchKeydownHandler,
     createSessionInputHistoryBrowseState,
     extractSessionInputHistoryEntries,
     navigateSessionInputHistory,
@@ -30,6 +33,10 @@ function createUserMessage(id: string, overrides: Partial<SessionMessage> = {}):
     };
 }
 
+beforeEach(() => {
+    setActivePinia(createPinia());
+});
+
 function createControllerStub() {
     return {
         focusConversation: vi.fn(),
@@ -287,6 +294,65 @@ describe('useQuickSearchCoordinator', () => {
     });
 });
 
+describe('createSearchKeydownHandler', () => {
+    it('routes the default F11 maximize shortcut to the maximize callback', async () => {
+        const controller = createControllerStub();
+        const toggleWindowMaximize = vi.fn().mockResolvedValue(undefined);
+        const handleKeyDown = createSearchKeydownHandler({
+            viewReady: ref(true),
+            searchKeybindings: ref(createDefaultSearchKeybindings()),
+            queryText: ref(''),
+            attachments: ref([]),
+            cursorContext: ref<SearchCursorContext>({
+                isMultiLine: false,
+                cursorAtStart: true,
+                cursorAtTextStart: true,
+                cursorAtEnd: true,
+            }),
+            modelOverride: ref<SearchModelOverride>({
+                modelId: null,
+                providerId: null,
+            }),
+            modelDropdownState: ref({ isOpen: false }),
+            controller,
+            sessionHistory: ref([]),
+            pendingRequest: ref(null),
+            isWaitingForCompletion: ref(false),
+            isLoading: ref(false),
+            pendingToolApproval: ref(null),
+            approvePendingToolApproval: vi.fn(() => false),
+            rejectPendingToolApproval: vi.fn(() => false),
+            promptPendingToolApprovalAttention: vi.fn(),
+            getActivePopupType: () => null,
+            hasActivePopupWindowFocus: () => false,
+            isQuickSearchOpen: computed(() => false),
+            shouldTriggerQuickSearch: () => false,
+            sessionHistoryPopupOpen: ref(false),
+            hideAllPopups: vi.fn().mockResolvedValue(undefined),
+            hideSearchWindow: vi.fn().mockResolvedValue(undefined),
+            navigateInputHistory: vi.fn(() => 'ignored'),
+            closeModelDropdown: vi.fn().mockResolvedValue(undefined),
+            toggleModelDropdown: vi.fn().mockResolvedValue(undefined),
+            openHistoryDialog: vi.fn().mockResolvedValue(undefined),
+            startNewSession: vi.fn().mockResolvedValue(undefined),
+            toggleWindowPin: vi.fn().mockResolvedValue(undefined),
+            toggleWindowMaximize,
+            handleSubmit: vi.fn().mockResolvedValue(undefined),
+            clearAll: vi.fn(),
+            cancelRequest: vi.fn(),
+            clearSession: vi.fn(),
+        });
+
+        const event = new KeyboardEvent('keydown', { key: 'F11', cancelable: true });
+        await handleKeyDown(event);
+        await Promise.resolve();
+        await Promise.resolve();
+
+        expect(toggleWindowMaximize).toHaveBeenCalledTimes(1);
+        expect(event.defaultPrevented).toBe(true);
+    });
+});
+
 describe('useSearchOverlayMachine', () => {
     afterEach(() => {
         document.body.innerHTML = '';
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index f140538d..ab944f5d 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -114,6 +114,33 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.history.open');
     });
 
+    it('routes the default maximize shortcut through the action callback', async () => {
+        const { router, callbacks } = createKeyboardRouter({
+            getSearchKeybindings: () => createDefaultSearchKeybindings(),
+        });
+
+        expect(router.route({ key: 'F11' })).toBe(true);
+        await flushAsyncWork();
+
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.window.maximize');
+    });
+
+    it('stops routing raw F11 after the maximize shortcut is remapped', async () => {
+        const { router, callbacks } = createKeyboardRouter({
+            getSearchKeybindings: () => ({
+                ...createDefaultSearchKeybindings(),
+                'search.window.maximize': 'F12',
+            }),
+        });
+
+        expect(router.route({ key: 'F11' })).toBe(false);
+        expect(router.route({ key: 'F12' })).toBe(true);
+        await flushAsyncWork();
+
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledTimes(1);
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.window.maximize');
+    });
+
     it('only routes cancel and clear actions when their guard conditions are satisfied', async () => {
         const { router, callbacks } = createKeyboardRouter({
             getSearchKeybindings: () => createDefaultSearchKeybindings(),
diff --git a/apps/desktop/tests/stores/settings-keybindings.test.ts b/apps/desktop/tests/stores/settings-keybindings.test.ts
index a7ac425a..bd620180 100644
--- a/apps/desktop/tests/stores/settings-keybindings.test.ts
+++ b/apps/desktop/tests/stores/settings-keybindings.test.ts
@@ -69,6 +69,7 @@ describe('settings search keybindings state', () => {
         await store.initialize();
 
         expect(store.settings.searchKeybindings).toEqual(createDefaultSearchKeybindings());
+        expect(store.settings.searchKeybindings['search.window.maximize']).toBe('F11');
         expect(setSettingMock).toHaveBeenCalledWith({
             key: 'search_keybindings',
             value: JSON.stringify(createDefaultSearchKeybindings()),
@@ -90,6 +91,9 @@ describe('settings search keybindings state', () => {
 
         expect(store.settings.searchKeybindings['search.history.open']).toBe('Mod+Y');
         expect(store.settings.searchKeybindings['search.request.cancel']).toBeNull();
+        expect(store.settings.searchKeybindings['search.window.maximize']).toBe(
+            createDefaultSearchKeybindings()['search.window.maximize']
+        );
         expect(store.settings.searchKeybindings['search.input.focus']).toBe(
             createDefaultSearchKeybindings()['search.input.focus']
         );
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index b0ec16b0..326508d1 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -4,42 +4,48 @@ import { vi } from 'vitest';
 
 import GeneralSection from '@/views/SettingsView/components/General/index.vue';
 
-const settingsStoreMock = vi.hoisted(() => ({
-    settings: {
-        value: {
-            globalShortcut: 'Alt+Space',
-            searchKeybindings: {
-                'search.history.open': 'Mod+H',
-                'search.input.focus': 'Mod+L',
-                'search.session.new': 'Mod+N',
-                'search.model.toggle': 'Mod+M',
-                'search.window.pin': 'Mod+P',
-                'search.request.cancel': 'Mod+.',
-                'search.draft.clearAll': 'Mod+Backspace',
-            },
-            startOnBoot: false,
-            startMinimized: true,
-            language: 'zh-CN',
-            outputScrollBehavior: 'follow_output',
-            searchWindowSizePreset: 'normal',
-            searchWindowDefaultSize: { width: 720, height: 520 },
-            appUpdateChannel: 'stable',
-            appUpdateAutoCheck: true,
-            appUpdateLastCheckedAt: null,
+const settingsStoreMock = vi.hoisted(() => {
+    const createGeneralSettingsMock = () => ({
+        globalShortcut: 'Alt+Space',
+        searchKeybindings: {
+            'search.history.open': 'Mod+H',
+            'search.input.focus': 'Mod+L',
+            'search.session.new': 'Mod+N',
+            'search.model.toggle': 'Mod+M',
+            'search.window.pin': 'Mod+P',
+            'search.window.maximize': 'F11',
+            'search.request.cancel': 'Mod+.',
+            'search.draft.clearAll': 'Mod+Backspace',
+        } as Record<string, string | null>,
+        startOnBoot: false,
+        startMinimized: true,
+        language: 'zh-CN',
+        outputScrollBehavior: 'follow_output',
+        searchWindowSizePreset: 'normal',
+        searchWindowDefaultSize: { width: 720, height: 520 },
+        appUpdateChannel: 'stable',
+        appUpdateAutoCheck: true,
+        appUpdateLastCheckedAt: null,
+    });
+
+    return {
+        createGeneralSettingsMock,
+        settings: {
+            value: createGeneralSettingsMock(),
         },
-    },
-    initialize: vi.fn().mockResolvedValue(undefined),
-    updateGlobalShortcut: vi.fn().mockResolvedValue(undefined),
-    updateSearchKeybindings: vi.fn().mockResolvedValue(undefined),
-    updateStartOnBoot: vi.fn().mockResolvedValue(undefined),
-    updateStartMinimized: vi.fn().mockResolvedValue(undefined),
-    updateOutputScrollBehavior: vi.fn().mockResolvedValue(undefined),
-    updateSearchWindowSizePreset: vi.fn().mockResolvedValue(undefined),
-    updateLanguage: vi.fn().mockResolvedValue(undefined),
-    updateAppUpdateChannel: vi.fn().mockResolvedValue(undefined),
-    updateAppUpdateAutoCheck: vi.fn().mockResolvedValue(undefined),
-    updateAppUpdateLastCheckedAt: vi.fn().mockResolvedValue(undefined),
-}));
+        initialize: vi.fn().mockResolvedValue(undefined),
+        updateGlobalShortcut: vi.fn().mockResolvedValue(undefined),
+        updateSearchKeybindings: vi.fn().mockResolvedValue(undefined),
+        updateStartOnBoot: vi.fn().mockResolvedValue(undefined),
+        updateStartMinimized: vi.fn().mockResolvedValue(undefined),
+        updateOutputScrollBehavior: vi.fn().mockResolvedValue(undefined),
+        updateSearchWindowSizePreset: vi.fn().mockResolvedValue(undefined),
+        updateLanguage: vi.fn().mockResolvedValue(undefined),
+        updateAppUpdateChannel: vi.fn().mockResolvedValue(undefined),
+        updateAppUpdateAutoCheck: vi.fn().mockResolvedValue(undefined),
+        updateAppUpdateLastCheckedAt: vi.fn().mockResolvedValue(undefined),
+    };
+});
 
 const nativeMock = vi.hoisted(() => ({
     shortcut: {
@@ -162,19 +168,49 @@ describe('SettingsGeneralSection', () => {
         appUpdateServiceMock.state = appUpdateServiceMock.createState();
         nativeMock.shortcut.getShortcutStatus.mockResolvedValue([false, null]);
         nativeMock.autostart.isAutostartEnabled.mockResolvedValue(false);
+        settingsStoreMock.settings.value = settingsStoreMock.createGeneralSettingsMock();
     });
 
-    it('renders the general settings groups and row controls', () => {
+    it('renders the general settings groups and row controls', async () => {
         const wrapper = mount(GeneralSection);
 
+        await flushPromises();
+
         expect(wrapper.get('h1').text()).toBe('通用');
         expect(wrapper.text()).toContain('快捷键');
         expect(wrapper.text()).toContain('唤起快捷键');
-        expect(wrapper.text()).toContain('Alt+Space');
-        expect(wrapper.text()).toContain('Ctrl+Space');
-        expect(wrapper.text()).toContain('搜索页快捷键');
+        expect(
+            (
+                wrapper.get('[data-testid="settings-global-shortcut-input"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('Alt+Space');
+        expect(wrapper.text()).not.toContain('Ctrl+Space');
+        expect(wrapper.find('[data-testid="settings-shortcut-suggestions"]').exists()).toBe(false);
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            false
+        );
+        expect(wrapper.text()).not.toContain('搜索页快捷键');
+        expect(wrapper.text()).not.toContain(
+            '自定义搜索窗口内的命令型快捷键，不会影响输入导航与全局唤起。'
+        );
+        expect(wrapper.text()).toContain('会话');
+        expect(wrapper.text()).toContain('输入与请求');
+        expect(wrapper.text()).toContain('窗口');
         expect(wrapper.text()).toContain('打开会话历史');
         expect(wrapper.text()).toContain('开始新会话');
+        expect(wrapper.text()).toContain('切换窗口最大化');
+        expect(
+            (
+                wrapper.get('[data-testid="settings-search-shortcut-input-search.window.maximize"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('F11');
+        expect(
+            wrapper
+                .get('[data-testid="settings-search-shortcut-input-search.history.open"]')
+                .classes()
+        ).not.toContain('font-mono');
         expect(wrapper.text()).toContain('启动与窗口');
         expect(wrapper.text()).toContain('开机自启动');
         expect(wrapper.text()).toContain('启动时最小化');
@@ -203,6 +239,179 @@ describe('SettingsGeneralSection', () => {
         expect(rowLabels.length).toBeGreaterThanOrEqual(13);
     });
 
+    it('opens global shortcut presets from the shortcut field and saves a preset', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            true
+        );
+        expect(
+            wrapper.get('[data-testid="settings-global-shortcut-preset-Alt+Space"]').text()
+        ).toBe('Alt+Space');
+        expect(
+            wrapper.get('[data-testid="settings-global-shortcut-preset-Ctrl+Space"]').text()
+        ).toBe('Ctrl+Space');
+
+        await wrapper
+            .get('[data-testid="settings-global-shortcut-preset-Ctrl+Space"]')
+            .trigger('click');
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
+        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            false
+        );
+    });
+
+    it('saves the global shortcut immediately after a shortcut is pressed', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.session.new'] = 'Mod+Shift+N';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'n', ctrlKey: true }));
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith('Ctrl+N');
+        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Ctrl+N');
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            false
+        );
+    });
+
+    it('does not save a global shortcut that duplicates a search shortcut', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+A';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'a', ctrlKey: true }));
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
+        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Alt+Space');
+    });
+    it('accepts modifierless F11 for the maximize search shortcut', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.window.maximize'] =
+            'Mod+Shift+M';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.window.maximize"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F11' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.window.maximize': 'F11',
+        });
+    });
+
+    it('uses an inline x icon to clear a default search shortcut', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        expect(
+            wrapper
+                .find('[data-testid="settings-search-shortcut-reset-search.history.open"]')
+                .exists()
+        ).toBe(false);
+        expect(
+            wrapper
+                .find('[data-testid="settings-search-shortcut-disable-search.history.open"]')
+                .exists()
+        ).toBe(false);
+
+        const action = wrapper.get(
+            '[data-testid="settings-search-shortcut-action-search.history.open"]'
+        );
+        expect(action.attributes('data-shortcut-action')).toBe('clear');
+        expect(action.get('[data-testid="app-icon"]').attributes('data-name')).toBe('x');
+
+        await action.trigger('click');
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': null,
+        });
+    });
+
+    it('uses an inline undo icon to restore non-default search shortcuts', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const action = wrapper.get(
+            '[data-testid="settings-search-shortcut-action-search.history.open"]'
+        );
+        expect(action.attributes('data-shortcut-action')).toBe('restore');
+        expect(action.get('[data-testid="app-icon"]').attributes('data-name')).toBe('undo');
+
+        await action.trigger('click');
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'Mod+H',
+        });
+    });
+
+    it('restores the default search shortcut from the cleared state', async () => {
+        const clearedSearchKeybindings = {
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': null,
+        };
+        settingsStoreMock.settings.value.searchKeybindings = clearedSearchKeybindings;
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        expect(
+            (
+                wrapper.get('[data-testid="settings-search-shortcut-input-search.history.open"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('无');
+
+        const action = wrapper.get(
+            '[data-testid="settings-search-shortcut-action-search.history.open"]'
+        );
+        expect(action.attributes('data-shortcut-action')).toBe('restore');
+        expect(action.get('[data-testid="app-icon"]').attributes('data-name')).toBe('undo');
+
+        await action.trigger('click');
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...clearedSearchKeybindings,
+            'search.history.open': 'Mod+H',
+        });
+    });
+
     it('shows the current version in the latest update details', async () => {
         appUpdateServiceMock.state = {
             ...appUpdateServiceMock.createState(),

From 0e5759d73c90c6202a5e78479bfa225c1853a5d3 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sat, 6 Jun 2026 02:40:46 +0800
Subject: [PATCH 03/55] feat(desktop): reopen last closed search session

---
 apps/desktop/src/config/searchKeybindings.ts  |  21 +--
 apps/desktop/src/i18n/messages.ts             |  12 ++
 .../src/services/EventService/types.ts        |   1 +
 apps/desktop/src/stores/settings.ts           |  57 +++++-
 .../interaction/useSearchKeyboardRouter.ts    |  17 +-
 .../composables/searchInteraction.ts          |  35 +---
 .../composables/useSearchRequest.ts           |  21 +++
 apps/desktop/src/views/SearchView/index.vue   |  35 +++-
 .../SettingsView/components/General/index.vue | 172 +++++++++++++++---
 .../SearchView/searchInteraction.test.ts      | 124 ++++++++++++-
 .../useSearchKeyboardRouter.test.ts           |  35 ++--
 .../SearchView/useSearchRequest.test.ts       |  62 +++++++
 .../tests/stores/settings-keybindings.test.ts |  36 +++-
 .../settingsGeneralComponent.test.ts          |   9 +-
 14 files changed, 536 insertions(+), 101 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 13fff367..f81cf661 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -5,11 +5,10 @@ export const SEARCH_KEYBINDING_ACTION_IDS = [
     'search.history.open',
     'search.input.focus',
     'search.session.new',
+    'search.session.reopenLastClosed',
     'search.model.toggle',
     'search.window.pin',
     'search.window.maximize',
-    'search.request.cancel',
-    'search.draft.clearAll',
 ] as const;
 
 export type SearchKeybindingActionId = (typeof SEARCH_KEYBINDING_ACTION_IDS)[number];
@@ -43,6 +42,12 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         defaultShortcut: 'Mod+N',
         allowDisable: true,
     },
+    {
+        id: 'search.session.reopenLastClosed',
+        labelKey: 'settings.general.searchActions.reopenLastClosedSession',
+        defaultShortcut: 'Mod+Up',
+        allowDisable: true,
+    },
     {
         id: 'search.model.toggle',
         labelKey: 'settings.general.searchActions.modelToggle',
@@ -62,18 +67,6 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         allowDisable: true,
         allowModifierlessFunctionKey: true,
     },
-    {
-        id: 'search.request.cancel',
-        labelKey: 'settings.general.searchActions.cancelRequest',
-        defaultShortcut: 'Mod+.',
-        allowDisable: true,
-    },
-    {
-        id: 'search.draft.clearAll',
-        labelKey: 'settings.general.searchActions.clearAll',
-        defaultShortcut: 'Mod+Backspace',
-        allowDisable: true,
-    },
 ];
 
 const SEARCH_KEYBINDING_DEFINITION_MAP = new Map(
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index b6e16954..a82ab904 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -95,10 +95,16 @@ const zhCNMessages = {
     'settings.general.searchActions.history': '打开会话历史',
     'settings.general.searchActions.focusInput': '聚焦输入框',
     'settings.general.searchActions.newSession': '开始新会话',
+    'settings.general.searchActions.reopenLastClosedSession': '打开最近关闭的会话',
     'settings.general.searchActions.modelToggle': '切换模型选择',
     'settings.general.searchActions.windowPin': '切换窗口置顶',
     'settings.general.searchActions.windowMaximize': '切换窗口最大化',
     'settings.general.searchActions.cancelRequest': '取消当前请求',
+    'settings.general.fixedSearchShortcuts': '固定快捷键',
+    'settings.general.fixedSearchActions.submitRequest': '发送请求',
+    'settings.general.fixedSearchActions.newLine': '插入换行',
+    'settings.general.fixedSearchActions.previousInputHistory': '上一条输入历史',
+    'settings.general.fixedSearchActions.nextInputHistory': '下一条输入历史',
     'settings.general.searchActions.clearAll': '清空草稿与上下文',
     'settings.general.searchShortcuts.errors.modifierRequired': '快捷键至少需要一个修饰键',
     'settings.general.searchShortcuts.errors.reserved':
@@ -843,10 +849,16 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.searchActions.history': 'Open session history',
     'settings.general.searchActions.focusInput': 'Focus input',
     'settings.general.searchActions.newSession': 'Start new session',
+    'settings.general.searchActions.reopenLastClosedSession': 'Open most recently closed session',
     'settings.general.searchActions.modelToggle': 'Toggle model picker',
     'settings.general.searchActions.windowPin': 'Toggle window pin',
     'settings.general.searchActions.windowMaximize': 'Toggle window maximize',
     'settings.general.searchActions.cancelRequest': 'Cancel current request',
+    'settings.general.fixedSearchShortcuts': 'Fixed shortcuts',
+    'settings.general.fixedSearchActions.submitRequest': 'Submit request',
+    'settings.general.fixedSearchActions.newLine': 'Insert new line',
+    'settings.general.fixedSearchActions.previousInputHistory': 'Previous input history',
+    'settings.general.fixedSearchActions.nextInputHistory': 'Next input history',
     'settings.general.searchActions.clearAll': 'Clear draft and context',
     'settings.general.searchShortcuts.errors.modifierRequired':
         'A shortcut must include at least one modifier key',
diff --git a/apps/desktop/src/services/EventService/types.ts b/apps/desktop/src/services/EventService/types.ts
index 33da3bb6..8f16426d 100644
--- a/apps/desktop/src/services/EventService/types.ts
+++ b/apps/desktop/src/services/EventService/types.ts
@@ -74,6 +74,7 @@ export interface McpStatusChangeEvent {
 export type GeneralSettingKey =
     | 'global_shortcut'
     | 'search_keybindings'
+    | 'last_closed_session_id'
     | 'start_on_boot'
     | 'start_minimized'
     | 'output_scroll_behavior'
diff --git a/apps/desktop/src/stores/settings.ts b/apps/desktop/src/stores/settings.ts
index 50861aaa..cd55abe1 100644
--- a/apps/desktop/src/stores/settings.ts
+++ b/apps/desktop/src/stores/settings.ts
@@ -32,6 +32,7 @@ export type OutputScrollBehavior = 'follow_output' | 'stay_position' | 'jump_to_
 export interface GeneralSettingsData {
     globalShortcut: string;
     searchKeybindings: SearchKeybindings;
+    lastClosedSessionId: number | null;
     startOnBoot: boolean;
     startMinimized: boolean;
     outputScrollBehavior: OutputScrollBehavior;
@@ -46,6 +47,7 @@ export interface GeneralSettingsData {
 const DEFAULT_GENERAL_SETTINGS: GeneralSettingsData = {
     globalShortcut: 'Alt+Space',
     searchKeybindings: createDefaultSearchKeybindings(),
+    lastClosedSessionId: null,
     startOnBoot: false,
     startMinimized: true,
     outputScrollBehavior: 'follow_output',
@@ -138,6 +140,24 @@ export const useSettingsStore = defineStore('settings', () => {
         }
     }
 
+    function shouldRewritePersistedSearchKeybindings(value: string | null): boolean {
+        if (!value) {
+            return false;
+        }
+
+        try {
+            const parsed = JSON.parse(value);
+            return (
+                parsed &&
+                typeof parsed === 'object' &&
+                !Array.isArray(parsed) &&
+                ('search.request.cancel' in parsed || 'search.draft.clearAll' in parsed)
+            );
+        } catch {
+            return false;
+        }
+    }
+
     function cloneSettingsSnapshot(): GeneralSettingsData {
         return {
             ...settings.value,
@@ -162,6 +182,13 @@ export const useSettingsStore = defineStore('settings', () => {
                     typeof value === 'string' ? parsePersistedSearchKeybindings(value) : value
                 );
                 break;
+            case 'last_closed_session_id':
+                settings.value.lastClosedSessionId =
+                    value === null || value === '' ? null : Number(value);
+                if (Number.isNaN(settings.value.lastClosedSessionId)) {
+                    settings.value.lastClosedSessionId = null;
+                }
+                break;
             case 'start_on_boot':
                 settings.value.startOnBoot =
                     typeof value === 'boolean' ? value : String(value) === 'true';
@@ -200,6 +227,10 @@ export const useSettingsStore = defineStore('settings', () => {
                 return settings.value.globalShortcut;
             case 'search_keybindings':
                 return JSON.stringify(settings.value.searchKeybindings);
+            case 'last_closed_session_id':
+                return settings.value.lastClosedSessionId === null
+                    ? ''
+                    : String(settings.value.lastClosedSessionId);
             case 'start_on_boot':
                 return String(settings.value.startOnBoot);
             case 'start_minimized':
@@ -229,6 +260,8 @@ export const useSettingsStore = defineStore('settings', () => {
                 return {
                     ...settings.value.searchKeybindings,
                 };
+            case 'last_closed_session_id':
+                return settings.value.lastClosedSessionId;
             case 'start_on_boot':
                 return settings.value.startOnBoot;
             case 'start_minimized':
@@ -263,6 +296,7 @@ export const useSettingsStore = defineStore('settings', () => {
             const [
                 globalShortcut,
                 searchKeybindings,
+                lastClosedSessionId,
                 startOnBoot,
                 startMinimized,
                 outputScroll,
@@ -274,6 +308,7 @@ export const useSettingsStore = defineStore('settings', () => {
             ] = await Promise.all([
                 getSettingValue({ key: 'global_shortcut' }),
                 getSettingValue({ key: 'search_keybindings' }),
+                getSettingValue({ key: 'last_closed_session_id' }),
                 getSettingValue({ key: 'start_on_boot' }),
                 getSettingValue({ key: 'start_minimized' }),
                 getSettingValue({ key: 'output_scroll_behavior' }),
@@ -287,6 +322,13 @@ export const useSettingsStore = defineStore('settings', () => {
             settings.value.globalShortcut =
                 globalShortcut || DEFAULT_GENERAL_SETTINGS.globalShortcut;
             settings.value.searchKeybindings = parsePersistedSearchKeybindings(searchKeybindings);
+            settings.value.lastClosedSessionId =
+                lastClosedSessionId === null || lastClosedSessionId === ''
+                    ? DEFAULT_GENERAL_SETTINGS.lastClosedSessionId
+                    : Number(lastClosedSessionId);
+            if (Number.isNaN(settings.value.lastClosedSessionId)) {
+                settings.value.lastClosedSessionId = DEFAULT_GENERAL_SETTINGS.lastClosedSessionId;
+            }
             settings.value.startOnBoot =
                 startOnBoot === null
                     ? DEFAULT_GENERAL_SETTINGS.startOnBoot
@@ -307,7 +349,13 @@ export const useSettingsStore = defineStore('settings', () => {
 
             await Promise.allSettled([
                 persistDefaultIfMissing('global_shortcut', globalShortcut),
-                persistDefaultIfMissing('search_keybindings', searchKeybindings),
+                shouldRewritePersistedSearchKeybindings(searchKeybindings)
+                    ? setSetting({
+                          key: 'search_keybindings',
+                          value: JSON.stringify(settings.value.searchKeybindings),
+                      })
+                    : persistDefaultIfMissing('search_keybindings', searchKeybindings),
+                persistDefaultIfMissing('last_closed_session_id', lastClosedSessionId),
                 persistDefaultIfMissing('start_on_boot', startOnBoot),
                 persistDefaultIfMissing('start_minimized', startMinimized),
                 persistDefaultIfMissing('output_scroll_behavior', outputScroll),
@@ -420,6 +468,10 @@ export const useSettingsStore = defineStore('settings', () => {
         await updateSetting('search_keybindings', normalizeSearchKeybindings(searchKeybindings));
     }
 
+    async function updateLastClosedSessionId(sessionId: number | null) {
+        await updateSetting('last_closed_session_id', sessionId);
+    }
+
     async function updateStartOnBoot(enabled: boolean) {
         await updateSetting('start_on_boot', enabled);
     }
@@ -455,6 +507,7 @@ export const useSettingsStore = defineStore('settings', () => {
     const outputScrollBehavior = computed(() => settings.value.outputScrollBehavior);
     const globalShortcut = computed(() => settings.value.globalShortcut);
     const searchKeybindings = computed(() => settings.value.searchKeybindings);
+    const lastClosedSessionId = computed(() => settings.value.lastClosedSessionId);
     const searchWindowSizePreset = computed(() => settings.value.searchWindowSizePreset);
     const searchWindowDefaultSize = computed(() => settings.value.searchWindowDefaultSize);
     const language = computed(() => settings.value.language);
@@ -469,6 +522,7 @@ export const useSettingsStore = defineStore('settings', () => {
         outputScrollBehavior,
         globalShortcut,
         searchKeybindings,
+        lastClosedSessionId,
         searchWindowSizePreset,
         searchWindowDefaultSize,
         language,
@@ -480,6 +534,7 @@ export const useSettingsStore = defineStore('settings', () => {
         refresh,
         updateGlobalShortcut,
         updateSearchKeybindings,
+        updateLastClosedSessionId,
         updateStartOnBoot,
         updateStartMinimized,
         updateOutputScrollBehavior,
diff --git a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
index 6b8fef4e..60d32a2b 100644
--- a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
+++ b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
@@ -59,7 +59,6 @@ interface CreateSearchKeyboardRouterOptions {
     onHideWindow: () => void | Promise<void>;
     onClearSession: () => void;
     onClearDraft: () => void;
-    onClearAll: () => void;
     onSearchKeybindingAction: (actionId: SearchKeybindingActionId) => void | Promise<void>;
 }
 
@@ -86,9 +85,8 @@ function isTypingAttemptDuringApproval(input: SearchKeyboardRouteInput) {
 function resolveSearchKeybindingAction(
     input: SearchKeyboardRouteInput,
     keybindings: SearchKeybindings,
-    context: {
+    _context: {
         isLoading: boolean;
-        hasClearableState: boolean;
     }
 ): SearchKeybindingActionId | null {
     for (const [actionId, shortcut] of Object.entries(keybindings) as Array<
@@ -98,14 +96,6 @@ function resolveSearchKeybindingAction(
             continue;
         }
 
-        if (actionId === 'search.request.cancel' && !context.isLoading) {
-            continue;
-        }
-
-        if (actionId === 'search.draft.clearAll' && !context.hasClearableState) {
-            continue;
-        }
-
         return actionId;
     }
 
@@ -185,11 +175,6 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
             getSearchKeybindings(),
             {
                 isLoading: isLoading(),
-                hasClearableState:
-                    Boolean(queryText.trim()) ||
-                    hasAttachments() ||
-                    hasModelOverride() ||
-                    getSessionHistoryCount() > 0,
             }
         );
         if (searchKeybindingAction) {
diff --git a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
index 97c19b31..ebe53ea0 100644
--- a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
+++ b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
@@ -133,16 +133,14 @@ export interface UseSearchKeyboardOptions {
     toggleModelDropdown: () => Promise<void>;
     openHistoryDialog: () => Promise<void>;
     startNewSession: () => Promise<void>;
+    reopenLastClosedSession: () => Promise<void>;
     toggleWindowPin: () => Promise<void>;
     toggleWindowMaximize: () => Promise<void>;
     handleSubmit: (query: string) => Promise<void>;
-    clearAll: () => void;
     cancelRequest: () => void;
     clearSession: () => void;
 }
 
-const DOUBLE_BACKSPACE_INTERVAL = 300;
-
 function createEmptyModelOverride(): SearchModelOverride {
     return {
         modelId: null,
@@ -655,8 +653,6 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
         modelDropdownState,
         controller,
         sessionHistory,
-        pendingRequest,
-        isWaitingForCompletion,
         isLoading,
         pendingToolApproval,
         approvePendingToolApproval,
@@ -674,15 +670,14 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
         toggleModelDropdown,
         openHistoryDialog,
         startNewSession,
+        reopenLastClosedSession,
         toggleWindowPin,
         toggleWindowMaximize,
         handleSubmit,
-        clearAll,
         cancelRequest,
         clearSession,
     } = options;
 
-    let lastBackspaceTime = 0;
     const keyboardRouter = createConfigurableSearchKeyboardRouter({
         getSearchKeybindings: () => searchKeybindings.value,
         getPendingApproval: () =>
@@ -778,9 +773,6 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
         onClearDraft: () => {
             queryText.value = '';
         },
-        onClearAll: () => {
-            clearAll();
-        },
         onSearchKeybindingAction: async (actionId) => {
             switch (actionId) {
                 case 'search.history.open':
@@ -795,6 +787,9 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
                         await startNewSession();
                     }
                     return;
+                case 'search.session.reopenLastClosed':
+                    await reopenLastClosedSession();
+                    return;
                 case 'search.model.toggle':
                     await toggleModelDropdown();
                     return;
@@ -804,12 +799,6 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
                 case 'search.window.maximize':
                     await toggleWindowMaximize();
                     return;
-                case 'search.request.cancel':
-                    cancelRequest();
-                    return;
-                case 'search.draft.clearAll':
-                    clearAll();
-                    return;
                 default:
                     return;
             }
@@ -868,20 +857,6 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
                 return;
             }
 
-            if (pendingRequest.value) {
-                const now = Date.now();
-                const timeSinceLastBackspace = now - lastBackspaceTime;
-                lastBackspaceTime = now;
-
-                if (timeSinceLastBackspace < DOUBLE_BACKSPACE_INTERVAL) {
-                    event.preventDefault();
-                    pendingRequest.value = null;
-                    isWaitingForCompletion.value = false;
-                    lastBackspaceTime = 0;
-                }
-                return;
-            }
-
             if (modelOverride.value.modelId && cursorContext.value.cursorAtStart) {
                 event.preventDefault();
                 modelOverride.value = createEmptyModelOverride();
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
index 36e54f3e..72f66188 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
@@ -14,6 +14,7 @@ import {
 import { dismissSessionTerminalStatus, listSessions } from '@/services/AgentService/session';
 import { eventService } from '@/services/EventService';
 import { AppEvent } from '@/services/EventService/types';
+import { useSettingsStore } from '@/stores/settings';
 import {
     createInputHistorySnapshot,
     type InputHistorySnapshot,
@@ -73,6 +74,7 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
     const sessionList = ref<SessionEntity[]>([]);
     const sessionListQuery = ref('');
     const isSessionListLoading = ref(false);
+    const settingsStore = useSettingsStore();
     let sessionListRequestId = 0;
     let sessionListLoadPromise: Promise<void> | null = null;
     let sessionListInFlightKey: string | null = null;
@@ -229,6 +231,11 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
     });
 
     function clearSessionState() {
+        if (currentSessionId.value !== null) {
+            void settingsStore.updateLastClosedSessionId(currentSessionId.value).catch((error) => {
+                console.error('[SearchView] Failed to persist last closed session id:', error);
+            });
+        }
         clearPendingRequestState();
         clearSession();
     }
@@ -392,6 +399,19 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
         clearDraft();
     }
 
+    async function reopenLastClosedSession(): Promise<LoadedSessionInfo | null> {
+        const sessionId = settingsStore.lastClosedSessionId;
+        if (sessionId === null) {
+            return null;
+        }
+
+        const loadedSession = await openSession(sessionId);
+        if (currentSessionId.value === sessionId) {
+            await settingsStore.updateLastClosedSessionId(null);
+        }
+        return loadedSession;
+    }
+
     async function openSession(sessionId: number): Promise<LoadedSessionInfo> {
         // 切换会话时必须丢弃当前页面暂存的排队请求，
         // 否则新会话会错误继承旧会话的“等待发送”锁态。
@@ -461,6 +481,7 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
         refreshSessionList,
         ensureSessionListLoaded,
         startNewSession,
+        reopenLastClosedSession,
         openSession,
         pendingToolApproval,
         pendingUserQuestion,
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index d210456a..9853e368 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -233,6 +233,7 @@
         refreshSessionList,
         ensureSessionListLoaded,
         startNewSession,
+        reopenLastClosedSession,
         openSession,
         pendingToolApproval,
         pendingUserQuestion,
@@ -240,7 +241,6 @@
         rejectPendingToolApproval,
         settleUserQuestion,
         handleSubmit,
-        clearAll,
         cancelRequest,
         handleRegenerateMessage: handleRegenerateMessageRequest,
     } = useSearchRequestFlow({
@@ -536,10 +536,10 @@
         toggleModelDropdown: handleToggleModelDropdownRequest,
         openHistoryDialog,
         startNewSession: handleStartNewSession,
+        reopenLastClosedSession: handleReopenLastClosedSession,
         toggleWindowPin: handleToggleWindowPin,
         toggleWindowMaximize: handleToggleMaximize,
         handleSubmit,
-        clearAll,
         cancelRequest,
         clearSession: clearSessionToIdle,
     });
@@ -812,6 +812,37 @@
         await controller.focusSearchInput();
     }
 
+    async function handleReopenLastClosedSession() {
+        controller.closeQuickSearch();
+        await hideAllPopups();
+        resetSessionInputHistoryTracking();
+
+        try {
+            const reopenedSession = await reopenLastClosedSession();
+            if (!reopenedSession) {
+                await controller.focusSearchInput();
+                return;
+            }
+
+            await syncSearchWindowState().catch((error) => {
+                console.error(
+                    '[SearchView] Failed to sync search window state after reopening session:',
+                    error
+                );
+            });
+            await remeasureTargetHeight().catch((error) => {
+                console.error(
+                    '[SearchView] Failed to remeasure window height after reopening session:',
+                    error
+                );
+            });
+            conversationPanel.value?.revealLatestContent();
+        } catch (error) {
+            console.error('[SearchView] Failed to reopen last closed session:', error);
+            await controller.focusSearchInput();
+        }
+    }
+
     async function handleToggleWindowPin() {
         try {
             await toggleWindowPin();
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index ef0aa8c0..79dfd691 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -90,12 +90,77 @@
         label: LOCALE_LABELS[value],
     }));
 
+    type SearchShortcutGroupId = 'session' | 'inputAndRequest' | 'window';
+
+    interface SettingsSearchShortcutGroupRow {
+        kind: 'configurable' | 'fixed';
+        id: string;
+        label: string;
+        displayValue: string;
+        isCapturing?: boolean;
+        hasError?: boolean;
+        shortcutAction?: SearchShortcutIconAction;
+        shortcutActionLabel?: string;
+    }
+
+    const fixedSearchShortcutRows = computed<
+        Record<SearchShortcutGroupId, SettingsSearchShortcutGroupRow[]>
+    >(
+        () => ({
+            session: [
+                {
+                    kind: 'fixed',
+                    id: 'search.inputHistory.older',
+                    label: t('settings.general.fixedSearchActions.previousInputHistory'),
+                    displayValue: 'Up',
+                },
+                {
+                    kind: 'fixed',
+                    id: 'search.inputHistory.newer',
+                    label: t('settings.general.fixedSearchActions.nextInputHistory'),
+                    displayValue: 'Down',
+                },
+            ],
+            inputAndRequest: [
+                {
+                    kind: 'fixed',
+                    id: 'search.request.cancel',
+                    label: t('settings.general.searchActions.cancelRequest'),
+                    displayValue: 'Esc',
+                },
+                {
+                    kind: 'fixed',
+                    id: 'search.submit',
+                    label: t('settings.general.fixedSearchActions.submitRequest'),
+                    displayValue: 'Enter',
+                },
+                {
+                    kind: 'fixed',
+                    id: 'search.newLine',
+                    label: t('settings.general.fixedSearchActions.newLine'),
+                    displayValue: 'Shift+Enter',
+                },
+            ],
+            window: [],
+        })
+    );
+
     function formatSearchShortcutForSettings(shortcut: string | null | undefined): string {
         const normalizedShortcut = normalizeLocalShortcutString(shortcut);
         return normalizedShortcut ? formatShortcutForDisplay(normalizedShortcut) : '无';
     }
 
-    const searchShortcutRows = computed(() =>
+    function allowsReservedSearchShortcut(
+        actionId: SearchKeybindingActionId,
+        shortcut: string | null | undefined
+    ): boolean {
+        return (
+            actionId === 'search.session.reopenLastClosed' &&
+            normalizeLocalShortcutString(shortcut) === 'Mod+Up'
+        );
+    }
+
+    const searchShortcutRows = computed<SettingsSearchShortcutGroupRow[]>(() =>
         SEARCH_KEYBINDING_DEFINITIONS.map((definition) => {
             const currentShortcut = settings.value.searchKeybindings[definition.id];
             const isDefaultShortcut =
@@ -107,6 +172,7 @@
 
             return {
                 ...definition,
+                kind: 'configurable',
                 label: t(definition.labelKey),
                 displayValue: searchShortcutDisplayMap.value[definition.id],
                 isCapturing: activeSearchShortcutActionId.value === definition.id,
@@ -121,36 +187,48 @@
     );
 
     const searchShortcutGroups = computed(() => {
-        const rowById = new Map(searchShortcutRows.value.map((row) => [row.id, row]));
+        const rowById = new Map<string, SettingsSearchShortcutGroupRow>(
+            searchShortcutRows.value.map((row) => [row.id, row] as const)
+        );
         const groups: Array<{
+            id: SearchShortcutGroupId;
             title: string;
             actionIds: SearchKeybindingActionId[];
         }> = [
             {
+                id: 'session',
                 title: t('settings.general.searchShortcutGroups.session'),
-                actionIds: ['search.history.open', 'search.session.new'],
+                actionIds: [
+                    'search.history.open',
+                    'search.session.new',
+                    'search.session.reopenLastClosed',
+                ],
             },
             {
+                id: 'inputAndRequest',
                 title: t('settings.general.searchShortcutGroups.inputAndRequest'),
-                actionIds: [
-                    'search.input.focus',
-                    'search.model.toggle',
-                    'search.request.cancel',
-                    'search.draft.clearAll',
-                ],
+                actionIds: ['search.input.focus', 'search.model.toggle'],
             },
             {
+                id: 'window',
                 title: t('settings.general.searchShortcutGroups.window'),
                 actionIds: ['search.window.pin', 'search.window.maximize'],
             },
         ];
 
-        return groups.map((group) => ({
-            title: group.title,
-            rows: group.actionIds
-                .map((actionId) => rowById.get(actionId))
-                .filter((row): row is NonNullable<typeof row> => Boolean(row)),
-        }));
+        return groups.map((group) => {
+            const rows: SettingsSearchShortcutGroupRow[] = [
+                ...group.actionIds
+                    .map((actionId) => rowById.get(actionId))
+                    .filter((row): row is SettingsSearchShortcutGroupRow => Boolean(row)),
+                ...fixedSearchShortcutRows.value[group.id],
+            ];
+
+            return {
+                title: group.title,
+                rows,
+            };
+        });
     });
 
     const shortcutInput = ref<HTMLInputElement | null>(null);
@@ -436,7 +514,10 @@
                 return;
             }
 
-            if (isReservedLocalShortcut(normalizedShortcut)) {
+            if (
+                isReservedLocalShortcut(normalizedShortcut) &&
+                !allowsReservedSearchShortcut(actionId, normalizedShortcut)
+            ) {
                 reportSearchShortcutError(
                     actionId,
                     'settings.general.searchShortcuts.errors.reserved'
@@ -518,7 +599,24 @@
         }
     };
 
-    const startSearchShortcutCapture = (actionId: SearchKeybindingActionId) => {
+    const startSearchShortcutCapture = (
+        rowOrActionId: SettingsSearchShortcutGroupRow | string
+    ) => {
+        if (typeof rowOrActionId === 'string') {
+            const actionId = rowOrActionId as SearchKeybindingActionId;
+            activeSearchShortcutActionId.value = actionId;
+            hasCapturedSearchShortcut.value = false;
+            searchShortcutCapturedValue.value = null;
+            searchShortcutErrorActionId.value = null;
+            updateSearchShortcutDisplay(actionId, shortcutCapturePrompt.value);
+            return;
+        }
+
+        if (rowOrActionId.kind !== 'configurable') {
+            return;
+        }
+
+        const actionId = rowOrActionId.id as SearchKeybindingActionId;
         activeSearchShortcutActionId.value = actionId;
         hasCapturedSearchShortcut.value = false;
         searchShortcutCapturedValue.value = null;
@@ -552,7 +650,19 @@
         await saveSearchShortcut(actionId, shortcut);
     };
 
-    const stopSearchShortcutCaptureAndSave = async (actionId: SearchKeybindingActionId) => {
+    const stopSearchShortcutCaptureAndSave = async (
+        rowOrActionId: SettingsSearchShortcutGroupRow | string
+    ) => {
+        const actionId =
+            typeof rowOrActionId === 'string'
+                ? (rowOrActionId as SearchKeybindingActionId)
+                : rowOrActionId.kind === 'configurable'
+                  ? (rowOrActionId.id as SearchKeybindingActionId)
+                  : null;
+        if (!actionId) {
+            return;
+        }
+
         if (activeSearchShortcutActionId.value !== actionId) {
             return;
         }
@@ -590,9 +700,26 @@
     };
 
     const handleSearchShortcutIconAction = async (
-        actionId: SearchKeybindingActionId,
-        action: SearchShortcutIconAction
+        rowOrActionId: SettingsSearchShortcutGroupRow | string,
+        explicitAction?: SearchShortcutIconAction
     ) => {
+        const actionId =
+            typeof rowOrActionId === 'string'
+                ? (rowOrActionId as SearchKeybindingActionId)
+                : rowOrActionId.kind === 'configurable'
+                  ? (rowOrActionId.id as SearchKeybindingActionId)
+                  : null;
+        const action =
+            explicitAction ??
+            (typeof rowOrActionId === 'string'
+                ? undefined
+                : rowOrActionId.kind === 'configurable'
+                  ? rowOrActionId.shortcutAction
+                  : undefined);
+        if (!actionId || !action) {
+            return;
+        }
+
         if (activeSearchShortcutActionId.value === actionId) {
             activeSearchShortcutActionId.value = null;
             hasCapturedSearchShortcut.value = false;
@@ -972,7 +1099,9 @@
                                                       : 'focus:border-primary-300 border-transparent bg-[#f0f0ef] text-neutral-900 hover:bg-[#ececea]',
                                                 isSaving
                                                     ? 'cursor-wait opacity-50'
-                                                    : 'cursor-pointer',
+                                                    : row.shortcutAction
+                                                      ? 'cursor-pointer'
+                                                      : 'cursor-default',
                                             ]"
                                             :disabled="isSaving"
                                             :placeholder="t('settings.general.shortcutPlaceholder')"
@@ -980,6 +1109,7 @@
                                             @blur="stopSearchShortcutCaptureAndSave(row.id)"
                                         />
                                         <button
+                                            v-if="row.shortcutAction"
                                             type="button"
                                             class="absolute top-1/2 right-2.5 flex h-6 w-6 -translate-y-1/2 items-center justify-center rounded-md text-neutral-500 transition-colors hover:bg-neutral-200/70 hover:text-neutral-900 disabled:cursor-not-allowed disabled:opacity-50"
                                             :disabled="isSaving"
diff --git a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
index 28a4ac65..2d3a3fe4 100644
--- a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
+++ b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
@@ -330,15 +330,15 @@ describe('createSearchKeydownHandler', () => {
             sessionHistoryPopupOpen: ref(false),
             hideAllPopups: vi.fn().mockResolvedValue(undefined),
             hideSearchWindow: vi.fn().mockResolvedValue(undefined),
-            navigateInputHistory: vi.fn(() => 'ignored'),
+            navigateInputHistory: vi.fn(() => 'ignored' as const),
             closeModelDropdown: vi.fn().mockResolvedValue(undefined),
             toggleModelDropdown: vi.fn().mockResolvedValue(undefined),
             openHistoryDialog: vi.fn().mockResolvedValue(undefined),
             startNewSession: vi.fn().mockResolvedValue(undefined),
+            reopenLastClosedSession: vi.fn().mockResolvedValue(undefined),
             toggleWindowPin: vi.fn().mockResolvedValue(undefined),
             toggleWindowMaximize,
             handleSubmit: vi.fn().mockResolvedValue(undefined),
-            clearAll: vi.fn(),
             cancelRequest: vi.fn(),
             clearSession: vi.fn(),
         });
@@ -351,6 +351,126 @@ describe('createSearchKeydownHandler', () => {
         expect(toggleWindowMaximize).toHaveBeenCalledTimes(1);
         expect(event.defaultPrevented).toBe(true);
     });
+
+    it('cancels a pending request with Escape and ignores Backspace', async () => {
+        const controller = createControllerStub();
+        const cancelRequest = vi.fn();
+        const handleKeyDown = createSearchKeydownHandler({
+            viewReady: ref(true),
+            searchKeybindings: ref(createDefaultSearchKeybindings()),
+            queryText: ref(''),
+            attachments: ref([]),
+            cursorContext: ref<SearchCursorContext>({
+                isMultiLine: false,
+                cursorAtStart: true,
+                cursorAtTextStart: true,
+                cursorAtEnd: true,
+            }),
+            modelOverride: ref<SearchModelOverride>({
+                modelId: null,
+                providerId: null,
+            }),
+            modelDropdownState: ref({ isOpen: false }),
+            controller,
+            sessionHistory: ref([]),
+            pendingRequest: ref({ query: 'q', attachments: [] }),
+            isWaitingForCompletion: ref(true),
+            isLoading: ref(true),
+            pendingToolApproval: ref(null),
+            approvePendingToolApproval: vi.fn(() => false),
+            rejectPendingToolApproval: vi.fn(() => false),
+            promptPendingToolApprovalAttention: vi.fn(),
+            getActivePopupType: () => null,
+            hasActivePopupWindowFocus: () => false,
+            isQuickSearchOpen: computed(() => false),
+            shouldTriggerQuickSearch: () => false,
+            sessionHistoryPopupOpen: ref(false),
+            hideAllPopups: vi.fn().mockResolvedValue(undefined),
+            hideSearchWindow: vi.fn().mockResolvedValue(undefined),
+            navigateInputHistory: vi.fn(() => 'ignored' as const),
+            closeModelDropdown: vi.fn().mockResolvedValue(undefined),
+            toggleModelDropdown: vi.fn().mockResolvedValue(undefined),
+            openHistoryDialog: vi.fn().mockResolvedValue(undefined),
+            startNewSession: vi.fn().mockResolvedValue(undefined),
+            reopenLastClosedSession: vi.fn().mockResolvedValue(undefined),
+            toggleWindowPin: vi.fn().mockResolvedValue(undefined),
+            toggleWindowMaximize: vi.fn().mockResolvedValue(undefined),
+            handleSubmit: vi.fn().mockResolvedValue(undefined),
+            cancelRequest,
+            clearSession: vi.fn(),
+        });
+
+        const backspaceEvent = new KeyboardEvent('keydown', { key: 'Backspace', cancelable: true });
+        await handleKeyDown(backspaceEvent);
+        expect(cancelRequest).not.toHaveBeenCalled();
+        expect(backspaceEvent.defaultPrevented).toBe(false);
+
+        const escapeEvent = new KeyboardEvent('keydown', { key: 'Escape', cancelable: true });
+        await handleKeyDown(escapeEvent);
+        expect(cancelRequest).toHaveBeenCalledTimes(1);
+        expect(escapeEvent.defaultPrevented).toBe(true);
+    });
+
+    it('routes Ctrl+Up to reopen the most recently closed session', async () => {
+        const controller = createControllerStub();
+        const reopenLastClosedSession = vi.fn().mockResolvedValue(undefined);
+        const handleKeyDown = createSearchKeydownHandler({
+            viewReady: ref(true),
+            searchKeybindings: ref(createDefaultSearchKeybindings()),
+            queryText: ref(''),
+            attachments: ref([]),
+            cursorContext: ref<SearchCursorContext>({
+                isMultiLine: false,
+                cursorAtStart: true,
+                cursorAtTextStart: true,
+                cursorAtEnd: true,
+            }),
+            modelOverride: ref<SearchModelOverride>({
+                modelId: null,
+                providerId: null,
+            }),
+            modelDropdownState: ref({ isOpen: false }),
+            controller,
+            sessionHistory: ref([]),
+            pendingRequest: ref(null),
+            isWaitingForCompletion: ref(false),
+            isLoading: ref(false),
+            pendingToolApproval: ref(null),
+            approvePendingToolApproval: vi.fn(() => false),
+            rejectPendingToolApproval: vi.fn(() => false),
+            promptPendingToolApprovalAttention: vi.fn(),
+            getActivePopupType: () => null,
+            hasActivePopupWindowFocus: () => false,
+            isQuickSearchOpen: computed(() => false),
+            shouldTriggerQuickSearch: () => false,
+            sessionHistoryPopupOpen: ref(false),
+            hideAllPopups: vi.fn().mockResolvedValue(undefined),
+            hideSearchWindow: vi.fn().mockResolvedValue(undefined),
+            navigateInputHistory: vi.fn(() => 'ignored' as const),
+            closeModelDropdown: vi.fn().mockResolvedValue(undefined),
+            toggleModelDropdown: vi.fn().mockResolvedValue(undefined),
+            openHistoryDialog: vi.fn().mockResolvedValue(undefined),
+            startNewSession: vi.fn().mockResolvedValue(undefined),
+            reopenLastClosedSession,
+            toggleWindowPin: vi.fn().mockResolvedValue(undefined),
+            toggleWindowMaximize: vi.fn().mockResolvedValue(undefined),
+            handleSubmit: vi.fn().mockResolvedValue(undefined),
+            cancelRequest: vi.fn(),
+            clearSession: vi.fn(),
+        });
+
+        const event = new KeyboardEvent('keydown', {
+            key: 'ArrowUp',
+            ctrlKey: true,
+            cancelable: true,
+        });
+        await handleKeyDown(event);
+        await Promise.resolve();
+        await Promise.resolve();
+
+        expect(reopenLastClosedSession).toHaveBeenCalledTimes(1);
+        expect(event.defaultPrevented).toBe(true);
+    });
 });
 
 describe('useSearchOverlayMachine', () => {
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index ab944f5d..e1f15732 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -114,6 +114,19 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.history.open');
     });
 
+    it('routes the default Ctrl+Up shortcut through the action callback', async () => {
+        const { router, callbacks } = createKeyboardRouter({
+            getSearchKeybindings: () => createDefaultSearchKeybindings(),
+        });
+
+        expect(router.route({ key: 'ArrowUp', ctrlKey: true })).toBe(true);
+        await flushAsyncWork();
+
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith(
+            'search.session.reopenLastClosed'
+        );
+    });
+
     it('routes the default maximize shortcut through the action callback', async () => {
         const { router, callbacks } = createKeyboardRouter({
             getSearchKeybindings: () => createDefaultSearchKeybindings(),
@@ -141,29 +154,29 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.window.maximize');
     });
 
-    it('only routes cancel and clear actions when their guard conditions are satisfied', async () => {
+    it('does not route removed Ctrl+. and Ctrl+Backspace shortcuts', async () => {
         const { router, callbacks } = createKeyboardRouter({
             getSearchKeybindings: () => createDefaultSearchKeybindings(),
             getQueryText: () => 'touchai',
             isLoading: () => true,
         });
 
-        expect(router.route({ key: 'Backspace', ctrlKey: true })).toBe(true);
-        expect(router.route({ key: '.', ctrlKey: true })).toBe(true);
+        expect(router.route({ key: 'Backspace', ctrlKey: true })).toBe(false);
+        expect(router.route({ key: '.', ctrlKey: true })).toBe(false);
         expect(router.route({ key: '.', ctrlKey: true, shiftKey: true })).toBe(false);
         await flushAsyncWork();
 
-        expect(callbacks.onSearchKeybindingAction).toHaveBeenNthCalledWith(
-            1,
-            'search.draft.clearAll'
-        );
-        expect(callbacks.onSearchKeybindingAction).toHaveBeenNthCalledWith(
-            2,
-            'search.request.cancel'
-        );
+        expect(callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();
     });
 
     it('applies the escape fallback order on the search surface', async () => {
+        const loadingRouter = createKeyboardRouter({
+            isLoading: () => true,
+        });
+        expect(loadingRouter.router.route({ key: 'Escape' })).toBe(true);
+        expect(loadingRouter.callbacks.onCancelRequest).toHaveBeenCalledTimes(1);
+        expect(loadingRouter.callbacks.onClearDraft).not.toHaveBeenCalled();
+
         const draftRouter = createKeyboardRouter({
             getQueryText: () => 'current draft',
         });
diff --git a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
index 27ec1ba1..87f0ab3e 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
@@ -15,6 +15,7 @@ const {
     eventHandlers,
     listSessionsMock,
     notifyMock,
+    settingsStoreMock,
     useAgentMock,
 } = vi.hoisted(() => {
     const callbacksHolder: { current: Record<string, unknown> | null } = { current: null };
@@ -32,6 +33,12 @@ const {
         approvePendingToolApproval: vi.fn(() => true),
         rejectPendingToolApproval: vi.fn(() => true),
     };
+    const settingsStore = {
+        lastClosedSessionId: null as number | null,
+        updateLastClosedSessionId: vi.fn(async (sessionId: number | null) => {
+            settingsStore.lastClosedSessionId = sessionId;
+        }),
+    };
 
     return {
         agentCallbacks: callbacksHolder,
@@ -40,6 +47,7 @@ const {
         eventHandlers: handlers,
         listSessionsMock: vi.fn().mockResolvedValue([]),
         notifyMock: vi.fn(),
+        settingsStoreMock: settingsStore,
         useAgentMock: vi.fn((callbacks: Record<string, unknown>) => {
             callbacksHolder.current = callbacks;
             return agent;
@@ -55,6 +63,10 @@ vi.mock('@services/NotificationService', () => ({
     notify: notifyMock,
 }));
 
+vi.mock('@/stores/settings', () => ({
+    useSettingsStore: () => settingsStoreMock,
+}));
+
 vi.mock('@services/AgentService/session', async () => {
     const actual = await vi.importActual<typeof import('@services/AgentService/session')>(
         '@services/AgentService/session'
@@ -130,6 +142,8 @@ describe('useSearchRequestFlow', () => {
         agentState.currentSessionId.value = null;
         agentState.sessionHistory.value = [];
         agentState.pendingToolApproval.value = null;
+        settingsStoreMock.lastClosedSessionId = null;
+        settingsStoreMock.updateLastClosedSessionId.mockClear();
 
         listSessionsMock.mockResolvedValue([]);
         dismissSessionTerminalStatusMock.mockResolvedValue(undefined);
@@ -333,6 +347,54 @@ describe('useSearchRequestFlow', () => {
         mounted.unmount();
     });
 
+    it('reopens the most recently closed session', async () => {
+        const modelOverride = ref({
+            modelId: null,
+            providerId: null,
+        });
+        const mounted = await mountComposable(() =>
+            useSearchRequestFlow({
+                modelOverride,
+                clearDraft: vi.fn(),
+                getSupportedAttachments: () => [],
+                getUnsupportedAttachmentMessage: () => null,
+                getCurrentInputSnapshot: (query) =>
+                    createInputHistorySnapshot({
+                        text: query,
+                        attachments: [],
+                    }),
+            })
+        );
+
+        agentState.currentSessionId.value = 23;
+        mounted.result.clearSession();
+
+        expect(agentState.clearSession).toHaveBeenCalledTimes(1);
+        expect(settingsStoreMock.updateLastClosedSessionId).toHaveBeenCalledWith(23);
+        expect(settingsStoreMock.lastClosedSessionId).toBe(23);
+
+        agentState.openSession.mockResolvedValueOnce({
+            sessionId: 23,
+            title: 'Reopened Session',
+            modelId: 'gpt-5',
+            providerId: 9,
+        });
+
+        const reopenedSession = await mounted.result.reopenLastClosedSession();
+
+        expect(agentState.openSession).toHaveBeenCalledWith(23);
+        expect(reopenedSession).toEqual({
+            sessionId: 23,
+            title: 'Reopened Session',
+            modelId: 'gpt-5',
+            providerId: 9,
+        });
+        expect(settingsStoreMock.updateLastClosedSessionId).toHaveBeenLastCalledWith(null);
+        expect(settingsStoreMock.lastClosedSessionId).toBeNull();
+
+        mounted.unmount();
+    });
+
     it('regenerates from the nearest preceding user message and drops unsupported attachments', async () => {
         const supportedAttachment = createAttachment('supported-1');
         const unsupportedAttachment = createAttachment('unsupported-1', {
diff --git a/apps/desktop/tests/stores/settings-keybindings.test.ts b/apps/desktop/tests/stores/settings-keybindings.test.ts
index bd620180..85d19565 100644
--- a/apps/desktop/tests/stores/settings-keybindings.test.ts
+++ b/apps/desktop/tests/stores/settings-keybindings.test.ts
@@ -74,6 +74,28 @@ describe('settings search keybindings state', () => {
             key: 'search_keybindings',
             value: JSON.stringify(createDefaultSearchKeybindings()),
         });
+        expect(store.settings.lastClosedSessionId).toBeNull();
+    });
+
+    it('loads and updates the persisted last closed session id', async () => {
+        mockSettings({
+            last_closed_session_id: '42',
+        });
+
+        const { useSettingsStore } = await import('@/stores/settings');
+        const store = useSettingsStore();
+
+        await store.initialize();
+
+        expect(store.settings.lastClosedSessionId).toBe(42);
+
+        await store.updateLastClosedSessionId(108);
+
+        expect(store.settings.lastClosedSessionId).toBe(108);
+        expect(setSettingMock).toHaveBeenLastCalledWith({
+            key: 'last_closed_session_id',
+            value: '108',
+        });
     });
 
     it('loads persisted search keybindings and merges missing defaults', async () => {
@@ -81,6 +103,7 @@ describe('settings search keybindings state', () => {
             search_keybindings: JSON.stringify({
                 'search.history.open': 'Mod+Y',
                 'search.request.cancel': null,
+                'search.draft.clearAll': 'Mod+Backspace',
             }),
         });
 
@@ -90,10 +113,20 @@ describe('settings search keybindings state', () => {
         await store.initialize();
 
         expect(store.settings.searchKeybindings['search.history.open']).toBe('Mod+Y');
-        expect(store.settings.searchKeybindings['search.request.cancel']).toBeNull();
+        expect(store.settings.searchKeybindings).toEqual({
+            ...createDefaultSearchKeybindings(),
+            'search.history.open': 'Mod+Y',
+        });
         expect(store.settings.searchKeybindings['search.window.maximize']).toBe(
             createDefaultSearchKeybindings()['search.window.maximize']
         );
+        expect(setSettingMock).toHaveBeenCalledWith({
+            key: 'search_keybindings',
+            value: JSON.stringify({
+                ...createDefaultSearchKeybindings(),
+                'search.history.open': 'Mod+Y',
+            }),
+        });
         expect(store.settings.searchKeybindings['search.input.focus']).toBe(
             createDefaultSearchKeybindings()['search.input.focus']
         );
@@ -109,7 +142,6 @@ describe('settings search keybindings state', () => {
         const nextKeybindings = {
             ...createDefaultSearchKeybindings(),
             'search.input.focus': 'Mod+K',
-            'search.request.cancel': null,
         };
 
         await store.updateSearchKeybindings(nextKeybindings);
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 326508d1..14cfbbb8 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -11,11 +11,10 @@ const settingsStoreMock = vi.hoisted(() => {
             'search.history.open': 'Mod+H',
             'search.input.focus': 'Mod+L',
             'search.session.new': 'Mod+N',
+            'search.session.reopenLastClosed': 'Ctrl+Up',
             'search.model.toggle': 'Mod+M',
             'search.window.pin': 'Mod+P',
             'search.window.maximize': 'F11',
-            'search.request.cancel': 'Mod+.',
-            'search.draft.clearAll': 'Mod+Backspace',
         } as Record<string, string | null>,
         startOnBoot: false,
         startMinimized: true,
@@ -206,6 +205,12 @@ describe('SettingsGeneralSection', () => {
                     .element as HTMLInputElement
             ).value
         ).toBe('F11');
+        expect(
+            (
+                wrapper.get('[data-testid="settings-search-shortcut-input-search.request.cancel"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('Esc');
         expect(
             wrapper
                 .get('[data-testid="settings-search-shortcut-input-search.history.open"]')

From e3c0b219969f2b5e8f2977c59f0a020609d29453 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 7 Jun 2026 03:25:06 +0800
Subject: [PATCH 04/55] feat(i18n): update zh-CN messages for search actions
 and history navigation

---
 apps/desktop/src/i18n/messages.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index a82ab904..d8d91bab 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -102,9 +102,9 @@ const zhCNMessages = {
     'settings.general.searchActions.cancelRequest': '取消当前请求',
     'settings.general.fixedSearchShortcuts': '固定快捷键',
     'settings.general.fixedSearchActions.submitRequest': '发送请求',
-    'settings.general.fixedSearchActions.newLine': '插入换行',
-    'settings.general.fixedSearchActions.previousInputHistory': '上一条输入历史',
-    'settings.general.fixedSearchActions.nextInputHistory': '下一条输入历史',
+    'settings.general.fixedSearchActions.newLine': '换行',
+    'settings.general.fixedSearchActions.previousInputHistory': '上一条会话历史',
+    'settings.general.fixedSearchActions.nextInputHistory': '下一条会话历史',
     'settings.general.searchActions.clearAll': '清空草稿与上下文',
     'settings.general.searchShortcuts.errors.modifierRequired': '快捷键至少需要一个修饰键',
     'settings.general.searchShortcuts.errors.reserved':

From 294fb05c9117984ed5b03ed895043a9b2d295061 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 8 Jun 2026 10:34:18 +0800
Subject: [PATCH 05/55] feat(desktop): support function key search shortcuts

---
 apps/desktop/src/config/searchKeybindings.ts  |  2 -
 apps/desktop/src/i18n/messages.ts             |  3 +
 .../SettingsView/components/General/index.vue | 97 ++++++++++---------
 .../settingsGeneralComponent.test.ts          | 29 ++++--
 4 files changed, 77 insertions(+), 54 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index f81cf661..6ee46712 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -18,7 +18,6 @@ export interface SearchKeybindingDefinition {
     labelKey: MessageKey;
     defaultShortcut: string | null;
     allowDisable: boolean;
-    allowModifierlessFunctionKey?: boolean;
 }
 
 export type SearchKeybindings = Record<SearchKeybindingActionId, string | null>;
@@ -65,7 +64,6 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         labelKey: 'settings.general.searchActions.windowMaximize',
         defaultShortcut: 'F11',
         allowDisable: true,
-        allowModifierlessFunctionKey: true,
     },
 ];
 
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index d8d91bab..1acec78e 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -112,6 +112,7 @@ const zhCNMessages = {
     'settings.general.searchShortcuts.errors.duplicate': '该快捷键已被“{action}”使用，请换一个组合',
     'settings.general.searchShortcuts.errors.globalConflict':
         '该快捷键与全局唤起快捷键冲突，请换一个组合',
+    'settings.general.searchShortcuts.fixedUnavailable': '暂不支持修改该快捷键',
     'settings.general.saveShortcutFailed': '保存快捷键到数据库失败',
     'settings.general.loadSettingsFailed': '加载设置失败',
     'settings.general.saveStartOnBootFailed': '保存开机自启动设置失败',
@@ -868,6 +869,8 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
         'This shortcut is already used by "{action}". Choose another combination.',
     'settings.general.searchShortcuts.errors.globalConflict':
         'This shortcut conflicts with the global activation shortcut. Choose another combination.',
+    'settings.general.searchShortcuts.fixedUnavailable':
+        'Changing this shortcut is not supported yet.',
     'settings.general.saveShortcutFailed': 'Failed to save shortcut to database',
     'settings.general.loadSettingsFailed': 'Failed to load settings',
     'settings.general.saveStartOnBootFailed': 'Failed to save start-on-boot setting',
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 79dfd691..07355e82 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -105,45 +105,43 @@
 
     const fixedSearchShortcutRows = computed<
         Record<SearchShortcutGroupId, SettingsSearchShortcutGroupRow[]>
-    >(
-        () => ({
-            session: [
-                {
-                    kind: 'fixed',
-                    id: 'search.inputHistory.older',
-                    label: t('settings.general.fixedSearchActions.previousInputHistory'),
-                    displayValue: 'Up',
-                },
-                {
-                    kind: 'fixed',
-                    id: 'search.inputHistory.newer',
-                    label: t('settings.general.fixedSearchActions.nextInputHistory'),
-                    displayValue: 'Down',
-                },
-            ],
-            inputAndRequest: [
-                {
-                    kind: 'fixed',
-                    id: 'search.request.cancel',
-                    label: t('settings.general.searchActions.cancelRequest'),
-                    displayValue: 'Esc',
-                },
-                {
-                    kind: 'fixed',
-                    id: 'search.submit',
-                    label: t('settings.general.fixedSearchActions.submitRequest'),
-                    displayValue: 'Enter',
-                },
-                {
-                    kind: 'fixed',
-                    id: 'search.newLine',
-                    label: t('settings.general.fixedSearchActions.newLine'),
-                    displayValue: 'Shift+Enter',
-                },
-            ],
-            window: [],
-        })
-    );
+    >(() => ({
+        session: [
+            {
+                kind: 'fixed',
+                id: 'search.inputHistory.older',
+                label: t('settings.general.fixedSearchActions.previousInputHistory'),
+                displayValue: 'Up',
+            },
+            {
+                kind: 'fixed',
+                id: 'search.inputHistory.newer',
+                label: t('settings.general.fixedSearchActions.nextInputHistory'),
+                displayValue: 'Down',
+            },
+        ],
+        inputAndRequest: [
+            {
+                kind: 'fixed',
+                id: 'search.request.cancel',
+                label: t('settings.general.searchActions.cancelRequest'),
+                displayValue: 'Esc',
+            },
+            {
+                kind: 'fixed',
+                id: 'search.submit',
+                label: t('settings.general.fixedSearchActions.submitRequest'),
+                displayValue: 'Enter',
+            },
+            {
+                kind: 'fixed',
+                id: 'search.newLine',
+                label: t('settings.general.fixedSearchActions.newLine'),
+                displayValue: 'Shift+Enter',
+            },
+        ],
+        window: [],
+    }));
 
     function formatSearchShortcutForSettings(shortcut: string | null | undefined): string {
         const normalizedShortcut = normalizeLocalShortcutString(shortcut);
@@ -497,9 +495,7 @@
         const normalizedShortcut =
             shortcut === null ? null : normalizeLocalShortcutString(shortcut);
         if (normalizedShortcut) {
-            const definition = getSearchKeybindingDefinition(actionId);
             const allowsModifierlessFunctionShortcut =
-                definition.allowModifierlessFunctionKey &&
                 isModifierlessFunctionShortcut(normalizedShortcut);
 
             if (!hasRequiredModifier(normalizedShortcut) && !allowsModifierlessFunctionShortcut) {
@@ -599,9 +595,7 @@
         }
     };
 
-    const startSearchShortcutCapture = (
-        rowOrActionId: SettingsSearchShortcutGroupRow | string
-    ) => {
+    const startSearchShortcutCapture = (rowOrActionId: SettingsSearchShortcutGroupRow | string) => {
         if (typeof rowOrActionId === 'string') {
             const actionId = rowOrActionId as SearchKeybindingActionId;
             activeSearchShortcutActionId.value = actionId;
@@ -1105,8 +1099,19 @@
                                             ]"
                                             :disabled="isSaving"
                                             :placeholder="t('settings.general.shortcutPlaceholder')"
-                                            @focus="startSearchShortcutCapture(row.id)"
-                                            @blur="stopSearchShortcutCaptureAndSave(row.id)"
+                                            :title="
+                                                row.kind === 'fixed'
+                                                    ? t(
+                                                          'settings.general.searchShortcuts.fixedUnavailable'
+                                                      )
+                                                    : undefined
+                                            "
+                                            :tabindex="row.kind === 'fixed' ? -1 : 0"
+                                            @mousedown="
+                                                row.kind === 'fixed' && $event.preventDefault()
+                                            "
+                                            @focus="startSearchShortcutCapture(row)"
+                                            @blur="stopSearchShortcutCaptureAndSave(row)"
                                         />
                                         <button
                                             v-if="row.shortcutAction"
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 14cfbbb8..a1442fb7 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -312,27 +312,44 @@ describe('SettingsGeneralSection', () => {
         expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
         expect((input.element as HTMLInputElement).value).toBe('Alt+Space');
     });
-    it('accepts modifierless F11 for the maximize search shortcut', async () => {
-        settingsStoreMock.settings.value.searchKeybindings['search.window.maximize'] =
-            'Mod+Shift+M';
+    it('accepts modifierless F1-F12 for configurable search shortcuts', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
         const wrapper = mount(GeneralSection);
 
         await flushPromises();
 
         const input = wrapper.get(
-            '[data-testid="settings-search-shortcut-input-search.window.maximize"]'
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
         );
         await input.trigger('focus');
         await flushPromises();
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F11' }));
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
         await flushPromises();
 
         expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
             ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.window.maximize': 'F11',
+            'search.history.open': 'F1',
         });
     });
 
+    it('shows fixed search shortcuts as unsupported for editing', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-search-shortcut-input-search.submit"]');
+        expect(input.attributes('title')).toBe('暂不支持修改该快捷键');
+        expect(input.attributes('tabindex')).toBe('-1');
+
+        await input.trigger('focus');
+        await flushPromises();
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F2' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Enter');
+    });
+
     it('uses an inline x icon to clear a default search shortcut', async () => {
         const wrapper = mount(GeneralSection);
 

From e6d1b132d4f0f9275c621d2e2dfae87acf56dfe6 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 8 Jun 2026 11:11:17 +0800
Subject: [PATCH 06/55] feat(desktop): recover last active search session

---
 .../src/services/EventService/types.ts        |  1 +
 apps/desktop/src/stores/settings.ts           | 32 +++++++++++
 .../composables/useSearchRequest.ts           | 57 ++++++++++++++++---
 .../SearchView/useSearchRequest.test.ts       | 49 ++++++++++++++++
 .../tests/stores/settings-keybindings.test.ts |  9 ++-
 5 files changed, 139 insertions(+), 9 deletions(-)

diff --git a/apps/desktop/src/services/EventService/types.ts b/apps/desktop/src/services/EventService/types.ts
index 8f16426d..3d6b8618 100644
--- a/apps/desktop/src/services/EventService/types.ts
+++ b/apps/desktop/src/services/EventService/types.ts
@@ -75,6 +75,7 @@ export type GeneralSettingKey =
     | 'global_shortcut'
     | 'search_keybindings'
     | 'last_closed_session_id'
+    | 'last_active_session_id'
     | 'start_on_boot'
     | 'start_minimized'
     | 'output_scroll_behavior'
diff --git a/apps/desktop/src/stores/settings.ts b/apps/desktop/src/stores/settings.ts
index cd55abe1..f5d00d10 100644
--- a/apps/desktop/src/stores/settings.ts
+++ b/apps/desktop/src/stores/settings.ts
@@ -33,6 +33,7 @@ export interface GeneralSettingsData {
     globalShortcut: string;
     searchKeybindings: SearchKeybindings;
     lastClosedSessionId: number | null;
+    lastActiveSessionId: number | null;
     startOnBoot: boolean;
     startMinimized: boolean;
     outputScrollBehavior: OutputScrollBehavior;
@@ -48,6 +49,7 @@ const DEFAULT_GENERAL_SETTINGS: GeneralSettingsData = {
     globalShortcut: 'Alt+Space',
     searchKeybindings: createDefaultSearchKeybindings(),
     lastClosedSessionId: null,
+    lastActiveSessionId: null,
     startOnBoot: false,
     startMinimized: true,
     outputScrollBehavior: 'follow_output',
@@ -189,6 +191,13 @@ export const useSettingsStore = defineStore('settings', () => {
                     settings.value.lastClosedSessionId = null;
                 }
                 break;
+            case 'last_active_session_id':
+                settings.value.lastActiveSessionId =
+                    value === null || value === '' ? null : Number(value);
+                if (Number.isNaN(settings.value.lastActiveSessionId)) {
+                    settings.value.lastActiveSessionId = null;
+                }
+                break;
             case 'start_on_boot':
                 settings.value.startOnBoot =
                     typeof value === 'boolean' ? value : String(value) === 'true';
@@ -231,6 +240,10 @@ export const useSettingsStore = defineStore('settings', () => {
                 return settings.value.lastClosedSessionId === null
                     ? ''
                     : String(settings.value.lastClosedSessionId);
+            case 'last_active_session_id':
+                return settings.value.lastActiveSessionId === null
+                    ? ''
+                    : String(settings.value.lastActiveSessionId);
             case 'start_on_boot':
                 return String(settings.value.startOnBoot);
             case 'start_minimized':
@@ -262,6 +275,8 @@ export const useSettingsStore = defineStore('settings', () => {
                 };
             case 'last_closed_session_id':
                 return settings.value.lastClosedSessionId;
+            case 'last_active_session_id':
+                return settings.value.lastActiveSessionId;
             case 'start_on_boot':
                 return settings.value.startOnBoot;
             case 'start_minimized':
@@ -297,6 +312,7 @@ export const useSettingsStore = defineStore('settings', () => {
                 globalShortcut,
                 searchKeybindings,
                 lastClosedSessionId,
+                lastActiveSessionId,
                 startOnBoot,
                 startMinimized,
                 outputScroll,
@@ -309,6 +325,7 @@ export const useSettingsStore = defineStore('settings', () => {
                 getSettingValue({ key: 'global_shortcut' }),
                 getSettingValue({ key: 'search_keybindings' }),
                 getSettingValue({ key: 'last_closed_session_id' }),
+                getSettingValue({ key: 'last_active_session_id' }),
                 getSettingValue({ key: 'start_on_boot' }),
                 getSettingValue({ key: 'start_minimized' }),
                 getSettingValue({ key: 'output_scroll_behavior' }),
@@ -329,6 +346,13 @@ export const useSettingsStore = defineStore('settings', () => {
             if (Number.isNaN(settings.value.lastClosedSessionId)) {
                 settings.value.lastClosedSessionId = DEFAULT_GENERAL_SETTINGS.lastClosedSessionId;
             }
+            settings.value.lastActiveSessionId =
+                lastActiveSessionId === null || lastActiveSessionId === ''
+                    ? DEFAULT_GENERAL_SETTINGS.lastActiveSessionId
+                    : Number(lastActiveSessionId);
+            if (Number.isNaN(settings.value.lastActiveSessionId)) {
+                settings.value.lastActiveSessionId = DEFAULT_GENERAL_SETTINGS.lastActiveSessionId;
+            }
             settings.value.startOnBoot =
                 startOnBoot === null
                     ? DEFAULT_GENERAL_SETTINGS.startOnBoot
@@ -356,6 +380,7 @@ export const useSettingsStore = defineStore('settings', () => {
                       })
                     : persistDefaultIfMissing('search_keybindings', searchKeybindings),
                 persistDefaultIfMissing('last_closed_session_id', lastClosedSessionId),
+                persistDefaultIfMissing('last_active_session_id', lastActiveSessionId),
                 persistDefaultIfMissing('start_on_boot', startOnBoot),
                 persistDefaultIfMissing('start_minimized', startMinimized),
                 persistDefaultIfMissing('output_scroll_behavior', outputScroll),
@@ -472,6 +497,10 @@ export const useSettingsStore = defineStore('settings', () => {
         await updateSetting('last_closed_session_id', sessionId);
     }
 
+    async function updateLastActiveSessionId(sessionId: number | null) {
+        await updateSetting('last_active_session_id', sessionId);
+    }
+
     async function updateStartOnBoot(enabled: boolean) {
         await updateSetting('start_on_boot', enabled);
     }
@@ -508,6 +537,7 @@ export const useSettingsStore = defineStore('settings', () => {
     const globalShortcut = computed(() => settings.value.globalShortcut);
     const searchKeybindings = computed(() => settings.value.searchKeybindings);
     const lastClosedSessionId = computed(() => settings.value.lastClosedSessionId);
+    const lastActiveSessionId = computed(() => settings.value.lastActiveSessionId);
     const searchWindowSizePreset = computed(() => settings.value.searchWindowSizePreset);
     const searchWindowDefaultSize = computed(() => settings.value.searchWindowDefaultSize);
     const language = computed(() => settings.value.language);
@@ -523,6 +553,7 @@ export const useSettingsStore = defineStore('settings', () => {
         globalShortcut,
         searchKeybindings,
         lastClosedSessionId,
+        lastActiveSessionId,
         searchWindowSizePreset,
         searchWindowDefaultSize,
         language,
@@ -535,6 +566,7 @@ export const useSettingsStore = defineStore('settings', () => {
         updateGlobalShortcut,
         updateSearchKeybindings,
         updateLastClosedSessionId,
+        updateLastActiveSessionId,
         updateStartOnBoot,
         updateStartMinimized,
         updateOutputScrollBehavior,
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
index 72f66188..4efbeeac 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
@@ -5,7 +5,7 @@
 import { useAgent } from '@composables/agent';
 import type { SessionEntity } from '@database/types';
 import { notify } from '@services/NotificationService';
-import { onUnmounted, type Ref, ref } from 'vue';
+import { onUnmounted, type Ref, ref, watch } from 'vue';
 
 import {
     type Index,
@@ -230,6 +230,24 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
         stopSessionStatusListener = null;
     });
 
+    watch(
+        () => currentSessionId.value,
+        (sessionId) => {
+            persistLastActiveSessionId(sessionId);
+        },
+        { flush: 'sync' }
+    );
+
+    function persistLastActiveSessionId(sessionId: number | null) {
+        if (sessionId === null || settingsStore.lastActiveSessionId === sessionId) {
+            return;
+        }
+
+        void settingsStore.updateLastActiveSessionId(sessionId).catch((error) => {
+            console.error('[SearchView] Failed to persist last active session id:', error);
+        });
+    }
+
     function clearSessionState() {
         if (currentSessionId.value !== null) {
             void settingsStore.updateLastClosedSessionId(currentSessionId.value).catch((error) => {
@@ -400,16 +418,40 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
     }
 
     async function reopenLastClosedSession(): Promise<LoadedSessionInfo | null> {
-        const sessionId = settingsStore.lastClosedSessionId;
-        if (sessionId === null) {
+        const candidateSessionIds = [
+            settingsStore.lastClosedSessionId,
+            settingsStore.lastActiveSessionId,
+        ].filter(
+            (sessionId, index, sessionIds): sessionId is number =>
+                sessionId !== null && sessionIds.indexOf(sessionId) === index
+        );
+        if (candidateSessionIds.length === 0) {
             return null;
         }
 
-        const loadedSession = await openSession(sessionId);
-        if (currentSessionId.value === sessionId) {
-            await settingsStore.updateLastClosedSessionId(null);
+        let lastOpenError: unknown = null;
+        for (const sessionId of candidateSessionIds) {
+            try {
+                const loadedSession = await openSession(sessionId);
+                if (
+                    settingsStore.lastClosedSessionId !== null &&
+                    currentSessionId.value === settingsStore.lastClosedSessionId
+                ) {
+                    await settingsStore.updateLastClosedSessionId(null);
+                }
+                return loadedSession;
+            } catch (error) {
+                lastOpenError = error;
+                if (sessionId === settingsStore.lastClosedSessionId) {
+                    await settingsStore.updateLastClosedSessionId(null);
+                }
+            }
+        }
+
+        if (lastOpenError) {
+            throw lastOpenError;
         }
-        return loadedSession;
+        return null;
     }
 
     async function openSession(sessionId: number): Promise<LoadedSessionInfo> {
@@ -419,6 +461,7 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
         clearDraft({ preserveModelTag: true });
 
         const loadedSession = await openStoredSession(sessionId);
+        persistLastActiveSessionId(sessionId);
         modelOverride.value = {
             modelId: loadedSession.modelId,
             providerId: loadedSession.providerId,
diff --git a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
index 87f0ab3e..edb8c087 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
@@ -35,9 +35,13 @@ const {
     };
     const settingsStore = {
         lastClosedSessionId: null as number | null,
+        lastActiveSessionId: null as number | null,
         updateLastClosedSessionId: vi.fn(async (sessionId: number | null) => {
             settingsStore.lastClosedSessionId = sessionId;
         }),
+        updateLastActiveSessionId: vi.fn(async (sessionId: number | null) => {
+            settingsStore.lastActiveSessionId = sessionId;
+        }),
     };
 
     return {
@@ -143,7 +147,9 @@ describe('useSearchRequestFlow', () => {
         agentState.sessionHistory.value = [];
         agentState.pendingToolApproval.value = null;
         settingsStoreMock.lastClosedSessionId = null;
+        settingsStoreMock.lastActiveSessionId = null;
         settingsStoreMock.updateLastClosedSessionId.mockClear();
+        settingsStoreMock.updateLastActiveSessionId.mockClear();
 
         listSessionsMock.mockResolvedValue([]);
         dismissSessionTerminalStatusMock.mockResolvedValue(undefined);
@@ -343,6 +349,7 @@ describe('useSearchRequestFlow', () => {
             modelId: 'gpt-5',
             providerId: 9,
         });
+        expect(settingsStoreMock.updateLastActiveSessionId).toHaveBeenCalledWith(7);
 
         mounted.unmount();
     });
@@ -395,6 +402,48 @@ describe('useSearchRequestFlow', () => {
         mounted.unmount();
     });
 
+    it('falls back to the last active session when no closed session is recorded', async () => {
+        const modelOverride = ref({
+            modelId: null,
+            providerId: null,
+        });
+        settingsStoreMock.lastActiveSessionId = 45;
+
+        const mounted = await mountComposable(() =>
+            useSearchRequestFlow({
+                modelOverride,
+                clearDraft: vi.fn(),
+                getSupportedAttachments: () => [],
+                getUnsupportedAttachmentMessage: () => null,
+                getCurrentInputSnapshot: (query) =>
+                    createInputHistorySnapshot({
+                        text: query,
+                        attachments: [],
+                    }),
+            })
+        );
+
+        agentState.openSession.mockResolvedValueOnce({
+            sessionId: 45,
+            title: 'Last Active Session',
+            modelId: 'gpt-5',
+            providerId: 9,
+        });
+
+        const reopenedSession = await mounted.result.reopenLastClosedSession();
+
+        expect(agentState.openSession).toHaveBeenCalledWith(45);
+        expect(reopenedSession).toEqual({
+            sessionId: 45,
+            title: 'Last Active Session',
+            modelId: 'gpt-5',
+            providerId: 9,
+        });
+        expect(settingsStoreMock.updateLastClosedSessionId).not.toHaveBeenCalledWith(null);
+
+        mounted.unmount();
+    });
+
     it('regenerates from the nearest preceding user message and drops unsupported attachments', async () => {
         const supportedAttachment = createAttachment('supported-1');
         const unsupportedAttachment = createAttachment('unsupported-1', {
diff --git a/apps/desktop/tests/stores/settings-keybindings.test.ts b/apps/desktop/tests/stores/settings-keybindings.test.ts
index 85d19565..c0be65a3 100644
--- a/apps/desktop/tests/stores/settings-keybindings.test.ts
+++ b/apps/desktop/tests/stores/settings-keybindings.test.ts
@@ -75,11 +75,13 @@ describe('settings search keybindings state', () => {
             value: JSON.stringify(createDefaultSearchKeybindings()),
         });
         expect(store.settings.lastClosedSessionId).toBeNull();
+        expect(store.settings.lastActiveSessionId).toBeNull();
     });
 
     it('loads and updates the persisted last closed session id', async () => {
         mockSettings({
             last_closed_session_id: '42',
+            last_active_session_id: '84',
         });
 
         const { useSettingsStore } = await import('@/stores/settings');
@@ -88,13 +90,16 @@ describe('settings search keybindings state', () => {
         await store.initialize();
 
         expect(store.settings.lastClosedSessionId).toBe(42);
+        expect(store.settings.lastActiveSessionId).toBe(84);
 
         await store.updateLastClosedSessionId(108);
+        await store.updateLastActiveSessionId(216);
 
         expect(store.settings.lastClosedSessionId).toBe(108);
+        expect(store.settings.lastActiveSessionId).toBe(216);
         expect(setSettingMock).toHaveBeenLastCalledWith({
-            key: 'last_closed_session_id',
-            value: '108',
+            key: 'last_active_session_id',
+            value: '216',
         });
     });
 

From b82c1371ca3898a7e23ce6fbd6f35fe91d8f56b4 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 8 Jun 2026 12:53:16 +0800
Subject: [PATCH 07/55] fix(desktop): reuse select for shortcut presets

---
 apps/desktop/src/components/CustomSelect.vue  |  96 ++++++++++++----
 .../components/ui/select/SelectContent.vue    |  18 ++-
 .../SettingsView/components/General/index.vue | 104 +++++++++---------
 .../settingsGeneralComponent.test.ts          |  24 +++-
 4 files changed, 164 insertions(+), 78 deletions(-)

diff --git a/apps/desktop/src/components/CustomSelect.vue b/apps/desktop/src/components/CustomSelect.vue
index 00e9dfa3..6ca7efaa 100644
--- a/apps/desktop/src/components/CustomSelect.vue
+++ b/apps/desktop/src/components/CustomSelect.vue
@@ -8,7 +8,7 @@
         SelectTrigger,
         SelectValue,
     } from '@components/ui/select';
-    import type { AcceptableValue } from 'reka-ui';
+    import type { AcceptableValue, SelectTriggerProps } from 'reka-ui';
     import { computed, ref } from 'vue';
 
     import { type MessageKey, t, tt } from '@/i18n';
@@ -27,21 +27,47 @@
         placeholderKey?: MessageKey;
         disabled?: boolean;
         protectOptionText?: boolean;
+        open?: boolean;
+        displayLabel?: string;
+        triggerTestId?: string;
+        contentTestId?: string;
+        optionTestIdPrefix?: string;
+        disablePortal?: boolean;
+        triggerAs?: SelectTriggerProps['as'];
     }
 
     interface Emits {
         (e: 'update:modelValue', value: T): void;
+        (e: 'update:open', value: boolean): void;
+        (e: 'focus', event: FocusEvent): void;
+        (e: 'blur', event: FocusEvent): void;
     }
 
     const props = withDefaults(defineProps<Props>(), {
         placeholder: '',
         disabled: false,
         protectOptionText: false,
+        open: undefined,
+        displayLabel: '',
+        triggerTestId: '',
+        contentTestId: '',
+        optionTestIdPrefix: '',
+        disablePortal: false,
+        triggerAs: 'button',
     });
 
     const emit = defineEmits<Emits>();
+    defineSlots<{
+        trigger?(props: {
+            option: Option | undefined;
+            open: boolean;
+            displayLabel: string;
+        }): unknown;
+    }>();
 
-    const isOpen = ref(false);
+    const localOpen = ref(false);
+
+    const isOpen = computed(() => props.open ?? localOpen.value);
 
     const selectedOption = computed(() => {
         return props.options.find((opt) => opt.value === props.modelValue);
@@ -63,6 +89,11 @@
             selectOption(value as T);
         }
     };
+
+    const updateOpen = (open: boolean) => {
+        localOpen.value = open;
+        emit('update:open', open);
+    };
 </script>
 
 <template>
@@ -71,7 +102,7 @@
         :disabled="disabled"
         :open="isOpen"
         @update:model-value="handleSelectValue"
-        @update:open="isOpen = $event"
+        @update:open="updateOpen"
     >
         <SelectTrigger
             class="w-full rounded-[10px] border px-3 py-2 text-left font-serif text-sm shadow-none [box-shadow:none] transition-colors"
@@ -82,36 +113,55 @@
             }"
             :icon-class="isOpen ? 'rotate-180' : ''"
             :disabled="disabled"
+            :as="triggerAs"
+            :data-testid="triggerTestId || undefined"
+            @focus="emit('focus', $event)"
+            @blur="emit('blur', $event)"
         >
-            <template v-if="selectedOption">
-                <div class="flex min-w-0 items-center gap-2">
-                    <img
-                        v-if="selectedOption.iconSrc"
-                        :src="selectedOption.iconSrc"
-                        :alt="selectedOption.label"
-                        class="h-4 w-4 shrink-0 rounded-sm object-contain"
-                        :data-no-i18n="protectOptionText ? 'true' : undefined"
-                        :translate="protectOptionText ? 'no' : undefined"
-                    />
-                    <span
-                        class="line-clamp-1"
-                        :data-no-i18n="protectOptionText ? 'true' : undefined"
-                        :translate="protectOptionText ? 'no' : undefined"
-                    >
-                        {{ selectedOption.label }}
-                    </span>
-                </div>
-            </template>
-            <SelectValue v-else :placeholder="resolvedPlaceholder" />
+            <slot
+                name="trigger"
+                :option="selectedOption"
+                :open="isOpen"
+                :display-label="displayLabel"
+            >
+                <template v-if="displayLabel">
+                    <span class="line-clamp-1">{{ displayLabel }}</span>
+                </template>
+                <template v-else-if="selectedOption">
+                    <div class="flex min-w-0 items-center gap-2">
+                        <img
+                            v-if="selectedOption.iconSrc"
+                            :src="selectedOption.iconSrc"
+                            :alt="selectedOption.label"
+                            class="h-4 w-4 shrink-0 rounded-sm object-contain"
+                            :data-no-i18n="protectOptionText ? 'true' : undefined"
+                            :translate="protectOptionText ? 'no' : undefined"
+                        />
+                        <span
+                            class="line-clamp-1"
+                            :data-no-i18n="protectOptionText ? 'true' : undefined"
+                            :translate="protectOptionText ? 'no' : undefined"
+                        >
+                            {{ selectedOption.label }}
+                        </span>
+                    </div>
+                </template>
+                <SelectValue v-else :placeholder="resolvedPlaceholder" />
+            </slot>
         </SelectTrigger>
 
         <SelectContent
+            :data-testid="contentTestId || undefined"
+            :disable-portal="disablePortal"
             class="w-[var(--reka-select-trigger-width)] rounded-[10px] border border-gray-200 bg-white py-1 shadow-lg"
         >
             <SelectItem
                 v-for="option in options"
                 :key="option.value"
                 :value="option.value"
+                :data-testid="
+                    optionTestIdPrefix ? `${optionTestIdPrefix}${option.value}` : undefined
+                "
                 class="flex w-full px-3 py-2 text-left text-sm transition-colors hover:bg-gray-100"
                 :class="{
                     'bg-primary-50 text-primary-600': option.value === modelValue,
diff --git a/apps/desktop/src/components/ui/select/SelectContent.vue b/apps/desktop/src/components/ui/select/SelectContent.vue
index bcba5ec8..a2619532 100644
--- a/apps/desktop/src/components/ui/select/SelectContent.vue
+++ b/apps/desktop/src/components/ui/select/SelectContent.vue
@@ -8,12 +8,17 @@
         useForwardPropsEmits,
     } from 'reka-ui';
     import type { HTMLAttributes } from 'vue';
-    import { computed } from 'vue';
+    import { computed, useAttrs } from 'vue';
 
     import { cn } from '@/lib/utils';
 
+    defineOptions({
+        inheritAttrs: false,
+    });
+
     interface Props extends SelectContentProps {
         class?: HTMLAttributes['class'];
+        disablePortal?: boolean;
     }
 
     const props = withDefaults(defineProps<Props>(), {
@@ -23,23 +28,30 @@
         align: 'start',
         sideOffset: 4,
         avoidCollisions: true,
+        disablePortal: false,
     });
 
     const emits = defineEmits<SelectContentEmits>();
+    const attrs = useAttrs();
 
     const delegatedProps = computed(() => {
         const delegated = { ...props };
         Reflect.deleteProperty(delegated, 'class');
+        Reflect.deleteProperty(delegated, 'disablePortal');
         return delegated;
     });
 
     const forwarded = useForwardPropsEmits(delegatedProps, emits);
+    const contentProps = computed(() => ({
+        ...forwarded.value,
+        ...attrs,
+    }));
 </script>
 
 <template>
-    <SelectPortal>
+    <SelectPortal :disabled="disablePortal">
         <SelectContent
-            v-bind="forwarded"
+            v-bind="contentProps"
             :class="
                 cn(
                     'relative z-50 min-w-[8rem] overflow-hidden rounded-lg border border-gray-200 bg-white py-1 text-gray-900 shadow-lg',
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 07355e82..e798f102 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -229,7 +229,6 @@
         });
     });
 
-    const shortcutInput = ref<HTMLInputElement | null>(null);
     const isSaving = ref(false);
     const isCapturing = ref(false);
     const hasCapturedShortcut = ref(false);
@@ -239,7 +238,13 @@
     const alertMessage = ref<InstanceType<typeof AlertMessage> | null>(null);
     const shortcutRegistrationFailed = ref(false);
     const showGlobalShortcutPresetMenu = ref(false);
-    const globalShortcutPresetOptions = ['Alt+Space', 'Ctrl+Space'] as const;
+    const globalShortcutPresetShortcuts = ['Alt+Space', 'Ctrl+Space'] as const;
+    const globalShortcutPresetOptions = computed(() =>
+        globalShortcutPresetShortcuts.map((shortcut) => ({
+            label: shortcut,
+            value: shortcut,
+        }))
+    );
     const activeSearchShortcutActionId = ref<SearchKeybindingActionId | null>(null);
     const searchShortcutCapturedValue = ref<string | null>(null);
     const hasCapturedSearchShortcut = ref(false);
@@ -403,6 +408,19 @@
     };
 
     // 保存新快捷键的通用函数
+    const handleGlobalShortcutPresetOpenChange = (open: boolean) => {
+        if (isSaving.value) {
+            return;
+        }
+
+        if (open) {
+            startCapture();
+            return;
+        }
+
+        void stopCaptureAndSave();
+    };
+
     const saveNewShortcut = async (newShortcut: string) => {
         const searchConflict = findGlobalShortcutSearchConflict(newShortcut);
         if (searchConflict) {
@@ -449,6 +467,10 @@
 
     // 使用建议的快捷键
     const useSuggestedShortcut = async (shortcut: string) => {
+        if (isSaving.value) {
+            return;
+        }
+
         showGlobalShortcutPresetMenu.value = false;
 
         // 如果正在捕获，先取消捕获
@@ -457,10 +479,6 @@
         }
 
         // 如果输入框有焦点，先失焦
-        if (shortcutInput.value) {
-            shortcutInput.value.blur();
-        }
-
         await saveNewShortcut(shortcut);
     };
 
@@ -997,35 +1015,41 @@
                                         data-testid="settings-general-shortcut-input-wrap"
                                         class="relative ml-auto w-[220px] shrink-0"
                                     >
-                                        <input
-                                            ref="shortcutInput"
-                                            v-model="displayShortcut"
-                                            data-testid="settings-global-shortcut-input"
-                                            type="text"
-                                            readonly
-                                            :class="[
-                                                'w-full rounded-[10px] border px-3 py-2 text-center text-[12px] shadow-none [box-shadow:none] transition-colors focus:shadow-none focus:[box-shadow:none] focus:outline-none',
-                                                showGlobalShortcutPresetMenu
-                                                    ? 'rounded-b-none border-b-0'
-                                                    : '',
-                                                shortcutRegistrationFailed
-                                                    ? 'border-red-300 bg-red-50 text-red-600'
-                                                    : isCapturing
-                                                      ? 'border-primary-300 bg-white text-neutral-950'
-                                                      : 'focus:border-primary-300 border-transparent bg-[#f0f0ef] text-neutral-900 hover:bg-[#ececea]',
-                                                isSaving
-                                                    ? 'cursor-wait opacity-50'
-                                                    : 'cursor-pointer',
-                                            ]"
+                                        <CustomSelect
+                                            :model-value="displayShortcut"
+                                            :options="globalShortcutPresetOptions"
+                                            :open="showGlobalShortcutPresetMenu"
+                                            :display-label="displayShortcut"
                                             :disabled="isSaving"
-                                            :placeholder="t('settings.general.shortcutPlaceholder')"
-                                            @focus="startCapture"
-                                            @blur="stopCaptureAndSave"
-                                        />
+                                            trigger-as="div"
+                                            content-test-id="settings-global-shortcut-preset-menu"
+                                            option-test-id-prefix="settings-global-shortcut-preset-"
+                                            disable-portal
+                                            protect-option-text
+                                            @update:open="handleGlobalShortcutPresetOpenChange"
+                                            @update:model-value="useSuggestedShortcut"
+                                        >
+                                            <template #trigger>
+                                                <input
+                                                    v-model="displayShortcut"
+                                                    data-testid="settings-global-shortcut-input"
+                                                    type="text"
+                                                    readonly
+                                                    class="min-w-0 flex-1 bg-transparent text-center text-[12px] outline-none"
+                                                    :disabled="isSaving"
+                                                    :placeholder="
+                                                        t('settings.general.shortcutPlaceholder')
+                                                    "
+                                                    @pointerdown.stop
+                                                    @click.stop
+                                                    @focus="startCapture"
+                                                />
+                                            </template>
+                                        </CustomSelect>
                                         <span
                                             v-if="shortcutRegistrationFailed"
                                             data-testid="settings-shortcut-occupied-indicator"
-                                            class="absolute top-1/2 right-2.5 flex h-4 w-4 -translate-y-1/2 items-center justify-center text-red-500"
+                                            class="absolute top-1/2 right-8 flex h-4 w-4 -translate-y-1/2 items-center justify-center text-red-500"
                                             :title="
                                                 t('settings.general.shortcutRegistrationFailed')
                                             "
@@ -1035,24 +1059,6 @@
                                                 class="h-3.5 w-3.5"
                                             />
                                         </span>
-                                        <div
-                                            v-if="showGlobalShortcutPresetMenu"
-                                            data-testid="settings-global-shortcut-preset-menu"
-                                            class="border-primary-300 absolute top-full right-0 z-20 w-full overflow-hidden rounded-[10px] rounded-t-none border border-t-0 bg-white py-1 shadow-lg"
-                                        >
-                                            <button
-                                                v-for="shortcut in globalShortcutPresetOptions"
-                                                :key="shortcut"
-                                                type="button"
-                                                class="block w-full px-3 py-2 text-center text-[12px] text-neutral-800 transition-colors hover:bg-neutral-100 disabled:cursor-not-allowed disabled:opacity-50"
-                                                :disabled="isSaving"
-                                                :data-testid="`settings-global-shortcut-preset-${shortcut}`"
-                                                @mousedown.prevent
-                                                @click="useSuggestedShortcut(shortcut)"
-                                            >
-                                                {{ shortcut }}
-                                            </button>
-                                        </div>
                                     </div>
                                 </div>
                             </div>
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index a1442fb7..1a32f471 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -102,9 +102,27 @@ vi.mock('@components/AppIcon.vue', () => ({
 vi.mock('@components/CustomSelect.vue', () => ({
     default: {
         name: 'CustomSelectStub',
-        props: ['modelValue', 'options'],
-        emits: ['update:modelValue'],
-        template: '<select data-testid="custom-select"><option>{{ modelValue }}</option></select>',
+        props: ['modelValue', 'options', 'open', 'contentTestId', 'optionTestIdPrefix'],
+        emits: ['update:modelValue', 'update:open'],
+        template: `
+            <div data-testid="custom-select">
+                <slot name="trigger" />
+                <select v-if="!$slots.trigger" data-testid="custom-select-native">
+                    <option>{{ modelValue }}</option>
+                </select>
+                <div v-if="open" :data-testid="contentTestId">
+                    <button
+                        v-for="option in options"
+                        :key="option.value"
+                        type="button"
+                        :data-testid="optionTestIdPrefix ? optionTestIdPrefix + option.value : undefined"
+                        @click="$emit('update:modelValue', option.value)"
+                    >
+                        {{ option.label }}
+                    </button>
+                </div>
+            </div>
+        `,
     },
 }));
 

From d669b1683478526b6eca7a7949954eaaa8e7c8c3 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 8 Jun 2026 17:48:49 +0800
Subject: [PATCH 08/55] feat(desktop): add shortcut descriptions

---
 apps/desktop/src/config/searchKeybindings.ts  |  8 +++++
 apps/desktop/src/i18n/messages.ts             | 33 +++++++++++++++++++
 .../SettingsView/components/General/index.vue | 18 +++++++++-
 .../SettingsView/general-language.test.ts     |  4 +--
 .../settingsGeneralComponent.test.ts          |  6 ++--
 5 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 6ee46712..356484ad 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -16,6 +16,7 @@ export type SearchKeybindingActionId = (typeof SEARCH_KEYBINDING_ACTION_IDS)[num
 export interface SearchKeybindingDefinition {
     id: SearchKeybindingActionId;
     labelKey: MessageKey;
+    descriptionKey: MessageKey;
     defaultShortcut: string | null;
     allowDisable: boolean;
 }
@@ -26,42 +27,49 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
     {
         id: 'search.history.open',
         labelKey: 'settings.general.searchActions.history',
+        descriptionKey: 'settings.general.searchActionDescriptions.history',
         defaultShortcut: 'Mod+H',
         allowDisable: true,
     },
     {
         id: 'search.input.focus',
         labelKey: 'settings.general.searchActions.focusInput',
+        descriptionKey: 'settings.general.searchActionDescriptions.focusInput',
         defaultShortcut: 'Mod+L',
         allowDisable: true,
     },
     {
         id: 'search.session.new',
         labelKey: 'settings.general.searchActions.newSession',
+        descriptionKey: 'settings.general.searchActionDescriptions.newSession',
         defaultShortcut: 'Mod+N',
         allowDisable: true,
     },
     {
         id: 'search.session.reopenLastClosed',
         labelKey: 'settings.general.searchActions.reopenLastClosedSession',
+        descriptionKey: 'settings.general.searchActionDescriptions.reopenLastClosedSession',
         defaultShortcut: 'Mod+Up',
         allowDisable: true,
     },
     {
         id: 'search.model.toggle',
         labelKey: 'settings.general.searchActions.modelToggle',
+        descriptionKey: 'settings.general.searchActionDescriptions.modelToggle',
         defaultShortcut: 'Mod+M',
         allowDisable: true,
     },
     {
         id: 'search.window.pin',
         labelKey: 'settings.general.searchActions.windowPin',
+        descriptionKey: 'settings.general.searchActionDescriptions.windowPin',
         defaultShortcut: 'Mod+P',
         allowDisable: true,
     },
     {
         id: 'search.window.maximize',
         labelKey: 'settings.general.searchActions.windowMaximize',
+        descriptionKey: 'settings.general.searchActionDescriptions.windowMaximize',
         defaultShortcut: 'F11',
         allowDisable: true,
     },
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 1acec78e..20cb0d0d 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -77,6 +77,7 @@ const zhCNMessages = {
     'settings.general.shortcuts': '快捷键',
     'settings.general.globalShortcut': '全局快捷键',
     'settings.general.activationShortcut': '唤起快捷键',
+    'settings.general.activationShortcutDescription': '设置呼出 TouchAI 的全局快捷键。',
     'settings.general.shortcutPlaceholder': '点击输入框设置快捷键',
     'settings.general.shortcutCapturePrompt': '请按下快捷键...',
     'settings.general.shortcutRegistrationFailed': '快捷键注册失败，可能已被其他应用占用',
@@ -106,6 +107,18 @@ const zhCNMessages = {
     'settings.general.fixedSearchActions.previousInputHistory': '上一条会话历史',
     'settings.general.fixedSearchActions.nextInputHistory': '下一条会话历史',
     'settings.general.searchActions.clearAll': '清空草稿与上下文',
+    'settings.general.searchActionDescriptions.history': '快速打开会话历史列表。',
+    'settings.general.searchActionDescriptions.focusInput': '将焦点移动到输入框。',
+    'settings.general.searchActionDescriptions.newSession': '立即开始一段新会话。',
+    'settings.general.searchActionDescriptions.reopenLastClosedSession': '重新打开最近关闭的会话。',
+    'settings.general.searchActionDescriptions.modelToggle': '展开或收起模型选择。',
+    'settings.general.searchActionDescriptions.windowPin': '切换搜索窗口置顶状态。',
+    'settings.general.searchActionDescriptions.windowMaximize': '切换搜索窗口最大化。',
+    'settings.general.searchActionDescriptions.cancelRequest': '停止当前生成或工具执行。',
+    'settings.general.searchActionDescriptions.submitRequest': '发送当前输入内容。',
+    'settings.general.searchActionDescriptions.newLine': '在输入框中插入换行。',
+    'settings.general.searchActionDescriptions.previousInputHistory': '查看上一条输入记录。',
+    'settings.general.searchActionDescriptions.nextInputHistory': '查看下一条输入记录。',
     'settings.general.searchShortcuts.errors.modifierRequired': '快捷键至少需要一个修饰键',
     'settings.general.searchShortcuts.errors.reserved':
         '该快捷键保留给输入/导航行为，请选择其他组合',
@@ -830,6 +843,8 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.shortcuts': 'Shortcuts',
     'settings.general.globalShortcut': 'Global shortcut',
     'settings.general.activationShortcut': 'Activation shortcut',
+    'settings.general.activationShortcutDescription':
+        'Set the global shortcut used to open TouchAI.',
     'settings.general.shortcutPlaceholder': 'Click the field to set a shortcut',
     'settings.general.shortcutCapturePrompt': 'Press a shortcut...',
     'settings.general.shortcutRegistrationFailed':
@@ -861,6 +876,24 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.fixedSearchActions.previousInputHistory': 'Previous input history',
     'settings.general.fixedSearchActions.nextInputHistory': 'Next input history',
     'settings.general.searchActions.clearAll': 'Clear draft and context',
+    'settings.general.searchActionDescriptions.history': 'Quickly open the session history list.',
+    'settings.general.searchActionDescriptions.focusInput': 'Move focus to the input field.',
+    'settings.general.searchActionDescriptions.newSession': 'Start a new session immediately.',
+    'settings.general.searchActionDescriptions.reopenLastClosedSession':
+        'Reopen the most recently closed session.',
+    'settings.general.searchActionDescriptions.modelToggle': 'Open or close the model picker.',
+    'settings.general.searchActionDescriptions.windowPin':
+        'Toggle whether the search window stays on top.',
+    'settings.general.searchActionDescriptions.windowMaximize':
+        'Toggle the search window maximized state.',
+    'settings.general.searchActionDescriptions.cancelRequest':
+        'Stop the current generation or tool run.',
+    'settings.general.searchActionDescriptions.submitRequest': 'Send the current input.',
+    'settings.general.searchActionDescriptions.newLine': 'Insert a new line in the input field.',
+    'settings.general.searchActionDescriptions.previousInputHistory':
+        'Show the previous input history item.',
+    'settings.general.searchActionDescriptions.nextInputHistory':
+        'Show the next input history item.',
     'settings.general.searchShortcuts.errors.modifierRequired':
         'A shortcut must include at least one modifier key',
     'settings.general.searchShortcuts.errors.reserved':
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index e798f102..a53dc184 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -96,6 +96,7 @@
         kind: 'configurable' | 'fixed';
         id: string;
         label: string;
+        description?: string;
         displayValue: string;
         isCapturing?: boolean;
         hasError?: boolean;
@@ -111,12 +112,14 @@
                 kind: 'fixed',
                 id: 'search.inputHistory.older',
                 label: t('settings.general.fixedSearchActions.previousInputHistory'),
+                description: t('settings.general.searchActionDescriptions.previousInputHistory'),
                 displayValue: 'Up',
             },
             {
                 kind: 'fixed',
                 id: 'search.inputHistory.newer',
                 label: t('settings.general.fixedSearchActions.nextInputHistory'),
+                description: t('settings.general.searchActionDescriptions.nextInputHistory'),
                 displayValue: 'Down',
             },
         ],
@@ -125,18 +128,21 @@
                 kind: 'fixed',
                 id: 'search.request.cancel',
                 label: t('settings.general.searchActions.cancelRequest'),
+                description: t('settings.general.searchActionDescriptions.cancelRequest'),
                 displayValue: 'Esc',
             },
             {
                 kind: 'fixed',
                 id: 'search.submit',
                 label: t('settings.general.fixedSearchActions.submitRequest'),
+                description: t('settings.general.searchActionDescriptions.submitRequest'),
                 displayValue: 'Enter',
             },
             {
                 kind: 'fixed',
                 id: 'search.newLine',
                 label: t('settings.general.fixedSearchActions.newLine'),
+                description: t('settings.general.searchActionDescriptions.newLine'),
                 displayValue: 'Shift+Enter',
             },
         ],
@@ -172,6 +178,7 @@
                 ...definition,
                 kind: 'configurable',
                 label: t(definition.labelKey),
+                description: t(definition.descriptionKey),
                 displayValue: searchShortcutDisplayMap.value[definition.id],
                 isCapturing: activeSearchShortcutActionId.value === definition.id,
                 hasError: searchShortcutErrorActionId.value === definition.id,
@@ -1003,7 +1010,10 @@
                             data-testid="settings-general-row-label"
                             class="text-[13px] leading-6 font-normal text-neutral-900"
                         >
-                            {{ t('settings.general.activationShortcut') }}
+                            <div>{{ t('settings.general.activationShortcut') }}</div>
+                            <div class="text-[12px] leading-5 text-neutral-500">
+                                {{ t('settings.general.activationShortcutDescription') }}
+                            </div>
                         </label>
                         <div class="min-w-0 justify-self-end">
                             <div
@@ -1081,6 +1091,12 @@
                                 class="min-w-0 text-[13px] leading-6 font-normal text-neutral-900"
                             >
                                 <div>{{ row.label }}</div>
+                                <div
+                                    v-if="row.description"
+                                    class="text-[12px] leading-5 text-neutral-500"
+                                >
+                                    {{ row.description }}
+                                </div>
                             </div>
                             <div class="min-w-0 justify-self-end">
                                 <div class="flex min-w-0 items-center justify-end">
diff --git a/apps/desktop/tests/SettingsView/general-language.test.ts b/apps/desktop/tests/SettingsView/general-language.test.ts
index f716f726..a61594f9 100644
--- a/apps/desktop/tests/SettingsView/general-language.test.ts
+++ b/apps/desktop/tests/SettingsView/general-language.test.ts
@@ -166,9 +166,9 @@ describe('Settings General shortcut capture i18n', () => {
 
         expect(wrapper.text()).toContain('General');
         expect(wrapper.text()).toContain('Shortcuts');
-        expect(wrapper.text()).toContain('Search shortcuts');
+        expect(wrapper.text()).toContain('Set the global shortcut used to open TouchAI.');
         expect(wrapper.text()).toContain('Toggle window maximize');
-        expect(wrapper.text()).toContain('Set the global entry point for opening TouchAI');
+        expect(wrapper.text()).toContain('Toggle the search window maximized state.');
         expect(wrapper.text()).toContain('Activation shortcut');
         expect(wrapper.text()).toContain('Startup and window');
         expect(wrapper.text()).toContain(
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 1a32f471..766d72ba 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -202,21 +202,21 @@ describe('SettingsGeneralSection', () => {
                     .element as HTMLInputElement
             ).value
         ).toBe('Alt+Space');
+        expect(wrapper.text()).toContain('设置呼出 TouchAI 的全局快捷键。');
         expect(wrapper.text()).not.toContain('Ctrl+Space');
         expect(wrapper.find('[data-testid="settings-shortcut-suggestions"]').exists()).toBe(false);
         expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
             false
         );
         expect(wrapper.text()).not.toContain('搜索页快捷键');
-        expect(wrapper.text()).not.toContain(
-            '自定义搜索窗口内的命令型快捷键，不会影响输入导航与全局唤起。'
-        );
         expect(wrapper.text()).toContain('会话');
         expect(wrapper.text()).toContain('输入与请求');
         expect(wrapper.text()).toContain('窗口');
         expect(wrapper.text()).toContain('打开会话历史');
+        expect(wrapper.text()).toContain('快速打开会话历史列表。');
         expect(wrapper.text()).toContain('开始新会话');
         expect(wrapper.text()).toContain('切换窗口最大化');
+        expect(wrapper.text()).toContain('切换搜索窗口最大化。');
         expect(
             (
                 wrapper.get('[data-testid="settings-search-shortcut-input-search.window.maximize"]')

From 14c5f35a25bf4c6b7b26bd3ede77a377366380e3 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 8 Jun 2026 18:17:36 +0800
Subject: [PATCH 09/55] fix(desktop): normalize function-row shortcuts

---
 apps/desktop/src/config/searchKeybindings.ts  |  8 +++++
 apps/desktop/src/utils/shortcuts.ts           | 31 +++++++++++++++++--
 .../interaction/useSearchKeyboardRouter.ts    | 14 ++-------
 .../composables/searchInteraction.ts          |  1 +
 .../SettingsView/components/General/index.vue |  2 ++
 .../useSearchKeyboardRouter.test.ts           | 14 +++++++++
 .../settingsGeneralComponent.test.ts          | 22 ++++++++++++-
 7 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 356484ad..62480105 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -19,6 +19,7 @@ export interface SearchKeybindingDefinition {
     descriptionKey: MessageKey;
     defaultShortcut: string | null;
     allowDisable: boolean;
+    allowModifierlessFunctionShortcut: boolean;
 }
 
 export type SearchKeybindings = Record<SearchKeybindingActionId, string | null>;
@@ -30,6 +31,7 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         descriptionKey: 'settings.general.searchActionDescriptions.history',
         defaultShortcut: 'Mod+H',
         allowDisable: true,
+        allowModifierlessFunctionShortcut: true,
     },
     {
         id: 'search.input.focus',
@@ -37,6 +39,7 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         descriptionKey: 'settings.general.searchActionDescriptions.focusInput',
         defaultShortcut: 'Mod+L',
         allowDisable: true,
+        allowModifierlessFunctionShortcut: true,
     },
     {
         id: 'search.session.new',
@@ -44,6 +47,7 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         descriptionKey: 'settings.general.searchActionDescriptions.newSession',
         defaultShortcut: 'Mod+N',
         allowDisable: true,
+        allowModifierlessFunctionShortcut: true,
     },
     {
         id: 'search.session.reopenLastClosed',
@@ -51,6 +55,7 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         descriptionKey: 'settings.general.searchActionDescriptions.reopenLastClosedSession',
         defaultShortcut: 'Mod+Up',
         allowDisable: true,
+        allowModifierlessFunctionShortcut: true,
     },
     {
         id: 'search.model.toggle',
@@ -58,6 +63,7 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         descriptionKey: 'settings.general.searchActionDescriptions.modelToggle',
         defaultShortcut: 'Mod+M',
         allowDisable: true,
+        allowModifierlessFunctionShortcut: true,
     },
     {
         id: 'search.window.pin',
@@ -65,6 +71,7 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         descriptionKey: 'settings.general.searchActionDescriptions.windowPin',
         defaultShortcut: 'Mod+P',
         allowDisable: true,
+        allowModifierlessFunctionShortcut: true,
     },
     {
         id: 'search.window.maximize',
@@ -72,6 +79,7 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         descriptionKey: 'settings.general.searchActionDescriptions.windowMaximize',
         defaultShortcut: 'F11',
         allowDisable: true,
+        allowModifierlessFunctionShortcut: true,
     },
 ];
 
diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index a01f86cc..b3938c67 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -1,5 +1,6 @@
 export interface ShortcutMatchInput {
     key: string;
+    code?: string;
     ctrlKey?: boolean;
     metaKey?: boolean;
     altKey?: boolean;
@@ -116,6 +117,32 @@ function normalizeEventKey(key: string): string | null {
     return normalizeShortcutToken(mappedKey);
 }
 
+function normalizeFunctionKeyCode(code: string | null | undefined): string | null {
+    if (!code) {
+        return null;
+    }
+
+    const trimmedCode = code.trim();
+    if (!/^F\d{1,2}$/i.test(trimmedCode)) {
+        return null;
+    }
+
+    return trimmedCode.toUpperCase();
+}
+
+export function resolveKeyboardEventShortcutKey(
+    key: string | null | undefined,
+    code?: string | null
+): string | null {
+    const normalizedKey = normalizeEventKey(key ?? '');
+    const normalizedFunctionKeyCode = normalizeFunctionKeyCode(code);
+    if (normalizedFunctionKeyCode && (!normalizedKey || !/^F\d{1,2}$/.test(normalizedKey))) {
+        return normalizedFunctionKeyCode;
+    }
+
+    return normalizedKey;
+}
+
 function createShortcutParts(shortcut: string): { modifiers: string[]; key: string | null } {
     const parts = shortcut
         .split('+')
@@ -186,7 +213,7 @@ export function matchShortcut(
     }
 
     const { modifiers, key } = createShortcutParts(normalized);
-    const eventKey = normalizeEventKey(input.key);
+    const eventKey = resolveKeyboardEventShortcutKey(input.key, input.code);
     if (!eventKey || eventKey !== key) {
         return false;
     }
@@ -236,7 +263,7 @@ export function captureShortcutFromKeyboardEvent(
         return null;
     }
 
-    const key = normalizeEventKey(event.key);
+    const key = resolveKeyboardEventShortcutKey(event.key, event.code);
     if (!key) {
         return null;
     }
diff --git a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
index 60d32a2b..2d0dada1 100644
--- a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
+++ b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
@@ -14,6 +14,7 @@ interface PendingApprovalState {
 
 export interface SearchKeyboardRouteInput {
     key: string;
+    code?: string;
     shiftKey?: boolean;
     ctrlKey?: boolean;
     metaKey?: boolean;
@@ -84,10 +85,7 @@ function isTypingAttemptDuringApproval(input: SearchKeyboardRouteInput) {
 
 function resolveSearchKeybindingAction(
     input: SearchKeyboardRouteInput,
-    keybindings: SearchKeybindings,
-    _context: {
-        isLoading: boolean;
-    }
+    keybindings: SearchKeybindings
 ): SearchKeybindingActionId | null {
     for (const [actionId, shortcut] of Object.entries(keybindings) as Array<
         [SearchKeybindingActionId, string | null]
@@ -170,13 +168,7 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
             }
         }
 
-        const searchKeybindingAction = resolveSearchKeybindingAction(
-            input,
-            getSearchKeybindings(),
-            {
-                isLoading: isLoading(),
-            }
-        );
+        const searchKeybindingAction = resolveSearchKeybindingAction(input, getSearchKeybindings());
         if (searchKeybindingAction) {
             runKeyboardEffect(() => onSearchKeybindingAction(searchKeybindingAction));
             return true;
diff --git a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
index ebe53ea0..429ae810 100644
--- a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
+++ b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
@@ -834,6 +834,7 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
 
         const handledByRouter = keyboardRouter.route({
             key: event.key,
+            code: event.code,
             shiftKey: event.shiftKey,
             ctrlKey: event.ctrlKey,
             metaKey: event.metaKey,
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index a53dc184..775927b6 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -520,7 +520,9 @@
         const normalizedShortcut =
             shortcut === null ? null : normalizeLocalShortcutString(shortcut);
         if (normalizedShortcut) {
+            const definition = getSearchKeybindingDefinition(actionId);
             const allowsModifierlessFunctionShortcut =
+                definition.allowModifierlessFunctionShortcut &&
                 isModifierlessFunctionShortcut(normalizedShortcut);
 
             if (!hasRequiredModifier(normalizedShortcut) && !allowsModifierlessFunctionShortcut) {
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index e1f15732..2ad0c3a8 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -114,6 +114,20 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.history.open');
     });
 
+    it('routes function-row search shortcuts by keyboard code when the key value is remapped', async () => {
+        const { router, callbacks } = createKeyboardRouter({
+            getSearchKeybindings: () => ({
+                ...createDefaultSearchKeybindings(),
+                'search.history.open': 'F2',
+            }),
+        });
+
+        expect(router.route({ key: 'BrightnessUp', code: 'F2' })).toBe(true);
+        await flushAsyncWork();
+
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.history.open');
+    });
+
     it('routes the default Ctrl+Up shortcut through the action callback', async () => {
         const { router, callbacks } = createKeyboardRouter({
             getSearchKeybindings: () => createDefaultSearchKeybindings(),
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 766d72ba..c698ee2a 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -330,7 +330,7 @@ describe('SettingsGeneralSection', () => {
         expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
         expect((input.element as HTMLInputElement).value).toBe('Alt+Space');
     });
-    it('accepts modifierless F1-F12 for configurable search shortcuts', async () => {
+    it('accepts modifierless function keys for configurable search shortcuts', async () => {
         settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
         const wrapper = mount(GeneralSection);
 
@@ -350,6 +350,26 @@ describe('SettingsGeneralSection', () => {
         });
     });
 
+    it('captures a function-row key by keyboard code when the key value is not an F-key', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'BrightnessUp', code: 'F2' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'F2',
+        });
+    });
+
     it('shows fixed search shortcuts as unsupported for editing', async () => {
         const wrapper = mount(GeneralSection);
 

From 61905a9322858d8a17f64a42bf84b05b0441133f Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Tue, 9 Jun 2026 00:40:41 +0800
Subject: [PATCH 10/55] fix(desktop): address keybinding review feedback

---
 apps/desktop/src/config/searchKeybindings.ts  | 12 ++++-
 apps/desktop/src/i18n/messages.ts             |  2 +
 apps/desktop/src/stores/settings.ts           | 45 +++++++---------
 .../composables/searchInteraction.ts          |  6 ++-
 .../composables/useSearchRequest.ts           | 12 ++++-
 .../SettingsView/components/General/index.vue |  4 +-
 .../SearchView/useSearchRequest.test.ts       | 52 +++++++++++++++++++
 .../tests/config/searchKeybindings.test.ts    | 14 +++++
 .../tests/stores/settings-keybindings.test.ts | 25 +++++++++
 .../settingsGeneralComponent.test.ts          | 22 ++++++++
 10 files changed, 162 insertions(+), 32 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 62480105..0d94fb0d 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -1,5 +1,9 @@
 import type { MessageKey } from '@/i18n';
-import { normalizeLocalShortcutString } from '@/utils/shortcuts';
+import {
+    hasRequiredModifier,
+    isModifierlessFunctionShortcut,
+    normalizeLocalShortcutString,
+} from '@/utils/shortcuts';
 
 export const SEARCH_KEYBINDING_ACTION_IDS = [
     'search.history.open',
@@ -129,6 +133,12 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
 
         const shortcut = normalizeLocalShortcutString(candidate);
         if (shortcut) {
+            const allowsModifierlessFunction =
+                definition.allowModifierlessFunctionShortcut &&
+                isModifierlessFunctionShortcut(shortcut);
+            if (!hasRequiredModifier(shortcut) && !allowsModifierlessFunction) {
+                continue;
+            }
             normalized[definition.id] = shortcut;
         }
     }
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 24d3eff5..0babc7bd 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -87,6 +87,7 @@ const zhCNMessages = {
         '点击输入框后按下您想要设置的快捷键组合。支持的修饰键：Ctrl、Alt、Shift',
     'settings.general.winKeyUnsupported': '不支持 Win 键组合，请使用 Ctrl、Alt、Shift',
     'settings.general.shortcutSaved': '快捷键保存成功',
+    'settings.general.noShortcut': '无',
     'settings.general.globalShortcutGroup': '全局唤起',
     'settings.general.searchShortcutsDescription':
         '自定义搜索窗口内的命令型快捷键，不会影响输入导航与全局唤起。',
@@ -865,6 +866,7 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.winKeyUnsupported':
         'Win key combinations are not supported. Use Ctrl, Alt, or Shift.',
     'settings.general.shortcutSaved': 'Shortcut saved',
+    'settings.general.noShortcut': 'None',
     'settings.general.globalShortcutGroup': 'Global activation',
     'settings.general.searchShortcutsDescription':
         'Customize command shortcuts inside the search window without changing typing, navigation, or the global activation shortcut.',
diff --git a/apps/desktop/src/stores/settings.ts b/apps/desktop/src/stores/settings.ts
index f5d00d10..c8a525fa 100644
--- a/apps/desktop/src/stores/settings.ts
+++ b/apps/desktop/src/stores/settings.ts
@@ -130,6 +130,19 @@ export const useSettingsStore = defineStore('settings', () => {
         settings.value.searchKeybindings = normalizeSearchKeybindings(value);
     }
 
+    function parseOptionalSessionId(value: unknown): number | null {
+        if (value === null || value === '') {
+            return null;
+        }
+
+        if (typeof value === 'string' && !/^\d+$/.test(value)) {
+            return null;
+        }
+
+        const parsed = typeof value === 'number' ? value : Number(value);
+        return Number.isInteger(parsed) && parsed > 0 ? parsed : null;
+    }
+
     function parsePersistedSearchKeybindings(value: string | null): SearchKeybindings {
         if (!value) {
             return createDefaultSearchKeybindings();
@@ -185,18 +198,10 @@ export const useSettingsStore = defineStore('settings', () => {
                 );
                 break;
             case 'last_closed_session_id':
-                settings.value.lastClosedSessionId =
-                    value === null || value === '' ? null : Number(value);
-                if (Number.isNaN(settings.value.lastClosedSessionId)) {
-                    settings.value.lastClosedSessionId = null;
-                }
+                settings.value.lastClosedSessionId = parseOptionalSessionId(value);
                 break;
             case 'last_active_session_id':
-                settings.value.lastActiveSessionId =
-                    value === null || value === '' ? null : Number(value);
-                if (Number.isNaN(settings.value.lastActiveSessionId)) {
-                    settings.value.lastActiveSessionId = null;
-                }
+                settings.value.lastActiveSessionId = parseOptionalSessionId(value);
                 break;
             case 'start_on_boot':
                 settings.value.startOnBoot =
@@ -339,20 +344,8 @@ export const useSettingsStore = defineStore('settings', () => {
             settings.value.globalShortcut =
                 globalShortcut || DEFAULT_GENERAL_SETTINGS.globalShortcut;
             settings.value.searchKeybindings = parsePersistedSearchKeybindings(searchKeybindings);
-            settings.value.lastClosedSessionId =
-                lastClosedSessionId === null || lastClosedSessionId === ''
-                    ? DEFAULT_GENERAL_SETTINGS.lastClosedSessionId
-                    : Number(lastClosedSessionId);
-            if (Number.isNaN(settings.value.lastClosedSessionId)) {
-                settings.value.lastClosedSessionId = DEFAULT_GENERAL_SETTINGS.lastClosedSessionId;
-            }
-            settings.value.lastActiveSessionId =
-                lastActiveSessionId === null || lastActiveSessionId === ''
-                    ? DEFAULT_GENERAL_SETTINGS.lastActiveSessionId
-                    : Number(lastActiveSessionId);
-            if (Number.isNaN(settings.value.lastActiveSessionId)) {
-                settings.value.lastActiveSessionId = DEFAULT_GENERAL_SETTINGS.lastActiveSessionId;
-            }
+            settings.value.lastClosedSessionId = parseOptionalSessionId(lastClosedSessionId);
+            settings.value.lastActiveSessionId = parseOptionalSessionId(lastActiveSessionId);
             settings.value.startOnBoot =
                 startOnBoot === null
                     ? DEFAULT_GENERAL_SETTINGS.startOnBoot
@@ -494,11 +487,11 @@ export const useSettingsStore = defineStore('settings', () => {
     }
 
     async function updateLastClosedSessionId(sessionId: number | null) {
-        await updateSetting('last_closed_session_id', sessionId);
+        await updateSetting('last_closed_session_id', parseOptionalSessionId(sessionId));
     }
 
     async function updateLastActiveSessionId(sessionId: number | null) {
-        await updateSetting('last_active_session_id', sessionId);
+        await updateSetting('last_active_session_id', parseOptionalSessionId(sessionId));
     }
 
     async function updateStartOnBoot(enabled: boolean) {
diff --git a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
index 429ae810..0a5dca2b 100644
--- a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
+++ b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
@@ -799,8 +799,10 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
                 case 'search.window.maximize':
                     await toggleWindowMaximize();
                     return;
-                default:
-                    return;
+                default: {
+                    const exhaustiveActionId: never = actionId;
+                    throw new Error(`Unhandled search keybinding action: ${exhaustiveActionId}`);
+                }
             }
         },
     });
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
index 4efbeeac..761c44ab 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
@@ -417,6 +417,14 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
         clearDraft();
     }
 
+    async function clearLastClosedSessionIdSafely() {
+        try {
+            await settingsStore.updateLastClosedSessionId(null);
+        } catch (error) {
+            console.error('[SearchView] Failed to clear last closed session id:', error);
+        }
+    }
+
     async function reopenLastClosedSession(): Promise<LoadedSessionInfo | null> {
         const candidateSessionIds = [
             settingsStore.lastClosedSessionId,
@@ -437,13 +445,13 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
                     settingsStore.lastClosedSessionId !== null &&
                     currentSessionId.value === settingsStore.lastClosedSessionId
                 ) {
-                    await settingsStore.updateLastClosedSessionId(null);
+                    await clearLastClosedSessionIdSafely();
                 }
                 return loadedSession;
             } catch (error) {
                 lastOpenError = error;
                 if (sessionId === settingsStore.lastClosedSessionId) {
-                    await settingsStore.updateLastClosedSessionId(null);
+                    await clearLastClosedSessionIdSafely();
                 }
             }
         }
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 775927b6..7149be22 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -151,7 +151,9 @@
 
     function formatSearchShortcutForSettings(shortcut: string | null | undefined): string {
         const normalizedShortcut = normalizeLocalShortcutString(shortcut);
-        return normalizedShortcut ? formatShortcutForDisplay(normalizedShortcut) : '无';
+        return normalizedShortcut
+            ? formatShortcutForDisplay(normalizedShortcut)
+            : t('settings.general.noShortcut');
     }
 
     function allowsReservedSearchShortcut(
diff --git a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
index edb8c087..7d251089 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
@@ -444,6 +444,58 @@ describe('useSearchRequestFlow', () => {
         mounted.unmount();
     });
 
+    it('still returns a reopened session when clearing last-closed metadata fails', async () => {
+        const modelOverride = ref({
+            modelId: null,
+            providerId: null,
+        });
+        settingsStoreMock.lastClosedSessionId = 23;
+        settingsStoreMock.updateLastClosedSessionId.mockRejectedValueOnce(
+            new Error('database unavailable')
+        );
+        agentState.openSession.mockImplementationOnce(async () => {
+            agentState.currentSessionId.value = 23;
+            return {
+                sessionId: 23,
+                title: 'Reopened Session',
+                modelId: 'gpt-5',
+                providerId: 9,
+            };
+        });
+
+        const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
+        const mounted = await mountComposable(() =>
+            useSearchRequestFlow({
+                modelOverride,
+                clearDraft: vi.fn(),
+                getSupportedAttachments: () => [],
+                getUnsupportedAttachmentMessage: () => null,
+                getCurrentInputSnapshot: (query) =>
+                    createInputHistorySnapshot({
+                        text: query,
+                        attachments: [],
+                    }),
+            })
+        );
+
+        const reopenedSession = await mounted.result.reopenLastClosedSession();
+
+        expect(reopenedSession).toEqual({
+            sessionId: 23,
+            title: 'Reopened Session',
+            modelId: 'gpt-5',
+            providerId: 9,
+        });
+        expect(settingsStoreMock.updateLastClosedSessionId).toHaveBeenCalledWith(null);
+        expect(consoleErrorSpy).toHaveBeenCalledWith(
+            '[SearchView] Failed to clear last closed session id:',
+            expect.any(Error)
+        );
+
+        consoleErrorSpy.mockRestore();
+        mounted.unmount();
+    });
+
     it('regenerates from the nearest preceding user message and drops unsupported attachments', async () => {
         const supportedAttachment = createAttachment('supported-1');
         const unsupportedAttachment = createAttachment('unsupported-1', {
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index 7c14f906..3574b674 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -63,6 +63,20 @@ describe('search keybinding configuration', () => {
         });
     });
 
+    it('rejects persisted shortcuts that bypass capture policy', () => {
+        expect(
+            normalizeSearchKeybindings({
+                'search.history.open': 'H',
+                'search.input.focus': 'Ctrl+L',
+                'search.window.maximize': 'F12',
+            })
+        ).toEqual({
+            ...createDefaultSearchKeybindings(),
+            'search.input.focus': 'Ctrl+L',
+            'search.window.maximize': 'F12',
+        });
+    });
+
     it('falls back to defaults for invalid persisted payloads', () => {
         const defaults = createDefaultSearchKeybindings();
 
diff --git a/apps/desktop/tests/stores/settings-keybindings.test.ts b/apps/desktop/tests/stores/settings-keybindings.test.ts
index c0be65a3..6cd80c0c 100644
--- a/apps/desktop/tests/stores/settings-keybindings.test.ts
+++ b/apps/desktop/tests/stores/settings-keybindings.test.ts
@@ -103,6 +103,31 @@ describe('settings search keybindings state', () => {
         });
     });
 
+    it('ignores invalid persisted and updated session ids', async () => {
+        mockSettings({
+            last_closed_session_id: '-1',
+            last_active_session_id: '42.5',
+        });
+
+        const { useSettingsStore } = await import('@/stores/settings');
+        const store = useSettingsStore();
+
+        await store.initialize();
+
+        expect(store.settings.lastClosedSessionId).toBeNull();
+        expect(store.settings.lastActiveSessionId).toBeNull();
+
+        await store.updateLastClosedSessionId(0);
+        await store.updateLastActiveSessionId(-2);
+
+        expect(store.settings.lastClosedSessionId).toBeNull();
+        expect(store.settings.lastActiveSessionId).toBeNull();
+        expect(setSettingMock).toHaveBeenLastCalledWith({
+            key: 'last_active_session_id',
+            value: '',
+        });
+    });
+
     it('loads persisted search keybindings and merges missing defaults', async () => {
         mockSettings({
             search_keybindings: JSON.stringify({
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index c698ee2a..32c77d78 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -2,6 +2,7 @@ import type { AppUpdateState } from '@services/AppUpdateService/types';
 import { flushPromises, mount } from '@vue/test-utils';
 import { vi } from 'vitest';
 
+import { setLocale } from '@/i18n';
 import GeneralSection from '@/views/SettingsView/components/General/index.vue';
 
 const settingsStoreMock = vi.hoisted(() => {
@@ -182,6 +183,7 @@ vi.mock('@services/AppUpdateService', () => ({
 describe('SettingsGeneralSection', () => {
     beforeEach(() => {
         vi.clearAllMocks();
+        setLocale('zh-CN');
         appUpdateServiceMock.state = appUpdateServiceMock.createState();
         nativeMock.shortcut.getShortcutStatus.mockResolvedValue([false, null]);
         nativeMock.autostart.isAutostartEnabled.mockResolvedValue(false);
@@ -472,6 +474,26 @@ describe('SettingsGeneralSection', () => {
         });
     });
 
+    it('localizes the cleared search shortcut fallback', async () => {
+        setLocale('en-US');
+        settingsStoreMock.settings.value.language = 'en-US';
+        settingsStoreMock.settings.value.searchKeybindings = {
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': null,
+        };
+
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        expect(
+            (
+                wrapper.get('[data-testid="settings-search-shortcut-input-search.history.open"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('None');
+    });
+
     it('shows the current version in the latest update details', async () => {
         appUpdateServiceMock.state = {
             ...appUpdateServiceMock.createState(),

From b62fd54490750ea3429d8f60b249817bf7b05d0b Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Tue, 9 Jun 2026 01:01:58 +0800
Subject: [PATCH 11/55] fix(desktop): reject malformed shortcut strings

---
 apps/desktop/src/utils/shortcuts.ts        | 3 +++
 apps/desktop/tests/utils/shortcuts.test.ts | 1 +
 2 files changed, 4 insertions(+)

diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index b3938c67..30dd3a3d 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -157,6 +157,9 @@ function createShortcutParts(shortcut: string): { modifiers: string[]; key: stri
             continue;
         }
 
+        if (key) {
+            return { modifiers: [], key: null };
+        }
         key = part;
     }
 
diff --git a/apps/desktop/tests/utils/shortcuts.test.ts b/apps/desktop/tests/utils/shortcuts.test.ts
index 4846e488..a0eda21c 100644
--- a/apps/desktop/tests/utils/shortcuts.test.ts
+++ b/apps/desktop/tests/utils/shortcuts.test.ts
@@ -38,6 +38,7 @@ describe('shortcut utilities', () => {
         expect(normalizeLocalShortcutString('f12')).toBe('F12');
         expect(normalizeLocalShortcutString(null)).toBeNull();
         expect(normalizeLocalShortcutString('Ctrl+Alt')).toBeNull();
+        expect(normalizeLocalShortcutString('Ctrl+A+B')).toBeNull();
         expect(normalizeLocalShortcutString('   ')).toBeNull();
     });
 

From 7d9f6963cd0691401c1c72c21cffc4a29f2c1c1f Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Tue, 9 Jun 2026 09:34:45 +0800
Subject: [PATCH 12/55] feat(desktop): add settings shortcut

---
 apps/desktop/src/config/searchKeybindings.ts          |  9 +++++++++
 apps/desktop/src/i18n/messages.ts                     |  4 ++++
 apps/desktop/src/utils/shortcuts.ts                   |  1 +
 .../views/SearchView/composables/searchInteraction.ts |  5 +++++
 apps/desktop/src/views/SearchView/index.vue           |  1 +
 .../views/SettingsView/components/General/index.vue   |  2 +-
 .../composables/SearchView/searchInteraction.test.ts  |  3 +++
 .../SearchView/useSearchKeyboardRouter.test.ts        | 11 +++++++++++
 apps/desktop/tests/config/searchKeybindings.test.ts   |  3 +++
 .../desktop/tests/stores/settings-keybindings.test.ts |  1 +
 .../SettingsView/settingsGeneralComponent.test.ts     |  9 +++++++++
 11 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 0d94fb0d..653336fa 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -13,6 +13,7 @@ export const SEARCH_KEYBINDING_ACTION_IDS = [
     'search.model.toggle',
     'search.window.pin',
     'search.window.maximize',
+    'search.settings.open',
 ] as const;
 
 export type SearchKeybindingActionId = (typeof SEARCH_KEYBINDING_ACTION_IDS)[number];
@@ -85,6 +86,14 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         allowDisable: true,
         allowModifierlessFunctionShortcut: true,
     },
+    {
+        id: 'search.settings.open',
+        labelKey: 'settings.general.searchActions.openSettings',
+        descriptionKey: 'settings.general.searchActionDescriptions.openSettings',
+        defaultShortcut: 'Mod+,',
+        allowDisable: true,
+        allowModifierlessFunctionShortcut: false,
+    },
 ];
 
 const SEARCH_KEYBINDING_DEFINITION_MAP = new Map(
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 0babc7bd..01956835 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -101,6 +101,7 @@ const zhCNMessages = {
     'settings.general.searchActions.modelToggle': '切换模型选择',
     'settings.general.searchActions.windowPin': '切换窗口置顶',
     'settings.general.searchActions.windowMaximize': '切换窗口最大化',
+    'settings.general.searchActions.openSettings': '打开设置',
     'settings.general.searchActions.cancelRequest': '取消当前请求',
     'settings.general.fixedSearchShortcuts': '固定快捷键',
     'settings.general.fixedSearchActions.submitRequest': '发送请求',
@@ -115,6 +116,7 @@ const zhCNMessages = {
     'settings.general.searchActionDescriptions.modelToggle': '展开或收起模型选择。',
     'settings.general.searchActionDescriptions.windowPin': '切换搜索窗口置顶状态。',
     'settings.general.searchActionDescriptions.windowMaximize': '切换搜索窗口最大化。',
+    'settings.general.searchActionDescriptions.openSettings': '快速打开设置窗口。',
     'settings.general.searchActionDescriptions.cancelRequest': '停止当前生成或工具执行。',
     'settings.general.searchActionDescriptions.submitRequest': '发送当前输入内容。',
     'settings.general.searchActionDescriptions.newLine': '在输入框中插入换行。',
@@ -880,6 +882,7 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.searchActions.modelToggle': 'Toggle model picker',
     'settings.general.searchActions.windowPin': 'Toggle window pin',
     'settings.general.searchActions.windowMaximize': 'Toggle window maximize',
+    'settings.general.searchActions.openSettings': 'Open settings',
     'settings.general.searchActions.cancelRequest': 'Cancel current request',
     'settings.general.fixedSearchShortcuts': 'Fixed shortcuts',
     'settings.general.fixedSearchActions.submitRequest': 'Submit request',
@@ -897,6 +900,7 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
         'Toggle whether the search window stays on top.',
     'settings.general.searchActionDescriptions.windowMaximize':
         'Toggle the search window maximized state.',
+    'settings.general.searchActionDescriptions.openSettings': 'Quickly open the settings window.',
     'settings.general.searchActionDescriptions.cancelRequest':
         'Stop the current generation or tool run.',
     'settings.general.searchActionDescriptions.submitRequest': 'Send the current input.',
diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index 30dd3a3d..f47eb97b 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -37,6 +37,7 @@ const KEY_DISPLAY_MAP: Record<string, string> = {
     Delete: 'Del',
     Del: 'Del',
     '.': '.',
+    ',': ',',
 };
 
 const ALIAS_MAP: Record<string, string> = {
diff --git a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
index 0a5dca2b..25152aa8 100644
--- a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
+++ b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
@@ -136,6 +136,7 @@ export interface UseSearchKeyboardOptions {
     reopenLastClosedSession: () => Promise<void>;
     toggleWindowPin: () => Promise<void>;
     toggleWindowMaximize: () => Promise<void>;
+    openSettingsWindow: () => Promise<void>;
     handleSubmit: (query: string) => Promise<void>;
     cancelRequest: () => void;
     clearSession: () => void;
@@ -673,6 +674,7 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
         reopenLastClosedSession,
         toggleWindowPin,
         toggleWindowMaximize,
+        openSettingsWindow,
         handleSubmit,
         cancelRequest,
         clearSession,
@@ -799,6 +801,9 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
                 case 'search.window.maximize':
                     await toggleWindowMaximize();
                     return;
+                case 'search.settings.open':
+                    await openSettingsWindow();
+                    return;
                 default: {
                     const exhaustiveActionId: never = actionId;
                     throw new Error(`Unhandled search keybinding action: ${exhaustiveActionId}`);
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index 79923832..c0ba34ee 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -541,6 +541,7 @@
         reopenLastClosedSession: handleReopenLastClosedSession,
         toggleWindowPin: handleToggleWindowPin,
         toggleWindowMaximize: handleToggleMaximize,
+        openSettingsWindow: native.window.openSettingsWindow,
         handleSubmit,
         cancelRequest,
         clearSession: clearSessionToIdle,
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 7149be22..53792068 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -219,7 +219,7 @@
             {
                 id: 'window',
                 title: t('settings.general.searchShortcutGroups.window'),
-                actionIds: ['search.window.pin', 'search.window.maximize'],
+                actionIds: ['search.window.pin', 'search.window.maximize', 'search.settings.open'],
             },
         ];
 
diff --git a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
index 2d3a3fe4..56397144 100644
--- a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
+++ b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
@@ -338,6 +338,7 @@ describe('createSearchKeydownHandler', () => {
             reopenLastClosedSession: vi.fn().mockResolvedValue(undefined),
             toggleWindowPin: vi.fn().mockResolvedValue(undefined),
             toggleWindowMaximize,
+            openSettingsWindow: vi.fn().mockResolvedValue(undefined),
             handleSubmit: vi.fn().mockResolvedValue(undefined),
             cancelRequest: vi.fn(),
             clearSession: vi.fn(),
@@ -395,6 +396,7 @@ describe('createSearchKeydownHandler', () => {
             reopenLastClosedSession: vi.fn().mockResolvedValue(undefined),
             toggleWindowPin: vi.fn().mockResolvedValue(undefined),
             toggleWindowMaximize: vi.fn().mockResolvedValue(undefined),
+            openSettingsWindow: vi.fn().mockResolvedValue(undefined),
             handleSubmit: vi.fn().mockResolvedValue(undefined),
             cancelRequest,
             clearSession: vi.fn(),
@@ -454,6 +456,7 @@ describe('createSearchKeydownHandler', () => {
             reopenLastClosedSession,
             toggleWindowPin: vi.fn().mockResolvedValue(undefined),
             toggleWindowMaximize: vi.fn().mockResolvedValue(undefined),
+            openSettingsWindow: vi.fn().mockResolvedValue(undefined),
             handleSubmit: vi.fn().mockResolvedValue(undefined),
             cancelRequest: vi.fn(),
             clearSession: vi.fn(),
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index a6500d69..fa3b9dc2 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -186,6 +186,17 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.window.maximize');
     });
 
+    it('routes the default settings shortcut through the action callback', async () => {
+        const { router, callbacks } = createKeyboardRouter({
+            getSearchKeybindings: () => createDefaultSearchKeybindings(),
+        });
+
+        expect(router.route({ key: ',', ctrlKey: true })).toBe(true);
+        await flushAsyncWork();
+
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.settings.open');
+    });
+
     it('stops routing raw F11 after the maximize shortcut is remapped', async () => {
         const { router, callbacks } = createKeyboardRouter({
             getSearchKeybindings: () => ({
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index 3574b674..0e3b670a 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -43,6 +43,7 @@ describe('search keybinding configuration', () => {
             'search.model.toggle': 'Mod+M',
             'search.window.pin': 'Mod+P',
             'search.window.maximize': 'F11',
+            'search.settings.open': 'Mod+,',
         });
     });
 
@@ -53,6 +54,7 @@ describe('search keybinding configuration', () => {
                 'search.input.focus': null,
                 'search.session.new': '   ',
                 'search.window.maximize': 'f2',
+                'search.settings.open': 'ctrl + ,',
                 unknown: 'Alt+U',
             })
         ).toEqual({
@@ -60,6 +62,7 @@ describe('search keybinding configuration', () => {
             'search.history.open': 'Ctrl+Shift+H',
             'search.input.focus': null,
             'search.window.maximize': 'F2',
+            'search.settings.open': 'Ctrl+,',
         });
     });
 
diff --git a/apps/desktop/tests/stores/settings-keybindings.test.ts b/apps/desktop/tests/stores/settings-keybindings.test.ts
index 6cd80c0c..53b8c5ef 100644
--- a/apps/desktop/tests/stores/settings-keybindings.test.ts
+++ b/apps/desktop/tests/stores/settings-keybindings.test.ts
@@ -70,6 +70,7 @@ describe('settings search keybindings state', () => {
 
         expect(store.settings.searchKeybindings).toEqual(createDefaultSearchKeybindings());
         expect(store.settings.searchKeybindings['search.window.maximize']).toBe('F11');
+        expect(store.settings.searchKeybindings['search.settings.open']).toBe('Mod+,');
         expect(setSettingMock).toHaveBeenCalledWith({
             key: 'search_keybindings',
             value: JSON.stringify(createDefaultSearchKeybindings()),
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 32c77d78..98d8e6ea 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -16,6 +16,7 @@ const settingsStoreMock = vi.hoisted(() => {
             'search.model.toggle': 'Mod+M',
             'search.window.pin': 'Mod+P',
             'search.window.maximize': 'F11',
+            'search.settings.open': 'Mod+,',
         } as Record<string, string | null>,
         startOnBoot: false,
         startMinimized: true,
@@ -219,12 +220,20 @@ describe('SettingsGeneralSection', () => {
         expect(wrapper.text()).toContain('开始新会话');
         expect(wrapper.text()).toContain('切换窗口最大化');
         expect(wrapper.text()).toContain('切换搜索窗口最大化。');
+        expect(wrapper.text()).toContain('打开设置');
+        expect(wrapper.text()).toContain('快速打开设置窗口。');
         expect(
             (
                 wrapper.get('[data-testid="settings-search-shortcut-input-search.window.maximize"]')
                     .element as HTMLInputElement
             ).value
         ).toBe('F11');
+        expect(
+            (
+                wrapper.get('[data-testid="settings-search-shortcut-input-search.settings.open"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('Ctrl+,');
         expect(
             (
                 wrapper.get('[data-testid="settings-search-shortcut-input-search.request.cancel"]')

From 557bf54dba6a66845fa05bde158d840c444eb75e Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Tue, 9 Jun 2026 10:08:34 +0800
Subject: [PATCH 13/55] fix(desktop): harden search shortcuts

---
 apps/desktop/src/config/searchKeybindings.ts  |   6 +-
 apps/desktop/src/utils/shortcuts.ts           |  11 ++
 .../interaction/useSearchKeyboardRouter.ts    |  12 ++
 .../composables/useSearchRequest.ts           |  53 +++----
 apps/desktop/src/views/SearchView/index.vue   |   5 +
 .../SettingsView/components/General/index.vue |  15 +-
 .../SearchView/searchInteraction.test.ts      |   7 +-
 .../useSearchKeyboardRouter.test.ts           |   9 +-
 .../SearchView/useSearchRequest.test.ts       | 148 +++++++++++++++---
 .../tests/config/searchKeybindings.test.ts    |  10 +-
 apps/desktop/tests/utils/shortcuts.test.ts    |  14 +-
 .../settingsGeneralComponent.test.ts          |   2 +-
 12 files changed, 211 insertions(+), 81 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 653336fa..a799e2bf 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -2,6 +2,7 @@ import type { MessageKey } from '@/i18n';
 import {
     hasRequiredModifier,
     isModifierlessFunctionShortcut,
+    isReservedLocalShortcut,
     normalizeLocalShortcutString,
 } from '@/utils/shortcuts';
 
@@ -58,7 +59,7 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         id: 'search.session.reopenLastClosed',
         labelKey: 'settings.general.searchActions.reopenLastClosedSession',
         descriptionKey: 'settings.general.searchActionDescriptions.reopenLastClosedSession',
-        defaultShortcut: 'Mod+Up',
+        defaultShortcut: null,
         allowDisable: true,
         allowModifierlessFunctionShortcut: true,
     },
@@ -148,6 +149,9 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
             if (!hasRequiredModifier(shortcut) && !allowsModifierlessFunction) {
                 continue;
             }
+            if (isReservedLocalShortcut(shortcut)) {
+                continue;
+            }
             normalized[definition.id] = shortcut;
         }
     }
diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index f47eb97b..582de1d9 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -15,8 +15,14 @@ export interface CapturedShortcutResult {
 const MODIFIER_DISPLAY_ORDER = ['Mod', 'Ctrl', 'Alt', 'Shift'] as const;
 const SUPPORTED_CAPTURE_MODIFIERS = new Set(['Ctrl', 'Alt', 'Shift', 'Mod']);
 const RESERVED_LOCAL_SHORTCUT_KEYS = new Set([
+    'Backspace',
+    'Del',
     'Enter',
     'Esc',
+    'Home',
+    'End',
+    'PageUp',
+    'PageDown',
     'Tab',
     'Up',
     'Down',
@@ -164,6 +170,11 @@ function createShortcutParts(shortcut: string): { modifiers: string[]; key: stri
         key = part;
     }
 
+    if (!isMacPlatform() && modifierSet.has('Ctrl')) {
+        modifierSet.delete('Ctrl');
+        modifierSet.add('Mod');
+    }
+
     const modifiers = MODIFIER_DISPLAY_ORDER.filter((modifier) => modifierSet.has(modifier));
     return { modifiers, key };
 }
diff --git a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
index 2d0dada1..9bdbc172 100644
--- a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
+++ b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
@@ -83,6 +83,10 @@ function isTypingAttemptDuringApproval(input: SearchKeyboardRouteInput) {
     return input.key.length === 1 || input.key === 'Backspace' || input.key === 'Delete';
 }
 
+function hasNavigationModifier(input: SearchKeyboardRouteInput) {
+    return Boolean(input.ctrlKey || input.metaKey || input.altKey || input.shiftKey);
+}
+
 function resolveSearchKeybindingAction(
     input: SearchKeyboardRouteInput,
     keybindings: SearchKeybindings
@@ -277,6 +281,10 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
 
         if (getActiveSurface() === 'search-surface' && !isQuickSearchOpen()) {
             if (input.key === 'ArrowUp') {
+                if (hasNavigationModifier(input)) {
+                    return false;
+                }
+
                 if (isMultiLineCursor() && !isCursorAtTextStart()) {
                     return false;
                 }
@@ -285,6 +293,10 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
             }
 
             if (input.key === 'ArrowDown') {
+                if (hasNavigationModifier(input)) {
+                    return false;
+                }
+
                 if (isMultiLineCursor() && !isCursorAtEnd()) {
                     return false;
                 }
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
index 761c44ab..9ebfe5fe 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
@@ -426,49 +426,38 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
     }
 
     async function reopenLastClosedSession(): Promise<LoadedSessionInfo | null> {
-        const candidateSessionIds = [
-            settingsStore.lastClosedSessionId,
-            settingsStore.lastActiveSessionId,
-        ].filter(
-            (sessionId, index, sessionIds): sessionId is number =>
-                sessionId !== null && sessionIds.indexOf(sessionId) === index
-        );
-        if (candidateSessionIds.length === 0) {
+        const sessionId = settingsStore.lastClosedSessionId;
+        if (sessionId === null || sessionId === currentSessionId.value) {
             return null;
         }
 
-        let lastOpenError: unknown = null;
-        for (const sessionId of candidateSessionIds) {
-            try {
-                const loadedSession = await openSession(sessionId);
-                if (
-                    settingsStore.lastClosedSessionId !== null &&
-                    currentSessionId.value === settingsStore.lastClosedSessionId
-                ) {
-                    await clearLastClosedSessionIdSafely();
-                }
-                return loadedSession;
-            } catch (error) {
-                lastOpenError = error;
-                if (sessionId === settingsStore.lastClosedSessionId) {
-                    await clearLastClosedSessionIdSafely();
-                }
+        try {
+            const loadedSession = await openSession(sessionId);
+            if (currentSessionId.value === sessionId) {
+                await clearLastClosedSessionIdSafely();
             }
+            return loadedSession;
+        } catch (error) {
+            await clearLastClosedSessionIdSafely();
+            throw error;
         }
-
-        if (lastOpenError) {
-            throw lastOpenError;
-        }
-        return null;
     }
 
     async function openSession(sessionId: number): Promise<LoadedSessionInfo> {
-        // 切换会话时必须丢弃当前页面暂存的排队请求，
+        if (sessionId === currentSessionId.value) {
+            return {
+                sessionId,
+                title: '',
+                modelId: modelOverride.value.modelId,
+                providerId: modelOverride.value.providerId,
+            };
+        }
+
+        const loadedSession = await openStoredSession(sessionId);
+        // 切换会话成功后必须丢弃当前页面暂存的排队请求，
         // 否则新会话会错误继承旧会话的“等待发送”锁态。
         clearPendingRequestState();
         clearDraft({ preserveModelTag: true });
-
-        const loadedSession = await openStoredSession(sessionId);
         persistLastActiveSessionId(sessionId);
         modelOverride.value = {
             modelId: loadedSession.modelId,
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index c0ba34ee..a78c9f97 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -816,6 +816,11 @@
     }
 
     async function handleReopenLastClosedSession() {
+        if (queryText.value.trim() || attachments.value.length > 0) {
+            await controller.focusSearchInput();
+            return;
+        }
+
         controller.closeQuickSearch();
         await hideAllPopups();
         resetSessionInputHistoryTracking();
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 53792068..1aa0e0d9 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -156,16 +156,6 @@
             : t('settings.general.noShortcut');
     }
 
-    function allowsReservedSearchShortcut(
-        actionId: SearchKeybindingActionId,
-        shortcut: string | null | undefined
-    ): boolean {
-        return (
-            actionId === 'search.session.reopenLastClosed' &&
-            normalizeLocalShortcutString(shortcut) === 'Mod+Up'
-        );
-    }
-
     const searchShortcutRows = computed<SettingsSearchShortcutGroupRow[]>(() =>
         SEARCH_KEYBINDING_DEFINITIONS.map((definition) => {
             const currentShortcut = settings.value.searchKeybindings[definition.id];
@@ -539,10 +529,7 @@
                 return;
             }
 
-            if (
-                isReservedLocalShortcut(normalizedShortcut) &&
-                !allowsReservedSearchShortcut(actionId, normalizedShortcut)
-            ) {
+            if (isReservedLocalShortcut(normalizedShortcut)) {
                 reportSearchShortcutError(
                     actionId,
                     'settings.general.searchShortcuts.errors.reserved'
diff --git a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
index 56397144..3eefe79e 100644
--- a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
+++ b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
@@ -413,12 +413,15 @@ describe('createSearchKeydownHandler', () => {
         expect(escapeEvent.defaultPrevented).toBe(true);
     });
 
-    it('routes Ctrl+Up to reopen the most recently closed session', async () => {
+    it('routes a configured Ctrl+Up shortcut to reopen the most recently closed session', async () => {
         const controller = createControllerStub();
         const reopenLastClosedSession = vi.fn().mockResolvedValue(undefined);
         const handleKeyDown = createSearchKeydownHandler({
             viewReady: ref(true),
-            searchKeybindings: ref(createDefaultSearchKeybindings()),
+            searchKeybindings: ref({
+                ...createDefaultSearchKeybindings(),
+                'search.session.reopenLastClosed': 'Mod+Up',
+            }),
             queryText: ref(''),
             attachments: ref([]),
             cursorContext: ref<SearchCursorContext>({
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index fa3b9dc2..ec0977f7 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -162,17 +162,16 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.history.open');
     });
 
-    it('routes the default Ctrl+Up shortcut through the action callback', async () => {
+    it('does not route Ctrl+Up through default search shortcuts or input history', async () => {
         const { router, callbacks } = createKeyboardRouter({
             getSearchKeybindings: () => createDefaultSearchKeybindings(),
         });
 
-        expect(router.route({ key: 'ArrowUp', ctrlKey: true })).toBe(true);
+        expect(router.route({ key: 'ArrowUp', ctrlKey: true })).toBe(false);
         await flushAsyncWork();
 
-        expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith(
-            'search.session.reopenLastClosed'
-        );
+        expect(callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();
+        expect(callbacks.onNavigateInputHistory).not.toHaveBeenCalled();
     });
 
     it('routes the default maximize shortcut through the action callback', async () => {
diff --git a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
index 7d251089..3201b8f6 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
@@ -354,6 +354,88 @@ describe('useSearchRequestFlow', () => {
         mounted.unmount();
     });
 
+    it('keeps draft and queue state when opening a stored session fails', async () => {
+        const queuedAttachment = createAttachment('queued-failed-open');
+        const modelOverride = ref({
+            modelId: 'stale-model',
+            providerId: 2,
+        });
+        const clearDraft = vi.fn();
+        const openError = new Error('session not found');
+
+        agentState.isLoading.value = true;
+        agentState.openSession.mockRejectedValueOnce(openError);
+
+        const mounted = await mountComposable(() =>
+            useSearchRequestFlow({
+                modelOverride,
+                clearDraft,
+                getSupportedAttachments: () => [queuedAttachment],
+                getUnsupportedAttachmentMessage: () => null,
+                getCurrentInputSnapshot: (query) =>
+                    createInputHistorySnapshot({
+                        text: query,
+                        attachments: [queuedAttachment],
+                    }),
+            })
+        );
+
+        await mounted.result.handleSubmit('queued before failed open');
+
+        await expect(mounted.result.openSession(7)).rejects.toThrow(openError);
+
+        expect(clearDraft).not.toHaveBeenCalledWith({
+            preserveModelTag: true,
+        });
+        expect(mounted.result.pendingRequest.value?.query).toBe('queued before failed open');
+        expect(mounted.result.isWaitingForCompletion.value).toBe(true);
+        expect(modelOverride.value).toEqual({
+            modelId: 'stale-model',
+            providerId: 2,
+        });
+        expect(settingsStoreMock.updateLastActiveSessionId).not.toHaveBeenCalledWith(7);
+
+        mounted.unmount();
+    });
+
+    it('does not clear draft or reopen when opening the current session', async () => {
+        const modelOverride = ref({
+            modelId: 'current-model',
+            providerId: 12,
+        });
+        const clearDraft = vi.fn();
+        agentState.currentSessionId.value = 7;
+
+        const mounted = await mountComposable(() =>
+            useSearchRequestFlow({
+                modelOverride,
+                clearDraft,
+                getSupportedAttachments: () => [],
+                getUnsupportedAttachmentMessage: () => null,
+                getCurrentInputSnapshot: (query) =>
+                    createInputHistorySnapshot({
+                        text: query,
+                        attachments: [],
+                    }),
+            })
+        );
+
+        const loadedSession = await mounted.result.openSession(7);
+
+        expect(agentState.openSession).not.toHaveBeenCalled();
+        expect(clearDraft).not.toHaveBeenCalled();
+        expect(dismissSessionTerminalStatusMock).not.toHaveBeenCalledWith(7);
+        expect(settingsStoreMock.updateLastActiveSessionId).not.toHaveBeenCalledWith(7);
+        expect(loadedSession).toEqual({
+            sessionId: 7,
+            title: '',
+            modelId: 'current-model',
+            providerId: 12,
+        });
+
+        mounted.unmount();
+    });
+
     it('reopens the most recently closed session', async () => {
         const modelOverride = ref({
             modelId: null,
@@ -380,11 +462,15 @@ describe('useSearchRequestFlow', () => {
         expect(settingsStoreMock.updateLastClosedSessionId).toHaveBeenCalledWith(23);
         expect(settingsStoreMock.lastClosedSessionId).toBe(23);
 
-        agentState.openSession.mockResolvedValueOnce({
-            sessionId: 23,
-            title: 'Reopened Session',
-            modelId: 'gpt-5',
-            providerId: 9,
+        agentState.currentSessionId.value = null;
+        agentState.openSession.mockImplementationOnce(async () => {
+            agentState.currentSessionId.value = 23;
+            return {
+                sessionId: 23,
+                title: 'Reopened Session',
+                modelId: 'gpt-5',
+                providerId: 9,
+            };
         });
 
         const reopenedSession = await mounted.result.reopenLastClosedSession();
@@ -402,17 +488,18 @@ describe('useSearchRequestFlow', () => {
         mounted.unmount();
     });
 
-    it('falls back to the last active session when no closed session is recorded', async () => {
+    it('does not fall back to the last active session when no closed session is recorded', async () => {
         const modelOverride = ref({
             modelId: null,
             providerId: null,
         });
+        const clearDraft = vi.fn();
         settingsStoreMock.lastActiveSessionId = 45;
 
         const mounted = await mountComposable(() =>
             useSearchRequestFlow({
                 modelOverride,
-                clearDraft: vi.fn(),
+                clearDraft,
                 getSupportedAttachments: () => [],
                 getUnsupportedAttachmentMessage: () => null,
                 getCurrentInputSnapshot: (query) =>
@@ -423,23 +510,44 @@ describe('useSearchRequestFlow', () => {
             })
         );
 
-        agentState.openSession.mockResolvedValueOnce({
-            sessionId: 45,
-            title: 'Last Active Session',
-            modelId: 'gpt-5',
-            providerId: 9,
+        const reopenedSession = await mounted.result.reopenLastClosedSession();
+
+        expect(agentState.openSession).not.toHaveBeenCalled();
+        expect(clearDraft).not.toHaveBeenCalled();
+        expect(reopenedSession).toBeNull();
+        expect(settingsStoreMock.updateLastClosedSessionId).not.toHaveBeenCalledWith(null);
+
+        mounted.unmount();
+    });
+
+    it('does not reopen or clear draft when the last closed session is already current', async () => {
+        const modelOverride = ref({
+            modelId: null,
+            providerId: null,
         });
+        const clearDraft = vi.fn();
+        settingsStoreMock.lastClosedSessionId = 23;
+        agentState.currentSessionId.value = 23;
+
+        const mounted = await mountComposable(() =>
+            useSearchRequestFlow({
+                modelOverride,
+                clearDraft,
+                getSupportedAttachments: () => [],
+                getUnsupportedAttachmentMessage: () => null,
+                getCurrentInputSnapshot: (query) =>
+                    createInputHistorySnapshot({
+                        text: query,
+                        attachments: [],
+                    }),
+            })
+        );
 
         const reopenedSession = await mounted.result.reopenLastClosedSession();
 
-        expect(agentState.openSession).toHaveBeenCalledWith(45);
-        expect(reopenedSession).toEqual({
-            sessionId: 45,
-            title: 'Last Active Session',
-            modelId: 'gpt-5',
-            providerId: 9,
-        });
-        expect(settingsStoreMock.updateLastClosedSessionId).not.toHaveBeenCalledWith(null);
+        expect(agentState.openSession).not.toHaveBeenCalled();
+        expect(clearDraft).not.toHaveBeenCalled();
+        expect(reopenedSession).toBeNull();
 
         mounted.unmount();
     });
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index 0e3b670a..03a136e7 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -39,7 +39,7 @@ describe('search keybinding configuration', () => {
             'search.history.open': 'Mod+H',
             'search.input.focus': 'Mod+L',
             'search.session.new': 'Mod+N',
-            'search.session.reopenLastClosed': 'Mod+Up',
+            'search.session.reopenLastClosed': null,
             'search.model.toggle': 'Mod+M',
             'search.window.pin': 'Mod+P',
             'search.window.maximize': 'F11',
@@ -53,16 +53,18 @@ describe('search keybinding configuration', () => {
                 'search.history.open': ' ctrl + shift + h ',
                 'search.input.focus': null,
                 'search.session.new': '   ',
+                'search.session.reopenLastClosed': 'Mod+Up',
+                'search.model.toggle': 'Ctrl+Backspace',
                 'search.window.maximize': 'f2',
                 'search.settings.open': 'ctrl + ,',
                 unknown: 'Alt+U',
             })
         ).toEqual({
             ...createDefaultSearchKeybindings(),
-            'search.history.open': 'Ctrl+Shift+H',
+            'search.history.open': 'Mod+Shift+H',
             'search.input.focus': null,
             'search.window.maximize': 'F2',
-            'search.settings.open': 'Ctrl+,',
+            'search.settings.open': 'Mod+,',
         });
     });
 
@@ -75,7 +77,7 @@ describe('search keybinding configuration', () => {
             })
         ).toEqual({
             ...createDefaultSearchKeybindings(),
-            'search.input.focus': 'Ctrl+L',
+            'search.input.focus': 'Mod+L',
             'search.window.maximize': 'F12',
         });
     });
diff --git a/apps/desktop/tests/utils/shortcuts.test.ts b/apps/desktop/tests/utils/shortcuts.test.ts
index a0eda21c..4722a644 100644
--- a/apps/desktop/tests/utils/shortcuts.test.ts
+++ b/apps/desktop/tests/utils/shortcuts.test.ts
@@ -33,13 +33,17 @@ describe('shortcut utilities', () => {
 
     it('normalizes shortcut strings with aliases and stable modifier ordering', () => {
         expect(normalizeLocalShortcutString(' shift + cmd + option + k ')).toBe('Mod+Alt+Shift+K');
-        expect(normalizeLocalShortcutString('control+delete')).toBe('Ctrl+Del');
+        expect(normalizeLocalShortcutString('control+delete')).toBe('Mod+Del');
         expect(normalizeLocalShortcutString('return')).toBe('Enter');
         expect(normalizeLocalShortcutString('f12')).toBe('F12');
         expect(normalizeLocalShortcutString(null)).toBeNull();
         expect(normalizeLocalShortcutString('Ctrl+Alt')).toBeNull();
         expect(normalizeLocalShortcutString('Ctrl+A+B')).toBeNull();
         expect(normalizeLocalShortcutString('   ')).toBeNull();
+
+        setPlatform('MacIntel');
+
+        expect(normalizeLocalShortcutString('control+delete')).toBe('Ctrl+Del');
     });
 
     it('formats display shortcuts for the current platform', () => {
@@ -66,7 +70,7 @@ describe('shortcut utilities', () => {
     it('matches shortcuts using platform-specific Mod behavior', () => {
         expect(matchShortcut('Mod+H', { key: 'h', ctrlKey: true })).toBe(true);
         expect(matchShortcut('Mod+H', { key: 'h', metaKey: true })).toBe(false);
-        expect(matchShortcut('Ctrl+H', { key: 'h', ctrlKey: true })).toBe(false);
+        expect(matchShortcut('Ctrl+H', { key: 'h', ctrlKey: true })).toBe(true);
         expect(matchShortcut('Ctrl+H', { key: 'h' })).toBe(false);
         expect(
             matchShortcut('Alt+Shift+Del', { key: 'Delete', altKey: true, shiftKey: true })
@@ -127,6 +131,12 @@ describe('shortcut utilities', () => {
 
     it('classifies reserved, modifierless, and conflicting shortcuts', () => {
         expect(isReservedLocalShortcut('Enter')).toBe(true);
+        expect(isReservedLocalShortcut('Mod+Backspace')).toBe(true);
+        expect(isReservedLocalShortcut('Ctrl+Delete')).toBe(true);
+        expect(isReservedLocalShortcut('Alt+Home')).toBe(true);
+        expect(isReservedLocalShortcut('Shift+End')).toBe(true);
+        expect(isReservedLocalShortcut('Mod+PageUp')).toBe(true);
+        expect(isReservedLocalShortcut('Mod+PageDown')).toBe(true);
         expect(isReservedLocalShortcut('Mod+K')).toBe(false);
         expect(isReservedLocalShortcut(null)).toBe(false);
 
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 98d8e6ea..0ffa2691 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -12,7 +12,7 @@ const settingsStoreMock = vi.hoisted(() => {
             'search.history.open': 'Mod+H',
             'search.input.focus': 'Mod+L',
             'search.session.new': 'Mod+N',
-            'search.session.reopenLastClosed': 'Ctrl+Up',
+            'search.session.reopenLastClosed': null,
             'search.model.toggle': 'Mod+M',
             'search.window.pin': 'Mod+P',
             'search.window.maximize': 'F11',

From 90333e20173677a6f7a8b289ed121c0ef286e152 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Tue, 9 Jun 2026 10:48:05 +0800
Subject: [PATCH 14/55] fix(desktop): reject shift-only search shortcuts

---
 apps/desktop/src/config/searchKeybindings.ts     |  4 ++--
 apps/desktop/src/i18n/messages.ts                |  5 +++--
 apps/desktop/src/utils/shortcuts.ts              | 12 ++++++++++++
 .../SettingsView/components/General/index.vue    |  4 ++--
 .../tests/config/searchKeybindings.test.ts       |  1 +
 apps/desktop/tests/utils/shortcuts.test.ts       |  7 +++++++
 .../settingsGeneralComponent.test.ts             | 16 ++++++++++++++++
 7 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index a799e2bf..2f21b907 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -1,6 +1,6 @@
 import type { MessageKey } from '@/i18n';
 import {
-    hasRequiredModifier,
+    hasCommandModifier,
     isModifierlessFunctionShortcut,
     isReservedLocalShortcut,
     normalizeLocalShortcutString,
@@ -146,7 +146,7 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
             const allowsModifierlessFunction =
                 definition.allowModifierlessFunctionShortcut &&
                 isModifierlessFunctionShortcut(shortcut);
-            if (!hasRequiredModifier(shortcut) && !allowsModifierlessFunction) {
+            if (!hasCommandModifier(shortcut) && !allowsModifierlessFunction) {
                 continue;
             }
             if (isReservedLocalShortcut(shortcut)) {
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 01956835..56745852 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -122,7 +122,8 @@ const zhCNMessages = {
     'settings.general.searchActionDescriptions.newLine': '在输入框中插入换行。',
     'settings.general.searchActionDescriptions.previousInputHistory': '查看上一条输入记录。',
     'settings.general.searchActionDescriptions.nextInputHistory': '查看下一条输入记录。',
-    'settings.general.searchShortcuts.errors.modifierRequired': '快捷键至少需要一个修饰键',
+    'settings.general.searchShortcuts.errors.modifierRequired':
+        '快捷键需要包含 Ctrl、Alt 或 Cmd，或使用允许的功能键',
     'settings.general.searchShortcuts.errors.reserved':
         '该快捷键保留给输入/导航行为，请选择其他组合',
     'settings.general.searchShortcuts.errors.duplicate': '该快捷键已被“{action}”使用，请换一个组合',
@@ -910,7 +911,7 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.searchActionDescriptions.nextInputHistory':
         'Show the next input history item.',
     'settings.general.searchShortcuts.errors.modifierRequired':
-        'A shortcut must include at least one modifier key',
+        'A shortcut must include Ctrl, Alt, or Cmd, or use an allowed function key',
     'settings.general.searchShortcuts.errors.reserved':
         'This shortcut is reserved for typing or navigation. Choose another combination.',
     'settings.general.searchShortcuts.errors.duplicate':
diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index 582de1d9..c83e8d8c 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -324,6 +324,18 @@ export function hasRequiredModifier(shortcut: string | null | undefined): boolea
     return modifiers.length > 0;
 }
 
+export function hasCommandModifier(shortcut: string | null | undefined): boolean {
+    const normalized = normalizeLocalShortcutString(shortcut);
+    if (!normalized) {
+        return false;
+    }
+
+    const { modifiers } = createShortcutParts(normalized);
+    return modifiers.some(
+        (modifier) => modifier === 'Mod' || modifier === 'Ctrl' || modifier === 'Alt'
+    );
+}
+
 export function isModifierlessFunctionShortcut(shortcut: string | null | undefined): boolean {
     const normalized = normalizeLocalShortcutString(shortcut);
     if (!normalized) {
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 1aa0e0d9..4f9720d5 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -29,7 +29,7 @@
         captureShortcutFromKeyboardEvent,
         findShortcutConflict,
         formatShortcutForDisplay,
-        hasRequiredModifier,
+        hasCommandModifier,
         isModifierlessFunctionShortcut,
         isReservedLocalShortcut,
         normalizeLocalShortcutString,
@@ -517,7 +517,7 @@
                 definition.allowModifierlessFunctionShortcut &&
                 isModifierlessFunctionShortcut(normalizedShortcut);
 
-            if (!hasRequiredModifier(normalizedShortcut) && !allowsModifierlessFunctionShortcut) {
+            if (!hasCommandModifier(normalizedShortcut) && !allowsModifierlessFunctionShortcut) {
                 reportSearchShortcutError(
                     actionId,
                     'settings.general.searchShortcuts.errors.modifierRequired'
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index 03a136e7..6d5768cb 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -73,6 +73,7 @@ describe('search keybinding configuration', () => {
             normalizeSearchKeybindings({
                 'search.history.open': 'H',
                 'search.input.focus': 'Ctrl+L',
+                'search.model.toggle': 'Shift+M',
                 'search.window.maximize': 'F12',
             })
         ).toEqual({
diff --git a/apps/desktop/tests/utils/shortcuts.test.ts b/apps/desktop/tests/utils/shortcuts.test.ts
index 4722a644..bd849ea1 100644
--- a/apps/desktop/tests/utils/shortcuts.test.ts
+++ b/apps/desktop/tests/utils/shortcuts.test.ts
@@ -4,6 +4,7 @@ import {
     captureShortcutFromKeyboardEvent,
     findShortcutConflict,
     formatShortcutForDisplay,
+    hasCommandModifier,
     hasRequiredModifier,
     isModifierlessFunctionShortcut,
     isReservedLocalShortcut,
@@ -141,9 +142,15 @@ describe('shortcut utilities', () => {
         expect(isReservedLocalShortcut(null)).toBe(false);
 
         expect(hasRequiredModifier('Mod+K')).toBe(true);
+        expect(hasRequiredModifier('Shift+K')).toBe(true);
         expect(hasRequiredModifier('F11')).toBe(false);
         expect(hasRequiredModifier('')).toBe(false);
 
+        expect(hasCommandModifier('Mod+K')).toBe(true);
+        expect(hasCommandModifier('Alt+Shift+K')).toBe(true);
+        expect(hasCommandModifier('Shift+K')).toBe(false);
+        expect(hasCommandModifier('F11')).toBe(false);
+
         expect(isModifierlessFunctionShortcut('F1')).toBe(true);
         expect(isModifierlessFunctionShortcut('F12')).toBe(true);
         expect(isModifierlessFunctionShortcut('F13')).toBe(false);
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 0ffa2691..15d87bf1 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -381,6 +381,22 @@ describe('SettingsGeneralSection', () => {
         });
     });
 
+    it('does not save shift-only printable search shortcuts', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'a', shiftKey: true }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+    });
+
     it('shows fixed search shortcuts as unsupported for editing', async () => {
         const wrapper = mount(GeneralSection);
 

From 5d1c86532e95fa9ea228114ab1845f36b18bdeea Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Tue, 9 Jun 2026 11:41:21 +0800
Subject: [PATCH 15/55] fix(desktop): restore reopen session shortcut default

---
 apps/desktop/src/config/searchKeybindings.ts        |  2 +-
 .../SearchView/useSearchKeyboardRouter.test.ts      | 13 +++++++++++++
 apps/desktop/tests/config/searchKeybindings.test.ts |  2 +-
 .../SettingsView/settingsGeneralComponent.test.ts   |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 2f21b907..ef00a561 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -59,7 +59,7 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         id: 'search.session.reopenLastClosed',
         labelKey: 'settings.general.searchActions.reopenLastClosedSession',
         descriptionKey: 'settings.general.searchActionDescriptions.reopenLastClosedSession',
-        defaultShortcut: null,
+        defaultShortcut: 'Mod+Shift+T',
         allowDisable: true,
         allowModifierlessFunctionShortcut: true,
     },
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index ec0977f7..359aae46 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -196,6 +196,19 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.settings.open');
     });
 
+    it('routes the default reopen-last-closed-session shortcut through the action callback', async () => {
+        const { router, callbacks } = createKeyboardRouter({
+            getSearchKeybindings: () => createDefaultSearchKeybindings(),
+        });
+
+        expect(router.route({ key: 't', ctrlKey: true, shiftKey: true })).toBe(true);
+        await flushAsyncWork();
+
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith(
+            'search.session.reopenLastClosed'
+        );
+    });
+
     it('stops routing raw F11 after the maximize shortcut is remapped', async () => {
         const { router, callbacks } = createKeyboardRouter({
             getSearchKeybindings: () => ({
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index 6d5768cb..5fa0ca32 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -39,7 +39,7 @@ describe('search keybinding configuration', () => {
             'search.history.open': 'Mod+H',
             'search.input.focus': 'Mod+L',
             'search.session.new': 'Mod+N',
-            'search.session.reopenLastClosed': null,
+            'search.session.reopenLastClosed': 'Mod+Shift+T',
             'search.model.toggle': 'Mod+M',
             'search.window.pin': 'Mod+P',
             'search.window.maximize': 'F11',
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 15d87bf1..3a4942fb 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -12,7 +12,7 @@ const settingsStoreMock = vi.hoisted(() => {
             'search.history.open': 'Mod+H',
             'search.input.focus': 'Mod+L',
             'search.session.new': 'Mod+N',
-            'search.session.reopenLastClosed': null,
+            'search.session.reopenLastClosed': 'Mod+Shift+T',
             'search.model.toggle': 'Mod+M',
             'search.window.pin': 'Mod+P',
             'search.window.maximize': 'F11',

From 5d903ebb52a7dd63d00b4cc040e40853b67edb48 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Tue, 9 Jun 2026 20:52:44 +0800
Subject: [PATCH 16/55] fix(desktop): preserve last closed session retry

---
 .../src/services/EventService/types.ts        |  1 -
 apps/desktop/src/stores/settings.ts           | 22 ------
 .../composables/useSearchRequest.ts           | 29 ++-----
 apps/desktop/src/views/SearchView/index.vue   |  1 +
 .../SearchView/useSearchRequest.test.ts       | 75 ++++++++++++++++---
 .../tests/stores/settings-keybindings.test.ts | 15 +---
 .../settingsGeneralComponent.test.ts          | 20 ++---
 7 files changed, 83 insertions(+), 80 deletions(-)

diff --git a/apps/desktop/src/services/EventService/types.ts b/apps/desktop/src/services/EventService/types.ts
index c3d4203e..8c3ec39c 100644
--- a/apps/desktop/src/services/EventService/types.ts
+++ b/apps/desktop/src/services/EventService/types.ts
@@ -76,7 +76,6 @@ export type GeneralSettingKey =
     | 'global_shortcut'
     | 'search_keybindings'
     | 'last_closed_session_id'
-    | 'last_active_session_id'
     | 'start_on_boot'
     | 'start_minimized'
     | 'output_scroll_behavior'
diff --git a/apps/desktop/src/stores/settings.ts b/apps/desktop/src/stores/settings.ts
index c8a525fa..a9a375d4 100644
--- a/apps/desktop/src/stores/settings.ts
+++ b/apps/desktop/src/stores/settings.ts
@@ -33,7 +33,6 @@ export interface GeneralSettingsData {
     globalShortcut: string;
     searchKeybindings: SearchKeybindings;
     lastClosedSessionId: number | null;
-    lastActiveSessionId: number | null;
     startOnBoot: boolean;
     startMinimized: boolean;
     outputScrollBehavior: OutputScrollBehavior;
@@ -49,7 +48,6 @@ const DEFAULT_GENERAL_SETTINGS: GeneralSettingsData = {
     globalShortcut: 'Alt+Space',
     searchKeybindings: createDefaultSearchKeybindings(),
     lastClosedSessionId: null,
-    lastActiveSessionId: null,
     startOnBoot: false,
     startMinimized: true,
     outputScrollBehavior: 'follow_output',
@@ -200,9 +198,6 @@ export const useSettingsStore = defineStore('settings', () => {
             case 'last_closed_session_id':
                 settings.value.lastClosedSessionId = parseOptionalSessionId(value);
                 break;
-            case 'last_active_session_id':
-                settings.value.lastActiveSessionId = parseOptionalSessionId(value);
-                break;
             case 'start_on_boot':
                 settings.value.startOnBoot =
                     typeof value === 'boolean' ? value : String(value) === 'true';
@@ -245,10 +240,6 @@ export const useSettingsStore = defineStore('settings', () => {
                 return settings.value.lastClosedSessionId === null
                     ? ''
                     : String(settings.value.lastClosedSessionId);
-            case 'last_active_session_id':
-                return settings.value.lastActiveSessionId === null
-                    ? ''
-                    : String(settings.value.lastActiveSessionId);
             case 'start_on_boot':
                 return String(settings.value.startOnBoot);
             case 'start_minimized':
@@ -280,8 +271,6 @@ export const useSettingsStore = defineStore('settings', () => {
                 };
             case 'last_closed_session_id':
                 return settings.value.lastClosedSessionId;
-            case 'last_active_session_id':
-                return settings.value.lastActiveSessionId;
             case 'start_on_boot':
                 return settings.value.startOnBoot;
             case 'start_minimized':
@@ -317,7 +306,6 @@ export const useSettingsStore = defineStore('settings', () => {
                 globalShortcut,
                 searchKeybindings,
                 lastClosedSessionId,
-                lastActiveSessionId,
                 startOnBoot,
                 startMinimized,
                 outputScroll,
@@ -330,7 +318,6 @@ export const useSettingsStore = defineStore('settings', () => {
                 getSettingValue({ key: 'global_shortcut' }),
                 getSettingValue({ key: 'search_keybindings' }),
                 getSettingValue({ key: 'last_closed_session_id' }),
-                getSettingValue({ key: 'last_active_session_id' }),
                 getSettingValue({ key: 'start_on_boot' }),
                 getSettingValue({ key: 'start_minimized' }),
                 getSettingValue({ key: 'output_scroll_behavior' }),
@@ -345,7 +332,6 @@ export const useSettingsStore = defineStore('settings', () => {
                 globalShortcut || DEFAULT_GENERAL_SETTINGS.globalShortcut;
             settings.value.searchKeybindings = parsePersistedSearchKeybindings(searchKeybindings);
             settings.value.lastClosedSessionId = parseOptionalSessionId(lastClosedSessionId);
-            settings.value.lastActiveSessionId = parseOptionalSessionId(lastActiveSessionId);
             settings.value.startOnBoot =
                 startOnBoot === null
                     ? DEFAULT_GENERAL_SETTINGS.startOnBoot
@@ -373,7 +359,6 @@ export const useSettingsStore = defineStore('settings', () => {
                       })
                     : persistDefaultIfMissing('search_keybindings', searchKeybindings),
                 persistDefaultIfMissing('last_closed_session_id', lastClosedSessionId),
-                persistDefaultIfMissing('last_active_session_id', lastActiveSessionId),
                 persistDefaultIfMissing('start_on_boot', startOnBoot),
                 persistDefaultIfMissing('start_minimized', startMinimized),
                 persistDefaultIfMissing('output_scroll_behavior', outputScroll),
@@ -490,10 +475,6 @@ export const useSettingsStore = defineStore('settings', () => {
         await updateSetting('last_closed_session_id', parseOptionalSessionId(sessionId));
     }
 
-    async function updateLastActiveSessionId(sessionId: number | null) {
-        await updateSetting('last_active_session_id', parseOptionalSessionId(sessionId));
-    }
-
     async function updateStartOnBoot(enabled: boolean) {
         await updateSetting('start_on_boot', enabled);
     }
@@ -530,7 +511,6 @@ export const useSettingsStore = defineStore('settings', () => {
     const globalShortcut = computed(() => settings.value.globalShortcut);
     const searchKeybindings = computed(() => settings.value.searchKeybindings);
     const lastClosedSessionId = computed(() => settings.value.lastClosedSessionId);
-    const lastActiveSessionId = computed(() => settings.value.lastActiveSessionId);
     const searchWindowSizePreset = computed(() => settings.value.searchWindowSizePreset);
     const searchWindowDefaultSize = computed(() => settings.value.searchWindowDefaultSize);
     const language = computed(() => settings.value.language);
@@ -546,7 +526,6 @@ export const useSettingsStore = defineStore('settings', () => {
         globalShortcut,
         searchKeybindings,
         lastClosedSessionId,
-        lastActiveSessionId,
         searchWindowSizePreset,
         searchWindowDefaultSize,
         language,
@@ -559,7 +538,6 @@ export const useSettingsStore = defineStore('settings', () => {
         updateGlobalShortcut,
         updateSearchKeybindings,
         updateLastClosedSessionId,
-        updateLastActiveSessionId,
         updateStartOnBoot,
         updateStartMinimized,
         updateOutputScrollBehavior,
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
index 9ebfe5fe..a34d2b2e 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
@@ -5,7 +5,7 @@
 import { useAgent } from '@composables/agent';
 import type { SessionEntity } from '@database/types';
 import { notify } from '@services/NotificationService';
-import { onUnmounted, type Ref, ref, watch } from 'vue';
+import { onUnmounted, type Ref, ref } from 'vue';
 
 import {
     type Index,
@@ -230,24 +230,6 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
         stopSessionStatusListener = null;
     });
 
-    watch(
-        () => currentSessionId.value,
-        (sessionId) => {
-            persistLastActiveSessionId(sessionId);
-        },
-        { flush: 'sync' }
-    );
-
-    function persistLastActiveSessionId(sessionId: number | null) {
-        if (sessionId === null || settingsStore.lastActiveSessionId === sessionId) {
-            return;
-        }
-
-        void settingsStore.updateLastActiveSessionId(sessionId).catch((error) => {
-            console.error('[SearchView] Failed to persist last active session id:', error);
-        });
-    }
-
     function clearSessionState() {
         if (currentSessionId.value !== null) {
             void settingsStore.updateLastClosedSessionId(currentSessionId.value).catch((error) => {
@@ -425,6 +407,10 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
         }
     }
 
+    function isSessionNotFoundError(error: unknown, sessionId: number): boolean {
+        return error instanceof Error && error.message === `Session ${sessionId} not found`;
+    }
+
     async function reopenLastClosedSession(): Promise<LoadedSessionInfo | null> {
         const sessionId = settingsStore.lastClosedSessionId;
         if (sessionId === null || sessionId === currentSessionId.value) {
@@ -438,7 +424,9 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
             }
             return loadedSession;
         } catch (error) {
-            await clearLastClosedSessionIdSafely();
+            if (isSessionNotFoundError(error, sessionId)) {
+                await clearLastClosedSessionIdSafely();
+            }
             throw error;
         }
     }
@@ -458,7 +446,6 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
         // 否则新会话会错误继承旧会话的“等待发送”锁态。
         clearPendingRequestState();
         clearDraft({ preserveModelTag: true });
-        persistLastActiveSessionId(sessionId);
         modelOverride.value = {
             modelId: loadedSession.modelId,
             providerId: loadedSession.providerId,
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index a78c9f97..3fdc5ca9 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -817,6 +817,7 @@
 
     async function handleReopenLastClosedSession() {
         if (queryText.value.trim() || attachments.value.length > 0) {
+            await hideAllPopups();
             await controller.focusSearchInput();
             return;
         }
diff --git a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
index 3201b8f6..c20b7a3f 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
@@ -35,13 +35,9 @@ const {
     };
     const settingsStore = {
         lastClosedSessionId: null as number | null,
-        lastActiveSessionId: null as number | null,
         updateLastClosedSessionId: vi.fn(async (sessionId: number | null) => {
             settingsStore.lastClosedSessionId = sessionId;
         }),
-        updateLastActiveSessionId: vi.fn(async (sessionId: number | null) => {
-            settingsStore.lastActiveSessionId = sessionId;
-        }),
     };
 
     return {
@@ -147,9 +143,7 @@ describe('useSearchRequestFlow', () => {
         agentState.sessionHistory.value = [];
         agentState.pendingToolApproval.value = null;
         settingsStoreMock.lastClosedSessionId = null;
-        settingsStoreMock.lastActiveSessionId = null;
         settingsStoreMock.updateLastClosedSessionId.mockClear();
-        settingsStoreMock.updateLastActiveSessionId.mockClear();
 
         listSessionsMock.mockResolvedValue([]);
         dismissSessionTerminalStatusMock.mockResolvedValue(undefined);
@@ -349,7 +343,6 @@ describe('useSearchRequestFlow', () => {
             modelId: 'gpt-5',
             providerId: 9,
         });
-        expect(settingsStoreMock.updateLastActiveSessionId).toHaveBeenCalledWith(7);
 
         mounted.unmount();
     });
@@ -393,8 +386,6 @@ describe('useSearchRequestFlow', () => {
             modelId: 'stale-model',
             providerId: 2,
         });
-        expect(settingsStoreMock.updateLastActiveSessionId).not.toHaveBeenCalledWith(7);
-
         mounted.unmount();
     });
 
@@ -425,7 +416,6 @@ describe('useSearchRequestFlow', () => {
         expect(agentState.openSession).not.toHaveBeenCalled();
         expect(clearDraft).not.toHaveBeenCalled();
         expect(dismissSessionTerminalStatusMock).not.toHaveBeenCalledWith(7);
-        expect(settingsStoreMock.updateLastActiveSessionId).not.toHaveBeenCalledWith(7);
         expect(loadedSession).toEqual({
             sessionId: 7,
             title: '',
@@ -488,13 +478,12 @@ describe('useSearchRequestFlow', () => {
         mounted.unmount();
     });
 
-    it('does not fall back to the last active session when no closed session is recorded', async () => {
+    it('does not reopen when no closed session is recorded', async () => {
         const modelOverride = ref({
             modelId: null,
             providerId: null,
         });
         const clearDraft = vi.fn();
-        settingsStoreMock.lastActiveSessionId = 45;
 
         const mounted = await mountComposable(() =>
             useSearchRequestFlow({
@@ -520,6 +509,68 @@ describe('useSearchRequestFlow', () => {
         mounted.unmount();
     });
 
+    it('keeps the last closed session id when reopening fails with a generic error', async () => {
+        const modelOverride = ref({
+            modelId: null,
+            providerId: null,
+        });
+        const openError = new Error('database unavailable');
+        settingsStoreMock.lastClosedSessionId = 23;
+        agentState.openSession.mockRejectedValueOnce(openError);
+
+        const mounted = await mountComposable(() =>
+            useSearchRequestFlow({
+                modelOverride,
+                clearDraft: vi.fn(),
+                getSupportedAttachments: () => [],
+                getUnsupportedAttachmentMessage: () => null,
+                getCurrentInputSnapshot: (query) =>
+                    createInputHistorySnapshot({
+                        text: query,
+                        attachments: [],
+                    }),
+            })
+        );
+
+        await expect(mounted.result.reopenLastClosedSession()).rejects.toThrow(openError);
+
+        expect(settingsStoreMock.updateLastClosedSessionId).not.toHaveBeenCalledWith(null);
+        expect(settingsStoreMock.lastClosedSessionId).toBe(23);
+
+        mounted.unmount();
+    });
+
+    it('clears the last closed session id when the stored session no longer exists', async () => {
+        const modelOverride = ref({
+            modelId: null,
+            providerId: null,
+        });
+        const openError = new Error('Session 23 not found');
+        settingsStoreMock.lastClosedSessionId = 23;
+        agentState.openSession.mockRejectedValueOnce(openError);
+
+        const mounted = await mountComposable(() =>
+            useSearchRequestFlow({
+                modelOverride,
+                clearDraft: vi.fn(),
+                getSupportedAttachments: () => [],
+                getUnsupportedAttachmentMessage: () => null,
+                getCurrentInputSnapshot: (query) =>
+                    createInputHistorySnapshot({
+                        text: query,
+                        attachments: [],
+                    }),
+            })
+        );
+
+        await expect(mounted.result.reopenLastClosedSession()).rejects.toThrow(openError);
+
+        expect(settingsStoreMock.updateLastClosedSessionId).toHaveBeenCalledWith(null);
+        expect(settingsStoreMock.lastClosedSessionId).toBeNull();
+
+        mounted.unmount();
+    });
+
     it('does not reopen or clear draft when the last closed session is already current', async () => {
         const modelOverride = ref({
             modelId: null,
diff --git a/apps/desktop/tests/stores/settings-keybindings.test.ts b/apps/desktop/tests/stores/settings-keybindings.test.ts
index 53b8c5ef..b9a29700 100644
--- a/apps/desktop/tests/stores/settings-keybindings.test.ts
+++ b/apps/desktop/tests/stores/settings-keybindings.test.ts
@@ -76,13 +76,11 @@ describe('settings search keybindings state', () => {
             value: JSON.stringify(createDefaultSearchKeybindings()),
         });
         expect(store.settings.lastClosedSessionId).toBeNull();
-        expect(store.settings.lastActiveSessionId).toBeNull();
     });
 
     it('loads and updates the persisted last closed session id', async () => {
         mockSettings({
             last_closed_session_id: '42',
-            last_active_session_id: '84',
         });
 
         const { useSettingsStore } = await import('@/stores/settings');
@@ -91,23 +89,19 @@ describe('settings search keybindings state', () => {
         await store.initialize();
 
         expect(store.settings.lastClosedSessionId).toBe(42);
-        expect(store.settings.lastActiveSessionId).toBe(84);
 
         await store.updateLastClosedSessionId(108);
-        await store.updateLastActiveSessionId(216);
 
         expect(store.settings.lastClosedSessionId).toBe(108);
-        expect(store.settings.lastActiveSessionId).toBe(216);
         expect(setSettingMock).toHaveBeenLastCalledWith({
-            key: 'last_active_session_id',
-            value: '216',
+            key: 'last_closed_session_id',
+            value: '108',
         });
     });
 
     it('ignores invalid persisted and updated session ids', async () => {
         mockSettings({
             last_closed_session_id: '-1',
-            last_active_session_id: '42.5',
         });
 
         const { useSettingsStore } = await import('@/stores/settings');
@@ -116,15 +110,12 @@ describe('settings search keybindings state', () => {
         await store.initialize();
 
         expect(store.settings.lastClosedSessionId).toBeNull();
-        expect(store.settings.lastActiveSessionId).toBeNull();
 
         await store.updateLastClosedSessionId(0);
-        await store.updateLastActiveSessionId(-2);
 
         expect(store.settings.lastClosedSessionId).toBeNull();
-        expect(store.settings.lastActiveSessionId).toBeNull();
         expect(setSettingMock).toHaveBeenLastCalledWith({
-            key: 'last_active_session_id',
+            key: 'last_closed_session_id',
             value: '',
         });
     });
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 3a4942fb..c9177717 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -2,22 +2,16 @@ import type { AppUpdateState } from '@services/AppUpdateService/types';
 import { flushPromises, mount } from '@vue/test-utils';
 import { vi } from 'vitest';
 
+import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
 import { setLocale } from '@/i18n';
 import GeneralSection from '@/views/SettingsView/components/General/index.vue';
 
 const settingsStoreMock = vi.hoisted(() => {
-    const createGeneralSettingsMock = () => ({
+    const createGeneralSettingsMock = (searchKeybindings: Record<string, string | null>) => ({
         globalShortcut: 'Alt+Space',
         searchKeybindings: {
-            'search.history.open': 'Mod+H',
-            'search.input.focus': 'Mod+L',
-            'search.session.new': 'Mod+N',
-            'search.session.reopenLastClosed': 'Mod+Shift+T',
-            'search.model.toggle': 'Mod+M',
-            'search.window.pin': 'Mod+P',
-            'search.window.maximize': 'F11',
-            'search.settings.open': 'Mod+,',
-        } as Record<string, string | null>,
+            ...searchKeybindings,
+        },
         startOnBoot: false,
         startMinimized: true,
         language: 'zh-CN',
@@ -32,7 +26,7 @@ const settingsStoreMock = vi.hoisted(() => {
     return {
         createGeneralSettingsMock,
         settings: {
-            value: createGeneralSettingsMock(),
+            value: createGeneralSettingsMock({}),
         },
         initialize: vi.fn().mockResolvedValue(undefined),
         updateGlobalShortcut: vi.fn().mockResolvedValue(undefined),
@@ -188,7 +182,9 @@ describe('SettingsGeneralSection', () => {
         appUpdateServiceMock.state = appUpdateServiceMock.createState();
         nativeMock.shortcut.getShortcutStatus.mockResolvedValue([false, null]);
         nativeMock.autostart.isAutostartEnabled.mockResolvedValue(false);
-        settingsStoreMock.settings.value = settingsStoreMock.createGeneralSettingsMock();
+        settingsStoreMock.settings.value = settingsStoreMock.createGeneralSettingsMock(
+            createDefaultSearchKeybindings()
+        );
     });
 
     it('renders the general settings groups and row controls', async () => {

From 2c44d9dda7e73c760ff29be64ab1c7558bb4599d Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Tue, 9 Jun 2026 21:27:09 +0800
Subject: [PATCH 17/55] fix(desktop): avoid persisted reopen session state

---
 .../src/services/EventService/types.ts        |   1 -
 apps/desktop/src/stores/settings.ts           |  35 ------
 .../composables/useSearchRequest.ts           |  21 ++--
 .../SearchView/useSearchRequest.test.ts       | 111 +++++-------------
 .../tests/stores/settings-keybindings.test.ts |  43 -------
 5 files changed, 36 insertions(+), 175 deletions(-)

diff --git a/apps/desktop/src/services/EventService/types.ts b/apps/desktop/src/services/EventService/types.ts
index 8c3ec39c..1f8c7601 100644
--- a/apps/desktop/src/services/EventService/types.ts
+++ b/apps/desktop/src/services/EventService/types.ts
@@ -75,7 +75,6 @@ export interface McpStatusChangeEvent {
 export type GeneralSettingKey =
     | 'global_shortcut'
     | 'search_keybindings'
-    | 'last_closed_session_id'
     | 'start_on_boot'
     | 'start_minimized'
     | 'output_scroll_behavior'
diff --git a/apps/desktop/src/stores/settings.ts b/apps/desktop/src/stores/settings.ts
index a9a375d4..0f77d43c 100644
--- a/apps/desktop/src/stores/settings.ts
+++ b/apps/desktop/src/stores/settings.ts
@@ -32,7 +32,6 @@ export type OutputScrollBehavior = 'follow_output' | 'stay_position' | 'jump_to_
 export interface GeneralSettingsData {
     globalShortcut: string;
     searchKeybindings: SearchKeybindings;
-    lastClosedSessionId: number | null;
     startOnBoot: boolean;
     startMinimized: boolean;
     outputScrollBehavior: OutputScrollBehavior;
@@ -47,7 +46,6 @@ export interface GeneralSettingsData {
 const DEFAULT_GENERAL_SETTINGS: GeneralSettingsData = {
     globalShortcut: 'Alt+Space',
     searchKeybindings: createDefaultSearchKeybindings(),
-    lastClosedSessionId: null,
     startOnBoot: false,
     startMinimized: true,
     outputScrollBehavior: 'follow_output',
@@ -128,19 +126,6 @@ export const useSettingsStore = defineStore('settings', () => {
         settings.value.searchKeybindings = normalizeSearchKeybindings(value);
     }
 
-    function parseOptionalSessionId(value: unknown): number | null {
-        if (value === null || value === '') {
-            return null;
-        }
-
-        if (typeof value === 'string' && !/^\d+$/.test(value)) {
-            return null;
-        }
-
-        const parsed = typeof value === 'number' ? value : Number(value);
-        return Number.isInteger(parsed) && parsed > 0 ? parsed : null;
-    }
-
     function parsePersistedSearchKeybindings(value: string | null): SearchKeybindings {
         if (!value) {
             return createDefaultSearchKeybindings();
@@ -195,9 +180,6 @@ export const useSettingsStore = defineStore('settings', () => {
                     typeof value === 'string' ? parsePersistedSearchKeybindings(value) : value
                 );
                 break;
-            case 'last_closed_session_id':
-                settings.value.lastClosedSessionId = parseOptionalSessionId(value);
-                break;
             case 'start_on_boot':
                 settings.value.startOnBoot =
                     typeof value === 'boolean' ? value : String(value) === 'true';
@@ -236,10 +218,6 @@ export const useSettingsStore = defineStore('settings', () => {
                 return settings.value.globalShortcut;
             case 'search_keybindings':
                 return JSON.stringify(settings.value.searchKeybindings);
-            case 'last_closed_session_id':
-                return settings.value.lastClosedSessionId === null
-                    ? ''
-                    : String(settings.value.lastClosedSessionId);
             case 'start_on_boot':
                 return String(settings.value.startOnBoot);
             case 'start_minimized':
@@ -269,8 +247,6 @@ export const useSettingsStore = defineStore('settings', () => {
                 return {
                     ...settings.value.searchKeybindings,
                 };
-            case 'last_closed_session_id':
-                return settings.value.lastClosedSessionId;
             case 'start_on_boot':
                 return settings.value.startOnBoot;
             case 'start_minimized':
@@ -305,7 +281,6 @@ export const useSettingsStore = defineStore('settings', () => {
             const [
                 globalShortcut,
                 searchKeybindings,
-                lastClosedSessionId,
                 startOnBoot,
                 startMinimized,
                 outputScroll,
@@ -317,7 +292,6 @@ export const useSettingsStore = defineStore('settings', () => {
             ] = await Promise.all([
                 getSettingValue({ key: 'global_shortcut' }),
                 getSettingValue({ key: 'search_keybindings' }),
-                getSettingValue({ key: 'last_closed_session_id' }),
                 getSettingValue({ key: 'start_on_boot' }),
                 getSettingValue({ key: 'start_minimized' }),
                 getSettingValue({ key: 'output_scroll_behavior' }),
@@ -331,7 +305,6 @@ export const useSettingsStore = defineStore('settings', () => {
             settings.value.globalShortcut =
                 globalShortcut || DEFAULT_GENERAL_SETTINGS.globalShortcut;
             settings.value.searchKeybindings = parsePersistedSearchKeybindings(searchKeybindings);
-            settings.value.lastClosedSessionId = parseOptionalSessionId(lastClosedSessionId);
             settings.value.startOnBoot =
                 startOnBoot === null
                     ? DEFAULT_GENERAL_SETTINGS.startOnBoot
@@ -358,7 +331,6 @@ export const useSettingsStore = defineStore('settings', () => {
                           value: JSON.stringify(settings.value.searchKeybindings),
                       })
                     : persistDefaultIfMissing('search_keybindings', searchKeybindings),
-                persistDefaultIfMissing('last_closed_session_id', lastClosedSessionId),
                 persistDefaultIfMissing('start_on_boot', startOnBoot),
                 persistDefaultIfMissing('start_minimized', startMinimized),
                 persistDefaultIfMissing('output_scroll_behavior', outputScroll),
@@ -471,10 +443,6 @@ export const useSettingsStore = defineStore('settings', () => {
         await updateSetting('search_keybindings', normalizeSearchKeybindings(searchKeybindings));
     }
 
-    async function updateLastClosedSessionId(sessionId: number | null) {
-        await updateSetting('last_closed_session_id', parseOptionalSessionId(sessionId));
-    }
-
     async function updateStartOnBoot(enabled: boolean) {
         await updateSetting('start_on_boot', enabled);
     }
@@ -510,7 +478,6 @@ export const useSettingsStore = defineStore('settings', () => {
     const outputScrollBehavior = computed(() => settings.value.outputScrollBehavior);
     const globalShortcut = computed(() => settings.value.globalShortcut);
     const searchKeybindings = computed(() => settings.value.searchKeybindings);
-    const lastClosedSessionId = computed(() => settings.value.lastClosedSessionId);
     const searchWindowSizePreset = computed(() => settings.value.searchWindowSizePreset);
     const searchWindowDefaultSize = computed(() => settings.value.searchWindowDefaultSize);
     const language = computed(() => settings.value.language);
@@ -525,7 +492,6 @@ export const useSettingsStore = defineStore('settings', () => {
         outputScrollBehavior,
         globalShortcut,
         searchKeybindings,
-        lastClosedSessionId,
         searchWindowSizePreset,
         searchWindowDefaultSize,
         language,
@@ -537,7 +503,6 @@ export const useSettingsStore = defineStore('settings', () => {
         refresh,
         updateGlobalShortcut,
         updateSearchKeybindings,
-        updateLastClosedSessionId,
         updateStartOnBoot,
         updateStartMinimized,
         updateOutputScrollBehavior,
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
index a34d2b2e..82fa811d 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchRequest.ts
@@ -14,7 +14,6 @@ import {
 import { dismissSessionTerminalStatus, listSessions } from '@/services/AgentService/session';
 import { eventService } from '@/services/EventService';
 import { AppEvent } from '@/services/EventService/types';
-import { useSettingsStore } from '@/stores/settings';
 import {
     createInputHistorySnapshot,
     type InputHistorySnapshot,
@@ -74,7 +73,7 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
     const sessionList = ref<SessionEntity[]>([]);
     const sessionListQuery = ref('');
     const isSessionListLoading = ref(false);
-    const settingsStore = useSettingsStore();
+    const lastClosedSessionId = ref<number | null>(null);
     let sessionListRequestId = 0;
     let sessionListLoadPromise: Promise<void> | null = null;
     let sessionListInFlightKey: string | null = null;
@@ -232,9 +231,7 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
 
     function clearSessionState() {
         if (currentSessionId.value !== null) {
-            void settingsStore.updateLastClosedSessionId(currentSessionId.value).catch((error) => {
-                console.error('[SearchView] Failed to persist last closed session id:', error);
-            });
+            lastClosedSessionId.value = currentSessionId.value;
         }
         clearPendingRequestState();
         clearSession();
@@ -399,12 +396,8 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
         clearDraft();
     }
 
-    async function clearLastClosedSessionIdSafely() {
-        try {
-            await settingsStore.updateLastClosedSessionId(null);
-        } catch (error) {
-            console.error('[SearchView] Failed to clear last closed session id:', error);
-        }
+    function clearLastClosedSessionId() {
+        lastClosedSessionId.value = null;
     }
 
     function isSessionNotFoundError(error: unknown, sessionId: number): boolean {
@@ -412,7 +405,7 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
     }
 
     async function reopenLastClosedSession(): Promise<LoadedSessionInfo | null> {
-        const sessionId = settingsStore.lastClosedSessionId;
+        const sessionId = lastClosedSessionId.value;
         if (sessionId === null || sessionId === currentSessionId.value) {
             return null;
         }
@@ -420,12 +413,12 @@ export function useSearchRequestFlow(options: UseSearchRequestFlowOptions) {
         try {
             const loadedSession = await openSession(sessionId);
             if (currentSessionId.value === sessionId) {
-                await clearLastClosedSessionIdSafely();
+                clearLastClosedSessionId();
             }
             return loadedSession;
         } catch (error) {
             if (isSessionNotFoundError(error, sessionId)) {
-                await clearLastClosedSessionIdSafely();
+                clearLastClosedSessionId();
             }
             throw error;
         }
diff --git a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
index c20b7a3f..f05a2d49 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchRequest.test.ts
@@ -15,7 +15,6 @@ const {
     eventHandlers,
     listSessionsMock,
     notifyMock,
-    settingsStoreMock,
     useAgentMock,
 } = vi.hoisted(() => {
     const callbacksHolder: { current: Record<string, unknown> | null } = { current: null };
@@ -33,13 +32,6 @@ const {
         approvePendingToolApproval: vi.fn(() => true),
         rejectPendingToolApproval: vi.fn(() => true),
     };
-    const settingsStore = {
-        lastClosedSessionId: null as number | null,
-        updateLastClosedSessionId: vi.fn(async (sessionId: number | null) => {
-            settingsStore.lastClosedSessionId = sessionId;
-        }),
-    };
-
     return {
         agentCallbacks: callbacksHolder,
         agentState: agent,
@@ -47,7 +39,6 @@ const {
         eventHandlers: handlers,
         listSessionsMock: vi.fn().mockResolvedValue([]),
         notifyMock: vi.fn(),
-        settingsStoreMock: settingsStore,
         useAgentMock: vi.fn((callbacks: Record<string, unknown>) => {
             callbacksHolder.current = callbacks;
             return agent;
@@ -63,10 +54,6 @@ vi.mock('@services/NotificationService', () => ({
     notify: notifyMock,
 }));
 
-vi.mock('@/stores/settings', () => ({
-    useSettingsStore: () => settingsStoreMock,
-}));
-
 vi.mock('@services/AgentService/session', async () => {
     const actual = await vi.importActual<typeof import('@services/AgentService/session')>(
         '@services/AgentService/session'
@@ -142,9 +129,6 @@ describe('useSearchRequestFlow', () => {
         agentState.currentSessionId.value = null;
         agentState.sessionHistory.value = [];
         agentState.pendingToolApproval.value = null;
-        settingsStoreMock.lastClosedSessionId = null;
-        settingsStoreMock.updateLastClosedSessionId.mockClear();
-
         listSessionsMock.mockResolvedValue([]);
         dismissSessionTerminalStatusMock.mockResolvedValue(undefined);
         agentState.sendRequest.mockResolvedValue(undefined);
@@ -449,8 +433,6 @@ describe('useSearchRequestFlow', () => {
         mounted.result.clearSession();
 
         expect(agentState.clearSession).toHaveBeenCalledTimes(1);
-        expect(settingsStoreMock.updateLastClosedSessionId).toHaveBeenCalledWith(23);
-        expect(settingsStoreMock.lastClosedSessionId).toBe(23);
 
         agentState.currentSessionId.value = null;
         agentState.openSession.mockImplementationOnce(async () => {
@@ -472,8 +454,10 @@ describe('useSearchRequestFlow', () => {
             modelId: 'gpt-5',
             providerId: 9,
         });
-        expect(settingsStoreMock.updateLastClosedSessionId).toHaveBeenLastCalledWith(null);
-        expect(settingsStoreMock.lastClosedSessionId).toBeNull();
+
+        const secondReopenAttempt = await mounted.result.reopenLastClosedSession();
+        expect(secondReopenAttempt).toBeNull();
+        expect(agentState.openSession).toHaveBeenCalledTimes(1);
 
         mounted.unmount();
     });
@@ -504,7 +488,6 @@ describe('useSearchRequestFlow', () => {
         expect(agentState.openSession).not.toHaveBeenCalled();
         expect(clearDraft).not.toHaveBeenCalled();
         expect(reopenedSession).toBeNull();
-        expect(settingsStoreMock.updateLastClosedSessionId).not.toHaveBeenCalledWith(null);
 
         mounted.unmount();
     });
@@ -515,8 +498,6 @@ describe('useSearchRequestFlow', () => {
             providerId: null,
         });
         const openError = new Error('database unavailable');
-        settingsStoreMock.lastClosedSessionId = 23;
-        agentState.openSession.mockRejectedValueOnce(openError);
 
         const mounted = await mountComposable(() =>
             useSearchRequestFlow({
@@ -532,10 +513,24 @@ describe('useSearchRequestFlow', () => {
             })
         );
 
+        agentState.currentSessionId.value = 23;
+        mounted.result.clearSession();
+        agentState.currentSessionId.value = null;
+        agentState.openSession.mockRejectedValueOnce(openError);
+
         await expect(mounted.result.reopenLastClosedSession()).rejects.toThrow(openError);
 
-        expect(settingsStoreMock.updateLastClosedSessionId).not.toHaveBeenCalledWith(null);
-        expect(settingsStoreMock.lastClosedSessionId).toBe(23);
+        agentState.openSession.mockResolvedValueOnce({
+            sessionId: 23,
+            title: 'Reopened Session',
+            modelId: 'gpt-5',
+            providerId: 9,
+        });
+
+        await mounted.result.reopenLastClosedSession();
+
+        expect(agentState.openSession).toHaveBeenCalledTimes(2);
+        expect(agentState.openSession).toHaveBeenLastCalledWith(23);
 
         mounted.unmount();
     });
@@ -546,8 +541,6 @@ describe('useSearchRequestFlow', () => {
             providerId: null,
         });
         const openError = new Error('Session 23 not found');
-        settingsStoreMock.lastClosedSessionId = 23;
-        agentState.openSession.mockRejectedValueOnce(openError);
 
         const mounted = await mountComposable(() =>
             useSearchRequestFlow({
@@ -563,10 +556,16 @@ describe('useSearchRequestFlow', () => {
             })
         );
 
+        agentState.currentSessionId.value = 23;
+        mounted.result.clearSession();
+        agentState.currentSessionId.value = null;
+        agentState.openSession.mockRejectedValueOnce(openError);
+
         await expect(mounted.result.reopenLastClosedSession()).rejects.toThrow(openError);
 
-        expect(settingsStoreMock.updateLastClosedSessionId).toHaveBeenCalledWith(null);
-        expect(settingsStoreMock.lastClosedSessionId).toBeNull();
+        const secondReopenAttempt = await mounted.result.reopenLastClosedSession();
+        expect(secondReopenAttempt).toBeNull();
+        expect(agentState.openSession).toHaveBeenCalledTimes(1);
 
         mounted.unmount();
     });
@@ -577,7 +576,6 @@ describe('useSearchRequestFlow', () => {
             providerId: null,
         });
         const clearDraft = vi.fn();
-        settingsStoreMock.lastClosedSessionId = 23;
         agentState.currentSessionId.value = 23;
 
         const mounted = await mountComposable(() =>
@@ -594,6 +592,7 @@ describe('useSearchRequestFlow', () => {
             })
         );
 
+        mounted.result.clearSession();
         const reopenedSession = await mounted.result.reopenLastClosedSession();
 
         expect(agentState.openSession).not.toHaveBeenCalled();
@@ -603,58 +602,6 @@ describe('useSearchRequestFlow', () => {
         mounted.unmount();
     });
 
-    it('still returns a reopened session when clearing last-closed metadata fails', async () => {
-        const modelOverride = ref({
-            modelId: null,
-            providerId: null,
-        });
-        settingsStoreMock.lastClosedSessionId = 23;
-        settingsStoreMock.updateLastClosedSessionId.mockRejectedValueOnce(
-            new Error('database unavailable')
-        );
-        agentState.openSession.mockImplementationOnce(async () => {
-            agentState.currentSessionId.value = 23;
-            return {
-                sessionId: 23,
-                title: 'Reopened Session',
-                modelId: 'gpt-5',
-                providerId: 9,
-            };
-        });
-
-        const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
-        const mounted = await mountComposable(() =>
-            useSearchRequestFlow({
-                modelOverride,
-                clearDraft: vi.fn(),
-                getSupportedAttachments: () => [],
-                getUnsupportedAttachmentMessage: () => null,
-                getCurrentInputSnapshot: (query) =>
-                    createInputHistorySnapshot({
-                        text: query,
-                        attachments: [],
-                    }),
-            })
-        );
-
-        const reopenedSession = await mounted.result.reopenLastClosedSession();
-
-        expect(reopenedSession).toEqual({
-            sessionId: 23,
-            title: 'Reopened Session',
-            modelId: 'gpt-5',
-            providerId: 9,
-        });
-        expect(settingsStoreMock.updateLastClosedSessionId).toHaveBeenCalledWith(null);
-        expect(consoleErrorSpy).toHaveBeenCalledWith(
-            '[SearchView] Failed to clear last closed session id:',
-            expect.any(Error)
-        );
-
-        consoleErrorSpy.mockRestore();
-        mounted.unmount();
-    });
-
     it('regenerates from the nearest preceding user message and drops unsupported attachments', async () => {
         const supportedAttachment = createAttachment('supported-1');
         const unsupportedAttachment = createAttachment('unsupported-1', {
diff --git a/apps/desktop/tests/stores/settings-keybindings.test.ts b/apps/desktop/tests/stores/settings-keybindings.test.ts
index b9a29700..ce10f499 100644
--- a/apps/desktop/tests/stores/settings-keybindings.test.ts
+++ b/apps/desktop/tests/stores/settings-keybindings.test.ts
@@ -75,49 +75,6 @@ describe('settings search keybindings state', () => {
             key: 'search_keybindings',
             value: JSON.stringify(createDefaultSearchKeybindings()),
         });
-        expect(store.settings.lastClosedSessionId).toBeNull();
-    });
-
-    it('loads and updates the persisted last closed session id', async () => {
-        mockSettings({
-            last_closed_session_id: '42',
-        });
-
-        const { useSettingsStore } = await import('@/stores/settings');
-        const store = useSettingsStore();
-
-        await store.initialize();
-
-        expect(store.settings.lastClosedSessionId).toBe(42);
-
-        await store.updateLastClosedSessionId(108);
-
-        expect(store.settings.lastClosedSessionId).toBe(108);
-        expect(setSettingMock).toHaveBeenLastCalledWith({
-            key: 'last_closed_session_id',
-            value: '108',
-        });
-    });
-
-    it('ignores invalid persisted and updated session ids', async () => {
-        mockSettings({
-            last_closed_session_id: '-1',
-        });
-
-        const { useSettingsStore } = await import('@/stores/settings');
-        const store = useSettingsStore();
-
-        await store.initialize();
-
-        expect(store.settings.lastClosedSessionId).toBeNull();
-
-        await store.updateLastClosedSessionId(0);
-
-        expect(store.settings.lastClosedSessionId).toBeNull();
-        expect(setSettingMock).toHaveBeenLastCalledWith({
-            key: 'last_closed_session_id',
-            value: '',
-        });
     });
 
     it('loads persisted search keybindings and merges missing defaults', async () => {

From a17df8f513c39dd683f963186e248063e295b9e0 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Wed, 10 Jun 2026 00:03:13 +0800
Subject: [PATCH 18/55] fix(desktop): harden search shortcut handling

---
 apps/desktop/src/config/searchKeybindings.ts  | 20 +++++++++++++++++--
 .../interaction/useSearchKeyboardRouter.ts    |  8 ++++----
 .../SettingsView/components/General/index.vue | 19 +++++++++++-------
 .../SearchView/searchInteraction.test.ts      |  7 ++++---
 .../useSearchKeyboardRouter.test.ts           | 12 +++++++++++
 .../tests/config/searchKeybindings.test.ts    | 16 +++++++++++++++
 .../settingsGeneralComponent.test.ts          | 10 +++++++++-
 7 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index ef00a561..17f49080 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -130,12 +130,25 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
         return normalized;
     }
 
+    const candidates = value as Record<string, unknown>;
     for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
-        const candidate = (value as Record<string, unknown>)[definition.id];
+        const candidate = candidates[definition.id];
         if (candidate === null && definition.allowDisable) {
             normalized[definition.id] = null;
-            continue;
         }
+    }
+
+    function hasShortcutConflict(actionId: SearchKeybindingActionId, shortcut: string): boolean {
+        return SEARCH_KEYBINDING_DEFINITIONS.some((definition) => {
+            if (definition.id === actionId) {
+                return false;
+            }
+            return normalizeLocalShortcutString(normalized[definition.id]) === shortcut;
+        });
+    }
+
+    for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
+        const candidate = candidates[definition.id];
 
         if (typeof candidate !== 'string') {
             continue;
@@ -152,6 +165,9 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
             if (isReservedLocalShortcut(shortcut)) {
                 continue;
             }
+            if (hasShortcutConflict(definition.id, shortcut)) {
+                continue;
+            }
             normalized[definition.id] = shortcut;
         }
     }
diff --git a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
index 9bdbc172..2dd1d3e7 100644
--- a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
+++ b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
@@ -172,13 +172,13 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
             }
         }
 
-        const searchKeybindingAction = resolveSearchKeybindingAction(input, getSearchKeybindings());
-        if (searchKeybindingAction) {
-            runKeyboardEffect(() => onSearchKeybindingAction(searchKeybindingAction));
+        if (hasActivePopupWindowFocus()) {
             return true;
         }
 
-        if (hasActivePopupWindowFocus()) {
+        const searchKeybindingAction = resolveSearchKeybindingAction(input, getSearchKeybindings());
+        if (searchKeybindingAction) {
+            runKeyboardEffect(() => onSearchKeybindingAction(searchKeybindingAction));
             return true;
         }
 
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 4f9720d5..e7fce42e 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -508,7 +508,7 @@
     const saveSearchShortcut = async (
         actionId: SearchKeybindingActionId,
         shortcut: string | null
-    ) => {
+    ): Promise<boolean> => {
         const normalizedShortcut =
             shortcut === null ? null : normalizeLocalShortcutString(shortcut);
         if (normalizedShortcut) {
@@ -526,7 +526,7 @@
                     actionId,
                     formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
                 );
-                return;
+                return false;
             }
 
             if (isReservedLocalShortcut(normalizedShortcut)) {
@@ -538,7 +538,7 @@
                     actionId,
                     formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
                 );
-                return;
+                return false;
             }
 
             const conflictActionId = findShortcutConflict(
@@ -561,7 +561,7 @@
                     actionId,
                     formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
                 );
-                return;
+                return false;
             }
 
             const comparableGlobalShortcut = normalizeLocalShortcutString(
@@ -583,7 +583,7 @@
                     actionId,
                     formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
                 );
-                return;
+                return false;
             }
         }
 
@@ -599,6 +599,7 @@
                 formatSearchShortcutForSettings(normalizedShortcut)
             );
             alertMessage.value?.success(t('common.saved'), 2000);
+            return true;
         } catch (error) {
             console.error('Failed to save search shortcut:', error);
             reportSearchShortcutError(actionId, 'settings.general.saveSettingsFailed');
@@ -606,6 +607,7 @@
                 actionId,
                 formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
             );
+            return false;
         } finally {
             isSaving.value = false;
         }
@@ -642,7 +644,6 @@
             return;
         }
 
-        activeSearchShortcutActionId.value = null;
         hasCapturedSearchShortcut.value = false;
         searchShortcutCapturedValue.value = null;
 
@@ -654,10 +655,14 @@
                 actionId,
                 formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
             );
+            activeSearchShortcutActionId.value = null;
             return;
         }
 
-        await saveSearchShortcut(actionId, shortcut);
+        const saved = await saveSearchShortcut(actionId, shortcut);
+        if (saved) {
+            activeSearchShortcutActionId.value = null;
+        }
     };
 
     const stopSearchShortcutCaptureAndSave = async (
diff --git a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
index 3eefe79e..cf3aad95 100644
--- a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
+++ b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
@@ -413,14 +413,14 @@ describe('createSearchKeydownHandler', () => {
         expect(escapeEvent.defaultPrevented).toBe(true);
     });
 
-    it('routes a configured Ctrl+Up shortcut to reopen the most recently closed session', async () => {
+    it('routes a configured command shortcut to reopen the most recently closed session', async () => {
         const controller = createControllerStub();
         const reopenLastClosedSession = vi.fn().mockResolvedValue(undefined);
         const handleKeyDown = createSearchKeydownHandler({
             viewReady: ref(true),
             searchKeybindings: ref({
                 ...createDefaultSearchKeybindings(),
-                'search.session.reopenLastClosed': 'Mod+Up',
+                'search.session.reopenLastClosed': 'Mod+Shift+Y',
             }),
             queryText: ref(''),
             attachments: ref([]),
@@ -466,8 +466,9 @@ describe('createSearchKeydownHandler', () => {
         });
 
         const event = new KeyboardEvent('keydown', {
-            key: 'ArrowUp',
+            key: 'y',
             ctrlKey: true,
+            shiftKey: true,
             cancelable: true,
         });
         await handleKeyDown(event);
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index 359aae46..d22edb35 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -272,6 +272,18 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onOpenQuickSearch).not.toHaveBeenCalled();
     });
 
+    it('does not route search shortcuts while a popup window owns focus', async () => {
+        const { router, callbacks } = createKeyboardRouter({
+            hasActivePopupWindowFocus: () => true,
+        });
+
+        expect(router.route({ key: 'F11' })).toBe(true);
+        expect(router.route({ key: 'h', ctrlKey: true })).toBe(true);
+        await flushAsyncWork();
+
+        expect(callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();
+    });
+
     it('applies the escape fallback order on the search surface', async () => {
         const loadingRouter = createKeyboardRouter({
             isLoading: () => true,
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index 5fa0ca32..451dbc6f 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -83,6 +83,22 @@ describe('search keybinding configuration', () => {
         });
     });
 
+    it('rejects persisted shortcut duplicates while preserving disabled actions', () => {
+        expect(
+            normalizeSearchKeybindings({
+                'search.history.open': 'Ctrl+Y',
+                'search.input.focus': 'Ctrl+Y',
+                'search.session.new': null,
+                'search.model.toggle': 'Ctrl+N',
+            })
+        ).toEqual({
+            ...createDefaultSearchKeybindings(),
+            'search.history.open': 'Mod+Y',
+            'search.session.new': null,
+            'search.model.toggle': 'Mod+N',
+        });
+    });
+
     it('falls back to defaults for invalid persisted payloads', () => {
         const defaults = createDefaultSearchKeybindings();
 
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index c9177717..72403cbc 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -377,7 +377,7 @@ describe('SettingsGeneralSection', () => {
         });
     });
 
-    it('does not save shift-only printable search shortcuts', async () => {
+    it('keeps search shortcut capture active after a validation failure', async () => {
         const wrapper = mount(GeneralSection);
 
         await flushPromises();
@@ -391,6 +391,14 @@ describe('SettingsGeneralSection', () => {
         await flushPromises();
 
         expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'F1',
+        });
     });
 
     it('shows fixed search shortcuts as unsupported for editing', async () => {

From ba0f67b2b51ddf58fb27c46abccdb9c953af53fc Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Wed, 10 Jun 2026 01:44:01 +0800
Subject: [PATCH 19/55] fix(desktop): allow clean keybinding swaps in
 normalization

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 apps/desktop/src/config/searchKeybindings.ts | 72 ++++++++++++--------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 17f49080..3a5488e6 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -125,52 +125,68 @@ export function createDefaultSearchKeybindings(): SearchKeybindings {
 }
 
 export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
-    const normalized = createDefaultSearchKeybindings();
+    const defaults = createDefaultSearchKeybindings();
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
-        return normalized;
+        return defaults;
     }
 
     const candidates = value as Record<string, unknown>;
+
+    // First pass: resolve each action's desired shortcut (validated custom value,
+    // explicit disable, or its default) without considering conflicts yet.
+    const resolved = new Map<SearchKeybindingActionId, string | null>();
     for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
         const candidate = candidates[definition.id];
+
         if (candidate === null && definition.allowDisable) {
-            normalized[definition.id] = null;
+            resolved.set(definition.id, null);
+            continue;
         }
-    }
 
-    function hasShortcutConflict(actionId: SearchKeybindingActionId, shortcut: string): boolean {
-        return SEARCH_KEYBINDING_DEFINITIONS.some((definition) => {
-            if (definition.id === actionId) {
-                return false;
+        if (typeof candidate === 'string') {
+            const shortcut = normalizeLocalShortcutString(candidate);
+            if (shortcut) {
+                const allowsModifierlessFunction =
+                    definition.allowModifierlessFunctionShortcut &&
+                    isModifierlessFunctionShortcut(shortcut);
+                const passesModifierPolicy =
+                    hasCommandModifier(shortcut) || allowsModifierlessFunction;
+                if (passesModifierPolicy && !isReservedLocalShortcut(shortcut)) {
+                    resolved.set(definition.id, shortcut);
+                    continue;
+                }
             }
-            return normalizeLocalShortcutString(normalized[definition.id]) === shortcut;
-        });
+        }
+
+        resolved.set(definition.id, defaults[definition.id]);
     }
 
+    // Second pass: resolve conflicts deterministically (first action in
+    // definition order keeps the shortcut). This lets clean swaps survive
+    // instead of both sides colliding with the other's default.
+    const result = createDefaultSearchKeybindings();
+    const usedShortcuts = new Set<string>();
     for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
-        const candidate = candidates[definition.id];
+        const desired = resolved.get(definition.id) ?? null;
+        if (desired === null) {
+            result[definition.id] = null;
+            continue;
+        }
 
-        if (typeof candidate !== 'string') {
+        if (!usedShortcuts.has(desired)) {
+            usedShortcuts.add(desired);
+            result[definition.id] = desired;
             continue;
         }
 
-        const shortcut = normalizeLocalShortcutString(candidate);
-        if (shortcut) {
-            const allowsModifierlessFunction =
-                definition.allowModifierlessFunctionShortcut &&
-                isModifierlessFunctionShortcut(shortcut);
-            if (!hasCommandModifier(shortcut) && !allowsModifierlessFunction) {
-                continue;
-            }
-            if (isReservedLocalShortcut(shortcut)) {
-                continue;
-            }
-            if (hasShortcutConflict(definition.id, shortcut)) {
-                continue;
-            }
-            normalized[definition.id] = shortcut;
+        const fallback = normalizeLocalShortcutString(definition.defaultShortcut);
+        if (fallback && !usedShortcuts.has(fallback)) {
+            usedShortcuts.add(fallback);
+            result[definition.id] = definition.defaultShortcut;
+        } else {
+            result[definition.id] = definition.allowDisable ? null : definition.defaultShortcut;
         }
     }
 
-    return normalized;
+    return result;
 }

From 5bd2979edd11619b8b3c5de4be2cfae71f81fec7 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Wed, 10 Jun 2026 01:58:51 +0800
Subject: [PATCH 20/55] fix(desktop): use normalized fallback in keybinding
 conflict resolution

Co-Authored-By: Claude <noreply@anthropic.com>
---
 apps/desktop/src/config/searchKeybindings.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 3a5488e6..80662a61 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -182,9 +182,9 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
         const fallback = normalizeLocalShortcutString(definition.defaultShortcut);
         if (fallback && !usedShortcuts.has(fallback)) {
             usedShortcuts.add(fallback);
-            result[definition.id] = definition.defaultShortcut;
+            result[definition.id] = fallback;
         } else {
-            result[definition.id] = definition.allowDisable ? null : definition.defaultShortcut;
+            result[definition.id] = null;
         }
     }
 

From 048f8d086c96732f86804f3274f977cb6e3b945a Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Wed, 10 Jun 2026 11:03:28 +0800
Subject: [PATCH 21/55] fix(desktop): address keybinding review feedback

---
 .prettierignore                                    |  1 -
 apps/desktop/src/components/CustomSelect.vue       |  3 +--
 apps/desktop/src/stores/settings.ts                | 14 +++++++++++++-
 .../components/General/SearchShortcutSettings.vue  |  4 +---
 .../SettingsView/components/General/index.vue      |  4 ++--
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index 8ce40a2a..bf00ff90 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -65,4 +65,3 @@ apps/site/dist/
 
 # Local app runtime data and Vite cache
 apps/desktop/data/
-apps/desktop/.vite-cache/
diff --git a/apps/desktop/src/components/CustomSelect.vue b/apps/desktop/src/components/CustomSelect.vue
index 03bebc38..c67047cb 100644
--- a/apps/desktop/src/components/CustomSelect.vue
+++ b/apps/desktop/src/components/CustomSelect.vue
@@ -9,8 +9,7 @@
         SelectValue,
     } from '@components/ui/select';
     import type { AcceptableValue, SelectTriggerProps } from 'reka-ui';
-    import { computed, ref } from 'vue';
-    import { useAttrs } from 'vue';
+    import { computed, ref, useAttrs } from 'vue';
 
     import { type MessageKey, t, tt } from '@/i18n';
 
diff --git a/apps/desktop/src/stores/settings.ts b/apps/desktop/src/stores/settings.ts
index 798a9049..55cb8838 100644
--- a/apps/desktop/src/stores/settings.ts
+++ b/apps/desktop/src/stores/settings.ts
@@ -77,7 +77,7 @@ export const useSettingsStore = defineStore('settings', () => {
                 );
             });
 
-            await Promise.allSettled(
+            const persistenceResults = await Promise.allSettled(
                 GENERAL_SETTING_DEFINITIONS.map((definition, index) => {
                     const persistedValue = settingRows[index] ?? null;
                     if (definition.shouldRewritePersisted?.(persistedValue)) {
@@ -90,6 +90,18 @@ export const useSettingsStore = defineStore('settings', () => {
                     return persistDefaultIfMissing(definition.key, persistedValue);
                 })
             );
+            const failedPersistenceKeys = persistenceResults.flatMap((result, index) =>
+                result.status === 'rejected'
+                    ? [GENERAL_SETTING_DEFINITIONS[index]?.key ?? `unknown:${index}`]
+                    : []
+            );
+            if (failedPersistenceKeys.length > 0) {
+                throw new Error(
+                    `Failed to persist general setting rewrite/default value(s): ${failedPersistenceKeys.join(
+                        ', '
+                    )}`
+                );
+            }
         } finally {
             loading.value = false;
         }
diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index c2fc9a62..5d5634cf 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -567,9 +567,7 @@
                                 :data-testid="`settings-search-shortcut-action-${row.id}`"
                                 :data-shortcut-action="row.shortcutAction"
                                 @mousedown.prevent
-                                @click="
-                                    handleSearchShortcutIconAction(row.id, row.shortcutAction)
-                                "
+                                @click="handleSearchShortcutIconAction(row.id, row.shortcutAction)"
                             >
                                 <AppIcon
                                     :name="row.shortcutAction === 'clear' ? 'x' : 'undo'"
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 8638e82f..6e2653ea 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -330,7 +330,7 @@
                       notificationBodyKey: MessageKey;
                       params?: never;
                   } => {
-                if (errorStr.includes('already registered') || errorStr.includes('宸叉敞鍐?')) {
+                if (errorStr.includes('already registered') || errorStr.includes('已注册')) {
                     return {
                         friendlyMessageKey:
                             'notification.shortcutRegistrationFailed.alreadyRegistered',
@@ -340,7 +340,7 @@
                     };
                 }
 
-                if (errorStr.includes('invalid') || errorStr.includes('鏃犳晥')) {
+                if (errorStr.includes('invalid') || errorStr.includes('无效')) {
                     return {
                         friendlyMessageKey: 'notification.shortcutRegistrationFailed.invalid',
                         notificationBodyKey: 'notification.shortcutRegistrationFailed.invalidBody',

From b560f9b60cbe28e610cf95e85740076d219b7862 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Wed, 10 Jun 2026 11:32:31 +0800
Subject: [PATCH 22/55] chore: keep prettier ignore scope unchanged

---
 .prettierignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.prettierignore b/.prettierignore
index bf00ff90..695eb12c 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -5,7 +5,6 @@ build/
 *.min.*
 coverage/
 .coverage/
-.vite-cache/
 
 # Drizzle 生成的迁移文件
 apps/desktop/src/database/drizzle/
@@ -65,3 +64,4 @@ apps/site/dist/
 
 # Local app runtime data and Vite cache
 apps/desktop/data/
+apps/desktop/.vite-cache/

From 64134f48fa7c6d83996f7698716b788cd0accc26 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Wed, 10 Jun 2026 18:51:41 +0800
Subject: [PATCH 23/55] fix(desktop): tighten shortcut capture handling

---
 .../src-tauri/src/core/system/shortcut.rs     | 20 ++++---
 apps/desktop/src/utils/shortcuts.ts           |  8 +++
 .../General/SearchShortcutSettings.vue        |  9 +++-
 .../SettingsView/components/General/index.vue | 22 ++++++--
 apps/desktop/tests/utils/shortcuts.test.ts    |  3 ++
 .../settingsGeneralComponent.test.ts          | 53 +++++++++++++++++++
 6 files changed, 104 insertions(+), 11 deletions(-)

diff --git a/apps/desktop/src-tauri/src/core/system/shortcut.rs b/apps/desktop/src-tauri/src/core/system/shortcut.rs
index 83baa11e..2f9155d0 100644
--- a/apps/desktop/src-tauri/src/core/system/shortcut.rs
+++ b/apps/desktop/src-tauri/src/core/system/shortcut.rs
@@ -49,20 +49,28 @@ pub fn register_global_shortcut<R: Runtime>(
 ) -> Result<(), String> {
     let new_shortcut = parse_shortcut(&shortcut)?;
 
-    // 注销旧快捷键
-    if let Ok(current) = CURRENT_SHORTCUT.lock() {
-        if let Some(old_shortcut) = *current {
-            let _ = app.global_shortcut().unregister(old_shortcut);
+    let old_shortcut = CURRENT_SHORTCUT.lock().ok().and_then(|current| *current);
+    if let Some(old_shortcut) = old_shortcut {
+        if let Err(error) = app.global_shortcut().unregister(old_shortcut) {
+            let message = format!("Failed to unregister previous shortcut: {}", error);
+            if let Ok(mut status) = REGISTRATION_STATUS.lock() {
+                *status = (true, Some(message.clone()));
+            }
+            return Err(message);
         }
     }
 
-    // 尝试注册新快捷键
     let result = app
         .global_shortcut()
         .register(new_shortcut)
         .map_err(|e| format!("Failed to register shortcut: {}", e));
 
-    // 更新状态
+    if result.is_err() {
+        if let Some(old_shortcut) = old_shortcut {
+            let _ = app.global_shortcut().register(old_shortcut);
+        }
+    }
+
     match result {
         Ok(_) => {
             if let Ok(mut current) = CURRENT_SHORTCUT.lock() {
diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index c83e8d8c..2bc7c34e 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -314,6 +314,14 @@ export function isReservedLocalShortcut(shortcut: string | null | undefined): bo
     return key ? RESERVED_LOCAL_SHORTCUT_KEYS.has(key) : false;
 }
 
+export function isReservedLocalShortcutKey(
+    key: string | null | undefined,
+    code?: string | null
+): boolean {
+    const normalizedKey = resolveKeyboardEventShortcutKey(key, code);
+    return normalizedKey ? RESERVED_LOCAL_SHORTCUT_KEYS.has(normalizedKey) : false;
+}
+
 export function hasRequiredModifier(shortcut: string | null | undefined): boolean {
     const normalized = normalizeLocalShortcutString(shortcut);
     if (!normalized) {
diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index 5d5634cf..21af6b53 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -18,6 +18,7 @@
         hasCommandModifier,
         isModifierlessFunctionShortcut,
         isReservedLocalShortcut,
+        isReservedLocalShortcutKey,
         normalizeLocalShortcutString,
         toCurrentPlatformShortcut,
     } from '@/utils/shortcuts';
@@ -219,8 +220,9 @@
             return;
         }
 
-        event.preventDefault();
-        event.stopPropagation();
+        if (isReservedLocalShortcutKey(event.key, event.code)) {
+            return;
+        }
 
         const captured = captureShortcutFromKeyboardEvent(event);
         if (!captured) {
@@ -230,6 +232,9 @@
             return;
         }
 
+        event.preventDefault();
+        event.stopPropagation();
+
         searchShortcutCapturedValue.value = captured.shortcut;
         hasCapturedSearchShortcut.value = true;
         searchShortcutErrorActionId.value = null;
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 6e2653ea..43a77222 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -20,7 +20,11 @@
         t,
     } from '@/i18n';
     import { type OutputScrollBehavior, useSettingsStore } from '@/stores/settings';
-    import { normalizeLocalShortcutString } from '@/utils/shortcuts';
+    import {
+        hasCommandModifier,
+        isReservedLocalShortcutKey,
+        normalizeLocalShortcutString,
+    } from '@/utils/shortcuts';
 
     import SearchShortcutSettings from './SearchShortcutSettings.vue';
     import { resolveShortcutCaptureCompletion } from './shortcutCapture';
@@ -121,8 +125,9 @@
             return;
         }
 
-        event.preventDefault();
-        event.stopPropagation();
+        if (isReservedLocalShortcutKey(event.key, event.code)) {
+            return;
+        }
 
         if (['Control', 'Alt', 'Shift', 'Meta', 'OS'].includes(event.key)) {
             return;
@@ -153,6 +158,17 @@
         }
 
         const shortcut = [...modifiers, keyName].join('+');
+        if (!hasCommandModifier(shortcut)) {
+            alertMessage.value?.warning(
+                t('settings.general.searchShortcuts.errors.modifierRequired'),
+                3000
+            );
+            return;
+        }
+
+        event.preventDefault();
+        event.stopPropagation();
+
         displayShortcut.value = shortcut;
         hasCapturedShortcut.value = true;
         showGlobalShortcutPresetMenu.value = false;
diff --git a/apps/desktop/tests/utils/shortcuts.test.ts b/apps/desktop/tests/utils/shortcuts.test.ts
index bd849ea1..58210d5b 100644
--- a/apps/desktop/tests/utils/shortcuts.test.ts
+++ b/apps/desktop/tests/utils/shortcuts.test.ts
@@ -8,6 +8,7 @@ import {
     hasRequiredModifier,
     isModifierlessFunctionShortcut,
     isReservedLocalShortcut,
+    isReservedLocalShortcutKey,
     matchShortcut,
     normalizeLocalShortcutString,
     resolveKeyboardEventShortcutKey,
@@ -140,6 +141,8 @@ describe('shortcut utilities', () => {
         expect(isReservedLocalShortcut('Mod+PageDown')).toBe(true);
         expect(isReservedLocalShortcut('Mod+K')).toBe(false);
         expect(isReservedLocalShortcut(null)).toBe(false);
+        expect(isReservedLocalShortcutKey('ArrowDown')).toBe(true);
+        expect(isReservedLocalShortcutKey('BrightnessUp', 'F2')).toBe(false);
 
         expect(hasRequiredModifier('Mod+K')).toBe(true);
         expect(hasRequiredModifier('Shift+K')).toBe(true);
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 72403cbc..620ed258 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -295,6 +295,8 @@ describe('SettingsGeneralSection', () => {
 
         expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
         expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
+        expect((input.element as HTMLInputElement).value).toBe('Ctrl+Space');
+        expect(settingsStoreMock.settings.value.globalShortcut).toBe('Ctrl+Space');
         expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
             false
         );
@@ -320,6 +322,29 @@ describe('SettingsGeneralSection', () => {
         );
     });
 
+    it('does not capture navigation keys while global shortcut presets are open', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        const event = new KeyboardEvent('keydown', { key: 'ArrowDown', cancelable: true });
+        window.dispatchEvent(event);
+        await flushPromises();
+
+        expect(event.defaultPrevented).toBe(false);
+        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
+        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            true
+        );
+
+        wrapper.unmount();
+    });
+
     it('does not save a global shortcut that duplicates a search shortcut', async () => {
         settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+A';
         const wrapper = mount(GeneralSection);
@@ -377,6 +402,34 @@ describe('SettingsGeneralSection', () => {
         });
     });
 
+    it('does not capture navigation keys while editing a search shortcut', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+
+        const event = new KeyboardEvent('keydown', { key: 'ArrowDown', cancelable: true });
+        window.dispatchEvent(event);
+        await flushPromises();
+
+        expect(event.defaultPrevented).toBe(false);
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'F1',
+        });
+    });
+
     it('keeps search shortcut capture active after a validation failure', async () => {
         const wrapper = mount(GeneralSection);
 

From bb50b14a5fa2016084f598039f3af486ab960842 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Thu, 11 Jun 2026 01:05:43 +0800
Subject: [PATCH 24/55] fix(desktop): capture global shortcut input keys

---
 .../SettingsView/components/General/index.vue |  7 +++---
 .../settingsGeneralComponent.test.ts          | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 43a77222..c134ccb2 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -284,9 +284,9 @@
 
     watch(isCapturing, (newValue) => {
         if (newValue) {
-            window.addEventListener('keydown', captureShortcut);
+            window.addEventListener('keydown', captureShortcut, { capture: true });
         } else {
-            window.removeEventListener('keydown', captureShortcut);
+            window.removeEventListener('keydown', captureShortcut, { capture: true });
         }
     });
 
@@ -476,7 +476,7 @@
     });
 
     onUnmounted(() => {
-        window.removeEventListener('keydown', captureShortcut);
+        window.removeEventListener('keydown', captureShortcut, { capture: true });
     });
 </script>
 
@@ -552,6 +552,7 @@
                                                         t('settings.general.shortcutPlaceholder')
                                                     "
                                                     @pointerdown.stop
+                                                    @keydown.capture="captureShortcut"
                                                     @click.stop
                                                     @focus="startCapture"
                                                 />
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 620ed258..99577991 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -322,6 +322,28 @@ describe('SettingsGeneralSection', () => {
         );
     });
 
+    it('captures Ctrl+Space from the global shortcut input before the preset menu handles Space', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        await input.trigger('keydown', {
+            key: ' ',
+            code: 'Space',
+            ctrlKey: true,
+        });
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
+        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
+        expect((input.element as HTMLInputElement).value).toBe('Ctrl+Space');
+        expect(settingsStoreMock.settings.value.globalShortcut).toBe('Ctrl+Space');
+    });
+
     it('does not capture navigation keys while global shortcut presets are open', async () => {
         const wrapper = mount(GeneralSection);
 

From 12e2046faac998875e61dc83d109bf5d66f25df5 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Thu, 11 Jun 2026 01:13:19 +0800
Subject: [PATCH 25/55] fix(desktop): align shortcut group headings

---
 .../SettingsView/components/General/SearchShortcutSettings.vue  | 2 +-
 .../desktop/src/views/SettingsView/components/General/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index 21af6b53..74e0b9f3 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -511,7 +511,7 @@
     <AlertMessage ref="alertMessage" />
 
     <div v-for="group in searchShortcutGroups" :key="group.title" class="space-y-2">
-        <div class="px-1 text-[12px] leading-5 font-medium text-neutral-500">
+        <div class="text-[12px] leading-5 font-medium text-neutral-500">
             {{ group.title }}
         </div>
         <div class="settings-row-group divide-y divide-neutral-200/70">
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index c134ccb2..2ebb3fa9 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -496,7 +496,7 @@
                     </h2>
                 </div>
 
-                <div class="px-1 text-[12px] leading-5 font-medium text-neutral-500">
+                <div class="text-[12px] leading-5 font-medium text-neutral-500">
                     {{ t('settings.general.globalShortcutGroup') }}
                 </div>
 

From a4a7f9398cc4d5d6e65a74c04479321127a9c812 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Thu, 11 Jun 2026 20:00:59 +0800
Subject: [PATCH 26/55] fix(desktop): prevent text selection in shortcut input
 fields

Read-only shortcut inputs auto-highlighted their text on focus. Add
select-none to the CustomSelect trigger and both shortcut input fields.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 apps/desktop/src/components/CustomSelect.vue                    | 2 +-
 .../SettingsView/components/General/SearchShortcutSettings.vue  | 2 +-
 .../desktop/src/views/SettingsView/components/General/index.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/components/CustomSelect.vue b/apps/desktop/src/components/CustomSelect.vue
index c67047cb..9d601a69 100644
--- a/apps/desktop/src/components/CustomSelect.vue
+++ b/apps/desktop/src/components/CustomSelect.vue
@@ -109,7 +109,7 @@
     >
         <SelectTrigger
             v-bind="attrs"
-            class="w-full rounded-[10px] border px-3 py-2 text-left font-serif text-sm shadow-none [box-shadow:none] transition-colors"
+            class="w-full rounded-[10px] border px-3 py-2 text-left font-serif text-sm shadow-none [box-shadow:none] transition-colors select-none"
             :class="{
                 'border-transparent bg-[#f0f0ef] text-gray-900 hover:bg-[#ececea]': !disabled,
                 'cursor-not-allowed border-transparent bg-gray-50 text-gray-400': disabled,
diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index 74e0b9f3..def6c8b1 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -538,7 +538,7 @@
                                 type="text"
                                 readonly
                                 :class="[
-                                    'w-full rounded-[10px] border px-9 py-2 text-center text-[12px] shadow-none [box-shadow:none] transition-colors focus:shadow-none focus:[box-shadow:none] focus:outline-none',
+                                    'w-full rounded-[10px] border px-9 py-2 text-center text-[12px] shadow-none [box-shadow:none] transition-colors select-none focus:shadow-none focus:[box-shadow:none] focus:outline-none',
                                     row.hasError
                                         ? 'border-red-300 bg-red-50 text-red-600'
                                         : row.isCapturing
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 2ebb3fa9..9b519b01 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -546,7 +546,7 @@
                                                     data-testid="settings-global-shortcut-input"
                                                     type="text"
                                                     readonly
-                                                    class="min-w-0 flex-1 bg-transparent text-center text-[12px] outline-none"
+                                                    class="min-w-0 flex-1 bg-transparent text-center text-[12px] outline-none select-none"
                                                     :disabled="isSaving"
                                                     :placeholder="
                                                         t('settings.general.shortcutPlaceholder')

From bc809919dc5192315c449131a892f0103e0d4c4f Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Fri, 12 Jun 2026 00:53:09 +0800
Subject: [PATCH 27/55] fix(desktop): suppress Alt+Space system menu on all
 windows

Alt+Space opened the Win32 window system menu instead of being captured
as a shortcut, because the WM_SYSKEYDOWN/WM_SYSCHAR is handled by the
WebView2 child window (Chrome_WidgetWin_*), not the top-level window.

Subclass the top-level window and all descendant windows after the
webview is ready, swallowing WM_SYSKEYDOWN/WM_SYSCHAR for Space and
WM_SYSCOMMAND(SC_KEYMENU) at the source so the keydown still reaches the
DOM for shortcut capture. Subclass install failures degrade to a warning
rather than aborting window creation.
---
 .../src/core/window/webview_defaults.rs       | 167 +++++++++++++++++-
 1 file changed, 166 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
index 62343c16..7c85cc93 100644
--- a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
+++ b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
@@ -2,6 +2,8 @@
 
 //! Webview 运行时默认配置。
 
+#[cfg(target_os = "windows")]
+use raw_window_handle::HasWindowHandle;
 #[cfg(target_os = "windows")]
 use tauri::Emitter;
 #[cfg(target_os = "windows")]
@@ -16,7 +18,15 @@ use webview2_com::Microsoft::Web::WebView2::Win32::{
     COREWEBVIEW2_KEY_EVENT_KIND_SYSTEM_KEY_DOWN,
 };
 #[cfg(target_os = "windows")]
-use windows::Win32::UI::Input::KeyboardAndMouse::{GetKeyState, VK_CONTROL, VK_SHIFT};
+use windows::Win32::Foundation::{BOOL, HWND, LPARAM, LRESULT, TRUE, WPARAM};
+#[cfg(target_os = "windows")]
+use windows::Win32::UI::Input::KeyboardAndMouse::{GetKeyState, VK_CONTROL, VK_SHIFT, VK_SPACE};
+#[cfg(target_os = "windows")]
+use windows::Win32::UI::Shell::{DefSubclassProc, SetWindowSubclass};
+#[cfg(target_os = "windows")]
+use windows::Win32::UI::WindowsAndMessaging::{
+    EnumChildWindows, SC_KEYMENU, WM_SYSCHAR, WM_SYSCOMMAND, WM_SYSKEYDOWN,
+};
 #[cfg(target_os = "windows")]
 use windows_core::Interface;
 
@@ -81,6 +91,96 @@ fn disable_browser_accelerator_keys_with_controller(
     }
 }
 
+#[cfg(target_os = "windows")]
+/// 子类化标识，用于在窗口上唯一标记系统菜单拦截子类过程。
+const SYSTEM_MENU_SUBCLASS_ID: usize = 0x5359_534D;
+
+#[cfg(target_os = "windows")]
+/// 从 Tauri 窗口取出顶层 Win32 HWND。
+fn top_level_hwnd<R: Runtime>(window: &WebviewWindow<R>) -> Result<HWND, String> {
+    let window_handle = window
+        .window_handle()
+        .map_err(|error| format!("Failed to get window handle: {}", error))?;
+
+    match window_handle.as_ref() {
+        raw_window_handle::RawWindowHandle::Win32(handle) => Ok(HWND(handle.hwnd.get() as _)),
+        _ => Err("Not a Win32 window".to_string()),
+    }
+}
+
+#[cfg(target_os = "windows")]
+/// 子类过程：拦截 Alt+Space 触发系统菜单的相关消息（WM_SYSKEYDOWN / WM_SYSCHAR /
+/// WM_SYSCOMMAND），阻止系统菜单弹出，让 keydown 仍能传到 WebView2 以供前端捕获。
+unsafe extern "system" fn system_menu_subclass_proc(
+    hwnd: HWND,
+    msg: u32,
+    wparam: WPARAM,
+    lparam: LPARAM,
+    _subclass_id: usize,
+    _ref_data: usize,
+) -> LRESULT {
+    if msg == WM_SYSKEYDOWN && wparam.0 == VK_SPACE.0 as usize {
+        // 吞掉 Alt+Space 的 WM_SYSKEYDOWN，阻止 DefWindowProc 将其翻译为 WM_SYSCHAR/SC_KEYMENU。
+        return LRESULT(0);
+    }
+
+    if msg == WM_SYSCHAR && wparam.0 == VK_SPACE.0 as usize {
+        // 吞掉 Alt+Space 的 WM_SYSCHAR，这是真正触发系统菜单的消息。
+        return LRESULT(0);
+    }
+
+    if msg == WM_SYSCOMMAND && (wparam.0 & 0xFFF0) == SC_KEYMENU as usize {
+        return LRESULT(0);
+    }
+
+    DefSubclassProc(hwnd, msg, wparam, lparam)
+}
+
+#[cfg(target_os = "windows")]
+/// EnumChildWindows 回调：为每个子窗口安装系统菜单拦截子类。
+unsafe extern "system" fn install_subclass_on_child(hwnd: HWND, _lparam: LPARAM) -> BOOL {
+    let _ = SetWindowSubclass(
+        hwnd,
+        Some(system_menu_subclass_proc),
+        SYSTEM_MENU_SUBCLASS_ID,
+        0,
+    );
+    TRUE
+}
+
+#[cfg(target_os = "windows")]
+/// 在顶层窗口上安装系统菜单拦截子类，屏蔽 Alt+Space 系统菜单热键。
+///
+/// 子窗口（WebView2 内容区）的子类需在 webview 就绪后由
+/// [`install_system_menu_interceptor_on_children`] 单独安装。
+fn install_system_menu_interceptor<R: Runtime>(window: &WebviewWindow<R>) -> Result<(), String> {
+    let hwnd = top_level_hwnd(window)?;
+    let installed = unsafe {
+        SetWindowSubclass(
+            hwnd,
+            Some(system_menu_subclass_proc),
+            SYSTEM_MENU_SUBCLASS_ID,
+            0,
+        )
+    };
+    if !installed.as_bool() {
+        return Err("Failed to install system menu subclass".to_string());
+    }
+
+    Ok(())
+}
+
+#[cfg(target_os = "windows")]
+/// 为窗口的所有子孙窗口安装系统菜单拦截子类。
+///
+/// WebView2 内容渲染在子 HWND 中，焦点在内容区时 WM_SYSKEYDOWN/WM_SYSCHAR 由子窗口处理，
+/// 因此需在 webview 就绪、子窗口已创建后调用此函数，才能在源头拦截。
+fn install_system_menu_interceptor_on_children(hwnd: HWND) {
+    unsafe {
+        let _ = EnumChildWindows(hwnd, Some(install_subclass_on_child), LPARAM(0));
+    }
+}
+
 #[cfg(target_os = "windows")]
 /// 判断是否命中了需要从宿主层兜底转发的搜索 surface 快捷键。
 fn is_search_surface_accelerator_command(
@@ -244,6 +344,59 @@ fn register_devtools_accelerator_handler(
     Ok(())
 }
 
+#[cfg(target_os = "windows")]
+/// 判断是否命中了 Alt+Space 系统菜单热键。
+fn is_system_menu_accelerator_command(key_event_kind: i32, virtual_key: u32) -> bool {
+    let is_system_key_down = key_event_kind == COREWEBVIEW2_KEY_EVENT_KIND_SYSTEM_KEY_DOWN.0;
+    is_system_key_down && virtual_key == u32::from(VK_SPACE.0)
+}
+
+#[cfg(target_os = "windows")]
+/// 注册 WebView2 accelerator 处理器，拦截 Alt+Space，阻止 WebView2 转发触发系统菜单，
+/// 同时保证 keydown 仍能传到 DOM 供前端捕获。
+fn register_system_menu_accelerator_handler(
+    controller: &ICoreWebView2Controller,
+) -> Result<(), String> {
+    let mut token = 0i64;
+    let handler = AcceleratorKeyPressedEventHandler::create(Box::new(
+        move |_controller: Option<ICoreWebView2Controller>,
+              args: Option<ICoreWebView2AcceleratorKeyPressedEventArgs>| {
+            let Some(args) = args else {
+                return Ok(());
+            };
+
+            unsafe {
+                let mut key_event_kind = COREWEBVIEW2_KEY_EVENT_KIND_KEY_DOWN;
+                args.KeyEventKind(&mut key_event_kind)?;
+
+                let mut virtual_key = 0u32;
+                args.VirtualKey(&mut virtual_key)?;
+
+                if !is_system_menu_accelerator_command(key_event_kind.0, virtual_key) {
+                    return Ok(());
+                }
+
+                if let Ok(args2) =
+                    Interface::cast::<ICoreWebView2AcceleratorKeyPressedEventArgs2>(&args)
+                {
+                    let _ = args2.SetIsBrowserAcceleratorKeyEnabled(false);
+                }
+                let _ = args.SetHandled(true);
+            }
+
+            Ok(())
+        },
+    ));
+
+    unsafe {
+        controller
+            .add_AcceleratorKeyPressed(&handler, &mut token)
+            .map_err(|error| format!("Failed to add system menu accelerator handler: {}", error))?;
+    }
+
+    Ok(())
+}
+
 #[cfg(target_os = "windows")]
 /**
  * 为桌面窗口应用统一的 webview 运行时默认配置。
@@ -251,16 +404,28 @@ fn register_devtools_accelerator_handler(
 pub(crate) fn apply_webview_runtime_defaults<R: Runtime>(
     window: &WebviewWindow<R>,
 ) -> Result<(), String> {
+    if let Err(error) = install_system_menu_interceptor(window) {
+        log::warn!(
+            "Failed to install system menu interceptor for window '{}': {}",
+            window.label(),
+            error
+        );
+    }
+
     let (tx, rx) = std::sync::mpsc::channel();
     let window_clone = window.clone();
     window
         .with_webview(move |webview| {
             let controller = webview.controller();
             let result = disable_browser_accelerator_keys_with_controller(&controller)
+                .and_then(|_| register_system_menu_accelerator_handler(&controller))
                 .and_then(|_| {
                     register_search_surface_accelerator_bridge(&window_clone, &controller)
                 })
                 .and_then(|_| register_devtools_accelerator_handler(&controller));
+            if let Ok(hwnd) = top_level_hwnd(&window_clone) {
+                install_system_menu_interceptor_on_children(hwnd);
+            }
             let _ = tx.send(result);
         })
         .map_err(|error| format!("Failed to access platform webview: {}", error))?;

From a777734656ea0d9c6023fb8514f3c2f76be6fc67 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Fri, 12 Jun 2026 10:08:54 +0800
Subject: [PATCH 28/55] fix(desktop): allow keyboard capture of Alt+Space
 shortcut

Alt+Space could only be set from the dropdown preset list, not by typing
it into the capture input. WebView2 classifies Alt+Space as a system
accelerator and calls SetHandled implicitly, so the keydown never
reaches the DOM and the capture handler never fires.

Bridge the key from the host: in the WebView2 AcceleratorKeyPressed
handler emit a 'shortcut-capture-system-key' Tauri event with the
modifier state, and have the global shortcut capture input subscribe to
it during capture mode and reuse the existing save path. The HWND
subclass continues to swallow WM_SYSCHAR / SC_KEYMENU so the system
menu stays suppressed. This mirrors the existing search-surface
accelerator bridge.
---
 .../src/core/window/webview_defaults.rs       | 141 ++++++++++--------
 .../src/services/EventService/index.ts        |   1 +
 .../src/services/EventService/types.ts        |  18 +++
 .../SettingsView/components/General/index.vue |  53 +++++++
 4 files changed, 151 insertions(+), 62 deletions(-)

diff --git a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
index 7c85cc93..67625110 100644
--- a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
+++ b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
@@ -25,7 +25,7 @@ use windows::Win32::UI::Input::KeyboardAndMouse::{GetKeyState, VK_CONTROL, VK_SH
 use windows::Win32::UI::Shell::{DefSubclassProc, SetWindowSubclass};
 #[cfg(target_os = "windows")]
 use windows::Win32::UI::WindowsAndMessaging::{
-    EnumChildWindows, SC_KEYMENU, WM_SYSCHAR, WM_SYSCOMMAND, WM_SYSKEYDOWN,
+    EnumChildWindows, SC_KEYMENU, WM_SYSCHAR, WM_SYSCOMMAND,
 };
 #[cfg(target_os = "windows")]
 use windows_core::Interface;
@@ -109,8 +109,9 @@ fn top_level_hwnd<R: Runtime>(window: &WebviewWindow<R>) -> Result<HWND, String>
 }
 
 #[cfg(target_os = "windows")]
-/// 子类过程：拦截 Alt+Space 触发系统菜单的相关消息（WM_SYSKEYDOWN / WM_SYSCHAR /
-/// WM_SYSCOMMAND），阻止系统菜单弹出，让 keydown 仍能传到 WebView2 以供前端捕获。
+/// 子类过程：拦截 Alt+Space 真正触发系统菜单的消息（WM_SYSCHAR / WM_SYSCOMMAND），
+/// 阻止系统菜单弹出。注意不拦截 WM_SYSKEYDOWN，使其仍能传到 WebView2 并派发 DOM keydown，
+/// 供前端捕获 Alt+Space 作为快捷键。
 unsafe extern "system" fn system_menu_subclass_proc(
     hwnd: HWND,
     msg: u32,
@@ -119,11 +120,6 @@ unsafe extern "system" fn system_menu_subclass_proc(
     _subclass_id: usize,
     _ref_data: usize,
 ) -> LRESULT {
-    if msg == WM_SYSKEYDOWN && wparam.0 == VK_SPACE.0 as usize {
-        // 吞掉 Alt+Space 的 WM_SYSKEYDOWN，阻止 DefWindowProc 将其翻译为 WM_SYSCHAR/SC_KEYMENU。
-        return LRESULT(0);
-    }
-
     if msg == WM_SYSCHAR && wparam.0 == VK_SPACE.0 as usize {
         // 吞掉 Alt+Space 的 WM_SYSCHAR，这是真正触发系统菜单的消息。
         return LRESULT(0);
@@ -181,6 +177,80 @@ fn install_system_menu_interceptor_on_children(hwnd: HWND) {
     }
 }
 
+#[cfg(target_os = "windows")]
+/// 判断是否命中了 Alt+Space。
+///
+/// WebView2 把 Alt+Space 作为 system accelerator，默认不会派发 DOM keydown；
+/// 必须在 `AcceleratorKeyPressed` 中调用 `SetIsBrowserAcceleratorKeyEnabled(false)`
+/// 才能让事件继续传播到 web 内容。注意不要调 `SetHandled(true)`，否则传播会被
+/// 终止，DOM 同样收不到。菜单抑制由宿主子类化吃掉 WM_SYSCHAR / SC_KEYMENU 完成。
+fn is_system_menu_accelerator_command(key_event_kind: i32, virtual_key: u32) -> bool {
+    let is_system_key_down = key_event_kind == COREWEBVIEW2_KEY_EVENT_KIND_SYSTEM_KEY_DOWN.0;
+    is_system_key_down && virtual_key == u32::from(VK_SPACE.0)
+}
+
+#[cfg(target_os = "windows")]
+/// 注册 WebView2 accelerator 处理器，将 Alt+Space 转成 Tauri 事件供前端捕获。
+///
+/// WebView2 把 Alt+Space 当作 system accelerator，默认不会派发 DOM keydown；
+/// 实测 `SetIsBrowserAcceleratorKeyEnabled(false)` 对系统键不生效，因此采用事件桥模式：
+/// 在 accelerator 阶段直接 emit Tauri 事件，前端捕获模式下监听该事件录入快捷键。
+/// 系统菜单的抑制由 [`system_menu_subclass_proc`] 在宿主层完成。
+fn register_system_menu_accelerator_handler<R: Runtime>(
+    window: &WebviewWindow<R>,
+    controller: &ICoreWebView2Controller,
+) -> Result<(), String> {
+    let app_handle = window.app_handle().clone();
+    let mut token = 0i64;
+    let handler = AcceleratorKeyPressedEventHandler::create(Box::new(
+        move |_controller: Option<ICoreWebView2Controller>,
+              args: Option<ICoreWebView2AcceleratorKeyPressedEventArgs>| {
+            let Some(args) = args else {
+                return Ok(());
+            };
+
+            unsafe {
+                let mut key_event_kind = COREWEBVIEW2_KEY_EVENT_KIND_KEY_DOWN;
+                args.KeyEventKind(&mut key_event_kind)?;
+
+                let mut virtual_key = 0u32;
+                args.VirtualKey(&mut virtual_key)?;
+
+                if !is_system_menu_accelerator_command(key_event_kind.0, virtual_key) {
+                    return Ok(());
+                }
+
+                let is_ctrl_down = (GetKeyState(i32::from(VK_CONTROL.0)) as u16 & 0x8000) != 0;
+                let is_shift_down = (GetKeyState(i32::from(VK_SHIFT.0)) as u16 & 0x8000) != 0;
+                log::info!(
+                    "[sysmenu-accel] Alt+Space detected, emitting shortcut-capture-system-key (ctrl={} shift={})",
+                    is_ctrl_down,
+                    is_shift_down
+                );
+                let _ = app_handle.emit(
+                    "shortcut-capture-system-key",
+                    serde_json::json!({
+                        "key": "Space",
+                        "alt": true,
+                        "ctrl": is_ctrl_down,
+                        "shift": is_shift_down,
+                    }),
+                );
+            }
+
+            Ok(())
+        },
+    ));
+
+    unsafe {
+        controller
+            .add_AcceleratorKeyPressed(&handler, &mut token)
+            .map_err(|error| format!("Failed to add system menu accelerator handler: {}", error))?;
+    }
+
+    Ok(())
+}
+
 #[cfg(target_os = "windows")]
 /// 判断是否命中了需要从宿主层兜底转发的搜索 surface 快捷键。
 fn is_search_surface_accelerator_command(
@@ -344,59 +414,6 @@ fn register_devtools_accelerator_handler(
     Ok(())
 }
 
-#[cfg(target_os = "windows")]
-/// 判断是否命中了 Alt+Space 系统菜单热键。
-fn is_system_menu_accelerator_command(key_event_kind: i32, virtual_key: u32) -> bool {
-    let is_system_key_down = key_event_kind == COREWEBVIEW2_KEY_EVENT_KIND_SYSTEM_KEY_DOWN.0;
-    is_system_key_down && virtual_key == u32::from(VK_SPACE.0)
-}
-
-#[cfg(target_os = "windows")]
-/// 注册 WebView2 accelerator 处理器，拦截 Alt+Space，阻止 WebView2 转发触发系统菜单，
-/// 同时保证 keydown 仍能传到 DOM 供前端捕获。
-fn register_system_menu_accelerator_handler(
-    controller: &ICoreWebView2Controller,
-) -> Result<(), String> {
-    let mut token = 0i64;
-    let handler = AcceleratorKeyPressedEventHandler::create(Box::new(
-        move |_controller: Option<ICoreWebView2Controller>,
-              args: Option<ICoreWebView2AcceleratorKeyPressedEventArgs>| {
-            let Some(args) = args else {
-                return Ok(());
-            };
-
-            unsafe {
-                let mut key_event_kind = COREWEBVIEW2_KEY_EVENT_KIND_KEY_DOWN;
-                args.KeyEventKind(&mut key_event_kind)?;
-
-                let mut virtual_key = 0u32;
-                args.VirtualKey(&mut virtual_key)?;
-
-                if !is_system_menu_accelerator_command(key_event_kind.0, virtual_key) {
-                    return Ok(());
-                }
-
-                if let Ok(args2) =
-                    Interface::cast::<ICoreWebView2AcceleratorKeyPressedEventArgs2>(&args)
-                {
-                    let _ = args2.SetIsBrowserAcceleratorKeyEnabled(false);
-                }
-                let _ = args.SetHandled(true);
-            }
-
-            Ok(())
-        },
-    ));
-
-    unsafe {
-        controller
-            .add_AcceleratorKeyPressed(&handler, &mut token)
-            .map_err(|error| format!("Failed to add system menu accelerator handler: {}", error))?;
-    }
-
-    Ok(())
-}
-
 #[cfg(target_os = "windows")]
 /**
  * 为桌面窗口应用统一的 webview 运行时默认配置。
@@ -418,7 +435,7 @@ pub(crate) fn apply_webview_runtime_defaults<R: Runtime>(
         .with_webview(move |webview| {
             let controller = webview.controller();
             let result = disable_browser_accelerator_keys_with_controller(&controller)
-                .and_then(|_| register_system_menu_accelerator_handler(&controller))
+                .and_then(|_| register_system_menu_accelerator_handler(&window_clone, &controller))
                 .and_then(|_| {
                     register_search_surface_accelerator_bridge(&window_clone, &controller)
                 })
diff --git a/apps/desktop/src/services/EventService/index.ts b/apps/desktop/src/services/EventService/index.ts
index f4beffbb..f345d135 100644
--- a/apps/desktop/src/services/EventService/index.ts
+++ b/apps/desktop/src/services/EventService/index.ts
@@ -78,6 +78,7 @@ export type {
     McpServerStatus,
     McpStatusChangeEvent,
     SettingsGeneralUpdatedEvent,
+    ShortcutCaptureSystemKeyEvent,
     WindowFocusEvent,
     WindowResizeEvent,
 } from './types';
diff --git a/apps/desktop/src/services/EventService/types.ts b/apps/desktop/src/services/EventService/types.ts
index 4ce127c0..326c17cc 100644
--- a/apps/desktop/src/services/EventService/types.ts
+++ b/apps/desktop/src/services/EventService/types.ts
@@ -59,6 +59,9 @@ export enum AppEvent {
     SEARCH_SURFACE_COMMAND = 'search-surface-command',
     SESSION_TASK_STATUS_CHANGED = 'session:task:status-changed',
     SESSION_STATUS_REMINDER_ACTION = 'session-status-reminder:action',
+
+    // 快捷键捕获事件
+    SHORTCUT_CAPTURE_SYSTEM_KEY = 'shortcut-capture-system-key',
 }
 
 // ==================== MCP 事件 ====================
@@ -121,6 +124,18 @@ export interface SearchSurfaceCommandEvent {
     source: 'webview2-accelerator';
 }
 
+/**
+ * 系统级快捷键（如 Alt+Space）由 WebView2 当作 system accelerator 截获，
+ * 不会派发 DOM keydown，因此宿主在 accelerator 阶段直接 emit 此事件，
+ * 由前端在快捷键录入模式下监听并复用普通保存路径。
+ */
+export interface ShortcutCaptureSystemKeyEvent {
+    key: 'Space';
+    alt: boolean;
+    ctrl: boolean;
+    shift: boolean;
+}
+
 export interface SessionStatusReminderApprovalActionPayload {
     callId: string;
     approveLabel: string;
@@ -195,6 +210,9 @@ export interface AppEventMap {
     [AppEvent.SEARCH_SURFACE_COMMAND]: SearchSurfaceCommandEvent;
     [AppEvent.SESSION_TASK_STATUS_CHANGED]: SessionTaskStatusChangedEvent;
     [AppEvent.SESSION_STATUS_REMINDER_ACTION]: SessionStatusReminderActionEvent;
+
+    // 快捷键捕获事件
+    [AppEvent.SHORTCUT_CAPTURE_SYSTEM_KEY]: ShortcutCaptureSystemKeyEvent;
 }
 
 export type AppEventName = keyof AppEventMap;
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 9b519b01..c0692d9c 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -2,8 +2,14 @@
     import AlertMessage from '@components/AlertMessage.vue';
     import AppIcon from '@components/AppIcon.vue';
     import CustomSelect from '@components/CustomSelect.vue';
+    import {
+        AppEvent,
+        eventService,
+        type ShortcutCaptureSystemKeyEvent,
+    } from '@services/EventService';
     import { native } from '@services/NativeService';
     import { notify } from '@services/NotificationService';
+    import { type UnlistenFn } from '@tauri-apps/api/event';
     import { storeToRefs } from 'pinia';
     import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 
@@ -175,6 +181,42 @@
         void confirmCapturedShortcut(shortcut);
     };
 
+    /**
+     * 处理来自 Rust 端的系统级快捷键桥接事件（如 Alt+Space）。
+     *
+     * Windows 上 Alt+Space 会被 WebView2 当作 system accelerator 截获，
+     * 不会派发 DOM keydown，因此 [`webview_defaults.rs`] 在 accelerator 阶段
+     * 直接 emit 此事件，由这里复用与键盘录入相同的保存路径。
+     */
+    const handleSystemKeyCapture = (payload: ShortcutCaptureSystemKeyEvent) => {
+        if (!isCapturing.value) {
+            return;
+        }
+
+        const modifiers: string[] = [];
+        if (payload.ctrl) {
+            modifiers.push('Ctrl');
+        }
+        if (payload.alt) {
+            modifiers.push('Alt');
+        }
+        if (payload.shift) {
+            modifiers.push('Shift');
+        }
+
+        const shortcut = [...modifiers, payload.key].join('+');
+        if (!hasCommandModifier(shortcut)) {
+            return;
+        }
+
+        displayShortcut.value = shortcut;
+        hasCapturedShortcut.value = true;
+        showGlobalShortcutPresetMenu.value = false;
+        void confirmCapturedShortcut(shortcut);
+    };
+
+    let unlistenSystemKey: UnlistenFn | null = null;
+
     const startCapture = () => {
         isCapturing.value = true;
         hasCapturedShortcut.value = false;
@@ -464,6 +506,15 @@
     onMounted(async () => {
         await loadSettings();
 
+        try {
+            unlistenSystemKey = await eventService.on(
+                AppEvent.SHORTCUT_CAPTURE_SYSTEM_KEY,
+                handleSystemKeyCapture
+            );
+        } catch (error) {
+            console.error('Failed to subscribe to system key capture event:', error);
+        }
+
         try {
             const isEnabled = await native.autostart.isAutostartEnabled();
             if (isEnabled !== settings.value.startOnBoot) {
@@ -477,6 +528,8 @@
 
     onUnmounted(() => {
         window.removeEventListener('keydown', captureShortcut, { capture: true });
+        unlistenSystemKey?.();
+        unlistenSystemKey = null;
     });
 </script>
 

From 393221bc53c8d62bd8f75d48f455fa4ec7fd597e Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Fri, 12 Jun 2026 19:30:54 +0800
Subject: [PATCH 29/55] fix(desktop): support cross-platform shortcut capture
 and registration

The global shortcut input rejected Cmd on Mac because it duplicated the
capture logic and treated metaKey unconditionally as the Win/Super key.
The Rust parser also only recognised Ctrl/Alt/Shift, so Cmd-based global
shortcuts could never be registered.

Reuse captureShortcutFromKeyboardEvent in General/index.vue so Mac Cmd
flows through correctly while Win/Super is still rejected with a now
platform-neutral message. Recognise cmd/command/meta/super/win/windows
and a Mod alias in parse_shortcut, mapping to global-hotkey's SUPER as
HotKey::new normalises META to SUPER. Cover the new aliases with unit
tests.
---
 .../src-tauri/src/core/system/shortcut.rs     | 72 ++++++++++++++-
 apps/desktop/src/i18n/messages.ts             |  4 +-
 apps/desktop/src/utils/shortcuts.ts           |  2 +-
 .../SettingsView/components/General/index.vue | 91 ++++++++++---------
 4 files changed, 124 insertions(+), 45 deletions(-)

diff --git a/apps/desktop/src-tauri/src/core/system/shortcut.rs b/apps/desktop/src-tauri/src/core/system/shortcut.rs
index 2f9155d0..67a719ec 100644
--- a/apps/desktop/src-tauri/src/core/system/shortcut.rs
+++ b/apps/desktop/src-tauri/src/core/system/shortcut.rs
@@ -110,8 +110,22 @@ pub fn parse_shortcut(shortcut_str: &str) -> Result<Shortcut, String> {
     for part in parts {
         match part.to_lowercase().as_str() {
             "ctrl" | "control" => modifiers |= Modifiers::CONTROL,
-            "alt" => modifiers |= Modifiers::ALT,
+            "alt" | "option" => modifiers |= Modifiers::ALT,
             "shift" => modifiers |= Modifiers::SHIFT,
+            // global-hotkey 把 Cmd / Win / Super 都映射到 Modifiers::SUPER；
+            // HotKey::new 还会把 META 自动转为 SUPER，统一在这里直接发 SUPER。
+            "cmd" | "command" | "meta" | "super" | "win" | "windows" => {
+                modifiers |= Modifiers::SUPER
+            }
+            // 跨平台主修饰键别名：Mac 上为 Cmd（SUPER），其余平台为 Ctrl。
+            // 与前端 utils/shortcuts.ts 的 `Mod` 抽象一致。
+            "mod" => {
+                if cfg!(target_os = "macos") {
+                    modifiers |= Modifiers::SUPER;
+                } else {
+                    modifiers |= Modifiers::CONTROL;
+                }
+            }
             key => {
                 key_code = Some(match key.to_lowercase().as_str() {
                     "space" => Code::Space,
@@ -195,3 +209,59 @@ pub fn parse_shortcut(shortcut_str: &str) -> Result<Shortcut, String> {
         None => Err("No key code specified".to_string()),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_shortcut_accepts_ctrl_alias() {
+        let shortcut = parse_shortcut("Ctrl+Space").expect("ctrl+space parses");
+        assert_eq!(shortcut.mods, Modifiers::CONTROL);
+        assert_eq!(shortcut.key, Code::Space);
+    }
+
+    #[test]
+    fn parse_shortcut_accepts_super_aliases_for_cmd_or_win() {
+        // global-hotkey 把 Cmd（macOS）和 Win/Super（Linux）都映射到 SUPER；
+        // 这里不区分平台，所有别名都应解析到 Modifiers::SUPER。
+        for token in ["Cmd", "Command", "Meta", "Super", "Win", "Windows"] {
+            let input = format!("{}+Space", token);
+            let shortcut = parse_shortcut(&input)
+                .unwrap_or_else(|error| panic!("{} should parse: {}", token, error));
+            assert_eq!(
+                shortcut.mods,
+                Modifiers::SUPER,
+                "{} should map to SUPER",
+                token
+            );
+            assert_eq!(shortcut.key, Code::Space);
+        }
+    }
+
+    #[test]
+    fn parse_shortcut_mod_resolves_to_platform_primary() {
+        let shortcut = parse_shortcut("Mod+Space").expect("mod+space parses");
+        let expected = if cfg!(target_os = "macos") {
+            Modifiers::SUPER
+        } else {
+            Modifiers::CONTROL
+        };
+        assert_eq!(shortcut.mods, expected);
+        assert_eq!(shortcut.key, Code::Space);
+    }
+
+    #[test]
+    fn parse_shortcut_combines_super_with_other_modifiers() {
+        let shortcut = parse_shortcut("Cmd+Shift+T").expect("cmd+shift+t parses");
+        assert_eq!(shortcut.mods, Modifiers::SUPER | Modifiers::SHIFT);
+        assert_eq!(shortcut.key, Code::KeyT);
+    }
+
+    #[test]
+    fn parse_shortcut_is_case_insensitive() {
+        let shortcut = parse_shortcut("cmd+SPACE").expect("lowercase cmd parses");
+        assert_eq!(shortcut.mods, Modifiers::SUPER);
+        assert_eq!(shortcut.key, Code::Space);
+    }
+}
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 2479d1ef..ae7ccbe0 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -85,7 +85,7 @@ const zhCNMessages = {
     'settings.general.suggestionsShort': '建议',
     'settings.general.shortcutHelp':
         '点击输入框后按下您想要设置的快捷键组合。支持的修饰键：Ctrl、Alt、Shift',
-    'settings.general.winKeyUnsupported': '不支持 Win 键组合，请使用 Ctrl、Alt、Shift',
+    'settings.general.winKeyUnsupported': '不支持 Win/Super 键组合，请使用 Ctrl、Alt、Shift',
     'settings.general.shortcutSaved': '快捷键保存成功',
     'settings.general.noShortcut': '无',
     'settings.general.globalShortcutGroup': '全局唤起',
@@ -1045,7 +1045,7 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.shortcutHelp':
         'Click the field and press the shortcut you want. Supported modifiers: Ctrl, Alt, Shift',
     'settings.general.winKeyUnsupported':
-        'Win key combinations are not supported. Use Ctrl, Alt, or Shift.',
+        'Win/Super key combinations are not supported. Use Ctrl, Alt, or Shift.',
     'settings.general.shortcutSaved': 'Shortcut saved',
     'settings.general.noShortcut': 'None',
     'settings.general.globalShortcutGroup': 'Global activation',
diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index 2bc7c34e..b1332423 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -77,7 +77,7 @@ const ALIAS_MAP: Record<string, string> = {
     space: 'Space',
 };
 
-function isMacPlatform(): boolean {
+export function isMacPlatform(): boolean {
     if (typeof navigator === 'undefined') {
         return false;
     }
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index c0692d9c..0405255a 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -27,7 +27,9 @@
     } from '@/i18n';
     import { type OutputScrollBehavior, useSettingsStore } from '@/stores/settings';
     import {
+        captureShortcutFromKeyboardEvent,
         hasCommandModifier,
+        isMacPlatform,
         isReservedLocalShortcutKey,
         normalizeLocalShortcutString,
     } from '@/utils/shortcuts';
@@ -95,6 +97,8 @@
     const alertMessage = ref<InstanceType<typeof AlertMessage> | null>(null);
     const shortcutRegistrationFailed = ref(false);
     const showGlobalShortcutPresetMenu = ref(false);
+    // Mac 上 Cmd+Space 被 Spotlight 占用，因此预设使用 Option+Space（Alt+Space）和 Ctrl+Space；
+    // Windows/Linux 上 Cmd 由 Win/Super 键代表，前端统一拒绝其作为快捷键，预设保持 Alt/Ctrl 组合。
     const globalShortcutPresetShortcuts = ['Alt+Space', 'Ctrl+Space'] as const;
     const globalShortcutPresetOptions = computed(() =>
         globalShortcutPresetShortcuts.map((shortcut) => ({
@@ -115,17 +119,6 @@
         });
     }
 
-    const keyNameMap: Record<string, string> = {
-        Control: 'Ctrl',
-        ' ': 'Space',
-        ArrowUp: 'Up',
-        ArrowDown: 'Down',
-        ArrowLeft: 'Left',
-        ArrowRight: 'Right',
-        Escape: 'Esc',
-        Delete: 'Del',
-    };
-
     const captureShortcut = (event: KeyboardEvent) => {
         if (!isCapturing.value) {
             return;
@@ -135,36 +128,17 @@
             return;
         }
 
-        if (['Control', 'Alt', 'Shift', 'Meta', 'OS'].includes(event.key)) {
-            return;
-        }
-
-        if (event.metaKey) {
-            alertMessage.value?.warning(t('settings.general.winKeyUnsupported'), 3000);
+        const captured = captureShortcutFromKeyboardEvent(event);
+        if (!captured) {
+            // captureShortcutFromKeyboardEvent 在非 Mac 上对 metaKey 返回 null，
+            // 用以拒绝 Win/Super 键组合。Mac 上 metaKey 是 Cmd，不会返回 null。
+            if (!isMacPlatform() && event.metaKey) {
+                alertMessage.value?.warning(t('settings.general.winKeyUnsupported'), 3000);
+            }
             return;
         }
 
-        const modifiers: string[] = [];
-        if (event.ctrlKey) {
-            modifiers.push('Ctrl');
-        }
-        if (event.altKey) {
-            modifiers.push('Alt');
-        }
-        if (event.shiftKey) {
-            modifiers.push('Shift');
-        }
-
-        let keyName = event.key;
-        const mappedKey = keyNameMap[keyName];
-        if (mappedKey) {
-            keyName = mappedKey;
-        } else if (keyName.length === 1) {
-            keyName = keyName.toUpperCase();
-        }
-
-        const shortcut = [...modifiers, keyName].join('+');
-        if (!hasCommandModifier(shortcut)) {
+        if (!hasCommandModifier(captured.shortcut)) {
             alertMessage.value?.warning(
                 t('settings.general.searchShortcuts.errors.modifierRequired'),
                 3000
@@ -175,10 +149,13 @@
         event.preventDefault();
         event.stopPropagation();
 
-        displayShortcut.value = shortcut;
+        // 全局快捷键存储平台原文（Mac 上为 Cmd+，其他平台为 Ctrl+），
+        // 以便 Rust 侧 parse_shortcut 直接识别。captured.shortcut 使用平台中性的
+        // `Mod` 抽象，captured.displayShortcut 才是当前平台的字面形式。
+        displayShortcut.value = captured.displayShortcut;
         hasCapturedShortcut.value = true;
         showGlobalShortcutPresetMenu.value = false;
-        void confirmCapturedShortcut(shortcut);
+        void confirmCapturedShortcut(captured.displayShortcut);
     };
 
     /**
@@ -224,6 +201,17 @@
         showGlobalShortcutPresetMenu.value = true;
     };
 
+    function focusShortcutCaptureInput(event: MouseEvent) {
+        event.preventDefault();
+        (event.currentTarget as HTMLInputElement).focus();
+    }
+
+    function clearShortcutCaptureSelection(event: Event) {
+        const input = event.currentTarget as HTMLInputElement;
+        const cursorPosition = input.value.length;
+        input.setSelectionRange(cursorPosition, cursorPosition);
+    }
+
     const confirmCapturedShortcut = async (shortcut: string) => {
         if (!isCapturing.value) {
             return;
@@ -599,12 +587,15 @@
                                                     data-testid="settings-global-shortcut-input"
                                                     type="text"
                                                     readonly
-                                                    class="min-w-0 flex-1 bg-transparent text-center text-[12px] outline-none select-none"
+                                                    class="shortcut-capture-input min-w-0 flex-1 bg-transparent text-center text-[12px] outline-none select-none"
                                                     :disabled="isSaving"
                                                     :placeholder="
                                                         t('settings.general.shortcutPlaceholder')
                                                     "
                                                     @pointerdown.stop
+                                                    @mousedown="focusShortcutCaptureInput"
+                                                    @select="clearShortcutCaptureSelection"
+                                                    @dragstart.prevent
                                                     @keydown.capture="captureShortcut"
                                                     @click.stop
                                                     @focus="startCapture"
@@ -795,3 +786,21 @@
         </div>
     </div>
 </template>
+
+<style scoped>
+    .shortcut-capture-input {
+        caret-color: transparent;
+        user-select: none;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+    }
+
+    .shortcut-capture-input::selection {
+        background: transparent;
+    }
+
+    .shortcut-capture-input::-moz-selection {
+        background: transparent;
+    }
+</style>

From c25541cc438ba908d8bb57738e064cc8fc655c90 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sat, 13 Jun 2026 22:18:55 +0800
Subject: [PATCH 30/55] fix(i18n): update Chinese translations for shortcut
 settings

---
 apps/desktop/src/i18n/messages.ts | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index ae7ccbe0..c2ff8a0c 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -77,7 +77,7 @@ const zhCNMessages = {
     'settings.general.shortcuts': '快捷键',
     'settings.general.globalShortcut': '全局快捷键',
     'settings.general.activationShortcut': '唤起快捷键',
-    'settings.general.activationShortcutDescription': '设置呼出 TouchAI 的全局快捷键。',
+    'settings.general.activationShortcutDescription': '设置呼出 TouchAI 的全局快捷键',
     'settings.general.shortcutPlaceholder': '点击输入框设置快捷键',
     'settings.general.shortcutCapturePrompt': '请按下快捷键...',
     'settings.general.shortcutRegistrationFailed': '快捷键注册失败，可能已被其他应用占用',
@@ -109,19 +109,21 @@ const zhCNMessages = {
     'settings.general.fixedSearchActions.previousInputHistory': '上一条会话历史',
     'settings.general.fixedSearchActions.nextInputHistory': '下一条会话历史',
     'settings.general.searchActions.clearAll': '清空草稿与上下文',
-    'settings.general.searchActionDescriptions.history': '快速打开会话历史列表。',
-    'settings.general.searchActionDescriptions.focusInput': '将焦点移动到输入框。',
-    'settings.general.searchActionDescriptions.newSession': '立即开始一段新会话。',
-    'settings.general.searchActionDescriptions.reopenLastClosedSession': '重新打开最近关闭的会话。',
-    'settings.general.searchActionDescriptions.modelToggle': '展开或收起模型选择。',
-    'settings.general.searchActionDescriptions.windowPin': '切换搜索窗口置顶状态。',
-    'settings.general.searchActionDescriptions.windowMaximize': '切换搜索窗口最大化。',
-    'settings.general.searchActionDescriptions.openSettings': '快速打开设置窗口。',
-    'settings.general.searchActionDescriptions.cancelRequest': '停止当前生成或工具执行。',
-    'settings.general.searchActionDescriptions.submitRequest': '发送当前输入内容。',
-    'settings.general.searchActionDescriptions.newLine': '在输入框中插入换行。',
-    'settings.general.searchActionDescriptions.previousInputHistory': '查看上一条输入记录。',
-    'settings.general.searchActionDescriptions.nextInputHistory': '查看下一条输入记录。',
+    'settings.general.searchActionDescriptions.history': '快速打开或收起会话历史列表',
+    'settings.general.searchActionDescriptions.focusInput': '将焦点移动到输入框',
+    'settings.general.searchActionDescriptions.newSession': '立即开始一段新会话',
+    'settings.general.searchActionDescriptions.reopenLastClosedSession':
+        '重新打开最近关闭的一条会话',
+    'settings.general.searchActionDescriptions.modelToggle': '快速打开或收起模型列表',
+    'settings.general.searchActionDescriptions.windowPin': '切换搜索窗口的置顶状态',
+    'settings.general.searchActionDescriptions.windowMaximize': '切换搜索窗口最大化',
+    'settings.general.searchActionDescriptions.openSettings': '快速打开设置窗口',
+    'settings.general.searchActionDescriptions.cancelRequest':
+        '停止会话 / 清除输入内容 / 恢复默认模型',
+    'settings.general.searchActionDescriptions.submitRequest': '发送当前输入内容',
+    'settings.general.searchActionDescriptions.newLine': '在输入框中输入文本时换行',
+    'settings.general.searchActionDescriptions.previousInputHistory': '查看输入框输入的上一条记录',
+    'settings.general.searchActionDescriptions.nextInputHistory': '查看输入框输入的下一条记录',
     'settings.general.searchShortcuts.errors.modifierRequired':
         '快捷键需要包含 Ctrl、Alt 或 Cmd，或使用允许的功能键',
     'settings.general.searchShortcuts.errors.reserved':

From 96dceb8e023926449e6b6968161fda8f0860a868 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sat, 13 Jun 2026 22:47:57 +0800
Subject: [PATCH 31/55] fix(desktop): prevent search shortcut input selection

---
 .../General/SearchShortcutSettings.vue        | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index def6c8b1..f6418462 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -374,6 +374,21 @@
         updateSearchShortcutDisplay(actionId, shortcutCapturePrompt.value);
     }
 
+    function focusSearchShortcutInput(event: MouseEvent, row: SettingsSearchShortcutGroupRow) {
+        event.preventDefault();
+        if (row.kind !== 'configurable') {
+            return;
+        }
+
+        (event.currentTarget as HTMLInputElement).focus();
+    }
+
+    function clearSearchShortcutSelection(event: Event) {
+        const input = event.currentTarget as HTMLInputElement;
+        const cursorPosition = input.value.length;
+        input.setSelectionRange(cursorPosition, cursorPosition);
+    }
+
     async function confirmCapturedSearchShortcut(
         actionId: SearchKeybindingActionId,
         shortcut: string
@@ -538,7 +553,7 @@
                                 type="text"
                                 readonly
                                 :class="[
-                                    'w-full rounded-[10px] border px-9 py-2 text-center text-[12px] shadow-none [box-shadow:none] transition-colors select-none focus:shadow-none focus:[box-shadow:none] focus:outline-none',
+                                    'shortcut-capture-input w-full rounded-[10px] border px-9 py-2 text-center text-[12px] shadow-none [box-shadow:none] transition-colors select-none focus:shadow-none focus:[box-shadow:none] focus:outline-none',
                                     row.hasError
                                         ? 'border-red-300 bg-red-50 text-red-600'
                                         : row.isCapturing
@@ -558,7 +573,9 @@
                                         : undefined
                                 "
                                 :tabindex="row.kind === 'fixed' ? -1 : 0"
-                                @mousedown="row.kind === 'fixed' && $event.preventDefault()"
+                                @mousedown="focusSearchShortcutInput($event, row)"
+                                @select="clearSearchShortcutSelection"
+                                @dragstart.prevent
                                 @focus="startSearchShortcutCapture(row)"
                                 @blur="stopSearchShortcutCaptureAndSave(row)"
                             />
@@ -586,3 +603,21 @@
         </div>
     </div>
 </template>
+
+<style scoped>
+    .shortcut-capture-input {
+        caret-color: transparent;
+        user-select: none;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+    }
+
+    .shortcut-capture-input::selection {
+        background: transparent;
+    }
+
+    .shortcut-capture-input::-moz-selection {
+        background: transparent;
+    }
+</style>

From 5a5e856430fb3119012b876aa7917233d8cfbd17 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sat, 13 Jun 2026 22:49:06 +0800
Subject: [PATCH 32/55] fix(desktop): clarify global shortcut conflicts

---
 .../SettingsView/components/General/index.vue | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 0405255a..4deddf2d 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -13,6 +13,10 @@
     import { storeToRefs } from 'pinia';
     import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 
+    import {
+        getSearchKeybindingDefinition,
+        type SearchKeybindingActionId,
+    } from '@/config/searchKeybindings';
     import {
         resolveSearchWindowDefaultSize,
         type SearchWindowSizePreset,
@@ -107,16 +111,22 @@
         }))
     );
 
-    function findGlobalShortcutSearchConflict(shortcut: string): boolean {
+    function findGlobalShortcutSearchConflict(shortcut: string): SearchKeybindingActionId | null {
         const normalizedShortcut = normalizeLocalShortcutString(shortcut);
         if (!normalizedShortcut) {
-            return false;
+            return null;
         }
 
-        return Object.values(settings.value.searchKeybindings).some((searchShortcut) => {
+        for (const [actionId, searchShortcut] of Object.entries(
+            settings.value.searchKeybindings
+        ) as Array<[SearchKeybindingActionId, string | null]>) {
             const normalizedSearchShortcut = normalizeLocalShortcutString(searchShortcut);
-            return normalizedSearchShortcut === normalizedShortcut;
-        });
+            if (normalizedSearchShortcut === normalizedShortcut) {
+                return actionId;
+            }
+        }
+
+        return null;
     }
 
     const captureShortcut = (event: KeyboardEvent) => {
@@ -264,11 +274,14 @@
     };
 
     const saveNewShortcut = async (newShortcut: string) => {
-        if (findGlobalShortcutSearchConflict(newShortcut)) {
+        const conflictActionId = findGlobalShortcutSearchConflict(newShortcut);
+        if (conflictActionId) {
             shortcutRegistrationFailed.value = false;
             displayShortcut.value = settings.value.globalShortcut;
             alertMessage.value?.error(
-                t('settings.general.searchShortcuts.errors.globalConflict'),
+                t('settings.general.searchShortcuts.errors.duplicate', {
+                    action: t(getSearchKeybindingDefinition(conflictActionId).labelKey),
+                }),
                 3000
             );
             return;

From 86963bdac03084066a703ba07e6c315cfd4029bc Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sat, 13 Jun 2026 23:25:06 +0800
Subject: [PATCH 33/55] test(desktop): align general shortcut description

---
 .../tests/views/SettingsView/settingsGeneralComponent.test.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 99577991..861a0d99 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -201,7 +201,7 @@ describe('SettingsGeneralSection', () => {
                     .element as HTMLInputElement
             ).value
         ).toBe('Alt+Space');
-        expect(wrapper.text()).toContain('设置呼出 TouchAI 的全局快捷键。');
+        expect(wrapper.text()).toContain('设置呼出 TouchAI 的全局快捷键');
         expect(wrapper.text()).not.toContain('Ctrl+Space');
         expect(wrapper.find('[data-testid="settings-shortcut-suggestions"]').exists()).toBe(false);
         expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(

From ad4c365db80a18cbae945b9cf140cf4af13fc09e Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sat, 13 Jun 2026 23:34:50 +0800
Subject: [PATCH 34/55] test(desktop): align search shortcut descriptions

---
 .../views/SettingsView/settingsGeneralComponent.test.ts     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 861a0d99..4b1b87fd 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -212,12 +212,12 @@ describe('SettingsGeneralSection', () => {
         expect(wrapper.text()).toContain('输入与请求');
         expect(wrapper.text()).toContain('窗口');
         expect(wrapper.text()).toContain('打开会话历史');
-        expect(wrapper.text()).toContain('快速打开会话历史列表。');
+        expect(wrapper.text()).toContain('快速打开或收起会话历史列表');
         expect(wrapper.text()).toContain('开始新会话');
         expect(wrapper.text()).toContain('切换窗口最大化');
-        expect(wrapper.text()).toContain('切换搜索窗口最大化。');
+        expect(wrapper.text()).toContain('切换搜索窗口最大化');
         expect(wrapper.text()).toContain('打开设置');
-        expect(wrapper.text()).toContain('快速打开设置窗口。');
+        expect(wrapper.text()).toContain('快速打开设置窗口');
         expect(
             (
                 wrapper.get('[data-testid="settings-search-shortcut-input-search.window.maximize"]')

From a4a2ff5d9cdad5a42fcaeac1616bdf67b816a782 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 14 Jun 2026 01:45:57 +0800
Subject: [PATCH 35/55] fix(desktop): handle macOS global shortcut conflicts

---
 .../src-tauri/src/core/system/shortcut.rs     |  7 ++
 apps/desktop/src/i18n/messages.ts             |  4 +
 apps/desktop/src/utils/shortcuts.ts           | 16 ++++
 .../SettingsView/components/General/index.vue | 53 ++++++++----
 apps/desktop/tests/setup/vitest.ts            | 17 ++--
 apps/desktop/tests/utils/shortcuts.test.ts    | 19 ++++-
 .../settingsGeneralComponent.test.ts          | 82 +++++++++++++++++++
 7 files changed, 168 insertions(+), 30 deletions(-)

diff --git a/apps/desktop/src-tauri/src/core/system/shortcut.rs b/apps/desktop/src-tauri/src/core/system/shortcut.rs
index 67a719ec..0bf793fe 100644
--- a/apps/desktop/src-tauri/src/core/system/shortcut.rs
+++ b/apps/desktop/src-tauri/src/core/system/shortcut.rs
@@ -221,6 +221,13 @@ mod tests {
         assert_eq!(shortcut.key, Code::Space);
     }
 
+    #[test]
+    fn parse_shortcut_accepts_option_alias_for_alt() {
+        let shortcut = parse_shortcut("Option+Shift+Space").expect("option+shift+space parses");
+        assert_eq!(shortcut.mods, Modifiers::ALT | Modifiers::SHIFT);
+        assert_eq!(shortcut.key, Code::Space);
+    }
+
     #[test]
     fn parse_shortcut_accepts_super_aliases_for_cmd_or_win() {
         // global-hotkey 把 Cmd（macOS）和 Win/Super（Linux）都映射到 SUPER；
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index c2ff8a0c..61118f9a 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -86,6 +86,8 @@ const zhCNMessages = {
     'settings.general.shortcutHelp':
         '点击输入框后按下您想要设置的快捷键组合。支持的修饰键：Ctrl、Alt、Shift',
     'settings.general.winKeyUnsupported': '不支持 Win/Super 键组合，请使用 Ctrl、Alt、Shift',
+    'settings.general.globalShortcutReservedOnMac':
+        '该快捷键容易与 macOS 系统功能或输入法冲突，请改用 Option+Space 或 Option+Shift+Space',
     'settings.general.shortcutSaved': '快捷键保存成功',
     'settings.general.noShortcut': '无',
     'settings.general.globalShortcutGroup': '全局唤起',
@@ -1048,6 +1050,8 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
         'Click the field and press the shortcut you want. Supported modifiers: Ctrl, Alt, Shift',
     'settings.general.winKeyUnsupported':
         'Win/Super key combinations are not supported. Use Ctrl, Alt, or Shift.',
+    'settings.general.globalShortcutReservedOnMac':
+        'This shortcut can conflict with macOS system features or input methods. Use Option+Space or Option+Shift+Space.',
     'settings.general.shortcutSaved': 'Shortcut saved',
     'settings.general.noShortcut': 'None',
     'settings.general.globalShortcutGroup': 'Global activation',
diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index b1332423..17820a00 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -89,6 +89,10 @@ function getPrimaryModifierLabel(): 'Cmd' | 'Ctrl' {
     return isMacPlatform() ? 'Cmd' : 'Ctrl';
 }
 
+function getAltModifierLabel(): 'Option' | 'Alt' {
+    return isMacPlatform() ? 'Option' : 'Alt';
+}
+
 function usesPrimaryModifier(input: ShortcutMatchInput): boolean {
     return isMacPlatform() ? Boolean(input.metaKey) : Boolean(input.ctrlKey);
 }
@@ -203,6 +207,9 @@ export function formatShortcutForDisplay(shortcut: string | null | undefined): s
         if (modifier === 'Mod') {
             return getPrimaryModifierLabel();
         }
+        if (modifier === 'Alt') {
+            return getAltModifierLabel();
+        }
         return modifier;
     });
 
@@ -322,6 +329,15 @@ export function isReservedLocalShortcutKey(
     return normalizedKey ? RESERVED_LOCAL_SHORTCUT_KEYS.has(normalizedKey) : false;
 }
 
+export function isReservedGlobalShortcut(shortcut: string | null | undefined): boolean {
+    if (!isMacPlatform()) {
+        return false;
+    }
+
+    const normalized = normalizeLocalShortcutString(shortcut);
+    return normalized === 'Mod+Space' || normalized === 'Ctrl+Space';
+}
+
 export function hasRequiredModifier(shortcut: string | null | undefined): boolean {
     const normalized = normalizeLocalShortcutString(shortcut);
     if (!normalized) {
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 4deddf2d..9855d878 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -32,8 +32,10 @@
     import { type OutputScrollBehavior, useSettingsStore } from '@/stores/settings';
     import {
         captureShortcutFromKeyboardEvent,
+        formatShortcutForDisplay,
         hasCommandModifier,
         isMacPlatform,
+        isReservedGlobalShortcut,
         isReservedLocalShortcutKey,
         normalizeLocalShortcutString,
     } from '@/utils/shortcuts';
@@ -101,15 +103,20 @@
     const alertMessage = ref<InstanceType<typeof AlertMessage> | null>(null);
     const shortcutRegistrationFailed = ref(false);
     const showGlobalShortcutPresetMenu = ref(false);
-    // Mac 上 Cmd+Space 被 Spotlight 占用，因此预设使用 Option+Space（Alt+Space）和 Ctrl+Space；
-    // Windows/Linux 上 Cmd 由 Win/Super 键代表，前端统一拒绝其作为快捷键，预设保持 Alt/Ctrl 组合。
-    const globalShortcutPresetShortcuts = ['Alt+Space', 'Ctrl+Space'] as const;
-    const globalShortcutPresetOptions = computed(() =>
-        globalShortcutPresetShortcuts.map((shortcut) => ({
+    const globalShortcutPresetOptions = computed(() => {
+        const shortcuts = isMacPlatform()
+            ? ['Option+Space', 'Option+Shift+Space']
+            : ['Alt+Space', 'Ctrl+Space'];
+
+        return shortcuts.map((shortcut) => ({
             label: shortcut,
             value: shortcut,
-        }))
-    );
+        }));
+    });
+
+    function formatGlobalShortcutForSettings(shortcut: string | null | undefined): string {
+        return formatShortcutForDisplay(shortcut);
+    }
 
     function findGlobalShortcutSearchConflict(shortcut: string): SearchKeybindingActionId | null {
         const normalizedShortcut = normalizeLocalShortcutString(shortcut);
@@ -196,10 +203,10 @@
             return;
         }
 
-        displayShortcut.value = shortcut;
+        displayShortcut.value = formatGlobalShortcutForSettings(shortcut);
         hasCapturedShortcut.value = true;
         showGlobalShortcutPresetMenu.value = false;
-        void confirmCapturedShortcut(shortcut);
+        void confirmCapturedShortcut(displayShortcut.value);
     };
 
     let unlistenSystemKey: UnlistenFn | null = null;
@@ -230,8 +237,11 @@
         isCapturing.value = false;
         showGlobalShortcutPresetMenu.value = false;
 
-        if (shortcut === settings.value.globalShortcut) {
-            displayShortcut.value = settings.value.globalShortcut;
+        if (
+            normalizeLocalShortcutString(shortcut) ===
+            normalizeLocalShortcutString(settings.value.globalShortcut)
+        ) {
+            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
             return;
         }
 
@@ -247,7 +257,7 @@
         showGlobalShortcutPresetMenu.value = false;
 
         const completion = resolveShortcutCaptureCompletion({
-            currentShortcut: settings.value.globalShortcut,
+            currentShortcut: formatGlobalShortcutForSettings(settings.value.globalShortcut),
             displayShortcut: displayShortcut.value,
             hasCapturedShortcut: hasCapturedShortcut.value,
         });
@@ -274,10 +284,17 @@
     };
 
     const saveNewShortcut = async (newShortcut: string) => {
+        if (isReservedGlobalShortcut(newShortcut)) {
+            shortcutRegistrationFailed.value = false;
+            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
+            alertMessage.value?.warning(t('settings.general.globalShortcutReservedOnMac'), 4000);
+            return;
+        }
+
         const conflictActionId = findGlobalShortcutSearchConflict(newShortcut);
         if (conflictActionId) {
             shortcutRegistrationFailed.value = false;
-            displayShortcut.value = settings.value.globalShortcut;
+            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
             alertMessage.value?.error(
                 t('settings.general.searchShortcuts.errors.duplicate', {
                     action: t(getSearchKeybindingDefinition(conflictActionId).labelKey),
@@ -294,18 +311,18 @@
             const registered = await registerShortcut(newShortcut);
             if (!registered) {
                 shortcutRegistrationFailed.value = true;
-                displayShortcut.value = newShortcut;
+                displayShortcut.value = formatGlobalShortcutForSettings(newShortcut);
                 return;
             }
 
             await saveShortcutToDatabase(newShortcut);
             settings.value.globalShortcut = newShortcut;
-            displayShortcut.value = newShortcut;
+            displayShortcut.value = formatGlobalShortcutForSettings(newShortcut);
             alertMessage.value?.success(t('settings.general.shortcutSaved'), 3000);
         } catch (error) {
             console.error('Failed to save shortcut:', error);
             alertMessage.value?.error(t('settings.general.saveShortcutFailed'), 3000);
-            displayShortcut.value = settings.value.globalShortcut;
+            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
             shortcutRegistrationFailed.value = false;
         } finally {
             isSaving.value = false;
@@ -337,7 +354,7 @@
         () => settings.value.globalShortcut,
         (shortcut) => {
             if (!isCapturing.value && !shortcutRegistrationFailed.value) {
-                displayShortcut.value = shortcut;
+                displayShortcut.value = formatGlobalShortcutForSettings(shortcut);
             }
         }
     );
@@ -353,7 +370,7 @@
     const loadSettings = async () => {
         try {
             await settingsStore.initialize();
-            displayShortcut.value = settings.value.globalShortcut;
+            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
 
             const [failed, error] = await native.shortcut.getShortcutStatus();
             if (failed) {
diff --git a/apps/desktop/tests/setup/vitest.ts b/apps/desktop/tests/setup/vitest.ts
index f3fd7f55..f0cf7f78 100644
--- a/apps/desktop/tests/setup/vitest.ts
+++ b/apps/desktop/tests/setup/vitest.ts
@@ -1,21 +1,18 @@
-import {
-    ReadableStream as NodeReadableStream,
-    TransformStream as NodeTransformStream,
-    WritableStream as NodeWritableStream,
-} from 'node:stream/web';
-
 import { afterEach, beforeEach, vi } from 'vitest';
 
 import { installTauriMocks, resetTauriMocks } from '../utils/tauri';
 
 const webStreamGlobals = {
-    ReadableStream: NodeReadableStream,
-    TransformStream: NodeTransformStream,
-    WritableStream: NodeWritableStream,
+    ReadableStream: globalThis.ReadableStream,
+    TransformStream: globalThis.TransformStream,
+    WritableStream: globalThis.WritableStream,
 };
 
 for (const [name, value] of Object.entries(webStreamGlobals)) {
-    if (typeof (globalThis as Record<string, unknown>)[name] === 'undefined') {
+    if (
+        typeof value !== 'undefined' &&
+        typeof (globalThis as Record<string, unknown>)[name] === 'undefined'
+    ) {
         Object.defineProperty(globalThis, name, {
             configurable: true,
             writable: true,
diff --git a/apps/desktop/tests/utils/shortcuts.test.ts b/apps/desktop/tests/utils/shortcuts.test.ts
index 58210d5b..c17a6d3c 100644
--- a/apps/desktop/tests/utils/shortcuts.test.ts
+++ b/apps/desktop/tests/utils/shortcuts.test.ts
@@ -7,6 +7,7 @@ import {
     hasCommandModifier,
     hasRequiredModifier,
     isModifierlessFunctionShortcut,
+    isReservedGlobalShortcut,
     isReservedLocalShortcut,
     isReservedLocalShortcutKey,
     matchShortcut,
@@ -56,7 +57,8 @@ describe('shortcut utilities', () => {
 
         setPlatform('MacIntel');
 
-        expect(formatShortcutForDisplay('Mod+Ctrl+Alt+Shift+H')).toBe('Cmd+Ctrl+Alt+Shift+H');
+        expect(formatShortcutForDisplay('Mod+Ctrl+Alt+Shift+H')).toBe('Cmd+Ctrl+Option+Shift+H');
+        expect(formatShortcutForDisplay('Alt+Space')).toBe('Option+Space');
         expect(toCurrentPlatformShortcut('Mod+H')).toBe('Cmd+H');
     });
 
@@ -127,7 +129,7 @@ describe('shortcut utilities', () => {
             )
         ).toEqual({
             shortcut: 'Mod+Ctrl+Alt+Shift+K',
-            displayShortcut: 'Cmd+Ctrl+Alt+Shift+K',
+            displayShortcut: 'Cmd+Ctrl+Option+Shift+K',
         });
     });
 
@@ -171,4 +173,17 @@ describe('shortcut utilities', () => {
         expect(findShortcutConflict('Mod+P', entries)).toBeNull();
         expect(findShortcutConflict('', entries)).toBeNull();
     });
+
+    it('classifies macOS system global shortcut conflicts', () => {
+        expect(isReservedGlobalShortcut('Mod+Space')).toBe(false);
+        expect(isReservedGlobalShortcut('Ctrl+Space')).toBe(false);
+
+        setPlatform('MacIntel');
+
+        expect(isReservedGlobalShortcut('Cmd+Space')).toBe(true);
+        expect(isReservedGlobalShortcut('Mod+Space')).toBe(true);
+        expect(isReservedGlobalShortcut('Ctrl+Space')).toBe(true);
+        expect(isReservedGlobalShortcut('Option+Space')).toBe(false);
+        expect(isReservedGlobalShortcut('Option+Shift+Space')).toBe(false);
+    });
 });
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 4b1b87fd..13cb82e1 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -6,6 +6,15 @@ import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
 import { setLocale } from '@/i18n';
 import GeneralSection from '@/views/SettingsView/components/General/index.vue';
 
+const originalPlatform = navigator.platform;
+
+function setPlatform(platform: string) {
+    Object.defineProperty(window.navigator, 'platform', {
+        configurable: true,
+        value: platform,
+    });
+}
+
 const settingsStoreMock = vi.hoisted(() => {
     const createGeneralSettingsMock = (searchKeybindings: Record<string, string | null>) => ({
         globalShortcut: 'Alt+Space',
@@ -178,6 +187,7 @@ vi.mock('@services/AppUpdateService', () => ({
 describe('SettingsGeneralSection', () => {
     beforeEach(() => {
         vi.clearAllMocks();
+        setPlatform('Win32');
         setLocale('zh-CN');
         appUpdateServiceMock.state = appUpdateServiceMock.createState();
         nativeMock.shortcut.getShortcutStatus.mockResolvedValue([false, null]);
@@ -187,6 +197,10 @@ describe('SettingsGeneralSection', () => {
         );
     });
 
+    afterEach(() => {
+        setPlatform(originalPlatform);
+    });
+
     it('renders the general settings groups and row controls', async () => {
         const wrapper = mount(GeneralSection);
 
@@ -302,6 +316,74 @@ describe('SettingsGeneralSection', () => {
         );
     });
 
+    it('uses macOS shortcut labels and omits input-method-conflicting presets', async () => {
+        setPlatform('MacIntel');
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        expect((input.element as HTMLInputElement).value).toBe('Option+Space');
+
+        await input.trigger('focus');
+        await flushPromises();
+
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            true
+        );
+        expect(
+            wrapper.get('[data-testid="settings-global-shortcut-preset-Option+Space"]').text()
+        ).toBe('Option+Space');
+        expect(
+            wrapper.get('[data-testid="settings-global-shortcut-preset-Option+Shift+Space"]').text()
+        ).toBe('Option+Shift+Space');
+        expect(
+            wrapper.find('[data-testid="settings-global-shortcut-preset-Ctrl+Space"]').exists()
+        ).toBe(false);
+
+        await wrapper
+            .get('[data-testid="settings-global-shortcut-preset-Option+Shift+Space"]')
+            .trigger('click');
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith(
+            'Option+Shift+Space'
+        );
+        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Option+Shift+Space');
+        expect((input.element as HTMLInputElement).value).toBe('Option+Shift+Space');
+    });
+
+    it('blocks macOS system-reserved global shortcuts before registration', async () => {
+        setPlatform('MacIntel');
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        window.dispatchEvent(
+            new KeyboardEvent('keydown', { key: ' ', code: 'Space', metaKey: true })
+        );
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
+        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Option+Space');
+
+        await input.trigger('focus');
+        await flushPromises();
+        window.dispatchEvent(
+            new KeyboardEvent('keydown', { key: ' ', code: 'Space', ctrlKey: true })
+        );
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
+        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Option+Space');
+    });
+
     it('saves the global shortcut immediately after a shortcut is pressed', async () => {
         settingsStoreMock.settings.value.searchKeybindings['search.session.new'] = 'Mod+Shift+N';
         const wrapper = mount(GeneralSection);

From a028ebfd27882a8698aff6b0e0644651759e9c31 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 14 Jun 2026 02:38:06 +0800
Subject: [PATCH 36/55] fix(desktop): respect configurable search shortcuts

---
 .../src/core/window/webview_defaults.rs       | 81 -------------------
 apps/desktop/src/config/searchKeybindings.ts  |  9 +--
 apps/desktop/src/i18n/messages.ts             |  5 +-
 apps/desktop/src/i18n/textMap.ts              |  3 +-
 .../src/services/EventService/types.ts        |  7 --
 .../SearchView/composables/useSearchPage.ts   | 17 ----
 apps/desktop/src/views/SearchView/index.vue   |  5 --
 .../useSearchKeyboardRouter.test.ts           | 32 ++++++++
 8 files changed, 41 insertions(+), 118 deletions(-)

diff --git a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
index 67625110..9eaacf0b 100644
--- a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
+++ b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
@@ -251,84 +251,6 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
     Ok(())
 }
 
-#[cfg(target_os = "windows")]
-/// 判断是否命中了需要从宿主层兜底转发的搜索 surface 快捷键。
-fn is_search_surface_accelerator_command(
-    key_event_kind: i32,
-    virtual_key: u32,
-    is_control_down: bool,
-) -> bool {
-    let is_key_down = key_event_kind == COREWEBVIEW2_KEY_EVENT_KIND_KEY_DOWN.0
-        || key_event_kind == COREWEBVIEW2_KEY_EVENT_KIND_SYSTEM_KEY_DOWN.0;
-    is_key_down && is_control_down && virtual_key == u32::from(b'M')
-}
-
-#[cfg(target_os = "windows")]
-/// 在主搜索窗口注册 WebView2 accelerator 兜底，避免 DOM 未接管焦点时首个 Ctrl+M 丢失。
-fn register_search_surface_accelerator_bridge<R: Runtime>(
-    window: &WebviewWindow<R>,
-    controller: &ICoreWebView2Controller,
-) -> Result<(), String> {
-    if window.label() != "main" {
-        return Ok(());
-    }
-
-    let app_handle = window.app_handle().clone();
-    let mut token = 0i64;
-    let handler = AcceleratorKeyPressedEventHandler::create(Box::new(
-        move |_controller: Option<ICoreWebView2Controller>,
-              args: Option<ICoreWebView2AcceleratorKeyPressedEventArgs>| {
-            let Some(args) = args else {
-                return Ok(());
-            };
-
-            unsafe {
-                let mut key_event_kind = COREWEBVIEW2_KEY_EVENT_KIND_KEY_DOWN;
-                args.KeyEventKind(&mut key_event_kind)?;
-
-                let mut virtual_key = 0u32;
-                args.VirtualKey(&mut virtual_key)?;
-
-                let mut physical_key_status = Default::default();
-                args.PhysicalKeyStatus(&mut physical_key_status)?;
-
-                let is_control_down = (GetKeyState(i32::from(VK_CONTROL.0)) as u16 & 0x8000) != 0;
-                if !is_search_surface_accelerator_command(
-                    key_event_kind.0,
-                    virtual_key,
-                    is_control_down,
-                ) {
-                    return Ok(());
-                }
-
-                if let Ok(args2) =
-                    Interface::cast::<ICoreWebView2AcceleratorKeyPressedEventArgs2>(&args)
-                {
-                    let _ = args2.SetIsBrowserAcceleratorKeyEnabled(false);
-                }
-                let _ = args.SetHandled(true);
-                let _ = app_handle.emit(
-                    "search-surface-command",
-                    serde_json::json!({
-                        "command": "toggle-model-dropdown",
-                        "source": "webview2-accelerator"
-                    }),
-                );
-            }
-
-            Ok(())
-        },
-    ));
-
-    unsafe {
-        controller
-            .add_AcceleratorKeyPressed(&handler, &mut token)
-            .map_err(|error| format!("Failed to add WebView2 accelerator handler: {}", error))?;
-    }
-
-    Ok(())
-}
-
 #[cfg(target_os = "windows")]
 /// 判断是否命中了需要打开 DevTools 的快捷键。
 fn is_devtools_accelerator_command(
@@ -436,9 +358,6 @@ pub(crate) fn apply_webview_runtime_defaults<R: Runtime>(
             let controller = webview.controller();
             let result = disable_browser_accelerator_keys_with_controller(&controller)
                 .and_then(|_| register_system_menu_accelerator_handler(&window_clone, &controller))
-                .and_then(|_| {
-                    register_search_surface_accelerator_bridge(&window_clone, &controller)
-                })
                 .and_then(|_| register_devtools_accelerator_handler(&controller));
             if let Ok(hwnd) = top_level_hwnd(&window_clone) {
                 install_system_menu_interceptor_on_children(hwnd);
diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 80662a61..517eb0d7 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -132,8 +132,8 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
 
     const candidates = value as Record<string, unknown>;
 
-    // First pass: resolve each action's desired shortcut (validated custom value,
-    // explicit disable, or its default) without considering conflicts yet.
+    // 第一轮：先解析每个动作期望使用的快捷键（合法自定义值、显式禁用或默认值），
+    // 暂不处理快捷键冲突。
     const resolved = new Map<SearchKeybindingActionId, string | null>();
     for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
         const candidate = candidates[definition.id];
@@ -161,9 +161,8 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
         resolved.set(definition.id, defaults[definition.id]);
     }
 
-    // Second pass: resolve conflicts deterministically (first action in
-    // definition order keeps the shortcut). This lets clean swaps survive
-    // instead of both sides colliding with the other's default.
+    // 第二轮：按定义顺序稳定处理冲突，先出现的动作保留快捷键。
+    // 这样干净的快捷键互换不会因为撞到对方默认值而被同时丢弃。
     const result = createDefaultSearchKeybindings();
     const usedShortcuts = new Set<string>();
     for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 61118f9a..3aaa0f6b 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -828,7 +828,7 @@ const zhCNMessages = {
     'conversation.toolbar.pinWindow': '窗口置顶',
     'conversation.timeline.jumpToMessage': '跳转到消息: {preview}',
     'assistant.loadingTip.newLine': 'Shift+Enter 换行，适合分段表述',
-    'assistant.loadingTip.switchModel': 'Ctrl+M 或点击模型图标切换模型',
+    'assistant.loadingTip.switchModel': '使用配置的快捷键或点击模型图标切换模型',
     'assistant.loadingTip.history': 'Ctrl+H 快速打开历史会话',
     'assistant.loadingTip.alwaysOnTop': 'Ctrl+P 切换窗口置顶',
     'assistant.loadingTip.newSession': 'Ctrl+N 开启新会话',
@@ -1865,7 +1865,8 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'conversation.toolbar.pinWindow': 'Keep window on top',
     'conversation.timeline.jumpToMessage': 'Jump to message: {preview}',
     'assistant.loadingTip.newLine': 'Shift+Enter inserts a new line for structured prompts',
-    'assistant.loadingTip.switchModel': 'Ctrl+M or the model icon switches models',
+    'assistant.loadingTip.switchModel':
+        'Use the configured shortcut or the model icon to switch models',
     'assistant.loadingTip.history': 'Ctrl+H opens conversation history',
     'assistant.loadingTip.alwaysOnTop': 'Ctrl+P toggles always on top',
     'assistant.loadingTip.newSession': 'Ctrl+N starts a new conversation',
diff --git a/apps/desktop/src/i18n/textMap.ts b/apps/desktop/src/i18n/textMap.ts
index 748b938b..6def9656 100644
--- a/apps/desktop/src/i18n/textMap.ts
+++ b/apps/desktop/src/i18n/textMap.ts
@@ -511,7 +511,8 @@ export const zhToEnTextMap = {
     未命名图片: 'Image',
     未命名文件: 'File',
     'Shift+Enter 换行，适合分段表述': 'Shift+Enter inserts a new line for structured prompts',
-    'Ctrl+M 或点击模型图标切换模型': 'Ctrl+M or the model icon switches models',
+    使用配置的快捷键或点击模型图标切换模型:
+        'Use the configured shortcut or the model icon to switch models',
     'Ctrl+H 快速打开历史会话': 'Ctrl+H opens conversation history',
     'Ctrl+P 切换窗口置顶': 'Ctrl+P toggles always on top',
     'Ctrl+N 开启新会话': 'Ctrl+N starts a new conversation',
diff --git a/apps/desktop/src/services/EventService/types.ts b/apps/desktop/src/services/EventService/types.ts
index 326c17cc..b3616512 100644
--- a/apps/desktop/src/services/EventService/types.ts
+++ b/apps/desktop/src/services/EventService/types.ts
@@ -56,7 +56,6 @@ export enum AppEvent {
     POPUP_SESSION_SEARCH_QUERY_CHANGE = 'popup-session-history-search-query-change',
     SEARCH_SURFACE_SHOWN = 'search-surface-shown',
     SEARCH_SURFACE_HIDDEN = 'search-surface-hidden',
-    SEARCH_SURFACE_COMMAND = 'search-surface-command',
     SESSION_TASK_STATUS_CHANGED = 'session:task:status-changed',
     SESSION_STATUS_REMINDER_ACTION = 'session-status-reminder:action',
 
@@ -119,11 +118,6 @@ export interface SearchSurfaceHiddenEvent {
     sequence?: number;
 }
 
-export interface SearchSurfaceCommandEvent {
-    command: 'toggle-model-dropdown';
-    source: 'webview2-accelerator';
-}
-
 /**
  * 系统级快捷键（如 Alt+Space）由 WebView2 当作 system accelerator 截获，
  * 不会派发 DOM keydown，因此宿主在 accelerator 阶段直接 emit 此事件，
@@ -207,7 +201,6 @@ export interface AppEventMap {
     [AppEvent.POPUP_SESSION_SEARCH_QUERY_CHANGE]: PopupSessionSearchQueryChangePayload;
     [AppEvent.SEARCH_SURFACE_SHOWN]: SearchSurfaceShownEvent;
     [AppEvent.SEARCH_SURFACE_HIDDEN]: SearchSurfaceHiddenEvent;
-    [AppEvent.SEARCH_SURFACE_COMMAND]: SearchSurfaceCommandEvent;
     [AppEvent.SESSION_TASK_STATUS_CHANGED]: SessionTaskStatusChangedEvent;
     [AppEvent.SESSION_STATUS_REMINDER_ACTION]: SessionStatusReminderActionEvent;
 
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
index 98a12f76..09ce2c48 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
@@ -384,10 +384,6 @@ interface UseSearchPageLifecycleOptions {
     reconcilePopupSurfaces?: () => Promise<void>;
     remeasureSearchWindowHeight?: () => void | Promise<void>;
     onSurfaceHidden?: () => void | Promise<void>;
-    handleSearchSurfaceCommand?: (payload: {
-        command: 'toggle-model-dropdown';
-        source: 'webview2-accelerator';
-    }) => void | Promise<void>;
     handleSessionStatusReminderAction?: (
         payload: SessionStatusReminderActionEvent
     ) => void | Promise<void>;
@@ -409,7 +405,6 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
         reconcilePopupSurfaces,
         remeasureSearchWindowHeight,
         onSurfaceHidden,
-        handleSearchSurfaceCommand,
         handleSessionStatusReminderAction,
         handleAiModelsUpdated,
         handleShortcutAutoPaste,
@@ -420,7 +415,6 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
     let unlistenAiModelsUpdated: (() => void) | null = null;
     let unlistenSearchSurfaceShown: (() => void) | null = null;
     let unlistenSearchSurfaceHidden: (() => void) | null = null;
-    let unlistenSearchSurfaceCommand: (() => void) | null = null;
     let unlistenSessionTaskStatusChanged: (() => void) | null = null;
     let unlistenSessionStatusReminderAction: (() => void) | null = null;
     let stopReadyWatch: (() => void) | null = null;
@@ -681,15 +675,6 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
             AppEvent.SESSION_STATUS_REMINDER_ACTION,
             sessionStatusReminderCoordinator.handleReminderAction
         );
-
-        unlistenSearchSurfaceCommand = await eventService.on(
-            AppEvent.SEARCH_SURFACE_COMMAND,
-            async (payload) => {
-                await Promise.resolve(handleSearchSurfaceCommand?.(payload)).catch((error) => {
-                    console.error('[SearchView] Failed to handle search surface command:', error);
-                });
-            }
-        );
     }
 
     const handleWindowFocus = () => {
@@ -774,8 +759,6 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
         unlistenSessionTaskStatusChanged = null;
         unlistenSessionStatusReminderAction?.();
         unlistenSessionStatusReminderAction = null;
-        unlistenSearchSurfaceCommand?.();
-        unlistenSearchSurfaceCommand = null;
     });
 
     return {
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index 3fdc5ca9..6b35ec92 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -412,11 +412,6 @@
         reconcilePopupSurfaces: hideAllPopups,
         remeasureSearchWindowHeight: remeasureTargetHeight,
         onSurfaceHidden: clearSurfaceUiAfterHidden,
-        handleSearchSurfaceCommand: async (payload) => {
-            if (payload.command === 'toggle-model-dropdown') {
-                await handleToggleModelDropdownRequest();
-            }
-        },
         handleSessionStatusReminderAction,
         handleAiModelsUpdated,
         handleShortcutAutoPaste: tryShortcutAutoPaste,
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index d22edb35..899b6251 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -148,6 +148,38 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.history.open');
     });
 
+    it('routes Ctrl+M only through the current keybinding configuration', async () => {
+        const defaultRouter = createKeyboardRouter();
+        expect(defaultRouter.router.route({ key: 'm', ctrlKey: true })).toBe(true);
+        await flushAsyncWork();
+        expect(defaultRouter.callbacks.onSearchKeybindingAction).toHaveBeenCalledWith(
+            'search.model.toggle'
+        );
+
+        const disabledRouter = createKeyboardRouter({
+            getSearchKeybindings: () => ({
+                ...createDefaultSearchKeybindings(),
+                'search.model.toggle': null,
+            }),
+        });
+        expect(disabledRouter.router.route({ key: 'm', ctrlKey: true })).toBe(false);
+        await flushAsyncWork();
+        expect(disabledRouter.callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();
+
+        const remappedRouter = createKeyboardRouter({
+            getSearchKeybindings: () => ({
+                ...createDefaultSearchKeybindings(),
+                'search.history.open': 'Mod+M',
+                'search.model.toggle': null,
+            }),
+        });
+        expect(remappedRouter.router.route({ key: 'm', ctrlKey: true })).toBe(true);
+        await flushAsyncWork();
+        expect(remappedRouter.callbacks.onSearchKeybindingAction).toHaveBeenCalledWith(
+            'search.history.open'
+        );
+    });
+
     it('routes function-row search shortcuts by keyboard code when the key value is remapped', async () => {
         const { router, callbacks } = createKeyboardRouter({
             getSearchKeybindings: () => ({

From 4c23b89daa3a337ef3dfe9a81d22144034321534 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 14 Jun 2026 03:47:53 +0800
Subject: [PATCH 37/55] fix(desktop): validate search shortcut keys

---
 apps/desktop/src/utils/shortcuts.ts           | 50 ++++++++++++++-----
 .../tests/config/searchKeybindings.test.ts    |  2 +
 apps/desktop/tests/utils/shortcuts.test.ts    | 10 ++++
 3 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index 17820a00..16a3075d 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -14,6 +14,23 @@ export interface CapturedShortcutResult {
 
 const MODIFIER_DISPLAY_ORDER = ['Mod', 'Ctrl', 'Alt', 'Shift'] as const;
 const SUPPORTED_CAPTURE_MODIFIERS = new Set(['Ctrl', 'Alt', 'Shift', 'Mod']);
+const SUPPORTED_NON_CHARACTER_KEYS = new Set([
+    'Backspace',
+    'Del',
+    'Enter',
+    'Esc',
+    'Home',
+    'End',
+    'PageUp',
+    'PageDown',
+    'Tab',
+    'Up',
+    'Down',
+    'Left',
+    'Right',
+    'Insert',
+    'Space',
+]);
 const RESERVED_LOCAL_SHORTCUT_KEYS = new Set([
     'Backspace',
     'Del',
@@ -47,6 +64,7 @@ const KEY_DISPLAY_MAP: Record<string, string> = {
 };
 
 const ALIAS_MAP: Record<string, string> = {
+    mod: 'Mod',
     cmd: 'Mod',
     command: 'Mod',
     meta: 'Mod',
@@ -63,6 +81,7 @@ const ALIAS_MAP: Record<string, string> = {
     del: 'Del',
     return: 'Enter',
     enter: 'Enter',
+    tab: 'Tab',
     pageup: 'PageUp',
     pagedown: 'PageDown',
     arrowup: 'Up',
@@ -74,6 +93,8 @@ const ALIAS_MAP: Record<string, string> = {
     arrowright: 'Right',
     right: 'Right',
     backspace: 'Backspace',
+    insert: 'Insert',
+    ins: 'Insert',
     space: 'Space',
 };
 
@@ -112,11 +133,17 @@ function normalizeShortcutToken(token: string): string | null {
         return trimmed.toUpperCase();
     }
 
-    if (/^f\d{1,2}$/i.test(trimmed)) {
-        return trimmed.toUpperCase();
+    const functionKeyMatch = /^f(\d{1,2})$/i.exec(trimmed);
+    if (functionKeyMatch) {
+        const functionKeyNumber = Number(functionKeyMatch[1]);
+        return functionKeyNumber >= 1 && functionKeyNumber <= 24 ? trimmed.toUpperCase() : null;
+    }
+
+    if (SUPPORTED_NON_CHARACTER_KEYS.has(trimmed)) {
+        return trimmed;
     }
 
-    return trimmed;
+    return null;
 }
 
 function normalizeEventKey(key: string): string | null {
@@ -133,12 +160,8 @@ function normalizeFunctionKeyCode(code: string | null | undefined): string | nul
         return null;
     }
 
-    const trimmedCode = code.trim();
-    if (!/^F\d{1,2}$/i.test(trimmedCode)) {
-        return null;
-    }
-
-    return trimmedCode.toUpperCase();
+    const normalizedCode = normalizeShortcutToken(code);
+    return normalizedCode && /^F\d{1,2}$/.test(normalizedCode) ? normalizedCode : null;
 }
 
 export function resolveKeyboardEventShortcutKey(
@@ -155,11 +178,12 @@ export function resolveKeyboardEventShortcutKey(
 }
 
 function createShortcutParts(shortcut: string): { modifiers: string[]; key: string | null } {
-    const parts = shortcut
-        .split('+')
-        .map((part) => normalizeShortcutToken(part))
-        .filter((part): part is string => Boolean(part));
+    const normalizedParts = shortcut.split('+').map((part) => normalizeShortcutToken(part));
+    if (normalizedParts.some((part) => !part)) {
+        return { modifiers: [], key: null };
+    }
 
+    const parts = normalizedParts as string[];
     const modifierSet = new Set<string>();
     let key: string | null = null;
     for (const part of parts) {
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index 451dbc6f..3b536679 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -110,6 +110,8 @@ describe('search keybinding configuration', () => {
             normalizeSearchKeybindings({
                 'search.history.open': 42,
                 'search.input.focus': false,
+                'search.model.toggle': 'Ctrl+DefinitelyNotAKey',
+                'search.window.pin': 'Ctrl+DefinitelyNotAKey+P',
             })
         ).toEqual(defaults);
     });
diff --git a/apps/desktop/tests/utils/shortcuts.test.ts b/apps/desktop/tests/utils/shortcuts.test.ts
index c17a6d3c..3cfc6728 100644
--- a/apps/desktop/tests/utils/shortcuts.test.ts
+++ b/apps/desktop/tests/utils/shortcuts.test.ts
@@ -35,13 +35,20 @@ describe('shortcut utilities', () => {
     });
 
     it('normalizes shortcut strings with aliases and stable modifier ordering', () => {
+        expect(normalizeLocalShortcutString('mod+h')).toBe('Mod+H');
         expect(normalizeLocalShortcutString(' shift + cmd + option + k ')).toBe('Mod+Alt+Shift+K');
         expect(normalizeLocalShortcutString('control+delete')).toBe('Mod+Del');
         expect(normalizeLocalShortcutString('return')).toBe('Enter');
+        expect(normalizeLocalShortcutString('tab')).toBe('Tab');
+        expect(normalizeLocalShortcutString('insert')).toBe('Insert');
         expect(normalizeLocalShortcutString('f12')).toBe('F12');
         expect(normalizeLocalShortcutString(null)).toBeNull();
         expect(normalizeLocalShortcutString('Ctrl+Alt')).toBeNull();
         expect(normalizeLocalShortcutString('Ctrl+A+B')).toBeNull();
+        expect(normalizeLocalShortcutString('Ctrl+DefinitelyNotAKey')).toBeNull();
+        expect(normalizeLocalShortcutString('Ctrl+DefinitelyNotAKey+A')).toBeNull();
+        expect(normalizeLocalShortcutString('Ctrl++A')).toBeNull();
+        expect(normalizeLocalShortcutString('F25')).toBeNull();
         expect(normalizeLocalShortcutString('   ')).toBeNull();
 
         setPlatform('MacIntel');
@@ -67,6 +74,9 @@ describe('shortcut utilities', () => {
         expect(resolveKeyboardEventShortcutKey(' ', null)).toBe('Space');
         expect(resolveKeyboardEventShortcutKey('BrightnessUp', 'F2')).toBe('F2');
         expect(resolveKeyboardEventShortcutKey('F2', 'F3')).toBe('F2');
+        expect(resolveKeyboardEventShortcutKey('BrightnessUp', 'F25')).toBeNull();
+        expect(resolveKeyboardEventShortcutKey('x', 'Space')).toBe('X');
+        expect(resolveKeyboardEventShortcutKey('BrightnessUp', 'Space')).toBeNull();
         expect(resolveKeyboardEventShortcutKey('', 'KeyA')).toBeNull();
         expect(resolveKeyboardEventShortcutKey(undefined, undefined)).toBeNull();
     });

From 563ef2589f66e7bb324301550637140dac6ea902 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 14 Jun 2026 03:48:57 +0800
Subject: [PATCH 38/55] fix(desktop): remove hardcoded search shortcut tips

---
 apps/desktop/src/i18n/messages.ts | 12 ++++++------
 apps/desktop/src/i18n/textMap.ts  |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 3aaa0f6b..495c339b 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -829,9 +829,9 @@ const zhCNMessages = {
     'conversation.timeline.jumpToMessage': '跳转到消息: {preview}',
     'assistant.loadingTip.newLine': 'Shift+Enter 换行，适合分段表述',
     'assistant.loadingTip.switchModel': '使用配置的快捷键或点击模型图标切换模型',
-    'assistant.loadingTip.history': 'Ctrl+H 快速打开历史会话',
-    'assistant.loadingTip.alwaysOnTop': 'Ctrl+P 切换窗口置顶',
-    'assistant.loadingTip.newSession': 'Ctrl+N 开启新会话',
+    'assistant.loadingTip.history': '使用配置的快捷键快速打开历史会话',
+    'assistant.loadingTip.alwaysOnTop': '使用配置的快捷键切换窗口置顶',
+    'assistant.loadingTip.newSession': '使用配置的快捷键开启新会话',
     'assistant.loadingTip.historyButton': '右上角历史按钮可查看和切换历史会话',
     'assistant.loadingTip.copy': '消息下方按钮可复制内容',
     'assistant.loadingTip.regenerate': '消息下方按钮可重新生成回复',
@@ -1867,9 +1867,9 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'assistant.loadingTip.newLine': 'Shift+Enter inserts a new line for structured prompts',
     'assistant.loadingTip.switchModel':
         'Use the configured shortcut or the model icon to switch models',
-    'assistant.loadingTip.history': 'Ctrl+H opens conversation history',
-    'assistant.loadingTip.alwaysOnTop': 'Ctrl+P toggles always on top',
-    'assistant.loadingTip.newSession': 'Ctrl+N starts a new conversation',
+    'assistant.loadingTip.history': 'Use the configured shortcut to open conversation history',
+    'assistant.loadingTip.alwaysOnTop': 'Use the configured shortcut to toggle always on top',
+    'assistant.loadingTip.newSession': 'Use the configured shortcut to start a new conversation',
     'assistant.loadingTip.historyButton':
         'Use the history button in the top right to view and switch conversations',
     'assistant.loadingTip.copy': 'Buttons below a message can copy content',
diff --git a/apps/desktop/src/i18n/textMap.ts b/apps/desktop/src/i18n/textMap.ts
index 6def9656..59f02b34 100644
--- a/apps/desktop/src/i18n/textMap.ts
+++ b/apps/desktop/src/i18n/textMap.ts
@@ -513,9 +513,9 @@ export const zhToEnTextMap = {
     'Shift+Enter 换行，适合分段表述': 'Shift+Enter inserts a new line for structured prompts',
     使用配置的快捷键或点击模型图标切换模型:
         'Use the configured shortcut or the model icon to switch models',
-    'Ctrl+H 快速打开历史会话': 'Ctrl+H opens conversation history',
-    'Ctrl+P 切换窗口置顶': 'Ctrl+P toggles always on top',
-    'Ctrl+N 开启新会话': 'Ctrl+N starts a new conversation',
+    使用配置的快捷键快速打开历史会话: 'Use the configured shortcut to open conversation history',
+    使用配置的快捷键切换窗口置顶: 'Use the configured shortcut to toggle always on top',
+    使用配置的快捷键开启新会话: 'Use the configured shortcut to start a new conversation',
     右上角历史按钮可查看和切换历史会话:
         'Use the history button in the top right to view and switch conversations',
     消息下方按钮可复制内容: 'Buttons below a message can copy content',

From 3d995c37ecc4febbccb40eab2e5406f43bb326ca Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 14 Jun 2026 04:42:38 +0800
Subject: [PATCH 39/55] fix(desktop): harden search shortcut handling

---
 apps/desktop/src-tauri/src/commands/mod.rs    |   1 +
 .../src-tauri/src/commands/shortcut.rs        |   7 +
 .../src-tauri/src/core/system/shortcut.rs     | 259 +++++++++++++++++-
 .../src/core/window/webview_defaults.rs       |  39 ++-
 apps/desktop/src/i18n/messages.ts             |   4 +
 .../src/services/EventService/index.ts        |   1 +
 .../src/services/EventService/types.ts        |   9 +
 .../src/services/NativeService/index.ts       |   1 +
 .../src/services/NativeService/shortcut.ts    |   8 +
 .../composables/searchInteraction.ts          |   9 +-
 .../SearchView/composables/useSearchPage.ts   |  62 ++++-
 apps/desktop/src/views/SearchView/index.vue   |  43 +++
 .../General/SearchShortcutSettings.vue        |  12 +
 .../SearchView/useSearchPage.test.ts          |  71 +++++
 .../tests/services/native-service.test.ts     |  19 ++
 .../settingsGeneralComponent.test.ts          |  33 +++
 16 files changed, 568 insertions(+), 10 deletions(-)

diff --git a/apps/desktop/src-tauri/src/commands/mod.rs b/apps/desktop/src-tauri/src/commands/mod.rs
index bb64a38b..28e35069 100644
--- a/apps/desktop/src-tauri/src/commands/mod.rs
+++ b/apps/desktop/src-tauri/src/commands/mod.rs
@@ -40,6 +40,7 @@ pub fn invoke_handler<R: tauri::Runtime>(
         window::get_search_window_state,
         shortcut::register_global_shortcut,
         shortcut::get_shortcut_status,
+        shortcut::set_search_surface_shortcuts,
         clipboard::read_clipboard_payload,
         clipboard::consume_shortcut_auto_paste_payload,
         clipboard::write_clipboard_text,
diff --git a/apps/desktop/src-tauri/src/commands/shortcut.rs b/apps/desktop/src-tauri/src/commands/shortcut.rs
index defcc0b0..7784e139 100644
--- a/apps/desktop/src-tauri/src/commands/shortcut.rs
+++ b/apps/desktop/src-tauri/src/commands/shortcut.rs
@@ -15,3 +15,10 @@ pub fn register_global_shortcut<R: Runtime>(
 pub fn get_shortcut_status() -> (bool, Option<String>) {
     crate::core::system::shortcut::get_shortcut_status()
 }
+
+#[tauri::command]
+pub fn set_search_surface_shortcuts(
+    entries: Vec<crate::core::system::shortcut::SearchSurfaceShortcutEntry>,
+) -> Result<(), String> {
+    crate::core::system::shortcut::set_search_surface_shortcuts(entries)
+}
diff --git a/apps/desktop/src-tauri/src/core/system/shortcut.rs b/apps/desktop/src-tauri/src/core/system/shortcut.rs
index 0bf793fe..13f2c544 100644
--- a/apps/desktop/src-tauri/src/core/system/shortcut.rs
+++ b/apps/desktop/src-tauri/src/core/system/shortcut.rs
@@ -13,6 +13,29 @@ use tauri_plugin_global_shortcut::{
 
 static CURRENT_SHORTCUT: Mutex<Option<Shortcut>> = Mutex::new(None);
 static REGISTRATION_STATUS: Mutex<(bool, Option<String>)> = Mutex::new((false, None));
+static SEARCH_SURFACE_SHORTCUTS: Mutex<Vec<SearchSurfaceShortcut>> = Mutex::new(Vec::new());
+
+#[derive(Debug, Clone, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SearchSurfaceShortcutEntry {
+    pub action_id: String,
+    pub shortcut: String,
+}
+
+#[derive(Debug, Clone)]
+struct SearchSurfaceShortcut {
+    action_id: String,
+    shortcut: String,
+    parsed: Shortcut,
+}
+
+#[derive(Debug, Clone, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SearchSurfaceCommand {
+    pub action_id: String,
+    pub shortcut: String,
+    pub source: &'static str,
+}
 
 /// 先异步跳出 WM_HOTKEY 回调栈，再把搜索窗口切换投递回 Tauri 主事件循环。
 fn schedule_search_window_toggle<R: Runtime>(app_handle: AppHandle<R>) {
@@ -65,12 +88,6 @@ pub fn register_global_shortcut<R: Runtime>(
         .register(new_shortcut)
         .map_err(|e| format!("Failed to register shortcut: {}", e));
 
-    if result.is_err() {
-        if let Some(old_shortcut) = old_shortcut {
-            let _ = app.global_shortcut().register(old_shortcut);
-        }
-    }
-
     match result {
         Ok(_) => {
             if let Ok(mut current) = CURRENT_SHORTCUT.lock() {
@@ -81,7 +98,27 @@ pub fn register_global_shortcut<R: Runtime>(
             }
         }
         Err(ref e) => {
-            if let Ok(mut status) = REGISTRATION_STATUS.lock() {
+            if let Some(old_shortcut) = old_shortcut {
+                match app.global_shortcut().register(old_shortcut) {
+                    Ok(_) => {
+                        if let Ok(mut status) = REGISTRATION_STATUS.lock() {
+                            *status = (false, None);
+                        }
+                    }
+                    Err(restore_error) => {
+                        let message = format!(
+                            "{}; failed to restore previous shortcut: {}",
+                            e, restore_error
+                        );
+                        if let Ok(mut current) = CURRENT_SHORTCUT.lock() {
+                            *current = None;
+                        }
+                        if let Ok(mut status) = REGISTRATION_STATUS.lock() {
+                            *status = (true, Some(message));
+                        }
+                    }
+                }
+            } else if let Ok(mut status) = REGISTRATION_STATUS.lock() {
                 *status = (true, Some(e.clone()));
             }
         }
@@ -97,6 +134,156 @@ pub fn get_shortcut_status() -> (bool, Option<String>) {
         .unwrap_or((false, None))
 }
 
+pub fn set_search_surface_shortcuts(
+    entries: Vec<SearchSurfaceShortcutEntry>,
+) -> Result<(), String> {
+    let mut parsed_entries = Vec::with_capacity(entries.len());
+    for entry in entries {
+        parsed_entries.push(SearchSurfaceShortcut {
+            parsed: parse_shortcut(&entry.shortcut)?,
+            action_id: entry.action_id,
+            shortcut: entry.shortcut,
+        });
+    }
+
+    let mut shortcuts = SEARCH_SURFACE_SHORTCUTS
+        .lock()
+        .map_err(|_| "Failed to lock search surface shortcuts".to_string())?;
+    *shortcuts = parsed_entries;
+    Ok(())
+}
+
+pub fn find_search_surface_command_for_windows_accelerator(
+    virtual_key: u32,
+    control: bool,
+    alt: bool,
+    shift: bool,
+    super_key: bool,
+) -> Option<SearchSurfaceCommand> {
+    let candidate = windows_accelerator_to_shortcut(virtual_key, control, alt, shift, super_key)?;
+    let shortcuts = SEARCH_SURFACE_SHORTCUTS.lock().ok()?;
+    shortcuts
+        .iter()
+        .find(|entry| entry.parsed.mods == candidate.mods && entry.parsed.key == candidate.key)
+        .map(|entry| SearchSurfaceCommand {
+            action_id: entry.action_id.clone(),
+            shortcut: entry.shortcut.clone(),
+            source: "webview2-accelerator",
+        })
+}
+
+fn windows_accelerator_to_shortcut(
+    virtual_key: u32,
+    control: bool,
+    alt: bool,
+    shift: bool,
+    super_key: bool,
+) -> Option<Shortcut> {
+    let key = windows_virtual_key_to_code(virtual_key)?;
+    let mut modifiers = Modifiers::empty();
+    if control {
+        modifiers |= Modifiers::CONTROL;
+    }
+    if alt {
+        modifiers |= Modifiers::ALT;
+    }
+    if shift {
+        modifiers |= Modifiers::SHIFT;
+    }
+    if super_key {
+        modifiers |= Modifiers::SUPER;
+    }
+
+    Some(Shortcut::new(
+        if modifiers.is_empty() {
+            None
+        } else {
+            Some(modifiers)
+        },
+        key,
+    ))
+}
+
+fn windows_virtual_key_to_code(virtual_key: u32) -> Option<Code> {
+    match virtual_key {
+        0x08 => Some(Code::Backspace),
+        0x09 => Some(Code::Tab),
+        0x0D => Some(Code::Enter),
+        0x1B => Some(Code::Escape),
+        0x20 => Some(Code::Space),
+        0x21 => Some(Code::PageUp),
+        0x22 => Some(Code::PageDown),
+        0x23 => Some(Code::End),
+        0x24 => Some(Code::Home),
+        0x25 => Some(Code::ArrowLeft),
+        0x26 => Some(Code::ArrowUp),
+        0x27 => Some(Code::ArrowRight),
+        0x28 => Some(Code::ArrowDown),
+        0x2D => Some(Code::Insert),
+        0x2E => Some(Code::Delete),
+        0x30 => Some(Code::Digit0),
+        0x31 => Some(Code::Digit1),
+        0x32 => Some(Code::Digit2),
+        0x33 => Some(Code::Digit3),
+        0x34 => Some(Code::Digit4),
+        0x35 => Some(Code::Digit5),
+        0x36 => Some(Code::Digit6),
+        0x37 => Some(Code::Digit7),
+        0x38 => Some(Code::Digit8),
+        0x39 => Some(Code::Digit9),
+        0x41 => Some(Code::KeyA),
+        0x42 => Some(Code::KeyB),
+        0x43 => Some(Code::KeyC),
+        0x44 => Some(Code::KeyD),
+        0x45 => Some(Code::KeyE),
+        0x46 => Some(Code::KeyF),
+        0x47 => Some(Code::KeyG),
+        0x48 => Some(Code::KeyH),
+        0x49 => Some(Code::KeyI),
+        0x4A => Some(Code::KeyJ),
+        0x4B => Some(Code::KeyK),
+        0x4C => Some(Code::KeyL),
+        0x4D => Some(Code::KeyM),
+        0x4E => Some(Code::KeyN),
+        0x4F => Some(Code::KeyO),
+        0x50 => Some(Code::KeyP),
+        0x51 => Some(Code::KeyQ),
+        0x52 => Some(Code::KeyR),
+        0x53 => Some(Code::KeyS),
+        0x54 => Some(Code::KeyT),
+        0x55 => Some(Code::KeyU),
+        0x56 => Some(Code::KeyV),
+        0x57 => Some(Code::KeyW),
+        0x58 => Some(Code::KeyX),
+        0x59 => Some(Code::KeyY),
+        0x5A => Some(Code::KeyZ),
+        0x70 => Some(Code::F1),
+        0x71 => Some(Code::F2),
+        0x72 => Some(Code::F3),
+        0x73 => Some(Code::F4),
+        0x74 => Some(Code::F5),
+        0x75 => Some(Code::F6),
+        0x76 => Some(Code::F7),
+        0x77 => Some(Code::F8),
+        0x78 => Some(Code::F9),
+        0x79 => Some(Code::F10),
+        0x7A => Some(Code::F11),
+        0x7B => Some(Code::F12),
+        0xBA => Some(Code::Semicolon),
+        0xBB => Some(Code::Equal),
+        0xBC => Some(Code::Comma),
+        0xBD => Some(Code::Minus),
+        0xBE => Some(Code::Period),
+        0xBF => Some(Code::Slash),
+        0xC0 => Some(Code::Backquote),
+        0xDB => Some(Code::BracketLeft),
+        0xDC => Some(Code::Backslash),
+        0xDD => Some(Code::BracketRight),
+        0xDE => Some(Code::Quote),
+        _ => None,
+    }
+}
+
 pub fn parse_shortcut(shortcut_str: &str) -> Result<Shortcut, String> {
     let parts: Vec<&str> = shortcut_str.split('+').map(|s| s.trim()).collect();
 
@@ -143,6 +330,17 @@ pub fn parse_shortcut(shortcut_str: &str) -> Result<Shortcut, String> {
                     "arrowdown" | "down" => Code::ArrowDown,
                     "arrowleft" | "left" => Code::ArrowLeft,
                     "arrowright" | "right" => Code::ArrowRight,
+                    "," | "comma" => Code::Comma,
+                    "." | "period" => Code::Period,
+                    "=" | "equal" | "equals" => Code::Equal,
+                    "-" | "minus" => Code::Minus,
+                    ";" | "semicolon" => Code::Semicolon,
+                    "/" | "slash" => Code::Slash,
+                    "'" | "quote" => Code::Quote,
+                    "`" | "backquote" => Code::Backquote,
+                    "[" | "bracketleft" => Code::BracketLeft,
+                    "]" | "bracketright" => Code::BracketRight,
+                    "\\" | "backslash" => Code::Backslash,
                     "a" => Code::KeyA,
                     "b" => Code::KeyB,
                     "c" => Code::KeyC,
@@ -271,4 +469,51 @@ mod tests {
         assert_eq!(shortcut.mods, Modifiers::SUPER);
         assert_eq!(shortcut.key, Code::Space);
     }
+
+    #[test]
+    fn parse_shortcut_accepts_punctuation_keys() {
+        let shortcut = parse_shortcut("Mod+,").expect("mod+comma parses");
+        let expected_mod = if cfg!(target_os = "macos") {
+            Modifiers::SUPER
+        } else {
+            Modifiers::CONTROL
+        };
+        assert_eq!(shortcut.mods, expected_mod);
+        assert_eq!(shortcut.key, Code::Comma);
+
+        let shortcut = parse_shortcut("Ctrl+=").expect("ctrl+equal parses");
+        assert_eq!(shortcut.mods, Modifiers::CONTROL);
+        assert_eq!(shortcut.key, Code::Equal);
+    }
+
+    #[test]
+    fn search_surface_command_matches_windows_accelerator() {
+        set_search_surface_shortcuts(vec![
+            SearchSurfaceShortcutEntry {
+                action_id: "search.model.toggle".to_string(),
+                shortcut: "Mod+M".to_string(),
+            },
+            SearchSurfaceShortcutEntry {
+                action_id: "search.settings.open".to_string(),
+                shortcut: "Mod+,".to_string(),
+            },
+        ])
+        .expect("shortcuts sync");
+
+        let command = find_search_surface_command_for_windows_accelerator(
+            0xBC,
+            !cfg!(target_os = "macos"),
+            false,
+            false,
+            cfg!(target_os = "macos"),
+        )
+        .expect("comma shortcut matches");
+        assert_eq!(command.action_id, "search.settings.open");
+        assert_eq!(command.shortcut, "Mod+,");
+
+        assert!(find_search_surface_command_for_windows_accelerator(
+            0x4D, false, false, false, false
+        )
+        .is_none());
+    }
 }
diff --git a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
index 9eaacf0b..f7bb8a94 100644
--- a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
+++ b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
@@ -20,7 +20,9 @@ use webview2_com::Microsoft::Web::WebView2::Win32::{
 #[cfg(target_os = "windows")]
 use windows::Win32::Foundation::{BOOL, HWND, LPARAM, LRESULT, TRUE, WPARAM};
 #[cfg(target_os = "windows")]
-use windows::Win32::UI::Input::KeyboardAndMouse::{GetKeyState, VK_CONTROL, VK_SHIFT, VK_SPACE};
+use windows::Win32::UI::Input::KeyboardAndMouse::{
+    GetKeyState, VK_CONTROL, VK_LWIN, VK_MENU, VK_RWIN, VK_SHIFT, VK_SPACE,
+};
 #[cfg(target_os = "windows")]
 use windows::Win32::UI::Shell::{DefSubclassProc, SetWindowSubclass};
 #[cfg(target_os = "windows")]
@@ -189,6 +191,12 @@ fn is_system_menu_accelerator_command(key_event_kind: i32, virtual_key: u32) ->
     is_system_key_down && virtual_key == u32::from(VK_SPACE.0)
 }
 
+#[cfg(target_os = "windows")]
+fn is_accelerator_key_down_event(key_event_kind: i32) -> bool {
+    key_event_kind == COREWEBVIEW2_KEY_EVENT_KIND_KEY_DOWN.0
+        || key_event_kind == COREWEBVIEW2_KEY_EVENT_KIND_SYSTEM_KEY_DOWN.0
+}
+
 #[cfg(target_os = "windows")]
 /// 注册 WebView2 accelerator 处理器，将 Alt+Space 转成 Tauri 事件供前端捕获。
 ///
@@ -217,6 +225,35 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
                 args.VirtualKey(&mut virtual_key)?;
 
                 if !is_system_menu_accelerator_command(key_event_kind.0, virtual_key) {
+                    if !is_accelerator_key_down_event(key_event_kind.0) {
+                        return Ok(());
+                    }
+
+                    let is_ctrl_down = (GetKeyState(i32::from(VK_CONTROL.0)) as u16 & 0x8000) != 0;
+                    let is_alt_down = (GetKeyState(i32::from(VK_MENU.0)) as u16 & 0x8000) != 0;
+                    let is_shift_down = (GetKeyState(i32::from(VK_SHIFT.0)) as u16 & 0x8000) != 0;
+                    let is_super_down = (GetKeyState(i32::from(VK_LWIN.0)) as u16 & 0x8000) != 0
+                        || (GetKeyState(i32::from(VK_RWIN.0)) as u16 & 0x8000) != 0;
+
+                    let Some(command) =
+                        crate::core::system::shortcut::find_search_surface_command_for_windows_accelerator(
+                            virtual_key,
+                            is_ctrl_down,
+                            is_alt_down,
+                            is_shift_down,
+                            is_super_down,
+                        )
+                    else {
+                        return Ok(());
+                    };
+
+                    if let Ok(args2) =
+                        Interface::cast::<ICoreWebView2AcceleratorKeyPressedEventArgs2>(&args)
+                    {
+                        let _ = args2.SetIsBrowserAcceleratorKeyEnabled(false);
+                    }
+                    let _ = args.SetHandled(true);
+                    let _ = app_handle.emit("search-surface-command", command);
                     return Ok(());
                 }
 
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 495c339b..710b18e9 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -130,6 +130,8 @@ const zhCNMessages = {
         '快捷键需要包含 Ctrl、Alt 或 Cmd，或使用允许的功能键',
     'settings.general.searchShortcuts.errors.reserved':
         '该快捷键保留给输入/导航行为，请选择其他组合',
+    'settings.general.searchShortcuts.errors.unsupported':
+        '暂不支持该按键作为搜索页快捷键，请换一个组合',
     'settings.general.searchShortcuts.errors.duplicate': '该快捷键已被“{action}”使用，请换一个组合',
     'settings.general.searchShortcuts.errors.globalConflict':
         '该快捷键与全局唤起快捷键冲突，请换一个组合',
@@ -1098,6 +1100,8 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
         'A shortcut must include Ctrl, Alt, or Cmd, or use an allowed function key',
     'settings.general.searchShortcuts.errors.reserved':
         'This shortcut is reserved for typing or navigation. Choose another combination.',
+    'settings.general.searchShortcuts.errors.unsupported':
+        'This key is not supported for search shortcuts yet. Choose another combination.',
     'settings.general.searchShortcuts.errors.duplicate':
         'This shortcut is already used by "{action}". Choose another combination.',
     'settings.general.searchShortcuts.errors.globalConflict':
diff --git a/apps/desktop/src/services/EventService/index.ts b/apps/desktop/src/services/EventService/index.ts
index f345d135..88bbc139 100644
--- a/apps/desktop/src/services/EventService/index.ts
+++ b/apps/desktop/src/services/EventService/index.ts
@@ -77,6 +77,7 @@ export type {
     GeneralSettingKey,
     McpServerStatus,
     McpStatusChangeEvent,
+    SearchSurfaceCommandEvent,
     SettingsGeneralUpdatedEvent,
     ShortcutCaptureSystemKeyEvent,
     WindowFocusEvent,
diff --git a/apps/desktop/src/services/EventService/types.ts b/apps/desktop/src/services/EventService/types.ts
index b3616512..d52b36eb 100644
--- a/apps/desktop/src/services/EventService/types.ts
+++ b/apps/desktop/src/services/EventService/types.ts
@@ -11,6 +11,7 @@ import type {
     PopupSessionSearchQueryChangePayload,
 } from '@services/PopupService/types';
 
+import type { SearchKeybindingActionId } from '@/config/searchKeybindings';
 import type { GeneralSettingKey, GeneralSettingValue } from '@/stores/setting';
 import type { SessionStatusReminderKind } from '@/utils/session';
 
@@ -56,6 +57,7 @@ export enum AppEvent {
     POPUP_SESSION_SEARCH_QUERY_CHANGE = 'popup-session-history-search-query-change',
     SEARCH_SURFACE_SHOWN = 'search-surface-shown',
     SEARCH_SURFACE_HIDDEN = 'search-surface-hidden',
+    SEARCH_SURFACE_COMMAND = 'search-surface-command',
     SESSION_TASK_STATUS_CHANGED = 'session:task:status-changed',
     SESSION_STATUS_REMINDER_ACTION = 'session-status-reminder:action',
 
@@ -118,6 +120,12 @@ export interface SearchSurfaceHiddenEvent {
     sequence?: number;
 }
 
+export interface SearchSurfaceCommandEvent {
+    actionId: SearchKeybindingActionId;
+    shortcut: string;
+    source: 'webview2-accelerator';
+}
+
 /**
  * 系统级快捷键（如 Alt+Space）由 WebView2 当作 system accelerator 截获，
  * 不会派发 DOM keydown，因此宿主在 accelerator 阶段直接 emit 此事件，
@@ -201,6 +209,7 @@ export interface AppEventMap {
     [AppEvent.POPUP_SESSION_SEARCH_QUERY_CHANGE]: PopupSessionSearchQueryChangePayload;
     [AppEvent.SEARCH_SURFACE_SHOWN]: SearchSurfaceShownEvent;
     [AppEvent.SEARCH_SURFACE_HIDDEN]: SearchSurfaceHiddenEvent;
+    [AppEvent.SEARCH_SURFACE_COMMAND]: SearchSurfaceCommandEvent;
     [AppEvent.SESSION_TASK_STATUS_CHANGED]: SessionTaskStatusChangedEvent;
     [AppEvent.SESSION_STATUS_REMINDER_ACTION]: SessionStatusReminderActionEvent;
 
diff --git a/apps/desktop/src/services/NativeService/index.ts b/apps/desktop/src/services/NativeService/index.ts
index 4cc78738..9b518b3a 100644
--- a/apps/desktop/src/services/NativeService/index.ts
+++ b/apps/desktop/src/services/NativeService/index.ts
@@ -21,6 +21,7 @@ export type {
     McpToolDefinition,
     McpTransportType,
 } from './mcp';
+export type { SearchSurfaceShortcutEntry } from './shortcut';
 export type {
     AppUpdateChannel,
     AppUpdateChannelLatest,
diff --git a/apps/desktop/src/services/NativeService/shortcut.ts b/apps/desktop/src/services/NativeService/shortcut.ts
index 78afa41c..f9fe5b7f 100644
--- a/apps/desktop/src/services/NativeService/shortcut.ts
+++ b/apps/desktop/src/services/NativeService/shortcut.ts
@@ -1,5 +1,10 @@
 import { invoke } from '@tauri-apps/api/core';
 
+export interface SearchSurfaceShortcutEntry {
+    actionId: string;
+    shortcut: string;
+}
+
 export const shortcut = {
     registerGlobalShortcut(shortcut: string): Promise<void> {
         return invoke('register_global_shortcut', { shortcut });
@@ -7,4 +12,7 @@ export const shortcut = {
     getShortcutStatus(): Promise<[boolean, string | null]> {
         return invoke('get_shortcut_status');
     },
+    setSearchSurfaceShortcuts(entries: SearchSurfaceShortcutEntry[]): Promise<void> {
+        return invoke('set_search_surface_shortcuts', { entries });
+    },
 } as const;
diff --git a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
index 25152aa8..74f7fd70 100644
--- a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
+++ b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
@@ -7,7 +7,7 @@ import { AppEvent, eventService } from '@services/EventService';
 import type { PopupKeydownPayload } from '@services/PopupService';
 import { computed, type ComputedRef, reactive, type Ref, ref, watch } from 'vue';
 
-import type { SearchKeybindings } from '@/config/searchKeybindings';
+import type { SearchKeybindingActionId, SearchKeybindings } from '@/config/searchKeybindings';
 import { useAskUserStore } from '@/stores/askUser';
 import {
     cloneInputHistorySnapshot,
@@ -137,6 +137,7 @@ export interface UseSearchKeyboardOptions {
     toggleWindowPin: () => Promise<void>;
     toggleWindowMaximize: () => Promise<void>;
     openSettingsWindow: () => Promise<void>;
+    handleSearchKeybindingAction?: (actionId: SearchKeybindingActionId) => void | Promise<void>;
     handleSubmit: (query: string) => Promise<void>;
     cancelRequest: () => void;
     clearSession: () => void;
@@ -675,6 +676,7 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
         toggleWindowPin,
         toggleWindowMaximize,
         openSettingsWindow,
+        handleSearchKeybindingAction,
         handleSubmit,
         cancelRequest,
         clearSession,
@@ -776,6 +778,11 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
             queryText.value = '';
         },
         onSearchKeybindingAction: async (actionId) => {
+            if (handleSearchKeybindingAction) {
+                await handleSearchKeybindingAction(actionId);
+                return;
+            }
+
             switch (actionId) {
                 case 'search.history.open':
                     await openHistoryDialog();
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
index 09ce2c48..eae7aeae 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
@@ -4,7 +4,10 @@
  */
 import { useAlert } from '@composables/useAlert';
 import { AppEvent, eventService } from '@services/EventService';
-import type { SessionStatusReminderActionEvent } from '@services/EventService/types';
+import type {
+    SearchSurfaceCommandEvent,
+    SessionStatusReminderActionEvent,
+} from '@services/EventService/types';
 import { native } from '@services/NativeService';
 import { initNotificationPermission, notify } from '@services/NotificationService';
 import type { ModelDropdownData, ModelDropdownPopupItem } from '@services/PopupService';
@@ -13,9 +16,11 @@ import { runStartupTasks } from '@services/StartupService';
 import { getCurrentWindow } from '@tauri-apps/api/window';
 import { nextTick, onMounted, onUnmounted, type Ref, ref, watch } from 'vue';
 
+import { SEARCH_KEYBINDING_DEFINITIONS, type SearchKeybindings } from '@/config/searchKeybindings';
 import { type MessageKey, type MessageParams, t } from '@/i18n';
 import { useSettingsStore } from '@/stores/settings';
 import { isE2eTestMode } from '@/utils/runtimeMode';
+import { normalizeLocalShortcutString } from '@/utils/shortcuts';
 
 import type {
     ConversationPanelHandle,
@@ -34,6 +39,13 @@ import { useModelDropdownPopup } from './useModelDropdownPopup';
 
 const HIDE_TIMEOUT_MS = 5 * 60 * 1000;
 
+function buildSearchSurfaceShortcutEntries(searchKeybindings: SearchKeybindings) {
+    return SEARCH_KEYBINDING_DEFINITIONS.flatMap((definition) => {
+        const shortcut = normalizeLocalShortcutString(searchKeybindings[definition.id]);
+        return shortcut ? [{ actionId: definition.id, shortcut }] : [];
+    });
+}
+
 export function useSearchWindowPin() {
     const currentWindow = getCurrentWindow();
     const isPinned = ref(false);
@@ -377,6 +389,7 @@ interface UseSearchPageLifecycleOptions {
     isDragging: Ref<boolean>;
     isPinned: Ref<boolean>;
     isMaximized?: Readonly<Ref<boolean>>;
+    searchKeybindings?: Readonly<Ref<SearchKeybindings>>;
     interactionContext: ReturnType<typeof createSearchInteractionContext>;
     syncWindowPinState: () => Promise<boolean>;
     clearSession: () => void | Promise<void>;
@@ -389,6 +402,7 @@ interface UseSearchPageLifecycleOptions {
     ) => void | Promise<void>;
     handleAiModelsUpdated?: () => void | Promise<void>;
     handleShortcutAutoPaste?: () => void | Promise<void>;
+    handleSearchSurfaceCommand?: (payload: SearchSurfaceCommandEvent) => void | Promise<void>;
 }
 
 export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
@@ -398,6 +412,7 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
         isDragging,
         isPinned,
         isMaximized,
+        searchKeybindings,
         interactionContext,
         syncWindowPinState,
         clearSession,
@@ -408,6 +423,7 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
         handleSessionStatusReminderAction,
         handleAiModelsUpdated,
         handleShortcutAutoPaste,
+        handleSearchSurfaceCommand,
     } = options;
 
     const settingsStore = useSettingsStore();
@@ -415,10 +431,12 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
     let unlistenAiModelsUpdated: (() => void) | null = null;
     let unlistenSearchSurfaceShown: (() => void) | null = null;
     let unlistenSearchSurfaceHidden: (() => void) | null = null;
+    let unlistenSearchSurfaceCommand: (() => void) | null = null;
     let unlistenSessionTaskStatusChanged: (() => void) | null = null;
     let unlistenSessionStatusReminderAction: (() => void) | null = null;
     let stopReadyWatch: (() => void) | null = null;
     let stopPinnedWatch: (() => void) | null = null;
+    let stopSearchSurfaceShortcutWatch: (() => void) | null = null;
     let lifecycleInitialized = false;
     let restoredActivationEpoch: number | null = null;
     let latestSurfaceSequence = 0;
@@ -565,6 +583,20 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
         }
     }
 
+    async function syncSearchSurfaceShortcutsSafely() {
+        if (!searchKeybindings) {
+            return;
+        }
+
+        try {
+            await native.shortcut.setSearchSurfaceShortcuts(
+                buildSearchSurfaceShortcutEntries(searchKeybindings.value)
+            );
+        } catch (error) {
+            console.error('[SearchView] Failed to sync search surface shortcuts:', error);
+        }
+    }
+
     async function initializeSearchView() {
         try {
             await initializeGlobalShortcut();
@@ -666,6 +698,20 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
             }
         );
 
+        if (handleSearchSurfaceCommand) {
+            unlistenSearchSurfaceCommand = await eventService.on(
+                AppEvent.SEARCH_SURFACE_COMMAND,
+                (payload) => {
+                    void Promise.resolve(handleSearchSurfaceCommand(payload)).catch((error) => {
+                        console.error(
+                            '[SearchView] Failed to handle search surface command:',
+                            error
+                        );
+                    });
+                }
+            );
+        }
+
         unlistenSessionTaskStatusChanged = await eventService.on(
             AppEvent.SESSION_TASK_STATUS_CHANGED,
             sessionStatusReminderCoordinator.handleTaskStatusChanged
@@ -721,6 +767,16 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
             { immediate: true, flush: 'sync' }
         );
 
+        if (searchKeybindings) {
+            stopSearchSurfaceShortcutWatch = watch(
+                searchKeybindings,
+                () => {
+                    void syncSearchSurfaceShortcutsSafely();
+                },
+                { deep: true, immediate: true, flush: 'post' }
+            );
+        }
+
         if (viewReady.value) {
             void startLifecycleOnceReady();
             return;
@@ -749,12 +805,16 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
         stopReadyWatch = null;
         stopPinnedWatch?.();
         stopPinnedWatch = null;
+        stopSearchSurfaceShortcutWatch?.();
+        stopSearchSurfaceShortcutWatch = null;
         unlistenAiModelsUpdated?.();
         unlistenAiModelsUpdated = null;
         unlistenSearchSurfaceShown?.();
         unlistenSearchSurfaceShown = null;
         unlistenSearchSurfaceHidden?.();
         unlistenSearchSurfaceHidden = null;
+        unlistenSearchSurfaceCommand?.();
+        unlistenSearchSurfaceCommand = null;
         unlistenSessionTaskStatusChanged?.();
         unlistenSessionTaskStatusChanged = null;
         unlistenSessionStatusReminderAction?.();
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index 6b35ec92..0d27fbee 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -14,6 +14,7 @@
     import { storeToRefs } from 'pinia';
     import { computed, nextTick, onMounted, onUnmounted, reactive, ref, toRef, watch } from 'vue';
 
+    import type { SearchKeybindingActionId } from '@/config/searchKeybindings';
     import { t } from '@/i18n';
     import { mcpManager } from '@/services/AgentService/infrastructure/mcp';
     import type { SessionTaskStatus } from '@/services/AgentService/task/types';
@@ -399,12 +400,47 @@
         await refreshModelDropdownData();
     }
 
+    async function handleSearchKeybindingAction(actionId: SearchKeybindingActionId) {
+        switch (actionId) {
+            case 'search.history.open':
+                await openHistoryDialog();
+                return;
+            case 'search.input.focus':
+                await hideAllPopups();
+                await controller.focusSearchInput();
+                return;
+            case 'search.session.new':
+                await handleStartNewSession();
+                return;
+            case 'search.session.reopenLastClosed':
+                await handleReopenLastClosedSession();
+                return;
+            case 'search.model.toggle':
+                await handleToggleModelDropdownRequest();
+                return;
+            case 'search.window.pin':
+                await handleToggleWindowPin();
+                return;
+            case 'search.window.maximize':
+                await handleToggleMaximize();
+                return;
+            case 'search.settings.open':
+                await native.window.openSettingsWindow();
+                return;
+            default: {
+                const exhaustiveActionId: never = actionId;
+                throw new Error(`Unhandled search keybinding action: ${exhaustiveActionId}`);
+            }
+        }
+    }
+
     const { hideSearchWindow } = useSearchPageLifecycle({
         controller,
         viewReady,
         isDragging,
         isPinned,
         isMaximized: effectiveWindowMaximized,
+        searchKeybindings,
         interactionContext: searchInteractionContext,
         syncWindowPinState,
         clearSession: clearSessionToIdle,
@@ -415,6 +451,12 @@
         handleSessionStatusReminderAction,
         handleAiModelsUpdated,
         handleShortcutAutoPaste: tryShortcutAutoPaste,
+        handleSearchSurfaceCommand: async (payload) => {
+            if (!viewReady.value) {
+                return;
+            }
+            await handleSearchKeybindingAction(payload.actionId);
+        },
     });
 
     function getSessionHistoryPopupData(): SessionHistoryData {
@@ -537,6 +579,7 @@
         toggleWindowPin: handleToggleWindowPin,
         toggleWindowMaximize: handleToggleMaximize,
         openSettingsWindow: native.window.openSettingsWindow,
+        handleSearchKeybindingAction,
         handleSubmit,
         cancelRequest,
         clearSession: clearSessionToIdle,
diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index f6418462..4f80d206 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -249,6 +249,18 @@
         const normalizedShortcut =
             shortcut === null ? null : normalizeLocalShortcutString(shortcut);
 
+        if (shortcut !== null && !normalizedShortcut) {
+            reportSearchShortcutError(
+                actionId,
+                'settings.general.searchShortcuts.errors.unsupported'
+            );
+            updateSearchShortcutDisplay(
+                actionId,
+                formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
+            );
+            return false;
+        }
+
         if (normalizedShortcut) {
             const definition = getSearchKeybindingDefinition(actionId);
             const allowsModifierlessFunctionShortcut =
diff --git a/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts b/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
index 57a278ff..1d145faf 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
@@ -3,6 +3,7 @@ import { mountComposable } from '@tests/utils/composables';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { nextTick, ref } from 'vue';
 
+import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
 import { createSearchInteractionContext } from '@/views/SearchView/composables/searchInteraction';
 import {
     useSearchPageController,
@@ -47,6 +48,7 @@ const {
             },
             shortcut: {
                 registerGlobalShortcut: vi.fn(),
+                setSearchSurfaceShortcuts: vi.fn(),
             },
             window: {
                 hideSearchWindow: vi.fn(),
@@ -236,6 +238,7 @@ describe('useSearchPageLifecycle', () => {
         currentWindowMock.setAlwaysOnTop.mockResolvedValue(undefined);
 
         nativeMock.shortcut.registerGlobalShortcut.mockResolvedValue(undefined);
+        nativeMock.shortcut.setSearchSurfaceShortcuts.mockResolvedValue(undefined);
         nativeMock.runtime.getRuntimeInfo.mockResolvedValue({ isE2eTestMode: false });
         nativeMock.window.hideSearchWindow.mockResolvedValue(undefined);
         nativeMock.window.setTrayStatusIndicator.mockResolvedValue(undefined);
@@ -304,6 +307,74 @@ describe('useSearchPageLifecycle', () => {
         mounted.unmount();
     });
 
+    it('syncs search surface shortcuts and delegates host accelerator commands', async () => {
+        const controller = createController();
+        const interactionContext = createSearchInteractionContext();
+        const searchKeybindings = ref(createDefaultSearchKeybindings());
+        const handleSearchSurfaceCommand = vi.fn().mockResolvedValue(undefined);
+
+        const mounted = await mountComposable(() =>
+            useSearchPageLifecycle({
+                controller: controller as never,
+                viewReady: ref(true),
+                isDragging: ref(false),
+                isPinned: ref(false),
+                searchKeybindings,
+                interactionContext,
+                syncWindowPinState: vi.fn().mockResolvedValue(false),
+                clearSession: vi.fn(),
+                handleSearchSurfaceCommand,
+            })
+        );
+
+        await flushLifecycle();
+
+        expect(nativeMock.shortcut.setSearchSurfaceShortcuts).toHaveBeenCalledWith(
+            expect.arrayContaining([
+                {
+                    actionId: 'search.model.toggle',
+                    shortcut: 'Mod+M',
+                },
+                {
+                    actionId: 'search.settings.open',
+                    shortcut: 'Mod+,',
+                },
+            ])
+        );
+
+        const commandHandler = eventHandlers.get(AppEvent.SEARCH_SURFACE_COMMAND);
+        expect(commandHandler).toBeDefined();
+        await commandHandler!({
+            actionId: 'search.model.toggle',
+            shortcut: 'Mod+M',
+            source: 'webview2-accelerator',
+        });
+        await flushLifecycle();
+
+        expect(handleSearchSurfaceCommand).toHaveBeenCalledWith({
+            actionId: 'search.model.toggle',
+            shortcut: 'Mod+M',
+            source: 'webview2-accelerator',
+        });
+
+        searchKeybindings.value = {
+            ...searchKeybindings.value,
+            'search.model.toggle': null,
+        };
+        await flushLifecycle();
+
+        expect(nativeMock.shortcut.setSearchSurfaceShortcuts).toHaveBeenLastCalledWith(
+            expect.not.arrayContaining([
+                {
+                    actionId: 'search.model.toggle',
+                    shortcut: 'Mod+M',
+                },
+            ])
+        );
+
+        mounted.unmount();
+    });
+
     it('does not send status notifications while the search surface is visible', async () => {
         const controller = createController();
         const interactionContext = createSearchInteractionContext();
diff --git a/apps/desktop/tests/services/native-service.test.ts b/apps/desktop/tests/services/native-service.test.ts
index 28e312d6..233b5afe 100644
--- a/apps/desktop/tests/services/native-service.test.ts
+++ b/apps/desktop/tests/services/native-service.test.ts
@@ -868,6 +868,25 @@ describe('NativeService supporting boundaries', () => {
             cmd: 'register_global_shortcut',
             payload: { shortcut: 'Ctrl+Shift+K' },
         },
+        {
+            name: 'syncs search surface shortcuts',
+            call: () =>
+                shortcut.setSearchSurfaceShortcuts([
+                    {
+                        actionId: 'search.model.toggle',
+                        shortcut: 'Mod+M',
+                    },
+                ]),
+            cmd: 'set_search_surface_shortcuts',
+            payload: {
+                entries: [
+                    {
+                        actionId: 'search.model.toggle',
+                        shortcut: 'Mod+M',
+                    },
+                ],
+            },
+        },
         {
             name: 'enables autostart',
             call: () => autostart.enableAutostart(),
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 13cb82e1..c1da2ac5 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -558,6 +558,39 @@ describe('SettingsGeneralSection', () => {
         });
     });
 
+    it('rejects captured plus shortcuts instead of saving a disabled shortcut', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+
+        window.dispatchEvent(
+            new KeyboardEvent('keydown', {
+                key: '+',
+                code: 'Equal',
+                ctrlKey: true,
+                shiftKey: true,
+            })
+        );
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Ctrl+H');
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'F1',
+        });
+    });
+
     it('shows fixed search shortcuts as unsupported for editing', async () => {
         const wrapper = mount(GeneralSection);
 

From ceb291279a18a2f36020522b2a23a8cea812e297 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 14 Jun 2026 16:04:53 +0800
Subject: [PATCH 40/55] fix(desktop): harden search shortcut accelerators

---
 .../src-tauri/src/core/system/shortcut.rs     | 67 +++++++++++++--
 .../src/core/window/webview_defaults.rs       |  7 +-
 apps/desktop/src/utils/shortcuts.ts           | 20 ++++-
 .../interaction/useSearchKeyboardRouter.ts    | 46 ++++++++++-
 .../composables/searchInteraction.ts          | 36 ++++++++-
 .../SearchView/composables/useSearchPage.ts   | 29 ++++---
 apps/desktop/src/views/SearchView/index.vue   | 12 +--
 .../General/SearchShortcutSettings.vue        | 26 +++++-
 .../SearchView/searchInteraction.test.ts      | 81 +++++++++++++++++++
 .../useSearchKeyboardRouter.test.ts           | 38 +++++++++
 .../SearchView/useSearchPage.test.ts          | 12 +++
 .../tests/config/searchKeybindings.test.ts    |  2 +
 apps/desktop/tests/utils/shortcuts.test.ts    |  4 +
 .../settingsGeneralComponent.test.ts          | 43 +++++++++-
 14 files changed, 388 insertions(+), 35 deletions(-)

diff --git a/apps/desktop/src-tauri/src/core/system/shortcut.rs b/apps/desktop/src-tauri/src/core/system/shortcut.rs
index 13f2c544..cf5b25fb 100644
--- a/apps/desktop/src-tauri/src/core/system/shortcut.rs
+++ b/apps/desktop/src-tauri/src/core/system/shortcut.rs
@@ -138,19 +138,30 @@ pub fn set_search_surface_shortcuts(
     entries: Vec<SearchSurfaceShortcutEntry>,
 ) -> Result<(), String> {
     let mut parsed_entries = Vec::with_capacity(entries.len());
+    let mut parse_errors = Vec::new();
     for entry in entries {
-        parsed_entries.push(SearchSurfaceShortcut {
-            parsed: parse_shortcut(&entry.shortcut)?,
-            action_id: entry.action_id,
-            shortcut: entry.shortcut,
-        });
+        match parse_shortcut(&entry.shortcut) {
+            Ok(parsed) => parsed_entries.push(SearchSurfaceShortcut {
+                parsed,
+                action_id: entry.action_id,
+                shortcut: entry.shortcut,
+            }),
+            Err(error) => parse_errors.push(format!("{}: {}", entry.action_id, error)),
+        }
     }
 
     let mut shortcuts = SEARCH_SURFACE_SHORTCUTS
         .lock()
         .map_err(|_| "Failed to lock search surface shortcuts".to_string())?;
     *shortcuts = parsed_entries;
-    Ok(())
+    if parse_errors.is_empty() {
+        Ok(())
+    } else {
+        Err(format!(
+            "Ignored unsupported search surface shortcuts: {}",
+            parse_errors.join("; ")
+        ))
+    }
 }
 
 pub fn find_search_surface_command_for_windows_accelerator(
@@ -411,6 +422,9 @@ pub fn parse_shortcut(shortcut_str: &str) -> Result<Shortcut, String> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use std::sync::Mutex;
+
+    static SEARCH_SURFACE_SHORTCUT_TEST_LOCK: Mutex<()> = Mutex::new(());
 
     #[test]
     fn parse_shortcut_accepts_ctrl_alias() {
@@ -488,6 +502,7 @@ mod tests {
 
     #[test]
     fn search_surface_command_matches_windows_accelerator() {
+        let _guard = SEARCH_SURFACE_SHORTCUT_TEST_LOCK.lock().expect("test lock");
         set_search_surface_shortcuts(vec![
             SearchSurfaceShortcutEntry {
                 action_id: "search.model.toggle".to_string(),
@@ -516,4 +531,44 @@ mod tests {
         )
         .is_none());
     }
+
+    #[test]
+    fn search_surface_shortcut_sync_drops_invalid_entries_without_retaining_old_commands() {
+        let _guard = SEARCH_SURFACE_SHORTCUT_TEST_LOCK.lock().expect("test lock");
+        set_search_surface_shortcuts(vec![SearchSurfaceShortcutEntry {
+            action_id: "search.model.toggle".to_string(),
+            shortcut: "Mod+M".to_string(),
+        }])
+        .expect("initial shortcut sync");
+
+        let result = set_search_surface_shortcuts(vec![
+            SearchSurfaceShortcutEntry {
+                action_id: "search.model.toggle".to_string(),
+                shortcut: "Mod+F13".to_string(),
+            },
+            SearchSurfaceShortcutEntry {
+                action_id: "search.settings.open".to_string(),
+                shortcut: "Mod+,".to_string(),
+            },
+        ]);
+
+        assert!(result.is_err());
+        assert!(find_search_surface_command_for_windows_accelerator(
+            0x4D,
+            !cfg!(target_os = "macos"),
+            false,
+            false,
+            cfg!(target_os = "macos"),
+        )
+        .is_none());
+        let command = find_search_surface_command_for_windows_accelerator(
+            0xBC,
+            !cfg!(target_os = "macos"),
+            false,
+            false,
+            cfg!(target_os = "macos"),
+        )
+        .expect("valid shortcut remains synced");
+        assert_eq!(command.action_id, "search.settings.open");
+    }
 }
diff --git a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
index f7bb8a94..d4002c48 100644
--- a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
+++ b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
@@ -209,6 +209,7 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
     controller: &ICoreWebView2Controller,
 ) -> Result<(), String> {
     let app_handle = window.app_handle().clone();
+    let search_surface_window = (window.label() == "main").then(|| window.clone());
     let mut token = 0i64;
     let handler = AcceleratorKeyPressedEventHandler::create(Box::new(
         move |_controller: Option<ICoreWebView2Controller>,
@@ -229,6 +230,10 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
                         return Ok(());
                     }
 
+                    let Some(search_surface_window) = &search_surface_window else {
+                        return Ok(());
+                    };
+
                     let is_ctrl_down = (GetKeyState(i32::from(VK_CONTROL.0)) as u16 & 0x8000) != 0;
                     let is_alt_down = (GetKeyState(i32::from(VK_MENU.0)) as u16 & 0x8000) != 0;
                     let is_shift_down = (GetKeyState(i32::from(VK_SHIFT.0)) as u16 & 0x8000) != 0;
@@ -253,7 +258,7 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
                         let _ = args2.SetIsBrowserAcceleratorKeyEnabled(false);
                     }
                     let _ = args.SetHandled(true);
-                    let _ = app_handle.emit("search-surface-command", command);
+                    let _ = search_surface_window.emit("search-surface-command", command);
                     return Ok(());
                 }
 
diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index 16a3075d..0df696f6 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -14,6 +14,21 @@ export interface CapturedShortcutResult {
 
 const MODIFIER_DISPLAY_ORDER = ['Mod', 'Ctrl', 'Alt', 'Shift'] as const;
 const SUPPORTED_CAPTURE_MODIFIERS = new Set(['Ctrl', 'Alt', 'Shift', 'Mod']);
+const SUPPORTED_CHARACTER_KEYS = new Set([
+    ...'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+    ...'0123456789'.split(''),
+    ',',
+    '.',
+    '=',
+    '-',
+    ';',
+    '/',
+    "'",
+    '`',
+    '[',
+    ']',
+    '\\',
+]);
 const SUPPORTED_NON_CHARACTER_KEYS = new Set([
     'Backspace',
     'Del',
@@ -130,13 +145,14 @@ function normalizeShortcutToken(token: string): string | null {
     }
 
     if (trimmed.length === 1) {
-        return trimmed.toUpperCase();
+        const normalizedCharacter = trimmed.toUpperCase();
+        return SUPPORTED_CHARACTER_KEYS.has(normalizedCharacter) ? normalizedCharacter : null;
     }
 
     const functionKeyMatch = /^f(\d{1,2})$/i.exec(trimmed);
     if (functionKeyMatch) {
         const functionKeyNumber = Number(functionKeyMatch[1]);
-        return functionKeyNumber >= 1 && functionKeyNumber <= 24 ? trimmed.toUpperCase() : null;
+        return functionKeyNumber >= 1 && functionKeyNumber <= 12 ? trimmed.toUpperCase() : null;
     }
 
     if (SUPPORTED_NON_CHARACTER_KEYS.has(trimmed)) {
diff --git a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
index 2dd1d3e7..7bc10fdc 100644
--- a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
+++ b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
@@ -1,5 +1,5 @@
 import type { SearchKeybindingActionId, SearchKeybindings } from '@/config/searchKeybindings';
-import { matchShortcut } from '@/utils/shortcuts';
+import { matchShortcut, normalizeLocalShortcutString } from '@/utils/shortcuts';
 
 export type SearchPopupSurfaceType = 'model-dropdown-surface' | 'session-history-surface';
 type SearchKeyboardSurface = 'search-surface' | SearchPopupSurfaceType;
@@ -104,6 +104,28 @@ function resolveSearchKeybindingAction(
     return null;
 }
 
+function resolveSearchKeybindingActionByShortcut(
+    shortcut: string,
+    keybindings: SearchKeybindings
+): SearchKeybindingActionId | null {
+    const normalizedShortcut = normalizeLocalShortcutString(shortcut);
+    if (!normalizedShortcut) {
+        return null;
+    }
+
+    for (const [actionId, candidate] of Object.entries(keybindings) as Array<
+        [SearchKeybindingActionId, string | null]
+    >) {
+        if (normalizeLocalShortcutString(candidate) !== normalizedShortcut) {
+            continue;
+        }
+
+        return actionId;
+    }
+
+    return null;
+}
+
 /**
  * 纯键盘语义路由器。
  */
@@ -148,6 +170,24 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
         onSearchKeybindingAction,
     } = options;
 
+    function routeSearchKeybindingAction(actionId: SearchKeybindingActionId) {
+        if (hasActivePopupWindowFocus()) {
+            return true;
+        }
+
+        runKeyboardEffect(() => onSearchKeybindingAction(actionId));
+        return true;
+    }
+
+    function routeShortcut(shortcut: string) {
+        const actionId = resolveSearchKeybindingActionByShortcut(shortcut, getSearchKeybindings());
+        if (!actionId) {
+            return false;
+        }
+
+        return routeSearchKeybindingAction(actionId);
+    }
+
     function route(input: SearchKeyboardRouteInput) {
         const queryText = getQueryText();
         const pendingApproval = getPendingApproval();
@@ -178,8 +218,7 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
 
         const searchKeybindingAction = resolveSearchKeybindingAction(input, getSearchKeybindings());
         if (searchKeybindingAction) {
-            runKeyboardEffect(() => onSearchKeybindingAction(searchKeybindingAction));
-            return true;
+            return routeSearchKeybindingAction(searchKeybindingAction);
         }
 
         if (input.key === 'Escape' || input.key === 'Esc') {
@@ -331,5 +370,6 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
 
     return {
         route,
+        routeShortcut,
     };
 }
diff --git a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
index 74f7fd70..14d96cc6 100644
--- a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
+++ b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
@@ -143,6 +143,10 @@ export interface UseSearchKeyboardOptions {
     clearSession: () => void;
 }
 
+export type SearchKeydownHandler = ((event: KeyboardEvent) => Promise<void>) & {
+    routeSearchSurfaceShortcut: (shortcut: string) => boolean;
+};
+
 function createEmptyModelOverride(): SearchModelOverride {
     return {
         modelId: null,
@@ -644,7 +648,9 @@ export function useSearchOverlayMachine(options: UseSearchOverlayMachineOptions)
 /**
  * 创建 SearchView 页面级键盘处理器。
  */
-export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
+export function createSearchKeydownHandler(
+    options: UseSearchKeyboardOptions
+): SearchKeydownHandler {
     const {
         viewReady,
         searchKeybindings,
@@ -821,7 +827,27 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
 
     const askUserStore = useAskUserStore();
 
-    return async function handleKeyDown(event: KeyboardEvent) {
+    function shouldSkipSearchKeyboardRouting() {
+        if (!viewReady.value) {
+            return true;
+        }
+
+        if (askUserStore.current) {
+            return true;
+        }
+
+        return controller.isQuickSearchContextMenuOpen();
+    }
+
+    function routeSearchSurfaceShortcut(shortcut: string) {
+        if (shouldSkipSearchKeyboardRouting()) {
+            return false;
+        }
+
+        return keyboardRouter.routeShortcut(shortcut);
+    }
+
+    async function handleKeyDown(event: KeyboardEvent) {
         if (!viewReady.value) {
             return;
         }
@@ -877,5 +903,9 @@ export function createSearchKeydownHandler(options: UseSearchKeyboardOptions) {
                 modelOverride.value = createEmptyModelOverride();
             }
         }
-    };
+    }
+
+    return Object.assign(handleKeyDown, {
+        routeSearchSurfaceShortcut,
+    });
 }
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
index eae7aeae..f7aed5d3 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
@@ -643,12 +643,27 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
         }
         await syncWindowPinStateSafely('initialize');
         await initFocusListener();
+        startSearchSurfaceShortcutSync();
         if (!(await isE2eTestMode())) {
             await initNotificationPermission();
         }
         await runStartupTasks();
     }
 
+    function startSearchSurfaceShortcutSync() {
+        if (!searchKeybindings || stopSearchSurfaceShortcutWatch) {
+            return;
+        }
+
+        stopSearchSurfaceShortcutWatch = watch(
+            searchKeybindings,
+            () => {
+                void syncSearchSurfaceShortcutsSafely();
+            },
+            { deep: true, immediate: true, flush: 'post' }
+        );
+    }
+
     async function initFocusListener() {
         unlistenAiModelsUpdated = await eventService.on(AppEvent.AI_MODELS_UPDATED, () => {
             if (!handleAiModelsUpdated) {
@@ -767,16 +782,6 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
             { immediate: true, flush: 'sync' }
         );
 
-        if (searchKeybindings) {
-            stopSearchSurfaceShortcutWatch = watch(
-                searchKeybindings,
-                () => {
-                    void syncSearchSurfaceShortcutsSafely();
-                },
-                { deep: true, immediate: true, flush: 'post' }
-            );
-        }
-
         if (viewReady.value) {
             void startLifecycleOnceReady();
             return;
@@ -1113,4 +1118,8 @@ export function useSearchKeyboard(options: UseSearchKeyboardOptions) {
         document.removeEventListener('mousedown', handleSearchWindowMouseDown, true);
         document.body.removeEventListener('click', handleSearchWindowClick);
     });
+
+    return {
+        routeSearchSurfaceShortcut: handleKeyDown.routeSearchSurfaceShortcut,
+    };
 }
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index 0d27fbee..2503fca4 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -434,6 +434,8 @@
         }
     }
 
+    let routeSearchSurfaceShortcut: ((shortcut: string) => boolean) | null = null;
+
     const { hideSearchWindow } = useSearchPageLifecycle({
         controller,
         viewReady,
@@ -451,11 +453,8 @@
         handleSessionStatusReminderAction,
         handleAiModelsUpdated,
         handleShortcutAutoPaste: tryShortcutAutoPaste,
-        handleSearchSurfaceCommand: async (payload) => {
-            if (!viewReady.value) {
-                return;
-            }
-            await handleSearchKeybindingAction(payload.actionId);
+        handleSearchSurfaceCommand: (payload) => {
+            routeSearchSurfaceShortcut?.(payload.shortcut);
         },
     });
 
@@ -545,7 +544,7 @@
         return 'navigated';
     }
 
-    useSearchKeyboard({
+    const searchKeyboard = useSearchKeyboard({
         viewReady,
         searchKeybindings,
         queryText,
@@ -584,6 +583,7 @@
         cancelRequest,
         clearSession: clearSessionToIdle,
     });
+    routeSearchSurfaceShortcut = searchKeyboard.routeSearchSurfaceShortcut;
 
     function handleQueryTextChange(value: string) {
         queryText.value = value;
diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index 4f80d206..245b6fe1 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -16,6 +16,7 @@
         findShortcutConflict,
         formatShortcutForDisplay,
         hasCommandModifier,
+        isMacPlatform,
         isModifierlessFunctionShortcut,
         isReservedLocalShortcut,
         isReservedLocalShortcutKey,
@@ -214,6 +215,12 @@
         alertMessage.value?.error(t(messageKey, params), 3000);
     }
 
+    function isModifierOnlyKey(key: string) {
+        return (
+            key === 'Control' || key === 'Alt' || key === 'Shift' || key === 'Meta' || key === 'OS'
+        );
+    }
+
     const captureSearchShortcut = (event: KeyboardEvent) => {
         const actionId = activeSearchShortcutActionId.value;
         if (!actionId) {
@@ -226,9 +233,26 @@
 
         const captured = captureShortcutFromKeyboardEvent(event);
         if (!captured) {
-            if (event.metaKey) {
+            if (isModifierOnlyKey(event.key)) {
+                return;
+            }
+
+            event.preventDefault();
+            event.stopPropagation();
+
+            if (!isMacPlatform() && event.metaKey) {
                 alertMessage.value?.warning(t('settings.general.winKeyUnsupported'), 3000);
+                return;
             }
+
+            reportSearchShortcutError(
+                actionId,
+                'settings.general.searchShortcuts.errors.unsupported'
+            );
+            updateSearchShortcutDisplay(
+                actionId,
+                formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
+            );
             return;
         }
 
diff --git a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
index cf3aad95..ea107cf5 100644
--- a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
+++ b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
@@ -72,6 +72,58 @@ function createControllerStub() {
     } satisfies SearchPageController;
 }
 
+function createSearchKeydownHandlerForTest(
+    overrides: Partial<Parameters<typeof createSearchKeydownHandler>[0]> = {}
+) {
+    const controller = createControllerStub();
+    return createSearchKeydownHandler({
+        viewReady: ref(true),
+        searchKeybindings: ref(createDefaultSearchKeybindings()),
+        queryText: ref(''),
+        attachments: ref([]),
+        cursorContext: ref<SearchCursorContext>({
+            isMultiLine: false,
+            cursorAtStart: true,
+            cursorAtTextStart: true,
+            cursorAtEnd: true,
+        }),
+        modelOverride: ref<SearchModelOverride>({
+            modelId: null,
+            providerId: null,
+        }),
+        modelDropdownState: ref({ isOpen: false }),
+        controller,
+        sessionHistory: ref([]),
+        pendingRequest: ref(null),
+        isWaitingForCompletion: ref(false),
+        isLoading: ref(false),
+        pendingToolApproval: ref(null),
+        approvePendingToolApproval: vi.fn(() => false),
+        rejectPendingToolApproval: vi.fn(() => false),
+        promptPendingToolApprovalAttention: vi.fn(),
+        getActivePopupType: () => null,
+        hasActivePopupWindowFocus: () => false,
+        isQuickSearchOpen: computed(() => false),
+        shouldTriggerQuickSearch: () => false,
+        sessionHistoryPopupOpen: ref(false),
+        hideAllPopups: vi.fn().mockResolvedValue(undefined),
+        hideSearchWindow: vi.fn().mockResolvedValue(undefined),
+        navigateInputHistory: vi.fn(() => 'ignored' as const),
+        closeModelDropdown: vi.fn().mockResolvedValue(undefined),
+        toggleModelDropdown: vi.fn().mockResolvedValue(undefined),
+        openHistoryDialog: vi.fn().mockResolvedValue(undefined),
+        startNewSession: vi.fn().mockResolvedValue(undefined),
+        reopenLastClosedSession: vi.fn().mockResolvedValue(undefined),
+        toggleWindowPin: vi.fn().mockResolvedValue(undefined),
+        toggleWindowMaximize: vi.fn().mockResolvedValue(undefined),
+        openSettingsWindow: vi.fn().mockResolvedValue(undefined),
+        handleSubmit: vi.fn().mockResolvedValue(undefined),
+        cancelRequest: vi.fn(),
+        clearSession: vi.fn(),
+        ...overrides,
+    });
+}
+
 describe('extractSessionInputHistoryEntries', () => {
     it('returns only user prompts that still have visible input history content', () => {
         const entries = extractSessionInputHistoryEntries([
@@ -295,6 +347,35 @@ describe('useQuickSearchCoordinator', () => {
 });
 
 describe('createSearchKeydownHandler', () => {
+    it('routes host accelerator shortcuts through the same search keyboard guards', async () => {
+        const handleSearchKeybindingAction = vi.fn().mockResolvedValue(undefined);
+        const handleKeyDown = createSearchKeydownHandlerForTest({
+            handleSearchKeybindingAction,
+        });
+
+        expect(handleKeyDown.routeSearchSurfaceShortcut('Mod+M')).toBe(true);
+        await Promise.resolve();
+        await Promise.resolve();
+
+        expect(handleSearchKeybindingAction).toHaveBeenCalledWith('search.model.toggle');
+    });
+
+    it('ignores host accelerator shortcuts while the quick search context menu is open', async () => {
+        const controller = createControllerStub();
+        controller.isQuickSearchContextMenuOpen.mockReturnValue(true);
+        const handleSearchKeybindingAction = vi.fn().mockResolvedValue(undefined);
+        const handleKeyDown = createSearchKeydownHandlerForTest({
+            controller,
+            handleSearchKeybindingAction,
+        });
+
+        expect(handleKeyDown.routeSearchSurfaceShortcut('Mod+M')).toBe(false);
+        await Promise.resolve();
+        await Promise.resolve();
+
+        expect(handleSearchKeybindingAction).not.toHaveBeenCalled();
+    });
+
     it('routes the default F11 maximize shortcut to the maximize callback', async () => {
         const controller = createControllerStub();
         const toggleWindowMaximize = vi.fn().mockResolvedValue(undefined);
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index 899b6251..1e2a2d9f 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -180,6 +180,44 @@ describe('createSearchKeyboardRouter', () => {
         );
     });
 
+    it('routes host accelerator shortcuts through the current keybinding configuration', async () => {
+        const disabledRouter = createKeyboardRouter({
+            getSearchKeybindings: () => ({
+                ...createDefaultSearchKeybindings(),
+                'search.model.toggle': null,
+            }),
+        });
+
+        expect(disabledRouter.router.routeShortcut('Mod+M')).toBe(false);
+        await flushAsyncWork();
+        expect(disabledRouter.callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();
+
+        const remappedRouter = createKeyboardRouter({
+            getSearchKeybindings: () => ({
+                ...createDefaultSearchKeybindings(),
+                'search.history.open': 'Mod+M',
+                'search.model.toggle': null,
+            }),
+        });
+
+        expect(remappedRouter.router.routeShortcut('Mod+M')).toBe(true);
+        await flushAsyncWork();
+        expect(remappedRouter.callbacks.onSearchKeybindingAction).toHaveBeenCalledWith(
+            'search.history.open'
+        );
+    });
+
+    it('swallows host accelerator shortcuts while a popup window has focus', async () => {
+        const { router, callbacks } = createKeyboardRouter({
+            hasActivePopupWindowFocus: () => true,
+        });
+
+        expect(router.routeShortcut('Mod+M')).toBe(true);
+        await flushAsyncWork();
+
+        expect(callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();
+    });
+
     it('routes function-row search shortcuts by keyboard code when the key value is remapped', async () => {
         const { router, callbacks } = createKeyboardRouter({
             getSearchKeybindings: () => ({
diff --git a/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts b/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
index 1d145faf..87a26803 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
@@ -329,6 +329,18 @@ describe('useSearchPageLifecycle', () => {
 
         await flushLifecycle();
 
+        const commandListenerCallIndex = eventServiceMock.on.mock.calls.findIndex(
+            ([eventName]) => eventName === AppEvent.SEARCH_SURFACE_COMMAND
+        );
+        const commandListenerOrder =
+            eventServiceMock.on.mock.invocationCallOrder[commandListenerCallIndex];
+        const firstShortcutSyncOrder =
+            nativeMock.shortcut.setSearchSurfaceShortcuts.mock.invocationCallOrder[0];
+        expect(commandListenerCallIndex).toBeGreaterThanOrEqual(0);
+        expect(commandListenerOrder).toBeDefined();
+        expect(firstShortcutSyncOrder).toBeDefined();
+        expect(commandListenerOrder!).toBeLessThan(firstShortcutSyncOrder!);
+
         expect(nativeMock.shortcut.setSearchSurfaceShortcuts).toHaveBeenCalledWith(
             expect.arrayContaining([
                 {
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index 3b536679..df14c6ab 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -112,6 +112,8 @@ describe('search keybinding configuration', () => {
                 'search.input.focus': false,
                 'search.model.toggle': 'Ctrl+DefinitelyNotAKey',
                 'search.window.pin': 'Ctrl+DefinitelyNotAKey+P',
+                'search.window.maximize': 'F13',
+                'search.settings.open': 'Ctrl+@',
             })
         ).toEqual(defaults);
     });
diff --git a/apps/desktop/tests/utils/shortcuts.test.ts b/apps/desktop/tests/utils/shortcuts.test.ts
index 3cfc6728..2c7f920f 100644
--- a/apps/desktop/tests/utils/shortcuts.test.ts
+++ b/apps/desktop/tests/utils/shortcuts.test.ts
@@ -48,6 +48,8 @@ describe('shortcut utilities', () => {
         expect(normalizeLocalShortcutString('Ctrl+DefinitelyNotAKey')).toBeNull();
         expect(normalizeLocalShortcutString('Ctrl+DefinitelyNotAKey+A')).toBeNull();
         expect(normalizeLocalShortcutString('Ctrl++A')).toBeNull();
+        expect(normalizeLocalShortcutString('Ctrl+@')).toBeNull();
+        expect(normalizeLocalShortcutString('F13')).toBeNull();
         expect(normalizeLocalShortcutString('F25')).toBeNull();
         expect(normalizeLocalShortcutString('   ')).toBeNull();
 
@@ -75,6 +77,8 @@ describe('shortcut utilities', () => {
         expect(resolveKeyboardEventShortcutKey('BrightnessUp', 'F2')).toBe('F2');
         expect(resolveKeyboardEventShortcutKey('F2', 'F3')).toBe('F2');
         expect(resolveKeyboardEventShortcutKey('BrightnessUp', 'F25')).toBeNull();
+        expect(resolveKeyboardEventShortcutKey('BrightnessUp', 'F13')).toBeNull();
+        expect(resolveKeyboardEventShortcutKey('@')).toBeNull();
         expect(resolveKeyboardEventShortcutKey('x', 'Space')).toBe('X');
         expect(resolveKeyboardEventShortcutKey('BrightnessUp', 'Space')).toBeNull();
         expect(resolveKeyboardEventShortcutKey('', 'KeyA')).toBeNull();
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index c1da2ac5..d3a1e1a5 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -66,6 +66,12 @@ const nativeMock = vi.hoisted(() => ({
     },
 }));
 
+const alertMessageMock = vi.hoisted(() => ({
+    success: vi.fn(),
+    error: vi.fn(),
+    warning: vi.fn(),
+}));
+
 vi.mock('pinia', () => ({
     storeToRefs: (store: typeof settingsStoreMock) => ({
         settings: store.settings,
@@ -89,9 +95,9 @@ vi.mock('@components/AlertMessage.vue', () => ({
         name: 'AlertMessageStub',
         template: '<div />',
         methods: {
-            success: vi.fn(),
-            error: vi.fn(),
-            warning: vi.fn(),
+            success: alertMessageMock.success,
+            error: alertMessageMock.error,
+            warning: alertMessageMock.warning,
         },
     },
 }));
@@ -582,6 +588,12 @@ describe('SettingsGeneralSection', () => {
         expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
         expect((input.element as HTMLInputElement).value).toBe('Ctrl+H');
 
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F13' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Ctrl+H');
+
         window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
         await flushPromises();
 
@@ -591,6 +603,31 @@ describe('SettingsGeneralSection', () => {
         });
     });
 
+    it('reports unsupported mac command search shortcuts without showing the Windows key warning', async () => {
+        setPlatform('MacIntel');
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+        alertMessageMock.error.mockClear();
+        alertMessageMock.warning.mockClear();
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: '@', metaKey: true }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+        expect(alertMessageMock.warning).not.toHaveBeenCalled();
+        expect(alertMessageMock.error).toHaveBeenCalledTimes(1);
+        expect((input.element as HTMLInputElement).value).toBe('Cmd+H');
+
+        wrapper.unmount();
+    });
+
     it('shows fixed search shortcuts as unsupported for editing', async () => {
         const wrapper = mount(GeneralSection);
 

From 403b7406b73ae768b1450a660290e8e0d999221c Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 14 Jun 2026 18:04:06 +0800
Subject: [PATCH 41/55] fix(desktop): handle search shortcut conflicts

---
 .../src-tauri/src/core/system/shortcut.rs     | 16 +++++
 .../src/core/window/webview_defaults.rs       | 24 ++++++++
 .../BuiltInToolService/tools/setting/index.ts | 51 +++++++++++++++-
 .../General/SearchShortcutSettings.vue        | 59 ++++++++++++++++++-
 .../tools/setting/i18n.test.ts                | 30 ++++++++++
 .../settingsGeneralComponent.test.ts          | 28 +++++++++
 6 files changed, 205 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src-tauri/src/core/system/shortcut.rs b/apps/desktop/src-tauri/src/core/system/shortcut.rs
index cf5b25fb..a3bb36ba 100644
--- a/apps/desktop/src-tauri/src/core/system/shortcut.rs
+++ b/apps/desktop/src-tauri/src/core/system/shortcut.rs
@@ -532,6 +532,22 @@ mod tests {
         .is_none());
     }
 
+    #[test]
+    fn search_surface_command_matches_alt_space_windows_system_accelerator() {
+        let _guard = SEARCH_SURFACE_SHORTCUT_TEST_LOCK.lock().expect("test lock");
+        set_search_surface_shortcuts(vec![SearchSurfaceShortcutEntry {
+            action_id: "search.model.toggle".to_string(),
+            shortcut: "Alt+Space".to_string(),
+        }])
+        .expect("shortcuts sync");
+
+        let command =
+            find_search_surface_command_for_windows_accelerator(0x20, false, true, false, false)
+                .expect("alt+space shortcut matches");
+        assert_eq!(command.action_id, "search.model.toggle");
+        assert_eq!(command.shortcut, "Alt+Space");
+    }
+
     #[test]
     fn search_surface_shortcut_sync_drops_invalid_entries_without_retaining_old_commands() {
         let _guard = SEARCH_SURFACE_SHORTCUT_TEST_LOCK.lock().expect("test lock");
diff --git a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
index d4002c48..2f0ab928 100644
--- a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
+++ b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
@@ -264,6 +264,30 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
 
                 let is_ctrl_down = (GetKeyState(i32::from(VK_CONTROL.0)) as u16 & 0x8000) != 0;
                 let is_shift_down = (GetKeyState(i32::from(VK_SHIFT.0)) as u16 & 0x8000) != 0;
+                let is_super_down = (GetKeyState(i32::from(VK_LWIN.0)) as u16 & 0x8000) != 0
+                    || (GetKeyState(i32::from(VK_RWIN.0)) as u16 & 0x8000) != 0;
+
+                if let Some(search_surface_window) = &search_surface_window {
+                    if let Some(command) =
+                        crate::core::system::shortcut::find_search_surface_command_for_windows_accelerator(
+                            virtual_key,
+                            is_ctrl_down,
+                            true,
+                            is_shift_down,
+                            is_super_down,
+                        )
+                    {
+                        if let Ok(args2) =
+                            Interface::cast::<ICoreWebView2AcceleratorKeyPressedEventArgs2>(&args)
+                        {
+                            let _ = args2.SetIsBrowserAcceleratorKeyEnabled(false);
+                        }
+                        let _ = args.SetHandled(true);
+                        let _ = search_surface_window.emit("search-surface-command", command);
+                        return Ok(());
+                    }
+                }
+
                 log::info!(
                     "[sysmenu-accel] Alt+Space detected, emitting shortcut-capture-system-key (ctrl={} shift={})",
                     is_ctrl_down,
diff --git a/apps/desktop/src/services/BuiltInToolService/tools/setting/index.ts b/apps/desktop/src/services/BuiltInToolService/tools/setting/index.ts
index bd60fb60..634a318a 100644
--- a/apps/desktop/src/services/BuiltInToolService/tools/setting/index.ts
+++ b/apps/desktop/src/services/BuiltInToolService/tools/setting/index.ts
@@ -2,10 +2,15 @@
 
 import { native } from '@services/NativeService';
 
+import {
+    getSearchKeybindingDefinition,
+    type SearchKeybindingActionId,
+} from '@/config/searchKeybindings';
 import { resolveSearchWindowDefaultSize } from '@/config/searchWindow';
-import { tt } from '@/i18n';
+import { t, tt } from '@/i18n';
 import type { ToolApprovalRequest } from '@/services/AgentService/contracts/tooling';
 import type { GeneralSettingsData } from '@/stores/settings';
+import { normalizeLocalShortcutString } from '@/utils/shortcuts';
 import { truncateText } from '@/utils/text';
 
 import {
@@ -70,10 +75,15 @@ function buildSettingConversationSemantic(
 }
 
 async function applySettingSideEffect(
+    settingsStore: SettingsStore,
     key: SupportedSettingKey,
     value: SupportedSettingValue
 ): Promise<void> {
     if (key === 'global_shortcut') {
+        ensureGlobalShortcutDoesNotConflictWithSearchShortcuts(
+            settingsStore,
+            value as GeneralSettingsData['globalShortcut']
+        );
         try {
             await native.shortcut.registerGlobalShortcut(
                 value as GeneralSettingsData['globalShortcut']
@@ -107,6 +117,43 @@ async function applySettingSideEffect(
     }
 }
 
+function findGlobalShortcutSearchConflict(
+    settingsStore: SettingsStore,
+    shortcut: GeneralSettingsData['globalShortcut']
+): SearchKeybindingActionId | null {
+    const normalizedShortcut = normalizeLocalShortcutString(shortcut);
+    if (!normalizedShortcut) {
+        return null;
+    }
+
+    const searchKeybindings = settingsStore.settings.searchKeybindings ?? {};
+    for (const [actionId, searchShortcut] of Object.entries(searchKeybindings) as Array<
+        [SearchKeybindingActionId, string | null]
+    >) {
+        if (normalizeLocalShortcutString(searchShortcut) === normalizedShortcut) {
+            return actionId;
+        }
+    }
+
+    return null;
+}
+
+function ensureGlobalShortcutDoesNotConflictWithSearchShortcuts(
+    settingsStore: SettingsStore,
+    shortcut: GeneralSettingsData['globalShortcut']
+): void {
+    const conflictActionId = findGlobalShortcutSearchConflict(settingsStore, shortcut);
+    if (!conflictActionId) {
+        return;
+    }
+
+    throw new Error(
+        t('settings.general.searchShortcuts.errors.duplicate', {
+            action: t(getSearchKeybindingDefinition(conflictActionId).labelKey),
+        })
+    );
+}
+
 async function persistSettingValue(
     settingsStore: SettingsStore,
     key: SupportedSettingKey,
@@ -149,7 +196,7 @@ async function applySettingUpdate(
     key: SupportedSettingKey,
     value: SupportedSettingValue
 ): Promise<void> {
-    await applySettingSideEffect(key, value);
+    await applySettingSideEffect(settingsStore, key, value);
     await persistSettingValue(settingsStore, key, value);
 }
 
diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index 245b6fe1..c303f4bd 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -1,8 +1,14 @@
 <script setup lang="ts">
     import AlertMessage from '@components/AlertMessage.vue';
     import AppIcon from '@components/AppIcon.vue';
+    import {
+        AppEvent,
+        eventService,
+        type ShortcutCaptureSystemKeyEvent,
+    } from '@services/EventService';
+    import type { UnlistenFn } from '@tauri-apps/api/event';
     import { storeToRefs } from 'pinia';
-    import { computed, onUnmounted, ref, watch } from 'vue';
+    import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 
     import {
         getSearchKeybindingDefinition,
@@ -53,6 +59,7 @@
     const hasCapturedSearchShortcut = ref(false);
     const searchShortcutErrorActionId = ref<SearchKeybindingActionId | null>(null);
     const shortcutCapturePrompt = computed(() => t('settings.general.shortcutCapturePrompt'));
+    let unlistenSystemKey: UnlistenFn | null = null;
 
     function formatSearchShortcutForSettings(shortcut: string | null | undefined): string {
         const normalizedShortcut = normalizeLocalShortcutString(shortcut);
@@ -266,6 +273,43 @@
         void confirmCapturedSearchShortcut(actionId, captured.shortcut);
     };
 
+    const handleSystemKeyCapture = (payload: ShortcutCaptureSystemKeyEvent) => {
+        const actionId = activeSearchShortcutActionId.value;
+        if (!actionId) {
+            return;
+        }
+
+        const modifiers: string[] = [];
+        if (payload.ctrl) {
+            modifiers.push(isMacPlatform() ? 'Ctrl' : 'Mod');
+        }
+        if (payload.alt) {
+            modifiers.push('Alt');
+        }
+        if (payload.shift) {
+            modifiers.push('Shift');
+        }
+
+        const shortcut = normalizeLocalShortcutString([...modifiers, payload.key].join('+'));
+        if (!shortcut) {
+            reportSearchShortcutError(
+                actionId,
+                'settings.general.searchShortcuts.errors.unsupported'
+            );
+            updateSearchShortcutDisplay(
+                actionId,
+                formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
+            );
+            return;
+        }
+
+        searchShortcutCapturedValue.value = shortcut;
+        hasCapturedSearchShortcut.value = true;
+        searchShortcutErrorActionId.value = null;
+        updateSearchShortcutDisplay(actionId, formatShortcutForDisplay(shortcut));
+        void confirmCapturedSearchShortcut(actionId, shortcut);
+    };
+
     async function saveSearchShortcut(
         actionId: SearchKeybindingActionId,
         shortcut: string | null
@@ -553,8 +597,21 @@
         { deep: true, immediate: true }
     );
 
+    onMounted(async () => {
+        try {
+            unlistenSystemKey = await eventService.on(
+                AppEvent.SHORTCUT_CAPTURE_SYSTEM_KEY,
+                handleSystemKeyCapture
+            );
+        } catch (error) {
+            console.error('Failed to subscribe to search shortcut system key event:', error);
+        }
+    });
+
     onUnmounted(() => {
         window.removeEventListener('keydown', captureSearchShortcut);
+        unlistenSystemKey?.();
+        unlistenSystemKey = null;
     });
 </script>
 
diff --git a/apps/desktop/tests/services/BuiltInToolService/tools/setting/i18n.test.ts b/apps/desktop/tests/services/BuiltInToolService/tools/setting/i18n.test.ts
index 89ae4c1f..4dccf490 100644
--- a/apps/desktop/tests/services/BuiltInToolService/tools/setting/i18n.test.ts
+++ b/apps/desktop/tests/services/BuiltInToolService/tools/setting/i18n.test.ts
@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
 import { setLocale } from '@/i18n';
 import {
     buildSettingApprovalRequest,
@@ -30,6 +31,7 @@ const {
         mockSettingsStore: {
             settings: {
                 globalShortcut: 'Alt+Space',
+                searchKeybindings: {},
                 startOnBoot: false,
                 startMinimized: true,
                 outputScrollBehavior: 'follow_output',
@@ -68,6 +70,7 @@ vi.mock('@services/NativeService', () => ({
 const settingsStore = {
     settings: {
         globalShortcut: 'Alt+Space',
+        searchKeybindings: {},
         startOnBoot: false,
         startMinimized: true,
         outputScrollBehavior: 'follow_output',
@@ -92,6 +95,7 @@ describe('Setting built-in tool i18n', () => {
         mockUpdateGlobalShortcut.mockResolvedValue(undefined);
         mockUpdateLanguage.mockResolvedValue(undefined);
         mockSettingsStore.settings.globalShortcut = 'Alt+Space';
+        mockSettingsStore.settings.searchKeybindings = createDefaultSearchKeybindings();
         mockSettingsStore.settings.language = 'zh-CN';
     });
 
@@ -193,6 +197,32 @@ describe('Setting built-in tool i18n', () => {
         );
     });
 
+    it('rejects global shortcuts that duplicate search shortcuts before registration', async () => {
+        setLocale('en-US');
+        mockSettingsStore.settings.searchKeybindings = {
+            ...createDefaultSearchKeybindings(),
+            'search.history.open': 'Mod+K',
+        };
+
+        const result = await executeSettingTool(
+            {
+                action: 'set',
+                key: 'global_shortcut',
+                value: 'Ctrl+K',
+                reason: 'User asked for it.',
+            },
+            {},
+            createExecutionContext()
+        );
+
+        expect(result).toMatchObject({
+            isError: true,
+            status: 'error',
+        });
+        expect(result.errorMessage).toContain('Open session history');
+        expect(mockRegisterGlobalShortcut).not.toHaveBeenCalledWith('Ctrl+K');
+    });
+
     it('formats failed rollback in English', async () => {
         setLocale('en-US');
         mockRegisterGlobalShortcut
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index d3a1e1a5..0fcfaeb1 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -4,6 +4,7 @@ import { vi } from 'vitest';
 
 import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
 import { setLocale } from '@/i18n';
+import { AppEvent, eventService } from '@/services/EventService';
 import GeneralSection from '@/views/SettingsView/components/General/index.vue';
 
 const originalPlatform = navigator.platform;
@@ -492,6 +493,33 @@ describe('SettingsGeneralSection', () => {
         });
     });
 
+    it('captures Windows system key events while editing a search shortcut', async () => {
+        settingsStoreMock.settings.value.globalShortcut = 'Ctrl+Space';
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+
+        await eventService.emit(AppEvent.SHORTCUT_CAPTURE_SYSTEM_KEY, {
+            key: 'Space',
+            alt: true,
+            ctrl: false,
+            shift: false,
+        });
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'Alt+Space',
+        });
+    });
+
     it('captures a function-row key by keyboard code when the key value is not an F-key', async () => {
         settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
         const wrapper = mount(GeneralSection);

From f6f0cb7a9715387ecb7ef970096fd08177b7173e Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 14 Jun 2026 19:25:59 +0800
Subject: [PATCH 42/55] fix(desktop): normalize function key shortcuts

---
 apps/desktop/src/utils/shortcuts.ts                 | 2 +-
 apps/desktop/tests/config/searchKeybindings.test.ts | 2 +-
 apps/desktop/tests/utils/shortcuts.test.ts          | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index 0df696f6..1bcf3e7f 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -152,7 +152,7 @@ function normalizeShortcutToken(token: string): string | null {
     const functionKeyMatch = /^f(\d{1,2})$/i.exec(trimmed);
     if (functionKeyMatch) {
         const functionKeyNumber = Number(functionKeyMatch[1]);
-        return functionKeyNumber >= 1 && functionKeyNumber <= 12 ? trimmed.toUpperCase() : null;
+        return functionKeyNumber >= 1 && functionKeyNumber <= 12 ? `F${functionKeyNumber}` : null;
     }
 
     if (SUPPORTED_NON_CHARACTER_KEYS.has(trimmed)) {
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index df14c6ab..edc18a5a 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -55,7 +55,7 @@ describe('search keybinding configuration', () => {
                 'search.session.new': '   ',
                 'search.session.reopenLastClosed': 'Mod+Up',
                 'search.model.toggle': 'Ctrl+Backspace',
-                'search.window.maximize': 'f2',
+                'search.window.maximize': 'f02',
                 'search.settings.open': 'ctrl + ,',
                 unknown: 'Alt+U',
             })
diff --git a/apps/desktop/tests/utils/shortcuts.test.ts b/apps/desktop/tests/utils/shortcuts.test.ts
index 2c7f920f..4432914e 100644
--- a/apps/desktop/tests/utils/shortcuts.test.ts
+++ b/apps/desktop/tests/utils/shortcuts.test.ts
@@ -41,6 +41,8 @@ describe('shortcut utilities', () => {
         expect(normalizeLocalShortcutString('return')).toBe('Enter');
         expect(normalizeLocalShortcutString('tab')).toBe('Tab');
         expect(normalizeLocalShortcutString('insert')).toBe('Insert');
+        expect(normalizeLocalShortcutString('F01')).toBe('F1');
+        expect(normalizeLocalShortcutString('Ctrl+F09')).toBe('Mod+F9');
         expect(normalizeLocalShortcutString('f12')).toBe('F12');
         expect(normalizeLocalShortcutString(null)).toBeNull();
         expect(normalizeLocalShortcutString('Ctrl+Alt')).toBeNull();

From 94413d895513d75c2c9edc01cd5e65e8eb33d579 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 14 Jun 2026 21:02:25 +0800
Subject: [PATCH 43/55] fix(desktop): tolerate settings default persistence
 failures

---
 apps/desktop/src/stores/settings.ts           |  4 +--
 .../tests/stores/settings-keybindings.test.ts | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/stores/settings.ts b/apps/desktop/src/stores/settings.ts
index 55cb8838..e345b40d 100644
--- a/apps/desktop/src/stores/settings.ts
+++ b/apps/desktop/src/stores/settings.ts
@@ -96,8 +96,8 @@ export const useSettingsStore = defineStore('settings', () => {
                     : []
             );
             if (failedPersistenceKeys.length > 0) {
-                throw new Error(
-                    `Failed to persist general setting rewrite/default value(s): ${failedPersistenceKeys.join(
+                console.warn(
+                    `[SettingsStore] Failed to persist general setting rewrite/default value(s): ${failedPersistenceKeys.join(
                         ', '
                     )}`
                 );
diff --git a/apps/desktop/tests/stores/settings-keybindings.test.ts b/apps/desktop/tests/stores/settings-keybindings.test.ts
index ce10f499..6ec27ea5 100644
--- a/apps/desktop/tests/stores/settings-keybindings.test.ts
+++ b/apps/desktop/tests/stores/settings-keybindings.test.ts
@@ -77,6 +77,35 @@ describe('settings search keybindings state', () => {
         });
     });
 
+    it('keeps initialization usable when default keybinding persistence fails', async () => {
+        mockSettings({});
+        const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);
+        setSettingMock.mockImplementation(
+            async ({ key, value }: { key: string; value: string }) => {
+                if (key === 'search_keybindings') {
+                    throw new Error('database locked');
+                }
+
+                return {
+                    id: 1,
+                    key,
+                    value,
+                    created_at: '2026-06-03 00:00:00',
+                    updated_at: '2026-06-03 00:00:00',
+                };
+            }
+        );
+
+        const { useSettingsStore } = await import('@/stores/settings');
+        const store = useSettingsStore();
+
+        await expect(store.initialize()).resolves.toBeUndefined();
+
+        expect(store.initialized).toBe(true);
+        expect(store.settings.searchKeybindings).toEqual(createDefaultSearchKeybindings());
+        expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('search_keybindings'));
+    });
+
     it('loads persisted search keybindings and merges missing defaults', async () => {
         mockSettings({
             search_keybindings: JSON.stringify({

From 0648a548279d123239341b6df3e93726e8437359 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Sun, 14 Jun 2026 23:03:29 +0800
Subject: [PATCH 44/55] fix(desktop): make search shortcuts configurable

---
 README.en.md                                  |  2 +-
 README.md                                     |  2 +-
 .../src-tauri/src/core/system/shortcut.rs     |  9 ++++
 apps/desktop/src/config/searchKeybindings.ts  |  9 ++++
 apps/desktop/src/i18n/messages.ts             |  6 +++
 apps/desktop/src/i18n/textMap.ts              |  4 +-
 .../src/services/PopupService/manager.ts      |  2 +-
 .../src/services/PopupService/types.ts        |  2 +
 .../components/ModelDropdownPopup/index.vue   |  3 +-
 .../SessionHistoryPopover/index.vue           |  4 +-
 .../interaction/useSearchKeyboardRouter.ts    | 19 ++++---
 .../composables/searchInteraction.ts          |  8 +--
 .../SearchView/composables/useSearchPage.ts   |  3 ++
 apps/desktop/src/views/SearchView/index.vue   |  7 +++
 .../General/SearchShortcutSettings.vue        |  6 ++-
 .../PopupView/model-dropdown-i18n.test.ts     | 50 +++++++++++++++++++
 .../PopupView/session-history-i18n.test.ts    | 44 ++++++++++++++++
 .../useSearchKeyboardRouter.test.ts           | 38 ++++++++++++--
 .../tests/config/searchKeybindings.test.ts    |  1 +
 .../touchai-intro-en/touchai-components.html  |  4 +-
 .../touchai-intro/touchai-components.html     |  4 +-
 21 files changed, 199 insertions(+), 28 deletions(-)

diff --git a/README.en.md b/README.en.md
index 491859bb..1679a5ed 100644
--- a/README.en.md
+++ b/README.en.md
@@ -33,7 +33,7 @@
 
 ### Features
 
-- **One shortcut away** - `Alt+Space` appears and disappears without interrupting your workflow
+- **One shortcut away** - use the default global shortcut, or customize it to fit your workflow
 - **Full keyboard operation** - operate entirely without a mouse for much higher efficiency
 - **Desktop context** - aware of files, screen, and clipboard
 - **Tool support** - includes 7 built-in tools and supports MCP tool extensions
diff --git a/README.md b/README.md
index 28c30626..6c3c0edc 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@
 
 ### 功能特性
 
-- **一触即达** - `Alt+Space` 召之即来挥之即去，不打断工作流
+- **一触即达** - 默认全局快捷键可唤起/隐藏，也可按习惯自定义，不打断工作流
 - **全键盘操作** - 支持无鼠标全键盘操作，极大提升效率
 - **桌面上下文** - 文件、屏幕、剪贴板智能感知
 - **工具支持** - 内置7大工具，支持MCP工具拓展
diff --git a/apps/desktop/src-tauri/src/core/system/shortcut.rs b/apps/desktop/src-tauri/src/core/system/shortcut.rs
index a3bb36ba..f7dde53e 100644
--- a/apps/desktop/src-tauri/src/core/system/shortcut.rs
+++ b/apps/desktop/src-tauri/src/core/system/shortcut.rs
@@ -325,6 +325,9 @@ pub fn parse_shortcut(shortcut_str: &str) -> Result<Shortcut, String> {
                 }
             }
             key => {
+                if key_code.is_some() {
+                    return Err("Shortcut must contain exactly one key code".to_string());
+                }
                 key_code = Some(match key.to_lowercase().as_str() {
                     "space" => Code::Space,
                     "enter" | "return" => Code::Enter,
@@ -500,6 +503,12 @@ mod tests {
         assert_eq!(shortcut.key, Code::Equal);
     }
 
+    #[test]
+    fn parse_shortcut_rejects_multiple_key_codes() {
+        let error = parse_shortcut("Ctrl+A+B").expect_err("multiple keys should be rejected");
+        assert_eq!(error, "Shortcut must contain exactly one key code");
+    }
+
     #[test]
     fn search_surface_command_matches_windows_accelerator() {
         let _guard = SEARCH_SURFACE_SHORTCUT_TEST_LOCK.lock().expect("test lock");
diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 517eb0d7..67180dd5 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -12,6 +12,7 @@ export const SEARCH_KEYBINDING_ACTION_IDS = [
     'search.session.new',
     'search.session.reopenLastClosed',
     'search.model.toggle',
+    'search.quickSearch.toggleView',
     'search.window.pin',
     'search.window.maximize',
     'search.settings.open',
@@ -71,6 +72,14 @@ export const SEARCH_KEYBINDING_DEFINITIONS: SearchKeybindingDefinition[] = [
         allowDisable: true,
         allowModifierlessFunctionShortcut: true,
     },
+    {
+        id: 'search.quickSearch.toggleView',
+        labelKey: 'settings.general.searchActions.quickSearchToggleView',
+        descriptionKey: 'settings.general.searchActionDescriptions.quickSearchToggleView',
+        defaultShortcut: 'Mod+G',
+        allowDisable: true,
+        allowModifierlessFunctionShortcut: true,
+    },
     {
         id: 'search.window.pin',
         labelKey: 'settings.general.searchActions.windowPin',
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 710b18e9..e185a265 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -101,6 +101,7 @@ const zhCNMessages = {
     'settings.general.searchActions.newSession': '开始新会话',
     'settings.general.searchActions.reopenLastClosedSession': '打开最近关闭的会话',
     'settings.general.searchActions.modelToggle': '切换模型选择',
+    'settings.general.searchActions.quickSearchToggleView': '切换快捷搜索视图',
     'settings.general.searchActions.windowPin': '切换窗口置顶',
     'settings.general.searchActions.windowMaximize': '切换窗口最大化',
     'settings.general.searchActions.openSettings': '打开设置',
@@ -117,6 +118,8 @@ const zhCNMessages = {
     'settings.general.searchActionDescriptions.reopenLastClosedSession':
         '重新打开最近关闭的一条会话',
     'settings.general.searchActionDescriptions.modelToggle': '快速打开或收起模型列表',
+    'settings.general.searchActionDescriptions.quickSearchToggleView':
+        '在快捷搜索打开时切换结果视图',
     'settings.general.searchActionDescriptions.windowPin': '切换搜索窗口的置顶状态',
     'settings.general.searchActionDescriptions.windowMaximize': '切换搜索窗口最大化',
     'settings.general.searchActionDescriptions.openSettings': '快速打开设置窗口',
@@ -1067,6 +1070,7 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.searchActions.newSession': 'Start new session',
     'settings.general.searchActions.reopenLastClosedSession': 'Open most recently closed session',
     'settings.general.searchActions.modelToggle': 'Toggle model picker',
+    'settings.general.searchActions.quickSearchToggleView': 'Toggle quick search view',
     'settings.general.searchActions.windowPin': 'Toggle window pin',
     'settings.general.searchActions.windowMaximize': 'Toggle window maximize',
     'settings.general.searchActions.openSettings': 'Open settings',
@@ -1083,6 +1087,8 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.searchActionDescriptions.reopenLastClosedSession':
         'Reopen the most recently closed session.',
     'settings.general.searchActionDescriptions.modelToggle': 'Open or close the model picker.',
+    'settings.general.searchActionDescriptions.quickSearchToggleView':
+        'Switch the result view while quick search is open.',
     'settings.general.searchActionDescriptions.windowPin':
         'Toggle whether the search window stays on top.',
     'settings.general.searchActionDescriptions.windowMaximize':
diff --git a/apps/desktop/src/i18n/textMap.ts b/apps/desktop/src/i18n/textMap.ts
index 59f02b34..6024efd3 100644
--- a/apps/desktop/src/i18n/textMap.ts
+++ b/apps/desktop/src/i18n/textMap.ts
@@ -667,8 +667,8 @@ export const zhToEnTextMap = {
     加载设置失败: 'Failed to load settings',
     快捷键保存成功: 'Shortcut saved',
     搜索窗口尺寸已更新: 'Search window size updated',
-    '不支持 Win 键组合，请使用 Ctrl、Alt、Shift':
-        'Win key combinations are not supported. Use Ctrl, Alt, or Shift.',
+    '不支持 Win/Super 键组合，请使用 Ctrl、Alt、Shift':
+        'Win/Super key combinations are not supported. Use Ctrl, Alt, or Shift.',
     '确定要删除服务器 "{serverName}" 吗？': 'Delete server "{serverName}"?',
     标准输入输出: 'Standard input/output',
     '兼容Streamable HTTP与SSE': 'Compatible with Streamable HTTP and SSE',
diff --git a/apps/desktop/src/services/PopupService/manager.ts b/apps/desktop/src/services/PopupService/manager.ts
index fa14b710..7fe9f061 100644
--- a/apps/desktop/src/services/PopupService/manager.ts
+++ b/apps/desktop/src/services/PopupService/manager.ts
@@ -128,7 +128,7 @@ export class PopupManager {
             await this.ensureReadyListener();
             await this.syncPopupConfigs();
 
-            // 让初始化真正等待 popup 预热完成，避免首次 Ctrl+H 还在走冷启动链路。
+            // 让初始化真正等待 popup 预热完成，避免首次快捷键打开弹窗还在走冷启动链路。
             await this.transport.preloadWindows();
 
             this.isInitialized = true;
diff --git a/apps/desktop/src/services/PopupService/types.ts b/apps/desktop/src/services/PopupService/types.ts
index 73f6c804..bcba5a6c 100644
--- a/apps/desktop/src/services/PopupService/types.ts
+++ b/apps/desktop/src/services/PopupService/types.ts
@@ -79,6 +79,7 @@ export interface ModelDropdownData {
     selectedModelId: string;
     selectedProviderId: number | null;
     searchQuery: string;
+    toggleShortcut?: string | null;
     models?: ModelDropdownPopupItem[];
 }
 
@@ -110,6 +111,7 @@ export interface SessionHistoryData {
     activeSessionId: number | null;
     searchQuery: string;
     isLoading: boolean;
+    toggleShortcut?: string | null;
 }
 
 export type PopupData = ModelDropdownData | SessionHistoryData;
diff --git a/apps/desktop/src/views/PopupView/components/ModelDropdownPopup/index.vue b/apps/desktop/src/views/PopupView/components/ModelDropdownPopup/index.vue
index 24869ae7..cf1b55b8 100644
--- a/apps/desktop/src/views/PopupView/components/ModelDropdownPopup/index.vue
+++ b/apps/desktop/src/views/PopupView/components/ModelDropdownPopup/index.vue
@@ -138,6 +138,7 @@
     import { computed, nextTick, ref, watch } from 'vue';
 
     import { t } from '@/i18n';
+    import { matchShortcut } from '@/utils/shortcuts';
 
     defineOptions({
         name: 'PopupModelDropdown',
@@ -244,7 +245,7 @@
     };
 
     function handleKeyDown(event: KeyboardEvent) {
-        if (event.ctrlKey && event.key.toLowerCase() === 'm') {
+        if (matchShortcut(props.data?.toggleShortcut, event)) {
             event.preventDefault();
             emit('close');
             return;
diff --git a/apps/desktop/src/views/PopupView/components/SessionHistoryPopover/index.vue b/apps/desktop/src/views/PopupView/components/SessionHistoryPopover/index.vue
index 387a918d..0d23d18d 100644
--- a/apps/desktop/src/views/PopupView/components/SessionHistoryPopover/index.vue
+++ b/apps/desktop/src/views/PopupView/components/SessionHistoryPopover/index.vue
@@ -188,6 +188,7 @@
 
     import { type MessageKey, t } from '@/i18n';
     import { formatMonthDay, formatTime } from '@/i18n/format';
+    import { matchShortcut } from '@/utils/shortcuts';
 
     defineOptions({
         name: 'SessionHistoryPopover',
@@ -706,8 +707,7 @@
     }
 
     function handleKeyDown(event: KeyboardEvent) {
-        // Ctrl+H 关闭弹窗
-        if (event.ctrlKey && event.key === 'h') {
+        if (matchShortcut(props.data?.toggleShortcut, event)) {
             event.preventDefault();
             emit('close');
             return;
diff --git a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
index 7bc10fdc..22f5307c 100644
--- a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
+++ b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
@@ -49,7 +49,6 @@ interface CreateSearchKeyboardRouterOptions {
     onQuickSearchPageUp: () => void;
     onQuickSearchPageDown: () => void;
     onQuickSearchContextMenu: () => void;
-    onQuickSearchToggleView: () => void;
     onQuickSearchCollapse: () => void;
     onNavigateInputHistory: (
         direction: SessionInputHistoryDirection
@@ -158,7 +157,6 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
         onQuickSearchPageUp,
         onQuickSearchPageDown,
         onQuickSearchContextMenu,
-        onQuickSearchToggleView,
         onQuickSearchCollapse,
         onNavigateInputHistory,
         onHideAllPopups,
@@ -170,11 +168,23 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
         onSearchKeybindingAction,
     } = options;
 
+    function canRouteSearchKeybindingAction(actionId: SearchKeybindingActionId) {
+        if (actionId === 'search.quickSearch.toggleView') {
+            return isQuickSearchOpen();
+        }
+
+        return true;
+    }
+
     function routeSearchKeybindingAction(actionId: SearchKeybindingActionId) {
         if (hasActivePopupWindowFocus()) {
             return true;
         }
 
+        if (!canRouteSearchKeybindingAction(actionId)) {
+            return false;
+        }
+
         runKeyboardEffect(() => onSearchKeybindingAction(actionId));
         return true;
     }
@@ -280,11 +290,6 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
                 return true;
             }
 
-            if (input.key.toLowerCase() === 'g' && (input.ctrlKey || input.metaKey)) {
-                onQuickSearchToggleView();
-                return true;
-            }
-
             if (hasQuickSearchHighlight()) {
                 const directionMap: Partial<Record<string, SearchQuickSearchDirection>> = {
                     ArrowUp: 'up',
diff --git a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
index 14d96cc6..05ecdf08 100644
--- a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
+++ b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
@@ -756,9 +756,6 @@ export function createSearchKeydownHandler(
         onQuickSearchContextMenu: () => {
             controller.openQuickSearchContextMenu();
         },
-        onQuickSearchToggleView: () => {
-            controller.toggleQuickSearchView();
-        },
         onQuickSearchCollapse: () => {
             controller.collapseQuickSearch();
         },
@@ -808,6 +805,11 @@ export function createSearchKeydownHandler(
                 case 'search.model.toggle':
                     await toggleModelDropdown();
                     return;
+                case 'search.quickSearch.toggleView':
+                    if (isQuickSearchOpen.value) {
+                        controller.toggleQuickSearchView();
+                    }
+                    return;
                 case 'search.window.pin':
                     await toggleWindowPin();
                     return;
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
index f7aed5d3..6bac2dee 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
@@ -837,6 +837,7 @@ interface UseSearchModelDropdownCoordinatorOptions {
     modelOverride: Ref<SearchModelOverride>;
     modelDropdownState: Ref<SearchModelDropdownState>;
     modelDropdownQuery: Ref<string>;
+    getModelToggleShortcut?: () => string | null | undefined;
     requestModelDropdownOpen: () => SearchOverlayCommand;
     handleQuickSearchClosedForModelDropdown: () => SearchOverlayCommand;
     handleLayoutStableForModelDropdown: () => SearchOverlayCommand;
@@ -856,6 +857,7 @@ export function useSearchModelDropdownCoordinator(
         modelOverride,
         modelDropdownState,
         modelDropdownQuery,
+        getModelToggleShortcut,
         requestModelDropdownOpen,
         handleQuickSearchClosedForModelDropdown,
         handleLayoutStableForModelDropdown,
@@ -874,6 +876,7 @@ export function useSearchModelDropdownCoordinator(
             selectedModelId: context.selectedModelId ?? '',
             selectedProviderId: context.selectedProviderId,
             searchQuery: modelDropdownQuery.value,
+            toggleShortcut: getModelToggleShortcut?.() ?? null,
             models: filterModelDropdownItems(
                 context.models.filter((model) => model.provider_enabled === 1).map(mapPopupModel),
                 modelDropdownQuery.value
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index 2503fca4..22e4c156 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -371,6 +371,7 @@
         modelOverride,
         modelDropdownState,
         modelDropdownQuery,
+        getModelToggleShortcut: () => searchKeybindings.value['search.model.toggle'],
         requestModelDropdownOpen,
         handleQuickSearchClosedForModelDropdown,
         handleLayoutStableForModelDropdown,
@@ -418,6 +419,11 @@
             case 'search.model.toggle':
                 await handleToggleModelDropdownRequest();
                 return;
+            case 'search.quickSearch.toggleView':
+                if (isQuickSearchOpen.value) {
+                    controller.toggleQuickSearchView();
+                }
+                return;
             case 'search.window.pin':
                 await handleToggleWindowPin();
                 return;
@@ -470,6 +476,7 @@
             activeSessionId: currentSessionId.value,
             searchQuery: sessionListQuery.value,
             isLoading: isSessionListLoading.value,
+            toggleShortcut: searchKeybindings.value['search.history.open'],
         };
     }
 
diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index c303f4bd..b73867ba 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -173,7 +173,11 @@
             {
                 id: 'inputAndRequest',
                 title: t('settings.general.searchShortcutGroups.inputAndRequest'),
-                actionIds: ['search.input.focus', 'search.model.toggle'],
+                actionIds: [
+                    'search.input.focus',
+                    'search.model.toggle',
+                    'search.quickSearch.toggleView',
+                ],
             },
             {
                 id: 'window',
diff --git a/apps/desktop/tests/PopupView/model-dropdown-i18n.test.ts b/apps/desktop/tests/PopupView/model-dropdown-i18n.test.ts
index 7c86911e..9cb06cd8 100644
--- a/apps/desktop/tests/PopupView/model-dropdown-i18n.test.ts
+++ b/apps/desktop/tests/PopupView/model-dropdown-i18n.test.ts
@@ -126,4 +126,54 @@ describe('ModelDropdownPopup i18n', () => {
         expect(normalizedText).toContain('Configure models in Settings first');
         expect(normalizedText).not.toContain('Configure models inSettingsfirst');
     });
+
+    it('uses the configured toggle shortcut and ignores the old default', () => {
+        const wrapper = mount(ModelDropdownPopup, {
+            props: {
+                data: {
+                    activeModelId: '',
+                    activeProviderId: null,
+                    selectedModelId: '',
+                    selectedProviderId: null,
+                    searchQuery: '',
+                    toggleShortcut: 'Alt+M',
+                    models: [],
+                },
+                isInPopup: true,
+            },
+        });
+        const handleKeyDown = (
+            wrapper.vm as unknown as { handleKeyDown: (event: KeyboardEvent) => void }
+        ).handleKeyDown;
+
+        handleKeyDown(new KeyboardEvent('keydown', { key: 'm', ctrlKey: true }));
+        expect(wrapper.emitted('close')).toBeUndefined();
+
+        handleKeyDown(new KeyboardEvent('keydown', { key: 'm', altKey: true }));
+        expect(wrapper.emitted('close')).toHaveLength(1);
+    });
+
+    it('does not close from the old toggle shortcut when the shortcut is disabled', () => {
+        const wrapper = mount(ModelDropdownPopup, {
+            props: {
+                data: {
+                    activeModelId: '',
+                    activeProviderId: null,
+                    selectedModelId: '',
+                    selectedProviderId: null,
+                    searchQuery: '',
+                    toggleShortcut: null,
+                    models: [],
+                },
+                isInPopup: true,
+            },
+        });
+        const handleKeyDown = (
+            wrapper.vm as unknown as { handleKeyDown: (event: KeyboardEvent) => void }
+        ).handleKeyDown;
+
+        handleKeyDown(new KeyboardEvent('keydown', { key: 'm', ctrlKey: true }));
+
+        expect(wrapper.emitted('close')).toBeUndefined();
+    });
 });
diff --git a/apps/desktop/tests/PopupView/session-history-i18n.test.ts b/apps/desktop/tests/PopupView/session-history-i18n.test.ts
index 3af44cec..4a7f808d 100644
--- a/apps/desktop/tests/PopupView/session-history-i18n.test.ts
+++ b/apps/desktop/tests/PopupView/session-history-i18n.test.ts
@@ -285,4 +285,48 @@ describe('SessionHistoryPopover i18n', () => {
         expect(wrapper.get('.history-session-preview').attributes('translate')).toBe('no');
         expect(wrapper.get('.history-session-preview').text()).toBe('关闭');
     });
+
+    it('uses the configured toggle shortcut and ignores the old default', () => {
+        const wrapper = mount(SessionHistoryPopover, {
+            props: {
+                data: {
+                    activeSessionId: null,
+                    searchQuery: '',
+                    isLoading: false,
+                    toggleShortcut: 'Alt+H',
+                    sessions: [],
+                },
+            },
+        });
+        const handleKeyDown = (
+            wrapper.vm as unknown as { handleKeyDown: (event: KeyboardEvent) => void }
+        ).handleKeyDown;
+
+        handleKeyDown(new KeyboardEvent('keydown', { key: 'h', ctrlKey: true }));
+        expect(wrapper.emitted('close')).toBeUndefined();
+
+        handleKeyDown(new KeyboardEvent('keydown', { key: 'h', altKey: true }));
+        expect(wrapper.emitted('close')).toHaveLength(1);
+    });
+
+    it('does not close from the old history shortcut when the shortcut is disabled', () => {
+        const wrapper = mount(SessionHistoryPopover, {
+            props: {
+                data: {
+                    activeSessionId: null,
+                    searchQuery: '',
+                    isLoading: false,
+                    toggleShortcut: null,
+                    sessions: [],
+                },
+            },
+        });
+        const handleKeyDown = (
+            wrapper.vm as unknown as { handleKeyDown: (event: KeyboardEvent) => void }
+        ).handleKeyDown;
+
+        handleKeyDown(new KeyboardEvent('keydown', { key: 'h', ctrlKey: true }));
+
+        expect(wrapper.emitted('close')).toBeUndefined();
+    });
 });
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index 1e2a2d9f..f8e1029c 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -148,7 +148,7 @@ describe('createSearchKeyboardRouter', () => {
         expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith('search.history.open');
     });
 
-    it('routes Ctrl+M only through the current keybinding configuration', async () => {
+    it('routes the model toggle shortcut only through the current keybinding configuration', async () => {
         const defaultRouter = createKeyboardRouter();
         expect(defaultRouter.router.route({ key: 'm', ctrlKey: true })).toBe(true);
         await flushAsyncWork();
@@ -420,7 +420,7 @@ describe('createSearchKeyboardRouter', () => {
         expect(dropdownRouter.callbacks.onForwardToPopup).toHaveBeenNthCalledWith(2, 'Enter');
     });
 
-    it('routes quick-search page, menu, and view-toggle keys', () => {
+    it('routes quick-search page and menu keys', () => {
         const { router, callbacks } = createKeyboardRouter({
             isQuickSearchOpen: () => true,
             hasQuickSearchHighlight: () => false,
@@ -430,13 +430,41 @@ describe('createSearchKeyboardRouter', () => {
         expect(router.route({ key: 'PageDown' })).toBe(true);
         expect(router.route({ key: 'ContextMenu' })).toBe(true);
         expect(router.route({ key: 'F10', shiftKey: true })).toBe(true);
-        expect(router.route({ key: 'g', ctrlKey: true })).toBe(true);
-        expect(router.route({ key: 'G', metaKey: true })).toBe(true);
 
         expect(callbacks.onQuickSearchPageUp).toHaveBeenCalledTimes(1);
         expect(callbacks.onQuickSearchPageDown).toHaveBeenCalledTimes(1);
         expect(callbacks.onQuickSearchContextMenu).toHaveBeenCalledTimes(2);
-        expect(callbacks.onQuickSearchToggleView).toHaveBeenCalledTimes(2);
+    });
+
+    it('routes quick-search view toggle through the current keybinding configuration', async () => {
+        const { router, callbacks } = createKeyboardRouter({
+            isQuickSearchOpen: () => true,
+            hasQuickSearchHighlight: () => false,
+        });
+
+        expect(router.route({ key: 'g', ctrlKey: true })).toBe(true);
+        await flushAsyncWork();
+        expect(callbacks.onSearchKeybindingAction).toHaveBeenCalledWith(
+            'search.quickSearch.toggleView'
+        );
+
+        const disabledRouter = createKeyboardRouter({
+            isQuickSearchOpen: () => true,
+            getSearchKeybindings: () => ({
+                ...createDefaultSearchKeybindings(),
+                'search.quickSearch.toggleView': null,
+            }),
+        });
+        expect(disabledRouter.router.route({ key: 'g', ctrlKey: true })).toBe(false);
+        await flushAsyncWork();
+        expect(disabledRouter.callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();
+
+        const closedRouter = createKeyboardRouter({
+            isQuickSearchOpen: () => false,
+        });
+        expect(closedRouter.router.route({ key: 'g', ctrlKey: true })).toBe(false);
+        await flushAsyncWork();
+        expect(closedRouter.callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();
     });
 
     it('routes highlighted quick-search navigation and opening through the quick-search contract', async () => {
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index edc18a5a..dcc85bc5 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -41,6 +41,7 @@ describe('search keybinding configuration', () => {
             'search.session.new': 'Mod+N',
             'search.session.reopenLastClosed': 'Mod+Shift+T',
             'search.model.toggle': 'Mod+M',
+            'search.quickSearch.toggleView': 'Mod+G',
             'search.window.pin': 'Mod+P',
             'search.window.maximize': 'F11',
             'search.settings.open': 'Mod+,',
diff --git a/apps/site/public/touchai-intro-en/touchai-components.html b/apps/site/public/touchai-intro-en/touchai-components.html
index bc60c287..cbe1cc9b 100644
--- a/apps/site/public/touchai-intro-en/touchai-components.html
+++ b/apps/site/public/touchai-intro-en/touchai-components.html
@@ -1134,11 +1134,11 @@
                 const answerMarkdown = [
                     'TouchAI is a one-touch desktop productivity agent.',
                     '',
-                    'It is not just a web chat box. It is an AI entry point that lives on your desktop. You can summon it with `Alt+Space`, describe a goal in natural language, and let it work with files, the screen, the clipboard, models, and tools.',
+                    'It is not just a web chat box. It is an AI entry point that lives on your desktop. You can summon it with a customizable global shortcut, describe a goal in natural language, and let it work with files, the screen, the clipboard, models, and tools.',
                     '',
                     '## Core abilities',
                     '',
-                    '- **Instant access:** Open or hide it quickly with `Alt+Space`, without switching to a browser or another app.',
+                    '- **Instant access:** Open or hide it quickly with the default global shortcut, or customize it to fit your workflow.',
                     '- **Desktop context:** Understands tasks around local files, screen content, clipboard text, and the current conversation.',
                     '- **Built-in tools:** Supports file search, local file and folder reading, web fetching, terminal execution, settings updates, model upgrades, and inline visualization.',
                     '- **MCP extension:** Connects external MCP servers so more tools can be used inside the same conversation.',
diff --git a/apps/site/public/touchai-intro/touchai-components.html b/apps/site/public/touchai-intro/touchai-components.html
index 0930a7d2..13a8a984 100644
--- a/apps/site/public/touchai-intro/touchai-components.html
+++ b/apps/site/public/touchai-intro/touchai-components.html
@@ -1142,13 +1142,13 @@
                 const answerMarkdown = [
                     'TouchAI 是一个“一触即达”的桌面效率 Agent。',
                     '',
-                    '它不是单纯的网页聊天框，而是一个运行在桌面上的 AI 工作入口。你可以在当前工作流里按下 `Alt+Space` 唤起它，用自然语言说出目标，让它结合文件、屏幕、剪贴板、模型和工具去完成任务。',
+                    '它不是单纯的网页聊天框，而是一个运行在桌面上的 AI 工作入口。你可以在当前工作流里通过可自定义的全局快捷键唤起它，用自然语言说出目标，让它结合文件、屏幕、剪贴板、模型和工具去完成任务。',
                     '',
                     '项目 README 对 TouchAI 的定位是：**一触即达的桌面效率 Agent**。这个定位很关键，因为它强调的不是“打开一个 AI 网站再问问题”，而是让 AI 变成电脑系统里的一个随叫随到的操作层。',
                     '',
                     '## 1. 一触即达的桌面入口',
                     '',
-                    'TouchAI 默认以全局快捷键作为入口。源码里的通用设置将全局快捷键设为 `Alt+Space`，所以它的交互方式更接近系统级搜索栏、启动器或命令面板。',
+                    'TouchAI 默认以全局快捷键作为入口，并允许在设置中按习惯自定义，所以它的交互方式更接近系统级搜索栏、启动器或命令面板。',
                     '',
                     '- **随叫随到：** 需要时唤起，不需要时隐藏。',
                     '- **不打断工作流：** 不必切到浏览器或单独应用窗口。',

From 11f90d56e1b65f8590cfd592621072d320e90c43 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 15 Jun 2026 00:05:16 +0800
Subject: [PATCH 45/55] fix(desktop): avoid swallowing quick search toggle
 shortcut

---
 .../SearchView/composables/useSearchPage.ts   | 36 +++++++++++++++--
 .../SearchView/useSearchPage.test.ts          | 39 ++++++++++++++++++-
 2 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
index 6bac2dee..820379bd 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
@@ -16,7 +16,11 @@ import { runStartupTasks } from '@services/StartupService';
 import { getCurrentWindow } from '@tauri-apps/api/window';
 import { nextTick, onMounted, onUnmounted, type Ref, ref, watch } from 'vue';
 
-import { SEARCH_KEYBINDING_DEFINITIONS, type SearchKeybindings } from '@/config/searchKeybindings';
+import {
+    SEARCH_KEYBINDING_DEFINITIONS,
+    type SearchKeybindingActionId,
+    type SearchKeybindings,
+} from '@/config/searchKeybindings';
 import { type MessageKey, type MessageParams, t } from '@/i18n';
 import { useSettingsStore } from '@/stores/settings';
 import { isE2eTestMode } from '@/utils/runtimeMode';
@@ -39,8 +43,30 @@ import { useModelDropdownPopup } from './useModelDropdownPopup';
 
 const HIDE_TIMEOUT_MS = 5 * 60 * 1000;
 
-function buildSearchSurfaceShortcutEntries(searchKeybindings: SearchKeybindings) {
+interface SearchSurfaceShortcutSyncContext {
+    quickSearchOpen: boolean;
+}
+
+function shouldSyncSearchSurfaceShortcutToNative(
+    actionId: SearchKeybindingActionId,
+    context: SearchSurfaceShortcutSyncContext
+) {
+    if (actionId === 'search.quickSearch.toggleView') {
+        return context.quickSearchOpen;
+    }
+
+    return true;
+}
+
+function buildSearchSurfaceShortcutEntries(
+    searchKeybindings: SearchKeybindings,
+    context: SearchSurfaceShortcutSyncContext
+) {
     return SEARCH_KEYBINDING_DEFINITIONS.flatMap((definition) => {
+        if (!shouldSyncSearchSurfaceShortcutToNative(definition.id, context)) {
+            return [];
+        }
+
         const shortcut = normalizeLocalShortcutString(searchKeybindings[definition.id]);
         return shortcut ? [{ actionId: definition.id, shortcut }] : [];
     });
@@ -590,7 +616,9 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
 
         try {
             await native.shortcut.setSearchSurfaceShortcuts(
-                buildSearchSurfaceShortcutEntries(searchKeybindings.value)
+                buildSearchSurfaceShortcutEntries(searchKeybindings.value, {
+                    quickSearchOpen: controller.isQuickSearchOpen(),
+                })
             );
         } catch (error) {
             console.error('[SearchView] Failed to sync search surface shortcuts:', error);
@@ -656,7 +684,7 @@ export function useSearchPageLifecycle(options: UseSearchPageLifecycleOptions) {
         }
 
         stopSearchSurfaceShortcutWatch = watch(
-            searchKeybindings,
+            [searchKeybindings, () => controller.isQuickSearchOpen()],
             () => {
                 void syncSearchSurfaceShortcutsSafely();
             },
diff --git a/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts b/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
index 87a26803..a318d0e7 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
@@ -131,6 +131,7 @@ function createController() {
         focusSearchInput: vi.fn().mockResolvedValue(undefined),
         loadActiveModel: vi.fn().mockResolvedValue(undefined),
         invalidateModelDropdownData: vi.fn(),
+        isQuickSearchOpen: vi.fn(() => false),
     };
 }
 
@@ -308,7 +309,11 @@ describe('useSearchPageLifecycle', () => {
     });
 
     it('syncs search surface shortcuts and delegates host accelerator commands', async () => {
-        const controller = createController();
+        const quickSearchOpen = ref(false);
+        const controller = {
+            ...createController(),
+            isQuickSearchOpen: vi.fn(() => quickSearchOpen.value),
+        };
         const interactionContext = createSearchInteractionContext();
         const searchKeybindings = ref(createDefaultSearchKeybindings());
         const handleSearchSurfaceCommand = vi.fn().mockResolvedValue(undefined);
@@ -353,6 +358,14 @@ describe('useSearchPageLifecycle', () => {
                 },
             ])
         );
+        expect(nativeMock.shortcut.setSearchSurfaceShortcuts).toHaveBeenCalledWith(
+            expect.not.arrayContaining([
+                {
+                    actionId: 'search.quickSearch.toggleView',
+                    shortcut: 'Mod+G',
+                },
+            ])
+        );
 
         const commandHandler = eventHandlers.get(AppEvent.SEARCH_SURFACE_COMMAND);
         expect(commandHandler).toBeDefined();
@@ -369,6 +382,30 @@ describe('useSearchPageLifecycle', () => {
             source: 'webview2-accelerator',
         });
 
+        quickSearchOpen.value = true;
+        await flushLifecycle();
+
+        expect(nativeMock.shortcut.setSearchSurfaceShortcuts).toHaveBeenLastCalledWith(
+            expect.arrayContaining([
+                {
+                    actionId: 'search.quickSearch.toggleView',
+                    shortcut: 'Mod+G',
+                },
+            ])
+        );
+
+        quickSearchOpen.value = false;
+        await flushLifecycle();
+
+        expect(nativeMock.shortcut.setSearchSurfaceShortcuts).toHaveBeenLastCalledWith(
+            expect.not.arrayContaining([
+                {
+                    actionId: 'search.quickSearch.toggleView',
+                    shortcut: 'Mod+G',
+                },
+            ])
+        );
+
         searchKeybindings.value = {
             ...searchKeybindings.value,
             'search.model.toggle': null,

From bfb2d9b75ac78ff93fcba8b0d94b1001447b2913 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 15 Jun 2026 02:12:09 +0800
Subject: [PATCH 46/55] fix(desktop): preserve persisted search shortcuts

---
 apps/desktop/src/config/searchKeybindings.ts  | 56 +++++++++++++++----
 .../tests/config/searchKeybindings.test.ts    | 37 ++++++++++++
 2 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 67180dd5..29dec439 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -140,15 +140,16 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
     }
 
     const candidates = value as Record<string, unknown>;
+    const resolved = new Map<
+        SearchKeybindingActionId,
+        { shortcut: string | null; isPersisted: boolean }
+    >();
 
-    // 第一轮：先解析每个动作期望使用的快捷键（合法自定义值、显式禁用或默认值），
-    // 暂不处理快捷键冲突。
-    const resolved = new Map<SearchKeybindingActionId, string | null>();
     for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
         const candidate = candidates[definition.id];
 
         if (candidate === null && definition.allowDisable) {
-            resolved.set(definition.id, null);
+            resolved.set(definition.id, { shortcut: null, isPersisted: true });
             continue;
         }
 
@@ -161,30 +162,42 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
                 const passesModifierPolicy =
                     hasCommandModifier(shortcut) || allowsModifierlessFunction;
                 if (passesModifierPolicy && !isReservedLocalShortcut(shortcut)) {
-                    resolved.set(definition.id, shortcut);
+                    resolved.set(definition.id, { shortcut, isPersisted: true });
                     continue;
                 }
             }
         }
 
-        resolved.set(definition.id, defaults[definition.id]);
+        resolved.set(definition.id, {
+            shortcut: defaults[definition.id],
+            isPersisted: false,
+        });
     }
 
-    // 第二轮：按定义顺序稳定处理冲突，先出现的动作保留快捷键。
-    // 这样干净的快捷键互换不会因为撞到对方默认值而被同时丢弃。
     const result = createDefaultSearchKeybindings();
+    const assignedActionIds = new Set<SearchKeybindingActionId>();
     const usedShortcuts = new Set<string>();
-    for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
-        const desired = resolved.get(definition.id) ?? null;
+
+    function assignShortcut(
+        definition: SearchKeybindingDefinition,
+        desired: string | null,
+        fallbackOnConflict = true
+    ) {
         if (desired === null) {
             result[definition.id] = null;
-            continue;
+            assignedActionIds.add(definition.id);
+            return true;
         }
 
         if (!usedShortcuts.has(desired)) {
             usedShortcuts.add(desired);
             result[definition.id] = desired;
-            continue;
+            assignedActionIds.add(definition.id);
+            return true;
+        }
+
+        if (!fallbackOnConflict) {
+            return false;
         }
 
         const fallback = normalizeLocalShortcutString(definition.defaultShortcut);
@@ -194,6 +207,25 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
         } else {
             result[definition.id] = null;
         }
+        assignedActionIds.add(definition.id);
+        return true;
+    }
+
+    for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
+        const resolvedShortcut = resolved.get(definition.id);
+        if (!resolvedShortcut?.isPersisted) {
+            continue;
+        }
+
+        assignShortcut(definition, resolvedShortcut.shortcut, false);
+    }
+
+    for (const definition of SEARCH_KEYBINDING_DEFINITIONS) {
+        if (assignedActionIds.has(definition.id)) {
+            continue;
+        }
+
+        assignShortcut(definition, defaults[definition.id]);
     }
 
     return result;
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index dcc85bc5..8adf1028 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -100,6 +100,43 @@ describe('search keybinding configuration', () => {
         });
     });
 
+    it('does not let duplicate fallback defaults steal later persisted shortcuts', () => {
+        expect(
+            normalizeSearchKeybindings({
+                'search.history.open': 'Ctrl+Y',
+                'search.input.focus': 'Ctrl+Y',
+                'search.settings.open': 'Ctrl+L',
+            })
+        ).toEqual({
+            ...createDefaultSearchKeybindings(),
+            'search.history.open': 'Mod+Y',
+            'search.input.focus': null,
+            'search.settings.open': 'Mod+L',
+        });
+    });
+
+    it('preserves persisted shortcuts when they conflict with newly added defaults', () => {
+        expect(
+            normalizeSearchKeybindings({
+                'search.window.pin': 'Mod+G',
+            })
+        ).toEqual({
+            ...createDefaultSearchKeybindings(),
+            'search.quickSearch.toggleView': null,
+            'search.window.pin': 'Mod+G',
+        });
+    });
+
+    it('keeps normalized key order stable for persistence', () => {
+        expect(
+            Object.keys(
+                normalizeSearchKeybindings({
+                    'search.window.pin': 'Mod+G',
+                })
+            )
+        ).toEqual(SEARCH_KEYBINDING_ACTION_IDS);
+    });
+
     it('falls back to defaults for invalid persisted payloads', () => {
         const defaults = createDefaultSearchKeybindings();
 

From 1f557f25ce99926b98488feb87229bc7e235afe1 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 15 Jun 2026 02:56:07 +0800
Subject: [PATCH 47/55] fix(desktop): reject macOS reserved shortcuts

---
 apps/desktop/src/config/searchKeybindings.ts  |  7 +++-
 apps/desktop/src/i18n/messages.ts             |  4 ++
 .../BuiltInToolService/tools/setting/index.ts | 13 ++++++-
 .../General/SearchShortcutSettings.vue        | 13 +++++++
 .../tests/config/searchKeybindings.test.ts    | 30 +++++++++++++-
 .../tools/setting/i18n.test.ts                | 39 ++++++++++++++++++-
 .../settingsGeneralComponent.test.ts          | 31 +++++++++++++++
 7 files changed, 133 insertions(+), 4 deletions(-)

diff --git a/apps/desktop/src/config/searchKeybindings.ts b/apps/desktop/src/config/searchKeybindings.ts
index 29dec439..b6f423be 100644
--- a/apps/desktop/src/config/searchKeybindings.ts
+++ b/apps/desktop/src/config/searchKeybindings.ts
@@ -2,6 +2,7 @@ import type { MessageKey } from '@/i18n';
 import {
     hasCommandModifier,
     isModifierlessFunctionShortcut,
+    isReservedGlobalShortcut,
     isReservedLocalShortcut,
     normalizeLocalShortcutString,
 } from '@/utils/shortcuts';
@@ -161,7 +162,11 @@ export function normalizeSearchKeybindings(value: unknown): SearchKeybindings {
                     isModifierlessFunctionShortcut(shortcut);
                 const passesModifierPolicy =
                     hasCommandModifier(shortcut) || allowsModifierlessFunction;
-                if (passesModifierPolicy && !isReservedLocalShortcut(shortcut)) {
+                if (
+                    passesModifierPolicy &&
+                    !isReservedLocalShortcut(shortcut) &&
+                    !isReservedGlobalShortcut(shortcut)
+                ) {
                     resolved.set(definition.id, { shortcut, isPersisted: true });
                     continue;
                 }
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index e185a265..cf470586 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -133,6 +133,8 @@ const zhCNMessages = {
         '快捷键需要包含 Ctrl、Alt 或 Cmd，或使用允许的功能键',
     'settings.general.searchShortcuts.errors.reserved':
         '该快捷键保留给输入/导航行为，请选择其他组合',
+    'settings.general.searchShortcuts.errors.systemReserved':
+        '该快捷键容易与 macOS 系统功能或输入法冲突，请换一个组合',
     'settings.general.searchShortcuts.errors.unsupported':
         '暂不支持该按键作为搜索页快捷键，请换一个组合',
     'settings.general.searchShortcuts.errors.duplicate': '该快捷键已被“{action}”使用，请换一个组合',
@@ -1106,6 +1108,8 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
         'A shortcut must include Ctrl, Alt, or Cmd, or use an allowed function key',
     'settings.general.searchShortcuts.errors.reserved':
         'This shortcut is reserved for typing or navigation. Choose another combination.',
+    'settings.general.searchShortcuts.errors.systemReserved':
+        'This shortcut can conflict with macOS system features or input methods. Choose another combination.',
     'settings.general.searchShortcuts.errors.unsupported':
         'This key is not supported for search shortcuts yet. Choose another combination.',
     'settings.general.searchShortcuts.errors.duplicate':
diff --git a/apps/desktop/src/services/BuiltInToolService/tools/setting/index.ts b/apps/desktop/src/services/BuiltInToolService/tools/setting/index.ts
index 634a318a..9d7977c6 100644
--- a/apps/desktop/src/services/BuiltInToolService/tools/setting/index.ts
+++ b/apps/desktop/src/services/BuiltInToolService/tools/setting/index.ts
@@ -10,7 +10,7 @@ import { resolveSearchWindowDefaultSize } from '@/config/searchWindow';
 import { t, tt } from '@/i18n';
 import type { ToolApprovalRequest } from '@/services/AgentService/contracts/tooling';
 import type { GeneralSettingsData } from '@/stores/settings';
-import { normalizeLocalShortcutString } from '@/utils/shortcuts';
+import { isReservedGlobalShortcut, normalizeLocalShortcutString } from '@/utils/shortcuts';
 import { truncateText } from '@/utils/text';
 
 import {
@@ -80,6 +80,7 @@ async function applySettingSideEffect(
     value: SupportedSettingValue
 ): Promise<void> {
     if (key === 'global_shortcut') {
+        ensureGlobalShortcutIsNotSystemReserved(value as GeneralSettingsData['globalShortcut']);
         ensureGlobalShortcutDoesNotConflictWithSearchShortcuts(
             settingsStore,
             value as GeneralSettingsData['globalShortcut']
@@ -117,6 +118,16 @@ async function applySettingSideEffect(
     }
 }
 
+function ensureGlobalShortcutIsNotSystemReserved(
+    shortcut: GeneralSettingsData['globalShortcut']
+): void {
+    if (!isReservedGlobalShortcut(shortcut)) {
+        return;
+    }
+
+    throw new Error(t('settings.general.globalShortcutReservedOnMac'));
+}
+
 function findGlobalShortcutSearchConflict(
     settingsStore: SettingsStore,
     shortcut: GeneralSettingsData['globalShortcut']
diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index b73867ba..312fff39 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -24,6 +24,7 @@
         hasCommandModifier,
         isMacPlatform,
         isModifierlessFunctionShortcut,
+        isReservedGlobalShortcut,
         isReservedLocalShortcut,
         isReservedLocalShortcutKey,
         normalizeLocalShortcutString,
@@ -351,6 +352,18 @@
                 return false;
             }
 
+            if (isReservedGlobalShortcut(normalizedShortcut)) {
+                reportSearchShortcutError(
+                    actionId,
+                    'settings.general.searchShortcuts.errors.systemReserved'
+                );
+                updateSearchShortcutDisplay(
+                    actionId,
+                    formatSearchShortcutForSettings(settings.value.searchKeybindings[actionId])
+                );
+                return false;
+            }
+
             if (isReservedLocalShortcut(normalizedShortcut)) {
                 reportSearchShortcutError(
                     actionId,
diff --git a/apps/desktop/tests/config/searchKeybindings.test.ts b/apps/desktop/tests/config/searchKeybindings.test.ts
index 8adf1028..47a61268 100644
--- a/apps/desktop/tests/config/searchKeybindings.test.ts
+++ b/apps/desktop/tests/config/searchKeybindings.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest';
+import { afterEach, describe, expect, it } from 'vitest';
 
 import {
     createDefaultSearchKeybindings,
@@ -10,7 +10,20 @@ import {
     type SearchKeybindingActionId,
 } from '@/config/searchKeybindings';
 
+const originalPlatform = navigator.platform;
+
+function setPlatform(platform: string) {
+    Object.defineProperty(window.navigator, 'platform', {
+        configurable: true,
+        value: platform,
+    });
+}
+
 describe('search keybinding configuration', () => {
+    afterEach(() => {
+        setPlatform(originalPlatform);
+    });
+
     it('keeps action ids and definitions in sync', () => {
         expect(SEARCH_KEYBINDING_DEFINITIONS.map((definition) => definition.id)).toEqual(
             SEARCH_KEYBINDING_ACTION_IDS
@@ -84,6 +97,21 @@ describe('search keybinding configuration', () => {
         });
     });
 
+    it('rejects persisted macOS system-reserved shortcuts', () => {
+        setPlatform('MacIntel');
+
+        expect(
+            normalizeSearchKeybindings({
+                'search.history.open': 'Cmd+Space',
+                'search.input.focus': 'Ctrl+Space',
+                'search.window.maximize': 'F12',
+            })
+        ).toEqual({
+            ...createDefaultSearchKeybindings(),
+            'search.window.maximize': 'F12',
+        });
+    });
+
     it('rejects persisted shortcut duplicates while preserving disabled actions', () => {
         expect(
             normalizeSearchKeybindings({
diff --git a/apps/desktop/tests/services/BuiltInToolService/tools/setting/i18n.test.ts b/apps/desktop/tests/services/BuiltInToolService/tools/setting/i18n.test.ts
index 4dccf490..8f238cf2 100644
--- a/apps/desktop/tests/services/BuiltInToolService/tools/setting/i18n.test.ts
+++ b/apps/desktop/tests/services/BuiltInToolService/tools/setting/i18n.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
 import { setLocale } from '@/i18n';
@@ -16,6 +16,15 @@ import {
     parseSettingRequest,
 } from '@/services/BuiltInToolService/tools/setting/helper';
 
+const originalPlatform = navigator.platform;
+
+function setPlatform(platform: string) {
+    Object.defineProperty(window.navigator, 'platform', {
+        configurable: true,
+        value: platform,
+    });
+}
+
 const {
     mockSettingsStore,
     mockRegisterGlobalShortcut,
@@ -91,6 +100,7 @@ function createExecutionContext(): Parameters<typeof executeSettingTool>[2] {
 describe('Setting built-in tool i18n', () => {
     beforeEach(() => {
         vi.clearAllMocks();
+        setPlatform('Win32');
         mockRegisterGlobalShortcut.mockResolvedValue(undefined);
         mockUpdateGlobalShortcut.mockResolvedValue(undefined);
         mockUpdateLanguage.mockResolvedValue(undefined);
@@ -99,6 +109,10 @@ describe('Setting built-in tool i18n', () => {
         mockSettingsStore.settings.language = 'zh-CN';
     });
 
+    afterEach(() => {
+        setPlatform(originalPlatform);
+    });
+
     it('formats list and get outputs in English when active locale is English', async () => {
         setLocale('en-US');
 
@@ -223,6 +237,29 @@ describe('Setting built-in tool i18n', () => {
         expect(mockRegisterGlobalShortcut).not.toHaveBeenCalledWith('Ctrl+K');
     });
 
+    it('rejects macOS system-reserved global shortcuts before registration', async () => {
+        setLocale('en-US');
+        setPlatform('MacIntel');
+
+        const result = await executeSettingTool(
+            {
+                action: 'set',
+                key: 'global_shortcut',
+                value: 'Cmd+Space',
+                reason: 'User asked for it.',
+            },
+            {},
+            createExecutionContext()
+        );
+
+        expect(result).toMatchObject({
+            isError: true,
+            status: 'error',
+        });
+        expect(result.errorMessage).toContain('macOS');
+        expect(mockRegisterGlobalShortcut).not.toHaveBeenCalledWith('Cmd+Space');
+    });
+
     it('formats failed rollback in English', async () => {
         setLocale('en-US');
         mockRegisterGlobalShortcut
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 0fcfaeb1..83d59a6d 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -391,6 +391,37 @@ describe('SettingsGeneralSection', () => {
         expect((input.element as HTMLInputElement).value).toBe('Option+Space');
     });
 
+    it('rejects macOS system-reserved search shortcuts', async () => {
+        setPlatform('MacIntel');
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+        alertMessageMock.error.mockClear();
+
+        window.dispatchEvent(
+            new KeyboardEvent('keydown', { key: ' ', code: 'Space', metaKey: true })
+        );
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+        expect(alertMessageMock.error).toHaveBeenCalledWith(expect.stringContaining('macOS'), 3000);
+        expect((input.element as HTMLInputElement).value).toBe('Cmd+H');
+
+        window.dispatchEvent(
+            new KeyboardEvent('keydown', { key: ' ', code: 'Space', ctrlKey: true })
+        );
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Cmd+H');
+    });
+
     it('saves the global shortcut immediately after a shortcut is pressed', async () => {
         settingsStoreMock.settings.value.searchKeybindings['search.session.new'] = 'Mod+Shift+N';
         const wrapper = mount(GeneralSection);

From fab4520d3367c88f9c443341ba44b6a71e2374c2 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 15 Jun 2026 03:15:45 +0800
Subject: [PATCH 48/55] fix(desktop): harden search accelerator command routing

---
 .../src/core/window/webview_defaults.rs       | 34 +++++++++--
 apps/desktop/src/views/PopupView/index.vue    | 22 ++++++-
 .../interaction/useSearchKeyboardRouter.ts    | 26 +++-----
 .../composables/searchInteraction.ts          | 10 +--
 .../SearchView/composables/useSearchPage.ts   |  2 +-
 apps/desktop/src/views/SearchView/index.vue   | 11 ++--
 .../tests/PopupView/popup-view-i18n.test.ts   | 61 ++++++++++++++++++-
 .../SearchView/searchInteraction.test.ts      | 16 ++++-
 .../useSearchKeyboardRouter.test.ts           | 12 ++--
 9 files changed, 152 insertions(+), 42 deletions(-)

diff --git a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
index 2f0ab928..fe3587a1 100644
--- a/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
+++ b/apps/desktop/src-tauri/src/core/window/webview_defaults.rs
@@ -197,6 +197,11 @@ fn is_accelerator_key_down_event(key_event_kind: i32) -> bool {
         || key_event_kind == COREWEBVIEW2_KEY_EVENT_KIND_SYSTEM_KEY_DOWN.0
 }
 
+#[cfg(target_os = "windows")]
+fn should_emit_search_surface_command_to_window(label: &str) -> bool {
+    label == "main" || label.starts_with("popup-")
+}
+
 #[cfg(target_os = "windows")]
 /// 注册 WebView2 accelerator 处理器，将 Alt+Space 转成 Tauri 事件供前端捕获。
 ///
@@ -209,7 +214,8 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
     controller: &ICoreWebView2Controller,
 ) -> Result<(), String> {
     let app_handle = window.app_handle().clone();
-    let search_surface_window = (window.label() == "main").then(|| window.clone());
+    let search_surface_command_window =
+        should_emit_search_surface_command_to_window(window.label()).then(|| window.clone());
     let mut token = 0i64;
     let handler = AcceleratorKeyPressedEventHandler::create(Box::new(
         move |_controller: Option<ICoreWebView2Controller>,
@@ -230,7 +236,7 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
                         return Ok(());
                     }
 
-                    let Some(search_surface_window) = &search_surface_window else {
+                    let Some(search_surface_command_window) = &search_surface_command_window else {
                         return Ok(());
                     };
 
@@ -258,7 +264,7 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
                         let _ = args2.SetIsBrowserAcceleratorKeyEnabled(false);
                     }
                     let _ = args.SetHandled(true);
-                    let _ = search_surface_window.emit("search-surface-command", command);
+                    let _ = search_surface_command_window.emit("search-surface-command", command);
                     return Ok(());
                 }
 
@@ -267,7 +273,7 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
                 let is_super_down = (GetKeyState(i32::from(VK_LWIN.0)) as u16 & 0x8000) != 0
                     || (GetKeyState(i32::from(VK_RWIN.0)) as u16 & 0x8000) != 0;
 
-                if let Some(search_surface_window) = &search_surface_window {
+                if let Some(search_surface_command_window) = &search_surface_command_window {
                     if let Some(command) =
                         crate::core::system::shortcut::find_search_surface_command_for_windows_accelerator(
                             virtual_key,
@@ -283,7 +289,7 @@ fn register_system_menu_accelerator_handler<R: Runtime>(
                             let _ = args2.SetIsBrowserAcceleratorKeyEnabled(false);
                         }
                         let _ = args.SetHandled(true);
-                        let _ = search_surface_window.emit("search-surface-command", command);
+                        let _ = search_surface_command_window.emit("search-surface-command", command);
                         return Ok(());
                     }
                 }
@@ -440,6 +446,24 @@ pub(crate) fn apply_webview_runtime_defaults<R: Runtime>(
     })?
 }
 
+#[cfg(all(test, target_os = "windows"))]
+mod tests {
+    use super::should_emit_search_surface_command_to_window;
+
+    #[test]
+    fn search_surface_commands_target_main_and_popup_windows_only() {
+        assert!(should_emit_search_surface_command_to_window("main"));
+        assert!(should_emit_search_surface_command_to_window(
+            "popup-model-dropdown-popup"
+        ));
+        assert!(should_emit_search_surface_command_to_window(
+            "popup-session-history-popup"
+        ));
+        assert!(!should_emit_search_surface_command_to_window("settings"));
+        assert!(!should_emit_search_surface_command_to_window("assistant"));
+    }
+}
+
 #[cfg(not(target_os = "windows"))]
 /**
  * 非 Windows 平台无需额外的 WebView2 默认配置。
diff --git a/apps/desktop/src/views/PopupView/index.vue b/apps/desktop/src/views/PopupView/index.vue
index 8ba57a1a..71a9750e 100644
--- a/apps/desktop/src/views/PopupView/index.vue
+++ b/apps/desktop/src/views/PopupView/index.vue
@@ -2,7 +2,7 @@
 
 <script setup lang="ts">
     import { useWindowResize } from '@composables/useWindowResize';
-    import { AppEvent, eventService } from '@services/EventService';
+    import { AppEvent, eventService, type SearchSurfaceCommandEvent } from '@services/EventService';
     import { native } from '@services/NativeService';
     import type { PopupDataPayload, PopupKeydownPayload, PopupType } from '@services/PopupService';
     import { initializeBuiltInPopups, popupRegistry } from '@services/PopupService';
@@ -33,6 +33,10 @@
     const popupComponent = computed(() =>
         popupType.value ? popupRegistry.get(popupType.value)?.component : null
     );
+    const popupToggleActionByType: Record<PopupType, SearchSurfaceCommandEvent['actionId']> = {
+        'model-dropdown-popup': 'search.model.toggle',
+        'session-history-popup': 'search.history.open',
+    };
     const popupProps = computed(() => {
         return {
             data: popupData.value,
@@ -112,6 +116,19 @@
         componentRef.value?.handleKeyDown?.(e);
     }
 
+    function handleSearchSurfaceCommand(payload: SearchSurfaceCommandEvent) {
+        const currentPopupType = popupType.value;
+        if (!currentPopupType) {
+            return;
+        }
+
+        if (popupToggleActionByType[currentPopupType] !== payload.actionId) {
+            return;
+        }
+
+        void close();
+    }
+
     // 初始化内置弹窗注册表（PopupView 有独立的 JS 上下文）
     initializeBuiltInPopups();
 
@@ -231,6 +248,9 @@
                 );
             })
         );
+        unlisteners.push(
+            await eventService.on(AppEvent.SEARCH_SURFACE_COMMAND, handleSearchSurfaceCommand)
+        );
 
         // ESC 关闭
         window.addEventListener('keydown', handleKeyDown);
diff --git a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
index 22f5307c..91f247e4 100644
--- a/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
+++ b/apps/desktop/src/views/SearchView/composables/interaction/useSearchKeyboardRouter.ts
@@ -103,26 +103,17 @@ function resolveSearchKeybindingAction(
     return null;
 }
 
-function resolveSearchKeybindingActionByShortcut(
+function matchesSearchKeybindingCommand(
+    actionId: SearchKeybindingActionId,
     shortcut: string,
     keybindings: SearchKeybindings
-): SearchKeybindingActionId | null {
+): boolean {
     const normalizedShortcut = normalizeLocalShortcutString(shortcut);
     if (!normalizedShortcut) {
-        return null;
-    }
-
-    for (const [actionId, candidate] of Object.entries(keybindings) as Array<
-        [SearchKeybindingActionId, string | null]
-    >) {
-        if (normalizeLocalShortcutString(candidate) !== normalizedShortcut) {
-            continue;
-        }
-
-        return actionId;
+        return false;
     }
 
-    return null;
+    return normalizeLocalShortcutString(keybindings[actionId]) === normalizedShortcut;
 }
 
 /**
@@ -189,9 +180,8 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
         return true;
     }
 
-    function routeShortcut(shortcut: string) {
-        const actionId = resolveSearchKeybindingActionByShortcut(shortcut, getSearchKeybindings());
-        if (!actionId) {
+    function routeCommand(actionId: SearchKeybindingActionId, shortcut: string) {
+        if (!matchesSearchKeybindingCommand(actionId, shortcut, getSearchKeybindings())) {
             return false;
         }
 
@@ -375,6 +365,6 @@ export function createSearchKeyboardRouter(options: CreateSearchKeyboardRouterOp
 
     return {
         route,
-        routeShortcut,
+        routeCommand,
     };
 }
diff --git a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
index 05ecdf08..36eff70b 100644
--- a/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
+++ b/apps/desktop/src/views/SearchView/composables/searchInteraction.ts
@@ -3,7 +3,7 @@
  * 收口页面交互状态、QuickSearch / overlay 策略与键盘语义解释，
  * 避免页面编排层和输入层同时承载交互规则。
  */
-import { AppEvent, eventService } from '@services/EventService';
+import { AppEvent, eventService, type SearchSurfaceCommandEvent } from '@services/EventService';
 import type { PopupKeydownPayload } from '@services/PopupService';
 import { computed, type ComputedRef, reactive, type Ref, ref, watch } from 'vue';
 
@@ -144,7 +144,7 @@ export interface UseSearchKeyboardOptions {
 }
 
 export type SearchKeydownHandler = ((event: KeyboardEvent) => Promise<void>) & {
-    routeSearchSurfaceShortcut: (shortcut: string) => boolean;
+    routeSearchSurfaceCommand: (payload: SearchSurfaceCommandEvent) => boolean;
 };
 
 function createEmptyModelOverride(): SearchModelOverride {
@@ -841,12 +841,12 @@ export function createSearchKeydownHandler(
         return controller.isQuickSearchContextMenuOpen();
     }
 
-    function routeSearchSurfaceShortcut(shortcut: string) {
+    function routeSearchSurfaceCommand(payload: SearchSurfaceCommandEvent) {
         if (shouldSkipSearchKeyboardRouting()) {
             return false;
         }
 
-        return keyboardRouter.routeShortcut(shortcut);
+        return keyboardRouter.routeCommand(payload.actionId, payload.shortcut);
     }
 
     async function handleKeyDown(event: KeyboardEvent) {
@@ -908,6 +908,6 @@ export function createSearchKeydownHandler(
     }
 
     return Object.assign(handleKeyDown, {
-        routeSearchSurfaceShortcut,
+        routeSearchSurfaceCommand,
     });
 }
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
index 820379bd..772fdeb8 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
@@ -1151,6 +1151,6 @@ export function useSearchKeyboard(options: UseSearchKeyboardOptions) {
     });
 
     return {
-        routeSearchSurfaceShortcut: handleKeyDown.routeSearchSurfaceShortcut,
+        routeSearchSurfaceCommand: handleKeyDown.routeSearchSurfaceCommand,
     };
 }
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index 22e4c156..2f288659 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -2,7 +2,10 @@
     // Copyright (c) 2026. Qian Cheng. Licensed under GPL v3.
 
     import { useSessionStatus } from '@composables/useSessionStatus';
-    import type { SessionStatusReminderActionEvent } from '@services/EventService/types';
+    import type {
+        SearchSurfaceCommandEvent,
+        SessionStatusReminderActionEvent,
+    } from '@services/EventService/types';
     import type { QuickShortcutItem } from '@services/NativeService';
     import { native } from '@services/NativeService';
     import { notify } from '@services/NotificationService';
@@ -440,7 +443,7 @@
         }
     }
 
-    let routeSearchSurfaceShortcut: ((shortcut: string) => boolean) | null = null;
+    let routeSearchSurfaceCommand: ((payload: SearchSurfaceCommandEvent) => boolean) | null = null;
 
     const { hideSearchWindow } = useSearchPageLifecycle({
         controller,
@@ -460,7 +463,7 @@
         handleAiModelsUpdated,
         handleShortcutAutoPaste: tryShortcutAutoPaste,
         handleSearchSurfaceCommand: (payload) => {
-            routeSearchSurfaceShortcut?.(payload.shortcut);
+            routeSearchSurfaceCommand?.(payload);
         },
     });
 
@@ -590,7 +593,7 @@
         cancelRequest,
         clearSession: clearSessionToIdle,
     });
-    routeSearchSurfaceShortcut = searchKeyboard.routeSearchSurfaceShortcut;
+    routeSearchSurfaceCommand = searchKeyboard.routeSearchSurfaceCommand;
 
     function handleQueryTextChange(value: string) {
         queryText.value = value;
diff --git a/apps/desktop/tests/PopupView/popup-view-i18n.test.ts b/apps/desktop/tests/PopupView/popup-view-i18n.test.ts
index 3e9c85ad..34a4bea7 100644
--- a/apps/desktop/tests/PopupView/popup-view-i18n.test.ts
+++ b/apps/desktop/tests/PopupView/popup-view-i18n.test.ts
@@ -2,17 +2,21 @@ import { flushPromises, mount } from '@vue/test-utils';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 const {
+    eventHandlers,
     eventEmitMock,
     eventOnMock,
     getCurrentWindowMock,
+    hidePopupWindowMock,
     initializeBuiltInPopupsMock,
     requestResizeMock,
     resetMeasuredHeightMock,
     settingsInitializeMock,
 } = vi.hoisted(() => ({
+    eventHandlers: new Map<string, (payload: unknown) => unknown>(),
     eventEmitMock: vi.fn(),
     eventOnMock: vi.fn(),
     getCurrentWindowMock: vi.fn(),
+    hidePopupWindowMock: vi.fn(),
     initializeBuiltInPopupsMock: vi.fn(),
     requestResizeMock: vi.fn(),
     resetMeasuredHeightMock: vi.fn(),
@@ -32,6 +36,7 @@ vi.mock('@services/EventService', () => ({
         POPUP_DATA: 'popup-data',
         POPUP_KEYDOWN: 'popup-keydown',
         POPUP_READY: 'popup-ready',
+        SEARCH_SURFACE_COMMAND: 'search-surface-command',
     },
     eventService: {
         emit: eventEmitMock,
@@ -42,7 +47,7 @@ vi.mock('@services/EventService', () => ({
 vi.mock('@services/NativeService', () => ({
     native: {
         window: {
-            hidePopupWindow: vi.fn(),
+            hidePopupWindow: hidePopupWindowMock,
         },
     },
 }));
@@ -68,13 +73,21 @@ describe('PopupView i18n bootstrap', () => {
     beforeEach(() => {
         vi.clearAllMocks();
         vi.useRealTimers();
+        eventHandlers.clear();
         window.history.replaceState(null, '', '/popup?type=session-history');
-        eventOnMock.mockResolvedValue(vi.fn());
+        eventOnMock.mockImplementation(
+            async (event: string, handler: (payload: unknown) => void) => {
+                eventHandlers.set(event, handler);
+                return vi.fn();
+            }
+        );
         eventEmitMock.mockResolvedValue(undefined);
+        hidePopupWindowMock.mockResolvedValue(undefined);
         getCurrentWindowMock.mockReturnValue({
             hide: vi.fn().mockResolvedValue(undefined),
             label: 'popup-session-history-popup',
             setFocus: vi.fn(),
+            show: vi.fn().mockResolvedValue(undefined),
         });
         settingsInitializeMock.mockResolvedValue(undefined);
     });
@@ -128,4 +141,48 @@ describe('PopupView i18n bootstrap', () => {
 
         expect(hideMock).toHaveBeenCalledTimes(1);
     });
+
+    it('closes the current popup from a matching native search surface command', async () => {
+        const { default: PopupView } = await import('@/views/PopupView/index.vue');
+
+        mount(PopupView);
+        await flushPromises();
+
+        await eventHandlers.get('popup-data')?.({
+            popupId: 'popup-session-history-popup:1',
+            windowLabel: 'popup-session-history-popup',
+            popupSessionVersion: 1,
+            type: 'session-history-popup',
+            isShow: true,
+            data: {
+                sessions: [],
+                activeSessionId: null,
+                searchQuery: '',
+                isLoading: false,
+                toggleShortcut: 'Alt+Space',
+            },
+        });
+        await flushPromises();
+
+        eventHandlers.get('search-surface-command')?.({
+            actionId: 'search.model.toggle',
+            shortcut: 'Alt+Space',
+            source: 'webview2-accelerator',
+        });
+        await flushPromises();
+        expect(hidePopupWindowMock).not.toHaveBeenCalled();
+
+        eventHandlers.get('search-surface-command')?.({
+            actionId: 'search.history.open',
+            shortcut: 'Alt+Space',
+            source: 'webview2-accelerator',
+        });
+        await flushPromises();
+
+        expect(hidePopupWindowMock).toHaveBeenCalledWith({
+            popupId: 'popup-session-history-popup:1',
+            windowLabel: 'popup-session-history-popup',
+            popupSessionVersion: 1,
+        });
+    });
 });
diff --git a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
index ea107cf5..ef5655a7 100644
--- a/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
+++ b/apps/desktop/tests/composables/SearchView/searchInteraction.test.ts
@@ -353,7 +353,13 @@ describe('createSearchKeydownHandler', () => {
             handleSearchKeybindingAction,
         });
 
-        expect(handleKeyDown.routeSearchSurfaceShortcut('Mod+M')).toBe(true);
+        expect(
+            handleKeyDown.routeSearchSurfaceCommand({
+                actionId: 'search.model.toggle',
+                shortcut: 'Mod+M',
+                source: 'webview2-accelerator',
+            })
+        ).toBe(true);
         await Promise.resolve();
         await Promise.resolve();
 
@@ -369,7 +375,13 @@ describe('createSearchKeydownHandler', () => {
             handleSearchKeybindingAction,
         });
 
-        expect(handleKeyDown.routeSearchSurfaceShortcut('Mod+M')).toBe(false);
+        expect(
+            handleKeyDown.routeSearchSurfaceCommand({
+                actionId: 'search.model.toggle',
+                shortcut: 'Mod+M',
+                source: 'webview2-accelerator',
+            })
+        ).toBe(false);
         await Promise.resolve();
         await Promise.resolve();
 
diff --git a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
index f8e1029c..49cd34c0 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchKeyboardRouter.test.ts
@@ -180,7 +180,7 @@ describe('createSearchKeyboardRouter', () => {
         );
     });
 
-    it('routes host accelerator shortcuts through the current keybinding configuration', async () => {
+    it('routes host accelerator commands only when the action still owns the shortcut', async () => {
         const disabledRouter = createKeyboardRouter({
             getSearchKeybindings: () => ({
                 ...createDefaultSearchKeybindings(),
@@ -188,7 +188,7 @@ describe('createSearchKeyboardRouter', () => {
             }),
         });
 
-        expect(disabledRouter.router.routeShortcut('Mod+M')).toBe(false);
+        expect(disabledRouter.router.routeCommand('search.model.toggle', 'Mod+M')).toBe(false);
         await flushAsyncWork();
         expect(disabledRouter.callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();
 
@@ -200,7 +200,11 @@ describe('createSearchKeyboardRouter', () => {
             }),
         });
 
-        expect(remappedRouter.router.routeShortcut('Mod+M')).toBe(true);
+        expect(remappedRouter.router.routeCommand('search.model.toggle', 'Mod+M')).toBe(false);
+        await flushAsyncWork();
+        expect(remappedRouter.callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();
+
+        expect(remappedRouter.router.routeCommand('search.history.open', 'Mod+M')).toBe(true);
         await flushAsyncWork();
         expect(remappedRouter.callbacks.onSearchKeybindingAction).toHaveBeenCalledWith(
             'search.history.open'
@@ -212,7 +216,7 @@ describe('createSearchKeyboardRouter', () => {
             hasActivePopupWindowFocus: () => true,
         });
 
-        expect(router.routeShortcut('Mod+M')).toBe(true);
+        expect(router.routeCommand('search.model.toggle', 'Mod+M')).toBe(true);
         await flushAsyncWork();
 
         expect(callbacks.onSearchKeybindingAction).not.toHaveBeenCalled();

From 87167f20b1b6d20886ef7f21e07cf83d6acafab0 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 15 Jun 2026 04:04:02 +0800
Subject: [PATCH 49/55] fix(desktop): keep popup toggle shortcuts current

---
 apps/desktop/src/views/PopupView/index.vue    | 26 +++++-
 .../SearchView/composables/useSearchPage.ts   |  6 +-
 apps/desktop/src/views/SearchView/index.vue   |  1 +
 .../tests/PopupView/popup-view-i18n.test.ts   |  8 ++
 .../SearchView/useSearchPage.test.ts          | 93 ++++++++++++++++++-
 5 files changed, 131 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/views/PopupView/index.vue b/apps/desktop/src/views/PopupView/index.vue
index 71a9750e..bce2ba26 100644
--- a/apps/desktop/src/views/PopupView/index.vue
+++ b/apps/desktop/src/views/PopupView/index.vue
@@ -10,6 +10,7 @@
     import { computed, nextTick, onMounted, onUnmounted, ref, shallowRef } from 'vue';
 
     import { useSettingsStore } from '@/stores/settings';
+    import { normalizeLocalShortcutString } from '@/utils/shortcuts';
 
     import { getPopupTypeFromLocation } from './location';
 
@@ -116,13 +117,36 @@
         componentRef.value?.handleKeyDown?.(e);
     }
 
+    function getCurrentPopupToggleShortcut(): string | null {
+        const currentPopupData = popupData.value;
+        if (!currentPopupData || typeof currentPopupData !== 'object') {
+            return null;
+        }
+
+        const shortcut = (currentPopupData as { toggleShortcut?: unknown }).toggleShortcut;
+        return typeof shortcut === 'string' ? shortcut : null;
+    }
+
+    function matchesCurrentPopupToggleCommand(
+        currentPopupType: PopupType,
+        payload: SearchSurfaceCommandEvent
+    ) {
+        if (popupToggleActionByType[currentPopupType] !== payload.actionId) {
+            return false;
+        }
+
+        const currentShortcut = normalizeLocalShortcutString(getCurrentPopupToggleShortcut());
+        const commandShortcut = normalizeLocalShortcutString(payload.shortcut);
+        return Boolean(currentShortcut && commandShortcut && currentShortcut === commandShortcut);
+    }
+
     function handleSearchSurfaceCommand(payload: SearchSurfaceCommandEvent) {
         const currentPopupType = popupType.value;
         if (!currentPopupType) {
             return;
         }
 
-        if (popupToggleActionByType[currentPopupType] !== payload.actionId) {
+        if (!matchesCurrentPopupToggleCommand(currentPopupType, payload)) {
             return;
         }
 
diff --git a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
index 772fdeb8..1af3ec4b 100644
--- a/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
+++ b/apps/desktop/src/views/SearchView/composables/useSearchPage.ts
@@ -1068,7 +1068,11 @@ export function useSearchModelDropdownCoordinator(
     }
 
     watch(
-        () => [modelDropdownState.value.isOpen, modelDropdownQuery.value],
+        () => [
+            modelDropdownState.value.isOpen,
+            modelDropdownQuery.value,
+            getModelToggleShortcut?.() ?? null,
+        ],
         ([isOpen]) => {
             if (!isOpen) {
                 return;
diff --git a/apps/desktop/src/views/SearchView/index.vue b/apps/desktop/src/views/SearchView/index.vue
index 2f288659..2a199c38 100644
--- a/apps/desktop/src/views/SearchView/index.vue
+++ b/apps/desktop/src/views/SearchView/index.vue
@@ -1315,6 +1315,7 @@
             isSessionListLoading,
             currentSessionId,
             sessionStatuses,
+            () => searchKeybindings.value['search.history.open'],
         ],
         ([isOpen]) => {
             if (!isOpen) {
diff --git a/apps/desktop/tests/PopupView/popup-view-i18n.test.ts b/apps/desktop/tests/PopupView/popup-view-i18n.test.ts
index 34a4bea7..b778fc04 100644
--- a/apps/desktop/tests/PopupView/popup-view-i18n.test.ts
+++ b/apps/desktop/tests/PopupView/popup-view-i18n.test.ts
@@ -172,6 +172,14 @@ describe('PopupView i18n bootstrap', () => {
         await flushPromises();
         expect(hidePopupWindowMock).not.toHaveBeenCalled();
 
+        eventHandlers.get('search-surface-command')?.({
+            actionId: 'search.history.open',
+            shortcut: 'Mod+H',
+            source: 'webview2-accelerator',
+        });
+        await flushPromises();
+        expect(hidePopupWindowMock).not.toHaveBeenCalled();
+
         eventHandlers.get('search-surface-command')?.({
             actionId: 'search.history.open',
             shortcut: 'Alt+Space',
diff --git a/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts b/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
index a318d0e7..a6f5dcbf 100644
--- a/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
+++ b/apps/desktop/tests/composables/SearchView/useSearchPage.test.ts
@@ -4,8 +4,12 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { nextTick, ref } from 'vue';
 
 import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
-import { createSearchInteractionContext } from '@/views/SearchView/composables/searchInteraction';
 import {
+    createSearchInteractionContext,
+    type SearchOverlayCommand,
+} from '@/views/SearchView/composables/searchInteraction';
+import {
+    useSearchModelDropdownCoordinator,
     useSearchPageController,
     useSearchPageLifecycle,
 } from '@/views/SearchView/composables/useSearchPage';
@@ -15,6 +19,7 @@ const {
     eventHandlers,
     eventServiceMock,
     initNotificationPermissionMock,
+    modelDropdownPopupMock,
     nativeMock,
     notifyMock,
     popupManagerMock,
@@ -22,8 +27,16 @@ const {
     runStartupTasksMock,
     settingsStoreMock,
     useAlertMock,
+    useModelDropdownPopupMock,
 } = vi.hoisted(() => {
     const handlers = new Map<string, (payload?: unknown) => unknown>();
+    const modelDropdownPopup = {
+        isOpen: { value: true },
+        open: vi.fn(),
+        close: vi.fn(),
+        updateData: vi.fn(),
+        isLiveSession: vi.fn(),
+    };
 
     return {
         currentWindowMock: {
@@ -41,6 +54,7 @@ const {
             }),
         },
         initNotificationPermissionMock: vi.fn(),
+        modelDropdownPopupMock: modelDropdownPopup,
         notifyMock: vi.fn(),
         nativeMock: {
             runtime: {
@@ -75,6 +89,7 @@ const {
             globalShortcut: 'Alt+Space',
         },
         useAlertMock: vi.fn(),
+        useModelDropdownPopupMock: vi.fn(() => modelDropdownPopup),
     };
 });
 
@@ -107,6 +122,10 @@ vi.mock('@services/PopupService', () => ({
     },
 }));
 
+vi.mock('@/views/SearchView/composables/useModelDropdownPopup', () => ({
+    useModelDropdownPopup: useModelDropdownPopupMock,
+}));
+
 vi.mock('@services/StartupService', () => ({
     runStartupTasks: runStartupTasksMock,
 }));
@@ -189,6 +208,76 @@ describe('useSearchPageController', () => {
     });
 });
 
+describe('useSearchModelDropdownCoordinator', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        modelDropdownPopupMock.isOpen.value = true;
+        useModelDropdownPopupMock.mockReturnValue(modelDropdownPopupMock);
+    });
+
+    it('refreshes open popup data when the model toggle shortcut changes', async () => {
+        const modelToggleShortcut = ref<string | null>('Mod+M');
+        const controller = {
+            getModelDropdownAnchor: vi.fn(() => document.createElement('button')),
+            getModelDropdownContext: vi.fn(() => ({
+                activeModelId: null,
+                activeProviderId: null,
+                selectedModelId: null,
+                selectedProviderId: null,
+                models: [],
+            })),
+            prepareModelDropdownOpen: vi.fn().mockResolvedValue(undefined),
+            selectModelFromDropdown: vi.fn().mockResolvedValue({
+                modelId: null,
+                providerId: null,
+            }),
+        };
+
+        const mounted = await mountComposable(() =>
+            useSearchModelDropdownCoordinator({
+                pageContainer: ref(null),
+                controller: controller as never,
+                modelOverride: ref({
+                    modelId: null,
+                    providerId: null,
+                }),
+                modelDropdownState: ref({
+                    isOpen: true,
+                }),
+                modelDropdownQuery: ref(''),
+                getModelToggleShortcut: () => modelToggleShortcut.value,
+                requestModelDropdownOpen: vi.fn((): SearchOverlayCommand => 'noop'),
+                handleQuickSearchClosedForModelDropdown: vi.fn((): SearchOverlayCommand => 'noop'),
+                handleLayoutStableForModelDropdown: vi.fn((): SearchOverlayCommand => 'noop'),
+                handleModelDropdownOpened: vi.fn(),
+                handleModelDropdownClosed: vi.fn(),
+                syncOverlayState: vi.fn(),
+            })
+        );
+        const popupOptions = (
+            useModelDropdownPopupMock.mock.calls as unknown as Array<
+                [
+                    {
+                        getPopupData: () => {
+                            toggleShortcut?: string | null;
+                        };
+                    },
+                ]
+            >
+        )[0]?.[0];
+        expect(popupOptions?.getPopupData().toggleShortcut).toBe('Mod+M');
+
+        modelDropdownPopupMock.updateData.mockClear();
+        modelToggleShortcut.value = 'Alt+M';
+        await flushLifecycle();
+
+        expect(modelDropdownPopupMock.updateData).toHaveBeenCalledTimes(1);
+        expect(popupOptions?.getPopupData().toggleShortcut).toBe('Alt+M');
+
+        mounted.unmount();
+    });
+});
+
 function createStatusChangedPayload(
     kind: 'completed' | 'failed' | 'waiting_approval',
     overrides: Partial<{
@@ -233,6 +322,8 @@ describe('useSearchPageLifecycle', () => {
         vi.clearAllMocks();
         vi.useFakeTimers();
         eventHandlers.clear();
+        modelDropdownPopupMock.isOpen.value = true;
+        useModelDropdownPopupMock.mockReturnValue(modelDropdownPopupMock);
 
         currentWindowMock.isVisible.mockResolvedValue(true);
         currentWindowMock.isAlwaysOnTop.mockResolvedValue(false);

From a55623a95ec3e0982231fe7f8dd5ff99b72a247b Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 15 Jun 2026 04:25:31 +0800
Subject: [PATCH 50/55] fix(desktop): consume invalid global shortcut captures
 once

---
 .../SettingsView/components/General/index.vue | 10 +++++--
 .../settingsGeneralComponent.test.ts          | 30 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index 9855d878..a7985573 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -136,6 +136,11 @@
         return null;
     }
 
+    function consumeShortcutCaptureEvent(event: KeyboardEvent) {
+        event.preventDefault();
+        event.stopPropagation();
+    }
+
     const captureShortcut = (event: KeyboardEvent) => {
         if (!isCapturing.value) {
             return;
@@ -150,12 +155,14 @@
             // captureShortcutFromKeyboardEvent 在非 Mac 上对 metaKey 返回 null，
             // 用以拒绝 Win/Super 键组合。Mac 上 metaKey 是 Cmd，不会返回 null。
             if (!isMacPlatform() && event.metaKey) {
+                consumeShortcutCaptureEvent(event);
                 alertMessage.value?.warning(t('settings.general.winKeyUnsupported'), 3000);
             }
             return;
         }
 
         if (!hasCommandModifier(captured.shortcut)) {
+            consumeShortcutCaptureEvent(event);
             alertMessage.value?.warning(
                 t('settings.general.searchShortcuts.errors.modifierRequired'),
                 3000
@@ -163,8 +170,7 @@
             return;
         }
 
-        event.preventDefault();
-        event.stopPropagation();
+        consumeShortcutCaptureEvent(event);
 
         // 全局快捷键存储平台原文（Mac 上为 Cmd+，其他平台为 Ctrl+），
         // 以便 Rust 侧 parse_shortcut 直接识别。captured.shortcut 使用平台中性的
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index 83d59a6d..c3a9f103 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -206,6 +206,7 @@ describe('SettingsGeneralSection', () => {
 
     afterEach(() => {
         setPlatform(originalPlatform);
+        document.body.innerHTML = '';
     });
 
     it('renders the general settings groups and row controls', async () => {
@@ -487,6 +488,35 @@ describe('SettingsGeneralSection', () => {
         wrapper.unmount();
     });
 
+    it('reports invalid global shortcut attempts only once through the capture stack', async () => {
+        const wrapper = mount(GeneralSection, {
+            attachTo: document.body,
+        });
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+        alertMessageMock.warning.mockClear();
+
+        const event = new KeyboardEvent('keydown', {
+            key: 'a',
+            shiftKey: true,
+            bubbles: true,
+            cancelable: true,
+        });
+        input.element.dispatchEvent(event);
+        await flushPromises();
+
+        expect(event.defaultPrevented).toBe(true);
+        expect(alertMessageMock.warning).toHaveBeenCalledTimes(1);
+        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
+        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
+
+        wrapper.unmount();
+    });
+
     it('does not save a global shortcut that duplicates a search shortcut', async () => {
         settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+A';
         const wrapper = mount(GeneralSection);

From d0dab35024721c0c4a0540e23a4a56b55d600aa4 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Mon, 15 Jun 2026 10:30:07 +0800
Subject: [PATCH 51/55] fix(desktop): match shifted punctuation shortcuts

---
 apps/desktop/src/utils/shortcuts.ts           | 39 ++++++++++++++++++-
 apps/desktop/tests/utils/shortcuts.test.ts    | 34 ++++++++++++++++
 .../settingsGeneralComponent.test.ts          | 17 ++------
 3 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/apps/desktop/src/utils/shortcuts.ts b/apps/desktop/src/utils/shortcuts.ts
index 1bcf3e7f..416238c5 100644
--- a/apps/desktop/src/utils/shortcuts.ts
+++ b/apps/desktop/src/utils/shortcuts.ts
@@ -78,6 +78,30 @@ const KEY_DISPLAY_MAP: Record<string, string> = {
     ',': ',',
 };
 
+const CODE_KEY_MAP: Record<string, string> = {
+    Digit0: '0',
+    Digit1: '1',
+    Digit2: '2',
+    Digit3: '3',
+    Digit4: '4',
+    Digit5: '5',
+    Digit6: '6',
+    Digit7: '7',
+    Digit8: '8',
+    Digit9: '9',
+    Comma: ',',
+    Period: '.',
+    Equal: '=',
+    Minus: '-',
+    Semicolon: ';',
+    Slash: '/',
+    Quote: "'",
+    Backquote: '`',
+    BracketLeft: '[',
+    BracketRight: ']',
+    Backslash: '\\',
+};
+
 const ALIAS_MAP: Record<string, string> = {
     mod: 'Mod',
     cmd: 'Mod',
@@ -180,16 +204,29 @@ function normalizeFunctionKeyCode(code: string | null | undefined): string | nul
     return normalizedCode && /^F\d{1,2}$/.test(normalizedCode) ? normalizedCode : null;
 }
 
+function normalizePrintableKeyCode(code: string | null | undefined): string | null {
+    if (!code) {
+        return null;
+    }
+
+    return normalizeShortcutToken(CODE_KEY_MAP[code] ?? '');
+}
+
 export function resolveKeyboardEventShortcutKey(
     key: string | null | undefined,
     code?: string | null
 ): string | null {
-    const normalizedKey = normalizeEventKey(key ?? '');
+    const rawKey = key ?? '';
+    const normalizedKey = normalizeEventKey(rawKey);
     const normalizedFunctionKeyCode = normalizeFunctionKeyCode(code);
     if (normalizedFunctionKeyCode && (!normalizedKey || !/^F\d{1,2}$/.test(normalizedKey))) {
         return normalizedFunctionKeyCode;
     }
 
+    if (!normalizedKey && rawKey.length === 1) {
+        return normalizePrintableKeyCode(code);
+    }
+
     return normalizedKey;
 }
 
diff --git a/apps/desktop/tests/utils/shortcuts.test.ts b/apps/desktop/tests/utils/shortcuts.test.ts
index 4432914e..a694af19 100644
--- a/apps/desktop/tests/utils/shortcuts.test.ts
+++ b/apps/desktop/tests/utils/shortcuts.test.ts
@@ -78,6 +78,11 @@ describe('shortcut utilities', () => {
         expect(resolveKeyboardEventShortcutKey(' ', null)).toBe('Space');
         expect(resolveKeyboardEventShortcutKey('BrightnessUp', 'F2')).toBe('F2');
         expect(resolveKeyboardEventShortcutKey('F2', 'F3')).toBe('F2');
+        expect(resolveKeyboardEventShortcutKey('!', 'Digit1')).toBe('1');
+        expect(resolveKeyboardEventShortcutKey('@', 'Digit2')).toBe('2');
+        expect(resolveKeyboardEventShortcutKey('<', 'Comma')).toBe(',');
+        expect(resolveKeyboardEventShortcutKey('?', 'Slash')).toBe('/');
+        expect(resolveKeyboardEventShortcutKey('+', 'Equal')).toBe('=');
         expect(resolveKeyboardEventShortcutKey('BrightnessUp', 'F25')).toBeNull();
         expect(resolveKeyboardEventShortcutKey('BrightnessUp', 'F13')).toBeNull();
         expect(resolveKeyboardEventShortcutKey('@')).toBeNull();
@@ -95,6 +100,22 @@ describe('shortcut utilities', () => {
         expect(
             matchShortcut('Alt+Shift+Del', { key: 'Delete', altKey: true, shiftKey: true })
         ).toBe(true);
+        expect(
+            matchShortcut('Mod+Shift+1', {
+                key: '!',
+                code: 'Digit1',
+                ctrlKey: true,
+                shiftKey: true,
+            })
+        ).toBe(true);
+        expect(
+            matchShortcut('Mod+Shift+,', {
+                key: '<',
+                code: 'Comma',
+                ctrlKey: true,
+                shiftKey: true,
+            })
+        ).toBe(true);
         expect(matchShortcut('Alt+Shift+Del', { key: 'Delete', altKey: true })).toBe(false);
         expect(matchShortcut(null, { key: 'h' })).toBe(false);
         expect(matchShortcut('Mod+H', { key: 'x', ctrlKey: true })).toBe(false);
@@ -130,6 +151,19 @@ describe('shortcut utilities', () => {
             shortcut: 'Mod+Alt+Shift+F2',
             displayShortcut: 'Ctrl+Alt+Shift+F2',
         });
+        expect(
+            captureShortcutFromKeyboardEvent(
+                new KeyboardEvent('keydown', {
+                    key: '!',
+                    code: 'Digit1',
+                    ctrlKey: true,
+                    shiftKey: true,
+                })
+            )
+        ).toEqual({
+            shortcut: 'Mod+Shift+1',
+            displayShortcut: 'Ctrl+Shift+1',
+        });
 
         setPlatform('MacIntel');
 
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index c3a9f103..c959cfe8 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -653,7 +653,7 @@ describe('SettingsGeneralSection', () => {
         });
     });
 
-    it('rejects captured plus shortcuts instead of saving a disabled shortcut', async () => {
+    it('captures shifted punctuation shortcuts through their physical key code', async () => {
         const wrapper = mount(GeneralSection);
 
         await flushPromises();
@@ -674,22 +674,11 @@ describe('SettingsGeneralSection', () => {
         );
         await flushPromises();
 
-        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
-        expect((input.element as HTMLInputElement).value).toBe('Ctrl+H');
-
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F13' }));
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
-        expect((input.element as HTMLInputElement).value).toBe('Ctrl+H');
-
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
-        await flushPromises();
-
         expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
             ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': 'F1',
+            'search.history.open': 'Mod+Shift+=',
         });
+        expect((input.element as HTMLInputElement).value).toBe('Ctrl+Shift+=');
     });
 
     it('reports unsupported mac command search shortcuts without showing the Windows key warning', async () => {

From fd33ed3a87f3dc4d279662f9979f2db6ea17adcd Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Tue, 16 Jun 2026 02:17:00 +0800
Subject: [PATCH 52/55] chore: revert unrelated docs and site changes

---
 README.en.md                                              | 2 +-
 README.md                                                 | 2 +-
 apps/site/public/touchai-intro-en/touchai-components.html | 4 ++--
 apps/site/public/touchai-intro/touchai-components.html    | 4 ++--
 eslint.config.js                                          | 4 ----
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/README.en.md b/README.en.md
index 1679a5ed..491859bb 100644
--- a/README.en.md
+++ b/README.en.md
@@ -33,7 +33,7 @@
 
 ### Features
 
-- **One shortcut away** - use the default global shortcut, or customize it to fit your workflow
+- **One shortcut away** - `Alt+Space` appears and disappears without interrupting your workflow
 - **Full keyboard operation** - operate entirely without a mouse for much higher efficiency
 - **Desktop context** - aware of files, screen, and clipboard
 - **Tool support** - includes 7 built-in tools and supports MCP tool extensions
diff --git a/README.md b/README.md
index 6c3c0edc..28c30626 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@
 
 ### 功能特性
 
-- **一触即达** - 默认全局快捷键可唤起/隐藏，也可按习惯自定义，不打断工作流
+- **一触即达** - `Alt+Space` 召之即来挥之即去，不打断工作流
 - **全键盘操作** - 支持无鼠标全键盘操作，极大提升效率
 - **桌面上下文** - 文件、屏幕、剪贴板智能感知
 - **工具支持** - 内置7大工具，支持MCP工具拓展
diff --git a/apps/site/public/touchai-intro-en/touchai-components.html b/apps/site/public/touchai-intro-en/touchai-components.html
index cbe1cc9b..bc60c287 100644
--- a/apps/site/public/touchai-intro-en/touchai-components.html
+++ b/apps/site/public/touchai-intro-en/touchai-components.html
@@ -1134,11 +1134,11 @@
                 const answerMarkdown = [
                     'TouchAI is a one-touch desktop productivity agent.',
                     '',
-                    'It is not just a web chat box. It is an AI entry point that lives on your desktop. You can summon it with a customizable global shortcut, describe a goal in natural language, and let it work with files, the screen, the clipboard, models, and tools.',
+                    'It is not just a web chat box. It is an AI entry point that lives on your desktop. You can summon it with `Alt+Space`, describe a goal in natural language, and let it work with files, the screen, the clipboard, models, and tools.',
                     '',
                     '## Core abilities',
                     '',
-                    '- **Instant access:** Open or hide it quickly with the default global shortcut, or customize it to fit your workflow.',
+                    '- **Instant access:** Open or hide it quickly with `Alt+Space`, without switching to a browser or another app.',
                     '- **Desktop context:** Understands tasks around local files, screen content, clipboard text, and the current conversation.',
                     '- **Built-in tools:** Supports file search, local file and folder reading, web fetching, terminal execution, settings updates, model upgrades, and inline visualization.',
                     '- **MCP extension:** Connects external MCP servers so more tools can be used inside the same conversation.',
diff --git a/apps/site/public/touchai-intro/touchai-components.html b/apps/site/public/touchai-intro/touchai-components.html
index 13a8a984..0930a7d2 100644
--- a/apps/site/public/touchai-intro/touchai-components.html
+++ b/apps/site/public/touchai-intro/touchai-components.html
@@ -1142,13 +1142,13 @@
                 const answerMarkdown = [
                     'TouchAI 是一个“一触即达”的桌面效率 Agent。',
                     '',
-                    '它不是单纯的网页聊天框，而是一个运行在桌面上的 AI 工作入口。你可以在当前工作流里通过可自定义的全局快捷键唤起它，用自然语言说出目标，让它结合文件、屏幕、剪贴板、模型和工具去完成任务。',
+                    '它不是单纯的网页聊天框，而是一个运行在桌面上的 AI 工作入口。你可以在当前工作流里按下 `Alt+Space` 唤起它，用自然语言说出目标，让它结合文件、屏幕、剪贴板、模型和工具去完成任务。',
                     '',
                     '项目 README 对 TouchAI 的定位是：**一触即达的桌面效率 Agent**。这个定位很关键，因为它强调的不是“打开一个 AI 网站再问问题”，而是让 AI 变成电脑系统里的一个随叫随到的操作层。',
                     '',
                     '## 1. 一触即达的桌面入口',
                     '',
-                    'TouchAI 默认以全局快捷键作为入口，并允许在设置中按习惯自定义，所以它的交互方式更接近系统级搜索栏、启动器或命令面板。',
+                    'TouchAI 默认以全局快捷键作为入口。源码里的通用设置将全局快捷键设为 `Alt+Space`，所以它的交互方式更接近系统级搜索栏、启动器或命令面板。',
                     '',
                     '- **随叫随到：** 需要时唤起，不需要时隐藏。',
                     '- **不打断工作流：** 不必切到浏览器或单独应用窗口。',
diff --git a/eslint.config.js b/eslint.config.js
index 26dd29c0..4c733c6c 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -66,10 +66,6 @@ export default defineConfig([
         '.coverage/**',
         '**/.coverage',
         '**/.coverage/**',
-        '.vite-cache',
-        '.vite-cache/**',
-        '**/.vite-cache',
-        '**/.vite-cache/**',
         'src-tauri',
         'src-tauri/**',
         '**/src-tauri',

From d2d94f3b1c9a7116783a621c0cf9bff99f4ca95e Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Tue, 16 Jun 2026 23:31:23 +0800
Subject: [PATCH 53/55] chore: revert unrelated popup and font changes

---
 apps/desktop/src/services/PopupService/manager.ts |  2 +-
 apps/desktop/src/utils/font.ts                    | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/apps/desktop/src/services/PopupService/manager.ts b/apps/desktop/src/services/PopupService/manager.ts
index 7fe9f061..fa14b710 100644
--- a/apps/desktop/src/services/PopupService/manager.ts
+++ b/apps/desktop/src/services/PopupService/manager.ts
@@ -128,7 +128,7 @@ export class PopupManager {
             await this.ensureReadyListener();
             await this.syncPopupConfigs();
 
-            // 让初始化真正等待 popup 预热完成，避免首次快捷键打开弹窗还在走冷启动链路。
+            // 让初始化真正等待 popup 预热完成，避免首次 Ctrl+H 还在走冷启动链路。
             await this.transport.preloadWindows();
 
             this.isInitialized = true;
diff --git a/apps/desktop/src/utils/font.ts b/apps/desktop/src/utils/font.ts
index 8796dc41..f2fae79f 100644
--- a/apps/desktop/src/utils/font.ts
+++ b/apps/desktop/src/utils/font.ts
@@ -16,7 +16,6 @@ const FONT_LOAD_RETRY_DELAY_MS = 16;
 
 let fontLoadPromise: Promise<void> | null = null;
 let fontReadyListenerPromise: Promise<void> | null = null;
-let fontLoadInjectedFontFace = false;
 let fontReloadToken = 0;
 
 interface LoadFontFaceOptions {
@@ -158,9 +157,6 @@ async function injectFontFace(options: LoadFontFaceOptions = {}): Promise<boolea
     `;
     getInjectedFontFaceStyle()?.remove();
     document.head.appendChild(style);
-    if (!refresh) {
-        fontLoadInjectedFontFace = true;
-    }
 
     await verifyInjectedFontFace(fontUrl);
     return true;
@@ -174,17 +170,9 @@ function loadFontFace(options: LoadFontFaceOptions = {}): Promise<void> {
     }
 
     if (!refresh && fontLoadPromise) {
-        if (fontLoadInjectedFontFace && !hasInjectedFontFace()) {
-            return injectFontFace(options).then(() => undefined);
-        }
-
         return fontLoadPromise;
     }
 
-    if (!refresh) {
-        fontLoadInjectedFontFace = false;
-    }
-
     const loadPromise = injectFontFace(options)
         .then(() => undefined)
         .finally(() => {

From d8dd081b96165d8a27b1b5ec917bd13b61e180f1 Mon Sep 17 00:00:00 2001
From: hiqiancheng <51521689+hiqiancheng@users.noreply.github.com>
Date: Thu, 18 Jun 2026 00:34:38 +0800
Subject: [PATCH 54/55] feat: split shortcut settings into dedicated tab

---
 apps/desktop/src/components/appIconMap.ts     |   2 +
 apps/desktop/src/i18n/messages.ts             |  14 +-
 .../General/GeneralShortcutSettings.vue       | 508 +++++++++++
 .../SettingsView/components/General/index.vue | 515 +----------
 .../components/Shortcuts/index.vue            |  46 +
 apps/desktop/src/views/SettingsView/index.vue |   6 +
 .../views/SettingsView/settingsNavigation.ts  |   7 +
 .../SettingsView/general-language.test.ts     |   9 +-
 .../navigation-sidebar-i18n.test.ts           |   4 +
 .../SettingsView/settings-view-i18n.test.ts   |  14 +
 .../SettingsView/navigationSidebar.test.ts    |   1 +
 .../settingsGeneralComponent.test.ts          | 662 +--------------
 .../SettingsView/settingsWindowView.test.ts   |  16 +
 .../SettingsView/shortcutsComponent.test.ts   | 796 ++++++++++++++++++
 14 files changed, 1433 insertions(+), 1167 deletions(-)
 create mode 100644 apps/desktop/src/views/SettingsView/components/General/GeneralShortcutSettings.vue
 create mode 100644 apps/desktop/src/views/SettingsView/components/Shortcuts/index.vue
 create mode 100644 apps/desktop/tests/views/SettingsView/shortcutsComponent.test.ts

diff --git a/apps/desktop/src/components/appIconMap.ts b/apps/desktop/src/components/appIconMap.ts
index dbdca68a..ac7de2a4 100644
--- a/apps/desktop/src/components/appIconMap.ts
+++ b/apps/desktop/src/components/appIconMap.ts
@@ -25,6 +25,7 @@ import IconGlobe from '~icons/lucide/globe';
 import IconGridAlt from '~icons/lucide/grid-2x2';
 import IconHistory from '~icons/lucide/history';
 import IconInfoCircle from '~icons/lucide/info';
+import IconKeyboard from '~icons/lucide/keyboard';
 import IconLeaf from '~icons/lucide/leaf';
 import IconMaximize from '~icons/lucide/maximize';
 import IconMenu from '~icons/lucide/menu';
@@ -75,6 +76,7 @@ export const appIconMap = {
     maximize: IconMaximize,
     restore: IconWindowRestore,
     'information-circle': IconInfoCircle,
+    keyboard: IconKeyboard,
     llm: IconBoxes,
     leaf: IconLeaf,
     'external-link': IconLinkExternal,
diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index cf470586..473ef12a 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -77,7 +77,7 @@ const zhCNMessages = {
     'settings.general.shortcuts': '快捷键',
     'settings.general.globalShortcut': '全局快捷键',
     'settings.general.activationShortcut': '唤起快捷键',
-    'settings.general.activationShortcutDescription': '设置呼出 TouchAI 的全局快捷键',
+    'settings.general.activationShortcutDescription': '全局呼出快捷键',
     'settings.general.shortcutPlaceholder': '点击输入框设置快捷键',
     'settings.general.shortcutCapturePrompt': '请按下快捷键...',
     'settings.general.shortcutRegistrationFailed': '快捷键注册失败，可能已被其他应用占用',
@@ -91,6 +91,7 @@ const zhCNMessages = {
     'settings.general.shortcutSaved': '快捷键保存成功',
     'settings.general.noShortcut': '无',
     'settings.general.globalShortcutGroup': '全局唤起',
+    'settings.general.searchShortcuts': '搜索快捷键',
     'settings.general.searchShortcutsDescription':
         '自定义搜索窗口内的命令型快捷键，不会影响输入导航与全局唤起。',
     'settings.general.searchShortcutGroups.session': '会话',
@@ -205,6 +206,7 @@ const zhCNMessages = {
     'settings.general.update.dialog.action.installing': '正在安装',
     'settings.language.changed': '语言已切换为{language}',
     'settings.loading.general': '正在加载常规设置...',
+    'settings.loading.shortcuts': '正在加载快捷键设置...',
     'settings.loading.aiServices': '正在加载大模型服务设置...',
     'settings.loading.builtInTools': '正在加载内置工具...',
     'settings.loading.search': '正在加载搜索设置...',
@@ -213,7 +215,9 @@ const zhCNMessages = {
     'settings.loading.dataManagement': '正在加载数据管理...',
     'settings.loading.about': '正在加载关于页面...',
     'settings.nav.general.label': '通用',
-    'settings.nav.general.description': '快捷键、启动、对话和窗口偏好',
+    'settings.nav.general.description': '启动、对话和窗口偏好',
+    'settings.nav.shortcuts.label': '快捷键',
+    'settings.nav.shortcuts.description': '全局呼出与搜索快捷键',
     'settings.nav.aiServices.label': '服务商与模型',
     'settings.nav.aiServices.description': 'Provider、模型、默认模型和密钥',
     'settings.nav.builtInTools.label': '内置工具',
@@ -1062,6 +1066,7 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.shortcutSaved': 'Shortcut saved',
     'settings.general.noShortcut': 'None',
     'settings.general.globalShortcutGroup': 'Global activation',
+    'settings.general.searchShortcuts': 'Search shortcuts',
     'settings.general.searchShortcutsDescription':
         'Customize command shortcuts inside the search window without changing typing, navigation, or the global activation shortcut.',
     'settings.general.searchShortcutGroups.session': 'Session',
@@ -1191,6 +1196,7 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.update.dialog.action.installing': 'Installing',
     'settings.language.changed': 'Language changed to {language}',
     'settings.loading.general': 'Loading general settings...',
+    'settings.loading.shortcuts': 'Loading shortcut settings...',
     'settings.loading.aiServices': 'Loading model service settings...',
     'settings.loading.builtInTools': 'Loading built-in tools...',
     'settings.loading.search': 'Loading search settings...',
@@ -1199,7 +1205,9 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.loading.dataManagement': 'Loading data management...',
     'settings.loading.about': 'Loading about page...',
     'settings.nav.general.label': 'General',
-    'settings.nav.general.description': 'Shortcuts, startup, conversation, and window preferences',
+    'settings.nav.general.description': 'Startup, conversation, and window preferences',
+    'settings.nav.shortcuts.label': 'Shortcuts',
+    'settings.nav.shortcuts.description': 'Global activation and search shortcuts',
     'settings.nav.aiServices.label': 'Providers and models',
     'settings.nav.aiServices.description': 'Providers, models, default model, and keys',
     'settings.nav.builtInTools.label': 'Built-in tools',
diff --git a/apps/desktop/src/views/SettingsView/components/General/GeneralShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/GeneralShortcutSettings.vue
new file mode 100644
index 00000000..9cabb699
--- /dev/null
+++ b/apps/desktop/src/views/SettingsView/components/General/GeneralShortcutSettings.vue
@@ -0,0 +1,508 @@
+<script setup lang="ts">
+    import AlertMessage from '@components/AlertMessage.vue';
+    import AppIcon from '@components/AppIcon.vue';
+    import CustomSelect from '@components/CustomSelect.vue';
+    import {
+        AppEvent,
+        eventService,
+        type ShortcutCaptureSystemKeyEvent,
+    } from '@services/EventService';
+    import { native } from '@services/NativeService';
+    import { notify } from '@services/NotificationService';
+    import { type UnlistenFn } from '@tauri-apps/api/event';
+    import { storeToRefs } from 'pinia';
+    import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
+
+    import {
+        getSearchKeybindingDefinition,
+        type SearchKeybindingActionId,
+    } from '@/config/searchKeybindings';
+    import { type MessageKey, type MessageParams, t } from '@/i18n';
+    import { useSettingsStore } from '@/stores/settings';
+    import {
+        captureShortcutFromKeyboardEvent,
+        formatShortcutForDisplay,
+        hasCommandModifier,
+        isMacPlatform,
+        isReservedGlobalShortcut,
+        isReservedLocalShortcutKey,
+        normalizeLocalShortcutString,
+    } from '@/utils/shortcuts';
+
+    import { resolveShortcutCaptureCompletion } from './shortcutCapture';
+
+    defineOptions({
+        name: 'SettingsGeneralShortcutSettings',
+    });
+
+    const settingsStore = useSettingsStore();
+    const { settings } = storeToRefs(settingsStore);
+
+    const alertMessage = ref<InstanceType<typeof AlertMessage> | null>(null);
+    const isSaving = ref(false);
+    const isCapturing = ref(false);
+    const hasCapturedShortcut = ref(false);
+    const displayShortcut = ref('');
+    const shortcutCapturePrompt = computed(() => t('settings.general.shortcutCapturePrompt'));
+    const shortcutRegistrationFailed = ref(false);
+    const showGlobalShortcutPresetMenu = ref(false);
+    const globalShortcutPresetOptions = computed(() => {
+        const shortcuts = isMacPlatform()
+            ? ['Option+Space', 'Option+Shift+Space']
+            : ['Alt+Space', 'Ctrl+Space'];
+
+        return shortcuts.map((shortcut) => ({
+            label: shortcut,
+            value: shortcut,
+        }));
+    });
+
+    function formatGlobalShortcutForSettings(shortcut: string | null | undefined): string {
+        return formatShortcutForDisplay(shortcut);
+    }
+
+    function findGlobalShortcutSearchConflict(shortcut: string): SearchKeybindingActionId | null {
+        const normalizedShortcut = normalizeLocalShortcutString(shortcut);
+        if (!normalizedShortcut) {
+            return null;
+        }
+
+        for (const [actionId, searchShortcut] of Object.entries(
+            settings.value.searchKeybindings
+        ) as Array<[SearchKeybindingActionId, string | null]>) {
+            const normalizedSearchShortcut = normalizeLocalShortcutString(searchShortcut);
+            if (normalizedSearchShortcut === normalizedShortcut) {
+                return actionId;
+            }
+        }
+
+        return null;
+    }
+
+    function consumeShortcutCaptureEvent(event: KeyboardEvent) {
+        event.preventDefault();
+        event.stopPropagation();
+    }
+
+    const captureShortcut = (event: KeyboardEvent) => {
+        if (!isCapturing.value) {
+            return;
+        }
+
+        if (isReservedLocalShortcutKey(event.key, event.code)) {
+            return;
+        }
+
+        const captured = captureShortcutFromKeyboardEvent(event);
+        if (!captured) {
+            if (!isMacPlatform() && event.metaKey) {
+                consumeShortcutCaptureEvent(event);
+                alertMessage.value?.warning(t('settings.general.winKeyUnsupported'), 3000);
+            }
+            return;
+        }
+
+        if (!hasCommandModifier(captured.shortcut)) {
+            consumeShortcutCaptureEvent(event);
+            alertMessage.value?.warning(
+                t('settings.general.searchShortcuts.errors.modifierRequired'),
+                3000
+            );
+            return;
+        }
+
+        consumeShortcutCaptureEvent(event);
+        displayShortcut.value = captured.displayShortcut;
+        hasCapturedShortcut.value = true;
+        showGlobalShortcutPresetMenu.value = false;
+        void confirmCapturedShortcut(captured.displayShortcut);
+    };
+
+    const handleSystemKeyCapture = (payload: ShortcutCaptureSystemKeyEvent) => {
+        if (!isCapturing.value) {
+            return;
+        }
+
+        const modifiers: string[] = [];
+        if (payload.ctrl) {
+            modifiers.push('Ctrl');
+        }
+        if (payload.alt) {
+            modifiers.push('Alt');
+        }
+        if (payload.shift) {
+            modifiers.push('Shift');
+        }
+
+        const shortcut = [...modifiers, payload.key].join('+');
+        if (!hasCommandModifier(shortcut)) {
+            return;
+        }
+
+        displayShortcut.value = formatGlobalShortcutForSettings(shortcut);
+        hasCapturedShortcut.value = true;
+        showGlobalShortcutPresetMenu.value = false;
+        void confirmCapturedShortcut(displayShortcut.value);
+    };
+
+    let unlistenSystemKey: UnlistenFn | null = null;
+
+    const startCapture = () => {
+        isCapturing.value = true;
+        hasCapturedShortcut.value = false;
+        displayShortcut.value = shortcutCapturePrompt.value;
+        showGlobalShortcutPresetMenu.value = true;
+    };
+
+    function focusShortcutCaptureInput(event: MouseEvent) {
+        event.preventDefault();
+        (event.currentTarget as HTMLInputElement).focus();
+    }
+
+    function clearShortcutCaptureSelection(event: Event) {
+        const input = event.currentTarget as HTMLInputElement;
+        const cursorPosition = input.value.length;
+        input.setSelectionRange(cursorPosition, cursorPosition);
+    }
+
+    const confirmCapturedShortcut = async (shortcut: string) => {
+        if (!isCapturing.value) {
+            return;
+        }
+
+        isCapturing.value = false;
+        showGlobalShortcutPresetMenu.value = false;
+
+        if (
+            normalizeLocalShortcutString(shortcut) ===
+            normalizeLocalShortcutString(settings.value.globalShortcut)
+        ) {
+            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
+            return;
+        }
+
+        await saveNewShortcut(shortcut);
+    };
+
+    const stopCaptureAndSave = async () => {
+        if (!isCapturing.value) {
+            return;
+        }
+
+        isCapturing.value = false;
+        showGlobalShortcutPresetMenu.value = false;
+
+        const completion = resolveShortcutCaptureCompletion({
+            currentShortcut: formatGlobalShortcutForSettings(settings.value.globalShortcut),
+            displayShortcut: displayShortcut.value,
+            hasCapturedShortcut: hasCapturedShortcut.value,
+        });
+
+        displayShortcut.value = completion.displayShortcut;
+        if (completion.action !== 'save') {
+            return;
+        }
+
+        await saveNewShortcut(completion.shortcut);
+    };
+
+    const handleGlobalShortcutPresetOpenChange = (open: boolean) => {
+        if (isSaving.value) {
+            return;
+        }
+
+        if (open) {
+            startCapture();
+            return;
+        }
+
+        void stopCaptureAndSave();
+    };
+
+    const saveNewShortcut = async (newShortcut: string) => {
+        if (isReservedGlobalShortcut(newShortcut)) {
+            shortcutRegistrationFailed.value = false;
+            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
+            alertMessage.value?.warning(t('settings.general.globalShortcutReservedOnMac'), 4000);
+            return;
+        }
+
+        const conflictActionId = findGlobalShortcutSearchConflict(newShortcut);
+        if (conflictActionId) {
+            shortcutRegistrationFailed.value = false;
+            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
+            alertMessage.value?.error(
+                t('settings.general.searchShortcuts.errors.duplicate', {
+                    action: t(getSearchKeybindingDefinition(conflictActionId).labelKey),
+                }),
+                3000
+            );
+            return;
+        }
+
+        isSaving.value = true;
+        shortcutRegistrationFailed.value = false;
+
+        try {
+            const registered = await registerShortcut(newShortcut);
+            if (!registered) {
+                shortcutRegistrationFailed.value = true;
+                displayShortcut.value = formatGlobalShortcutForSettings(newShortcut);
+                return;
+            }
+
+            await saveShortcutToDatabase(newShortcut);
+            settings.value.globalShortcut = newShortcut;
+            displayShortcut.value = formatGlobalShortcutForSettings(newShortcut);
+            alertMessage.value?.success(t('settings.general.shortcutSaved'), 3000);
+        } catch (error) {
+            console.error('Failed to save shortcut:', error);
+            alertMessage.value?.error(t('settings.general.saveShortcutFailed'), 3000);
+            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
+            shortcutRegistrationFailed.value = false;
+        } finally {
+            isSaving.value = false;
+        }
+    };
+
+    const useSuggestedShortcut = async (shortcut: string) => {
+        if (isSaving.value) {
+            return;
+        }
+
+        showGlobalShortcutPresetMenu.value = false;
+        if (isCapturing.value) {
+            isCapturing.value = false;
+        }
+
+        await saveNewShortcut(shortcut);
+    };
+
+    watch(isCapturing, (newValue) => {
+        if (newValue) {
+            window.addEventListener('keydown', captureShortcut, { capture: true });
+        } else {
+            window.removeEventListener('keydown', captureShortcut, { capture: true });
+        }
+    });
+
+    watch(
+        () => settings.value.globalShortcut,
+        (shortcut) => {
+            if (!isCapturing.value && !shortcutRegistrationFailed.value) {
+                displayShortcut.value = formatGlobalShortcutForSettings(shortcut);
+            }
+        }
+    );
+
+    const loadSettings = async () => {
+        try {
+            await settingsStore.initialize();
+            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
+
+            const [failed, error] = await native.shortcut.getShortcutStatus();
+            if (failed) {
+                shortcutRegistrationFailed.value = true;
+                console.warn('[GeneralView] Shortcut registration failed:', error);
+            }
+        } catch (error) {
+            console.error('Failed to load settings:', error);
+            alertMessage.value?.error(t('settings.general.loadSettingsFailed'), 3000);
+        }
+    };
+
+    const registerShortcut = async (shortcut: string): Promise<boolean> => {
+        try {
+            await native.shortcut.registerGlobalShortcut(shortcut);
+            return true;
+        } catch (error) {
+            console.error('Failed to register shortcut:', error);
+
+            const errorStr = String(error);
+            const shortcutErrorMessage: {
+                friendlyMessageKey: MessageKey;
+                notificationBodyKey: MessageKey;
+                params?: MessageParams;
+            } = (():
+                | {
+                      friendlyMessageKey: MessageKey;
+                      notificationBodyKey: MessageKey;
+                      params: MessageParams;
+                  }
+                | {
+                      friendlyMessageKey: MessageKey;
+                      notificationBodyKey: MessageKey;
+                      params?: never;
+                  } => {
+                if (errorStr.includes('already registered') || errorStr.includes('已注册')) {
+                    return {
+                        friendlyMessageKey:
+                            'notification.shortcutRegistrationFailed.alreadyRegistered',
+                        notificationBodyKey:
+                            'notification.shortcutRegistrationFailed.alreadyRegisteredBody',
+                        params: { shortcut },
+                    };
+                }
+
+                if (errorStr.includes('invalid') || errorStr.includes('无效')) {
+                    return {
+                        friendlyMessageKey: 'notification.shortcutRegistrationFailed.invalid',
+                        notificationBodyKey: 'notification.shortcutRegistrationFailed.invalidBody',
+                        params: { shortcut },
+                    };
+                }
+
+                if (errorStr.includes('Unknown key')) {
+                    return {
+                        friendlyMessageKey: 'notification.shortcutRegistrationFailed.unsupported',
+                        notificationBodyKey:
+                            'notification.shortcutRegistrationFailed.unsupportedBody',
+                    };
+                }
+
+                return {
+                    friendlyMessageKey: 'notification.shortcutRegistrationFailed.generic',
+                    notificationBodyKey: 'notification.shortcutRegistrationFailed.generic',
+                    params: { error: errorStr },
+                };
+            })();
+
+            notify({
+                title: t('notification.shortcutRegistrationFailed.title'),
+                body: t(shortcutErrorMessage.notificationBodyKey, shortcutErrorMessage.params),
+            });
+
+            alertMessage.value?.error(
+                t(shortcutErrorMessage.friendlyMessageKey, shortcutErrorMessage.params),
+                4000
+            );
+            return false;
+        }
+    };
+
+    const saveShortcutToDatabase = async (shortcut: string) => {
+        try {
+            await settingsStore.updateGlobalShortcut(shortcut);
+        } catch (error) {
+            console.error('Failed to save shortcut to database:', error);
+            throw error;
+        }
+    };
+
+    onMounted(async () => {
+        await loadSettings();
+
+        try {
+            unlistenSystemKey = await eventService.on(
+                AppEvent.SHORTCUT_CAPTURE_SYSTEM_KEY,
+                handleSystemKeyCapture
+            );
+        } catch (error) {
+            console.error('Failed to subscribe to system key capture event:', error);
+        }
+    });
+
+    onUnmounted(() => {
+        window.removeEventListener('keydown', captureShortcut, { capture: true });
+        unlistenSystemKey?.();
+        unlistenSystemKey = null;
+    });
+</script>
+
+<template>
+    <AlertMessage ref="alertMessage" />
+
+    <div data-testid="settings-general-shortcut-section">
+        <div
+            data-testid="settings-general-card-shortcut"
+            class="settings-row-group divide-y divide-neutral-200/70 overflow-visible"
+        >
+            <div
+                class="grid min-w-0 gap-4 px-5 py-4 sm:grid-cols-[minmax(0,1fr)_360px] sm:items-center"
+            >
+                <label
+                    data-testid="settings-general-row-label"
+                    class="text-[13px] leading-6 font-normal text-neutral-900"
+                >
+                    <div>{{ t('settings.general.activationShortcut') }}</div>
+                    <div class="text-[12px] leading-5 text-neutral-500">
+                        {{ t('settings.general.activationShortcutDescription') }}
+                    </div>
+                </label>
+                <div class="min-w-0 justify-self-end">
+                    <div
+                        data-testid="settings-shortcut-control-row"
+                        class="flex min-w-0 items-center justify-end text-[11px]"
+                    >
+                        <div data-testid="settings-general-control" class="w-[220px]">
+                            <div
+                                data-testid="settings-general-shortcut-input-wrap"
+                                class="relative ml-auto w-[220px] shrink-0"
+                            >
+                                <CustomSelect
+                                    :model-value="displayShortcut"
+                                    :options="globalShortcutPresetOptions"
+                                    :open="showGlobalShortcutPresetMenu"
+                                    :display-label="displayShortcut"
+                                    :disabled="isSaving"
+                                    trigger-as="div"
+                                    content-test-id="settings-global-shortcut-preset-menu"
+                                    option-test-id-prefix="settings-global-shortcut-preset-"
+                                    disable-portal
+                                    protect-option-text
+                                    @update:open="handleGlobalShortcutPresetOpenChange"
+                                    @update:model-value="useSuggestedShortcut"
+                                >
+                                    <template #trigger>
+                                        <input
+                                            v-model="displayShortcut"
+                                            data-testid="settings-global-shortcut-input"
+                                            type="text"
+                                            readonly
+                                            class="shortcut-capture-input min-w-0 flex-1 bg-transparent text-center text-[12px] outline-none select-none"
+                                            :disabled="isSaving"
+                                            :placeholder="t('settings.general.shortcutPlaceholder')"
+                                            @pointerdown.stop
+                                            @mousedown="focusShortcutCaptureInput"
+                                            @select="clearShortcutCaptureSelection"
+                                            @dragstart.prevent
+                                            @keydown.capture="captureShortcut"
+                                            @click.stop
+                                            @focus="startCapture"
+                                        />
+                                    </template>
+                                </CustomSelect>
+                                <span
+                                    v-if="shortcutRegistrationFailed"
+                                    data-testid="settings-shortcut-occupied-indicator"
+                                    class="absolute top-1/2 right-8 flex h-4 w-4 -translate-y-1/2 items-center justify-center text-red-500"
+                                    :title="t('settings.general.shortcutRegistrationFailed')"
+                                >
+                                    <AppIcon name="exclamation-triangle" class="h-3.5 w-3.5" />
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<style scoped>
+    .shortcut-capture-input {
+        caret-color: transparent;
+        user-select: none;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+    }
+
+    .shortcut-capture-input::selection {
+        background: transparent;
+    }
+
+    .shortcut-capture-input::-moz-selection {
+        background: transparent;
+    }
+</style>
diff --git a/apps/desktop/src/views/SettingsView/components/General/index.vue b/apps/desktop/src/views/SettingsView/components/General/index.vue
index a7985573..2b23952f 100644
--- a/apps/desktop/src/views/SettingsView/components/General/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/index.vue
@@ -1,47 +1,17 @@
 <script setup lang="ts">
     import AlertMessage from '@components/AlertMessage.vue';
-    import AppIcon from '@components/AppIcon.vue';
     import CustomSelect from '@components/CustomSelect.vue';
-    import {
-        AppEvent,
-        eventService,
-        type ShortcutCaptureSystemKeyEvent,
-    } from '@services/EventService';
     import { native } from '@services/NativeService';
-    import { notify } from '@services/NotificationService';
-    import { type UnlistenFn } from '@tauri-apps/api/event';
     import { storeToRefs } from 'pinia';
-    import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
+    import { computed, onMounted, ref, watch } from 'vue';
 
-    import {
-        getSearchKeybindingDefinition,
-        type SearchKeybindingActionId,
-    } from '@/config/searchKeybindings';
     import {
         resolveSearchWindowDefaultSize,
         type SearchWindowSizePreset,
     } from '@/config/searchWindow';
-    import {
-        type AppLocale,
-        LOCALE_LABELS,
-        type MessageKey,
-        type MessageParams,
-        SUPPORTED_LOCALES,
-        t,
-    } from '@/i18n';
+    import { type AppLocale, LOCALE_LABELS, SUPPORTED_LOCALES, t } from '@/i18n';
     import { type OutputScrollBehavior, useSettingsStore } from '@/stores/settings';
-    import {
-        captureShortcutFromKeyboardEvent,
-        formatShortcutForDisplay,
-        hasCommandModifier,
-        isMacPlatform,
-        isReservedGlobalShortcut,
-        isReservedLocalShortcutKey,
-        normalizeLocalShortcutString,
-    } from '@/utils/shortcuts';
 
-    import SearchShortcutSettings from './SearchShortcutSettings.vue';
-    import { resolveShortcutCaptureCompletion } from './shortcutCapture';
     import UpdateSettingsSection from './UpdateSettingsSection.vue';
 
     defineOptions({
@@ -94,276 +64,8 @@
         label: LOCALE_LABELS[value],
     }));
 
-    const isSaving = ref(false);
-    const isCapturing = ref(false);
-    const hasCapturedShortcut = ref(false);
-    const displayShortcut = ref('');
-    const shortcutCapturePrompt = computed(() => t('settings.general.shortcutCapturePrompt'));
     const pendingLanguage = ref<AppLocale>(settings.value.language);
     const alertMessage = ref<InstanceType<typeof AlertMessage> | null>(null);
-    const shortcutRegistrationFailed = ref(false);
-    const showGlobalShortcutPresetMenu = ref(false);
-    const globalShortcutPresetOptions = computed(() => {
-        const shortcuts = isMacPlatform()
-            ? ['Option+Space', 'Option+Shift+Space']
-            : ['Alt+Space', 'Ctrl+Space'];
-
-        return shortcuts.map((shortcut) => ({
-            label: shortcut,
-            value: shortcut,
-        }));
-    });
-
-    function formatGlobalShortcutForSettings(shortcut: string | null | undefined): string {
-        return formatShortcutForDisplay(shortcut);
-    }
-
-    function findGlobalShortcutSearchConflict(shortcut: string): SearchKeybindingActionId | null {
-        const normalizedShortcut = normalizeLocalShortcutString(shortcut);
-        if (!normalizedShortcut) {
-            return null;
-        }
-
-        for (const [actionId, searchShortcut] of Object.entries(
-            settings.value.searchKeybindings
-        ) as Array<[SearchKeybindingActionId, string | null]>) {
-            const normalizedSearchShortcut = normalizeLocalShortcutString(searchShortcut);
-            if (normalizedSearchShortcut === normalizedShortcut) {
-                return actionId;
-            }
-        }
-
-        return null;
-    }
-
-    function consumeShortcutCaptureEvent(event: KeyboardEvent) {
-        event.preventDefault();
-        event.stopPropagation();
-    }
-
-    const captureShortcut = (event: KeyboardEvent) => {
-        if (!isCapturing.value) {
-            return;
-        }
-
-        if (isReservedLocalShortcutKey(event.key, event.code)) {
-            return;
-        }
-
-        const captured = captureShortcutFromKeyboardEvent(event);
-        if (!captured) {
-            // captureShortcutFromKeyboardEvent 在非 Mac 上对 metaKey 返回 null，
-            // 用以拒绝 Win/Super 键组合。Mac 上 metaKey 是 Cmd，不会返回 null。
-            if (!isMacPlatform() && event.metaKey) {
-                consumeShortcutCaptureEvent(event);
-                alertMessage.value?.warning(t('settings.general.winKeyUnsupported'), 3000);
-            }
-            return;
-        }
-
-        if (!hasCommandModifier(captured.shortcut)) {
-            consumeShortcutCaptureEvent(event);
-            alertMessage.value?.warning(
-                t('settings.general.searchShortcuts.errors.modifierRequired'),
-                3000
-            );
-            return;
-        }
-
-        consumeShortcutCaptureEvent(event);
-
-        // 全局快捷键存储平台原文（Mac 上为 Cmd+，其他平台为 Ctrl+），
-        // 以便 Rust 侧 parse_shortcut 直接识别。captured.shortcut 使用平台中性的
-        // `Mod` 抽象，captured.displayShortcut 才是当前平台的字面形式。
-        displayShortcut.value = captured.displayShortcut;
-        hasCapturedShortcut.value = true;
-        showGlobalShortcutPresetMenu.value = false;
-        void confirmCapturedShortcut(captured.displayShortcut);
-    };
-
-    /**
-     * 处理来自 Rust 端的系统级快捷键桥接事件（如 Alt+Space）。
-     *
-     * Windows 上 Alt+Space 会被 WebView2 当作 system accelerator 截获，
-     * 不会派发 DOM keydown，因此 [`webview_defaults.rs`] 在 accelerator 阶段
-     * 直接 emit 此事件，由这里复用与键盘录入相同的保存路径。
-     */
-    const handleSystemKeyCapture = (payload: ShortcutCaptureSystemKeyEvent) => {
-        if (!isCapturing.value) {
-            return;
-        }
-
-        const modifiers: string[] = [];
-        if (payload.ctrl) {
-            modifiers.push('Ctrl');
-        }
-        if (payload.alt) {
-            modifiers.push('Alt');
-        }
-        if (payload.shift) {
-            modifiers.push('Shift');
-        }
-
-        const shortcut = [...modifiers, payload.key].join('+');
-        if (!hasCommandModifier(shortcut)) {
-            return;
-        }
-
-        displayShortcut.value = formatGlobalShortcutForSettings(shortcut);
-        hasCapturedShortcut.value = true;
-        showGlobalShortcutPresetMenu.value = false;
-        void confirmCapturedShortcut(displayShortcut.value);
-    };
-
-    let unlistenSystemKey: UnlistenFn | null = null;
-
-    const startCapture = () => {
-        isCapturing.value = true;
-        hasCapturedShortcut.value = false;
-        displayShortcut.value = shortcutCapturePrompt.value;
-        showGlobalShortcutPresetMenu.value = true;
-    };
-
-    function focusShortcutCaptureInput(event: MouseEvent) {
-        event.preventDefault();
-        (event.currentTarget as HTMLInputElement).focus();
-    }
-
-    function clearShortcutCaptureSelection(event: Event) {
-        const input = event.currentTarget as HTMLInputElement;
-        const cursorPosition = input.value.length;
-        input.setSelectionRange(cursorPosition, cursorPosition);
-    }
-
-    const confirmCapturedShortcut = async (shortcut: string) => {
-        if (!isCapturing.value) {
-            return;
-        }
-
-        isCapturing.value = false;
-        showGlobalShortcutPresetMenu.value = false;
-
-        if (
-            normalizeLocalShortcutString(shortcut) ===
-            normalizeLocalShortcutString(settings.value.globalShortcut)
-        ) {
-            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
-            return;
-        }
-
-        await saveNewShortcut(shortcut);
-    };
-
-    const stopCaptureAndSave = async () => {
-        if (!isCapturing.value) {
-            return;
-        }
-
-        isCapturing.value = false;
-        showGlobalShortcutPresetMenu.value = false;
-
-        const completion = resolveShortcutCaptureCompletion({
-            currentShortcut: formatGlobalShortcutForSettings(settings.value.globalShortcut),
-            displayShortcut: displayShortcut.value,
-            hasCapturedShortcut: hasCapturedShortcut.value,
-        });
-
-        displayShortcut.value = completion.displayShortcut;
-        if (completion.action !== 'save') {
-            return;
-        }
-
-        await saveNewShortcut(completion.shortcut);
-    };
-
-    const handleGlobalShortcutPresetOpenChange = (open: boolean) => {
-        if (isSaving.value) {
-            return;
-        }
-
-        if (open) {
-            startCapture();
-            return;
-        }
-
-        void stopCaptureAndSave();
-    };
-
-    const saveNewShortcut = async (newShortcut: string) => {
-        if (isReservedGlobalShortcut(newShortcut)) {
-            shortcutRegistrationFailed.value = false;
-            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
-            alertMessage.value?.warning(t('settings.general.globalShortcutReservedOnMac'), 4000);
-            return;
-        }
-
-        const conflictActionId = findGlobalShortcutSearchConflict(newShortcut);
-        if (conflictActionId) {
-            shortcutRegistrationFailed.value = false;
-            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
-            alertMessage.value?.error(
-                t('settings.general.searchShortcuts.errors.duplicate', {
-                    action: t(getSearchKeybindingDefinition(conflictActionId).labelKey),
-                }),
-                3000
-            );
-            return;
-        }
-
-        isSaving.value = true;
-        shortcutRegistrationFailed.value = false;
-
-        try {
-            const registered = await registerShortcut(newShortcut);
-            if (!registered) {
-                shortcutRegistrationFailed.value = true;
-                displayShortcut.value = formatGlobalShortcutForSettings(newShortcut);
-                return;
-            }
-
-            await saveShortcutToDatabase(newShortcut);
-            settings.value.globalShortcut = newShortcut;
-            displayShortcut.value = formatGlobalShortcutForSettings(newShortcut);
-            alertMessage.value?.success(t('settings.general.shortcutSaved'), 3000);
-        } catch (error) {
-            console.error('Failed to save shortcut:', error);
-            alertMessage.value?.error(t('settings.general.saveShortcutFailed'), 3000);
-            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
-            shortcutRegistrationFailed.value = false;
-        } finally {
-            isSaving.value = false;
-        }
-    };
-
-    const useSuggestedShortcut = async (shortcut: string) => {
-        if (isSaving.value) {
-            return;
-        }
-
-        showGlobalShortcutPresetMenu.value = false;
-        if (isCapturing.value) {
-            isCapturing.value = false;
-        }
-
-        await saveNewShortcut(shortcut);
-    };
-
-    watch(isCapturing, (newValue) => {
-        if (newValue) {
-            window.addEventListener('keydown', captureShortcut, { capture: true });
-        } else {
-            window.removeEventListener('keydown', captureShortcut, { capture: true });
-        }
-    });
-
-    watch(
-        () => settings.value.globalShortcut,
-        (shortcut) => {
-            if (!isCapturing.value && !shortcutRegistrationFailed.value) {
-                displayShortcut.value = formatGlobalShortcutForSettings(shortcut);
-            }
-        }
-    );
 
     watch(
         () => settings.value.language,
@@ -376,97 +78,12 @@
     const loadSettings = async () => {
         try {
             await settingsStore.initialize();
-            displayShortcut.value = formatGlobalShortcutForSettings(settings.value.globalShortcut);
-
-            const [failed, error] = await native.shortcut.getShortcutStatus();
-            if (failed) {
-                shortcutRegistrationFailed.value = true;
-                console.warn('[GeneralView] Shortcut registration failed:', error);
-            }
         } catch (error) {
             console.error('Failed to load settings:', error);
             alertMessage.value?.error(t('settings.general.loadSettingsFailed'), 3000);
         }
     };
 
-    const registerShortcut = async (shortcut: string): Promise<boolean> => {
-        try {
-            await native.shortcut.registerGlobalShortcut(shortcut);
-            return true;
-        } catch (error) {
-            console.error('Failed to register shortcut:', error);
-
-            const errorStr = String(error);
-            const shortcutErrorMessage: {
-                friendlyMessageKey: MessageKey;
-                notificationBodyKey: MessageKey;
-                params?: MessageParams;
-            } = (():
-                | {
-                      friendlyMessageKey: MessageKey;
-                      notificationBodyKey: MessageKey;
-                      params: MessageParams;
-                  }
-                | {
-                      friendlyMessageKey: MessageKey;
-                      notificationBodyKey: MessageKey;
-                      params?: never;
-                  } => {
-                if (errorStr.includes('already registered') || errorStr.includes('已注册')) {
-                    return {
-                        friendlyMessageKey:
-                            'notification.shortcutRegistrationFailed.alreadyRegistered',
-                        notificationBodyKey:
-                            'notification.shortcutRegistrationFailed.alreadyRegisteredBody',
-                        params: { shortcut },
-                    };
-                }
-
-                if (errorStr.includes('invalid') || errorStr.includes('无效')) {
-                    return {
-                        friendlyMessageKey: 'notification.shortcutRegistrationFailed.invalid',
-                        notificationBodyKey: 'notification.shortcutRegistrationFailed.invalidBody',
-                        params: { shortcut },
-                    };
-                }
-
-                if (errorStr.includes('Unknown key')) {
-                    return {
-                        friendlyMessageKey: 'notification.shortcutRegistrationFailed.unsupported',
-                        notificationBodyKey:
-                            'notification.shortcutRegistrationFailed.unsupportedBody',
-                    };
-                }
-
-                return {
-                    friendlyMessageKey: 'notification.shortcutRegistrationFailed.generic',
-                    notificationBodyKey: 'notification.shortcutRegistrationFailed.generic',
-                    params: { error: errorStr },
-                };
-            })();
-
-            notify({
-                title: t('notification.shortcutRegistrationFailed.title'),
-                body: t(shortcutErrorMessage.notificationBodyKey, shortcutErrorMessage.params),
-            });
-
-            alertMessage.value?.error(
-                t(shortcutErrorMessage.friendlyMessageKey, shortcutErrorMessage.params),
-                4000
-            );
-            return false;
-        }
-    };
-
-    const saveShortcutToDatabase = async (shortcut: string) => {
-        try {
-            await settingsStore.updateGlobalShortcut(shortcut);
-        } catch (error) {
-            console.error('Failed to save shortcut to database:', error);
-            throw error;
-        }
-    };
-
     const saveStartOnBoot = async () => {
         try {
             if (settings.value.startOnBoot) {
@@ -530,15 +147,6 @@
     onMounted(async () => {
         await loadSettings();
 
-        try {
-            unlistenSystemKey = await eventService.on(
-                AppEvent.SHORTCUT_CAPTURE_SYSTEM_KEY,
-                handleSystemKeyCapture
-            );
-        } catch (error) {
-            console.error('Failed to subscribe to system key capture event:', error);
-        }
-
         try {
             const isEnabled = await native.autostart.isAutostartEnabled();
             if (isEnabled !== settings.value.startOnBoot) {
@@ -549,12 +157,6 @@
             console.error('Failed to check autostart status:', error);
         }
     });
-
-    onUnmounted(() => {
-        window.removeEventListener('keydown', captureShortcut, { capture: true });
-        unlistenSystemKey?.();
-        unlistenSystemKey = null;
-    });
 </script>
 
 <template>
@@ -566,101 +168,6 @@
                 <h1 class="settings-page-title">{{ t('settings.nav.general.label') }}</h1>
             </header>
 
-            <section class="space-y-4">
-                <div>
-                    <h2 class="settings-section-title">
-                        {{ t('settings.general.shortcuts') }}
-                    </h2>
-                </div>
-
-                <div class="text-[12px] leading-5 font-medium text-neutral-500">
-                    {{ t('settings.general.globalShortcutGroup') }}
-                </div>
-
-                <div
-                    data-testid="settings-general-card-shortcut"
-                    class="settings-row-group divide-y divide-neutral-200/70 overflow-visible"
-                >
-                    <div
-                        class="grid min-w-0 gap-4 px-5 py-4 sm:grid-cols-[minmax(0,1fr)_360px] sm:items-center"
-                    >
-                        <label
-                            data-testid="settings-general-row-label"
-                            class="text-[13px] leading-6 font-normal text-neutral-900"
-                        >
-                            <div>{{ t('settings.general.activationShortcut') }}</div>
-                            <div class="text-[12px] leading-5 text-neutral-500">
-                                {{ t('settings.general.activationShortcutDescription') }}
-                            </div>
-                        </label>
-                        <div class="min-w-0 justify-self-end">
-                            <div
-                                data-testid="settings-shortcut-control-row"
-                                class="flex min-w-0 items-center justify-end text-[11px]"
-                            >
-                                <div data-testid="settings-general-control" class="w-[220px]">
-                                    <div
-                                        data-testid="settings-general-shortcut-input-wrap"
-                                        class="relative ml-auto w-[220px] shrink-0"
-                                    >
-                                        <CustomSelect
-                                            :model-value="displayShortcut"
-                                            :options="globalShortcutPresetOptions"
-                                            :open="showGlobalShortcutPresetMenu"
-                                            :display-label="displayShortcut"
-                                            :disabled="isSaving"
-                                            trigger-as="div"
-                                            content-test-id="settings-global-shortcut-preset-menu"
-                                            option-test-id-prefix="settings-global-shortcut-preset-"
-                                            disable-portal
-                                            protect-option-text
-                                            @update:open="handleGlobalShortcutPresetOpenChange"
-                                            @update:model-value="useSuggestedShortcut"
-                                        >
-                                            <template #trigger>
-                                                <input
-                                                    v-model="displayShortcut"
-                                                    data-testid="settings-global-shortcut-input"
-                                                    type="text"
-                                                    readonly
-                                                    class="shortcut-capture-input min-w-0 flex-1 bg-transparent text-center text-[12px] outline-none select-none"
-                                                    :disabled="isSaving"
-                                                    :placeholder="
-                                                        t('settings.general.shortcutPlaceholder')
-                                                    "
-                                                    @pointerdown.stop
-                                                    @mousedown="focusShortcutCaptureInput"
-                                                    @select="clearShortcutCaptureSelection"
-                                                    @dragstart.prevent
-                                                    @keydown.capture="captureShortcut"
-                                                    @click.stop
-                                                    @focus="startCapture"
-                                                />
-                                            </template>
-                                        </CustomSelect>
-                                        <span
-                                            v-if="shortcutRegistrationFailed"
-                                            data-testid="settings-shortcut-occupied-indicator"
-                                            class="absolute top-1/2 right-8 flex h-4 w-4 -translate-y-1/2 items-center justify-center text-red-500"
-                                            :title="
-                                                t('settings.general.shortcutRegistrationFailed')
-                                            "
-                                        >
-                                            <AppIcon
-                                                name="exclamation-triangle"
-                                                class="h-3.5 w-3.5"
-                                            />
-                                        </span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <SearchShortcutSettings />
-            </section>
-
             <section class="space-y-4">
                 <div>
                     <h2 class="settings-section-title">
@@ -822,21 +329,3 @@
         </div>
     </div>
 </template>
-
-<style scoped>
-    .shortcut-capture-input {
-        caret-color: transparent;
-        user-select: none;
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        -ms-user-select: none;
-    }
-
-    .shortcut-capture-input::selection {
-        background: transparent;
-    }
-
-    .shortcut-capture-input::-moz-selection {
-        background: transparent;
-    }
-</style>
diff --git a/apps/desktop/src/views/SettingsView/components/Shortcuts/index.vue b/apps/desktop/src/views/SettingsView/components/Shortcuts/index.vue
new file mode 100644
index 00000000..c9ecd819
--- /dev/null
+++ b/apps/desktop/src/views/SettingsView/components/Shortcuts/index.vue
@@ -0,0 +1,46 @@
+<script setup lang="ts">
+    import { t } from '@/i18n';
+
+    import GeneralShortcutSettings from '../General/GeneralShortcutSettings.vue';
+    import SearchShortcutSettings from '../General/SearchShortcutSettings.vue';
+
+    defineOptions({
+        name: 'SettingsShortcutsSection',
+    });
+</script>
+
+<template>
+    <div class="settings-page" data-testid="settings-shortcuts-section">
+        <div class="settings-section-stack">
+            <header class="settings-page-header flex items-start gap-4">
+                <div class="max-w-2xl min-w-0">
+                    <h1 class="settings-page-title" data-testid="shortcuts-settings-title">
+                        {{ t('settings.nav.shortcuts.label') }}
+                    </h1>
+                    <p class="settings-section-description">
+                        {{ t('settings.nav.shortcuts.description') }}
+                    </p>
+                </div>
+            </header>
+
+            <section class="space-y-4">
+                <h2 class="settings-section-title">
+                    {{ t('settings.general.globalShortcutGroup') }}
+                </h2>
+                <GeneralShortcutSettings />
+            </section>
+
+            <section class="mt-10 space-y-4">
+                <div>
+                    <h2 class="settings-section-title">
+                        {{ t('settings.general.searchShortcuts') }}
+                    </h2>
+                    <p class="settings-section-description">
+                        {{ t('settings.general.searchShortcutsDescription') }}
+                    </p>
+                </div>
+                <SearchShortcutSettings />
+            </section>
+        </div>
+    </div>
+</template>
diff --git a/apps/desktop/src/views/SettingsView/index.vue b/apps/desktop/src/views/SettingsView/index.vue
index 70385453..697e7736 100644
--- a/apps/desktop/src/views/SettingsView/index.vue
+++ b/apps/desktop/src/views/SettingsView/index.vue
@@ -28,6 +28,7 @@
     });
 
     const GeneralView = defineAsyncComponent(() => import('./components/General/index.vue'));
+    const ShortcutsView = defineAsyncComponent(() => import('./components/Shortcuts/index.vue'));
     const AiServicesView = defineAsyncComponent(() => import('./components/AiServices/index.vue'));
     const BuiltInToolsView = defineAsyncComponent(
         () => import('./components/BuiltInTools/index.vue')
@@ -56,6 +57,11 @@
             loadingKey: 'settings.loading.general',
             scrollable: true,
         },
+        shortcuts: {
+            component: ShortcutsView,
+            loadingKey: 'settings.loading.shortcuts',
+            scrollable: true,
+        },
         'ai-services': {
             component: AiServicesView,
             loadingKey: 'settings.loading.aiServices',
diff --git a/apps/desktop/src/views/SettingsView/settingsNavigation.ts b/apps/desktop/src/views/SettingsView/settingsNavigation.ts
index 013bb9bc..d7dfa6af 100644
--- a/apps/desktop/src/views/SettingsView/settingsNavigation.ts
+++ b/apps/desktop/src/views/SettingsView/settingsNavigation.ts
@@ -5,6 +5,7 @@ import { JSON_SETTINGS_SECTIONS } from '@/stores/setting/sections/registry';
 
 export type NavigationSection =
     | 'general'
+    | 'shortcuts'
     | 'ai-services'
     | 'built-in-tools'
     | 'search'
@@ -57,6 +58,12 @@ const settingsNavigationDefinitions: SettingsNavigationGroupDefinition[] = [
                 labelKey: 'settings.nav.general.label',
                 descriptionKey: 'settings.nav.general.description',
             },
+            {
+                id: 'shortcuts',
+                icon: 'keyboard',
+                labelKey: 'settings.nav.shortcuts.label',
+                descriptionKey: 'settings.nav.shortcuts.description',
+            },
         ],
     },
     {
diff --git a/apps/desktop/tests/SettingsView/general-language.test.ts b/apps/desktop/tests/SettingsView/general-language.test.ts
index a61594f9..4c1c1c7c 100644
--- a/apps/desktop/tests/SettingsView/general-language.test.ts
+++ b/apps/desktop/tests/SettingsView/general-language.test.ts
@@ -165,11 +165,6 @@ describe('Settings General shortcut capture i18n', () => {
         await flushMountedPromises();
 
         expect(wrapper.text()).toContain('General');
-        expect(wrapper.text()).toContain('Shortcuts');
-        expect(wrapper.text()).toContain('Set the global shortcut used to open TouchAI.');
-        expect(wrapper.text()).toContain('Toggle window maximize');
-        expect(wrapper.text()).toContain('Toggle the search window maximized state.');
-        expect(wrapper.text()).toContain('Activation shortcut');
         expect(wrapper.text()).toContain('Startup and window');
         expect(wrapper.text()).toContain(
             'Control startup behavior and the default search window size'
@@ -186,6 +181,10 @@ describe('Settings General shortcut capture i18n', () => {
         expect(wrapper.text()).toContain('Language');
         expect(wrapper.text()).toContain('Controls the display language used by TouchAI');
         expect(wrapper.text()).toContain('Interface language');
+        expect(wrapper.text()).not.toContain('Activation shortcut');
+        expect(wrapper.text()).not.toContain('Set the global shortcut used to open TouchAI.');
+        expect(wrapper.text()).not.toContain('Toggle window maximize');
+        expect(wrapper.text()).not.toContain('Toggle the search window maximized state.');
         expect(wrapper.text()).not.toContain('常规设置');
         expect(wrapper.text()).not.toContain('输出时滚动策略');
     });
diff --git a/apps/desktop/tests/SettingsView/navigation-sidebar-i18n.test.ts b/apps/desktop/tests/SettingsView/navigation-sidebar-i18n.test.ts
index b432e49c..662a149f 100644
--- a/apps/desktop/tests/SettingsView/navigation-sidebar-i18n.test.ts
+++ b/apps/desktop/tests/SettingsView/navigation-sidebar-i18n.test.ts
@@ -34,6 +34,9 @@ describe('Settings navigation sidebar i18n', () => {
         expect(wrapper.get('[data-testid="settings-nav-general"]').attributes('title')).toBe(
             'General'
         );
+        expect(wrapper.get('[data-testid="settings-nav-shortcuts"]').attributes('title')).toBe(
+            'Shortcuts'
+        );
         expect(wrapper.get('[data-testid="settings-nav-ai-services"]').attributes('title')).toBe(
             'Providers and models'
         );
@@ -61,6 +64,7 @@ describe('Settings navigation sidebar i18n', () => {
         expect(settingsNavigationGroups[0]?.label).toBe('Basics');
         expect(flattenSettingsNavigation().map((item) => item.label)).toEqual([
             'General',
+            'Shortcuts',
             'Providers and models',
             'Built-in tools',
             'Search',
diff --git a/apps/desktop/tests/SettingsView/settings-view-i18n.test.ts b/apps/desktop/tests/SettingsView/settings-view-i18n.test.ts
index 8faeb9a5..0e861164 100644
--- a/apps/desktop/tests/SettingsView/settings-view-i18n.test.ts
+++ b/apps/desktop/tests/SettingsView/settings-view-i18n.test.ts
@@ -55,6 +55,16 @@ vi.mock('@/views/SettingsView/components/General/index.vue', () => ({
         },
     },
 }));
+vi.mock('@/views/SettingsView/components/Shortcuts/index.vue', () => ({
+    __esModule: true,
+    default: {
+        name: 'ShortcutsViewStub',
+        async setup() {
+            await asyncViewControls.waitForResolve();
+            return () => null;
+        },
+    },
+}));
 vi.mock('@/views/SettingsView/components/AiServices/index.vue', () => ({
     __esModule: true,
     default: {
@@ -146,8 +156,12 @@ describe('SettingsView lazy loading i18n', () => {
 
         await flushMountedPromises();
         expect(wrapper.text()).toContain('Loading general settings...');
+        expect(wrapper.text()).not.toContain('Loading shortcut settings...');
         expect(setTitleMock).toHaveBeenCalledWith('TouchAI - Settings');
 
+        await wrapper.get('[data-testid="settings-nav-shortcuts"]').trigger('click');
+        expect(wrapper.text()).toContain('Loading shortcut settings...');
+
         await wrapper.get('[data-testid="settings-nav-ai-services"]').trigger('click');
         expect(wrapper.text()).toContain('Loading model service settings...');
 
diff --git a/apps/desktop/tests/views/SettingsView/navigationSidebar.test.ts b/apps/desktop/tests/views/SettingsView/navigationSidebar.test.ts
index 7337aa27..26e94dd6 100644
--- a/apps/desktop/tests/views/SettingsView/navigationSidebar.test.ts
+++ b/apps/desktop/tests/views/SettingsView/navigationSidebar.test.ts
@@ -66,6 +66,7 @@ describe('NavigationSidebar', () => {
         expect(wrapper.text()).not.toContain('返回');
         expect(wrapper.text()).not.toContain('概览');
         expect(wrapper.text()).toContain('通用');
+        expect(wrapper.text()).toContain('快捷键');
         expect(wrapper.text()).toContain('服务商与模型');
         expect(wrapper.text()).not.toContain('关于');
         expect(wrapper.text()).not.toContain('Provider、模型、默认模型和密钥');
diff --git a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
index c959cfe8..91af6965 100644
--- a/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsGeneralComponent.test.ts
@@ -2,9 +2,7 @@ import type { AppUpdateState } from '@services/AppUpdateService/types';
 import { flushPromises, mount } from '@vue/test-utils';
 import { vi } from 'vitest';
 
-import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
 import { setLocale } from '@/i18n';
-import { AppEvent, eventService } from '@/services/EventService';
 import GeneralSection from '@/views/SettingsView/components/General/index.vue';
 
 const originalPlatform = navigator.platform;
@@ -17,11 +15,9 @@ function setPlatform(platform: string) {
 }
 
 const settingsStoreMock = vi.hoisted(() => {
-    const createGeneralSettingsMock = (searchKeybindings: Record<string, string | null>) => ({
+    const createGeneralSettingsMock = () => ({
         globalShortcut: 'Alt+Space',
-        searchKeybindings: {
-            ...searchKeybindings,
-        },
+        searchKeybindings: {},
         startOnBoot: false,
         startMinimized: true,
         language: 'zh-CN',
@@ -36,11 +32,9 @@ const settingsStoreMock = vi.hoisted(() => {
     return {
         createGeneralSettingsMock,
         settings: {
-            value: createGeneralSettingsMock({}),
+            value: createGeneralSettingsMock(),
         },
         initialize: vi.fn().mockResolvedValue(undefined),
-        updateGlobalShortcut: vi.fn().mockResolvedValue(undefined),
-        updateSearchKeybindings: vi.fn().mockResolvedValue(undefined),
         updateStartOnBoot: vi.fn().mockResolvedValue(undefined),
         updateStartMinimized: vi.fn().mockResolvedValue(undefined),
         updateOutputScrollBehavior: vi.fn().mockResolvedValue(undefined),
@@ -53,10 +47,6 @@ const settingsStoreMock = vi.hoisted(() => {
 });
 
 const nativeMock = vi.hoisted(() => ({
-    shortcut: {
-        getShortcutStatus: vi.fn().mockResolvedValue([false, null]),
-        registerGlobalShortcut: vi.fn().mockResolvedValue(undefined),
-    },
     autostart: {
         isAutostartEnabled: vi.fn().mockResolvedValue(false),
         enableAutostart: vi.fn().mockResolvedValue(undefined),
@@ -87,10 +77,6 @@ vi.mock('@services/NativeService', () => ({
     native: nativeMock,
 }));
 
-vi.mock('@services/NotificationService', () => ({
-    notify: vi.fn(),
-}));
-
 vi.mock('@components/AlertMessage.vue', () => ({
     default: {
         name: 'AlertMessageStub',
@@ -103,35 +89,18 @@ vi.mock('@components/AlertMessage.vue', () => ({
     },
 }));
 
-vi.mock('@components/AppIcon.vue', () => ({
-    default: {
-        name: 'AppIconStub',
-        props: ['name'],
-        template: '<span data-testid="app-icon" :data-name="name" />',
-    },
-}));
-
 vi.mock('@components/CustomSelect.vue', () => ({
     default: {
         name: 'CustomSelectStub',
-        props: ['modelValue', 'options', 'open', 'contentTestId', 'optionTestIdPrefix'],
-        emits: ['update:modelValue', 'update:open'],
+        props: ['modelValue', 'options'],
+        emits: ['update:modelValue'],
         template: `
             <div data-testid="custom-select">
-                <slot name="trigger" />
-                <select v-if="!$slots.trigger" data-testid="custom-select-native">
+                <select data-testid="custom-select-native">
                     <option>{{ modelValue }}</option>
                 </select>
-                <div v-if="open" :data-testid="contentTestId">
-                    <button
-                        v-for="option in options"
-                        :key="option.value"
-                        type="button"
-                        :data-testid="optionTestIdPrefix ? optionTestIdPrefix + option.value : undefined"
-                        @click="$emit('update:modelValue', option.value)"
-                    >
-                        {{ option.label }}
-                    </button>
+                <div v-for="option in options" :key="option.value">
+                    {{ option.label }} {{ option.description }}
                 </div>
             </div>
         `,
@@ -197,72 +166,20 @@ describe('SettingsGeneralSection', () => {
         setPlatform('Win32');
         setLocale('zh-CN');
         appUpdateServiceMock.state = appUpdateServiceMock.createState();
-        nativeMock.shortcut.getShortcutStatus.mockResolvedValue([false, null]);
         nativeMock.autostart.isAutostartEnabled.mockResolvedValue(false);
-        settingsStoreMock.settings.value = settingsStoreMock.createGeneralSettingsMock(
-            createDefaultSearchKeybindings()
-        );
+        settingsStoreMock.settings.value = settingsStoreMock.createGeneralSettingsMock();
     });
 
     afterEach(() => {
         setPlatform(originalPlatform);
         document.body.innerHTML = '';
     });
-
     it('renders the general settings groups and row controls', async () => {
         const wrapper = mount(GeneralSection);
 
         await flushPromises();
 
         expect(wrapper.get('h1').text()).toBe('通用');
-        expect(wrapper.text()).toContain('快捷键');
-        expect(wrapper.text()).toContain('唤起快捷键');
-        expect(
-            (
-                wrapper.get('[data-testid="settings-global-shortcut-input"]')
-                    .element as HTMLInputElement
-            ).value
-        ).toBe('Alt+Space');
-        expect(wrapper.text()).toContain('设置呼出 TouchAI 的全局快捷键');
-        expect(wrapper.text()).not.toContain('Ctrl+Space');
-        expect(wrapper.find('[data-testid="settings-shortcut-suggestions"]').exists()).toBe(false);
-        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
-            false
-        );
-        expect(wrapper.text()).not.toContain('搜索页快捷键');
-        expect(wrapper.text()).toContain('会话');
-        expect(wrapper.text()).toContain('输入与请求');
-        expect(wrapper.text()).toContain('窗口');
-        expect(wrapper.text()).toContain('打开会话历史');
-        expect(wrapper.text()).toContain('快速打开或收起会话历史列表');
-        expect(wrapper.text()).toContain('开始新会话');
-        expect(wrapper.text()).toContain('切换窗口最大化');
-        expect(wrapper.text()).toContain('切换搜索窗口最大化');
-        expect(wrapper.text()).toContain('打开设置');
-        expect(wrapper.text()).toContain('快速打开设置窗口');
-        expect(
-            (
-                wrapper.get('[data-testid="settings-search-shortcut-input-search.window.maximize"]')
-                    .element as HTMLInputElement
-            ).value
-        ).toBe('F11');
-        expect(
-            (
-                wrapper.get('[data-testid="settings-search-shortcut-input-search.settings.open"]')
-                    .element as HTMLInputElement
-            ).value
-        ).toBe('Ctrl+,');
-        expect(
-            (
-                wrapper.get('[data-testid="settings-search-shortcut-input-search.request.cancel"]')
-                    .element as HTMLInputElement
-            ).value
-        ).toBe('Esc');
-        expect(
-            wrapper
-                .get('[data-testid="settings-search-shortcut-input-search.history.open"]')
-                .classes()
-        ).not.toContain('font-mono');
         expect(wrapper.text()).toContain('启动与窗口');
         expect(wrapper.text()).toContain('开机自启动');
         expect(wrapper.text()).toContain('启动时最小化');
@@ -275,6 +192,12 @@ describe('SettingsGeneralSection', () => {
         expect(wrapper.text()).toContain('当前已是最新版（V0.1.0）');
         expect(wrapper.text()).toContain('自动检查更新');
         expect(wrapper.text()).toContain('检查更新');
+        expect(wrapper.text()).not.toContain('快捷键');
+        expect(wrapper.text()).not.toContain('唤起快捷键');
+        expect(wrapper.find('[data-testid="settings-global-shortcut-input"]').exists()).toBe(false);
+        expect(wrapper.find('[data-testid^="settings-search-shortcut-input-"]').exists()).toBe(
+            false
+        );
         expect(wrapper.text()).not.toContain('快捷唤起');
         expect(wrapper.text()).not.toContain('管理全局唤起');
         expect(wrapper.text()).not.toContain('启动设置');
@@ -288,544 +211,7 @@ describe('SettingsGeneralSection', () => {
         expect(controls.length).toBeGreaterThanOrEqual(3);
 
         const rowLabels = wrapper.findAll('[data-testid="settings-general-row-label"]');
-        expect(rowLabels.length).toBeGreaterThanOrEqual(13);
-    });
-
-    it('opens global shortcut presets from the shortcut field and saves a preset', async () => {
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
-        await input.trigger('focus');
-        await flushPromises();
-
-        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
-            true
-        );
-        expect(
-            wrapper.get('[data-testid="settings-global-shortcut-preset-Alt+Space"]').text()
-        ).toBe('Alt+Space');
-        expect(
-            wrapper.get('[data-testid="settings-global-shortcut-preset-Ctrl+Space"]').text()
-        ).toBe('Ctrl+Space');
-
-        await wrapper
-            .get('[data-testid="settings-global-shortcut-preset-Ctrl+Space"]')
-            .trigger('click');
-        await flushPromises();
-
-        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
-        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
-        expect((input.element as HTMLInputElement).value).toBe('Ctrl+Space');
-        expect(settingsStoreMock.settings.value.globalShortcut).toBe('Ctrl+Space');
-        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
-            false
-        );
-    });
-
-    it('uses macOS shortcut labels and omits input-method-conflicting presets', async () => {
-        setPlatform('MacIntel');
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
-        expect((input.element as HTMLInputElement).value).toBe('Option+Space');
-
-        await input.trigger('focus');
-        await flushPromises();
-
-        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
-            true
-        );
-        expect(
-            wrapper.get('[data-testid="settings-global-shortcut-preset-Option+Space"]').text()
-        ).toBe('Option+Space');
-        expect(
-            wrapper.get('[data-testid="settings-global-shortcut-preset-Option+Shift+Space"]').text()
-        ).toBe('Option+Shift+Space');
-        expect(
-            wrapper.find('[data-testid="settings-global-shortcut-preset-Ctrl+Space"]').exists()
-        ).toBe(false);
-
-        await wrapper
-            .get('[data-testid="settings-global-shortcut-preset-Option+Shift+Space"]')
-            .trigger('click');
-        await flushPromises();
-
-        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith(
-            'Option+Shift+Space'
-        );
-        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Option+Shift+Space');
-        expect((input.element as HTMLInputElement).value).toBe('Option+Shift+Space');
-    });
-
-    it('blocks macOS system-reserved global shortcuts before registration', async () => {
-        setPlatform('MacIntel');
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
-        await input.trigger('focus');
-        await flushPromises();
-
-        window.dispatchEvent(
-            new KeyboardEvent('keydown', { key: ' ', code: 'Space', metaKey: true })
-        );
-        await flushPromises();
-
-        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
-        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
-        expect((input.element as HTMLInputElement).value).toBe('Option+Space');
-
-        await input.trigger('focus');
-        await flushPromises();
-        window.dispatchEvent(
-            new KeyboardEvent('keydown', { key: ' ', code: 'Space', ctrlKey: true })
-        );
-        await flushPromises();
-
-        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
-        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
-        expect((input.element as HTMLInputElement).value).toBe('Option+Space');
-    });
-
-    it('rejects macOS system-reserved search shortcuts', async () => {
-        setPlatform('MacIntel');
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get(
-            '[data-testid="settings-search-shortcut-input-search.history.open"]'
-        );
-        await input.trigger('focus');
-        await flushPromises();
-        alertMessageMock.error.mockClear();
-
-        window.dispatchEvent(
-            new KeyboardEvent('keydown', { key: ' ', code: 'Space', metaKey: true })
-        );
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
-        expect(alertMessageMock.error).toHaveBeenCalledWith(expect.stringContaining('macOS'), 3000);
-        expect((input.element as HTMLInputElement).value).toBe('Cmd+H');
-
-        window.dispatchEvent(
-            new KeyboardEvent('keydown', { key: ' ', code: 'Space', ctrlKey: true })
-        );
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
-        expect((input.element as HTMLInputElement).value).toBe('Cmd+H');
-    });
-
-    it('saves the global shortcut immediately after a shortcut is pressed', async () => {
-        settingsStoreMock.settings.value.searchKeybindings['search.session.new'] = 'Mod+Shift+N';
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
-        await input.trigger('focus');
-        await flushPromises();
-
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'n', ctrlKey: true }));
-        await flushPromises();
-
-        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith('Ctrl+N');
-        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Ctrl+N');
-        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
-            false
-        );
-    });
-
-    it('captures Ctrl+Space from the global shortcut input before the preset menu handles Space', async () => {
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
-        await input.trigger('focus');
-        await flushPromises();
-
-        await input.trigger('keydown', {
-            key: ' ',
-            code: 'Space',
-            ctrlKey: true,
-        });
-        await flushPromises();
-
-        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
-        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
-        expect((input.element as HTMLInputElement).value).toBe('Ctrl+Space');
-        expect(settingsStoreMock.settings.value.globalShortcut).toBe('Ctrl+Space');
-    });
-
-    it('does not capture navigation keys while global shortcut presets are open', async () => {
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
-        await input.trigger('focus');
-        await flushPromises();
-
-        const event = new KeyboardEvent('keydown', { key: 'ArrowDown', cancelable: true });
-        window.dispatchEvent(event);
-        await flushPromises();
-
-        expect(event.defaultPrevented).toBe(false);
-        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
-        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
-        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
-            true
-        );
-
-        wrapper.unmount();
-    });
-
-    it('reports invalid global shortcut attempts only once through the capture stack', async () => {
-        const wrapper = mount(GeneralSection, {
-            attachTo: document.body,
-        });
-
-        await flushPromises();
-
-        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
-        await input.trigger('focus');
-        await flushPromises();
-        alertMessageMock.warning.mockClear();
-
-        const event = new KeyboardEvent('keydown', {
-            key: 'a',
-            shiftKey: true,
-            bubbles: true,
-            cancelable: true,
-        });
-        input.element.dispatchEvent(event);
-        await flushPromises();
-
-        expect(event.defaultPrevented).toBe(true);
-        expect(alertMessageMock.warning).toHaveBeenCalledTimes(1);
-        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
-        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
-
-        wrapper.unmount();
-    });
-
-    it('does not save a global shortcut that duplicates a search shortcut', async () => {
-        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+A';
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
-        await input.trigger('focus');
-        await flushPromises();
-
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'a', ctrlKey: true }));
-        await flushPromises();
-
-        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
-        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
-        expect((input.element as HTMLInputElement).value).toBe('Alt+Space');
-    });
-    it('accepts modifierless function keys for configurable search shortcuts', async () => {
-        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get(
-            '[data-testid="settings-search-shortcut-input-search.history.open"]'
-        );
-        await input.trigger('focus');
-        await flushPromises();
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
-            ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': 'F1',
-        });
-    });
-
-    it('captures Windows system key events while editing a search shortcut', async () => {
-        settingsStoreMock.settings.value.globalShortcut = 'Ctrl+Space';
-        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get(
-            '[data-testid="settings-search-shortcut-input-search.history.open"]'
-        );
-        await input.trigger('focus');
-        await flushPromises();
-
-        await eventService.emit(AppEvent.SHORTCUT_CAPTURE_SYSTEM_KEY, {
-            key: 'Space',
-            alt: true,
-            ctrl: false,
-            shift: false,
-        });
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
-            ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': 'Alt+Space',
-        });
-    });
-
-    it('captures a function-row key by keyboard code when the key value is not an F-key', async () => {
-        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get(
-            '[data-testid="settings-search-shortcut-input-search.history.open"]'
-        );
-        await input.trigger('focus');
-        await flushPromises();
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'BrightnessUp', code: 'F2' }));
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
-            ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': 'F2',
-        });
-    });
-
-    it('does not capture navigation keys while editing a search shortcut', async () => {
-        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get(
-            '[data-testid="settings-search-shortcut-input-search.history.open"]'
-        );
-        await input.trigger('focus');
-        await flushPromises();
-
-        const event = new KeyboardEvent('keydown', { key: 'ArrowDown', cancelable: true });
-        window.dispatchEvent(event);
-        await flushPromises();
-
-        expect(event.defaultPrevented).toBe(false);
-        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
-
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
-            ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': 'F1',
-        });
-    });
-
-    it('keeps search shortcut capture active after a validation failure', async () => {
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get(
-            '[data-testid="settings-search-shortcut-input-search.history.open"]'
-        );
-        await input.trigger('focus');
-        await flushPromises();
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'a', shiftKey: true }));
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
-
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
-            ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': 'F1',
-        });
-    });
-
-    it('captures shifted punctuation shortcuts through their physical key code', async () => {
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get(
-            '[data-testid="settings-search-shortcut-input-search.history.open"]'
-        );
-        await input.trigger('focus');
-        await flushPromises();
-
-        window.dispatchEvent(
-            new KeyboardEvent('keydown', {
-                key: '+',
-                code: 'Equal',
-                ctrlKey: true,
-                shiftKey: true,
-            })
-        );
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
-            ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': 'Mod+Shift+=',
-        });
-        expect((input.element as HTMLInputElement).value).toBe('Ctrl+Shift+=');
-    });
-
-    it('reports unsupported mac command search shortcuts without showing the Windows key warning', async () => {
-        setPlatform('MacIntel');
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get(
-            '[data-testid="settings-search-shortcut-input-search.history.open"]'
-        );
-        await input.trigger('focus');
-        await flushPromises();
-        alertMessageMock.error.mockClear();
-        alertMessageMock.warning.mockClear();
-
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: '@', metaKey: true }));
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
-        expect(alertMessageMock.warning).not.toHaveBeenCalled();
-        expect(alertMessageMock.error).toHaveBeenCalledTimes(1);
-        expect((input.element as HTMLInputElement).value).toBe('Cmd+H');
-
-        wrapper.unmount();
-    });
-
-    it('shows fixed search shortcuts as unsupported for editing', async () => {
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const input = wrapper.get('[data-testid="settings-search-shortcut-input-search.submit"]');
-        expect(input.attributes('title')).toBe('暂不支持修改该快捷键');
-        expect(input.attributes('tabindex')).toBe('-1');
-
-        await input.trigger('focus');
-        await flushPromises();
-        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F2' }));
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
-        expect((input.element as HTMLInputElement).value).toBe('Enter');
-    });
-
-    it('uses an inline x icon to clear a default search shortcut', async () => {
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        expect(
-            wrapper
-                .find('[data-testid="settings-search-shortcut-reset-search.history.open"]')
-                .exists()
-        ).toBe(false);
-        expect(
-            wrapper
-                .find('[data-testid="settings-search-shortcut-disable-search.history.open"]')
-                .exists()
-        ).toBe(false);
-
-        const action = wrapper.get(
-            '[data-testid="settings-search-shortcut-action-search.history.open"]'
-        );
-        expect(action.attributes('data-shortcut-action')).toBe('clear');
-        expect(action.get('[data-testid="app-icon"]').attributes('data-name')).toBe('x');
-
-        await action.trigger('click');
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
-            ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': null,
-        });
-    });
-
-    it('uses an inline undo icon to restore non-default search shortcuts', async () => {
-        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        const action = wrapper.get(
-            '[data-testid="settings-search-shortcut-action-search.history.open"]'
-        );
-        expect(action.attributes('data-shortcut-action')).toBe('restore');
-        expect(action.get('[data-testid="app-icon"]').attributes('data-name')).toBe('undo');
-
-        await action.trigger('click');
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
-            ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': 'Mod+H',
-        });
-    });
-
-    it('restores the default search shortcut from the cleared state', async () => {
-        const clearedSearchKeybindings = {
-            ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': null,
-        };
-        settingsStoreMock.settings.value.searchKeybindings = clearedSearchKeybindings;
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        expect(
-            (
-                wrapper.get('[data-testid="settings-search-shortcut-input-search.history.open"]')
-                    .element as HTMLInputElement
-            ).value
-        ).toBe('无');
-
-        const action = wrapper.get(
-            '[data-testid="settings-search-shortcut-action-search.history.open"]'
-        );
-        expect(action.attributes('data-shortcut-action')).toBe('restore');
-        expect(action.get('[data-testid="app-icon"]').attributes('data-name')).toBe('undo');
-
-        await action.trigger('click');
-        await flushPromises();
-
-        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
-            ...clearedSearchKeybindings,
-            'search.history.open': 'Mod+H',
-        });
-    });
-
-    it('localizes the cleared search shortcut fallback', async () => {
-        setLocale('en-US');
-        settingsStoreMock.settings.value.language = 'en-US';
-        settingsStoreMock.settings.value.searchKeybindings = {
-            ...settingsStoreMock.settings.value.searchKeybindings,
-            'search.history.open': null,
-        };
-
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        expect(
-            (
-                wrapper.get('[data-testid="settings-search-shortcut-input-search.history.open"]')
-                    .element as HTMLInputElement
-            ).value
-        ).toBe('None');
+        expect(rowLabels.length).toBeGreaterThanOrEqual(5);
     });
 
     it('shows the current version in the latest update details', async () => {
@@ -1088,20 +474,4 @@ describe('SettingsGeneralSection', () => {
 
         expect(wrapper.text()).toContain('暂无更新日志');
     });
-
-    it('shows a compact occupied-shortcut indicator inside the fixed-width control area', async () => {
-        nativeMock.shortcut.getShortcutStatus.mockResolvedValueOnce([true, 'occupied']);
-        const wrapper = mount(GeneralSection);
-
-        await flushPromises();
-
-        expect(wrapper.find('[data-testid="settings-shortcut-error"]').exists()).toBe(false);
-        expect(
-            wrapper.get('[data-testid="settings-shortcut-occupied-indicator"]').attributes('title')
-        ).toBe('快捷键注册失败，可能已被其他应用占用');
-        expect(wrapper.find('[data-testid="settings-shortcut-retry-button"]').exists()).toBe(false);
-        expect(wrapper.find('[data-testid="settings-shortcut-cancel-button"]').exists()).toBe(
-            false
-        );
-    });
 });
diff --git a/apps/desktop/tests/views/SettingsView/settingsWindowView.test.ts b/apps/desktop/tests/views/SettingsView/settingsWindowView.test.ts
index f6fe1dc5..57ded6ad 100644
--- a/apps/desktop/tests/views/SettingsView/settingsWindowView.test.ts
+++ b/apps/desktop/tests/views/SettingsView/settingsWindowView.test.ts
@@ -45,6 +45,13 @@ vi.mock('@/views/SettingsView/components/General/index.vue', () => ({
     },
 }));
 
+vi.mock('@/views/SettingsView/components/Shortcuts/index.vue', () => ({
+    default: {
+        name: 'ShortcutsView',
+        template: '<section data-testid="shortcuts-view-stub" />',
+    },
+}));
+
 vi.mock('@/views/SettingsView/components/AiServices/index.vue', () => ({
     default: {
         name: 'AiServicesView',
@@ -198,6 +205,11 @@ describe('SettingsWindowView', () => {
         expect(loadingState().attributes('fill')).toBe('min');
         expect(loadingState().attributes('message')).toBe('正在加载常规设置...');
 
+        nav.vm.$emit('navigate', 'shortcuts');
+        await flushPromises();
+        expect(loadingState().attributes('message')).toBe('正在加载快捷键设置...');
+        expect(loadingState().attributes('variant')).toBe('brand');
+
         nav.vm.$emit('navigate', 'ai-services');
         await flushPromises();
         expect(loadingState().attributes('variant')).toBe('brand');
@@ -225,6 +237,10 @@ describe('SettingsWindowView', () => {
 
         expect(wrapper.find('general-view-stub').exists()).toBe(true);
 
+        nav.vm.$emit('navigate', 'shortcuts');
+        await flushPromises();
+        expect(wrapper.find('shortcuts-view-stub').exists()).toBe(true);
+
         nav.vm.$emit('navigate', 'ai-services');
         await flushPromises();
         expect(wrapper.find('ai-services-view-stub').exists()).toBe(true);
diff --git a/apps/desktop/tests/views/SettingsView/shortcutsComponent.test.ts b/apps/desktop/tests/views/SettingsView/shortcutsComponent.test.ts
new file mode 100644
index 00000000..83f0c7d7
--- /dev/null
+++ b/apps/desktop/tests/views/SettingsView/shortcutsComponent.test.ts
@@ -0,0 +1,796 @@
+import { flushPromises, mount } from '@vue/test-utils';
+import { vi } from 'vitest';
+
+import { createDefaultSearchKeybindings } from '@/config/searchKeybindings';
+import { setLocale } from '@/i18n';
+import { AppEvent, eventService } from '@/services/EventService';
+import GeneralSection from '@/views/SettingsView/components/Shortcuts/index.vue';
+
+const originalPlatform = navigator.platform;
+
+function setPlatform(platform: string) {
+    Object.defineProperty(window.navigator, 'platform', {
+        configurable: true,
+        value: platform,
+    });
+}
+
+const settingsStoreMock = vi.hoisted(() => {
+    const createGeneralSettingsMock = (searchKeybindings: Record<string, string | null>) => ({
+        globalShortcut: 'Alt+Space',
+        searchKeybindings: {
+            ...searchKeybindings,
+        },
+        startOnBoot: false,
+        startMinimized: true,
+        language: 'zh-CN',
+        outputScrollBehavior: 'follow_output',
+        searchWindowSizePreset: 'normal',
+        searchWindowDefaultSize: { width: 720, height: 520 },
+        appUpdateChannel: 'stable',
+        appUpdateAutoCheck: true,
+        appUpdateLastCheckedAt: null,
+    });
+
+    return {
+        createGeneralSettingsMock,
+        settings: {
+            value: createGeneralSettingsMock({}),
+        },
+        initialize: vi.fn().mockResolvedValue(undefined),
+        updateGlobalShortcut: vi.fn().mockResolvedValue(undefined),
+        updateSearchKeybindings: vi.fn().mockResolvedValue(undefined),
+        updateStartOnBoot: vi.fn().mockResolvedValue(undefined),
+        updateStartMinimized: vi.fn().mockResolvedValue(undefined),
+        updateOutputScrollBehavior: vi.fn().mockResolvedValue(undefined),
+        updateSearchWindowSizePreset: vi.fn().mockResolvedValue(undefined),
+        updateLanguage: vi.fn().mockResolvedValue(undefined),
+        updateAppUpdateChannel: vi.fn().mockResolvedValue(undefined),
+        updateAppUpdateAutoCheck: vi.fn().mockResolvedValue(undefined),
+        updateAppUpdateLastCheckedAt: vi.fn().mockResolvedValue(undefined),
+    };
+});
+
+const nativeMock = vi.hoisted(() => ({
+    shortcut: {
+        getShortcutStatus: vi.fn().mockResolvedValue([false, null]),
+        registerGlobalShortcut: vi.fn().mockResolvedValue(undefined),
+    },
+    autostart: {
+        isAutostartEnabled: vi.fn().mockResolvedValue(false),
+        enableAutostart: vi.fn().mockResolvedValue(undefined),
+        disableAutostart: vi.fn().mockResolvedValue(undefined),
+    },
+    window: {
+        setSearchWindowDefaults: vi.fn().mockResolvedValue(undefined),
+    },
+}));
+
+const alertMessageMock = vi.hoisted(() => ({
+    success: vi.fn(),
+    error: vi.fn(),
+    warning: vi.fn(),
+}));
+
+vi.mock('pinia', () => ({
+    storeToRefs: (store: typeof settingsStoreMock) => ({
+        settings: store.settings,
+    }),
+}));
+
+vi.mock('@/stores/settings', () => ({
+    useSettingsStore: () => settingsStoreMock,
+}));
+
+vi.mock('@services/NativeService', () => ({
+    native: nativeMock,
+}));
+
+vi.mock('@services/NotificationService', () => ({
+    notify: vi.fn(),
+}));
+
+vi.mock('@components/AlertMessage.vue', () => ({
+    default: {
+        name: 'AlertMessageStub',
+        template: '<div />',
+        methods: {
+            success: alertMessageMock.success,
+            error: alertMessageMock.error,
+            warning: alertMessageMock.warning,
+        },
+    },
+}));
+
+vi.mock('@components/AppIcon.vue', () => ({
+    default: {
+        name: 'AppIconStub',
+        props: ['name'],
+        template: '<span data-testid="app-icon" :data-name="name" />',
+    },
+}));
+
+vi.mock('@components/CustomSelect.vue', () => ({
+    default: {
+        name: 'CustomSelectStub',
+        props: ['modelValue', 'options', 'open', 'contentTestId', 'optionTestIdPrefix'],
+        emits: ['update:modelValue', 'update:open'],
+        template: `
+            <div data-testid="custom-select">
+                <slot name="trigger" />
+                <select v-if="!$slots.trigger" data-testid="custom-select-native">
+                    <option>{{ modelValue }}</option>
+                </select>
+                <div v-if="open" :data-testid="contentTestId">
+                    <button
+                        v-for="option in options"
+                        :key="option.value"
+                        type="button"
+                        :data-testid="optionTestIdPrefix ? optionTestIdPrefix + option.value : undefined"
+                        @click="$emit('update:modelValue', option.value)"
+                    >
+                        {{ option.label }}
+                    </button>
+                </div>
+            </div>
+        `,
+    },
+}));
+
+describe('SettingsShortcutsSection', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        setPlatform('Win32');
+        setLocale('zh-CN');
+        nativeMock.shortcut.getShortcutStatus.mockResolvedValue([false, null]);
+        nativeMock.autostart.isAutostartEnabled.mockResolvedValue(false);
+        settingsStoreMock.settings.value = settingsStoreMock.createGeneralSettingsMock(
+            createDefaultSearchKeybindings()
+        );
+    });
+
+    afterEach(() => {
+        setPlatform(originalPlatform);
+        document.body.innerHTML = '';
+    });
+
+    it('renders the shortcuts settings groups in the browser settings layout', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        expect(wrapper.get('h1').text()).toBe('快捷键');
+        expect(wrapper.get('[data-testid="shortcuts-settings-title"]').text()).toBe('快捷键');
+        expect(wrapper.get('.settings-page-header').classes()).toEqual(
+            expect.arrayContaining(['flex', 'items-start', 'gap-4'])
+        );
+        expect(wrapper.get('.settings-section-description').text()).toBe('全局呼出与搜索快捷键');
+        expect(wrapper.find('.settings-page-description').exists()).toBe(false);
+        expect(wrapper.text()).toContain('快捷键');
+        expect(wrapper.text()).toContain('唤起快捷键');
+        expect(wrapper.text()).toContain('全局呼出与搜索快捷键');
+        expect(
+            (
+                wrapper.get('[data-testid="settings-global-shortcut-input"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('Alt+Space');
+        const sections = wrapper.findAll('section');
+        expect(sections).toHaveLength(2);
+        expect(sections[0].classes()).toEqual(expect.arrayContaining(['space-y-4']));
+        expect(sections[1].classes()).toEqual(expect.arrayContaining(['mt-10', 'space-y-4']));
+        expect(wrapper.findAll('.settings-section-title').map((heading) => heading.text())).toEqual(
+            ['全局唤起', '搜索快捷键']
+        );
+
+        expect(wrapper.text()).toContain('全局呼出快捷键');
+        expect(wrapper.text()).not.toContain('Ctrl+Space');
+        expect(wrapper.find('[data-testid="settings-shortcut-suggestions"]').exists()).toBe(false);
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            false
+        );
+        expect(wrapper.text()).toContain(
+            '自定义搜索窗口内的命令型快捷键，不会影响输入导航与全局唤起。'
+        );
+        expect(wrapper.text()).toContain('会话');
+        expect(wrapper.text()).toContain('输入与请求');
+        expect(wrapper.text()).toContain('窗口');
+        expect(wrapper.text()).toContain('打开会话历史');
+        expect(wrapper.text()).toContain('快速打开或收起会话历史列表');
+        expect(wrapper.text()).toContain('开始新会话');
+        expect(wrapper.text()).toContain('切换窗口最大化');
+        expect(wrapper.text()).toContain('切换搜索窗口最大化');
+        expect(wrapper.text()).toContain('打开设置');
+        expect(wrapper.text()).toContain('快速打开设置窗口');
+        expect(
+            (
+                wrapper.get('[data-testid="settings-search-shortcut-input-search.window.maximize"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('F11');
+        expect(
+            (
+                wrapper.get('[data-testid="settings-search-shortcut-input-search.settings.open"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('Ctrl+,');
+        expect(
+            (
+                wrapper.get('[data-testid="settings-search-shortcut-input-search.request.cancel"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('Esc');
+        expect(
+            wrapper
+                .get('[data-testid="settings-search-shortcut-input-search.history.open"]')
+                .classes()
+        ).not.toContain('font-mono');
+        expect(wrapper.text()).not.toContain('启动与窗口');
+        expect(wrapper.text()).not.toContain('界面语言');
+        expect(wrapper.text()).not.toContain('版本更新通道');
+        expect(wrapper.text()).not.toContain('快捷唤起');
+        expect(wrapper.text()).not.toContain('管理全局唤起');
+        expect(wrapper.text()).not.toContain('启动设置');
+        expect(wrapper.text()).not.toContain('支持的修饰键');
+        expect(wrapper.find('[data-testid="settings-brand-accent"]').exists()).toBe(false);
+
+        const controls = wrapper.findAll('[data-testid="settings-general-control"]');
+        expect(controls.length).toBeGreaterThanOrEqual(1);
+
+        const rowLabels = wrapper.findAll('[data-testid="settings-general-row-label"]');
+        expect(rowLabels.length).toBeGreaterThanOrEqual(10);
+    });
+
+    it('opens global shortcut presets from the shortcut field and saves a preset', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            true
+        );
+        expect(
+            wrapper.get('[data-testid="settings-global-shortcut-preset-Alt+Space"]').text()
+        ).toBe('Alt+Space');
+        expect(
+            wrapper.get('[data-testid="settings-global-shortcut-preset-Ctrl+Space"]').text()
+        ).toBe('Ctrl+Space');
+
+        await wrapper
+            .get('[data-testid="settings-global-shortcut-preset-Ctrl+Space"]')
+            .trigger('click');
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
+        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
+        expect((input.element as HTMLInputElement).value).toBe('Ctrl+Space');
+        expect(settingsStoreMock.settings.value.globalShortcut).toBe('Ctrl+Space');
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            false
+        );
+    });
+
+    it('uses macOS shortcut labels and omits input-method-conflicting presets', async () => {
+        setPlatform('MacIntel');
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        expect((input.element as HTMLInputElement).value).toBe('Option+Space');
+
+        await input.trigger('focus');
+        await flushPromises();
+
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            true
+        );
+        expect(
+            wrapper.get('[data-testid="settings-global-shortcut-preset-Option+Space"]').text()
+        ).toBe('Option+Space');
+        expect(
+            wrapper.get('[data-testid="settings-global-shortcut-preset-Option+Shift+Space"]').text()
+        ).toBe('Option+Shift+Space');
+        expect(
+            wrapper.find('[data-testid="settings-global-shortcut-preset-Ctrl+Space"]').exists()
+        ).toBe(false);
+
+        await wrapper
+            .get('[data-testid="settings-global-shortcut-preset-Option+Shift+Space"]')
+            .trigger('click');
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith(
+            'Option+Shift+Space'
+        );
+        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Option+Shift+Space');
+        expect((input.element as HTMLInputElement).value).toBe('Option+Shift+Space');
+    });
+
+    it('blocks macOS system-reserved global shortcuts before registration', async () => {
+        setPlatform('MacIntel');
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        window.dispatchEvent(
+            new KeyboardEvent('keydown', { key: ' ', code: 'Space', metaKey: true })
+        );
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
+        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Option+Space');
+
+        await input.trigger('focus');
+        await flushPromises();
+        window.dispatchEvent(
+            new KeyboardEvent('keydown', { key: ' ', code: 'Space', ctrlKey: true })
+        );
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
+        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Option+Space');
+    });
+
+    it('rejects macOS system-reserved search shortcuts', async () => {
+        setPlatform('MacIntel');
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+        alertMessageMock.error.mockClear();
+
+        window.dispatchEvent(
+            new KeyboardEvent('keydown', { key: ' ', code: 'Space', metaKey: true })
+        );
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+        expect(alertMessageMock.error).toHaveBeenCalledWith(expect.stringContaining('macOS'), 3000);
+        expect((input.element as HTMLInputElement).value).toBe('Cmd+H');
+
+        window.dispatchEvent(
+            new KeyboardEvent('keydown', { key: ' ', code: 'Space', ctrlKey: true })
+        );
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Cmd+H');
+    });
+
+    it('saves the global shortcut immediately after a shortcut is pressed', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.session.new'] = 'Mod+Shift+N';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'n', ctrlKey: true }));
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith('Ctrl+N');
+        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Ctrl+N');
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            false
+        );
+    });
+
+    it('captures Ctrl+Space from the global shortcut input before the preset menu handles Space', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        await input.trigger('keydown', {
+            key: ' ',
+            code: 'Space',
+            ctrlKey: true,
+        });
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
+        expect(settingsStoreMock.updateGlobalShortcut).toHaveBeenCalledWith('Ctrl+Space');
+        expect((input.element as HTMLInputElement).value).toBe('Ctrl+Space');
+        expect(settingsStoreMock.settings.value.globalShortcut).toBe('Ctrl+Space');
+    });
+
+    it('does not capture navigation keys while global shortcut presets are open', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        const event = new KeyboardEvent('keydown', { key: 'ArrowDown', cancelable: true });
+        window.dispatchEvent(event);
+        await flushPromises();
+
+        expect(event.defaultPrevented).toBe(false);
+        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
+        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
+        expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
+            true
+        );
+
+        wrapper.unmount();
+    });
+
+    it('reports invalid global shortcut attempts only once through the capture stack', async () => {
+        const wrapper = mount(GeneralSection, {
+            attachTo: document.body,
+        });
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+        alertMessageMock.warning.mockClear();
+
+        const event = new KeyboardEvent('keydown', {
+            key: 'a',
+            shiftKey: true,
+            bubbles: true,
+            cancelable: true,
+        });
+        input.element.dispatchEvent(event);
+        await flushPromises();
+
+        expect(event.defaultPrevented).toBe(true);
+        expect(alertMessageMock.warning).toHaveBeenCalledTimes(1);
+        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
+        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
+
+        wrapper.unmount();
+    });
+
+    it('does not save a global shortcut that duplicates a search shortcut', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+A';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-global-shortcut-input"]');
+        await input.trigger('focus');
+        await flushPromises();
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'a', ctrlKey: true }));
+        await flushPromises();
+
+        expect(nativeMock.shortcut.registerGlobalShortcut).not.toHaveBeenCalled();
+        expect(settingsStoreMock.updateGlobalShortcut).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Alt+Space');
+    });
+    it('accepts modifierless function keys for configurable search shortcuts', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'F1',
+        });
+    });
+
+    it('captures Windows system key events while editing a search shortcut', async () => {
+        settingsStoreMock.settings.value.globalShortcut = 'Ctrl+Space';
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+
+        await eventService.emit(AppEvent.SHORTCUT_CAPTURE_SYSTEM_KEY, {
+            key: 'Space',
+            alt: true,
+            ctrl: false,
+            shift: false,
+        });
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'Alt+Space',
+        });
+    });
+
+    it('captures a function-row key by keyboard code when the key value is not an F-key', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'BrightnessUp', code: 'F2' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'F2',
+        });
+    });
+
+    it('does not capture navigation keys while editing a search shortcut', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+
+        const event = new KeyboardEvent('keydown', { key: 'ArrowDown', cancelable: true });
+        window.dispatchEvent(event);
+        await flushPromises();
+
+        expect(event.defaultPrevented).toBe(false);
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'F1',
+        });
+    });
+
+    it('keeps search shortcut capture active after a validation failure', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'a', shiftKey: true }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F1' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'F1',
+        });
+    });
+
+    it('captures shifted punctuation shortcuts through their physical key code', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+
+        window.dispatchEvent(
+            new KeyboardEvent('keydown', {
+                key: '+',
+                code: 'Equal',
+                ctrlKey: true,
+                shiftKey: true,
+            })
+        );
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'Mod+Shift+=',
+        });
+        expect((input.element as HTMLInputElement).value).toBe('Ctrl+Shift+=');
+    });
+
+    it('reports unsupported mac command search shortcuts without showing the Windows key warning', async () => {
+        setPlatform('MacIntel');
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get(
+            '[data-testid="settings-search-shortcut-input-search.history.open"]'
+        );
+        await input.trigger('focus');
+        await flushPromises();
+        alertMessageMock.error.mockClear();
+        alertMessageMock.warning.mockClear();
+
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: '@', metaKey: true }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+        expect(alertMessageMock.warning).not.toHaveBeenCalled();
+        expect(alertMessageMock.error).toHaveBeenCalledTimes(1);
+        expect((input.element as HTMLInputElement).value).toBe('Cmd+H');
+
+        wrapper.unmount();
+    });
+
+    it('shows fixed search shortcuts as unsupported for editing', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const input = wrapper.get('[data-testid="settings-search-shortcut-input-search.submit"]');
+        expect(input.attributes('title')).toBe('暂不支持修改该快捷键');
+        expect(input.attributes('tabindex')).toBe('-1');
+
+        await input.trigger('focus');
+        await flushPromises();
+        window.dispatchEvent(new KeyboardEvent('keydown', { key: 'F2' }));
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).not.toHaveBeenCalled();
+        expect((input.element as HTMLInputElement).value).toBe('Enter');
+    });
+
+    it('uses an inline x icon to clear a default search shortcut', async () => {
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        expect(
+            wrapper
+                .find('[data-testid="settings-search-shortcut-reset-search.history.open"]')
+                .exists()
+        ).toBe(false);
+        expect(
+            wrapper
+                .find('[data-testid="settings-search-shortcut-disable-search.history.open"]')
+                .exists()
+        ).toBe(false);
+
+        const action = wrapper.get(
+            '[data-testid="settings-search-shortcut-action-search.history.open"]'
+        );
+        expect(action.attributes('data-shortcut-action')).toBe('clear');
+        expect(action.get('[data-testid="app-icon"]').attributes('data-name')).toBe('x');
+
+        await action.trigger('click');
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': null,
+        });
+    });
+
+    it('uses an inline undo icon to restore non-default search shortcuts', async () => {
+        settingsStoreMock.settings.value.searchKeybindings['search.history.open'] = 'Mod+Shift+H';
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        const action = wrapper.get(
+            '[data-testid="settings-search-shortcut-action-search.history.open"]'
+        );
+        expect(action.attributes('data-shortcut-action')).toBe('restore');
+        expect(action.get('[data-testid="app-icon"]').attributes('data-name')).toBe('undo');
+
+        await action.trigger('click');
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': 'Mod+H',
+        });
+    });
+
+    it('restores the default search shortcut from the cleared state', async () => {
+        const clearedSearchKeybindings = {
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': null,
+        };
+        settingsStoreMock.settings.value.searchKeybindings = clearedSearchKeybindings;
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        expect(
+            (
+                wrapper.get('[data-testid="settings-search-shortcut-input-search.history.open"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('无');
+
+        const action = wrapper.get(
+            '[data-testid="settings-search-shortcut-action-search.history.open"]'
+        );
+        expect(action.attributes('data-shortcut-action')).toBe('restore');
+        expect(action.get('[data-testid="app-icon"]').attributes('data-name')).toBe('undo');
+
+        await action.trigger('click');
+        await flushPromises();
+
+        expect(settingsStoreMock.updateSearchKeybindings).toHaveBeenCalledWith({
+            ...clearedSearchKeybindings,
+            'search.history.open': 'Mod+H',
+        });
+    });
+
+    it('localizes the cleared search shortcut fallback', async () => {
+        setLocale('en-US');
+        settingsStoreMock.settings.value.language = 'en-US';
+        settingsStoreMock.settings.value.searchKeybindings = {
+            ...settingsStoreMock.settings.value.searchKeybindings,
+            'search.history.open': null,
+        };
+
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        expect(
+            (
+                wrapper.get('[data-testid="settings-search-shortcut-input-search.history.open"]')
+                    .element as HTMLInputElement
+            ).value
+        ).toBe('None');
+    });
+
+    it('shows a compact occupied-shortcut indicator inside the fixed-width control area', async () => {
+        nativeMock.shortcut.getShortcutStatus.mockResolvedValueOnce([true, 'occupied']);
+        const wrapper = mount(GeneralSection);
+
+        await flushPromises();
+
+        expect(wrapper.find('[data-testid="settings-shortcut-error"]').exists()).toBe(false);
+        expect(
+            wrapper.get('[data-testid="settings-shortcut-occupied-indicator"]').attributes('title')
+        ).toBe('快捷键注册失败，可能已被其他应用占用');
+        expect(wrapper.find('[data-testid="settings-shortcut-retry-button"]').exists()).toBe(false);
+        expect(wrapper.find('[data-testid="settings-shortcut-cancel-button"]').exists()).toBe(
+            false
+        );
+    });
+});

From fe48ab4a19eb792bc2a09ea92bb70a08fb6c6767 Mon Sep 17 00:00:00 2001
From: velga111 <191950256+velga111@users.noreply.github.com>
Date: Fri, 19 Jun 2026 03:04:40 +0800
Subject: [PATCH 55/55] fix(desktop): align shortcut settings headings

---
 apps/desktop/src/i18n/messages.ts             | 22 +++++++------------
 .../General/SearchShortcutSettings.vue        |  8 +++----
 .../components/Shortcuts/index.vue            | 12 ++--------
 .../SettingsView/shortcutsComponent.test.ts   | 17 ++++++--------
 4 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/apps/desktop/src/i18n/messages.ts b/apps/desktop/src/i18n/messages.ts
index 473ef12a..533dea7f 100644
--- a/apps/desktop/src/i18n/messages.ts
+++ b/apps/desktop/src/i18n/messages.ts
@@ -91,12 +91,9 @@ const zhCNMessages = {
     'settings.general.shortcutSaved': '快捷键保存成功',
     'settings.general.noShortcut': '无',
     'settings.general.globalShortcutGroup': '全局唤起',
-    'settings.general.searchShortcuts': '搜索快捷键',
-    'settings.general.searchShortcutsDescription':
-        '自定义搜索窗口内的命令型快捷键，不会影响输入导航与全局唤起。',
-    'settings.general.searchShortcutGroups.session': '会话',
-    'settings.general.searchShortcutGroups.inputAndRequest': '输入与请求',
-    'settings.general.searchShortcutGroups.window': '窗口',
+    'settings.general.searchShortcutGroups.session': '会话管理',
+    'settings.general.searchShortcutGroups.inputAndRequest': '输入请求',
+    'settings.general.searchShortcutGroups.window': '窗口控制',
     'settings.general.searchActions.history': '打开会话历史',
     'settings.general.searchActions.focusInput': '聚焦输入框',
     'settings.general.searchActions.newSession': '开始新会话',
@@ -217,7 +214,7 @@ const zhCNMessages = {
     'settings.nav.general.label': '通用',
     'settings.nav.general.description': '启动、对话和窗口偏好',
     'settings.nav.shortcuts.label': '快捷键',
-    'settings.nav.shortcuts.description': '全局呼出与搜索快捷键',
+    'settings.nav.shortcuts.description': '全局唤起与窗口命令',
     'settings.nav.aiServices.label': '服务商与模型',
     'settings.nav.aiServices.description': 'Provider、模型、默认模型和密钥',
     'settings.nav.builtInTools.label': '内置工具',
@@ -1066,12 +1063,9 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.general.shortcutSaved': 'Shortcut saved',
     'settings.general.noShortcut': 'None',
     'settings.general.globalShortcutGroup': 'Global activation',
-    'settings.general.searchShortcuts': 'Search shortcuts',
-    'settings.general.searchShortcutsDescription':
-        'Customize command shortcuts inside the search window without changing typing, navigation, or the global activation shortcut.',
-    'settings.general.searchShortcutGroups.session': 'Session',
-    'settings.general.searchShortcutGroups.inputAndRequest': 'Input and request',
-    'settings.general.searchShortcutGroups.window': 'Window',
+    'settings.general.searchShortcutGroups.session': 'Session management',
+    'settings.general.searchShortcutGroups.inputAndRequest': 'Input requests',
+    'settings.general.searchShortcutGroups.window': 'Window control',
     'settings.general.searchActions.history': 'Open session history',
     'settings.general.searchActions.focusInput': 'Focus input',
     'settings.general.searchActions.newSession': 'Start new session',
@@ -1207,7 +1201,7 @@ const enUSMessages: Record<keyof typeof zhCNMessages, string> = {
     'settings.nav.general.label': 'General',
     'settings.nav.general.description': 'Startup, conversation, and window preferences',
     'settings.nav.shortcuts.label': 'Shortcuts',
-    'settings.nav.shortcuts.description': 'Global activation and search shortcuts',
+    'settings.nav.shortcuts.description': 'Global activation and window commands',
     'settings.nav.aiServices.label': 'Providers and models',
     'settings.nav.aiServices.description': 'Providers, models, default model, and keys',
     'settings.nav.builtInTools.label': 'Built-in tools',
diff --git a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
index 312fff39..a4dceaff 100644
--- a/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
+++ b/apps/desktop/src/views/SettingsView/components/General/SearchShortcutSettings.vue
@@ -635,10 +635,10 @@
 <template>
     <AlertMessage ref="alertMessage" />
 
-    <div v-for="group in searchShortcutGroups" :key="group.title" class="space-y-2">
-        <div class="text-[12px] leading-5 font-medium text-neutral-500">
+    <section v-for="group in searchShortcutGroups" :key="group.title" class="space-y-4">
+        <h2 class="settings-section-title">
             {{ group.title }}
-        </div>
+        </h2>
         <div class="settings-row-group divide-y divide-neutral-200/70">
             <div
                 v-for="row in group.rows"
@@ -711,7 +711,7 @@
                 </div>
             </div>
         </div>
-    </div>
+    </section>
 </template>
 
 <style scoped>
diff --git a/apps/desktop/src/views/SettingsView/components/Shortcuts/index.vue b/apps/desktop/src/views/SettingsView/components/Shortcuts/index.vue
index c9ecd819..83cef638 100644
--- a/apps/desktop/src/views/SettingsView/components/Shortcuts/index.vue
+++ b/apps/desktop/src/views/SettingsView/components/Shortcuts/index.vue
@@ -30,17 +30,9 @@
                 <GeneralShortcutSettings />
             </section>
 
-            <section class="mt-10 space-y-4">
-                <div>
-                    <h2 class="settings-section-title">
-                        {{ t('settings.general.searchShortcuts') }}
-                    </h2>
-                    <p class="settings-section-description">
-                        {{ t('settings.general.searchShortcutsDescription') }}
-                    </p>
-                </div>
+            <div class="mt-10 space-y-12">
                 <SearchShortcutSettings />
-            </section>
+            </div>
         </div>
     </div>
 </template>
diff --git a/apps/desktop/tests/views/SettingsView/shortcutsComponent.test.ts b/apps/desktop/tests/views/SettingsView/shortcutsComponent.test.ts
index 83f0c7d7..5bff98b1 100644
--- a/apps/desktop/tests/views/SettingsView/shortcutsComponent.test.ts
+++ b/apps/desktop/tests/views/SettingsView/shortcutsComponent.test.ts
@@ -164,11 +164,11 @@ describe('SettingsShortcutsSection', () => {
         expect(wrapper.get('.settings-page-header').classes()).toEqual(
             expect.arrayContaining(['flex', 'items-start', 'gap-4'])
         );
-        expect(wrapper.get('.settings-section-description').text()).toBe('全局呼出与搜索快捷键');
+        expect(wrapper.get('.settings-section-description').text()).toBe('全局唤起与窗口命令');
         expect(wrapper.find('.settings-page-description').exists()).toBe(false);
         expect(wrapper.text()).toContain('快捷键');
         expect(wrapper.text()).toContain('唤起快捷键');
-        expect(wrapper.text()).toContain('全局呼出与搜索快捷键');
+        expect(wrapper.text()).toContain('全局唤起与窗口命令');
         expect(
             (
                 wrapper.get('[data-testid="settings-global-shortcut-input"]')
@@ -176,11 +176,10 @@ describe('SettingsShortcutsSection', () => {
             ).value
         ).toBe('Alt+Space');
         const sections = wrapper.findAll('section');
-        expect(sections).toHaveLength(2);
-        expect(sections[0].classes()).toEqual(expect.arrayContaining(['space-y-4']));
-        expect(sections[1].classes()).toEqual(expect.arrayContaining(['mt-10', 'space-y-4']));
+        expect(sections).toHaveLength(4);
+        expect(sections.every((section) => section.classes().includes('space-y-4'))).toBe(true);
         expect(wrapper.findAll('.settings-section-title').map((heading) => heading.text())).toEqual(
-            ['全局唤起', '搜索快捷键']
+            ['全局唤起', '会话管理', '输入请求', '窗口控制']
         );
 
         expect(wrapper.text()).toContain('全局呼出快捷键');
@@ -189,12 +188,10 @@ describe('SettingsShortcutsSection', () => {
         expect(wrapper.find('[data-testid="settings-global-shortcut-preset-menu"]').exists()).toBe(
             false
         );
-        expect(wrapper.text()).toContain(
+        expect(wrapper.text()).not.toContain('搜索快捷键');
+        expect(wrapper.text()).not.toContain(
             '自定义搜索窗口内的命令型快捷键，不会影响输入导航与全局唤起。'
         );
-        expect(wrapper.text()).toContain('会话');
-        expect(wrapper.text()).toContain('输入与请求');
-        expect(wrapper.text()).toContain('窗口');
         expect(wrapper.text()).toContain('打开会话历史');
         expect(wrapper.text()).toContain('快速打开或收起会话历史列表');
         expect(wrapper.text()).toContain('开始新会话');