dsh-vscode-mode 0.14.6 → 0.14.8

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/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

@@ -1143,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'
@@ -1968,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
@@ -2556,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('覆盖失败')
@@ -2769,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) : '操作失败')
@@ -2858,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 })
@@ -2869,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 })
@@ -2899,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 })
@@ -2915,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)))
   }
@@ -4197,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)
+}

package/src/dap/manager.ts

@@ -22,7 +22,7 @@ import { childEnv } from '../childEnv.js'
 import { stopTree } from '../processTree.js'
 import { join } from 'node:path'
 import { createFrameParser, encodeMessage } from '../lsp/jsonrpc.js'
-import { sourceBaseOf, sourceKeyOf, sourcePathOf, normalizeSourcePath } from './sourcePath.js'
+import { sourceBaseOf, sourceKeyOf, sourcePathOf, normalizeSourcePath, rankSourceCandidates } from './sourcePath.js'
 import { bpAcksOfResponse, DAP_ACTIONS, needsConfigurationDone, requestOfConfig, threadIdOfStopped, type DapAction, type DapBreakpointInput, type DapBreakpointAck, type DapDebugConfig, type DapEventView, type DapFrameView, type DapPhase, type DapPollResult, type DapScopeView, type DapStateView, type DapVariableView } from '../shared/dap.js'
 import { dapRequest, eventBody, initializeArgs, isDapEvent, isDapResponse, responseBody, type DapEvent, type DapMessage, type DapRequest } from './protocol.js'
 import type { DapAdapterSpec } from './provider.js'
@@ -458,18 +458,50 @@ export class DapSession {
     return '会话在初始化完成前终止（attach/连接目标失败）' + dotrushLog
   }
 
-  /** findFileReq 反向应答：按完整 chunkname 排序工作区候选并缓存首命中。 */
+  /**
+   * 按当前语言过滤并排序源码候选，供反向应答与栈帧解析共用。
+   * @private
+   * @author ddj 2026年10月09号
+   * @param chunk 适配器上报的源码标识
+   * @returns 语言合法、按路径相关度排序的候选
+   */
+  private async sourceCandidates(chunk: string): Promise<string[]> {
+    const files = await this.deps.findFiles(this.workspacePath, chunk)
+    const exts = this.frameExts()
+    const allowed = exts.length ? files.filter((file) => hasSourceExtension(file, exts)) : files
+    return rankSourceCandidates(chunk, allowed, this.workspacePath)
+  }
+
+  /**
+   * 更新源码标识及 basename 缓存；无合法候选时删除旧映射。
+   * @private
+   * @author ddj 2026年10月09号
+   * @param chunk 适配器上报的源码标识
+   * @param file 合法候选首项，空值表示未解析
+   * @description 副作用：更新当前会话源码缓存
+   */
+  private cacheSource(chunk: string, file: string): void {
+    for (const key of [sourceKeyOf(chunk), sourceKeyOf(sourceBaseOf(chunk))]) {
+      if (!key) continue
+      if (file) this.sourceFiles.set(key, file)
+      else this.sourceFiles.delete(key)
+    }
+  }
+
+  /**
+   * findFileReq 反向应答：只返回当前语言合法源码并缓存首命中。
+   * @private
+   * @author ddj 2026年10月09号
+   * @param body 反向请求参数
+   * @description 副作用：更新源码缓存并发送 findFileRsp
+   */
   private async respondFindFile(body: Record<string, unknown>): Promise<void> {
     const seq = typeof body.seq === 'number' ? body.seq : -1
     const chunk = String(body.file ?? '')
-    const files = await this.deps.findFiles(this.workspacePath, chunk)
+    const files = await this.sourceCandidates(chunk)
     log.debug('[dap-trace] findFileReq seq=' + seq + ' chunk=' + chunk + ' candidates=' + files.length + ' first=' + (files[0] ?? ''))
     this.deps.trace?.(this.workspacePath, '[DEBUG findFileReq] seq=' + seq + ' chunk=' + chunk + ' candidates=' + files.length + ' first=' + (files[0] ?? ''))
-    const first = files[0]
-    if (first) {
-      this.sourceFiles.set(sourceKeyOf(chunk), first)
-      this.sourceFiles.set(sourceKeyOf(sourceBaseOf(chunk)), first)
-    }
+    this.cacheSource(chunk, files[0] ?? '')
     this.send({ seq: this.msgSeq++, type: 'request', command: 'findFileRsp', arguments: { seq, files } })
   }
 
