dsh-subscriptions 0.2.0 → 0.2.3

package/lib/client.js

@@ -56,7 +56,7 @@ const en = {
 	accountsCatalogUnavailable: "Model discovery is currently unavailable. Saved model selections are preserved.",
 	modelsPartialSave: "Some reasoning defaults were saved. Remaining changes are still in the draft; retry to finish.",
 	modelsEdit: "Edit model list",
-	modelsHint: "Configure model visibility, default reasoning effort, context and tools here; Save changes below submits them together with the account settings. Hidden models remain usable by existing sessions; tool changes apply to new sessions.",
+	modelsHint: "Configure model visibility, default reasoning effort, subagent speed, context and tools here; Save changes below submits them together with the account settings. Hidden models remain usable by existing sessions; tool changes apply to new sessions.",
 	modelsAutomatic: "Automatically show all models, including new models",
 	modelsSelectAll: "Select all",
 	modelsSelectNone: "Clear selection",
@@ -64,6 +64,8 @@ const en = {
 	modelsContextBounds: "Default {default} · Maximum {max}",
 	modelsContextHint: "Leave blank to follow the provider. The requested window is capped by the account’s advertised maximum; account pools use the smallest member window. This controls local history and compaction, not the API’s capacity.",
 	modelsContextInvalid: "Enter a positive whole number of tokens for {model}.",
+	modelsSubagentSpeed: "Subagent default speed",
+	modelsSubagentSpeedHint: "Applies to subsequent subagent requests using this model, regardless of the parent model. Main conversations keep their own Speed setting. Fast requires model support.",
 	modelsTools: "Provider tools",
 	modelsToolsHint: "Changes apply only to sessions created after saving. Existing sessions keep their tools. Shared tools remain available if any supporting provider is enabled.",
 	modelsImage: "Image generation",
@@ -72,6 +74,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.",
@@ -108,6 +115,7 @@ const en = {
 	usageRefresh: "Refresh",
 	usageLoading: "Loading usage…",
 	usageEmpty: "No usage windows reported.",
+	usageNoVisibleModels: "No usage windows for the models visible in the picker.",
 	usageUnsupported: "This endpoint has no usage surface.",
 	usageError: "Usage lookup failed: {message}",
 	usageSession: "5-hour window",
@@ -206,6 +214,9 @@ const en = {
 	modelDefaultsSummaryEmpty: "No model advertises reasoning levels",
 	modelDefaultsFilterPlaceholder: "Filter models",
 	modelDefaultsFilterEmpty: "No model matches “{query}”.",
+	modelDefaultsNoModels: "This provider reports no models.",
+	modelDefaultsNoAccount: "No connected accounts. Connect one on the provider card first.",
+	modelDefaultsDiscoveryFailed: "Model discovery failed or timed out. Use Refresh to try again.",
 	generating: "Generating image…",
 	image: "image",
 	viewImage: "View image",
@@ -291,7 +302,7 @@ const zh = {
 	accountsCatalogUnavailable: "暂时无法获取模型目录，已保存的模型选择会被保留。",
 	modelsPartialSave: "部分推理档已保存，其余更改仍保留在草稿中，请重试完成保存。",
 	modelsEdit: "编辑模型列表",
-	modelsHint: "在此配置模型显示、默认推理档、上下文与工具，底部的「保存更改」会连同账号设置一起提交。隐藏模型不影响已有会话；工具开关对新建会话生效。",
+	modelsHint: "在此配置模型显示、默认推理档、子代理速度、上下文与工具，底部的「保存更改」会连同账号设置一起提交。隐藏模型不影响已有会话；工具开关对新建会话生效。",
 	modelsAutomatic: "自动显示全部模型（包含以后新增的模型）",
 	modelsSelectAll: "全选",
 	modelsSelectNone: "清空选择",
@@ -299,6 +310,8 @@ const zh = {
 	modelsContextBounds: "默认 {default} · 最大 {max}",
 	modelsContextHint: "留空跟随服务商。配置值按账号返回的最大窗口限制；账号池取各成员的最小窗口。此设置控制本地历史保留和压缩时机，不会扩大 API 本身的容量。",
 	modelsContextInvalid: "请为 {model} 输入正整数 token 数。",
+	modelsSubagentSpeed: "子代理默认速度",
+	modelsSubagentSpeedHint: "对使用此模型的子代理后续请求生效，与父会话模型无关。主会话仍使用自己的速度设置；快速档仅在模型支持时生效。",
 	modelsTools: "Provider 工具",
 	modelsToolsHint: "仅对保存后新建的会话生效，已有会话保留原工具。任一支持的服务商启用共享工具时，该工具仍会显示。",
 	modelsImage: "图片生成",
@@ -307,6 +320,11 @@ const zh = {
 	modelsWebSearch: "网页搜索",
 	modelsSave: "保存更改",
 	modelsUnavailable: "当前不可用",
+	claudeCacheTtl: "提示词缓存时长",
+	claudeCacheTtlFollowConfig: "跟随配置",
+	claudeCacheTtl5m: "5 分钟",
+	claudeCacheTtl1h: "1 小时",
+	claudeCacheTtlHint: "覆盖此 Claude 路由的 claudePromptCacheTtl 配置；选择「跟随配置」时使用配置值。保存后自下一次请求生效。1 小时可更久保留缓存前缀，但写入按更高的输入价格计费；压缩与会话标题请求仍为 5 分钟。",
 	nav: "订阅",
 	intro: "在此登录或退出订阅服务商。点击登录会在新标签页打开服务商的授权页面；无浏览器环境可改为粘贴回调 URL 或授权码。",
 	unavailable: "连接不可用，无法加载订阅状态。",
@@ -343,6 +361,7 @@ const zh = {
 	usageRefresh: "刷新",
 	usageLoading: "用量加载中…",
 	usageEmpty: "服务商未返回任何用量窗口。",
+	usageNoVisibleModels: "选择器中的可见模型没有任何用量窗口。",
 	usageUnsupported: "该端点不提供用量查询。",
 	usageError: "用量查询失败：{message}",
 	usageSession: "5 小时窗口",
@@ -441,6 +460,9 @@ const zh = {
 	modelDefaultsSummaryEmpty: "没有模型声明推理档",
 	modelDefaultsFilterPlaceholder: "筛选模型",
 	modelDefaultsFilterEmpty: "没有匹配「{query}」的模型。",
+	modelDefaultsNoModels: "这个服务商没有报告任何模型。",
+	modelDefaultsNoAccount: "还没有连接账号。请先在卡片上连接一个账号。",
+	modelDefaultsDiscoveryFailed: "模型列表发现失败或超时。可以点「刷新」重试。",
 	generating: "正在生成图片…",
 	image: "图片",
 	viewImage: "查看图片",
@@ -517,6 +539,19 @@ function resetActionBlock(usage, now = Date.now()) {
 	if (!usage.resetCredits.some((c) => c.id && (c.expiresAt === void 0 || c.expiresAt > now))) return "resetUseRefresh";
 }
 
+//#endregion
+//#region src/client/usage-window-filter.ts
+/**
+* Keep model-scoped Google quotas aligned with the saved model-picker selection.
+* Account-wide windows and other providers are unaffected; an absent selection
+* follows discovery, while an empty selection hides every model-scoped window.
+*/
+function visibleUsageWindows(provider, windows, visibleModels) {
+	if (windows === void 0) return [];
+	if (provider !== "antigravity" || visibleModels === void 0) return windows;
+	return windows.filter((window$1) => !window$1.scope || visibleModels.includes(window$1.scope));
+}
+
 //#endregion
 //#region src/client/subscriptions-rpc.ts
 /**
@@ -576,6 +611,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 {
@@ -587,6 +635,43 @@ function mergeAccountChanges(latest, changes) {
 	};
 }
 
+//#endregion
+//#region src/client/model-filter.ts
+/** Distinguish an empty provider from a query that filtered out every row. */
+function modelListState(total, matched) {
+	if (total === 0) return "provider-empty";
+	return matched === 0 ? "filter-empty" : "rows";
+}
+/**
+* Retain saved model ids when discovery returns no rows. A temporary catalog
+* failure must not hide the visibility or subagent-speed settings they edit.
+*/
+function savedModelIds(visibleModels, subagentSpeeds) {
+	return [...new Set([...visibleModels ?? [], ...Object.keys(subagentSpeeds ?? {})])];
+}
+/**
+* Use account discovery evidence to explain an empty provider. Connected
+* accounts with failed discovery need a retry, not another login prompt.
+*/
+function modelEditorNotice(accounts) {
+	if (accounts === void 0) return "noModels";
+	if (accounts.length === 0) return "noAccount";
+	return accounts.every((account) => account.unavailable === true) ? "discoveryFailed" : "noModels";
+}
+/** Locale keys for the three empty states. */
+const NOTICE_KEYS = {
+	noAccount: "modelDefaultsNoAccount",
+	discoveryFailed: "modelDefaultsDiscoveryFailed",
+	noModels: "modelDefaultsNoModels"
+};
+/** Combine discovered and saved rows, filter results, and discovery evidence. */
+function modelEditorState(input) {
+	return {
+		listState: modelListState(input.discovered + input.saved, input.matched),
+		noticeKey: NOTICE_KEYS[modelEditorNotice(input.accounts)]
+	};
+}
+
 //#endregion
 //#region src/client/ProviderModelEditor.tsx
 /** Providers whose runtime honours a local context-window override. */
@@ -683,16 +768,23 @@ 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));
-	const missing = (draft.visibleModels ?? []).filter((id) => !known.has(id)).map((id) => ({
+	const missing = savedModelIds(draft.visibleModels, draft.subagentSpeeds).filter((id) => !known.has(id)).map((id) => ({
 		id,
 		name: id
 	}));
 	const models = [...allModels, ...missing].filter((model) => `${model.name} ${model.id}`.toLowerCase().includes(query.trim().toLowerCase()));
-	const selected = new Set(draft.visibleModels ?? allModels.map((model) => model.id));
+	const editorState = modelEditorState({
+		discovered: allModels.length,
+		saved: missing.length,
+		matched: models.length,
+		accounts: catalog?.accounts
+	});
+	const selected = new Set(draft.visibleModels ?? [...allModels, ...missing].map((model) => model.id));
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		style: {
 			borderTop: border$2,
@@ -732,7 +824,7 @@ const ProviderModelEditor = (0, react.forwardRef)(function ProviderModelEditor$1
 						children: t("modelDefaultsLoading")
 					})]
 				}),
-				catalog && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("fieldset", {
+				!busy && catalog && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("fieldset", {
 					disabled: busy || disabled,
 					style: {
 						border: 0,
@@ -757,7 +849,10 @@ const ProviderModelEditor = (0, react.forwardRef)(function ProviderModelEditor$1
 							" ",
 							t("modelsAutomatic")
 						] }),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						editorState.listState === "provider-empty" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							className: "dsh-subscription-hint",
+							children: t(editorState.noticeKey)
+						}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							style: actions$2,
 							children: [
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
@@ -784,8 +879,7 @@ const ProviderModelEditor = (0, react.forwardRef)(function ProviderModelEditor$1
 									children: t("modelsSelectNone")
 								})
 							]
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							style: {
 								maxHeight: 360,
 								overflowY: "auto",
@@ -799,87 +893,118 @@ const ProviderModelEditor = (0, react.forwardRef)(function ProviderModelEditor$1
 									display: "grid",
 									gap: 8
 								},
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
-									style: { overflowWrap: "anywhere" },
-									children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-											type: "checkbox",
-											checked: selected.has(model.id),
-											onChange: (event) => {
-												const next = new Set(selected);
-												if (event.target.checked) next.add(model.id);
-												else next.delete(model.id);
-												edit({
-													...draft,
-													visibleModels: [...next]
-												});
-											}
-										}),
-										" ",
-										model.name,
-										!known.has(model.id) && ` (${t("modelsUnavailable")})`
-									]
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									style: actions$2,
-									children: [(model.efforts?.length ?? 0) > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
-										style: actions$2,
-										children: [t("modelDefaultsTitle"), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
-											"aria-label": `${model.name} ${t("modelDefaultsTitle")}`,
-											value: efforts[model.id] ?? "",
-											onChange: (event) => {
-												setEfforts({
-													...efforts,
-													[model.id]: event.target.value
-												});
-												setDirty(true);
-											},
-											children: [
-												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-													value: "",
-													children: t("modelDefaultsFollowProvider")
-												}),
-												model.configured && !model.efforts?.some((effort) => effort.id === model.configured) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
-													value: model.configured,
-													disabled: true,
-													children: [
-														model.configured,
-														" (",
-														t("modelsUnavailable"),
-														")"
-													]
-												}),
-												model.efforts?.map((effort) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-													value: effort.id,
-													children: effort.name
-												}, effort.id))
-											]
-										})]
-									}), supportsContext(provider) && model.maxContextWindow !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+										style: { overflowWrap: "anywhere" },
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+												type: "checkbox",
+												checked: selected.has(model.id),
+												onChange: (event) => {
+													const next = new Set(selected);
+													if (event.target.checked) next.add(model.id);
+													else next.delete(model.id);
+													edit({
+														...draft,
+														visibleModels: [...next]
+													});
+												}
+											}),
+											" ",
+											model.name,
+											!known.has(model.id) && ` (${t("modelsUnavailable")})`
+										]
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 										style: actions$2,
-										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+										children: [(model.efforts?.length ?? 0) > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
 											style: actions$2,
-											children: [t("modelsContext"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-												style: { width: 140 },
-												inputMode: "numeric",
-												value: contexts[model.id] ?? "",
-												"aria-label": `${model.name} ${t("modelsContext")}`,
-												placeholder: String(model.defaultContextWindow),
+											children: [t("modelDefaultsTitle"), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+												"aria-label": `${model.name} ${t("modelDefaultsTitle")}`,
+												value: efforts[model.id] ?? "",
 												onChange: (event) => {
-													setContexts({
-														...contexts,
+													setEfforts({
+														...efforts,
 														[model.id]: event.target.value
 													});
 													setDirty(true);
-												}
+												},
+												children: [
+													/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+														value: "",
+														children: t("modelDefaultsFollowProvider")
+													}),
+													model.configured && !model.efforts?.some((effort) => effort.id === model.configured) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
+														value: model.configured,
+														disabled: true,
+														children: [
+															model.configured,
+															" (",
+															t("modelsUnavailable"),
+															")"
+														]
+													}),
+													model.efforts?.map((effort) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+														value: effort.id,
+														children: effort.name
+													}, effort.id))
+												]
 											})]
