dsh-vscode-mode 0.12.0 → 0.13.0

package/src/client/ui/ShortcutSettings.ts

@@ -11,22 +11,12 @@
 import React from 'react'
 import { COMMANDS } from '../keybindings.js'
 import { log } from '../log.js'
+import { startRecording } from '../shortcutRecorder.js'
 import { resetPluginKeys } from '../shortcutsOfficial.js'
 import type { ShortcutsServiceLike, ShortcutCatalogRow } from '../shortcutsOfficial.js'
 
 const settingsLog = log.child('shortcut-settings')
 
-const MODIFIER_ONLY = new Set(['Control', 'Shift', 'Alt', 'Meta', 'AltGraph'])
-
-/** 录制键 → 官方绑定（物理 code + 修饰符；Ctrl/Cmd 同为 primary，与官方互认语义一致）。 */
-function bindingFromEvent(e) {
-  const modifiers = []
-  if (e.ctrlKey || e.metaKey) modifiers.push('primary')
-  if (e.altKey) modifiers.push('alt')
-  if (e.shiftKey) modifiers.push('shift')
-  return { code: e.code, modifiers }
-}
-
 /** 目录行展示键位（keys 已按平台格式化；binding null = 未绑定）。 */
 function keysText(row) {
   if (!row || row.binding === null) return '未绑定'
@@ -114,7 +104,7 @@ function OfficialRow({ row }) {
       row.modified && React.createElement('small', { className: 'vsm-kb-warn' }, '已自定义'),
       row.issue && React.createElement('small', { className: 'vsm-kb-warn' }, '键位不受当前环境支持'),
       row.conflicts.length > 0 && React.createElement('small', { className: 'vsm-kb-warn' }, '与 ' + row.conflicts.join('、') + ' 冲突')),
-    React.createElement('kbd', { className: 'vsm-kb-key' + (row.conflicts.length ? ' warn' : '') }, keysText(row)),
+    React.createElement('kbd', { 'aria-label': row?.aria, className: 'vsm-kb-key' + (row.conflicts.length ? ' warn' : '') }, keysText(row)),
   )
 }
 
