@klarkxy/dsh-model-hub 0.1.3 → 0.1.4

package/lib/client.js

@@ -5,30 +5,7 @@ window.__ModuleLoader__.load({
     var module = { exports: {} };
     var exports = module.exports;
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-//#region \0rolldown/runtime.js
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-//#endregion
 let react = require("react");
-react = __toESM(react, 1);
 let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 let react_dom = require("react-dom");
 let react_jsx_runtime = require("react/jsx-runtime");
@@ -1322,25 +1299,18 @@ ${scope} {
 }
 //#endregion
 //#region ../dsh-plugin-kit/src/contracts.ts
-/**
-* Remote contribution for model-settings change notifications.
-* Provided by `@klarkxy/dsh-model-hub` (`ModelSettingsChangesController`);
-* subscribers degrade silently when that package is not installed.
-* The stream carries invalidations only — `ready` is never a settings snapshot.
-*/
-const MODEL_SETTINGS_CHANGES_REMOTE = {
-	package: "@klarkxy/dsh-model-hub",
-	descriptors: [{
-		id: "modelSettingsChanges/watch",
-		service: "modelSettingsChangesController",
-		namespace: "modelSettingsChanges",
-		method: "watch",
-		mode: "stream",
-		invocation: { kind: "direct" },
-		parameters: [],
-		cancellation: { parameter: "signal" }
-	}]
-};
+/** `@klarkxy/dsh-git-commit` becomes `KlarkxyDshGitCommitModelSettingsChanges`. */
+function modelSettingsChangesIdentity(packageName) {
+	const scoped = /^@([^/]+)\/(.+)$/.exec(packageName);
+	const parts = (scoped ? `${scoped[1]}/${scoped[2]}` : packageName).split(/[^A-Za-z0-9]+/).filter(Boolean);
+	if (!parts.length) throw new Error("Model settings package name has no RPC segment");
+	const segment = `${parts.map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("")}ModelSettingsChanges`;
+	if (!/^[A-Z][A-Za-z0-9]*$/.test(segment)) throw new Error(`Model settings sync name is not an RPC segment: ${segment}`);
+	return {
+		service: segment,
+		namespace: segment
+	};
+}
 //#endregion
 //#region ../dsh-plugin-kit/src/model-settings-client.ts
 /** This stream carries invalidations only; ready is never a settings snapshot. */
@@ -1355,21 +1325,44 @@ function parseModelSettingsChangeFrame(value) {
 	};
 	throw new Error("Invalid model settings change frame");
 }
-/** One contribution mounted by Model Hub; consumers only inject its service. */
-const modelSettingsChangesRemote = {
-	package: MODEL_SETTINGS_CHANGES_REMOTE.package,
-	descriptors: MODEL_SETTINGS_CHANGES_REMOTE.descriptors.map((descriptor) => ({
-		...descriptor,
-		result: {
-			mode: "strict",
-			typeSymbol: "ModelSettings.ChangeFrame",
-			create: () => ({ parse: parseModelSettingsChangeFrame })
-		}
-	}))
-};
+/** One owner's contribution. Each package mounts only its own endpoint. */
+function modelSettingsChangesRemote(packageName, identity = modelSettingsChangesIdentity(packageName)) {
+	return {
+		package: packageName,
+		descriptors: [{
+			id: `${identity.namespace}/watch`,
+			service: identity.service,
+			namespace: identity.namespace,
+			method: "watch",
+			mode: "stream",
+			invocation: { kind: "direct" },
+			parameters: [],
+			cancellation: { parameter: "signal" },
+			result: {
+				mode: "strict",
+				typeSymbol: "ModelSettings.ChangeFrame",
+				create: () => ({ parse: parseModelSettingsChangeFrame })
+			}
+		}]
+	};
+}
+/** Mount from a synchronous apply. Disposal waits for an in-flight mount and
+* then withdraws it, so the contribution cannot outlive the plugin. */
+function mountModelSettingsChanges(ctx, packageName) {
+	const contribution = modelSettingsChangesRemote(packageName);
+	ctx.inject(["remote"], (injected) => {
+		const scope = injected;
+		const mounting = scope.remote.$mount(contribution);
+		mounting.catch(() => {});
+		scope.effect(() => async () => {
+			await (await mounting.catch(() => void 0))?.();
+		});
+	});
+}
 /** Native RemoteStream owns carrier reconnects; no timers or browser transport.
 * A factory shares one logical stream while at least one subscriber remains. */
-function createModelSettingsSubscriber(ctx, namespace) {
+function createModelSettingsSubscriber(ctx, packageName, identity = modelSettingsChangesIdentity(packageName), accept = (ns) => ns === packageName) {
+	const endpoint = identity;
 	const listeners = /* @__PURE__ */ new Set();
 	let injection;
 	let current;
@@ -1395,12 +1388,18 @@ function createModelSettingsSubscriber(ctx, namespace) {
 	};
 	const start = () => {
 		const life = ++lifecycle;
-		injection = ctx.inject(["remote", "remote.modelSettingsChanges"], (injected) => {
+		injection = ctx.inject(["remote", `remote.${endpoint.namespace}`], (injected) => {
 			if (life !== lifecycle || !listeners.size) return;
 			const scope = injected;
+			const service = scope.remote[endpoint.namespace];
+			if (!service || !("watch" in service) || !service.watch) {
+				report("Model settings sync service unavailable");
+				return;
+			}
+			const watch = service.watch;
 			const stream = scope.remote.$stream({
 				name: "Model settings sync",
-				open: (signal) => scope.remote.modelSettingsChanges.watch(signal),
+				open: (signal) => watch(signal),
 				ended: (accepted) => /* @__PURE__ */ new Error(`Model settings sync stream ended ${accepted ? "after" : "before"} ready; refresh or reopen the page`)
 			});
 			const session = {
@@ -1435,7 +1434,7 @@ function createModelSettingsSubscriber(ctx, namespace) {
 							invalidate();
 						} else {
 							if (!ready) throw new Error("Model settings sync change arrived before ready");
-							if (namespace === "*" || frame.ns === namespace) invalidate();
+							if (accept(frame.ns)) invalidate();
 						}
 					}
 				} catch (error) {
@@ -2594,11 +2593,10 @@ function HubPage({ view, api, locale, initialEntries = null, initialCatalog = nu
 		]
 	});
 }
-async function apply(ctx) {
+function apply(ctx) {
 	const client = ctx;
-	const disposeRemote = await client.remote.$mount(modelSettingsChangesRemote);
-	client.effect(() => disposeRemote);
-	const changes = createModelSettingsSubscriber(ctx, "*");
+	mountModelSettingsChanges(ctx, BUNDLE);
+	const changes = createModelSettingsSubscriber(ctx, BUNDLE, modelSettingsChangesIdentity(BUNDLE), () => true);
 	const call = async (endpoint, payload) => {
 		const result = await client.connection.rpc.call(CHANNEL, endpoint, payload);
 		if (!result?.ok) throw new Error(result?.error?.message || "Request failed");

package/lib/index.js

@@ -1,13 +1,45 @@
-import { mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { mkdir, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import Schema from "@deepseek-ai/schemastery";
 import { registerHostRpc } from "@klarkxy/dsh-plugin-kit/host-rpc";
 import { modelRouteRoleSchemastery, modelRouteSchemastery } from "@klarkxy/dsh-model-route/schemastery";
 import { detectModelFields, modelRouteOverride, normalizeModelRoute } from "@klarkxy/dsh-model-route";
-import { MODEL_SETTINGS_CHANGED_EVENT, collectModelSettings, notifyModelSettingsChanged } from "@klarkxy/dsh-plugin-kit/model-settings";
-import { Remote, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
-import { MODEL_SETTINGS_CHANGES_REMOTE, isSubagentSession } from "@klarkxy/dsh-plugin-kit/contracts";
-import { parseModelSettingsChangeFrame } from "@klarkxy/dsh-plugin-kit/model-settings-client";
+import { collectModelSettings, notifyModelSettingsChanged } from "@klarkxy/dsh-plugin-kit/model-settings";
+import { isSubagentSession, modelSettingsChangesIdentity } from "@klarkxy/dsh-plugin-kit/contracts";
+import { createModelSettingsChanges } from "@klarkxy/dsh-plugin-kit/model-settings-changes";
+import { mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
+//#region src/diagnostics.ts
+/** Invalidation is constant-time. Only startup and explicit reads request a
+* diagnostic; a burst shares one deferred run. Work never reschedules itself. */
+function createProbeDiagnostics(run, onError) {
+	let dirty = true;
+	let stopped = false;
+	let timer;
+	let running;
+	return {
+		invalidate() {
+			if (!stopped) dirty = true;
+		},
+		request() {
+			if (stopped || !dirty || timer !== void 0 || running) return;
+			timer = setTimeout(() => {
+				timer = void 0;
+				if (stopped || !dirty) return;
+				dirty = false;
+				running = Promise.resolve().then(run).catch(onError).finally(() => {
+					running = void 0;
+				});
+			}, 0);
+		},
+		async dispose() {
+			stopped = true;
+			if (timer !== void 0) clearTimeout(timer);
+			timer = void 0;
+			await running;
+		}
+	};
+}
+//#endregion
 //#region src/probe.ts
 /**
 * Pure probe-report builder for the model hub. Takes the host's
@@ -209,170 +241,10 @@ function createHubSettings(events, settings, ownNamespace = "@klarkxy/dsh-model-
 }
 //#endregion
 //#region src/changes.ts
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
-var __typeError = (msg) => {
-	throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {
-	enumerable: true,
-	configurable: true,
-	writable: true,
-	value
-}) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", {
-	value,
-	configurable: true
-});
-var __decoratorStart = (base) => [
-	,
-	,
-	,
-	__create(base?.[__knownSymbol("metadata")] ?? null)
-];
-var __decoratorStrings = [
-	"class",
-	"method",
-	"getter",
-	"setter",
-	"accessor",
-	"field",
-	"value",
-	"get",
-	"set"
-];
-var __expectFn = (fn) => fn !== void 0 && typeof fn !== "function" ? __typeError("Function expected") : fn;
-var __decoratorContext = (kind, name, done, metadata, fns) => ({
-	kind: __decoratorStrings[kind],
-	name,
-	metadata,
-	addInitializer: (fn) => done._ ? __typeError("Already initialized") : fns.push(__expectFn(fn || null))
-});
-var __decoratorMetadata = (array, target) => __defNormalProp(target, __knownSymbol("metadata"), array[3]);
-var __runInitializers = (array, flags, self, value) => {
-	for (var i = 0, fns = array[flags >> 1], n = fns && fns.length; i < n; i++) flags & 1 ? fns[i].call(self) : value = fns[i].call(self, value);
-	return value;
-};
-var __decorateElement = (array, flags, name, decorators, target, extra) => {
-	var fn, it, done, ctx, access, k = flags & 7, s = !!(flags & 8), p = !!(flags & 16);
-	var j = k > 3 ? array.length + 1 : k ? s ? 1 : 2 : 0, key = __decoratorStrings[k + 5];
-	var initializers = k > 3 && (array[j - 1] = []), extraInitializers = array[j] || (array[j] = []);
-	var desc = k && (!p && !s && (target = target.prototype), k < 5 && (k > 3 || !p) && __getOwnPropDesc(k < 4 ? target : {
-		get [name]() {
-			return __privateGet(this, extra);
-		},
-		set [name](x) {
-			return __privateSet(this, extra, x);
-		}
-	}, name));
-	k ? p && k < 4 && __name(extra, (k > 2 ? "set " : k > 1 ? "get " : "") + name) : __name(target, name);
-	for (var i = decorators.length - 1; i >= 0; i--) {
-		ctx = __decoratorContext(k, name, done = {}, array[3], extraInitializers);
-		if (k) {
-			ctx.static = s, ctx.private = p, access = ctx.access = { has: p ? (x) => __privateIn(target, x) : (x) => name in x };
-			if (k ^ 3) access.get = p ? (x) => (k ^ 1 ? __privateGet : __privateMethod)(x, target, k ^ 4 ? extra : desc.get) : (x) => x[name];
-			if (k > 2) access.set = p ? (x, y) => __privateSet(x, target, y, k ^ 4 ? extra : desc.set) : (x, y) => x[name] = y;
-		}
-		it = (0, decorators[i])(k ? k < 4 ? p ? extra : desc[key] : k > 4 ? void 0 : {
-			get: desc.get,
-			set: desc.set
-		} : target, ctx), done._ = 1;
-		if (k ^ 4 || it === void 0) __expectFn(it) && (k > 4 ? initializers.unshift(it) : k ? p ? extra = it : desc[key] = it : target = it);
-		else if (typeof it !== "object" || it === null) __typeError("Object expected");
-		else __expectFn(fn = it.get) && (desc.get = fn), __expectFn(fn = it.set) && (desc.set = fn), __expectFn(fn = it.init) && initializers.unshift(fn);
-	}
-	return k || __decoratorMetadata(array, target), desc && __defProp(target, name, desc), p ? k ^ 4 ? extra : desc : target;
-};
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateIn = (member, obj) => Object(obj) !== obj ? __typeError("Cannot use the \"in\" operator on this value") : member.has(obj);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-var _watch_dec;
-var _a;
-var _init;
-async function* watchModelSettingsChanges(events, signal) {
-	signal.throwIfAborted();
-	const pending = /* @__PURE__ */ new Map();
-	let full = false;
-	let wake;
-	const changed = (ns, revision) => {
-		let frame;
-		try {
-			frame = parseModelSettingsChangeFrame({
-				kind: "changed",
-				ns,
-				revision
-			});
-		} catch {
-			return;
-		}
-		if (!full) {
-			if (!pending.has(ns) && pending.size >= 256) {
-				pending.clear();
-				full = true;
-			} else pending.set(ns, frame);
-		}
-		wake?.();
-	};
-	const disposers = [];
-	const cleanup = () => {
-		for (const off of disposers.splice(0).reverse()) off();
-		pending.clear();
-	};
-	const aborted = () => {
-		cleanup();
-		wake?.();
-	};
-	signal.addEventListener("abort", aborted, { once: true });
-	try {
-		disposers.push(events.on(MODEL_SETTINGS_CHANGED_EVENT, ({ ns, revision }) => changed(ns, revision)));
-		disposers.push(events.on("settings/document-updated", changed));
-		signal.throwIfAborted();
-		yield { kind: "ready" };
-		while (true) {
-			signal.throwIfAborted();
-			if (full) {
-				full = false;
-				yield { kind: "ready" };
-				continue;
-			}
-			if (pending.size) {
-				const [ns, frame] = pending.entries().next().value;
-				pending.delete(ns);
-				yield frame;
-				continue;
-			}
-			await new Promise((resolve) => {
-				wake = resolve;
-				if (signal.aborted || full || pending.size) resolve();
-			});
-			wake = void 0;
-		}
-	} finally {
-		signal.removeEventListener("abort", aborted);
-		cleanup();
-	}
+/** Model Hub forwards every settings namespace; feature plugins filter their own. */
+function registerHubModelSettingsChanges(ctx) {
+	createModelSettingsChanges(ctx, modelSettingsChangesIdentity("@klarkxy/dsh-model-hub"));
 }
-var ModelSettingsChangesController = class extends (_a = TypertRemoteService, _watch_dec = [Remote({ mode: "stream" })], _a) {
-	constructor(ctx) {
-		super(ctx, MODEL_SETTINGS_CHANGES_REMOTE.descriptors[0].service, { namespace: MODEL_SETTINGS_CHANGES_REMOTE.descriptors[0].namespace });
-		__runInitializers(_init, 5, this);
-		__publicField(this, "lifetime", new AbortController());
-		ctx.effect(() => () => {
-			this.lifetime.abort(/* @__PURE__ */ new Error("Model settings sync owner unloaded"));
-		});
-	}
-	watch(signal) {
-		return watchModelSettingsChanges(this.ctx, AbortSignal.any([this.lifetime.signal, signal]));
-	}
-};
-_init = __decoratorStart(_a);
-__decorateElement(_init, 1, "watch", _watch_dec, ModelSettingsChangesController);
-__decoratorMetadata(_init, ModelSettingsChangesController);
 //#endregion
 //#region src/cast.ts
 /**
@@ -863,7 +735,7 @@ const Config = Schema.object({
 	}).volatile()
 });
 function apply(ctx) {
-	new ModelSettingsChangesController(ctx);
+	registerHubModelSettingsChanges(ctx);
 	const profile = ctx.get("profileContext");
 	const settings = ctx.settings;
 	const describe = () => settings.describe({ redactSecrets: true });
@@ -891,7 +763,8 @@ function apply(ctx) {
 		interpolate: false,
 		text: () => cast.promptText(() => ctx.get("subagentModelSelection")?.current())
 	});
-	const run = (reason) => {
+	const run = async () => {
+		const reason = "requested";
 		let report;
 		try {
 			report = buildProbeReport(describe());
@@ -902,20 +775,33 @@ function apply(ctx) {
 		ctx.logger.info("model-hub: probe (%s): %d namespaces, %d with model fields; self-test extra-key=%s role=%s", reason, report.totalNamespaces, report.namespacesWithModelFields, report.selfTest.extraKey, report.selfTest.role);
 		if (profile?.dir) try {
 			const dir = join(profile.dir, "data", "model-hub");
-			mkdirSync(dir, { recursive: true });
-			writeFileSync(join(dir, "probe-report.json"), JSON.stringify(report, null, 2));
+			await mkdir(dir, { recursive: true });
+			await writeFile(join(dir, "probe-report.json"), JSON.stringify(report, null, 2));
 		} catch (error) {
 			ctx.logger.warn("model-hub: could not write probe report: %s", error instanceof Error ? error.message : String(error));
 		}
 	};
-	run("boot");
-	ctx.on("settings/document-updated", () => run("document-updated"));
+	const diagnostics = createProbeDiagnostics(run, (error) => {
+		ctx.logger.warn("model-hub: diagnostics failed: %s", String(error));
+	});
+	ctx.effect(() => {
+		const off = ctx.on("settings/document-updated", () => diagnostics.invalidate());
+		diagnostics.request();
+		return async () => {
+			off();
+			await diagnostics.dispose();
+		};
+	});
 	ctx.effect(() => registerHostRpc(ctx, CHANNEL, async (endpoint, payload, signal) => {
 		try {
-			if (endpoint === "fields.list") return {
-				ok: true,
-				value: await hub.list(signal)
-			};
+			if (endpoint === "fields.list") {
+				const value = await hub.list(signal);
+				diagnostics.request();
+				return {
+					ok: true,
+					value
+				};
+			}
 			if (endpoint === "fields.set") return {
 				ok: true,
 				value: await hub.set(payload, signal)