dsh-vscode-mode 0.10.0 → 0.12.0

package/src/client/ui/EditorView.ts

@@ -13,6 +13,7 @@ import { emitFileChanged, emitRefresh } from '../events.js'
 import { langOf, loadMonaco, snippetLanguageOf } from '../monaco/loader.js'
 import { clampZoom, clearZoomMem, dataUrlOf, isImagePath, isSvgPath, recallZoom, rememberZoom, zoomKeyOf, zoomStepOf } from '../imagePreview.js'
 import { isMarkdownPath } from '../markdownPreview.js'
+import { setActiveEditorPath } from '../activePathStore.js'
 import { MarkdownPanel } from '../md/mdPanel.js'
 import { base64ToBytes, bytesToBase64, isPdfPath } from '../pdfPreview.js'
 import { inNativePath, tryNativeOpen } from '../nativeOpenStore.js'
@@ -49,13 +50,14 @@ import { upsertViewState, viewStatesLoad, viewStatesSave } from '../state/viewSt
 import { migrateScopedKeys, workspaceScopeOf } from '../state/scopeStore.js'
 import { modelsForScope, rememberModel } from '../state/modelCache.js'
 import { navFlashRangeOf } from '../navHighlight.js'
-import { bindingsOf, chordOf, matchEvent, useKeybindingsVersion } from '../keybindings.js'
+import { chordOf, useKeybindingsVersion } from '../keybindings.js'
 import { getSidebarMinWidth } from '../sidebarMin.js'
 import { navHistoryFor } from '../navHistory.js'
 import { statusOfAdd } from '../addToConversation.js'
 import { setSearchScope, setSearchSeed } from '../searchSeed.js'
 import { CACHE_KEY } from '../paths.js'
 import { runGoToDefinition, runFindReferences, hideReferencesOverlay } from '../monaco/lsp/providers.js'
+import { isLuaTypeSlot } from '../monaco/lsp/keywords.js'
 import { bindLspUnderline } from '../monaco/lsp/underline.js'
 import { onLspProgress, refreshStatus, setSession as setLspSession } from '../monaco/lsp/index.js'
 import { setupAiInline, trackAiEditor, aiInlineEnabled } from '../ai/inlineProvider.js'
@@ -69,7 +71,7 @@ import {
 } from '../tabActions.js'
 import { getMaxOpenEditors } from '../editorLimit.js'
 import { buildTabMenu } from '../tabMenu.js'
-import { ensureSvnChanges, ensureSvnStatus, getSvnChanges, getSvnStatus, refreshSvnChanges, svnAdd, svnChangeMapOf, svnDiffBase, svnDiffLocalPair, svnEditorActions, svnRevert, svnTortoise, svnUpdate } from '../svnStatus.js'
+import { ensureSvnChanges, ensureSvnStatus, getSvnChanges, getSvnStatus, refreshSvnChanges, svnAdd, svnChangeMapOf, svnDiffBase, svnDiffLocalPair, svnEditorActions, svnRevert, svnTortoise } from '../svnStatus.js'
 import { ensureSvnLog, getSvnLog, refreshSvnLog, svnDiffPair, svnDiffRev, svnDiffWorking, svnLogKeyOf, svnLogLoadedLimit, svnLogTruncated, svnWcRev, SVN_LOG_SHOW_ALL_LIMIT } from '../svnLog.js'
 import { runSvnAction } from '../svnActions.js'
 import { dshTrace } from '../svnStore.js'
@@ -82,6 +84,9 @@ import { promptName } from './PromptDialog.js'
 import { openWithDialog } from '../openWithDialog.js'
 import { copyText as copyClipText } from '../copyText.js'
 import { SvnLogDialog } from './SvnLogDialog.js'
+import { SvnUpdateDialog } from './SvnUpdateDialog.js'
+import { sameUpdateOwner, updateDone } from './svnUpdateModel.js'
+import { IconRefreshOutline16 } from './icons.js'
 import { SvnPatchDialog } from './SvnPatchDialog.js'
 import { SvnSumDialog } from './SvnSumDialog.js'
 import { LogDialog } from './LogDialog.js'
