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

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" }
 		};
@@ -158,11 +158,15 @@ 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": "刷新",
@@ -179,6 +183,8 @@ window.__ModuleLoader__.load({
 			"row.attempts": "尝试",
 			"row.origin": "来源",
 			"row.expires": "暂存到期",
+			"row.expired": "已过期",
+			"row.reason": "原因",
 			"row.failure": "失败",
 			"row.noRetry": "不可重试",
 			"row.copy": "复制命令",
@@ -186,17 +192,22 @@ window.__ModuleLoader__.load({
 			"origin.human": "人工",
 			"state.verify": "待判定",
 			"state.pending": "待批准",
-			"state.fuse": "待融合",
+			"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",
@@ -213,6 +224,8 @@ window.__ModuleLoader__.load({
 			"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",
@@ -220,7 +233,8 @@ window.__ModuleLoader__.load({
 			"origin.human": "human",
 			"state.verify": "Unverified",
 			"state.pending": "Pending approval",
-			"state.fuse": "Ready to fuse",
+			"state.approved": "Approved",
+			"state.fuse": "Ready to merge",
 			"state.skipped": "Skipped"
 		};
 		//#endregion
@@ -297,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) {
@@ -316,6 +331,7 @@ window.__ModuleLoader__.load({
 			const [loading, setLoading] = (0, react.useState)(face.loadRows !== void 0 || face.loadView !== void 0);
 			const [failed, setFailed] = (0, react.useState)(void 0);
 			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;
@@ -347,7 +363,7 @@ window.__ModuleLoader__.load({
 						setFailed(outcome.failure);
 						return;
 					}
-					if (outcome.payload.schemaVersion !== void 0 && outcome.payload.schemaVersion !== 1) {
+					if (outcome.payload.schemaVersion !== void 0 && outcome.payload.schemaVersion !== 2) {
 						setFailed({
 							kind: "server",
 							status: 0
@@ -362,6 +378,39 @@ window.__ModuleLoader__.load({
 					});
 				});
 			};
+			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");
@@ -399,12 +448,27 @@ window.__ModuleLoader__.load({
 					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" }, (row.actions ?? []).filter((action) => view.approval !== false || !action.includes("/evolution merge approve")).map((action) => (0, react.createElement)("button", {
+				}, (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",
@@ -423,7 +487,21 @@ window.__ModuleLoader__.load({
 				onClick: () => {
 					loadRows(tab, Number(nextCursor));
 				}
-			}, t("loadMore")), (0, react.createElement)("button", {
+			}, 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: () => {
@@ -452,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,13 +2,14 @@ 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 {
@@ -55,6 +56,9 @@ export interface MergeRowView {
     attempts?: number;
     origin?: 'agent' | 'human';
     stagingExpiresAt?: number;
+    expired?: 'target-taken' | 'source-changed';
+    reason?: string;
+    summary?: string[];
     actions?: string[];
 }
 export interface QueuePage {
@@ -62,6 +66,19 @@ export interface QueuePage {
     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;
@@ -71,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.29.0",
+  "version": "0.30.0",
   "publishConfig": {
     "access": "public"
   },