@@ -122,11 +112,13 @@ function OfficialRow({ row }) {
 function OfficialShortcutsPane({ service }) {
   const [error, setError] = React.useState('')
   const rows = service.catalog.getSnapshot()
+  const shortcut = rows.find((row) => row.id === 'shortcuts.open')
+  const hint = shortcut?.keys?.length ? '（' + shortcut.keys.join(' ') + '）' : ''
   const config = service.config.getSnapshot()
   const openOfficial = () => {
     setError('')
     if (!service.registry || typeof service.registry.invoke !== 'function') {
-      setError('官方弹窗入口不可用；可按 Ctrl+/ 或到 设置 → 通用 → 快捷键 打开')
+      setError('官方弹窗入口不可用；可到 设置 → 通用 → 快捷键 打开')
       return
     }
     try {
@@ -137,15 +129,15 @@ function OfficialShortcutsPane({ service }) {
       })
     } catch (e) {
       settingsLog.warn('打开官方快捷键弹窗失败：' + String(e))
-      setError('打开官方弹窗失败：' + String(e) + '；可按 Ctrl+/ 或到 设置 → 通用 → 快捷键 打开')
+      setError('打开官方弹窗失败：' + String(e) + '；可到 设置 → 通用 → 快捷键 打开')
     }
   }
   return React.createElement(React.Fragment, null,
     React.createElement('section', { className: 'vsm-panel' },
       React.createElement('h3', { className: 'vsm-panel-title' }, '官方快捷键配置'),
       React.createElement('div', { className: 'vsm-panel-body' },
-        React.createElement('p', null, '官方快捷键弹窗（Ctrl+/ 或 设置 → 通用 → 快捷键）提供全部命令的查看、录键与恢复默认；下方为当前目录只读总览（含插件注册的命令）。'),
-        React.createElement('button', { className: 'vsm-primary vsm-small', onClick: openOfficial }, '打开官方快捷键设置（Ctrl+/）'),
+        React.createElement('p', null, '官方快捷键弹窗提供全部命令的查看、录键与恢复默认；也可从 设置 → 通用 → 快捷键 打开。下方为当前目录只读总览（含插件注册的命令）。'),
+        React.createElement('button', { className: 'vsm-primary vsm-small', onClick: openOfficial, 'aria-keyshortcuts': shortcut?.aria }, '打开官方快捷键设置' + hint),
         error && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, error),
         config?.status === 'unreadable' && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' },
           '快捷键配置读取失败（内容损坏或由更新版本写入），当前使用默认键位；请备份后清理配置，或升级 DSH。')),
@@ -161,6 +153,7 @@ function OfficialShortcutsPane({ service }) {
 
 /** 子页二：插件命令键位（行内录键 + 行级清除 + 恢复默认；写入走官方 edit API）。 */
 function PluginShortcutEditor({ service }) {
+  const [nativeReady, setNativeReady] = React.useState(false)
   const [recording, setRecording] = React.useState(null) // 正在录制的命令 id
   const [busy, setBusy] = React.useState(false)
   const [message, setMessage] = React.useState('')
@@ -225,46 +218,33 @@ function PluginShortcutEditor({ service }) {
     }
   }
 
-  // 录制态：窗口捕获下一次组合键（Desktop 原生桥已经 recording(true) 暂停拦截）。
-  // capture 阶段 preventDefault → 官方 DOM 派发因 defaultPrevented 放行，不会误触发命令。
-  React.useEffect(() => {
+  /**
+   * Own capture and native suspension for the selected command's entire lifetime.
+   * @author ddj 2026年09月28号
+   * @returns Cleanup on cancel, save, failure, service change and unmount.
+   */
+  const recordEffect = () => {
     if (!recording) return undefined
-    const onKey = (e) => {
-      e.preventDefault()
-      e.stopPropagation()
-      if (e.key === 'Escape') {
-        setRecording(null)
-        return
-      }
-      if (e.key === 'Backspace' || e.key === 'Delete') {
-        const id = recording
-        setRecording(null)
-        void saveBinding(id, null)
-        return
-      }
-      if (MODIFIER_ONLY.has(e.key)) return
-      const id = recording
-      setRecording(null)
-      void saveBinding(id, bindingFromEvent(e))
-    }
-    window.addEventListener('keydown', onKey, true)
-    return () => window.removeEventListener('keydown', onKey, true)
-  }, [recording])
-
-  // 录制期间通知 Desktop 原生桥暂停拦截（Web 适配器为空实现）
-  React.useEffect(() => {
-    if (!service || typeof service.recording !== 'function') return undefined
-    void service.recording(Boolean(recording)).catch(() => {})
-    return () => {
-      if (recording) void service.recording(false).catch(() => {})
-    }
-  }, [recording, service])
+    let mounted = true
+    setNativeReady(false)
+    /** @author ddj 2026年09月28号 Mark the native bridge ready to collect physical keys. */
+    const ready = () => { if (mounted) setNativeReady(true) }
+    /** @author ddj 2026年09月28号 Cancel capture without modifying preferences. */
+    const cancel = () => { if (mounted) setRecording(null) }
+    /** @author ddj 2026年09月28号 @param binding Accepted physical binding or reset. */
+    const save = (binding) => { if (mounted) { setRecording(null); void saveBinding(recording, binding) } }
+    /** @author ddj 2026年09月28号 @param reason Recorder failure to show while mounted. */
+    const fail = (reason) => { if (mounted) { setRecording(null); setError('录制失败：' + String(reason)) } }
+    const dispose = startRecording(service, window, { ready, cancel, save, error: fail })
+    return () => { mounted = false; dispose() }
+  }
+  React.useEffect(recordEffect, [recording, service])
 
   const rowsView = rows.map(({ id, label, row }) => {
     const recordingRow = recording === id
     const display = recordingRow
-      ? React.createElement('span', { className: 'vsm-kb-rec' }, '按下组合键…（Esc 取消 / Backspace 清除）')
-      : React.createElement('kbd', { className: 'vsm-kb-key' + (row && row.conflicts.length ? ' warn' : '') }, keysText(row))
+      ? React.createElement('span', { className: 'vsm-kb-rec' }, nativeReady ? '按下组合键…（Esc 取消 / Backspace 恢复默认）' : '正在准备录制…')
+      : React.createElement('kbd', { 'aria-label': row?.aria, className: 'vsm-kb-key' + (row && row.conflicts.length ? ' warn' : '') }, keysText(row))
     return React.createElement('div', { key: id, className: 'vsm-kb-row' + (recordingRow ? ' rec' : '') },
       React.createElement('div', { className: 'vsm-kb-label' },
         React.createElement('span', null, label),
@@ -276,8 +256,8 @@ function PluginShortcutEditor({ service }) {
         recordingRow
           ? React.createElement('button', { onClick: () => setRecording(null) }, '取消')
           : React.createElement(React.Fragment, null,
-              React.createElement('button', { disabled: busy || config?.status !== 'ready', onClick: () => { setRecording(id); setMessage('') } }, '编辑'),
-              React.createElement('button', { disabled: busy || config?.status !== 'ready', title: '清除该命令的键位（恢复默认）', onClick: () => void saveBinding(id, null) }, '清除'))),
+              React.createElement('button', { disabled: busy || Boolean(recording) || config?.status !== 'ready', onClick: () => { setRecording(id); setMessage('') } }, '编辑'),
+              React.createElement('button', { disabled: busy || Boolean(recording) || config?.status !== 'ready', title: '清除该命令的键位（恢复默认）', onClick: () => void saveBinding(id, null) }, '清除'))),
     )
   })
 
@@ -289,6 +269,6 @@ function PluginShortcutEditor({ service }) {
       React.createElement('span', { className: 'vsm-kb-dirty' }, recording ? '录制中…' : ''),
       message && React.createElement('span', { className: 'vsm-kb-message' }, message),
       error && React.createElement('span', { className: 'vsm-kb-warn' }, error),
-      React.createElement('button', { className: 'vsm-small', disabled: busy || config?.status !== 'ready', onClick: () => void resetAll() }, '恢复默认')),
+      React.createElement('button', { className: 'vsm-small', disabled: busy || Boolean(recording) || config?.status !== 'ready', onClick: () => void resetAll() }, '恢复默认')),
   )
 }

