@lmzhen/dsh-evolution-merge 0.32.6 → 0.34.0

package/lib/index.js

@@ -3700,6 +3700,12 @@ function runView(run, readAt, includeResultRef = false) {
 	const record = run.record;
 	const state = run.meta?.phase === "undone" ? "undone" : run.meta?.stopReason === "interrupted" ? "interrupted" : run.meta?.approval === "pending" ? "awaiting-approval" : record.state;
 	const stopReason = run.meta?.stopReason ?? (record.state === "cancelled" ? "cancelled" : record.state === "failed" ? "failed" : record.state === "succeeded" ? "completed" : void 0);
+	const reportPairs = run.report?.processedPairs?.length ?? run.report?.pairs.length;
+	const terminal = state === "succeeded" || state === "undone";
+	const progress = record.progress === void 0 && reportPairs === void 0 ? null : {
+		done: terminal ? Math.max(record.progress?.done ?? 0, reportPairs ?? 0, run.pairs.length) : record.progress?.done ?? reportPairs ?? 0,
+		total: record.progress?.total ?? reportPairs ?? 0
+	};
 	return {
 		wireVersion: 1,
 		readAt,
@@ -3707,10 +3713,7 @@ function runView(run, readAt, includeResultRef = false) {
 		state,
 		command: record.command ?? "scan",
 		...record.stage === void 0 ? {} : { stage: record.stage },
-		progress: record.progress === void 0 ? null : {
-			done: record.progress.done,
-			total: record.progress.total
-		},
+		progress,
 		startedAt: record.startedAt,
 		...record.endedAt === void 0 ? {} : { endedAt: record.endedAt },
 		...stopReason === void 0 ? {} : { stopReason },
@@ -5056,7 +5059,8 @@ const MERGE_ROUTES = {
 	view: MERGE_PATHS.view,
 	rows: MERGE_PATHS.rows,
 	body: MERGE_PATHS.body ?? MERGE_BASE + "body",
-	history: MERGE_PATHS.history ?? MERGE_BASE + "history"
+	history: MERGE_PATHS.history ?? MERGE_BASE + "history",
+	decision: MERGE_BASE + "decision"
 };
 function makeMergeRoutes(deps, _audit) {
 	const absent = () => json(404, {
@@ -5171,7 +5175,6 @@ function makeMergeRoutes(deps, _audit) {
 				const id = query.get("id");
 				const name = query.get("name");
 				const side = query.get("side");
-				if (id !== null && name !== null) return bad("id and name are mutually exclusive");
 				if ((id === null || id === "") && (name === null || name === "")) return json(404, {
 					wireVersion: 1,
 					code: "merge-body-not-found",
@@ -5184,21 +5187,21 @@ function makeMergeRoutes(deps, _audit) {
 						code: "merge-state-blocked",
 						readiness: snapshot.blocked.readiness
 					});
-					const refs = id !== null && id !== "" ? snapshot.bodyRefs.filter((ref) => ref.rowId === id) : snapshot.bodyRefs.filter((ref) => ref.name === name);
+					const sideFilter = side === "a" ? "live" : side === "b" ? "archive" : side === "live" || side === "archive" ? side : void 0;
+					const refs = snapshot.bodyRefs.filter((ref) => (id === null || id === "" || ref.rowId === id) && (name === null || name === "" || ref.name === name) && (sideFilter === void 0 || ref.side === sideFilter));
 					if (refs.length === 0) return json(404, {
 						wireVersion: 1,
 						code: "merge-body-not-found",
 						message: "merge body not found"
 					});
-					if (name !== null && refs.length > 1) return bad("name matches multiple merge rows");
+					if (refs.length > 1) return bad("merge body is ambiguous; pass id, name and side");
 					const row = snapshot.rows.find((item) => item.row.id === refs[0].rowId);
 					if (row?.stage?.state === "lost" || row?.stage?.state === "expired") return json(404, {
 						wireVersion: 1,
 						code: "merge-body-not-found",
 						message: "merge stage is lost"
 					});
-					const sideFilter = side === "a" ? "live" : side === "b" ? "archive" : side === "live" || side === "archive" ? side : void 0;
-					const ref = (sideFilter === void 0 ? refs[0] : refs.find((item) => item.side === sideFilter)) ?? refs[0];
+					const ref = refs[0];
 					return json(200, buildBodyView(snapshot, ref, (source.bodyRef === void 0 ? null : await source.bodyRef(ref)) ?? ""));
 				}
 				const readiness = await notReady(source);
@@ -5234,6 +5237,35 @@ function makeMergeRoutes(deps, _audit) {
 				if (readiness !== null) return readiness;
 				return json(200, toHistoryView(await source.history?.() ?? [], Date.now()));
 			}
+		},
+		{
+			path: MERGE_ROUTES.decision,
+			methods: ["POST"],
+			requestBody: "buffered",
+			fetch: async (request) => {
+				if (request.method !== "POST") return methodNotAllowed(["POST"]);
+				if (deps.decide === void 0) return absent();
+				let body;
+				try {
+					body = await request.json();
+				} catch {
+					return bad("decision body must be JSON");
+				}
+				if (typeof body !== "object" || body === null) return bad("decision body must be an object");
+				const input = body;
+				if (typeof input.rowId !== "string" || input.rowId === "") return bad("rowId is required");
+				if (input.verb !== "approve" && input.verb !== "reject") return bad("verb must be approve or reject");
+				if (typeof input.sessionId !== "string" || input.sessionId === "") return bad("sessionId is required");
+				const result = await deps.decide({
+					rowId: input.rowId,
+					verb: input.verb,
+					sessionId: input.sessionId
+				}, _audit);
+				return json(result.ok ? 200 : result.code === "E-305" ? 409 : 400, {
+					wireVersion: 1,
+					...result
+				});
+			}
 		}
 	];
 }
@@ -9261,16 +9293,22 @@ function unitFor(deps) {
 function createMergeRuntime(deps) {
 	const readOnly = createReadOnlyMergeService(deps.io, deps.home);
 	const timeout = deps.timeoutMinutes > 0 ? deps.timeoutMinutes : void 0;
-	const common = {
+	const paramsOf = () => {
+		if (deps.getParams !== void 0) return deps.getParams();
+		if (deps.params !== void 0) return deps.params;
+		throw new Error("merge runtime requires getParams or params");
+	};
+	const platformWriteOf = () => deps.getPlatformWrite?.() ?? deps.platformWrite ?? false;
+	const common = () => ({
 		io: deps.io,
 		home: deps.home,
 		registry: deps.registry,
-		platformWrite: deps.platformWrite,
+		platformWrite: platformWriteOf(),
 		now: deps.now,
 		...deps.model === void 0 ? {} : { model: deps.model },
 		...deps.isOwnerActive === void 0 ? {} : { isOwnerActive: deps.isOwnerActive },
 		...timeout === void 0 ? {} : { timeoutMinutes: timeout }
-	};
+	});
 	const stage = deps.stage;
 	const stageHooks = stage === void 0 ? {} : {
 		onChild: (context) => {
@@ -9284,6 +9322,7 @@ function createMergeRuntime(deps) {
 		const parent = context?.parent ?? deps.parent;
 		const agentless = context?.agentless === true;
 		const detached = deps.detached !== false;
+		const params = paramsOf();
 		if (command.verb === "pair") {
 			const signal = new AbortController().signal;
 			if (command.a === command.b) return fail("pair", "pair-same-source", "merge pair 需要两个不同技能源：" + command.a, "重新指定两个不同的 family-managed 技能");
@@ -9323,9 +9362,9 @@ function createMergeRuntime(deps) {
 			if (existing?.state === "pending") return fail("pair", "pair-pending", "该 pair 已在待批准队列：" + existing.id, "先运行 /evolution merge approve/reject/discard " + existing.id, existing.runId);
 			if (!cleared && (existing?.state === "approved" || existing?.state === "fuse")) return fail("pair", "pair-fuse", "该 pair 已在待合并队列，可复用决策重跑", "运行 /evolution merge resume --retry " + (existing.runId ?? existing.id), existing.runId);
 			const forced = command.force === true ? forcedDecisionFor(command.a, command.b) : void 0;
-			const approval = deps.params.mergeApproval;
+			const approval = params.mergeApproval;
 			const result = await runScanCommand({
-				...common,
+				...common(),
 				approval,
 				cards,
 				...detached ? { detached: true } : {},
@@ -9340,12 +9379,12 @@ function createMergeRuntime(deps) {
 						parent,
 						allow: deps.allow,
 						...deps.cwd === void 0 ? {} : { cwd: deps.cwd },
-						timeoutMs: deps.params.mergePairTimeoutMinutes * 6e4,
+						timeoutMs: params.mergePairTimeoutMinutes * 6e4,
 						approval,
 						commitPort: skillLibraryPort(deps.skills),
 						now: deps.now,
 						...unitFor(deps) === void 0 ? {} : { unit: unitFor(deps) },
-						...deps.params.limitsSnapshot === void 0 ? {} : { limits: deps.params.limitsSnapshot.skillLimits },
+						...params.limitsSnapshot === void 0 ? {} : { limits: params.limitsSnapshot.skillLimits },
 						...deps.isBlocked === void 0 ? {} : { isBlocked: deps.isBlocked },
 						...stageHooks
 					});
@@ -9379,12 +9418,12 @@ function createMergeRuntime(deps) {
 			for (const card of cards) if (await deps.isBlocked?.(card.name) === true) blocked.add(card.name);
 			const managed = new Set(cards.filter((card) => card.managed === true && card.protectedBy == null && !blocked.has(card.name)).map((card) => card.name));
 			const loadedState = await loadMergeState(deps.io, deps.home);
-			const skipped = skippedPairKeys(loadedState.state.rows, deps.params.mergeSkippedTtlDays, deps.now());
+			const skipped = skippedPairKeys(loadedState.state.rows, params.mergeSkippedTtlDays, deps.now());
 			const held = new Set(loadedState.state.rows.filter((row) => row.queue === "pending" || row.queue === "fuse" || row.queue === "verify" && (row.runId !== void 0 && deps.now() - Date.parse(row.updatedAt) < 10 * 6e4 || !canRetry(row))).map((row) => row.pairKey));
 			const notes = loadedState.state.rows.filter((row) => row.state === "pending" || row.state === "approved" || row.state === "fuse" || row.state === "skipped").map((row) => "conflict:" + row.state + ":" + row.pairKey + ":" + row.id);
 			const result = await runScanCommand({
-				...common,
-				approval: deps.params.mergeApproval,
+				...common(),
+				approval: params.mergeApproval,
 				notes,
 				cards,
 				...detached ? { detached: true } : {},
@@ -9416,12 +9455,12 @@ function createMergeRuntime(deps) {
 					parent,
 					allow: deps.allow,
 					...deps.cwd === void 0 ? {} : { cwd: deps.cwd },
-					timeoutMs: deps.params.mergePairTimeoutMinutes * 6e4,
-					approval: deps.params.mergeApproval,
+					timeoutMs: params.mergePairTimeoutMinutes * 6e4,
+					approval: params.mergeApproval,
 					commitPort: skillLibraryPort(deps.skills),
 					now: deps.now,
 					...unitFor(deps) === void 0 ? {} : { unit: unitFor(deps) },
-					...deps.params.limitsSnapshot === void 0 ? {} : { limits: deps.params.limitsSnapshot.skillLimits },
+					...params.limitsSnapshot === void 0 ? {} : { limits: params.limitsSnapshot.skillLimits },
 					...deps.isBlocked === void 0 ? {} : { isBlocked: deps.isBlocked },
 					...stageHooks
 				})
@@ -9449,8 +9488,8 @@ function createMergeRuntime(deps) {
 				b: row.b
 			};
 			const result = await runScanCommand({
-				...common,
-				approval: deps.params.mergeApproval,
+				...common(),
+				approval: params.mergeApproval,
 				notes: ["candidates --retry " + row.id],
 				cards,
 				makePorts: (runId) => createChannelScanPorts({
@@ -9467,12 +9506,12 @@ function createMergeRuntime(deps) {
 					parent,
 					allow: deps.allow,
 					...deps.cwd === void 0 ? {} : { cwd: deps.cwd },
-					timeoutMs: deps.params.mergePairTimeoutMinutes * 6e4,
-					approval: deps.params.mergeApproval,
+					timeoutMs: params.mergePairTimeoutMinutes * 6e4,
+					approval: params.mergeApproval,
 					commitPort: skillLibraryPort(deps.skills),
 					now: deps.now,
 					...unitFor(deps) === void 0 ? {} : { unit: unitFor(deps) },
-					...deps.params.limitsSnapshot === void 0 ? {} : { limits: deps.params.limitsSnapshot.skillLimits },
+					...params.limitsSnapshot === void 0 ? {} : { limits: params.limitsSnapshot.skillLimits },
 					...deps.isBlocked === void 0 ? {} : { isBlocked: deps.isBlocked },
 					...stageHooks
 				})
@@ -9514,7 +9553,7 @@ function createMergeRuntime(deps) {
 					io: deps.io,
 					home: deps.home,
 					now: deps.now,
-					ttlDays: deps.params.mergeSkippedTtlDays,
+					ttlDays: params.mergeSkippedTtlDays,
 					...managed === void 0 ? {} : { managed },
 					...live === void 0 ? {} : { live }
 				});
@@ -9529,7 +9568,7 @@ function createMergeRuntime(deps) {
 		}
 		if (command.verb === "doctor") return {
 			ok: true,
-			text: (await mergeDoctor(deps.io, deps.home, deps.params.mergeModelsRoot)).map((row) => row.key + " [" + row.status + "] " + row.label + "：" + row.detail).join("\n")
+			text: (await mergeDoctor(deps.io, deps.home, params.mergeModelsRoot)).map((row) => row.key + " [" + row.status + "] " + row.label + "：" + row.detail).join("\n")
 		};
 		if (command.verb === "report" || command.verb === "runs" || command.verb === "cancel") {
 			const registry = deps.registry;
@@ -9541,7 +9580,7 @@ function createMergeRuntime(deps) {
 						io: deps.io,
 						home: deps.home,
 						runs: mergeRuns,
-						approval: deps.params.mergeApproval,
+						approval: params.mergeApproval,
 						now: deps.now
 					})))
 				};
@@ -9657,13 +9696,13 @@ function createMergeRuntime(deps) {
 				round2: () => failed("author", "resume-needs-child", "fuse resume needs a new child")
 			};
 			const result = await runResumeCommand({
-				...common,
+				...common(),
 				rowId: row.id,
 				ports: basePorts,
-				approval: deps.params.mergeApproval,
+				approval: params.mergeApproval,
 				...agentless ? { agentless: true } : {},
 				...detached ? { detached: true } : {},
-				pairTimeoutMinutes: deps.params.mergePairTimeoutMinutes,
+				pairTimeoutMinutes: params.mergePairTimeoutMinutes,
 				...deps.isOwnerActive === void 0 ? {} : { isOwnerActive: deps.isOwnerActive },
 				makePorts: (runId) => createChannelScanPorts({
 					io: deps.io,
@@ -9675,12 +9714,12 @@ function createMergeRuntime(deps) {
 					parent,
 					allow: deps.allow,
 					...deps.cwd === void 0 ? {} : { cwd: deps.cwd },
-					timeoutMs: deps.params.mergePairTimeoutMinutes * 6e4,
-					approval: deps.params.mergeApproval,
+					timeoutMs: params.mergePairTimeoutMinutes * 6e4,
+					approval: params.mergeApproval,
 					commitPort: skillLibraryPort(deps.skills),
 					now: deps.now,
 					...unitFor(deps) === void 0 ? {} : { unit: unitFor(deps) },
-					...deps.params.limitsSnapshot === void 0 ? {} : { limits: deps.params.limitsSnapshot.skillLimits },
+					...params.limitsSnapshot === void 0 ? {} : { limits: params.limitsSnapshot.skillLimits },
 					...deps.isBlocked === void 0 ? {} : { isBlocked: deps.isBlocked }
 				}),
 				round2WithRun: createNewChildRound2({
@@ -9692,11 +9731,11 @@ function createMergeRuntime(deps) {
 					parentRunId: (runId) => runId,
 					allow: deps.allow,
 					...deps.cwd === void 0 ? {} : { cwd: deps.cwd },
-					timeoutMs: deps.params.mergePairTimeoutMinutes * 6e4,
+					timeoutMs: params.mergePairTimeoutMinutes * 6e4,
 					commitPort: skillLibraryPort(deps.skills),
 					now: deps.now,
 					...unitFor(deps) === void 0 ? {} : { unit: unitFor(deps) },
-					...deps.params.limitsSnapshot === void 0 ? {} : { limits: deps.params.limitsSnapshot.skillLimits },
+					...params.limitsSnapshot === void 0 ? {} : { limits: params.limitsSnapshot.skillLimits },
 					...deps.isBlocked === void 0 ? {} : { isBlocked: deps.isBlocked },
 					...stageHooks
 				})
@@ -9811,11 +9850,11 @@ function createMergeRuntime(deps) {
 				}
 			}
 			const result = await runApproveCommand({
-				...common,
+				...common(),
 				rowId: command.id,
 				...agentless ? { agentless: true } : {},
 				...detached ? { detached: true } : {},
-				pairTimeoutMinutes: deps.params.mergePairTimeoutMinutes,
+				pairTimeoutMinutes: params.mergePairTimeoutMinutes,
 				ports: {
 					stage: createStageForCards({
 						io: deps.io,
@@ -9833,11 +9872,11 @@ function createMergeRuntime(deps) {
 						parentRunId: (runId) => runId,
 						allow: deps.allow,
 						...deps.cwd === void 0 ? {} : { cwd: deps.cwd },
-						timeoutMs: deps.params.mergePairTimeoutMinutes * 6e4,
+						timeoutMs: params.mergePairTimeoutMinutes * 6e4,
 						commitPort: skillLibraryPort(deps.skills),
 						now: deps.now,
 						...unitFor(deps) === void 0 ? {} : { unit: unitFor(deps) },
-						...deps.params.limitsSnapshot === void 0 ? {} : { limits: deps.params.limitsSnapshot.skillLimits },
+						...params.limitsSnapshot === void 0 ? {} : { limits: params.limitsSnapshot.skillLimits },
 						...deps.isBlocked === void 0 ? {} : { isBlocked: deps.isBlocked },
 						...stageHooks
 					})
@@ -9864,7 +9903,7 @@ function createMergeRuntime(deps) {
 					io: deps.io,
 					home: deps.home,
 					runs: runs !== void 0 && runs.some((item) => item.id === found.id) ? runs : [...runs ?? [], found],
-					approval: deps.params.mergeApproval,
+					approval: params.mergeApproval,
 					now: deps.now
 				});
 				if (snapshot.blocked !== void 0) return fail("status", snapshot.blocked.code, snapshot.blocked.message, "先修复合并状态（/evolution merge doctor），再查看运行");
@@ -9881,7 +9920,7 @@ function createMergeRuntime(deps) {
 			const list = cards ?? await deps.cards(new AbortController().signal).catch(() => []);
 			return list.length === 0 ? void 0 : liveRowFactsOf(list);
 		};
-		const text = await handleReadOnlyMergeCommand(command, deps.io, deps.home, cards, runs, deps.params.mergeApproval, liveForRead);
+		const text = await handleReadOnlyMergeCommand(command, deps.io, deps.home, cards, runs, params.mergeApproval, liveForRead);
 		if (text !== null) return {
 			ok: true,
 			text
@@ -10545,8 +10584,9 @@ const inject = [];
 function apply(ctx, rawConfig = {}) {
 	registerOwnerSettings(ctx, "evolution-merge", Config);
 	configureMergePresentation(ctx);
-	let params = resolveMergeParams(rawConfig);
+	const startupParams = resolveMergeParams(rawConfig);
 	let mergeRun;
+	let decide;
 	let source;
 	let doctorFact;
 	const mergeService = {
@@ -10568,7 +10608,17 @@ function apply(ctx, rawConfig = {}) {
 	};
 	const mergeContext = ctx;
 	if (typeof mergeContext.provide === "function") mergeContext.provide("evolutionMerge", mergeService);
-	registerHostRoutes(ctx, (audit) => makeMergeRoutes({ getSource: () => source }, audit));
+	registerHostRoutes(ctx, (audit) => makeMergeRoutes({
+		getSource: () => source,
+		decide: async (request, _audit) => {
+			if (decide === void 0) return {
+				ok: false,
+				code: "E-305",
+				message: "合并服务尚未完成挂载"
+			};
+			return await decide(request);
+		}
+	}, audit));
 	ctx.inject(["commands", "evolutionIo"], (scope) => {
 		const registry = scope.get("evolutionIo");
 		if (registry === void 0) return;
@@ -10619,13 +10669,15 @@ function apply(ctx, rawConfig = {}) {
 			});
 		}, "evolution-merge: restore supersede");
 		const limitsSnapshot = resolveLimitsSnapshot(ctx.get("evolutionPolicy")?.get?.());
-		const hostApproval = ctx.get("evolutionApproval");
-		const platformWrite = typeof hostApproval?.platformWrite === "boolean" ? hostApproval.platformWrite : params.platformWrite ?? false;
-		params = {
-			...params,
-			limitsSnapshot,
-			platformWrite
+		const getPlatformWrite = () => {
+			const hostApproval = ctx.get("evolutionApproval");
+			return typeof hostApproval?.platformWrite === "boolean" ? hostApproval.platformWrite : resolveMergeParams(rawConfig).platformWrite ?? false;
 		};
+		const getParams = () => ({
+			...resolveMergeParams(rawConfig),
+			limitsSnapshot,
+			platformWrite: getPlatformWrite()
+		});
 		const skills = newSkillLibrary({
 			io,
 			ctx,
@@ -10668,7 +10720,7 @@ function apply(ctx, rawConfig = {}) {
 						io,
 						home,
 						now: () => Date.now(),
-						ttlDays: params.mergeSkippedTtlDays,
+						ttlDays: getParams().mergeSkippedTtlDays,
 						...live === void 0 ? {} : { live }
 					});
 					if (reconciled.actions.length > 0) ctx.logger?.info?.("merge reconcile: " + String(reconciled.actions.length) + " action(s)");
@@ -10705,7 +10757,7 @@ function apply(ctx, rawConfig = {}) {
 			} : void 0;
 		});
 		const stage = new StageToolRegistry();
-		const engineInput = resolveEngineInput({ modelsRoot: params.mergeModelsRoot });
+		const engineInput = resolveEngineInput({ modelsRoot: startupParams.mergeModelsRoot });
 		const engineConfig = engineConfigFromRoot(engineInput.modelsRoot);
 		const llm = ctx.get("llm");
 		const defaultModel = ctx.get("agentDefaultModel");
@@ -10761,12 +10813,13 @@ function apply(ctx, rawConfig = {}) {
 		});
 		source = {
 			async snapshot() {
+				const current = getParams();
 				return await readMergeSnapshot({
 					io,
 					home,
 					runs: runs.runs("merge"),
-					approval: params.mergeApproval,
-					platformWrite,
+					approval: current.mergeApproval,
+					platformWrite: getPlatformWrite(),
 					hostOnly: hostCapabilities.hostOnly,
 					live: async () => liveRowFactsOf(await readSkillCards(skills)),
 					history: async () => {
@@ -10818,7 +10871,7 @@ function apply(ctx, rawConfig = {}) {
 				return await resolveBody(io, home, ref, async () => ref.side === "archive" ? await skills.readArchived(ref.name) : await skills.read(ref.name));
 			},
 			approval() {
-				return params.mergeApproval;
+				return getParams().mergeApproval;
 			},
 			readiness() {
 				return ready;
@@ -10854,13 +10907,13 @@ function apply(ctx, rawConfig = {}) {
 			registry: runs,
 			skills,
 			now: () => Date.now(),
-			params,
-			platformWrite,
+			getParams,
+			getPlatformWrite,
 			...defaultModel === void 0 ? {} : { model: defaultModel.currentSelection().model },
 			channel,
 			parent: void 0,
 			allow: ["merge_stage"],
-			timeoutMinutes: params.mergeRunTimeoutMinutes,
+			timeoutMinutes: startupParams.mergeRunTimeoutMinutes,
 			hostCapabilities,
 			isBlocked: async (name) => {
 				return await ctx.get("evolutionCurator")?.isBlocked?.(name) === true;
@@ -10892,6 +10945,20 @@ function apply(ctx, rawConfig = {}) {
 			};
 			return runMergeCommand(runtime, rawInput, invocation);
 		};
+		const agents = ctx.get("agents");
+		decide = async ({ rowId, verb, sessionId }) => {
+			const agent = agents?.get(sessionId);
+			if (agent === void 0 || agent === null) return {
+				ok: false,
+				code: "E-305",
+				message: "当前会话没有可用的 Agent；请在会话打开时操作，或复制命令到 CLI 执行"
+			};
+			const result = await mergeService.run("/evolution merge " + verb + " " + rowId, { agent });
+			return {
+				ok: result.ok,
+				message: result.text
+			};
+		};
 		const command = createMergeCommand(runtime);
 		if (command !== null) scope.effect(() => commands.register(command), "evolution-merge: command");
 		ctx.inject(["tools"], (toolScope) => {

package/lib/types/index.js

@@ -137,8 +137,9 @@ export const inject = [];
 export function apply(ctx, rawConfig = {}) {
     registerOwnerSettings(ctx, 'evolution-merge', Config);
     configureMergePresentation(ctx);
-    let params = resolveMergeParams(rawConfig);
+    const startupParams = resolveMergeParams(rawConfig);
     let mergeRun;
+    let decide;
     let source;
     let doctorFact;
     const mergeService = {
@@ -157,7 +158,14 @@ export function apply(ctx, rawConfig = {}) {
         ;
         mergeContext.provide('evolutionMerge', mergeService);
     }
-    registerHostRoutes(ctx, audit => makeMergeRoutes({ getSource: () => source }, audit));
+    registerHostRoutes(ctx, audit => makeMergeRoutes({
+        getSource: () => source,
+        decide: async (request, _audit) => {
+            if (decide === undefined)
+                return { ok: false, code: 'E-305', message: '合并服务尚未完成挂载' };
+            return await decide(request);
+        },
+    }, audit));
     ctx.inject(['commands', 'evolutionIo'], (scope) => {
         const registry = scope.get('evolutionIo');
         if (registry === undefined)
@@ -188,9 +196,11 @@ export function apply(ctx, rawConfig = {}) {
         }, 'evolution-merge: restore supersede');
         const policySnapshot = ctx.get('evolutionPolicy');
         const limitsSnapshot = resolveLimitsSnapshot(policySnapshot?.get?.());
-        const hostApproval = ctx.get('evolutionApproval');
-        const platformWrite = typeof hostApproval?.platformWrite === 'boolean' ? hostApproval.platformWrite : (params.platformWrite ?? false);
-        params = { ...params, limitsSnapshot, platformWrite };
+        const getPlatformWrite = () => {
+            const hostApproval = ctx.get('evolutionApproval');
+            return typeof hostApproval?.platformWrite === 'boolean' ? hostApproval.platformWrite : (resolveMergeParams(rawConfig).platformWrite ?? false);
+        };
+        const getParams = () => ({ ...resolveMergeParams(rawConfig), limitsSnapshot, platformWrite: getPlatformWrite() });
         const skills = newSkillLibrary({
             io, ctx, authority: authorityFrom({ origin: 'subagent' }),
             limits: limitsSnapshot.skillLimits,
@@ -225,7 +235,7 @@ export function apply(ctx, rawConfig = {}) {
                     const pending = v4.state.rows.some(row => row.state === 'pending');
                     const library = pending ? await cards().catch(() => []) : [];
                     const live = library.length === 0 ? undefined : liveRowFactsOf(library);
-                    const reconciled = await reconcileMergeState({ io, home, now: () => Date.now(), ttlDays: params.mergeSkippedTtlDays, ...(live === undefined ? {} : { live }) });
+                    const reconciled = await reconcileMergeState({ io, home, now: () => Date.now(), ttlDays: getParams().mergeSkippedTtlDays, ...(live === undefined ? {} : { live }) });
                     if (reconciled.actions.length > 0)
                         ctx.logger?.info?.('merge reconcile: ' + String(reconciled.actions.length) + ' action(s)');
                     await transactIo(io, reportsSweepLockTarget(), async () => {
@@ -242,7 +252,7 @@ export function apply(ctx, rawConfig = {}) {
             return state.kind === 'unavailable' ? { code: 'E-323', detail: state.reason } : undefined;
         });
         const stage = new StageToolRegistry();
-        const engineInput = resolveEngineInput({ modelsRoot: params.mergeModelsRoot });
+        const engineInput = resolveEngineInput({ modelsRoot: startupParams.mergeModelsRoot });
         const engineConfig = engineConfigFromRoot(engineInput.modelsRoot);
         const llm = ctx.get('llm');
         const defaultModel = ctx.get('agentDefaultModel');
@@ -283,7 +293,8 @@ export function apply(ctx, rawConfig = {}) {
         });
         source = {
             async snapshot() {
-                return await readMergeSnapshot({ io, home, runs: runs.runs('merge'), approval: params.mergeApproval, platformWrite, hostOnly: hostCapabilities.hostOnly, live: async () => liveRowFactsOf(await readSkillCards(skills)), history: async () => {
+                const current = getParams();
+                return await readMergeSnapshot({ io, home, runs: runs.runs('merge'), approval: current.mergeApproval, platformWrite: getPlatformWrite(), hostOnly: hostCapabilities.hostOnly, live: async () => liveRowFactsOf(await readSkillCards(skills)), history: async () => {
                         const items = new Map();
                         const receipts = [...await readCommitReceipts(io, home)].sort((a, b) => a.at - b.at);
                         const generationOf = new Map(receipts.map((receipt, index) => [receipt.runId, index + 1]));
@@ -310,7 +321,7 @@ export function apply(ctx, rawConfig = {}) {
                     } });
             },
             async bodyRef(ref) { return await resolveBody(io, home, ref, async () => ref.side === 'archive' ? await skills.readArchived(ref.name) : await skills.read(ref.name)); },
-            approval() { return params.mergeApproval; },
+            approval() { return getParams().mergeApproval; },
             readiness() { return ready; },
             commands() {
                 return ['merge scan', 'merge doctor', 'merge status', 'merge pending', 'merge skipped', 'merge report', 'merge runs', 'merge cancel', 'merge reconcile'];
@@ -327,9 +338,9 @@ export function apply(ctx, rawConfig = {}) {
         if (commands === undefined)
             return;
         const runtime = createMergeRuntime({
-            io, home, registry: runs, skills, now: () => Date.now(), params, platformWrite,
+            io, home, registry: runs, skills, now: () => Date.now(), getParams, getPlatformWrite,
             ...(defaultModel === undefined ? {} : { model: defaultModel.currentSelection().model }),
-            channel, parent: undefined, allow: ['merge_stage'], timeoutMinutes: params.mergeRunTimeoutMinutes,
+            channel, parent: undefined, allow: ['merge_stage'], timeoutMinutes: startupParams.mergeRunTimeoutMinutes,
             hostCapabilities,
             isBlocked: async (name) => {
                 const curator = ctx.get('evolutionCurator');
@@ -358,6 +369,15 @@ export function apply(ctx, rawConfig = {}) {
                 return { ok: false, text: formatMergeError(commandError('merge', state.code, state.message, '先修复合并状态（/evolution merge doctor），再重试')) };
             return runMergeCommand(runtime, rawInput, invocation);
         };
+        const agents = ctx.get('agents');
+        decide = async ({ rowId, verb, sessionId }) => {
+            const agent = agents?.get(sessionId);
+            if (agent === undefined || agent === null) {
+                return { ok: false, code: 'E-305', message: '当前会话没有可用的 Agent；请在会话打开时操作，或复制命令到 CLI 执行' };
+            }
+            const result = await mergeService.run('/evolution merge ' + verb + ' ' + rowId, { agent });
+            return { ok: result.ok, message: result.text };
+        };
         const command = createMergeCommand(runtime);
         if (command !== null)
             scope.effect(() => commands.register(command), 'evolution-merge: command');

package/lib/types/merge-routes.d.ts

@@ -12,7 +12,19 @@ export declare const MERGE_ROUTES: {
     rows: `/api/dsh-evolution/${string}`;
     body: `/api/dsh-evolution/${string}`;
     history: `/api/dsh-evolution/${string}`;
+    decision: `/api/dsh-evolution/${string}`;
 };
+export interface MergeDecisionRequest {
+    readonly rowId: string;
+    readonly verb: 'approve' | 'reject';
+    readonly sessionId: string;
+}
+export interface MergeDecisionResult {
+    readonly ok: boolean;
+    readonly message: string;
+    readonly code?: string;
+    readonly runId?: string;
+}
 export interface MergeHistoryItem {
     readonly name: string;
     readonly kind: 'merged' | 'deleted' | 'split' | 'other';
@@ -35,5 +47,6 @@ export interface MergeRouteSource {
 }
 export declare function makeMergeRoutes(deps: {
     getSource: () => MergeRouteSource | undefined;
+    decide?: (request: MergeDecisionRequest, audit: DecisionAudit) => Promise<MergeDecisionResult>;
 }, _audit: DecisionAudit): ConnectionFetchRouteLike[];
 //# sourceMappingURL=merge-routes.d.ts.map

package/lib/types/merge-routes.js

@@ -9,6 +9,7 @@ export const MERGE_ROUTES = {
     rows: MERGE_PATHS.rows,
     body: (MERGE_PATHS.body ?? MERGE_BASE + 'body'),
     history: (MERGE_PATHS.history ?? MERGE_BASE + 'history'),
+    decision: (MERGE_BASE + 'decision'),
 };
 export function makeMergeRoutes(deps, _audit) {
     const absent = () => json(404, { wireVersion: 1, code: 'E-325', message: 'merge service is not mounted' });
@@ -110,8 +111,6 @@ export function makeMergeRoutes(deps, _audit) {
                 const id = query.get('id');
                 const name = query.get('name');
                 const side = query.get('side');
-                if (id !== null && name !== null)
-                    return bad('id and name are mutually exclusive');
                 if ((id === null || id === '') && (name === null || name === ''))
                     return json(404, { wireVersion: 1, code: 'merge-body-not-found', message: 'merge body requires id or name' });
                 if (source.snapshot !== undefined) {
@@ -120,16 +119,18 @@ export function makeMergeRoutes(deps, _audit) {
                         return json(503, { wireVersion: 1, code: 'merge-state-blocked', readiness: snapshot.blocked.readiness });
                     // Body/history are read-only projections of already-written files; a host without
                     // the live agent data plane can still read past reports and archived bodies.
-                    const refs = id !== null && id !== '' ? snapshot.bodyRefs.filter(ref => ref.rowId === id) : snapshot.bodyRefs.filter(ref => ref.name === name);
+                    const sideFilter = side === 'a' ? 'live' : side === 'b' ? 'archive' : side === 'live' || side === 'archive' ? side : undefined;
+                    const refs = snapshot.bodyRefs.filter(ref => (id === null || id === '' || ref.rowId === id)
+                        && (name === null || name === '' || ref.name === name)
+                        && (sideFilter === undefined || ref.side === sideFilter));
                     if (refs.length === 0)
                         return json(404, { wireVersion: 1, code: 'merge-body-not-found', message: 'merge body not found' });
-                    if (name !== null && refs.length > 1)
-                        return bad('name matches multiple merge rows');
+                    if (refs.length > 1)
+                        return bad('merge body is ambiguous; pass id, name and side');
                     const row = snapshot.rows.find(item => item.row.id === refs[0].rowId);
                     if (row?.stage?.state === 'lost' || row?.stage?.state === 'expired')
                         return json(404, { wireVersion: 1, code: 'merge-body-not-found', message: 'merge stage is lost' });
-                    const sideFilter = side === 'a' ? 'live' : side === 'b' ? 'archive' : side === 'live' || side === 'archive' ? side : undefined;
-                    const ref = (sideFilter === undefined ? refs[0] : refs.find(item => item.side === sideFilter)) ?? refs[0];
+                    const ref = refs[0];
                     const content = source.bodyRef === undefined ? null : await source.bodyRef(ref);
                     return json(200, buildBodyView(snapshot, ref, content ?? ''));
                 }
@@ -167,6 +168,35 @@ export function makeMergeRoutes(deps, _audit) {
                 return json(200, toHistoryView(await source.history?.() ?? [], Date.now()));
             },
         },
+        {
+            path: MERGE_ROUTES.decision,
+            methods: ['POST'],
+            requestBody: 'buffered',
+            fetch: async (request) => {
+                if (request.method !== 'POST')
+                    return methodNotAllowed(['POST']);
+                if (deps.decide === undefined)
+                    return absent();
+                let body;
+                try {
+                    body = await request.json();
+                }
+                catch {
+                    return bad('decision body must be JSON');
+                }
+                if (typeof body !== 'object' || body === null)
+                    return bad('decision body must be an object');
+                const input = body;
+                if (typeof input.rowId !== 'string' || input.rowId === '')
+                    return bad('rowId is required');
+                if (input.verb !== 'approve' && input.verb !== 'reject')
+                    return bad('verb must be approve or reject');
+                if (typeof input.sessionId !== 'string' || input.sessionId === '')
+                    return bad('sessionId is required');
+                const result = await deps.decide({ rowId: input.rowId, verb: input.verb, sessionId: input.sessionId }, _audit);
+                return json(result.ok ? 200 : result.code === 'E-305' ? 409 : 400, { wireVersion: 1, ...result });
+            },
+        },
     ];
 }
 //# sourceMappingURL=merge-routes.js.map

package/lib/types/runtime.d.ts

@@ -18,8 +18,13 @@ export interface MergeRuntimeDeps {
     readonly registry: MergeRegistryPort;
     readonly skills: SkillLibrary;
     readonly now: () => number;
-    readonly params: MergeParams;
-    readonly platformWrite: boolean;
+    /** Live params: re-resolve at each operation, never cache an apply-time value. */
+    readonly getParams?: () => MergeParams;
+    /** Legacy fixture shape; used only when getParams is absent. */
+    readonly params?: MergeParams;
+    readonly getPlatformWrite?: () => boolean;
+    /** Legacy fixture shape; used only when getPlatformWrite is absent. */
+    readonly platformWrite?: boolean;
     readonly channel: ConversationChannelLike;
     readonly hostCapabilities?: HostCapabilities;
     readonly parent: unknown;

package/lib/types/runtime.js

@@ -78,13 +78,21 @@ export function unitFor(deps) {
 export function createMergeRuntime(deps) {
     const readOnly = createReadOnlyMergeService(deps.io, deps.home);
     const timeout = deps.timeoutMinutes > 0 ? deps.timeoutMinutes : undefined;
-    const common = {
+    const paramsOf = () => {
+        if (deps.getParams !== undefined)
+            return deps.getParams();
+        if (deps.params !== undefined)
+            return deps.params;
+        throw new Error('merge runtime requires getParams or params');
+    };
+    const platformWriteOf = () => deps.getPlatformWrite?.() ?? deps.platformWrite ?? false;
+    const common = () => ({
         io: deps.io, home: deps.home, registry: deps.registry,
-        platformWrite: deps.platformWrite, now: deps.now,
+        platformWrite: platformWriteOf(), now: deps.now,
         ...(deps.model === undefined ? {} : { model: deps.model }),
         ...(deps.isOwnerActive === undefined ? {} : { isOwnerActive: deps.isOwnerActive }),
         ...(timeout === undefined ? {} : { timeoutMinutes: timeout }),
-    };
+    });
     const stage = deps.stage;
     const stageHooks = stage === undefined ? {} : {
         onChild: (context) => { stage.bind(context); },
@@ -95,6 +103,7 @@ export function createMergeRuntime(deps) {
             const parent = context?.parent ?? deps.parent;
             const agentless = context?.agentless === true;
             const detached = deps.detached !== false;
+            const params = paramsOf();
             if (command.verb === 'pair') {
                 const signal = new AbortController().signal;
                 if (command.a === command.b)
@@ -155,9 +164,9 @@ export function createMergeRuntime(deps) {
                     return fail('pair', 'pair-fuse', '该 pair 已在待合并队列，可复用决策重跑', '运行 /evolution merge resume --retry ' + (existing.runId ?? existing.id), existing.runId);
                 }
                 const forced = command.force === true ? forcedDecisionFor(command.a, command.b) : undefined;
-                const approval = deps.params.mergeApproval;
+                const approval = params.mergeApproval;
                 const result = await runScanCommand({
-                    ...common,
+                    ...common(),
                     approval,
                     cards,
                     ...(detached ? { detached: true } : {}),
@@ -167,10 +176,10 @@ export function createMergeRuntime(deps) {
                             screening: () => Promise.resolve(pair),
                             channel: deps.channel, parent, allow: deps.allow,
                             ...(deps.cwd === undefined ? {} : { cwd: deps.cwd }),
-                            timeoutMs: deps.params.mergePairTimeoutMinutes * 60_000,
+                            timeoutMs: params.mergePairTimeoutMinutes * 60_000,
                             approval,
                             commitPort: skillLibraryPort(deps.skills), now: deps.now, ...(unitFor(deps) === undefined ? {} : { unit: unitFor(deps) }),
-                            ...(deps.params.limitsSnapshot === undefined ? {} : { limits: deps.params.limitsSnapshot.skillLimits }),
+                            ...(params.limitsSnapshot === undefined ? {} : { limits: params.limitsSnapshot.skillLimits }),
                             ...(deps.isBlocked === undefined ? {} : { isBlocked: deps.isBlocked }),
                             ...stageHooks,
                         });
@@ -201,7 +210,7 @@ export function createMergeRuntime(deps) {
                     .filter(card => card.managed === true && card.protectedBy == null && !blocked.has(card.name))
                     .map(card => card.name));
                 const loadedState = await loadMergeState(deps.io, deps.home);
-                const skipped = skippedPairKeys(loadedState.state.rows, deps.params.mergeSkippedTtlDays, deps.now());
+                const skipped = skippedPairKeys(loadedState.state.rows, params.mergeSkippedTtlDays, deps.now());
                 const held = new Set(loadedState.state.rows.filter(row => row.queue === 'pending' || row.queue === 'fuse'
                     || (row.queue === 'verify' && (row.runId !== undefined && deps.now() - Date.parse(row.updatedAt) < 10 * 60_000 || !canRetry(row))))
                     .map(row => row.pairKey));
@@ -209,8 +218,8 @@ export function createMergeRuntime(deps) {
                     .filter(row => row.state === 'pending' || row.state === 'approved' || row.state === 'fuse' || row.state === 'skipped')
                     .map(row => 'conflict:' + row.state + ':' + row.pairKey + ':' + row.id);
                 const result = await runScanCommand({
-                    ...common,
-                    approval: deps.params.mergeApproval,
+                    ...common(),
+                    approval: params.mergeApproval,
                     notes,
                     cards,
                     ...(detached ? { detached: true } : {}),
@@ -238,10 +247,10 @@ export function createMergeRuntime(deps) {
                         },
                         channel: deps.channel, parent, allow: deps.allow,
                         ...(deps.cwd === undefined ? {} : { cwd: deps.cwd }),
-                        timeoutMs: deps.params.mergePairTimeoutMinutes * 60_000,
-                        approval: deps.params.mergeApproval,
+                        timeoutMs: params.mergePairTimeoutMinutes * 60_000,
+                        approval: params.mergeApproval,
                         commitPort: skillLibraryPort(deps.skills), now: deps.now, ...(unitFor(deps) === undefined ? {} : { unit: unitFor(deps) }),
-                        ...(deps.params.limitsSnapshot === undefined ? {} : { limits: deps.params.limitsSnapshot.skillLimits }),
+                        ...(params.limitsSnapshot === undefined ? {} : { limits: params.limitsSnapshot.skillLimits }),
                         ...(deps.isBlocked === undefined ? {} : { isBlocked: deps.isBlocked }),
                         ...stageHooks,
                     }),
@@ -267,8 +276,8 @@ export function createMergeRuntime(deps) {
                 const cards = await deps.cards(signal);
                 const pairCandidate = { a: row.a, b: row.b };
                 const result = await runScanCommand({
-                    ...common,
-                    approval: deps.params.mergeApproval,
+                    ...common(),
+                    approval: params.mergeApproval,
                     notes: ['candidates --retry ' + row.id],
                     cards,
                     makePorts: runId => createChannelScanPorts({
@@ -280,10 +289,10 @@ export function createMergeRuntime(deps) {
                         },
                         channel: deps.channel, parent, allow: deps.allow,
                         ...(deps.cwd === undefined ? {} : { cwd: deps.cwd }),
-                        timeoutMs: deps.params.mergePairTimeoutMinutes * 60_000,
-                        approval: deps.params.mergeApproval,
+                        timeoutMs: params.mergePairTimeoutMinutes * 60_000,
+                        approval: params.mergeApproval,
                         commitPort: skillLibraryPort(deps.skills), now: deps.now, ...(unitFor(deps) === undefined ? {} : { unit: unitFor(deps) }),
-                        ...(deps.params.limitsSnapshot === undefined ? {} : { limits: deps.params.limitsSnapshot.skillLimits }),
+                        ...(params.limitsSnapshot === undefined ? {} : { limits: params.limitsSnapshot.skillLimits }),
                         ...(deps.isBlocked === undefined ? {} : { isBlocked: deps.isBlocked }),
                         ...stageHooks,
                     }),
@@ -318,7 +327,7 @@ export function createMergeRuntime(deps) {
                 const managed = cards === undefined || cards.length === 0 ? undefined : new Set(cards.map(card => card.name));
                 const live = cards === undefined || cards.length === 0 ? undefined : liveRowFactsOf(cards);
                 try {
-                    const report = await reconcileMergeState({ io: deps.io, home: deps.home, now: deps.now, ttlDays: deps.params.mergeSkippedTtlDays, ...(managed === undefined ? {} : { managed }), ...(live === undefined ? {} : { live }) });
+                    const report = await reconcileMergeState({ io: deps.io, home: deps.home, now: deps.now, ttlDays: params.mergeSkippedTtlDays, ...(managed === undefined ? {} : { managed }), ...(live === undefined ? {} : { live }) });
                     if (report.state === 'blocked')
                         return fail('reconcile', report.code ?? 'merge-state-blocked', report.message ?? '合并状态不可读', '先修复合并状态，再运行 /evolution merge doctor');
                     return { ok: true, text: formatReconcileReport(report) };
@@ -328,14 +337,14 @@ export function createMergeRuntime(deps) {
                 }
             }
             if (command.verb === 'doctor') {
-                const rows = await mergeDoctor(deps.io, deps.home, deps.params.mergeModelsRoot);
+                const rows = await mergeDoctor(deps.io, deps.home, params.mergeModelsRoot);
                 return { ok: true, text: rows.map(row => row.key + ' [' + row.status + '] ' + row.label + '：' + row.detail).join('\n') };
             }
             if (command.verb === 'report' || command.verb === 'runs' || command.verb === 'cancel') {
                 const registry = deps.registry;
                 if (command.verb === 'runs') {
                     const mergeRuns = registry.runs('merge');
-                    const snapshot = await readMergeSnapshot({ io: deps.io, home: deps.home, runs: mergeRuns, approval: deps.params.mergeApproval, now: deps.now });
+                    const snapshot = await readMergeSnapshot({ io: deps.io, home: deps.home, runs: mergeRuns, approval: params.mergeApproval, now: deps.now });
                     return { ok: true, text: formatRunsView(buildRunsView(snapshot)) };
                 }
                 if (command.verb === 'cancel') {
@@ -443,27 +452,27 @@ export function createMergeRuntime(deps) {
                     round2: () => failed('author', 'resume-needs-child', 'fuse resume needs a new child'),
                 };
                 const result = await runResumeCommand({
-                    ...common, rowId: row.id, ports: basePorts, approval: deps.params.mergeApproval,
+                    ...common(), rowId: row.id, ports: basePorts, approval: params.mergeApproval,
                     ...(agentless ? { agentless: true } : {}),
                     ...(detached ? { detached: true } : {}),
-                    pairTimeoutMinutes: deps.params.mergePairTimeoutMinutes,
+                    pairTimeoutMinutes: params.mergePairTimeoutMinutes,
                     ...(deps.isOwnerActive === undefined ? {} : { isOwnerActive: deps.isOwnerActive }),
                     makePorts: runId => createChannelScanPorts({
                         io: deps.io, home: deps.home, runId, cards, screening: pair,
                         channel: deps.channel, parent, allow: deps.allow,
                         ...(deps.cwd === undefined ? {} : { cwd: deps.cwd }),
-                        timeoutMs: deps.params.mergePairTimeoutMinutes * 60_000,
-                        approval: deps.params.mergeApproval, commitPort: skillLibraryPort(deps.skills), now: deps.now, ...(unitFor(deps) === undefined ? {} : { unit: unitFor(deps) }),
-                        ...(deps.params.limitsSnapshot === undefined ? {} : { limits: deps.params.limitsSnapshot.skillLimits }),
+                        timeoutMs: params.mergePairTimeoutMinutes * 60_000,
+                        approval: params.mergeApproval, commitPort: skillLibraryPort(deps.skills), now: deps.now, ...(unitFor(deps) === undefined ? {} : { unit: unitFor(deps) }),
+                        ...(params.limitsSnapshot === undefined ? {} : { limits: params.limitsSnapshot.skillLimits }),
                         ...(deps.isBlocked === undefined ? {} : { isBlocked: deps.isBlocked }),
                     }),
                     round2WithRun: createNewChildRound2({
                         io: deps.io, home: deps.home, cards, channel: deps.channel, parent,
                         parentRunId: (runId) => runId,
                         allow: deps.allow, ...(deps.cwd === undefined ? {} : { cwd: deps.cwd }),
-                        timeoutMs: deps.params.mergePairTimeoutMinutes * 60_000,
+                        timeoutMs: params.mergePairTimeoutMinutes * 60_000,
                         commitPort: skillLibraryPort(deps.skills), now: deps.now, ...(unitFor(deps) === undefined ? {} : { unit: unitFor(deps) }),
-                        ...(deps.params.limitsSnapshot === undefined ? {} : { limits: deps.params.limitsSnapshot.skillLimits }),
+                        ...(params.limitsSnapshot === undefined ? {} : { limits: params.limitsSnapshot.skillLimits }),
                         ...(deps.isBlocked === undefined ? {} : { isBlocked: deps.isBlocked }),
                         ...stageHooks,
                     }),
@@ -563,20 +572,20 @@ export function createMergeRuntime(deps) {
                     }
                 }
                 const result = await runApproveCommand({
-                    ...common,
+                    ...common(),
                     rowId: command.id,
                     ...(agentless ? { agentless: true } : {}),
                     ...(detached ? { detached: true } : {}),
-                    pairTimeoutMinutes: deps.params.mergePairTimeoutMinutes,
+                    pairTimeoutMinutes: params.mergePairTimeoutMinutes,
                     ports: {
                         stage: createStageForCards({ io: deps.io, home: deps.home, runId: command.id, cards, now: deps.now }),
                         round2: createNewChildRound2({
                             io: deps.io, home: deps.home, cards, channel: deps.channel, parent,
                             parentRunId: (runId) => runId,
                             allow: deps.allow, ...(deps.cwd === undefined ? {} : { cwd: deps.cwd }),
-                            timeoutMs: deps.params.mergePairTimeoutMinutes * 60_000,
+                            timeoutMs: params.mergePairTimeoutMinutes * 60_000,
                             commitPort: skillLibraryPort(deps.skills), now: deps.now, ...(unitFor(deps) === undefined ? {} : { unit: unitFor(deps) }),
-                            ...(deps.params.limitsSnapshot === undefined ? {} : { limits: deps.params.limitsSnapshot.skillLimits }),
+                            ...(params.limitsSnapshot === undefined ? {} : { limits: params.limitsSnapshot.skillLimits }),
                             ...(deps.isBlocked === undefined ? {} : { isBlocked: deps.isBlocked }),
                             ...stageHooks,
                         }),
@@ -597,7 +606,7 @@ export function createMergeRuntime(deps) {
                 const found = runs?.find(item => item.id === command.id) ?? registry.find(command.id);
                 if (found !== undefined && found.kind === 'merge') {
                     // CLI consumer of the RunDetail envelope: current pair, per-pair outcome, stop reason.
-                    const snapshot = await readMergeSnapshot({ io: deps.io, home: deps.home, runs: runs !== undefined && runs.some(item => item.id === found.id) ? runs : [...(runs ?? []), found], approval: deps.params.mergeApproval, now: deps.now });
+                    const snapshot = await readMergeSnapshot({ io: deps.io, home: deps.home, runs: runs !== undefined && runs.some(item => item.id === found.id) ? runs : [...(runs ?? []), found], approval: params.mergeApproval, now: deps.now });
                     if (snapshot.blocked !== undefined)
                         return fail('status', snapshot.blocked.code, snapshot.blocked.message, '先修复合并状态（/evolution merge doctor），再查看运行');
                     const detail = buildRunDetail(snapshot, found.id);
@@ -615,7 +624,7 @@ export function createMergeRuntime(deps) {
                 const list = cards ?? await deps.cards(new AbortController().signal).catch(() => []);
                 return list.length === 0 ? undefined : liveRowFactsOf(list);
             };
-            const text = await handleReadOnlyMergeCommand(command, deps.io, deps.home, cards, runs, deps.params.mergeApproval, liveForRead);
+            const text = await handleReadOnlyMergeCommand(command, deps.io, deps.home, cards, runs, params.mergeApproval, liveForRead);
             if (text !== null)
                 return { ok: true, text };
             return readOnly.execute(command);

package/lib/types/surface/merge-view.js

@@ -86,7 +86,15 @@ function runView(run, readAt, includeResultRef = false) {
             : run.meta?.approval === 'pending' ? 'awaiting-approval'
                 : record.state;
     const stopReason = run.meta?.stopReason ?? (record.state === 'cancelled' ? 'cancelled' : record.state === 'failed' ? 'failed' : record.state === 'succeeded' ? 'completed' : undefined);
-    return { wireVersion: 1, readAt, id: record.id, state, command: record.command ?? 'scan', ...(record.stage === undefined ? {} : { stage: record.stage }), progress: record.progress === undefined ? null : { done: record.progress.done, total: record.progress.total }, startedAt: record.startedAt, ...(record.endedAt === undefined ? {} : { endedAt: record.endedAt }), ...(stopReason === undefined ? {} : { stopReason }), ...(record.failure === undefined ? {} : { failure: { stage: 'settle', code: 'run-failed', retryable: false, retryFrom: 'none', detail: record.failure } }), ...(record.parentRunId === undefined ? {} : { parentRunId: record.parentRunId }), ...(run.pairs[0]?.pairKey === undefined ? {} : { currentPairKey: run.pairs[0].pairKey }), ...(record.resultRef === undefined ? {} : { resultRef: record.resultRef }), actions: [{ id: 'status', command: base + 'status ' + record.id, confirm: false, enabled: true }, { id: 'report', command: base + 'report ' + record.id, confirm: false, enabled: record.resultRef !== undefined }, { id: 'cancel', command: base + 'cancel ' + record.id, confirm: false, enabled: record.state === 'running' }] };
+    // The maker records progress while running; a terminal run that actually produced pairs
+    // must not keep the last in-flight 0/N. The UI shows what happened, not the last tick.
+    const reportPairs = run.report?.processedPairs?.length ?? run.report?.pairs.length;
+    const terminal = state === 'succeeded' || state === 'undone';
+    const progress = record.progress === undefined && reportPairs === undefined ? null : {
+        done: terminal ? Math.max(record.progress?.done ?? 0, reportPairs ?? 0, run.pairs.length) : record.progress?.done ?? reportPairs ?? 0,
+        total: record.progress?.total ?? reportPairs ?? 0,
+    };
+    return { wireVersion: 1, readAt, id: record.id, state, command: record.command ?? 'scan', ...(record.stage === undefined ? {} : { stage: record.stage }), progress, startedAt: record.startedAt, ...(record.endedAt === undefined ? {} : { endedAt: record.endedAt }), ...(stopReason === undefined ? {} : { stopReason }), ...(record.failure === undefined ? {} : { failure: { stage: 'settle', code: 'run-failed', retryable: false, retryFrom: 'none', detail: record.failure } }), ...(record.parentRunId === undefined ? {} : { parentRunId: record.parentRunId }), ...(run.pairs[0]?.pairKey === undefined ? {} : { currentPairKey: run.pairs[0].pairKey }), ...(record.resultRef === undefined ? {} : { resultRef: record.resultRef }), actions: [{ id: 'status', command: base + 'status ' + record.id, confirm: false, enabled: true }, { id: 'report', command: base + 'report ' + record.id, confirm: false, enabled: record.resultRef !== undefined }, { id: 'cancel', command: base + 'cancel ' + record.id, confirm: false, enabled: record.state === 'running' }] };
 }
 export function buildFacts(snapshot) {
     const ordered = [...snapshot.runs].sort((a, b) => b.record.startedAt - a.record.startedAt);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-merge",
   "description": "Skill auto-merge domain: screening, two-round authoring, queues and commit orchestration (community build)",
-  "version": "0.32.6",
+  "version": "0.34.0",
   "publishConfig": {
     "access": "public"
   },
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.32.6",
-    "@lmzhen/dsh-evolution-commands": "^0.32.6",
-    "@lmzhen/dsh-evolution-merge-engine": "0.32.6"
+    "@lmzhen/dsh-evolution-core": "^0.34.0",
+    "@lmzhen/dsh-evolution-commands": "^0.34.0",
+    "@lmzhen/dsh-evolution-merge-engine": "0.34.0"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"