@lmzhen/dsh-evolution-merge-ui 0.28.0 → 0.29.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

@@ -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
 					}
 				};
 			}
@@ -162,11 +166,28 @@ window.__ModuleLoader__.load({
 			"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.failure": "失败",
+			"row.noRetry": "不可重试",
+			"row.copy": "复制命令",
+			"origin.agent": "自动",
+			"origin.human": "人工",
+			"state.verify": "待判定",
+			"state.pending": "待批准",
+			"state.fuse": "待融合",
+			"state.skipped": "已跳过"
 		};
 		const en = {
 			"entry.label": "Skill merge",
@@ -179,17 +200,35 @@ window.__ModuleLoader__.load({
 			"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.failure": "Failure",
+			"row.noRetry": "not retryable",
+			"row.copy": "Copy command",
+			"origin.agent": "auto",
+			"origin.human": "human",
+			"state.verify": "Unverified",
+			"state.pending": "Pending approval",
+			"state.fuse": "Ready to fuse",
+			"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); }",
@@ -274,15 +313,21 @@ 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 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 +343,32 @@ 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 !== 1) {
+						setFailed({
+							kind: "server",
+							status: 0
+						});
+						return;
+					}
+					setView(outcome.payload);
+				}).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 +376,59 @@ 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.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", {
+					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")), (0, react.createElement)("button", {
 				type: "button",
 				"data-role": "refresh",
 				onClick: () => {
 					loadView();
-					loadRows(tab);
+					loadRows(tab, 0);
 				}
 			}, t("refresh")));
 		}

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

@@ -11,13 +11,27 @@ export interface MergeCounts {
     retry: 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,6 +43,19 @@ 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;
+    actions?: string[];
 }
 export interface QueuePage {
     queue: MergeQueue;

package/package.json

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