dsh-session-guard 4.1.5 → 4.1.15

package/lib/client.js

@@ -429,6 +429,11 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
+		/** 卡面字段消毒：宿主 describe 形态异常（≤0.1.5 骨架残留等）时槽崩会殉葬全族
+		* tab——ListRow 的 values 非 nullish 非数组（如 {}）会让 `?? []` 失守，逐卡硬护栏。 */
+		function toList(v) {
+			return Array.isArray(v) ? v.map(String) : [];
+		}
 		/** 插件配置卡片主体：可展开的 <li> + header 按钮 + pill switch 字段体。 */
 		function SessionGuardCard({ scope }) {
 			const snapshot = (0, react.useSyncExternalStore)((listener) => scope.subscribe(listener), () => scope.getSnapshot());
@@ -517,7 +522,7 @@ window.__ModuleLoader__.load({
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ListRow, {
 							label: "追加官方 provider id",
 							description: "精确匹配，优先级最高（逗号分隔）",
-							values: value.officialProviders ?? [],
+							values: toList(value.officialProviders),
 							placeholder: "deepseek-official",
 							disabled: readonly,
 							onCommit: (next) => {
@@ -527,7 +532,7 @@ window.__ModuleLoader__.load({
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ListRow, {
 							label: "官方端点名单",
 							description: "baseURL 归一化后的 host（逗号分隔）",
-							values: value.officialBaseURLs ?? [],
+							values: toList(value.officialBaseURLs),
 							placeholder: "api.deepseek.com",
 							disabled: readonly,
 							onCommit: (next) => {
@@ -537,7 +542,7 @@ window.__ModuleLoader__.load({
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SelectRow, {
 							label: "拦截方式",
 							description: "挂起等待不报错；或报错并记入延后队列",
-							value: value.deferredMode ?? "hold",
+							value: value.deferredMode === "error" ? "error" : "hold",
 							options: [{
 								value: "hold",
 								label: "挂起等待（退峰自动放行）"
@@ -615,81 +620,220 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
-		//#region src/client/shell-overlay.tsx
+		//#region \0@oxc-project+runtime@0.146.0/helpers/esm/typeof.js
+		function _typeof(o) {
+			"@babel/helpers - typeof";
+			return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
+				return typeof o;
+			} : function(o) {
+				return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+			}, _typeof(o);
+		}
+		//#endregion
+		//#region \0@oxc-project+runtime@0.146.0/helpers/esm/toPrimitive.js
+		function toPrimitive(t, r) {
+			if ("object" != _typeof(t) || !t) return t;
+			var e = t[Symbol.toPrimitive];
+			if (void 0 !== e) {
+				var i = e.call(t, r || "default");
+				if ("object" != _typeof(i)) return i;
+				throw new TypeError("@@toPrimitive must return a primitive value.");
+			}
+			return ("string" === r ? String : Number)(t);
+		}
+		//#endregion
+		//#region \0@oxc-project+runtime@0.146.0/helpers/esm/toPropertyKey.js
+		function toPropertyKey(t) {
+			var i = toPrimitive(t, "string");
+			return "symbol" == _typeof(i) ? i : i + "";
+		}
+		//#endregion
+		//#region \0@oxc-project+runtime@0.146.0/helpers/esm/defineProperty.js
+		function _defineProperty(e, r, t) {
+			return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+				value: t,
+				enumerable: !0,
+				configurable: !0,
+				writable: !0
+			}) : e[r] = t, e;
+		}
+		//#endregion
+		//#region src/client/settings-bridge.ts
 		/**
-		* dsh-session-guard — 无设置页宿主（0.1.0/0.1.1）的兜底配置入口。
+		* BridgeDocHandle — 设置卡双轨数据源的桥轨（M4/T20-b）。
+		*
+		* ≤0.1.5（settingsScope fiber 永不解 / 0.1.0-0.1.1 无 client 服务）时，
+		* 配置卡经本句柄走自家 webServer 桥（describe/mutate）读写宿主 settings 服务。
+		* 与原生 SettingsScope（scope-face.ts）同构：getSnapshot/subscribe/set/unset。
+		* 读 = POST /api/<ns>/settings/describe；写 = POST …/mutate（ops 转发宿主服务），
+		* 成功即用回填描述符刷新快照并通知订阅者（无本地第二份状态——权威值始终在宿主）。
 		*
-		* 壳级 `shell.overlay` 席位渲染：右下角固定齿轮钮，点开固定定位浮层承载
-		* SessionGuardCard（page 形态，默认展开）。配置存储全在 host 侧（settings
-		* 服务），浮层与宿主设置页解耦——壳再老也不影响读写。有设置页的宿主上
-		* 该齿轮与行配置卡/家族 tab 并存，作为全局快捷入口。
+		* 与 perm-gate src/client/bridge-scope.ts（T13b/T20-b 泛化模板）的差异：
+		* ① 快照形状对齐本仓 SettingsScope（status: loading/ready/unavailable + mode）；
+		* ② describe 未就绪（settings-unavailable/ns-not-registered）时有限重试
+		*    （宿主 settings 服务解析晚于卡挂载的窗口），重试耗尽才落 'unavailable'。
 		*/
-		function ShellSettingsEntry(props) {
-			const [open, setOpen] = (0, react.useState)(false);
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				style: {
-					position: "fixed",
-					right: 16,
-					bottom: 64,
-					zIndex: 1e4
-				},
-				children: [
-					open && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						onClick: () => setOpen(false),
-						style: {
-							position: "fixed",
-							top: 0,
-							left: 0,
-							right: 0,
-							bottom: 0,
-							background: "rgba(0,0,0,.45)",
-							zIndex: 1e4
-						}
-					}),
-					open && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						style: {
-							position: "fixed",
-							top: "6vh",
-							left: "50%",
-							transform: "translateX(-50%)",
-							width: "min(760px, 92vw)",
-							maxHeight: "84vh",
-							overflowY: "auto",
-							zIndex: 10001
-						},
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-							type: "button",
-							onClick: () => setOpen(false),
-							style: {
-								position: "sticky",
-								top: 6,
-								float: "right",
-								marginRight: 8,
-								zIndex: 2
-							},
-							children: "✕ 关闭"
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SessionGuardCard, { scope: props.scope })]
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						type: "button",
-						title: "会话守护设置",
-						onClick: () => setOpen((state) => !state),
-						style: {
-							width: 40,
-							height: 40,
-							borderRadius: "50%",
-							border: "1px solid rgba(127,127,127,.4)",
-							background: "rgba(30,30,32,.85)",
-							color: "inherit",
-							cursor: "pointer",
-							fontSize: 16,
-							boxShadow: "0 4px 16px rgba(0,0,0,.35)"
-						},
-						children: "🛡"
-					})
-				]
-			});
+		/** 与 server 侧 settingsBridgeRoutesFor（src/settings-bridge.js）必须逐字符一致。 */
+		function settingsBridgeRoutesFor(ns) {
+			return {
+				describe: `/api/${ns}/settings/describe`,
+				mutate: `/api/${ns}/settings/mutate`
+			};
+		}
+		/**
+		* ≤0.1.5 宿主 describe 的 descriptor.value 是「每字段 → {}」骨架（0.1.0/0.1.5
+		* 实测：value={enabled:{},…,officialProviders:{}}，真值拆在 base（合并默认层）
+		* 与 user（用户层））——直接吞 value 会让卡拿到 officialProviders={}，
+		* `?? []` 不兜底（{} 非 nullish）→ ListRow values.join 崩，整族 tab 槽殉葬。
+		* 判特征：对象且每个自有值都是空 plain 对象（guard 字段是标量/数组，不会全空）。
+		* 命中即以 {...base, ...user} 重组有效值（guard 配置全是顶层标量/数组，浅合并即语义）。
+		*/
+		function isFieldSkeleton(v) {
+			if (v === null || typeof v !== "object" || Array.isArray(v)) return false;
+			const values = Object.values(v);
+			return values.length > 0 && values.every((x) => x !== null && typeof x === "object" && !Array.isArray(x) && Object.keys(x).length === 0);
 		}
+		function plainObject(v) {
+			return v !== null && typeof v === "object" && !Array.isArray(v) ? { ...v } : {};
+		}
+		/** descriptor → 卡面可用 plain 值：正常代际用 value；骨架代际用 base+user 浅合并。 */
+		function descriptorPlainValue(d) {
+			if (!isFieldSkeleton(d.value)) return d.value;
+			return {
+				...plainObject(d.base),
+				...plainObject(d.user)
+			};
+		}
+		/** describe 不可就绪码：宿主 settings 未解析/未注册——值得重试的瞬态。 */
+		const RETRYABLE_CODES = /* @__PURE__ */ new Set(["settings-unavailable", "ns-not-registered"]);
+		const RETRY_DELAY_MS = 1500;
+		const RETRY_MAX = 4;
+		var BridgeDocHandle = class {
+			constructor(ns) {
+				_defineProperty(this, "snapshot", void 0);
+				_defineProperty(this, "listeners", /* @__PURE__ */ new Set());
+				_defineProperty(this, "revision", void 0);
+				_defineProperty(this, "retriesLeft", RETRY_MAX);
+				_defineProperty(this, "inflight", void 0);
+				_defineProperty(this, "ns", void 0);
+				_defineProperty(this, "routes", void 0);
+				this.ns = ns;
+				this.routes = settingsBridgeRoutesFor(ns);
+				this.snapshot = {
+					status: "loading",
+					value: void 0,
+					revision: void 0,
+					writable: true,
+					base: void 0,
+					user: void 0,
+					mode: "bridge"
+				};
+				this.refresh();
+			}
+			getSnapshot() {
+				return this.snapshot;
+			}
+			subscribe(listener) {
+				this.listeners.add(listener);
+				return () => {
+					this.listeners.delete(listener);
+				};
+			}
+			async set(field, value) {
+				return this.mutate([{
+					op: "set",
+					path: [field],
+					value
+				}]);
+			}
+			async unset(field) {
+				return this.mutate([{
+					op: "unset",
+					path: [field]
+				}]);
+			}
+			notify() {
+				for (const l of [...this.listeners]) l();
+			}
+			applyDescriptor(d, writable) {
+				this.revision = typeof d.revision === "number" ? d.revision : void 0;
+				this.snapshot = {
+					status: "ready",
+					value: descriptorPlainValue(d),
+					revision: this.revision,
+					writable,
+					base: void 0,
+					user: void 0,
+					mode: "bridge"
+				};
+			}
+			async request(path, body) {
+				const response = await fetch(path, {
+					method: "POST",
+					headers: { "content-type": "application/json" },
+					body: JSON.stringify(body ?? {})
+				});
+				if (!response.ok) throw new Error(`bridge ${path} HTTP ${response.status}`);
+				return await response.json();
+			}
+			/** describe 拉取；瞬态未就绪码在重试预算内延迟重拉，耗尽才落 unavailable。 */
+			refresh() {
+				if (this.inflight !== void 0) return this.inflight;
+				this.inflight = (async () => {
+					try {
+						const body = await this.request(this.routes.describe);
+						if (body.ok && body.value?.descriptor !== void 0) {
+							this.retriesLeft = RETRY_MAX;
+							this.applyDescriptor(body.value.descriptor, body.value.writable !== false);
+						} else if (body.code !== void 0 && RETRYABLE_CODES.has(body.code) && this.retriesLeft > 0) {
+							this.retriesLeft -= 1;
+							this.inflight = void 0;
+							setTimeout(() => {
+								this.refresh();
+							}, RETRY_DELAY_MS);
+							return;
+						} else this.snapshot = {
+							...this.snapshot,
+							status: "unavailable",
+							writable: false
+						};
+					} catch {
+						if (this.retriesLeft > 0) {
+							this.retriesLeft -= 1;
+							this.inflight = void 0;
+							setTimeout(() => {
+								this.refresh();
+							}, RETRY_DELAY_MS);
+							return;
+						}
+						this.snapshot = {
+							...this.snapshot,
+							status: "unavailable",
+							writable: false
+						};
+					}
+					this.inflight = void 0;
+					this.notify();
+				})();
+				return this.inflight;
+			}
+			async mutate(ops) {
+				const body = await this.request(this.routes.mutate, {
+					ops,
+					expectedRevision: this.revision
+				});
+				if (body.ok && body.value?.descriptor !== void 0) {
+					this.applyDescriptor(body.value.descriptor, this.snapshot.writable);
+					this.notify();
+					return true;
+				}
+				if (body.code === "settings-conflict") {
+					await this.refresh();
+					return false;
+				}
+				throw new Error(`bridge mutate failed: ${body.code ?? "unknown"} ${body.message ?? ""}`);
+			}
+		};
 		//#endregion
 		//#region src/client/family-section.tsx
 		/**
@@ -704,17 +848,24 @@ window.__ModuleLoader__.load({
 		* 与 thinking-levels 的 FamilySettingsSection 的差别仅在不需要 thinking-
 		* levels 自己的卡（宿主不在了，它的卡也不在）：渲染循环没有 own-tab 特例。
 		*/
+		const NO_TABS = [];
 		function GuardFamilySection(props) {
-			const tabs = (0, react.useSyncExternalStore)(props.hooks.tabs.subscribe, props.hooks.tabs.getSnapshot);
+			const raw = props.hooks?.tabs;
+			const [polled, setPolled] = (0, react.useState)(() => raw?.getSnapshot() ?? NO_TABS);
+			(0, react.useEffect)(() => {
+				if (props.useTabs !== void 0 || raw === void 0) return;
+				return raw.subscribe(() => setPolled(raw.getSnapshot()));
+			});
+			const tabs = props.useTabs !== void 0 ? props.useTabs((value) => value) : polled;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				style: {
 					display: "grid",
 					gap: "12px"
 				},
-				children: tabs.map((row) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: props.renderSlot("dsh-family.tab", {}, {
+				children: tabs.map((row) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: props.renderSlot ? props.renderSlot("dsh-family.tab", {}, {
 					only: row.id,
 					fallback: null
-				}) }, row.id))
+				}) : props.renderContributor?.(row.id) ?? null }, row.id))
 			});
 		}
 		//#endregion
