@klarkxy/dsh-current-title 0.2.5 → 0.3.1

package/lib/client.js

@@ -298,6 +298,17 @@ ${scope} {
 /* --- Layout scaffolding. --- */
 & .dsh-ui-stack { display: flex; flex-direction: column; gap: 12px; }
 & .dsh-ui-stack-lg { display: flex; flex-direction: column; gap: 20px; }
+/* Plugin detail pages share one reading column. These are layout recipes;
+ * controls keep their own primitive styles. Form spacing follows the host's
+ * settings-form/fields.module.css and SettingsForm.module.css. */
+& .dsh-ui-page { display: flex; flex-direction: column; gap: 16px; width: 100%; max-width: 760px; min-width: 0; }
+& .dsh-ui-form { display: flex; flex-direction: column; gap: 0; min-width: 0; }
+&.dsh-ui-form > .dsh-ui-field, & .dsh-ui-form > .dsh-ui-field { padding: 12px 0; }
+& .dsh-ui-form-footer { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; padding-top: 16px; min-width: 0; }
+& .dsh-ui-fields-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px 20px; min-width: 0; margin: 0; padding: 0; border: 0; }
+@media (max-width: 560px) {
+  & .dsh-ui-fields-grid { grid-template-columns: minmax(0, 1fr); }
+}
 & .dsh-ui-row { display: flex; align-items: center; gap: 8px; min-width: 0; }
 & .dsh-ui-row-wrap { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; }
 & .dsh-ui-spacer { flex: 1; min-width: 0; }
@@ -325,6 +336,9 @@ ${scope} {
  * official primitive, so this only owns the vertical rhythm. --- */
 & .dsh-ui-field { display: flex; flex-direction: column; gap: 6px; min-width: 0; }
 & .dsh-ui-field + .dsh-ui-field { border-top: 0.5px solid var(--dsw-alias-border-l2); padding-top: 12px; }
+/* Grid fields share a row, so the stacked-field divider must not win later in
+ * the cascade. Reset it here, after the field recipe. */
+& .dsh-ui-fields-grid > .dsh-ui-field { padding: 0; border: 0; }
 & .dsh-ui-label { display: flex; align-items: center; gap: 6px; font-size: 13px; line-height: 20px; font-weight: 500; color: var(--dsw-alias-label-primary); }
 & .dsh-ui-label-row { display: flex; align-items: baseline; justify-content: space-between; gap: 8px; }
 & .dsh-ui-help { font-size: 12px; line-height: 1.6; color: var(--dsw-alias-label-secondary); }
@@ -515,29 +529,22 @@ ${scope} {
   & *, & *::before, & *::after { transition-duration: 0.01ms !important; animation-duration: 0.01ms !important; }
 }
 }
-`.replace(/^& (\.dsh-ui-[a-z0-9-]+)(?![+>~])/gm, (_match, className) => `&${className}, & ${className}`);
+`.replace(/^& (\.dsh-ui-[a-z0-9-]+)(?=\s*\{)/gm, (_match, className) => `&${className}, & ${className}`);
 }
 //#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. */
@@ -552,17 +559,44 @@ function parseModelSettingsChangeFrame(value) {
 	};
 	throw new Error("Invalid model settings change frame");
 }
-MODEL_SETTINGS_CHANGES_REMOTE.package, 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;
@@ -588,12 +622,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 = {
@@ -628,7 +668,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) {
@@ -933,7 +973,14 @@ function useModelCatalog(load, options = {}) {
 		refresh
 	};
 }
