dsh-subscriptions 0.2.2 → 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",
@@ -113,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",
@@ -211,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",
@@ -296,7 +302,7 @@ const zh = {
 	accountsCatalogUnavailable: "暂时无法获取模型目录，已保存的模型选择会被保留。",
 	modelsPartialSave: "部分推理档已保存，其余更改仍保留在草稿中，请重试完成保存。",
 	modelsEdit: "编辑模型列表",
-	modelsHint: "在此配置模型显示、默认推理档、上下文与工具，底部的「保存更改」会连同账号设置一起提交。隐藏模型不影响已有会话；工具开关对新建会话生效。",
+	modelsHint: "在此配置模型显示、默认推理档、子代理速度、上下文与工具，底部的「保存更改」会连同账号设置一起提交。隐藏模型不影响已有会话；工具开关对新建会话生效。",
 	modelsAutomatic: "自动显示全部模型（包含以后新增的模型）",
 	modelsSelectAll: "全选",
 	modelsSelectNone: "清空选择",
@@ -304,6 +310,8 @@ const zh = {
 	modelsContextBounds: "默认 {default} · 最大 {max}",
 	modelsContextHint: "留空跟随服务商。配置值按账号返回的最大窗口限制；账号池取各成员的最小窗口。此设置控制本地历史保留和压缩时机，不会扩大 API 本身的容量。",
 	modelsContextInvalid: "请为 {model} 输入正整数 token 数。",
+	modelsSubagentSpeed: "子代理默认速度",
+	modelsSubagentSpeedHint: "对使用此模型的子代理后续请求生效，与父会话模型无关。主会话仍使用自己的速度设置；快速档仅在模型支持时生效。",
 	modelsTools: "Provider 工具",
 	modelsToolsHint: "仅对保存后新建的会话生效，已有会话保留原工具。任一支持的服务商启用共享工具时，该工具仍会显示。",
 	modelsImage: "图片生成",
@@ -353,6 +361,7 @@ const zh = {
 	usageRefresh: "刷新",
 	usageLoading: "用量加载中…",
 	usageEmpty: "服务商未返回任何用量窗口。",
+	usageNoVisibleModels: "选择器中的可见模型没有任何用量窗口。",
 	usageUnsupported: "该端点不提供用量查询。",
 	usageError: "用量查询失败：{message}",
 	usageSession: "5 小时窗口",
@@ -451,6 +460,9 @@ const zh = {
 	modelDefaultsSummaryEmpty: "没有模型声明推理档",
 	modelDefaultsFilterPlaceholder: "筛选模型",
 	modelDefaultsFilterEmpty: "没有匹配「{query}」的模型。",
+	modelDefaultsNoModels: "这个服务商没有报告任何模型。",
+	modelDefaultsNoAccount: "还没有连接账号。请先在卡片上连接一个账号。",
+	modelDefaultsDiscoveryFailed: "模型列表发现失败或超时。可以点「刷新」重试。",
 	generating: "正在生成图片…",
 	image: "图片",
 	viewImage: "查看图片",
@@ -527,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
 /**
@@ -610,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. */
@@ -711,12 +773,18 @@ const ProviderModelEditor = (0, react.forwardRef)(function ProviderModelEditor$1
 	]);
 	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,
@@ -756,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,
@@ -781,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", {
@@ -808,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",
@@ -823,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: {
@@ -4452,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));
@@ -4534,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,
@@ -4605,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({
@@ -4697,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", {
@@ -5537,22 +5646,17 @@ 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
-		};
-		let current;
-		try {
+		let current = null;
+		if (directories !== void 0) try {
 			current = (await directories.directoryFor(sessionId).load()).current;
 		} catch (error) {
 			if (!modelSelectionUnavailable(error)) throw error;
-			return {
-				visible: false,
-				tier: state.tier
-			};
 		}
+		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