package/src/client/ui/commandCatalog.ts

@@ -6,6 +6,7 @@
  * 与既有 `edrv:` 刷新/主题事件分属不同命名空间，互不干扰）。
  * 作者 ddj 2026年09月10号
  */
+import { panelAvailable, runPanelCommand } from '../panelCommands.js'
 import { hasEditorModel, hasOpenTabs } from '../editorModelState.js'
 import { activeEditorPath } from '../activePathStore.js'
 import { isMarkdownPath } from '../markdownPreview.js'
@@ -201,8 +202,8 @@ export const EDITOR_COMMANDS: readonly CommandDef[] = [
   },
   {
     id: 'edrv.quickOpen', label: '快速打开文件', category: '文件', order: 20,
-    available: alwaysAvailable,
-    run: () => emit('quickOpen'),
+    available: () => panelAvailable('quickOpen'),
+    run: () => { runPanelCommand('quickOpen') },
   },
   {
     id: 'edrv.toggleSidebar', label: '切换侧边栏', category: '视图', order: 10,
@@ -211,8 +212,8 @@ export const EDITOR_COMMANDS: readonly CommandDef[] = [
   },
   {
     id: 'edrv.searchInFiles', label: '在工作区中搜索', category: '视图', order: 20,
-    available: alwaysAvailable,
-    run: () => emit('searchInFiles'),
+    available: () => panelAvailable('searchInFiles'),
+    run: () => { runPanelCommand('searchInFiles') },
   },
   {
     id: 'edrv.toggleMarkdownPreview', label: '切换 Markdown 预览', category: '视图', order: 25,

package/src/client/useOpenReceipt.ts

@@ -0,0 +1,128 @@
+/** Correlated editor readiness for external file opens. @author ddj 2026年09月28号 */
+import React from 'react'
+import { finishOpen, hasOpen, peekOpen } from './openReceipt.js'
+import type { EditorRequest } from './openReceipt.js'
+
+export interface ReceiptHost {
+  sessionId: string
+  open(request: EditorRequest): void | Promise<void>
+  ready(request: EditorRequest): boolean
+  error(request: EditorRequest): string | null
+}
+
+/** One mounted editor owns at most one claimed external request. */
+export class OpenMonitor {
+  private pending: EditorRequest | undefined
+  private frame: number | undefined
+  private stopped = false
+  private opening = false
+  /** @private @author ddj 2026年09月28号 Claim a request arriving after mount. */
+  private listener = (): void => { this.claim() }
+
+  /** @author ddj 2026年09月28号 @param read Read current component state without a stale closure. */
+  constructor(private readonly read: () => ReceiptHost) {}
+
+  /** @public @author ddj 2026年09月28号 Attach the listener and claim a pre-mount request. */
+  start(): void {
+    window.addEventListener('edrv:open-request', this.listener)
+    this.claim()
+  }
+
+  /** @public @author ddj 2026年09月28号 Fail claimed work and cancel the frame on unmount. */
+  stop(): void {
+    this.stopped = true
+    window.removeEventListener('edrv:open-request', this.listener)
+    if (this.frame !== undefined) cancelAnimationFrame(this.frame)
+    this.frame = undefined
+    if (this.pending) finishOpen(this.pending.requestId, false, '编辑器已关闭')
+    this.pending = undefined
+  }
+
+  /** @private @author ddj 2026年09月28号 Schedule at most one readiness/queue check. */
+  private arm(): void {
+    if (!this.stopped && this.frame === undefined) this.frame = requestAnimationFrame(this.check)
+  }
+
+  /**
+   * Settle only the request this instance still owns; queued work runs next frame.
+   * @private @author ddj 2026年09月28号
+   * @param request Claimed request, captured before asynchronous work.
+   * @param success Whether actual readiness was confirmed.
+   * @param error Failure description.
+   */
+  private finish(request: EditorRequest, success: boolean, error?: string): void {
+    if (this.stopped || this.pending !== request) return
+    this.pending = undefined
+    this.opening = false
+    if (hasOpen(request.requestId)) finishOpen(request.requestId, success, error)
+    this.arm()
+  }
+
+  /**
+   * Observe startup without letting a late completion affect a new claim.
+   * @private @author ddj 2026年09月28号
+   * @param request Startup's request identity.
+   * @param operation Optional asynchronous editor startup.
+   */
+  private watchOpen(request: EditorRequest, operation: void | Promise<void>): void {
+    if (!operation) return
+    this.opening = true
+    /** @author ddj 2026年09月28号 Release readiness only for this live claim. */
+    const ready = (): void => {
+      if (!this.stopped && this.pending === request) this.opening = false
+    }
+    /** @author ddj 2026年09月28号 @param error Correlated startup rejection. */
+    const fail = (error: unknown): void => this.finish(request, false, String(error))
+    void Promise.resolve(operation).then(ready, fail)
+  }
+
+  /** @private @author ddj 2026年09月28号 Claim this session; exceptions fail the exact request. */
+  private claim(): void {
+    if (this.stopped || (this.pending && hasOpen(this.pending.requestId))) return
+    this.pending = undefined
+    this.opening = false
+    try {
+      const host = this.read()
+      const request = peekOpen(host.sessionId)
+      if (!request) return
+      this.pending = request
+      this.watchOpen(request, host.open(request))
+      this.arm()
+    } catch (error) {
+      if (this.pending) this.finish(this.pending, false, String(error))
+    }
+  }
+
+  /** @private @author ddj 2026年09月28号 Check readiness; expired claims and exceptions cannot ACK later work. */
+  private check = (): void => {
+    this.frame = undefined
+    if (this.stopped) return
+    const request = this.pending
+    if (!request || !hasOpen(request.requestId)) { this.pending = undefined; this.claim(); return }
+    try {
+      const host = this.read()
+      if (request.sessionId !== host.sessionId) { this.finish(request, false, '会话已切换'); return }
+      if (this.opening) { this.arm(); return }
+      const error = host.error(request)
+      if (error || host.ready(request)) { this.finish(request, !error, error ?? undefined); return }
+      this.arm()
+    } catch (error) { this.finish(request, false, String(error)) }
+  }
+}
+
+/**
+ * Bind a component while reading its latest model state.
+ * @author ddj 2026年09月28号
+ * @param host Mounted editor actions and readiness checks.
+ */
+export function useOpenReceipt(host: ReceiptHost): void {
+  const latest = React.useRef(host)
+  latest.current = host
+  /** @author ddj 2026年09月28号 @returns Listener and animation-frame cleanup. */
+  function mount(): () => void {
+    const monitor = new OpenMonitor(() => latest.current)
+    monitor.start()
+    return () => monitor.stop()
+  }
+  React.useEffect(mount, [host.sessionId])
+}

package/src/compat.ts

@@ -132,8 +132,10 @@ export function detectGuards(ctx: Ctx): CompatAdapter[] {
   ]
 }
 
-/** 已实测覆盖的最高 DSH 版本（适配矩阵上界，超过则提示，见 buildReport）。 */
-const TESTED_DSH_MAX = '0.1.7-alpha.2'
+/** 已实测覆盖的最高 DSH 版本（适配矩阵上界，超过则提示，见 buildReport）。
+ * 0.1.7-rc.2 已在官方已签名打包 Desktop 上实机装配（认证路由、同源 RPC、项目 MCP
+ * 与私有打开队列均生效）；更高版本仍按能力探测运行并提示。 */
+const TESTED_DSH_MAX = '0.1.7-rc.2'
 
 /** Config volatile 标记起效的版本线（此前设置走 section 安装，与 volatile 无关）。 */
 const CONFIG_VOLATILE_MIN = '0.1.7-alpha.1'
@@ -210,7 +212,7 @@ export async function buildReport(
     guards,
     adapters,
     warnings,
-    devForm: readDevForm(),
+    devForm: readDevForm(ctx),
     dshVersion,
   }
 }

