@lmzhen/dsh-evolution-merge-ui 0.32.4 → 0.32.6

package/README.md

@@ -1,11 +1,7 @@
 # @lmzhen/dsh-evolution-merge-ui
 
-Browser-only sidebar panel for the merge queues. It reads the four host routes
-and never writes skills: row actions are copyable `/evolution merge ...`
-commands.
+Skill-merge view inside the shared evolution workbench. It ships only in the `all` installation form.
 
-- Queues: pending / retry / skipped.
-- Row facts: target, confidence, failure, attempts, origin, staging expiry.
-- Run strip: latest run id/state/stage/progress.
-- Four states: loading / ready / empty / failed; view schemaVersion guard.
-- Mounted by the `all` bundle only.
+The view is read-only: action buttons copy the appropriate `/evolution merge` or `/evolution doctor` command; they do not approve, execute, or undo a merge in the browser. Internal run fields (run id, stage, parent, result ref) live under the view's run-details disclosure so the queue and decision facts come first.
+
+The host entry intentionally registers nothing. The Loader discovers the `dsh.client` manifest and serves the browser bundle, which registers itself into `evolution.workbench.view` and uses the shared client-kit lifecycle and the four merge read routes.

package/lib/client.js

@@ -5,28 +5,24 @@ window.__ModuleLoader__.load({
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 		let react = require("react");
-		//#region ../evolution-client-kit/src/panel.ts
-		function interpolate(text, values) {
-			if (values === void 0) return text;
-			return text.replace(/\{(\w+)\}/g, (_match, key) => String(values[key] ?? ""));
-		}
+		//#region ../evolution-client-kit/src/workbench-view.ts
 		function injectStyles(doc, css, tagId) {
 			if (doc === void 0) return () => {};
 			doc.querySelector("style[data-plugin-css=\"" + tagId + "\"]")?.remove();
 			const tag = doc.createElement("style");
 			tag.setAttribute("data-plugin-css", tagId);
 			tag.textContent = css;
-			doc.head.append(tag);
+			doc.head.appendChild(tag);
 			return () => {
 				tag.remove();
 			};
 		}
 		/**
-		* Register one sidebar row and its main body under one lifecycle.
-		* @param ctx - the client context carrying the slots and locale seats.
-		* @param spec - the feature-specific row/body descriptor.
+		* Register one view into `evolution.workbench.view`.
+		* @param ctx - client cordis context.
+		* @param spec - view identity, copy, styles, component and face factory.
 		*/
-		function registerSidebarPanel(ctx, spec) {
+		function registerWorkbenchView(ctx, spec) {
 			const seam = ctx;
 			let registered = false;
 			ctx.effect(() => {
@@ -35,12 +31,12 @@ window.__ModuleLoader__.load({
 					registered = true;
 					return dispose;
 				} catch (error) {
-					ctx.logger.warn(spec.namespace + ": the locale seat refused the dictionary (" + String(error) + "); the panel falls back to the bundle copy");
+					ctx.logger.warn(spec.namespace + ": locale refused (" + String(error) + "); the view falls back to the bundle copy");
 					return () => {};
 				}
 			}, spec.namespace + ": locale");
 			ctx.effect(() => injectStyles(typeof document === "undefined" ? void 0 : document, spec.styles.css, spec.styles.tagId), spec.namespace + ": styles");
-			const fallback = spec.dictionaries[spec.fallback ?? "zh"];
+			const fallback = spec.dictionaries.zh;
 			const lookup = (key) => {
 				const own = fallback[key] ?? key;
 				if (!registered) return own;
@@ -50,47 +46,36 @@ window.__ModuleLoader__.load({
 					return own;
 				}
 			};
-			const t = (key, values) => interpolate(lookup(key), values);
-			const label = () => lookup("entry.label");
-			seam.slots.inject("sidebar.panellist", function* () {
+			const t = (key, values) => {
+				const template = lookup(key);
+				if (values === void 0) return template;
+				return template.replace(/\{(\w+)\}/g, (match, slot) => values[slot] === void 0 ? match : String(values[slot]));
+			};
+			seam.slots.inject("evolution.workbench.view", function* () {
 				yield seam.slots.register({
-					name: "sidebar.panellist",
+					name: "evolution.workbench.view",
 					id: spec.id,
 					order: spec.order,
-					label
-				}, spec.icon);
-				yield seam.slots.register({
-					name: "main",
-					key: spec.id,
-					inject: () => spec.body(t)
+					label: () => t("entry.label"),
+					inject: () => spec.face(t)
 				}, spec.component);
 			});
 		}
 		//#endregion
-		//#region ../evolution-client-kit/src/workspace.ts
+		//#region ../evolution-client-kit/src/generated/routes.generated.ts
 		/**
-		* Best-effort workspace id; a seat that is absent or refuses leaves the panel in local scope.
-		* @param ctx - the client context.
-		* @returns the current workspace id, or undefined.
+		* Every family host path, generated from evolution-core's HOST_ROUTES (the ONE declaration).
+		* A browser half cannot import the host package at runtime (client bundles keep @deepseek-ai/*
+		* external), so the table is mirrored here mechanically; a rename in core regenerates all three
+		* client copies, and the generator's --check makes a stale copy red.
 		*/
-		function panelWorkspaceId(ctx) {
-			const get = ctx.get;
-			if (typeof get !== "function") return void 0;
-			for (const name of ["workspace", "uiWorkspace"]) try {
-				const seat = get.call(ctx, name);
-				const id = seat?.workspaceId ?? seat?.currentWorkspaceId;
-				if (typeof id === "string" && id.trim() !== "") return id;
-			} catch {}
-		}
-		//#endregion
-		//#region src/client/api.ts
-		/** Read-only merge wire client. Classifies every failure and never writes. */
-		const HOST_ROUTES = {
+		const ROUTES = {
 			approval: {
 				pending: "/api/dsh-evolution/approval/pending",
 				preview: "/api/dsh-evolution/approval/preview",
 				approve: "/api/dsh-evolution/approval/approve",
-				reject: "/api/dsh-evolution/approval/reject"
+				reject: "/api/dsh-evolution/approval/reject",
+				release: "/api/dsh-evolution/approval/release"
 			},
 			"skill-history": {
 				skills: "/api/dsh-evolution/skill-history/skills",
@@ -109,8 +94,166 @@ window.__ModuleLoader__.load({
 				body: "/api/dsh-evolution/merge/body",
 				history: "/api/dsh-evolution/merge/history"
 			},
-			diagnostics: { view: "/api/dsh-evolution/diagnostics" }
-		}.merge;
+			diagnostics: { view: "/api/dsh-evolution/diagnostics" },
+			settings: {
+				describe: "/api/dsh-evolution/settings/describe",
+				mutate: "/api/dsh-evolution/settings/mutate"
+			}
+		};
+		//#endregion
+		//#region ../evolution-client-kit/src/settings-seat.ts
+		const SETTINGS_DESCRIBE = ROUTES.settings.describe;
+		const SETTINGS_MUTATE = ROUTES.settings.mutate;
+		const EMPTY = Object.freeze({
+			status: "unavailable",
+			value: void 0,
+			user: void 0,
+			writable: false,
+			base: void 0,
+			revision: void 0,
+			reason: "transport"
+		});
+		function snapshotFrom(value, ns) {
+			if (typeof value !== "object" || value === null) return EMPTY;
+			const list = value.namespaces;
+			if (!Array.isArray(list)) return EMPTY;
+			const item = list.find((candidate) => typeof candidate === "object" && candidate !== null && candidate.ns === ns);
+			return item === void 0 ? {
+				...EMPTY,
+				reason: "not-served"
+			} : item;
+		}
+		async function describe(namespace) {
+			try {
+				const response = await fetch(SETTINGS_DESCRIBE, { headers: { accept: "application/json" } });
+				if (!response.ok) return EMPTY;
+				const body = await response.json();
+				if (body.ok !== true) return EMPTY;
+				return snapshotFrom(body.data, namespace);
+			} catch {
+				return EMPTY;
+			}
+		}
+		async function write(namespace, ops, expectedRevision) {
+			try {
+				const response = await fetch(SETTINGS_MUTATE, {
+					method: "POST",
+					headers: {
+						"content-type": "application/json",
+						accept: "application/json"
+					},
+					body: JSON.stringify({
+						ns: namespace,
+						ops,
+						...expectedRevision === void 0 ? {} : { expectedRevision }
+					})
+				});
+				if (!response.ok) return { ok: false };
+				const body = await response.json();
+				return {
+					ok: body.ok === true,
+					snapshot: snapshotFrom(body.data, namespace)
+				};
+			} catch {
+				return { ok: false };
+			}
+		}
+		function createForm(namespace, ctx) {
+			let snapshot = {
+				...EMPTY,
+				reason: "seat-missing"
+			};
+			const listeners = /* @__PURE__ */ new Set();
+			let started = false;
+			let listening = false;
+			const notify = () => {
+				for (const listener of listeners) listener();
+			};
+			const refresh = async () => {
+				snapshot = await describe(namespace);
+				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 form = {
+				getSnapshot: () => snapshot,
+				subscribe: (listener) => {
+					listeners.add(listener);
+					start();
+					return () => {
+						listeners.delete(listener);
+					};
+				},
+				set: async (field, value) => await form.mutate([{
+					op: "set",
+					path: [field],
+					value
+				}]),
+				unset: async (field) => await form.mutate([{
+					op: "unset",
+					path: [field]
+				}]),
+				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();
+					return outcome.ok;
+				}
+			};
+			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/*.
+		*/
+		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 form;
+			} };
+			seats.set(ctx, seat);
+			return seat;
+		}
+		//#endregion
+		//#region ../evolution-client-kit/src/workspace.ts
+		/**
+		* Best-effort workspace id; a seat that is absent or refuses leaves the panel in local scope.
+		* @param ctx - the client context.
+		* @returns the current workspace id, or undefined.
+		*/
+		function panelWorkspaceId(ctx) {
+			const get = ctx.get;
+			if (typeof get !== "function") return void 0;
+			for (const name of ["workspace", "uiWorkspace"]) try {
+				const seat = get.call(ctx, name);
+				const id = seat?.workspaceId ?? seat?.currentWorkspaceId;
+				if (typeof id === "string" && id.trim() !== "") return id;
+			} catch {}
+		}
+		//#endregion
+		//#region src/client/api.ts
+		/** Read-only merge wire client. Classifies every failure and never writes. */
+		const HOST_ROUTES = ROUTES.merge;
 		const isBlocked = (failure) => failure.kind === "blocked";
 		const asReadiness = (value) => {
 			const raw = typeof value === "object" && value !== null ? value : {};
@@ -348,7 +491,7 @@ window.__ModuleLoader__.load({
 					startCommands: facts.startCommands,
 					notes: [...facts.notes],
 					degraded: facts.degraded,
-					...facts.last === null && facts.active === null ? {} : { latestRun: toRun(facts.last ?? facts.active) },
+					...facts.active === null && facts.last === null ? {} : { latestRun: toRun(facts.active ?? facts.last) },
 					approval: {
 						mergeApproval: facts.approval.mergeApproval,
 						...platformWrite === void 0 ? {} : { platformWrite }
@@ -426,6 +569,7 @@ window.__ModuleLoader__.load({
 			"start.pair": "复制配对命令模板",
 			"degraded": "读模型降级：",
 			"copied": "已复制：",
+			"copyFailed": "复制失败：浏览器没有接受剪贴板写入。",
 			"row.noSummary": "无摘要",
 			"overlay.body": "正文",
 			"hint": "手动触发；后台逐对判定。这里只读，不写技能。",
@@ -441,6 +585,7 @@ window.__ModuleLoader__.load({
 			"empty.fuse": "没有待合并的对。",
 			"empty.skipped": "没有标记为无需合并的对。",
 			"loading": "正在读取…",
+			"refreshing": "刷新中，下面仍是上次结果…",
 			"refresh": "刷新",
 			"loadMore": "加载更多",
 			"approval.on": "审批开：合并前需人工批准。",
@@ -489,13 +634,13 @@ window.__ModuleLoader__.load({
 			"skipKind.forced": "强制",
 			"action.approve": "复制批准",
 			"action.reject": "复制拒绝",
-			"action.retry-candidates": "重试候选",
+			"action.retry-candidates": "复制重试候选",
 			"action.retry-resume": "重试续跑",
 			"action.discard": "复制丢弃",
-			"action.restore": "恢复",
+			"action.restore": "复制恢复命令",
 			"action.pair": "复制配对",
-			"action.status": "状态",
-			"action.report": "报告",
+			"action.status": "复制状态命令",
+			"action.report": "复制报告命令",
 			"action.cancel": "取消",
 			"action.confirm": "确认复制",
 			"disabled.expired": "已过期，不可用",
@@ -505,6 +650,7 @@ window.__ModuleLoader__.load({
 			"disabled.owned": "已有运行",
 			"disabled.unavailable": "暂不可用",
 			"history.empty": "没有历史。",
+			"history.archivedAt": "归档于 {date}",
 			"failureServer": "读取失败",
 			"failureUnauthorized": "未登录",
 			"failureForbidden": "无权访问",
@@ -592,6 +738,7 @@ window.__ModuleLoader__.load({
 			"run.currentPair": "当前对",
 			"run.parent": "父运行",
 			"run.report": "报告",
+			"run.details": "运行详情",
 			"run.noReport": "暂无报告",
 			"run.resultRef": "报告位置",
 			"run.actions": "运行操作",
@@ -609,7 +756,7 @@ window.__ModuleLoader__.load({
 			"error.title": "读取失败",
 			"error.retry": "重试",
 			"error.raw": "原始信息",
-			"doctor.open": "打开全局诊断",
+			"doctor.open": "复制诊断命令",
 			"sort.updatedAt": "按更新时间",
 			"sort.score": "按分数",
 			"pin": "置顶",
@@ -622,6 +769,7 @@ window.__ModuleLoader__.load({
 			"start.pair": "Copy pair command template",
 			"degraded": "Degraded read model:",
 			"copied": "Copied:",
+			"copyFailed": "Copy failed: the browser did not accept the clipboard write.",
 			"row.noSummary": "No summary",
 			"overlay.body": "Body",
 			"hint": "Manual only; pairs are judged in the background. Read-only here.",
@@ -637,6 +785,7 @@ window.__ModuleLoader__.load({
 			"empty.fuse": "No pairs ready to merge.",
 			"empty.skipped": "No pairs marked as not worth merging.",
 			"loading": "Loading…",
+			"refreshing": "Refreshing; the rows below are the previous result…",
 			"refresh": "Refresh",
 			"loadMore": "Load more",
 			"approval.on": "Approval on: merges wait for a human.",
@@ -685,13 +834,13 @@ window.__ModuleLoader__.load({
 			"skipKind.forced": "forced",
 			"action.approve": "Copy approve",
 			"action.reject": "Copy reject",
-			"action.retry-candidates": "Retry candidates",
+			"action.retry-candidates": "Copy retry candidates",
 			"action.retry-resume": "Retry resume",
 			"action.discard": "Copy discard",
-			"action.restore": "Restore",
+			"action.restore": "Copy restore command",
 			"action.pair": "Copy pair",
-			"action.status": "Status",
-			"action.report": "Report",
+			"action.status": "Copy status command",
+			"action.report": "Copy report command",
 			"action.cancel": "Cancel",
 			"action.confirm": "Copy confirmation",
 			"disabled.expired": "expired",
@@ -701,6 +850,7 @@ window.__ModuleLoader__.load({
 			"disabled.owned": "already running",
 			"disabled.unavailable": "unavailable",
 			"history.empty": "No history.",
+			"history.archivedAt": "Archived {date}",
 			"failureServer": "Read failed",
 			"failureUnauthorized": "Not signed in",
 			"failureForbidden": "Forbidden",
@@ -788,6 +938,7 @@ window.__ModuleLoader__.load({
 			"run.currentPair": "Current pair",
 			"run.parent": "Parent run",
 			"run.report": "Report",
+			"run.details": "Run details",
 			"run.noReport": "No report yet",
 			"run.resultRef": "Report location",
 			"run.actions": "Run actions",
@@ -805,7 +956,7 @@ window.__ModuleLoader__.load({
 			"error.title": "Read failed",
 			"error.retry": "Retry",
 			"error.raw": "Raw message",
-			"doctor.open": "Open global diagnostics",
+			"doctor.open": "Copy diagnostics command",
 			"sort.updatedAt": "Last updated",
 			"sort.score": "Score",
 			"pin": "Pin",
@@ -815,12 +966,14 @@ window.__ModuleLoader__.load({
 			"settings.saved": "已保存",
 			"settings.saveFailed": "保存失败",
 			"settings.openPlatform": "打开平台设置",
+			"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.live": "Save directly here; platformWrite capability comes from the host."
 		});
 		Object.assign(zh, { "settings.platformWriteLinkHint": "此开关属于平台设置，这里只读；请到平台设置修改。" });
@@ -850,7 +1003,7 @@ window.__ModuleLoader__.load({
 			".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; gap:var(--evo-space-6); 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); border-bottom:var(--evo-hairline-width) solid var(--dsw-alias-border-l2); }",
 			".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; }",
@@ -1171,19 +1324,43 @@ window.__ModuleLoader__.load({
 			if (run === void 0) return null;
 			const report = run.actions.find((action) => action.id === "report");
 			const reportEnabled = report?.enabled === true;
+			const internals = [
+				(0, react.createElement)("span", {
+					key: "id",
+					"data-role": "run-id",
+					title: run.id
+				}, t("run.id") + " " + run.id),
+				run.stage === void 0 ? null : (0, react.createElement)("span", {
+					key: "stage",
+					"data-role": "run-stage"
+				}, t("stage." + run.stage)),
+				run.endedAt === void 0 ? null : (0, react.createElement)("span", {
+					key: "ended",
+					"data-role": "run-ended"
+				}, t("run.endedAt") + " " + new Date(run.endedAt).toLocaleString()),
+				run.failure === void 0 ? null : (0, react.createElement)("span", {
+					key: "failure",
+					"data-role": "run-failure",
+					title: run.failure.detail
+				}, t("run.failure") + " " + run.failure.code),
+				run.currentPairKey === void 0 ? null : (0, react.createElement)("span", {
+					key: "pair",
+					"data-role": "run-current-pair"
+				}, t("run.currentPair") + " " + run.currentPairKey),
+				run.parentRunId === void 0 ? null : (0, react.createElement)("span", {
+					key: "parent",
+					"data-role": "run-parent"
+				}, t("run.parent") + " " + run.parentRunId),
+				run.resultRef === void 0 ? null : (0, react.createElement)("span", {
+					key: "ref",
+					"data-role": "run-result-ref",
+					title: run.resultRef
+				}, t("run.resultRef"))
+			];
 			return (0, react.createElement)("div", {
 				"data-role": "run-strip",
 				"data-run-state": run.state
-			}, (0, react.createElement)("span", {
-				"data-role": "run-id",
-				title: run.id
-			}, t("run.id") + " " + run.id), (0, react.createElement)("span", { "data-role": "run-state" }, t("run.state") + " " + t("run." + run.state)), run.stage === void 0 ? null : (0, react.createElement)("span", { "data-role": "run-stage" }, t("stage." + run.stage)), 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)), run.endedAt === void 0 ? null : (0, react.createElement)("span", { "data-role": "run-ended" }, t("run.endedAt") + " " + new Date(run.endedAt).toLocaleString()), run.failure === void 0 ? null : (0, react.createElement)("span", {
-				"data-role": "run-failure",
-				title: run.failure.detail
-			}, t("run.failure") + " " + run.failure.code), run.currentPairKey === void 0 ? null : (0, react.createElement)("span", { "data-role": "run-current-pair" }, t("run.currentPair") + " " + run.currentPairKey), run.parentRunId === void 0 ? null : (0, react.createElement)("span", { "data-role": "run-parent" }, t("run.parent") + " " + run.parentRunId), run.resultRef === void 0 ? null : (0, react.createElement)("span", {
-				"data-role": "run-result-ref",
-				title: run.resultRef
-			}, t("run.resultRef")), (0, react.createElement)("button", {
+			}, (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", {
 				type: "button",
 				"data-role": "run-report",
 				"data-action": "report",
@@ -1202,7 +1379,7 @@ window.__ModuleLoader__.load({
 				onClick: () => {
 					if (action.enabled) copy(action.command);
 				}
-			}, t("action." + action.id))));
+			}, 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");
@@ -1213,19 +1390,7 @@ window.__ModuleLoader__.load({
 			}, (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)("a", {
-				"data-role": "settings-link",
-				href: "#/settings",
-				onClick: () => {
-					window.dispatchEvent(new KeyboardEvent("keydown", {
-						key: ",",
-						code: "Comma",
-						ctrlKey: true,
-						altKey: true,
-						bubbles: true
-					}));
-				}
-			}, t("settings.openPlatform")) : null);
+			}, 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);
 		}
 		function EditableSetting({ form, field, label, fallback, capability, t }) {
 			const subscribe = (0, react.useCallback)((listener) => form.subscribe(listener), [form]);
@@ -1258,7 +1423,12 @@ window.__ModuleLoader__.load({
 				"data-role": "settings-section",
 				"data-section": field === "mergeApproval" ? "merge-approval" : "platform-write",
 				...disabled ? { "data-disabled": "true" } : {}
-			}, (0, react.createElement)("label", { "data-role": "settings-label" }, label), (0, react.createElement)("input", {
+			}, (0, react.createElement)("label", {
+				"data-role": "settings-label",
+				htmlFor: "merge-setting-" + field
+			}, label), (0, react.createElement)("input", {
+				id: "merge-setting-" + field,
+				"aria-label": label,
 				type: "checkbox",
 				role: "switch",
 				"data-role": "settings-toggle",
@@ -1303,12 +1473,9 @@ window.__ModuleLoader__.load({
 				note: t("settings.platformWriteLinkHint"),
 				link: true,
 				t
-			}), settings?.merge === void 0 ? (0, react.createElement)("a", {
-				"data-role": "settings-link",
-				href: "#/settings"
-			}, t("settings.openPlatform")) : null, (0, react.createElement)("p", { "data-role": "settings-readonly" }, settings?.merge === void 0 ? t("settings.readonly") : t("settings.live")));
+			}), (0, react.createElement)("p", { "data-role": "settings-readonly" }, settings?.merge === void 0 ? t("settings.readonly") : t("settings.live")));
 		}
-		function rowNode(row, store, t, copy, sort) {
+		function rowNode(row, t, copy, sort, openBody) {
 			const facts = [
 				row.target === void 0 ? void 0 : t("row.target") + " " + row.target,
 				row.targetActual === void 0 ? void 0 : t("row.actualTarget") + " " + row.targetActual,
@@ -1330,7 +1497,6 @@ window.__ModuleLoader__.load({
 				disabled: !action.enabled,
 				onClick: () => {
 					if (!action.enabled) return;
-					if (action.confirm && globalThis.confirm !== void 0 && !globalThis.confirm(t("action.confirm") + " " + (t("action." + action.id) || action.id))) return;
 					copy(action.command);
 				}
 			}, t("action." + action.id)));
@@ -1341,7 +1507,15 @@ window.__ModuleLoader__.load({
 				"data-row-state": row.state,
 				"data-row-queue": row.queue,
 				draggable: true,
+				tabIndex: 0,
 				title: t("sort.drag"),
+				"aria-haspopup": "menu",
+				onKeyDown: (event) => {
+					if (event.key !== "ContextMenu" && !(event.shiftKey && event.key === "F10")) return;
+					event.preventDefault();
+					const box = event.currentTarget.getBoundingClientRect();
+					sort.menu(row.id, box.left + 12, box.top + 12);
+				},
 				onDragStart: (event) => {
 					if (event.dataTransfer != null) {
 						event.dataTransfer.setData("text/plain", row.id);
@@ -1375,29 +1549,56 @@ window.__ModuleLoader__.load({
 					key: "a",
 					type: "button",
 					"data-role": "body-a",
+					"aria-label": t("body." + bodyA.side) + " " + bodyA.name,
+					title: t("body." + bodyA.side) + " " + bodyA.name,
 					onClick: () => {
-						store.openBody(bodyA.name, bodyA.side, bodyA.rowId);
+						openBody(bodyA.name, bodyA.side, bodyA.rowId);
 					}
 				}, "A"), bodyB === void 0 ? null : (0, react.createElement)("button", {
 					key: "b",
 					type: "button",
 					"data-role": "body-b",
+					"aria-label": t("body." + bodyB.side) + " " + bodyB.name,
+					title: t("body." + bodyB.side) + " " + bodyB.name,
 					onClick: () => {
-						store.openBody(bodyB.name, bodyB.side, bodyB.rowId);
+						openBody(bodyB.name, bodyB.side, bodyB.rowId);
 					}
 				}, "B")];
 			})(), actions)));
 		}
+		const overlayKey = (event, onClose) => {
+			if (event.key === "Escape") {
+				event.preventDefault();
+				onClose();
+				return;
+			}
+			if (event.key !== "Tab") return;
+			const nodes = [...event.currentTarget.querySelectorAll("button, [href], input, select, textarea, [tabindex]:not([tabindex=\"-1\"])")].filter((node) => !node.hasAttribute("disabled"));
+			if (nodes.length === 0) return;
+			const first = nodes[0];
+			const last = nodes[nodes.length - 1];
+			if (event.shiftKey && document.activeElement === first) {
+				event.preventDefault();
+				last.focus();
+			} else if (!event.shiftKey && document.activeElement === last) {
+				event.preventDefault();
+				first.focus();
+			}
+		};
 		function bodyNode(overlay, t, onClose) {
 			return (0, react.createElement)("section", {
 				"data-role": "overlay",
 				"data-overlay": "body",
 				role: "dialog",
 				"aria-modal": "true",
-				"aria-label": t("overlay.body")
+				"aria-label": t("overlay.body"),
+				onKeyDown: (event) => {
+					overlayKey(event, onClose);
+				}
 			}, (0, react.createElement)("div", { "data-role": "overlay-head" }, (0, react.createElement)("h3", { "data-role": "overlay-title" }, t("overlay.body") + " · " + overlay.name), (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "overlay-close",
+				autoFocus: true,
 				onClick: onClose
 			}, t("close"))), (0, react.createElement)("p", { "data-role": "overlay-meta" }, t("body." + overlay.side) + " · " + (overlay.status === "ready" ? t("body.totalBytes") + " " + String(overlay.body?.totalBytes ?? 0) : "")), 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.body !== void 0 ? (0, react.createElement)("div", null, overlay.body.truncated ? (0, react.createElement)("p", { "data-role": "body-truncated" }, t("body.truncated")) : null, overlay.body.text === "" ? (0, react.createElement)("p", { "data-role": "body-empty" }, t("body.empty")) : (0, react.createElement)("pre", { "data-role": "body-text" }, overlay.body.text)) : null);
 		}
@@ -1407,10 +1608,17 @@ window.__ModuleLoader__.load({
 				"data-overlay": "history",
 				role: "dialog",
 				"aria-modal": "true",
-				"aria-label": t("history")
+				"aria-label": t("history"),
+				onKeyDown: (event) => {
+					if (event.key === "Escape") {
+						event.preventDefault();
+						onClose();
+					}
+				}
 			}, (0, react.createElement)("div", { "data-role": "overlay-head" }, (0, react.createElement)("h3", { "data-role": "overlay-title" }, t("history")), (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "overlay-close",
+				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,
@@ -1419,20 +1627,51 @@ 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)))) : null);
+			})() + " · v" + String(item.lastVersion) + " · " + t("history.archivedAt", { date: new Date(item.archivedAt).toLocaleString() })))) : null);
 		}
 		function MergePanel(face) {
 			const { store, t } = face;
 			const snapshot = (0, react.useSyncExternalStore)(store.subscribe, store.read, store.read);
-			const [copied, setCopied] = (0, react.useState)(void 0);
+			const [copyState, setCopyState] = (0, react.useState)({ kind: "idle" });
 			const [orders, setOrders] = (0, react.useState)({});
 			const [dragId, setDragId] = (0, react.useState)(void 0);
 			const [menu, setMenu] = (0, react.useState)(void 0);
+			const returnFocus = (0, react.useRef)(null);
+			const captureFocus = () => {
+				returnFocus.current = document.activeElement instanceof HTMLElement ? document.activeElement : null;
+			};
+			const openBody = (name, side, rowId) => {
+				captureFocus();
+				store.openBody(name, side, rowId);
+			};
+			const openHistory = () => {
+				captureFocus();
+				store.openHistory();
+			};
+			const closeOverlay = () => {
+				store.closeOverlay();
+				requestAnimationFrame(() => {
+					returnFocus.current?.focus();
+				});
+			};
 			const workspaceId = resolveWorkspaceId(face.workspaceId);
 			const orderStore = (0, react.useMemo)(() => createRowOrderStore(), []);
 			const copy = (command) => {
-				navigator.clipboard.writeText(command);
-				setCopied(command);
+				(async () => {
+					try {
+						if (navigator.clipboard?.writeText === void 0) throw new Error("clipboard unavailable");
+						await navigator.clipboard.writeText(command);
+						setCopyState({
+							kind: "copied",
+							text: command
+						});
+					} catch {
+						setCopyState({
+							kind: "failed",
+							text: command
+						});
+					}
+				})();
 			};
 			const doctorCommand = face.doctorCommand ?? DOCTOR_COMMAND;
 			(0, react.useEffect)(() => {
@@ -1503,19 +1742,37 @@ window.__ModuleLoader__.load({
 				saveOrder(pinRow(visibleRows.map((row) => row.id), menu.id, edge));
 				setMenu(void 0);
 			};
+			const onTabKey = (event, current) => {
+				const delta = event.key === "ArrowRight" ? 1 : event.key === "ArrowLeft" ? -1 : 0;
+				const isEdge = event.key === "Home" || event.key === "End";
+				if (delta === 0 && !isEdge) return;
+				event.preventDefault();
+				const index = QUEUES.indexOf(current);
+				const next = event.key === "Home" ? QUEUES[0] : event.key === "End" ? QUEUES[QUEUES.length - 1] : QUEUES[(index + delta + QUEUES.length) % QUEUES.length];
+				store.select(next);
+				requestAnimationFrame(() => {
+					document.getElementById("merge-tab-" + next)?.focus();
+				});
+			};
 			const tabs = (0, react.createElement)("div", {
 				"data-role": "tabs",
 				role: "tablist"
 			}, QUEUES.map((item) => (0, react.createElement)("button", {
 				key: item,
+				id: "merge-tab-" + item,
 				type: "button",
 				role: "tab",
 				"aria-selected": snapshot.queue === item ? "true" : "false",
+				"aria-controls": "merge-rows",
+				tabIndex: snapshot.queue === item ? 0 : -1,
 				"data-role": "tab",
 				"data-active": snapshot.queue === item ? "true" : "false",
 				onClick: () => {
 					setMenu(void 0);
 					store.select(item);
+				},
+				onKeyDown: (event) => {
+					onTabKey(event, item);
 				}
 			}, t("tab." + item) + " " + String(view.counts[item]))));
 			const expiredToggle = snapshot.queue === "pending" ? (0, react.createElement)("button", {
@@ -1528,14 +1785,19 @@ window.__ModuleLoader__.load({
 					store.toggleExpired();
 				}
 			}, t("tab.expired") + " " + String(view.expired)) : null;
-			const list = uiState === "ready" && queue.status === "ready" ? (0, react.createElement)("div", { "data-role": "rows" }, visibleRows.map((row) => rowNode(row, store, t, copy, sortHandlers))) : null;
+			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;
 			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 activeFailure = viewFailure !== void 0 ? viewFailure : queue.status === "error" ? queue.failure : void 0;
 			const overlay = snapshot.overlay;
 			const menuStyle = menu === void 0 ? void 0 : {
 				position: "fixed",
 				zIndex: 70,
-				minWidth: "var(--evo-measure-read)",
+				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"
 			};
@@ -1608,10 +1870,16 @@ window.__ModuleLoader__.load({
 				view,
 				settings: face.settings,
 				t
-			}), runNode(view, t, copy), tabs, expiredToggle, snapshot.viewState === "loading" || queue.status === "loading" ? (0, react.createElement)("p", { "data-role": "note" }, t("loading")) : null, activeFailure === void 0 ? null : failureNode(t, activeFailure, fallback, copy), copied === void 0 ? null : (0, react.createElement)("p", {
+			}), 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", {
+				"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") + " " + copied), list, empty, queue.nextCursor === void 0 || uiState !== "ready" ? null : (0, react.createElement)("button", {
+			}, t("copied") + " " + (copyState.text ?? "")) : (0, react.createElement)("p", {
+				"data-role": "copy-failed",
+				role: "alert"
+			}, t("copyFailed")), list, empty, queue.nextCursor === void 0 || uiState !== "ready" ? null : (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "load-more",
 				disabled: queue.status === "loading",
@@ -1622,7 +1890,7 @@ window.__ModuleLoader__.load({
 				type: "button",
 				"data-role": "history",
 				onClick: () => {
-					store.openHistory();
+					openHistory();
 				}
 			}, t("history")), (0, react.createElement)("button", {
 				type: "button",
@@ -1630,11 +1898,7 @@ window.__ModuleLoader__.load({
 				onClick: () => {
 					copy(doctorCommand);
 				}
-			}, t("doctor.open")), overlay === void 0 ? null : overlay.kind === "body" ? bodyNode(overlay, t, () => {
-				store.closeOverlay();
-			}) : historyNode(overlay, t, () => {
-				store.closeOverlay();
-			}), (0, react.createElement)("button", {
+			}, t("doctor.open")), overlay === void 0 ? null : overlay.kind === "body" ? bodyNode(overlay, t, closeOverlay) : historyNode(overlay, t, closeOverlay), (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "refresh",
 				onClick: () => {
@@ -1738,7 +2002,11 @@ window.__ModuleLoader__.load({
 			}
 			async loadView(showLoading = true) {
 				const token = ++this.viewToken;
-				if (showLoading) this.set({
+				if (showLoading) if (this.snapshot.viewState === "ready") this.set({
+					...this.snapshot,
+					viewRefreshing: true
+				});
+				else this.set({
 					...this.snapshot,
 					viewState: "loading",
 					viewFailure: void 0
@@ -1765,7 +2033,8 @@ window.__ModuleLoader__.load({
 					this.set({
 						...this.snapshot,
 						viewState: "error",
-						viewFailure: outcome.failure
+						viewFailure: outcome.failure,
+						viewRefreshing: false
 					});
 					return;
 				}
@@ -1774,7 +2043,8 @@ window.__ModuleLoader__.load({
 					...this.snapshot,
 					view: outcome.payload,
 					viewState: "ready",
-					viewFailure: void 0
+					viewFailure: void 0,
+					viewRefreshing: false
 				});
 				if (wasBlocked && this.snapshot.current.status === "idle") this.loadQueue(this.snapshot.queue, this.snapshot.expiredOnly);
 			}
@@ -1783,7 +2053,13 @@ window.__ModuleLoader__.load({
 				const token = (this.tokens.get(key) ?? 0) + 1;
 				this.tokens.set(key, token);
 				const previous = this.cache.get(key);
-				const next = cursor === void 0 ? {
+				const keepRows = cursor === void 0 && (previous?.rows.length ?? 0) > 0;
+				const next = cursor === void 0 ? keepRows ? {
+					status: "ready",
+					refreshing: true,
+					rows: previous.rows,
+					...previous.nextCursor === void 0 ? {} : { nextCursor: previous.nextCursor }
+				} : {
 					status: "loading",
 					rows: []
 				} : {
@@ -1815,7 +2091,12 @@ window.__ModuleLoader__.load({
 						});
 						return;
 					}
-					const failed = {
+					const failed = keepRows ? {
+						status: "ready",
+						refreshing: false,
+						rows: previous.rows,
+						failure: outcome.failure
+					} : {
 						status: "error",
 						rows: [],
 						failure: outcome.failure
@@ -1830,6 +2111,7 @@ window.__ModuleLoader__.load({
 				const items = cursor === void 0 ? outcome.payload.items : [...previous?.rows ?? [], ...outcome.payload.items];
 				const ready = {
 					status: items.length === 0 ? "empty" : "ready",
+					refreshing: false,
 					rows: items,
 					...outcome.payload.nextCursor === void 0 ? {} : { nextCursor: outcome.payload.nextCursor }
 				};
@@ -1981,26 +2263,16 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/index.ts
 		const inject = ["slots", "locale"];
-		function PanelIcon(props = {}) {
-			const size = typeof props.size === "number" && props.size > 0 ? props.size : 16;
-			return (0, react.createElement)("svg", {
-				"aria-hidden": "true",
-				width: String(size),
-				height: String(size),
-				viewBox: "0 0 16 16",
-				fill: "none",
-				stroke: "currentColor",
-				strokeWidth: "1.5",
-				strokeLinecap: "round",
-				strokeLinejoin: "round"
-			}, (0, react.createElement)("path", { d: "M3 4h10M3 8h6M3 12h8" }));
+		/** The view component receives the workbench's activeView marker alongside its face. */
+		function MergeView(props) {
+			return props.activeView === "merge" ? MergePanel(props) : null;
 		}
 		/**
-		* Register the merge row and its keyed main body through the shared panel lifecycle.
+		* Register the merge view on the workbench page.
 		* @param ctx - the client context.
 		*/
 		function apply(ctx) {
-			registerSidebarPanel(ctx, {
+			registerWorkbenchView(ctx, {
 				id: PANEL_ID,
 				order: 45,
 				namespace: NS,
@@ -2012,30 +2284,24 @@ window.__ModuleLoader__.load({
 					css: CSS,
 					tagId: CSS_TAG_ID
 				},
-				icon: PanelIcon,
-				component: MergePanel,
-				body: (t) => {
+				component: MergeView,
+				face: (t) => {
 					const source = {
 						view,
 						rows,
 						body,
 						history
 					};
-					let seat;
-					try {
-						seat = ctx.get?.("configForms");
-					} catch {
-						seat = void 0;
-					}
+					const seat = createSettingsSeat(ctx);
 					const workspaceId = panelWorkspaceId(ctx);
 					return {
 						store: new MergeStore(source),
 						t,
 						doctorCommand: "/evolution doctor",
-						settings: { ...seat === void 0 ? {} : {
-							merge: seat.get("evolution-merge"),
-							platform: seat.get("evolution-approval")
-						} },
+						settings: {
+							...seat.get("evolution-merge") === void 0 ? {} : { merge: seat.get("evolution-merge") },
+							...seat.get("evolution-approval") === void 0 ? {} : { platform: seat.get("evolution-approval") }
+						},
 						...workspaceId === void 0 ? {} : { workspaceId }
 					};
 				}

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

@@ -11,6 +11,8 @@ export interface MergeSource {
 export type QueueStatus = 'idle' | 'loading' | 'ready' | 'empty' | 'error';
 export interface QueueState {
     status: QueueStatus;
+    /** A background refresh is in flight; the old rows remain visible. */
+    refreshing?: boolean | undefined;
     rows: MergeRowView[];
     nextCursor?: string | undefined;
     failure?: MergeFailure | undefined;
@@ -31,6 +33,7 @@ export type OverlayState = {
 export interface StoreSnapshot {
     view: MergeViewPayload;
     viewState: 'loading' | 'ready' | 'error' | 'blocked';
+    viewRefreshing?: boolean | undefined;
     viewFailure?: MergeFailure | undefined;
     queue: MergeQueue;
     expiredOnly: boolean;

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

@@ -1,8 +1,8 @@
-/** Browser half: one sidebar row and the read-only Batch 4 panel. */
+/** Browser half: one read-only merge view inside the shared evolution workbench. */
 import type { Context as ClientContext } from '@deepseek-ai/cordis';
 export declare const inject: string[];
 /**
- * Register the merge row and its keyed main body through the shared panel lifecycle.
+ * Register the merge view on the workbench page.
  * @param ctx - the client context.
  */
 export declare function apply(ctx: ClientContext): void;

package/package.json

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