dsh-vscode-mode 0.11.0 → 0.13.0

package/src/client/index.ts

@@ -32,7 +32,7 @@ import { openEditorView } from './events.js'
 import { setupExtOpen } from './externalOpen.js'
 import { SettingsContext } from './settingsContext.js'
 import { SIDEBAR_PLUGIN, registerSlotSafely, settingsBridge } from './compat.js'
-import { detectSidebarService, installSideEditor, setEnsureSideEditor, SIDEBAR_INSTALL_CMD } from './sidebarBridge.js'
+import { detectSidebarService, hasSideRoute, installSideEditor, routeSideEditor, setEnsureSideEditor, SIDEBAR_INSTALL_CMD } from './sidebarBridge.js'
 import { detectOfficial, installOfficial, registerOfficialFileClaim, OFFICIAL_TAB_KIND, OFFICIAL_TAB_TITLE, isEditorTabActive, restoreEditorTab, buildFileAddress } from './officialSidebar.js'
 import { setNativeCsv, setNativeOpenHandler, resetNativeOpen } from './nativeOpenStore.js'
 import { SideEditorTab } from './ui/SideEditorTab.js'
@@ -50,9 +50,13 @@ import { createDefaultFileMenuItems } from './sidebar/menuItems.js'
 import { createOutlinePanel } from './outline/index.js'
 import { createOutlineSourceRegistry, registerBuiltinOutlineSources } from './outline/sources.js'
 import { createLspOutlineSource } from './outline/lspSource.js'
-import { keybindingsApply } from './keybindings.js'
+import { applyOfficialChords } from './keybindings.js'
 import { createCommandBridge } from './commandBridge.js'
+import type { CommandBridge } from './commandBridge.js'
 import { REGISTRY_GLOBAL } from './commandGlobals.js'
+import { awaitShortcutsService, bindCatalogChords, detectShortcuts, installLegacyKeys, migrateLegacyKeybindings, registerOfficialShortcuts } from './shortcutsOfficial.js'
+import { SHORTCUT_PROFILES, defaultKeybindings, normalizeKeybindings } from '../shared/keybindings.js'
+import { ShortcutSettings } from './ui/ShortcutSettings.js'
 import { sidebarMinApply } from './sidebarMin.js'
 import { editorLimitApply } from './editorLimit.js'
 import { log } from './log.js'
@@ -71,31 +75,38 @@ import type { CompatAdapter } from '../shared/compat.js'
 // 写死任一桥名都会在另一版本停等）——设置桥由 compat.pickSettingsBinder 运行时探测三级降级。
 export const inject = ['slots', 'timer', 'locale', 'connection', 'remote', 'workspaces', 'sessions', 'conversation']
 
-/** 指令桥装配幂等标记（同一 document 重复 apply 只装配一次，避免重复键位监听）。 */
-let commandsMounted = false
+/** 指令桥单例（同一 document 重复 apply 只装配一次；HMR 重挂不重复注册）。 */
+let commandsBridge: CommandBridge | null = null
 
 /**
  * 装配指令注册表（指令桥 + 命令栏）。
  * 指令桥不依赖已挂载编辑器（run 只派发窗口事件），故可在启动期装配；
  * 命令栏浮层的宿主由 CommandPalette 自己在编辑区树内认领。
- * @author ddj 2026年09月10号
+ * @author ddj 2026年09月10号 / 2026年10月
  * @param ctx 客户端根上下文
- * @returns void
+ * @returns 指令桥（官方 shortcuts 注册的执行器来源）
  */
