@lmzhen/dsh-evolution-merge-ui 0.36.2 → 0.37.1

package/lib/client.js

@@ -134,6 +134,22 @@ window.__ModuleLoader__.load({
 				return EMPTY;
 			}
 		}
+		/**
+		* Classify one refused write from the exact route's response: the route answers 409 for a revision
+		* CAS loss and 400 with an "invalid config" error for a schema refusal, so the card can name the
+		* right cause instead of calling every refusal a concurrent edit.
+		* @param response - the non-ok response.
+		* @returns the refusal class; anything the route did not name stays transport.
+		*/
+		async function refusalKind(response) {
+			if (response.status === 409) return "conflict";
+			try {
+				const body = await response.json();
+				return typeof body.error === "string" && body.error.startsWith("invalid config") ? "validation" : "transport";
+			} catch {
+				return "transport";
+			}
+		}
 		async function write(namespace, ops, expectedRevision) {
 			try {
 				const response = await fetch(SETTINGS_MUTATE, {
@@ -148,14 +164,20 @@ window.__ModuleLoader__.load({
 						...expectedRevision === void 0 ? {} : { expectedRevision }
 					})
 				});
-				if (!response.ok) return { ok: false };
+				if (!response.ok) return {
+					ok: false,
+					kind: await refusalKind(response)
+				};
 				const body = await response.json();
 				return {
 					ok: body.ok === true,
 					snapshot: snapshotFrom(body.data, namespace)
 				};
 			} catch {
-				return { ok: false };
+				return {
+					ok: false,
+					kind: "transport"
+				};
 			}
 		}
 		function createForm(namespace, ctx) {
@@ -219,6 +241,15 @@ window.__ModuleLoader__.load({
 					op: "unset",
 					path: [field]
 				}]),
+				save: async (ops, expectedRevision) => {
+					const outcome = await write(namespace, ops, expectedRevision ?? snapshot.revision);
+					if (outcome.snapshot !== void 0) absorb(outcome.snapshot);
+					else await refresh();
+					return outcome.ok ? { written: true } : {
+						written: false,
+						kind: outcome.kind ?? "transport"
+					};
+				},
 				mutate: async (ops, expectedRevision) => {
 					const outcome = await write(namespace, ops, expectedRevision ?? snapshot.revision);
 					if (outcome.snapshot !== void 0) absorb(outcome.snapshot);
@@ -273,6 +304,20 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region ../evolution-client-kit/src/format.ts
+		/** Parse an ISO string, epoch ms, or null into a valid Date; null when absent/invalid. */
+		function toLocalDate(value) {
+			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);
+			return Number.isNaN(date.getTime()) ? null : date;
+		}
+		const pad = (part) => String(part).padStart(2, "0");
+		/** The local clock part, HH:MM[:SS]. */
+		function clockOf(date, options) {
+			const head = pad(date.getHours()) + ":" + pad(date.getMinutes());
+			return options.seconds === false ? head : head + ":" + pad(date.getSeconds());
+		}
 		/**
 		* Format an ISO string, epoch milliseconds, or null as local wall time.
 		* Invalid values return null; callers decide how to say "unknown".
@@ -281,14 +326,9 @@ window.__ModuleLoader__.load({
 		* @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());
+			const date = toLocalDate(value);
+			if (date === null) return null;
+			return String(date.getFullYear()) + "-" + pad(date.getMonth() + 1) + "-" + pad(date.getDate()) + " " + clockOf(date, options);
 		}
 		//#endregion
 		//#region ../evolution-client-kit/src/notice.ts
@@ -296,7 +336,7 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region ../evolution-client-kit/src/presentation/decision-frame.ts
 		/** One decision card: title, facts, at most one primary, secondary actions and details. */
-		function actionButton(action, role) {
+		function actionButton$1(action, role) {
 			return (0, react.createElement)("button", {
 				key: action.id,
 				type: "button",
@@ -324,7 +364,7 @@ window.__ModuleLoader__.load({
 			}, (0, react.createElement)("h2", { "data-role": "decision-title" }, decision.title), decision.summary === void 0 || decision.summary === "" ? null : (0, react.createElement)("p", { "data-role": "decision-summary" }, decision.summary), decision.facts.length === 0 ? null : (0, react.createElement)("dl", { "data-role": "decision-facts" }, decision.facts.map((fact) => (0, react.createElement)("div", {
 				key: fact.label,
 				"data-role": "decision-fact"
-			}, (0, react.createElement)("dt", null, fact.label), (0, react.createElement)("dd", null, fact.value)))), decision.details === void 0 ? null : (0, react.createElement)("div", { "data-role": "decision-details" }, decision.details), decision.primary === void 0 && secondary.length === 0 ? null : (0, react.createElement)("div", { "data-role": "decision-actions" }, decision.primary === void 0 ? null : actionButton(decision.primary, "primary"), secondary.map((action) => actionButton(action, "secondary"))));
+			}, (0, react.createElement)("dt", null, fact.label), (0, react.createElement)("dd", null, fact.value)))), decision.details === void 0 ? null : (0, react.createElement)("div", { "data-role": "decision-details" }, decision.details), decision.primary === void 0 && secondary.length === 0 ? null : (0, react.createElement)("div", { "data-role": "decision-actions" }, decision.primary === void 0 ? null : actionButton$1(decision.primary, "primary"), secondary.map((action) => actionButton$1(action, "secondary"))));
 		}
 		//#endregion
 		//#region ../evolution-client-kit/src/presentation/task-banner.ts
