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

package/lib/client.js

@@ -272,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;
@@ -628,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;
@@ -647,7 +666,9 @@ window.__ModuleLoader__.load({
 			"degraded": "读模型降级：",
 			"copied": "已复制：",
 			"copyFailed": "复制失败：浏览器没有接受剪贴板写入。",
+			"copyRetry": "重试复制",
 			"row.noSummary": "无摘要",
+			"row.summaryBoth": "双方摘要",
 			"overlay.body": "正文",
 			"hint": "手动触发；后台逐对判定。这里只读，不写技能。",
 			"history": "历史",
@@ -691,6 +712,7 @@ window.__ModuleLoader__.load({
 			"row.failure": "失败",
 			"row.noRetry": "不可重试",
 			"row.copy": "复制命令",
+			"row.more": "更多命令",
 			"tab.expired": "已过期",
 			"row.targetCreated": "新建",
 			"row.verify": "判定状态",
@@ -730,6 +752,7 @@ window.__ModuleLoader__.load({
 			"disabled.unavailable": "暂不可用",
 			"history.empty": "没有历史。",
 			"history.archivedAt": "归档于 {date}",
+			"history.archivedAtUnknown": "归档时间未知",
 			"failureServer": "读取失败",
 			"failureUnauthorized": "未登录",
 			"failureForbidden": "无权访问",
@@ -808,6 +831,9 @@ window.__ModuleLoader__.load({
 			"settings.capabilityDisabled": "当前部署不可用",
 			"settings.readonly": "只读显示；修改请到平台设置页。",
 			"run.title": "运行",
+			"run.progressUnknown": "进度未知",
+			"run.current": "当前运行",
+			"run.last": "上次完成",
 			"run.id": "运行编号",
 			"run.state": "状态",
 			"run.stage": "阶段",
@@ -849,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",
@@ -893,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",
@@ -932,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",
@@ -1010,6 +1040,9 @@ window.__ModuleLoader__.load({
 			"settings.capabilityDisabled": "Not available in this deployment",
 			"settings.readonly": "Read-only here; edit in platform settings.",
 			"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",
@@ -1091,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; }",
@@ -1120,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; }",
@@ -1305,121 +1341,14 @@ 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);
-		}
-		function runNode(view, t, copy) {
+		//#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;
@@ -1441,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",
@@ -1465,7 +1394,10 @@ window.__ModuleLoader__.load({
 				"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",
@@ -1486,45 +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)("p", { "data-role": "settings-path" }, t("settings.openPlatformPath")), (0, react.createElement)(ReadOnlySetting, {
-				section: "merge-approval",
-				label: t("settings.mergeApproval"),
-				value: mergeFallback,
-				disabled: false,
-				missing: false,
-				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"),
-				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, onDecide, busy) {
+		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,
@@ -1534,9 +1489,9 @@ 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.flatMap((action) => {
+			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;
-				const primary = (0, react.createElement)("button", {
+				return (0, react.createElement)("button", {
 					key: action.id,
 					type: "button",
 					"data-role": decision ? "row-decision" : "row-action",
@@ -1550,18 +1505,6 @@ window.__ModuleLoader__.load({
 						else copy(action.command);
 					}
 				}, decision ? t("decision." + action.id) : t("action." + action.id));
-				if (!decision) return [primary];
-				return [primary, (0, react.createElement)("button", {
-					key: action.id + "-copy",
-					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"))];
 			});
 			return (0, react.createElement)("div", {
 				key: row.id,
@@ -1633,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") {
@@ -1712,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,
@@ -1909,7 +1996,15 @@ window.__ModuleLoader__.load({
 				"data-role": "rows",
 				id: "merge-rows",
 				role: "tabpanel"
-			}, visibleRows.map((row) => rowNode(row, t, copy, sortHandlers, openBody, face.decide === void 0 ? void 0 : decideRow, deciding === row.id))) : 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;
@@ -1987,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")), notice, 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",

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;

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

@@ -144,7 +144,7 @@ export interface MergeHistoryItem {
     reason: string;
     reasonCode?: string;
     lastVersion: number;
-    archivedAt: string;
+    archivedAt: string | null;
     sourceRunId?: string;
 }
 export interface MergeStateReadiness {

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/package.json

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