-function setupCommands(ctx: any): void {
-  if (commandsMounted) return
-  commandsMounted = true
-  const bridge = createCommandBridge()
+function setupCommands(ctx: any): CommandBridge {
+  if (commandsBridge) return commandsBridge
+  /** @author ddj 2026年09月28号 @returns Current session/workspace for command ownership. */
+  const readScope = () => readSessionScope(ctx)
+  /** @author ddj 2026年09月28号 @returns Whether an installed sidebar can mount the editor. */
+  const canOpen = () => hasSideRoute()
+  /** @author ddj 2026年09月28号 @returns Whether the current editor route accepted the request. */
+  const open = () => routeSideEditor(null, false)
+  const bridge = createCommandBridge({ readScope, canOpen, open })
+  commandsBridge = bridge
   ctx.provide(REGISTRY_GLOBAL, bridge.registry)
   // 无条件镜像到 window（DSH 不创建 window.dsh，旧条件式赋值是死代码 → 命令栏空表）
   const host = window as unknown as Record<string, unknown>
   host[REGISTRY_GLOBAL] = bridge.registry
   ctx.effect(() => () => {
     bridge.dispose()
-    commandsMounted = false
+    commandsBridge = null
     if (host[REGISTRY_GLOBAL] === bridge.registry) delete host[REGISTRY_GLOBAL]
   }, 'vscode-mode: command registry')
   log.info('指令系统已装配：' + bridge.registry.list().length + ' 条指令，Ctrl+Shift+P 打开命令栏')
+  return bridge
 }
 
 /**
@@ -131,14 +142,14 @@ export function apply(ctx: any): void {
   }, 'vscode-mode: settings document editor route')
 
   // 指令系统（命令栏 + 指令注册表）先装配：命令栏在被任何 React slot 渲染前即可唤起
-  setupCommands(ctx)
+  const commands = setupCommands(ctx)
 
   const registry: FileOpenerRegistry = createFileOpenerRegistry()
   const workspaces = ctx.get('workspaces')
   const sessions = ctx.get('sessions')
 
   // 外部深链落地：Windows 右键菜单 / Unity 外部编辑器 → 浏览器 URL 参数 → 打开规则路由
-  setupExtOpen(ctx)
+  ctx.effect(() => setupExtOpen(ctx), 'vscode-mode: external open')
 
   // Monaco 加载时机：不再 DSH 启动即预热，改为进入会话界面（当前会话出现）后再后台加载，
   // 用户点开「文件编辑」页签即用；空闲时仍由 EditorView 挂载兜底加载。
@@ -253,7 +264,7 @@ export function apply(ctx: any): void {
     return sidebar ? registry.register(sidebar) : undefined
   }, 'vscode-mode: sidebar file opener')
   // 官方侧边栏正文组件装配（页类型正文；兼作 file 认领转发失败时的兜底正文）
-  const officialRenderTab = (props: Record<string, unknown>) => React.createElement(OfficialSideTab, Object.assign({}, props, { schedule, addToConversation, sidebarPanels, outlineSources, fileMenuItems, fileOpeners: registry, sessions }))
+  const officialRenderTab = (props: Record<string, unknown>) => React.createElement(OfficialSideTab, Object.assign({}, props, { schedule, addToConversation, sidebarPanels, outlineSources, fileMenuItems, fileOpeners: registry, sessions, readSessionScope: () => readSessionScope(ctx) }))
   /** 官方 file 地址认领同步：自动/VSCodeMode 档认领（转发进单一编辑器页签），其余交官方查看器。 */
   const syncFileClaim = (): void => {
     const official = officialService
@@ -270,6 +281,17 @@ export function apply(ctx: any): void {
       claimDisposer = null
     }
   }
+  const legacyDefaults = defaultKeybindings()
+  let officialReady = false
+  /**
+   * 获取旧版快捷键覆盖；设置桥尚未就绪时回退默认键位。
+   * @author ddj 2026年09月28号
+   * @returns 旧版键位弦表
+   */
+  const legacyChords = (): Record<string, string> => ({
+    ...legacyDefaults, ...normalizeKeybindings(bridge.scope()?.getSnapshot().value?.keybindings),
+  })
+  applyOfficialChords(legacyChords())
   // 设置同步（fileOpenTool / 快捷键 / 侧宽 / 页签上限）：桥可能晚于本插件 apply 就绪
   // （设置桥服务不进 inject），首次命中即挂两条 effect；晚到经 bridge.whenReady 重挂一次
   // （settingsBridge 15×2s 有界重试内命中才会触发，用尽后保持旧行为不轮询）。
@@ -290,14 +312,14 @@ export function apply(ctx: any): void {
       sync()
       return scope.subscribe(sync)
     }, 'vscode-mode: file opener setting sync')