@@ -348,6 +388,30 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region ../evolution-client-kit/src/presentation/empty-state.ts
 		/** A compact completed/empty state with at most one primary next step. */
+		function actionButton(action, role) {
+			return (0, react.createElement)("button", {
+				key: action.id,
+				type: "button",
+				"data-role": role === "primary" ? "empty-primary" : "empty-secondary",
+				"data-action": action.id,
+				...action.attributes ?? {},
+				disabled: action.disabled === true || action.busy === true,
+				title: action.title ?? action.label,
+				onClick: () => {
+					if (action.disabled !== true && action.busy !== true) action.onSelect();
+				}
+			}, action.label);
+		}
+		/** Render a quiet empty state; loading/failure remain the caller's separate states. */
+		function EmptyState({ title, description, tone = "neutral", primary, secondary, className, variant = "default" }) {
+			const actions = primary === void 0 && secondary === void 0 ? null : (0, react.createElement)("div", { "data-role": "empty-actions" }, primary === void 0 ? null : actionButton(primary, "primary"), secondary === void 0 ? null : actionButton(secondary, "secondary"));
+			return (0, react.createElement)("section", {
+				"data-role": "empty-state",
+				"data-tone": tone,
+				...variant === "default" ? {} : { "data-variant": variant },
+				...className === void 0 ? {} : { className }
+			}, (0, react.createElement)("h2", { "data-role": "empty-title" }, title), description === void 0 || description === "" ? null : (0, react.createElement)("p", { "data-role": "empty-description" }, description), actions);
+		}
 		//#endregion
 		//#region ../evolution-client-kit/src/presentation/disclosure-group.ts
 		/** A native details group for normal/secondary facts. */