package/src/dap/manager.ts

@@ -18,6 +18,8 @@
  * 作者 ddj 2026年09月29号 / 2026年09月21号
  */
 import { spawn, type ChildProcess } from 'node:child_process'
+import { childEnv } from '../childEnv.js'
+import { stopTree } from '../processTree.js'
 import { join } from 'node:path'
 import { createFrameParser, encodeMessage } from '../lsp/jsonrpc.js'
 import { sourceBaseOf, sourceKeyOf, sourcePathOf, normalizeSourcePath } from './sourcePath.js'
@@ -288,9 +290,18 @@ export class DapSession {
 
   // ---------------------------------------------------------------- 内部实现
 
-  /** spawn 适配器进程并接好帧解析。 */
+  /**
+   * 启动独立适配器进程组并接入协议，清理隐式宿主凭据。
+   * @private
+   * @author ddj 2026年09月28号
+   * @param spec 适配器规格
+   * @throws spawn 同步失败
+   */
   private spawnAdapter(spec: DapAdapterSpec): void {
-    const child = spawn(spec.command, spec.args, { stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true })
+    const child = spawn(spec.command, spec.args, {
+      stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true,
+      detached: process.platform !== 'win32', env: this.adapterEnv(),
+    })
     this.child = child
     const parser = createFrameParser()
     child.stdout?.on('data', (chunk: Buffer) => {
@@ -300,11 +311,16 @@ export class DapSession {
       log.debug('[dap-adapter] ' + chunk.toString('utf8').trim())
       this.stderrTail = (this.stderrTail + chunk.toString('utf8')).slice(-STDERR_TAIL_CAP)
     })
-    child.on('error', (error) => this.fail('适配器进程错误：' + String(error)))
+    child.on('error', (error) => {
+      if (this.child === child) this.fail('适配器进程错误：' + String(error))
+    })
+    child.stdin?.on('error', (error) => {
+      if (this.child === child) this.fail('适配器 stdin 错误：' + String(error))
+    })
     child.on('exit', (code) => {
-      if (this.child === child && this.phase !== 'idle' && this.phase !== 'terminated') {
-        this.fail('适配器退出（code=' + code + '）' + this.stderrSuffix())
-      }
+      if (this.child !== child) return
+      if (this.phase === 'idle' || this.phase === 'terminated') this.killChild()
+      else this.fail('适配器退出（code=' + code + '）' + this.stderrSuffix())
     })
   }
 
@@ -529,18 +545,35 @@ export class DapSession {
     this.setPhase('terminated')
   }
 
-  /** 杀适配器进程树（Windows taskkill /T /F，同 LSP transport 口径）。 */
+  /**
+   * 清理父环境后合并 launch 配置显式 env，null 表示移除该项。
+   * @private
+   * @author ddj 2026年09月28号
+   * @returns 适配器的环境副本
+   */
+  private adapterEnv(): NodeJS.ProcessEnv {
+    const explicit: NodeJS.ProcessEnv = {}
+    const raw = this.config?.raw?.env
+    if (raw && typeof raw === 'object' && !Array.isArray(raw)) {
+      for (const [key, value] of Object.entries(raw)) {
+        if (typeof value === 'string' || value === null) explicit[key] = value ?? undefined
+      }
+    }
+    return childEnv(explicit)
+  }
+
+  /**
+   * 解除会话拥有权并终止适配器进程树；不先杀根进程。
+   * @private
+   * @author ddj 2026年09月28号
+   * @description 同时清理所有待处理请求与计时器。
+   */
   private killChild(): void {
     const child = this.child
     this.child = null
     for (const entry of this.pending.values()) { clearTimeout(entry.timer); entry.resolve(null) }
     this.pending.clear()
-    if (!child) return
-    try { child.kill() } catch { /* 忽略 */ }
-    if (process.platform === 'win32' && child.pid) {
-      try { spawn('taskkill', ['/PID', String(child.pid), '/T', '/F'], { windowsHide: true, stdio: 'ignore' }) } catch { /* 忽略 */ }
-    }
-    setTimeout(() => { try { child.kill('SIGKILL') } catch { /* 忽略 */ } }, 1500).unref?.()
+    if (child) stopTree(child, (line) => log.warn('[dap] ' + line))
   }
 
   /** 相位切换（running→running 等幂等跳过）。 */