@@ -95,6 +100,23 @@ import { clampToolbarPosition, loadToolbarPosition, saveToolbarPosition } from '
 import { editorModelPathOf } from '../dap/modelPath.js'
 import { dapTrace } from '../dap/trace.js'
 
+/**
+ * 只在 Lua 注解类型槽开启注释自动建议；跨文件/离开类型槽立即恢复默认。
+ * @author ddj 2026年09月24号
+ * @param ed 当前 Monaco 编辑器
+ * @param monaco Monaco API（读取 quickSuggestions 枚举）
+ */
+function syncTypeSuggest(ed, monaco) {
+  const model = ed.getModel()
+  const position = ed.getPosition()
+  const typeSlot = model?.getLanguageId() === 'lua' && position
+    && isLuaTypeSlot(model, position, model.getWordUntilPosition(position))
+  const options = ed.getOption(monaco.editor.EditorOption.quickSuggestions)
+  const comments = typeSlot ? 'on' : 'off'
+  if (options.comments === comments) return
+  ed.updateOptions({ quickSuggestions: { ...options, comments } })
+}
+
 /** 日志弹窗每次加载条数（「加载更多」按此步长递增；上限由 host 的 SVN_LOG_SHOW_ALL_CAP 约束）。 */
 const SVN_LOG_PAGE = 100
 
