dsh-subscriptions 0.2.2 → 0.3.0

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",
@@ -180,22 +183,6 @@ const en = {
 	externalUsageApiKey: "API key",
 	externalUsageConfigure: "No API key found at {ref}. Add one in Settings → Models.",
 	externalUsageUnavailable: "Usage status unavailable: {message}",
-	cursorTitle: "Cursor",
-	cursorOpenLogin: "Open Cursor sign-in",
-	cursorWaiting: "Waiting for Cursor sign-in…",
-	cursorConnected: "Connected",
-	cursorManageTitle: "Manage Cursor",
-	cursorManageSignIn: "Sign in to see the models available to this Cursor account.",
-	cursorAccountsHint: "Cursor uses one connected account. Choose which of its models appear in the model picker.",
-	cursorManageHint: "Choose model visibility here. Refresh fetches the current models from Cursor; Save changes updates the model picker.",
-	cursorFilterModels: "Filter models",
-	cursorModelsLoading: "Loading Cursor models…",
-	cursorModelsError: "Could not load Cursor models: {message}",
-	cursorModelsCount: "{count} models available",
-	cursorIncluded: "Included usage",
-	cursorModels: "Cursor Models",
-	cursorOtherModels: "Other Models",
-	cursorIncludedRequests: "Included requests",
 	modelDefaultsTitle: "Default reasoning effort",
 	modelDefaultsHint: "The model picker preselects this level when you switch to the model; models without levels always follow the provider.",
 	modelDefaultsFollowProvider: "Follow provider",
@@ -211,6 +198,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 +286,7 @@ const zh = {
 	accountsCatalogUnavailable: "暂时无法获取模型目录，已保存的模型选择会被保留。",
 	modelsPartialSave: "部分推理档已保存，其余更改仍保留在草稿中，请重试完成保存。",
 	modelsEdit: "编辑模型列表",
-	modelsHint: "在此配置模型显示、默认推理档、上下文与工具，底部的「保存更改」会连同账号设置一起提交。隐藏模型不影响已有会话；工具开关对新建会话生效。",
+	modelsHint: "在此配置模型显示、默认推理档、子代理速度、上下文与工具，底部的「保存更改」会连同账号设置一起提交。隐藏模型不影响已有会话；工具开关对新建会话生效。",
 	modelsAutomatic: "自动显示全部模型（包含以后新增的模型）",
 	modelsSelectAll: "全选",
 	modelsSelectNone: "清空选择",
@@ -304,6 +294,8 @@ const zh = {
 	modelsContextBounds: "默认 {default} · 最大 {max}",
 	modelsContextHint: "留空跟随服务商。配置值按账号返回的最大窗口限制；账号池取各成员的最小窗口。此设置控制本地历史保留和压缩时机，不会扩大 API 本身的容量。",
 	modelsContextInvalid: "请为 {model} 输入正整数 token 数。",
+	modelsSubagentSpeed: "子代理默认速度",
+	modelsSubagentSpeedHint: "对使用此模型的子代理后续请求生效，与父会话模型无关。主会话仍使用自己的速度设置；快速档仅在模型支持时生效。",
 	modelsTools: "Provider 工具",
 	modelsToolsHint: "仅对保存后新建的会话生效，已有会话保留原工具。任一支持的服务商启用共享工具时，该工具仍会显示。",
 	modelsImage: "图片生成",
@@ -353,6 +345,7 @@ const zh = {
 	usageRefresh: "刷新",
 	usageLoading: "用量加载中…",
 	usageEmpty: "服务商未返回任何用量窗口。",
+	usageNoVisibleModels: "选择器中的可见模型没有任何用量窗口。",
 	usageUnsupported: "该端点不提供用量查询。",
 	usageError: "用量查询失败：{message}",
 	usageSession: "5 小时窗口",
@@ -420,22 +413,6 @@ const zh = {
 	externalUsageApiKey: "API 密钥",
 	externalUsageConfigure: "未在 {ref} 找到 API 密钥。请在「设置 → 模型」中添加。",
 	externalUsageUnavailable: "无法获取用量状态：{message}",
-	cursorTitle: "Cursor",
-	cursorOpenLogin: "打开 Cursor 登录页面",
-	cursorWaiting: "等待 Cursor 登录…",
-	cursorConnected: "已连接",
-	cursorManageTitle: "管理 Cursor",
-	cursorManageSignIn: "登录后可查看此 Cursor 账号可用的模型。",
-	cursorAccountsHint: "Cursor 使用一个已连接账号。可在此选择模型选择器中显示的模型。",
-	cursorManageHint: "在此选择模型是否显示。刷新可从 Cursor 获取当前模型；保存更改后更新模型选择器。",
-	cursorFilterModels: "筛选模型",
-	cursorModelsLoading: "正在加载 Cursor 模型…",
-	cursorModelsError: "无法加载 Cursor 模型：{message}",
-	cursorModelsCount: "可用模型：{count} 个",
-	cursorIncluded: "套餐内用量",
-	cursorModels: "Cursor 模型",
-	cursorOtherModels: "其他模型",
-	cursorIncludedRequests: "套餐内请求",
 	modelDefaultsTitle: "默认推理档",
 	modelDefaultsHint: "切换到该模型时，模型选择器会预选此档位；没有推理档的模型始终跟随服务商默认。",
 	modelDefaultsFollowProvider: "跟随服务商",
@@ -451,6 +428,9 @@ const zh = {
 	modelDefaultsSummaryEmpty: "没有模型声明推理档",
 	modelDefaultsFilterPlaceholder: "筛选模型",
 	modelDefaultsFilterEmpty: "没有匹配「{query}」的模型。",
+	modelDefaultsNoModels: "这个服务商没有报告任何模型。",
+	modelDefaultsNoAccount: "还没有连接账号。请先在卡片上连接一个账号。",
+	modelDefaultsDiscoveryFailed: "模型列表发现失败或超时。可以点「刷新」重试。",
 	generating: "正在生成图片…",
 	image: "图片",
 	viewImage: "查看图片",
@@ -527,6 +507,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 +603,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. */
@@ -655,7 +685,7 @@ const ProviderModelEditor = (0, react.forwardRef)(function ProviderModelEditor$1
 		setBusy(true);
 		setError("");
 		try {
-			const data = await callSubscriptionsAuth(rpc, provider === "cursor-subscription" ? "cursorSettings" : "providerSettings", {
+			const data = await callSubscriptionsAuth(rpc, "providerSettings", {
 				provider,
 				force
 			});
@@ -711,12 +741,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,
@@ -735,7 +771,7 @@ const ProviderModelEditor = (0, react.forwardRef)(function ProviderModelEditor$1
 			children: [
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 					className: "dsh-subscription-hint",
-					children: t(provider === "cursor-subscription" ? "cursorManageHint" : "modelsHint")
+					children: t("modelsHint")
 				}),
 				error && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 					role: "alert",
@@ -756,7 +792,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 +817,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 +847,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 +861,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: {
@@ -1193,7 +1262,7 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 		let current = true;
 		setLoading(true);
 		setError("");
-		callSubscriptionsAuth(rpc, provider === "cursor-subscription" ? "cursorSettings" : "providerSettings", { provider }).then((data) => {
+		callSubscriptionsAuth(rpc, "providerSettings", { provider }).then((data) => {
 			if (current) {
 				setCatalog(data);
 				setTtlDraft(data.settings.promptCacheTtl);
@@ -1232,7 +1301,7 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 		setSaveError("");
 		let savedEfforts = 0;
 		try {
-			if (provider !== "cursor-subscription") for (const { model, effort } of models.efforts) {
+			for (const { model, effort } of models.efforts) {
 				await callSubscriptionsAuth(rpc, "setModelDefault", {
 					provider,
 					model,
@@ -1241,18 +1310,17 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 				savedEfforts++;
 				if (!alive.current) return;
 			}
-			const latest = await callSubscriptionsAuth(rpc, provider === "cursor-subscription" ? "cursorSettings" : "providerSettings", { provider });
+			const latest = await callSubscriptionsAuth(rpc, "providerSettings", { provider });
 			if (!alive.current) return;
-			if (provider === "cursor-subscription") await callSubscriptionsAuth(rpc, "cursorSetSettings", { settings: models.settings ?? latest.settings });
-			else await callSubscriptionsAuth(rpc, "setProviderSettings", {
+			await callSubscriptionsAuth(rpc, "setProviderSettings", {
 				provider,
 				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) {
 			if (alive.current) {
-				const message$3 = error$1 instanceof Error ? error$1.message : String(error$1);
-				setSaveError((savedEfforts ? t("modelsPartialSave") + " " : "") + t("accountsSaveFailed", { message: message$3 }));
+				const message$2 = error$1 instanceof Error ? error$1.message : String(error$1);
+				setSaveError((savedEfforts ? t("modelsPartialSave") + " " : "") + t("accountsSaveFailed", { message: message$2 }));
 			}
 		} finally {
 			saveLock.current = false;
@@ -1300,7 +1368,7 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 					id: description,
 					className: "dsh-subscription-hint",
-					children: t(provider === "cursor-subscription" ? "cursorAccountsHint" : "accountsHint")
+					children: t("accountsHint")
 				}),
 				error && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 					role: "alert",
@@ -1324,190 +1392,173 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 						margin: 0,
 						padding: 0
 					},
-					children: [
-						catalog.accounts.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-							className: "dsh-subscription-hint",
-							children: t(provider === "cursor-subscription" ? "cursorManageSignIn" : "accountsEmpty")
-						}),
-						provider === "cursor-subscription" && catalog.accounts.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("fieldset", {
+					children: [catalog.accounts.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						className: "dsh-subscription-hint",
+						children: t("accountsEmpty")
+					}), catalog.accounts.map((account) => {
+						const preferences = changes[account.key] ?? catalog.settings.accounts?.[account.key] ?? {};
+						const selected = accountPoolSelection(preferences, account.models);
+						const models = accountModelRows(account, preferences);
+						return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("fieldset", {
 							style: {
+								...stack$1,
 								border: border$1,
 								borderRadius: "var(--dsw-radius-lg, 12px)",
-								padding: 14
+								padding: 14,
+								margin: 0
 							},
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("legend", {
-								style: { padding: "0 6px" },
-								children: name
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "dsh-subscription-hint",
-								children: t("cursorConnected")
-							})]
-						}),
-						provider !== "cursor-subscription" && catalog.accounts.map((account) => {
-							const preferences = changes[account.key] ?? catalog.settings.accounts?.[account.key] ?? {};
-							const selected = accountPoolSelection(preferences, account.models);
-							const models = accountModelRows(account, preferences);
-							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("fieldset", {
-								style: {
-									...stack$1,
-									border: border$1,
-									borderRadius: "var(--dsw-radius-lg, 12px)",
-									padding: 14,
-									margin: 0
-								},
-								children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("legend", {
-										style: {
-											padding: "0 6px",
-											overflowWrap: "anywhere",
-											maxWidth: "100%"
-										},
-										children: account.label
-									}),
-									account.unavailable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-										className: "dsh-subscription-hint",
-										children: t("accountsCatalogUnavailable")
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("legend", {
+									style: {
+										padding: "0 6px",
+										overflowWrap: "anywhere",
+										maxWidth: "100%"
+									},
+									children: account.label
+								}),
+								account.unavailable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "dsh-subscription-hint",
+									children: t("accountsCatalogUnavailable")
+								}),
+								/* @__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("accountsAlias")
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+										value: preferences.alias ?? "",
+										placeholder: account.label,
+										onChange: (event) => {
+											const next = { ...preferences };
+											if (event.target.value.trim()) next.alias = event.target.value;
+											else delete next.alias;
+											edit(account.key, next);
+										}
+									})]
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+										type: "checkbox",
+										checked: preferences.poolEnabled !== false,
+										onChange: (event) => edit(account.key, {
+											...preferences,
+											poolEnabled: event.target.checked
+										})
 									}),
-									/* @__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("accountsAlias")
-										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-											value: preferences.alias ?? "",
-											placeholder: account.label,
-											onChange: (event) => {
-												const next = { ...preferences };
-												if (event.target.value.trim()) next.alias = event.target.value;
-												else delete next.alias;
-												edit(account.key, next);
-											}
-										})]
+									" ",
+									t("accountsPoolEnabled")
+								] }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+										type: "checkbox",
+										checked: preferences.independentEntry === true,
+										onChange: (event) => edit(account.key, {
+											...preferences,
+											independentEntry: event.target.checked
+										})
 									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-											type: "checkbox",
-											checked: preferences.poolEnabled !== false,
-											onChange: (event) => edit(account.key, {
-												...preferences,
-												poolEnabled: event.target.checked
-											})
-										}),
+									" ",
+									t("accountsIndependent")
+								] }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "dsh-subscription-hint",
+									children: t("accountsIndependentHint")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("summary", {
+									style: {
+										cursor: "pointer",
+										fontSize: 13
+									},
+									children: [
+										t("accountsModels"),
+										" ·",
 										" ",
-										t("accountsPoolEnabled")
-									] }),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-											type: "checkbox",
-											checked: preferences.independentEntry === true,
-											onChange: (event) => edit(account.key, {
-												...preferences,
-												independentEntry: event.target.checked
-											})
+										preferences.poolModels === void 0 ? t("accountsModelsAll") : t("accountsModelsCount", { count: preferences.poolModels.length })
+									]
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+									style: {
+										...stack$1,
+										marginTop: 12
+									},
+									children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											className: "dsh-subscription-hint",
+											children: t("accountsModelsHint")
 										}),
-										" ",
-										t("accountsIndependent")
-									] }),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-										className: "dsh-subscription-hint",
-										children: t("accountsIndependentHint")
-									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("summary", {
-										style: {
-											cursor: "pointer",
-											fontSize: 13
-										},
-										children: [
-											t("accountsModels"),
-											" ·",
-											" ",
-											preferences.poolModels === void 0 ? t("accountsModelsAll") : t("accountsModelsCount", { count: preferences.poolModels.length })
-										]
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-										style: {
-											...stack$1,
-											marginTop: 12
-										},
-										children: [
-											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-												className: "dsh-subscription-hint",
-												children: t("accountsModelsHint")
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+												type: "checkbox",
+												checked: preferences.poolModels === void 0,
+												onChange: (event) => {
+													const next = { ...preferences };
+													if (event.target.checked) delete next.poolModels;
+													else next.poolModels = account.models.map((model) => model.id);
+													edit(account.key, next);
+												}
 											}),
-											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [
-												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-													type: "checkbox",
-													checked: preferences.poolModels === void 0,
-													onChange: (event) => {
-														const next = { ...preferences };
-														if (event.target.checked) delete next.poolModels;
-														else next.poolModels = account.models.map((model) => model.id);
-														edit(account.key, next);
-													}
+											" ",
+											t("accountsModelsAutomatic")
+										] }),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											style: actions$1,
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+												type: "button",
+												onClick: () => edit(account.key, {
+													...preferences,
+													poolModels: models.map((model) => model.id)
 												}),
-												" ",
-												t("accountsModelsAutomatic")
-											] }),
-											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-												style: actions$1,
-												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-													type: "button",
-													onClick: () => edit(account.key, {
-														...preferences,
-														poolModels: models.map((model) => model.id)
-													}),
-													children: t("modelsSelectAll")
-												}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-													type: "button",
-													onClick: () => edit(account.key, {
-														...preferences,
-														poolModels: []
+												children: t("modelsSelectAll")
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+												type: "button",
+												onClick: () => edit(account.key, {
+													...preferences,
+													poolModels: []
+												}),
+												children: t("modelsSelectNone")
+											})]
+										}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											style: {
+												...stack$1,
+												gap: 8,
+												maxHeight: 240,
+												overflowY: "auto"
+											},
+											children: [models.map((model) => /* @__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(account.key, {
+																...preferences,
+																poolModels: [...next]
+															});
+														}
 													}),
-													children: t("modelsSelectNone")
-												})]
-											}),
-											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-												style: {
-													...stack$1,
-													gap: 8,
-													maxHeight: 240,
-													overflowY: "auto"
-												},
-												children: [models.map((model) => /* @__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(account.key, {
-																	...preferences,
-																	poolModels: [...next]
-																});
-															}
-														}),
-														" ",
-														model.name,
-														model.unavailable && ` (${t("modelsUnavailable")})`
-													]
-												}, model.id)), models.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-													className: "dsh-subscription-hint",
-													children: t("accountsNoModels")
-												})]
-											})
-										]
-									})] })
-								]
-							}, account.key);
-						})
-					]
+													" ",
+													model.name,
+													model.unavailable && ` (${t("modelsUnavailable")})`
+												]
+											}, model.id)), models.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "dsh-subscription-hint",
+												children: t("accountsNoModels")
+											})]
+										})
+									]
+								})] })
+							]
+						}, account.key);
+					})]
 				}),
-				(provider !== "cursor-subscription" || (catalog?.accounts.length ?? 0) > 0) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ProviderModelEditor, {
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ProviderModelEditor, {
 					ref: editor,
 					provider,
 					rpc,
@@ -1602,7 +1653,7 @@ function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
 
 //#endregion
 //#region src/client/subscription-card-styles.ts
-/** Shared visual language for OAuth, Cursor, and built-in provider cards. */
+/** Shared visual language for OAuth and built-in provider cards. */
 const subscriptionCardStyles = {
 	card: {
 		border: "1px solid var(--dsw-alias-border-l2)",
@@ -2185,250 +2236,6 @@ function ExternalUsageCards({ rpc, t }) {
 	}) });
 }
 
-//#endregion
-//#region src/client/CursorCard.tsx
-function message$2(error) {
-	return error instanceof Error ? error.message : String(error);
-}
-/** Cursor's single connected account, rendered with the same card and Manage dialog as the other providers. */
-function CursorCard({ rpc, t }) {
-	const [status, setStatus] = (0, react.useState)();
-	const [usage, setUsage] = (0, react.useState)();
-	const [observedAt, setObservedAt] = (0, react.useState)();
-	const [usageStale, setUsageStale] = (0, react.useState)(false);
-	const [authorizeUrl, setAuthorizeUrl] = (0, react.useState)();
-	const [error, setError] = (0, react.useState)();
-	const [loading, setLoading] = (0, react.useState)(false);
-	const [manage, setManage] = (0, react.useState)(false);
-	const authenticated = (0, react.useRef)();
-	const refreshStatus = (0, react.useCallback)(async () => {
-		try {
-			const value = await callSubscriptionsAuth(rpc, "cursorStatus", {});
-			setStatus(value);
-			if (authenticated.current !== value.authenticated) {
-				authenticated.current = value.authenticated;
-				window.dispatchEvent(new Event(USAGE_BADGE_REFRESH_EVENT));
-			}
-			if (value.authenticated) setAuthorizeUrl(void 0);
-			if (value.error) setError(value.error);
-		} catch (failure) {
-			setError(message$2(failure));
-		}
-	}, [rpc]);
-	const refreshUsage = (0, react.useCallback)(async () => {
-		setLoading(true);
-		try {
-			const value = await callSubscriptionsAuth(rpc, "cursorUsage", {});
-			setUsage(value);
-			setObservedAt(value.observedAt ?? Date.now());
-			setUsageStale(value.stale === true);
-			setError(void 0);
-			window.dispatchEvent(new Event(USAGE_BADGE_REFRESH_EVENT));
-		} catch (failure) {
-			setError(message$2(failure));
-			setUsageStale(true);
-		} finally {
-			setLoading(false);
-		}
-	}, [rpc]);
-	(0, react.useEffect)(() => {
-		refreshStatus();
-	}, [refreshStatus]);
-	(0, react.useEffect)(() => {
-		if (status?.busy !== true) return;
-		const timer = setInterval(() => {
-			refreshStatus();
-		}, 2e3);
-		return () => clearInterval(timer);
-	}, [status?.busy, refreshStatus]);
-	(0, react.useEffect)(() => {
-		if (status?.authenticated === true) refreshUsage();
-	}, [status?.authenticated, refreshUsage]);
-	const login = async () => {
-		setError(void 0);
-		try {
-			const value = await callSubscriptionsAuth(rpc, "cursorLogin", {});
-			setAuthorizeUrl(value.authorizeUrl);
-			window.open(value.authorizeUrl, "_blank", "noopener");
-			await refreshStatus();
-		} catch (failure) {
-			setError(message$2(failure));
-		}
-	};
-	const cancel = async () => {
-		try {
-			await callSubscriptionsAuth(rpc, "cursorCancel", {});
-			setAuthorizeUrl(void 0);
-			await refreshStatus();
-		} catch (failure) {
-			setError(message$2(failure));
-		}
-	};
-	const logout = async () => {
-		if (!window.confirm(t("logoutAccountConfirm", {
-			account: "Cursor",
-			provider: "Cursor"
-		}))) return;
-		try {
-			await callSubscriptionsAuth(rpc, "cursorLogout", {});
-			setUsage(void 0);
-			setObservedAt(void 0);
-			setUsageStale(false);
-			await refreshStatus();
-		} catch (failure) {
-			setError(message$2(failure));
-		}
-	};
-	const connected = status?.authenticated === true;
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-		style: subscriptionCardStyles.card,
-		children: [
-			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				style: subscriptionCardStyles.header,
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { style: {
-					...subscriptionCardStyles.dot,
-					background: status?.busy ? "var(--dsw-alias-state-warn-label)" : connected ? "var(--dsw-alias-state-success-primary)" : "var(--dsw-alias-label-dimmed)"
-				} }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-					style: subscriptionCardStyles.name,
-					children: t("cursorTitle")
-				})]
-			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-				style: subscriptionCardStyles.status,
-				children: status === void 0 ? t("checking") : status.busy ? t("loginInProgress") : connected ? t("loggedInCount", { count: 1 }) : t("notLoggedIn")
-			}),
-			error !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-				style: subscriptionCardStyles.error,
-				children: error
-			}),
-			connected && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				style: subscriptionCardStyles.account,
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					style: subscriptionCardStyles.accountHeader,
-					children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							style: subscriptionCardStyles.defaultStar,
-							title: t("defaultBadge"),
-							children: "★"
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							style: subscriptionCardStyles.accountName,
-							children: "Cursor"
-						}),
-						status.expiresAt !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							style: subscriptionCardStyles.status,
-							children: t("accountExpires", { date: new Date(status.expiresAt).toLocaleString() })
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-							type: "button",
-							style: {
-								...subscriptionCardStyles.button,
-								marginLeft: "auto",
-								flexShrink: 0
-							},
-							onClick: () => {
-								logout();
-							},
-							children: t("logout")
-						})
-					]
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					style: subscriptionCardStyles.usage,
-					children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							style: subscriptionCardStyles.usageHeader,
-							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									style: subscriptionCardStyles.usageTitle,
-									children: t("usageTitle")
-								}),
-								usage?.plan !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									style: subscriptionCardStyles.status,
-									children: t("usagePlan", { plan: usage.plan })
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-									type: "button",
-									style: subscriptionCardStyles.usageRefresh,
-									disabled: loading,
-									onClick: () => {
-										refreshUsage();
-									},
-									children: t("usageRefresh")
-								})
-							]
-						}),
-						loading && usage === void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-							style: subscriptionCardStyles.status,
-							children: t("usageLoading")
-						}),
-						usage?.windows?.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-							style: subscriptionCardStyles.status,
-							children: t("usageEmpty")
-						}),
-						usage?.windows?.map((window$1, index) => {
-							const percent = displayUsedPercent(window$1.usedPercent);
-							const label = window$1.scope === "Included" ? t("cursorIncluded") : window$1.scope === "Cursor Models" ? t("cursorModels") : window$1.scope === "Other Models" ? t("cursorOtherModels") : window$1.scope === "Included requests" ? t("cursorIncludedRequests") : window$1.scope ?? t("usageWindow");
-							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-								style: subscriptionCardStyles.usageRow,
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									style: subscriptionCardStyles.usageMeta,
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: label }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [percent === void 0 ? t("usageMeterInvalid") : `${percent}%`, window$1.resetsAt === void 0 ? "" : ` · ${t("usageResets", { date: new Date(window$1.resetsAt).toLocaleString() })}`] })]
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(UsageMeter, {
-									window: window$1,
-									t,
-									observedAt,
-									stale: usageStale
-								})]
-							}, index);
-						})
-					]
-				})]
-			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				style: subscriptionCardStyles.actions,
-				children: [
-					status?.authenticated === false && !status.busy && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						type: "button",
-						style: subscriptionCardStyles.button,
-						onClick: () => {
-							login();
-						},
-						children: t("login")
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						type: "button",
-						style: subscriptionCardStyles.button,
-						"aria-haspopup": "dialog",
-						onClick: () => setManage(true),
-						children: t("accountsManage")
-					}),
-					status?.busy === true && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						type: "button",
-						style: subscriptionCardStyles.button,
-						onClick: () => {
-							cancel();
-						},
-						children: t("cancel")
-					})
-				]
-			}),
-			status?.busy === true && authorizeUrl !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("a", {
-				href: authorizeUrl,
-				target: "_blank",
-				rel: "noopener noreferrer",
-				children: t("cursorOpenLogin")
-			}),
-			manage && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ProviderAccountManager, {
-				provider: "cursor-subscription",
-				name: "Cursor",
-				rpc,
-				t,
-				onClose: () => setManage(false)
-			})
-		]
-	});
-}
-
 //#endregion
 //#region src/client/ollama-draft.ts
 /**
@@ -3545,15 +3352,15 @@ function showsResetCredits(provider, credits) {
 	return (credits?.length ?? 0) > 0;
 }
 /** The error line the settings card mounts. Claude never interpolates provider text. */
