dsh-vscode-mode 0.1.7 → 0.1.11

package/src/mcpProject.ts

@@ -0,0 +1,258 @@
+/**
+ * dsh-vscode-mode host — 项目级 MCP 管理。
+ * 配置以项目根目录 .mcp.json（mcpServers 格式，对齐 Claude Code/Cursor）存储；
+ * 工具经 loader 动态激活（entry id 带 PROJECT_ENTRY_PREFIX，全局生效）。
+ * 重启后由本项目从各 .mcp.json 恢复激活；.mcp.json 为持久真相，reconcile 以文件为准。
+ * 作者 ddj 2026年08月22号
+ */
+import { createHash } from 'node:crypto'
+import { PROJECT_ENTRY_PREFIX, entriesOf, serverOf, validateConfig } from './mcp.js'
+import type { MpcConfig, MpcProject, MpcServer } from './shared/mcp.js'
+import type { Ctx } from './store.js'
+
+const FILE_NAME = '.mcp.json'
+
+/** 校验项目路径属于 DSH 已注册 workspace，避免 RPC 写入任意目录。 */
+function requireWorkspace(ctx: Ctx, workspacePath: string): { path: string; title?: string } {
+  const workspace = (ctx.get('workspaceRegistry')?.list?.() ?? []).find((item: { path: string }) => item.path === workspacePath)
+  if (!workspace) throw new Error('项目未注册为 DSH workspace，不能管理项目 MCP')
+  return workspace
+}
+
+/** 用户显式 GUI 管理操作的写策略：danger-full-access（写入路径固定为 workspacePath/.mcp.json）。 */
+function fullPolicy(ctx: Ctx): unknown {
+  const svc = ctx.get('sandboxPolicy')
+  if (!svc || typeof svc.resolve !== 'function') return undefined
+  return svc.resolve({ mode: 'danger-full-access' })
+}
+
+/** workspace 路径 → 确定性短哈希（entry id 归属段，重启后稳定可解码）。 */
+export function hashWorkspace(path: string): string {
+  return createHash('sha1').update(path).digest('hex').slice(0, 10)
+}
+
+/** 项目 MCP 的 loader entry id：vsm-mcp.<pathHash>.<serverName>（loader id 不能用冒号）。 */
+export function projectEntryId(workspacePath: string, serverName: string): string {
+  return PROJECT_ENTRY_PREFIX + hashWorkspace(workspacePath) + '.' + serverName
+}
+
+/** 读取项目 .mcp.json 顶层对象（缺失 → 空；非法 → 抛错带文案）。 */
+async function readProjectJson(ctx: Ctx, workspacePath: string): Promise<Record<string, unknown>> {
+  const fs = ctx.get('fs')
+  if (!fs) throw new Error('缺少 fs 服务')
+  const target = await fs.resolve(FILE_NAME, { cwd: workspacePath })
+  let text: string
+  try {
+    text = await fs.readText(target)
+  } catch (error) {
+    return {}
+  }
+  let data: unknown
+  try {
+    data = JSON.parse(text)
+  } catch (error) {
+    throw new Error('.mcp.json 解析失败：' + String(error))
+  }
+  if (data === null || typeof data !== 'object' || Array.isArray(data)) throw new Error('.mcp.json 顶层必须是对象')
+  return data as Record<string, unknown>
+}
+
+/** 读取并校验 .mcp.json 的 mcpServers 映射（纯函数，可单测）。 */
+export function serversOf(data: Record<string, unknown>): Record<string, Record<string, unknown>> {
+  const raw = data.mcpServers
+  if (raw === undefined) return {}
+  if (raw === null || typeof raw !== 'object' || Array.isArray(raw)) throw new Error('.mcp.json 的 mcpServers 必须是对象')
+  const out: Record<string, Record<string, unknown>> = {}
+  for (const [name, value] of Object.entries(raw)) {
+    if (value === null || typeof value !== 'object' || Array.isArray(value)) continue
+    out[name] = value as Record<string, unknown>
+  }
+  return out
+}
+
+/** 把 .mcp.json 单条 server 定义归一化为 MpcConfig（缺传输必填 → null，纯函数可单测）。 */
+export function configFromDef(def: Record<string, unknown> | undefined, serverName: string): MpcConfig | null {
+  if (!def) return null
+  const transport = typeof def.url === 'string' ? 'streamable-http' : 'stdio'
+  const config: MpcConfig = { serverName, transport }
+  if (transport === 'stdio') {
+    config.command = typeof def.command === 'string' ? def.command : ''
+    config.args = Array.isArray(def.args) ? def.args.map(String) : []
+    if (typeof def.cwd === 'string') config.cwd = def.cwd
+    if (def.env && typeof def.env === 'object') config.env = Object.fromEntries(Object.entries(def.env as Record<string, unknown>).map(([k, v]) => [k, String(v)]))
+  } else {
+    config.url = def.url as string
+    if (def.headers && typeof def.headers === 'object') config.headers = Object.fromEntries(Object.entries(def.headers as Record<string, unknown>).map(([k, v]) => [k, String(v)]))
+  }
+  if (typeof def.toolCallTimeoutMs === 'number') config.toolCallTimeoutMs = def.toolCallTimeoutMs
+  return config
+}
+
+/** 写回 .mcp.json（保留顶层未知字段与其余 mcpServers，仅改目标 serverName）。 */
+async function writeProjectJson(ctx: Ctx, workspacePath: string, data: Record<string, unknown>, mcpServers: Record<string, Record<string, unknown>>): Promise<void> {
+  const fs = ctx.get('fs')
+  if (!fs) throw new Error('缺少 fs 服务')
+  const target = await fs.resolve(FILE_NAME, { cwd: workspacePath })
+  const next = { ...data, mcpServers }
+  await fs.writeText(target, JSON.stringify(next, null, 2) + '\n', void 0, void 0, fullPolicy(ctx))
+}
+
+/** 查重：目标 serverName 是否已被其他 loader entry（全局或他项目）占用。 */
+function findConflict(ctx: Ctx, workspacePath: string, serverName: string): string | null {
+  const ownId = projectEntryId(workspacePath, serverName)
+  for (const entry of entriesOf(ctx)) {
+    if (String(entry.id ?? entry.options?.id ?? '') === ownId) continue
+    if (entry.options?.config?.serverName === serverName) {
+      return 'serverName "' + serverName + '" 已被另一个 MCP 使用（全局或其他项目），请换一个名称'
+    }
+  }
+  return null
+}
+
+/** 激活一个项目 MCP：校验 + 查重 + loader.create。 */
+export async function activateProjectMcp(ctx: Ctx, workspacePath: string, config: MpcConfig): Promise<MpcServer> {
+  validateConfig(config)
+  const conflict = findConflict(ctx, workspacePath, config.serverName)
+  if (conflict) throw new Error(conflict)
+  const loader = ctx.get('loader')
+  if (!loader) throw new Error('缺少 loader 服务')
+  const id = projectEntryId(workspacePath, config.serverName)
+  const existing = entriesOf(ctx).find((entry) => String(entry.id ?? entry.options?.id ?? '') === id)
+  if (existing) {
+    await loader.update(existing.id, { config: { ...config } })
+    return serverOf(ctx, loader.resolve(existing.id))
+  }
+  const created = await loader.create({ id, name: '@deepseek-ai/dsh-mcp-client', config: { ...config } })
+  const entry = entriesOf(ctx).find((candidate) => String(candidate.id ?? candidate.options?.id ?? '') === id)
+  if (!entry) throw new Error('MCP 已创建但未能找到 entry（id=' + id + '）')
+  return serverOf(ctx, entry)
+}
+
+/** 停用一个项目 MCP（按 entry id）。 */
+export async function deactivateMcp(ctx: Ctx, entryId: string): Promise<void> {
+  const loader = ctx.get('loader')
+  if (!loader) throw new Error('缺少 loader 服务')
+  const entry = entriesOf(ctx).find((candidate) => String(candidate.id ?? candidate.options?.id ?? '') === entryId)
+  if (!entry) return
+  await loader.remove(entry.id)
+}
+
+/** 以 .mcp.json 为真相 reconcile 该项目的激活状态（幂等）。 */
+export async function reconcileProject(ctx: Ctx, workspacePath: string): Promise<void> {
+  const data = await readProjectJson(ctx, workspacePath)
+  const fileServers = new Set(Object.keys(serversOf(data)))
+  const prefix = PROJECT_ENTRY_PREFIX + hashWorkspace(workspacePath) + '.'
+  for (const entry of entriesOf(ctx)) {
+    const id = String(entry.id ?? entry.options?.id ?? '')
+    if (!id.startsWith(prefix)) continue
+    const serverName = id.slice(prefix.length)
+    if (fileServers.has(serverName)) continue
+    await deactivateMcp(ctx, id)
+  }
+  for (const serverName of fileServers) {
+    const config = await configOfServer(ctx, workspacePath, serverName)
+    if (config === null) continue
+    const id = projectEntryId(workspacePath, serverName)
+    if (entriesOf(ctx).some((entry) => String(entry.id ?? entry.options?.id ?? '') === id)) continue
+    await activateProjectMcp(ctx, workspacePath, { ...config, serverName })
+  }
+}
+
+/** 把 .mcp.json 单条 server 定义归一化为 MpcConfig（缺传输必填 → null）。 */
+async function configOfServer(ctx: Ctx, workspacePath: string, serverName: string): Promise<MpcConfig | null> {
+  const data = await readProjectJson(ctx, workspacePath)
+  return configFromDef(serversOf(data)[serverName], serverName)
+}
+
+/** 单个项目的完整视图（fileData + 激活状态合并）。 */
+async function projectOf(ctx: Ctx, workspacePath: string, title: string): Promise<MpcProject> {
+  const fs = ctx.get('fs')
+  if (!fs) return { workspacePath, title, servers: [], source: 'project' }
+  try {
+    const target = await fs.resolve(workspacePath)
+    const info = await fs.stat(target)
+    if (!info || info.type !== 'directory') return { workspacePath, title, servers: [], source: 'project', missingDir: true }
+  } catch (error) {
+    return { workspacePath, title, servers: [], source: 'project', missingDir: true }
+  }
+  await reconcileProject(ctx, workspacePath)
+  let servers: MpcServer[] = []
+  let fileError: string | undefined
+  try {
+    const data = await readProjectJson(ctx, workspacePath)
+    const prefix = PROJECT_ENTRY_PREFIX + hashWorkspace(workspacePath) + '.'
+    servers = entriesOf(ctx).filter((entry) => String(entry.id ?? entry.options?.id ?? '').startsWith(prefix)).map((entry) => serverOf(ctx, entry))
+    servers.sort((a, b) => (a.serverName < b.serverName ? -1 : 1))
+  } catch (error) {
+    fileError = String(error)
+  }
+  return { workspacePath, title, servers, source: 'project', fileError }
+}
+
+/** 列出全部项目及其项目级 MCP。 */
+export async function listProjects(ctx: Ctx): Promise<{ projects: MpcProject[] }> {
+  const registry = ctx.get('workspaceRegistry')
+  const workspaces = registry?.list?.() ?? []
+  const projects: MpcProject[] = []
+  for (const ws of workspaces) projects.push(await projectOf(ctx, ws.path, ws.title ?? ''))
+  return { projects }
+}
+
+/** 保存（新增/更新）一个项目 MCP：写 .mcp.json → 激活。 */
+export async function projectSave(ctx: Ctx, workspacePath: string, serverName: string, config: MpcConfig): Promise<MpcProject> {
+  const workspace = requireWorkspace(ctx, workspacePath)
+  validateConfig({ ...config, serverName })
+  const conflict = findConflict(ctx, workspacePath, serverName)
+  if (conflict) throw new Error(conflict)
+  const data = await readProjectJson(ctx, workspacePath)
+  const servers = serversOf(data)
+  const next = { ...config } as unknown as Record<string, unknown>
+  delete next.serverName
+  delete next.transport
+  delete next.disabled // disabled 由 projectToggle 管理，保存恒为启用
+  servers[serverName] = next
+  await writeProjectJson(ctx, workspacePath, data, servers)
+  await activateProjectMcp(ctx, workspacePath, { ...config, serverName })
+  return projectOf(ctx, workspacePath, workspace.title ?? '')
+}
+
+/** 删除一个项目 MCP：停用 → 从 .mcp.json 移除。 */
+export async function projectRemove(ctx: Ctx, workspacePath: string, serverName: string): Promise<MpcProject> {
+  const workspace = requireWorkspace(ctx, workspacePath)
+  await deactivateMcp(ctx, projectEntryId(workspacePath, serverName))
+  const data = await readProjectJson(ctx, workspacePath)
+  const servers = serversOf(data)
+  delete servers[serverName]
+  await writeProjectJson(ctx, workspacePath, data, servers)
+  return projectOf(ctx, workspacePath, workspace.title ?? '')
+}
+
+/** 切换项目 MCP 启用状态（持久化到 .mcp.json + loader.update）。 */
+export async function projectToggle(ctx: Ctx, workspacePath: string, serverName: string, enabled: boolean): Promise<MpcProject> {
+  const workspace = requireWorkspace(ctx, workspacePath)
+  const data = await readProjectJson(ctx, workspacePath)
+  const servers = serversOf(data)
+  const def = servers[serverName]
+  if (!def) throw new Error('项目中不存在该 MCP')
+  if (enabled) delete def.disabled
+  else def.disabled = true
+  await writeProjectJson(ctx, workspacePath, data, servers)
+  const loader = ctx.get('loader')
+  if (loader) {
+    const entry = entriesOf(ctx).find((candidate) => String(candidate.id ?? candidate.options?.id ?? '') === projectEntryId(workspacePath, serverName))
+    if (entry) await loader.update(entry.id, { disabled: !enabled })
+  }
+  return projectOf(ctx, workspacePath, workspace.title ?? '')
+}
+
+/** 刷新（重连）项目 MCP。 */
+export async function projectRefresh(ctx: Ctx, workspacePath: string, serverName: string): Promise<MpcProject> {
+  const workspace = requireWorkspace(ctx, workspacePath)
+  const loader = ctx.get('loader')
+  if (!loader) throw new Error('缺少 loader 服务')
+  const id = projectEntryId(workspacePath, serverName)
+  const entry = entriesOf(ctx).find((candidate) => String(candidate.id ?? candidate.options?.id ?? '') === id)
+  if (!entry) throw new Error('该项目 MCP 未激活')
+  await loader.update(entry.id, { config: { ...(entry.options?.config ?? {}) } })
+  return projectOf(ctx, workspacePath, workspace.title ?? '')
+}