@@ -779,11 +843,13 @@ window.__ModuleLoader__.load({
 		const NS = "evolution-merge";
 		const zh = {
 			"entry.label": "技能合并",
+			"session.missing": "没有当前会话；请打开会话后重试",
+			"decide.failed": "审批请求失败",
 			"title": "合并建议",
 			"task.pending": "条合并建议待处理",
-			"start.scan": "复制扫描命令",
-			"start.pair": "复制配对命令模板",
-			"degraded": "读模型降级：",
+			"start.scan": "复制查找重复技能的命令",
+			"start.pair": "复制配对命令",
+			"degraded": "读取结果不完整：",
 			"copied": "已复制：",
 			"copyFailed": "复制失败：浏览器没有接受剪贴板写入。",
 			"copyRetry": "重试复制",
@@ -798,7 +864,7 @@ window.__ModuleLoader__.load({
 			"tab.fuse": "待合并",
 			"tab.skipped": "无需合并",
 			"empty.verify": "没有待判断的对。",
-			"empty.scope": "这里只做两轮合成；机械追加属于 skill 管理，不进入合并队列。",
+			"empty.scope": "这里只处理两轮合并；单纯追加内容属于技能管理，不会进入合并队列。",
 			"empty.pending": "没有待批准的合并。",
 			"empty.fuse": "没有待合并的对。",
 			"empty.skipped": "没有标记为无需合并的对。",
@@ -810,10 +876,10 @@ window.__ModuleLoader__.load({
 			"approval.off": "审批关：合并自动执行。",
 			"failed": "读取失败，保留上次结果。",
 			"blocked.title": "合并状态未就绪",
-			"blocked.hint": "迁移/备份修复后刷新；面板不会自动降级。",
+			"blocked.hint": "修好合并数据后再刷新；面板不会自动退回旧数据。",
 			"blocked.doctor": "复制诊断命令",
 			"blocked.detail": "查看原始信息",
-			"blocked.reason.migration-blocked": "合并状态需要迁移，面板已暂停读取。",
+			"blocked.reason.migration-blocked": "合并数据需要升级，面板已暂停读取。",
 			"blocked.reason.needs-repair": "合并状态需要修复，面板已暂停读取。",
 			"blocked.reason.forward-only": "合并状态版本过新，当前面板暂不支持。",
 			"blocked.reason.unknown": "合并状态未就绪，面板已暂停读取。",
@@ -853,18 +919,18 @@ window.__ModuleLoader__.load({
 			"skipKind.human-reject": "人工拒绝",
 			"skipKind.over-limit": "超限",
 			"skipKind.forced": "强制",
-			"action.approve": "复制批准",
-			"action.reject": "复制拒绝",
+			"action.approve": "复制批准命令",
+			"action.reject": "复制拒绝命令",
 			"decision.approve": "批准",
 			"decision.reject": "拒绝",
-			"action.retry-candidates": "复制重试候选",
-			"action.retry-resume": "重试续跑",
-			"action.discard": "复制丢弃",
+			"action.retry-candidates": "复制重试命令",
+			"action.retry-resume": "复制继续运行命令",
+			"action.discard": "复制丢弃命令",
 			"action.restore": "复制恢复命令",
 			"action.pair": "复制配对",
 			"action.status": "复制状态命令",
 			"action.report": "复制报告命令",
-			"action.cancel": "取消",
+			"action.cancel": "复制取消命令",
 			"action.confirm": "确认复制",
 			"disabled.expired": "已过期，不可用",
 			"disabled.invalid": "状态不允许",
@@ -878,9 +944,9 @@ window.__ModuleLoader__.load({
 			"failureServer": "读取失败",
 			"failureUnauthorized": "未登录",
 			"failureForbidden": "无权访问",
-			"failureUnmounted": "宿主未挂载",
+			"failureUnmounted": "功能未启用",
 			"failureCapability": "子代理通道不可用",
-			"failureCapabilityHint": "先运行全局诊断，或复制下方命令继续处理。preset/host-only 形态没有面板时仍可用这些命令兜底。",
+			"failureCapabilityHint": "先运行全局诊断，或复制下方命令继续处理。没有面板的安装方式（preset / host-only）仍可用这些命令。",
 			"failureBodyAmbiguous": "同名技能匹配到多行，无法确定读取哪一个；请用唯一名称或从具体行打开。",
 			"fallbackHint": "可复制命令见下方",
 			"body.missing": "正文不存在或不可读。",
@@ -932,6 +998,7 @@ window.__ModuleLoader__.load({
 			"history.reason.archived": "已归档",
 			"history.reason.unknown": "原因未提供",
 			"history.lastVersion": "最后版本",
+			"history.sourceRunId": "来源运行",
 			"body.truncated": "正文过长，已截断。",
 			"body.empty": "正文为空。",
 			"body.totalBytes": "总字节",
@@ -991,11 +1058,13 @@ window.__ModuleLoader__.load({
 		});
 		const en = {
 			"entry.label": "Skill merge",
+			"session.missing": "No current session; open a session and try again",
+			"decide.failed": "The approval request failed",
 			"title": "Merge suggestions",
 			"task.pending": "merge suggestions need attention",
-			"start.scan": "Copy scan command",
-			"start.pair": "Copy pair command template",
-			"degraded": "Degraded read model:",
+			"start.scan": "Copy the find-duplicate-skills command",
+			"start.pair": "Copy the pair command",
+			"degraded": "Incomplete read:",
 			"copied": "Copied:",
 			"copyFailed": "Copy failed: the browser did not accept the clipboard write.",
 			"copyRetry": "Retry copy",
@@ -1010,7 +1079,7 @@ window.__ModuleLoader__.load({
 			"tab.fuse": "Ready to merge",
 			"tab.skipped": "Skipped",
 			"empty.verify": "No pairs to judge.",
-			"empty.scope": "This panel only performs two-round synthesis; mechanical append belongs to skill management and does not enter the merge queue.",
+			"empty.scope": "Only two-round merges are handled here; plain appends belong to skill management and never enter this queue.",
 			"empty.pending": "No pending merges.",
 			"empty.fuse": "No pairs ready to merge.",
 			"empty.skipped": "No pairs marked as not worth merging.",
@@ -1022,10 +1091,10 @@ window.__ModuleLoader__.load({
 			"approval.off": "Approval off: merges run automatically.",
 			"failed": "Read failed; keeping the last result.",
 			"blocked.title": "Merge state blocked",
-			"blocked.hint": "Fix the migration/backup, then refresh. The panel does not fall back automatically.",
+			"blocked.hint": "Fix the merge data and refresh; the panel will not fall back to older data by itself.",
 			"blocked.doctor": "Copy diagnostics command",
 			"blocked.detail": "Show host message",
-			"blocked.reason.migration-blocked": "Merge state needs migration; the panel is paused.",
+			"blocked.reason.migration-blocked": "The merge data needs an upgrade; reading is paused.",
 			"blocked.reason.needs-repair": "Merge state needs repair; the panel is paused.",
 			"blocked.reason.forward-only": "Merge state was written by a newer version; this panel cannot read it.",
 			"blocked.reason.unknown": "Merge state is not ready; the panel is paused.",
@@ -1065,18 +1134,18 @@ window.__ModuleLoader__.load({
 			"skipKind.human-reject": "human reject",
 			"skipKind.over-limit": "over limit",
 			"skipKind.forced": "forced",
-			"action.approve": "Copy approve",
-			"action.reject": "Copy reject",
+			"action.approve": "Copy approve command",
+			"action.reject": "Copy reject command",
 			"decision.approve": "Approve",
 			"decision.reject": "Reject",
-			"action.retry-candidates": "Copy retry candidates",
-			"action.retry-resume": "Retry resume",
-			"action.discard": "Copy discard",
+			"action.retry-candidates": "Copy retry command",
+			"action.retry-resume": "Copy resume command",
+			"action.discard": "Copy discard command",
 			"action.restore": "Copy restore command",
 			"action.pair": "Copy pair",
 			"action.status": "Copy status command",
 			"action.report": "Copy report command",
-			"action.cancel": "Cancel",
+			"action.cancel": "Copy cancel command",
 			"action.confirm": "Copy confirmation",
 			"disabled.expired": "expired",
 			"disabled.invalid": "invalid state",
@@ -1090,9 +1159,9 @@ window.__ModuleLoader__.load({
 			"failureServer": "Read failed",
 			"failureUnauthorized": "Not signed in",
 			"failureForbidden": "Forbidden",
-			"failureUnmounted": "Host not mounted",
+			"failureUnmounted": "Feature not enabled",
 			"failureCapability": "Subagent channel unavailable",
-			"failureCapabilityHint": "Run global diagnostics first, or copy a command below to continue. The command fallback also covers preset/host-only shapes without a panel.",
+			"failureCapabilityHint": "Run the global diagnostics first, or copy a command below. Installs without the panel (preset / host-only) can still use these commands.",
 			"failureBodyAmbiguous": "The skill name matches multiple rows, so the body is ambiguous. Use a unique name or open it from a specific row.",
 			"fallbackHint": "Copy the command below",
 			"body.missing": "Body missing or unreadable.",
@@ -1144,6 +1213,7 @@ window.__ModuleLoader__.load({
 			"history.reason.archived": "archived",
 			"history.reason.unknown": "reason not provided",
 			"history.lastVersion": "Last version",
+			"history.sourceRunId": "Source run",
 			"body.truncated": "Body is truncated.",
 			"body.empty": "Body is empty.",
 			"body.totalBytes": "Total bytes",
@@ -1235,14 +1305,15 @@ window.__ModuleLoader__.load({
 		//#region src/client/styles.ts
 		const CSS_TAG_ID = "evolution-merge-panel";
 		const CSS = [
-			":where(.evolution-merge-panel) { --evo-type-lg:calc(1em + 2px);--evo-type-body:1em;--evo-type-sm:calc(1em - 1px);--evo-type-xs:calc(1em - 2px);--evo-space-2:2px;--evo-space-4:4px;--evo-space-6:6px;--evo-space-8:8px;--evo-space-10:10px;--evo-space-12:12px;--evo-space-14:14px;--evo-space-16:16px;--evo-space-20:20px;--evo-radius-chip:4px;--evo-radius-control:8px;--evo-radius-surface:12px;--evo-radius-pill:999px;--evo-hairline-width:.5px;--evo-hairline-marker:2px;--evo-measure-read:80ch;--evo-leading-base:1.5;--evo-tone-quiet:var(--dsw-alias-label-secondary);--evo-tone-primary:var(--dsw-alias-brand-primary);--evo-tone-danger:var(--dsw-alias-state-error-primary);--evo-tone-success:var(--dsw-alias-state-success-primary);--evo-focus-ring:2px solid var(--dsw-alias-label-primary);--evo-focus-offset:-2px;--evo-cap-aside:280px;--evo-cap-block:260px }",
+			":where(.evolution-merge-panel,.evo-merge-modal) { --evo-type-lg:calc(1em + 2px);--evo-type-body:1em;--evo-type-sm:calc(1em - 1px);--evo-type-xs:calc(1em - 2px);--evo-space-2:2px;--evo-space-4:4px;--evo-space-6:6px;--evo-space-8:8px;--evo-space-10:10px;--evo-space-12:12px;--evo-space-14:14px;--evo-space-16:16px;--evo-space-20:20px;--evo-radius-chip:4px;--evo-radius-control:8px;--evo-radius-surface:12px;--evo-radius-pill:999px;--evo-hairline-width:.5px;--evo-hairline-marker:2px;--evo-measure-read:80ch;--evo-leading-base:1.5;--evo-tone-quiet:var(--dsw-alias-label-secondary);--evo-tone-primary:var(--dsw-alias-brand-primary);--evo-tone-danger:var(--dsw-alias-state-error-primary);--evo-tone-success:var(--dsw-alias-state-success-primary);--evo-focus-ring:2px solid var(--dsw-alias-label-primary);--evo-focus-offset:-2px;--evo-cap-aside:280px;--evo-cap-block:260px }",
 			".evolution-merge-panel { display:flex; flex-direction:column; gap:var(--evo-space-12); padding:var(--evo-space-16); color:var(--dsw-alias-label-primary); font-size:var(--evo-type-sm); line-height:var(--evo-leading-base); }",
 			".evolution-merge-panel [data-role=\"hint\"] { margin:0; color:var(--dsw-alias-label-tertiary); font-size:var(--evo-type-xs); }",
 			".evolution-merge-panel [data-role=\"stats\"] { display:flex; gap:var(--evo-space-8); flex-wrap:wrap; }",
 			".evolution-merge-panel [data-role=\"stat\"] { border:var(--evo-hairline-width) solid var(--dsw-alias-border-l2); border-radius:var(--evo-radius-control); padding:var(--evo-space-6) var(--evo-space-10); min-width:calc(var(--evo-space-16) * 4); }",
 			".evolution-merge-panel [data-role=\"stat-value\"] { font-size:var(--evo-type-lg); font-weight:600; }",
 			".evolution-merge-panel [data-role=\"stat-label\"] { font-size:var(--evo-type-xs); color:var(--dsw-alias-label-tertiary); }",
-			".evolution-merge-panel [data-role=\"tabs\"] { display:flex; flex-wrap:wrap; gap:var(--evo-space-6); border-bottom:var(--evo-hairline-width) solid var(--dsw-alias-border-l2); }",
+			".evolution-merge-panel [data-role=\"queue-head\"] { display:flex; align-items:flex-end; justify-content:space-between; gap:var(--evo-space-8); border-bottom:var(--evo-hairline-width) solid var(--dsw-alias-border-l2); }",
+			".evolution-merge-panel [data-role=\"tabs\"] { display:flex; flex-wrap:wrap; gap:var(--evo-space-6); flex:1 1 auto; min-width:0; }",
 			".evolution-merge-panel [data-role=\"tab\"] { background:none; border:0; border-bottom:var(--evo-hairline-width) solid transparent; padding:var(--evo-space-6) var(--evo-space-8); cursor:pointer; color:inherit; }",
 			".evolution-merge-panel [data-role=\"tab\"][data-active=\"true\"] { border-bottom-color:var(--dsw-alias-brand-primary); }",
 			".evolution-merge-panel button:focus-visible { outline:2px solid currentColor !important; outline-offset:2px; box-shadow:0 0 0 2px currentColor !important; }",
@@ -1273,19 +1344,26 @@ window.__ModuleLoader__.load({
 			".evolution-merge-panel .merge-decision [data-role=\"decision-primary\"]:disabled, .evolution-merge-panel .merge-decision [data-role=\"decision-secondary\"]:disabled, .evolution-merge-panel .merge-decision [data-role=\"view-both\"]:disabled { color:var(--dsw-alias-label-dimmed); cursor:default; }",
 			".evolution-merge-panel .merge-decision [data-role=\"decision-details\"] { display:flex; flex-direction:column; gap:var(--evo-space-4); }",
 			".evolution-merge-panel [data-role=\"row-actions\"] { display:flex; align-items:center; justify-content:flex-end; gap:var(--evo-space-8); }",
-			".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\"] { display:inline-flex; align-items:center; flex:0 0 auto; align-self:center; gap:var(--evo-space-4); margin-bottom:var(--evo-space-4); border:var(--evo-hairline-width) solid var(--dsw-alias-border-l2); 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; }",
 			".evolution-merge-panel [data-role=\"overlay\"] { position:fixed; z-index:60; top:8vh; left:50%; transform:translateX(-50%); width:min(820px, calc(100vw - 64px)); max-height:78vh; overflow:auto; display:flex; flex-direction:column; gap:var(--evo-space-8); padding:var(--evo-space-12); border:var(--evo-hairline-width) solid var(--dsw-alias-border-l2); border-radius:var(--evo-radius-control); background:var(--dsw-alias-bg-layer-1); box-shadow:0 0 var(--evo-space-8) var(--dsw-alias-border-l2); }",
 			".evo-merge-modal { width:min(820px, calc(100vw - 48px)); max-width:calc(100vw - 48px); max-height:min(78vh, 720px); }",
-			".evo-merge-modal [data-role=\"overlay\"][data-platform-modal] { position:static; z-index:auto; top:auto; left:auto; transform:none; width:auto; box-sizing:border-box; max-height:none; overflow:auto; padding:var(--evo-space-20); border:0; border-radius:0; background:transparent; box-shadow:none; gap:var(--evo-space-8); }",
+			".evo-merge-modal [data-role=\"overlay\"][data-platform-modal] { position:static; z-index:auto; top:auto; left:auto; transform:none; width:auto; box-sizing:border-box; max-height:none; overflow:auto; padding:var(--evo-space-20); border:0; border-radius:0; box-shadow:none; background:var(--dsw-alias-bg-overlay); gap:var(--evo-space-8); }",
 			".evo-merge-modal [data-role=\"overlay-head\"] { display:flex; align-items:center; justify-content:space-between; gap:var(--evo-space-8); }",
 			".evo-merge-modal [data-role=\"overlay-title\"] { margin:0; font-size:var(--evo-type-lg); }",
 			".evo-merge-modal [data-role=\"body-text\"] { margin:0; max-height:52vh; overflow:auto; white-space:pre-wrap; }",
-			".evo-merge-modal [data-role=\"history-list\"] { margin:0; padding-left:var(--evo-space-20); }",
-			".evo-merge-modal [data-role=\"history-item\"] { padding:var(--evo-space-4) 0; }",
+			".evo-merge-modal [data-role=\"history-list\"] { display:flex; flex-direction:column; gap:var(--evo-space-8); margin:0; padding:0; list-style:none; max-height:56vh; overflow:auto; }",
+			".evo-merge-modal [data-role=\"history-item\"] { display:flex; flex-direction:column; gap:var(--evo-space-4); padding:var(--evo-space-10) var(--evo-space-12); border:var(--evo-hairline-width) solid var(--dsw-alias-border-l2); border-radius:var(--evo-radius-control); background:var(--dsw-alias-bg-layer-2); }",
+			".evo-merge-modal [data-role=\"history-item-head\"] { display:flex; flex-wrap:wrap; align-items:center; gap:var(--evo-space-4) var(--evo-space-8); }",
+			".evo-merge-modal [data-role=\"history-item-name\"] { min-width:0; font-weight:600; overflow-wrap:anywhere; }",
+			".evo-merge-modal [data-role=\"history-item-kind\"] { flex:none; padding:var(--evo-space-2) var(--evo-space-6); border-radius:var(--evo-radius-pill); background:var(--dsw-alias-bg-layer-3); color:var(--dsw-alias-label-secondary); font-size:var(--evo-type-xs); }",
+			".evo-merge-modal [data-role=\"history-item-meta\"] { display:flex; flex-wrap:wrap; gap:var(--evo-space-4) var(--evo-space-8); color:var(--dsw-alias-label-tertiary); font-size:var(--evo-type-xs); }",
+			".evo-merge-modal [data-role=\"history-item-source\"], .evo-merge-modal [data-role=\"history-item-reason\"] { margin:0; color:var(--dsw-alias-label-secondary); overflow-wrap:anywhere; }",
+			".evo-merge-modal [data-role=\"overlay-close\"] { min-width:calc(var(--evo-space-20) + var(--evo-space-4)); min-height:calc(var(--evo-space-20) + var(--evo-space-4)); }",
+			".evolution-merge-panel [data-role=\"footer-tools\"] { display:flex; flex-wrap:wrap; align-items:center; gap:var(--evo-space-6) var(--evo-space-8); padding-top:var(--evo-space-8); border-top:var(--evo-hairline-width) solid var(--dsw-alias-border-l2); }",
 			".evolution-merge-panel [data-role=\"overlay-head\"] { display:flex; align-items:center; justify-content:space-between; gap:var(--evo-space-8); }",
 			".evolution-merge-panel [data-role=\"overlay-title\"] { margin:0; font-size:var(--evo-type-lg); }",
 			".evolution-merge-panel [data-role=\"rows\"] { display:flex; flex-direction:column; gap:var(--evo-space-6); }",
@@ -1539,7 +1617,10 @@ window.__ModuleLoader__.load({
 		//#region src/client/MergeRow.ts
 		/** One merge row: summary, stage, facts, one primary decision and the copy/sort drawer. */
 		function reasonText$1(t, reasonCode, fallback) {
-			return reasonCode === void 0 ? fallback : t("history.reason." + reasonCode);
+			if (reasonCode === void 0) return fallback;
+			const key = "history.reason." + reasonCode;
+			const text = t(key);
+			return text === key ? fallback : text;
 		}
 		function summaryNode(row, t) {
 			if (row.state !== "pending" || row.summary === void 0) return null;
@@ -1722,7 +1803,7 @@ window.__ModuleLoader__.load({
 				onClick: () => {
 					if (!busy) copy(action.command);
 				}
-			}, t("row.copy") + " " + t("action." + action.id))))));
+			}, t("action." + action.id))))));
 		}
 		//#endregion
 		//#region src/client/MergeSettings.ts
@@ -1766,6 +1847,27 @@ window.__ModuleLoader__.load({
 			})));
 		}
 		//#endregion
+		//#region src/client/HistoryItemRow.ts
+		/** Structured rows for the read-only merge archive; the modal owns focus and scrolling. */
+		function reasonText(t, item) {
+			if (item.reasonCode !== void 0) {
+				const key = "history.reason." + item.reasonCode;
+				const text = t(key);
+				if (text !== key) return text;
+			}
+			return item.reason;
+		}
+		/** One archive entry: identity and outcome, version/time, then source or reason. */
+		function HistoryItemRow({ item, t }) {
+			const kind = t("history.kind." + item.kind);
+			const reason = reasonText(t, item);
+			const archived = item.archivedAt === null ? t("history.archivedAtUnknown") : t("history.archivedAt", { date: formatLocalDateTime(item.archivedAt) ?? t("history.archivedAtUnknown") });
+			return (0, react.createElement)("li", { "data-role": "history-item" }, (0, react.createElement)("div", { "data-role": "history-item-head" }, (0, react.createElement)("span", { "data-role": "history-item-name" }, item.name), (0, react.createElement)("span", {
+				"data-role": "history-item-kind",
+				"data-kind": item.kind
+			}, kind)), (0, react.createElement)("div", { "data-role": "history-item-meta" }, (0, react.createElement)("span", { "data-role": "history-item-version" }, "v" + String(item.lastVersion)), (0, react.createElement)("span", { "data-role": "history-item-archived" }, archived)), item.sourceRunId === void 0 ? null : (0, react.createElement)("p", { "data-role": "history-item-source" }, t("history.sourceRunId") + " " + item.sourceRunId), reason === "" || reason === kind ? null : (0, react.createElement)("p", { "data-role": "history-item-reason" }, reason));
+		}
+		//#endregion
 		//#region src/client/fallbacks.ts
 		/** Static command-face fallback for a Facts read failure; the API fallback is unavailable then. */
 		const FALLBACK_COMMANDS = [
@@ -1803,12 +1905,6 @@ window.__ModuleLoader__.load({
 				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";
@@ -1961,14 +2057,14 @@ window.__ModuleLoader__.load({
 				"data-role": "overlay-close",
 				...Modal === void 0 ? { autoFocus: true } : { "data-modal-autofocus": "true" },
 				onClick: onClose
-			}, t("close"))), overlay.status === "loading" ? (0, react.createElement)("p", { "data-role": "overlay-loading" }, t("loading")) : null, overlay.status === "error" && overlay.failure !== void 0 ? failureNode(t, overlay.failure, [], () => {}) : null, overlay.status === "ready" ? overlay.items === void 0 || overlay.items.length === 0 ? (0, react.createElement)("p", { "data-role": "history-empty" }, t("history.empty")) : (0, react.createElement)("ul", { "data-role": "history-list" }, overlay.items.map((item) => (0, react.createElement)("li", {
-				key: item.name + ":" + item.archivedAt,
-				"data-role": "history-item"
-			}, item.name + " · " + (() => {
-				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) + " · " + (item.archivedAt === null ? t("history.archivedAtUnknown") : t("history.archivedAt", { date: formatLocalDateTime(item.archivedAt) ?? t("history.archivedAtUnknown") }))))) : null);
+			}, t("close"))), overlay.status === "loading" ? (0, react.createElement)("p", { "data-role": "overlay-loading" }, t("loading")) : null, overlay.status === "error" && overlay.failure !== void 0 ? failureNode(t, overlay.failure, [], () => {}) : null, overlay.status === "ready" ? overlay.items === void 0 || overlay.items.length === 0 ? (0, react.createElement)(EmptyState, {
+				title: t("history.empty"),
+				variant: "compact"
+			}) : (0, react.createElement)("ul", { "data-role": "history-list" }, overlay.items.map((item) => (0, react.createElement)(HistoryItemRow, {
+				key: item.name + ":" + String(item.archivedAt),
+				item,
+				t
+			}))) : null);
 			return Modal === void 0 ? inner : (0, react.createElement)(Modal, {
 				open: true,
 				onClose,
@@ -2114,6 +2210,22 @@ window.__ModuleLoader__.load({
 				saveOrder(pinRow(visibleRows.map((row) => row.id), menu.id, edge));
 				setMenu(void 0);
 			};
+			(0, react.useEffect)(() => {
+				if (menu === void 0 || PLATFORM_MENU !== void 0) return;
+				const onKey = (event) => {
+					if (event.key === "Escape") setMenu(void 0);
+				};
+				const onPointer = (event) => {
+					const target = event.target;
+					if (!(target instanceof Element) || target.closest("[data-role=\"sort-menu\"]") === null) setMenu(void 0);
+				};
+				window.addEventListener("keydown", onKey);
+				window.addEventListener("pointerdown", onPointer, true);
+				return () => {
+					window.removeEventListener("keydown", onKey);
+					window.removeEventListener("pointerdown", onPointer, true);
+				};
+			}, [menu]);
 			const onTabKey = (event, current) => {
 				const delta = event.key === "ArrowRight" ? 1 : event.key === "ArrowLeft" ? -1 : 0;
 				const isEdge = event.key === "Home" || event.key === "End";
@@ -2187,8 +2299,8 @@ window.__ModuleLoader__.load({
 				zIndex: 70,
 				minWidth: "160px",
 				maxWidth: "min(320px, calc(100vw - 16px))",
-				left: String(Math.min(menu.x, Math.max(0, (globalThis.innerWidth || 1440) - 180))) + "px",
-				top: String(Math.min(menu.y, Math.max(0, (globalThis.innerHeight || 800) - 110))) + "px"
+				left: String(Math.min(menu.x, Math.max(0, (globalThis.innerWidth || 1440) - 320))) + "px",
+				top: String(Math.min(menu.y, Math.max(0, (globalThis.innerHeight || 800) - 220))) + "px"
 			};
 			const menuNode = menu === void 0 ? null : PLATFORM_MENU === void 0 ? (0, react.createElement)("div", {
 				"data-role": "sort-menu",
@@ -2258,7 +2370,7 @@ window.__ModuleLoader__.load({
 				onClick: () => {
 					if (copyState.text !== void 0) copy(copyState.text);
 				}
-			}, t("copyRetry"))), notice, list, tabs, expiredToggle, empty, queue.nextCursor === void 0 || uiState !== "ready" ? null : (0, react.createElement)("button", {
+			}, t("copyRetry"))), notice, (0, react.createElement)("div", { "data-role": "queue-head" }, tabs, expiredToggle), list, empty, queue.nextCursor === void 0 || uiState !== "ready" ? null : (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "load-more",
 				disabled: queue.status === "loading",
@@ -2272,7 +2384,7 @@ window.__ModuleLoader__.load({
 				view,
 				t,
 				copy
-			}), view.degraded ? (0, react.createElement)("p", { "data-role": "degraded" }, t("degraded") + " " + view.notes.join(",")) : null, (0, react.createElement)("div", { "data-role": "start" }, (0, react.createElement)("button", {
+			}), view.degraded ? (0, react.createElement)("p", { "data-role": "degraded" }, t("degraded") + " " + view.notes.join(",")) : null, (0, react.createElement)("div", { "data-role": "footer-tools" }, (0, react.createElement)("div", { "data-role": "start" }, (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "start-scan",
 				onClick: () => {
@@ -2296,13 +2408,13 @@ window.__ModuleLoader__.load({
 				onClick: () => {
 					copy(doctorCommand);
 				}
-			}, t("doctor.open")), overlay === void 0 ? null : overlay.kind === "body" ? bodyNode(overlay, t, closeOverlay) : overlay.kind === "pair" ? pairNode(overlay, t, closeOverlay) : historyNode(overlay, t, closeOverlay), (0, react.createElement)("button", {
+			}, t("doctor.open")), (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "refresh",
 				onClick: () => {
 					store.refresh();
 				}
-			}, t("refresh")), menuNode));
+			}, t("refresh"))), overlay === void 0 ? null : overlay.kind === "body" ? bodyNode(overlay, t, closeOverlay) : overlay.kind === "pair" ? pairNode(overlay, t, closeOverlay) : historyNode(overlay, t, closeOverlay), menuNode));
 		}
 		//#endregion
 		//#region src/client/MergeStore.ts
@@ -2769,14 +2881,14 @@ window.__ModuleLoader__.load({
 							const sessionId = currentSessionId(ctx);
 							if (sessionId === void 0) return {
 								ok: false,
-								message: "没有当前会话；请打开会话后重试"
+								message: t("session.missing")
 							};
 							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 : "审批请求失败"
+								message: "message" in failure && typeof failure.message === "string" ? failure.message : t("decide.failed")
 							};
 						},
 						...workspaceId === void 0 ? {} : { workspaceId }

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

@@ -0,0 +1,11 @@
+/** Structured rows for the read-only merge archive; the modal owns focus and scrolling. */
+import { type ReactNode } from 'react';
+import type { MergeHistoryItem } from './api.ts';
+type Translate = (key: string, values?: Readonly<Record<string, string | number>>) => string;
+/** One archive entry: identity and outcome, version/time, then source or reason. */
+export declare function HistoryItemRow({ item, t }: {
+    item: MergeHistoryItem;
+    t: Translate;
+}): ReactNode;
+export {};
+//# sourceMappingURL=HistoryItemRow.d.ts.map

package/package.json

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