-    // 快捷键配置同步：设置提交后立即刷新键位匹配（编辑器/QuickOpen 按事件时读取）
-    // 同一订阅里顺带同步侧边栏最小宽度（sidebarMinWidth）→ 派发 edrv:sidebar-min-width 通知编辑器重夹
-    // 以及页签上限（maxOpenEditors）→ 派发 edrv:max-open-editors 通知编辑器复算淘汰
+    // 界面偏好同步：侧边栏最小宽度（sidebarMinWidth）→ 派发 edrv:sidebar-min-width 通知编辑器重夹
+    // 页签上限（maxOpenEditors）→ 派发 edrv:max-open-editors 通知编辑器复算淘汰
+    // （快捷键配置已归官方 shortcuts 机制，目录弦表同步见 'vscode-mode: official shortcuts' effect）
     ctx.effect(() => {
       const sync = (): void => {
         const snapshot = scope.getSnapshot()
         if (snapshot.status === 'loading') return
-        keybindingsApply(snapshot.value?.keybindings)
+        if (!officialReady) applyOfficialChords(legacyChords())
         const minW = sidebarMinApply(snapshot.value?.sidebarMinWidth)
         window.dispatchEvent(new CustomEvent('edrv:sidebar-min-width', { detail: { value: minW } }))
         const limit = editorLimitApply(snapshot.value?.maxOpenEditors)
@@ -311,6 +333,58 @@ export function apply(ctx: any): void {
   }
   mountSettingsSyncs()
   if (!settingsSyncMounted) ctx.effect(() => bridge.whenReady(mountSettingsSyncs), 'vscode-mode: settings bridge wait')
+
+  // 官方 shortcuts 机制装配（可选服务，有界重试；服务缺失仅降级告警，不阻断装配）：
+  // ① 全部指令注册进官方目录（含无默认键位命令，官方 UI 可自定义绑定；冲突默认自动降级未绑定）；
+  // ② 订阅官方目录 → 弦表同步（chordOf/bindingsOf 数据源，tooltip/命令栏提示跟随）；
+  // ③ 旧 keybindings 设置一次性迁移进官方存储（幂等，与设置桥双就绪后有界重试）。
+  ctx.effect(() => {
+    let cancelled = false
+    let disposeRegistration: (() => void) | null = null
+    let disposeCatalog: (() => void) | null = null
+    const disposeLegacy = installLegacyKeys(commands.registry.list(), commands.registry, legacyChords)
+    const cancelProbe = awaitShortcutsService(ctx, {
+      schedule,
+      onReady: (service) => {
+        if (cancelled) return
+        if (service === null) {
+          log.warn('官方 shortcuts 服务不可用（DSH 版本过旧？），继续使用旧版快捷键派发')
+          return
+        }
+        disposeLegacy()
+        officialReady = true
+        disposeRegistration = registerOfficialShortcuts(service, commands.registry.list(), commands.registry, SHORTCUT_PROFILES)
+        disposeCatalog = bindCatalogChords(service, applyOfficialChords)
+        let attempts = 0
+        const attemptMigration = (): void => {
+          if (cancelled) return
+          const scope = bridge.scope()
+          if (!scope) {
+            if (attempts < 15) {
+              attempts += 1
+              schedule(attemptMigration, 2000)
+            }
+            return
+          }
+          void migrateLegacyKeybindings(service, scope).then((result) => {
+            if (cancelled || result.done) return
+            if (attempts < 15) {
+              attempts += 1
+              schedule(attemptMigration, 2000)
+            }
+          })
+        }
+        attemptMigration()
+      },
+    })
+    return () => {
+      cancelled = true
+      cancelProbe()
+      disposeLegacy()
+      disposeRegistration?.()
+      disposeCatalog?.()
+    }
+  }, 'vscode-mode: official shortcuts')
   if (workspaces?.openPath) {
     ctx.effect(() => installOpenPathRouter({
       workspaces,
@@ -503,6 +577,15 @@ export function apply(ctx: any): void {
     label: 'VSCodeMode',
   }, () => React.createElement(SettingsContext.Provider, { value: bridge.scope() }, React.createElement(McpSettings, { openerRegistry: registry, compatSummary })))
 
+  // 独立「快捷键」设置区（与 VSCodeMode 平级）：官方快捷键子页 + 插件快捷键子页。
+  // 服务经 getShortcuts 运行时探测（自愈），组件内部自带就绪重试。
+  registerSlotSafely(ctx, {
+    name: 'settings.section',
+    id: 'vscode-mode-shortcuts',
+    order: 31,
+    label: '快捷键',
+  }, () => React.createElement(ShortcutSettings, { getShortcuts: () => detectShortcuts(ctx) }))
+
   // 卸载收尾（G4，DSH 0.1.6-alpha.2 起支持运行时卸载/重载）：
   // 注销挂在存活的 window.monaco 上的全部 Monaco provider 并复位模块状态。
   // 不做会导致重载后重复注册（补全/跳转/hover 各翻倍）与陈旧开关残留。

package/src/client/keybindings.ts

@@ -1,16 +1,14 @@
 /**
- * dsh-vscode-mode client — 快捷键配置模块（解析/匹配/状态同步）。
+ * dsh-vscode-mode client — 快捷键配置模块（解析/匹配/官方目录同步）。
  * 纯逻辑（parseChord/parseChords/formatChord/matchEvent/chordFromEvent/normalizeKey）不依赖 DOM，可单测；
- * 模块状态由 settings 订阅驱动（client/index.ts 调 keybindingsApply）。
- * 键位语义：Ctrl 与 Cmd 互认（延续 Ctrl+P/Ctrl+B 捕获行为）。
- * 命令目录（COMMANDS）派生自指令目录 commandCatalog（指令 = 单一数据源，设置页自动跟随）；
- * 另支持运行时键位表（第三方命令 register 时声明，不落设置 schema，注销即失效）。
- * 作者 ddj 2026年08月26号 / 2026年09月10号
+ * 弦表（current）由官方 shortcuts 目录驱动：client/index.ts 经 shortcutsOfficial.bindCatalogChords
+ * 订阅官方 catalog 后调 applyOfficialChords（键位持久化/冲突校验/派发全部归官方机制，本模块不再自派发）。
+ * 键位语义：Ctrl 与 Cmd 互认（延续历史捕获行为）。
+ * 命令目录（COMMANDS）派生自指令目录 commandCatalog（指令 = 单一数据源）。
+ * 作者 ddj 2026年08月26号 / 2026年09月10号 / 2026年10月
  */
 import React from 'react'
-import { KEYBINDING_DEFAULTS, normalizeKeybindings } from '../shared/keybindings.js'
-import { BRIDGE_COMMANDS, EDITOR_COMMANDS, showCommandsDef } from './ui/commandCatalog.js'
-import { log } from './log.js'
+import { BRIDGE_COMMANDS, EDITOR_COMMANDS } from './ui/commandCatalog.js'
 
 /** 解析后的键位（修饰符 + 规范化主键）。 */
 export interface Binding {
@@ -21,52 +19,45 @@ export interface Binding {
   key: string
 }
 
-/** 命令目录（设置页展示标签；执行按目录序先匹配先执行，冲突键位确定性）。 */
+/** 命令目录（设置页展示标签；命令栏候选与键位提示共用）。 */
 export const COMMANDS: Array<{ id: string; label: string }> = [
   ...EDITOR_COMMANDS.map((command) => ({ id: command.id, label: command.label })),
   { id: 'edrv.showCommands', label: '显示所有命令' },
   ...BRIDGE_COMMANDS.map((command) => ({ id: command.id, label: command.label })),
 ]
 
-/** 命令栏命令定义（键位自检与目录展示共用；run 不参与键位逻辑）。 */
-function paletteCommand(): { id: string; label: string; keybinding?: string } {
-  return showCommandsDef(() => {})
+const MODIFIERS: Record<string, 'ctrl' | 'shift' | 'alt' | 'meta'> = {
+  ctrl: 'ctrl', cmd: 'meta', meta: 'meta', shift: 'shift', alt: 'alt',
 }
 
+/** 弦表（官方 catalog 派生：id → 显示键位弦）。官方目录就绪前为空（tooltip 走各自的兜底文案）。 */
+let current: Record<string, string> = {}
+let currentAria: Record<string, string | undefined> = {}
+
 /**
- * 目录与默认键位表一致性自检（仅告警不中断）：新指令漏写共享表时第一时间可见。
- * @author ddj 2026年09月10号
+ * Read official accessibility metadata without deriving it from visual keycaps.
+ * @author ddj 2026年09月28号
+ * @param id Command identifier.
+ * @returns Official single-key ARIA shortcut, absent for two-key chords.
  */
-function checkDefaultsDrift(): void {
-  for (const command of [...EDITOR_COMMANDS, paletteCommand()]) {
-    if (!command.keybinding) continue
-    if (KEYBINDING_DEFAULTS[command.id] === command.keybinding) continue
-    log.warn('指令默认键位与共享表不一致：' + command.id
-      + ' 目录=' + command.keybinding + ' 共享表=' + String(KEYBINDING_DEFAULTS[command.id]))
-  }
-}
+export function ariaOf(id: string): string | undefined { return currentAria[id] }
 
-const MODIFIERS: Record<string, 'ctrl' | 'shift' | 'alt' | 'meta'> = {
-  ctrl: 'ctrl', cmd: 'meta', meta: 'meta', shift: 'shift', alt: 'alt',
-}
-
-let current: Record<string, string> = { ...KEYBINDING_DEFAULTS }
-const runtime = new Map<string, Binding[]>()
+/**
+ * Replace accessibility metadata from the official catalog.
+ * @author ddj 2026年09月28号
+ * @param aria Complete catalog ARIA map, applied before display notification.
+ */
+export function applyKeyAria(aria: Record<string, string | undefined>): void { currentAria = { ...aria } }
 const listeners = new Set<() => void>()
 
-checkDefaultsDrift()
-
 /**
- * 应用设置快照（与默认值合并；未知 id 丢弃；空对象 = 全部默认）。
- * 每个命令可含多候选键位（`|` 分隔），任一命中即触发。
- * @author ddj 2026年08月26号
- * @param raw 设置 scope 的 keybindings 字段
+ * 应用官方目录弦表（id → 显示键位弦；由 shortcutsOfficial.bindCatalogChords 全量推送）。
+ * @author ddj 2026年10月
+ * @param chords 弦表（官方 catalog 派生，含用户覆盖；issue 行不收录）
  */
-export function keybindingsApply(raw: unknown): void {
-  current = { ...KEYBINDING_DEFAULTS, ...normalizeKeybindings(raw) }
-  for (const listener of listeners) {
-    try { listener() } catch { /* 监听器异常不影响其他订阅 */ }
-  }
+export function applyOfficialChords(chords: Readonly<Record<string, string>>): void {
+  current = { ...chords }
+  notifyKeybindings()
 }
 
 /**
@@ -80,29 +71,6 @@ export function subscribeKeybindings(listener: () => void): () => void {
   return () => listeners.delete(listener)
 }
 
-/**
- * 注册运行时键位（第三方命令；优先于设置值，注销即失效）。
- * @author ddj 2026年09月10号
- * @param id 命令 id
- * @param chord 键位弦（空/非法按未绑定处理）
- * @returns 注销函数（幂等）
- */
-export function addRuntimeKeybinding(id: string, chord: string): () => void {
-  runtime.set(id, parseChords(chord))
-  notifyKeybindings()
-  return () => removeRuntimeKeybinding(id)
-}
-
-/**
- * 移除运行时键位。
- * @author ddj 2026年09月10号
- * @param id 命令 id
- */
-export function removeRuntimeKeybinding(id: string): void {
-  if (!runtime.delete(id)) return
-  notifyKeybindings()
-}
-
 /** 通知键位订阅者（异常隔离）。 */
 function notifyKeybindings(): void {
   for (const listener of listeners) {
@@ -111,29 +79,23 @@ function notifyKeybindings(): void {
 }
 
 /**
- * 当前命令的键位弦（运行时键位优先；未绑定/空 → null）。
- * @author ddj 2026年08月26号 / 2026年09月10号
+ * 当前命令的键位弦（官方目录派生；未绑定/空 → null）。
+ * @author ddj 2026年08月26号 / 2026年10月
  * @param id 命令 id
  * @returns 键位弦或 null
  */
 export function chordOf(id: string): string | null {
-  if (runtime.has(id)) {
-    const chords = runtime.get(id) ?? []
-    return chords.length ? chords.map(formatChord).join('|') : null
-  }
   const chord = current[id]
   return typeof chord === 'string' && chord.trim() !== '' ? chord : null
 }
 
 /**
  * 当前命令的解析键位集合（未绑定/非法 → 空数组；含多候选）。
- * @author ddj 2026年08月26号 / 2026年09月10号
+ * @author ddj 2026年08月26号 / 2026年10月
  * @param id 命令 id
  * @returns 解析键位数组（可能为空）
  */
 export function bindingsOf(id: string): Binding[] {
-  const override = runtime.get(id)
-  if (override) return override
   const chord = current[id]
   return typeof chord === 'string' ? parseChords(chord) : []
 }
@@ -216,7 +178,8 @@ export function formatChord(binding: Binding): string {
  * @param bindings 解析键位或键位数组（null/空 = 未绑定，永不命中）
  * @returns 是否命中
  */
-export function matchEvent(e: { ctrlKey?: boolean; metaKey?: boolean; shiftKey?: boolean; altKey?: boolean; key?: string }, bindings: Binding | Binding[] | null): boolean {
+export function matchEvent(e: { ctrlKey?: boolean; metaKey?: boolean; shiftKey?: boolean; altKey?: boolean; key?: string; isComposing?: boolean; keyCode?: number; defaultPrevented?: boolean; getModifierState?: (key: string) => boolean }, bindings: Binding | Binding[] | null): boolean {
+  if (e.defaultPrevented || e.isComposing || e.keyCode === 229 || e.key === 'Dead' || e.getModifierState?.('AltGraph')) return false
   const list = Array.isArray(bindings) ? bindings : bindings ? [bindings] : []
   for (const binding of list) {
     if (Boolean(e.ctrlKey || e.metaKey) !== (binding.ctrl || binding.meta)) continue

package/src/client/monaco/loader.ts

@@ -6,7 +6,9 @@
  */
 import { applyOfficial, registerThemes } from './theme.js'
 
-export const MONACO_BASE = '/edrv/vendor/monaco/vs'
+import { appUrl } from '../../shared/appUrl.js'
+
+export const MONACO_BASE = appUrl('/edrv/vendor/monaco/vs')
 let monacoPromise = null
 let monacoStage = { phase: 'idle', progress: 0, message: '准备加载 Monaco…' }
 const stageListeners = new Set()

package/src/client/openFlow.ts

@@ -8,7 +8,7 @@
  */
 import { rpc } from './rpc.js'
 import { chooseWorkspace } from './chooseDialog.js'
-import { emitOpenAt, openEditorView } from './events.js'
+import { requestOpen } from './openReceipt.js'
 import { toastDom } from './externalOpen.js'
 import { createAddToConversation } from './addToConversation.js'
 import type { AddOutcome, CtxLike } from './addToConversation.js'
@@ -47,7 +47,7 @@ export interface OpenDeps {
   openSession(id: string): void
   reference(sessionId: string, path: string, appearance: 'file' | 'folder'): Promise<boolean>
   choose(title: string, folder: string): Promise<'recent' | 'create' | null>
-  openEditor(path: string | null, line?: number, column?: number): void
+  openEditor(path: string | null, line?: number, column?: number, sessionId?: string): Promise<boolean>
   schedule(fn: () => void, ms: number): void
   notify(text: string): void
 }
@@ -57,8 +57,6 @@ const READY_TIMEOUT_MS = 15000
 const READY_TICK_MS = 300
 const REF_RETRY_MAX = 20
 const REF_RETRY_MS = 300
-const REST_STEP_MS = 150
-const LINE_AT_DELAY_MS = 200
 
 /**
  * 路径规范化：`\→/`、小写、去尾分隔符（Windows 大小写不敏感前缀匹配用）。
@@ -124,11 +122,11 @@ export function pickRule(kind: PathKind, matched: boolean, hasSession: boolean):
  * @param params 深链参数（首路径驱动规则）
  * @param overrides 依赖覆盖（测试注入）
  */
-export async function openDeepLink(ctx: unknown, params: OpenParams, overrides: Partial<OpenDeps> = {}): Promise<void> {
+export async function openDeepLink(ctx: unknown, params: OpenParams, overrides: Partial<OpenDeps> = {}): Promise<boolean> {
   const deps = realDeps(ctx, overrides)
   if (!(await waitListsReady(deps))) {
     deps.notify('DSH 会话列表未就绪，请稍后重试')
-    return
+    return false
   }
   const primary = params.paths[0]
   const kind = await deps.stat(primary).catch(() => 'missing' as PathKind)
@@ -137,14 +135,16 @@ export async function openDeepLink(ctx: unknown, params: OpenParams, overrides:
   try {
     if (rule === 'abort') {
       deps.notify('路径不存在：' + primary)
-      return
+      return false
     }
-    if (rule === 'choose') return await runChoose(deps, primary, params)
-    if (rule === 'folderNew') return await runFolderNew(deps, primary, params)
-    if (rule === 'fileRecent') return await runFileRecent(deps, primary, params)
-    return await runFileBootstrap(deps, primary, params)
+    if (rule === 'choose') await runChoose(deps, primary, params)
+    else if (rule === 'folderNew') await runFolderNew(deps, primary, params)
+    else if (rule === 'fileRecent') await runFileRecent(deps, primary, params)
+    else await runFileBootstrap(deps, primary, params)
+    return true
   } catch (error) {
     deps.notify('打开失败：' + String((error as Error)?.message ?? error))
+    return false
   }
 }
 
@@ -162,12 +162,12 @@ async function runChoose(deps: OpenDeps, folder: string, params: OpenParams): Pr
   const matches = matchWorkspaces(deps.workspaces().items, folder)
   const best = bestMatch(deps, matches)
   const choice = await deps.choose(best?.title ?? '工作区', folder)
-  if (choice === null) return
+  if (choice === null) throw new Error('用户取消打开')
   if (choice === 'create') return runFolderNew(deps, folder, params)
   const ws = best ?? deps.workspaces().items[0]
   const sessionId = await spawnInWorkspace(deps, ws.workspaceId, undefined)
   await settleRef(deps, sessionId, folder, 'folder')
-  deps.openEditor(null)
+  await openChecked(deps, sessionId, null)
   await openRest(deps, sessionId, params, 1)
 }
 
@@ -178,21 +178,21 @@ async function runFileRecent(deps: OpenDeps, file: string, params: OpenParams):
     const anchor = recentSessionIn(deps, ws)
     if (anchor) {
       deps.openSession(anchor.id)
-      deps.openEditor(file, params.line, params.column)
+      await openChecked(deps, anchor.id, file, params.line, params.column)
       await openRest(deps, anchor.id, params, 1)
       return
     }
     // 文件所属工作区存在但无会话 → 在该工作区新建对话 + 文件引用
     const sessionId = await spawnInWorkspace(deps, ws.workspaceId, undefined)
     await settleRef(deps, sessionId, file, 'file')
-    deps.openEditor(file, params.line, params.column)
+    await openChecked(deps, sessionId, file, params.line, params.column)
     await openRest(deps, sessionId, params, 1)
     return
   }
   const anchor = recentSession(deps.sessions().byId, deps.sessions().ids)
   if (!anchor) return runFileBootstrap(deps, file, params)
   deps.openSession(anchor.id)
-  deps.openEditor(file, params.line, params.column)
+  await openChecked(deps, anchor.id, file, params.line, params.column)
   await openRest(deps, anchor.id, params, 1)
 }
 
@@ -228,7 +228,7 @@ async function runFileBootstrap(deps: OpenDeps, file: string, params: OpenParams
   const ws = await deps.createWorkspace(dirnameOf(file))
   const sessionId = await spawnInWorkspace(deps, ws.workspaceId, undefined)
   await settleRef(deps, sessionId, file, 'file')
-  deps.openEditor(file, params.line, params.column)
+  await openChecked(deps, sessionId, file, params.line, params.column)
   await openRest(deps, sessionId, params, 1)
 }
 
@@ -237,7 +237,7 @@ async function runFolderNew(deps: OpenDeps, folder: string, params: OpenParams):
   const ws = await deps.createWorkspace(folder)
   const sessionId = await spawnInWorkspace(deps, ws.workspaceId, undefined)
   await settleRef(deps, sessionId, folder, 'folder')
-  deps.openEditor(null)
+  await openChecked(deps, sessionId, null)
   await openRest(deps, sessionId, params, 1)
 }
 
@@ -264,17 +264,20 @@ async function settleRef(deps: OpenDeps, sessionId: string, path: string, appear
     if (await deps.reference(sessionId, path, appearance)) return
     await sleep(deps, REF_RETRY_MS)
   }
+  throw new Error('引用插入未完成')
 }
 
 /** 其余路径：文件进编辑器（步进），文件夹补文件夹引用。 */
 async function openRest(deps: OpenDeps, sessionId: string | null, params: OpenParams, from: number): Promise<void> {
   const rest = params.paths.slice(from)
-  for (const [index, path] of rest.entries()) {
+  for (const path of rest) {
     const kind = await deps.stat(path).catch(() => 'missing' as PathKind)
     if (kind === 'file') {
-      deps.schedule(() => deps.openEditor(path), REST_STEP_MS * (index + 1))
+      await openChecked(deps, sessionId ?? undefined, path)
     } else if (kind === 'directory' && sessionId) {
       await settleRef(deps, sessionId, path, 'folder')
+    } else {
+      throw new Error('路径不存在：' + path)
     }
   }
 }
@@ -316,16 +319,21 @@ function realDeps(ctx: unknown, overrides: Partial<OpenDeps> = {}): OpenDeps {
       return outcome === 'ok' || outcome === 'busy'
     },
     choose: (title, folder) => chooseWorkspace(title, folder),
-    openEditor: (path, line, column) => {
-      if (path == null) {
-        openEditorView(null)
-        return
-      }
-      openEditorView(path)
-      if (line != null) setTimeout(() => emitOpenAt(path, line, column), LINE_AT_DELAY_MS)
-    },
+    openEditor: requestOpen,
     schedule: (fn, ms) => setTimeout(fn, ms),
     notify: (text) => toastDom(text),
   }
   return { ...base, ...overrides }
 }
+
+/** @private @author ddj 2026年09月28号
+ * Await actual editor completion and propagate failure to the request result.
+ * @param deps Open dependencies.
+ * @param sessionId Target session.
+ * @param path Target file or editor mount.
+ * @param line Optional line.
+ * @param column Optional column.
+ */
+async function openChecked(deps: OpenDeps, sessionId: string | undefined, path: string | null, line?: number, column?: number): Promise<void> {
+  if (!(await deps.openEditor(path, line, column, sessionId))) throw new Error('编辑器打开未完成：' + (path ?? '工作区'))
+}

package/src/client/openReceipt.ts

@@ -0,0 +1,64 @@
+import { openEditorView } from './events.js'
+
+export interface EditorRequest { requestId: string; sessionId: string; path: string | null; line?: number; column?: number }
+interface Waiter { request: EditorRequest; finish: (success: boolean) => void; claimed?: boolean }
+const waiters = new Map<string, Waiter>()
+
+/** @public @author ddj 2026年09月28号
+ * Atomically claim the pending request for this editor's session on mount.
+ * @param sessionId Owning session.
+ * @returns Unclaimed request, if any.
+ */
+export function peekOpen(sessionId: string): EditorRequest | undefined {
+  const row = [...waiters.values()].find((item) => item.request.sessionId === sessionId && !item.claimed)
+  if (!row) return undefined
+  row.claimed = true
+  return row.request
+}
+
+/** @public @author ddj 2026年09月28号
+ * Complete an actual editor open by its unguessable local request ID.
+ * @param requestId Claimed request identity.
+ * @param success Whether content and navigation are ready.
+ * @param error Optional diagnostic for the caller.
+ */
+export function finishOpen(requestId: string, success: boolean, error?: string): void {
+  const row = waiters.get(requestId)
+  if (row?.claimed) row.finish(success === true)
+}
+
+/** @public @author ddj 2026年09月28号
+ * Route an editor open and await a correlated model-ready completion.
+ * @param path File path, or null to mount the editor.
+ * @param line Optional target line.
+ * @param column Optional target column.
+ * @param sessionId Owning session, required for routing.
+ * @returns Actual completion; timeout and disposal are false.
+ */
+export function requestOpen(path: string | null, line?: number, column?: number, sessionId = ''): Promise<boolean> {
+  if (typeof window === 'undefined' || !sessionId) return Promise.resolve(false)
+  const request: EditorRequest = { requestId: crypto.randomUUID(), sessionId, path, line, column }
+  return new Promise((resolve) => {
+    let timer: ReturnType<typeof setTimeout>
+    /** @private @author ddj 2026年09月28号 Complete once and release the deadline. */
+    function finish(success: boolean): void {
+      clearTimeout(timer)
+      waiters.delete(request.requestId)
+      resolve(success)
+    }
+    waiters.set(request.requestId, { request, finish })
+    timer = setTimeout(() => finish(false), 20_000)
+    openEditorView(null)
+    window.dispatchEvent(new CustomEvent('edrv:open-request', { detail: request }))
+  })
+}
+
+/** @public @author ddj 2026年09月28号
+ * Check that an editor receipt is still awaited after timeout or disposal.
+ * @param requestId Local request identity.
+ * @returns Whether this request may still be completed.
+ */
+export function hasOpen(requestId: string): boolean { return waiters.has(requestId) }
+
+/** @public @author ddj 2026年09月28号 Cancel outstanding receipts when the client plugin unloads. */
+export function disposeOpenWait(): void { for (const waiter of [...waiters.values()]) waiter.finish(false) }