dsh-vscode-mode 0.12.0 → 0.13.1

package/src/client/ui/QuickOpen.ts

@@ -9,7 +9,8 @@
  */
 import React from 'react'
 import { rpc } from '../rpc.js'
-import { chordOf, useKeybindingsVersion } from '../keybindings.js'
+import { bindPanelCommand } from '../panelCommands.js'
+import { ariaOf, chordOf, useKeybindingsVersion } from '../keybindings.js'
 import { stepIndex } from './searchNav.js'
 
 /**
@@ -66,19 +67,18 @@ export function QuickOpen(props) {
     }
     // Esc 关闭（仅收起浮窗；历史 capture 行为保留，不参与命令派发、不吞键）
     const onEscape = (e) => {
-      if (e.key !== 'Escape') return
+      if (e.isComposing || e.keyCode === 229 || e.getModifierState?.('AltGraph') || e.key !== 'Escape') return
       setOpen(false)
       inputRef.current?.blur?.()
     }
-    // 快速打开键位（Ctrl+P）已归官方 shortcuts 机制派发：官方 resolve → 注册表 run →
-    // 派发 `edrv.command.quickOpen` 事件到此处（历史窗口 capture 键位自检移除，防双开）。
+    // 官方与旧版键位统一走会话级命令接收器；挂载时只消费本会话的待打开请求。
     window.addEventListener('keydown', onEscape, true)
-    window.addEventListener('edrv.command.quickOpen', openBox)
+    const offCommand = bindPanelCommand('quickOpen', { sessionId }, openBox)
     return () => {
       window.removeEventListener('keydown', onEscape, true)
-      window.removeEventListener('edrv.command.quickOpen', openBox)
+      offCommand()
     }
-  }, [])
+  }, [sessionId])
 
   // 高亮项滚入浮窗可视区（候选集或高亮变化时；nearest 避免整页跳动）
   React.useEffect(() => {
@@ -99,7 +99,7 @@ export function QuickOpen(props) {
    * @param e 输入框键盘事件
    */
   const onInputKey = (e) => {
-    if (e.nativeEvent?.isComposing) return
+    if (e.nativeEvent?.isComposing || e.nativeEvent?.keyCode === 229 || e.getModifierState?.('AltGraph')) return
     if (e.key === 'Escape') { setOpen(false); return }
     if (!showPop || !list.length) return
     if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
@@ -135,7 +135,8 @@ export function QuickOpen(props) {
 
   return React.createElement('div', { className: 'edrv-search-wrap' },
     React.createElement('input', {
-      ref: inputRef, className: 'edrv-search', placeholder: '搜索文件 (' + (chordOf('edrv.quickOpen') ?? 'Ctrl+P') + ')',
+      ref: inputRef, className: 'edrv-search', placeholder: '搜索文件' + (chordOf('edrv.quickOpen') ? ' (' + chordOf('edrv.quickOpen') + ')' : ''),
+      'aria-keyshortcuts': ariaOf('edrv.quickOpen'),
       value: q,
       role: 'combobox',
       'aria-expanded': showPop && list.length > 0,

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 等幂等跳过）。 */