dsh-vscode-mode 0.1.17 → 0.1.19

package/lib/index.js

@@ -1243,15 +1243,18 @@ async function appendArchiveEntries(ctx, cwd, entries, session) {
 		console.error("edrv appendArchiveEntries failed", error);
 	}
 }
-/** 归档记录：标记 archived、按批次写入归档、落盘工作区桶。 */
-async function archiveRecords(ctx, session, cwd, bucket, recs, reason) {
+/**
+* 归档记录：标记 archived、按批次写入归档、落盘工作区桶。
+* @param opts.deferSave 为 true 时只写归档、不落盘桶（由批量调用方统一 saveBucket 一次）
+*/
+async function archiveRecords(ctx, session, cwd, bucket, recs, reason, opts) {
 	if (!recs.length) return;
 	const fresh = recs.filter((r) => !r.archived);
 	for (const r of recs) r.archived = true;
 	const entries = [];
 	for (const list of groupByBatch(recs).values()) entries.push(archiveEntryFor(list, cwd, reason));
 	await appendArchiveEntries(ctx, cwd, entries, session);
-	if (fresh.length) await saveBucket(ctx, cwd, bucket, session);
+	if (fresh.length && !opts?.deferSave) await saveBucket(ctx, cwd, bucket, session);
 }
 //#endregion
 //#region src/registry.ts
@@ -2437,6 +2440,53 @@ async function requireSession(ctx, sessionId) {
 		cwd
 	};
 }
+/**
+* 批量决策核心：一次会话/桶解析 + 逐项处理 + 统一落盘（accept/reject 单条与 decideBatch 共用）。
+* rejected 项先做回滚，失败记入该项 error 且不改决策；本批次新增"已解决"记录一次性归档，
+* 有任何成功项则整桶只写盘一次，避免逐条读写整个 sidecar。
+* @author ddj 2026年08月25号
+* @param items 决策项（按数组顺序处理，rejected 的先后即回滚顺序）
+* @returns 逐项结果（ok 项含更新后的记录视图）
+*/
+async function applyDecisions(ctx, session, cwd, bucket, items) {
+	const results = [];
+	const resolved = [];
+	let changed = false;
+	for (const item of items) {
+		const record = bucket.get(item.callId);
+		if (!record) {
+			results.push({
+				callId: item.callId,
+				ok: false,
+				error: "记录不存在"
+			});
+			continue;
+		}
+		if (item.decision === "rejected") {
+			const outcome = (item.scope ?? "call") === "hunk" ? await revertHunk(ctx, session, record, item.hunkIndex ?? -1) : await revertCall(ctx, session, record);
+			if (!outcome.ok) {
+				results.push({
+					callId: item.callId,
+					ok: false,
+					error: outcome.error
+				});
+				continue;
+			}
+		}
+		const wasResolved = recordResolved(record);
+		markDecision(record, item.scope ?? "call", item.hunkIndex, item.decision);
+		changed = true;
+		if (!wasResolved && recordResolved(record)) resolved.push(record);
+		results.push({
+			callId: item.callId,
+			ok: true,
+			record: recView(record)
+		});
+	}
+	if (resolved.length) await archiveRecords(ctx, session, cwd, bucket, resolved, items.some((item) => item.decision === "rejected") ? "已处理（回滚）" : "已处理", { deferSave: true });
+	if (changed) await saveBucket(ctx, cwd, bucket, session);
+	return results;
+}
 /** 各方法 handler 表（类型由 shared/rpc 的 RpcHandlerMap 约束）。 */
 function buildHandlers(ctx, registry, searcher = newSearcher(ctx)) {
 	return {
@@ -2448,7 +2498,7 @@ function buildHandlers(ctx, registry, searcher = newSearcher(ctx)) {
 			};
 			const bucket = await bucketOf(registry, ctx, sc.cwd);
 			const want = Array.isArray(args.callIds) ? new Set(args.callIds) : null;
-			if (!want) await autoArchiveStale(ctx, sc.session, sc.cwd, bucket);
+			if (!want && args.skipStale !== true) await autoArchiveStale(ctx, sc.session, sc.cwd, bucket);
 			const out = [];
 			for (const rec of bucket.values()) {
 				if (!want && rec.archived) continue;
@@ -2468,17 +2518,19 @@ function buildHandlers(ctx, registry, searcher = newSearcher(ctx)) {
 				error: sc.err
 			};
 			const bucket = await bucketOf(registry, ctx, sc.cwd);
-			const record = bucket.get(args.callId);
-			if (!record) return {
+			const item = (await applyDecisions(ctx, sc.session, sc.cwd, bucket, [{
+				callId: args.callId,
+				scope: args.scope,
+				hunkIndex: args.hunkIndex,
+				decision: "accepted"
+			}]))[0];
+			if (!item?.ok) return {
 				ok: false,
-				error: "记录不存在"
+				error: item?.error ?? "操作失败"
 			};
-			markDecision(record, args.scope ?? "call", args.hunkIndex, "accepted");
-			if (recordResolved(record)) await archiveRecords(ctx, sc.session, sc.cwd, bucket, [record], "已处理");
-			else await saveBucket(ctx, sc.cwd, bucket, sc.session);
 			return {
 				ok: true,
-				record: recView(record)
+				record: item.record
 			};
 		},
 		"edrv.reject": async (args) => {
@@ -2488,24 +2540,31 @@ function buildHandlers(ctx, registry, searcher = newSearcher(ctx)) {
 				error: sc.err
 			};
 			const bucket = await bucketOf(registry, ctx, sc.cwd);
-			const record = bucket.get(args.callId);
-			if (!record) return {
+			const item = (await applyDecisions(ctx, sc.session, sc.cwd, bucket, [{
+				callId: args.callId,
+				scope: args.scope,
+				hunkIndex: args.hunkIndex,
+				decision: "rejected"
+			}]))[0];
+			if (!item?.ok) return {
 				ok: false,
-				error: "记录不存在"
+				error: item?.error ?? "操作失败"
+			};
+			return {
+				ok: true,
+				record: item.record
 			};
-			const scope = args.scope ?? "call";
-			const outcome = scope === "hunk" ? await revertHunk(ctx, sc.session, record, args.hunkIndex ?? -1) : await revertCall(ctx, sc.session, record);
-			if (!outcome.ok) return {
+		},
+		"edrv.decideBatch": async (args) => {
+			const sc = await requireSession(ctx, args.sessionId);
+			if ("err" in sc) return {
 				ok: false,
-				error: outcome.error
+				error: sc.err
 			};
-			markDecision(record, scope, args.hunkIndex, "rejected");
-			record.at = (/* @__PURE__ */ new Date()).toISOString();
-			if (recordResolved(record)) await archiveRecords(ctx, sc.session, sc.cwd, bucket, [record], "已处理（回滚）");
-			else await saveBucket(ctx, sc.cwd, bucket, sc.session);
+			const bucket = await bucketOf(registry, ctx, sc.cwd);
 			return {
 				ok: true,
-				record: recView(record)
+				results: await applyDecisions(ctx, sc.session, sc.cwd, bucket, Array.isArray(args.items) ? args.items : [])
 			};
 		},
 		"edrv.read": async (args) => {