@@ -583,27 +615,43 @@ export class DapSession {
     if (phase === 'idle') { this.events = []; this.config = null; this.pid = undefined; this.error = undefined }
   }
 
-  /** 适配器上报路径 → 帧视图（file 始终保留可打开的规范路径）。 */
+  /**
+   * 适配器源码标识转帧视图；完整合法路径优先，错误语言缓存须重新解析。
+   * @private
+   * @author ddj 2026年10月09号
+   * @param item 适配器栈帧
+   * @param index 栈帧下标（EmmyLua frameId）
+   * @returns 保留原始行号、只含合法源码路径的帧视图
+   * @description 副作用：按需查找源码并更新会话缓存
+   */
   private async frameViewOf(item: unknown, index: number): Promise<DapFrameView> {
     const raw = item as Record<string, unknown>
     const source = (raw.source ?? {}) as Record<string, unknown>
     const sourcePath = typeof source.path === 'string' ? source.path : ''
     const sourceName = typeof source.name === 'string' ? source.name : ''
+    const exts = this.frameExts()
     const cached = this.sourceFiles.get(sourceKeyOf(sourcePath)) ?? this.sourceFiles.get(sourceKeyOf(sourceName))
-    let selected = cached || sourcePath || sourceName
-    const needsLookup = !selected || !hasSourceExtension(selected, this.frameExts())
+    const validPath = sourcePath && !isBareChunk(sourcePath)
+      && (exts.length ? hasSourceExtension(sourcePath, exts) : sourceBaseOf(sourcePath).includes('.'))
+    const validCache = cached && (!exts.length || hasSourceExtension(cached, exts))
+    let selected = validPath ? sourcePath : validCache ? cached : sourcePath || sourceName
+    const needsLookup = !validPath && !validCache
+    if (cached && !validCache) {
+      this.cacheSource(sourcePath, '')
+      this.cacheSource(sourceName, '')
+    }
     log.debug('[dap-trace] frame rawPath=' + sourcePath + ' name=' + sourceName + ' cached=' + (cached ?? '') + ' needsLookup=' + needsLookup + ' selected=' + selected)
     this.deps.trace?.(this.workspacePath, '[DEBUG frame] rawPath=' + sourcePath + ' name=' + sourceName + ' cached=' + (cached ?? '') + ' needsLookup=' + needsLookup + ' selected=' + selected)
-    if (!cached && needsLookup) {
-      const candidates = await this.deps.findFiles(this.workspacePath, sourceName || sourcePath)
+    if (needsLookup) {
+      const candidates = await this.sourceCandidates(sourceName || sourcePath)
       log.debug('[dap-trace] frameLookup source=' + (sourceName || sourcePath) + ' candidates=' + candidates.length + ' first=' + (candidates[0] ?? ''))
       this.deps.trace?.(this.workspacePath, '[DEBUG frameLookup] source=' + (sourceName || sourcePath) + ' candidates=' + candidates.length + ' first=' + (candidates[0] ?? ''))
       if (candidates[0]) {
         selected = candidates[0]
-        this.sourceFiles.set(sourceKeyOf(sourceName || sourcePath), candidates[0])
-      } else if (isBareChunk(sourceName || sourcePath)) {
-        // 反查失败 + 裸 chunkname：无可打开路径。置空而非回退原串，
-        // 避免客户端按工作区根拼出必然不存在的路径、打开注定失败的页签。
+        this.cacheSource(sourceName || sourcePath, candidates[0])
+      } else if (exts.length || isBareChunk(sourceName || sourcePath)) {
+        // 反查失败且当前语言已知或只有裸 chunk：不回退到错误语言文件，
+        // 也不让客户端按工作区根拼出不存在的 chunk 路径。
         selected = ''
       }
     }

package/src/index.ts

@@ -2,7 +2,7 @@
 import { registerRoutes } from './routes.js'
 import { captureToolResult } from './capture.js'
 import { closeArchiveDbs } from './archiveDb.js'
-import { handleRpc } from './rpc.js'
+import { handleRpc, integrationBaseUrlOf } from './rpc.js'
 import { newSearcher } from './search/orchestrator.js'
 import { newContentSearcher } from './search/content.js'
 import { installIsolation } from './mcpIsolation.js'
@@ -13,6 +13,7 @@ import type { SettingsDeps } from './fileOpenSettings.js'
 import z from '@deepseek-ai/schemastery'
 import { shellMenuLifecycle } from './integrate.js'
 import { startOpenInbox } from './openInbox.js'
+import { ensureActiveBridge } from './openBridge.js'
 import { installPlanTool } from './svnPlanTool.js'
 import { disposeIndex } from './treeIndex.js'
 import { sweepTreeCache } from './paths.js'
@@ -142,6 +143,13 @@ export async function apply(ctx: Ctx, config?: unknown): Promise<void> {
   await installPlanTool(ctx, submitPlan)
   ctx.effect(mountInbox, 'vscode-mode:open-inbox')
   ctx.effect(() => shellMenuLifecycle(ctx), 'vscode-mode:integration')
+  /** @author ddj 2026年10月12号 @returns Active-profile bridge disposer; failures never block boot. */
+  async function provisionBridge(): Promise<() => void> {
+    try { await ensureActiveBridge(ctx, await integrationBaseUrlOf(ctx)) }
+    catch (error) { noteWarning('外部打开桥接未就绪：' + String(error)) }
+    return () => {}
+  }
+  ctx.effect(provisionBridge, 'vscode-mode:bridge')
   void sweepTreeCache()
   await logCompatSummary(ctx, warnings)
   log.info('编辑差异审查已装配（认证路由、项目 MCP 作用域、SVN 方案工具与外部打开通道）')

package/src/model.ts

@@ -4,7 +4,7 @@
  * 作者 ddj 2026-08-20
  */
 import type { Decision, DiffRecord, Hunk, RecordSummary } from './shared/types.js'
-import { applyLocations, fingerprint, isNoopHunk, locateHunks, preciseHunk } from './shared/diff.js'
+import { applyLocations, fingerprint, isNoopHunk, locateHunks, normalizeForCompare, normalizeHunk, preciseHunk } from './shared/diff.js'
 
 /** 工作区记录桶上限（超过后按 at 最旧剔除）。 */
 export const MAX_RECORDS = 200
@@ -157,6 +157,117 @@ export function reconstructOriginal(records: DiffRecord[], content: string): { c
   }
 }
 
+// #region 过程抵消
+
+/**
+ * @public
+ * @author ddj 2026年10月10号
+ * 判断记录是否完全未决策；缺少逐块状态时沿用 pending 的 call 状态。
+ * @param record 审查记录
+ * @returns 未归档、未覆盖且没有用户决策时为 true
+ */
+export function fullyPending(record: DiffRecord): boolean {
+  return !record.archived && !record.superseded && record.decisions.call === 'pending'
+    && record.decisions.perHunk.every((value) => value === 'pending')
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月10号
+ * 比较整组 hunk 是否逐块精确逆反；不把新建或纯 no-op 当作抵消。
+ * @param prior 先前修改的差异块
+ * @param later 后续修改的差异块
+ * @returns 文本归一化后整组逆反且包含真实修改时为 true
+ */
+export function hunksInverse(prior: Hunk[], later: Hunk[]): boolean {
+  if (!prior.length || prior.length !== later.length) return false
+  let changed = false
+  for (let idx = 0; idx < prior.length; idx++) {
+    const a = normalizeHunk(prior[idx])
+    const b = normalizeHunk(later[idx])
+    if (a.oldText !== b.newText || a.newText !== b.oldText) return false
+    if (!isNoopHunk(a)) changed = true
+  }
+  return changed
+}
+
+/**
+ * @private
+ * @author ddj 2026年10月10号
+ * 同路径优先按捕获批次排序；旧记录仅使用有效时间，不拿 callId 伪造先后证据。
+ * @param a 第一条记录
+ * @param b 第二条记录
+ * @returns 负数表示 a 更早，零表示先后无法区分
+ */
+function recordOrder(a: DiffRecord, b: DiffRecord): number {
+  if (a.path !== b.path) return a.path.localeCompare(b.path)
+  if (Number.isInteger(a.batch) && Number.isInteger(b.batch)
+    && a.batch > 0 && b.batch > 0 && a.batch !== b.batch) return a.batch - b.batch
+  const delta = Date.parse(a.at) - Date.parse(b.at)
+  return Number.isFinite(delta) ? delta : 0
+}
+
+/**
+ * @private
+ * @author ddj 2026年10月10号
+ * 确认完整文件快照往返，防止相同文本在不同位置的反向修改被误隐藏。
+ * @param prior 先前记录
+ * @param later 后续记录
+ * @returns 两端快照互换且文件存在性未变化时为 true；缺少证据时保留审查
+ */
+function snapshotsRestore(prior: DiffRecord, later: DiffRecord): boolean {
+  if (prior.create || later.create) return false
+  if (typeof prior.before !== 'string' || typeof prior.after !== 'string'
+    || typeof later.before !== 'string' || typeof later.after !== 'string') return false
+  return normalizeForCompare(prior.before) === normalizeForCompare(later.after)
+    && normalizeForCompare(prior.after) === normalizeForCompare(later.before)
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月10号
+ * 查找最近一条未决的整记录逆反；必须有文件快照证明原内容确实恢复。
+ * @param records 工作区记录（不修改输入）
+ * @param record 新记录
+ * @returns 可安全配对的先前记录，证据不足或部分撤销时为 null
+ */
+export function findInversePrior(records: DiffRecord[], record: DiffRecord): DiffRecord | null {
+  if (!fullyPending(record)) return null
+  let found: DiffRecord | null = null
+  for (const prior of records) {
+    if (prior.callId === record.callId || prior.path !== record.path || !fullyPending(prior)) continue
+    if (recordOrder(prior, record) >= 0 || !hunksInverse(prior.hunks, record.hunks)) continue
+    if (!snapshotsRestore(prior, record)) continue
+    if (!found || recordOrder(found, prior) < 0) found = prior
+  }
+  return found
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月10号
+ * 按捕获顺序贪心配对历史抵消记录，每条最多使用一次；桶上限为 200。
+ * @param records 工作区记录（不修改输入或记录状态）
+ * @returns 可以整对归档的记录对
+ */
+export function findCanceledPairs(records: DiffRecord[]): Array<[DiffRecord, DiffRecord]> {
+  const available: DiffRecord[] = []
+  const pairs: Array<[DiffRecord, DiffRecord]> = []
+  const ordered = [...records].sort(recordOrder)
+  for (const record of ordered) {
+    const prior = findInversePrior(available, record)
+    if (!prior) {
+      if (fullyPending(record)) available.push(record)
+      continue
+    }
+    pairs.push([prior, record])
+    available.splice(available.indexOf(prior), 1)
+  }
+  return pairs
+}
+
+// #endregion
+
 /** 文件当前最大批次号（无记录为 0）。 */
 export function fileMaxBatch(records: Map<string, DiffRecord>, path: string): number {
   let m = 0

package/src/openBridge.ts

@@ -56,6 +56,19 @@ export async function ensureOpenBridge(ctx: Ctx, baseUrl: string): Promise<strin
   return join(dir, 'dsh-open.ini')
 }
 
+/** @public @author ddj 2026年10月12号
+ * Provision the active profile's independent bridge at startup (desktop or web).
+ * Mirrors unityInstall's per-profile bridge without requiring a registered project,
+ * so Unity can select either target. Unknown profile returns null instead of failing.
+ * @param ctx Active host context.
+ * @param baseUrl Selected public Web URL (unused for desktop wake).
+ * @returns Absolute profile bridge INI path, or null when no owned profile is active.
+ */
+export async function ensureActiveBridge(ctx: Ctx, baseUrl: string): Promise<string | null> {
+  if (!findProfileDir(ctx)) return null
+  return ensureOpenBridge(ctx, baseUrl)
+}
+
 /** @private @author ddj 2026年09月28号
  * Replace a bridge file atomically without following a preexisting file link.
  * @param path Destination in the validated bridge directory.

package/src/rpc.ts

@@ -13,6 +13,7 @@ import {
   READ_CAP,
   appendArchiveEntries,
   archiveRecords,
+  archiveCanceled,
   autoArchiveStale,
   policyOf,
   resolveTarget,
@@ -460,7 +461,7 @@ async function latestPatchBackup(patchPath: string): Promise<string | undefined>
 }
 
 /** 读取设置中的深链基址（缺省/非法回退默认 3080）。 */
-async function integrationBaseUrlOf(ctx: Ctx): Promise<string> {
+export async function integrationBaseUrlOf(ctx: Ctx): Promise<string> {
   const settings = ctx.get('settings')
   const value = sectionOf(settings, FILE_OPEN_SETTINGS_NS)?.value as { integrationBaseUrl?: unknown } | undefined
   const raw = typeof value?.integrationBaseUrl === 'string' ? value.integrationBaseUrl.trim() : ''
@@ -613,6 +614,7 @@ export function buildHandlers(
           const staleStart = performance.now()
           // #endregion
           await autoArchiveStale(ctx, sc.session, sc.cwd, bucket)
+          await archiveCanceled(ctx, sc.session, sc.cwd, bucket)
           // #region debug log
           staleMs = performance.now() - staleStart
           // #endregion