@klarkxy/dsh-model-hub 0.1.2 → 0.1.4

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 } 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
 /**
@@ -457,9 +329,15 @@ function validateIndex(value) {
 */
 function buildCastPrompt(enabled, routes) {
 	if (!enabled || !routes.length) return "";
-	const annotated = routes.filter((route) => typeof route.tendency === "string" && route.tendency);
-	if (!annotated.length) return "";
-	return ["Subagent cast: the user has annotated the models available for subagent delegation with task tendencies. When delegating to a subagent, prefer a model whose tendency matches the task at hand; treat models without a tendency as general-purpose. These tendencies are advisory — the final model choice is always yours.", ...annotated.map((route) => `- ${route.provider}/${route.model}${route.reasoningEffort ? ` (reasoning effort: ${route.reasoningEffort})` : ""}: ${route.tendency}`)].join("\n");
+	const annotated = routes.filter((route) => typeof route.tendency === "string" && route.tendency.trim());
+	const guidance = [
+		"Subagent model selection:",
+		"When delegating an independent task, actively choose a suitable model instead of silently inheriting your own. If list_subagent_models and a delegation tool with provider/model fields are available, inspect the available routes before the first model-selectable delegation in this task, reuse those results for later delegations, and supply provider and model together explicitly.",
+		"For independent reviews, alternative approaches, or disputed conclusions, prefer a model different from your own when a suitable candidate is available. Choose for task fit and the user's constraints; using the same model is appropriate when it fits better or no suitable alternative is available. Do not create extra subtasks solely for model diversity.",
+		"The current Session's discovery results and tool schema are authoritative. Configured model notes may refer to routes unavailable in this Session. If discovery or model-selection fields are unavailable, use the supported delegation behavior; do not invent routes or pass unsupported fields to tools such as subagent_fork. When changing models, omit reasoning_effort unless you have verified a supported value."
+	];
+	if (annotated.length) guidance.push("User-provided task tendencies (advisory): prefer a matching tendency among available models. Models without a tendency remain general-purpose candidates; no model-specific strengths are assumed.", ...annotated.map((route) => `- ${route.provider}/${route.model}${route.reasoningEffort ? ` (reasoning effort: ${route.reasoningEffort})` : ""}: ${route.tendency}`));
+	return guidance.join("\n");
 }
 function createCast(deps) {
 	const castFile = () => {
@@ -683,7 +561,7 @@ function createCast(deps) {
 			return buildCastPrompt(snapshot.enabled, mergeTendencies(snapshot.routes, readTendencies().tendencies));
 		} catch (error) {
 			deps.logger?.warn("model-hub: cast tendencies unavailable: %s", error.message);
-			return "";
+			return buildCastPrompt(snapshot.enabled, snapshot.routes);
 		}
 	};
 	return {
@@ -697,6 +575,128 @@ function createCast(deps) {
 	};
 }
 //#endregion
+//#region src/running.ts
+/**
+* dsh-model-hub — running subagent routes (host half).
+*
+* Read-only live view answering "which model and reasoning effort is each
+* running subagent actually using". `subagent/start` and `subagent/end`
+* maintain the live set; each child's effective route is read from its
+* session epoch header (`session.requestHeader()`) and kept current through
+* the session's own `request/header` events (reason `change` covers mid-run
+* model switches). Children already running when this plugin (re)loads are
+* recovered from the live agent registry via `isSubagentSession`.
+*
+* The effective route is session data recorded by the host; this tracker
+* never writes to sessions or settings. Display-only invalidations reuse the
+* model-settings change channel with RUNNING_NAMESPACE so open pages refetch.
+*/
+/** Invalidation namespace for the running-subagent view; carries no settings. */
+const RUNNING_NAMESPACE = "@klarkxy/dsh-model-hub/running-subagents";
+function text(value) {
+	return typeof value === "string" ? value.trim() : "";
+}
+/** Normalize one epoch header into the display route plus the adapter-default flag. */
+function routeFromHeader(header) {
+	const config = header?.config;
+	const provider = text(config?.provider);
+	const model = text(config?.model);
+	if (!provider || !model) return {};
+	const effort = text(config?.reasoningEffort);
+	return {
+		route: effort ? {
+			provider,
+			model,
+			reasoningEffort: effort
+		} : {
+			provider,
+			model
+		},
+		...effort && header?.adapterDefaults?.reasoningEffort === true ? { effortIsAdapterDefault: true } : {}
+	};
+}
+function sameRoute(left, right) {
+	return left.route?.provider === right.route?.provider && left.route?.model === right.route?.model && left.route?.reasoningEffort === right.route?.reasoningEffort && left.effortIsAdapterDefault === right.effortIsAdapterDefault;
+}
+function createRunningTracker(deps) {
+	const entries = /* @__PURE__ */ new Map();
+	let revision = 0;
+	const bump = () => deps.notify(++revision);
+	const add = (id, info) => {
+		const session = (deps.agents?.get(id))?.session;
+		const next = routeFromHeader(session?.requestHeader?.());
+		const existing = entries.get(id);
+		if (existing) {
+			const providerName = info?.provider ?? existing.providerName;
+			const local = info?.local ?? existing.local;
+			const changed = existing.providerName !== providerName || existing.local !== local || !sameRoute(existing, next);
+			existing.providerName = providerName;
+			existing.local = local;
+			existing.route = next.route;
+			existing.effortIsAdapterDefault = next.effortIsAdapterDefault;
+			if (changed) bump();
+			return;
+		}
+		entries.set(id, {
+			id,
+			local: info?.local !== false,
+			...info?.provider ? { providerName: info.provider } : {},
+			...typeof session?.header?.parentSession === "string" && session.header.parentSession ? { parentSessionId: session.header.parentSession } : {},
+			...typeof session?.header?.createdAt === "number" ? { startedAt: session.header.createdAt } : {},
+			route: next.route,
+			effortIsAdapterDefault: next.effortIsAdapterDefault
+		});
+		bump();
+	};
+	const remove = (id) => {
+		if (entries.delete(id)) bump();
+	};
+	try {
+		for (const agent of deps.agents?.list() ?? []) if (agent?.id && isSubagentSession(agent.session)) add(agent.id);
+	} catch {}
+	deps.events.on("subagent/start", (info) => {
+		if (typeof info?.id === "string" && info.id) add(info.id, info);
+	});
+	deps.events.on("subagent/end", (info) => {
+		if (typeof info?.id === "string") remove(info.id);
+	});
+	deps.events.on("agent/disposed", (payload) => {
+		if (typeof payload?.agent?.id === "string") remove(payload.agent.id);
+	});
+	deps.events.on("session/event", (session, event) => {
+		if (event?.type !== "request/header") return;
+		const id = typeof session?.id === "string" ? session.id : void 0;
+		const entry = id ? entries.get(id) : void 0;
+		if (!entry) return;
+		const next = routeFromHeader(event.data?.header);
+		if (sameRoute(entry, next)) return;
+		entry.route = next.route;
+		entry.effortIsAdapterDefault = next.effortIsAdapterDefault;
+		bump();
+	});
+	return { async list(signal) {
+		const pendingParents = /* @__PURE__ */ new Set();
+		for (const entry of entries.values()) if (entry.label === void 0 && entry.parentSessionId) pendingParents.add(entry.parentSessionId);
+		if (deps.subagents && pendingParents.size) await Promise.allSettled([...pendingParents].map(async (parent) => {
+			const children = await deps.subagents.listChildren(parent, signal);
+			const labels = new Map(children.map((child) => [child.id, child.label]));
+			for (const entry of entries.values()) {
+				if (entry.parentSessionId !== parent || entry.label !== void 0) continue;
+				const label = labels.get(entry.id);
+				if (typeof label === "string" && label.trim()) entry.label = label.trim();
+			}
+		}));
+		const snapshot = [...entries.values()].map((entry) => ({
+			...entry,
+			route: entry.route ? { ...entry.route } : void 0
+		})).sort((a, b) => (a.startedAt ?? 0) - (b.startedAt ?? 0) || a.id.localeCompare(b.id));
+		return {
+			revision,
+			entries: snapshot
+		};
+	} };
+}
+//#endregion
 //#region src/index.ts
 /**
 * dsh-model-hub — cross-plugin model settings hub.
@@ -735,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 });
@@ -751,13 +751,20 @@ function apply(ctx) {
 		logger: ctx.logger,
 		notifyTendenciesChanged: (revision) => notifyModelSettingsChanged(ctx, CAST_TENDENCIES_NAMESPACE, revision)
 	});
+	const running = createRunningTracker({
+		events: ctx,
+		agents: ctx.get("agents"),
+		subagents: ctx.get("subagents"),
+		notify: (revision) => notifyModelSettingsChanged(ctx, RUNNING_NAMESPACE, revision)
+	});
 	ctx.systemPrompt.section({
 		name: "model-hub:subagent-cast",
 		order: ctx.systemPrompt.getSectionOrder("TOOL_SUBAGENT") + 1,
 		interpolate: false,
 		text: () => cast.promptText(() => ctx.get("subagentModelSelection")?.current())
 	});
-	const run = (reason) => {
+	const run = async () => {
+		const reason = "requested";
 		let report;
 		try {
 			report = buildProbeReport(describe());
@@ -768,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)
@@ -812,6 +832,10 @@ function apply(ctx) {
 					ok: true,
 					value: cast.setTendency(row.provider, row.model, row.tendency, row.expectedRevision, signal)
 				};
+				if (endpoint === "cast.running") return {
+					ok: true,
+					value: await running.list(signal)
+				};
 			}
 			throw new Error(`Unknown endpoint: ${endpoint}`);
 		} catch (error) {