-/** Also accepts a mapped state from a caller that owns broader async orchestration. */
+/**
+* Also accepts a mapped state from a caller that owns broader async orchestration.
+*
+* The dsh-ui-* classes carry the styling and resolve through the consuming
+* plugin's own officialUiCss scope (every consumer mounts its root class, so
+* e.g. `.dsh-model-hub .dsh-ui-loading` paints this); dsh-model-catalog-status
+* stays as a structural hook for tests and layout, never a colour source.
+*/
 function ModelCatalogStatus({ state, locale }) {
 	const zh = locale?.toLowerCase().startsWith("zh") === true;
 	const copy = zh ? {
@@ -949,15 +996,17 @@ function ModelCatalogStatus({ state, locale }) {
 	};
 	if (!state.loading && !state.error && state.failures.length === 0) return null;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-		className: "dsh-model-catalog-status",
+		className: "dsh-model-catalog-status dsh-ui-stack",
 		lang: zh ? "zh" : "en",
 		children: [
 			state.loading ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 				role: "status",
+				className: "dsh-ui-loading",
 				children: copy.loading
 			}) : null,
 			state.error ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
 				role: "alert",
+				className: "dsh-ui-error dsh-ui-wrap",
 				children: [
 					copy.error,
 					": ",
@@ -966,20 +1015,27 @@ function ModelCatalogStatus({ state, locale }) {
 			}) : null,
 			state.failures.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				role: "status",
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: copy.partial }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", { children: state.failures.map((failure, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [
-					failure.name || failure.id,
-					": ",
-					failure.message
-				] }, `${failure.id}:${index}`)) })]
+				className: "dsh-ui-meta",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: copy.partial }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+					className: "dsh-ui-list",
+					children: state.failures.map((failure, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [
+						failure.name || failure.id,
+						": ",
+						failure.message
+					] }, `${failure.id}:${index}`))
+				})]
 			}) : null,
-			state.error || state.failures.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-				type: "button",
-				size: "sm",
-				disabled: state.loading,
-				onClick: () => {
-					state.refresh();
-				},
-				children: copy.retry
+			state.error || state.failures.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: "dsh-ui-actions",
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					type: "button",
+					size: "sm",
+					disabled: state.loading,
+					onClick: () => {
+						state.refresh();
+					},
+					children: copy.retry
+				})
 			}) : null
 		]
 	});
