@lmzhen/dsh-evolution-merge-ui 0.28.0 → 0.30.0

package/README.md

@@ -1,12 +1,11 @@
 # @lmzhen/dsh-evolution-merge-ui
 
-技能合并的只读浏览器面板：三队列计数、行列表与刷新；动作只展示为命令文本，不在浏览器写技能。
-
-## 数据面
-
-读取 `/api/dsh-evolution/merge/view` 与 `/api/dsh-evolution/merge/rows`，走生成的路由表和 route-client。失败按四态显示，不伪造空成功。
-
-## 已知限制
-
-- 只读；approve/reject 等动作需复制命令执行。
-- 面板仅在 `evolution-merge` host 行与其 bundle 同时挂载时可用。
+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.
+
+- 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.

package/lib/client.js

@@ -31,8 +31,8 @@ window.__ModuleLoader__.load({
 			merge: {
 				view: "/api/dsh-evolution/merge/view",
 				rows: "/api/dsh-evolution/merge/rows",
-				run: "/api/dsh-evolution/merge/run",
-				runs: "/api/dsh-evolution/merge/runs"
+				body: "/api/dsh-evolution/merge/body",
+				history: "/api/dsh-evolution/merge/history"
 			},
 			diagnostics: { view: "/api/dsh-evolution/diagnostics" }
 		};
@@ -100,12 +100,16 @@ window.__ModuleLoader__.load({
 					ok: true,
 					data: record.data
 				};
-				if (record.ok === false && typeof record.message === "string" && record.message !== "") return {
+				const nested = record.error;
+				const errorRecord = typeof nested === "object" && nested !== null ? nested : void 0;
+				const code = typeof record.code === "string" && record.code !== "" ? record.code : typeof errorRecord?.code === "string" ? errorRecord.code : void 0;
+				const message = typeof record.message === "string" && record.message !== "" ? record.message : typeof errorRecord?.message === "string" ? errorRecord.message : void 0;
+				if (record.ok === false && code !== void 0 && message !== void 0 && message !== "") return {
 					ok: false,
 					failure: {
 						kind: "refused",
-						code: typeof record.code === "string" && record.code !== "" ? record.code : "refused",
-						message: record.message
+						code,
+						message
 					}
 				};
 			}
@@ -154,42 +158,91 @@ window.__ModuleLoader__.load({
 		const zh = {
 			"entry.label": "技能合并",
 			"hint": "手动触发；后台逐对判定。这里只读，不写技能。",
+			"history": "历史",
+			"close": "关闭",
+			"tab.verify": "待判断",
 			"tab.pending": "待批准",
-			"tab.retry": "待重跑",
+			"tab.fuse": "待合并",
 			"tab.skipped": "无需合并",
+			"empty.verify": "没有待判断的对。",
 			"empty.pending": "没有待批准的合并。",
-			"empty.retry": "没有待重跑的对。",
+			"empty.fuse": "没有待合并的对。",
 			"empty.skipped": "没有标记为无需合并的对。",
 			"loading": "正在读取…",
 			"refresh": "刷新",
+			"loadMore": "加载更多",
+			"approval.on": "审批开：合并前需人工批准。",
+			"approval.off": "审批关：合并自动执行。",
 			"failed": "读取失败，保留上次结果。",
 			"stage.decide": "判定",
 			"stage.author": "合并",
 			"stage.validate": "检查",
-			"stage.commit": "提交"
+			"stage.commit": "提交",
+			"row.target": "目标",
+			"row.confidence": "置信度",
+			"row.attempts": "尝试",
+			"row.origin": "来源",
+			"row.expires": "暂存到期",
+			"row.expired": "已过期",
+			"row.reason": "原因",
+			"row.failure": "失败",
+			"row.noRetry": "不可重试",
+			"row.copy": "复制命令",
+			"origin.agent": "自动",
+			"origin.human": "人工",
+			"state.verify": "待判定",
+			"state.pending": "待批准",
+			"state.approved": "已批准",
+			"state.fuse": "待合并",
+			"state.skipped": "已跳过"
 		};
 		const en = {
 			"entry.label": "Skill merge",
 			"hint": "Manual only; pairs are judged in the background. Read-only here.",
-			"tab.pending": "Pending",
-			"tab.retry": "Retry",
+			"history": "History",
+			"close": "Close",
+			"tab.verify": "To judge",
+			"tab.pending": "Pending approval",
+			"tab.fuse": "Ready to merge",
 			"tab.skipped": "Skipped",
+			"empty.verify": "No pairs to judge.",
 			"empty.pending": "No pending merges.",
-			"empty.retry": "No pairs waiting to retry.",
+			"empty.fuse": "No pairs ready to merge.",
 			"empty.skipped": "No pairs marked as not worth merging.",
 			"loading": "Loading…",
 			"refresh": "Refresh",
+			"loadMore": "Load more",
+			"approval.on": "Approval on: merges wait for a human.",
+			"approval.off": "Approval off: merges run automatically.",
 			"failed": "Read failed; keeping the last result.",
 			"stage.decide": "Decide",
 			"stage.author": "Author",
 			"stage.validate": "Validate",
-			"stage.commit": "Commit"
+			"stage.commit": "Commit",
+			"row.target": "Target",
+			"row.confidence": "Confidence",
+			"row.attempts": "Attempts",
+			"row.origin": "Origin",
+			"row.expires": "Staging expires",
+			"row.expired": "Expired",
+			"row.reason": "Reason",
+			"row.failure": "Failure",
+			"row.noRetry": "not retryable",
+			"row.copy": "Copy command",
+			"origin.agent": "auto",
+			"origin.human": "human",
+			"state.verify": "Unverified",
+			"state.pending": "Pending approval",
+			"state.approved": "Approved",
+			"state.fuse": "Ready to merge",
+			"state.skipped": "Skipped"
 		};
 		//#endregion
 		//#region src/client/styles.ts
 		const CSS_TAG_ID = "evolution-merge-panel";
 		const CSS = [
-			".evolution-merge-panel { display:flex; flex-direction:column; gap:var(--evo-space-12); padding:var(--evo-space-16); }",
+			":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 }",
+			".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); }",
@@ -258,8 +311,9 @@ window.__ModuleLoader__.load({
 		* intentionally copied commands, not buttons that write from the browser.
 		*/
 		const QUEUES = [
+			"verify",
 			"pending",
-			"retry",
+			"fuse",
 			"skipped"
 		];
 		function failure(t, failure) {
@@ -274,15 +328,22 @@ window.__ModuleLoader__.load({
 			const [view, setView] = (0, react.useState)(face.view);
 			const [tab, setTab] = (0, react.useState)("pending");
 			const [rows, setRows] = (0, react.useState)(face.rows);
-			const [loading, setLoading] = (0, react.useState)(false);
+			const [loading, setLoading] = (0, react.useState)(face.loadRows !== void 0 || face.loadView !== void 0);
 			const [failed, setFailed] = (0, react.useState)(void 0);
-			const loadRows = (queue) => {
+			const [nextCursor, setNextCursor] = (0, react.useState)(void 0);
+			const [overlay, setOverlay] = (0, react.useState)(void 0);
+			const request = (0, react.useRef)(0);
+			const loadRows = (queue, cursor = 0) => {
 				const load = face.loadRows;
 				if (load === void 0) return;
+				const token = request.current + 1;
+				request.current = token;
 				setLoading(true);
-				load(queue).then((outcome) => {
+				load(queue, cursor).then((outcome) => {
+					if (token !== request.current) return;
 					if (outcome.ok) {
-						setRows(outcome.payload.items);
+						setRows((current) => [...cursor === 0 ? [] : current, ...outcome.payload.items].sort((a, b) => b.updatedAt.localeCompare(a.updatedAt)));
+						setNextCursor(outcome.payload.nextCursor);
 						setFailed(void 0);
 					} else setFailed(outcome.failure);
 				}).catch(() => {
@@ -298,15 +359,65 @@ window.__ModuleLoader__.load({
 				const load = face.loadView;
 				if (load === void 0) return;
 				load().then((outcome) => {
-					if (outcome.ok) setView(outcome.payload);
-				}).catch(() => {});
+					if (!outcome.ok) {
+						setFailed(outcome.failure);
+						return;
+					}
+					if (outcome.payload.schemaVersion !== void 0 && outcome.payload.schemaVersion !== 2) {
+						setFailed({
+							kind: "server",
+							status: 0
+						});
+						return;
+					}
+					setView(outcome.payload);
+				}).catch(() => {
+					setFailed({
+						kind: "server",
+						status: 0
+					});
+				});
+			};
+			const openBody = (id, side) => {
+				const load = face.loadBody;
+				if (load === void 0) return;
+				load(id, side).then((outcome) => {
+					if (outcome.ok) setOverlay({
+						kind: "body",
+						html: outcome.payload.html,
+						label: id + ":" + side
+					});
+					else setFailed(outcome.failure);
+				}).catch(() => {
+					setFailed({
+						kind: "server",
+						status: 0
+					});
+				});
+			};
+			const openHistory = () => {
+				const load = face.loadHistory;
+				if (load === void 0) return;
+				load().then((outcome) => {
+					if (outcome.ok) setOverlay({
+						kind: "history",
+						items: outcome.payload.items
+					});
+					else setFailed(outcome.failure);
+				}).catch(() => {
+					setFailed({
+						kind: "server",
+						status: 0
+					});
+				});
 			};
 			(0, react.useEffect)(() => {
 				loadView();
 				loadRows("pending");
 			}, [face]);
 			(0, react.useEffect)(() => {
-				loadRows(tab);
+				setNextCursor(void 0);
+				loadRows(tab, 0);
 			}, [tab]);
 			const counts = view.counts;
 			const stats = (0, react.createElement)("div", { "data-role": "stats" }, QUEUES.map((queue) => (0, react.createElement)("div", {
@@ -314,25 +425,88 @@ window.__ModuleLoader__.load({
 				"data-role": "stat",
 				"data-queue": queue
 			}, (0, react.createElement)("div", { "data-role": "stat-value" }, String(counts[queue])), (0, react.createElement)("div", { "data-role": "stat-label" }, t("tab." + queue)))));
-			const tabs = (0, react.createElement)("div", { "data-role": "tabs" }, QUEUES.map((queue) => (0, react.createElement)("button", {
+			const latest = view.latestRun;
+			const runStrip = latest === void 0 ? null : (0, react.createElement)("div", { "data-role": "run-strip" }, (0, react.createElement)("span", { "data-role": "run-id" }, latest.id), (0, react.createElement)("span", { "data-role": "run-state" }, latest.state), latest.stage === void 0 ? null : (0, react.createElement)("span", { "data-role": "run-stage" }, t("stage." + latest.stage)), latest.progress === void 0 ? null : (0, react.createElement)("span", { "data-role": "run-progress" }, String(latest.progress.done) + "/" + String(latest.progress.total)));
+			const tabs = (0, react.createElement)("div", {
+				"data-role": "tabs",
+				role: "tablist"
+			}, QUEUES.map((queue) => (0, react.createElement)("button", {
 				key: queue,
 				type: "button",
+				role: "tab",
+				"aria-selected": tab === queue ? "true" : "false",
 				"data-role": "tab",
 				"data-active": tab === queue ? "true" : "false",
 				onClick: () => {
 					setTab(queue);
 				}
 			}, t("tab." + queue) + " " + String(counts[queue]))));
-			const list = rows.length === 0 ? (0, react.createElement)("p", { "data-role": "note" }, t("empty." + tab)) : (0, react.createElement)("div", { "data-role": "rows" }, rows.map((row) => (0, react.createElement)("div", {
-				key: row.id,
-				"data-role": "row"
-			}, (0, react.createElement)("div", null, (0, react.createElement)("div", { "data-role": "row-label" }, row.label), (0, react.createElement)("div", { "data-role": "row-meta" }, row.state + (row.stage === null ? "" : " · " + t("stage." + row.stage)))), (0, react.createElement)("div", { "data-role": "row-meta" }, row.updatedAt))));
-			return (0, react.createElement)("section", { className: CSS_TAG_ID }, (0, react.createElement)("p", { "data-role": "hint" }, t("hint")), stats, tabs, loading ? (0, react.createElement)("p", { "data-role": "note" }, t("loading")) : null, failed === void 0 ? null : (0, react.createElement)("div", { "data-role": "note" }, failure(t, failed)), list, (0, react.createElement)("button", {
+			const list = rows.length === 0 ? (0, react.createElement)("p", { "data-role": "note" }, t("empty." + tab)) : (0, react.createElement)("div", { "data-role": "rows" }, rows.map((row) => {
+				const facts = [
+					row.target === void 0 ? void 0 : t("row.target") + " " + row.target,
+					row.confidence === void 0 ? void 0 : t("row.confidence") + " " + row.confidence.toFixed(2),
+					row.attempts === void 0 ? void 0 : t("row.attempts") + " " + String(row.attempts),
+					row.origin === void 0 ? void 0 : t("row.origin") + " " + t("origin." + row.origin),
+					row.stagingExpiresAt === void 0 ? void 0 : t("row.expires") + " " + new Date(row.stagingExpiresAt).toLocaleString(),
+					row.expired === void 0 ? void 0 : t("row.expired") + " " + row.expired,
+					row.reason === void 0 ? void 0 : t("row.reason") + " " + row.reason,
+					row.summary === void 0 ? void 0 : row.summary.filter(Boolean).join(" · "),
+					row.failure === void 0 ? void 0 : t("row.failure") + " " + row.failure.message + (row.failure.retryable ? "" : " · " + t("row.noRetry"))
+				].filter((value) => value !== void 0).join(" · ");
+				return (0, react.createElement)("div", {
+					key: row.id,
+					"data-role": "row"
+				}, (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))), facts === "" ? null : (0, react.createElement)("div", { "data-role": "row-facts" }, facts)), (0, react.createElement)("div", null, (0, react.createElement)("div", { "data-role": "row-meta" }, row.updatedAt), (0, react.createElement)("div", { "data-role": "row-actions" }, face.loadBody === void 0 ? null : (0, react.createElement)("button", {
+					type: "button",
+					"data-role": "body-a",
+					onClick: () => {
+						openBody(row.id, "a");
+					}
+				}, "A"), face.loadBody === void 0 ? null : (0, react.createElement)("button", {
+					type: "button",
+					"data-role": "body-b",
+					onClick: () => {
+						openBody(row.id, "b");
+					}
+				}, "B"), (row.actions ?? []).filter((action) => view.approval !== false || !action.includes("/evolution merge approve")).map((action) => (0, react.createElement)("button", {
+					key: action,
+					type: "button",
+					"data-role": "row-action",
+					title: action,
+					onClick: () => {
+						navigator.clipboard.writeText(action);
+					}
+				}, t("row.copy"))))));
+			}));
+			return (0, react.createElement)("section", {
+				className: CSS_TAG_ID,
+				"data-state": loading ? "loading" : failed !== void 0 ? "failed" : rows.length === 0 ? "empty" : "ready"
+			}, (0, react.createElement)("p", { "data-role": "hint" }, t("hint")), view.approval === void 0 ? null : (0, react.createElement)("p", { "data-role": "approval" }, t(view.approval ? "approval.on" : "approval.off")), runStrip, stats, tabs, loading ? (0, react.createElement)("p", { "data-role": "note" }, t("loading")) : null, failed === void 0 ? null : (0, react.createElement)("div", { "data-role": "note" }, failure(t, failed)), list, nextCursor === void 0 ? null : (0, react.createElement)("button", {
+				type: "button",
+				"data-role": "load-more",
+				onClick: () => {
+					loadRows(tab, Number(nextCursor));
+				}
+			}, t("loadMore")), face.loadHistory === void 0 ? null : (0, react.createElement)("button", {
+				type: "button",
+				"data-role": "history",
+				onClick: openHistory
+			}, t("history")), overlay === void 0 ? null : (0, react.createElement)("section", { "data-role": "overlay" }, (0, react.createElement)("button", {
+				type: "button",
+				"data-role": "overlay-close",
+				onClick: () => {
+					setOverlay(void 0);
+				}
+			}, t("close")), overlay.kind === "body" ? (0, react.createElement)("div", {
+				"data-role": "body",
+				"data-label": overlay.label,
+				dangerouslySetInnerHTML: { __html: overlay.html }
+			}) : (0, react.createElement)("ul", { "data-role": "history-list" }, overlay.items.map((item) => (0, react.createElement)("li", { key: item.name }, item.name + " · " + item.kind + " · " + item.reason + " · v" + String(item.lastVersion))))), (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "refresh",
 				onClick: () => {
 					loadView();
-					loadRows(tab);
+					loadRows(tab, 0);
 				}
 			}, t("refresh")));
 		}
@@ -356,17 +530,22 @@ window.__ModuleLoader__.load({
 		function seedView() {
 			return {
 				counts: {
+					verify: 0,
 					pending: 0,
-					retry: 0,
+					fuse: 0,
 					skipped: 0
 				},
 				tabs: [
+					{
+						queue: "verify",
+						count: 0
+					},
 					{
 						queue: "pending",
 						count: 0
 					},
 					{
-						queue: "retry",
+						queue: "fuse",
 						count: 0
 					},
 					{

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

@@ -3,12 +3,16 @@
  * intentionally copied commands, not buttons that write from the browser.
  */
 import { type ReactNode } from 'react';
-import type { MergeOutcome, MergeQueue, MergeRowView, MergeViewPayload, QueuePage } from './api.ts';
+import type { MergeBody, MergeHistoryItem, MergeOutcome, MergeQueue, MergeRowView, MergeViewPayload, QueuePage } from './api.ts';
 export interface MergeFace {
     view: MergeViewPayload;
     rows: MergeRowView[];
     loadView?: () => Promise<MergeOutcome<MergeViewPayload>>;
     loadRows?: (queue: MergeQueue, cursor?: number) => Promise<MergeOutcome<QueuePage>>;
+    loadBody?: (id: string, side: 'a' | 'b') => Promise<MergeOutcome<MergeBody>>;
+    loadHistory?: () => Promise<MergeOutcome<{
+        items: MergeHistoryItem[];
+    }>>;
     t: (key: string) => string;
 }
 export declare function MergePanel(face: MergeFace): ReactNode;

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

@@ -2,22 +2,37 @@ import { type RouteFailure } from './route-client.generated.ts';
 export declare const HOST_ROUTES: {
     readonly view: "/api/dsh-evolution/merge/view";
     readonly rows: "/api/dsh-evolution/merge/rows";
-    readonly run: "/api/dsh-evolution/merge/run";
-    readonly runs: "/api/dsh-evolution/merge/runs";
+    readonly body: "/api/dsh-evolution/merge/body";
+    readonly history: "/api/dsh-evolution/merge/history";
 };
-export type MergeQueue = 'pending' | 'retry' | 'skipped';
+export type MergeQueue = 'verify' | 'pending' | 'fuse' | 'skipped';
 export interface MergeCounts {
+    verify: number;
     pending: number;
-    retry: number;
+    fuse: number;
     skipped: number;
 }
+export interface MergeRunView {
+    id: string;
+    state: string;
+    command?: string;
+    stage?: string;
+    progress?: {
+        done: number;
+        total: number;
+    };
+    startedAt: number;
+}
 export interface MergeViewPayload {
+    schemaVersion?: number;
     counts: MergeCounts;
     tabs: {
         queue: MergeQueue;
         count: number;
     }[];
     commands: string[];
+    latestRun?: MergeRunView;
+    approval?: boolean;
 }
 export interface MergeRowView {
     id: string;
@@ -29,12 +44,41 @@ export interface MergeRowView {
     stage: string | null;
     label: string;
     updatedAt: string;
+    createdAt?: string;
+    target?: string;
+    confidence?: number;
+    failure?: {
+        stage: string;
+        code: string;
+        message: string;
+        retryable: boolean;
+    };
+    attempts?: number;
+    origin?: 'agent' | 'human';
+    stagingExpiresAt?: number;
+    expired?: 'target-taken' | 'source-changed';
+    reason?: string;
+    summary?: string[];
+    actions?: string[];
 }
 export interface QueuePage {
     queue: MergeQueue;
     items: MergeRowView[];
     nextCursor?: string;
 }
+export interface MergeBody {
+    content: string;
+    markdown: boolean;
+    html: string;
+}
+export interface MergeHistoryItem {
+    name: string;
+    kind: 'merged' | 'deleted' | 'split' | 'other';
+    reason: string;
+    lastVersion: number;
+    archivedAt: string;
+    sourceRunId?: string;
+}
 export type MergeOutcome<T> = {
     ok: true;
     payload: T;
@@ -44,4 +88,8 @@ export type MergeOutcome<T> = {
 };
 export declare function view(): Promise<MergeOutcome<MergeViewPayload>>;
 export declare function rows(queue: MergeQueue, cursor?: number): Promise<MergeOutcome<QueuePage>>;
+export declare function body(id: string, side: 'a' | 'b'): Promise<MergeOutcome<MergeBody>>;
+export declare function history(): Promise<MergeOutcome<{
+    items: MergeHistoryItem[];
+}>>;
 //# sourceMappingURL=api.d.ts.map

package/lib/types/client/routes.generated.d.ts

@@ -27,8 +27,8 @@ export declare const ROUTES: {
     readonly merge: {
         readonly view: "/api/dsh-evolution/merge/view";
         readonly rows: "/api/dsh-evolution/merge/rows";
-        readonly run: "/api/dsh-evolution/merge/run";
-        readonly runs: "/api/dsh-evolution/merge/runs";
+        readonly body: "/api/dsh-evolution/merge/body";
+        readonly history: "/api/dsh-evolution/merge/history";
     };
     readonly diagnostics: {
         readonly view: "/api/dsh-evolution/diagnostics";

package/package.json

@@ -11,7 +11,7 @@
       ]
     }
   },
-  "version": "0.28.0",
+  "version": "0.30.0",
   "publishConfig": {
     "access": "public"
   },