dsh-vscode-mode 0.14.5 → 0.14.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "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/state/editorFindState.ts

@@ -0,0 +1,102 @@
+/** Workspace-local Ctrl+F state bridge; ddj 2026年10月09号. */
+export interface FindSnapshot {
+  searchString: string
+  isRevealed: boolean
+  matchCase: boolean
+  wholeWord: boolean
+  isRegex: boolean
+}
+
+interface FindState extends FindSnapshot {
+  change(value: Partial<FindSnapshot> & { searchScope?: null }, moveCursor: boolean): void
+  onFindReplaceStateChange(listener: () => void): { dispose(): void }
+}
+interface FindController {
+  getState(): FindState
+  start(options: Record<string, unknown>, state: FindSnapshot & { searchScope: null }): Promise<unknown>
+}
+export interface FindEditor {
+  getContribution(id: string): unknown
+}
+const snapshots = new Map<string, FindSnapshot>()
+
+/** @private @author ddj 2026年10月09号 @param state Native find state. @returns Only fields safe to share across files. */
+function snapshotOf(state: FindState): FindSnapshot {
+  return {
+    searchString: state.searchString, isRevealed: state.isRevealed,
+    matchCase: state.matchCase, wholeWord: state.wholeWord, isRegex: state.isRegex,
+  }
+}
+
+/** @private @author ddj 2026年10月09号 @param editor Monaco editor. @returns Supported controller, or null for native-only fallback. */
+function controllerOf(editor: FindEditor): FindController | null {
+  try {
+    const controller = editor.getContribution('editor.contrib.findController') as FindController | null
+    const state = controller?.getState?.()
+    return state && typeof state.change === 'function'
+      && typeof state.onFindReplaceStateChange === 'function'
+      && typeof controller?.start === 'function' ? controller : null
+  } catch { return null }
+}
+
+/** @private @author ddj 2026年10月09号 @param controller Optional native controller. @param listener State observer. @returns Disposable subscription, or null when the internal API is incompatible. */
+function listenFind(controller: FindController | null, listener: () => void): { dispose(): void } | null {
+  try { return controller?.getState().onFindReplaceStateChange(listener) ?? null } catch { return null }
+}
+
+/** @private @author ddj 2026年10月09号 @param controller Native controller. @param saved Workspace snapshot. @returns Completion when revealing; never focuses or seeds from selection. */
+function applyFind(controller: FindController, saved: FindSnapshot): Promise<unknown> | void {
+  const value = { ...saved, searchScope: null }
+  if (!saved.isRevealed) { controller.getState().change(value, false); return }
+  return controller.start({
+    forceRevealReplace: false, seedSearchStringFromSelection: 'none',
+    seedSearchStringFromNonEmptySelection: false, seedSearchStringFromGlobalClipboard: false,
+    shouldFocus: 0, shouldAnimate: false, updateSearchScope: false, loop: true,
+  }, value)
+}
+
+/** @public @author ddj 2026年10月09号 @param editor Monaco editor. @returns Model-switch bridge; dispose releases the native listener. */
+export function createFindBridge(editor: FindEditor) {
+  const controller = controllerOf(editor)
+  let scope: string | null = null
+  let paused = true
+  let disposed = false
+
+  /** @private @author ddj 2026年10月09号 Capture only user changes, not model-reset or restoration events. */
+  function capture(): void {
+    if (disposed || paused || !scope || !controller) return
+    try {
+      const saved = snapshotOf(controller.getState())
+      snapshots.delete(scope)
+      snapshots.set(scope, saved)
+      if (snapshots.size > 20) snapshots.delete(snapshots.keys().next().value!)
+    } catch { /* A disposed contribution must not interrupt view capture. */ }
+  }
+  const listener = listenFind(controller, capture)
+
+  /** @public @author ddj 2026年10月09号 Save before setModel; suppress Monaco's per-model option resets. */
+  function pause(): void { capture(); paused = true }
+
+  /** @public @author ddj 2026年10月09号 @param nextScope Workspace owning the bound model. Restore with moveCursor=false; no per-file range or match index. */
+  function resume(nextScope: string): void {
+    if (disposed || !controller) return
+    scope = nextScope
+    const saved = snapshots.get(scope) ?? {
+      searchString: '', isRevealed: false, matchCase: false, wholeWord: false, isRegex: false,
+    }
+    try {
+      const result = applyFind(controller, saved)
+      result?.catch(() => {}) // Unsupported internal API leaves native Ctrl+F usable.
+    } catch { /* Internal contribution compatibility must not break the editor. */ }
+    paused = false
+  }
+
+  /** @public @author ddj 2026年10月09号 Save final query and remove listener before editor destruction. */
+  function dispose(): void {
+    if (disposed) return
+    capture()
+    disposed = true
+    try { listener?.dispose() } catch { /* Already disposed by native editor cleanup. */ }
+  }
+  return { pause, resume, dispose }
+}