@@ -999,7 +1055,8 @@ function ModelCatalogStatus({ state, locale }) {
 * Sticky group headings, subsequence ranking, highlight walking and focus
 * hand-back all match the host. SYNC POINT: when the host's ModelSelect or
 * ModelSelect.module.css changes, this copy must be re-transcribed; styles
-* below may only reference --dsw-* theme tokens, never literal colors.
+* below may only reference allowlisted theme tokens (the --dsw-* set plus the
+* host's --ds-* motion tokens), never literal colors.
 *
 * It statically imports the primitives, so only browser clients should load
 * this entry; host code and node tests use the core entry (`./index.ts`).
@@ -1507,7 +1564,8 @@ function ModelMenu(props) {
 * sticky group headings (MenuGroup's own CSS), and the l1-stroke prominent
 * elevation at portal z-index 1100. The trigger mirrors the composer's 28px
 * model pill, chevron rotating open. MenuSurface paints fill and backdrop.
-* Only --dsw-* theme tokens may appear here — a literal color is a bug.
+* Only allowlisted --dsw- and --ds- theme tokens may appear here — a literal
+* color is a bug.
 */
 const modelMenuCss = `
 .dsh-model-menu-root { min-width: 0; position: relative; display: inline-flex; }
@@ -1530,12 +1588,14 @@ const modelMenuCss = `
   display: flex;
 }
 .dsh-model-menu-trigger:hover:not(:disabled) { background: var(--dsw-alias-interactive-bg-hover); }
-.dsh-model-menu-trigger:focus-visible:not([data-selection-focus]) { box-shadow: 0 0 0 2px var(--dsw-focus-ring-color, var(--dsw-alias-state-business-primary)); }
+.dsh-model-menu-trigger:focus-visible:not([data-selection-focus]) { box-shadow: 0 0 0 var(--dsw-focus-ring-width) var(--dsw-focus-ring-color, var(--dsw-alias-state-business-primary)); }
 .dsh-model-menu-trigger:disabled { color: var(--dsw-alias-label-dimmed); cursor: default; }
 .dsh-model-menu-triggerLabel { text-overflow: ellipsis; white-space: nowrap; min-width: 0; overflow: hidden; }
 .dsh-model-menu-triggerEffort { text-overflow: ellipsis; white-space: nowrap; min-width: 0; color: var(--dsw-alias-label-caption); flex-shrink: 1000; overflow: hidden; }
-.dsh-model-menu-chevron { color: var(--dsw-alias-label-caption); flex: none; transition: transform 0.12s; }
+.dsh-model-menu-chevron { color: var(--dsw-alias-label-caption); flex: none; transition: transform var(--ds-transition-duration) var(--ds-ease-in-out); }
 .dsh-model-menu-chevronOpen { transform: rotate(180deg); }
+/* Portal overlay: the host publishes no z-index token, so the card keeps the
+ * native menu layer's 1100 verbatim. */
 .dsh-model-menu-menu {
   z-index: 1100;
   --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);
@@ -1561,6 +1621,8 @@ const modelMenuCss = `
 .dsh-model-menu-searchWithQuery { padding-right: 34px; }
 .dsh-model-menu-searchRow .dsh-model-menu-search input { padding: 0; font-size: 12px; line-height: normal; }
 .dsh-model-menu-searchRow .dsh-model-menu-search input::placeholder { color: var(--dsw-alias-label-caption); }
+/* The clear button is a circle by geometry (border-radius: 50%), a shape the
+ * radius token scale does not describe. */
 .dsh-model-menu-searchClear {
   width: 24px;
   height: 24px;
@@ -2055,7 +2117,7 @@ function TitleSettings(props) {
 		});
 	}
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-		className: "current-title-settings ct-root dsh-ui-panel",
+		className: "current-title-settings ct-root dsh-ui-page",
 		lang: seat.locale,
 		"data-testid": "current-title-settings",
 		children: [
@@ -2321,13 +2383,16 @@ function TitleSettings(props) {
 		]
 	});
 }
-const styles = `${officialUiCss("ct-root")}${modelMenuCss}
-.ct-root { max-width: 760px; }
-.ct-prompt { min-height: 96px; }
+const currentTitleOwnCss = `
+.ct-root .ct-prompt { min-height: 96px; }
 `;
+const currentTitleStyles = `${officialUiCss("ct-root")}${modelMenuCss}${currentTitleOwnCss}`;
+const styles = currentTitleStyles;
 function apply(ctx) {
 	const client = ctx;
-	const settingsSubscriber = createModelSettingsSubscriber(ctx, "@klarkxy/dsh-current-title");
+	const packageName = "@klarkxy/dsh-current-title";
+	mountModelSettingsChanges(ctx, packageName);
+	const settingsSubscriber = createModelSettingsSubscriber(ctx, packageName, modelSettingsChangesIdentity(packageName));
 	const subscribeSettings = (change, error) => settingsSubscriber.subscribe(change, error);
 	const marker = createTitleClientMarker();
 	ctx.provide(TITLE_CLIENT_SERVICE, marker);
@@ -2367,6 +2432,8 @@ exports.TitleSettings = TitleSettings;
 exports.apply = apply;
 exports.applyMarkerFromStatus = applyMarkerFromStatus;
 exports.createTitleClientMarker = createTitleClientMarker;
+exports.currentTitleOwnCss = currentTitleOwnCss;
+exports.currentTitleStyles = currentTitleStyles;
 exports.disposeTitleClientMarker = disposeTitleClientMarker;
 exports.inject = inject;
 exports.name = name;

package/lib/contracts.d.ts

@@ -1,5 +1,5 @@
-import { ModelRoute, defaultModelRoute, normalizeModelRoute } from "@klarkxy/dsh-model-route";
 import { RpcResult } from "@klarkxy/dsh-plugin-kit/contracts";
+import { ModelRoute, defaultModelRoute, normalizeModelRoute } from "@klarkxy/dsh-model-route";
 //#region src/contracts.d.ts
 declare const PLUGIN_NAME = "@klarkxy/dsh-current-title";
 declare const FEATURE_ID = "current-title";

package/lib/index.d.ts

@@ -123,6 +123,7 @@ declare class CurrentTitleService {
   private settingsPending;
   private disposed;
   private readonly inFlight;
+  private readonly generations;
   readonly support: TitleSupport;
   constructor(options: {
     plugin: string;
@@ -155,6 +156,7 @@ declare class CurrentTitleService {
   regenerate(sessionId: string, signal: AbortSignal): Promise<TitleSnapshot | undefined>;
   read(session: SessionLike): TitleSnapshot | undefined;
   private nativeGenerate;
+  private runNativeGenerate;
 }
 //#endregion
 //#region src/input.d.ts

package/lib/index.js

@@ -1,8 +1,8 @@
 import { DEFAULT_TIMEOUT_MS, PLUGIN_NAME, PROVIDER_ID, RPC_CHANNEL, SETTINGS_KEY, defaultGenerateConfig, defaultModelRoute, isTitleLocaleMode, normalizeCadence, normalizeModelRoute, normalizePrompt } from "./contracts.js";
 import { registerHostRpc } from "@klarkxy/dsh-plugin-kit/host-rpc";
+import { isSubagentSession, modelSettingsChangesIdentity } from "@klarkxy/dsh-plugin-kit/contracts";
+import { createModelSettingsChanges } from "@klarkxy/dsh-plugin-kit/model-settings-changes";
 import { notifyModelSettingsChanged, registerModelSettings } from "@klarkxy/dsh-plugin-kit/model-settings";
-import "@klarkxy/dsh-model-route";
-import { isSubagentSession } from "@klarkxy/dsh-plugin-kit/contracts";
 import { callLlmText, resolveFeatureModel } from "@klarkxy/dsh-plugin-kit";
 import { defineDomain, domainTable } from "@deepseek-ai/dsh-storage-domain";
 import { z } from "zod";
@@ -251,32 +251,32 @@ async function generateCurrentTitle(options) {
 	const timeoutMs = Number.isFinite(options.config.timeoutMs) && options.config.timeoutMs > 0 ? options.config.timeoutMs : DEFAULT_TIMEOUT_MS;
 	const timer = setTimeout(() => deadline.abort(new DOMException("Title generation timed out.", "TimeoutError")), timeoutMs);
 	const signal = AbortSignal.any([options.signal, deadline.signal]);
-	let abort = () => {};
-	const cancelled = new Promise((_resolve, reject) => {
-		abort = () => reject(signal.reason);
-		if (signal.aborted) abort();
-		else signal.addEventListener("abort", abort, { once: true });
-	});
 	let result;
 	try {
-		result = await Promise.race([callLlmText(options.llm, {
+		result = await callLlmText(options.llm, {
 			plugin: PLUGIN_NAME,
 			route: callRoute,
 			system: systemPrompt(options.config, options.prompt),
 			text: framedInput,
 			maxTokens: options.config.maxOutputTokens,
 			purpose: "session-title",
+			configure: (controls, model) => {
+				const effort = model.reasoning?.efforts[0]?.id;
+				return {
+					...controls,
+					...effort === void 0 ? {} : { reasoningEffort: effort }
+				};
+			},
 			signal,
 			sessionId: options.sessionId,
 			isCurrent: options.isCurrent
-		}), cancelled]);
+		});
 		signal.throwIfAborted();
 	} catch (error) {
 		signal.throwIfAborted();
 		throw error;
 	} finally {
 		clearTimeout(timer);
-		signal.removeEventListener("abort", abort);
 	}
 	options.signal.throwIfAborted();
 	if (!options.isCurrent()) throw Object.assign(/* @__PURE__ */ new Error("dsh-current-title: generation is no longer current"), { code: "superseded" });
@@ -487,6 +487,7 @@ var CurrentTitleService = class {
 	settingsPending = Promise.resolve();
 	disposed = false;
 	inFlight = /* @__PURE__ */ new Map();
+	generations = /* @__PURE__ */ new Set();
 	support;
 	constructor(options) {
 		this.options = options;
@@ -527,6 +528,7 @@ var CurrentTitleService = class {
 		this.generation += 1;
 		for (const controller of this.inFlight.values()) controller.abort(/* @__PURE__ */ new Error("current-title disabled"));
 		this.inFlight.clear();
+		await Promise.allSettled([...this.generations]);
 		await this.settingsPending;
 		const snapshot = this.nativeSlot?.displacement;
 		const outcome = await releaseTitleSlot(this.nativeSlot ?? {
@@ -634,7 +636,14 @@ var CurrentTitleService = class {
 			updatedAt: snapshot.updatedAt ?? 0
 		};
 	}
-	async nativeGenerate(request) {
+	nativeGenerate(request) {
+		if (this.disposed) return Promise.reject(/* @__PURE__ */ new Error("dsh-current-title: plugin disabled"));
+		const pending = this.runNativeGenerate(request);
+		this.generations.add(pending);
+		pending.then(() => this.generations.delete(pending), () => this.generations.delete(pending));
+		return pending;
+	}
+	async runNativeGenerate(request) {
 		const llm = this.options.llm;
 		if (!llm) throw new Error("dsh-current-title: llm is not available");
 		const generation = this.generation;
@@ -801,6 +810,7 @@ const inject = [
 	"agentDefaultModel"
 ];
 async function apply(ctx, config = {}) {
+	createModelSettingsChanges(ctx, modelSettingsChangesIdentity(PLUGIN_NAME), PLUGIN_NAME);
 	const host = ctx;
 	const domain = await host.storageDomain.open(titleDomain);
 	const table = domain.table("settings");