@@ -252,7 +274,30 @@ export function EditorView(props) {
   const [svnLogError, setSvnLogError] = React.useState('') // 日志错误文案
   const [svnLogWcRev, setSvnLogWcRev] = React.useState(null) // P1-9：文件目标的工作副本版号（null = 不加粗）
   const [dlogOpen, setDlogOpen] = React.useState(false) // 诊断日志弹窗（自取数据，null 语义无需状态层）
-  const [svnUpdateResult, setSvnUpdateResult] = React.useState(null) // update 条目级结果条（null=不显示）
+  const [svnUpdateDialog, setSvnUpdateDialog] = React.useState(null) // {path,sessionId,scope,resumeJobId?}；窗口内自取增量
+  const [svnUpdateReturn, setSvnUpdateReturn] = React.useState(null) // 从日志/差异返回时恢复同一 job
+  const [recentUpdate, setRecentUpdate] = React.useState(null) // {jobId,path,sessionId,scope}；只读恢复入口
+  const [updateOpenWith, setUpdateOpenWith] = React.useState(false) // 二级弹窗 Esc 不联动关闭父窗口
+  const svnUpdateDoneRef = React.useRef(new Set()) // job 终态刷新一次，往返日志/差异不重复刷新
+  // @author ddj 2026年09月24号：切换作用域只关闭窗口，不取消旧工作副本中已启动的任务
+  React.useEffect(() => {
+    setSvnUpdateDialog(null)
+    setSvnUpdateReturn(null)
+    setRecentUpdate(null)
+    setUpdateOpenWith(false)
+  }, [sessionId, scope])
+  // @author ddj 2026年09月24号：只读恢复原工作区的活动更新，不调用 updateStart
+  React.useEffect(() => {
+    if (!sessionId || svnStatus?.managed !== true) return undefined
+    let alive = true
+    void rpc('svn.updateActive', { sessionId }).then((outcome) => {
+      if (!alive || !outcome.ok || !outcome.job) return
+      const recovered = { path: outcome.job.target, sessionId, scope, resumeJobId: outcome.job.jobId }
+      if (updateDone(outcome.job.phase)) setRecentUpdate(recovered)
+      else setSvnUpdateDialog((current) => current ?? recovered)
+    }).catch(() => {})
+    return () => { alive = false }
+  }, [sessionId, scope, svnStatus?.managed])
   const [sidebarOn, setSidebarOn] = React.useState(layout !== 'side') // 侧边栏显隐（侧栏形态默认收起）
   const [sidebarW, setSidebarW] = React.useState(() => getSidebarMinWidth()) // 侧边栏宽度（初值 = 最小宽度，默认 300）
   const [activePanel, setActivePanel] = React.useState('explorer') // 激活面板 id
@@ -291,6 +336,9 @@ export function EditorView(props) {
   const rowNavMoveRef = React.useRef(false) // 本次光标变化是否由整行移动触发（否则清空期望列）
   const activeRef = React.useRef(null) // 当前活动文件的最新值（空依赖闭包/指令回调读取）
   activeRef.current = active
+  // 活动文件路径镜像到模块级 store：命令目录可用性判定读取（如 Markdown 预览切换仅 .md 吞键）
+  setActiveEditorPath(active)
+  React.useEffect(() => () => setActiveEditorPath(null), [])
   const tabsRef = React.useRef([]) // 当前页签表的最新值（菜单动作按 id 分派时读，防陈旧闭包）
   tabsRef.current = tabs
   const tabPathsRef = React.useRef([]) // 页签路径镜像（外部改动轮询读取）
@@ -1296,29 +1344,10 @@ export function EditorView(props) {
     try { localStorage.setItem(sidebarKey, JSON.stringify({ on: sidebarOn, width: sidebarW, panel: activePanel })) }
     catch (e) { /* 忽略 */ }
   }, [sidebarOn, sidebarW, activePanel, sessionId, sidebarKey])
-  // 切换侧边栏（capture 抢占，避免与 DSH 全局冲突；键位随快捷键配置）
-  React.useEffect(() => {
-    const onKey = (e) => {
-      if (!matchEvent(e, bindingsOf('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, bindingsOf('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)
-  }, [])
+  // 编辑器键位（侧栏/保存/搜索/Markdown 预览/导航/页签循环）已归官方 shortcuts 机制派发：
+  // 官方 resolve → 指令注册表 run → `edrv.command.*` 事件 → 下方「指令系统接线」表执行。
+  // 历史 capture 监听移除（与官方派发并存会双执行）；Markdown 预览的「非 .md 不吞键」
+  // 语义由命令 available()（activePathStore + isMarkdownPath）承载，可用性为假时官方派发放行。
 
   /**
    * 打开搜索面板（Ctrl+Shift+F 与命令栏「在工作区中搜索」的唯一动作）。
@@ -1344,65 +1373,7 @@ export function EditorView(props) {
     setTimeout(() => window.dispatchEvent(new CustomEvent('edrv:search-focus')), 0)
   }
 
-  // Ctrl+Shift+F 全局搜索：展开侧边栏 + 激活搜索页签，随后聚焦搜索输入框（有选中则填入）
-  React.useEffect(() => {
-    const onKey = (e) => {
-      if (!matchEvent(e, bindingsOf('edrv.searchInFiles'))) return
-      e.preventDefault(); e.stopPropagation()
-      openSearchPanel()
-    }
-    window.addEventListener('keydown', onKey, true)
-    return () => window.removeEventListener('keydown', onKey, true)
-  }, [])
-
-  // Ctrl+Shift+V 切换 Markdown 预览：仅活动文件是 Markdown 时吞键；
-  // 其余情况直接放行（不 preventDefault），保留浏览器/输入框原生的「无格式粘贴」语义
-  // ——与 closeTab / addSelectionRef「不可用时放行按键」同款约定。
-  React.useEffect(() => {
-    const onKey = (e) => {
-      if (!matchEvent(e, bindingsOf('edrv.toggleMarkdownPreview'))) return
-      const path = activeRef.current
-      if (!isMarkdownPath(path)) return
-      e.preventDefault(); e.stopPropagation()
-      toggleMdPreviewRef.current?.(path)
-    }
-    window.addEventListener('keydown', onKey, true)
-    return () => window.removeEventListener('keydown', onKey, true)
-  }, [])
-
-  // 后退/前进：导航历史（跨文件焦点位置；经 ref 读最新闭包，避免空依赖过期）
-  React.useEffect(() => {
-    const onKey = (e) => {
-      if (!matchEvent(e, bindingsOf('edrv.navigateBack'))) return
-      e.preventDefault(); e.stopPropagation()
-      if (navBackRef.current) navBackRef.current()
-    }
-    window.addEventListener('keydown', onKey, true)
-    return () => window.removeEventListener('keydown', onKey, true)
-  }, [])
-  React.useEffect(() => {
-    const onKey = (e) => {
-      if (!matchEvent(e, bindingsOf('edrv.navigateForward'))) return
-      e.preventDefault(); e.stopPropagation()
-      if (navForwardRef.current) navForwardRef.current()
-    }
-    window.addEventListener('keydown', onKey, true)
-    return () => window.removeEventListener('keydown', onKey, true)
-  }, [])
-
-  // 页签循环切换：Ctrl+Alt+←/→（主候选，浏览器不占用）或 Ctrl+PgUp/PgDn（部分宿主可用）
-  React.useEffect(() => {
-    const onKey = (e) => {
-      const step = matchEvent(e, bindingsOf('edrv.nextTab')) ? 1
-        : matchEvent(e, bindingsOf('edrv.prevTab')) ? -1
-          : 0
-      if (step === 0) return
-      e.preventDefault(); e.stopPropagation()
-      if (cycleTabRef.current) cycleTabRef.current(step)
-    }
-    window.addEventListener('keydown', onKey, true)
-    return () => window.removeEventListener('keydown', onKey, true)
-  }, [])
+  // Ctrl+Shift+F / Ctrl+Shift+V / Alt+←→ / Ctrl+Alt+←→ 的 capture 监听已随官方派发改造移除（见上）。
 
   // 整行上下移动的实现见下方「指令系统接线」effect（moveRow 单点定义，命令栏与键位共用）。
 
@@ -1727,6 +1698,7 @@ export function EditorView(props) {
             sessionId,
             scope,
             path: def.id === 'update' ? (relPath ?? '') : relPath,
+            openSvnUpdate: (p) => runSvnUpdate(p),
             notify: (message) => setStatus(message),
             openSvnDiff: (p) => runSvnDiffBase(p),
             openSvnLocalPair: runSvnDiffLocalPair,
@@ -1904,6 +1876,7 @@ export function EditorView(props) {
     const ed = editorRef.current
     const model = getModel(active, content)
     if (ed.getModel() !== model) ed.setModel(model)
+    syncTypeSuggest(ed, monaco)
     restoreViewState(active)
     setLoadStage((prev) => ({ progress: Math.max(96, prev.progress), message: '创建编辑器视图…' }))
   }, [monaco, active, content, contentReady, mdPreviewing])
@@ -1997,9 +1970,11 @@ export function EditorView(props) {
     // 保存改由窗口级快捷键监听执行（键位可配置；见上方 edrv.save 监听）
     ed.onDidChangeModelContent(() => {
       if (!ed.getModel() || programmaticRef.current) return
+      syncTypeSuggest(ed, m)
       onEditRef.current?.()
     })
     ed.onDidChangeCursorPosition((e) => {
+      syncTypeSuggest(ed, m)
       setCursor('Ln ' + e.position.lineNumber + ', Col ' + e.position.column)
       // 整行移动（↓↑）刚定位时保留期望列；其余光标移动（点击/打字/方向键）清空期望列
       if (rowNavMoveRef.current) rowNavMoveRef.current = false
@@ -2740,17 +2715,15 @@ export function EditorView(props) {
 
   // 供 Monaco 原生右键菜单 addAction 读取的最新动作闭包（空依赖回调不随渲染重建）
   /**
-   * SVN 更新（CLI，全平台）：页签菜单/命令面板/编辑区右键共用；path 缺省 = 工作区根。
-   * P3：结果含条目级明细，成功后展示可关闭的结果条（冲突红字高亮）。
+   * 四入口共用的更新窗口：仅显式点击触发，不在背景静默更新。
+   * @author ddj 2026年09月24号
+   * @param relPath 工作区相对目标；空串代表根
    */
   const runSvnUpdate = (relPath) => {
-    void svnUpdate(sessionId, relPath ?? '').then((o) => {
-      setStatus(o.message)
-      // 更新会改工作副本状态：成功后重查变更清单（徽标/面板跟随）
-      if (o.ok) refreshSvnChanges(sessionId, scope)
-      // P3：有条目级明细时展示结果条（无变化则清空，不留旧结果）
-      setSvnUpdateResult(o.ok ? { summary: o.message, entries: o.entries ?? [], conflicts: o.conflicts ?? [] } : null)
-    })
+    closeCommandPalette()
+    setSvnUpdateReturn(null)
+    setRecentUpdate(null)
+    setSvnUpdateDialog({ path: relPath ?? '', sessionId, scope })
   }
   /** 强制重查 SVN 变更清单（命令栏「SVN 刷新变更」）。 */
   const runSvnReload = () => {
@@ -2857,8 +2830,9 @@ export function EditorView(props) {
    * @param relPath 目标工作区相对路径
    * @param revision 左侧版本
    * @param logTarget 来自日志弹窗时的日志目标（不传 = 非日志入口）
+   * @param onOpened 差异视图成功打开后触发（更新结果返回用）
    */
-  const runSvnDiffWorking = (relPath, revision, logTarget) => {
+  const runSvnDiffWorking = (relPath, revision, logTarget, onOpened) => {
     if (!relPath) { setStatus('仅文件目标支持与工作副本比较'); return }
     setStatus('读取 r' + revision + ' ↔ 工作副本 差异…')
     void svnDiffWorking(sessionId, relPath, revision).then((outcome) => {
@@ -2877,6 +2851,7 @@ export function EditorView(props) {
         logTarget,
       })
       setStatus('已打开 r' + revision + ' ↔ 工作副本 差异')
+      onOpened?.()
     })
   }
 
@@ -3032,6 +3007,7 @@ export function EditorView(props) {
         sessionId,
         scope,
         path,
+        openSvnUpdate: (p) => runSvnUpdate(p),
         notify: (message) => setStatus(message),
         openSvnDiff: (p) => runSvnDiffBase(p),
         openSvnLocalPair: runSvnDiffLocalPair,
@@ -3239,6 +3215,12 @@ 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 || '使用右上搜索框 (' + (chordOf('edrv.quickOpen') ?? 'Ctrl+P') + ') 打开文件'),
+    (recentUpdate && !svnUpdateDialog && sameUpdateOwner(recentUpdate, sessionId, scope)
+      ? React.createElement('button', {
+          className: 'edrv-pb-update', type: 'button', title: '查看最近 SVN 更新结果（不重新更新）',
+          onClick: () => setSvnUpdateDialog(recentUpdate),
+        }, React.createElement(IconRefreshOutline16, { size: 14 }), '最近更新')
+      : null),
     // Markdown 预览/源码切换（需求 4）：仅 .md 文件出现；命令栏与 Ctrl+Shift+V 为同一动作
     (isMdActive ? React.createElement('button', {
       className: 'edrv-pill edrv-pill-ghost edrv-pb-mdbtn',
@@ -3406,7 +3388,13 @@ export function EditorView(props) {
       leftLabel: svnDiff.leftLabel,
       rightLabel: svnDiff.rightLabel,
       onBack: svnDiff.logTarget !== undefined ? backToSvnLog : undefined,
-      onClose: () => setSvnDiff(null),
+      onClose: () => {
+        setSvnDiff(null)
+        if (svnUpdateReturn?.from === 'diff') {
+          setSvnUpdateDialog(svnUpdateReturn.dialog)
+          setSvnUpdateReturn(null)
+        }
+      },
     })
   } else if (!monaco && !monacoErr) {
     body = loadingBody(loadStage.message, loadStage.progress)
@@ -3574,6 +3562,7 @@ export function EditorView(props) {
     svnChanges,
     svnChangeMap: svnChangeMapMemo,
     openSvnDiff: (p) => runSvnDiffBase(p),
+    openSvnUpdate: (p) => runSvnUpdate(p),
     openSvnLocalPair: runSvnDiffLocalPair,
     refreshSvnChanges: () => refreshSvnChanges(sessionId, scope),
     openSvnLog: (p) => openSvnLog(p),
@@ -3726,49 +3715,11 @@ export function EditorView(props) {
         React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', title: '复制安装命令', onClick: copyInstallCmd }, '复制命令'),
         React.createElement('button', { className: 'edrv-side-hint-close', title: '关闭提示', 'aria-label': '关闭提示', onClick: dismissHint }, '×'))
     : null
-  /**
-   * SVN 更新结果条（P3）：逐条展示 update 的条目级状态，冲突红字高亮，可关闭。
-   * 只在本次 update 有条目明细时渲染（无明细/失败时不占用编辑区高度）。
-   * @author ddj 2026年09月16号
-   * @returns 结果条元素或 null
-   */
-  const svnResultBar = () => {
-    const result = svnUpdateResult
-    if (!result || !result.entries.length) return null
-    const conflicts = new Set(result.conflicts ?? [])
-    return React.createElement('div', { className: 'edrv-svnres' },
-      React.createElement('span', { className: 'edrv-svnres-head' }, 'SVN 更新'),
-      React.createElement('div', { className: 'edrv-svnres-list' },
-        result.entries.map((entry, idx) => React.createElement('span', {
-          key: entry.path + ':' + idx,
-          className: 'edrv-svnres-item' + (conflicts.has(entry.path) ? ' edrv-svnres-conflict' : ''),
-          title: entry.label + ' ' + entry.path,
-        }, entry.action + ' ' + entry.path))),
-      React.createElement('span', { style: { flex: 1 } }),
-      (conflicts.size
-        ? React.createElement('button', {
-            className: 'edrv-svn-act',
-            title: '在工作区中显示第一个冲突文件',
-            onClick: () => {
-              const first = [...conflicts][0]
-              const hit = result.entries.find((entry) => entry.path === first)
-              if (hit?.path) openFile(hit.path, false)
-            },
-          }, '查看冲突文件')
-        : null),
-      React.createElement('button', {
-        className: 'edrv-svn-act',
-        title: '关闭结果条',
-        onClick: () => setSvnUpdateResult(null),
-      }, '✕'))
-  }
-
   const mainCol = React.createElement('div', { className: 'edrv-main-col', style: { flex: 1, minWidth: 0, minHeight: 0, display: 'flex', flexDirection: 'column', overflow: 'hidden' } },
     pathBar,
     tabRow,
     sideHintEl,
     diskBanner(),
-    svnResultBar(),
     editorArea,
     statusBar)
   // 编辑器根节点按 composer 顶部边界动态限高，底部对话区域继续由 DSH 原生渲染。
@@ -3856,7 +3807,61 @@ export function EditorView(props) {
         onComparePair: (revA, revB) => { setSvnLog(null); runSvnDiffPair(svnLog.target || '', revA, revB, svnLog.target || '') },
         onCompareWorking: (revision) => { setSvnLog(null); runSvnDiffWorking(svnLog.target || '', revision, svnLog.target || '') },
         onOpenFile: (relPath) => { setSvnLog(null); openFile(relPath, false) },
-        onClose: () => { setSvnLog(null); setSvnLogError('') },
+        onClose: () => {
+          setSvnLog(null)
+          setSvnLogError('')
+          if (svnUpdateReturn?.from === 'log') {
+            setSvnUpdateDialog(svnUpdateReturn.dialog)
+            setSvnUpdateReturn(null)
+          }
+        },
+      })
+    : null
+  /**
+   * 更新终态只刷新一次目录树与变更缓存，切到日志再返回不重复执行。
+   * @author ddj 2026年09月24号
+   * @param result 已结束的更新任务
+   */
+  const onSvnUpdateDone = (result) => {
+    if (svnUpdateDoneRef.current.has(result.jobId)) return
+    svnUpdateDoneRef.current.add(result.jobId)
+    const message = result.phase === 'completed' ? 'SVN 更新完成'
+      : result.phase === 'cancelled' ? 'SVN 更新已取消（可能部分完成）' : 'SVN 更新失败：' + result.error
+    setStatus(message)
+    setRecentUpdate({ path: result.target, sessionId, scope, resumeJobId: result.jobId })
+    refreshSvnChanges(sessionId, scope)
+    emitRefresh()
+  }
+  const svnUpdateEl = sameUpdateOwner(svnUpdateDialog, sessionId, scope)
+    ? React.createElement(SvnUpdateDialog, {
+        key: 'edrv-svn-update:' + svnUpdateDialog.path + ':' + (svnUpdateDialog.resumeJobId || ''),
+        sessionId, cwd, path: svnUpdateDialog.path, resumeJobId: svnUpdateDialog.resumeJobId,
+        childOverlay: updateOpenWith,
+        onDone: onSvnUpdateDone, onNote: (message) => setStatus(message),
+        onClose: () => setSvnUpdateDialog(null),
+        onShowLog: (target, jobId) => {
+          setSvnUpdateReturn({ from: 'log', dialog: { ...svnUpdateDialog, resumeJobId: jobId } })
+          setSvnUpdateDialog(null)
+          openSvnLog(target)
+        },
+        onCompare: (path, revision, jobId) => runSvnDiffWorking(path, revision, undefined, () => {
+          setSvnUpdateReturn({ from: 'diff', dialog: { ...svnUpdateDialog, resumeJobId: jobId } })
+          setSvnUpdateDialog(null)
+        }),
+        onOpenFile: (path) => openFile(path, false),
+        onOpenWith: (path) => {
+          if (!props.fileOpeners) { setStatus('打开方式不可用'); return }
+          setUpdateOpenWith(true)
+          openWithDialog(props.fileOpeners, { sessionId, cwd: cwd ?? undefined }, path, (opener) => {
+            setUpdateOpenWith(false)
+            if (opener) setStatus('已用「' + opener.label + '」打开：' + baseNameOf(path))
+          })
+        },
+        onOpenParent: (path) => {
+          void revealPathInExplorer(sessionId, path).then((outcome) => {
+            setStatus(outcome.ok ? '已打开父目录' : '打开父目录失败：' + (outcome.error ?? '未知错误'))
+          })
+        },
       })
     : null
   // W2-1 补丁对话框 / W2-2 目录对比对话框：portal 到 body，与日志弹窗同一挂载方式
@@ -3954,6 +3959,7 @@ export function EditorView(props) {
         tabMenuEl,
         paletteEl,
         svnLogEl,
+        svnUpdateEl,
         patchDialogEl,
         sumDialogEl,
         dlogEl,
@@ -3965,6 +3971,7 @@ export function EditorView(props) {
         tabMenuEl,
         paletteEl,
         svnLogEl,
+        svnUpdateEl,
         patchDialogEl,
         sumDialogEl,
         dlogEl,

package/src/client/ui/McpSettings.ts

@@ -1,8 +1,9 @@
 // @ts-nocheck
 /**
- * dsh-vscode-mode client — VSCodeMode 设置区：通用 / 快捷键 / MCP 管理 / 语言服务器 / 性能优化 / 兼容性。
+ * dsh-vscode-mode client — VSCodeMode 设置区：通用 / MCP 管理 / 语言服务器 / 性能优化 / 兼容性。
+ * （快捷键管理已迁出为独立顶层设置区 ui/ShortcutSettings.ts，与 VSCodeMode 平级。）
  * MCP 管理 Tab 下含三个子页签：我的 MCP（profile 全局）/ 项目 MCP（各项目 .mcp.json）/ MCP 市场（占位）。
- * 作者 ddj 2026年08月22号 / 2026年08月26号 / 2026年08月27号
+ * 作者 ddj 2026年08月22号 / 2026年08月26号 / 2026年08月27号 / 2026年10月
  */
 import React from 'react'
 import { rpc } from '../rpc.js'
@@ -14,7 +15,6 @@ import { normalizeSidebarMinWidth, SIDEBAR_MIN_DEFAULT } from '../sidebarMin.js'
 import { EDITOR_LIMIT_CEIL, EDITOR_LIMIT_DEFAULT, normalizeMaxOpenEditors } from '../../shared/editorLimit.js'
 import { TORTOISE_DIR_DEFAULT } from '../../shared/svn.js'
 import { DEFAULT_NATIVE_CSV } from '../../shared/nativeOpen.js'
-import { KeybindingsPanel } from './KeybindingsPanel.js'
 import { LspSettings } from './LspSettings.js'
 import { PerfSettings } from './PerfSettings.js'
 import { IntegrationSettings } from './IntegrationSettings.js'
@@ -581,7 +581,6 @@ 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 === 'mcp') body = React.createElement(McpManagePanel, { servers, projects, busy, draft, edit, resetDraft,
     saveGlobal: (close) => saveGlobal(close), saveProject: (workspacePath, close) => saveProject(workspacePath, close),
     refreshGlobal, toggleGlobal, removeGlobal, refreshProject, toggleProject, removeProject })
@@ -591,7 +590,7 @@ export function McpSettings(props) {
   else body = React.createElement(PerfSettings, 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('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 === 'mcp' ? 'active' : '', onClick: () => setTab('mcp') }, 'MCP 管理'), React.createElement('button', { className: tab === 'lsp' ? 'active' : '', onClick: () => setTab('lsp') }, '语言服务器'), React.createElement('button', { className: tab === 'ai' ? 'active' : '', onClick: () => setTab('ai') }, 'AI 补全'), React.createElement('button', { className: tab === 'perf' ? 'active' : '', onClick: () => setTab('perf') }, '性能优化'), 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 === 'mcp' ? 'active' : '', onClick: () => setTab('mcp') }, 'MCP 管理'), React.createElement('button', { className: tab === 'lsp' ? 'active' : '', onClick: () => setTab('lsp') }, '语言服务器'), React.createElement('button', { className: tab === 'ai' ? 'active' : '', onClick: () => setTab('ai') }, 'AI 补全'), React.createElement('button', { className: tab === 'perf' ? 'active' : '', onClick: () => setTab('perf') }, '性能优化'), React.createElement('button', { className: tab === 'compat' ? 'active' : '', onClick: () => setTab('compat') }, '兼容性')),
     error && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, error),
     body,
   )

package/src/client/ui/QuickOpen.ts

@@ -9,7 +9,7 @@
  */
 import React from 'react'
 import { rpc } from '../rpc.js'
-import { bindingsOf, chordOf, matchEvent, useKeybindingsVersion } from '../keybindings.js'
+import { chordOf, useKeybindingsVersion } from '../keybindings.js'
 import { stepIndex } from './searchNav.js'
 
 /**
@@ -64,19 +64,18 @@ export function QuickOpen(props) {
       inputRef.current?.focus?.()
       setOpen(true)
     }
-    const onKey = (e) => {
-      if (matchEvent(e, bindingsOf('edrv.quickOpen'))) {
-        e.preventDefault(); e.stopPropagation()
-        openBox()
-      } else if (e.key === 'Escape') {
-        setOpen(false); inputRef.current?.blur?.()
-      }
+    // Esc 关闭（仅收起浮窗；历史 capture 行为保留，不参与命令派发、不吞键）
+    const onEscape = (e) => {
+      if (e.key !== 'Escape') return
+      setOpen(false)
+      inputRef.current?.blur?.()
     }
-    window.addEventListener('keydown', onKey, true)
-    // 指令系统入口（命令栏「快速打开文件」）：与键位复用同一动作
+    // 快速打开键位（Ctrl+P）已归官方 shortcuts 机制派发：官方 resolve → 注册表 run →
+    // 派发 `edrv.command.quickOpen` 事件到此处（历史窗口 capture 键位自检移除，防双开）。
+    window.addEventListener('keydown', onEscape, true)
     window.addEventListener('edrv.command.quickOpen', openBox)
     return () => {
-      window.removeEventListener('keydown', onKey, true)
+      window.removeEventListener('keydown', onEscape, true)
       window.removeEventListener('edrv.command.quickOpen', openBox)
     }
   }, [])