package/src/client/state/editorViewState.ts

@@ -0,0 +1,56 @@
+/** Model-owned view/find lifecycle; ddj 2026年10月09号. */
+import { createFindBridge, type FindEditor } from './editorFindState.js'
+import { upsertViewState, viewStatesLoad, viewStatesSave } from './viewStateCache.js'
+
+export interface ViewEditor extends FindEditor {
+  getModel(): unknown
+  setModel(model: unknown): void
+  saveViewState(): unknown
+  restoreViewState(state: unknown): void
+  dispose(): void
+}
+
+/** @public @author ddj 2026年10月09号 @param editor Monaco instance. @returns Keeper owning the model's scope/path, independent of React's active closure. */
+export function createViewKeeper(editor: ViewEditor) {
+  const find = createFindBridge(editor)
+  let bound: { scope: string; path: string; model: unknown } | null = null
+  let disposed = false
+
+  /** @public @author ddj 2026年10月09号 @param path Optional expected path; mismatches never write a snapshot under the wrong file. Persist viewport even if cursor never moved. */
+  function save(path?: string): void {
+    if (disposed || !bound || (path && path !== bound.path)) return
+    try {
+      if (editor.getModel() !== bound.model) return
+      const states = viewStatesLoad(bound.scope)
+      const next = upsertViewState(states, bound.path, editor.saveViewState())
+      if (next !== states) viewStatesSave(bound.scope, next)
+    } catch { /* A missing/disposed model must not overwrite a valid snapshot. */ }
+  }
+
+  /** @public @author ddj 2026年10月09号 @param scope Model workspace. @param path Cache path. @param model Ready text model. Restore only on identity change, before explicit navigation effects. */
+  function bind(scope: string, path: string, model: unknown): void {
+    if (disposed || !path || !model) return
+    if (bound?.scope === scope && bound.path === path && bound.model === model
+      && editor.getModel() === model) return
+    save()
+    find.pause()
+    if (editor.getModel() !== model) editor.setModel(model)
+    bound = { scope, path, model }
+    const state = viewStatesLoad(scope)[path]
+    if (state) {
+      try { editor.restoreViewState(state) } catch { /* Stale fold ranges may be invalid. */ }
+    }
+    find.resume(scope)
+  }
+
+  /** @public @author ddj 2026年10月09号 Save before dispose/ref clearing; repeated cleanup is a no-op. */
+  function dispose(): void {
+    if (disposed) return
+    save()
+    find.dispose()
+    disposed = true
+    bound = null
+    editor.dispose()
+  }
+  return { save, bind, dispose }
+}

package/src/client/ui/EditorView.ts

@@ -53,7 +53,7 @@ import { displayDiffTotal, editorDockMode } from '../diffDock.js'
 import { editorHeight } from '../editorLayout.js'
 import { revealInExplorer as revealPathInExplorer } from '../fileReveal.js'
 import { setSidePending, SIDEBAR_INSTALL_CMD } from '../sidebarBridge.js'
-import { upsertViewState, viewStatesLoad, viewStatesSave } from '../state/viewStateCache.js'
+import { createViewKeeper } from '../state/editorViewState.js'
 import { mdPreviewLoad, mdPreviewSave } from '../state/mdPreviewCache.js'
 import { onUiStateReady, reportUiStateEvent, uiStateSettled } from '../state/uiStatePersist.js'
 import { migrateScopedKeys, workspaceScopeOf } from '../state/scopeStore.js'
