@lmzhen/dsh-evolution-settings-ui 0.27.3 → 0.29.0

package/lib/client.js

@@ -28,6 +28,12 @@ window.__ModuleLoader__.load({
 				health: "/api/dsh-evolution/skill-history/health"
 			},
 			"skill-health": { rows: "/api/dsh-evolution/skill-health/rows" },
+			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"
+			},
 			diagnostics: { view: "/api/dsh-evolution/diagnostics" }
 		};
 		//#endregion
@@ -94,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
 					}
 				};
 			}
@@ -331,6 +341,48 @@ window.__ModuleLoader__.load({
 					}
 				]
 			},
+			{
+				namespace: "evolution-merge",
+				seatKey: "evolution-merge",
+				fields: [
+					{
+						id: "mergeApproval",
+						group: "merge",
+						doc: "Pause after round 1 and put the pair in the pending queue instead of authoring round 2 automatically.",
+						label: "合并审批",
+						hint: "开启后，第一轮判定完先停下、进入待批准清单；关闭则直接进入第二轮合并。",
+						control: "switch",
+						unit: "",
+						values: [],
+						valueLabels: [],
+						atLeast: ""
+					},
+					{
+						id: "mergeSkippedTtlDays",
+						group: "merge",
+						doc: "Days a skipped pair stays out of screening; 0 means it never expires.",
+						label: "无需合并保留天数",
+						hint: "判定无需合并的对，多少天内不再参与筛选；0 表示一直保留。",
+						control: "number",
+						unit: "天",
+						values: [],
+						valueLabels: [],
+						atLeast: ""
+					},
+					{
+						id: "mergeRunTimeoutMinutes",
+						group: "merge",
+						doc: "Wall-clock budget of one merge run; 0 means no limit.",
+						label: "单次运行上限",
+						hint: "一次合并运行最多持续多少分钟；0 表示不设上限。",
+						control: "number",
+						unit: "分钟",
+						values: [],
+						valueLabels: [],
+						atLeast: ""
+					}
+				]
+			},
 			{
 				namespace: "evolution-review",
 				seatKey: "evolution-review",
@@ -642,6 +694,7 @@ window.__ModuleLoader__.load({
 					"evolution-approval",
 					"evolution-commands",
 					"evolution-curator",
+					"evolution-merge",
 					"evolution-review",
 					"memory-files",
 					"tool-memory",
@@ -654,6 +707,7 @@ window.__ModuleLoader__.load({
 					"evolution-approval",
 					"evolution-commands",
 					"evolution-curator",
+					"evolution-merge",
 					"evolution-review",
 					"memory-files"
 				]
@@ -664,6 +718,7 @@ window.__ModuleLoader__.load({
 					"evolution-approval",
 					"evolution-commands",
 					"evolution-curator",
+					"evolution-merge",
 					"evolution-review",
 					"memory-files",
 					"tool-memory",
@@ -1211,6 +1266,7 @@ window.__ModuleLoader__.load({
 			approval: { command: "/evolution pending … /evolution approve <id> … /evolution reject <id> … /evolution release <id>" },
 			"skill-history": { command: "/evolution restore <name> [v]（查看：/evolution skills history <name>）" },
 			"skill-health": { command: "/evolution skills refresh（健康行：/evolution doctor）" },
+			merge: { command: "/evolution merge status / pending / approve <id> / report" },
 			diagnostics: {
 				command: "/evolution doctor",
 				platformCli: "dsh --json /evolution doctor"
@@ -1265,6 +1321,7 @@ window.__ModuleLoader__.load({
 			cardSkills: "技能写入规则",
 			cardApproval: "写入审批",
 			cardCommands: "维护扫描",
+			cardMerge: "技能自动合并",
 			approvalTitle: "待批写入",
 			approvalLoading: "正在读取待批项…",
 			approvalEmpty: "没有待批的写入",
@@ -1348,6 +1405,7 @@ window.__ModuleLoader__.load({
 			cardSkills: "Skill write rules",
 			cardApproval: "Write approval",
 			cardCommands: "Maintenance scans",
+			cardMerge: "Skill auto-merge",
 			approvalTitle: "Writes awaiting approval",
 			approvalLoading: "reading the pending window…",
 			approvalEmpty: "nothing is waiting for a decision",
@@ -1408,7 +1466,8 @@ window.__ModuleLoader__.load({
 			"evolution-curator": "cardCurator",
 			"tool-skill-manage": "cardSkills",
 			"evolution-approval": "cardApproval",
-			"evolution-commands": "cardCommands"
+			"evolution-commands": "cardCommands",
+			"evolution-merge": "cardMerge"
 		});
 		/**
 		* Resolve one message without the locale seat (tests and the fallback path).
@@ -2065,7 +2124,7 @@ window.__ModuleLoader__.load({
 		* @returns the section element.
 		*/
 		function SettingsSection(face) {
-			return (0, react.createElement)("div", { className: "evolution-params" }, (0, react.createElement)("h2", { className: "evolution-params-title" }, face.t("title")), (0, react.createElement)("p", { className: "evolution-params-subtitle" }, face.t("subtitle")), (0, react.createElement)("p", { className: "evolution-params-about" }, "0.27.3 · Web settings cards for the evolution family's parameter namespaces"), (0, react.createElement)("div", {
+			return (0, react.createElement)("div", { className: "evolution-params" }, (0, react.createElement)("h2", { className: "evolution-params-title" }, face.t("title")), (0, react.createElement)("p", { className: "evolution-params-subtitle" }, face.t("subtitle")), (0, react.createElement)("p", { className: "evolution-params-about" }, "0.29.0 · Web settings cards for the evolution family's parameter namespaces"), (0, react.createElement)("div", {
 				key: PENDING_CARD_KEY,
 				className: "evolution-params-group"
 			}, face.renderSlot(CARD_SLOT, {}, { entryKey: PENDING_CARD_KEY })), (0, react.createElement)("div", {

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

@@ -4,5 +4,5 @@ import type { FallbackHint } from './contracts.generated.ts';
  * COMMAND_FALLBACKS (the ONE home). When the platform's connection carrier is absent (E-325) the
  * panels render this hint instead of a bare HTTP failure — same use case, command face.
  */
-export declare const FALLBACKS: Readonly<Record<'approval' | 'skill-history' | 'skill-health' | 'diagnostics', FallbackHint>>;
+export declare const FALLBACKS: Readonly<Record<'approval' | 'skill-history' | 'skill-health' | 'merge' | 'diagnostics', FallbackHint>>;
 //# sourceMappingURL=fallbacks.generated.d.ts.map

package/lib/types/client/generated-about.d.ts

@@ -5,7 +5,7 @@
  * description, so the settings surface can state both without a hand-written copy.
  */
 /** The family version this surface belongs to. */
-export declare const FAMILY_VERSION = "0.27.3";
+export declare const FAMILY_VERSION = "0.29.0";
 /** What this surface is for, in one line. */
 export declare const PACKAGE_PURPOSE = "Web settings cards for the evolution family's parameter namespaces";
 //# sourceMappingURL=generated-about.d.ts.map

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

@@ -45,6 +45,7 @@ export declare const zh: {
     readonly cardSkills: "技能写入规则";
     readonly cardApproval: "写入审批";
     readonly cardCommands: "维护扫描";
+    readonly cardMerge: "技能自动合并";
     readonly approvalTitle: "待批写入";
     readonly approvalLoading: "正在读取待批项…";
     readonly approvalEmpty: "没有待批的写入";

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

@@ -1,5 +1,5 @@
 /** One host data-plane surface the browser half can call. */
-export type SurfaceId = 'approval' | 'skill-history' | 'skill-health' | 'diagnostics';
+export type SurfaceId = 'approval' | 'skill-history' | 'skill-health' | 'merge' | 'diagnostics';
 /**
  * Every family host path, generated from evolution-core's HOST_ROUTES (the ONE declaration).
  * A browser half cannot import the host package at runtime (client bundles keep @deepseek-ai/*
@@ -24,6 +24,12 @@ export declare const ROUTES: {
     readonly 'skill-health': {
         readonly rows: "/api/dsh-evolution/skill-health/rows";
     };
+    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 diagnostics: {
         readonly view: "/api/dsh-evolution/diagnostics";
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-settings-ui",
   "description": "Web settings cards for the evolution family's parameter namespaces (community build)",
-  "version": "0.27.3",
+  "version": "0.29.0",
   "publishConfig": {
     "access": "public"
   },