@lmzhen/dsh-evolution-merge-ui 0.37.0 → 0.37.1

package/lib/client.js

@@ -304,6 +304,20 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region ../evolution-client-kit/src/format.ts
+		/** Parse an ISO string, epoch ms, or null into a valid Date; null when absent/invalid. */
+		function toLocalDate(value) {
+			if (value === null || value === void 0) return null;
+			const ms = typeof value === "number" ? value : Date.parse(value);
+			if (!Number.isFinite(ms)) return null;
+			const date = new Date(ms);
+			return Number.isNaN(date.getTime()) ? null : date;
+		}
+		const pad = (part) => String(part).padStart(2, "0");
+		/** The local clock part, HH:MM[:SS]. */
+		function clockOf(date, options) {
+			const head = pad(date.getHours()) + ":" + pad(date.getMinutes());
+			return options.seconds === false ? head : head + ":" + pad(date.getSeconds());
+		}
 		/**
 		* Format an ISO string, epoch milliseconds, or null as local wall time.
 		* Invalid values return null; callers decide how to say "unknown".
@@ -312,14 +326,9 @@ window.__ModuleLoader__.load({
 		* @returns the formatted local time, or null when the value is absent/invalid.
 		*/
 		function formatLocalDateTime(value, options = {}) {
-			if (value === null || value === void 0) return null;
-			const ms = typeof value === "number" ? value : Date.parse(value);
-			if (!Number.isFinite(ms)) return null;
-			const date = new Date(ms);
-			if (Number.isNaN(date.getTime())) return null;
-			const pad = (part) => String(part).padStart(2, "0");
-			const head = String(date.getFullYear()) + "-" + pad(date.getMonth() + 1) + "-" + pad(date.getDate()) + " " + pad(date.getHours()) + ":" + pad(date.getMinutes());
-			return options.seconds === false ? head : head + ":" + pad(date.getSeconds());
+			const date = toLocalDate(value);
+			if (date === null) return null;
+			return String(date.getFullYear()) + "-" + pad(date.getMonth() + 1) + "-" + pad(date.getDate()) + " " + clockOf(date, options);
 		}
 		//#endregion
 		//#region ../evolution-client-kit/src/notice.ts
