dsh-subscriptions 0.2.0 → 0.2.2

package/lib/client/usage-pace.js

@@ -21,7 +21,7 @@ export function resetCountdownParts(ms) {
         { unit: 'hour', count: Math.floor((total % 1440) / 60) },
         { unit: 'minute', count: total % 60 },
     ];
-    return parts.filter(part => part.count > 0).slice(0, 2);
+    return parts.filter((part) => part.count > 0).slice(0, 2);
 }
 /**
  * Whether the reported percentage still describes the window now. Only a fresh
@@ -30,10 +30,14 @@ export function resetCountdownParts(ms) {
  * drawn: where the window stands in time never depends on the reading.
  */
 export function isUsageFresh(window, observation, now = Date.now()) {
-    return validUsage(window.usedPercent) && observation.stale !== true
-        && observation.observedAt !== undefined && Number.isFinite(observation.observedAt)
-        && observation.observedAt <= now && now - observation.observedAt <= USAGE_FRESHNESS_MS
-        && (window.resetsAt === undefined || Number.isFinite(window.resetsAt) && window.resetsAt > now);
+    return (validUsage(window.usedPercent) &&
+        observation.stale !== true &&
+        observation.observedAt !== undefined &&
+        Number.isFinite(observation.observedAt) &&
+        observation.observedAt <= now &&
+        now - observation.observedAt <= USAGE_FRESHNESS_MS &&
+        (window.resetsAt === undefined ||
+            (Number.isFinite(window.resetsAt) && window.resetsAt > now)));
 }
 /**
  * How far through its window the clock is, from the window's own timing alone.
@@ -48,10 +52,19 @@ export function elapsedPercent(window, now = Date.now()) {
     if (end === undefined || !Number.isFinite(end) || end <= now)
         return undefined;
     const duration = window.windowDurationMs;
-    const start = window.startsAt ?? (window.fixedWindow === true && duration !== undefined && Number.isFinite(duration) && duration > 0 ? end - duration : undefined);
-    if (start === undefined || !Number.isFinite(start) || start >= end || start > now)
+    const start = window.startsAt ??
+        (window.fixedWindow === true &&
+            duration !== undefined &&
+            Number.isFinite(duration) &&
+            duration > 0
+            ? end - duration
+            : undefined);
+    if (start === undefined ||
+        !Number.isFinite(start) ||
+        start >= end ||
+        start > now)
         return undefined;
-    return Math.min(100, Math.max(0, (now - start) / (end - start) * 100));
+    return Math.min(100, Math.max(0, ((now - start) / (end - start)) * 100));
 }
 export function usageColorState(used, elapsed, preset, fresh) {
     if (!validUsage(used))
@@ -65,8 +78,10 @@ export function usageColorState(used, elapsed, preset, fresh) {
 }
 export function usageBarColor(used, elapsed, preset = 'standard', fresh = true) {
     const state = usageColorState(used, elapsed, preset, fresh);
-    return state === 'red' ? 'var(--dsw-alias-state-error-primary)'
-        : state === 'yellow' ? 'var(--dsw-alias-state-warn-label)'
+    return state === 'red'
+        ? 'var(--dsw-alias-state-error-primary)'
+        : state === 'yellow'
+            ? 'var(--dsw-alias-state-warn-label)'
             : 'var(--dsw-alias-state-success-primary)';
 }
 /**
@@ -80,7 +95,10 @@ export function displayStartPercent(window, now = Date.now()) {
     const start = window.displayStartsAt;
     if (end === undefined || !Number.isFinite(end) || end <= now)
         return undefined;
-    if (start === undefined || !Number.isFinite(start) || start >= end || start > now)
+    if (start === undefined ||
+        !Number.isFinite(start) ||
+        start >= end ||
+        start > now)
         return undefined;
-    return Math.min(100, Math.max(0, (now - start) / (end - start) * 100));
+    return Math.min(100, Math.max(0, ((now - start) / (end - start)) * 100));
 }

package/lib/client.js

@@ -72,6 +72,11 @@ const en = {
 	modelsWebSearch: "Web search",
 	modelsSave: "Save changes",
 	modelsUnavailable: "Currently unavailable",
+	claudeCacheTtl: "Prompt cache lifetime",
+	claudeCacheTtlFollowConfig: "Follow config",
+	claudeCacheTtl5m: "5 minutes",
+	claudeCacheTtl1h: "1 hour",
+	claudeCacheTtlHint: "Overrides the claudePromptCacheTtl config for this Claude route; Follow config uses the configured value. Saved changes apply from the next request. One hour keeps cached prefixes longer but writes them at a higher input price; compaction and session-title requests stay at five minutes.",
 	nav: "Subscriptions",
 	intro: "Log a subscription provider in or out. Login opens the provider’s authorization page in a new tab; headless setups can paste the callback URL or code instead.",
 	unavailable: "Connection unavailable; subscription status cannot be loaded.",
@@ -307,6 +312,11 @@ const zh = {
 	modelsWebSearch: "网页搜索",
 	modelsSave: "保存更改",
 	modelsUnavailable: "当前不可用",
+	claudeCacheTtl: "提示词缓存时长",
+	claudeCacheTtlFollowConfig: "跟随配置",
+	claudeCacheTtl5m: "5 分钟",
+	claudeCacheTtl1h: "1 小时",
+	claudeCacheTtlHint: "覆盖此 Claude 路由的 claudePromptCacheTtl 配置；选择「跟随配置」时使用配置值。保存后自下一次请求生效。1 小时可更久保留缓存前缀，但写入按更高的输入价格计费；压缩与会话标题请求仍为 5 分钟。",
 	nav: "订阅",
 	intro: "在此登录或退出订阅服务商。点击登录会在新标签页打开服务商的授权页面；无浏览器环境可改为粘贴回调 URL 或授权码。",
 	unavailable: "连接不可用，无法加载订阅状态。",
@@ -576,6 +586,19 @@ function mergeLatestAccounts(draft, latest) {
 		...latest.accounts === void 0 ? {} : { accounts: latest.accounts }
 	};
 }
+/**
+* The account manager owns the Claude prompt-cache TTL picker. The model
+* editor's draft carries the TTL it loaded, so the dialog always replaces it
+* with the picker's choice when touched, or the freshly re-read value
+* otherwise.
+*/
+function mergePromptCacheTtl(settings, promptCacheTtl) {
+	const { promptCacheTtl: _stale,...rest } = settings;
+	return promptCacheTtl === void 0 ? rest : {
+		...rest,
+		promptCacheTtl
+	};
+}
 /** Only touched accounts replace their latest preferences; other settings survive. */
 function mergeAccountChanges(latest, changes) {
 	return {
@@ -683,7 +706,8 @@ const ProviderModelEditor = (0, react.forwardRef)(function ProviderModelEditor$1
 		draft,
 		contexts,
 		efforts,
-		provider
+		provider,
+		t
 	]);
 	const allModels = catalog?.models ?? [];
 	const known = new Set(allModels.map((model) => model.id));
@@ -1149,6 +1173,8 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 	const [saveError, setSaveError] = (0, react.useState)("");
 	const [attempt, setAttempt] = (0, react.useState)(0);
 	const [modelsDirty, setModelsDirty] = (0, react.useState)(false);
+	const [ttlDraft, setTtlDraft] = (0, react.useState)();
+	const [ttlDirty, setTtlDirty] = (0, react.useState)(false);
 	const alive = (0, react.useRef)(true);
 	const saveLock = (0, react.useRef)(false);
 	const editor = (0, react.useRef)(null);
@@ -1168,7 +1194,11 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 		setLoading(true);
 		setError("");
 		callSubscriptionsAuth(rpc, provider === "cursor-subscription" ? "cursorSettings" : "providerSettings", { provider }).then((data) => {
-			if (current) setCatalog(data);
+			if (current) {
+				setCatalog(data);
+				setTtlDraft(data.settings.promptCacheTtl);
+				setTtlDirty(false);
+			}
 		}).catch((error$1) => {
 			if (current) setError(t("accountsLoadFailed", { message: error$1 instanceof Error ? error$1.message : String(error$1) }));
 		}).finally(() => {
@@ -1216,7 +1246,7 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 			if (provider === "cursor-subscription") await callSubscriptionsAuth(rpc, "cursorSetSettings", { settings: models.settings ?? latest.settings });
 			else await callSubscriptionsAuth(rpc, "setProviderSettings", {
 				provider,
-				settings: mergeAccountChanges(models.settings === void 0 ? latest.settings : mergeLatestAccounts(models.settings, latest.settings), changes)
+				settings: mergeAccountChanges(mergePromptCacheTtl(models.settings === void 0 ? latest.settings : mergeLatestAccounts(models.settings, latest.settings), ttlDirty ? ttlDraft : latest.settings.promptCacheTtl), changes)
 			});
 			if (alive.current) onClose();
 		} catch (error$1) {
@@ -1392,7 +1422,8 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 										},
 										children: [
 											t("accountsModels"),
-											" · ",
+											" ·",
+											" ",
 											preferences.poolModels === void 0 ? t("accountsModelsAll") : t("accountsModelsCount", { count: preferences.poolModels.length })
 										]
 									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -1484,6 +1515,52 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 					disabled: saving,
 					onDirtyChange: setModelsDirty
 				}),
