dsh-vscode-mode 0.14.8 → 0.14.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.14.8",
+  "version": "0.14.9",
   "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 DSH 0.1.5+ 官方右侧 Sidebar 与对话同屏）+ 命令栏（Ctrl+Shift+P）与可扩展指令系统 + VS Code 兼容代码片段（.code-snippets 全局/项目，IntelliSense 展开）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚）+ SVN 集成（侧栏变更面板/日志弹窗/并排差异）+ 语言服务器（LSP）智能（跳转定义/引用/hover/大纲 + VSIX 扩展市场安装），状态持久化到工作区旁车，界面状态（页签/光标/侧栏/编辑 Tab/导航历史）镜像到 DSH home 跨重启恢复",
   "icon": "assets/icon.svg",
   "keywords": [

package/src/client/editorModelState.ts

@@ -19,6 +19,22 @@ export const EDITOR_ROOT_SELECTOR = '.edrv-editor-row'
 /** Monaco 编辑器实例选择器（限定在插件编辑器行内，排除官方预览等其它 Monaco）。 */
 export const EDITOR_MODEL_SELECTOR = EDITOR_ROOT_SELECTOR + ' .monaco-editor'
 
+/** @public @author ddj 2026年10月12号 @param target Optional shortcut target. @returns Whether focus belongs to plugin code input, excluding widgets and read-only editors. */
+export function hasCodeFocus(target?: unknown): boolean {
+  if (typeof document === 'undefined') return false
+  const node = target ?? document.activeElement
+  if (!(node instanceof Element)) return false
+  const editor = node.closest(EDITOR_MODEL_SELECTOR)
+  if (!editor || editor.classList.contains('readonly')) return false
+  if (node.closest('.find-widget, .suggest-widget, .rename-box, .monaco-inputbox')) return false
+  const host = typeof window === 'undefined' ? null : window as unknown as {
+    monaco?: { editor?: { getEditors?(): Array<{ getDomNode(): unknown; hasTextFocus(): boolean; getModel(): unknown }> } }
+  }
+  return host?.monaco?.editor?.getEditors?.().some((item) =>
+    item.getDomNode() === editor && item.hasTextFocus() && Boolean(item.getModel()),
+  ) ?? false
+}
+
 /**
  * 已打开文件页签选择器（页签栏在编辑器行内；空态时无此节点）。
  * 判据同样不依赖 Monaco：图片/PDF 页签没有 Monaco 实例，但仍是「有页签可关」。

package/src/client/index.ts

@@ -65,7 +65,8 @@ import { disposeLaunchJson } from './dap/launchSnippetProvider.js'
 import { disposeAiInline } from './ai/inlineProvider.js'
 import { readSessionScope, subscribeScope } from './sessionScope.js'
 import { installPlanBridge } from './planBridge.js'
-import { flushUiState, hydrateUiState, installUiStatePersist, onUiStateReady, reportUiStateEvent, uiStateSettled } from './state/uiStatePersist.js'
+import { installPageReload } from './pageReload.js'
+import { flushPageState, flushUiState, hydrateUiState, installUiStatePersist, onUiStateReady, reportUiStateEvent, uiStateSettled } from './state/uiStatePersist.js'
 import { workspaceScopeOf } from './state/scopeStore.js'
 import { dapStore } from './dap/store.js'
 import type { CompatAdapter } from '../shared/compat.js'
@@ -185,6 +186,13 @@ export async function apply(ctx: any): Promise<void> {
 
   // 指令系统（命令栏 + 指令注册表）先装配：命令栏在被任何 React slot 渲染前即可唤起
   const commands = setupCommands(ctx)
+  /** @private @author ddj 2026年10月12号 @param message Refresh refusal; surfaced in mounted editor status and diagnostic log. */
+  const notifyReload = (message: string): void => {
+    log.warn(message)
+    window.dispatchEvent(new CustomEvent('edrv:reload-status', { detail: message }))
+    window.alert(message)
+  }
+  ctx.effect(() => installPageReload(flushPageState, notifyReload), 'vscode-mode: guarded page reload')
 
   const registry: FileOpenerRegistry = createFileOpenerRegistry()
   const workspaces = ctx.get('workspaces')

package/src/client/monaco/editActions.ts

@@ -0,0 +1,58 @@
+/** Plugin-local Monaco editing bindings. @author ddj 2026年10月12号 */
+export interface EditTarget {
+  getModel(): unknown
+  getOption(option: number): unknown
+  hasTextFocus(): boolean
+  focus(): void
+  trigger(source: string, action: string, payload: null): void
+  createContextKey(name: string, value: boolean): { reset(): void }
+  onDidDispose(listener: () => void): { dispose(): void }
+  addAction(action: { id: string; label: string; precondition: string; contextMenuGroupId: string; run(): void }): { dispose(): void }
+}
+export interface EditMonaco {
+  KeyMod: { CtrlCmd: number }
+  KeyCode: { Slash: number; KeyD: number }
+  editor: {
+    EditorOption: { readOnly: number }
+    addKeybindingRules(rules: Array<{ keybinding: number; command: string; when: string }>): { dispose(): void }
+  }
+}
+
+/** @public @author ddj 2026年10月12号 @param editor Target editor. @param monaco Monaco API. @param action Native action. @returns Whether a writable model accepted the action. @sideEffects Restores focus and runs an undoable native edit. */
+export function runEditAction(editor: EditTarget | null, monaco: EditMonaco | null, action: string): boolean {
+  if (!editor?.getModel() || !monaco || editor.getOption(monaco.editor.EditorOption.readOnly)) return false
+  editor.focus()
+  editor.trigger('edrv-edit', action, null)
+  return true
+}
+
+/** @public @author ddj 2026年10月12号 @param editor Plugin editor. @param monaco Monaco API. @returns Idempotent disposer. @sideEffects Overrides only plugin-local bindings and menu entries until editor disposal. */
+export function bindEditActions(editor: EditTarget, monaco: EditMonaco): () => void {
+  const local = editor.createContextKey('edrvLocalEdit', true)
+  const focus = 'edrvLocalEdit && editorTextFocus'
+  const writable = focus + ' && !editorReadonly'
+  const rules = monaco.editor.addKeybindingRules([
+    { keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.Slash, command: '', when: focus },
+    { keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyD, command: 'editor.action.copyLinesDownAction', when: writable },
+  ])
+  /** @private @author ddj 2026年10月12号 Runs the native language-aware comment action. */
+  const comment = (): void => { runEditAction(editor, monaco, 'editor.action.commentLine') }
+  /** @private @author ddj 2026年10月12号 Runs the native multi-selection line-copy action. */
+  const duplicate = (): void => { runEditAction(editor, monaco, 'editor.action.copyLinesDownAction') }
+  const actions = [
+    editor.addAction({ id: 'edrv.toggleComment', label: '切换行注释（Ctrl+Alt+/）', precondition: writable, contextMenuGroupId: '1_edrv', run: comment }),
+    editor.addAction({ id: 'edrv.duplicateLine', label: '向下复制行（Ctrl+D，编辑器本地）', precondition: writable, contextMenuGroupId: '1_edrv', run: duplicate }),
+  ]
+  let disposed = false
+  /** @private @author ddj 2026年10月12号 Releases global rule contributions owned by this instance. */
+  const dispose = (): void => {
+    if (disposed) return
+    disposed = true
+    rules.dispose()
+    for (const action of actions) action.dispose()
+    local.reset()
+    lifetime.dispose()
+  }
+  const lifetime = editor.onDidDispose(dispose)
+  return dispose
+}

package/src/client/pageReload.ts

@@ -0,0 +1,73 @@
+/** Guarded page-only reload; never restarts Host. @author ddj 2026年10月12号 */
+export interface ReloadGuard { check(): string | null; prepare(): void }
+export interface ReloadDeps {
+  flush(): Promise<void>
+  reload(): void
+  notify(message: string): void
+  timeoutMs?: number
+}
+const guards = new Set<ReloadGuard>()
+
+/** @public @author ddj 2026年10月12号 @param guard Live editor checks and view-state capture. @returns Unregister function. */
+export function addReloadGuard(guard: ReloadGuard): () => void {
+  guards.add(guard)
+  return () => { guards.delete(guard) }
+}
+
+/** @private @author ddj 2026年10月12号 @param checks Current editor guards. @returns First unsafe state, or null. */
+function reloadBlock(checks: Iterable<ReloadGuard>): string | null {
+  for (const guard of checks) {
+    const reason = guard.check()
+    if (reason) return reason
+  }
+  return null
+}
+
+/** @public @author ddj 2026年10月12号 @param deps Page operations. @param checks Live editor guards. @returns Serialized request and cancellation. @sideEffects Flushes view state then reloads only when still safe. */
+export function createPageReload(deps: ReloadDeps, checks: Iterable<ReloadGuard> = guards) {
+  let busy = false
+  let disposed = false
+  /** @private @author ddj 2026年10月12号 @returns Completion of one guarded reload attempt. */
+  async function request(): Promise<void> {
+    if (busy || disposed) return
+    busy = true
+    let timer: ReturnType<typeof setTimeout> | undefined
+    try {
+      const reason = reloadBlock(checks)
+      if (reason) { deps.notify('未刷新：' + reason); return }
+      for (const guard of checks) guard.prepare()
+      const timeout = new Promise<never>((_, reject) => {
+        timer = setTimeout(() => reject(new Error('界面状态保存超时')), deps.timeoutMs ?? 5000)
+      })
+      await Promise.race([deps.flush(), timeout])
+      if (disposed) return
+      const changed = reloadBlock(checks)
+      if (changed) { deps.notify('未刷新：' + changed); return }
+      deps.reload()
+    } catch (error) {
+      if (!disposed) deps.notify('未刷新：' + String(error))
+    } finally {
+      clearTimeout(timer)
+      busy = false
+    }
+  }
+  return { request, dispose: () => { disposed = true } }
+}
+
+/** @public @author ddj 2026年10月12号 @returns Whether no live modal blocks page commands. */
+export function pageKeysAllowed(): boolean {
+  if (typeof document === 'undefined') return true
+  return document.querySelector('[role="dialog"], [aria-modal="true"]') === null
+}
+
+/** @public @author ddj 2026年10月12号 @param flush Durable UI-state flush. @param notify User-visible failure sink. @returns Root-scope listener disposer. */
+export function installPageReload(flush: () => Promise<void>, notify: (message: string) => void): () => void {
+  const controller = createPageReload({ flush, notify, reload: () => window.location.reload() })
+  /** @private @author ddj 2026年10月12号 Ignores modal-blocked commands even from programmatic callers. */
+  const onReload = (): void => { if (pageKeysAllowed()) void controller.request() }
+  window.addEventListener('edrv.command.reloadWindow', onReload)
+  return () => {
+    controller.dispose()
+    window.removeEventListener('edrv.command.reloadWindow', onReload)
+  }
+}

package/src/client/shortcutsOfficial.ts

@@ -11,6 +11,15 @@ import { bindingToChord, chordToBinding, defaultKeybindings, normalizeKeybinding
 import { applyKeyAria, matchEvent, parseChords } from './keybindings.js'
 import type { OfficialBinding, ShortcutProfileKey } from '../shared/keybindings.js'
 import { log } from './log.js'
+import { hasCodeFocus } from './editorModelState.js'
+import { pageKeysAllowed } from './pageReload.js'
+
+/** @private @author ddj 2026年10月12号 @param id Command id. @param target Shortcut target. @returns Whether new page commands can safely run from this context. */
+function shortcutAllowed(id: string, target?: unknown): boolean {
+  if (id === 'edrv.toggleComment' || id === 'edrv.duplicateLine') return pageKeysAllowed() && hasCodeFocus(target)
+  if (id === 'edrv.reloadWindow') return pageKeysAllowed()
+  return true
+}
 
 const bridgeLog = log.child('shortcuts-official')
 
@@ -197,6 +206,7 @@ export function installLegacyKeys(
   const onKey = (event: Event): void => {
     if (disposed) return
     const key = event as KeyboardEvent
+    if (key.isComposing || key.keyCode === 229 || key.defaultPrevented) return
     const current = chords()
     for (const def of defs) {
       const chord = current[def.id]
@@ -206,7 +216,8 @@ export function installLegacyKeys(
         bindings = parseChords(chord)
         cache.set(chord, bindings)
       }
-      if (!matchEvent(key, bindings) || !runner.isAvailable(def.id)) continue
+      if (def.id === 'edrv.duplicateLine') continue // Monaco owns Ctrl+D; no global duplicate dispatch.
+      if (!matchEvent(key, bindings) || !shortcutAllowed(def.id, key.target) || !runner.isAvailable(def.id)) continue
       key.preventDefault()
       key.stopPropagation()
       runner.run(def.id)
@@ -239,8 +250,8 @@ export function officialCommandOf(def: { id: string; label: string }, runner: Co
     defaults: undefined,
     regions: ['page', 'editable'],
     modals: [],
-    resolve: () => {
-      if (!runner.isAvailable(def.id)) return { status: 'pass' }
+    resolve: (context) => {
+      if (context.modal !== null || !shortcutAllowed(def.id, context.target) || !runner.isAvailable(def.id)) return { status: 'pass' }
       return {
         status: 'handled',
         run: () => {

package/src/client/state/uiStatePersist.ts

@@ -101,6 +101,8 @@ export interface UiStateMirror {
   hydrate(): Promise<number>
   /** 立即上送待推送批次，返回最终丢弃的键数（0 = 全部落盘；供卸载与测试驱动）。 */
   flush(): Promise<number>
+  /** Refresh-only strict resend; rejects on lost current state. */
+  flushStrict(): Promise<void>
   /** 是否已完成一次水合。 */
   hydrated(): boolean
   /** 水合阶段是否已结束（成功或重试耗尽）。未结束时界面不应写入存档，否则会把空初值推给 host。 */
@@ -269,6 +271,19 @@ export function createUiStateMirror(deps: UiStateMirrorDeps): UiStateMirror {
     return run
   }
 
+  /** @private @author ddj 2026年10月12号 @returns Durable refresh snapshot. @throws When state is unreadable, unsettled or rejected by Host. @sideEffects Resends current local state after waiting for inflight writes. */
+  async function flushStrict(): Promise<void> {
+    if (!settleDone || !installed) throw new Error('界面状态镜像尚未就绪')
+    if (inflight) await inflight
+    // Read directly: the lenient key scanner intentionally hides storage errors.
+    for (let index = 0; index < storage.length; index++) {
+      const key = storage.key(index)
+      if (key && isMirroredKey(key)) queue(key, storage.getItem(key))
+    }
+    const lost = await flush()
+    if (lost > 0) throw new Error('界面状态保存失败（' + lost + ' 个键）：' + lastError)
+  }
+
   /** 回填本地缺失键（本地已有值一律保留）。 */
   function applyHydration(snapshot: UiStateSnapshot): number {
     let filled = 0
@@ -393,6 +408,7 @@ export function createUiStateMirror(deps: UiStateMirrorDeps): UiStateMirror {
     },
     hydrate,
     flush,
+    flushStrict,
     hydrated(): boolean {
       return done
     },
@@ -559,4 +575,10 @@ export function onUiStateReady(listener: () => void): () => void {
 export async function flushUiState(): Promise<void> {
   if (singleton) await singleton.flush()
 }
+
+/** @public @author ddj 2026年10月12号 @returns Durable page state. @throws If the mirror is unavailable or cannot persist. */
+export async function flushPageState(): Promise<void> {
+  if (!singleton) throw new Error('界面状态镜像不可用')
+  await singleton.flushStrict()
+}
 // --endregion

package/src/client/ui/EditorView.ts

@@ -14,6 +14,8 @@ import { bindPanelCommand } from '../panelCommands.js'
 import { dbg, isDebug, rpc } from '../rpc.js'
 import { emitFileChanged, emitRefresh } from '../events.js'
 import { langOf, loadMonaco, snippetLanguageOf } from '../monaco/loader.js'
+import { bindEditActions, runEditAction } from '../monaco/editActions.js'
+import { addReloadGuard } from '../pageReload.js'
 import { clampZoom, clearZoomMem, dataUrlOf, isImagePath, isSvgPath, recallZoom, rememberZoom, zoomKeyOf, zoomStepOf } from '../imagePreview.js'
 import { isMarkdownPath } from '../markdownPreview.js'
 import { setActiveEditorPath } from '../activePathStore.js'
@@ -565,6 +567,24 @@ export function EditorView(props) {
   const saveViewState = (path) => viewKeeperRef.current?.save(path)
   saveViewStateRef.current = saveViewState
 
+  React.useEffect(() => {
+    /** @private @author ddj 2026年10月12号 @returns Unsafe editor state without saving or discarding file content. */
+    function checkReload() {
+      if (Object.values(dirtyRef.current).some(Boolean)) return '存在未保存文件'
+      if (saveTimerRef.current.isPending() || savingRef.current.size) return '文件正在等待保存或保存中'
+      for (const ctl of pdfCtlRef.current.values()) {
+        if (ctl.isDirty?.()) return '存在未保存 PDF'
+      }
+      for (const path of tabPathsRef.current) {
+        if (readSync(scope, path)) return '存在外部文件冲突'
+      }
+      return null
+    }
+    /** @private @author ddj 2026年10月12号 Captures view state only; never flushes file auto-save. */
+    function prepareReload() { saveViewStateRef.current?.() }
+    return addReloadGuard({ check: checkReload, prepare: prepareReload })
+  }, [scope])
+
   /** @private @author ddj 2026年10月09号 ref 脱离与 effect 卸载共用：保存视图/查找后销毁，重复调用无副作用。 */
   const disposeEditor = React.useCallback(() => {
     viewKeeperRef.current?.dispose()
@@ -1690,6 +1710,9 @@ export function EditorView(props) {
       ['edrv.command.svnTortoiseDiff', () => runSvnTortoise('diff', activeRef.current)],
       ['edrv.command.svnTortoiseBlame', () => runSvnTortoise('blame', activeRef.current)],
       ['edrv.command.svnTortoiseRevert', () => runSvnTortoise('revert', activeRef.current)],
+      ['edrv:reload-status', (event) => setStatus(event.detail)],
+      ['edrv.command.toggleComment', () => runEditAction(editorRef.current, monacoRef.current, 'editor.action.commentLine')],
+      ['edrv.command.duplicateLine', () => runEditAction(editorRef.current, monacoRef.current, 'editor.action.copyLinesDownAction')],
       // 转到行：转发 Monaco 原生 action（widget 本体/占位/跳转全原生，插件只补键位与命令栏入口）
       ['edrv.command.goToLine', () => {
         const ed = editorRef.current
@@ -1702,7 +1725,7 @@ export function EditorView(props) {
     const onCommand = (event) => {
       const action = byName.get(event.type)
       if (!action) return
-      try { action() } catch (error) { dbg(sessionId, '指令 ' + event.type + ' 失败：' + String(error)) }
+      try { action(event) } catch (error) { dbg(sessionId, '指令 ' + event.type + ' 失败：' + String(error)) }
     }
     for (const [eventName] of handlers) window.addEventListener(eventName, onCommand)
     return () => {
@@ -2157,6 +2180,7 @@ export function EditorView(props) {
       // AI 内联补全（ghost text）：开关经 edrv.ai.configGet 拉取；provider 见 client/ai/inlineProvider
       inlineSuggest: { enabled: true },
     })
+    bindEditActions(ed, m)
     // 保存改由窗口级快捷键监听执行（键位可配置；见上方 edrv.save 监听）
     ed.onDidChangeModelContent(() => {
       if (!ed.getModel() || programmaticRef.current) return

package/src/client/ui/commandCatalog.ts

@@ -7,6 +7,7 @@
  * 作者 ddj 2026年09月10号
  */
 import { panelAvailable, runPanelCommand } from '../panelCommands.js'
+import { pageKeysAllowed } from '../pageReload.js'
 import { hasEditorModel, hasOpenTabs } from '../editorModelState.js'
 import { activeEditorPath } from '../activePathStore.js'
 import { isMarkdownPath } from '../markdownPreview.js'
@@ -195,6 +196,21 @@ function svnEventOf(action: SvnActionDef): string {
  * @author ddj 2026年09月10号 / 2026年10月
  */
 export const EDITOR_COMMANDS: readonly CommandDef[] = [
+  {
+    id: 'edrv.toggleComment', label: '切换行注释', category: '编辑', order: 20,
+    available: needsModel,
+    run: () => emit('toggleComment'),
+  },
+  {
+    id: 'edrv.duplicateLine', label: '向下复制行（Ctrl+D，编辑器本地）', category: '编辑', order: 30,
+    available: needsModel,
+    run: () => emit('duplicateLine'),
+  },
+  {
+    id: 'edrv.reloadWindow', label: '刷新当前界面（不重启 Host）', category: '视图', order: 40,
+    available: pageKeysAllowed,
+    run: () => emit('reloadWindow'),
+  },
   {
     id: 'edrv.save', label: '保存文件', category: '文件', order: 10,
     available: needsModel,

package/src/shared/keybindings.ts

@@ -13,6 +13,9 @@
 /** 命令 id → 默认键位（可为多候选）。命令目录以此为准，新增命令只需加一项。 */
 export const KEYBINDING_DEFAULTS: Record<string, string> = {
   'edrv.save': 'Ctrl+S',
+  'edrv.toggleComment': 'Ctrl+Alt+/',
+  'edrv.duplicateLine': '', // Ctrl+D is Monaco-local, never a page-wide binding.
+  'edrv.reloadWindow': '', // Desktop-only defaults are declared below.
   'edrv.quickOpen': 'Ctrl+P',
   'edrv.toggleSidebar': 'Ctrl+B',
   'edrv.searchInFiles': 'Ctrl+Shift+F',
@@ -206,6 +209,19 @@ function bind(code: string, modifiers: OfficialModifier[]): OfficialBinding {
  */
 export const SHORTCUT_PROFILES: Record<string, ShortcutProfiles> = {
   'edrv.toggleSidebar': {},
+  'edrv.duplicateLine': {},
+  'edrv.toggleComment': {
+    'desktop:macos': bind('Slash', ['primary', 'alt']),
+    'desktop:windows': bind('Slash', ['primary', 'alt']),
+    'desktop:linux': bind('Slash', ['primary', 'alt']),
+    'web:macos': bind('Slash', ['primary', 'alt']),
+    'web:windows': bind('Slash', ['primary', 'alt']),
+  },
+  'edrv.reloadWindow': {
+    'desktop:macos': bind('KeyR', ['primary', 'shift']),
+    'desktop:windows': bind('KeyR', ['primary', 'shift']),
+    'desktop:linux': bind('KeyR', ['primary', 'shift']),
+  },
   'edrv.save': {
     'desktop:macos': bind('KeyS', ['primary']),
     'desktop:windows': bind('KeyS', ['primary']),