-										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", { children: t("modelsContextBounds", {
-											default: model.defaultContextWindow,
-											max: model.maxContextWindow
-										}) })]
-									})]
-								})]
+										}), supportsContext(provider) && model.maxContextWindow !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											style: actions$2,
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+												style: actions$2,
+												children: [t("modelsContext"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+													style: { width: 140 },
+													inputMode: "numeric",
+													value: contexts[model.id] ?? "",
+													"aria-label": `${model.name} ${t("modelsContext")}`,
+													placeholder: String(model.defaultContextWindow),
+													onChange: (event) => {
+														setContexts({
+															...contexts,
+															[model.id]: event.target.value
+														});
+														setDirty(true);
+													}
+												})]
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", { children: t("modelsContextBounds", {
+												default: model.defaultContextWindow,
+												max: model.maxContextWindow
+											}) })]
+										})]
+									}),
+									provider === "codex" && (model.fastTier === true || Object.hasOwn(draft.subagentSpeeds ?? {}, model.id)) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										style: {
+											display: "grid",
+											gap: 6
+										},
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+											style: actions$2,
+											children: [t("modelsSubagentSpeed"), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+												"aria-label": `${model.name} ${t("modelsSubagentSpeed")}`,
+												value: Object.hasOwn(draft.subagentSpeeds ?? {}, model.id) ? draft.subagentSpeeds[model.id] : "standard",
+												onChange: (event) => edit({
+													...draft,
+													subagentSpeeds: {
+														...draft.subagentSpeeds,
+														[model.id]: event.target.value
+													}
+												}),
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+													value: "standard",
+													children: t("speedStandard")
+												}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
+													value: "fast",
+													disabled: !model.fastTier,
+													children: [t("speedFast"), !model.fastTier && ` (${t("modelsUnavailable")})`]
+												})]
+											})]
+										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", { children: t("modelsSubagentSpeedHint") })]
+									})
+								]
 							}, model.id)), models.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("modelDefaultsFilterEmpty", { query }) })]
