dsh-vscode-mode 0.26.0 → 0.27.0

package/lib/index.js

@@ -2485,11 +2485,9 @@ const PENDING_PREFIX = "pending:";
 //#region src/pendingCompat.ts
 /**
 * 进程内"已被待审接管"的路径集合；旧写入口守卫只读它，绝不碰数据库。
-* 按会话登记：待审列表按会话可见，守卫必须同口径，否则会出现"拦得住、看不见"的死锁。
-* 无会话归属的登记落在 workspace 集合（兼容只有工作区+路径的旧用法）。
+* 按工作区登记，来源会话仅作追溯；任一对话重建或注销都会更新同一份集合。
 */
-const coveredBySession = /* @__PURE__ */ new Map();
-const coveredWorkspace = /* @__PURE__ */ new Set();
+const coveredWorkspace = /* @__PURE__ */ new Map();
 /**
 * @author ddj 2026年10月29号
 * @description: 由条目 id 派生稳定序号，保证轮询期间面板锚点不跳。
@@ -2605,16 +2603,18 @@ function coverKey(cwd, path) {
 	return `${pathKey$1(cwd)}|${pathKey$1(path)}`;
 }
 /**
-* @author ddj 2026年11月3号
-* @description: 取某会话的覆盖集合；首次登记时就地建集合，避免调用方判空。
-* @param sessionId 会话 id
-* @returns 该会话的覆盖键集合
-*/
-function sessionCovers(sessionId) {
-	const existing = coveredBySession.get(sessionId);
+* @private
+* @author ddj 2026年11月04号
+* @description: 取工作区唯一接管集合；来源对话仅保留为诊断信息。
+* @param cwd 工作区路径
+* @returns 路径到登记来源的映射
+*/
+function workspaceCovers(cwd) {
+	const workspaceKey = pathKey$1(cwd);
+	const existing = coveredWorkspace.get(workspaceKey);
 	if (existing) return existing;
-	const created = /* @__PURE__ */ new Set();
-	coveredBySession.set(sessionId, created);
+	const created = /* @__PURE__ */ new Map();
+	coveredWorkspace.set(workspaceKey, created);
 	return created;
 }
 /**
@@ -2628,27 +2628,27 @@ function sessionCovers(sessionId) {
 */
 function trackPendingCover(cwd, path, covered, sessionId) {
 	const key = coverKey(cwd, path);
-	const target = sessionId ? sessionCovers(sessionId) : coveredWorkspace;
-	if (covered) target.add(key);
+	const target = workspaceCovers(cwd);
+	if (covered) target.set(key, sessionId ?? null);
 	else target.delete(key);
 }
 /**
 * @author ddj 2026年11月3号
-* @description: 用一次列表结果整体重建某会话的接管集合：条目被移除或结案后自动失效，不再残留登记。
+* @description: 用完整列表重建工作区接管集合，清除任何对话留下的过期登记。
 * @param cwd 工作区
 * @param sessionId 会话 id
 * @param paths 本会话当前可见的待审条目路径
 * @returns 无
 */
 function setPendingCovers(cwd, sessionId, paths) {
-	const next = /* @__PURE__ */ new Set();
-	for (const path of paths) if (path) next.add(coverKey(cwd, path));
-	coveredBySession.set(sessionId, next);
+	const next = /* @__PURE__ */ new Map();
+	for (const path of paths) if (path) next.set(coverKey(cwd, path), sessionId);
+	coveredWorkspace.set(pathKey$1(cwd), next);
 }
 /**
 * @author ddj 2026年10月29号
 * @description: 判断某路径是否已由待审投影接管；仅读进程内集合，不产生任何 IO。
-* 给 sessionId 时按该会话的可见范围判定（列表看不到的接管不拦旧入口），缺省按全工作区并集判定。
+* 所有对话按同一工作区集合判定，兼容参数不影响可见范围。
 * @param cwd 工作区
 * @param path 请求路径
 * @param sessionId 会话 id；缺省按并集判定
@@ -2656,10 +2656,7 @@ function setPendingCovers(cwd, sessionId, paths) {
 */
 function pendingCovers(cwd, path, sessionId) {
 	const key = coverKey(cwd, path);
-	if (coveredWorkspace.has(key)) return true;
-	if (sessionId) return coveredBySession.get(sessionId)?.has(key) === true;
-	for (const set of coveredBySession.values()) if (set.has(key)) return true;
-	return false;
+	return coveredWorkspace.get(pathKey$1(cwd))?.has(key) === true;
 }
 /**
 * @author ddj 2026年10月29号
@@ -8780,6 +8777,67 @@ function evidenceText(evidence) {
 	};
 }
 //#endregion
+//#region src/toolTargets.ts
+/** Optional Host patch target extraction; results never substitute raw preimages. @author ddj 2026年11月04号 */
+/** @public @author ddj 2026年11月04号 @param result Untrusted tool envelope. @returns Diagnostic-only status; never writable preimages. */
+function patchDiagnostics(result) {
+	const payload = result?.value ?? result;
+	if (payload?.phase !== "commit" || !Array.isArray(payload.operations)) return ["apply_patch result unavailable or malformed"];
+	const diagnostics = [];
+	for (const operation of payload.operations) {
+		if (!operation || typeof operation.path !== "string" || ![
+			"add",
+			"update",
+			"delete",
+			"move"
+		].includes(operation.kind) || ![
+			"completed",
+			"failed",
+			"unknown",
+			"skipped"
+		].includes(operation.status)) {
+			diagnostics.push("apply_patch operation malformed");
+			continue;
+		}
+		if (operation.status !== "completed") diagnostics.push(operation.path + ": " + operation.status);
+		if (operation.changes !== void 0 && (!Array.isArray(operation.changes) || operation.changes.some((change) => !change || typeof change.path !== "string" || !(change.before === null || typeof change.before === "string") || !(change.after === null || typeof change.after === "string")))) diagnostics.push(operation.path + ": changes malformed");
+	}
+	return diagnostics;
+}
+let parserLoad;
+/** @public @author ddj 2026年11月04号 @returns Optional official parser; missing capabilities remain retryable. */
+async function patchParser() {
+	if (!parserLoad) parserLoad = loadHostModule("@deepseek-ai/dsh-fs-patch").then((module) => {
+		const parser = module.parsePatch;
+		return typeof parser === "function" ? parser : null;
+	}).catch(() => null);
+	const parser = await parserLoad;
+	if (!parser) parserLoad = void 0;
+	return parser;
+}
+/** @public @author ddj 2026年11月04号 @param call Tool identity and arguments. @param parser Optional injectable official parser. @returns Unique unresolved source/destination paths. @throws Unsupported parser or malformed patch. */
+async function toolTargets(call, parser) {
+	if ([
+		"edit",
+		"write",
+		"str_replace_editor"
+	].includes(String(call.name))) {
+		const path = call.arguments?.file_path ?? call.arguments?.path;
+		return typeof path === "string" && path ? [path] : [];
+	}
+	if (call.name !== "apply_patch") return [];
+	if (typeof call.arguments?.input !== "string") throw new Error("apply_patch input unavailable");
+	const parse = parser === void 0 ? await patchParser() : parser;
+	if (!parse) throw new Error("Host patch parser unavailable");
+	const paths = /* @__PURE__ */ new Set();
+	for (const operation of parse(call.arguments.input)) {
+		if (typeof operation.path !== "string" || !operation.path) throw new Error("Invalid patch target");
+		paths.add(operation.path);
+		if (operation.moveTo) paths.add(operation.moveTo);
+	}
+	return [...paths];
+}
+//#endregion
 //#region src/reviewCapture.ts
 /** Independent byte evidence; official diff remains the only display authority. @author ddj 2026年10月27号 */
 /** @public @author ddj 2026年10月27号 @param ctx Host lifecycle owner. @returns Scoped byte recorder; failures disable undo evidence only, never tool execution. */
@@ -8787,12 +8845,15 @@ function installEvidence(ctx) {
 	const chains = /* @__PURE__ */ new Map();
 	const staged = /* @__PURE__ */ new Map();
 	let stopped = false;
+	const disposed = /* @__PURE__ */ new Set();
 	ctx.on("tools/execute", aroundTool);
 	ctx.on("session/event", onEvent);
 	ctx.on("session/disposed", onDisposed);
 	/** @private @author ddj 2026年10月27号 @param session Disposed owner. Drops optional in-memory evidence, never persisted official facts. */
 	function onDisposed(session) {
+		disposed.add(session.id);
 		chains.delete(session.id);
+		for (const key of staged.keys()) if (JSON.parse(key)[0] === session.id) staged.delete(key);
 	}
 	/** @private @author ddj 2026年10月27号 @returns Current bounded capture footprint, excluding transient filesystem reads. */
 	function footprint() {
@@ -8803,48 +8864,94 @@ function installEvidence(ctx) {
 	/** @private @author ddj 2026年10月27号 @param exec Allowed tool dispatch. @param next Original dispatch. @returns Original result unchanged, regardless of capture failure. */
 	async function aroundTool(exec, next) {
 		const session = exec.agent?.session;
-		const path = exec.arguments?.file_path;
-		if (stopped || !session?.id || !["edit", "write"].includes(exec.name) || typeof path !== "string") return next();
-		let fs;
-		let chain;
-		let target;
+		if (stopped || !session?.id) return next();
+		const captures = [];
 		try {
-			if (chains.size >= 16 && !chains.has(session.id) || footprint() >= 33554432) return next();
-			fs = ctx.get("fs");
-			target = await resolveTarget(ctx, session, path);
-			const identity = fs.processPath(target);
-			const before = await readRaw(fs, target, exec.signal);
-			let files = chains.get(session.id);
-			if (!files) {
-				files = /* @__PURE__ */ new Map();
-				chains.set(session.id, files);
-			}
-			if (files.size >= 64 && !files.has(identity)) return next();
-			chain = files.get(identity);
-			if (!chain) {
-				chain = {
-					before,
-					after: before,
-					busy: false,
-					invalid: false
-				};
-				files.set(identity, chain);
-			}
-			if (chain.busy || chain.after.hash !== before.hash) chain.invalid = true;
-			chain.busy = true;
+			const cwd = cwdOfSession(ctx, session);
+			const fs = ctx.get("fs");
+			const paths = await toolTargets(exec);
+			for (const path of paths) try {
+				const capture = await prepareRaw(fs, session.id, cwd ?? void 0, path, exec.signal);
+				if (capture) captures.push(capture);
+			} catch {}
 		} catch {}
 		try {
 			return await next();
 		} finally {
-			if (chain) {
+			for (const capture of captures) {
 				try {
-					chain.after = await readRaw(fs, target, exec.signal);
+					const after = await readRaw(capture.fs, capture.target, exec.signal);
+					if (!stopped && !disposed.has(session.id)) {
+						capture.chain.after = after;
+						if (footprint() > 33554432) {
+							capture.chain.invalid = true;
+							capture.chain.before = rawReviewFile(null);
+							capture.chain.after = rawReviewFile(null);
+						}
+					}
 				} catch {
-					chain.invalid = true;
+					capture.chain.invalid = true;
 				}
+				capture.chain.busy = false;
+			}
+		}
+	}
+	/** @private @author ddj 2026年11月04号 @param sessionId Frozen owner. @param cwd Frozen workspace. @param path Patch target. @param signal Tool cancellation. @returns Reserved raw capture or no evidence. */
+	async function prepareRaw(fs, sessionId, cwd, path, signal) {
+		if (stopped || disposed.has(sessionId) || !cwd || chains.size >= 16 && !chains.has(sessionId) || footprint() >= 33554432) return null;
+		const target = await fs.resolve(path, { cwd });
+		if (stopped || disposed.has(sessionId)) return null;
+		const identity = fs.processPath(target);
+		let files = chains.get(sessionId);
+		if (!files) {
+			files = /* @__PURE__ */ new Map();
+			chains.set(sessionId, files);
+		}
+		if (files.size >= 64 && !files.has(identity)) return null;
+		let chain = files.get(identity);
+		if (chain?.busy) {
+			chain.invalid = true;
+			return null;
+		}
+		const empty = rawReviewFile(null);
+		if (!chain) {
+			chain = {
+				before: empty,
+				after: empty,
+				busy: true,
+				invalid: false
+			};
+			files.set(identity, chain);
+			try {
+				chain.before = await readRaw(fs, target, signal);
+				chain.after = chain.before;
+			} catch (error) {
+				chain.invalid = true;
 				chain.busy = false;
+				throw error;
 			}
+		} else {
+			chain.busy = true;
+			try {
+				const before = await readRaw(fs, target, signal);
+				if (chain.after.hash !== before.hash) chain.invalid = true;
+			} catch (error) {
+				chain.invalid = true;
+				chain.busy = false;
+				throw error;
+			}
+		}
+		if (stopped || disposed.has(sessionId) || footprint() > 33554432) {
+			chain.invalid = true;
+			chain.busy = false;
+			files.delete(identity);
+			return null;
 		}
+		return {
+			fs,
+			target,
+			chain
+		};
 	}
 	/** @private @author ddj 2026年10月27号 @param session Source session. @param event Published official turn. Freezes the chain before the next turn can mutate it. */
 	function onEvent(session, event) {
@@ -8908,10 +9015,34 @@ async function readRaw(fs, target, signal) {
 const WRITE_TOOLS = [
 	"edit",
 	"write",
-	"str_replace_editor"
+	"str_replace_editor",
+	"apply_patch"
 ];
 /** 单文件文本上限：超过即标注 oversized，不静默截断。 */
 const MAX_TEXT = 1048576;
+const captureGaps = /* @__PURE__ */ new Map();
+/** @public @author ddj 2026年11月04号 @param cwd Workspace identity. @returns Bounded runtime-only capture diagnostics. */
+function pendingGaps(cwd) {
+	return [...captureGaps.values()].filter((gap) => gap.cwd === cwd).map((gap) => gap.message);
+}
+/** @private @author ddj 2026年11月04号 @param ctx Host scope. @param exec Original call. @param path Failed target. @param error Evidence failure. Records no writable state. */
+function recordGap(scope, exec, path, error) {
+	const { cwd, sessionId } = scope;
+	const key = JSON.stringify([
+		cwd,
+		sessionId,
+		exec.id,
+		path
+	]);
+	captureGaps.set(key, {
+		cwd,
+		sessionId,
+		message: path + ": " + String(error)
+	});
+	const local = [...captureGaps].filter(([, gap]) => gap.cwd === cwd);
+	while (local.length > 50) captureGaps.delete(local.shift()[0]);
+	while (captureGaps.size > 500) captureGaps.delete(captureGaps.keys().next().value);
+}
 /**
 * @author ddj 2026年10月30号
 * @description: 安装写文件采集；读写失败只影响待审来源，绝不影响用户工具本身。
@@ -8922,12 +9053,18 @@ const MAX_TEXT = 1048576;
 function installPending(ctx, sink) {
 	const state = {
 		busy: /* @__PURE__ */ new Set(),
-		stopped: false
+		stopped: false,
+		disposed: /* @__PURE__ */ new Set()
 	};
 	ctx.on("tools/execute", (exec, next) => aroundTool(ctx, state, sink, exec, next));
+	ctx.on("session/disposed", (session) => {
+		state.disposed.add(session.id);
+		for (const [key, gap] of captureGaps) if (gap.sessionId === session.id) captureGaps.delete(key);
+	});
 	return { dispose() {
 		state.stopped = true;
 		state.busy.clear();
+		captureGaps.clear();
 	} };
 }
 /**
@@ -8938,27 +9075,32 @@ function installPending(ctx, sink) {
 * @param exec 工具分发上下文
 * @returns 采集计划或 null
 */
-async function planOf(ctx, state, exec) {
-	const session = exec.agent?.session;
-	const requested = exec.arguments?.file_path ?? exec.arguments?.path;
-	if (state.stopped || !session?.id || typeof requested !== "string") return null;
-	if (!WRITE_TOOLS.includes(String(exec.name))) return null;
-	const cwd = cwdOf(session);
-	if (!cwd) return null;
-	const fs = ctx.get("fs");
-	const target = await resolveTarget(ctx, session, requested);
+async function planOf(scope, state, requested) {
+	const { cwd, sessionId, fs } = scope;
+	if (state.stopped || state.disposed.has(sessionId)) return null;
+	const target = await fs.resolve(requested, { cwd });
 	const identity = fs.processPath(target);
-	if (typeof identity !== "string" || !identity || state.busy.has(identity)) return null;
-	const before = await readText(fs, target);
-	if (before !== null && before.length > MAX_TEXT) return null;
-	return {
-		cwd: String(cwd),
-		sessionId: String(session.id),
-		path: requested,
-		identity,
-		before,
-		session
-	};
+	if (state.stopped || state.disposed.has(sessionId) || typeof identity !== "string" || !identity || state.busy.has(identity)) return null;
+	state.busy.add(identity);
+	try {
+		const before = await readText(fs, target);
+		if (state.stopped || state.disposed.has(sessionId) || before !== null && before.length > MAX_TEXT) {
+			state.busy.delete(identity);
+			return null;
+		}
+		return {
+			cwd: String(cwd),
+			sessionId,
+			path: requested,
+			identity,
+			before,
+			target,
+			fs
+		};
+	} catch (error) {
+		state.busy.delete(identity);
+		throw error;
+	}
 }
 /**
 * @author ddj 2026年10月30号
@@ -8971,63 +9113,87 @@ async function planOf(ctx, state, exec) {
 * @returns 原始工具结果
 */
 async function aroundTool(ctx, state, sink, exec, next) {
-	let plan = null;
+	if (state.stopped || !WRITE_TOOLS.includes(String(exec.name))) return next();
+	const session = exec.agent?.session;
+	const cwd = session ? cwdOfSession(ctx, session) : null;
+	if (!session?.id || !cwd) return next();
+	const scope = {
+		cwd,
+		sessionId: session.id,
+		fs: ctx.get("fs")
+	};
+	const plans = [];
 	try {
-		plan = await planOf(ctx, state, exec);
+		const paths = await toolTargets(exec);
+		for (const path of paths) try {
+			if (plans.length >= 16) throw new Error("capture target budget exceeded");
+			const plan = await planOf(scope, state, path);
+			if (plan) plans.push(plan);
+		} catch (error) {
+			if (!state.stopped && !state.disposed.has(scope.sessionId)) recordGap(scope, exec, path, error);
+			log.debug("待审采集跳过：" + path + ": " + String(error));
+		}
 	} catch (error) {
-		log.debug("待审采集跳过：" + String(error));
+		if (!state.stopped && !state.disposed.has(scope.sessionId)) recordGap(scope, exec, String(exec.name), error);
+		log.debug("待审目标不可用：" + String(error));
 	}
-	if (!plan) return next();
-	state.busy.add(plan.identity);
 	try {
-		return await next();
+		const result = await next();
+		if (exec.name === "apply_patch" && !state.stopped && !state.disposed.has(scope.sessionId)) for (const diagnostic of patchDiagnostics(result)) recordGap(scope, exec, "apply_patch", diagnostic);
+		return result;
 	} finally {
-		state.busy.delete(plan.identity);
-		try {
-			reportWrite(ctx, sink, plan);
+		for (const plan of plans) try {
+			await reportWrite(state, sink, plan);
 		} catch (error) {
+			if (!state.stopped && !state.disposed.has(scope.sessionId)) recordGap(scope, exec, plan.path, error);
 			log.debug("待审上报失败：" + String(error));
+		} finally {
+			state.busy.delete(plan.identity);
 		}
 	}
 }
 /**
-* @author ddj 2026年10月29号
-* @description: 写后读回并比较，内容一致视为无净变化不产生条目。
-* @param ctx Host 生命周期
+* @author ddj 2026年11月04号
+* @description: 固定目标写后读回；内容一致不产生条目，卸载后不再上报。
+* @param state 采集生命周期状态
 * @param sink 已确认写入的接收方
 * @param plan 采集计划
 * @returns 无；读回失败只记日志
 */
-function reportWrite(ctx, sink, plan) {
-	const fs = ctx.get("fs");
-	resolveTarget(ctx, plan.session, plan.path).then(async (target) => {
-		const after = await readText(fs, target);
-		if (after !== null && after.length > MAX_TEXT) return;
-		if (plan.before === after) return;
-		sink({
-			cwd: plan.cwd,
-			sessionId: plan.sessionId,
-			path: plan.path,
-			identity: plan.identity,
-			before: plan.before,
-			after,
-			now: Date.now()
-		});
-	}).catch((error) => log.debug("待审读回失败：" + String(error)));
+async function reportWrite(state, sink, plan) {
+	if (state.stopped || state.disposed.has(plan.sessionId)) return;
+	const after = await readText(plan.fs, plan.target);
+	if (state.stopped || state.disposed.has(plan.sessionId)) return;
+	if (after !== null && after.length > MAX_TEXT) throw new Error("capture text budget exceeded");
+	for (const [key, gap] of captureGaps) {
+		const identity = JSON.parse(key);
+		if (gap.cwd === plan.cwd && gap.sessionId === plan.sessionId && identity[3] === plan.path) captureGaps.delete(key);
+	}
+	if (plan.before === after) return;
+	sink({
+		cwd: plan.cwd,
+		sessionId: plan.sessionId,
+		path: plan.path,
+		identity: plan.identity,
+		before: plan.before,
+		after,
+		now: Date.now()
+	});
 }
 /**
 * @author ddj 2026年10月29号
-* @description: 读取全文；缺失或不可读按"无内容"处理，交由上层决定语义。
+* @description: 读取全文；只有明确缺失返回 null，不可读或超限错误保留失败语义。
 * @param fs 文件系统
 * @param target 目标
 * @returns 文本或 null
 */
-async function readText(fs, target) {
+async function readText(fs, target, signal) {
 	try {
-		return String(await fs.readText(target));
+		if (typeof fs.readBytes === "function") return rawText(rawReviewFile(await fs.readBytes(target, signal, MAX_TEXT)));
+		throw new Error("Raw byte capture unavailable");
 	} catch (error) {
 		const code = error.code;
-		if (code === "ENOENT" || code === "FS_NOT_FOUND" || code === "FS_TOO_LARGE") return null;
+		if (code === "ENOENT" || code === "FS_NOT_FOUND") return null;
 		throw error;
 	}
 }
@@ -10155,18 +10321,39 @@ function itemOf(stored, baselineEmpty = false) {
 	return item;
 }
 /**
+* @private
+* @author ddj 2026年11月04号
+* @description 从条目来源判断创建基线；任何决定历史都阻止展示层复活已推进的旧基线。
+* @param cwd 工作区
+* @param stored 累计条目
+* @param sourceAdds 单次读取内的来源创建集合缓存
+* @returns 是否将展示基线置空
+*/
+function emptyBaseOf(cwd, stored, sourceAdds = /* @__PURE__ */ new Map()) {
+	if (isSettled(stored.entry)) return false;
+	if (pendingDb(cwd).prepare("SELECT 1 FROM pending_history WHERE entry_id=? LIMIT 1").get(stored.entry.id)) return false;
+	for (const sourceId of stored.entry.sessionIds) {
+		let createdPaths = sourceAdds.get(sourceId);
+		if (!createdPaths) {
+			createdPaths = addedFiles(cwd, sourceId);
+			sourceAdds.set(sourceId, createdPaths);
+		}
+		if (createdPaths.has(stored.entry.id)) return true;
+	}
+	return false;
+}
+/**
 * @author ddj 2026年10月29号
-* @description: 读一页待审条目，按更新时间升序；会话过滤走血缘集合。
+* @description: 读工作区全部待审条目，按更新时间升序；来源会话仅用于追溯。
 * @param cwd 工作区
-* @param sessionId 当前会话
-* @param wholeAdd 本次会话新建的文件身份集合，命中时基线置空
+* @param _sessionId 兼容旧调用签名，不再用于可见性过滤
 * @returns 列表
 */
-function loadPage(cwd, sessionId, wholeAdd) {
-	const all = loadEntries(cwd);
-	const visible = sessionId ? all.filter((stored) => stored.entry.sessionIds.includes(sessionId)) : all;
-	const items = visible.map((stored) => itemOf(stored, wholeAdd?.has(stored.entry.id) === true));
-	const gaps = [];
+function loadPage(cwd, _sessionId) {
+	const visible = loadEntries(cwd);
+	const sourceAdds = /* @__PURE__ */ new Map();
+	const items = visible.map((stored) => itemOf(stored, emptyBaseOf(cwd, stored, sourceAdds)));
+	const gaps = pendingGaps(cwd);
 	for (const stored of visible) if (stored.flags.oversized) gaps.push(`${stored.entry.path}: 文本超出上限，仅保留标记`);
 	return {
 		items,
@@ -10186,9 +10373,10 @@ function loadPage(cwd, sessionId, wholeAdd) {
 function loadDetail(cwd, id, baselineEmpty = false) {
 	const stored = loadEntries(cwd).find((item) => item.entry.id === id);
 	if (!stored) return null;
-	const diff = diffOf(stored.entry, baselineEmpty);
+	const emptyBase = baselineEmpty || emptyBaseOf(cwd, stored);
+	const diff = diffOf(stored.entry, emptyBase);
 	return {
-		item: itemOf(stored, baselineEmpty),
+		item: itemOf(stored, emptyBase),
 		diff,
 		blocks: blockStatesOf(stored.entry),
 		capability: capabilityOf(stored.entry, stored.flags)
@@ -10288,23 +10476,25 @@ function writerFor(fs, cwd, identity, expected, signal, policy, allowCreate = fa
 				reason: "resolve-failed"
 			};
 		}
-		const current = await readText(fs, target).catch(() => void 0);
-		if (current === void 0) return {
+		const snapshot = await stableRead(fs, target, signal);
+		if (!snapshot.ok) return snapshot;
+		const recreate = allowCreate && snapshot.content === null;
+		if (!recreate && snapshot.content !== expected) return {
 			ok: false,
-			reason: "read-failed"
+			reason: "diverged"
 		};
-		if (!(allowCreate && current === null) && current !== expected) return {
+		if (snapshot.content === null && !recreate) return {
 			ok: false,
-			reason: "diverged"
+			reason: "missing"
+		};
+		const intent = recreate ? { kind: "createIfAbsent" } : {
+			kind: "replaceIfVersion",
+			version: snapshot.version
 		};
-		const currentStat = await fs.stat(target, signal).catch(() => void 0);
 		try {
-			await fs.writeText(target, content ?? "", currentStat ? {
-				kind: "replaceIfVersion",
-				version: currentStat.version
-			} : void 0, signal, policy);
+			await fs.writeText(target, content ?? "", intent, signal, policy);
 			const readBack = await readText(fs, target);
-			if ((content ?? "") !== (readBack ?? "")) return {
+			if (content !== readBack) return {
 				ok: false,
 				reason: "read-back-mismatch"
 			};
@@ -10347,7 +10537,7 @@ async function applyDecide(fs, cwd, request, signal, policy) {
 		blocks: beforeBlocks,
 		now: Date.now(),
 		write: (content) => {
-			if (content === null) return deleteTarget(fs, cwd, stored.entry.id, signal);
+			if (content === null) return deleteTarget(fs, cwd, stored.entry.id, stored.entry.newText, signal, policy);
 			return writerFor(fs, cwd, stored.entry.id, stored.entry.newText, signal, policy)(content);
 		}
 	});
@@ -10575,7 +10765,7 @@ async function undoDecide(fs, cwd, move, signal, policy) {
 * @returns 写盘结果
 */
 async function writeBack(fs, cwd, stored, target, signal, policy) {
-	if (target.flags.missing) return deleteTarget(fs, cwd, stored.entry.id, signal);
+	if (target.flags.missing) return deleteTarget(fs, cwd, stored.entry.id, stored.entry.newText, signal, policy);
 	return writerFor(fs, cwd, stored.entry.id, stored.entry.newText, signal, policy, true)(target.entry.newText);
 }
 /**
@@ -10594,65 +10784,93 @@ function parseSnapshot(text) {
 	}
 }
 /**
-* @author ddj 2026年10月29号
-* @description: Revert 的删除分支：FileSystem 抽象没有删除能力，只有确认仍在工作区内才用宿主 unlink。
-* @param fs 文件系统
-* @param cwd 工作区
-* @param identity 目标身份
+* @private
+* @author ddj 2026年11月04号
+* @description 版本—内容—版本读取，防止将新版本令牌与旧内容拼成写入依据。
+* @param fs 文件提供方
+* @param target 已解析目标
 * @param signal 取消信号
-* @returns 删除结果
+* @returns 稳定快照或拒绝原因
 */
-async function deleteTarget(fs, cwd, identity, signal) {
-	let target;
+async function stableRead(fs, target, signal) {
 	try {
-		target = await fs.resolve(identity, {
-			cwd,
-			signal
-		});
-	} catch {
+		const before = await fs.stat(target, signal);
+		if (!before) return {
+			ok: true,
+			content: null
+		};
+		if (before.type !== "file" || !before.version) return {
+			ok: false,
+			reason: "unguarded-file"
+		};
+		const content = await readText(fs, target, signal);
+		if (content === null) return {
+			ok: false,
+			reason: "revision-mismatch"
+		};
+		const after = await fs.stat(target, signal);
+		if (after?.type !== "file" || after.version !== before.version) return {
+			ok: false,
+			reason: "revision-mismatch"
+		};
+		return {
+			ok: true,
+			content,
+			version: before.version
+		};
+	} catch (error) {
 		return {
 			ok: false,
-			reason: "resolve-failed"
+			reason: reasonOf(error)
 		};
 	}
-	if (!await fs.stat(target, signal).catch(() => void 0)) return {
-		ok: true,
-		content: null
-	};
-	const absolute = String(fs.processPath(target));
-	if (!insideWorkspace(cwd, absolute)) return {
+}
+/**
+* @private
+* @author ddj 2026年11月04号
+* @description 通过 provider 受控删除，保留会话策略与原子版本校验；旧 Host 不回落直删。
+* @param fs 文件提供方
+* @param cwd 工作目录
+* @param identity 目标身份
+* @param expected 应有内容
+* @param signal 取消信号
+* @param policy 会话沙箱策略
+* @returns 删除结果；结果不明不提交决定
+*/
+async function deleteTarget(fs, cwd, identity, expected, signal, policy) {
+	if (typeof fs.deleteFile !== "function") return {
 		ok: false,
-		reason: "outside-workspace"
+		reason: "delete-unavailable"
 	};
 	try {
-		await unlink(absolute);
+		const target = await fs.resolve(identity, {
+			cwd,
+			signal
+		});
+		const snapshot = await stableRead(fs, target, signal);
+		if (!snapshot.ok) return snapshot;
+		if (snapshot.content === null) return {
+			ok: true,
+			content: null
+		};
+		if (snapshot.content !== expected) return {
+			ok: false,
+			reason: "diverged"
+		};
+		await fs.deleteFile(target, { version: snapshot.version }, signal, policy);
+		return await fs.stat(target, signal) ? {
+			ok: false,
+			reason: "delete-failed"
+		} : {
+			ok: true,
+			content: null
+		};
 	} catch (error) {
 		return {
 			ok: false,
 			reason: reasonOf(error)
 		};
 	}
-	return await fs.stat(target, signal).catch(() => void 0) ? {
-		ok: false,
-		reason: "delete-failed"
-	} : {
-		ok: true,
-		content: null
-	};
-}
-/**
-* @author ddj 2026年10月29号
-* @description: 判断宿主路径是否位于工作区内，Windows 下按大小写不敏感比较。
-* @param cwd 工作区
-* @param absolute 目标绝对路径
-* @returns 是否在工作区内
-*/
-function insideWorkspace(cwd, absolute) {
-	const root = resolve(cwd);
-	const candidate = resolve(absolute);
-	const normalize = (value) => process.platform === "win32" ? value.toLowerCase() : value;
-	const rootKey = normalize(root).endsWith(sep) ? normalize(root) : normalize(root) + sep;
-	return normalize(candidate).startsWith(rootKey);
 }
 /**
 * @author ddj 2026年10月29号
@@ -16574,7 +16792,7 @@ function reviewHandlers(ctx, registry) {
 	*/
 	function pendingPageOf(cwd, sessionId) {
 		try {
-			const page = loadPage(cwd, sessionId, addedFiles(cwd, sessionId));
+			const page = loadPage(cwd, sessionId);
 			return page.items.some((item) => item.settled === true) ? {
 				...page,
 				items: page.items.filter((item) => item.settled !== true)
@@ -16714,8 +16932,7 @@ function reviewHandlers(ctx, registry) {
 			const scope = await scopeOf(args.sessionId);
 			const cwd = scope.cwd;
 			if (args.id.startsWith("pending:")) {
-				const entryId = args.id.slice(8);
-				const detail = loadDetail(cwd, entryId, addedFiles(cwd, args.sessionId).has(entryId));
+				const detail = loadDetail(cwd, args.id.slice(8));
 				if (!detail) return {
 					ok: false,
 					error: "待审条目不存在"
@@ -16763,7 +16980,7 @@ function reviewHandlers(ctx, registry) {
 						decision: args.decision,
 						scope: args.scope === "hunk" ? "block" : "file",
 						...args.blockId === void 0 ? {} : { blockId: args.blockId }
-					});
+					}, void 0, policyOf(ctx, sessionOf(ctx, args.sessionId)));
 					if (!result.ok) return {
 						ok: false,
 						error: result.reason
@@ -16901,7 +17118,7 @@ function readHandlers(kit) {
 	return {
 		"edrv.pending.list": async (args) => {
 			const cwd = await kit.read(args.sessionId);
-			const page = loadPage(cwd, args.sessionId, addedFiles(cwd, args.sessionId));
+			const page = loadPage(cwd, args.sessionId);
 			setPendingCovers(cwd, args.sessionId, page.items.map((item) => item.path));
 			return {
 				ok: true,
@@ -16909,9 +17126,7 @@ function readHandlers(kit) {
 			};
 		},
 		"edrv.pending.detail": async (args) => {
-			const cwd = await kit.read(args.sessionId);
-			const rawId = pendingRawId(args.id);
-			const detail = loadDetail(cwd, rawId, addedFiles(cwd, args.sessionId).has(rawId));
+			const detail = loadDetail(await kit.read(args.sessionId), pendingRawId(args.id));
 			return detail ? {
 				ok: true,
 				detail