dsh-vscode-mode 0.1.7 → 0.1.11

package/lib/index.js

@@ -1,6 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { dirname, extname, join, normalize, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
+import { createHash } from "node:crypto";
 //#region src/shared/rpc.ts
 /** webServer 精确路由。 */
 const RPC_PATH = "/edrv/rpc";
@@ -132,6 +133,190 @@ function registerRoutes(ctx, config, handleRpc) {
 		}
 	}), "edrv: /edrv/vendor prefix");
 }
+//#endregion
+//#region src/shared/diff.ts
+/** 统一取对应 hunk；callHunk 只用于旧记录缺失 hunks 时兼容。 */
+function preciseHunk(record, idx) {
+	return hunkOf(record, idx);
+}
+/** 轻量、确定性的字符串指纹；不引入 Node crypto。 */
+function fingerprint(text) {
+	if (typeof text !== "string") return null;
+	let hash = 2166136261;
+	for (let i = 0; i < text.length; i++) {
+		hash ^= text.charCodeAt(i);
+		hash = Math.imul(hash, 16777619);
+	}
+	return "fnv1a:" + (hash >>> 0).toString(16) + ":" + text.length;
+}
+/** 取记录第 idx 个有效 hunk；只有记录缺 hunk 时才回退 callHunk。 */
+function hunkOf(record, idx) {
+	const hunk = Array.isArray(record.hunks) ? record.hunks[idx] : void 0;
+	if (hunk && typeof hunk.newText === "string") return hunk;
+	if (idx === 0 && record.callHunk && typeof record.callHunk.newText === "string") return record.callHunk;
+	return null;
+}
+/** hunk 是否表示没有实际内容变化。 */
+function isNoopHunk(hunk) {
+	return !!hunk && hunk.oldText !== null && hunk.oldText === hunk.newText;
+}
+/** 按文件顺序为多 hunk 写入不重复的 after 坐标。 */
+function annotateHunks(hunks, before, after) {
+	if (typeof after !== "string") return hunks;
+	let cursor = 0;
+	return hunks.map((hunk) => {
+		if (hunk.newText.length > 0) {
+			const start = after.indexOf(hunk.newText, cursor);
+			if (start >= 0) {
+				cursor = start + hunk.newText.length;
+				return {
+					...hunk,
+					afterStart: start,
+					afterEnd: cursor
+				};
+			}
+			return hunk;
+		}
+		if (hunks.length !== 1 || typeof before !== "string" || before === after || hunk.oldText === null) return hunk;
+		const prefix = commonPrefix(before, after);
+		const suffix = commonSuffix(before, after, prefix);
+		const removedStart = prefix;
+		const removedEnd = Math.max(removedStart, before.length - suffix);
+		return {
+			...hunk,
+			afterStart: removedStart,
+			afterEnd: removedStart,
+			beforeStart: removedStart,
+			beforeEnd: removedEnd
+		};
+	});
+}
+/** 计算两个文本的最长公共前缀长度。 */
+function commonPrefix(left, right) {
+	const limit = Math.min(left.length, right.length);
+	let i = 0;
+	while (i < limit && left.charCodeAt(i) === right.charCodeAt(i)) i++;
+	return i;
+}
+/** 计算不与 prefix 重叠的最长公共后缀长度。 */
+function commonSuffix(left, right, prefix) {
+	const limit = Math.min(left.length, right.length) - prefix;
+	let i = 0;
+	while (i < limit && left.charCodeAt(left.length - 1 - i) === right.charCodeAt(right.length - 1 - i)) i++;
+	return i;
+}
+/** 找出文本的全部非重叠出现位置。 */
+function allMatches(content, needle) {
+	if (!needle.length) return [];
+	const out = [];
+	let from = 0;
+	while (from <= content.length - needle.length) {
+		const at = content.indexOf(needle, from);
+		if (at < 0) break;
+		out.push({
+			start: at,
+			end: at + needle.length
+		});
+		from = at + Math.max(1, needle.length);
+	}
+	return out;
+}
+/**
+* 从 after 快照定位所有 hunk，按 hunk 顺序优先选未占用且靠近前一块的候选。
+* 若 hunk 带 afterStart/afterEnd，则优先验证快照坐标，避免重复文本错配。
+* @author ddj 2026年08月24号
+* @param content 当前文件内容
+* @param hunks 待定位 hunk
+* @returns 每个 hunk 一个结果，matched=false 表示冲突/stale
+*/
+function locateHunks(content, hunks) {
+	const locations = [];
+	let cursor = 0;
+	const occupied = [];
+	for (let idx = 0; idx < hunks.length; idx++) {
+		const hunk = hunks[idx];
+		const newText = hunk.newText;
+		const snapshot = Number.isInteger(hunk.afterStart) && Number.isInteger(hunk.afterEnd) ? {
+			start: hunk.afterStart,
+			end: hunk.afterEnd
+		} : null;
+		const snapshotMatches = snapshot && snapshot.start >= 0 && snapshot.end >= snapshot.start && (newText.length === 0 || content.slice(snapshot.start, snapshot.end) === newText) ? snapshot : null;
+		const candidates = snapshotMatches ? [snapshotMatches] : allMatches(content, newText);
+		const candidate = candidates.find((range) => range.start >= cursor && !occupied.some((used) => overlaps(range, used))) ?? candidates.find((range) => !occupied.some((used) => overlaps(range, used)));
+		if (candidate) {
+			locations.push({
+				idx,
+				hunk,
+				...candidate,
+				matched: true
+			});
+			occupied.push(candidate);
+			cursor = Math.max(cursor, candidate.end);
+			continue;
+		}
+		if (newText.length === 0 && hunk.afterStart === void 0 && hunk.afterEnd === void 0 && content.length === 0) {
+			locations.push({
+				idx,
+				hunk,
+				start: 0,
+				end: 0,
+				matched: true
+			});
+			continue;
+		}
+		if (newText.length === 0 && hunk.afterStart !== void 0 && hunk.afterEnd !== void 0 && hunk.afterStart === hunk.afterEnd && hunk.afterStart >= 0 && hunk.afterStart <= content.length) {
+			const point = {
+				start: hunk.afterStart,
+				end: hunk.afterEnd
+			};
+			if (!occupied.some((used) => overlaps(point, used))) {
+				locations.push({
+					idx,
+					hunk,
+					...point,
+					matched: true
+				});
+				occupied.push(point);
+				cursor = Math.max(cursor, point.end);
+				continue;
+			}
+		}
+		locations.push({
+			idx,
+			hunk,
+			start: -1,
+			end: -1,
+			matched: false
+		});
+	}
+	return locations;
+}
+/** 判断两个半开区间是否重叠。零长度区间只与同一位置的零长度区间重叠。 */
+function overlaps(left, right) {
+	if (left.start === left.end || right.start === right.end) return left.start === right.start && left.end === right.end;
+	return left.start < right.end && right.start < left.end;
+}
+/** 在可定位区间上执行一次 hunk 反向替换。 */
+function replaceRange(content, location, reverse = false) {
+	if (!location.matched || location.start < 0) return null;
+	const replacement = reverse ? location.hunk.oldText ?? "" : location.hunk.newText;
+	return content.slice(0, location.start) + replacement + content.slice(location.end);
+}
+/** 按当前内容中出现的位置从后向前应用 hunk，避免前块长度变化影响后块。 */
+function applyLocations(content, locations, reverse = false) {
+	const stale = locations.filter((location) => !location.matched).map((location) => location.idx);
+	let out = content;
+	const matched = locations.filter((location) => location.matched).sort((a, b) => b.start - a.start);
+	for (const location of matched) {
+		const next = replaceRange(out, location, reverse);
+		if (next === null) stale.push(location.idx);
+		else out = next;
+	}
+	return {
+		content: out,
+		stale: stale.sort((a, b) => a - b)
+	};
+}
 /**
 * 归一化一条持久化记录（容忍旧版/损坏字段）。
 * @author ddj 2026年08月20号
@@ -142,25 +327,48 @@ function normalizeRecord(raw) {
 	if (!raw || typeof raw !== "object") return null;
 	const r = raw;
 	if (typeof r.callId !== "string" || typeof r.path !== "string") return null;
-	const hunks = Array.isArray(r.hunks) ? r.hunks.filter((h) => h && typeof h.newText === "string") : [];
+	const hunks = Array.isArray(r.hunks) ? r.hunks.filter((h) => h && typeof h.newText === "string").map((h) => {
+		const item = h;
+		return {
+			oldText: typeof item.oldText === "string" ? item.oldText : null,
+			newText: item.newText,
+			...Number.isInteger(item.afterStart) ? { afterStart: item.afterStart } : {},
+			...Number.isInteger(item.afterEnd) ? { afterEnd: item.afterEnd } : {},
+			...Number.isInteger(item.beforeStart) ? { beforeStart: item.beforeStart } : {},
+			...Number.isInteger(item.beforeEnd) ? { beforeEnd: item.beforeEnd } : {}
+		};
+	}) : [];
 	const toolName = r.toolName === "write" ? "write" : "edit";
+	const rawDecisions = r.decisions && typeof r.decisions === "object" ? r.decisions : {};
+	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.oldText === "string" ? {
+		callHunk: r.callHunk && typeof r.callHunk.oldText === "string" && typeof r.callHunk.newText === "string" ? {
 			oldText: r.callHunk.oldText,
 			newText: r.callHunk.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 : {
-			call: "pending",
-			perHunk: hunks.map(() => "pending")
+		hunks,
+		decisions: {
+			call,
+			perHunk
 		},
 		note: typeof r.note === "string" ? r.note : null,
 		superseded: r.superseded === true,
@@ -193,9 +401,17 @@ function markDecision(record, scope, idx, value) {
 /** 记录是否已无任何待决策差异（superseded 或全部已决策）。 */
 function recordResolved(record) {
 	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;
 }
 /**
 * 记录决策摘要（采纳/拒绝/待处理计数，superseded 标记）。
@@ -204,17 +420,20 @@ function recordResolved(record) {
 * @returns 摘要
 */
 function recSummary(record) {
+	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,
@@ -232,34 +451,23 @@ function recSummary(record) {
 */
 function reconstructOriginal(records, content) {
 	const pending = [];
-	for (const rec of records) {
-		const perHunk = Array.isArray(rec.decisions.perHunk) ? rec.decisions.perHunk : [];
-		for (let i = 0; i < rec.hunks.length; i++) if ((perHunk.length ? perHunk[i] : rec.decisions.call) === "pending") pending.push({
+	for (const rec of records) for (let i = 0; i < rec.hunks.length; 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
+			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 = [];
-	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 rebuilt = applyLocations(content, locateHunks(content, pending.map((item) => item.hunk)), true);
 	return {
-		content: out,
-		stale
+		content: rebuilt.content,
+		stale: rebuilt.stale.map((idx) => ({
+			callId: pending[idx].rec.callId,
+			idx: pending[idx].idx
+		}))
 	};
 }
 /** 文件当前最大批次号（无记录为 0）。 */
@@ -309,6 +517,11 @@ function archiveEntryFor(recs, cwd, reason) {
 			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,
@@ -410,29 +623,37 @@ async function saveBucket(ctx, cwd, recsMap, session) {
 * @param cache path → 内容（null=缺失/读取失败，''=过大跳过）
 */
 async function readForCache(ctx, session, cache, path) {
-	if (cache.has(path)) return cache.get(path) ?? null;
+	const cached = cache.get(path);
+	if (cached) return cached;
 	const fs = ctx.get("fs");
 	if (!fs) {
-		cache.set(path, null);
-		return null;
+		const state = { kind: "unavailable" };
+		cache.set(path, state);
+		return state;
 	}
 	try {
 		const target = await resolveTarget(ctx, session, path);
 		const info = await fs.stat(target);
 		if (!info || info.type !== "file") {
-			cache.set(path, null);
-			return null;
+			const state = { kind: "missing" };
+			cache.set(path, state);
+			return state;
 		}
 		if ((info.size ?? 0) > 8388608) {
-			cache.set(path, "");
-			return "";
+			const state = { kind: "unavailable" };
+			cache.set(path, state);
+			return state;
 		}
-		const content = await fs.readText(target);
-		cache.set(path, content);
-		return content;
+		const state = {
+			kind: "content",
+			content: await fs.readText(target)
+		};
+		cache.set(path, state);
+		return state;
 	} catch (error) {
-		cache.set(path, null);
-		return null;
+		const state = { kind: "unavailable" };
+		cache.set(path, state);
+		return state;
 	}
 }
 /**
@@ -443,30 +664,27 @@ async function readForCache(ctx, session, cache, path) {
 async function recordIsStale(ctx, session, cache, rec) {
 	if (rec.superseded === true) return true;
 	if (!Array.isArray(rec.hunks) || !rec.hunks.length) return true;
-	const perHunk = Array.isArray(rec.decisions.perHunk) ? rec.decisions.perHunk : [];
-	let hasLocatablePending = false;
-	for (let i = 0; i < rec.hunks.length; i++) {
-		const st = perHunk.length ? perHunk[i] : rec.decisions.call;
-		if (st === "accepted" || st === "rejected") continue;
-		if (rec.create === true) {
-			if (await readForCache(ctx, session, cache, rec.path) !== null) {
-				hasLocatablePending = true;
-				break;
-			}
-			continue;
-		}
-		const precise = rec.toolName === "edit" && rec.callHunk ? rec.callHunk : rec.hunks[i];
-		const oldText = precise?.oldText ?? null;
-		const newText = precise?.newText ?? null;
-		if (oldText !== null && oldText === newText) continue;
-		if (newText === null || newText === void 0) continue;
-		const content = await readForCache(ctx, session, cache, rec.path);
-		if (content !== null && content.indexOf(newText) >= 0) {
-			hasLocatablePending = true;
-			break;
-		}
+	const state = await readForCache(ctx, session, cache, rec.path);
+	if (state.kind === "unavailable") return false;
+	if (state.kind === "missing") return true;
+	if (rec.create === true) return false;
+	const pending = rec.hunks.map((_, idx) => ({
+		idx,
+		hunk: preciseHunk(rec, idx),
+		status: rec.decisions.perHunk[idx] ?? rec.decisions.call
+	})).filter((item) => item.status === "pending" && item.hunk && !isNoopHunk(item.hunk));
+	if (!pending.length) return true;
+	const currentFingerprint = fingerprint(state.content);
+	if (rec.afterFingerprint && currentFingerprint === rec.afterFingerprint) {
+		rec.conflict = false;
+		return false;
+	}
+	if (locateHunks(state.content, pending.map((item) => item.hunk)).some((location) => location.matched)) {
+		rec.conflict = false;
+		return false;
 	}
-	return !hasLocatablePending;
+	rec.conflict = true;
+	return false;
 }
 /**
 * edrv.list 全量轮询时自动清理 stale 记录：标记 superseded 并归档，
@@ -574,6 +792,42 @@ function bucketOf(registry, ctx, cwd) {
 }
 //#endregion
 //#region src/capture.ts
+/** 校验并提取工具 result meta 中的文件 hunk。 */
+function validHunks(raw) {
+	if (!Array.isArray(raw)) return [];
+	const hunks = [];
+	for (const item of raw) {
+		if (!item || typeof item !== "object") continue;
+		const hunk = item;
+		if (typeof hunk.newText !== "string") continue;
+		if (hunk.oldText !== null && typeof hunk.oldText !== "string") continue;
+		hunks.push({
+			oldText: hunk.oldText,
+			newText: hunk.newText
+		});
+	}
+	return hunks;
+}
+/** 已有文件 write 的元数据缺失时，用权威整文件快照保底。 */
+function fallbackHunks(toolName, args, before, after, create) {
+	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 成功时构造记录、
 * 递增文件批次、融合归档被后续修改取代的旧差异、落盘。
@@ -593,25 +847,27 @@ async function captureToolResult(ctx, registry, exec, result) {
 		const value = result.value;
 		const args = exec.arguments || {};
 		const path = typeof value.path === "string" ? value.path : args.file_path;
-		if (!path) return;
-		const metaDiffs = 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" ? {
+		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 synthHunk = create ? {
-			oldText: 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 metaHunks = validHunks(result.meta?.diffs);
+		const hunks = annotateHunks(metaHunks.length ? metaHunks : fallbackHunks(exec.name, args, before, after, create), before, after);
+		if (!hunks.length || typeof exec.callId !== "string") return;
 		const record = {
 			callId: exec.callId,
 			toolName: exec.name,
 			path,
 			before,
+			after,
+			baseFingerprint: fingerprint(before),
+			afterFingerprint: fingerprint(after),
+			legacy: false,
+			conflict: false,
 			create,
 			callHunk,
 			hunks,
@@ -816,18 +1072,30 @@ async function revertHunk(ctx, session, record, idx) {
 		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) > 8388608) 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 {
@@ -859,6 +1127,383 @@ async function restoreFile(ctx, session, rec) {
 	}
 }
 //#endregion
+//#region src/mcp.ts
+const MCP_PACKAGE = "@deepseek-ai/dsh-mcp-client";
+/** 项目级 MCP 的 loader entry id 固定前缀（区分 profile 全局 MCP；注意 loader id 不能用 ':' 分隔，故用 '.'）。 */
+const PROJECT_ENTRY_PREFIX = "vsm-mcp.";
+const LEGACY_PROJECT_PREFIX = "vsm-mcp:";
+/** 判断新旧格式项目 entry id，避免旧残留被显示为全局 MCP。 */
+function isProjectEntryId(id) {
+	return id.startsWith("vsm-mcp.") || id.startsWith(LEGACY_PROJECT_PREFIX);
+}
+/** 列出当前 loader 中的 MCP entry。 */
+function entriesOf(ctx) {
+	const loader = ctx.get("loader");
+	if (!loader || typeof loader.entries !== "function") return [];
+	return [...loader.entries()].filter((entry) => entry?.options?.name === MCP_PACKAGE);
+}
+/** 脱敏配置并保留可编辑字段的存在性。 */
+function publicConfig(config) {
+	const out = { ...config };
+	if (out.env && typeof out.env === "object") out.env = Object.fromEntries(Object.keys(out.env).map((key) => [key, "••••••"]));
+	if (out.headers && typeof out.headers === "object") out.headers = Object.fromEntries(Object.keys(out.headers).map((key) => [key, "••••••"]));
+	return out;
+}
+/** 从工具注册表读取服务器命名空间下的工具摘要。 */
+function toolsOf(ctx, serverName) {
+	const visible = (ctx.get("tools")?.view?.(void 0))?.visible;
+	if (!(visible instanceof Map)) return [];
+	const prefix = `mcp__${serverName}__`;
+	return [...visible.entries()].filter(([name]) => String(name).startsWith(prefix)).map(([name, definition]) => ({
+		name: String(name).slice(prefix.length),
+		description: typeof definition?.description === "string" ? definition.description : void 0
+	}));
+}
+/** 将 loader entry 映射为设置页摘要。 */
+function serverOf(ctx, entry) {
+	const config = entry.options?.config ?? {};
+	const serverName = typeof config.serverName === "string" ? config.serverName : entry.options?.id ?? "unknown";
+	const tools = toolsOf(ctx, serverName);
+	const state = entry.fiber?.state;
+	return {
+		id: String(entry.id ?? entry.options?.id ?? serverName),
+		serverName,
+		enabled: entry.disabled !== true,
+		transport: config.transport === "streamable-http" ? "streamable-http" : "stdio",
+		config: publicConfig(config),
+		status: state === 2 ? "connected" : state === 1 ? "connecting" : "error",
+		toolCount: tools.length,
+		tools,
+		error: state === 3 ? "MCP 插件未正常运行" : void 0
+	};
+}
+/** 校验 MCP 配置。 */
+function validateConfig(config) {
+	if (!/^[A-Za-z0-9_-]{1,32}$/.test(config.serverName)) throw new Error("serverName 只能包含字母、数字、下划线和连字符（最多 32 位）");
+	if (config.transport === "stdio" && !config.command?.trim()) throw new Error("stdio MCP 必须填写 command");
+	if (config.transport === "streamable-http" && !/^https?:\/\//.test(config.url ?? "")) throw new Error("HTTP MCP 必须填写 http(s) URL");
+}
+/** 列出全局（profile）MCP 服务，过滤掉新旧格式的项目级条目。 */
+function listMcp(ctx) {
+	return { servers: entriesOf(ctx).filter((entry) => !isProjectEntryId(String(entry.id ?? entry.options?.id ?? ""))).map((entry) => serverOf(ctx, entry)) };
+}
+/** 保存 MCP 服务配置并触发 loader 热更新。 */
+async function saveMcp(ctx, config) {
+	validateConfig(config);
+	const loader = ctx.get("loader");
+	if (!loader) throw new Error("缺少 loader 服务");
+	const existing = entriesOf(ctx).find((entry) => !isProjectEntryId(String(entry.id ?? entry.options?.id ?? "")) && entry.options?.config?.serverName === config.serverName);
+	if (existing) {
+		await loader.update(existing.id, { config: { ...config } });
+		return serverOf(ctx, loader.resolve(existing.id));
+	}
+	const id = await loader.create({
+		name: MCP_PACKAGE,
+		config: { ...config }
+	});
+	return serverOf(ctx, loader.resolve(id));
+}
+/** 删除 MCP 服务。 */
+async function removeMcp(ctx, id) {
+	const loader = ctx.get("loader");
+	if (!loader) throw new Error("缺少 loader 服务");
+	const entry = entriesOf(ctx).find((candidate) => String(candidate.id) === id);
+	if (!entry) throw new Error("MCP 服务不存在");
+	await loader.remove(entry.id);
+}
+/** 切换 MCP 服务启用状态。 */
+async function toggleMcp(ctx, id, enabled) {
+	const loader = ctx.get("loader");
+	if (!loader) throw new Error("缺少 loader 服务");
+	const entry = entriesOf(ctx).find((candidate) => String(candidate.id) === id);
+	if (!entry) throw new Error("MCP 服务不存在");
+	await loader.update(entry.id, { disabled: !enabled });
+	return serverOf(ctx, loader.resolve(entry.id));
+}
+/** 重新加载 MCP 服务。 */
+async function refreshMcp(ctx, id) {
+	const loader = ctx.get("loader");
+	if (!loader) throw new Error("缺少 loader 服务");
+	const entry = entriesOf(ctx).find((candidate) => String(candidate.id) === id);
+	if (!entry) throw new Error("MCP 服务不存在");
+	await loader.update(entry.id, { config: { ...entry.options?.config ?? {} } });
+	return serverOf(ctx, loader.resolve(entry.id));
+}
+//#endregion
+//#region src/mcpProject.ts
+/**
+* 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号
+*/
+const FILE_NAME = ".mcp.json";
+/** 校验项目路径属于 DSH 已注册 workspace，避免 RPC 写入任意目录。 */
+function requireWorkspace(ctx, workspacePath) {
+	const workspace = (ctx.get("workspaceRegistry")?.list?.() ?? []).find((item) => item.path === workspacePath);
+	if (!workspace) throw new Error("项目未注册为 DSH workspace，不能管理项目 MCP");
+	return workspace;
+}
+/** 用户显式 GUI 管理操作的写策略：danger-full-access（写入路径固定为 workspacePath/.mcp.json）。 */
+function fullPolicy(ctx) {
+	const svc = ctx.get("sandboxPolicy");
+	if (!svc || typeof svc.resolve !== "function") return void 0;
+	return svc.resolve({ mode: "danger-full-access" });
+}
+/** workspace 路径 → 确定性短哈希（entry id 归属段，重启后稳定可解码）。 */
+function hashWorkspace(path) {
+	return createHash("sha1").update(path).digest("hex").slice(0, 10);
+}
+/** 项目 MCP 的 loader entry id：vsm-mcp.<pathHash>.<serverName>（loader id 不能用冒号）。 */
+function projectEntryId(workspacePath, serverName) {
+	return PROJECT_ENTRY_PREFIX + hashWorkspace(workspacePath) + "." + serverName;
+}
+/** 读取项目 .mcp.json 顶层对象（缺失 → 空；非法 → 抛错带文案）。 */
+async function readProjectJson(ctx, workspacePath) {
+	const fs = ctx.get("fs");
+	if (!fs) throw new Error("缺少 fs 服务");
+	const target = await fs.resolve(FILE_NAME, { cwd: workspacePath });
+	let text;
+	try {
+		text = await fs.readText(target);
+	} catch (error) {
+		return {};
+	}
+	let data;
+	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;
+}
+/** 读取并校验 .mcp.json 的 mcpServers 映射（纯函数，可单测）。 */
+function serversOf(data) {
+	const raw = data.mcpServers;
+	if (raw === void 0) return {};
+	if (raw === null || typeof raw !== "object" || Array.isArray(raw)) throw new Error(".mcp.json 的 mcpServers 必须是对象");
+	const out = {};
+	for (const [name, value] of Object.entries(raw)) {
+		if (value === null || typeof value !== "object" || Array.isArray(value)) continue;
+		out[name] = value;
+	}
+	return out;
+}
+/** 把 .mcp.json 单条 server 定义归一化为 MpcConfig（缺传输必填 → null，纯函数可单测）。 */
+function configFromDef(def, serverName) {
+	if (!def) return null;
+	const transport = typeof def.url === "string" ? "streamable-http" : "stdio";
+	const config = {
+		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).map(([k, v]) => [k, String(v)]));
+	} else {
+		config.url = def.url;
+		if (def.headers && typeof def.headers === "object") config.headers = Object.fromEntries(Object.entries(def.headers).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, workspacePath, data, mcpServers) {
+	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, workspacePath, serverName) {
+	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。 */
+async function activateProjectMcp(ctx, workspacePath, config) {
+	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));
+	}
+	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）。 */
+async function deactivateMcp(ctx, entryId) {
+	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 该项目的激活状态（幂等）。 */
+async function reconcileProject(ctx, workspacePath) {
+	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, workspacePath, serverName) {
+	return configFromDef(serversOf(await readProjectJson(ctx, workspacePath))[serverName], serverName);
+}
+/** 单个项目的完整视图（fileData + 激活状态合并）。 */
+async function projectOf(ctx, workspacePath, title) {
+	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 = [];
+	let fileError;
+	try {
+		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。 */
+async function listProjects(ctx) {
+	const workspaces = ctx.get("workspaceRegistry")?.list?.() ?? [];
+	const projects = [];
+	for (const ws of workspaces) projects.push(await projectOf(ctx, ws.path, ws.title ?? ""));
+	return { projects };
+}
+/** 保存（新增/更新）一个项目 MCP：写 .mcp.json → 激活。 */
+async function projectSave(ctx, workspacePath, serverName, config) {
+	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 };
+	delete next.serverName;
+	delete next.transport;
+	delete next.disabled;
+	servers[serverName] = next;
+	await writeProjectJson(ctx, workspacePath, data, servers);
+	await activateProjectMcp(ctx, workspacePath, {
+		...config,
+		serverName
+	});
+	return projectOf(ctx, workspacePath, workspace.title ?? "");
+}
+/** 删除一个项目 MCP：停用 → 从 .mcp.json 移除。 */
+async function projectRemove(ctx, workspacePath, serverName) {
+	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）。 */
+async function projectToggle(ctx, workspacePath, serverName, enabled) {
+	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。 */
+async function projectRefresh(ctx, workspacePath, serverName) {
+	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 ?? "");
+}
+//#endregion
 //#region src/rpc.ts
 /** cwd → Promise 链：串行化 debug 日志追加（fs read+write 非原子，避免并发丢行）。 */
 const debugWriteQueues = /* @__PURE__ */ new Map();
@@ -875,6 +1520,11 @@ function recView(record) {
 		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
 	};
 }
@@ -1241,6 +1891,125 @@ function buildHandlers(ctx, registry) {
 				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)
+				};
+			}
 		}
 	};
 }
@@ -1257,6 +2026,141 @@ async function handleRpc(ctx, registry, method, args) {
 	return handler(args);
 }
 //#endregion
+//#region src/mcpIsolation.ts
+/**
+* dsh-vscode-mode host — 项目 MCP 的 agent 级隔离。
+* 项目 MCP 连接仍由 Host 维护，但每个 agent 只继承当前 workspace 的项目工具；
+* tools.restrict() 负责模型可见性，tools.guard() 负责执行层兜底拒绝。
+* 作者 ddj 2026年08月22号
+*/
+const LEGACY_PREFIX = "vsm-mcp:";
+const UNKNOWN_PROJECT = "__unknown_project__";
+/** 统一 workspace 路径，供 cwd 父路径匹配。 */
+function normalizePath(path) {
+	return String(path ?? "").replace(/\\/g, "/").replace(/\/+/g, "/").replace(/\/$/, "").toLowerCase();
+}
+/** 在已注册 workspace 中匹配 cwd，优先最长父路径。 */
+function matchWorkspace(cwd, paths) {
+	if (!cwd) return void 0;
+	const target = normalizePath(cwd);
+	const matches = paths.filter((path) => {
+		const root = normalizePath(path);
+		return target === root || target.startsWith(root + "/");
+	});
+	matches.sort((a, b) => normalizePath(b).length - normalizePath(a).length);
+	return matches[0];
+}
+/** 根据 entry id 判断是否为新旧格式项目 MCP。 */
+function isProjectEntry(id) {
+	return id.startsWith("vsm-mcp.") || id.startsWith(LEGACY_PREFIX);
+}
+/** 从项目 entry id 解析 workspace hash。 */
+function entryHash(id) {
+	if (id.startsWith("vsm-mcp.")) return id.slice(8).split(".")[0];
+	if (id.startsWith(LEGACY_PREFIX)) return id.slice(8).split(":")[0];
+}
+/** 返回一个 agent 不应继承的项目工具名。 */
+function denyTools(toolProjects, currentPath) {
+	return [...toolProjects.entries()].filter(([, owner]) => owner !== currentPath).map(([name]) => name).sort();
+}
+/** 从 loader entry 和工具注册表建立工具到项目路径的映射。 */
+function projectTools(ctx) {
+	const result = /* @__PURE__ */ new Map();
+	const workspaces = ctx.get("workspaceRegistry")?.list?.() ?? [];
+	const byHash = new Map(workspaces.map((ws) => [hashWorkspace(ws.path), ws.path]));
+	const visible = ctx.get("tools")?.view?.(void 0)?.visible;
+	if (!(visible instanceof Map)) return result;
+	for (const entry of entriesOf(ctx)) {
+		const id = String(entry.id ?? entry.options?.id ?? "");
+		if (!isProjectEntry(id)) continue;
+		const hash = entryHash(id);
+		const owner = hash ? byHash.get(hash) ?? UNKNOWN_PROJECT : UNKNOWN_PROJECT;
+		const serverName = entry.options?.config?.serverName;
+		if (typeof serverName !== "string") continue;
+		const prefix = `mcp__${serverName}__`;
+		for (const name of visible.keys()) if (String(name).startsWith(prefix)) result.set(String(name), owner);
+	}
+	return result;
+}
+/** 取得 agent 当前 cwd 所属 workspace。 */
+function agentWorkspace(ctx, agent) {
+	const cwd = agent?.session?.header?.cwd;
+	return matchWorkspace(cwd, (ctx.get("workspaceRegistry")?.list?.() ?? []).map((ws) => ws.path));
+}
+/** 同步一个 agent 的项目工具 deny 列表。 */
+function syncAgent(ctx, state, agent, tools) {
+	const denied = denyTools(tools, agentWorkspace(ctx, agent));
+	const nextKey = denied.join("\n");
+	if (state.denyKey === nextKey) return;
+	state.dispose?.();
+	state.dispose = void 0;
+	if (denied.length > 0) try {
+		state.dispose = agent.ctx.tools.restrict({ deny: denied });
+	} catch (error) {
+		ctx.logger?.warn?.("[dsh-vscode-mode] MCP agent restriction failed: " + String(error));
+		return;
+	}
+	state.denyKey = nextKey;
+}
+/** 为当前 Host 安装项目 MCP 的 agent restriction 与执行 guard。 */
+function installIsolation(ctx) {
+	const tools = ctx.get("tools");
+	const agents = ctx.get("agents");
+	if (!tools || !agents) return;
+	const states = /* @__PURE__ */ new Map();
+	let toolProjects = projectTools(ctx);
+	let scheduled = false;
+	let syncing = false;
+	const syncAll = () => {
+		if (syncing) return;
+		syncing = true;
+		try {
+			toolProjects = projectTools(ctx);
+			for (const agent of agents.list?.() ?? []) {
+				const state = states.get(agent) ?? { denyKey: "" };
+				states.set(agent, state);
+				syncAgent(ctx, state, agent, toolProjects);
+			}
+		} finally {
+			syncing = false;
+		}
+	};
+	const scheduleSync = () => {
+		if (scheduled) return;
+		scheduled = true;
+		queueMicrotask(() => {
+			scheduled = false;
+			syncAll();
+		});
+	};
+	const onCreated = ctx.on("agent/created", ({ agent }) => {
+		const state = { denyKey: "" };
+		states.set(agent, state);
+		syncAgent(ctx, state, agent, toolProjects);
+	});
+	const onDisposed = ctx.on("agent/disposed", ({ agent }) => {
+		states.get(agent)?.dispose?.();
+		states.delete(agent);
+	});
+	const onToolsChange = ctx.on("tools/change", scheduleSync);
+	const stopGuard = tools.guard((exec) => {
+		const owner = toolProjects.get(String(exec?.name ?? ""));
+		if (!owner) return void 0;
+		const current = agentWorkspace(ctx, exec.agent);
+		if (owner === current) return void 0;
+		return current === void 0 ? "项目 MCP 需要在已注册工作区的对话中使用" : "已拒绝：当前对话工作区不能使用其他项目的 MCP";
+	});
+	syncAll();
+	ctx.effect(() => () => {
+		onCreated?.();
+		onDisposed?.();
+		onToolsChange?.();
+		stopGuard?.();
+		for (const state of states.values()) state.dispose?.();
+		states.clear();
+	}, "vscode-mode:mcp-isolation");
+}
+//#endregion
 //#region src/index.ts
 /**
 * @dsh-external 生态 → dsh-vscode-mode：DSH 上的类 VSCode 编码体验（Host 半入口）。
@@ -1269,7 +2173,11 @@ const name = "dsh-vscode-mode";
 const inject = [
 	"sessions",
 	"fs",
-	"webServer"
+	"webServer",
+	"loader",
+	"tools",
+	"workspaceRegistry",
+	"agents"
 ];
 /**
 * 装配插件：挂事件监听、注册路由。
@@ -1290,7 +2198,8 @@ function apply(ctx, config) {
 		}
 	});
 	registerRoutes(ctx, config, (method, args) => handleRpc(ctx, registry, method, args));
-	ctx.logger?.info?.("[dsh-vscode-mode] 编辑差异审查已装配（/edrv/rpc 路由就绪）");
+	installIsolation(ctx);
+	ctx.logger?.info?.("[dsh-vscode-mode] 编辑差异审查已装配（/edrv/rpc 路由就绪，项目 MCP 隔离已启用）");
 }
 //#endregion
 export { apply, inject, name };