@lmzhen/dsh-evolution-ui 0.32.2 → 0.32.4

package/README.md

@@ -1,8 +1,8 @@
 # @lmzhen/dsh-evolution-ui
 
-Web UI umbrella for the evolution family. The settings and skill-history panels now live here; the merge panel still delegates to its package until that client code moves.
+Web UI umbrella for the evolution family. This package registers two client panels: the settings section and skill history.
 
 ## Known Limitations and Deferred Work
 
-- The merge panel is still a dependency and is mounted through its `apply` export.
+- The merge panel is the separate client-only `@lmzhen/dsh-evolution-merge-ui` package; it is not mounted by this umbrella.
 - The skill-health panel stays a separate disabled row; it is not enabled by this umbrella.

package/lib/client.js

@@ -195,21 +195,13 @@ window.__ModuleLoader__.load({
 					{
 						id: "approvalConfirm",
 						group: "write-caps",
-						doc: "What the confirmation before an APPROVE does: write straight through, ask first, or treat an unanswered prompt as a cancel. The same three words skillWriteConfirm uses for a skill write.",
+						doc: "What the confirmation before an APPROVE does: execute immediately, or ask first.",
 						label: "批准前先确认",
-						hint: "点「批准」时要不要再确认一次：直接执行 / 先确认 / 等待超时即取消。默认直接执行（不打断批量批准）。",
+						hint: "点「批准」时要不要再确认一次：直接执行 / 先确认。默认直接执行（不打断批量批准）。",
 						control: "select",
 						unit: "",
-						values: [
-							"auto",
-							"ask",
-							"timeout"
-						],
-						valueLabels: [
-							"直接执行",
-							"先确认",
-							"等待超时即取消"
-						],
+						values: ["auto", "ask"],
+						valueLabels: ["直接执行", "先确认"],
 						atLeast: ""
 					}
 				]
@@ -906,7 +898,7 @@ window.__ModuleLoader__.load({
 		*/
 		function confirmModeFrom(user) {
 			const value = typeof user === "object" && user !== null ? user.approvalConfirm : void 0;
-			return value === "ask" || value === "timeout" ? value : "auto";
+			return value === "ask" || value === "timeout" ? "ask" : "auto";
 		}
 		/** Which word one age bucket gets; an unknown bucket falls back to the count form. */
 		const AGE_KEYS = Object.freeze({
@@ -2168,7 +2160,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.32.2 · Web UI umbrella for the evolution family: settings, merge, skill history and skill health panels"), (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.32.4 · Web UI umbrella for the evolution family: settings and skill-history panels"), (0, react.createElement)("div", {
 				key: PENDING_CARD_KEY,
 				className: "evolution-params-group"
 			}, face.renderSlot(CARD_SLOT, {}, { entryKey: PENDING_CARD_KEY })), (0, react.createElement)("div", {
@@ -2294,7 +2286,7 @@ window.__ModuleLoader__.load({
 		function injectStyles$1(host) {
 			const doc = host ?? globalThis.document;
 			if (doc === void 0) return () => {};
-			if (doc.querySelector("style[data-plugin-css=\"@lmzhen/dsh-evolution-ui/settings.css\"]") !== null) return () => {};
+			doc.querySelector("style[data-plugin-css=\"@lmzhen/dsh-evolution-ui/settings.css\"]")?.remove?.();
 			const tag = doc.createElement("style");
 			tag.dataset.plugin = "@lmzhen/dsh-evolution-ui";
 			tag.dataset.pluginCss = CSS_TAG_ID$1;
@@ -2428,7 +2420,7 @@ window.__ModuleLoader__.load({
 		}
 		function injectStyles(doc, css, tagId) {
 			if (doc === void 0) return () => {};
-			if (doc.querySelector("style[data-plugin-css=\"" + tagId + "\"]") !== null) return () => {};
+			doc.querySelector("style[data-plugin-css=\"" + tagId + "\"]")?.remove();
 			const tag = doc.createElement("style");
 			tag.setAttribute("data-plugin-css", tagId);
 			tag.textContent = css;
@@ -2566,6 +2558,11 @@ window.__ModuleLoader__.load({
 			loading: "读取中…",
 			refresh: "刷新",
 			undo: "回退到此版",
+			failureUnauthorized: "需要登录：重新打开这个页面完成登录后再试。",
+			failureForbidden: "平台拒绝了这个请求（身份不是 owner）。",
+			failureUnmounted: "该功能没有挂载。",
+			failureServer: "读取失败，可以重试。",
+			fallbackHint: "可以改用命令：{command}",
 			"failure.unauthorized": "需要登录：重新打开这个页面完成登录后再试。",
 			"failure.forbidden": "平台拒绝了这个请求（身份不是 owner）。",
 			"failure.unmounted": "该功能没有挂载。",
@@ -2647,6 +2644,11 @@ window.__ModuleLoader__.load({
 			loading: "Loading…",
 			refresh: "Refresh",
 			undo: "Restore this version",
+			failureUnauthorized: "Sign-in is required: reopen this page and sign in, then retry.",
+			failureForbidden: "The platform refused this request (not the owner principal).",
+			failureUnmounted: "This feature is not mounted.",
+			failureServer: "The read failed; you can retry.",
+			fallbackHint: "Command fallback: {command}",
 			"failure.unauthorized": "Sign-in is required: reopen this page and sign in, then retry.",
 			"failure.forbidden": "The platform refused this request (not the owner principal).",
 			"failure.unmounted": "This feature is not mounted.",
@@ -3468,46 +3470,56 @@ window.__ModuleLoader__.load({
 				const ticket = readTicket.current + 1;
 				readTicket.current = ticket;
 				if (kind === "diff") {
-					setDiffs((current) => new Map(current).set(v, { kind: "loading" }));
+					setDiffs((current) => new Map(current).set(v, {
+						kind: "loading",
+						ticket
+					}));
 					face.loadDiff(name, v).then((diff) => {
 						if (readTicket.current !== ticket) {
-							setDiffs((current) => without(current, v));
+							setDiffs((current) => dropIfTicket(current, v, ticket));
 							return;
 						}
 						setDiffs((current) => new Map(current).set(v, {
 							kind: "ready",
-							diff
+							diff,
+							ticket
 						}));
 					}).catch((error) => {
 						if (readTicket.current !== ticket) {
-							setDiffs((current) => without(current, v));
+							setDiffs((current) => dropIfTicket(current, v, ticket));
 							return;
 						}
 						setDiffs((current) => new Map(current).set(v, {
 							kind: "failed",
-							message: failedMessage(error)
+							message: failedMessage(error),
+							ticket
 						}));
 					});
 					return;
 				}
-				setBodies((current) => new Map(current).set(v, { kind: "loading" }));
+				setBodies((current) => new Map(current).set(v, {
+					kind: "loading",
+					ticket
+				}));
 				face.loadBody(name, v).then((body) => {
 					if (readTicket.current !== ticket) {
-						setBodies((current) => without(current, v));
+						setBodies((current) => dropIfTicket(current, v, ticket));
 						return;
 					}
 					setBodies((current) => new Map(current).set(v, {
 						kind: "ready",
-						body
+						body,
+						ticket
 					}));
 				}).catch((error) => {
 					if (readTicket.current !== ticket) {
-						setBodies((current) => without(current, v));
+						setBodies((current) => dropIfTicket(current, v, ticket));
 						return;
 					}
 					setBodies((current) => new Map(current).set(v, {
 						kind: "failed",
-						message: failedMessage(error)
+						message: failedMessage(error),
+						ticket
 					}));
 				});
 			};
@@ -3561,15 +3573,18 @@ window.__ModuleLoader__.load({
 			}, face.t("hint"))] : loaded ? null : emptyState(versionsFailed === void 0 ? face.t("loading") : `${face.t("empty.versions.failed")} — ${versionsFailed}`), loaded ? (0, react.createElement)("div", null, group(face.t("group.content"), payload.content, void 0), group(face.t("group.support"), payload.support, face.t("group.support.note")), payload.content.length === 0 && payload.support.length === 0 ? (0, react.createElement)("p", { className: "evo-hist-hint" }, face.t("empty.versions")) : null) : null));
 		}
 		/**
-		* The lazy-read cache without one key.
+		* Drop a superseded lazy read ONLY if the entry still belongs to that read.
 		*
-		* A read that a later toggle superseded must leave nothing behind: `loading` is not an answer, and
-		* the cache also serves as the \u201cdo not read twice\u201d guard, so an abandoned entry would refuse every
-		* later read of that row and leave it saying \u201cloading\u201d until the page is reloaded.
+		* P2-30: deleting by version key alone let a stale reply erase a NEWER read that
+		* had already reached `ready`, leaving the expanded row blank with no retry path.
 		* @param current - the cache.
 		* @param key - the version whose entry is dropped.
-		* @returns a new cache without that key.
+		* @param ticket - the read that is being abandoned.
+		* @returns a new cache without that entry, or the current cache when it is not ours.
 		*/
+		function dropIfTicket(current, key, ticket) {
+			return current.get(key)?.ticket === ticket ? without(current, key) : current;
+		}
 		function without(current, key) {
 			const next = new Map(current);
 			next.delete(key);

package/lib/types/panels/history/client/document.d.ts

@@ -22,22 +22,28 @@ import { type MarkdownWords } from './markdown.ts';
 /** What one expanded diff holds: the change, still loading, or a refusal. */
 export type DiffState = {
     kind: 'loading';
+    ticket?: number;
 } | {
     kind: 'ready';
     diff: VersionDiffRow;
+    ticket?: number;
 } | {
     kind: 'failed';
     message: string;
+    ticket?: number;
 };
 /** What one expanded preview holds. */
 export type BodyState = {
     kind: 'loading';
+    ticket?: number;
 } | {
     kind: 'ready';
     body: VersionBodyRow;
+    ticket?: number;
 } | {
     kind: 'failed';
     message: string;
+    ticket?: number;
 };
 /** What the reading face needs: the dictionary seat, plus the two words the platform renderer takes. */
 export interface DocumentFace extends Copy {

package/lib/types/panels/settings/PendingCard.d.ts

@@ -24,7 +24,7 @@ export interface PendingCardFace {
      * U-6 (registry `approvalConfirm`): read PER RENDER, like the entry's own seat probe — a value
      * captured once would pin the gate for the life of the fiber. Absent ⇒ the shipped default `auto`.
      */
-    confirmMode?: () => 'auto' | 'ask' | 'timeout';
+    confirmMode?: () => 'auto' | 'ask';
     /** G5/W7 S4: the command-face fallback rendered with an unreachable/unauthenticated failure. */
     fallback?: FallbackHint | undefined;
 }
@@ -35,7 +35,7 @@ export interface PendingCardFace {
  * future version must not silently turn the confirmation ON, and a typo must not turn it off. The
  * independent review flagged that this reader had no case at all (P2-11).
  */
-export declare function confirmModeFrom(user: unknown): 'auto' | 'ask' | 'timeout';
+export declare function confirmModeFrom(user: unknown): 'auto' | 'ask';
 /**
  * Render the pending window.
  * @param props - the copy seat and the host calls.

package/lib/types/panels/settings/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.32.2";
+export declare const FAMILY_VERSION = "0.32.4";
 /** What this surface is for, in one line. */
-export declare const PACKAGE_PURPOSE = "Web UI umbrella for the evolution family: settings, merge, skill history and skill health panels";
+export declare const PACKAGE_PURPOSE = "Web UI umbrella for the evolution family: settings and skill-history panels";
 //# sourceMappingURL=generated-about.d.ts.map

package/lib/types/panels/settings/seam.d.ts

@@ -11,6 +11,7 @@
  * @module @lmzhen/dsh-evolution-ui/panels/settings/client
  */
 import type { ReactNode } from 'react';
+import type { ConfigFormLike as KitConfigFormLike, ConfigFormSnapshotLike as KitConfigFormSnapshotLike, ConfigPathOpLike } from '@lmzhen/dsh-evolution-client-kit';
 /** Our card slot, hosted by the section this bundle registers. */
 export declare const CARD_SLOT = "evolution.namespace.card";
 /** The Plugins page's per-row configuration seat (declared by `ui-plugin-manager`). */
@@ -68,31 +69,12 @@ export interface ParamSectionSource {
      */
     revive(): void;
 }
-/** One ordered field operation, as the client settings seat takes them. */
-export interface SettingsPathOpLike {
-    readonly op: 'set' | 'unset';
-    readonly path: readonly string[];
-    readonly value?: unknown;
-}
-/** One row's client form state, as `configForms.get(entryId)` reports it. */
-export interface ConfigFormSnapshotLike<T = Record<string, unknown>> {
-    status: 'loading' | 'ready' | 'unavailable';
-    value: T | undefined;
-    /** Composition layer the Host resolved `value` over; what a cleared field reverts to. */
-    base: unknown;
-    /** Raw user layer: a key's PRESENCE marks the override. */
-    user: unknown;
-    revision: number | undefined;
-    writable: boolean;
-}
-/** One row's client write face (0.2.x `configForms`). */
-export interface ConfigFormLike<T = Record<string, unknown>> {
-    getSnapshot(): ConfigFormSnapshotLike<T>;
-    subscribe(listener: () => void): () => void;
-    set(field: string, value: unknown): Promise<boolean>;
-    unset(field: string): Promise<boolean>;
-    mutate(ops: readonly SettingsPathOpLike[], expectedRevision?: number): Promise<boolean>;
-}
+/** One ordered field operation; client-kit owns the shape. */
+export type SettingsPathOpLike = ConfigPathOpLike;
+/** One row's client form state; client-kit owns the shape. */
+export type ConfigFormSnapshotLike<T = Record<string, unknown>> = KitConfigFormSnapshotLike<T>;
+/** One row's client write face; client-kit owns the shape. */
+export type ConfigFormLike<T = Record<string, unknown>> = KitConfigFormLike<T>;
 /**
  * The client settings seat, probed rather than injected: a deployment may compose the
  * family without the settings surface, and a REQUIRED inject for a missing service

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-ui",
-  "description": "Web UI umbrella for the evolution family: settings, merge, skill history and skill health panels (community build)",
-  "version": "0.32.2",
+  "description": "Web UI umbrella for the evolution family: settings and skill-history panels (community build)",
+  "version": "0.32.4",
   "publishConfig": {
     "access": "public"
   },
@@ -45,9 +45,9 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@lmzhen/dsh-evolution-client-kit": "^0.32.2",
-    "@lmzhen/dsh-evolution-core": "^0.32.2",
-    "@lmzhen/dsh-evolution-curator": "^0.32.2"
+    "@lmzhen/dsh-evolution-client-kit": "^0.32.4",
+    "@lmzhen/dsh-evolution-core": "^0.32.4",
+    "@lmzhen/dsh-evolution-curator": "^0.32.4"
   },
   "devDependencies": {
     "@types/react": "~18.3.1",