dsh-vscode-mode 0.14.5 → 0.14.7

package/src/client/sidebar/panels/useExplorerSvn.ts

@@ -0,0 +1,141 @@
+/** Explorer lifecycle: local refresh is offline, remote checks are explicit. @author ddj 2026年10月09号 */
+import React from 'react'
+import { bindSvnScope } from '../../svnNotice.js'
+import { rpc } from '../../rpc.js'
+import { explorerPathOf, remoteIndexOf } from '../../../shared/svnExplorer.js'
+import type { SvnViewRequest, SvnViewRow } from '../../../shared/svnExplorer.js'
+import { ExplorerViewClient } from './explorerView.js'
+import type { ExplorerNotice, ExplorerView } from './explorerView.js'
+import type { SvnRemoteOutdatedEntry } from '../../../shared/svn.js'
+import type { SidebarCtx } from '../types.js'
+
+interface LocalSnapshot { view: ExplorerView; key: string }
+
+// --region Explicit repository check
+/** @private @author ddj 2026年10月09号 @param ctx Sidebar context. @param local Confirmed snapshot. @returns Expiring read-only remote evidence and check action. */
+function useRemoteCheck(ctx: SidebarCtx | undefined, local: LocalSnapshot | null, resetToken: number, scope: string) {
+  const [remote, setRemote] = React.useState<Map<string, number> | null>(null)
+  const [message, setMessage] = React.useState('')
+  const [busy, setBusy] = React.useState(false)
+  const control = React.useRef<AbortController | null>(null)
+  const epoch = React.useRef(0)
+  const expiry = React.useRef<ReturnType<typeof setTimeout> | null>(null)
+
+  /** @private @author ddj 2026年10月09号 Cancel stale request/timer without updating an unmounted component. */
+  function cancel() {
+    epoch.current++
+    control.current?.abort()
+    control.current = null
+    if (expiry.current) clearTimeout(expiry.current)
+    expiry.current = null
+  }
+  /** @private @author ddj 2026年10月09号 @returns Cleanup; scope/local changes invalidate repository evidence. */
+  function reset() { cancel(); setRemote(null); setMessage(''); setBusy(false); return cancel }
+  React.useEffect(reset, [scope, resetToken])
+
+  /** @public @author ddj 2026年10月09号 Contact repository once; failures/expiry never imply up-to-date. */
+  async function checkRemote() {
+    if (!local || control.current) return
+    cancel()
+    setRemote(null)
+    const controller = new AbortController()
+    control.current = controller
+    const seq = epoch.current
+    setBusy(true)
+    setMessage('正在检查仓库更新（只读）…')
+    try {
+      const out = await rpc('svn.remoteStatus', { sessionId: ctx?.sessionId, path: '' }, controller.signal)
+      if (controller.signal.aborted || seq !== epoch.current) return
+      if (!out.ok) { setMessage(out.error); return }
+      /** @private @author ddj 2026年10月09号 @param entry WC-relative change. @returns Session subset. */
+      function scopeEntry(entry: SvnRemoteOutdatedEntry): SvnRemoteOutdatedEntry[] {
+        const path = explorerPathOf(entry.path, local!.view.prefix)
+        return path === null ? [] : [{ ...entry, path }]
+      }
+      const scoped = out.outdated.flatMap(scopeEntry)
+      setRemote(remoteIndexOf(scoped))
+      setMessage('检查于 ' + new Date().toLocaleTimeString() + '：' + scoped.length + ' 项可更新'
+        + (out.truncated ? '（结果不完整）' : '') + (out.againstRev === null ? '' : '，仓库 r' + out.againstRev))
+      /** @private @author ddj 2026年10月09号 Expire evidence; no automatic repository recheck. */
+      function expire() { setRemote(null); setMessage('远端检查已过期，请重新检查仓库更新') }
+      expiry.current = setTimeout(expire, 60_000)
+    } catch (error) { if (!controller.signal.aborted && seq === epoch.current) setMessage(String(error)) }
+    finally { if (seq === epoch.current) { control.current = null; setBusy(false) } }
+  }
+  return { remote, message, busy, checkRemote }
+}
+// --endregion
+
+/** @private @author ddj 2026年10月10号 @param view Compact metadata. @returns Honest refresh/failure/last-confirmed status. */
+function localMessage(view?: ExplorerView): string {
+  if (!view) return '正在读取本地 SVN 状态…'
+  const time = view.confirmedAt ? '；最后确认 ' + new Date(view.confirmedAt).toLocaleTimeString() : '；尚未确认'
+  if (view.error) return 'SVN 状态陈旧：' + view.error + time
+  return (view.refreshing ? 'SVN 状态刷新中' : view.complete ? 'SVN 本地状态已确认' : 'SVN 状态未完整确认') + time
+}
+// --region Offline local status
+/** @public @author ddj 2026年10月09号 @param ctx Sidebar context. @returns Scope-bound local/remote icons; unknown entries never show green. */
+export function useExplorerSvn(ctx: SidebarCtx | undefined, rows: readonly SvnViewRow[] = []) {
+  const [local, setLocal] = React.useState<LocalSnapshot | null>(null)
+  const [remoteToken, setRemoteToken] = React.useState(0)
+  const owner = React.useRef<ExplorerViewClient | null>(null)
+  const ready = ctx?.svn?.managed === true && ctx?.svn?.svnCli === true
+  const scope = ctx?.scope ?? ctx?.sessionId ?? ''
+  const key = JSON.stringify([scope, ready])
+  const snapshot = local?.key === key ? local : null
+  const remote = useRemoteCheck(ctx, snapshot, remoteToken, key)
+
+  /** @private @author ddj 2026年10月10号 @returns Scope owner cleanup; late results cannot populate a new workspace. */
+  function mount() {
+    setLocal(null)
+    bindSvnScope(ctx?.sessionId, scope)
+    if (!ready) return
+    /** @private @author ddj 2026年10月10号 @param view Compact state. Publish only this mounted scope. */
+    function publish(view: ExplorerView) { setLocal({ view, key }) }
+    /** @private @author ddj 2026年10月10号 Invalidate explicit remote evidence after non-text changes. */
+    function dropRemote() { setRemoteToken((value) => value + 1) }
+    /** @private @author ddj 2026年10月10号 @param args Compact projection. @param signal UI fetch lifetime. @returns Authenticated response. */
+    function fetch(args: SvnViewRequest, signal: AbortSignal) { return rpc('svn.explorerView', args, signal) }
+    const client = new ExplorerViewClient(scope, fetch, publish, dropRemote)
+    client.sessionId = ctx?.sessionId
+    owner.current = client
+    client.setRows(rows)
+    client.visibility(document.visibilityState !== 'hidden')
+    return () => { client.dispose(); if (owner.current === client) owner.current = null }
+  }
+  React.useEffect(mount, [key])
+  /** @private @author ddj 2026年10月10号 Row expansion/session switch only reprojects; Host owns shared workspace cache. */
+  function project() {
+    bindSvnScope(ctx?.sessionId, scope)
+    if (owner.current) { owner.current.sessionId = ctx?.sessionId; owner.current.setRows(rows) }
+  }
+  React.useEffect(project, [rows, ctx?.sessionId])
+  /** @private @author ddj 2026年10月10号 Unknown changes-list origins calibrate once; known event bursts are already scheduled. */
+  function changes() { owner.current?.changes() }
+  React.useEffect(changes, [ctx?.svnChanges])
+
+  /** @private @author ddj 2026年10月10号 @returns Scoped notices/focus/visibility listener cleanup. */
+  function listen() {
+    /** @private @author ddj 2026年10月10号 @param event Pathful or legacy notification. Legacy unknown scope safely falls back to full. */
+    function notice(event: Event) {
+      const detail = (event as CustomEvent<ExplorerNotice & { path?: string }>).detail ?? {}
+      owner.current?.notify({ ...detail, paths: detail.paths ?? (detail.path ? [detail.path] : undefined) })
+    }
+    /** @private @author ddj 2026年10月10号 Trigger only offline calibration; focus and visibility coalesce. */
+    function visibility() { owner.current?.visibility(document.visibilityState !== 'hidden') }
+    window.addEventListener('edrv:refresh', notice)
+    window.addEventListener('edrv:file-changed', notice)
+    window.addEventListener('focus', visibility)
+    document.addEventListener('visibilitychange', visibility)
+    return () => {
+      window.removeEventListener('edrv:refresh', notice); window.removeEventListener('edrv:file-changed', notice)
+      window.removeEventListener('focus', visibility); document.removeEventListener('visibilitychange', visibility)
+    }
+  }
+  React.useEffect(listen, [])
+  /** @public @author ddj 2026年10月10号 Request an explicit offline full scan. */
+  function refreshLocal() { owner.current?.refresh() }
+  return { ...remote, local: snapshot?.view.marks ?? null, remote: snapshot ? remote.remote : null,
+    message: localMessage(snapshot?.view) + (remote.message ? '；' + remote.message : ''), canCheck: ready && snapshot !== null, refreshLocal }
+}
+// --endregion

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/styles/editor.css