@@ -739,12 +890,8 @@ window.__ModuleLoader__.load({
 		const FAMILY_SECTION_ID = "dsh-family";
 		/** 家族子席位 key（与 thinking-levels 的声明严格一致）。 */
 		const FAMILY_CHILD_KEY = "dsh-family.tab";
-		/**
-		* 接管宽限期：等宿主（以及排名更前的贡献方）先落座。下载量排名 guard(1522)
-		* 高于 session-steward(1090) → guard 宽限期更短、先尝试接管；并发冲突由
-		* ui-slots 的「同 id 同 priority 重复注册抛错」仲裁，后到者放弃即可。
-		*/
-		const FAMILY_HOST_GRACE_MS = 2e3;
+		/** 让位宽限：声明批内 TL 的注册微秒级落账，此延迟后查账本足以分辨「TL 在场」。 */
+		const FAMILY_YIELD_MS = 500;
 		/**
 		* 客户端所需服务：slots（状态徽标）+ locale。持久设置走双代腰
 		* （registerSettingsFaces）：configForms 为 0.1.7+ 独有，顶层注入会在
@@ -761,8 +908,9 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* 双代持久设置腰（移植 input-traffic registerSettingsFaces）：两个 scoped
-		* 子注入各自产出同形 scope 后回调；0.2.0 两代并存时以 configForms 先到为准
-		* （mounted 位防双挂载，ui-slots 同 id 仲裁兜底）。
+		* 子注入各自产出同形 scope 后回调。M4 P0 重构后本函数**只承担数据臂**——
+		* 回调仅写 scopeRef 活引用（0.1.7+ 原生优先，mounted 位防双挂），卡面注册
+		* 已全部提到 apply 顶层（≤0.1.5 回调永不触发，注册不能关在这里）。
 		*/
 		function registerSettingsFaces(ctx, onScope) {
 			let mounted = false;
@@ -777,20 +925,32 @@ window.__ModuleLoader__.load({
 				onScope(sctx.settingsScope.bind({ namespace: "session-guard" }), "settingsScope");
 			});
 		}
-		/** 两张配置卡（family tab + bundle 详情页）挂载；scope 由双代腰产出。 */
-		function mountConfigCards(ctx, scope) {
+		/** scope 活引用（perm-gate client/index.ts L166-257 形态）：回调填、卡面现读。 */
+		const scopeRef = { scope: void 0 };
+		/** 桥轨惰性单例：≤0.1.5（settingsScope 死路 / 0.1.0-0.1.1 无服务）的数据源。 */
+		let bridgeScopeSingleton;
+		function bridgeScope() {
+			if (bridgeScopeSingleton === void 0) bridgeScopeSingleton = new BridgeDocHandle("session-guard");
+			return bridgeScopeSingleton;
+		}
+		/** 卡面现取数据源：原生句柄解到即原生，否则桥兜底（perm-gate 同式）。 */
+		function currentScope() {
+			return scopeRef.scope ?? bridgeScope();
+		}
+		/** 两张配置卡（family tab + bundle 详情页）挂载；数据经 currentScope() 现取。 */
+		function mountConfigCards(ctx) {
 			ctx.slots.inject("dsh-family.tab", () => ctx.slots.register({
 				name: "dsh-family.tab",
 				id: "session-guard",
 				order: 20,
 				label: "会话守护门禁",
 				locale: "session-guard",
-				inject: () => ({ scope })
+				inject: () => ({ scope: currentScope() })
 			}, SessionGuardCard));
 			ctx.slots.inject("plugins.bundle.config", () => ctx.slots.register({
 				name: "plugins.bundle.config",
 				key: "dsh-session-guard",
-				inject: () => ({ scope })
+				inject: () => ({ scope: currentScope() })
 			}, SessionGuardCard));
 		}
 		function apply(ctx) {
@@ -806,45 +966,65 @@ window.__ModuleLoader__.load({
 				order: 40,
 				locale: "session-guard"
 			}, StatusBadge)));
+			safe("config-cards/family-tab", () => mountConfigCards(ctx));
 			registerSettingsFaces(ctx, (scope, generation) => {
-				safe(`config-cards/${generation}`, () => {
-					mountConfigCards(ctx, scope);
-					ctx.slots.inject("settings.plugin.item", () => ctx.slots.register({
-						name: "settings.plugin.item",
-						id: "session-guard",
-						key: "session-guard",
-						order: 60,
-						locale: "session-guard",
-						inject: () => ({ scope })
-					}, SessionGuardCard));
-				});
-				safe("shell.overlay", () => ctx.slots.inject("shell.overlay", () => ctx.slots.register({
-					name: "shell.overlay",
-					id: "session-guard-settings"
-				}, () => ShellSettingsEntry({ scope }))));
+				if (generation === "configForms") scopeRef.scope = scope;
 			});
 			safe("family-section-election", () => {
-				setTimeout(() => {
-					if (ctx.slots.entries("settings.section").some((e) => e.options.id === FAMILY_SECTION_ID)) return;
-					ctx.inject(["configForms"], () => {
-						if (ctx.slots.entries("settings.section").some((e) => e.options.id === FAMILY_SECTION_ID)) return;
+				console.log("[dsh-session-guard] election: registering settings.section inject (apply-time)");
+				ctx.slots.inject("settings.section", () => {
+					console.log("[dsh-session-guard] election: factory fired (settings.section declared)");
+					setTimeout(() => {
+						if (ctx.slots.entries("settings.section").some((e) => e.options.id === FAMILY_SECTION_ID)) {
+							console.log("[dsh-session-guard] election: dsh-family already seated — stand down");
+							return;
+						}
+						const base = {
+							name: "settings.section",
+							id: FAMILY_SECTION_ID,
+							order: 40,
+							priority: 10,
+							label: () => "起子插件设置",
+							inject: () => ({
+								hooks: makeGuardFamilyTabsHooks(ctx.slots),
+								renderContributor
+							})
+						};
 						try {
 							ctx.slots.register({
-								name: "settings.section",
-								id: FAMILY_SECTION_ID,
-								order: 40,
-								label: () => "起子插件设置",
-								inject: () => makeGuardFamilyTabsHooks(ctx.slots),
+								...base,
 								children: { [FAMILY_CHILD_KEY]: {
 									kind: "list",
 									scope: "root"
 								} }
 							}, GuardFamilySection);
-						} catch {}
-					});
-				}, FAMILY_HOST_GRACE_MS);
+							console.log("[dsh-session-guard] family takeover registered (children declared)");
+						} catch (error) {
+							console.log(`[dsh-session-guard] children decl conflict (${error instanceof Error ? error.message : error}); registering without children`);
+							try {
+								ctx.slots.register(base, GuardFamilySection);
+								console.log("[dsh-session-guard] family takeover registered (no children)");
+							} catch (secondary) {
+								console.log(`[dsh-session-guard] family takeover abandoned: ${secondary instanceof Error ? secondary.message : secondary}`);
+							}
+						}
+					}, FAMILY_YIELD_MS);
+				});
 			});
 		}
+		/** 直接挂载面（≤0.1.5 壳无 renderSlot 的降级）：从账本原始条目现挂激活卡。
+		* entries 每代都带 component + inject（ui-slots SlotCore.entries 原始记录）；
+		* 任何失败（条目消失/抛错 inject）降级为 null，不炸接管节。 */
+		function renderContributor(id) {
+			try {
+				const entry = ctx.slots.entries(FAMILY_CHILD_KEY).find((e) => e.options.id === id);
+				if (entry === void 0 || typeof entry.component !== "function") return null;
+				const injected = typeof entry.inject === "function" ? entry.inject() : void 0;
+				return (0, react.createElement)(entry.component, injected ?? {});
+			} catch {
+				return null;
+			}
+		}
 		/** 接管节的账本投影 hooks（与 thinking-levels 的 FamilySectionInjected 同形）。 */
 		function makeGuardFamilyTabsHooks(slots) {
 			let version = -1;