package/src/model.ts

@@ -4,6 +4,7 @@
  * 作者 ddj 2026-08-20
  */
 import type { Decision, DiffRecord, Hunk, RecordSummary } from './shared/types.js'
+import { applyLocations, fingerprint, isNoopHunk, locateHunks, preciseHunk } from './shared/diff.js'
 
 /** 工作区记录桶上限（超过后按 at 最旧剔除）。 */
 export const MAX_RECORDS = 200
@@ -19,22 +20,46 @@ export function normalizeRecord(raw: unknown): DiffRecord | null {
   const r = raw as Record<string, unknown>
   if (typeof r.callId !== 'string' || typeof r.path !== 'string') return null
   const hunks: Hunk[] = Array.isArray(r.hunks)
-    ? (r.hunks as unknown[]).filter((h) => h && typeof (h as { newText?: unknown }).newText === 'string') as Hunk[]
+    ? (r.hunks as unknown[]).filter((h) => h && typeof (h as { newText?: unknown }).newText === 'string').map((h) => {
+      const item = h as Record<string, unknown>
+      return {
+        oldText: typeof item.oldText === 'string' ? item.oldText : null,
+        newText: item.newText as string,
+        ...(Number.isInteger(item.afterStart) ? { afterStart: item.afterStart as number } : {}),
+        ...(Number.isInteger(item.afterEnd) ? { afterEnd: item.afterEnd as number } : {}),
+        ...(Number.isInteger(item.beforeStart) ? { beforeStart: item.beforeStart as number } : {}),
+        ...(Number.isInteger(item.beforeEnd) ? { beforeEnd: item.beforeEnd as number } : {}),
+      }
+    })
     : []
   const toolName: DiffRecord['toolName'] = r.toolName === 'write' ? 'write' : 'edit'
+  const rawDecisions = r.decisions && typeof r.decisions === 'object' ? r.decisions as Record<string, unknown> : {}
+  const call = rawDecisions.call === 'accepted' || rawDecisions.call === 'rejected' ? rawDecisions.call : 'pending'
+  const rawPerHunk = Array.isArray(rawDecisions.perHunk) ? rawDecisions.perHunk : []
+  const perHunk = hunks.map((_, i) => {
+    const value = rawPerHunk[i]
+    if (value === 'accepted' || value === 'rejected') return value
+    return call === 'accepted' || call === 'rejected' ? call : 'pending'
+  })
+  const before = typeof r.before === 'string' ? r.before : null
+  const hasAfter = Object.prototype.hasOwnProperty.call(r, 'after')
+  const after = typeof r.after === 'string' ? r.after : null
   return {
     callId: r.callId,
     toolName,
     path: r.path,
-    before: typeof r.before === 'string' ? r.before : null,
+    before,
+    after,
+    baseFingerprint: typeof r.baseFingerprint === 'string' ? r.baseFingerprint : fingerprint(before),
+    afterFingerprint: typeof r.afterFingerprint === 'string' ? r.afterFingerprint : fingerprint(after),
+    legacy: !hasAfter,
+    conflict: r.conflict === true,
     create: r.create === true,
-    callHunk: r.callHunk && typeof (r.callHunk as { oldText?: unknown }).oldText === 'string'
+    callHunk: r.callHunk && typeof (r.callHunk as { oldText?: unknown }).oldText === 'string' && typeof (r.callHunk as { newText?: unknown }).newText === 'string'
       ? { oldText: (r.callHunk as { oldText: string }).oldText, newText: (r.callHunk as { newText: string }).newText }
       : null,
-    hunks: hunks.map((h) => ({ oldText: typeof h.oldText === 'string' ? h.oldText : null, newText: h.newText })),
-    decisions: r.decisions && typeof r.decisions === 'object'
-      ? r.decisions as DiffRecord['decisions']
-      : { call: 'pending', perHunk: hunks.map(() => 'pending' as Decision) },
+    hunks,
+    decisions: { call: call as Decision, perHunk },
     note: typeof r.note === 'string' ? r.note : null,
     superseded: r.superseded === true,
     archived: r.archived === true,
@@ -68,9 +93,17 @@ export function markDecision(record: DiffRecord, scope: string, idx: number | un
 /** 记录是否已无任何待决策差异（superseded 或全部已决策）。 */
 export function recordResolved(record: DiffRecord): boolean {
   if (record.superseded === true) return true
+  const hunks = Array.isArray(record.hunks) ? record.hunks : []
   const perHunk = Array.isArray(record.decisions.perHunk) ? record.decisions.perHunk : []
-  if (perHunk.length) return perHunk.every((v) => v === 'accepted' || v === 'rejected')
-  return record.decisions.call === 'accepted' || record.decisions.call === 'rejected'
+  const count = Math.max(hunks.length, perHunk.length)
+  if (!count) return record.decisions.call === 'accepted' || record.decisions.call === 'rejected'
+  for (let idx = 0; idx < count; idx++) {
+    const precise = preciseHunk(record, idx)
+    const value = perHunk[idx] ?? record.decisions.call
+    if (isNoopHunk(precise) && value === 'pending') return false
+    if (value !== 'accepted' && value !== 'rejected') return false
+  }
+  return true
 }
 
 /**
@@ -80,20 +113,20 @@ export function recordResolved(record: DiffRecord): boolean {
  * @returns 摘要
  */
 export function recSummary(record: DiffRecord): RecordSummary {
+  const hunks = Array.isArray(record.hunks) ? record.hunks : []
   const perHunk = Array.isArray(record.decisions.perHunk) ? record.decisions.perHunk : []
-  const n = Math.max(1, Array.isArray(record.hunks) ? record.hunks.length : 1)
+  const n = Math.max(1, hunks.length, perHunk.length)
   let accepted = 0
   let rejected = 0
   let pending = 0
-  if (perHunk.length) {
-    for (const v of perHunk) {
-      if (v === 'accepted') accepted++
-      else if (v === 'rejected') rejected++
-      else pending++
-    }
-  } else if (record.decisions.call === 'accepted') accepted = n
-  else if (record.decisions.call === 'rejected') rejected = n
-  else pending = n
+  for (let i = 0; i < n; i++) {
+    const hunk = preciseHunk(record, i)
+    const value = perHunk[i] ?? record.decisions.call
+    if (i < hunks.length && isNoopHunk(hunk) && value === 'pending') continue
+    if (value === 'accepted') accepted++
+    else if (value === 'rejected') rejected++
+    else pending++
+  }
   return { accepted, rejected, pending, superseded: record.superseded === true }
 }
 
@@ -106,27 +139,21 @@ export function recSummary(record: DiffRecord): RecordSummary {
  * @returns 重建内容与 stale 定位
  */
 export function reconstructOriginal(records: DiffRecord[], content: string): { content: string; stale: Array<{ callId: string; idx: number }> } {
-  const pending: Array<{ rec: DiffRecord; idx: number }> = []
+  const pending: Array<{ rec: DiffRecord; idx: number; hunk: Hunk }> = []
   for (const rec of records) {
-    const perHunk = Array.isArray(rec.decisions.perHunk) ? rec.decisions.perHunk : []
     for (let i = 0; i < rec.hunks.length; i++) {
-      const st = perHunk.length ? perHunk[i] : rec.decisions.call
-      if (st === 'pending') pending.push({ rec, idx: i })
+      const st = rec.decisions.perHunk[i] ?? rec.decisions.call
+      const hunk = preciseHunk(rec, i)
+      if (st === 'pending' && hunk && !isNoopHunk(hunk)) pending.push({ rec, idx: i, hunk })
     }
   }
   pending.sort((a, b) => (a.rec.at < b.rec.at ? 1 : a.rec.at > b.rec.at ? -1 : 0))
-  let out = content
-  const stale: Array<{ callId: string; idx: number }> = []
-  for (const p of pending) {
-    const h = p.rec.hunks[p.idx]
-    const precise = p.rec.toolName === 'edit' && p.rec.hunks.length <= 1 && p.rec.callHunk ? p.rec.callHunk : h
-    const newText = precise.newText ?? ''
-    const at = out.indexOf(newText)
-    if (at < 0) { stale.push({ callId: p.rec.callId, idx: p.idx }); continue }
-    const oldText = precise.oldText === null ? '' : precise.oldText
-    out = out.slice(0, at) + oldText + out.slice(at + newText.length)
+  const locations = locateHunks(content, pending.map((item) => item.hunk))
+  const rebuilt = applyLocations(content, locations, true)
+  return {
+    content: rebuilt.content,
+    stale: rebuilt.stale.map((idx) => ({ callId: pending[idx].rec.callId, idx: pending[idx].idx })),
   }
-  return { content: out, stale }
 }
 
 /** 文件当前最大批次号（无记录为 0）。 */
@@ -188,6 +215,11 @@ export function archiveEntryFor(recs: DiffRecord[], cwd: string, reason: string)
       decisions: r.decisions,
       note: r.note ?? null,
       before: typeof r.before === 'string' ? r.before : null,
+      after: typeof r.after === 'string' ? r.after : null,
+      baseFingerprint: r.baseFingerprint ?? null,
+      afterFingerprint: r.afterFingerprint ?? null,
+      conflict: r.conflict === true,
+      legacy: r.legacy === true,
       superseded: r.superseded === true,
       batch: Number.isInteger(r.batch) ? r.batch : null,
       at: r.at,

package/src/revert.ts

@@ -6,6 +6,7 @@
 import type { DiffRecord } from './shared/types.js'
 import type { Ctx, Session } from './store.js'
 import { policyOf, resolveTarget } from './store.js'
+import { applyLocations, locateHunks, preciseHunk } from './shared/diff.js'
 
 export type Result = { ok: true } | { ok: false; error: string }
 
@@ -71,12 +72,18 @@ export async function revertCall(ctx: Ctx, session: Session, record: DiffRecord)
 export async function revertHunk(ctx: Ctx, session: Session, record: DiffRecord, idx: number): Promise<Result> {
   const fs = ctx.get('fs')
   if (!fs) return { ok: false, error: '回滚不可用：缺少 fs' }
-  const hunk = record.hunks[idx]
-  const precise = record.toolName === 'edit' && record.hunks.length <= 1 && record.callHunk ? record.callHunk : hunk
+  const precise = preciseHunk(record, idx)
   if (!precise) return { ok: false, error: '找不到该差异块' }
   try {
     const target = await resolveTarget(ctx, session, record.path)
-    await fs.editText(target, { oldString: precise.newText, newString: precise.oldText === null ? '' : precise.oldText }, void 0, void 0, policyOf(ctx, session))
+    const info = await fs.stat(target)
+    if (!info || info.type !== 'file') return { ok: false, error: '回滚失败：文件不存在' }
+    if ((info.size ?? 0) > 8 * 1024 * 1024) return { ok: false, error: '回滚失败：文件过大，无法安全定位' }
+    const content = await fs.readText(target)
+    const location = locateHunks(content, [precise])[0]
+    if (!location?.matched) return { ok: false, error: '回滚失败：该区域可能已被后续修改影响' }
+    const result = applyLocations(content, [location], true)
+    await fs.writeText(target, result.content, void 0, void 0, policyOf(ctx, session))
     return { ok: true }
   } catch (error) {
     return { ok: false, error: '回滚失败：该区域可能已被后续修改影响（' + String(error) + '）' }

package/src/rpc.ts

@@ -23,6 +23,8 @@ import type { Registry } from './registry.js'
 import { bucketOf, cwdOf, sessionOf } from './registry.js'
 import { listWorkspaceFiles } from './workspace.js'
 import { restoreFile, revertCall, revertHunk } from './revert.js'
+import { listMcp, refreshMcp, removeMcp, saveMcp, toggleMcp } from './mcp.js'
+import { listProjects, projectRefresh, projectRemove, projectSave, projectToggle } from './mcpProject.js'
 
 /** cwd → Promise 链：串行化 debug 日志追加（fs read+write 非原子，避免并发丢行）。 */
 const debugWriteQueues = new Map<string, Promise<void>>()
@@ -40,6 +42,11 @@ function recView(record: DiffRecord): RecordView {
     decisions: record.decisions,
     note: record.note ?? null,
     superseded: record.superseded === true,
+    after: record.after ?? null,
+    baseFingerprint: record.baseFingerprint ?? null,
+    afterFingerprint: record.afterFingerprint ?? null,
+    conflict: record.conflict === true,
+    legacy: record.legacy === true,
     at: record.at,
   }
 }
@@ -275,6 +282,43 @@ export function buildHandlers(ctx: Ctx, registry: Registry): RpcHandlerMap {
       }
       return { ok: true, files, truncated: files.length >= 50 }
     },
+    'mcp.list': async () => ({ ok: true, ...listMcp(ctx) }),
+    'mcp.save': async (args) => {
+      try { return { ok: true, server: await saveMcp(ctx, args.config) } }
+      catch (error) { return { ok: false, error: String(error) } }
+    },
+    'mcp.remove': async (args) => {
+      try { await removeMcp(ctx, args.id); return { ok: true } }
+      catch (error) { return { ok: false, error: String(error) } }
+    },
+    'mcp.toggle': async (args) => {
+      try { return { ok: true, server: await toggleMcp(ctx, args.id, args.enabled) } }
+      catch (error) { return { ok: false, error: String(error) } }
+    },
+    'mcp.refresh': async (args) => {
+      try { return { ok: true, server: await refreshMcp(ctx, args.id) } }
+      catch (error) { return { ok: false, error: String(error) } }
+    },
+    'mcp.projects': async () => {
+      try { return { ok: true, ...await listProjects(ctx) } }
+      catch (error) { return { ok: false, error: String(error) } }
+    },
+    'mcp.projectSave': async (args) => {
+      try { return { ok: true, project: await projectSave(ctx, args.workspacePath, args.serverName, args.config) } }
+      catch (error) { return { ok: false, error: String(error) } }
+    },
+    'mcp.projectRemove': async (args) => {
+      try { return { ok: true, project: await projectRemove(ctx, args.workspacePath, args.serverName) } }
+      catch (error) { return { ok: false, error: String(error) } }
+    },
+    'mcp.projectToggle': async (args) => {
+      try { return { ok: true, project: await projectToggle(ctx, args.workspacePath, args.serverName, args.enabled) } }
+      catch (error) { return { ok: false, error: String(error) } }
+    },
+    'mcp.projectRefresh': async (args) => {
+      try { return { ok: true, project: await projectRefresh(ctx, args.workspacePath, args.serverName) } }
+      catch (error) { return { ok: false, error: String(error) } }
+    },
   }
 }