@@ -834,11 +843,13 @@ window.__ModuleLoader__.load({
 		const NS = "evolution-merge";
 		const zh = {
 			"entry.label": "技能合并",
+			"session.missing": "没有当前会话；请打开会话后重试",
+			"decide.failed": "审批请求失败",
 			"title": "合并建议",
 			"task.pending": "条合并建议待处理",
-			"start.scan": "复制扫描命令",
-			"start.pair": "复制配对命令模板",
-			"degraded": "读模型降级：",
+			"start.scan": "复制查找重复技能的命令",
+			"start.pair": "复制配对命令",
+			"degraded": "读取结果不完整：",
 			"copied": "已复制：",
 			"copyFailed": "复制失败：浏览器没有接受剪贴板写入。",
 			"copyRetry": "重试复制",
@@ -853,7 +864,7 @@ window.__ModuleLoader__.load({
 			"tab.fuse": "待合并",
 			"tab.skipped": "无需合并",
 			"empty.verify": "没有待判断的对。",
-			"empty.scope": "这里只做两轮合成；机械追加属于 skill 管理，不进入合并队列。",
+			"empty.scope": "这里只处理两轮合并；单纯追加内容属于技能管理，不会进入合并队列。",
 			"empty.pending": "没有待批准的合并。",
 			"empty.fuse": "没有待合并的对。",
 			"empty.skipped": "没有标记为无需合并的对。",
@@ -865,10 +876,10 @@ window.__ModuleLoader__.load({
 			"approval.off": "审批关：合并自动执行。",
 			"failed": "读取失败，保留上次结果。",
 			"blocked.title": "合并状态未就绪",
-			"blocked.hint": "迁移/备份修复后刷新；面板不会自动降级。",
+			"blocked.hint": "修好合并数据后再刷新；面板不会自动退回旧数据。",
 			"blocked.doctor": "复制诊断命令",
 			"blocked.detail": "查看原始信息",
-			"blocked.reason.migration-blocked": "合并状态需要迁移，面板已暂停读取。",
+			"blocked.reason.migration-blocked": "合并数据需要升级，面板已暂停读取。",
 			"blocked.reason.needs-repair": "合并状态需要修复，面板已暂停读取。",
 			"blocked.reason.forward-only": "合并状态版本过新，当前面板暂不支持。",
 			"blocked.reason.unknown": "合并状态未就绪，面板已暂停读取。",
@@ -912,8 +923,8 @@ window.__ModuleLoader__.load({
 			"action.reject": "复制拒绝命令",
 			"decision.approve": "批准",
 			"decision.reject": "拒绝",
-			"action.retry-candidates": "复制重试候选",
-			"action.retry-resume": "复制续跑命令",
+			"action.retry-candidates": "复制重试命令",
+			"action.retry-resume": "复制继续运行命令",
 			"action.discard": "复制丢弃命令",
 			"action.restore": "复制恢复命令",
 			"action.pair": "复制配对",
@@ -933,9 +944,9 @@ window.__ModuleLoader__.load({
 			"failureServer": "读取失败",
 			"failureUnauthorized": "未登录",
 			"failureForbidden": "无权访问",
-			"failureUnmounted": "宿主未挂载",
+			"failureUnmounted": "功能未启用",
 			"failureCapability": "子代理通道不可用",
-			"failureCapabilityHint": "先运行全局诊断，或复制下方命令继续处理。preset/host-only 形态没有面板时仍可用这些命令兜底。",
+			"failureCapabilityHint": "先运行全局诊断，或复制下方命令继续处理。没有面板的安装方式（preset / host-only）仍可用这些命令。",
 			"failureBodyAmbiguous": "同名技能匹配到多行，无法确定读取哪一个；请用唯一名称或从具体行打开。",
 			"fallbackHint": "可复制命令见下方",
 			"body.missing": "正文不存在或不可读。",
@@ -1047,11 +1058,13 @@ window.__ModuleLoader__.load({
 		});
 		const en = {
 			"entry.label": "Skill merge",
+			"session.missing": "No current session; open a session and try again",
+			"decide.failed": "The approval request failed",
 			"title": "Merge suggestions",
 			"task.pending": "merge suggestions need attention",
-			"start.scan": "Copy scan command",
-			"start.pair": "Copy pair command template",
-			"degraded": "Degraded read model:",
+			"start.scan": "Copy the find-duplicate-skills command",
+			"start.pair": "Copy the pair command",
+			"degraded": "Incomplete read:",
 			"copied": "Copied:",
 			"copyFailed": "Copy failed: the browser did not accept the clipboard write.",
 			"copyRetry": "Retry copy",
@@ -1066,7 +1079,7 @@ window.__ModuleLoader__.load({
 			"tab.fuse": "Ready to merge",
 			"tab.skipped": "Skipped",
 			"empty.verify": "No pairs to judge.",
-			"empty.scope": "This panel only performs two-round synthesis; mechanical append belongs to skill management and does not enter the merge queue.",
+			"empty.scope": "Only two-round merges are handled here; plain appends belong to skill management and never enter this queue.",
 			"empty.pending": "No pending merges.",
 			"empty.fuse": "No pairs ready to merge.",
 			"empty.skipped": "No pairs marked as not worth merging.",
@@ -1078,10 +1091,10 @@ window.__ModuleLoader__.load({
 			"approval.off": "Approval off: merges run automatically.",
 			"failed": "Read failed; keeping the last result.",
 			"blocked.title": "Merge state blocked",
-			"blocked.hint": "Fix the migration/backup, then refresh. The panel does not fall back automatically.",
+			"blocked.hint": "Fix the merge data and refresh; the panel will not fall back to older data by itself.",
 			"blocked.doctor": "Copy diagnostics command",
 			"blocked.detail": "Show host message",
-			"blocked.reason.migration-blocked": "Merge state needs migration; the panel is paused.",
+			"blocked.reason.migration-blocked": "The merge data needs an upgrade; reading is paused.",
 			"blocked.reason.needs-repair": "Merge state needs repair; the panel is paused.",
 			"blocked.reason.forward-only": "Merge state was written by a newer version; this panel cannot read it.",
 			"blocked.reason.unknown": "Merge state is not ready; the panel is paused.",
@@ -1125,7 +1138,7 @@ window.__ModuleLoader__.load({
 			"action.reject": "Copy reject command",
 			"decision.approve": "Approve",
 			"decision.reject": "Reject",
-			"action.retry-candidates": "Copy retry candidates",
+			"action.retry-candidates": "Copy retry command",
 			"action.retry-resume": "Copy resume command",
 			"action.discard": "Copy discard command",
 			"action.restore": "Copy restore command",
@@ -1146,9 +1159,9 @@ window.__ModuleLoader__.load({
 			"failureServer": "Read failed",
 			"failureUnauthorized": "Not signed in",
 			"failureForbidden": "Forbidden",
-			"failureUnmounted": "Host not mounted",
+			"failureUnmounted": "Feature not enabled",
 			"failureCapability": "Subagent channel unavailable",
-			"failureCapabilityHint": "Run global diagnostics first, or copy a command below to continue. The command fallback also covers preset/host-only shapes without a panel.",
+			"failureCapabilityHint": "Run the global diagnostics first, or copy a command below. Installs without the panel (preset / host-only) can still use these commands.",
 			"failureBodyAmbiguous": "The skill name matches multiple rows, so the body is ambiguous. Use a unique name or open it from a specific row.",
 			"fallbackHint": "Copy the command below",
 			"body.missing": "Body missing or unreadable.",
@@ -2868,14 +2881,14 @@ window.__ModuleLoader__.load({
 							const sessionId = currentSessionId(ctx);
 							if (sessionId === void 0) return {
 								ok: false,
-								message: "没有当前会话；请打开会话后重试"
+								message: t("session.missing")
 							};
 							const result = await decide(rowId, verb, sessionId);
 							if (result.ok) return result.payload;
 							const failure = result.failure;
 							return {
 								ok: false,
-								message: "message" in failure && typeof failure.message === "string" ? failure.message : "审批请求失败"
+								message: "message" in failure && typeof failure.message === "string" ? failure.message : t("decide.failed")
 							};
 						},
 						...workspaceId === void 0 ? {} : { workspaceId }

package/package.json

@@ -11,7 +11,7 @@
       ]
     }
   },
-  "version": "0.37.0",
+  "version": "0.37.1",
   "publishConfig": {
     "access": "public"
   },
@@ -51,7 +51,7 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@lmzhen/dsh-evolution-client-kit": "^0.37.0"
+    "@lmzhen/dsh-evolution-client-kit": "^0.37.1"
   },
   "engines": {
     "dsh": ">=0.2.1-rc.2 <0.2.2-0"