@lmzhen/dsh-evolution-settings-ui 0.27.2 → 0.28.0

package/README.md

@@ -65,9 +65,9 @@ dropped rather than painted under another row's heading.
 
 ## The diagnostics card
 
-One card in the same section is the read-only **self-check** (`data-card="diagnostics"`): it renders the Host's one `DiagnosticsView` — the same object the CLI and `/api/dsh-evolution/diagnostics` answer — and owns no key list and no status vocabulary.
+One card in the same section is the read-only **self-check** (`data-card="diagnostics"`): it renders the Host's `DiagnosticsView` runtime window — the same rows the CLI and `/api/dsh-evolution/diagnostics` answer — and owns no key list and no status vocabulary. The view's documentation facts are a CLI/JSON concern and are deliberately not rendered here: a settings page carries the runtime reading, not a spec sheet.
 
-It leads with a plain-language verdict derived from the frozen runtime statuses (`运行正常` / `{n} 项需要注意` / `{n} 项异常` / `{n} 项待确认`, decided fail > warn > unknown > ok), then groups the view as **环境信息** (fact label above value) and **运行状态** (status dot and word, detail line, remedy line). The raw material — view schema, check time and each fact's source home — sits behind one **技术详情** disclosure, so the default reading path carries no identifiers.
+It leads with a plain-language verdict derived from the frozen runtime statuses (`运行正常` / `{n} 项需要注意` / `{n} 项异常` / `{n} 项待确认`, decided fail > warn > unknown > ok), then renders **运行状态** rows (status dot and word, detail line, remedy line).
 
 The card is collapsible with the same `.evolution-param-head` button and body inset as the parameter cards; Refresh is an explicit control in the body (one read on mount, one per click), and a failed read renders the shared failure block with the `/evolution doctor` command fallback.
 ## A seat that arrives late revives the card

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
@@ -331,6 +337,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 +690,7 @@ window.__ModuleLoader__.load({
 					"evolution-approval",
 					"evolution-commands",
 					"evolution-curator",
+					"evolution-merge",
 					"evolution-review",
 					"memory-files",
 					"tool-memory",
@@ -1069,15 +1118,15 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/DiagnosticsCard.ts
 		/**
-		* The diagnostics card (W7 S7): the browser face of the SAME DiagnosticsView the CLI and the
+		* The diagnostics card (W7 S7): the settings face of the SAME DiagnosticsView the CLI and the
 		* `/api/dsh-evolution/diagnostics` route answer.
 		*
 		* Read-only by construction: it fetches once on mount and only refetches on an explicit Refresh; a
-		* failed read renders the shared FailureBlock with the command-face fallback. The client still owns
-		* no key list and no status vocabulary: it renders the host view's own order, groups the two
-		* sections the view carries (environment facts / runtime rows) and gives a plain-language summary
-		* from the frozen status set. Raw identifiers, source paths and the view schema live behind the
-		* one `技术详情` disclosure, not in the main reading path.
+		* failed read renders the shared FailureBlock with the command-face fallback. The client owns no
+		* key list and no status vocabulary: it renders the host view's frozen runtime rows and leads with
+		* a plain-language summary. The view's documentation facts are a CLI/JSON concern and are
+		* deliberately NOT rendered here (0.27.2 real-machine feedback: a settings page is not a spec
+		* sheet; the runtime window is the whole reading).
 		* @module @lmzhen/dsh-evolution-settings-ui/client/DiagnosticsCard
 		*/
 		/** Which word one status gets (the frozen W1 status set). */
@@ -1113,15 +1162,6 @@ window.__ModuleLoader__.load({
 				count: 0
 			};
 		}
-		/** A locally formatted check time; an unparseable stamp stays visible instead of becoming NaN. */
-		function checkedAt(iso) {
-			try {
-				const at = new Date(iso);
-				return Number.isNaN(at.getTime()) ? iso : at.toLocaleString();
-			} catch {
-				return iso;
-			}
-		}
 		/**
 		* Render the card.
 		* @param props - the copy seat, the host call and the command fallback.
@@ -1166,21 +1206,12 @@ window.__ModuleLoader__.load({
 				className: "evo-diag-badge",
 				"data-status": summary.status
 			}, t(SUMMARY_KEYS[summary.status], summary.count === 0 ? void 0 : { n: summary.count })), (0, react.createElement)("span", { className: "evolution-param-chevron" }, open ? "▲" : "▼"));
-			const facts = (view) => view.facts.length === 0 ? null : (0, react.createElement)("div", {}, (0, react.createElement)("h3", { className: "evolution-param-group" }, t("diagFactsTitle")), (0, react.createElement)("div", { className: "evo-diag-list" }, ...view.facts.map((fact) => (0, react.createElement)("div", {
-				key: "fact-" + fact.key,
-				className: "evo-diag-item",
-				"data-kind": "fact"
-			}, (0, react.createElement)("span", { className: "evo-diag-label" }, fact.label), (0, react.createElement)("span", { className: "evo-diag-value" }, fact.value)))));
 			const runtime = (view) => view.runtime.length === 0 ? null : (0, react.createElement)("div", {}, (0, react.createElement)("h3", { className: "evolution-param-group" }, t("diagRuntimeTitle")), (0, react.createElement)("div", { className: "evo-diag-list" }, ...view.runtime.map((row) => (0, react.createElement)("div", {
 				key: "runtime-" + row.key,
 				className: "evo-diag-item",
 				"data-kind": "runtime",
 				"data-status": row.status
 			}, (0, react.createElement)("div", { className: "evo-diag-row-head" }, (0, react.createElement)("span", { className: "evo-diag-dot" }), (0, react.createElement)("span", { className: "evo-diag-label" }, row.label), (0, react.createElement)("span", { className: "evo-diag-status" }, t(STATUS_KEYS[row.status]))), row.detail === void 0 ? null : (0, react.createElement)("span", { className: "evo-diag-detail" }, row.detail), row.remedy === void 0 ? null : (0, react.createElement)("span", { className: "evo-diag-remedy" }, t("diagRemedy") + row.remedy)))));
-			const details = (view) => (0, react.createElement)("details", { className: "evo-diag-meta" }, (0, react.createElement)("summary", {}, t("diagDetails")), (0, react.createElement)("div", { className: "evo-diag-meta-body" }, (0, react.createElement)("span", {}, t("diagCheckedAt", { at: checkedAt(view.generatedAt) })), (0, react.createElement)("span", {}, t("diagSchema", { n: view.schemaVersion })), view.facts.length === 0 ? null : (0, react.createElement)("span", { className: "evo-diag-sources-title" }, t("diagSourcesTitle")), ...view.facts.map((fact) => (0, react.createElement)("span", {
-				key: "source-" + fact.key,
-				className: "evo-diag-source"
-			}, (0, react.createElement)("span", { className: "evo-diag-source-label" }, fact.label), (0, react.createElement)("span", { className: "evo-diag-source-home" }, fact.home)))));
 			const body = () => {
 				if (state.phase === "loading") return (0, react.createElement)("p", { className: "evolution-param-loading" }, t("stateLoading"));
 				if (state.phase === "failed") return FailureBlock({
@@ -1194,7 +1225,7 @@ window.__ModuleLoader__.load({
 					className: "evolution-param-button",
 					onClick: refresh,
 					"data-action": "diag-refresh"
-				}, t("diagRefresh"))), facts(view), runtime(view), details(view));
+				}, t("diagRefresh"))), runtime(view), view.runtime.length === 0 ? (0, react.createElement)("p", { className: "evolution-param-note" }, t("diagNoRows")) : null);
 			};
 			return (0, react.createElement)("section", {
 				className: "evolution-param-card",
@@ -1229,6 +1260,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"
@@ -1283,6 +1315,7 @@ window.__ModuleLoader__.load({
 			cardSkills: "技能写入规则",
 			cardApproval: "写入审批",
 			cardCommands: "维护扫描",
+			cardMerge: "技能自动合并",
 			approvalTitle: "待批写入",
 			approvalLoading: "正在读取待批项…",
 			approvalEmpty: "没有待批的写入",
@@ -1310,8 +1343,7 @@ window.__ModuleLoader__.load({
 			approvalDiffRemoved: "{n} 行删除",
 			approvalDiffCut: "改动区域已截断",
 			diagTitle: "诊断",
-			diagSubtitle: "安装、兼容与运行状态的只读自查；不会改动任何东西。",
-			diagFactsTitle: "环境信息",
+			diagSubtitle: "运行状态的只读自查；不会改动任何东西。",
 			diagRuntimeTitle: "运行状态",
 			diagSummaryOk: "运行正常",
 			diagSummaryWarn: "{n} 项需要注意",
@@ -1324,10 +1356,7 @@ window.__ModuleLoader__.load({
 			diagStatusFail: "异常",
 			diagStatusUnknown: "未知",
 			diagRemedy: "建议：",
-			diagDetails: "技术详情",
-			diagCheckedAt: "检查时间：{at}",
-			diagSchema: "数据版本 v{n}",
-			diagSourcesTitle: "数据来源",
+			diagNoRows: "没有可显示的运行状态",
 			stateLoading: "正在读取…",
 			failureUnauthorized: "需要登录：重新打开这个页面完成登录后再试。",
 			failureForbidden: "平台拒绝了这个请求（身份不是 owner）。",
@@ -1370,6 +1399,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",
@@ -1397,8 +1427,7 @@ window.__ModuleLoader__.load({
 			approvalDiffRemoved: "{n} lines removed",
 			approvalDiffCut: "the changed region is truncated",
 			diagTitle: "Diagnostics",
-			diagSubtitle: "A read-only check of the install, compatibility and runtime state; nothing here changes anything.",
-			diagFactsTitle: "Environment",
+			diagSubtitle: "A read-only check of the runtime state; nothing here changes anything.",
 			diagRuntimeTitle: "Runtime status",
 			diagSummaryOk: "All healthy",
 			diagSummaryWarn: "{n} need attention",
@@ -1411,10 +1440,7 @@ window.__ModuleLoader__.load({
 			diagStatusFail: "failing",
 			diagStatusUnknown: "unknown",
 			diagRemedy: "Suggested: ",
-			diagDetails: "Technical details",
-			diagCheckedAt: "Checked: {at}",
-			diagSchema: "data version v{n}",
-			diagSourcesTitle: "Data sources",
+			diagNoRows: "no runtime status to show",
 			stateLoading: "reading…",
 			failureUnauthorized: "Sign-in is required: reopen this page and sign in, then retry.",
 			failureForbidden: "The platform refused this request (not the owner principal).",
@@ -1434,7 +1460,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).
@@ -2091,7 +2118,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.24.0 · 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.28.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", {
@@ -2194,7 +2221,6 @@ window.__ModuleLoader__.load({
 			".evo-diag-item{padding:var(--evo-space-12) 0}",
 			".evo-diag-item+.evo-diag-item{border-top:var(--evo-hairline-width) solid var(--dsw-alias-border-l2)}",
 			".evo-diag-label{display:block;color:var(--dsw-alias-label-tertiary);font-size:var(--evo-type-xs);line-height:var(--evo-leading-base)}",
-			".evo-diag-value{display:block;margin:var(--evo-space-2) 0 0;color:var(--dsw-alias-label-primary);font-size:var(--evo-type-sm);line-height:var(--evo-leading-base);overflow-wrap:anywhere}",
 			".evo-diag-row-head{display:flex;align-items:baseline;gap:var(--evo-space-6);flex-wrap:wrap}",
 			".evo-diag-dot{width:var(--evo-space-6);height:var(--evo-space-6);border-radius:var(--evo-radius-pill);background:var(--evo-diag-tone,var(--dsw-alias-state-idle-primary));flex:none}",
 			".evo-diag-status{color:var(--evo-diag-tone,var(--dsw-alias-state-idle-primary));font-size:var(--evo-type-xs);line-height:var(--evo-leading-base)}",
@@ -2203,14 +2229,7 @@ window.__ModuleLoader__.load({
 			".evo-diag-item[data-status=\"fail\"]{--evo-diag-tone:var(--dsw-alias-state-error-primary)}",
 			".evo-diag-item[data-status=\"unknown\"]{--evo-diag-tone:var(--dsw-alias-state-idle-primary)}",
 			".evo-diag-detail{display:block;margin:var(--evo-space-2) 0 0;color:var(--dsw-alias-label-secondary);font-size:var(--evo-type-xs);line-height:var(--evo-leading-base);overflow-wrap:anywhere}",
-			".evo-diag-remedy{display:block;margin:var(--evo-space-4) 0 0;color:var(--dsw-alias-label-tertiary);font-size:var(--evo-type-xs);line-height:var(--evo-leading-base)}",
-			".evo-diag-meta{margin:var(--evo-space-12) 0 0;padding-top:var(--evo-space-8);border-top:var(--evo-hairline-width) solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-tertiary);font-size:var(--evo-type-xs);line-height:var(--evo-leading-base)}",
-			".evo-diag-meta>summary{cursor:pointer;user-select:none;padding:var(--evo-space-4) 0}",
-			".evo-diag-meta-body{display:flex;flex-direction:column;gap:var(--evo-space-2);padding:var(--evo-space-4) 0 0}",
-			".evo-diag-sources-title{padding-top:var(--evo-space-6)}",
-			".evo-diag-source{display:flex;justify-content:space-between;gap:var(--evo-space-8);overflow-wrap:anywhere}",
-			".evo-diag-source-label{flex:none}",
-			".evo-diag-source-home{text-align:right;overflow-wrap:anywhere}"
+			".evo-diag-remedy{display:block;margin:var(--evo-space-4) 0 0;color:var(--dsw-alias-label-tertiary);font-size:var(--evo-type-xs);line-height:var(--evo-leading-base)}"
 		].join("\n");
 		/**
 		* Inject the stylesheet once per document.

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

@@ -1,13 +1,13 @@
 /**
- * The diagnostics card (W7 S7): the browser face of the SAME DiagnosticsView the CLI and the
+ * The diagnostics card (W7 S7): the settings face of the SAME DiagnosticsView the CLI and the
  * `/api/dsh-evolution/diagnostics` route answer.
  *
  * Read-only by construction: it fetches once on mount and only refetches on an explicit Refresh; a
- * failed read renders the shared FailureBlock with the command-face fallback. The client still owns
- * no key list and no status vocabulary: it renders the host view's own order, groups the two
- * sections the view carries (environment facts / runtime rows) and gives a plain-language summary
- * from the frozen status set. Raw identifiers, source paths and the view schema live behind the
- * one `技术详情` disclosure, not in the main reading path.
+ * failed read renders the shared FailureBlock with the command-face fallback. The client owns no
+ * key list and no status vocabulary: it renders the host view's frozen runtime rows and leads with
+ * a plain-language summary. The view's documentation facts are a CLI/JSON concern and are
+ * deliberately NOT rendered here (0.27.2 real-machine feedback: a settings page is not a spec
+ * sheet; the runtime window is the whole reading).
  * @module @lmzhen/dsh-evolution-settings-ui/client/DiagnosticsCard
  */
 import { type ReactNode } from 'react';

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.24.0";
+export declare const FAMILY_VERSION = "0.28.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: "没有待批的写入";
@@ -72,8 +73,7 @@ export declare const zh: {
     readonly approvalDiffRemoved: "{n} 行删除";
     readonly approvalDiffCut: "改动区域已截断";
     readonly diagTitle: "诊断";
-    readonly diagSubtitle: "安装、兼容与运行状态的只读自查；不会改动任何东西。";
-    readonly diagFactsTitle: "环境信息";
+    readonly diagSubtitle: "运行状态的只读自查；不会改动任何东西。";
     readonly diagRuntimeTitle: "运行状态";
     readonly diagSummaryOk: "运行正常";
     readonly diagSummaryWarn: "{n} 项需要注意";
@@ -86,10 +86,7 @@ export declare const zh: {
     readonly diagStatusFail: "异常";
     readonly diagStatusUnknown: "未知";
     readonly diagRemedy: "建议：";
-    readonly diagDetails: "技术详情";
-    readonly diagCheckedAt: "检查时间：{at}";
-    readonly diagSchema: "数据版本 v{n}";
-    readonly diagSourcesTitle: "数据来源";
+    readonly diagNoRows: "没有可显示的运行状态";
     readonly stateLoading: "正在读取…";
     readonly failureUnauthorized: "需要登录：重新打开这个页面完成登录后再试。";
     readonly failureForbidden: "平台拒绝了这个请求（身份不是 owner）。";

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.2",
+  "version": "0.28.0",
   "publishConfig": {
     "access": "public"
   },