dsh-vscode-mode 0.15.0 → 0.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "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/styles/editor.css

@@ -640,6 +640,10 @@
 [data-edrv-view] .edrv-update-close:not(:disabled):hover { background: var(--dsw-alias-interactive-bg-hover, #e7edf0); }
 [data-edrv-view] .edrv-update-table { display: flex; flex-direction: column; flex: 1; min-height: 0; margin: 12px 14px 0; border: 1px solid var(--dsw-alias-border-l1, #d9e0e4); border-radius: 5px; overflow: hidden; background: var(--dsw-alias-bg-layer-1, #fff); }
 [data-edrv-view] .edrv-update-cols, [data-edrv-view] .edrv-update-row { display: grid; grid-template-columns: 110px minmax(0, 1fr) 160px; align-items: center; }
+[data-edrv-view] .edrv-update-sort { width: 100%; padding: 0; border: 0; background: transparent; color: inherit; font: inherit; text-align: left; cursor: pointer; }
+[data-edrv-view] .edrv-update-sort:hover { color: var(--dsw-alias-brand-primary, #2869b4); }
+[data-edrv-view] .edrv-update-sort:focus-visible { outline: 2px solid var(--dsw-alias-brand-primary, #2869b4); outline-offset: 2px; }
+[data-edrv-view] .edrv-update-jump { color: var(--dsw-alias-state-error-primary, #b93b43); }
 [data-edrv-view] .edrv-update-cols { flex: none; height: 30px; background: var(--dsw-alias-bg-layer-2, #f1f4f5); border-bottom: 1px solid var(--dsw-alias-border-l1, #d9e0e4); color: var(--dsw-alias-label-secondary, #485762); font-size: 11px; font-weight: 600; }
 [data-edrv-view] .edrv-update-cols > span, [data-edrv-view] .edrv-update-row > span { min-width: 0; padding: 0 10px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 [data-edrv-view] .edrv-update-cols > span + span, [data-edrv-view] .edrv-update-row > span + span { border-left: 1px solid var(--dsw-alias-border-l1, #d9e0e4); }

package/src/client/svnNotice.ts

@@ -8,7 +8,7 @@ export function bindSvnScope(sessionId: string | undefined, scope: string): void
   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'])
+const WRITES = new Set<RpcMethod>(['svn.add', 'svn.revert', 'svn.resolve', '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. */

package/src/client/ui/SvnUpdateDialog.ts

@@ -3,14 +3,15 @@
  * @author ddj 2026年09月24号
  */
 import React from 'react'
-import type { SvnUpdateRow, SvnUpdateState } from '../../shared/svn.js'
+import type { SvnConflictState, SvnResolveAccept, SvnUpdateRow, SvnUpdateState } from '../../shared/svn.js'
 import { copyText } from '../copyText.js'
 import { rpc } from '../rpc.js'
 import { absoluteOf } from '../tabActions.js'
 import { ContextMenu } from './ContextMenu.js'
 import type { ContextMenuEntry } from './ContextMenu.js'
 import { ModalShell } from './ModalShell.js'
-import { updateActs, updateCloseMode, updateDone, updateLocked, updateParent, updateRange, updateReady, updateType } from './svnUpdateModel.js'
+import { nextConflict, nextUpdateSort, rowConflict, sortUpdateRows, updateActs, updateCloseMode, updateDone, updateLocked, updateParent, updateRange, updateReady, updateType } from './svnUpdateModel.js'
+import type { UpdateColumn, UpdateSort } from './svnUpdateModel.js'
 
 interface UpdateProps {
   sessionId?: string
@@ -28,6 +29,68 @@ interface UpdateProps {
   onOpenParent: (path: string) => void
 }
 interface UpdateMenu { x: number; y: number; row: SvnUpdateRow; kind: string }
+type ConflictChoice = SvnResolveAccept | 'revert'
+const conflictWarnings: Record<ConflictChoice, string> = {
+  'theirs-full': '使用对方完整版本，丢弃该目标本地冲突修改？',
+  'mine-full': '使用更新前自身完整版本，丢弃对方修改以及更新后编辑？这不是当前 working 内容。',
+  working: '仅标记为已解决，保留当前内容。SVN 不会自动清除文件内冲突标记；树冲突必须先手动处理。确定？',
+  revert: '还原此目标到当前 BASE，丢弃本地修改和冲突状态？这不是回到更新前版本；目录不递归。',
+}
+
+/** @private @author ddj 2026年10月14号 @param props Owner. @param paths Unique exact targets. @returns Evidence and bounded refresh action. */
+function useConflictState(props: UpdateProps, paths: string[], ready: boolean) {
+  const [states, setStates] = React.useState<Map<string, SvnConflictState>>(new Map())
+  const [error, setError] = React.useState('')
+  const [loading, setLoading] = React.useState(false)
+  const generation = React.useRef(0)
+  /** @private @author ddj 2026年10月14号 @returns Fresh evidence; failed targets remain unknown rather than clean. */
+  const refresh = React.useCallback(async () => {
+    const token = ++generation.current
+    setLoading(true)
+    const evidence = new Map<string, SvnConflictState>()
+    const errors: string[] = []
+    for (let start = 0; start < paths.length; start += 100) {
+      try {
+        const result = await rpc('svn.conflictStatus', { sessionId: props.sessionId, paths: paths.slice(start, start + 100) })
+        if (result.ok) result.states.forEach((state) => evidence.set(state.path, state))
+        else errors.push(result.error)
+      } catch (cause) { errors.push(String(cause)) }
+    }
+    if (token !== generation.current) return
+    setStates(evidence); setError(errors.join('\n')); setLoading(false)
+  }, [props.sessionId, paths])
+  React.useEffect(() => {
+    setStates(new Map()); setError('')
+    if (ready) void refresh()
+    return () => { generation.current++ }
+  }, [ready, refresh])
+  return { states, error, refresh, setStates, loading }
+}
+
+/** @private @author ddj 2026年10月14号 @param props Owner. @param ready Complete output. @param evidence Conflict reader. @returns Single-target confirmed mutation state and command. */
+function useConflictWrite(props: UpdateProps, ready: boolean, evidence: ReturnType<typeof useConflictState>) {
+  const [busy, setBusy] = React.useState(false)
+  const lock = React.useRef(false)
+  /** @private @author ddj 2026年10月14号 @param row Right-click target only. @param choice Explicit SVN operation. Execute once and always re-read status. */
+  const execute = async (row: SvnUpdateRow, choice: ConflictChoice) => {
+    if (lock.current || !ready || evidence.loading || !row.relPath) return
+    const state = evidence.states.get(row.relPath)
+    if (!state || !(state.text || state.props || state.tree)) return
+    if (state.tree && (choice === 'mine-full' || choice === 'theirs-full')) return
+    lock.current = true
+    try {
+      if (!window.confirm(conflictWarnings[choice] + '\n\n仅处理：' + row.relPath)) { lock.current = false; return }
+      setBusy(true)
+      evidence.setStates((previous) => { const next = new Map(previous); next.delete(row.relPath!); return next })
+      const result = choice === 'revert'
+        ? await rpc('svn.revert', { sessionId: props.sessionId, paths: [row.relPath], depth: 'empty' })
+        : await rpc('svn.resolve', { sessionId: props.sessionId, path: row.relPath, accept: choice })
+      props.onNote(result.ok ? result.summary : result.error)
+    } catch (cause) { props.onNote('冲突操作失败：' + String(cause)) }
+    finally { if (lock.current) { await evidence.refresh(); lock.current = false; setBusy(false) } }
+  }
+  return { busy, execute }
+}
 
 /**
  * 仅恢复明确匹配的原任务；失败时不重新触发一次 SVN 更新。
@@ -159,10 +222,22 @@ function countText(state: SvnUpdateState | null): string {
  * @param selected 已选序号
  * @returns 可点击动作列表
  */
-function menuEntries(props: UpdateProps, state: SvnUpdateState, menu: UpdateMenu, rows: SvnUpdateRow[], selected: number[]): ContextMenuEntry[] {
+function menuEntries(props: UpdateProps, state: SvnUpdateState, menu: UpdateMenu, rows: SvnUpdateRow[], selected: number[],
+  ready: boolean, evidence: ReturnType<typeof useConflictState>, write: ReturnType<typeof useConflictWrite>): ContextMenuEntry[] {
   const { row, kind } = menu
   const actions = updateActs(row, state.phase, kind, state.revision)
   const rel = row.relPath ?? ''
+  const conflict = rel ? evidence.states.get(rel) : undefined
+  const enabled = ready && !write.busy && !evidence.loading && Boolean(conflict && (conflict.text || conflict.props || conflict.tree))
+  const full = enabled && !conflict?.tree
+  const conflictEntries: ContextMenuEntry[] = row.action === 'C' ? [
+    { id: 'theirs-full', label: '使用对方完整版本解决', separator: true, disabled: !full, onClick: () => { void write.execute(row, 'theirs-full') } },
+    { id: 'mine-full', label: '使用自身完整版本解决', disabled: !full, onClick: () => { void write.execute(row, 'mine-full') } },
+    { id: 'working', label: '标记为已解决（保留当前内容）', disabled: !enabled, onClick: () => { void write.execute(row, 'working') } },
+    { id: 'revert', label: '还原此项…', disabled: !enabled, onClick: () => { void write.execute(row, 'revert') } },
+    ...(conflict?.tree ? [{ id: 'tree-hint', label: '树冲突：请先针对性处理，再标记解决', disabled: true, onClick: () => {} }] : []),
+    ...(!conflict && ready ? [{ id: 'unknown-hint', label: '状态未确认：请刷新冲突状态', disabled: true, onClick: () => {} }] : []),
+  ] : []
   const picked = new Set(selected)
   const names = rows.filter((item) => picked.has(item.seq)).map((item) => item.relPath
     ? absoluteOf(item.relPath, props.cwd) : item.path)
@@ -172,6 +247,7 @@ function menuEntries(props: UpdateProps, state: SvnUpdateState, menu: UpdateMenu
     { id: 'open', label: '打开', disabled: !actions.open, separator: true, onClick: () => props.onOpenFile(rel) },
     { id: 'open-with', label: '打开方式…', disabled: !actions.openWith, onClick: () => props.onOpenWith(rel) },
     { id: 'parent', label: '打开父目录', disabled: !actions.parent, onClick: () => props.onOpenParent(updateParent(rel)) },
+    ...conflictEntries,
     { id: 'copy', label: selected.length > 1 ? '复制选中路径' : '复制路径', disabled: !actions.copy, separator: true,
       onClick: () => { void copyText(names.join('\n'), '已复制路径', props.onNote) } },
   ]
@@ -189,7 +265,7 @@ function menuEntries(props: UpdateProps, state: SvnUpdateState, menu: UpdateMenu
  */
 function rowElement(row: SvnUpdateRow, cwd: string | null | undefined, picked: boolean,
   onPick: (event: React.MouseEvent<HTMLDivElement>) => void,
-  onMenu: (event: React.MouseEvent<HTMLDivElement>) => void): React.ReactElement {
+  onMenu: (event: React.MouseEvent<HTMLDivElement>) => void, resolved: boolean): React.ReactElement {
   // 显示用相对路径（窄窗省略尾部时先保住文件名），悬浮与复制仍用完整绝对路径。
   const full = row.relPath ? absoluteOf(row.relPath, cwd) : (row.path || row.label)
   const path = row.relPath || row.path || row.label
@@ -199,7 +275,7 @@ function rowElement(row: SvnUpdateRow, cwd: string | null | undefined, picked: b
     role: 'row', 'aria-selected': picked, className: 'edrv-update-row' + (picked ? ' is-selected' : ''),
     onClick: onPick, onContextMenu: onMenu, title: row.raw,
   },
-    React.createElement('span', { role: 'cell', className: 'edrv-update-action tone-' + tone }, row.action ? row.label : '信息'),
+    React.createElement('span', { role: 'cell', className: 'edrv-update-action tone-' + tone }, resolved ? row.label + '（已解决）' : row.action ? row.label : '信息'),
     React.createElement('span', { role: 'cell', className: 'edrv-update-path', title: full }, path),
     React.createElement('span', { role: 'cell', className: 'edrv-update-type' }, row.action ? updateType(row.path) : ''))
 }
@@ -210,7 +286,7 @@ function rowElement(row: SvnUpdateRow, cwd: string | null | undefined, picked: b
  * @param count 当前记录数
  * @returns 虚拟列表视口、行高和滚动回调
  */
-function useUpdateView(count: number) {
+function useUpdateView(count: number, sorted: boolean) {
   const [scrollTop, setScrollTop] = React.useState(0)
   const [height, setHeight] = React.useState(350)
   const [compact, setCompact] = React.useState(() => window.innerWidth < 620)
@@ -229,8 +305,8 @@ function useUpdateView(count: number) {
   }, [])
   React.useLayoutEffect(() => {
     const list = listRef.current
-    if (list && followRef.current) { list.scrollTop = list.scrollHeight; setScrollTop(list.scrollTop) }
-  }, [count, rowHeight])
+    if (list && followRef.current && !sorted) { list.scrollTop = list.scrollHeight; setScrollTop(list.scrollTop) }
+  }, [count, rowHeight, sorted])
   /**
    * 用户离开底部后暂停自动滚动，保持当前文件可读。
    * @author ddj 2026年09月24号
@@ -241,7 +317,15 @@ function useUpdateView(count: number) {
     followRef.current = list.scrollHeight - list.scrollTop - list.clientHeight < 40
     setScrollTop(list.scrollTop)
   }
-  return { listRef, rowHeight, range: updateRange(count, scrollTop, height, rowHeight), onScroll }
+  /** @private @author ddj 2026年10月14号 @param index Display index. Scroll without requiring a mounted virtual row. */
+  const locate = (index: number) => {
+    const list = listRef.current
+    if (!list || index < 0) return
+    followRef.current = false
+    list.scrollTop = index * rowHeight
+    setScrollTop(list.scrollTop)
+  }
+  return { listRef, rowHeight, range: updateRange(count, scrollTop, height, rowHeight), onScroll, locate }
 }
 
 /**
@@ -266,14 +350,15 @@ function useUpdateMenu(props: UpdateProps, rows: SvnUpdateRow[], state: SvnUpdat
   const pick = (event: React.MouseEvent<HTMLDivElement>, row: SvnUpdateRow) => {
     const index = rows.findIndex((item) => item.seq === row.seq)
     if (event.shiftKey) {
-      const from = Math.min(index, anchorRef.current)
-      const to = Math.max(index, anchorRef.current)
+      const anchor = rows.findIndex((item) => item.seq === anchorRef.current)
+      const from = Math.min(index, anchor < 0 ? index : anchor)
+      const to = Math.max(index, anchor < 0 ? index : anchor)
       setSelected(rows.slice(from, to + 1).map((item) => item.seq))
     } else if (event.ctrlKey || event.metaKey) {
       setSelected((previous) => previous.includes(row.seq)
         ? previous.filter((seq) => seq !== row.seq) : previous.concat(row.seq))
-      anchorRef.current = index
-    } else { setSelected([row.seq]); anchorRef.current = index }
+      anchorRef.current = row.seq
+    } else { setSelected([row.seq]); anchorRef.current = row.seq }
   }
   /**
    * 先开放父目录/复制，再按真实磁盘类型启用文件级操作。
@@ -293,7 +378,9 @@ function useUpdateMenu(props: UpdateProps, rows: SvnUpdateRow[], state: SvnUpdat
         ? { ...current, kind: outcome.ok ? outcome.kind : 'missing' } : current)
     }).catch(() => {})
   }
-  return { selected, picked, menu, setMenu, pick, openMenu }
+  /** @private @author ddj 2026年10月14号 @param row Navigation target. Select one stable row identity. */
+  const selectRow = (row: SvnUpdateRow) => { setSelected([row.seq]); anchorRef.current = row.seq }
+  return { selected, picked, menu, setMenu, pick, openMenu, selectRow }
 }
 
 /**
@@ -329,13 +416,18 @@ function updateHead(props: UpdateProps, state: SvnUpdateState | null, phase: str
  * @returns 表格元素
  */
 function updateTable(props: UpdateProps, rows: SvnUpdateRow[], view: ReturnType<typeof useUpdateView>,
-  selection: ReturnType<typeof useUpdateMenu>, finished: boolean): React.ReactElement {
+  selection: ReturnType<typeof useUpdateMenu>, finished: boolean, sort: UpdateSort | null,
+  onSort: (column: UpdateColumn) => void, states: ReadonlyMap<string, SvnConflictState>): React.ReactElement {
   const visible = rows.slice(view.range.start, view.range.end)
   return React.createElement('div', { className: 'edrv-update-table', role: 'table', 'aria-label': 'SVN 更新文件明细', 'aria-rowcount': rows.length },
     React.createElement('div', { role: 'row', className: 'edrv-update-cols' },
-      React.createElement('span', { role: 'columnheader' }, '操作'),
-      React.createElement('span', { role: 'columnheader' }, '路径'),
-      React.createElement('span', { role: 'columnheader', title: '仅对已知扩展名推断，非 SVN 属性' }, '类型（推断）')),
+      (['action', 'path', 'type'] as const).map((column) => {
+        const direction = sort?.column === column ? sort.direction : 0
+        const label = column === 'action' ? '操作' : column === 'path' ? '路径' : '类型（推断）'
+        return React.createElement('span', { key: column, role: 'columnheader', 'aria-sort': direction === 1 ? 'ascending' : direction === -1 ? 'descending' : 'none' },
+          React.createElement('button', { type: 'button', className: 'edrv-update-sort', onClick: () => onSort(column),
+            title: '点击切换升序、降序、原始顺序' + (column === 'type' ? '；仅推断类型，非 SVN 属性' : '') }, label + (direction === 1 ? ' ▲' : direction === -1 ? ' ▼' : ' ↕')))
+      })),
     React.createElement('div', { className: 'edrv-update-list', ref: view.listRef, role: 'rowgroup', onScroll: view.onScroll },
       React.createElement('div', { className: 'edrv-update-space', style: { height: rows.length * view.rowHeight } },
         visible.map((row, index) => React.createElement('div', {
@@ -343,7 +435,8 @@ function updateTable(props: UpdateProps, rows: SvnUpdateRow[], view: ReturnType<
           style: { top: (view.range.start + index) * view.rowHeight, height: view.rowHeight },
           'aria-rowindex': view.range.start + index + 1,
         }, rowElement(row, props.cwd, selection.picked.has(row.seq),
-          (event) => selection.pick(event, row), (event) => selection.openMenu(event, row))))),
+          (event) => selection.pick(event, row), (event) => selection.openMenu(event, row),
+          row.action === 'C' && !rowConflict(row, states))))),
       !rows.length ? React.createElement('div', { className: 'edrv-update-empty' },
         finished ? '没有逐文件变更' : '等待 SVN 输出…') : null))
 }
@@ -385,10 +478,12 @@ function updateStatus(state: SvnUpdateState | null, error: string, cleaned: bool
  */
 function updateFoot(props: UpdateProps, state: SvnUpdateState | null, closable: boolean,
   finished: boolean, cancel: () => void, dismiss: () => void, confirmClose: boolean,
-  cleaned: boolean, cleanup: () => void): React.ReactElement {
+  cleaned: boolean, cleanup: () => void, remaining: number, jump: () => void, refresh: () => void): React.ReactElement {
   const locked = updateLocked(state)
   return React.createElement('footer', { className: 'edrv-update-foot' },
     React.createElement('span', { className: 'edrv-update-counts' }, countText(state)),
+    remaining > 0 ? React.createElement('button', { type: 'button', className: 'edrv-svn-act edrv-update-jump', onClick: jump }, '跳转冲突（' + remaining + '）') : null,
+    state?.counts.C ? React.createElement('button', { type: 'button', className: 'edrv-svn-act', disabled: !finished, onClick: refresh }, '刷新冲突状态') : null,
     locked ? React.createElement('button', {
       type: 'button', className: 'edrv-svn-act edrv-update-cleanup', disabled: !finished || cleaned,
       title: locked && !cleaned ? '执行 svn cleanup，清除中断残留的锁（不撤销已完成的更新）' : '已执行过清理',
@@ -410,12 +505,29 @@ function updateFoot(props: UpdateProps, state: SvnUpdateState | null, closable:
 export function SvnUpdateDialog(props: UpdateProps): React.ReactElement {
   const { state, rows, error, pendingRows, setState } = useUpdateJob(props)
   const [cleaned, setCleaned] = React.useState(false)
-  const view = useUpdateView(rows.length)
-  const selection = useUpdateMenu(props, rows, state)
+  const [sort, setSort] = React.useState<UpdateSort | null>(null)
+  const displayRows = React.useMemo(() => sortUpdateRows(rows, sort), [rows, sort])
+  const view = useUpdateView(displayRows.length, Boolean(sort))
+  const selection = useUpdateMenu(props, displayRows, state)
   const processFinished = updateDone(state?.phase)
   const finished = updateReady(state?.phase, pendingRows)
-  const closeMode = updateCloseMode(finished, error, Boolean(state), Boolean(selection.menu || props.childOverlay))
-  const closable = closeMode.explicit
+  const conflictPaths = React.useMemo(() => [...new Set(rows.filter((row) => row.action === 'C' && row.relPath).map((row) => row.relPath!))], [rows])
+  const evidence = useConflictState(props, conflictPaths, finished)
+  const write = useConflictWrite(props, finished, evidence)
+  const remaining = new Set(rows.filter((row) => rowConflict(row, evidence.states)).map((row) => row.relPath || row.path)).size
+  const outside = rows.some((row) => row.action === 'C' && !row.relPath)
+  const closeMode = updateCloseMode(finished, error, Boolean(state), Boolean(selection.menu || props.childOverlay || write.busy))
+  const closable = closeMode.explicit && !write.busy
+  /** @private @author ddj 2026年10月14号 @param column Header identity. Cycle cached display ordering. */
+  const onSort = (column: UpdateColumn) => setSort((previous) => nextUpdateSort(previous, column))
+  /** @private @author ddj 2026年10月14号 Select and scroll to the next unresolved row in display order. */
+  const jump = () => {
+    const index = nextConflict(displayRows, evidence.states, selection.selected.at(-1))
+    if (index < 0) return
+    selection.selectRow(displayRows[index]); view.locate(index)
+  }
+  /** @private @author ddj 2026年10月14号 Refresh exact targets after an external resolution. */
+  const refresh = () => { if (!write.busy && finished) void evidence.refresh() }
   /**
    * 确认后请求终止任务；已变更文件不会自动回滚。
    * @author ddj 2026年09月24号
@@ -445,7 +557,7 @@ export function SvnUpdateDialog(props: UpdateProps): React.ReactElement {
    * @author ddj 2026年09月24号
    */
   const dismiss = () => {
-    if (!closeMode.explicit) return
+    if (!closable) return
     if (closeMode.confirm && !window.confirm('更新任务连接中断。关闭窗口不会停止可能仍在运行的 SVN 更新，确定暂时关闭？')) return
     props.onClose()
   }
@@ -458,15 +570,17 @@ export function SvnUpdateDialog(props: UpdateProps): React.ReactElement {
     closeOnEsc: closeMode.passive, closeOnMask: closeMode.passive, onClose: dismiss,
   },
     updateHead(props, state, phase, closable, dismiss),
-    updateTable(props, rows, view, selection, finished),
-    updateStatus(state, error, cleaned),
-    updateFoot(props, state, closable, finished, cancel, dismiss, closeMode.confirm, cleaned, cleanup),
+    updateTable(props, displayRows, view, selection, finished, sort, onSort, evidence.states),
+    updateStatus(state, error || evidence.error, cleaned),
+    outside ? React.createElement('div', { className: 'edrv-update-warning' }, '存在工作区外冲突；可定位但不能在此执行解决操作') : null,
+    write.busy ? React.createElement('div', { role: 'status' }, '正在处理冲突并核对 SVN 状态…') : null,
+    updateFoot(props, state, closable, finished && !write.busy, cancel, dismiss, closeMode.confirm, cleaned, cleanup, remaining, jump, refresh),
     state?.rawTail && (state.phase === 'failed' || state.truncated)
       ? React.createElement('details', { className: 'edrv-update-raw' },
           React.createElement('summary', null, '查看原始输出'), React.createElement('pre', null, state.rawTail)) : null,
     selection.menu && state ? React.createElement(ContextMenu, {
       x: selection.menu.x, y: selection.menu.y,
-      entries: menuEntries(props, state, selection.menu, rows, selection.selected), zIndex: 193,
+      entries: menuEntries(props, state, selection.menu, displayRows, selection.selected, finished, evidence, write), zIndex: 193,
       onClose: () => selection.setMenu(null),
     }) : null)
 }

package/src/client/ui/svnUpdateModel.ts

@@ -2,7 +2,51 @@
  * dsh-vscode-mode client — SVN 更新窗口的纯视图逻辑。
  * @author ddj 2026年09月24号
  */
-import type { SvnUpdatePhase, SvnUpdateRow } from '../../shared/svn.js'
+import type { SvnConflictState, SvnUpdatePhase, SvnUpdateRow } from '../../shared/svn.js'
+
+export type UpdateColumn = 'action' | 'path' | 'type'
+export interface UpdateSort { column: UpdateColumn; direction: 1 | -1 }
+const collator = new Intl.Collator('zh-CN', { numeric: true, sensitivity: 'base' })
+
+/** @public @author ddj 2026年10月14号 @param sort Current sort. @param column Clicked header. @returns Ascending, descending, then original output order. */
+export function nextUpdateSort(sort: UpdateSort | null, column: UpdateColumn): UpdateSort | null {
+  if (sort?.column !== column) return { column, direction: 1 }
+  return sort.direction === 1 ? { column, direction: -1 } : null
+}
+
+/** @public @author ddj 2026年10月14号 @param row Output row. @param column Display column. @returns Display sort key. */
+function updateKey(row: SvnUpdateRow, column: UpdateColumn): string {
+  if (column === 'action') return row.action ? row.label : '信息'
+  if (column === 'type') return row.action ? updateType(row.path) : ''
+  return row.relPath || row.path || row.label
+}
+
+/** @public @author ddj 2026年10月14号 @param rows Immutable original rows. @param sort Optional sort. @returns Stable derived display order, empty keys last. */
+export function sortUpdateRows(rows: SvnUpdateRow[], sort: UpdateSort | null): SvnUpdateRow[] {
+  if (!sort) return rows
+  return rows.slice().sort((a, b) => {
+    const left = updateKey(a, sort.column), right = updateKey(b, sort.column)
+    if (!left || !right) return left ? -1 : right ? 1 : a.seq - b.seq
+    return collator.compare(left, right) * sort.direction || a.seq - b.seq
+  })
+}
+
+/** @public @author ddj 2026年10月14号 @param row Output row. @param states Confirmed evidence by path. @returns Conservative unresolved status, including unknown/outside paths. */
+export function rowConflict(row: SvnUpdateRow, states: ReadonlyMap<string, SvnConflictState>): boolean {
+  if (row.action !== 'C') return false
+  const state = row.relPath ? states.get(row.relPath) : undefined
+  return state ? state.text || state.props || state.tree : true
+}
+
+/** @public @author ddj 2026年10月14号 @param rows Display order. @param states Confirmed evidence. @param seq Current selection. @returns Next conflict index, wrapping around. */
+export function nextConflict(rows: SvnUpdateRow[], states: ReadonlyMap<string, SvnConflictState>, seq?: number): number {
+  const start = rows.findIndex((row) => row.seq === seq)
+  for (let step = 1; step <= rows.length; step++) {
+    const index = (start + step) % rows.length
+    if (rowConflict(rows[index], states)) return index
+  }
+  return -1
+}
 
 /**
  * 只有真实终态允许直接关闭窗口。

package/src/shared/rpc.ts

@@ -468,7 +468,9 @@ export interface RpcRequestMap {
   'svn.explorerStatus': { sessionId?: string; force?: boolean }
   'svn.explorerView': SvnViewRequest
   'svn.diffBase': { sessionId?: string; path: string }
-  'svn.revert': { sessionId?: string; paths: string[] }
+  'svn.revert': { sessionId?: string; paths: string[]; depth?: 'empty' }
+  'svn.conflictStatus': { sessionId?: string; paths: string[] }
+  'svn.resolve': { sessionId?: string; path: string; accept: import('./svn.js').SvnResolveAccept }
   'svn.add': { sessionId?: string; paths: string[] }
   'svn.changelist': { sessionId?: string; paths: string[]; name?: string; remove?: boolean }
   'svn.log': { sessionId?: string; path?: string; limit?: number; stopOnCopy?: boolean; startRev?: number; endRev?: number; showMerged?: boolean }
@@ -631,6 +633,8 @@ export interface RpcOkMap {
   'svn.explorerView': SvnViewPayload
   'svn.diffBase': { base: string | null; working: string; reason?: string; error?: string; binary?: boolean; encodingHint?: boolean }
   'svn.revert': { count: number; summary: string; output: string }
+  'svn.conflictStatus': { states: import('./svn.js').SvnConflictState[] }
+  'svn.resolve': { summary: string; output: string }
   'svn.add': { count: number; summary: string; output: string }
   'svn.changelist': { count: number; summary: string; output: string }
   'svn.log': { entries: SvnLogEntry[]; truncated: boolean; target: string; limit?: number }

package/src/shared/svn.ts

@@ -137,6 +137,16 @@ export interface SvnUpdatePoll extends SvnUpdateState {
   totalSeq: number
 }
 
+/** Exact target conflict evidence; null/error is never a clean status. */
+export interface SvnConflictState {
+  path: string
+  text: boolean
+  props: boolean
+  tree: boolean
+  versioned: boolean
+}
+export type SvnResolveAccept = 'mine-full' | 'theirs-full' | 'working'
+
 /** revert/add 等批量动作结果（计数 + 摘要 + 原文）。 */
 export interface SvnActionResult {
   /** 处理条目数（宽松计数）。 */

package/src/svn.ts

@@ -19,6 +19,7 @@ import { attrOf, numAttrOf, scanXmlTags, textOf, unescapeXml } from './svnXml.js
 import { TEXT_OUTPUT_CAP, batchResultOf, tailOfText, updateResultOf } from './svnText.js'
 import { LOG_CAP, LOG_DEFAULT_LIMIT, SVN_LOG_SHOW_ALL_CAP, parseLogXml, parseSvnInfoRevision } from './svnLog.js'
 import { SvnUpdateJobs } from './svnUpdateJob.js'
+import { conflictOf, hasConflict, pegTarget, validAccept, validTarget } from './svnResolve.js'
 import { EXPLORER_CAP, explorerViewOf, scopeEntriesOf, statusXmlValid, viewArgsValid } from './svnExplorer.js'
 import { ExplorerScopes, explorerKey } from './svnExplorerCache.js'
 import type { ExplorerScan } from './svnExplorerCache.js'
@@ -503,6 +504,14 @@ export function createSvnRpc(deps: SvnRpcDeps): { handlers: Record<string, unkno
   const now = deps.now ?? (() => Date.now())
   const findRoot = deps.findRoot ?? ((cwd: string) => findSvnRoot(cwd))
   const findTortoise = deps.findTortoise ?? ((dir: string) => findTortoiseProc(dir))
+  const conflictWrites = new Set<string>()
+  /** @private @author ddj 2026年10月14号 @param root WC root. @returns Canonical lock identity across sessions. */
+  const writeKey = (root: string): string => (deps.platform ?? process.platform) === 'win32' ? root.toLowerCase() : root
+  /** @private @author ddj 2026年10月14号 @param root WC root. @returns Whether a live update or conflict write owns the WC. */
+  const writeBusy = (root: string): boolean => {
+    const job = updateJobs.active(root)
+    return conflictWrites.has(writeKey(root)) || Boolean(job && ['starting', 'running', 'cancelling'].includes(job.phase))
+  }
   const statusCache = new Map<string, { at: number; payload: SvnStatusPayload }>()
   /** 运行中更新按会话目录复用工作副本根；TTL 到期才重新扫描 .svn。 */
   const updateRootCache = new Map<string, { at: number; root: string }>()
@@ -622,7 +631,7 @@ export function createSvnRpc(deps: SvnRpcDeps): { handlers: Record<string, unkno
    * @param stdoutCap stdout 收集上限（缺省 1MB；大载荷场景如日志拉取需显式放大）
    * @returns 退出码与输出
    */
-  const runSvn = async (cwd: string, argv: string[], graceMs: number, stdoutCap: number = OUTPUT_CAP): Promise<SvnRunOutcome> => {
+  const runSvn = async (cwd: string, argv: string[], graceMs: number, stdoutCap: number = OUTPUT_CAP, allowFallback = true): Promise<SvnRunOutcome> => {
     const spawn = subprocess()
     if (!spawn) throw new Error('缺少 subprocess 服务')
     const fs = ctx.get('fs') as { resolve?: (p: string, o: object) => Promise<unknown>; processPath?: (t: unknown) => string } | null | undefined
@@ -643,7 +652,8 @@ export function createSvnRpc(deps: SvnRpcDeps): { handlers: Record<string, unkno
       const stdout = handle.collected?.stdout?.readFrom(0).text ?? ''
       const stderr = handle.collected?.stderr?.readFrom(0).text ?? ''
       return { code: outcome?.exitCode ?? outcome?.code ?? null, stdout, stderr }
-    } catch {
+    } catch (error) {
+      if (!allowFallback) throw error
       // 受管环境管道 EPERM：回退 inherit（只拿退出码，输出为空）
       const handle = attempt('inherit')
       const outcome = await handle.done
@@ -651,6 +661,15 @@ export function createSvnRpc(deps: SvnRpcDeps): { handlers: Record<string, unkno
     }
   }
 
+  /** @private @author ddj 2026年10月14号 @param cwd Session workspace. @param root WC root. @param path Validated target. @returns Exact conflict evidence without recursive scanning. */
+  const readConflict = async (cwd: string, root: string, path: string) => {
+    const target = svnPathOf(cwd, root, path)
+    if (!target) throw new Error('目标不在 SVN 工作副本内')
+    const result = await runSvn(root, ['status', '--xml', '--verbose', '--depth', 'empty', '--', pegTarget(target)], READ_GRACE_MS, OUTPUT_CAP, false)
+    if (result.code !== 0) throw new Error(result.stderr || result.stdout || 'SVN 状态读取失败')
+    return conflictOf(result.stdout, path)
+  }
+
   /** 发射 TortoiseProc（GUI 长驻：不 await done，no-op catch 防未处理 rejection）。 */
   const launchTortoise = (exe: string, action: SvnAction, absPath: string): void => {
     const spawn = subprocess()
@@ -738,7 +757,9 @@ export function createSvnRpc(deps: SvnRpcDeps): { handlers: Record<string, unkno
     if (!status.managed || !status.wcRoot) return { ok: false as const, error: '当前工作区不受 SVN 管理' }
     if (!status.svnCli) return { ok: false as const, error: 'svn 命令不可用（可在设置页配置 svn 路径）' }
     try {
-      const outcome = await runSvn(status.wcRoot, [...verbArgs, '--', ...rels], MUTATE_GRACE_MS)
+      const targets = rels.map((path) => svnPathOf(sc.cwd, status.wcRoot!, path))
+      if (targets.some((path) => path === null)) return { ok: false as const, error: '目标不在 SVN 工作副本内' }
+      const outcome = await runSvn(status.wcRoot, [...verbArgs, '--', ...targets.map((path) => pegTarget(path!))], MUTATE_GRACE_MS, OUTPUT_CAP, !verbArgs.includes('--depth'))
       const result = batchResultOf(outcome.stdout, outcome.stderr, outcome.code, verb)
       // 变更清单已过期（revert/add 改工作副本状态）：主动作废缓存，下次拉取即为最新
       changesCache.delete(status.wcRoot)
@@ -1089,8 +1110,51 @@ export function createSvnRpc(deps: SvnRpcDeps): { handlers: Record<string, unkno
         return { ok: false as const, error: '读取基线失败：' + String(error) }
       }
     },
-    'svn.revert': async (args: { sessionId?: string; paths?: string[] }) => {
-      return mutate('还原', ['revert', '-R'], args.sessionId, args.paths)
+    'svn.conflictStatus': async (args: { sessionId?: string; paths?: string[] }) => {
+      const scope = await updateScope(args.sessionId, true)
+      if ('err' in scope) return { ok: false as const, error: scope.err }
+      if (!scope.cli) return { ok: false as const, error: 'svn 命令不可用' }
+      if (!Array.isArray(args.paths) || args.paths.length > BATCH_PATHS_CAP) return { ok: false as const, error: '冲突路径列表不合法或超限' }
+      if (!args.paths.every(validTarget)) return { ok: false as const, error: '路径不合法' }
+      const paths = [...new Set(args.paths.map(safeRel))]
+      if (paths.some((path) => !path)) return { ok: false as const, error: '路径不合法' }
+      try {
+        const states = []
+        for (const path of paths) states.push(await readConflict(scope.cwd, scope.root, path!))
+        return { ok: true as const, states }
+      } catch (error) { return { ok: false as const, error: String(error) } }
+    },
+    'svn.resolve': async (args: { sessionId?: string; path?: string; accept?: unknown }) => {
+      if (!validAccept(args.accept)) return { ok: false as const, error: '解决策略不合法' }
+      if (!validTarget(args.path)) return { ok: false as const, error: '路径不合法' }
+      const path = safeRel(args.path)
+      if (!path) return { ok: false as const, error: '路径不合法' }
+      const scope = await updateScope(args.sessionId, true)
+      if ('err' in scope) return { ok: false as const, error: scope.err }
+      if (!scope.cli) return { ok: false as const, error: 'svn 命令不可用' }
+      if (writeBusy(scope.root)) return { ok: false as const, error: '工作副本正在更新或解决冲突，请等待完成' }
+      conflictWrites.add(writeKey(scope.root))
+      try {
+        const evidence = await readConflict(scope.cwd, scope.root, path)
+        if (!hasConflict(evidence)) return { ok: false as const, error: '目标已无冲突，请刷新状态' }
+        if (evidence.tree && args.accept !== 'working') return { ok: false as const, error: '树冲突不支持通用完整版本选择，请针对性处理' }
+        const target = svnPathOf(scope.cwd, scope.root, path)!
+        const outcome = await runSvn(scope.root, ['resolve', '--accept', args.accept, '--depth', 'empty', '--', pegTarget(target)], MUTATE_GRACE_MS, OUTPUT_CAP, false)
+        if (outcome.code !== 0) return { ok: false as const, error: outcome.stderr || outcome.stdout || 'SVN 解决冲突失败' }
+        return { ok: true as const, summary: 'SVN 解决命令已执行，请核对剩余冲突', output: outcome.stdout }
+      } catch (error) { return { ok: false as const, error: String(error) } }
+      finally { conflictWrites.delete(writeKey(scope.root)); changesCache.delete(scope.root); explorerCache.clear() }
+    },
+    'svn.revert': async (args: { sessionId?: string; paths?: string[]; depth?: unknown }) => {
+      if (args.depth === undefined) return mutate('还原', ['revert', '-R'], args.sessionId, args.paths)
+      if (args.depth !== 'empty') return { ok: false as const, error: '还原深度不合法' }
+      if (!Array.isArray(args.paths) || !args.paths.length || !args.paths.every(validTarget)) return { ok: false as const, error: '路径不合法' }
+      const scope = await updateScope(args.sessionId, true)
+      if ('err' in scope) return { ok: false as const, error: scope.err }
+      if (writeBusy(scope.root)) return { ok: false as const, error: '工作副本正在更新或解决冲突，请等待完成' }
+      conflictWrites.add(writeKey(scope.root))
+      try { return await mutate('还原', ['revert', '--depth', 'empty'], args.sessionId, args.paths) }
+      finally { conflictWrites.delete(writeKey(scope.root)); changesCache.delete(scope.root); explorerCache.clear() }
     },
     'svn.add': async (args: { sessionId?: string; paths?: string[] }) => {
       return mutate('加入版本控制', ['add'], args.sessionId, args.paths)
@@ -1546,6 +1610,7 @@ export function createSvnRpc(deps: SvnRpcDeps): { handlers: Record<string, unkno
         const fs = ctx.get('fs') as { resolve?: (p: string, o: object) => Promise<unknown>; processPath?: (t: unknown) => string } | undefined
         const cwd = fs?.resolve && fs?.processPath
           ? fs.processPath(await fs.resolve(scope.cwd, {})) : scope.cwd
+        if (conflictWrites.has(writeKey(scope.root))) return { ok: false as const, error: '工作副本正在解决冲突，请等待完成' }
         return { ok: true as const, ...updateJobs.start({ cwd, root: scope.root, path: rel, exe: scope.exe }) }
       } catch (error) {
         return { ok: false as const, error: '启动 SVN 更新失败：' + String(error) }

package/src/svnResolve.ts

@@ -0,0 +1,33 @@
+import type { SvnConflictState, SvnResolveAccept } from './shared/svn.js'
+import { attrOf, scanXmlTags } from './svnXml.js'
+
+/** @public @author ddj 2026年10月14号 @param value Requested strategy. @returns Whether SVN accepts this explicit strategy. */
+export function validAccept(value: unknown): value is SvnResolveAccept {
+  return value === 'mine-full' || value === 'theirs-full' || value === 'working'
+}
+
+/** @public @author ddj 2026年10月14号 @param value Untrusted relative target. @returns Whether the path names exactly one non-root workspace target. */
+export function validTarget(value: unknown): value is string {
+  if (typeof value !== 'string' || !value || /[\u0000-\u001f]/.test(value) || /^[A-Za-z]:|^[\\/]/.test(value)) return false
+  return value.replace(/\\/g, '/').split('/').every((part) => Boolean(part) && part !== '.' && part !== '..' && part.toLowerCase() !== '.svn')
+}
+
+/** @public @author ddj 2026年10月14号 @param path Exact relative target. @returns Peg-safe SVN argument. */
+export function pegTarget(path: string): string { return path.includes('@') ? path + '@' : path }
+
+/** @public @author ddj 2026年10月14号 @param xml Verbose depth-empty status. @param path Client target identity. @returns Confirmed conflict evidence. @throws Missing or incomplete status evidence. */
+export function conflictOf(xml: string, path: string): SvnConflictState {
+  if (!/^\s*(?:<\?xml[^>]*>\s*)?<status\b/.test(xml) || !/<\/status>\s*$/.test(xml)) {
+    throw new Error('SVN 冲突状态输出为空或不完整，状态未确认')
+  }
+  const statuses = [...scanXmlTags(xml, ['wc-status'])].filter((hit) => !hit.closing)
+  if (statuses.length !== 1) throw new Error('SVN 未返回唯一目标状态，状态未确认')
+  const attrs = statuses[0].attrs
+  const item = attrOf(attrs, 'item')
+  if (!item) throw new Error('SVN 目标状态缺失，状态未确认')
+  return { path, text: item === 'conflicted', props: attrOf(attrs, 'props') === 'conflicted',
+    tree: attrOf(attrs, 'tree-conflicted') === 'true', versioned: !['unversioned', 'ignored', 'external', 'none'].includes(item) }
+}
+
+/** @public @author ddj 2026年10月14号 @param state Confirmed target evidence. @returns Whether any conflict remains. */
+export function hasConflict(state: SvnConflictState): boolean { return state.text || state.props || state.tree }