dsh-vscode-mode 0.1.7 → 0.1.11

package/src/capture.ts

@@ -3,13 +3,41 @@
  * 迁移自原 src/index.ts 的 tools/result 处理，语义不改。
  * 作者 ddj 2026-08-20
  */
-import type { DiffRecord } from './shared/types.js'
+import type { DiffRecord, Hunk } from './shared/types.js'
+import { annotateHunks, fingerprint } from './shared/diff.js'
 import type { Ctx, Session } from './store.js'
 import { archiveRecords, loadBucket, saveBucket } from './store.js'
 import { fileMaxBatch, prune, recordResolved } from './model.js'
 import type { Registry } from './registry.js'
 import { cwdOf } from './registry.js'
 
+/** 校验并提取工具 result meta 中的文件 hunk。 */
+function validHunks(raw: unknown): Hunk[] {
+  if (!Array.isArray(raw)) return []
+  const hunks: Hunk[] = []
+  for (const item of raw) {
+    if (!item || typeof item !== 'object') continue
+    const hunk = item as Record<string, unknown>
+    if (typeof hunk.newText !== 'string') continue
+    if (hunk.oldText !== null && typeof hunk.oldText !== 'string') continue
+    hunks.push({ oldText: hunk.oldText as string | null, newText: hunk.newText })
+  }
+  return hunks
+}
+
+/** 已有文件 write 的元数据缺失时，用权威整文件快照保底。 */
+function fallbackHunks(toolName: string, args: Record<string, unknown>, before: string | null, after: string | null, create: boolean): Hunk[] {
+  if (create) return [{ oldText: null, newText: after ?? (typeof args.content === 'string' ? args.content : '') }]
+  if (toolName === 'edit' && typeof args.old_string === 'string' && typeof args.new_string === 'string') {
+    return [{ oldText: args.old_string, newText: args.new_string }]
+  }
+  if (toolName === 'write' && before !== null && after !== null && before !== after) {
+    return [{ oldText: before, newText: after }]
+  }
+  if (toolName === 'write' && after !== null) return [{ oldText: null, newText: after }]
+  return []
+}
+
 /**
  * 捕获一次工具执行结果（tools/result）：edit/write 成功时构造记录、
  * 递增文件批次、融合归档被后续修改取代的旧差异、落盘。
@@ -28,21 +56,29 @@ export async function captureToolResult(ctx: Ctx, registry: Registry, exec: any,
     const cwd = cwdOf(session)
     if (!cwd) return
     const value = result.value
-    const args = exec.arguments || {}
+    const args = (exec.arguments || {}) as Record<string, unknown>
     const path = typeof value.path === 'string' ? value.path : args.file_path
-    if (!path) return
-    const metaDiffs: DiffRecord['hunks'] = Array.isArray(result.meta?.diffs) ? result.meta.diffs : []
+    if (typeof path !== 'string' || !path) return
     const before = typeof value.before === 'string' ? value.before : null
+    const after = typeof value.after === 'string' ? value.after : (typeof args.content === 'string' ? args.content : null)
     const create = exec.name === 'write' && value.before === null
-    const callHunk = exec.name === 'edit' && typeof args.old_string === 'string' ? { oldText: args.old_string, newText: args.new_string } : null
-    const synthHunk = create ? { oldText: null as string | null, newText: typeof args.content === 'string' ? args.content : (typeof value.after === 'string' ? value.after : '') } : null
-    const hunks = metaDiffs.length ? metaDiffs : (synthHunk ? [synthHunk] : (callHunk ? [callHunk] : []))
-    if (!hunks.length) return
+    const callHunk = exec.name === 'edit' && typeof args.old_string === 'string' && typeof args.new_string === 'string'
+      ? { oldText: args.old_string, newText: args.new_string }
+      : null
+    const metaHunks = validHunks(result.meta?.diffs)
+    const rawHunks = metaHunks.length ? metaHunks : fallbackHunks(exec.name, args, before, after, create)
+    const hunks = annotateHunks(rawHunks, before, after)
+    if (!hunks.length || typeof exec.callId !== 'string') return
     const record: DiffRecord = {
       callId: exec.callId,
       toolName: exec.name,
       path,
       before,
+      after,
+      baseFingerprint: fingerprint(before),
+      afterFingerprint: fingerprint(after),
+      legacy: false,
+      conflict: false,
       create,
       callHunk,
       hunks,

package/src/client/index.ts

@@ -15,8 +15,9 @@ import React from 'react'
 import './styles/editor.css'
 import { EditorView } from './ui/EditorView.js'
 import { DiffBadge } from './ui/DiffBadge.js'
+import { McpSettings } from './ui/McpSettings.js'
 
-export const inject = ['slots', 'timer']
+export const inject = ['slots', 'timer', 'locale', 'connection', 'remote']
 
 /**
  * 装配客户端：注册中央编辑区视图与 header 差异角标。
@@ -41,4 +42,12 @@ export function apply(ctx: any): void {
     { name: 'conversation.session.header.utilities', id: 'edrv-diff-badge', order: 90, label: '差异' },
     (props: unknown) => React.createElement(DiffBadge, Object.assign({}, props)),
   ))
-}
+
+  // 设置页中的 VSCodeMode 专属页签，MCP 管理作为该页签的内部子 Tab。
+  ctx.slots.inject('settings.section', () => ctx.slots.register({
+    name: 'settings.section',
+    id: 'vscode-mode',
+    order: 30,
+    label: 'VSCodeMode',
+  }, () => React.createElement(McpSettings)))
+}

package/src/client/monaco/diffRender.ts

@@ -86,8 +86,15 @@ export function createDiffRenderer(log) {
         const lineH = editor.getOption(monaco.editor.EditorOption.lineHeight) || 20
         let li = null
         try { li = editor.getLayoutInfo() } catch (e) { /* ignore */ }
