dsh-vscode-mode 0.1.10 → 0.1.12

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

@@ -28,7 +28,7 @@ export function createDiffRenderer(log) {
     const decos = []
     for (const r of pendingRegions) {
       if (r.start === undefined || r.end === undefined) continue
-      if (!r.create && r.newLines && r.newLines.length) {
+      if (r.newLines && r.newLines.length) {
         decos.push({
           range: new monaco.Range(r.start, 1, Math.max(r.start, r.end - 1), 1),
           options: { isWholeLine: true, className: 'edrv-mn-add-line', linesDecorationsClassName: 'edrv-mn-gutter-add' },

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: lines.length + 1, 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/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/McpSettings.ts

@@ -0,0 +1,233 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — VSCodeMode 设置区内的 MCP 管理。
+ * 子 Tab：我的 MCP（profile 全局）/ 项目 MCP（各项目 .mcp.json）/ MCP 市场（占位）。
+ * 作者 ddj 2026年08月22号
+ */
+import React from 'react'
+import { rpc } from '../rpc.js'
+import type { MpcProject, MpcServer } from '../../shared/mcp.js'
+import '../styles/mcp.css'
+
+const EMPTY = { serverName: '', transport: 'stdio', command: '', args: '', cwd: '', url: '', headers: '' }
+
+/** 将表单草稿转换为 Host MCP 配置。 */
+function configOf(draft) {
+  const config = { serverName: draft.serverName.trim(), transport: draft.transport }
+  if (draft.transport === 'stdio') {
+    config.command = draft.command.trim()
+    config.args = draft.args.split(/\r?\n|\s+/).filter(Boolean)
+    if (draft.cwd.trim()) config.cwd = draft.cwd.trim()
+  } else {
+    config.url = draft.url.trim()
+    config.headers = parsePairs(draft.headers)
+  }
+  return config
+}
+
+/** 解析每行 key=value 的表单字段。 */
+function parsePairs(text) {
+  return Object.fromEntries(text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).map((line) => {
+    const idx = line.indexOf('=')
+    return idx > 0 ? [line.slice(0, idx).trim(), line.slice(idx + 1).trim()] : [line, '']
+  }))
+}
+
+/** 服务状态文案。 */
+function statusOf(server) {
+  return server.status === 'connected' ? '在线' : server.status === 'connecting' ? '连接中' : server.status === 'disabled' ? '已禁用' : '错误'
+}
+
+/** MCP 服务卡片（全局与项目共用）。 */
+function ServerCard({ server, onRefresh, onToggle, onRemove }) {
+  return React.createElement('article', { className: 'vsm-mcp-card' },
+    React.createElement('div', { className: 'vsm-mcp-card-head' },
+      React.createElement('div', { className: 'vsm-mcp-title' }, React.createElement('span', { className: 'vsm-mcp-dot ' + (server.enabled ? server.status : 'disabled') }), server.serverName),
+      React.createElement('div', { className: 'vsm-mcp-actions' },
+        React.createElement('button', { onClick: () => onRefresh(server.id), title: '刷新连接' }, '↻'),
+        React.createElement('button', { className: 'vsm-danger', onClick: () => onRemove(server.id), title: '删除 MCP' }, '⌫'),
+        React.createElement('button', { className: 'vsm-switch ' + (server.enabled ? 'on' : ''), onClick: () => onToggle(server), 'aria-label': server.enabled ? '禁用' : '启用' }, server.enabled ? '●' : '○'),
+      ),
+    ),
+    React.createElement('div', { className: 'vsm-mcp-meta' }, statusOf(server), ' · ', server.toolCount, ' 个工具 · ', server.transport),
+    server.error && React.createElement('div', { className: 'vsm-mcp-error' }, server.error),
+    React.createElement('div', { className: 'vsm-mcp-tools' }, server.tools.map((tool) => React.createElement('span', { key: tool.name, className: 'vsm-mcp-chip', title: tool.description || tool.name }, tool.name))),
+  )
+}
+
+/** 按项目标题或路径过滤，大小写不敏感。 */
+export function filterProjects(projects, query) {
+  const needle = String(query ?? '').trim().toLowerCase()
+  if (!needle) return projects
+  return projects.filter((project) => `${project.title} ${project.workspacePath}`.toLowerCase().includes(needle))
+}
+
+/** 带搜索的项目组合框。 */
+function ProjectPicker({ projects, value, onChange }) {
+  const [open, setOpen] = React.useState(false)
+  const [query, setQuery] = React.useState('')
+  const [highlight, setHighlight] = React.useState(0)
+  const rootRef = React.useRef(null)
+  const selected = projects.find((project) => project.workspacePath === value)
+  const filtered = React.useMemo(() => filterProjects(projects, query), [projects, query])
+
+  React.useEffect(() => {
+    const close = (event) => {
+      if (!rootRef.current?.contains(event.target)) setOpen(false)
+    }
+    document.addEventListener('mousedown', close)
+    return () => document.removeEventListener('mousedown', close)
+  }, [])
+
+  const choose = (project) => {
+    onChange(project.workspacePath)
+    setQuery('')
+    setOpen(false)
+  }
+  const move = (delta) => setHighlight((old) => Math.max(0, Math.min(Math.max(0, filtered.length - 1), old + delta)))
+  const keyDown = (event) => {
+    if (event.key === 'ArrowDown') { event.preventDefault(); move(1) }
+    else if (event.key === 'ArrowUp') { event.preventDefault(); move(-1) }
+    else if (event.key === 'Enter' && filtered[highlight]) { event.preventDefault(); choose(filtered[highlight]) }
+    else if (event.key === 'Escape') { event.preventDefault(); setOpen(false) }
+  }
+  return React.createElement('div', { className: 'vsm-project-picker', ref: rootRef },
+    React.createElement('button', { className: 'vsm-project-picker-trigger', role: 'combobox', 'aria-expanded': open, onClick: () => setOpen((old) => !old) },
+      React.createElement('span', { className: 'vsm-project-picker-label' }, selected?.title || '选择项目', selected && React.createElement('small', null, selected.workspacePath)),
+      React.createElement('span', { className: 'vsm-project-picker-arrow' }, open ? '⌃' : '⌄'),
+    ),
+    open && React.createElement('div', { className: 'vsm-project-picker-menu' },
+      React.createElement('input', { autoFocus: true, className: 'vsm-project-picker-search', value: query, placeholder: '搜索项目名称或路径…', onChange: (event) => { setQuery(event.target.value); setHighlight(0) }, onKeyDown: keyDown }),
+      React.createElement('div', { className: 'vsm-project-picker-options', role: 'listbox' }, filtered.length ? filtered.map((project, index) => React.createElement('button', { key: project.workspacePath, role: 'option', 'aria-selected': project.workspacePath === value, className: 'vsm-project-option ' + (index === highlight ? 'highlight' : '') + (project.workspacePath === value ? ' selected' : ''), onMouseEnter: () => setHighlight(index), onClick: () => choose(project) }, React.createElement('span', null, project.title), React.createElement('small', null, project.workspacePath, ' · ', project.servers.length, ' 个 MCP'))) : React.createElement('div', { className: 'vsm-project-picker-empty' }, '没有匹配的项目')),
+    ),
+  )
+}
+
+/** 单个项目的 MCP 分组。 */
+function ProjectGroup({ project, busy, onAdd, onRefresh, onToggle, onRemove }) {
+  const head = React.createElement('div', { className: 'vsm-project-head' },
+    React.createElement('div', { className: 'vsm-project-title' }, React.createElement('span', { className: 'vsm-project-icon' }, '▣'), React.createElement('div', null, React.createElement('span', { className: 'vsm-project-name' }, project.title), React.createElement('span', { className: 'vsm-project-path' }, project.workspacePath))),
+    React.createElement('button', { className: 'vsm-primary vsm-small', onClick: () => onAdd(project) }, '+ 添加 MCP'),
+  )
+  let body
+  if (project.missingDir) body = React.createElement('div', { className: 'vsm-project-empty' }, '项目目录已不存在，无法管理 MCP')
+  else if (project.fileError) body = React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, project.fileError)
+  else if (!project.servers.length) body = React.createElement('div', { className: 'vsm-project-empty' }, '此项目未配置 MCP')
+  else body = project.servers.map((server) => React.createElement(ServerCard, { key: server.serverName, server, onRefresh: (id) => onRefresh(project, server, id), onToggle: () => onToggle(project, server), onRemove: (id) => onRemove(project, server, id) }))
+  return React.createElement('section', { className: 'vsm-project' }, head, body)
+}
+
+/** MCP 管理主面板。 */
+export function McpSettings() {
+  const [servers, setServers] = React.useState<MpcServer[]>([])
+  const [projects, setProjects] = React.useState<MpcProject[]>([])
+  const [loading, setLoading] = React.useState(true)
+  const [busy, setBusy] = React.useState('')
+  const [error, setError] = React.useState('')
+  const [tab, setTab] = React.useState('mine')
+  const [draft, setDraft] = React.useState(EMPTY)
+  const [showForm, setShowForm] = React.useState(false)
+  const [projectForm, setProjectForm] = React.useState(null)
+  const [selectedPath, setSelectedPath] = React.useState('')
+
+  React.useEffect(() => {
+    if (!projects.length) {
+      setSelectedPath('')
+      return
+    }
+    if (!projects.some((project) => project.workspacePath === selectedPath)) setSelectedPath(projects[0].workspacePath)
+  }, [projects, selectedPath])
+
+  const loadAll = React.useCallback(() => {
+    setLoading(true)
+    setError('')
+    Promise.all([rpc('mcp.list', {}), rpc('mcp.projects', {})]).then(([list, prj]) => {
+      if (!list.ok) throw new Error(list.error)
+      if (!prj.ok) throw new Error(prj.error)
+      setServers(list.servers)
+      setProjects(prj.projects)
+    }).catch((e) => setError(String(e))).finally(() => setLoading(false))
+  }, [])
+
+  React.useEffect(loadAll, [loadAll])
+
+  const finish = (result) => {
+    if (!result.ok) throw new Error(result.error)
+    return result
+  }
+
+  const action = (label, id, method, args, patch) => {
+    setBusy(id)
+    setError('')
+    return rpc(method, args).then(finish).then((result) => {
+      if (patch) patch(result)
+    }).catch((e) => setError(String(e))).finally(() => setBusy('')).then(() => label)
+  }
+
+  const refreshGlobal = (id) => action('refresh', id, 'mcp.refresh', { id }, (r) => setServers((old) => old.map((s) => s.id === id ? r.server : s)))
+  const toggleGlobal = (s) => action('toggle', s.id, 'mcp.toggle', { id: s.id, enabled: !s.enabled }, (r) => setServers((old) => old.map((x) => x.id === s.id ? r.server : x)))
+  const removeGlobal = (s) => window.confirm('确认删除此 MCP 服务？') && action('remove', s.id, 'mcp.remove', { id: s.id }, (r) => setServers((old) => old.filter((x) => x.id !== s.id)))
+
+  const replaceProject = (workspacePath) => (result) => setProjects((old) => old.map((p) => p.workspacePath === workspacePath ? result.project : p))
+  const projectAction = (workspacePath, serverName, method, args, patch) => {
+    setBusy(workspacePath + ':' + serverName)
+    setError('')
+    return rpc(method, args).then(finish).then((result) => {
+      if (patch) patch(result)
+    }).catch((e) => setError(String(e))).finally(() => setBusy(''))
+  }
+
+  const refreshProject = (p, s) => projectAction(p.workspacePath, s.serverName, 'mcp.projectRefresh', { workspacePath: p.workspacePath, serverName: s.serverName }, replaceProject(p.workspacePath))
+  const toggleProject = (p, s) => projectAction(p.workspacePath, s.serverName, 'mcp.projectToggle', { workspacePath: p.workspacePath, serverName: s.serverName, enabled: !s.enabled }, replaceProject(p.workspacePath))
+  const removeProject = (p, s) => window.confirm('确认删除此项目的 MCP「' + s.serverName + '」？') && projectAction(p.workspacePath, s.serverName, 'mcp.projectRemove', { workspacePath: p.workspacePath, serverName: s.serverName }, replaceProject(p.workspacePath))
+
+  const saveGlobal = () => {
+    setBusy('save')
+    setError('')
+    rpc('mcp.save', { config: configOf(draft) }).then(finish).then((result) => {
+      setServers((old) => old.some((s) => s.id === result.server.id) ? old.map((s) => s.id === result.server.id ? result.server : s) : old.concat(result.server))
+      setDraft(EMPTY)
+      setShowForm(false)
+    }).catch((e) => setError(String(e))).finally(() => setBusy(''))
+  }
+
+  const saveProject = () => {
+    if (!projectForm) return
+    setBusy('project-save')
+    setError('')
+    const config = configOf(draft)
+    rpc('mcp.projectSave', { workspacePath: projectForm.workspacePath, serverName: config.serverName, config }).then(finish).then((result) => {
+      setProjects((old) => old.map((p) => p.workspacePath === projectForm.workspacePath ? result.project : p))
+      setDraft(EMPTY)
+      setProjectForm(null)
+    }).catch((e) => setError(String(e))).finally(() => setBusy(''))
+  }
+
+  const edit = (key, value) => setDraft((old) => ({ ...old, [key]: value }))
+  const marketBody = React.createElement('div', { className: 'vsm-mcp-empty' }, 'MCP 市场暂未接入')
+  const selectedProject = projects.find((project) => project.workspacePath === selectedPath)
+  const projectBody = projects.length ? React.createElement(React.Fragment, null,
+    React.createElement(ProjectPicker, { projects, value: selectedPath, onChange: setSelectedPath }),
+    selectedProject ? React.createElement(ProjectGroup, { project: selectedProject, busy, onAdd: (project) => { setDraft(EMPTY); setProjectForm({ workspacePath: project.workspacePath, title: project.title }) }, onRefresh: refreshProject, onToggle: toggleProject, onRemove: removeProject }) : React.createElement('div', { className: 'vsm-mcp-empty' }, '请选择项目'),
+  ) : React.createElement('div', { className: 'vsm-mcp-empty' }, '还没有项目')
+  let body
+  if (loading) body = React.createElement('div', { className: 'vsm-mcp-empty' }, '正在读取 MCP 服务…')
+  else if (tab === 'mine') body = React.createElement('div', null, servers.length ? servers.map((s) => React.createElement(ServerCard, { key: s.id, server: s, onRefresh: refreshGlobal, onToggle: toggleGlobal, onRemove: removeGlobal })) : React.createElement('div', { className: 'vsm-mcp-empty' }, '还没有配置全局 MCP'))
+  else if (tab === 'projects') body = projectBody
+  else body = marketBody
+  const form = showForm ? React.createElement(McpForm, { title: '添加全局 MCP', draft, busy, edit, save: saveGlobal, close: () => setShowForm(false) }) : projectForm ? React.createElement(McpForm, { title: '添加项目 MCP · ' + projectForm.title, draft, busy, edit, save: saveProject, close: () => setProjectForm(null) }) : null
+  return React.createElement('section', { className: 'vsm-mcp-page' },
+    React.createElement('header', { className: 'vsm-mcp-header' }, React.createElement('div', null, React.createElement('h2', null, 'VSCodeMode'), React.createElement('p', null, '管理当前 profile 与各项目的 Model Context Protocol 服务。')), React.createElement('button', { className: 'vsm-primary', onClick: () => { setDraft(EMPTY); setShowForm(true) } }, '+ 添加全局 MCP')),
+    React.createElement('nav', { className: 'vsm-mcp-tabs' }, React.createElement('button', { className: tab === 'mine' ? 'active' : '', onClick: () => setTab('mine') }, '我的 MCP'), React.createElement('button', { className: tab === 'projects' ? 'active' : '', onClick: () => setTab('projects') }, '项目 MCP'), React.createElement('button', { className: tab === 'market' ? 'active' : '', onClick: () => setTab('market') }, 'MCP 市场')),
+    error && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, error),
+    body,
+    form,
+  )
+}
+
+/** MCP 新增表单（全局/项目共用）。 */
+function McpForm({ title, draft, busy, edit, save, close }) {
+  const input = (key, placeholder) => React.createElement('input', { value: draft[key], onChange: (e) => edit(key, e.target.value), placeholder })
+  const fields = draft.transport === 'stdio' ? React.createElement(React.Fragment, null, React.createElement('label', null, '命令', input('command', 'npx')), React.createElement('label', null, '参数（空格或换行分隔）', React.createElement('textarea', { value: draft.args, onChange: (e) => edit('args', e.target.value) })), React.createElement('label', null, '工作目录（可选）', input('cwd', ''))) : React.createElement(React.Fragment, null, React.createElement('label', null, 'URL', input('url', 'http://localhost:3000/mcp')), React.createElement('label', null, '请求头（每行 key=value）', React.createElement('textarea', { value: draft.headers, onChange: (e) => edit('headers', e.target.value) })))
+  return React.createElement('div', { className: 'vsm-mcp-modal' }, React.createElement('div', { className: 'vsm-mcp-dialog' }, React.createElement('h3', null, title), React.createElement('label', null, '名称', input('serverName', '例如 codegraph')), React.createElement('label', null, '传输方式', React.createElement('select', { value: draft.transport, onChange: (e) => edit('transport', e.target.value) }, React.createElement('option', { value: 'stdio' }, 'stdio'), React.createElement('option', { value: 'streamable-http' }, 'streamable-http'))), fields, React.createElement('div', { className: 'vsm-mcp-dialog-actions' }, React.createElement('button', { onClick: close }, '取消'), React.createElement('button', { className: 'vsm-primary', disabled: busy === 'save' || busy === 'project-save', onClick: save }, '保存并连接'))))
+}

package/src/index.ts

@@ -8,13 +8,14 @@
 import { registerRoutes } from './routes.js'
 import { captureToolResult } from './capture.js'
 import { handleRpc } from './rpc.js'
+import { installIsolation } from './mcpIsolation.js'
 import { dropFileIndex } from './workspace.js'
 import { cwdOf } from './registry.js'
 import type { Registry } from './registry.js'
 import type { Ctx } from './store.js'
 
 export const name = "dsh-vscode-mode"
-export const inject = ['sessions', 'fs', 'webServer']
+export const inject = ['sessions', 'fs', 'webServer', 'loader', 'tools', 'workspaceRegistry', 'agents']
 
 /**
  * 装配插件：挂事件监听、注册路由。
@@ -38,6 +39,7 @@ export function apply(ctx: Ctx, config?: unknown): void {
   })
 
   registerRoutes(ctx, config, (method, args) => handleRpc(ctx, registry, method, args))
+  installIsolation(ctx)
 
-  ctx.logger?.info?.('[' + name + '] 编辑差异审查已装配（/edrv/rpc 路由就绪）')
+  ctx.logger?.info?.('[' + name + '] 编辑差异审查已装配（/edrv/rpc 路由就绪，项目 MCP 隔离已启用）')
 }