@klarkxy/dsh-model-hub 0.1.3 → 0.1.4

package/README.md

@@ -24,7 +24,7 @@ Open **Plugins → Model Hub**.
 ## Limits
 
 - Only plugins that expose model settings appear.
-- If a setting changed elsewhere, refresh and choose again.
+- Changes made elsewhere update the page automatically. If an edit conflicts with a newer change, refresh and choose again.
 - If the model list cannot load, use **Retry**. The last available list stays visible; warnings identify providers that could not be loaded while other providers remain usable.
 - Model selection guidance requires host tools that support choosing a subagent model. Existing conversations retain their saved model lists; start a new conversation to use an updated list.
 - Guidance does not force a model choice or add extra subtasks solely for variety.

package/docs/README.zh-CN.md

@@ -24,7 +24,7 @@ dsh plugin --profile web add @klarkxy/dsh-model-hub
 ## 限制
 
 - 只显示提供了模型设置的插件。
-- 设置在别处被改动时，刷新后重新选择。
+- 设置在别处改动时，页面会自动更新。编辑与较新的改动冲突时，请刷新后重新选择。
 - 模型列表读取失败时，点击「重试」。上次可用的列表会保留；部分提供方读取失败时会显示提示，其他提供方仍可使用。
 - 选模引导需要宿主工具支持选择子代理模型。已有会话保留各自的模型名单；修改名单后，新建会话才能使用更新后的名单。
 - 引导不强制模型选择，也不要求仅为增加模型种类而新增子任务。

package/lib/client.inner.cjs

@@ -1,28 +1,5 @@
 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");
@@ -1316,25 +1293,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. */
@@ -1349,21 +1319,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;
@@ -1389,12 +1382,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 = {
@@ -1429,7 +1428,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) {
@@ -2588,11 +2587,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");