-function ResetCreditsErrorLine({ provider, message: message$3, t }) {
+function ResetCreditsErrorLine({ provider, message: message$2, t }) {
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 		style: subscriptionCardStyles.error,
-		children: resetCreditsErrorText(provider, message$3, t)
+		children: resetCreditsErrorText(provider, message$2, t)
 	});
 }
 /** Fixed sentence for Claude. Codex may include the lookup message; Claude must not. */
-function resetCreditsErrorText(provider, message$3, t) {
-	return provider === "claude" ? t("resetCreditsErrorFixed") : t("resetCreditsError", { message: message$3 });
+function resetCreditsErrorText(provider, message$2, t) {
+	return provider === "claude" ? t("resetCreditsErrorFixed") : t("resetCreditsError", { message: message$2 });
 }
 const summaryStyle = {
 	...subscriptionCardStyles.usageMeta,
@@ -4089,12 +3896,12 @@ function SubscriptionsSection(props) {
 	const usageInflightRef = (0, react.useRef)(/* @__PURE__ */ new Map());
 	const usageRosterSignatureRef = (0, react.useRef)();
 	const [managedProvider, setManagedProvider] = (0, react.useState)();
-	const setProviderError = (0, react.useCallback)((provider, message$3) => {
+	const setProviderError = (0, react.useCallback)((provider, message$2) => {
 		if (!mountedRef.current) return;
 		setErrors((prev) => {
 			const next = { ...prev };
-			if (message$3 === void 0) delete next[provider];
-			else next[provider] = message$3;
+			if (message$2 === void 0) delete next[provider];
+			else next[provider] = message$2;
 			return next;
 		});
 	}, []);
@@ -4112,8 +3919,8 @@ function SubscriptionsSection(props) {
 		try {
 			response = await callSubscriptionsAuth(rpc, "status", {});
 		} catch (error) {
-			const message$3 = error instanceof Error ? error.message : String(error);
-			for (const { id } of PROVIDERS) setProviderError(id, message$3);
+			const message$2 = error instanceof Error ? error.message : String(error);
+			for (const { id } of PROVIDERS) setProviderError(id, message$2);
 			return;
 		}
 		if (!mountedRef.current) return;
@@ -4452,6 +4259,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 +4342,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 +4417,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({
@@ -4680,10 +4492,6 @@ function SubscriptionsSection(props) {
 					]
 				}, id);
 			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(CursorCard, {
-				rpc,
-				t
-			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(OllamaCard, {
 				rpc,
 				t
@@ -4697,7 +4505,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 +5348,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
@@ -5938,7 +5744,6 @@ const PROVIDER_NAMES = {
 	grok: "Grok",
 	copilot: "Copilot",
 	antigravity: "Antigravity",
-	"cursor-subscription": "Cursor",
 	"opencode-go": "OpenCode Go",
 	"kimi-coding": "Kimi Code",
 	minimax: "MiniMax",
@@ -5985,11 +5790,7 @@ function groupUsageDisplays(roster, windowsOf, plans) {
 }
 /** Read each account source independently so a failing endpoint cannot hide the others. */
 async function loadBadgeRoster(rpc) {
-	const [subscriptions, cursor, external] = await Promise.allSettled([
-		callSubscriptionsAuth(rpc, "status", {}),
-		callSubscriptionsAuth(rpc, "cursorStatus", {}),
-		callSubscriptionsAuth(rpc, "externalStatus", {})
-	]);
+	const [subscriptions, external] = await Promise.allSettled([callSubscriptionsAuth(rpc, "status", {}), callSubscriptionsAuth(rpc, "externalStatus", {})]);
 	const roster = [];
 	const refreshed = /* @__PURE__ */ new Set();
 	if (subscriptions.status === "fulfilled") for (const provider of [
@@ -6005,16 +5806,6 @@ async function loadBadgeRoster(rpc) {
 			account
 		});
 	}
-	if (cursor.status === "fulfilled") {
-		refreshed.add("cursor-subscription");
-		if (cursor.value.authenticated) roster.push({
-			provider: "cursor-subscription",
-			account: {
-				key: "cursor",
-				isDefault: true
-			}
-		});
-	}
 	if (external.status === "fulfilled") for (const [source, provider] of [
 		["opencode-go", "opencode-go"],
 		["kimi-code", "kimi-coding"],
@@ -6037,7 +5828,6 @@ async function loadBadgeRoster(rpc) {
 	};
 }
 async function usageOf(rpc, { provider, account }) {
-	if (provider === "cursor-subscription") return callSubscriptionsAuth(rpc, "cursorUsage", {});
 	if (provider === "opencode-go" || provider === "kimi-coding" || provider === "minimax" || provider === "minimax-cn" || provider === "ollama-cloud") return callSubscriptionsAuth(rpc, "externalUsage", { source: provider === "kimi-coding" ? "kimi-code" : provider });
 	return callSubscriptionsAuth(rpc, "usage", {
 		provider,