@@ -333,8 +333,8 @@ export function EditorView(props) {
   const modelsRef = React.useRef(null)
   // model 跨挂载缓存（按工作区作用域）：重挂载秒显内容，消除切换对话闪烁
   if (!modelsRef.current) modelsRef.current = modelsForScope(scope)
-  // 视图状态缓存（path → Monaco viewState；重启后恢复光标/滚动/折叠位置）
-  const viewStatesRef = React.useRef({})
+  // 视图/查找生命周期跟随实际绑定的 model，不能从新一帧 active/scope 猜旧模型归属。
+  const viewKeeperRef = React.useRef(null)
   // 防抖保存槽（arm/flush/cancel；见 saveDebounce.ts 的缺陷说明，勿退回单一取消句柄）
   const saveTimerRef = React.useRef(createSaveTimer())
   const savingRef = React.useRef(new Set()) // 在途保存的路径（关闭前落盘去重，防同内容双发）
@@ -561,39 +561,16 @@ export function EditorView(props) {
     return normalized
   }
 
-  /**
-   * 保存当前活动文件的视图状态（光标/滚动/折叠）到工作区作用域缓存。
-   * @author ddj 2026年08月28号
-   * @param path 要保存的文件路径（缺省 = 当前 active）
-   */
-  const saveViewState = (path) => {
-    const ed = editorRef.current
-    const target = path ?? active
-    if (!ed || !target) return
-    try {
-      const state = ed.saveViewState()
-      if (!state) return
-      viewStatesRef.current = upsertViewState(viewStatesRef.current, target, state)
-      viewStatesSave(scope, viewStatesRef.current)
-    } catch (e) { /* 视图状态保存失败忽略 */ }
-  }
+  /** @private @author ddj 2026年10月09号 @param path 可选预期文件路径。按已绑定模型归属保存，避免新 active 覆盖旧文件状态。 */
+  const saveViewState = (path) => viewKeeperRef.current?.save(path)
   saveViewStateRef.current = saveViewState
 
-  /**
-   * 恢复指定文件的视图状态（内容就绪、setModel 后调用；恢复后即消费删除）。
-   * @author ddj 2026年08月28号
-   * @param path 文件路径
-   */
-  const restoreViewState = (path) => {
-    const ed = editorRef.current
-    if (!ed || !path) return
-    const saved = viewStatesRef.current[path]
-    if (!saved) return
-    const next = Object.assign({}, viewStatesRef.current)
-    delete next[path]
-    viewStatesRef.current = next
-    try { ed.restoreViewState(saved) } catch (e) { /* 恢复失败忽略（行号越界自动兜底） */ }
-  }
+  /** @private @author ddj 2026年10月09号 ref 脱离与 effect 卸载共用：保存视图/查找后销毁，重复调用无副作用。 */
+  const disposeEditor = React.useCallback(() => {
+    viewKeeperRef.current?.dispose()
+    viewKeeperRef.current = null
+    editorRef.current = null
+  }, [])
 
   /**
    * 采集当前焦点条目：路径从编辑器 model 实时读取（避免空依赖闭包读到过期 active），
@@ -1366,7 +1343,6 @@ export function EditorView(props) {
     restoredScopeRef.current = scope
     // model 缓存跟随作用域（切工作区释放旧作用域模型；同工作区跨挂载复用）
     modelsRef.current = modelsForScope(scope)
-    viewStatesRef.current = viewStatesLoad(scope)
     // Markdown 预览态同样按作用域恢复（重启/换端口后由界面状态镜像回填，见 lateHydrateRef 分支）
     mdPreviewRef.current = mdPreviewLoad(String(scope))
     try {
@@ -2077,11 +2053,10 @@ export function EditorView(props) {
     if (!monaco || !editorRef.current || !active || !contentReady) return
     const ed = editorRef.current
     const model = getModel(active, content)
-    if (ed.getModel() !== model) ed.setModel(model)
+    viewKeeperRef.current?.bind(String(scope), active, model)
     syncTypeSuggest(ed, monaco)
-    restoreViewState(active)
     setLoadStage((prev) => ({ progress: Math.max(96, prev.progress), message: '创建编辑器视图…' }))
-  }, [monaco, active, content, contentReady, mdPreviewing, svnDiff])
+  }, [monaco, scope, active, content, contentReady, mdPreviewing, svnDiff])
 
   // PDF 面板外壳 ref 回调（div 仅在 PDF 分支渲染，refs 先于 effect 就绪）
   const ensurePdfHost = (node) => { pdfHostRef.current = node }
@@ -2140,7 +2115,7 @@ export function EditorView(props) {
     // 跳转目标高亮的计时器随卸载清理（装饰随编辑器 dispose 一并消失）
     if (navFlashTimerRef.current) { clearTimeout(navFlashTimerRef.current); navFlashTimerRef.current = null }
     navFlashRef.current = []
-    if (editorRef.current) { editorRef.current.dispose(); editorRef.current = null }
+    disposeEditor()
     // model 不在此销毁：跨挂载缓存按作用域存活（modelCache 切作用域时统一释放）
     for (const ctl of pdfCtlRef.current.values()) ctl.destroy()
     pdfCtlRef.current.clear()
@@ -2155,7 +2130,7 @@ export function EditorView(props) {
   // 普通 Monaco 编辑器（可编辑、单列行号）+ 自绘行内差异（decoration 绿底+ / view zone 删除块）
   const ensureEditor = React.useCallback((node) => {
     if (!node) {
-      if (editorRef.current) { editorRef.current.dispose(); editorRef.current = null }
+      disposeEditor()
       return
     }
     if (editorRef.current || !monacoRef.current) return
@@ -2367,6 +2342,7 @@ export function EditorView(props) {
     }
     node.addEventListener('contextmenu', onBpCtxCapture, true)
     editorRef.current = ed
+    viewKeeperRef.current = createViewKeeper(ed)
   }, [])
 
   // 调试断点装饰：断点表/活动文件变化时全量替换行首圆点（独立 collection，与差异/下划线互不干扰）；