dsh-vscode-mode 0.1.28 → 0.1.30

package/src/client/styles/editor.css

@@ -243,3 +243,43 @@
 [data-edrv-view] .edrv-side-hint-close { margin-left: auto; border: none; background: transparent; color: var(--dsw-alias-label-tertiary, #9aa5b1); cursor: pointer; font-size: 14px; line-height: 1; padding: 2px 6px; border-radius: 6px; flex-shrink: 0; }
 [data-edrv-view] .edrv-side-hint-close:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); color: var(--dsw-alias-label-primary, #1f2933); }
 
+/* ===== search panel (sidebar, VSCode search view) ===== */
+[data-edrv-view] .edrv-search-panel { display: flex; flex-direction: column; min-height: 0; flex: 1; padding: 6px; gap: 4px; }
+[data-edrv-view] .edrv-search-qrow { display: flex; gap: 4px; }
+[data-edrv-view] .edrv-search-input { flex: 1; min-width: 0; height: 26px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); font-size: 12px; outline: none; }
+[data-edrv-view] .edrv-search-input:focus { border-color: var(--dsw-alias-brand-primary, #4f8cff); }
+[data-edrv-view] .edrv-search-opts { display: flex; align-items: center; gap: 2px; flex: 0 0 auto; }
+[data-edrv-view] .edrv-search-opt { min-width: 24px; height: 22px; padding: 0 6px; border: 1px solid transparent; border-radius: 5px; background: transparent; color: var(--dsw-alias-label-secondary, #52606d); font-size: 11px; font-family: var(--ds-font-family-code, ui-monospace, monospace); cursor: pointer; }
+[data-edrv-view] .edrv-search-opt:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }
+[data-edrv-view] .edrv-search-opt.on { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.14)); color: var(--dsw-alias-label-primary, #1f2933); border-color: var(--dsw-alias-border-l2, #d5dde3); }
+[data-edrv-view] .edrv-search-spacer { flex: 1; }
+[data-edrv-view] .edrv-search-summary { font-size: 11px; color: var(--dsw-alias-label-tertiary, #9aa5b1); padding: 2px 4px; }
+[data-edrv-view] .edrv-search-results { flex: 1; min-height: 0; overflow: auto; font-size: 12px; }
+[data-edrv-view] .edrv-search-group { margin-bottom: 2px; }
+[data-edrv-view] .edrv-search-file { display: flex; align-items: center; gap: 4px; height: 22px; padding: 0 4px; border-radius: 5px; color: var(--dsw-alias-label-primary, #1f2933); cursor: pointer; white-space: nowrap; }
+[data-edrv-view] .edrv-search-file:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }
+[data-edrv-view] .edrv-search-chev { width: 12px; flex-shrink: 0; color: var(--dsw-alias-label-tertiary, #9aa5b1); font-size: 10px; text-align: center; }
+[data-edrv-view] .edrv-search-fname { font-weight: 600; overflow: hidden; text-overflow: ellipsis; }
+[data-edrv-view] .edrv-search-fdir { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; color: var(--dsw-alias-label-tertiary, #9aa5b1); font-size: 11px; }
+[data-edrv-view] .edrv-search-fcount { flex-shrink: 0; min-width: 16px; height: 15px; padding: 0 4px; border-radius: 999px; background: var(--dsw-alias-bg-layer-2, #f0f4f4); color: var(--dsw-alias-label-secondary, #52606d); font-size: 10px; line-height: 15px; text-align: center; }
+[data-edrv-view] .edrv-search-line { display: flex; gap: 6px; padding: 1px 4px 1px 16px; border-radius: 4px; color: var(--dsw-alias-label-primary, #1f2933); cursor: pointer; overflow: hidden; }
+[data-edrv-view] .edrv-search-line.alt { background: var(--dsw-alias-bg-layer-1, #ffffff); }
+[data-edrv-view] .edrv-search-line:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }
+[data-edrv-view] .edrv-search-ln { flex-shrink: 0; color: var(--dsw-alias-label-tertiary, #9aa5b1); font-size: 11px; min-width: 26px; text-align: right; user-select: none; }
+[data-edrv-view] .edrv-search-text { overflow: hidden; text-overflow: ellipsis; white-space: pre; font-family: var(--ds-font-family-code, ui-monospace, monospace); font-size: 11px; }
+[data-edrv-view] .edrv-search-hit { background: var(--dsw-alias-state-warn-primary, #e5b93f); color: #1f2933; border-radius: 2px; padding: 0 1px; }
+[data-edrv-view] .edrv-search-empty { padding: 8px 4px; font-size: 12px; color: var(--dsw-alias-label-tertiary, #9aa5b1); }
+[data-edrv-view] .edrv-search-error { padding: 6px 8px; border: 1px solid rgba(217,83,79,.4); border-radius: 6px; background: #fdeaea; color: var(--dsw-alias-state-error-primary, #d9534f); font-size: 11px; }
+
+/* include/exclude filter rows (collapsible) */
+[data-edrv-view] .edrv-search-rows { display: flex; flex-direction: column; gap: 4px; padding: 2px 0 4px; }
+[data-edrv-view] .edrv-search-row { display: flex; align-items: center; gap: 4px; }
+[data-edrv-view] .edrv-search-field { flex: 1; min-width: 0; height: 24px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); font-size: 11px; outline: none; }
+[data-edrv-view] .edrv-search-field:focus { border-color: var(--dsw-alias-brand-primary, #4f8cff); }
+[data-edrv-view] .edrv-search-field.dim { opacity: .45; }
+[data-edrv-view] .edrv-search-field::placeholder { color: var(--dsw-alias-label-tertiary, #9aa5b1); }
+[data-edrv-view] .edrv-search-toggle { min-width: 24px; height: 24px; padding: 0 5px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: transparent; color: var(--dsw-alias-label-secondary, #52606d); font-size: 12px; line-height: 1; cursor: pointer; flex-shrink: 0; }
+[data-edrv-view] .edrv-search-toggle:hover:not(:disabled) { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }
+[data-edrv-view] .edrv-search-toggle.on { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.14)); color: var(--dsw-alias-label-primary, #1f2933); border-color: var(--dsw-alias-brand-primary, #0f9d58); }
+[data-edrv-view] .edrv-search-toggle:disabled { opacity: .4; cursor: default; }
+

package/src/client/styles/mcp.css

@@ -110,3 +110,21 @@
 .vsm-general-row button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover,#ffffff14)}
 .vsm-general-row button:disabled{opacity:.55;cursor:default}
 .vsm-general-row button.vsm-devform-close{color:var(--dsw-alias-state-error-primary,#f07878);border-color:var(--dsw-alias-state-error-secondary,#d9534f55)}
+
+/* keyboard shortcuts page */
+.vsm-kb-list{display:flex;flex-direction:column;gap:6px;margin-top:8px}
+.vsm-kb-row{display:flex;align-items:center;gap:10px;padding:8px 10px;border:1px solid var(--dsw-alias-border-l2,#555);border-radius:8px;background:var(--dsw-alias-bg-layer-1,#161616)}
+.vsm-kb-row.rec{border-color:var(--dsw-alias-brand-primary,#4f8cff)}
+.vsm-kb-label{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px;color:var(--dsw-alias-label-primary,#eee);font-size:13px}
+.vsm-kb-warn{color:var(--dsw-alias-state-warn-primary,#e5b93f);font-size:11px}
+.vsm-kb-key{min-width:96px;text-align:center;padding:3px 10px;border:1px solid var(--dsw-alias-border-l2,#555);border-radius:6px;background:var(--dsw-alias-bg-base,#111);color:var(--dsw-alias-label-primary,#eee);font-size:12px;font-family:var(--ds-font-family-code,ui-monospace,monospace)}
+.vsm-kb-key.warn{border-color:var(--dsw-alias-state-warn-primary,#e5b93f);color:var(--dsw-alias-state-warn-primary,#e5b93f)}
+.vsm-kb-key.invalid{border-color:var(--dsw-alias-state-error-primary,#d9534f);color:var(--dsw-alias-state-error-primary,#d9534f)}
+.vsm-kb-rec{font-size:12px;color:var(--dsw-alias-label-secondary,#9aa5b1)}
+.vsm-kb-actions{display:flex;gap:6px}
+.vsm-kb-actions button{border:1px solid var(--dsw-alias-border-l2,#555);border-radius:6px;padding:4px 10px;background:none;color:var(--dsw-alias-label-primary,#eee);cursor:pointer;font-size:12px;white-space:nowrap}
+.vsm-kb-actions button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover,#ffffff14)}
+.vsm-kb-actions button:disabled{opacity:.55;cursor:default}
+.vsm-kb-actionsbar{display:flex;align-items:center;gap:10px;margin-top:12px}
+.vsm-kb-dirty{flex:1;font-size:12px;color:var(--dsw-alias-state-warn-primary,#e5b93f)}
+.vsm-kb-message{font-size:12px;color:var(--dsw-alias-brand-primary,#4f8cff);margin-top:8px}

package/src/client/ui/EditorView.ts

@@ -21,6 +21,7 @@ import { editorHeight } from '../editorLayout.js'
 import { revealInExplorer as revealPathInExplorer } from '../fileReveal.js'
 import { setSidePending, SIDEBAR_INSTALL_CMD } from '../sidebarBridge.js'
 import { upsertViewState, viewStatesLoad, viewStatesSave } from '../state/viewStateCache.js'
+import { bindingOf, chordOf, matchEvent, useKeybindingsVersion } from '../keybindings.js'
 
 /**
  * 中央编辑区：文件页签（脏点/关闭/打开路径）+ Ctrl+P 搜索 + Monaco 编辑器 +
@@ -61,6 +62,7 @@ export function EditorView(props) {
   const [sidebarW, setSidebarW] = React.useState(240) // 侧边栏宽度
   const [activePanel, setActivePanel] = React.useState('explorer') // 激活面板 id
   const [focusRequest, setFocusRequest] = React.useState(0) // 外部差异聚焦请求版本
+  const kbVersion = useKeybindingsVersion() // 快捷键配置版本（tooltip 文案随键位刷新）
   const [hintDismissed, setHintDismissed] = React.useState(() => {
     try { return localStorage.getItem('edrv.side-hint-dismissed') === '1' } catch { return false }
   }) // 侧边栏引导条是否已关闭
@@ -85,6 +87,7 @@ export function EditorView(props) {
   const hoverPanelRef = React.useRef(false) // 鼠标是否已进入 Keep/Undo 浮层
   const batchBusyRef = React.useRef(false) // 批量 Keep All/Undo All 防重入
   const menuHandlersRef = React.useRef(null) // 右键菜单动作的最新闭包（Monaco addAction 空依赖回调读取）
+  const doSaveRef = React.useRef(null) // 保存动作的最新闭包（窗口级保存监听读取）
   const diffRendererRef = React.useRef(null)
   const layoutRef = React.useRef(layout) // ensureEditor 空依赖闭包读取的稳定布局
   layoutRef.current = layout
@@ -392,13 +395,38 @@ export function EditorView(props) {
     catch (e) { /* 忽略 */ }
   }, [sidebarOn, sidebarW, activePanel, sessionId, sidebarKey])
 
-  // Ctrl+B 切换侧边栏（capture 抢占，避免与 DSH 全局冲突）
+  // 切换侧边栏（capture 抢占，避免与 DSH 全局冲突；键位随快捷键配置）
   React.useEffect(() => {
     const onKey = (e) => {
-      if ((e.ctrlKey || e.metaKey) && String(e.key).toLowerCase() === 'b') {
-        e.preventDefault(); e.stopPropagation()
-        setSidebarOn((v) => !v)
-      }
+      if (!matchEvent(e, bindingOf('edrv.toggleSidebar'))) return
+      e.preventDefault(); e.stopPropagation()
+      setSidebarOn((v) => !v)
+    }
+    window.addEventListener('keydown', onKey, true)
+    return () => window.removeEventListener('keydown', onKey, true)
+  }, [])
+
+  // 保存文件（窗口级）：编辑器有活动模型才拦截执行，无文件时放行（浏览器默认行为）
+  React.useEffect(() => {
+    const onKey = (e) => {
+      if (!matchEvent(e, bindingOf('edrv.save'))) return
+      if (!editorRef.current?.getModel?.()) return
+      e.preventDefault(); e.stopPropagation()
+      flushSave()
+      doSaveRef.current(false)
+    }
+    window.addEventListener('keydown', onKey, true)
+    return () => window.removeEventListener('keydown', onKey, true)
+  }, [])
+
+  // Ctrl+Shift+F 全局搜索：展开侧边栏 + 激活搜索页签，随后聚焦搜索输入框
+  React.useEffect(() => {
+    const onKey = (e) => {
+      if (!matchEvent(e, bindingOf('edrv.searchInFiles'))) return
+      e.preventDefault(); e.stopPropagation()
+      setSidebarOn(true)
+      setActivePanel('search')
+      setTimeout(() => window.dispatchEvent(new CustomEvent('edrv:search-focus')), 0)
     }
     window.addEventListener('keydown', onKey, true)
     return () => window.removeEventListener('keydown', onKey, true)
@@ -482,6 +510,7 @@ export function EditorView(props) {
       } else { setStatus('保存失败'); setError(res?.error ? String(res.error) : '保存失败') }
     }).catch((e) => { setStatus('保存失败'); setError('保存异常:' + String(e)) })
   }
+  doSaveRef.current = doSave
 
   const onEdit = () => {
     const ed = editorRef.current
@@ -551,7 +580,7 @@ export function EditorView(props) {
       cursorBlinking: 'smooth',
       padding: { top: side ? 6 : 8 },
     })
-    ed.addCommand(m.KeyMod.CtrlCmd | m.KeyCode.KeyS, () => { flushSave(); doSave(false) })
+    // 保存改由窗口级快捷键监听执行（键位可配置；见上方 edrv.save 监听）
     ed.onDidChangeModelContent(() => {
       if (!ed.getModel() || programmaticRef.current) return
       onEdit()
@@ -634,13 +663,22 @@ export function EditorView(props) {
     editorRef.current = ed
   }, [])
 
-  // 打开文件后的差异聚焦跳转（内容/差异就绪后执行一次）
+  // 打开文件后的跳转（差异聚焦/搜索行列跳转，内容就绪后执行一次）
   React.useEffect(() => {
     const pf = pendingFocusRef.current
     if (!pf || pf.path !== active || content === null) return
-    const target = pf.region || pendingRegions[0]
     const ed = editorRef.current
-    if (!target || !ed) return
+    if (!ed) return
+    if (pf.line != null) {
+      // 搜索命中跳转：直接定位到行/列（不依赖差异区域）
+      pendingFocusRef.current = null
+      ed.revealLineInCenter(Math.max(1, pf.line))
+      ed.setPosition({ lineNumber: Math.max(1, pf.line), column: Math.max(1, pf.column ?? 1) })
+      ed.focus()
+      return
+    }
+    const target = pf.region || pendingRegions[0]
+    if (!target) return
     pendingFocusRef.current = null
     ed.revealLineInCenter(Math.max(1, target.start ?? 1))
     ed.setPosition({ lineNumber: Math.max(1, target.start ?? 1), column: 1 })
@@ -757,7 +795,9 @@ export function EditorView(props) {
           fail++
         }
       }
-      setRecords((prev) => Object.assign({}, prev, next))
+      // 合并结果无变化（批量全部失败/重复点击）时不 setRecords：避免 records 换引用
+      // → pendingRegions 换引用 → diff 全量重渲染（内容相同，纯空转）
+      if (Object.keys(next).length) setRecords((prev) => Object.assign({}, prev, next))
       return { ok, fail }
     }).catch((e) => {
       setError('批量处理异常:' + String(e))
@@ -775,20 +815,26 @@ export function EditorView(props) {
   const itemOf = (r, reject) => ({ callId: r.callId, scope: r.create ? 'call' : 'hunk', hunkIndex: r.idx, decision: reject ? 'rejected' : 'accepted' })
 
   const acceptFile = () => {
+    if (batchBusyRef.current || !pendingRegions.length) return
+    batchBusyRef.current = true
     actMany(pendingRegions.map((r) => itemOf(r, false))).then(({ ok, fail }) => {
+      batchBusyRef.current = false
       reloadFile(true)
       emitRefresh()
       setStatus('已采纳 ' + ok + ' 处差异' + (fail ? '，' + fail + ' 处失败' : ''))
       if (fail) setError(fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
-    })
+    }).catch(() => { batchBusyRef.current = false })
   }
   const undoFile = () => {
+    if (batchBusyRef.current || !pendingRegions.length) return
+    batchBusyRef.current = true
     actMany([...pendingRegions].reverse().map((r) => itemOf(r, true))).then(({ ok, fail }) => {
+      batchBusyRef.current = false
       reloadFile(true)
       emitRefresh()
       setStatus('已不采纳 ' + ok + ' 处差异' + (fail ? '，' + fail + ' 处失败' : ''))
       if (fail) setError(fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
-    })
+    }).catch(() => { batchBusyRef.current = false })
   }
 
   // 所有差异文件的待处理 hunk 列表（二级菜单 Keep All / Undo All 用）
@@ -883,6 +929,20 @@ export function EditorView(props) {
     if (focusDiff) pendingFocusRef.current = { path, region: null }
   }
 
+  /**
+   * 打开文件并跳转到指定行列（搜索面板命中跳转）。
+   * @author ddj 2026年08月26号
+   * @param path 文件路径
+   * @param line 目标行（缺省仅打开不跳转）
+   * @param column 目标列（缺省 1）
+   */
+  const openFileAt = (path, line, column) => {
+    if (!path) return
+    addTab(path, true)
+    pendingFocusRef.current = { path, region: null, line: line ?? null, column: column ?? 1 }
+    setFocusRequest((value) => value + 1)
+  }
+
   const openPath = () => {
     const p = (pathDraft || '').trim()
     if (!p) return
@@ -916,7 +976,7 @@ export function EditorView(props) {
 
   const pathBar = React.createElement('div', { className: 'edrv-pathbar', title: active || '' },
     React.createElement('span', { className: 'edrv-pb-name' }, active ? String(active).split(/[\\/]/).pop() : '未打开文件'),
-    React.createElement('span', { className: 'edrv-pb-full' }, active || '使用右上搜索框 (Ctrl+P) 打开文件'),
+    React.createElement('span', { className: 'edrv-pb-full' }, active || '使用右上搜索框 (' + (chordOf('edrv.quickOpen') ?? 'Ctrl+P') + ') 打开文件'),
     (active && langOf(active) ? React.createElement('span', { className: 'edrv-pb-meta' }, langOf(active)) : null),
     (cursor ? React.createElement('span', { className: 'edrv-pb-meta' }, cursor) : null),
     (status ? React.createElement('span', { className: 'edrv-pb-meta edrv-pb-status' }, status) : null))
@@ -926,7 +986,7 @@ export function EditorView(props) {
     (sum.totalFiles > 0
       ? React.createElement('button', { className: 'edrv-diffchip', title: '打开差异总览/归档', onClick: () => setLauncherOpen((o) => !o) }, '⚠ 差异 ' + sum.totalFiles + ' 文件')
       : null),
-    React.createElement('button', { className: 'edrv-chip-btn' + (sidebarOn ? ' edrv-chip-on' : ''), title: '切换侧边栏 (Ctrl+B)', onClick: () => setSidebarOn((v) => !v) }, '☰'),
+    React.createElement('button', { className: 'edrv-chip-btn' + (sidebarOn ? ' edrv-chip-on' : ''), title: '切换侧边栏 (' + (chordOf('edrv.toggleSidebar') ?? 'Ctrl+B') + ')', onClick: () => setSidebarOn((v) => !v) }, '☰'),
     React.createElement('button', { className: 'edrv-chip-btn', title: '刷新', onClick: reloadFile }, '⟳'),
     React.createElement(QuickOpen, { sessionId, onOpen: (p) => openFile(p, false) }))
 
@@ -964,7 +1024,7 @@ export function EditorView(props) {
   } else if (!active) {
     body = React.createElement('div', { className: 'edrv-empty' },
       React.createElement('div', null, '暂无打开的文件'),
-      React.createElement('div', { style: { fontSize: 12 } }, '使用右上搜索框 (Ctrl+P) 打开工作区文件；agent 修改文件后顶部会出现差异角标'))
+      React.createElement('div', { style: { fontSize: 12 } }, '使用右上搜索框 (' + (chordOf('edrv.quickOpen') ?? 'Ctrl+P') + ') 打开工作区文件；agent 修改文件后顶部会出现差异角标'))
   } else if (content === null && loadError) {
     body = loadingBody('文件加载失败：' + loadError, 0, () => {
       setLoadError(null)
@@ -1073,6 +1133,7 @@ export function EditorView(props) {
   const sidebarCtx = {
     sessionId,
     openFile: (p) => openFile(p, false),
+    openFileAt,
     activePath: active,
     pendingByPath,
     sum: { totalFiles: sum.totalFiles, files: sum.files },

package/src/client/ui/KeybindingsPanel.ts

@@ -0,0 +1,187 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — VSCodeMode 设置区「快捷键」管理页。
+ * 命令目录来自 client/keybindings 的 COMMANDS；当前键位读 SettingsContext scope；
+ * 编辑：行内录制（捕获下一次组合键），Esc 取消、Backspace/Delete 清空（未绑定）；
+ * 草稿 + 显式保存（scope.set('keybindings', draft)）；行级恢复 + 页级「恢复默认」；
+ * 冲突键位（两命令同键位）标红警告；scope 外部变更且无未保存修改时回同步草稿。
+ * 作者 ddj 2026-08-26
+ */
+import React from 'react'
+import { SettingsContext } from '../settingsContext.js'
+import { COMMANDS, chordFromEvent, parseChord } from '../keybindings.js'
+import { defaultKeybindings, KEYBINDING_DEFAULTS, normalizeKeybindings } from '../../shared/keybindings.js'
+
+/**
+ * 草稿化：默认值 + 设置值合并，空串归一为 null（未绑定）。
+ * @param raw 设置 scope 的 keybindings 字段
+ * @returns 草稿映射（id → 键位弦或 null）
+ */
+export function draftOf(raw) {
+  const merged = { ...defaultKeybindings(), ...normalizeKeybindings(raw) }
+  const out = {}
+  for (const [id, chord] of Object.entries(merged)) out[id] = chord === '' ? null : chord
+  return out
+}
+
+/**
+ * 存库化：null（未绑定）转空串。
+ * @param draft 草稿映射
+ * @returns 可存储的键位映射
+ */
+export function storeOf(draft) {
+  const out = {}
+  for (const [id, chord] of Object.entries(draft)) out[id] = chord === null ? '' : chord
+  return out
+}
+
+/**
+ * 冲突检测：同一键位被多个命令占用 → 返回冲突命令 id 集合。
+ * @param draft 草稿映射
+ * @returns 冲突命令 id 集合
+ */
+export function conflictsOf(draft) {
+  const byChord = new Map()
+  for (const [id, chord] of Object.entries(draft)) {
+    if (!chord) continue
+    const list = byChord.get(chord) ?? []
+    list.push(id)
+    byChord.set(chord, list)
+  }
+  const out = new Set()
+  for (const list of byChord.values()) {
+    if (list.length > 1) for (const id of list) out.add(id)
+  }
+  return out
+}
+
+/**
+ * 快捷键管理页主体。
+ */
+export function KeybindingsPanel() {
+  const settings = React.useContext(SettingsContext)
+  const snapshot = settings?.getSnapshot?.()
+  const unavailable = !settings || snapshot?.status === 'unavailable'
+  const notReady = snapshot?.status !== 'ready'
+  const [draft, setDraft] = React.useState(() => draftOf(snapshot?.value?.keybindings))
+  const [recording, setRecording] = React.useState(null) // 正在录制的命令 id
+  const [dirty, setDirty] = React.useState(false)
+  const [busy, setBusy] = React.useState(false)
+  const [error, setError] = React.useState('')
+  const [message, setMessage] = React.useState('')
+  const dirtyRef = React.useRef(false)
+  dirtyRef.current = dirty
+  const lastKeyRef = React.useRef(JSON.stringify(draft)) // 草稿内容指纹（内容未变不 setState，防外部快照引用不稳导致循环）
+  const snapshotValue = snapshot?.value?.keybindings
+
+  // scope 外部变更（如重置/其他端写入）且无未保存修改时回同步草稿
+  React.useEffect(() => {
+    if (dirtyRef.current) return
+    const next = draftOf(snapshotValue)
+    const key = JSON.stringify(next)
+    if (key === lastKeyRef.current) return
+    lastKeyRef.current = key
+    setDraft(next)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [snapshotValue])
+
+  // 录制态：窗口捕获下一次组合键（preventDefault 防浏览器默认动作）
+  React.useEffect(() => {
+    if (!recording) return
+    const onKey = (e) => {
+      e.preventDefault()
+      e.stopPropagation()
+      if (e.key === 'Escape') { setRecording(null); return }
+      if (e.key === 'Backspace' || e.key === 'Delete') {
+        setDraft((prev) => Object.assign({}, prev, { [recording]: null }))
+        setRecording(null)
+        setDirty(true)
+        return
+      }
+      const chord = chordFromEvent(e)
+      if (!chord) return
+      setDraft((prev) => Object.assign({}, prev, { [recording]: chord }))
+      setRecording(null)
+      setDirty(true)
+    }
+    window.addEventListener('keydown', onKey, true)
+    return () => window.removeEventListener('keydown', onKey, true)
+  }, [recording])
+
+  const conflicts = conflictsOf(draft)
+  const save = () => {
+    if (!settings?.set) { setError('设置服务不可用'); return }
+    setBusy(true)
+    setError('')
+    setMessage('')
+    settings.set('keybindings', storeOf(draft)).then(() => {
+      setDirty(false)
+      lastKeyRef.current = JSON.stringify(draft)
+      setMessage('已保存')
+    }).catch((e) => setError(String(e))).finally(() => setBusy(false))
+  }
+
+  /**
+   * 恢复全部默认（确认后直接保存，一步到位）。
+   */
+  const resetAll = () => {
+    if (!settings?.set) { setError('设置服务不可用'); return }
+    if (!window.confirm('恢复全部快捷键为默认值？')) return
+    setBusy(true)
+    setError('')
+    setMessage('')
+    settings.set('keybindings', { ...defaultKeybindings() }).then(() => {
+      const next = draftOf({})
+      setDraft(next)
+      lastKeyRef.current = JSON.stringify(next)
+      setDirty(false)
+      setMessage('已恢复默认')
+    }).catch((e) => setError(String(e))).finally(() => setBusy(false))
+  }
+
+  /** 行级恢复该项默认值（进草稿，随保存提交）。 */
+  const resetRow = (id) => {
+    setDraft((prev) => Object.assign({}, prev, { [id]: KEYBINDING_DEFAULTS[id] ?? null }))
+    setDirty(true)
+  }
+
+  const rows = COMMANDS.map((command) => {
+    const chord = draft[command.id] ?? null
+    const conflict = chord !== null && conflicts.has(command.id)
+    const invalid = chord !== null && parseChord(chord) === null
+    const recordingRow = recording === command.id
+    let display
+    if (recordingRow) {
+      display = React.createElement('span', { className: 'vsm-kb-rec' }, '按下组合键…（Esc 取消 / Backspace 清除）')
+    } else {
+      display = React.createElement('kbd', { className: 'vsm-kb-key' + (conflict ? ' warn' : '') + (invalid ? ' invalid' : '') },
+        chord ?? '未绑定')
+    }
+    return React.createElement('div', { key: command.id, className: 'vsm-kb-row' + (recordingRow ? ' rec' : '') },
+      React.createElement('div', { className: 'vsm-kb-label' },
+        React.createElement('span', null, command.label),
+        conflict && React.createElement('small', { className: 'vsm-kb-warn' }, '与另一命令冲突'),
+        invalid && React.createElement('small', { className: 'vsm-kb-warn' }, '键位格式无效')),
+      display,
+      React.createElement('div', { className: 'vsm-kb-actions' },
+        recordingRow
+          ? React.createElement('button', { onClick: () => setRecording(null) }, '取消')
+          : React.createElement(React.Fragment, null,
+              React.createElement('button', { disabled: unavailable || notReady || busy || snapshot?.writable === false, onClick: () => { setRecording(command.id); setMessage('') } }, '编辑'),
+              React.createElement('button', { disabled: busy, onClick: () => resetRow(command.id) }, '恢复')),
+      ))
+  })
+
+  return React.createElement('section', { className: 'vsm-general-page' },
+    React.createElement('h2', null, '快捷键'),
+    React.createElement('p', null, '配置编辑器视图的快捷键（保存 / 快速打开 / 侧边栏 / 搜索）。修改即时写入配置，重新聚焦编辑器后生效。'),
+    unavailable && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, '设置服务暂不可用，当前使用默认键位。'),
+    error && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, error),
+    message && React.createElement('div', { className: 'vsm-kb-message' }, message),
+    React.createElement('div', { className: 'vsm-kb-list' }, rows),
+    React.createElement('div', { className: 'vsm-kb-actionsbar' },
+      React.createElement('span', { className: 'vsm-kb-dirty' }, dirty ? '有未保存的修改' : ''),
+      React.createElement('button', { className: 'vsm-primary vsm-small', disabled: unavailable || notReady || busy || snapshot?.writable === false || !dirty, onClick: save }, busy ? '保存中…' : '保存'),
+      React.createElement('button', { className: 'vsm-small', disabled: unavailable || notReady || busy || snapshot?.writable === false, onClick: resetAll }, '恢复默认')),
+  )
+}

package/src/client/ui/McpSettings.ts

@@ -1,8 +1,9 @@
 // @ts-nocheck
 /**
- * dsh-vscode-mode client — VSCodeMode 设置区内的 MCP 管理。
- * 子 Tab：我的 MCP（profile 全局）/ 项目 MCP（各项目 .mcp.json）/ MCP 市场（占位）。
- * 作者 ddj 2026年08月22号
+ * dsh-vscode-mode client — VSCodeMode 设置区：通用 / 快捷键 / MCP 管理。
+ * 子 Tab：通用（文件打开工具/开发形态）/ 快捷键（编辑器键位配置，可重置）/
+ * 我的 MCP（profile 全局）/ 项目 MCP（各项目 .mcp.json）/ MCP 市场（占位）/ 兼容性。
+ * 作者 ddj 2026年08月22号 / 2026年08月26号
  */
 import React from 'react'
 import { rpc } from '../rpc.js'
@@ -10,6 +11,7 @@ import type { MpcProject, MpcServer } from '../../shared/mcp.js'
 import '../styles/mcp.css'
 import { availableOpeners, AUTO_OPEN_TOOL } from '../fileOpeners.js'
 import { SettingsContext } from '../settingsContext.js'
+import { KeybindingsPanel } from './KeybindingsPanel.js'
 
 const EMPTY = { serverName: '', transport: 'stdio', command: '', args: '', cwd: '', url: '', headers: '' }
 
@@ -315,6 +317,7 @@ export function McpSettings(props) {
   let body
   if (loading) body = React.createElement('div', { className: 'vsm-mcp-empty' }, '正在读取 MCP 服务…')
   else if (tab === 'general') body = React.createElement(GeneralSettings, { registry: openerRegistry })
+  else if (tab === 'keys') body = React.createElement(KeybindingsPanel, null)
   else if (tab === 'mine') body = React.createElement('div', null, servers.length ? servers.map((s) => React.createElement(ServerCard, { key: s.id, server: s, onRefresh: refreshGlobal, onToggle: toggleGlobal, onRemove: removeGlobal })) : React.createElement('div', { className: 'vsm-mcp-empty' }, '还没有配置全局 MCP'))
   else if (tab === 'projects') body = projectBody
   else if (tab === 'compat') body = React.createElement(CompatSection, { getSummary: compatSummary })
@@ -322,7 +325,7 @@ export function McpSettings(props) {
   const form = showForm ? React.createElement(McpForm, { title: '添加全局 MCP', draft, busy, edit, save: saveGlobal, close: () => setShowForm(false) }) : projectForm ? React.createElement(McpForm, { title: '添加项目 MCP · ' + projectForm.title, draft, busy, edit, save: saveProject, close: () => setProjectForm(null) }) : null
   return React.createElement('section', { className: 'vsm-mcp-page' },
     React.createElement('header', { className: 'vsm-mcp-header' }, React.createElement('div', null, React.createElement('h2', null, 'VSCodeMode'), React.createElement('p', null, '管理当前 profile 与各项目的 Model Context Protocol 服务。')), React.createElement('button', { className: 'vsm-primary', onClick: () => { setDraft(EMPTY); setShowForm(true) } }, '+ 添加全局 MCP')),
-    React.createElement('nav', { className: 'vsm-mcp-tabs' }, React.createElement('button', { className: tab === 'general' ? 'active' : '', onClick: () => setTab('general') }, '通用'), React.createElement('button', { className: tab === 'mine' ? 'active' : '', onClick: () => setTab('mine') }, '我的 MCP'), React.createElement('button', { className: tab === 'projects' ? 'active' : '', onClick: () => setTab('projects') }, '项目 MCP'), React.createElement('button', { className: tab === 'market' ? 'active' : '', onClick: () => setTab('market') }, 'MCP 市场'), React.createElement('button', { className: tab === 'compat' ? 'active' : '', onClick: () => setTab('compat') }, '兼容性')),
+    React.createElement('nav', { className: 'vsm-mcp-tabs' }, React.createElement('button', { className: tab === 'general' ? 'active' : '', onClick: () => setTab('general') }, '通用'), React.createElement('button', { className: tab === 'keys' ? 'active' : '', onClick: () => setTab('keys') }, '快捷键'), React.createElement('button', { className: tab === 'mine' ? 'active' : '', onClick: () => setTab('mine') }, '我的 MCP'), React.createElement('button', { className: tab === 'projects' ? 'active' : '', onClick: () => setTab('projects') }, '项目 MCP'), React.createElement('button', { className: tab === 'market' ? 'active' : '', onClick: () => setTab('market') }, 'MCP 市场'), React.createElement('button', { className: tab === 'compat' ? 'active' : '', onClick: () => setTab('compat') }, '兼容性')),
     error && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, error),
     body,
     form,

package/src/client/ui/QuickOpen.ts

@@ -1,11 +1,13 @@
 // @ts-nocheck
 /**
  * dsh-vscode-mode client — QuickOpen：顶部搜索框（Ctrl+P 打开文件）。
+ * 快捷键随配置（edrv.quickOpen），占位文案同步当前键位。
  * 迁移自原 src/client/index.ts 的 QuickOpen，语义不改。
- * 作者 ddj 2026-08-20
+ * 作者 ddj 2026-08-20 / 2026-08-26
  */
 import React from 'react'
 import { rpc } from '../rpc.js'
+import { bindingOf, chordOf, matchEvent, useKeybindingsVersion } from '../keybindings.js'
 
 /**
  * 快速打开搜索框：Ctrl+P 聚焦，输入 ≥2 字符经 edrv.searchFiles 搜索，
@@ -22,6 +24,7 @@ export function QuickOpen(props) {
   const inputRef = React.useRef(null)
   const seq = React.useRef(0)
   const timer = React.useRef(null)
+  useKeybindingsVersion() // 键位变化时刷新占位文案
 
   const search = (query) => {
     const s = ++seq.current
@@ -47,7 +50,7 @@ export function QuickOpen(props) {
 
   React.useEffect(() => {
     const onKey = (e) => {
-      if ((e.ctrlKey || e.metaKey) && String(e.key).toLowerCase() === 'p') {
+      if (matchEvent(e, bindingOf('edrv.quickOpen'))) {
         e.preventDefault(); e.stopPropagation()
         inputRef.current?.focus?.()
         setOpen(true)
@@ -78,7 +81,7 @@ export function QuickOpen(props) {
 
   return React.createElement('div', { className: 'edrv-search-wrap' },
     React.createElement('input', {
-      ref: inputRef, className: 'edrv-search', placeholder: '搜索文件 (Ctrl+P)',
+      ref: inputRef, className: 'edrv-search', placeholder: '搜索文件 (' + (chordOf('edrv.quickOpen') ?? 'Ctrl+P') + ')',
       value: q,
       onChange: (e) => onChange(e.target.value),
       onFocus: () => { if (q.trim().length >= 2 && !results) setOpen(true) },

package/src/fileOpenSettings.ts

@@ -1,10 +1,11 @@
 /**
- * dsh-vscode-mode host — 文件链接打开工具的持久化设置。
+ * dsh-vscode-mode host — 文件链接打开工具 + 快捷键的持久化设置。
  * 依赖守卫：@deepseek-ai/dsh-settings / schemastery 以动态加载引入，
  * 缺失时插件仍可加载（fileOpenTool 降级为配置值，compat 报告可见）。
- * 作者 ddj 2026年08月24号
+ * 作者 ddj 2026年08月24号 / 2026年08月26号
  */
 import type { Ctx } from './store.js'
+import { KEYBINDING_DEFAULTS } from './shared/keybindings.js'
 
 export const FILE_OPEN_SETTINGS_NS = 'dsh-vscode-mode'
 export const FILE_OPEN_DEFAULT = 'auto'
@@ -21,7 +22,7 @@ type SettingsProvider = {
 export interface SettingsDeps {
   installSettingsSection: (ctx: Ctx, ns: string, schema: unknown, entry: object, hooks: object) => void
   z: {
-    object: (shape: Record<string, unknown>) => unknown
+    object: (shape: Record<string, unknown>) => { default: (value: Record<string, unknown>) => unknown }
     string: () => { default: (value: string) => unknown }
   }
 }
@@ -30,6 +31,18 @@ export type SettingsDepsLoader = () => Promise<SettingsDeps | null>
 
 let depsPromise: Promise<SettingsDeps | null> | undefined
 
+/**
+ * 按命令目录构建 keybindings 显式键形状（每键独立默认值）。
+ * @author ddj 2026年08月26号
+ * @param z schemastery 命名空间
+ * @returns keybindings 字段形状
+ */
+function keybindingsShape(z: SettingsDeps['z']): Record<string, unknown> {
+  const shape: Record<string, unknown> = {}
+  for (const [id, chord] of Object.entries(KEYBINDING_DEFAULTS)) shape[id] = z.string().default(chord)
+  return shape
+}
+
 /**
  * 动态加载设置依赖（模块级缓存；任一缺失返回 null 而非抛错）。
  * @author ddj 2026年08月24号
@@ -75,7 +88,10 @@ export async function installOpenSettingsSection(
 ): Promise<boolean> {
   const deps = await loader()
   if (!deps) return false
-  const schema = deps.z.object({ fileOpenTool: deps.z.string().default(FILE_OPEN_DEFAULT) })
+  const schema = deps.z.object({
+    fileOpenTool: deps.z.string().default(FILE_OPEN_DEFAULT),
+    keybindings: deps.z.object(keybindingsShape(deps.z)).default({ ...KEYBINDING_DEFAULTS }),
+  })
   deps.installSettingsSection(ctx, ns, schema, entry, hooks)
   return true
 }

package/src/index.ts

@@ -10,6 +10,7 @@ import { registerRoutes } from './routes.js'
 import { captureToolResult } from './capture.js'
 import { handleRpc } from './rpc.js'
 import { newSearcher } from './search/orchestrator.js'
+import { newContentSearcher } from './search/content.js'
 import { installIsolation } from './mcpIsolation.js'
 import { dropFileIndex } from './workspace.js'
 import { cwdOf } from './registry.js'
@@ -30,6 +31,7 @@ export const inject = ['sessions', 'fs', 'webServer', 'loader', 'tools', 'worksp
 export function apply(ctx: Ctx, config?: unknown): void {
   const registry: Registry = new Map()
   const searcher = newSearcher(ctx)
+  const contentSearcher = newContentSearcher(ctx)
   /** 兼容性警告收集（route 护栏等写入，启动日志一并输出）。 */
   const warnings: string[] = []
   setupOpenSettings(ctx, config, () => {})
@@ -44,10 +46,11 @@ export function apply(ctx: Ctx, config?: unknown): void {
       registry.delete(cwd)
       dropFileIndex(cwd)
       searcher.dispose(cwd)
+      contentSearcher.dispose(cwd)
     }
   })
 
-  registerRoutes(ctx, config, (method, args) => handleRpc(ctx, registry, method, args, searcher), (warning) => warnings.push(warning))
+  registerRoutes(ctx, config, (method, args) => handleRpc(ctx, registry, method, args, searcher, contentSearcher), (warning) => warnings.push(warning))
   installIsolation(ctx)
   void logCompatSummary(ctx, warnings)