@lobehub/chat 1.103.2 → 1.104.0

package/locales/zh-TW/setting.json

@@ -45,14 +45,25 @@
   },
   "hotkey": {
     "conflicts": "與現有快捷鍵衝突",
+    "errors": {
+      "CONFLICT": "快速鍵衝突：該快速鍵已被其他功能佔用",
+      "INVALID_FORMAT": "快速鍵格式無效：請使用正確的格式（如 CommandOrControl+E）",
+      "INVALID_ID": "無效的快速鍵ID",
+      "NO_MODIFIER": "快速鍵必須包含修飾鍵（Ctrl、Alt、Shift等）",
+      "SYSTEM_OCCUPIED": "快速鍵已被系統或其他應用程式佔用",
+      "UNKNOWN": "更新失敗：未知錯誤"
+    },
     "group": {
       "conversation": "對話",
+      "desktop": "桌面端",
       "essential": "基本"
     },
     "invalidCombination": "快捷鍵需要至少包含一個修飾鍵 (Ctrl, Alt, Shift) 和一個常規鍵",
     "record": "按下按鍵以錄製快捷鍵",
     "reset": "重置為預設快捷鍵",
-    "title": "快速鍵"
+    "title": "快速鍵",
+    "updateError": "快速鍵更新失敗：網路或系統錯誤",
+    "updateSuccess": "快速鍵更新成功"
   },
   "llm": {
     "aesGcm": "您的金鑰與代理地址等將使用 <1>AES-GCM</1> 加密演算法進行加密",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.103.2",
+  "version": "1.104.0",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/packages/electron-client-ipc/src/events/shortcut.ts

@@ -1,4 +1,6 @@
+import { ShortcutUpdateResult } from '../types';
+
 export interface ShortcutDispatchEvents {
   getShortcutsConfig: () => Record<string, string>;
-  updateShortcutConfig: (id: string, accelerator: string) => boolean;
+  updateShortcutConfig: (params: { accelerator: string; id: string }) => ShortcutUpdateResult;
 }

package/packages/electron-client-ipc/src/types/shortcut.ts

@@ -9,3 +9,14 @@ export interface ShortcutConfig {
   id: string;
 }
 export type ShortcutActionType = Record<string, any>;
+
+export interface ShortcutUpdateResult {
+  errorType?:
+    | 'INVALID_ID'
+    | 'INVALID_FORMAT'
+    | 'NO_MODIFIER'
+    | 'CONFLICT'
+    | 'SYSTEM_OCCUPIED'
+    | 'UNKNOWN';
+  success: boolean;
+}

package/src/app/[variants]/(main)/settings/hotkey/features/Conversation.tsx

@@ -9,19 +9,11 @@ import { useTranslation } from 'react-i18next';
 
 import { HOTKEYS_REGISTRATION } from '@/const/hotkeys';
 import { FORM_STYLE } from '@/const/layoutTokens';
-import { isDesktop } from '@/const/version';
 import hotkeyMeta from '@/locales/default/hotkey';
 import { useUserStore } from '@/store/user';
 import { settingsSelectors } from '@/store/user/selectors';
 import { HotkeyGroupEnum, HotkeyItem } from '@/types/hotkey';
 
-const filterByDesktop = (item: HotkeyItem) => {
-  if (isDesktop) return true;
-
-  // is not desktop, filter out desktop only items
-  if (!isDesktop) return !item.isDesktop;
-};
-
 const HotkeySetting = memo(() => {
   const { t } = useTranslation(['setting', 'hotkey']);
   const [form] = Form.useForm();
@@ -61,9 +53,9 @@ const HotkeySetting = memo(() => {
   };
 
   const conversation: FormGroupItemType = {
-    children: HOTKEYS_REGISTRATION.filter((item) => item.group === HotkeyGroupEnum.Conversation)
-      .filter((item) => filterByDesktop(item))
-      .map((item) => mapHotkeyItem(item)),
+    children: HOTKEYS_REGISTRATION.filter(
+      (item) => item.group === HotkeyGroupEnum.Conversation,
+    ).map((item) => mapHotkeyItem(item)),
     extra: loading && <Icon icon={Loader2Icon} size={16} spin style={{ opacity: 0.5 }} />,
     title: t('hotkey.group.conversation'),
   };

package/src/app/[variants]/(main)/settings/hotkey/features/Desktop.tsx

@@ -0,0 +1,92 @@
+'use client';
+
+import { Form, type FormGroupItemType, HotkeyInput, Icon } from '@lobehub/ui';
+import { App, Skeleton } from 'antd';
+import isEqual from 'fast-deep-equal';
+import { Loader2Icon } from 'lucide-react';
+import { memo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { DESKTOP_HOTKEYS_REGISTRATION } from '@/const/hotkeys';
+import { FORM_STYLE } from '@/const/layoutTokens';
+import hotkeyMeta from '@/locales/default/hotkey';
+import { useElectronStore } from '@/store/electron';
+import { desktopHotkeysSelectors } from '@/store/electron/selectors';
+import { DesktopHotkeyItem } from '@/types/hotkey';
+
+const HotkeySetting = memo(() => {
+  const { t } = useTranslation(['setting', 'hotkey']);
+  const [form] = Form.useForm();
+  const { message } = App.useApp();
+
+  const hotkeys = useElectronStore(desktopHotkeysSelectors.hotkeys, isEqual);
+  const [isHotkeysInit, updateDesktopHotkey, useFetchDesktopHotkeys] = useElectronStore((s) => [
+    desktopHotkeysSelectors.isHotkeysInit(s),
+    s.updateDesktopHotkey,
+    s.useFetchDesktopHotkeys,
+  ]);
+
+  useFetchDesktopHotkeys();
+
+  const [loading, setLoading] = useState(false);
+
+  if (!isHotkeysInit) return <Skeleton active paragraph={{ rows: 5 }} title={false} />;
+
+  const mapHotkeyItem = (item: DesktopHotkeyItem) => ({
+    children: (
+      <HotkeyInput
+        disabled={item.nonEditable}
+        onChange={async (value) => {
+          setLoading(true);
+          try {
+            const result = await updateDesktopHotkey(item.id, value);
+            console.log(result);
+            if (result.success) {
+              message.success(t('hotkey.updateSuccess', { ns: 'setting' }));
+            } else {
+              // 根据错误类型显示相应的错误消息
+
+              message.error(t(`hotkey.errors.${result.errorType}` as any, { ns: 'setting' }));
+            }
+          } catch {
+            message.error(t('hotkey.updateError', { ns: 'setting' }));
+          } finally {
+            setLoading(false);
+          }
+        }}
+        placeholder={t('hotkey.record')}
+        resetValue={item.keys}
+        texts={{
+          conflicts: t('hotkey.conflicts'),
+          invalidCombination: t('hotkey.invalidCombination'),
+          reset: t('hotkey.reset'),
+        }}
+        value={hotkeys[item.id]}
+      />
+    ),
+    desc: hotkeyMeta.desktop[item.id]?.desc
+      ? t(`desktop.${item.id}.desc`, { ns: 'hotkey' })
+      : undefined,
+    label: t(`desktop.${item.id}.title`, { ns: 'hotkey' }),
+    name: item.id,
+  });
+
+  const desktop: FormGroupItemType = {
+    children: DESKTOP_HOTKEYS_REGISTRATION.map((item) => mapHotkeyItem(item)),
+    extra: loading && <Icon icon={Loader2Icon} size={16} spin style={{ opacity: 0.5 }} />,
+    title: t('hotkey.group.desktop'),
+  };
+
+  return (
+    <Form
+      form={form}
+      initialValues={hotkeys}
+      items={[desktop]}
+      itemsType={'group'}
+      variant={'borderless'}
+      {...FORM_STYLE}
+    />
+  );
+});
+
+export default HotkeySetting;

package/src/app/[variants]/(main)/settings/hotkey/features/Essential.tsx

@@ -9,19 +9,11 @@ import { useTranslation } from 'react-i18next';
 
 import { HOTKEYS_REGISTRATION } from '@/const/hotkeys';
 import { FORM_STYLE } from '@/const/layoutTokens';
-import { isDesktop } from '@/const/version';
 import hotkeyMeta from '@/locales/default/hotkey';
 import { useUserStore } from '@/store/user';
 import { settingsSelectors } from '@/store/user/selectors';
 import { HotkeyGroupEnum, HotkeyItem } from '@/types/hotkey';
 
-const filterByDesktop = (item: HotkeyItem) => {
-  if (isDesktop) return true;
-
-  // is not desktop, filter out desktop only items
-  if (!isDesktop) return !item.isDesktop;
-};
-
 const HotkeySetting = memo(() => {
   const { t } = useTranslation(['setting', 'hotkey']);
   const [form] = Form.useForm();
@@ -61,9 +53,9 @@ const HotkeySetting = memo(() => {
   };
 
   const essential: FormGroupItemType = {
-    children: HOTKEYS_REGISTRATION.filter((item) => item.group === HotkeyGroupEnum.Essential)
-      .filter((item) => filterByDesktop(item))
-      .map((item) => mapHotkeyItem(item)),
+    children: HOTKEYS_REGISTRATION.filter((item) => item.group === HotkeyGroupEnum.Essential).map(
+      (item) => mapHotkeyItem(item),
+    ),
     extra: loading && <Icon icon={Loader2Icon} size={16} spin style={{ opacity: 0.5 }} />,
     title: t('hotkey.group.essential'),
   };

package/src/app/[variants]/(main)/settings/hotkey/page.tsx

@@ -1,9 +1,11 @@
+import { isDesktop } from '@/const/version';
 import { metadataModule } from '@/server/metadata';
 import { translation } from '@/server/translation';
 import { DynamicLayoutProps } from '@/types/next';
 import { RouteVariants } from '@/utils/server/routeVariants';
 
 import Conversation from './features/Conversation';
+import Desktop from './features/Desktop';
 import Essential from './features/Essential';
 
 export const generateMetadata = async (props: DynamicLayoutProps) => {
@@ -19,6 +21,7 @@ export const generateMetadata = async (props: DynamicLayoutProps) => {
 const Page = () => {
   return (
     <>
+      {isDesktop && <Desktop />}
       <Essential />
       <Conversation />
     </>

package/src/const/desktop.ts

@@ -1 +1,10 @@
+import { DESKTOP_HOTKEYS_REGISTRATION } from '@/const/hotkeys';
+import { DesktopHotkeyConfig } from '@/types/hotkey';
+
 export const DESKTOP_USER_ID = 'DEFAULT_DESKTOP_USER';
+
+export const DEFAULT_DESKTOP_HOTKEY_CONFIG: DesktopHotkeyConfig =
+  DESKTOP_HOTKEYS_REGISTRATION.reduce((acc: DesktopHotkeyConfig, item) => {
+    acc[item.id] = item.keys;
+    return acc;
+  }, {} as DesktopHotkeyConfig);

package/src/const/hotkeys.ts

@@ -1,23 +1,20 @@
 import {
+  DesktopHotkeyEnum,
+  DesktopHotkeyItem,
   HotkeyEnum,
   HotkeyGroupEnum,
-  HotkeyRegistration,
+  HotkeyItem,
   HotkeyScopeEnum,
   KeyEnum,
 } from '@/types/hotkey';
 
 const combineKeys = (keys: string[]) => keys.join('+');
 
+export type HotkeyRegistration = HotkeyItem[];
+
 // mod 在 Mac 上是 command 键，alt 在 Win 上是 ctrl 键
 export const HOTKEYS_REGISTRATION: HotkeyRegistration = [
   // basic
-  {
-    group: HotkeyGroupEnum.Essential,
-    id: HotkeyEnum.ShowApp,
-    keys: combineKeys([KeyEnum.Mod, 'e']),
-    nonEditable: true,
-    scopes: [HotkeyScopeEnum.Global],
-  },
   {
     group: HotkeyGroupEnum.Essential,
     id: HotkeyEnum.Search,
@@ -55,14 +52,6 @@ export const HOTKEYS_REGISTRATION: HotkeyRegistration = [
     keys: combineKeys([KeyEnum.Ctrl, KeyEnum.Shift, KeyEnum.QuestionMark]),
     scopes: [HotkeyScopeEnum.Global],
   },
-  {
-    group: HotkeyGroupEnum.Essential,
-    id: HotkeyEnum.OpenSettings,
-    isDesktop: true,
-    keys: combineKeys([KeyEnum.Mod, KeyEnum.Comma]),
-    nonEditable: true,
-    scopes: [HotkeyScopeEnum.Global],
-  },
   // Chat
   {
     group: HotkeyGroupEnum.Conversation,
@@ -102,3 +91,18 @@ export const HOTKEYS_REGISTRATION: HotkeyRegistration = [
     scopes: [HotkeyScopeEnum.Chat],
   },
 ];
+
+type DesktopHotkeyRegistration = DesktopHotkeyItem[];
+
+// 桌面端快捷键配置
+export const DESKTOP_HOTKEYS_REGISTRATION: DesktopHotkeyRegistration = [
+  {
+    id: DesktopHotkeyEnum.ShowApp,
+    keys: combineKeys([KeyEnum.Ctrl, 'e']),
+  },
+  {
+    id: DesktopHotkeyEnum.OpenSettings,
+    keys: combineKeys([KeyEnum.Mod, KeyEnum.Comma]),
+    nonEditable: true,
+  },
+];

package/src/features/User/UserPanel/useMenu.tsx

@@ -23,7 +23,7 @@ import { Flexbox } from 'react-layout-kit';
 import type { MenuProps } from '@/components/Menu';
 import { enableAuth } from '@/const/auth';
 import { BRANDING_EMAIL, LOBE_CHAT_CLOUD, SOCIAL_URL } from '@/const/branding';
-import { DEFAULT_HOTKEY_CONFIG } from '@/const/settings';
+import { DEFAULT_DESKTOP_HOTKEY_CONFIG } from '@/const/desktop';
 import {
   CHANGELOG,
   DOCUMENTS_REFER_URL,
@@ -85,7 +85,7 @@ export const useMenu = () => {
     {
       extra: isDesktop ? (
         <div>
-          <Hotkey keys={DEFAULT_HOTKEY_CONFIG.openSettings} />
+          <Hotkey keys={DEFAULT_DESKTOP_HOTKEY_CONFIG.openSettings} />
         </div>
       ) : undefined,
       icon: <Icon icon={Settings2} />,

package/src/locales/default/hotkey.ts

@@ -1,6 +1,8 @@
 import { HotkeyI18nTranslations } from '@/types/hotkey';
 
-const hotkey: HotkeyI18nTranslations = {
+const hotkey: HotkeyI18nTranslations & {
+  desktop: Record<string, { desc?: string; title: string }>;
+} = {
   addUserMessage: {
     desc: '将当前输入内容添加为用户消息，但不触发生成',
     title: '添加一条用户消息',
@@ -9,6 +11,16 @@ const hotkey: HotkeyI18nTranslations = {
     desc: '清空当前会话的消息和上传的文件',
     title: '清空会话消息',
   },
+  desktop: {
+    openSettings: {
+      desc: '打开应用设置页面',
+      title: '应用设置',
+    },
+    showApp: {
+      desc: '全局快捷键显示或隐藏主窗口',
+      title: '显示/隐藏主窗口',
+    },
+  },
   editMessage: {
     desc: '通过按住 Alt 并双击消息进入编辑模式',
     title: '编辑消息',
@@ -21,10 +33,6 @@ const hotkey: HotkeyI18nTranslations = {
     desc: '查看所有快捷键的使用说明',
     title: '打开快捷键帮助',
   },
-  openSettings: {
-    desc: '打开应用设置页面',
-    title: '应用设置',
-  },
   regenerateMessage: {
     desc: '重新生成最后一条消息',
     title: '重新生成消息',

package/src/locales/default/setting.ts

@@ -45,14 +45,25 @@ export default {
   },
   hotkey: {
     conflicts: '与现有快捷键冲突',
+    errors: {
+      CONFLICT: '快捷键冲突：该快捷键已被其他功能占用',
+      INVALID_FORMAT: '快捷键格式无效：请使用正确的格式（如 CommandOrControl+E）',
+      INVALID_ID: '无效的快捷键ID',
+      NO_MODIFIER: '快捷键必须包含修饰键（Ctrl、Alt、Shift等）',
+      SYSTEM_OCCUPIED: '快捷键已被系统或其他应用程序占用',
+      UNKNOWN: '更新失败：未知错误',
+    },
     group: {
       conversation: '会话',
+      desktop: '桌面端',
       essential: '基础',
     },
     invalidCombination: '快捷键需要至少包含一个修饰键 (Ctrl, Alt, Shift) 和一个常规键',
     record: '按下按键以录制快捷键',
     reset: '重置为默认快捷键',
     title: '快捷键',
+    updateError: '快捷键更新失败：网络或系统错误',
+    updateSuccess: '快捷键更新成功',
   },
   llm: {
     aesGcm: '您的秘钥与代理地址等将使用 <1>AES-GCM</1> 加密算法进行加密',

package/src/services/electron/settings.ts

@@ -1,4 +1,8 @@
-import { NetworkProxySettings, dispatch } from '@lobechat/electron-client-ipc';
+import {
+  NetworkProxySettings,
+  ShortcutUpdateResult,
+  dispatch,
+} from '@lobechat/electron-client-ipc';
 
 class DesktopSettingsService {
   /**
@@ -15,6 +19,20 @@ class DesktopSettingsService {
     return dispatch('setProxySettings', data);
   };
 
+  /**
+   * 获取桌面热键配置
+   */
+  getDesktopHotkeys = async () => {
+    return dispatch('getShortcutsConfig');
+  };
+
+  /**
+   * 更新桌面热键配置
+   */
+  updateDesktopHotkey = async (id: string, accelerator: string): Promise<ShortcutUpdateResult> => {
+    return dispatch('updateShortcutConfig', { accelerator, id });
+  };
+
   /**
    * 测试代理连接
    */

package/src/store/electron/actions/settings.ts

@@ -1,4 +1,4 @@
-import { NetworkProxySettings } from '@lobechat/electron-client-ipc';
+import { NetworkProxySettings, ShortcutUpdateResult } from '@lobechat/electron-client-ipc';
 import isEqual from 'fast-deep-equal';
 import useSWR, { SWRResponse, mutate } from 'swr';
 import type { StateCreator } from 'zustand/vanilla';
@@ -11,12 +11,16 @@ import type { ElectronStore } from '../store';
  * 设置操作
  */
 export interface ElectronSettingsAction {
+  refreshDesktopHotkeys: () => Promise<void>;
   refreshProxySettings: () => Promise<void>;
   setProxySettings: (params: Partial<NetworkProxySettings>) => Promise<void>;
+  updateDesktopHotkey: (id: string, accelerator: string) => Promise<ShortcutUpdateResult>;
+  useFetchDesktopHotkeys: () => SWRResponse;
   useGetProxySettings: () => SWRResponse;
 }
 
 const ELECTRON_PROXY_SETTINGS_KEY = 'electron:getProxySettings';
+const ELECTRON_DESKTOP_HOTKEYS_KEY = 'electron:getDesktopHotkeys';
 
 export const settingsSlice: StateCreator<
   ElectronStore,
@@ -24,6 +28,10 @@ export const settingsSlice: StateCreator<
   [],
   ElectronSettingsAction
 > = (set, get) => ({
+  refreshDesktopHotkeys: async () => {
+    await mutate(ELECTRON_DESKTOP_HOTKEYS_KEY);
+  },
+
   refreshProxySettings: async () => {
     await mutate(ELECTRON_PROXY_SETTINGS_KEY);
   },
@@ -40,6 +48,39 @@ export const settingsSlice: StateCreator<
     }
   },
 
+  updateDesktopHotkey: async (id, accelerator) => {
+    try {
+      // 更新热键配置
+      const result = await desktopSettingsService.updateDesktopHotkey(id, accelerator);
+
+      // 如果更新成功，刷新状态
+      if (result.success) {
+        await get().refreshDesktopHotkeys();
+      }
+
+      return result;
+    } catch (error) {
+      console.error('桌面热键更新失败:', error);
+      return {
+        errorType: 'UNKNOWN' as const,
+        success: false,
+      };
+    }
+  },
+
+  useFetchDesktopHotkeys: () =>
+    useSWR<Record<string, string>>(
+      ELECTRON_DESKTOP_HOTKEYS_KEY,
+      async () => desktopSettingsService.getDesktopHotkeys(),
+      {
+        onSuccess: (data) => {
+          if (!isEqual(data, get().desktopHotkeys)) {
+            set({ desktopHotkeys: data, isDesktopHotkeysInit: true });
+          }
+        },
+      },
+    ),
+
   useGetProxySettings: () =>
     useSWR<NetworkProxySettings>(
       ELECTRON_PROXY_SETTINGS_KEY,

package/src/store/electron/initialState.ts

@@ -1,4 +1,8 @@
-import { DataSyncConfig, ElectronAppState, NetworkProxySettings } from '@lobechat/electron-client-ipc';
+import {
+  DataSyncConfig,
+  ElectronAppState,
+  NetworkProxySettings,
+} from '@lobechat/electron-client-ipc';
 
 export type RemoteServerError = 'CONFIG_ERROR' | 'AUTH_ERROR' | 'DISCONNECT_ERROR';
 
@@ -14,8 +18,10 @@ export const defaultProxySettings: NetworkProxySettings = {
 export interface ElectronState {
   appState: ElectronAppState;
   dataSyncConfig: DataSyncConfig;
+  desktopHotkeys: Record<string, string>;
   isAppStateInit?: boolean;
   isConnectingServer?: boolean;
+  isDesktopHotkeysInit: boolean;
   isInitRemoteServerConfig: boolean;
   isSyncActive?: boolean;
   proxySettings: NetworkProxySettings;
@@ -25,8 +31,10 @@ export interface ElectronState {
 export const initialState: ElectronState = {
   appState: {},
   dataSyncConfig: { storageMode: 'local' },
+  desktopHotkeys: {},
   isAppStateInit: false,
   isConnectingServer: false,
+  isDesktopHotkeysInit: false,
   isInitRemoteServerConfig: false,
   isSyncActive: false,
   proxySettings: defaultProxySettings,

package/src/store/electron/selectors/__tests__/desktopState.test.ts

@@ -1,14 +1,14 @@
 import { describe, expect, it } from 'vitest';
 
-import { ElectronState, defaultProxySettings } from '@/store/electron/initialState';
+import { ElectronState, defaultProxySettings, initialState } from '@/store/electron/initialState';
+import { merge } from '@/utils/merge';
 
 import { desktopStateSelectors } from '../desktopState';
 
 describe('desktopStateSelectors', () => {
   describe('usePath', () => {
     it('should return userPath from appState', () => {
-      const state: ElectronState = {
-        isAppStateInit: false,
+      const state: ElectronState = merge(initialState, {
         appState: {
           userPath: {
             desktop: '/test/desktop',
@@ -21,12 +21,7 @@ describe('desktopStateSelectors', () => {
             videos: '/test/videos',
           },
         },
-        dataSyncConfig: {
-          storageMode: 'local',
-        },
-        isInitRemoteServerConfig: false,
-        proxySettings: defaultProxySettings,
-      };
+      });
 
       expect(desktopStateSelectors.usePath(state)).toEqual({
         desktop: '/test/desktop',
@@ -41,15 +36,9 @@ describe('desktopStateSelectors', () => {
     });
 
     it('should handle undefined userPath', () => {
-      const state: ElectronState = {
+      const state: ElectronState = merge(initialState, {
         appState: {},
-        isAppStateInit: false,
-        dataSyncConfig: {
-          storageMode: 'local',
-        },
-        isInitRemoteServerConfig: false,
-        proxySettings: defaultProxySettings,
-      };
+      });
 
       expect(desktopStateSelectors.usePath(state)).toBeUndefined();
     });

package/src/store/electron/selectors/hotkey.ts

@@ -0,0 +1,11 @@
+import { DEFAULT_DESKTOP_HOTKEY_CONFIG } from '@/const/desktop';
+import { ElectronState } from '@/store/electron/initialState';
+import { merge } from '@/utils/merge';
+
+const hotkeys = (s: ElectronState) => merge(DEFAULT_DESKTOP_HOTKEY_CONFIG, s.desktopHotkeys);
+const isHotkeysInit = (s: ElectronState) => s.isDesktopHotkeysInit;
+
+export const desktopHotkeysSelectors = {
+  hotkeys,
+  isHotkeysInit,
+};

package/src/store/electron/selectors/index.ts

@@ -1,2 +1,3 @@
 export * from './desktopState';
+export * from './hotkey';
 export * from './sync';

package/src/types/hotkey.ts

@@ -62,7 +62,6 @@ export const HotkeyEnum = {
   EditMessage: 'editMessage',
   OpenChatSettings: 'openChatSettings',
   OpenHotkeyHelper: 'openHotkeyHelper',
-  OpenSettings: 'openSettings',
   RegenerateMessage: 'regenerateMessage',
   SaveTopic: 'saveTopic',
   Search: 'search',
@@ -96,8 +95,6 @@ export interface HotkeyItem {
   // 快捷键分组用于展示
   group: HotkeyGroupId;
   id: HotkeyId;
-  isDesktop?: boolean;
-  // 是否是桌面端专用的快捷键
   keys: string;
   // 是否为不可编辑的快捷键
   nonEditable?: boolean;
@@ -105,7 +102,24 @@ export interface HotkeyItem {
   scopes?: HotkeyScopeId[];
 }
 
-export type HotkeyRegistration = HotkeyItem[];
+// ================== Desktop ================== //
+
+export const DesktopHotkeyEnum = {
+  OpenSettings: 'openSettings',
+  ShowApp: 'showApp',
+};
+
+export type DesktopHotkeyId = (typeof DesktopHotkeyEnum)[keyof typeof DesktopHotkeyEnum];
+
+export interface DesktopHotkeyItem {
+  id: DesktopHotkeyId;
+
+  keys: string;
+  // 是否为不可编辑的快捷键
+  nonEditable?: boolean;
+}
+
+export type DesktopHotkeyConfig = Record<DesktopHotkeyId, string>;
 
 export type HotkeyI18nTranslations = Record<
   HotkeyId,