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

package/lib/client.js

@@ -163,34 +163,51 @@ window.__ModuleLoader__.load({
 				...EMPTY,
 				reason: "seat-missing"
 			};
+			let lastReady;
+			let generation = 0;
 			const listeners = /* @__PURE__ */ new Set();
-			let started = false;
-			let listening = false;
+			let remoteOff;
 			const notify = () => {
 				for (const listener of listeners) listener();
 			};
-			const refresh = async () => {
-				snapshot = await describe(namespace);
+			const absorb = (next) => {
+				if (next.status === "ready") {
+					lastReady = next;
+					snapshot = next;
+				} else if (lastReady !== void 0) snapshot = {
+					...lastReady,
+					stale: true,
+					reason: next.reason ?? "readback-failed"
+				};
+				else snapshot = next;
 				notify();
 			};
-			const start = () => {
-				if (started) return;
-				started = true;
-				if (!listening) {
-					listening = true;
-					(ctx.get?.("remote"))?.$on?.("settings/document-updated", (changed) => {
-						if (changed === namespace) refresh();
-					});
-				}
-				refresh();
+			const refresh = async () => {
+				const ticket = ++generation;
+				const next = await describe(namespace);
+				if (ticket !== generation) return;
+				absorb(next);
+			};
+			const remote = () => ctx.get?.("remote");
+			const stopRemote = () => {
+				remoteOff?.();
+				remoteOff = void 0;
+			};
+			const startRemote = () => {
+				if (remoteOff !== void 0) return;
+				remoteOff = remote()?.$on?.("settings/document-updated", (changed) => {
+					if (changed === namespace) refresh();
+				});
 			};
 			const form = {
 				getSnapshot: () => snapshot,
 				subscribe: (listener) => {
 					listeners.add(listener);
-					start();
+					startRemote();
+					refresh();
 					return () => {
 						listeners.delete(listener);
+						if (listeners.size === 0) stopRemote();
 					};
 				},
 				set: async (field, value) => await form.mutate([{
@@ -204,35 +221,39 @@ window.__ModuleLoader__.load({
 				}]),
 				mutate: async (ops, expectedRevision) => {
 					const outcome = await write(namespace, ops, expectedRevision ?? snapshot.revision);
-					if (outcome.snapshot !== void 0) {
-						snapshot = outcome.snapshot;
-						notify();
-					} else await refresh();
+					if (outcome.snapshot !== void 0) absorb(outcome.snapshot);
+					else await refresh();
 					return outcome.ok;
+				},
+				refresh,
+				dispose: () => {
+					stopRemote();
+					listeners.clear();
 				}
 			};
 			return form;
 		}
 		/**
-		* Build one cached form per family namespace over the family settings routes.
-		* @param ctx - the client plugin context (remote subscription is optional).
-		* @returns the seat; each namespace is served by /api/dsh-evolution/settings/*.
+		* Build one seat per client registration; every form's remote listener is released by
+		* the caller's effect. No module-level WeakMap: a replaced registration must not share
+		* a dead seat with the previous one.
 		*/
-		const seats = /* @__PURE__ */ new WeakMap();
 		function createSettingsSeat(ctx) {
-			const cached = seats.get(ctx);
-			if (cached !== void 0) return cached;
 			const forms = /* @__PURE__ */ new Map();
-			const seat = { get(namespace) {
-				let form = forms.get(namespace);
-				if (form === void 0) {
-					form = createForm(namespace, ctx);
-					forms.set(namespace, form);
+			return {
+				get(namespace) {
+					let form = forms.get(namespace);
+					if (form === void 0) {
+						form = createForm(namespace, ctx);
+						forms.set(namespace, form);
+					}
+					return form;
+				},
+				dispose: () => {
+					for (const form of forms.values()) form.dispose?.();
+					forms.clear();
 				}
-				return form;
-			} };
-			seats.set(ctx, seat);
-			return seat;
+			};
 		}
 		//#endregion
 		//#region ../evolution-client-kit/src/workspace.ts
@@ -491,7 +512,8 @@ window.__ModuleLoader__.load({
 					startCommands: facts.startCommands,
 					notes: [...facts.notes],
 					degraded: facts.degraded,
-					...facts.active === null && facts.last === null ? {} : { latestRun: toRun(facts.active ?? facts.last) },
+					...facts.active === null ? {} : { activeRun: toRun(facts.active) },
+					...facts.last === null ? {} : { lastRun: toRun(facts.last) },
 					approval: {
 						mergeApproval: facts.approval.mergeApproval,
 						...platformWrite === void 0 ? {} : { platformWrite }
@@ -518,9 +540,14 @@ window.__ModuleLoader__.load({
 			};
 		}
 		async function body(name, side, rowId) {
-			const answer = await requestWire(HOST_ROUTES.body + (rowId === void 0 ? "?name=" + encodeURIComponent(name) : "?id=" + encodeURIComponent(rowId)) + "&side=" + side);
+			const query = new URLSearchParams({
+				name,
+				side
+			});
+			if (rowId !== void 0) query.set("id", rowId);
+			const answer = await requestWire(HOST_ROUTES.body + "?" + query.toString());
 			if (!answer.ok) {
-				if (answer.failure.kind === "problem" && answer.failure.code === "bad-query" && (answer.failure.message ?? "").includes("multiple merge rows")) return {
+				if (answer.failure.kind === "problem" && answer.failure.code === "bad-query" && (answer.failure.message ?? "").includes("ambiguous")) return {
 					ok: false,
 					failure: {
 						...answer.failure,
@@ -541,6 +568,56 @@ window.__ModuleLoader__.load({
 				}
 			};
 		}
+		async function decide(rowId, verb, sessionId) {
+			const path = HOST_ROUTES.body.replace(/body$/, "decision");
+			let response;
+			try {
+				response = await fetch(path, {
+					method: "POST",
+					headers: {
+						accept: "application/json",
+						"content-type": "application/json"
+					},
+					body: JSON.stringify({
+						rowId,
+						verb,
+						sessionId
+					})
+				});
+			} catch {
+				return {
+					ok: false,
+					failure: problem("server", 0)
+				};
+			}
+			let body;
+			try {
+				body = await response.json();
+			} catch {
+				return {
+					ok: false,
+					failure: problem("server", response.status)
+				};
+			}
+			if (typeof body !== "object" || body === null) return {
+				ok: false,
+				failure: problem("server", response.status)
+			};
+			const record = body;
+			if (record.wireVersion !== 1 || typeof record.ok !== "boolean" || typeof record.message !== "string") return {
+				ok: false,
+				failure: problem("wire-version", response.status)
+			};
+			return {
+				ok: true,
+				payload: {
+					ok: record.ok,
+					message: record.message,
+					...typeof record.code === "string" ? { code: record.code } : {},
+					...typeof record.runId === "string" ? { runId: record.runId } : {}
+				}
+			};
+		}
 		async function history() {
 			const answer = await requestWire(HOST_ROUTES.history);
 			return answer.ok ? {
@@ -634,6 +711,8 @@ window.__ModuleLoader__.load({
 			"skipKind.forced": "强制",
 			"action.approve": "复制批准",
 			"action.reject": "复制拒绝",
+			"decision.approve": "批准",
+			"decision.reject": "拒绝",
 			"action.retry-candidates": "复制重试候选",
 			"action.retry-resume": "重试续跑",
 			"action.discard": "复制丢弃",
@@ -686,6 +765,7 @@ window.__ModuleLoader__.load({
 			"stage.state.absent": "无暂存",
 			"origin.system": "系统",
 			"row.id": "编号",
+			"row.details": "详情",
 			"row.requestedTarget": "请求目标",
 			"row.stage": "合并暂存",
 			"row.summaryA": "摘要 A",
@@ -707,7 +787,6 @@ window.__ModuleLoader__.load({
 			"history.reason.archived": "已归档",
 			"history.reason.unknown": "原因未提供",
 			"history.lastVersion": "最后版本",
-			"history.archivedAt": "归档时间",
 			"body.truncated": "正文过长，已截断。",
 			"body.empty": "正文为空。",
 			"body.totalBytes": "总字节",
@@ -834,6 +913,8 @@ window.__ModuleLoader__.load({
 			"skipKind.forced": "forced",
 			"action.approve": "Copy approve",
 			"action.reject": "Copy reject",
+			"decision.approve": "Approve",
+			"decision.reject": "Reject",
 			"action.retry-candidates": "Copy retry candidates",
 			"action.retry-resume": "Retry resume",
 			"action.discard": "Copy discard",
@@ -886,6 +967,7 @@ window.__ModuleLoader__.load({
 			"stage.state.absent": "Not staged",
 			"origin.system": "System",
 			"row.id": "ID",
+			"row.details": "Details",
 			"row.requestedTarget": "Requested target",
 			"row.stage": "Merge staging",
 			"row.summaryA": "Summary A",
@@ -907,7 +989,6 @@ window.__ModuleLoader__.load({
 			"history.reason.archived": "archived",
 			"history.reason.unknown": "reason not provided",
 			"history.lastVersion": "Last version",
-			"history.archivedAt": "Archived at",
 			"body.truncated": "Body is truncated.",
 			"body.empty": "Body is empty.",
 			"body.totalBytes": "Total bytes",
@@ -966,14 +1047,14 @@ window.__ModuleLoader__.load({
 			"settings.saved": "已保存",
 			"settings.saveFailed": "保存失败",
 			"settings.openPlatform": "打开平台设置",
-			"settings.openPlatformPath": "设置 → 内置插件 → 插件配置 → 技能自动合并",
+			"settings.openPlatformPath": "设置 → 内置插件 → 自进化 → 技能自动合并",
 			"settings.live": "可直接在此保存；platformWrite 能力来自宿主。"
 		});
 		Object.assign(en, {
 			"settings.saved": "Saved",
 			"settings.saveFailed": "Save failed",
 			"settings.openPlatform": "Open platform settings",
-			"settings.openPlatformPath": "Settings → Built-in plugins → Plugin configuration → Skill auto-merge",
+			"settings.openPlatformPath": "Settings → Built-in plugins → Evolution → Skill auto-merge",
 			"settings.live": "Save directly here; platformWrite capability comes from the host."
 		});
 		Object.assign(zh, { "settings.platformWriteLinkHint": "此开关属于平台设置，这里只读；请到平台设置修改。" });
@@ -1015,6 +1096,13 @@ window.__ModuleLoader__.load({
 			".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-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; }",
 			".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); }",
@@ -1055,6 +1143,25 @@ window.__ModuleLoader__.load({
 			".evolution-merge-panel [data-role=\"refresh\"] { align-self:flex-start; }"
 		].join("\n");
 		//#endregion
+		//#region src/client/platform-modal.ts
+		const PLATFORM_UI_MODULE$1 = "@deepseek-ai/dsh-client-ui-primitives";
+		let cached;
+		/** The platform Modal, or undefined in a non-browser/SSR render or a deployment without the row. */
+		function platformModal() {
+			if (cached !== void 0) return cached ?? void 0;
+			if (typeof window === "undefined") {
+				cached = null;
+				return;
+			}
+			try {
+				const row = require(PLATFORM_UI_MODULE$1);
+				cached = typeof row.Modal === "function" ? row.Modal : null;
+			} catch {
+				cached = null;
+			}
+			return cached ?? void 0;
+		}
+		//#endregion
 		//#region src/client/platform-menu.ts
 		/**
 		* The one seam onto the platform's menu material and rows.
@@ -1116,9 +1223,9 @@ window.__ModuleLoader__.load({
 			const value = workspaceId?.trim() ?? "";
 			return value === "" ? "local" : value;
 		}
-		/** Stable localStorage key for one workspace and queue. */
-		function rowOrderKey(workspaceId, queue) {
-			return "dsh-evolution-merge.row-order.v1:" + encodeURIComponent(resolveWorkspaceId(workspaceId)) + ":" + queue;
+		/** Stable localStorage key for one workspace, queue and expired filter. */
+		function rowOrderKey(workspaceId, queue, expiredOnly = false) {
+			return "dsh-evolution-merge.row-order.v1:" + encodeURIComponent(resolveWorkspaceId(workspaceId)) + ":" + queue + (expiredOnly ? ":expired" : ":live");
 		}
 		function defaultStorage() {
 			try {
@@ -1147,18 +1254,18 @@ window.__ModuleLoader__.load({
 		/** One tab's persisted order; failures degrade to an empty (wire) order. */
 		function createRowOrderStore(storage = defaultStorage()) {
 			return {
-				read(workspaceId, queue) {
+				read(workspaceId, queue, expiredOnly = false) {
 					if (storage === void 0) return [];
 					try {
-						return normalize(storage.getItem(rowOrderKey(workspaceId, queue)));
+						return normalize(storage.getItem(rowOrderKey(workspaceId, queue, expiredOnly)));
 					} catch {
 						return [];
 					}
 				},
-				write(workspaceId, queue, ids) {
+				write(workspaceId, queue, ids, expiredOnly = false) {
 					if (storage === void 0) return;
 					try {
-						storage.setItem(rowOrderKey(workspaceId, queue), JSON.stringify(ids));
+						storage.setItem(rowOrderKey(workspaceId, queue, expiredOnly), JSON.stringify(ids));
 					} catch {}
 				}
 			};
@@ -1214,13 +1321,6 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/Panel.ts
 		/** Batch 4 merge panel: keyed read store, four tabs, local overlays, localized errors. */
-		async function saveSetting(form, field, value) {
-			try {
-				return await form.set(field, value);
-			} catch {
-				return false;
-			}
-		}
 		const QUEUES = [
 			"verify",
 			"pending",
@@ -1320,8 +1420,12 @@ window.__ModuleLoader__.load({
 			}, t("stage.state." + stage.state) + expiry);
 		}
 		function runNode(view, t, copy) {
-			const run = view.latestRun;
-			if (run === void 0) return null;
+			const active = view.activeRun;
+			const last = view.lastRun;
+			if (active === void 0 && last === void 0) return null;
+			return (0, react.createElement)("div", { "data-role": "run-strips" }, active === void 0 ? null : runStrip(active, t, copy, "active"), last === void 0 ? null : runStrip(last, t, copy, "last"));
+		}
+		function runStrip(run, t, copy, role) {
 			const report = run.actions.find((action) => action.id === "report");
 			const reportEnabled = report?.enabled === true;
 			const internals = [
@@ -1359,6 +1463,7 @@ window.__ModuleLoader__.load({
 			];
 			return (0, react.createElement)("div", {
 				"data-role": "run-strip",
+				"data-run-role": role,
 				"data-run-state": run.state
 			}, (0, react.createElement)("span", { "data-role": "run-state" }, t("run.state") + " " + t("run." + run.state)), run.progress === null || run.progress === void 0 ? null : (0, react.createElement)("span", { "data-role": "run-progress" }, t("run.progress") + " " + String(run.progress.done) + "/" + String(run.progress.total)), (0, react.createElement)("button", {
 				type: "button",
@@ -1392,78 +1497,18 @@ window.__ModuleLoader__.load({
 				"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);
 		}
-		function EditableSetting({ form, field, label, fallback, capability, t }) {
-			const subscribe = (0, react.useCallback)((listener) => form.subscribe(listener), [form]);
-			const readSnapshot = (0, react.useCallback)(() => form["getSnapshot"](), [form]);
-			const snapshot = (0, react.useSyncExternalStore)(subscribe, readSnapshot, readSnapshot);
-			const fieldPresent = snapshot.status !== "ready" || snapshot.value === void 0 || Object.prototype.hasOwnProperty.call(snapshot.value, field);
-			const [busy, setBusy] = (0, react.useState)(false);
-			const [saved, setSaved] = (0, react.useState)(void 0);
-			const value = snapshot.status === "ready" && typeof snapshot.value?.[field] === "boolean" ? snapshot.value[field] : fallback;
-			const disabled = !capability || busy || snapshot.status !== "ready" || !snapshot.writable;
-			const toggle = async () => {
-				if (disabled) return;
-				setBusy(true);
-				setSaved(void 0);
-				const ok = await saveSetting(form, field, !value);
-				setBusy(false);
-				setSaved(ok ? "saved" : "failed");
-			};
-			if (!fieldPresent) return (0, react.createElement)(ReadOnlySetting, {
-				section: "platform-write",
-				label,
-				value: fallback,
-				disabled: !capability,
-				missing: false,
-				note: t("settings.platformWriteLinkHint"),
-				link: true,
-				t
-			});
-			return (0, react.createElement)("div", {
-				"data-role": "settings-section",
-				"data-section": field === "mergeApproval" ? "merge-approval" : "platform-write",
-				...disabled ? { "data-disabled": "true" } : {}
-			}, (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",
-				"data-field": field,
-				"data-value": value ? "on" : "off",
-				checked: value,
-				disabled,
-				onChange: () => {
-					toggle();
-				}
-			}), (0, react.createElement)("span", { "data-role": "settings-value" }, value ? t("settings.on") : t("settings.off")), ...saved === void 0 ? [] : [(0, react.createElement)("span", {
-				"data-role": "settings-save-state",
-				"data-save": saved
-			}, t(saved === "saved" ? "settings.saved" : "settings.saveFailed"))]);
-		}
-		function SettingsCard({ view, settings, t }) {
+		function SettingsCard({ view, t }) {
 			const platform = view.approval.platformWrite;
-			const platformCapability = platform?.capability ?? settings?.platform !== void 0;
+			const platformCapability = platform?.capability === true;
 			const platformFallback = platform?.enabled ?? false;
-			const mergeCapability = settings?.merge !== void 0;
 			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")), settings?.merge === void 0 ? (0, react.createElement)(ReadOnlySetting, {
+			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)(EditableSetting, {
-				form: settings.merge,
-				field: "mergeApproval",
-				label: t("settings.mergeApproval"),
-				fallback: mergeFallback,
-				capability: mergeCapability,
-				t
 			}), (0, react.createElement)(ReadOnlySetting, {
 				section: "platform-write",
 				label: t("settings.platformWrite"),
@@ -1471,35 +1516,53 @@ window.__ModuleLoader__.load({
 				disabled: platformCapability === false,
 				missing: platform === void 0,
 				note: t("settings.platformWriteLinkHint"),
-				link: true,
 				t
-			}), (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" }, t("settings.readonly")));
 		}
-		function rowNode(row, t, copy, sort, openBody) {
-			const facts = [
+		function rowNode(row, t, copy, sort, openBody, onDecide, busy) {
+			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 ?? "")
+			].filter((value) => value !== void 0).join(" · ");
+			const details = [
+				t("row.id") + " " + row.id,
 				row.targetActual === void 0 ? void 0 : t("row.actualTarget") + " " + row.targetActual,
 				row.verifySubState === void 0 ? void 0 : t("row.verify") + " " + t("verify." + row.verifySubState),
 				row.origin === void 0 ? void 0 : t("row.origin") + " " + t("origin." + row.origin),
 				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),
-				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.confidence === void 0 ? void 0 : t("row.confidence") + " " + row.confidence.toFixed(2)
 			].filter((value) => value !== void 0).join(" · ");
-			const actions = row.actions.map((action) => (0, react.createElement)("button", {
-				key: action.id,
-				type: "button",
-				"data-role": "row-action",
-				"data-action": action.id,
-				...action.disabledReason === void 0 ? {} : { "data-disabled-reason": action.disabledReason },
-				title: action.disabledReason === void 0 ? action.command : t("disabled." + action.disabledReason),
-				disabled: !action.enabled,
-				onClick: () => {
-					if (!action.enabled) return;
-					copy(action.command);
-				}
-			}, t("action." + action.id)));
+			const actions = row.actions.flatMap((action) => {
+				const decision = (action.id === "approve" || action.id === "reject") && onDecide !== void 0;
+				const primary = (0, react.createElement)("button", {
+					key: action.id,
+					type: "button",
+					"data-role": decision ? "row-decision" : "row-action",
+					"data-action": action.id,
+					...action.disabledReason === void 0 ? {} : { "data-disabled-reason": action.disabledReason },
+					title: action.command,
+					disabled: !action.enabled || busy,
+					onClick: () => {
+						if (!action.enabled || busy) return;
+						if (decision) onDecide(row.id, action.id);
+						else copy(action.command);
+					}
+				}, decision ? t("decision." + action.id) : t("action." + action.id));
+				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,
 				"data-role": "row",
@@ -1539,10 +1602,16 @@ window.__ModuleLoader__.load({
 					event.preventDefault();
 					sort.menu(row.id, event.clientX, event.clientY);
 				}
-			}, (0, react.createElement)("div", null, (0, react.createElement)("div", { "data-role": "row-label" }, row.label), (0, react.createElement)("div", {
-				"data-role": "row-id",
-				title: row.id
-			}, t("row.id") + " " + row.id), (0, react.createElement)("div", { "data-role": "row-meta" }, t("state." + row.state) + (row.stage === null ? "" : " · " + t("stage." + row.stage))), stageNode(row, t), summaryNode(row, t), facts === "" ? null : (0, react.createElement)("div", { "data-role": "row-facts" }, facts)), (0, react.createElement)("div", null, (0, react.createElement)("div", { "data-role": "row-meta" }, new Date(row.updatedAt).toLocaleString()), (0, react.createElement)("div", { "data-role": "row-actions" }, (() => {
+			}, (0, react.createElement)("div", null, (0, react.createElement)("div", { "data-role": "row-label" }, row.label), (0, react.createElement)("div", { "data-role": "row-meta" }, t("state." + row.state) + (row.stage === null ? "" : " · " + t("stage." + row.stage))), stageNode(row, t), summaryNode(row, t), first === "" ? null : (0, react.createElement)("div", { "data-role": "row-facts" }, first), (0, react.createElement)("details", { "data-role": "row-details" }, (0, react.createElement)("summary", null, t("row.details")), (0, react.createElement)("p", null, details))), (0, react.createElement)("div", null, (0, react.createElement)("div", { "data-role": "row-meta" }, new Date(row.updatedAt).toLocaleString()), (0, react.createElement)("div", { "data-role": "row-actions" }, (0, react.createElement)("button", {
+				type: "button",
+				"data-role": "row-sort",
+				"aria-haspopup": "menu",
+				title: t("sort.menu"),
+				onClick: (event) => {
+					const rect = event.currentTarget.getBoundingClientRect();
+					sort.menu(row.id, rect.left, rect.bottom);
+				}
+			}, t("sort.menu")), (() => {
 				const bodyA = row.bodies?.find((body) => body.name === row.a);
 				const bodyB = row.bodies?.find((body) => body.name === row.b);
 				return [bodyA === void 0 ? null : (0, react.createElement)("button", {
@@ -1554,7 +1623,7 @@ window.__ModuleLoader__.load({
 					onClick: () => {
 						openBody(bodyA.name, bodyA.side, bodyA.rowId);
 					}
-				}, "A"), bodyB === void 0 ? null : (0, react.createElement)("button", {
+				}, "A · " + bodyA.name), bodyB === void 0 ? null : (0, react.createElement)("button", {
 					key: "b",
 					type: "button",
 					"data-role": "body-b",
@@ -1563,7 +1632,7 @@ window.__ModuleLoader__.load({
 					onClick: () => {
 						openBody(bodyB.name, bodyB.side, bodyB.rowId);
 					}
-				}, "B")];
+				}, "B · " + bodyB.name)];
 			})(), actions)));
 		}
 		const overlayKey = (event, onClose) => {
@@ -1586,39 +1655,55 @@ window.__ModuleLoader__.load({
 			}
 		};
 		function bodyNode(overlay, t, onClose) {
-			return (0, react.createElement)("section", {
+			const Modal = platformModal();
+			const title = t("overlay.body") + " · " + overlay.name;
+			const inner = (0, react.createElement)("section", {
 				"data-role": "overlay",
 				"data-overlay": "body",
-				role: "dialog",
-				"aria-modal": "true",
-				"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", {
+				"aria-label": title,
+				...Modal === void 0 ? {
+					role: "dialog",
+					"aria-modal": "true",
+					onKeyDown: (event) => {
+						overlayKey(event, onClose);
+					}
+				} : { "data-platform-modal": "true" }
+			}, (0, react.createElement)("div", { "data-role": "overlay-head" }, (0, react.createElement)("h3", { "data-role": "overlay-title" }, title), (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "overlay-close",
-				autoFocus: true,
+				...Modal === void 0 ? { autoFocus: true } : { "data-modal-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);
+			return Modal === void 0 ? inner : (0, react.createElement)(Modal, {
+				open: true,
+				onClose,
+				title,
+				closeLabel: t("close"),
+				headless: true,
+				className: "evo-merge-modal"
+			}, inner);
 		}
 		function historyNode(overlay, t, onClose) {
-			return (0, react.createElement)("section", {
+			const Modal = platformModal();
+			const title = t("history");
+			const inner = (0, react.createElement)("section", {
 				"data-role": "overlay",
 				"data-overlay": "history",
-				role: "dialog",
-				"aria-modal": "true",
-				"aria-label": t("history"),
-				onKeyDown: (event) => {
-					if (event.key === "Escape") {
-						event.preventDefault();
-						onClose();
+				"aria-label": title,
+				...Modal === void 0 ? {
+					role: "dialog",
+					"aria-modal": "true",
+					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", {
+				} : { "data-platform-modal": "true" }
+			}, (0, react.createElement)("div", { "data-role": "overlay-head" }, (0, react.createElement)("h3", { "data-role": "overlay-title" }, title), (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "overlay-close",
-				autoFocus: true,
+				...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,
@@ -1628,6 +1713,14 @@ window.__ModuleLoader__.load({
 				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);
+			return Modal === void 0 ? inner : (0, react.createElement)(Modal, {
+				open: true,
+				onClose,
+				title,
+				closeLabel: t("close"),
+				headless: true,
+				className: "evo-merge-modal"
+			}, inner);
 		}
 		function MergePanel(face) {
 			const { store, t } = face;
@@ -1635,6 +1728,8 @@ window.__ModuleLoader__.load({
 			const [copyState, setCopyState] = (0, react.useState)({ kind: "idle" });
 			const [orders, setOrders] = (0, react.useState)({});
 			const [dragId, setDragId] = (0, react.useState)(void 0);
+			const [deciding, setDeciding] = (0, react.useState)(void 0);
+			const [decisionNotice, setDecisionNotice] = (0, react.useState)(void 0);
 			const [menu, setMenu] = (0, react.useState)(void 0);
 			const returnFocus = (0, react.useRef)(null);
 			const captureFocus = () => {
@@ -1656,6 +1751,27 @@ window.__ModuleLoader__.load({
 			};
 			const workspaceId = resolveWorkspaceId(face.workspaceId);
 			const orderStore = (0, react.useMemo)(() => createRowOrderStore(), []);
+			const decideRow = (rowId, verb) => {
+				if (face.decide === void 0) return;
+				setDeciding(rowId);
+				(async () => {
+					try {
+						setDecisionNotice({
+							rowId,
+							...await face.decide(rowId, verb)
+						});
+						store.refresh();
+					} catch (error) {
+						setDecisionNotice({
+							rowId,
+							ok: false,
+							message: error instanceof Error ? error.message : String(error)
+						});
+					} finally {
+						setDeciding(void 0);
+					}
+				})();
+			};
 			const copy = (command) => {
 				(async () => {
 					try {
@@ -1705,15 +1821,15 @@ window.__ModuleLoader__.load({
 			const viewFailure = snapshot.viewState === "error" ? snapshot.viewFailure : void 0;
 			const queue = snapshot.current;
 			const uiState = blocked !== void 0 ? "blocked" : viewFailure !== void 0 ? "error" : snapshot.viewState === "loading" ? "loading" : queue.status === "error" ? "error" : queue.status === "loading" ? "loading" : queue.status === "empty" ? "empty" : "ready";
-			const orderKey = rowOrderKey(workspaceId, snapshot.queue);
-			const visibleOrder = orders[orderKey] ?? orderStore.read(workspaceId, snapshot.queue);
+			const orderKey = rowOrderKey(workspaceId, snapshot.queue, snapshot.expiredOnly);
+			const visibleOrder = orders[orderKey] ?? orderStore.read(workspaceId, snapshot.queue, snapshot.expiredOnly);
 			const visibleRows = orderRows(queue.rows, visibleOrder);
 			const saveOrder = (ids) => {
 				setOrders((previous) => ({
 					...previous,
 					[orderKey]: ids
 				}));
-				orderStore.write(workspaceId, snapshot.queue, ids);
+				orderStore.write(workspaceId, snapshot.queue, ids, snapshot.expiredOnly);
 			};
 			const sortHandlers = {
 				start: (id) => {
@@ -1785,13 +1901,18 @@ window.__ModuleLoader__.load({
 					store.toggleExpired();
 				}
 			}, t("tab.expired") + " " + String(view.expired)) : null;
+			const notice = decisionNotice === void 0 ? null : (0, react.createElement)("p", {
+				"data-role": "decision-notice",
+				"data-ok": decisionNotice.ok ? "true" : "false"
+			}, decisionNotice.message);
 			const list = uiState === "ready" && queue.status === "ready" ? (0, react.createElement)("div", {
 				"data-role": "rows",
 				id: "merge-rows",
 				role: "tabpanel"
-			}, visibleRows.map((row) => rowNode(row, t, copy, sortHandlers, openBody))) : null;
+			}, visibleRows.map((row) => rowNode(row, t, copy, sortHandlers, openBody, face.decide === void 0 ? void 0 : decideRow, 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 activeFailure = viewFailure !== void 0 ? viewFailure : queue.status === "error" ? queue.failure : void 0;
+			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;
 			const overlay = snapshot.overlay;
 			const menuStyle = menu === void 0 ? void 0 : {
 				position: "fixed",
@@ -1868,7 +1989,6 @@ window.__ModuleLoader__.load({
 				}
 			}, t("start.pair"))), view.degraded ? (0, react.createElement)("p", { "data-role": "degraded" }, t("degraded") + " " + view.notes.join(",")) : null, (0, react.createElement)(SettingsCard, {
 				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")) : queue.refreshing === true ? (0, react.createElement)("p", {
 				"data-role": "note",
@@ -1879,7 +1999,7 @@ window.__ModuleLoader__.load({
 			}, 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", {
+			}, t("copyFailed")), notice, list, empty, queue.nextCursor === void 0 || uiState !== "ready" ? null : (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "load-more",
 				disabled: queue.status === "loading",
@@ -1957,6 +2077,7 @@ window.__ModuleLoader__.load({
 			overlayToken = 0;
 			snapshot;
 			started = false;
+			loadedView = false;
 			disposed = false;
 			constructor(source, initial = {}) {
 				this.source = source;
@@ -2030,14 +2151,16 @@ window.__ModuleLoader__.load({
 						});
 						return;
 					}
+					const keeping = this.loadedView;
 					this.set({
 						...this.snapshot,
-						viewState: "error",
+						viewState: keeping ? "ready" : "error",
 						viewFailure: outcome.failure,
 						viewRefreshing: false
 					});
 					return;
 				}
+				this.loadedView = true;
 				const wasBlocked = this.snapshot.viewState === "blocked";
 				this.set({
 					...this.snapshot,
@@ -2261,8 +2384,19 @@ window.__ModuleLoader__.load({
 			}
 		};
 		//#endregion
+		//#region src/client/session.ts
+		function currentSessionId(ctx) {
+			const byId = ctx.sessions?.list?.getSnapshot?.().byId;
+			if (byId === void 0) return void 0;
+			return Object.values(byId).find((session) => (session.retainedBy?.mainView ?? 0) > 0)?.id;
+		}
+		//#endregion
 		//#region src/client/index.ts
-		const inject = ["slots", "locale"];
+		const inject = [
+			"slots",
+			"sessions",
+			"locale"
+		];
 		/** The view component receives the workbench's activeView marker alongside its face. */
 		function MergeView(props) {
 			return props.activeView === "merge" ? MergePanel(props) : null;
@@ -2272,6 +2406,10 @@ window.__ModuleLoader__.load({
 		* @param ctx - the client context.
 		*/
 		function apply(ctx) {
+			const seat = createSettingsSeat(ctx);
+			ctx.effect(() => () => {
+				seat.dispose?.();
+			}, "evolution-merge-ui: settings seat");
 			registerWorkbenchView(ctx, {
 				id: PANEL_ID,
 				order: 45,
@@ -2292,7 +2430,6 @@ window.__ModuleLoader__.load({
 						body,
 						history
 					};
-					const seat = createSettingsSeat(ctx);
 					const workspaceId = panelWorkspaceId(ctx);
 					return {
 						store: new MergeStore(source),
@@ -2302,6 +2439,20 @@ window.__ModuleLoader__.load({
 							...seat.get("evolution-merge") === void 0 ? {} : { merge: seat.get("evolution-merge") },
 							...seat.get("evolution-approval") === void 0 ? {} : { platform: seat.get("evolution-approval") }
 						},
+						decide: async (rowId, verb) => {
+							const sessionId = currentSessionId(ctx);
+							if (sessionId === void 0) return {
+								ok: false,
+								message: "没有当前会话；请打开会话后重试"
+							};
+							const result = await decide(rowId, verb, sessionId);
+							if (result.ok) return result.payload;
+							const failure = result.failure;
+							return {
+								ok: false,
+								message: "message" in failure && typeof failure.message === "string" ? failure.message : "审批请求失败"
+							};
+						},
 						...workspaceId === void 0 ? {} : { workspaceId }
 					};
 				}

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

@@ -55,6 +55,7 @@ export declare class MergeStore {
     private overlayToken;
     private snapshot;
     private started;
+    private loadedView;
     private disposed;
     constructor(source: MergeSource, initial?: MergeStoreInitial);
     readonly read: () => StoreSnapshot;

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 { ConfigFormLike, SettingsFace } from '@lmzhen/dsh-evolution-client-kit';
+import type { SettingsFace } from '@lmzhen/dsh-evolution-client-kit';
 export type Translate = (key: string, values?: Readonly<Record<string, string | number>>) => string;
 export interface MergeFace {
     store: MergeStore;
@@ -9,7 +9,10 @@ export interface MergeFace {
     doctorCommand?: string;
     settings?: SettingsFace;
     workspaceId?: string;
+    decide?: (rowId: string, verb: 'approve' | 'reject') => Promise<{
+        ok: boolean;
+        message: string;
+    }>;
 }
-export declare function saveSetting(form: ConfigFormLike, field: string, value: boolean): Promise<boolean>;
 export declare function MergePanel(face: MergeFace): ReactNode;
 //# sourceMappingURL=Panel.d.ts.map

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

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

package/lib/types/client/platform-modal.d.ts

@@ -0,0 +1,15 @@
+/** Platform Modal reached through the rc.3 client module table. */
+import type { ReactNode } from 'react';
+export interface PlatformModalProps {
+    readonly open: boolean;
+    readonly onClose: () => void;
+    readonly title: string;
+    readonly closeLabel: string;
+    readonly children?: ReactNode;
+    readonly headless?: boolean;
+    readonly className?: string;
+}
+export type PlatformModalComponent = (props: PlatformModalProps) => ReactNode;
+/** The platform Modal, or undefined in a non-browser/SSR render or a deployment without the row. */
+export declare function platformModal(): PlatformModalComponent | undefined;
+//# sourceMappingURL=platform-modal.d.ts.map

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

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

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

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

package/package.json

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