+				provider === "claude" && catalog && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					style: {
+						...stack$1,
+						gap: 6,
+						borderTop: border$1,
+						marginTop: 12,
+						paddingTop: 12
+					},
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+						style: {
+							...stack$1,
+							gap: 6
+						},
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "dsh-subscription-label",
+							children: t("claudeCacheTtl")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+							"aria-label": t("claudeCacheTtl"),
+							style: { width: 220 },
+							value: ttlDraft ?? "",
+							disabled: saving,
+							onChange: (event) => {
+								const value = event.target.value;
+								setTtlDraft(value === "" ? void 0 : value);
+								setTtlDirty(true);
+							},
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+									value: "",
+									children: t("claudeCacheTtlFollowConfig")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+									value: "5m",
+									children: t("claudeCacheTtl5m")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+									value: "1h",
+									children: t("claudeCacheTtl1h")
+								})
+							]
+						})]
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						className: "dsh-subscription-hint",
+						children: t("claudeCacheTtlHint")
+					})]
+				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("footer", {
 					style: {
 						...stack$1,
@@ -1510,7 +1587,7 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 							type: "button",
 							className: "dsh-subscription-primary",
-							disabled: loading || saving || !Object.keys(changes).length && !modelsDirty,
+							disabled: loading || saving || !Object.keys(changes).length && !modelsDirty && !ttlDirty,
 							onClick: () => {
 								save();
 							},
@@ -3588,7 +3665,12 @@ function ResetCreditsDisclosure({ mode, credits, t, now = Date.now(), nextCredit
 									}),
 									mode === "grants" && state === "notUsable" && credit.cooldownUntil !== void 0 && credit.cooldownUntil > now && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 										"aria-hidden": "true",
-										children: [t("resetCreditCooldownUntil", { date: new Date(credit.cooldownUntil).toLocaleString() }), " · "]
+										children: [
+											t("resetCreditCooldownUntil", { date: new Date(credit.cooldownUntil).toLocaleString() }),
+											" ",
+											"·",
+											" "
+										]
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 										"aria-hidden": mode === "grants" ? true : void 0,
@@ -3734,7 +3816,7 @@ const styles$6 = {
 //#endregion
 //#region src/client/SubscriptionsSection.tsx
 /** Poll cadence while a provider login attempt is busy. */
-const POLL_INTERVAL_MS$1 = 2e3;
+const POLL_INTERVAL_MS = 2e3;
 const CLIENT_VERSION_SOURCES = {
 	npm: "clientVersionNpm",
 	local: "clientVersionLocal",
@@ -4063,7 +4145,7 @@ function SubscriptionsSection(props) {
 		if (pollersRef.current.has(provider)) return;
 		pollersRef.current.set(provider, setInterval(() => {
 			refresh();
-		}, POLL_INTERVAL_MS$1));
+		}, POLL_INTERVAL_MS));
 	}, [refresh]);
 	(0, react.useEffect)(() => {
 		mountedRef.current = true;
@@ -4225,7 +4307,8 @@ function SubscriptionsSection(props) {
 		rpc,
 		t,
 		setProviderError,
-		startPolling
+		startPolling,
+		refresh
 	]);
 	const cancel = (0, react.useCallback)(async (provider) => {
 		if (rpc === void 0) return;
@@ -4972,7 +5055,8 @@ const HOST_CONTRACT = {
 		slots: "@deepseek-ai/dsh-client-ui-renderer"
 	},
 	markers: { composerStats: {
-		attribute: "data-composer-stats",
+		row: "data-composer-stats",
+		dock: "data-composer-stat",
 		package: "@deepseek-ai/dsh-client-ui-chat"
 	} },
 	diagnostics: {
@@ -5025,6 +5109,10 @@ const HOST_CONTRACT = {
 		]
 	}
 };
+/** Attribute selector for a host DOM marker (`data-composer-stats` → `[data-composer-stats]`). */
+function markerSelector(attribute) {
+	return `[${attribute}]`;
+}
 
 //#endregion
 //#region src/client/host-icons.ts
@@ -5435,9 +5523,10 @@ function VideoGenerateToolview(props) {
 //#region src/client/SpeedSelect.tsx
 /**
 * The `loadSpeed` half of the inject face: the plugin's own speed state plus
-* the host's current model selection (the visibility gate). A model-RPC
-* failure throws rather than answering "hidden" — the caller keeps its last
-* known state, so a transient failure never locks the toggle away.
+* the host's current model selection (the visibility gate). A session whose
+* model selection is unavailable (an addressed subagent) answers hidden.
+* Any other model-directory failure throws, so the caller keeps its last
+* known state instead of locking the toggle away.
 *
 * `sessionId` is a plain string: slot and command contexts brand it through
 * different dsh-session copies, and only the service boundary needs one.
@@ -5454,13 +5543,126 @@ function createSpeedLoader(connection, models, sessionId) {
 			visible: false,
 			tier: state.tier
 		};
-		const { current } = await directories.directoryFor(sessionId).load();
+		let current;
+		try {
+			current = (await directories.directoryFor(sessionId).load()).current;
+		} catch (error) {
+			if (!modelSelectionUnavailable(error)) throw error;
+			return {
+				visible: false,
+				tier: state.tier
+			};
+		}
 		return {
 			visible: current !== null && current.provider === "codex" && state.fastModels.includes(current.model),
 			tier: state.tier
 		};
 	};
 }
+/** Host copy for a session that has no model seat (an addressed subagent). */
+const MODEL_SELECTION_UNAVAILABLE = "model selection is unavailable";
+function modelSelectionUnavailable(error) {
+	return (error instanceof Error ? error.message : String(error)).includes(MODEL_SELECTION_UNAVAILABLE);
+}
+/** Stable identity of a model selection. Empty when nothing is selected. */
+function modelSelectionKey(current) {
+	if (current == null) return "";
+	return JSON.stringify([current.provider, current.model]);
+}
+/**
+* How often a host without a directory store is re-read, and how often a
+* missing directory service is retried. Neither interval calls
+* `subscriptions-auth.speed`.
+*/
+const MODEL_DIRECTORY_POLL_INTERVAL_MS = 3e3;
+/**
+* Mount reads of `speed`, including the first attempt. Further failures stop
+* instead of polling for the life of the composer.
+*/
+const SPEED_MOUNT_READ_ATTEMPTS = 4;
+/** Fired after `/fast` writes a tier, so an open composer re-reads `speed`. */
+const SPEED_CHANGED_EVENT = "dsh:subscriptions:speed-changed";
+/** Tell mounted Speed controls that this page changed a session tier. */
+function notifySpeedChanged() {
+	if (typeof window === "undefined") return;
+	window.dispatchEvent(new Event(SPEED_CHANGED_EVENT));
+}
+/**
+* Subscribe to the session's selected model. A directory store notifies the
+* listener only when `provider` or `model` changes. A directory with no store
+* is re-read on {@link MODEL_DIRECTORY_POLL_INTERVAL_MS}; a service that is
+* not registered yet, or whose `directoryFor` throws, is retried on that same
+* interval. The first successful attach after a miss notifies once, so a
+* mount that ran before the service existed reads `speed` again.
+*/
+function createModelSelectionWatch(models, sessionId) {
+	return (listener) => {
+		let stopped = false;
+		let unsubscribeStore;
+		let timer;
+		let mode = "seek";
+		let lastKey;
+		const stopTimer = () => {
+			if (timer === void 0) return;
+			clearInterval(timer);
+			timer = void 0;
+		};
+		const changed = (current) => {
+			const next = modelSelectionKey(current);
+			if (lastKey === void 0) {
+				lastKey = next;
+				return false;
+			}
+			if (next === lastKey) return false;
+			lastKey = next;
+			return true;
+		};
+		const attach = (late) => {
+			if (stopped || mode !== "seek") return;
+			let directory;
+			try {
+				directory = models()?.directoryFor(sessionId);
+			} catch {
+				return;
+			}
+			if (directory === void 0) return;
+			const store = directory.store;
+			if (store !== void 0) {
+				mode = "store";
+				stopTimer();
+				lastKey = modelSelectionKey(store.getSnapshot().current);
+				unsubscribeStore = store.subscribe(() => {
+					if (!stopped && changed(store.getSnapshot().current)) listener();
+				});
+				if (late) listener();
+				return;
+			}
+			mode = "poll";
+			stopTimer();
+			let force = late;
+			const seed = () => {
+				directory.load().then((state) => {
+					if (stopped || mode !== "poll") return;
+					const identityChanged = changed(state.current);
+					const forced = force;
+					force = false;
+					if (identityChanged || forced) listener();
+				}, () => {});
+			};
+			seed();
+			timer = setInterval(seed, MODEL_DIRECTORY_POLL_INTERVAL_MS);
+		};
+		attach(false);
+		if (mode === "seek") timer = setInterval(() => {
+			attach(true);
+		}, MODEL_DIRECTORY_POLL_INTERVAL_MS);
+		return () => {
+			stopped = true;
+			unsubscribeStore?.();
+			stopTimer();
+		};
+	};
+}
 /** The `setSpeed` half of the inject face: boolean outcome for the component's busy state. */
 function createSpeedSetter(connection, sessionId) {
 	return (tier) => callSubscriptionsAuth(connection.rpc, "setSpeed", {
@@ -5476,20 +5678,15 @@ const TIERS = ["standard", "fast"];
 /**
 * The composer Speed control: a trigger reading `速度 · 快速`/`速度 · 标准`
 * that opens a two-row menu (standard/fast with descriptions, check mark on
-* the current tier). Mount and every open reload the host state so a model
-* switch made since the last open self-corrects.
+* the current tier). It reads `subscriptions-auth.speed` on mount, when the
+* menu opens, when {@link SpeedSelectInjected.watchModel} reports a new
+* selected model, and when {@link notifySpeedChanged} fires. Until the first
+* read succeeds, a failure is retried on
+* {@link MODEL_DIRECTORY_POLL_INTERVAL_MS}, at most
+* {@link SPEED_MOUNT_READ_ATTEMPTS} times; after that, a failed read keeps
+* the last known state.
 */
-/** How often the control re-reads the host state (model switches arrive only by asking). */
-const POLL_INTERVAL_MS = 3e3;
-/**
-* The composer Speed control: a trigger reading `速度 · 快速`/`速度 · 标准`
-* that opens a two-row menu (standard/fast with descriptions, check mark on
-* the current tier). The host pushes nothing on a model switch, so the
-* control re-reads on a slow poll with a single-flight guard; a failed read
-* keeps the last known state, so a transient RPC failure can never lock the
-* toggle away (the earlier mount-only load had no recovery path).
-*/
-function SpeedSelect({ loadSpeed, setSpeed, t }) {
+function SpeedSelect({ loadSpeed, setSpeed, watchModel, t }) {
 	const translate = t ?? fallbackTranslate$1;
 	const [state, setState] = (0, react.useState)(null);
 	const [open, setOpen] = (0, react.useState)(false);
@@ -5497,25 +5694,58 @@ function SpeedSelect({ loadSpeed, setSpeed, t }) {
 	const rootRef = (0, react.useRef)(null);
 	const loadRef = (0, react.useRef)(loadSpeed);
 	loadRef.current = loadSpeed;
+	const watchRef = (0, react.useRef)(watchModel);
+	watchRef.current = watchModel;
 	(0, react.useEffect)(() => {
 		if (loadRef.current === void 0) return;
 		let cancelled = false;
 		let inflight = false;
+		let again = false;
+		let loadedOnce = false;
+		let failures = 0;
+		let retry;
+		const stopRetry = () => {
+			if (retry === void 0) return;
+			clearInterval(retry);
+			retry = void 0;
+		};
 		const reload = () => {
 			const load = loadRef.current;
-			if (load === void 0 || inflight) return;
+			if (load === void 0) return;
+			if (inflight) {
+				again = true;
+				return;
+			}
 			inflight = true;
 			load().then((loaded) => {
-				if (!cancelled) setState(loaded);
-			}, () => {}).finally(() => {
+				if (cancelled) return;
+				loadedOnce = true;
+				stopRetry();
+				setState(loaded);
+			}, () => {
+				failures += 1;
+				if (failures >= SPEED_MOUNT_READ_ATTEMPTS) stopRetry();
+			}).finally(() => {
 				inflight = false;
+				if (cancelled || !again) return;
+				again = false;
+				reload();
 			});
 		};
 		reload();
-		const timer = setInterval(reload, POLL_INTERVAL_MS);
+		retry = setInterval(() => {
+			if (!loadedOnce) reload();
+		}, MODEL_DIRECTORY_POLL_INTERVAL_MS);
+		const unsubscribe = watchRef.current?.(reload);
+		const onSpeedChanged = () => {
+			reload();
+		};
+		window.addEventListener(SPEED_CHANGED_EVENT, onSpeedChanged);
 		return () => {
 			cancelled = true;
-			clearInterval(timer);
+			unsubscribe?.();
+			stopRetry();
+			window.removeEventListener(SPEED_CHANGED_EVENT, onSpeedChanged);
 		};
 	}, []);
 	(0, react.useEffect)(() => {
@@ -5711,7 +5941,7 @@ const PROVIDER_NAMES = {
 	"cursor-subscription": "Cursor",
 	"opencode-go": "OpenCode Go",
 	"kimi-coding": "Kimi Code",
-	"minimax": "MiniMax",
+	minimax: "MiniMax",
 	"minimax-cn": "MiniMax CN",
 	"ollama-cloud": "Ollama Cloud"
 };
@@ -5946,6 +6176,8 @@ function usageWindowLabel(t, window$1) {
 * every provider's accounts and their windows. Returns null when no data is
 * available.
 */
+const STATS_ROW_SELECTOR = markerSelector(HOST_CONTRACT.markers.composerStats.row);
+const STATS_DOCK_SELECTOR = markerSelector(HOST_CONTRACT.markers.composerStats.dock);
 function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs }) {
 	const translate = t ?? fallbackTranslate;
 	const [displays, setDisplays] = (0, react.useState)([]);
@@ -6105,15 +6337,18 @@ function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs }) {
 		if (seat$1 === null) return;
 		const scope = statsScopeOf(seat$1);
 		if (scope === null) return;
-		const find = () => scope.querySelector("[data-composer-stats]");
-		setStatsRow(find());
-		const observer = new MutationObserver(() => {
-			setStatsRow(find());
-		});
+		const find = () => scope.querySelector(STATS_ROW_SELECTOR);
+		const settle = () => {
+			const row = find();
+			setStatsRow(row);
+			if (row === null && scope.querySelector(STATS_DOCK_SELECTOR) !== null) observer.disconnect();
+		};
+		const observer = new MutationObserver(settle);
 		observer.observe(scope, {
 			childList: true,
 			subtree: true
 		});
+		settle();
 		return () => {
 			observer.disconnect();
 		};
@@ -6237,15 +6472,19 @@ function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs }) {
 	});
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [seat, statsRow !== null && statsRow.isConnected ? (0, react_dom.createPortal)(pill, statsRow) : pill] });
 }
+/** How far statsScopeOf walks looking for `composerStats.row`. */
+const LEGACY_STATS_SCOPE_DEPTH = 4;
 /**
-* Nearest ancestor of the dock seat that can contain the host's stats row:
-* the composer bar. Bounded so a badge in an unfamiliar layout never adopts
-* some other composer's pills.
+* Scope for the legacy stats row. The nearest ancestor within
+* LEGACY_STATS_SCOPE_DEPTH that contains `composerStats.row`, so a badge
+* does not adopt another composer's pills. When none does, the seat's
+* parent: the slot outlet, which holds sibling `composerStats.dock` anchors
+* on hosts whose pills are dock entries.
 */
 function statsScopeOf(seat) {
 	let node = seat.parentElement;
-	for (let depth = 0; node !== null && depth < 4; depth++) {
-		if (node.querySelector("[data-composer-stats]") !== null) return node;
+	for (let depth = 0; node !== null && depth < LEGACY_STATS_SCOPE_DEPTH; depth++) {
+		if (node.querySelector(STATS_ROW_SELECTOR) !== null) return node;
 		node = node.parentElement;
 	}
 	return seat.parentElement;
@@ -6260,10 +6499,10 @@ function AccountMeta({ account, translate }) {
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 		style: styles.providerMeta,
 		title: account.account,
-		children: [account.isDefault && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+		children: [account.isDefault && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 			style: styles.defaultStar,
 			"aria-label": "default",
-			children: "★ "
+			children: ["★", " "]
 		}), parts.join(" · ")]
 	});
 }
@@ -6545,7 +6784,8 @@ function apply(ctx) {
 		locale: NS,
 		inject: (sessionId) => ({
 			loadSpeed: createSpeedLoader(connection, models, sessionId),
-			setSpeed: createSpeedSetter(connection, sessionId)
+			setSpeed: createSpeedSetter(connection, sessionId),
+			watchModel: createModelSelectionWatch(models, sessionId)
 		})
 	}, SpeedSelect));
 	ctx.slots.inject("conversation.composer.dock", () => ctx.slots.register({
@@ -6583,7 +6823,7 @@ function apply(ctx) {
 					}));
 				},
 				onSelect: async (option, session) => {
-					await createSpeedSetter(connection, session.sessionId)(option.id);
+					if (await createSpeedSetter(connection, session.sessionId)(option.id)) notifySpeedChanged();
 				}
 			}
 		}), "dsh-subscriptions: /fast contribution");