@@ -277,6 +277,16 @@
 /* 树行图标：官方原语（文件夹/文件类型），尺寸与行高对齐 @author ddj 2026-09-10 */
 [data-edrv-view] .edrv-tree-icon { flex-shrink: 0; display: inline-flex; align-items: center; color: var(--dsw-alias-label-tertiary, #9aa5b1); }
 [data-edrv-view] .edrv-tree-row.edrv-tree-active .edrv-tree-icon { color: var(--dsw-alias-label-secondary, #52606d); }
+/* SVN overlays: official file icon remains visible, independent local/remote signs. ddj 2026-10-09 */
+[data-edrv-view] .edrv-tree-iconbox { position: relative; display: inline-flex; width: 20px; height: 20px; align-items: center; flex-shrink: 0; }
+[data-edrv-view] .edrv-svn-overlay { position: absolute; inset: 0; }
+[data-edrv-view] .edrv-svn-local { position: absolute; right: -1px; bottom: -2px; display: flex; border-radius: 50%; box-shadow: 0 0 0 1px var(--dsw-alias-bg-layer-1, #fff); }
+[data-edrv-view] .edrv-svn-icon-clean { color: #16853b; }
+[data-edrv-view] .edrv-svn-icon-modified, [data-edrv-view] .edrv-svn-icon-deleted { color: #d12e35; }
+[data-edrv-view] .edrv-svn-icon-conflict { color: #c27300; }
+[data-edrv-view] .edrv-svn-icon-added { color: #2465c9; }
+[data-edrv-view] .edrv-svn-icon-unversioned, [data-edrv-view] .edrv-svn-icon-ignored, [data-edrv-view] .edrv-svn-icon-external { color: #75808c; }
+[data-edrv-view] .edrv-svn-remote { position: absolute; right: -3px; top: -4px; color: #2465c9; background: var(--dsw-alias-bg-layer-1, #fff); border-radius: 3px; font-size: 11px; font-weight: 900; line-height: 12px; }
 [data-edrv-view] .edrv-rail-badge { position: absolute; top: 2px; right: 2px; min-width: 14px; height: 14px; padding: 0 3px; border-radius: 999px; background: var(--dsw-alias-brand-primary, #0f9d58); color: var(--dsw-alias-label-primary-inverted, #fff); font-size: 9px; font-weight: 600; line-height: 14px; text-align: center; box-sizing: border-box; }
 [data-edrv-view] .edrv-side-body { flex: 1; min-width: 0; min-height: 0; display: flex; overflow: hidden; }
 [data-edrv-view] .edrv-side-panel { flex: 1; min-width: 0; min-height: 0; display: flex; flex-direction: column; position: relative; }
@@ -298,6 +308,8 @@
 [data-edrv-view] .edrv-tree-name.edrv-tree-dim { color: var(--dsw-alias-label-tertiary, #9aa5b1); }
 [data-edrv-view] .edrv-tree-badge { min-width: 14px; height: 14px; padding: 0 4px; border-radius: 999px; background: var(--dsw-alias-state-warn-primary, #d97706); color: var(--dsw-alias-label-primary-inverted, #fff); font-size: 9px; font-weight: 600; line-height: 14px; text-align: center; box-sizing: border-box; flex-shrink: 0; }
 [data-edrv-view] .edrv-tree-loading { height: 22px; line-height: 22px; color: var(--dsw-alias-label-tertiary, #9aa5b1); font-size: 11px; }
+/* SVN 状态独立占位：换行不覆盖文件树，长错误在栏内滚动。@author ddj 2026-10-12 */
+[data-edrv-view] .edrv-tree-status { flex: 0 0 auto; min-width: 0; max-height: 96px; overflow: auto; padding: 4px 8px; box-sizing: border-box; line-height: 18px; white-space: normal; overflow-wrap: anywhere; color: var(--dsw-alias-label-tertiary, #9aa5b1); font-size: 11px; }
 [data-edrv-view] .edrv-tree-error { display: flex; align-items: center; gap: 8px; margin: 4px 2px 6px; padding: 6px 8px; border: 1px solid var(--dsw-alias-state-error-primary, rgba(217,83,79,.4)); border-radius: 6px; background: var(--dsw-alias-interactive-bg-hover-danger, rgba(217,83,79,.12)); color: var(--dsw-alias-state-error-primary, #d9534f); font-size: 11px; }
 /* 大纲面板：kind 字形 / detail / 行号 */
 [data-edrv-view] .edrv-outline-kind { display: inline-flex; align-items: center; justify-content: center; width: 14px; flex-shrink: 0; font-size: 12px; font-weight: 600; text-align: center; }

package/src/client/svnNotice.ts

@@ -0,0 +1,24 @@
+/** SVN mutation notifications, independent of UI stores. @author ddj 2026年10月10号 */
+import type { RpcMethod, RpcRequestMap } from '../shared/rpc.js'
+let sequence = 0
+const scopes = new Map<string, string>()
+/** @public @author ddj 2026年10月10号 @param sessionId Active session. @param scope Canonical client workspace. Record bounded routing hints; unknown sessions invalidate globally, never misapply relative paths. */
+export function bindSvnScope(sessionId: string | undefined, scope: string): void {
+  if (!sessionId) return
+  scopes.delete(sessionId); scopes.set(sessionId, scope)
+  if (scopes.size > 512) scopes.delete(scopes.keys().next().value!)
+}
+const WRITES = new Set<RpcMethod>(['svn.add', 'svn.revert', 'svn.ignore', 'svn.cleanup', 'svn.update', 'svn.tortoise'])
+/** @public @author ddj 2026年10月10号 @param method RPC operation. @returns Whether local evidence may change (launching a writable native dialog counts, not its completion). */
+export function isSvnWrite(method: RpcMethod): boolean { return WRITES.has(method) }
+/** @public @author ddj 2026年10月10号 @param method Operation. @param args Typed request. @param ok Completed successfully. Notify even failed/partially applied operations; no repository access. */
+export function svnNotice<M extends RpcMethod>(method: M, args: RpcRequestMap[M], ok: boolean): void {
+  if (!isSvnWrite(method) || typeof window === 'undefined') return
+  const request = args as { sessionId?: string; path?: string; paths?: string[]; action?: string; items?: { dir: string }[] }
+  if (method === 'svn.tortoise' && !['commit', 'revert'].includes(request.action ?? '')) return
+  const scope = request.sessionId ? scopes.get(request.sessionId) : undefined
+  let paths: string[] | undefined
+  if (scope && ok && method !== 'svn.cleanup') paths = request.paths ?? request.items?.map((item) => item.dir) ?? (request.path ? [request.path] : undefined)
+  window.dispatchEvent(new CustomEvent('edrv:refresh', { detail: { scope, paths,
+    kind: 'svn', eventId: 'svn-write-' + Date.now() + '-' + (++sequence) } }))
+}

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），
@@ -1166,14 +1143,14 @@ export function EditorView(props) {
   const onDiskChange = (change) => {
     if (!change || !change.path) return
     // 文件树同步：目录缓存按该路径失效并强制重列（外部新增/删除/改名都能看到）
-    emitFileChanged(change.path)
+    const eventId = emitFileChanged(change.path, { scope, kind: change.kind === 'deleted' ? 'structure' : 'text' })
     if (change.kind === 'modified') {
       // 干净缓冲：强制从磁盘重读（跳过 model 复用），差异标记随之重算
       loadContent(change.path, sessionId, true)
       clearSync(scope, change.path)
       setDiskFlag((prev) => (prev && prev.path === change.path ? null : prev))
       setStatus('已同步外部修改 ' + new Date().toTimeString().slice(0, 8))
-      emitRefresh()
+      emitRefresh({ scope, paths: [change.path], kind: 'text', eventId })
       return
     }
     const kind = change.kind === 'deleted' ? 'deleted' : 'conflict'
@@ -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 {
@@ -1992,7 +1968,7 @@ export function EditorView(props) {
         clearSync(scope, path)
         acceptSaved(path, text, savedModel)
         refreshRecords()
-        emitRefresh()
+        emitRefresh({ scope, paths: [path], kind: 'text' })
         // 片段配置文件保存后失效补全缓存（下次补全即读到新片段）
         if (/\.code-snippets$/i.test(path)) window.dispatchEvent(new CustomEvent('edrv:snippets-changed'))
         return
@@ -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，与差异/下划线互不干扰）；
@@ -2580,7 +2556,7 @@ export function EditorView(props) {
         setDirtyMap((d) => Object.assign({}, d, { [path]: false }))
         setDiskFlag((prev) => (prev && prev.path === path ? null : prev))
         setStatus('已覆盖磁盘')
-        emitRefresh()
+        emitRefresh({ scope, paths: [path], kind: 'text' })
         return
       }
       setStatus('覆盖失败')
@@ -2793,7 +2769,7 @@ export function EditorView(props) {
       // #endregion
       if (res && res.ok) {
         setRecords((prev) => Object.assign({}, prev, { [region.callId]: res.record }))
-        if (!silent) { reloadFile(); emitRefresh() }
+        if (!silent) { reloadFile(); emitRefresh({ scope, paths: [res.record?.path || active], kind: 'structure' }) }
         return true
       }
       if (!silent) setError(res?.error ? String(res.error) : '操作失败')
@@ -2882,7 +2858,7 @@ export function EditorView(props) {
     actMany(decideRegions.map((r) => itemOf(r, false))).then((result) => {
       batchBusyRef.current = false
       reloadFile(true)
-      emitRefresh()
+      emitRefresh({ scope, paths: active ? [active] : undefined, kind: 'structure' })
       setStatus(decideStatus('已采纳 ', result))
       if (result.fail) setError(result.fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
     }).catch(() => { batchBusyRef.current = false })
@@ -2893,7 +2869,7 @@ export function EditorView(props) {
     actMany([...decideRegions].reverse().map((r) => itemOf(r, true))).then((result) => {
       batchBusyRef.current = false
       reloadFile(true)
-      emitRefresh()
+      emitRefresh({ scope, paths: active ? [active] : undefined, kind: 'structure' })
       setStatus(decideStatus('已不采纳 ', result))
       if (result.fail) setError(result.fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
     }).catch(() => { batchBusyRef.current = false })
@@ -2923,10 +2899,11 @@ export function EditorView(props) {
     if (batchBusyRef.current || !allPending.length) return
     batchBusyRef.current = true
     const list = reject ? [...allPending].sort((a, b) => (a.at < b.at ? 1 : a.at > b.at ? -1 : b.idx - a.idx)) : allPending
+    const paths = [...new Set(list.map((r) => records[r.callId]?.path).filter(Boolean))]
     actMany(list.map((r) => itemOf(r, reject))).then((result) => {
       batchBusyRef.current = false
       reloadFile(true)
-      emitRefresh()
+      emitRefresh({ scope, paths: paths.length ? paths : undefined, kind: 'structure' })
       setStatus(decideStatus(reject ? '已不采纳 ' : '已采纳 ', result))
       if (result.fail) setError(result.fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
     }).catch(() => { batchBusyRef.current = false })
@@ -2939,7 +2916,7 @@ export function EditorView(props) {
     rpc('edrv.rollback', { sessionId, path: active }).then((res) => {
       if (res && res.ok) {
         setStatus('已回滚'); reloadFile()
-        emitRefresh()
+        emitRefresh({ scope, paths: [active], kind: 'structure' })
       } else setError(res?.error ? String(res.error) : '回滚失败')
     }).catch((e) => setError('回滚异常:' + String(e)))
   }
@@ -4221,7 +4198,7 @@ export function EditorView(props) {
     setStatus(message)
     setRecentUpdate({ path: result.target, sessionId, scope, resumeJobId: result.jobId })
     refreshSvnChanges(sessionId, scope)
-    emitRefresh()
+    emitRefresh({ scope, kind: 'svn', eventId: 'svn-update-' + result.jobId })
   }
   const svnUpdateEl = sameUpdateOwner(svnUpdateDialog, sessionId, scope)
     ? React.createElement(SvnUpdateDialog, {

package/src/client/ui/SvnOverlay.ts

@@ -0,0 +1,24 @@
+/** Small vector overlays over official file-type icons. @author ddj 2026年10月09号 */
+import React from 'react'
+import type { SvnExplorerMark, SvnViewMark } from '../../shared/svnExplorer.js'
+/** @public @author ddj 2026年10月10号 @param row Compact mark. @returns Overlay description; stale evidence never renders a green check. */
+export function viewOverlayOf(row?: SvnViewMark): SvnExplorerMark | null {
+  if (!row?.kind || (row.stale && row.kind === 'clean')) return null
+  const names = { clean: '本地正常（不表示仓库无更新）', modified: '本地修改', conflict: '冲突或阻塞',
+    added: '新增', deleted: '删除或缺失', unversioned: '未受控', ignored: '忽略', external: '外部引用' }
+  return { kind: row.kind, title: names[row.kind] + (row.count ? '；子项 ' + row.count + ' 处变更' : '')
+    + (row.stale ? '；状态陈旧，等待确认' : '') }
+}
+const SIGNS = { clean: '✓', modified: '!', conflict: '×', added: '+', deleted: '−', unversioned: '?', ignored: '·', external: '↗' }
+
+/** @public @author ddj 2026年10月09号 @param mark Confirmed local mark. @param remote Remote changed-item count. @returns Accessible vector overlay; remote arrow coexists with local conflict. */
+export function svnOverlayEl(mark: SvnExplorerMark | null, remote: number): React.ReactElement | null {
+  if (!mark && !remote) return null
+  const title = 'SVN ' + (mark?.title ?? '本地状态未确认') + (remote ? '；仓库有可更新内容（' + remote + ' 项）' : '')
+  const svg = mark ? React.createElement('svg', { viewBox: '0 0 12 12', width: 12, height: 12, 'aria-hidden': true },
+    React.createElement('circle', { cx: 6, cy: 6, r: 5.5, fill: 'currentColor' }),
+    React.createElement('text', { x: 6, y: 9, textAnchor: 'middle', fill: '#fff', fontSize: 9, fontFamily: 'Arial, sans-serif', fontWeight: 700 }, SIGNS[mark.kind])) : null
+  return React.createElement('span', { className: 'edrv-svn-overlay', title, 'aria-label': title, role: 'img' },
+    mark ? React.createElement('span', { className: 'edrv-svn-local edrv-svn-icon-' + mark.kind }, svg) : null,
+    remote ? React.createElement('span', { className: 'edrv-svn-remote', 'aria-hidden': true }, '↓') : null)
+}