@lmzhen/dsh-evolution-merge-ui 0.33.0 → 0.35.0

package/lib/client.js

@@ -163,34 +163,51 @@ window.__ModuleLoader__.load({
 				...EMPTY,
 				reason: "seat-missing"
 			};
+			let lastReady;
+			let generation = 0;
 			const listeners = /* @__PURE__ */ new Set();
-			let started = false;
-			let listening = false;
+			let remoteOff;
 			const notify = () => {
 				for (const listener of listeners) listener();
 			};
-			const refresh = async () => {
-				snapshot = await describe(namespace);
+			const absorb = (next) => {
+				if (next.status === "ready") {
+					lastReady = next;
+					snapshot = next;
+				} else if (lastReady !== void 0) snapshot = {
+					...lastReady,
+					stale: true,
+					reason: next.reason ?? "readback-failed"
+				};
+				else snapshot = next;
 				notify();
 			};
-			const start = () => {
-				if (started) return;
-				started = true;
-				if (!listening) {
-					listening = true;
-					(ctx.get?.("remote"))?.$on?.("settings/document-updated", (changed) => {
-						if (changed === namespace) refresh();
-					});
-				}
-				refresh();
+			const refresh = async () => {
+				const ticket = ++generation;
+				const next = await describe(namespace);
+				if (ticket !== generation) return;
+				absorb(next);
+			};
+			const remote = () => ctx.get?.("remote");
+			const stopRemote = () => {
+				remoteOff?.();
+				remoteOff = void 0;
+			};
+			const startRemote = () => {
+				if (remoteOff !== void 0) return;
+				remoteOff = remote()?.$on?.("settings/document-updated", (changed) => {
+					if (changed === namespace) refresh();
+				});
 			};
 			const form = {
 				getSnapshot: () => snapshot,
 				subscribe: (listener) => {
 					listeners.add(listener);
-					start();
+					startRemote();
+					refresh();
 					return () => {
 						listeners.delete(listener);
+						if (listeners.size === 0) stopRemote();
 					};
 				},
 				set: async (field, value) => await form.mutate([{
@@ -204,35 +221,39 @@ window.__ModuleLoader__.load({
 				}]),
 				mutate: async (ops, expectedRevision) => {
 					const outcome = await write(namespace, ops, expectedRevision ?? snapshot.revision);
-					if (outcome.snapshot !== void 0) {
-						snapshot = outcome.snapshot;
-						notify();
-					} else await refresh();
+					if (outcome.snapshot !== void 0) absorb(outcome.snapshot);
+					else await refresh();
 					return outcome.ok;
+				},
+				refresh,
+				dispose: () => {
+					stopRemote();
+					listeners.clear();
 				}
 			};
 			return form;
 		}
 		/**
-		* Build one cached form per family namespace over the family settings routes.
-		* @param ctx - the client plugin context (remote subscription is optional).
-		* @returns the seat; each namespace is served by /api/dsh-evolution/settings/*.
+		* Build one seat per client registration; every form's remote listener is released by
+		* the caller's effect. No module-level WeakMap: a replaced registration must not share
+		* a dead seat with the previous one.
 		*/
-		const seats = /* @__PURE__ */ new WeakMap();
 		function createSettingsSeat(ctx) {
-			const cached = seats.get(ctx);
-			if (cached !== void 0) return cached;
 			const forms = /* @__PURE__ */ new Map();
-			const seat = { get(namespace) {
-				let form = forms.get(namespace);
-				if (form === void 0) {
-					form = createForm(namespace, ctx);
-					forms.set(namespace, form);
+			return {
+				get(namespace) {
+					let form = forms.get(namespace);
+					if (form === void 0) {
+						form = createForm(namespace, ctx);
+						forms.set(namespace, form);
+					}
+					return form;
+				},
+				dispose: () => {
+					for (const form of forms.values()) form.dispose?.();
+					forms.clear();
 				}
-				return form;
-			} };
-			seats.set(ctx, seat);
-			return seat;
+			};
 		}
 		//#endregion
 		//#region ../evolution-client-kit/src/workspace.ts
@@ -251,6 +272,25 @@ window.__ModuleLoader__.load({
 			} catch {}
 		}
 		//#endregion
+		//#region ../evolution-client-kit/src/format.ts
+		/**
+		* Format an ISO string, epoch milliseconds, or null as local wall time.
+		* Invalid values return null; callers decide how to say "unknown".
+		* @param value - ISO string, epoch ms, or null.
+		* @param options - seconds on/off; defaults to on.
+		* @returns the formatted local time, or null when the value is absent/invalid.
+		*/
+		function formatLocalDateTime(value, options = {}) {
+			if (value === null || value === void 0) return null;
+			const ms = typeof value === "number" ? value : Date.parse(value);
+			if (!Number.isFinite(ms)) return null;
+			const date = new Date(ms);
+			if (Number.isNaN(date.getTime())) return null;
+			const pad = (part) => String(part).padStart(2, "0");
+			const head = String(date.getFullYear()) + "-" + pad(date.getMonth() + 1) + "-" + pad(date.getDate()) + " " + pad(date.getHours()) + ":" + pad(date.getMinutes());
+			return options.seconds === false ? head : head + ":" + pad(date.getSeconds());
+		}
+		//#endregion
 		//#region src/client/api.ts
 		/** Read-only merge wire client. Classifies every failure and never writes. */
 		const HOST_ROUTES = ROUTES.merge;
@@ -491,7 +531,8 @@ window.__ModuleLoader__.load({
 					startCommands: facts.startCommands,
 					notes: [...facts.notes],
 					degraded: facts.degraded,
-					...facts.active === null && facts.last === null ? {} : { latestRun: toRun(facts.active ?? facts.last) },
+					...facts.active === null ? {} : { activeRun: toRun(facts.active) },
+					...facts.last === null ? {} : { lastRun: toRun(facts.last) },
 					approval: {
 						mergeApproval: facts.approval.mergeApproval,
 						...platformWrite === void 0 ? {} : { platformWrite }
@@ -518,9 +559,14 @@ window.__ModuleLoader__.load({
 			};
 		}
 		async function body(name, side, rowId) {
-			const answer = await requestWire(HOST_ROUTES.body + (rowId === void 0 ? "?name=" + encodeURIComponent(name) : "?id=" + encodeURIComponent(rowId)) + "&side=" + side);
+			const query = new URLSearchParams({
+				name,
+				side
+			});
+			if (rowId !== void 0) query.set("id", rowId);
+			const answer = await requestWire(HOST_ROUTES.body + "?" + query.toString());
 			if (!answer.ok) {
-				if (answer.failure.kind === "problem" && answer.failure.code === "bad-query" && (answer.failure.message ?? "").includes("multiple merge rows")) return {
+				if (answer.failure.kind === "problem" && answer.failure.code === "bad-query" && (answer.failure.message ?? "").includes("ambiguous")) return {
 					ok: false,
 					failure: {
 						...answer.failure,
@@ -541,6 +587,56 @@ window.__ModuleLoader__.load({
 				}
 			};
 		}
+		async function decide(rowId, verb, sessionId) {
+			const path = HOST_ROUTES.body.replace(/body$/, "decision");
+			let response;
+			try {
+				response = await fetch(path, {
+					method: "POST",
+					headers: {
+						accept: "application/json",
+						"content-type": "application/json"
+					},
+					body: JSON.stringify({
+						rowId,
+						verb,
+						sessionId
+					})
+				});
+			} catch {
+				return {
+					ok: false,
+					failure: problem("server", 0)
+				};
+			}
+			let body;
+			try {
+				body = await response.json();
+			} catch {
+				return {
+					ok: false,
+					failure: problem("server", response.status)
+				};
+			}
+			if (typeof body !== "object" || body === null) return {
+				ok: false,
+				failure: problem("server", response.status)
+			};
+			const record = body;
+			if (record.wireVersion !== 1 || typeof record.ok !== "boolean" || typeof record.message !== "string") return {
+				ok: false,
+				failure: problem("wire-version", response.status)
+			};
+			return {
+				ok: true,
+				payload: {
+					ok: record.ok,
+					message: record.message,
+					...typeof record.code === "string" ? { code: record.code } : {},
+					...typeof record.runId === "string" ? { runId: record.runId } : {}
+				}
+			};
+		}
 		async function history() {
 			const answer = await requestWire(HOST_ROUTES.history);
 			return answer.ok ? {
@@ -551,7 +647,7 @@ window.__ModuleLoader__.load({
 					reason: item.reason,
 					...item.reasonCode === void 0 ? {} : { reasonCode: item.reasonCode },
 					lastVersion: item.lastVersion,
-					archivedAt: new Date(item.archivedAt).toISOString(),
+					archivedAt: item.archivedAt === null ? null : new Date(item.archivedAt).toISOString(),
 					...item.sourceRunId === void 0 ? {} : { sourceRunId: item.sourceRunId }
 				})) }
 			} : answer;
@@ -570,7 +666,9 @@ window.__ModuleLoader__.load({
 			"degraded": "读模型降级：",
 			"copied": "已复制：",
 			"copyFailed": "复制失败：浏览器没有接受剪贴板写入。",
+			"copyRetry": "重试复制",
 			"row.noSummary": "无摘要",
+			"row.summaryBoth": "双方摘要",
 			"overlay.body": "正文",
 			"hint": "手动触发；后台逐对判定。这里只读，不写技能。",
 			"history": "历史",
@@ -614,6 +712,7 @@ window.__ModuleLoader__.load({
 			"row.failure": "失败",
 			"row.noRetry": "不可重试",
 			"row.copy": "复制命令",
+			"row.more": "更多命令",
 			"tab.expired": "已过期",
 			"row.targetCreated": "新建",
 			"row.verify": "判定状态",
@@ -634,6 +733,8 @@ window.__ModuleLoader__.load({
 			"skipKind.forced": "强制",
 			"action.approve": "复制批准",
 			"action.reject": "复制拒绝",
+			"decision.approve": "批准",
+			"decision.reject": "拒绝",
 			"action.retry-candidates": "复制重试候选",
 			"action.retry-resume": "重试续跑",
 			"action.discard": "复制丢弃",
@@ -651,6 +752,7 @@ window.__ModuleLoader__.load({
 			"disabled.unavailable": "暂不可用",
 			"history.empty": "没有历史。",
 			"history.archivedAt": "归档于 {date}",
+			"history.archivedAtUnknown": "归档时间未知",
 			"failureServer": "读取失败",
 			"failureUnauthorized": "未登录",
 			"failureForbidden": "无权访问",
@@ -708,7 +810,6 @@ window.__ModuleLoader__.load({
 			"history.reason.archived": "已归档",
 			"history.reason.unknown": "原因未提供",
 			"history.lastVersion": "最后版本",
-			"history.archivedAt": "归档时间",
 			"body.truncated": "正文过长，已截断。",
 			"body.empty": "正文为空。",
 			"body.totalBytes": "总字节",
@@ -729,8 +830,10 @@ window.__ModuleLoader__.load({
 			"settings.capabilityMissing": "宿主未提供该能力",
 			"settings.capabilityDisabled": "当前部署不可用",
 			"settings.readonly": "只读显示；修改请到平台设置页。",
-			"settings.mergeApprovalPath": "设置 → 插件 → 自进化 → 技能自动合并",
 			"run.title": "运行",
+			"run.progressUnknown": "进度未知",
+			"run.current": "当前运行",
+			"run.last": "上次完成",
 			"run.id": "运行编号",
 			"run.state": "状态",
 			"run.stage": "阶段",
@@ -772,7 +875,9 @@ window.__ModuleLoader__.load({
 			"degraded": "Degraded read model:",
 			"copied": "Copied:",
 			"copyFailed": "Copy failed: the browser did not accept the clipboard write.",
+			"copyRetry": "Retry copy",
 			"row.noSummary": "No summary",
+			"row.summaryBoth": "Shared summary",
 			"overlay.body": "Body",
 			"hint": "Manual only; pairs are judged in the background. Read-only here.",
 			"history": "History",
@@ -816,6 +921,7 @@ window.__ModuleLoader__.load({
 			"row.failure": "Failure",
 			"row.noRetry": "not retryable",
 			"row.copy": "Copy command",
+			"row.more": "More commands",
 			"tab.expired": "Expired",
 			"row.targetCreated": "created",
 			"row.verify": "Verify state",
@@ -836,6 +942,8 @@ window.__ModuleLoader__.load({
 			"skipKind.forced": "forced",
 			"action.approve": "Copy approve",
 			"action.reject": "Copy reject",
+			"decision.approve": "Approve",
+			"decision.reject": "Reject",
 			"action.retry-candidates": "Copy retry candidates",
 			"action.retry-resume": "Retry resume",
 			"action.discard": "Copy discard",
@@ -853,6 +961,7 @@ window.__ModuleLoader__.load({
 			"disabled.unavailable": "unavailable",
 			"history.empty": "No history.",
 			"history.archivedAt": "Archived {date}",
+			"history.archivedAtUnknown": "Archive time unknown",
 			"failureServer": "Read failed",
 			"failureUnauthorized": "Not signed in",
 			"failureForbidden": "Forbidden",
@@ -910,7 +1019,6 @@ window.__ModuleLoader__.load({
 			"history.reason.archived": "archived",
 			"history.reason.unknown": "reason not provided",
 			"history.lastVersion": "Last version",
-			"history.archivedAt": "Archived at",
 			"body.truncated": "Body is truncated.",
 			"body.empty": "Body is empty.",
 			"body.totalBytes": "Total bytes",
@@ -931,8 +1039,10 @@ window.__ModuleLoader__.load({
 			"settings.capabilityMissing": "Host did not provide this capability",
 			"settings.capabilityDisabled": "Not available in this deployment",
 			"settings.readonly": "Read-only here; edit in platform settings.",
-			"settings.mergeApprovalPath": "Settings → Plugins → Evolution → Skill auto-merge",
 			"run.title": "Run",
+			"run.progressUnknown": "progress unknown",
+			"run.current": "Current run",
+			"run.last": "Last completed",
 			"run.id": "Run ID",
 			"run.state": "State",
 			"run.stage": "Stage",
@@ -970,14 +1080,14 @@ window.__ModuleLoader__.load({
 			"settings.saved": "已保存",
 			"settings.saveFailed": "保存失败",
 			"settings.openPlatform": "打开平台设置",
-			"settings.openPlatformPath": "设置 → 内置插件 → 插件配置 → 技能自动合并",
+			"settings.openPlatformPath": "设置 → 内置插件 → 自进化 → 技能自动合并",
 			"settings.live": "可直接在此保存；platformWrite 能力来自宿主。"
 		});
 		Object.assign(en, {
 			"settings.saved": "Saved",
 			"settings.saveFailed": "Save failed",
 			"settings.openPlatform": "Open platform settings",
-			"settings.openPlatformPath": "Settings → Built-in plugins → Plugin configuration → Skill auto-merge",
+			"settings.openPlatformPath": "Settings → Built-in plugins → Evolution → Skill auto-merge",
 			"settings.live": "Save directly here; platformWrite capability comes from the host."
 		});
 		Object.assign(zh, { "settings.platformWriteLinkHint": "此开关属于平台设置，这里只读；请到平台设置修改。" });
@@ -1014,7 +1124,8 @@ window.__ModuleLoader__.load({
 			".evolution-merge-panel [data-role=\"title\"] { margin:0; font-size:var(--evo-type-lg); font-weight:600; }",
 			".evolution-merge-panel [data-role=\"start\"] { display:flex; gap:var(--evo-space-6); flex-wrap:wrap; }",
 			".evolution-merge-panel [data-role=\"degraded\"] { margin:0; color:var(--dsw-alias-state-warn-primary); font-size:var(--evo-type-xs); }",
-			".evolution-merge-panel [data-role=\"expired-toggle\"][data-active=\"true\"] { background:var(--dsw-alias-brand-primary); color:var(--dsw-alias-bg-base); }",
+			".evolution-merge-panel [data-role=\"expired-toggle\"] { display:inline-flex; align-items:center; gap:var(--evo-space-4); border:var(--evo-hairline-width) solid var(--dsw-alias-border-secondary); border-radius:var(--evo-radius-control); background:transparent; color:var(--dsw-alias-label-secondary); font:inherit; font-size:var(--evo-type-xs); padding:var(--evo-space-4) var(--evo-space-8); cursor:pointer; }",
+			".evolution-merge-panel [data-role=\"expired-toggle\"][data-active=\"true\"] { color:var(--dsw-alias-state-warn-primary); border-color:var(--dsw-alias-state-warn-primary); background:transparent; }",
 			".evolution-merge-panel [data-role=\"failure\"] { display:flex; flex-direction:column; gap:var(--evo-space-6); }",
 			".evolution-merge-panel [data-role=\"failure\"] [data-tone=\"fail\"] { color:var(--dsw-alias-state-error-primary); }",
 			".evolution-merge-panel [data-role=\"fallback\"] { display:flex; gap:var(--evo-space-6); flex-wrap:wrap; }",
@@ -1043,7 +1154,9 @@ window.__ModuleLoader__.load({
 			".evolution-merge-panel [data-role=\"settings-card\"] { display:flex; flex-direction:column; gap:var(--evo-space-6); padding:var(--evo-space-10); border:var(--evo-hairline-width) solid var(--dsw-alias-border-l2); border-radius:var(--evo-radius-control); background:var(--dsw-alias-bg-layer-1); }",
 			".evolution-merge-panel [data-role=\"settings-title\"] { margin:0; font-size:var(--evo-type-sm); }",
 			".evolution-merge-panel [data-role=\"settings-hint\"], .evolution-merge-panel [data-role=\"settings-readonly\"] { margin:0; color:var(--dsw-alias-label-tertiary); font-size:var(--evo-type-xs); }",
-			".evolution-merge-panel [data-role=\"settings-section\"] { display:grid; grid-template-columns:minmax(0,1fr) auto auto; align-items:center; column-gap:var(--evo-space-8); }",
+			".evolution-merge-panel [data-role=\"settings-chips\"] { display:flex; flex-wrap:wrap; gap:var(--evo-space-6); }",
+			".evolution-merge-panel [data-role=\"settings-section\"] { display:inline-flex; align-items:center; gap:var(--evo-space-6); padding:var(--evo-space-2) var(--evo-space-8); border:var(--evo-hairline-width) solid var(--dsw-alias-border-l2); border-radius:var(--evo-radius-control); font-size:var(--evo-type-xs); }",
+			".evolution-merge-panel [data-role=\"settings-label\"] { color:var(--dsw-alias-label-secondary); }",
 			".evolution-merge-panel [data-role=\"settings-section\"][data-disabled=\"true\"] { color:var(--dsw-alias-label-tertiary); }",
 			".evolution-merge-panel [data-role=\"settings-toggle\"] { margin:0; }",
 			".evolution-merge-panel [data-role=\"settings-value\"] { font-weight:600; min-width:2.5em; text-align:right; }",
@@ -1146,9 +1259,9 @@ window.__ModuleLoader__.load({
 			const value = workspaceId?.trim() ?? "";
 			return value === "" ? "local" : value;
 		}
-		/** Stable localStorage key for one workspace and queue. */
-		function rowOrderKey(workspaceId, queue) {
-			return "dsh-evolution-merge.row-order.v1:" + encodeURIComponent(resolveWorkspaceId(workspaceId)) + ":" + queue;
+		/** Stable localStorage key for one workspace, queue and expired filter. */
+		function rowOrderKey(workspaceId, queue, expiredOnly = false) {
+			return "dsh-evolution-merge.row-order.v1:" + encodeURIComponent(resolveWorkspaceId(workspaceId)) + ":" + queue + (expiredOnly ? ":expired" : ":live");
 		}
 		function defaultStorage() {
 			try {
@@ -1177,18 +1290,18 @@ window.__ModuleLoader__.load({
 		/** One tab's persisted order; failures degrade to an empty (wire) order. */
 		function createRowOrderStore(storage = defaultStorage()) {
 			return {
-				read(workspaceId, queue) {
+				read(workspaceId, queue, expiredOnly = false) {
 					if (storage === void 0) return [];
 					try {
-						return normalize(storage.getItem(rowOrderKey(workspaceId, queue)));
+						return normalize(storage.getItem(rowOrderKey(workspaceId, queue, expiredOnly)));
 					} catch {
 						return [];
 					}
 				},
-				write(workspaceId, queue, ids) {
+				write(workspaceId, queue, ids, expiredOnly = false) {
 					if (storage === void 0) return;
 					try {
-						storage.setItem(rowOrderKey(workspaceId, queue), JSON.stringify(ids));
+						storage.setItem(rowOrderKey(workspaceId, queue, expiredOnly), JSON.stringify(ids));
 					} catch {}
 				}
 			};
@@ -1228,123 +1341,20 @@ window.__ModuleLoader__.load({
 			return edge === "top" ? [id, ...rest] : [...rest, id];
 		}
 		//#endregion
-		//#region src/client/fallbacks.ts
-		/** Static command-face fallback for a Facts read failure; the API fallback is unavailable then. */
-		const FALLBACK_COMMANDS = [
-			"/evolution merge scan",
-			"/evolution merge pair <a> <b>",
-			"/evolution merge pending",
-			"/evolution merge pending --expired",
-			"/evolution merge skipped",
-			"/evolution merge candidates",
-			"/evolution merge status",
-			"/evolution merge report",
-			"/evolution doctor"
-		];
-		//#endregion
-		//#region src/client/Panel.ts
-		/** Batch 4 merge panel: keyed read store, four tabs, local overlays, localized errors. */
-		const QUEUES = [
-			"verify",
-			"pending",
-			"fuse",
-			"skipped"
-		];
-		const DOCTOR_COMMAND = "/evolution doctor";
-		function problemKey(problem) {
-			switch (problem.code) {
-				case "unauthenticated": return "failureUnauthorized";
-				case "forbidden": return "failureForbidden";
-				case "unmounted": return "failureUnmounted";
-				case "capability": return "failureCapability";
-				case "body-ambiguous": return "failureBodyAmbiguous";
-				case "wire-version": return "failureWireVersion";
-				case "body-missing": return "failureBodyMissing";
-				case "bad-query": return "failureBadQuery";
-				case "refused": return "failureRefused";
-				case "server": return "failureServer";
-			}
-		}
-		function reasonText(t, reasonCode, fallback) {
-			if (reasonCode === void 0) return fallback;
-			const key = "history.reason." + reasonCode;
-			const text = t(key);
-			return text === key ? fallback : text;
-		}
-		function blockedReasonKey(failure) {
-			const code = failure.readiness.code ?? failure.code;
-			if (code.endsWith("needs-repair")) return "blocked.reason.needs-repair";
-			if (code.endsWith("forward-only")) return "blocked.reason.forward-only";
-			if (code.endsWith("migration-blocked")) return "blocked.reason.migration-blocked";
-			return "blocked.reason.unknown";
-		}
-		function failureNode(t, failure, fallback, copy) {
-			if (isBlocked(failure)) {
-				const raw = failure.readiness.message;
-				return (0, react.createElement)("div", {
-					"data-role": "blocked",
-					role: "alert",
-					"data-block-code": failure.code,
-					"data-readiness-code": failure.readiness.code ?? ""
-				}, (0, react.createElement)("h3", { "data-role": "blocked-title" }, t("blocked.title")), (0, react.createElement)("p", {
-					"data-role": "blocked-reason",
-					title: raw ?? t(blockedReasonKey(failure))
-				}, t(blockedReasonKey(failure))), (0, react.createElement)("p", { "data-role": "blocked-hint" }, t("blocked.hint")), raw === void 0 ? null : (0, react.createElement)("details", { "data-role": "blocked-detail" }, (0, react.createElement)("summary", null, t("blocked.detail")), (0, react.createElement)("p", { "data-role": "blocked-raw" }, raw)), (0, react.createElement)("div", { "data-role": "blocked-actions" }, (0, react.createElement)("button", {
-					type: "button",
-					"data-role": "doctor",
-					onClick: () => {
-						copy(DOCTOR_COMMAND);
-					}
-				}, t("blocked.doctor")), (0, react.createElement)("button", {
-					type: "button",
-					"data-role": "refresh",
-					onClick: () => {
-						window.dispatchEvent(new Event("evolution-merge:refresh"));
-					}
-				}, t("refresh"))));
-			}
-			const capability = failure.code === "capability";
-			return (0, react.createElement)("div", {
-				"data-role": capability ? "capability-failure" : "failure",
-				"data-error-code": failure.code,
-				"data-status": String(failure.status)
-			}, (0, react.createElement)("p", {
-				"data-role": "failure-title",
-				title: failure.message
-			}, t(problemKey(failure))), capability ? (0, react.createElement)("p", { "data-role": "capability-hint" }, t("failureCapabilityHint")) : null, failure.message === void 0 ? null : (0, react.createElement)("details", { "data-role": "failure-detail" }, (0, react.createElement)("summary", null, t("failureDetails")), (0, react.createElement)("p", { "data-role": "failure-raw" }, failure.message)), fallback.length === 0 ? null : (0, react.createElement)("div", { "data-role": "fallback" }, fallback.map((command) => (0, react.createElement)("button", {
-				key: command,
-				type: "button",
-				"data-role": "fallback-command",
-				onClick: () => {
-					copy(command);
-				}
-			}, command))));
-		}
-		function summaryNode(row, t) {
-			if (row.state !== "pending" || row.summary === void 0) return null;
-			return (0, react.createElement)("div", { "data-role": "pending-summary" }, [
-				["row.summaryA", row.summary.a],
-				["row.summaryB", row.summary.b],
-				["row.rationale", row.summary.rationale]
-			].map(([label, value]) => (0, react.createElement)("div", {
-				key: label,
-				"data-role": "pending-summary-slot"
-			}, (0, react.createElement)("span", { "data-role": "pending-summary-label" }, t(label)), (0, react.createElement)("span", { "data-role": "pending-summary-value" }, value === null || value === "" ? t("row.noSummary") : value))));
-		}
-		function stageNode(row, t) {
-			const stage = row.stageView;
-			if (stage === void 0) return null;
-			const tone = stage.state === "lost" ? "fail" : stage.state === "expired" || stage.state === "reserved" ? "warn" : "neutral";
-			const expiry = stage.expiresAt === void 0 ? "" : " · " + t("row.expires") + " " + new Date(stage.expiresAt).toLocaleString();
-			return (0, react.createElement)("span", {
-				"data-role": "stage-badge",
-				"data-stage": stage.state,
-				"data-tone": tone
-			}, t("stage.state." + stage.state) + expiry);
+		//#region src/client/MergeRunStrip.ts
+		/** The merge run strips: active/last identity, state, progress, report and details. */
+		/**
+		* Render active and last runs as two independently labelled strips.
+		* @param props - view, translator and command copier.
+		* @returns the strips, or null when neither run exists.
+		*/
+		function MergeRunStrips({ view, t, copy }) {
+			const active = view.activeRun;
+			const last = view.lastRun;
+			if (active === void 0 && last === void 0) return null;
+			return (0, react.createElement)("div", { "data-role": "run-strips" }, active === void 0 ? null : runStrip(active, t, copy, "active"), last === void 0 ? null : runStrip(last, t, copy, "last"));
 		}
-		function runNode(view, t, copy) {
-			const run = view.latestRun;
-			if (run === void 0) return null;
+		function runStrip(run, t, copy, role) {
 			const report = run.actions.find((action) => action.id === "report");
 			const reportEnabled = report?.enabled === true;
 			const internals = [
@@ -1360,7 +1370,7 @@ window.__ModuleLoader__.load({
 				run.endedAt === void 0 ? null : (0, react.createElement)("span", {
 					key: "ended",
 					"data-role": "run-ended"
-				}, t("run.endedAt") + " " + new Date(run.endedAt).toLocaleString()),
+				}, t("run.endedAt") + " " + (formatLocalDateTime(run.endedAt) ?? "")),
 				run.failure === void 0 ? null : (0, react.createElement)("span", {
 					key: "failure",
 					"data-role": "run-failure",
@@ -1382,8 +1392,12 @@ window.__ModuleLoader__.load({
 			];
 			return (0, react.createElement)("div", {
 				"data-role": "run-strip",
+				"data-run-role": role,
 				"data-run-state": run.state
-			}, (0, react.createElement)("span", { "data-role": "run-state" }, t("run.state") + " " + t("run." + run.state)), run.progress === null || run.progress === void 0 ? null : (0, react.createElement)("span", { "data-role": "run-progress" }, t("run.progress") + " " + String(run.progress.done) + "/" + String(run.progress.total)), (0, react.createElement)("button", {
+			}, (0, react.createElement)("span", { "data-role": "run-identity" }, t(role === "active" ? "run.current" : "run.last")), (0, react.createElement)("span", { "data-role": "run-state" }, t("run.state") + " " + t("run." + run.state)), run.progress === null || run.progress === void 0 ? run.state === "succeeded" ? (0, react.createElement)("span", {
+				"data-role": "run-progress",
+				"data-progress": "unknown"
+			}, t("run.progressUnknown")) : null : (0, react.createElement)("span", { "data-role": "run-progress" }, t("run.progress") + " " + String(run.progress.done) + "/" + String(run.progress.total)), (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "run-report",
 				"data-action": "report",
@@ -1404,48 +1418,68 @@ window.__ModuleLoader__.load({
 				}
 			}, t("action." + action.id))), (0, react.createElement)("details", { "data-role": "run-details" }, (0, react.createElement)("summary", null, t("run.details")), ...internals));
 		}
-		function ReadOnlySetting({ section, label, value, disabled, missing, note, link, t }) {
-			const text = missing ? t("settings.capabilityMissing") : disabled ? t("settings.capabilityDisabled") : value === true ? t("settings.on") : t("settings.off");
-			return (0, react.createElement)("div", {
-				"data-role": "settings-section",
-				"data-section": section,
-				"data-disabled": missing || disabled ? "true" : "false"
-			}, (0, react.createElement)("span", { "data-role": "settings-label" }, label), (0, react.createElement)("span", {
-				"data-role": "settings-value",
-				"data-value": missing ? "missing" : disabled ? "unavailable" : value === true ? "on" : "off"
-			}, text), note === void 0 ? null : (0, react.createElement)("span", { "data-role": "settings-note" }, note), link === true ? (0, react.createElement)("span", { "data-role": "settings-link" }, t("settings.openPlatformPath")) : null);
+		//#endregion
+		//#region src/client/merge-presentation.ts
+		/**
+		* Compare the two source summaries after trimming. Equal non-empty text is one fact;
+		* missing text stays missing rather than being invented.
+		* @param a - source A summary, or null.
+		* @param b - source B summary, or null.
+		* @returns the presentation form.
+		*/
+		function summarizePair(a, b) {
+			const left = a?.trim() ?? "";
+			const right = b?.trim() ?? "";
+			if (left === "" && right === "") return { kind: "missing" };
+			if (left !== "" && left === right) return {
+				kind: "same",
+				text: left
+			};
+			return {
+				kind: "different",
+				a: left === "" ? null : left,
+				b: right === "" ? null : right
+			};
 		}
-		function SettingsCard({ view, t }) {
-			const platform = view.approval.platformWrite;
-			const platformCapability = platform?.capability === true;
-			const platformFallback = platform?.enabled ?? false;
-			const mergeFallback = view.approval.mergeApproval;
-			return (0, react.createElement)("div", { "data-role": "settings-card" }, (0, react.createElement)("h3", { "data-role": "settings-title" }, t("settings.title")), (0, react.createElement)("p", { "data-role": "settings-hint" }, t("settings.hint")), (0, react.createElement)(ReadOnlySetting, {
-				section: "merge-approval",
-				label: t("settings.mergeApproval"),
-				value: mergeFallback,
-				disabled: false,
-				missing: false,
-				note: t("settings.mergeApprovalPath"),
-				link: true,
-				t
-			}), (0, react.createElement)(ReadOnlySetting, {
-				section: "platform-write",
-				label: t("settings.platformWrite"),
-				value: platformFallback,
-				disabled: platformCapability === false,
-				missing: platform === void 0,
-				note: t("settings.platformWriteLinkHint"),
-				link: true,
-				t
-			}), (0, react.createElement)("p", { "data-role": "settings-readonly" }, t("settings.readonly")));
+		//#endregion
+		//#region src/client/MergeRow.ts
+		/** One merge row: summary, stage, facts, primary decisions and the copy drawer. */
+		function reasonText$1(t, reasonCode, fallback) {
+			return reasonCode === void 0 ? fallback : t("history.reason." + reasonCode);
 		}
-		function rowNode(row, t, copy, sort, openBody) {
+		function summaryNode(row, t) {
+			if (row.state !== "pending" || row.summary === void 0) return null;
+			const pair = summarizePair(row.summary.a, row.summary.b);
+			const slots = pair.kind === "same" ? [[t("row.summaryBoth"), pair.text]] : pair.kind === "missing" ? [[t("row.summaryBoth"), t("row.noSummary")]] : [[t("row.summaryA"), pair.a], [t("row.summaryB"), pair.b]];
+			slots.push([t("row.rationale"), row.summary.rationale]);
+			return (0, react.createElement)("div", { "data-role": "pending-summary" }, slots.map(([label, value]) => (0, react.createElement)("div", {
+				key: label,
+				"data-role": "pending-summary-slot"
+			}, (0, react.createElement)("span", { "data-role": "pending-summary-label" }, label), (0, react.createElement)("span", { "data-role": "pending-summary-value" }, value === null || value === "" ? t("row.noSummary") : value))));
+		}
+		function stageNode(row, t) {
+			const stage = row.stageView;
+			if (stage === void 0) return null;
+			const tone = stage.state === "lost" ? "fail" : stage.state === "expired" || stage.state === "reserved" ? "warn" : "neutral";
+			const expiry = stage.expiresAt === void 0 ? "" : " · " + t("row.expires") + " " + new Date(stage.expiresAt).toLocaleString();
+			return (0, react.createElement)("span", {
+				"data-role": "stage-badge",
+				"data-stage": stage.state,
+				"data-tone": tone
+			}, t("stage.state." + stage.state) + expiry);
+		}
+		/**
+		* Render one row. Primary decisions stay visible; copy commands live in one details drawer.
+		* @param props - row, translator, copier, sort hooks, body opener and decision callback.
+		* @returns the row element.
+		*/
+		function MergeRow(props) {
+			const { row, t, copy, sort, openBody, onDecide, busy } = props;
 			const first = [
 				row.target === void 0 ? void 0 : t("row.target") + " " + row.target,
 				row.failure === void 0 ? void 0 : t("row.failure") + " " + row.failure.code + (row.failure.retryable ? "" : " · " + t("row.noRetry")),
 				row.expired === void 0 ? void 0 : t("row.expired") + " " + t("expired." + row.expired),
-				row.reasonCode === void 0 && row.reason === void 0 ? void 0 : t("row.reason") + " " + reasonText(t, row.reasonCode, row.reason ?? "")
+				row.reasonCode === void 0 && row.reason === void 0 ? void 0 : t("row.reason") + " " + reasonText$1(t, row.reasonCode, row.reason ?? "")
 			].filter((value) => value !== void 0).join(" · ");
 			const details = [
 				t("row.id") + " " + row.id,
@@ -1455,19 +1489,23 @@ window.__ModuleLoader__.load({
 				row.attempts === void 0 ? void 0 : t("row.attempts") + " " + String(row.attempts),
 				row.confidence === void 0 ? void 0 : t("row.confidence") + " " + row.confidence.toFixed(2)
 			].filter((value) => value !== void 0).join(" · ");
-			const actions = row.actions.map((action) => (0, react.createElement)("button", {
-				key: action.id,
-				type: "button",
-				"data-role": "row-action",
-				"data-action": action.id,
-				...action.disabledReason === void 0 ? {} : { "data-disabled-reason": action.disabledReason },
-				title: action.disabledReason === void 0 ? action.command : t("disabled." + action.disabledReason),
-				disabled: !action.enabled,
-				onClick: () => {
-					if (!action.enabled) return;
-					copy(action.command);
-				}
-			}, t("action." + action.id)));
+			const actions = row.actions.filter((action) => action.id !== "copy" && action.id !== "discard").map((action) => {
+				const decision = (action.id === "approve" || action.id === "reject") && onDecide !== void 0;
+				return (0, react.createElement)("button", {
+					key: action.id,
+					type: "button",
+					"data-role": decision ? "row-decision" : "row-action",
+					"data-action": action.id,
+					...action.disabledReason === void 0 ? {} : { "data-disabled-reason": action.disabledReason },
+					title: action.command,
+					disabled: !action.enabled || busy,
+					onClick: () => {
+						if (!action.enabled || busy) return;
+						if (decision) onDecide(row.id, action.id);
+						else copy(action.command);
+					}
+				}, decision ? t("decision." + action.id) : t("action." + action.id));
+			});
 			return (0, react.createElement)("div", {
 				key: row.id,
 				"data-role": "row",
@@ -1507,7 +1545,16 @@ window.__ModuleLoader__.load({
 					event.preventDefault();
 					sort.menu(row.id, event.clientX, event.clientY);
 				}
-			}, (0, react.createElement)("div", null, (0, react.createElement)("div", { "data-role": "row-label" }, row.label), (0, react.createElement)("div", { "data-role": "row-meta" }, t("state." + row.state) + (row.stage === null ? "" : " · " + t("stage." + row.stage))), stageNode(row, t), summaryNode(row, t), first === "" ? null : (0, react.createElement)("div", { "data-role": "row-facts" }, first), (0, react.createElement)("details", { "data-role": "row-details" }, (0, react.createElement)("summary", null, t("row.details")), (0, react.createElement)("p", null, details))), (0, react.createElement)("div", null, (0, react.createElement)("div", { "data-role": "row-meta" }, new Date(row.updatedAt).toLocaleString()), (0, react.createElement)("div", { "data-role": "row-actions" }, (() => {
+			}, (0, react.createElement)("div", null, (0, react.createElement)("div", { "data-role": "row-label" }, row.label), (0, react.createElement)("div", { "data-role": "row-meta" }, t("state." + row.state) + (row.stage === null ? "" : " · " + t("stage." + row.stage))), stageNode(row, t), summaryNode(row, t), first === "" ? null : (0, react.createElement)("div", { "data-role": "row-facts" }, first), (0, react.createElement)("details", { "data-role": "row-details" }, (0, react.createElement)("summary", null, t("row.details")), (0, react.createElement)("p", null, details))), (0, react.createElement)("div", null, (0, react.createElement)("div", { "data-role": "row-meta" }, new Date(row.updatedAt).toLocaleString()), (0, react.createElement)("div", { "data-role": "row-actions" }, (0, react.createElement)("button", {
+				type: "button",
+				"data-role": "row-sort",
+				"aria-haspopup": "menu",
+				title: t("sort.menu"),
+				onClick: (event) => {
+					const rect = event.currentTarget.getBoundingClientRect();
+					sort.menu(row.id, rect.left, rect.bottom);
+				}
+			}, t("sort.menu")), (() => {
 				const bodyA = row.bodies?.find((body) => body.name === row.a);
 				const bodyB = row.bodies?.find((body) => body.name === row.b);
 				return [bodyA === void 0 ? null : (0, react.createElement)("button", {
@@ -1529,7 +1576,151 @@ window.__ModuleLoader__.load({
 						openBody(bodyB.name, bodyB.side, bodyB.rowId);
 					}
 				}, "B · " + bodyB.name)];
-			})(), actions)));
+			})(), actions), (0, react.createElement)("details", { "data-role": "row-more" }, (0, react.createElement)("summary", null, t("row.more")), ...row.actions.map((action) => (0, react.createElement)("button", {
+				key: "copy-" + action.id,
+				type: "button",
+				"data-role": "row-copy",
+				"data-action": action.id + "-copy",
+				title: action.command,
+				disabled: busy,
+				onClick: () => {
+					if (!busy) copy(action.command);
+				}
+			}, t("row.copy") + " " + t("action." + action.id))))));
+		}
+		//#endregion
+		//#region src/client/MergeSettings.ts
+		/** The merge settings summary: two read-only state chips and one settings path. */
+		function SettingChip({ section, label, value, disabled, missing, t }) {
+			const text = missing ? t("settings.capabilityMissing") : disabled ? t("settings.capabilityDisabled") : value === true ? t("settings.on") : t("settings.off");
+			const state = missing ? "missing" : disabled ? "unavailable" : value === true ? "on" : "off";
+			return (0, react.createElement)("span", {
+				"data-role": "settings-section",
+				"data-section": section,
+				"data-disabled": missing || disabled ? "true" : "false",
+				"data-state": state
+			}, (0, react.createElement)("span", { "data-role": "settings-label" }, label), (0, react.createElement)("span", {
+				"data-role": "settings-value",
+				"data-value": state
+			}, text));
+		}
+		/**
+		* Render the read-only approval state without the old large settings card.
+		* @param props - the merge view and translator.
+		* @returns two chips and the one current settings path.
+		*/
+		function MergeSettings({ view, t }) {
+			const platform = view.approval.platformWrite;
+			const platformCapability = platform?.capability === true;
+			const platformFallback = platform?.enabled ?? false;
+			return (0, react.createElement)("div", { "data-role": "settings-card" }, (0, react.createElement)("h3", { "data-role": "settings-title" }, t("settings.title")), (0, react.createElement)("p", { "data-role": "settings-path" }, t("settings.openPlatformPath")), (0, react.createElement)("div", { "data-role": "settings-chips" }, (0, react.createElement)(SettingChip, {
+				section: "merge-approval",
+				label: t("settings.mergeApproval"),
+				value: view.approval.mergeApproval,
+				disabled: false,
+				missing: false,
+				t
+			}), (0, react.createElement)(SettingChip, {
+				section: "platform-write",
+				label: t("settings.platformWrite"),
+				value: platformFallback,
+				disabled: platformCapability === false,
+				missing: platform === void 0,
+				t
+			})));
+		}
+		//#endregion
+		//#region src/client/fallbacks.ts
+		/** Static command-face fallback for a Facts read failure; the API fallback is unavailable then. */
+		const FALLBACK_COMMANDS = [
+			"/evolution merge scan",
+			"/evolution merge pair <a> <b>",
+			"/evolution merge pending",
+			"/evolution merge pending --expired",
+			"/evolution merge skipped",
+			"/evolution merge candidates",
+			"/evolution merge status",
+			"/evolution merge report",
+			"/evolution doctor"
+		];
+		//#endregion
+		//#region src/client/Panel.ts
+		/** Batch 4 merge panel: keyed read store, four tabs, local overlays, localized errors. */
+		const QUEUES = [
+			"verify",
+			"pending",
+			"fuse",
+			"skipped"
+		];
+		const DOCTOR_COMMAND = "/evolution doctor";
+		function problemKey(problem) {
+			switch (problem.code) {
+				case "unauthenticated": return "failureUnauthorized";
+				case "forbidden": return "failureForbidden";
+				case "unmounted": return "failureUnmounted";
+				case "capability": return "failureCapability";
+				case "body-ambiguous": return "failureBodyAmbiguous";
+				case "wire-version": return "failureWireVersion";
+				case "body-missing": return "failureBodyMissing";
+				case "bad-query": return "failureBadQuery";
+				case "refused": return "failureRefused";
+				case "server": return "failureServer";
+			}
+		}
+		function reasonText(t, reasonCode, fallback) {
+			if (reasonCode === void 0) return fallback;
+			const key = "history.reason." + reasonCode;
+			const text = t(key);
+			return text === key ? fallback : text;
+		}
+		function blockedReasonKey(failure) {
+			const code = failure.readiness.code ?? failure.code;
+			if (code.endsWith("needs-repair")) return "blocked.reason.needs-repair";
+			if (code.endsWith("forward-only")) return "blocked.reason.forward-only";
+			if (code.endsWith("migration-blocked")) return "blocked.reason.migration-blocked";
+			return "blocked.reason.unknown";
+		}
+		function failureNode(t, failure, fallback, copy) {
+			if (isBlocked(failure)) {
+				const raw = failure.readiness.message;
+				return (0, react.createElement)("div", {
+					"data-role": "blocked",
+					role: "alert",
+					"data-block-code": failure.code,
+					"data-readiness-code": failure.readiness.code ?? ""
+				}, (0, react.createElement)("h3", { "data-role": "blocked-title" }, t("blocked.title")), (0, react.createElement)("p", {
+					"data-role": "blocked-reason",
+					title: raw ?? t(blockedReasonKey(failure))
+				}, t(blockedReasonKey(failure))), (0, react.createElement)("p", { "data-role": "blocked-hint" }, t("blocked.hint")), raw === void 0 ? null : (0, react.createElement)("details", { "data-role": "blocked-detail" }, (0, react.createElement)("summary", null, t("blocked.detail")), (0, react.createElement)("p", { "data-role": "blocked-raw" }, raw)), (0, react.createElement)("div", { "data-role": "blocked-actions" }, (0, react.createElement)("button", {
+					type: "button",
+					"data-role": "doctor",
+					onClick: () => {
+						copy(DOCTOR_COMMAND);
+					}
+				}, t("blocked.doctor")), (0, react.createElement)("button", {
+					type: "button",
+					"data-role": "refresh",
+					onClick: () => {
+						window.dispatchEvent(new Event("evolution-merge:refresh"));
+					}
+				}, t("refresh"))));
+			}
+			const capability = failure.code === "capability";
+			return (0, react.createElement)("div", {
+				"data-role": capability ? "capability-failure" : "failure",
+				"data-error-code": failure.code,
+				"data-status": String(failure.status)
+			}, (0, react.createElement)("p", {
+				"data-role": "failure-title",
+				title: failure.message
+			}, t(problemKey(failure))), capability ? (0, react.createElement)("p", { "data-role": "capability-hint" }, t("failureCapabilityHint")) : null, failure.message === void 0 ? null : (0, react.createElement)("details", { "data-role": "failure-detail" }, (0, react.createElement)("summary", null, t("failureDetails")), (0, react.createElement)("p", { "data-role": "failure-raw" }, failure.message)), fallback.length === 0 ? null : (0, react.createElement)("div", { "data-role": "fallback" }, fallback.map((command) => (0, react.createElement)("button", {
+				key: command,
+				type: "button",
+				"data-role": "fallback-command",
+				onClick: () => {
+					copy(command);
+				}
+			}, command))));
 		}
 		const overlayKey = (event, onClose) => {
 			if (event.key === "Escape") {
@@ -1608,7 +1799,7 @@ window.__ModuleLoader__.load({
 				const kind = t("history.kind." + item.kind);
 				const reason = reasonText(t, item.reasonCode, item.reason);
 				return kind === reason ? kind : kind + " · " + reason;
-			})() + " · v" + String(item.lastVersion) + " · " + t("history.archivedAt", { date: new Date(item.archivedAt).toLocaleString() })))) : null);
+			})() + " · v" + String(item.lastVersion) + " · " + (item.archivedAt === null ? t("history.archivedAtUnknown") : t("history.archivedAt", { date: formatLocalDateTime(item.archivedAt) ?? t("history.archivedAtUnknown") }))))) : null);
 			return Modal === void 0 ? inner : (0, react.createElement)(Modal, {
 				open: true,
 				onClose,
@@ -1624,6 +1815,8 @@ window.__ModuleLoader__.load({
 			const [copyState, setCopyState] = (0, react.useState)({ kind: "idle" });
 			const [orders, setOrders] = (0, react.useState)({});
 			const [dragId, setDragId] = (0, react.useState)(void 0);
+			const [deciding, setDeciding] = (0, react.useState)(void 0);
+			const [decisionNotice, setDecisionNotice] = (0, react.useState)(void 0);
 			const [menu, setMenu] = (0, react.useState)(void 0);
 			const returnFocus = (0, react.useRef)(null);
 			const captureFocus = () => {
@@ -1645,6 +1838,27 @@ window.__ModuleLoader__.load({
 			};
 			const workspaceId = resolveWorkspaceId(face.workspaceId);
 			const orderStore = (0, react.useMemo)(() => createRowOrderStore(), []);
+			const decideRow = (rowId, verb) => {
+				if (face.decide === void 0) return;
+				setDeciding(rowId);
+				(async () => {
+					try {
+						setDecisionNotice({
+							rowId,
+							...await face.decide(rowId, verb)
+						});
+						store.refresh();
+					} catch (error) {
+						setDecisionNotice({
+							rowId,
+							ok: false,
+							message: error instanceof Error ? error.message : String(error)
+						});
+					} finally {
+						setDeciding(void 0);
+					}
+				})();
+			};
 			const copy = (command) => {
 				(async () => {
 					try {
@@ -1694,15 +1908,15 @@ window.__ModuleLoader__.load({
 			const viewFailure = snapshot.viewState === "error" ? snapshot.viewFailure : void 0;
 			const queue = snapshot.current;
 			const uiState = blocked !== void 0 ? "blocked" : viewFailure !== void 0 ? "error" : snapshot.viewState === "loading" ? "loading" : queue.status === "error" ? "error" : queue.status === "loading" ? "loading" : queue.status === "empty" ? "empty" : "ready";
-			const orderKey = rowOrderKey(workspaceId, snapshot.queue);
-			const visibleOrder = orders[orderKey] ?? orderStore.read(workspaceId, snapshot.queue);
+			const orderKey = rowOrderKey(workspaceId, snapshot.queue, snapshot.expiredOnly);
+			const visibleOrder = orders[orderKey] ?? orderStore.read(workspaceId, snapshot.queue, snapshot.expiredOnly);
 			const visibleRows = orderRows(queue.rows, visibleOrder);
 			const saveOrder = (ids) => {
 				setOrders((previous) => ({
 					...previous,
 					[orderKey]: ids
 				}));
-				orderStore.write(workspaceId, snapshot.queue, ids);
+				orderStore.write(workspaceId, snapshot.queue, ids, snapshot.expiredOnly);
 			};
 			const sortHandlers = {
 				start: (id) => {
@@ -1774,11 +1988,23 @@ window.__ModuleLoader__.load({
 					store.toggleExpired();
 				}
 			}, t("tab.expired") + " " + String(view.expired)) : null;
+			const notice = decisionNotice === void 0 ? null : (0, react.createElement)("p", {
+				"data-role": "decision-notice",
+				"data-ok": decisionNotice.ok ? "true" : "false"
+			}, decisionNotice.message);
 			const list = uiState === "ready" && queue.status === "ready" ? (0, react.createElement)("div", {
 				"data-role": "rows",
 				id: "merge-rows",
 				role: "tabpanel"
-			}, visibleRows.map((row) => rowNode(row, t, copy, sortHandlers, openBody))) : null;
+			}, visibleRows.map((row) => (0, react.createElement)(MergeRow, {
+				row,
+				t,
+				copy,
+				sort: sortHandlers,
+				openBody,
+				onDecide: face.decide === void 0 ? void 0 : decideRow,
+				busy: deciding === row.id
+			}))) : null;
 			const empty = uiState === "empty" ? (0, react.createElement)("div", null, (0, react.createElement)("p", { "data-role": "note" }, t("empty." + snapshot.queue)), (0, react.createElement)("p", { "data-role": "empty-scope" }, t("empty.scope"))) : null;
 			const staleViewFailure = snapshot.viewState === "ready" ? snapshot.viewFailure : void 0;
 			const activeFailure = viewFailure !== void 0 ? viewFailure : staleViewFailure !== void 0 ? staleViewFailure : queue.status === "error" ? queue.failure : void 0;
@@ -1856,19 +2082,29 @@ window.__ModuleLoader__.load({
 				onClick: () => {
 					copy(view.startCommands.pair);
 				}
-			}, t("start.pair"))), view.degraded ? (0, react.createElement)("p", { "data-role": "degraded" }, t("degraded") + " " + view.notes.join(",")) : null, (0, react.createElement)(SettingsCard, {
+			}, t("start.pair"))), view.degraded ? (0, react.createElement)("p", { "data-role": "degraded" }, t("degraded") + " " + view.notes.join(",")) : null, (0, react.createElement)(MergeSettings, {
 				view,
 				t
-			}), runNode(view, t, copy), tabs, expiredToggle, snapshot.viewState === "loading" || queue.status === "loading" ? (0, react.createElement)("p", { "data-role": "note" }, t("loading")) : queue.refreshing === true ? (0, react.createElement)("p", {
+			}), (0, react.createElement)(MergeRunStrips, {
+				view,
+				t,
+				copy
+			}), tabs, expiredToggle, snapshot.viewState === "loading" || queue.status === "loading" ? (0, react.createElement)("p", { "data-role": "note" }, t("loading")) : queue.refreshing === true ? (0, react.createElement)("p", {
 				"data-role": "note",
 				role: "status"
 			}, t("refreshing")) : null, activeFailure === void 0 ? null : failureNode(t, activeFailure, fallback, copy), copyState.kind === "idle" ? null : copyState.kind === "copied" ? (0, react.createElement)("p", {
 				"data-role": "copied",
 				role: "status"
-			}, t("copied") + " " + (copyState.text ?? "")) : (0, react.createElement)("p", {
+			}, t("copied") + " " + (copyState.text ?? "")) : (0, react.createElement)("div", {
 				"data-role": "copy-failed",
 				role: "alert"
-			}, t("copyFailed")), list, empty, queue.nextCursor === void 0 || uiState !== "ready" ? null : (0, react.createElement)("button", {
+			}, (0, react.createElement)("p", null, t("copyFailed")), copyState.text === void 0 ? null : (0, react.createElement)("code", { "data-role": "copy-failed-command" }, copyState.text), (0, react.createElement)("button", {
+				type: "button",
+				"data-role": "copy-retry",
+				onClick: () => {
+					if (copyState.text !== void 0) copy(copyState.text);
+				}
+			}, t("copyRetry"))), notice, list, empty, queue.nextCursor === void 0 || uiState !== "ready" ? null : (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "load-more",
 				disabled: queue.status === "loading",
@@ -2253,8 +2489,19 @@ window.__ModuleLoader__.load({
 			}
 		};
 		//#endregion
+		//#region src/client/session.ts
+		function currentSessionId(ctx) {
+			const byId = ctx.sessions?.list?.getSnapshot?.().byId;
+			if (byId === void 0) return void 0;
+			return Object.values(byId).find((session) => (session.retainedBy?.mainView ?? 0) > 0)?.id;
+		}
+		//#endregion
 		//#region src/client/index.ts
-		const inject = ["slots", "locale"];
+		const inject = [
+			"slots",
+			"sessions",
+			"locale"
+		];
 		/** The view component receives the workbench's activeView marker alongside its face. */
 		function MergeView(props) {
 			return props.activeView === "merge" ? MergePanel(props) : null;
@@ -2264,6 +2511,10 @@ window.__ModuleLoader__.load({
 		* @param ctx - the client context.
 		*/
 		function apply(ctx) {
+			const seat = createSettingsSeat(ctx);
+			ctx.effect(() => () => {
+				seat.dispose?.();
+			}, "evolution-merge-ui: settings seat");
 			registerWorkbenchView(ctx, {
 				id: PANEL_ID,
 				order: 45,
@@ -2284,7 +2535,6 @@ window.__ModuleLoader__.load({
 						body,
 						history
 					};
-					const seat = createSettingsSeat(ctx);
 					const workspaceId = panelWorkspaceId(ctx);
 					return {
 						store: new MergeStore(source),
@@ -2294,6 +2544,20 @@ window.__ModuleLoader__.load({
 							...seat.get("evolution-merge") === void 0 ? {} : { merge: seat.get("evolution-merge") },
 							...seat.get("evolution-approval") === void 0 ? {} : { platform: seat.get("evolution-approval") }
 						},
+						decide: async (rowId, verb) => {
+							const sessionId = currentSessionId(ctx);
+							if (sessionId === void 0) return {
+								ok: false,
+								message: "没有当前会话；请打开会话后重试"
+							};
+							const result = await decide(rowId, verb, sessionId);
+							if (result.ok) return result.payload;
+							const failure = result.failure;
+							return {
+								ok: false,
+								message: "message" in failure && typeof failure.message === "string" ? failure.message : "审批请求失败"
+							};
+						},
 						...workspaceId === void 0 ? {} : { workspaceId }
 					};
 				}

package/lib/types/client/MergeRow.d.ts

@@ -0,0 +1,27 @@
+/** One merge row: summary, stage, facts, primary decisions and the copy drawer. */
+import { type DragEvent, type ReactNode } from 'react';
+import type { MergeRowView } from './api.ts';
+type Translate = (key: string, values?: Readonly<Record<string, string | number>>) => string;
+export interface RowSortHandlers {
+    start(id: string): void;
+    over(event: DragEvent<HTMLDivElement>): void;
+    drop(id: string): void;
+    end(): void;
+    menu(id: string, x: number, y: number): void;
+}
+/**
+ * Render one row. Primary decisions stay visible; copy commands live in one details drawer.
+ * @param props - row, translator, copier, sort hooks, body opener and decision callback.
+ * @returns the row element.
+ */
+export declare function MergeRow(props: {
+    row: MergeRowView;
+    t: Translate;
+    copy: (command: string) => void;
+    sort: RowSortHandlers;
+    openBody: (name: string, side: 'live' | 'archive', rowId: string | undefined) => void;
+    onDecide: ((rowId: string, verb: 'approve' | 'reject') => void) | undefined;
+    busy: boolean;
+}): ReactNode;
+export {};
+//# sourceMappingURL=MergeRow.d.ts.map

package/lib/types/client/MergeRunStrip.d.ts

@@ -0,0 +1,16 @@
+/** The merge run strips: active/last identity, state, progress, report and details. */
+import { type ReactNode } from 'react';
+import type { MergeViewPayload } from './api.ts';
+type Translate = (key: string, values?: Readonly<Record<string, string | number>>) => string;
+/**
+ * Render active and last runs as two independently labelled strips.
+ * @param props - view, translator and command copier.
+ * @returns the strips, or null when neither run exists.
+ */
+export declare function MergeRunStrips({ view, t, copy }: {
+    view: MergeViewPayload;
+    t: Translate;
+    copy: (command: string) => void;
+}): ReactNode;
+export {};
+//# sourceMappingURL=MergeRunStrip.d.ts.map

package/lib/types/client/MergeSettings.d.ts

@@ -0,0 +1,15 @@
+/** The merge settings summary: two read-only state chips and one settings path. */
+import { type ReactNode } from 'react';
+import type { MergeViewPayload } from './api.ts';
+type Translate = (key: string, values?: Readonly<Record<string, string | number>>) => string;
+/**
+ * Render the read-only approval state without the old large settings card.
+ * @param props - the merge view and translator.
+ * @returns two chips and the one current settings path.
+ */
+export declare function MergeSettings({ view, t }: {
+    view: MergeViewPayload;
+    t: Translate;
+}): ReactNode;
+export {};
+//# sourceMappingURL=MergeSettings.d.ts.map

package/lib/types/client/Panel.d.ts

@@ -1,7 +1,7 @@
 /** Batch 4 merge panel: keyed read store, four tabs, local overlays, localized errors. */
 import { type ReactNode } from 'react';
 import type { MergeStore } from './MergeStore.ts';
-import type { SettingsFace } from '@lmzhen/dsh-evolution-client-kit';
+import { type SettingsFace } from '@lmzhen/dsh-evolution-client-kit';
 export type Translate = (key: string, values?: Readonly<Record<string, string | number>>) => string;
 export interface MergeFace {
     store: MergeStore;
@@ -9,6 +9,10 @@ export interface MergeFace {
     doctorCommand?: string;
     settings?: SettingsFace;
     workspaceId?: string;
+    decide?: (rowId: string, verb: 'approve' | 'reject') => Promise<{
+        ok: boolean;
+        message: string;
+    }>;
 }
 export declare function MergePanel(face: MergeFace): ReactNode;
 //# sourceMappingURL=Panel.d.ts.map

package/lib/types/client/api.d.ts

@@ -65,7 +65,8 @@ export interface MergeViewPayload {
     };
     notes: string[];
     degraded: boolean;
-    latestRun?: MergeRunView;
+    activeRun?: MergeRunView;
+    lastRun?: MergeRunView;
     approval: MergeApproval;
 }
 export interface RowActionView {
@@ -143,7 +144,7 @@ export interface MergeHistoryItem {
     reason: string;
     reasonCode?: string;
     lastVersion: number;
-    archivedAt: string;
+    archivedAt: string | null;
     sourceRunId?: string;
 }
 export interface MergeStateReadiness {
@@ -177,6 +178,13 @@ export declare const isBlocked: (failure: MergeFailure) => failure is MergeBlock
 export declare function view(): Promise<MergeOutcome<MergeViewPayload>>;
 export declare function rows(queue: MergeQueue, cursor?: string, expiredOnly?: boolean): Promise<MergeOutcome<QueuePage>>;
 export declare function body(name: string, side: 'live' | 'archive', rowId?: string): Promise<MergeOutcome<MergeBody>>;
+export interface MergeDecisionOutcome {
+    readonly ok: boolean;
+    readonly message: string;
+    readonly code?: string;
+    readonly runId?: string;
+}
+export declare function decide(rowId: string, verb: 'approve' | 'reject', sessionId: string): Promise<MergeOutcome<MergeDecisionOutcome>>;
 export declare function history(): Promise<MergeOutcome<{
     items: MergeHistoryItem[];
 }>>;

package/lib/types/client/merge-presentation.d.ts

@@ -0,0 +1,20 @@
+/** Pure presentation decisions for one merge row; no network or store state. */
+export type PairSummary = {
+    readonly kind: 'same';
+    readonly text: string;
+} | {
+    readonly kind: 'different';
+    readonly a: string | null;
+    readonly b: string | null;
+} | {
+    readonly kind: 'missing';
+};
+/**
+ * Compare the two source summaries after trimming. Equal non-empty text is one fact;
+ * missing text stays missing rather than being invented.
+ * @param a - source A summary, or null.
+ * @param b - source B summary, or null.
+ * @returns the presentation form.
+ */
+export declare function summarizePair(a: string | null | undefined, b: string | null | undefined): PairSummary;
+//# sourceMappingURL=merge-presentation.d.ts.map

package/lib/types/client/session.d.ts

@@ -0,0 +1,2 @@
+export declare function currentSessionId(ctx: unknown): string | undefined;
+//# sourceMappingURL=session.d.ts.map

package/lib/types/client/sorting.d.ts

@@ -7,12 +7,12 @@ export interface StorageLike {
 export type RowOrderEdge = 'top' | 'bottom';
 /** Workspace scope for one tab. A missing panel workspace is the local scope. */
 export declare function resolveWorkspaceId(workspaceId: string | null | undefined): string;
-/** Stable localStorage key for one workspace and queue. */
-export declare function rowOrderKey(workspaceId: string | null | undefined, queue: MergeQueue): string;
+/** Stable localStorage key for one workspace, queue and expired filter. */
+export declare function rowOrderKey(workspaceId: string | null | undefined, queue: MergeQueue, expiredOnly?: boolean): string;
 /** One tab's persisted order; failures degrade to an empty (wire) order. */
 export declare function createRowOrderStore(storage?: StorageLike | undefined): {
-    read(workspaceId: string | null | undefined, queue: MergeQueue): readonly string[];
-    write(workspaceId: string | null | undefined, queue: MergeQueue, ids: readonly string[]): void;
+    read(workspaceId: string | null | undefined, queue: MergeQueue, expiredOnly?: boolean): readonly string[];
+    write(workspaceId: string | null | undefined, queue: MergeQueue, ids: readonly string[], expiredOnly?: boolean): void;
 };
 /** Apply persisted ids first, then append unknown rows in their wire order. */
 export declare function orderRows<T extends {

package/package.json

@@ -11,7 +11,7 @@
       ]
     }
   },
-  "version": "0.33.0",
+  "version": "0.35.0",
   "publishConfig": {
     "access": "public"
   },
@@ -51,7 +51,7 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@lmzhen/dsh-evolution-client-kit": "^0.33.0"
+    "@lmzhen/dsh-evolution-client-kit": "^0.35.0"
   },
   "engines": {
     "dsh": ">=0.2.1-rc.2 <0.2.2-0"