-        const left = li ? li.decorationsLeft : 0
+        const rawLeft = li ? li.decorationsLeft : 0
         const width = li && li.decorationsWidth > 0 ? li.decorationsWidth : 16
+        // decorationsLeft 是 Monaco 内部坐标，需限制在宿主根节点内，避免窄窗口/边框
+        // 或布局尚未完成时把减号绘制到编辑器左、右边界之外。
+        const maxLeft = Math.max(0, root.clientWidth - width)
+        // 字符本身有少量字体侧向留白；给标记列留出 4px 内缩，避免减号半个
+        // 字符落到 Monaco 根节点左边框外，同时仍限制右侧不越界。
+        const markerInset = 12
+        const left = Math.max(0, Math.min(maxLeft, rawLeft + markerInset))
         const lineCount = editor.getModel().getLineCount()
         let itemIdx = 0
         let zi = 0
@@ -100,7 +107,8 @@ export function createDiffRenderer(log) {
           for (let i = 0; i < z.n; i++) {
             const item = document.createElement('div')
             item.className = 'edrv-minus-item'
-            item.textContent = '-'
+            // 使用 CSS 线段代替文本字符，避免不同字体的侧向留白把 “-” 绘制到边界外。
+            item.textContent = ''
             item.style.width = width + 'px'
             item.style.height = lineH + 'px'
             item.dataset.zone = String(zi)
@@ -130,7 +138,14 @@ export function createDiffRenderer(log) {
             const edRect = root.getBoundingClientRect()
             const st = editor.getScrollTop() || 0
             const items = overlay.querySelectorAll('.edrv-minus-item')
+            let correctedLeft = left
+            try {
+              const layout = editor.getLayoutInfo()
+              const markerWidth = layout.decorationsWidth > 0 ? layout.decorationsWidth : width
+              correctedLeft = Math.max(0, Math.min(Math.max(0, root.clientWidth - markerWidth), (layout.decorationsLeft || 0) + 12))
+            } catch (e) { /* 保留首次布局计算结果 */ }
             for (const item of items) {
+              item.style.left = correctedLeft + 'px'
               const zIndex = Number(item.dataset.zone)
               const rIndex = Number(item.dataset.row)
               const z = createdZones[zIndex]

package/src/client/monaco/loader.ts

@@ -7,6 +7,46 @@
 
 export const MONACO_BASE = '/edrv/vendor/monaco/vs'
 let monacoPromise = null
+let monacoStage = { phase: 'idle', progress: 0, message: '准备加载 Monaco…' }
+const stageListeners = new Set()
+
+/**
+ * Monaco 加载阶段：这是阶段进度而非网络字节进度，避免误导用户。
+ * @author ddj 2026年08月22号
+ */
+export const MONACO_STAGES = {
+  loader: { progress: 18, message: '加载 Monaco 引导模块…' },
+  core: { progress: 72, message: '加载编辑器核心模块…' },
+  ready: { progress: 100, message: 'Monaco 编辑器已就绪' },
+  error: { progress: 0, message: 'Monaco 编辑器加载失败' },
+}
+
+/**
+ * 发布 Monaco 加载阶段，监听器异常不得影响编辑器加载。
+ * @author ddj 2026年08月22号
+ * @param phase 阶段名
+ * @param progress 阶段百分比
+ * @param message 用户可读状态
+ */
+function publishStage(phase, progress, message) {
+  monacoStage = { phase, progress, message }
+  for (const listener of stageListeners) {
+    try { listener(monacoStage) } catch (error) { /* UI 回调异常忽略 */ }
+  }
+}
+
+/**
+ * 订阅 Monaco 加载阶段。
+ * @author ddj 2026年08月22号
+ * @param listener 阶段回调
+ * @returns 取消订阅函数
+ */
+function subscribeStage(listener) {
+  if (typeof listener !== 'function') return () => {}
+  stageListeners.add(listener)
+  listener(monacoStage)
+  return () => stageListeners.delete(listener)
+}
 
 /** 扩展名 → Monaco language id（常见语言；未知回退 plaintext）。 */
 export const LANG_BY_EXT = {
@@ -40,19 +80,26 @@ export function langOf(path) {
  * @author ddj 2026年08月20号
  * @returns Promise<object> window.monaco
  */
-export function loadMonaco() {
+export function loadMonaco(onProgress) {
+  const unsubscribe = subscribeStage(onProgress)
   if (!monacoPromise) {
+    publishStage('loader', MONACO_STAGES.loader.progress, MONACO_STAGES.loader.message)
     monacoPromise = new Promise((resolve, reject) => {
+      const fail = (error) => {
+        monacoPromise = null
+        publishStage('error', MONACO_STAGES.error.progress, MONACO_STAGES.error.message)
+        reject(error)
+      }
       const boot = () => {
         try {
           window.require.config({ paths: { vs: MONACO_BASE } })
-          window.require(['vs/editor/editor.main'], () => resolve(window.monaco), (err) => {
-            monacoPromise = null
-            reject(new Error('Monaco 模块加载失败：' + String(err)))
-          })
+          publishStage('core', MONACO_STAGES.core.progress, MONACO_STAGES.core.message)
+          window.require(['vs/editor/editor.main'], () => {
+            publishStage('ready', MONACO_STAGES.ready.progress, MONACO_STAGES.ready.message)
+            resolve(window.monaco)
+          }, (err) => fail(new Error('Monaco 模块加载失败：' + String(err))))
         } catch (error) {
-          monacoPromise = null
-          reject(error)
+          fail(error)
         }
       }
       const existing = document.querySelector('script[data-edrv-monaco-loader]')
@@ -62,10 +109,10 @@ export function loadMonaco() {
         s.src = MONACO_BASE + '/loader.js'
         s.dataset.edrvMonacoLoader = '1'
         s.onload = boot
-        s.onerror = () => { monacoPromise = null; reject(new Error('Monaco loader 加载失败')) }
+        s.onerror = () => fail(new Error('Monaco loader 加载失败'))
         document.head.appendChild(s)
       }
     })
   }
-  return monacoPromise
+  return monacoPromise.finally(unsubscribe)
 }

package/src/client/state/records.ts

@@ -4,6 +4,7 @@
  * 作者 ddj 2026-08-20
  */
 import type { CallHunk, Hunk, RecordView } from '../../shared/types.js'
+import { preciseHunk } from '../../shared/diff.js'
 
 /** 差异决策状态。 */
 export const ST = { PENDING: 'pending', ACCEPTED: 'accepted', REJECTED: 'rejected' } as const
@@ -36,7 +37,9 @@ export function statusAt(rec: RecordView | undefined, idx: number): Status {
 /** hunk 是否为空差异（old===new，无实际内容变化，不可操作）。create 记录不视为空差异。 */
 export function noopHunk(rec: RecordView | undefined, h: Hunk | CallHunk | null | undefined): boolean {
   if (!rec || rec.create === true) return false
-  const precise = rec.toolName === 'edit' && rec.callHunk ? rec.callHunk : h
+  const precise = rec && h && rec.hunks.indexOf(h as Hunk) >= 0
+    ? preciseHunk(rec, rec.hunks.indexOf(h as Hunk))
+    : h
   const oldText = precise?.oldText ?? null
   const newText = precise?.newText ?? null
   return oldText !== null && oldText === newText
@@ -44,7 +47,7 @@ export function noopHunk(rec: RecordView | undefined, h: Hunk | CallHunk | null
 
 /** 记录是否仍有待处理差异（superseded / 全部已决策 = false）。 */
 export function isRecPending(rec: RecordView): boolean {
-  if (!rec || rec.superseded === true) return false
+  if (!rec || rec.superseded === true || rec.conflict === true) return false
   const perHunk = Array.isArray(rec.decisions?.perHunk) ? rec.decisions.perHunk : []
   if (perHunk.length) {
     // 只认存在至少一个"非空差异且未决策"的 hunk

package/src/client/state/regions.ts

@@ -4,6 +4,7 @@
  * 作者 ddj 2026-08-20
  */
 import type { Hunk, RecordView } from '../../shared/types.js'
+import { locateHunks, lineBefore, preciseHunk, splitLines } from '../../shared/diff.js'
 import { ST, noopHunk, statusAt } from './records.js'
 import type { Status } from './records.js'
 
@@ -25,9 +26,7 @@ export interface Region {
 
 /** 统计 index 之前（不含）的换行数 → 0 基行号。 */
 export function countLinesBefore(text: string, index: number): number {
-  let n = 0
-  for (let i = 0; i < index; i++) if (text.charCodeAt(i) === 10) n++
-  return n
+  return lineBefore(text, index)
 }
 
 /**
@@ -51,29 +50,36 @@ export function trimCommonLines(oldLines: string[], newLines: string[]): { oldLi
 export function diffRegions(records: RecordView[], content: string | null): Region[] {
   const regions: Region[] = []
   if (content === null) return regions
-  const lines = content.split('\n')
+  const lines = splitLines(content)
   for (const rec of records) {
-    for (let i = 0; i < rec.hunks.length; i++) {
-      const h: Hunk = rec.hunks[i]
-      if (noopHunk(rec, h)) continue // 空差异（old===new）无实际变化，跳过
-      const status = statusAt(rec, i)
-      if (rec.create) {
-        regions.push({ callId: rec.callId, idx: i, start: 1, end: lines.length, oldLines: [], newLines: lines.slice(), whole: true, status, create: true, rec, superseded: rec.superseded === true })
-        continue
+    if (rec.create) {
+      for (let i = 0; i < rec.hunks.length; i++) {
+        const h = preciseHunk(rec, i)
+        if (!h || noopHunk(rec, h)) continue
+        regions.push({ callId: rec.callId, idx: i, start: 1, end: Math.max(1, lines.length), oldLines: [], newLines: lines.slice(), whole: true, status: statusAt(rec, i), create: true, rec, superseded: rec.superseded === true })
       }
-      const precise = rec.toolName === 'edit' && rec.callHunk ? rec.callHunk : h
-      const newText = precise.newText ?? ''
-      const at = content.indexOf(newText)
-      if (at < 0) {
-        regions.push({ callId: rec.callId, idx: i, stale: true, status, create: false, oldLines: [], newLines: [], rec, superseded: rec.superseded === true })
+      continue
+    }
+    const entries: Array<{ idx: number; hunk: Hunk }> = []
+    for (let i = 0; i < rec.hunks.length; i++) {
+      const hunk = preciseHunk(rec, i)
+      if (hunk && !noopHunk(rec, hunk)) entries.push({ idx: i, hunk })
+    }
+    const locations = locateHunks(content, entries.map((entry) => entry.hunk))
+    for (let i = 0; i < entries.length; i++) {
+      const entry = entries[i]
+      const location = locations[i]
+      const status = statusAt(rec, entry.idx)
+      if (!location.matched) {
+        regions.push({ callId: rec.callId, idx: entry.idx, stale: true, status, create: false, oldLines: entry.hunk.oldText === null ? [] : entry.hunk.oldText.split('\n'), newLines: entry.hunk.newText ? entry.hunk.newText.split('\n') : [], rec, superseded: rec.superseded === true })
         continue
       }
-      const start = countLinesBefore(content, at) + 1
-      const oldLines = precise.oldText === null ? [] : precise.oldText.split('\n')
-      const newLines = newText.split('\n')
+      const start = countLinesBefore(content, location.start) + 1
+      const oldLines = entry.hunk.oldText === null ? [] : entry.hunk.oldText.split('\n')
+      const newLines = entry.hunk.newText.split('\n')
       const trimmed = trimCommonLines(oldLines, newLines)
       const regionStart = start + trimmed.shift
-      regions.push({ callId: rec.callId, idx: i, start: regionStart, end: regionStart + trimmed.newLines.length, oldLines: trimmed.oldLines, newLines: trimmed.newLines, status, create: false, rec, superseded: rec.superseded === true })
+      regions.push({ callId: rec.callId, idx: entry.idx, start: regionStart, end: regionStart + trimmed.newLines.length, oldLines: trimmed.oldLines, newLines: trimmed.newLines, status, create: false, rec, superseded: rec.superseded === true })
     }
   }
   regions.sort((a, b) => (a.start ?? Infinity) - (b.start ?? Infinity))

package/src/client/styles/editor.css

@@ -40,8 +40,9 @@
 [data-edrv-view] .edrv-del-zone { background: #fdeaea; border-top: 1px solid rgba(217,83,79,.35); border-bottom: 1px solid rgba(217,83,79,.35); box-shadow: inset 0 0 0 1px rgba(217,83,79,.12); }
 [data-edrv-view] .edrv-del-row { white-space: pre; font-family: var(--ds-font-family-code, ui-monospace, monospace); font-size: 12.5px; line-height: 20px; color: #c0392b; }
 [data-edrv-view] .edrv-del-text { display: inline-block; white-space: pre; }
-[data-edrv-view] .edrv-minus-overlay { position: absolute; left: 0; top: 0; pointer-events: none; z-index: 6; }
-[data-edrv-view] .edrv-minus-item { position: absolute; width: 16px; text-align: center; color: #d9534f; font-weight: 700; font-size: 12.5px; line-height: 20px; }
+[data-edrv-view] .edrv-minus-overlay { position: absolute; left: 0; top: 0; width: 100%; height: 100%; max-width: 100%; overflow: visible; pointer-events: none; z-index: 6; }
+[data-edrv-view] .edrv-minus-item { position: absolute; box-sizing: border-box; max-width: 100%; overflow: hidden; }
+[data-edrv-view] .edrv-minus-item::before { content: ''; position: absolute; left: 4px; top: 50%; width: 8px; height: 2px; transform: translateY(-50%); border-radius: 2px; background: #d9534f; }
 [data-edrv-view] .edrv-monaco-host { flex: 1; min-height: 0; position: relative; }
 [data-edrv-view] .edrv-monaco-host > div { position: absolute; inset: 0; }
 [data-edrv-view] .edrv-empty { display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 10px; height: 100%; color: var(--dsw-alias-label-tertiary, #777); font-size: 13px; }
@@ -83,5 +84,18 @@
 [data-edrv-view] .edrv-launch-path { flex: 1; min-width: 0; font-size: 12px; color: var(--dsw-alias-label-primary, #eee); word-break: break-all; }
 [data-edrv-view] .edrv-launch-cnt { font-size: 11px; color: var(--dsw-alias-label-tertiary, #888); white-space: nowrap; }
 [data-edrv-view] .edrv-launch-arch { display: flex; flex-direction: column; gap: 6px; }
+[data-edrv-view] .monaco-editor { overflow: hidden !important; }
+[data-edrv-view] .monaco-editor .sticky-widget { z-index: 30 !important; background: var(--dsw-alias-bg-base, #f8f8f8) !important; }
+[data-edrv-view] .monaco-editor .sticky-widget .sticky-line-content,
+[data-edrv-view] .monaco-editor .sticky-widget .sticky-line-number { background: var(--dsw-alias-bg-base, #f8f8f8) !important; }
 [data-edrv-view] .monaco-editor, [data-edrv-view] .monaco-editor .margin, [data-edrv-view] .monaco-editor-background { background: transparent !important; }
 [data-edrv-view] .monaco-editor .scrollbar .slider { background: rgba(128,128,128,.3) !important; }
+[data-edrv-view] .edrv-loading { gap: 8px; padding: 20px; }
+[data-edrv-view] .edrv-loading-title { color: var(--dsw-alias-label-primary, #1f2933); font-size: 13px; }
+[data-edrv-view] .edrv-progress { width: min(360px, 72%); height: 6px; overflow: hidden; border-radius: 999px; background: var(--dsw-alias-border-l1, #e0e6e8); }
+[data-edrv-view] .edrv-progress-value { height: 100%; border-radius: inherit; background: var(--dsw-alias-brand-primary, #0f9d58); transition: width .24s ease; }
+[data-edrv-view] .edrv-loading-percent { color: var(--dsw-alias-label-tertiary, #9aa5b1); font-size: 11px; font-variant-numeric: tabular-nums; }
+@media (prefers-reduced-motion: reduce) {
+  [data-edrv-view] .edrv-progress-value { transition: none; }
+}
+

package/src/client/styles/mcp.css

@@ -0,0 +1,87 @@
+/* dsh-vscode-mode MCP 管理界面样式。
+   全部使用 DSH 真实主题变量（--dsw-alias-*），不再用不存在的 fg-* 变量。 */
+.vsm-mcp-page{display:flex;flex-direction:column;gap:18px;width:100%;max-width:920px;box-sizing:border-box;color:var(--dsw-alias-label-primary,#e6e6e6);padding-bottom:32px}
+
+/* 顶部：标题 + 副标题 + 添加按钮 */
+.vsm-mcp-header{display:flex;align-items:flex-start;justify-content:space-between;gap:20px}
+.vsm-mcp-header h2{margin:0 0 4px;font-size:20px;font-weight:600;line-height:1.35;color:var(--dsw-alias-label-primary,#e6e6e6)}
+.vsm-mcp-header p{margin:0;color:var(--dsw-alias-label-tertiary,#9aa5b1);font-size:13px;line-height:1.5}
+.vsm-primary{border:0;border-radius:6px;padding:8px 16px;background:var(--dsw-alias-button-primary-fill,#6d55ff);color:var(--dsw-alias-button-contrast-fill,#fff);font-size:13px;font-weight:500;cursor:pointer;white-space:nowrap}
+.vsm-primary:hover{background:var(--dsw-alias-button-primary-hover,#5a46e6)}
+.vsm-primary:disabled{opacity:.55;cursor:default}
+
+/* 子 Tab：我的 MCP / MCP 市场 */
+.vsm-mcp-tabs{display:flex;gap:24px;border-bottom:1px solid var(--dsw-alias-border-l2,#3a3a3a)}
+.vsm-mcp-tabs button{border:0;background:none;color:var(--dsw-alias-label-tertiary,#9aa5b1);padding:9px 2px 11px;cursor:pointer;font-size:14px;position:relative}
+.vsm-mcp-tabs button:hover{color:var(--dsw-alias-label-secondary,#c8c8c8)}
+.vsm-mcp-tabs button.active{color:var(--dsw-alias-label-primary,#fff);font-weight:500}
+.vsm-mcp-tabs button.active::after{content:"";position:absolute;left:0;right:0;bottom:-1px;height:2px;background:var(--dsw-alias-brand-primary,#6d55ff);border-radius:2px}
+
+/* 服务卡片 */
+.vsm-mcp-card{border:1px solid var(--dsw-alias-border-l2,#3a3a3a);border-radius:10px;padding:14px 16px;margin-bottom:10px;background:var(--dsw-alias-bg-layer-2,transparent);transition:border-color .15s}
+.vsm-mcp-card:hover{border-color:var(--dsw-alias-border-l3,#555)}
+.vsm-mcp-card-head{display:flex;justify-content:space-between;align-items:center;gap:12px}
+.vsm-mcp-title{display:flex;align-items:center;gap:9px;font-weight:600;font-size:14px;color:var(--dsw-alias-label-primary,#e6e6e6);min-width:0}
+.vsm-mcp-source{font-size:11px;font-weight:400;padding:2px 7px;border-radius:4px;background:var(--dsw-alias-bg-mask-2,#ffffff22);color:var(--dsw-alias-label-tertiary,#9aa5b1);flex-shrink:0}
+.vsm-mcp-dot{width:8px;height:8px;border-radius:50%;flex-shrink:0;background:var(--dsw-alias-state-error-primary,#e05252)}
+.vsm-mcp-dot.connected{background:var(--dsw-alias-state-success-primary,#38bd75)}
+.vsm-mcp-dot.connecting{background:var(--dsw-alias-state-warn-primary,#e5b93f)}
+.vsm-mcp-dot.disabled{background:var(--dsw-alias-label-tertiary,#9aa5b1)}
+.vsm-mcp-actions{display:flex;align-items:center;gap:4px;flex-shrink:0}
+.vsm-mcp-actions button{border:0;background:none;color:var(--dsw-alias-label-tertiary,#9aa5b1);cursor:pointer;font-size:15px;width:28px;height:28px;border-radius:6px;line-height:1}
+.vsm-mcp-actions button:hover{color:var(--dsw-alias-label-primary,#fff);background:var(--dsw-alias-interactive-bg-hover,#ffffff14)}
+.vsm-mcp-actions button.vsm-danger:hover{color:var(--dsw-alias-state-error-primary,#f07878);background:var(--dsw-alias-interactive-bg-hover-danger,#ff000014)}
+.vsm-switch{font-size:14px !important}
+.vsm-switch.on{color:var(--dsw-alias-state-success-primary,#38bd75)}
+.vsm-mcp-meta{font-size:12px;color:var(--dsw-alias-label-tertiary,#9aa5b1);margin:9px 0}
+.vsm-mcp-error{color:var(--dsw-alias-state-error-primary,#f07878);font-size:12px;margin:8px 0}
+.vsm-mcp-banner{padding:9px 12px;border:1px solid var(--dsw-alias-state-error-secondary,#d9534f55);border-radius:6px;background:var(--dsw-alias-state-error-secondary,#d9534f1a);margin-bottom:10px}
+
+/* 工具 chips */
+.vsm-mcp-tools{display:flex;flex-wrap:wrap;gap:6px}
+.vsm-mcp-chip{font:12px var(--ds-font-family-code,ui-monospace,monospace);padding:4px 8px;border-radius:5px;background:var(--dsw-alias-bg-mask-2,#ffffff14);color:var(--dsw-alias-label-secondary,#c8c8c8);border:1px solid var(--dsw-alias-border-l1,#333)}
+
+/* 空态 / 加载态 */
+.vsm-mcp-empty{text-align:center;padding:56px 20px;color:var(--dsw-alias-label-tertiary,#9aa5b1);border:1px dashed var(--dsw-alias-border-l2,#3a3a3a);border-radius:8px;font-size:13px}
+
+/* 项目搜索下拉框 */
+.vsm-project-picker{position:relative;width:100%;z-index:4}
+.vsm-project-picker-trigger{width:100%;display:flex;align-items:center;justify-content:space-between;gap:12px;padding:10px 12px;border:1px solid var(--dsw-alias-border-l2,#3a3a3a);border-radius:8px;background:var(--dsw-alias-bg-layer-1,transparent);color:var(--dsw-alias-label-primary,#e6e6e6);cursor:pointer;text-align:left}
+.vsm-project-picker-trigger:hover{border-color:var(--dsw-alias-brand-primary,#6d55ff)}
+.vsm-project-picker-label{display:flex;flex-direction:column;min-width:0;font-size:13px;font-weight:500}
+.vsm-project-picker-label small{margin-top:3px;color:var(--dsw-alias-label-tertiary,#9aa5b1);font:11px var(--ds-font-family-code,ui-monospace,monospace);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.vsm-project-picker-arrow{color:var(--dsw-alias-label-tertiary,#9aa5b1);font-size:16px}
+.vsm-project-picker-menu{position:absolute;top:calc(100% + 6px);left:0;right:0;padding:8px;border:1px solid var(--dsw-alias-border-l2,#3a3a3a);border-radius:9px;background:var(--dsw-alias-bg-overlay,#202020);box-shadow:0 12px 36px #0008}
+.vsm-project-picker-search{width:100%;box-sizing:border-box;padding:8px 10px;border:1px solid var(--dsw-alias-border-l2,#555);border-radius:6px;background:var(--dsw-alias-bg-layer-1,#2b2b2b);color:var(--dsw-alias-label-primary,#eee);outline:none}
+.vsm-project-picker-search:focus{border-color:var(--dsw-alias-brand-primary,#6d55ff)}
+.vsm-project-picker-options{max-height:260px;overflow:auto;margin-top:6px}
+.vsm-project-option{display:flex;width:100%;flex-direction:column;gap:3px;padding:8px 9px;border:0;border-radius:6px;background:none;color:var(--dsw-alias-label-primary,#eee);cursor:pointer;text-align:left}
+.vsm-project-option:hover,.vsm-project-option.highlight{background:var(--dsw-alias-interactive-bg-hover,#ffffff14)}
+.vsm-project-option.selected{color:var(--dsw-alias-brand-primary,#6d55ff)}
+.vsm-project-option small{overflow:hidden;color:var(--dsw-alias-label-tertiary,#9aa5b1);font:11px var(--ds-font-family-code,ui-monospace,monospace);text-overflow:ellipsis;white-space:nowrap}
+.vsm-project-picker-empty{padding:18px 8px;color:var(--dsw-alias-label-tertiary,#9aa5b1);font-size:12px;text-align:center}
+
+/* 项目级 MCP 分组 */
+.vsm-project{border:1px solid var(--dsw-alias-border-l2,#3a3a3a);border-radius:12px;margin-bottom:14px;overflow:hidden;background:var(--dsw-alias-bg-layer-1,transparent)}
+.vsm-project-head{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:12px 16px;border-bottom:1px solid var(--dsw-alias-border-l1,#333);background:var(--dsw-alias-bg-mask-1,#ffffff0a)}
+.vsm-project-title{display:flex;align-items:center;gap:10px;min-width:0}
+.vsm-project-icon{color:var(--dsw-alias-brand-primary,#6d55ff);font-size:15px;flex-shrink:0}
+.vsm-project-name{font-size:14px;font-weight:600;color:var(--dsw-alias-label-primary,#e6e6e6);display:block}
+.vsm-project-path{font-size:11px;color:var(--dsw-alias-label-tertiary,#9aa5b1);font-family:var(--ds-font-family-code,ui-monospace,monospace);display:block;margin-top:2px;word-break:break-all}
+.vsm-primary.vsm-small{padding:5px 12px;font-size:12px}
+.vsm-project-empty{text-align:center;padding:26px 16px;color:var(--dsw-alias-label-tertiary,#9aa5b1);font-size:12px}
+.vsm-project .vsm-mcp-card{border:0;border-radius:0;margin:0;border-bottom:1px solid var(--dsw-alias-border-l1,#333);background:transparent}
+.vsm-project .vsm-mcp-card:last-child{border-bottom:0}
+.vsm-project .vsm-mcp-banner{border-radius:0;margin:0}
+
+/* 新增 MCP 弹窗 */
+.vsm-mcp-modal{position:fixed;inset:0;background:var(--dsw-alias-bg-mask-drop,#000000aa);display:flex;align-items:center;justify-content:center;z-index:50}
+.vsm-mcp-dialog{width:min(560px,calc(100vw - 40px));max-height:88vh;overflow:auto;padding:22px 24px;border-radius:12px;background:var(--dsw-alias-bg-overlay,#202020);border:1px solid var(--dsw-alias-border-l2,#444);box-shadow:0 16px 60px #000c;color:var(--dsw-alias-label-primary,#e6e6e6)}
+.vsm-mcp-dialog h3{margin:0 0 14px;font-size:16px;font-weight:600}
+.vsm-mcp-dialog label{display:flex;flex-direction:column;gap:6px;margin:12px 0;font-size:12px;color:var(--dsw-alias-label-secondary,#aaa)}
+.vsm-mcp-dialog input,.vsm-mcp-dialog select,.vsm-mcp-dialog textarea{font:inherit;color:var(--dsw-alias-label-primary,#eee);background:var(--dsw-alias-bg-layer-1,#2b2b2b);border:1px solid var(--dsw-alias-border-l2,#555);border-radius:6px;padding:8px 10px}
+.vsm-mcp-dialog input:focus,.vsm-mcp-dialog select:focus,.vsm-mcp-dialog textarea:focus{outline:none;border-color:var(--dsw-alias-brand-primary,#6d55ff)}
+.vsm-mcp-dialog textarea{min-height:64px;resize:vertical;font-family:var(--ds-font-family-code,ui-monospace,monospace)}
+.vsm-mcp-dialog-actions{display:flex;justify-content:flex-end;gap:10px;margin-top:20px}
+.vsm-mcp-dialog-actions button{padding:8px 14px;border:1px solid var(--dsw-alias-border-l2,#555);border-radius:6px;background:none;color:var(--dsw-alias-label-primary,#eee);cursor:pointer;font-size:13px}
+.vsm-mcp-dialog-actions button:hover{background:var(--dsw-alias-interactive-bg-hover,#ffffff14)}

package/src/client/ui/DiffBox.ts

@@ -37,6 +37,7 @@ export function DiffBox(props) {
     })
     const stale = staleRegions.map((r) => React.createElement('div', { key: 'stale' + callIdAttr(r.callId, r.idx), className: 'edrv-diffrow edrv-diffrow-stale', title: '差异无法定位（文件可能已被手动修改）' },
       React.createElement('span', { className: 'edrv-diffrow-l' }, 'L' + (r.start ?? '?') + ' 无法定位'),
+      React.createElement('span', { className: 'edrv-diffrow-tag' }, '冲突/需刷新'),
       React.createElement('span', { className: 'edrv-diffrow-tag' }, badgeOf(r.status))))
     let othersEl = null
     if (otherFiles.length) {

package/src/client/ui/EditorView.ts

@@ -35,6 +35,8 @@ export function EditorView(props) {
   const [content, setContent] = React.useState(null)
   const [status, setStatus] = React.useState('')
   const [error, setError] = React.useState(null)
+  const [loadError, setLoadError] = React.useState(null)
+  const [loadStage, setLoadStage] = React.useState({ progress: 0, message: '准备加载编辑器…' })
   const [openInput, setOpenInput] = React.useState(false)
   const [pathDraft, setPathDraft] = React.useState('')
   const [cursor, setCursor] = React.useState('')
@@ -118,11 +120,27 @@ export function EditorView(props) {
 
   const loadContent = (path, sid) => {
     const seq = ++loadSeqRef.current
+    setLoadError(null)
+    setLoadStage({ progress: monaco ? 72 : 12, message: '读取文件内容…' })
     rpc('edrv.read', { sessionId: sid, path }).then((res) => {
       if (seq !== loadSeqRef.current || path !== active) return
-      if (res && res.ok) { setContent(res.content); setStatus('已加载') }
-      else { setError(res?.error ? String(res.error) : '读取失败'); setStatus('读取失败') }
-    }).catch((e) => { if (seq === loadSeqRef.current) { setError('read异常:' + String(e)); setStatus('读取失败') } })
+      if (res && res.ok) {
+        setContent(res.content)
+        setLoadStage((prev) => ({ progress: Math.max(84, prev.progress), message: '文件已读取，准备创建编辑器…' }))
+        setStatus('已加载')
+      } else {
+        const message = res?.error ? String(res.error) : '读取失败'
+        setLoadError(message)
+        setError(message)
+        setStatus('读取失败')
+      }
+    }).catch((e) => {
+      if (seq !== loadSeqRef.current) return
+      const message = 'read异常:' + String(e)
+      setLoadError(message)
+      setError(message)
+      setStatus('读取失败')
+    })
   }
 
   // 挂载轮询 + 事件订阅
@@ -173,14 +191,27 @@ export function EditorView(props) {
 
   React.useEffect(() => {
     if (!active) return
-    setContent(null); setStatus('加载中…')
+    setContent(null)
+    setLoadError(null)
+    setLoadStage({ progress: 10, message: '准备读取文件…' })
+    setStatus('加载中…')
     loadContent(active, sessionId)
   }, [active, sessionId])
 
   React.useEffect(() => {
     if (monaco || monacoErr) return
     let alive = true
-    loadMonaco().then((m) => { if (alive) setMonaco(m) }).catch((e) => { if (alive) { setMonacoErr(String(e?.message ?? e)); setStatus('Monaco 不可用') } })
+    const onProgress = (stage) => {
+      if (!alive) return
+      const progress = stage.phase === 'ready' ? 70 : Math.round(10 + stage.progress * 0.6)
+      setLoadStage((prev) => ({ progress: Math.max(prev.progress, progress), message: stage.message }))
+    }
+    loadMonaco(onProgress).then((m) => { if (alive) setMonaco(m) }).catch((e) => {
+      if (alive) {
+        setMonacoErr(String(e?.message ?? e))
+        setStatus('Monaco 不可用')
+      }
+    })
     return () => { alive = false }
   }, [monaco, monacoErr])
 
@@ -235,12 +266,14 @@ export function EditorView(props) {
     const ed = editorRef.current
     const model = getModel(active, content)
     if (ed.getModel() !== model) ed.setModel(model)
+    setLoadStage((prev) => ({ progress: Math.max(96, prev.progress), message: '创建编辑器视图…' }))
   }, [monaco, active, content])
 
   // 行内差异自绘（decorations / view zones / minus overlay）→ diffRenderer
   React.useEffect(() => {
     if (!monaco || !editorRef.current || !active || content === null) return
     diffRendererRef.current.render(monaco, editorRef.current, pendingRegions, sessionId)
+    setLoadStage({ progress: 100, message: '编辑器已就绪' })
   }, [monaco, active, content, pendingRegions])
 
   React.useEffect(() => () => {
@@ -525,19 +558,48 @@ export function EditorView(props) {
 
   const otherFiles = sum.pendingFiles.filter((f) => f.path !== active)
 
+  /**
+   * 渲染编辑器/文件加载进度面板。
+   * @author ddj 2026年08月22号
+   * @param message 当前加载阶段
+   * @param progress 阶段进度
+   * @param retry 可选重试回调
+   * @returns 加载面板 React 元素
+   */
+  const loadingBody = (message, progress, retry) => React.createElement('div', { className: 'edrv-empty edrv-loading', 'aria-live': 'polite' },
+    React.createElement('div', { className: 'edrv-loading-title' }, message),
+    React.createElement('div', {
+      className: 'edrv-progress',
+      role: 'progressbar',
+      'aria-label': '编辑器加载进度',
+      'aria-valuemin': 0,
+      'aria-valuemax': 100,
+      'aria-valuenow': progress,
+    }, React.createElement('div', { className: 'edrv-progress-value', style: { width: Math.max(0, Math.min(100, progress)) + '%' } })),
+    React.createElement('div', { className: 'edrv-loading-percent' }, Math.round(progress) + '%'),
+    retry ? React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: retry }, '重试') : null)
+
   let body
   if (!monaco && !monacoErr) {
-    body = React.createElement('div', { className: 'edrv-empty' }, '正在加载 Monaco 编辑器…')
+    body = loadingBody(loadStage.message, loadStage.progress)
   } else if (monacoErr) {
     body = React.createElement('div', { className: 'edrv-empty' },
       React.createElement('div', null, 'Monaco 编辑器加载失败：' + String(monacoErr)),
-      React.createElement('div', { style: { fontSize: 11 } }, '请确认插件包 assets/vendor/monaco 完整（/edrv/vendor 路由可达）'))
+      React.createElement('div', { style: { fontSize: 11 } }, '请确认插件包 assets/vendor/monaco 完整（/edrv/vendor 路由可达）'),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: () => { setMonacoErr(null); setLoadStage({ progress: 0, message: '准备重试 Monaco…' }) } }, '重试'))
   } else if (!active) {
     body = React.createElement('div', { className: 'edrv-empty' },
       React.createElement('div', null, '暂无打开的文件'),
       React.createElement('div', { style: { fontSize: 12 } }, '使用右上搜索框 (Ctrl+P) 打开工作区文件；agent 修改文件后顶部会出现差异角标'))
+  } else if (content === null && loadError) {
+    body = loadingBody('文件加载失败：' + loadError, 0, () => {
+      setLoadError(null)
+      setContent(null)
+      setLoadStage({ progress: 10, message: '重新读取文件…' })
+      loadContent(active, sessionId)
+    })
   } else if (content === null) {
-    body = React.createElement('div', { className: 'edrv-empty' }, '加载中…')
+    body = loadingBody(loadStage.message || '读取文件内容…', loadStage.progress)
   } else {
     body = React.createElement('div', { className: 'edrv-monaco-host' },
       React.createElement('div', { ref: ensureEditor }))