-						}),
+						})] }),
 						supportsContext(provider) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", { children: t("modelsContextHint") }),
 						catalog.tools.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							style: {
@@ -1149,6 +1274,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 +1295,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 +1347,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 +1523,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 +1616,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 +1688,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 +3766,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 +3917,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 +4246,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 +4408,8 @@ function SubscriptionsSection(props) {
 		rpc,
 		t,
 		setProviderError,
-		startPolling
+		startPolling,
+		refresh
 	]);
 	const cancel = (0, react.useCallback)(async (provider) => {
 		if (rpc === void 0) return;
@@ -4369,6 +4553,7 @@ function SubscriptionsSection(props) {
 						accounts.map((account) => {
 							const usageKey = `${id}:${account.key}`;
 							const usage = usages[usageKey];
+							const shownWindows = visibleUsageWindows(id, usage?.windows, status?.visibleModels);
 							const usageError = usageErrors[usageKey];
 							const display = account.account ?? account.key;
 							const sortedCredits = [...usage?.resetCredits ?? []].sort((a, b) => (a.expiresAt ?? Infinity) - (b.expiresAt ?? Infinity));
@@ -4451,7 +4636,11 @@ function SubscriptionsSection(props) {
 											style: styles$5.statusLine,
 											children: t("usageEmpty")
 										}),
-										(usage?.windows ?? []).map((window$1, index) => {
+										usage?.windows !== void 0 && usage.windows.length > 0 && shownWindows.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											style: styles$5.statusLine,
+											children: t("usageNoVisibleModels")
+										}),
+										shownWindows.map((window$1, index) => {
 											const percent = displayUsedPercent(window$1.usedPercent);
 											return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 												style: styles$5.usageRow,
@@ -4522,7 +4711,7 @@ function SubscriptionsSection(props) {
 									},
 									children: t("addAccount")
 								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								!busy && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",
 									"aria-haspopup": "dialog",
 									onClick: () => setManagedProvider({
@@ -4614,7 +4803,10 @@ function SubscriptionsSection(props) {
 				name: managedProvider.name,
 				rpc,
 				t,
-				onClose: () => setManagedProvider(void 0)
+				onClose: () => {
+					setManagedProvider(void 0);
+					refresh();
+				}
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: ".subscriptions-reset-dialog::backdrop { background: var(--dsw-alias-bg-mask-1, #0006); backdrop-filter: var(--dsw-mask-blur, none); }" }),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dialog", {
@@ -4972,7 +5164,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 +5218,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 +5632,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.
@@ -5448,19 +5646,127 @@ function VideoGenerateToolview(props) {
 */
 function createSpeedLoader(connection, models, sessionId) {
 	return async () => {
-		const state = await callSubscriptionsAuth(connection.rpc, "speed", { sessionId });
 		const directories = models();
-		if (directories === void 0) return {
-			visible: false,
-			tier: state.tier
-		};
-		const { current } = await directories.directoryFor(sessionId).load();
+		let current = null;
+		if (directories !== void 0) try {
+			current = (await directories.directoryFor(sessionId).load()).current;
+		} catch (error) {
+			if (!modelSelectionUnavailable(error)) throw error;
+		}
+		const state = await callSubscriptionsAuth(connection.rpc, "speed", {
+			sessionId,
+			...current?.provider === "codex" ? { model: current.model } : {}
+		});
 		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 +5782,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.
-*/
-/** 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).
+* 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.
 */
-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 +5798,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 +6045,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 +6280,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 +6441,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 +6576,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 +6603,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 +6888,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 +6927,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");