dsh-plugin-subscriptions 0.5.2 → 0.6.0

package/lib/client.js

@@ -39,15 +39,19 @@ const en = {
 	unavailable: "Connection unavailable; subscription status cannot be loaded.",
 	checking: "Checking…",
 	loginInProgress: "Login in progress…",
-	loggedIn: "Logged in",
-	loggedInAccount: "Logged in as {account}",
-	loggedInExpires: "Logged in · expires {date}",
-	loggedInAccountExpires: "Logged in as {account} · expires {date}",
 	notLoggedIn: "Not logged in",
+	loggedInCount: "{count} account(s) connected",
+	accountExpires: "expires {date}",
+	defaultBadge: "Default",
+	setDefault: "Set as default",
+	addAccount: "Add account",
+	addAccountOAuth: "Browser authorization",
+	addAccountKeychain: "Import Claude Code",
+	addAccountHint: "Browser authorization signs in whichever account the browser currently uses — switch accounts there first (or use an incognito window with the manual code below) to add a different one.",
 	login: "Log in",
 	cancel: "Cancel",
 	logout: "Log out",
-	logoutConfirm: "Log out of {provider}?",
+	logoutAccountConfirm: "Log out {account} of {provider}?",
 	manualSummary: "Browser flow not working? Paste the callback URL or code",
 	manualPlaceholder: "Paste the callback URL or code",
 	submit: "Submit",
@@ -66,6 +70,20 @@ const en = {
 	usageWindow: "Window",
 	usageResets: "resets {date}",
 	usagePlan: "Plan: {plan}",
+	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",
+	modelDefaultsNoLevels: "{count} model(s) advertise no reasoning levels and always follow the provider.",
+	modelDefaultsLoading: "Loading models…",
+	modelDefaultsLoadFailed: "Failed to load models: {message}",
+	modelDefaultsRetry: "Retry",
+	modelDefaultsSaving: "Saving…",
+	modelDefaultsSaveFailedNamed: "Save failed for {model}: {message}",
+	modelDefaultsSummary: "{total} model(s) · {configured} overridden",
+	modelDefaultsSummaryNone: "{total} model(s) · following the provider",
+	modelDefaultsSummaryEmpty: "No model advertises reasoning levels",
+	modelDefaultsFilterPlaceholder: "Filter models",
+	modelDefaultsFilterEmpty: "No model matches “{query}”.",
 	generating: "Generating image…",
 	image: "image",
 	viewImage: "View image",
@@ -124,15 +142,19 @@ const zh = {
 	unavailable: "连接不可用，无法加载订阅状态。",
 	checking: "查询中…",
 	loginInProgress: "登录中…",
-	loggedIn: "已登录",
-	loggedInAccount: "已登录：{account}",
-	loggedInExpires: "已登录 · 过期时间 {date}",
-	loggedInAccountExpires: "已登录：{account} · 过期时间 {date}",
 	notLoggedIn: "未登录",
+	loggedInCount: "已连接 {count} 个账号",
+	accountExpires: "过期时间 {date}",
+	defaultBadge: "默认",
+	setDefault: "设为默认",
+	addAccount: "添加账号",
+	addAccountOAuth: "浏览器授权",
+	addAccountKeychain: "导入 Claude Code",
+	addAccountHint: "浏览器授权以浏览器当前登录的账号为准；要添加不同账号，请先在浏览器里切换账号，或用无痕窗口走下方手动授权码。",
 	login: "登录",
 	cancel: "取消",
 	logout: "退出登录",
-	logoutConfirm: "确定退出 {provider} 的登录吗？",
+	logoutAccountConfirm: "确定退出 {provider} 的账号 {account} 吗？",
 	manualSummary: "浏览器流程无法完成？粘贴回调 URL 或授权码",
 	manualPlaceholder: "粘贴回调 URL 或授权码",
 	submit: "提交",
@@ -151,6 +173,20 @@ const zh = {
 	usageWindow: "窗口",
 	usageResets: "{date} 重置",
 	usagePlan: "计划：{plan}",
+	modelDefaultsTitle: "默认推理档",
+	modelDefaultsHint: "切换到该模型时，模型选择器会预选此档位；没有推理档的模型始终跟随服务商默认。",
+	modelDefaultsFollowProvider: "跟随服务商",
+	modelDefaultsNoLevels: "{count} 个模型未声明推理档，始终跟随服务商默认。",
+	modelDefaultsLoading: "加载模型中…",
+	modelDefaultsLoadFailed: "模型加载失败：{message}",
+	modelDefaultsRetry: "重试",
+	modelDefaultsSaving: "保存中…",
+	modelDefaultsSaveFailedNamed: "{model} 保存失败：{message}",
+	modelDefaultsSummary: "{total} 个模型 · {configured} 个已覆盖",
+	modelDefaultsSummaryNone: "{total} 个模型 · 全部跟随服务商",
+	modelDefaultsSummaryEmpty: "没有模型声明推理档",
+	modelDefaultsFilterPlaceholder: "筛选模型",
+	modelDefaultsFilterEmpty: "没有匹配「{query}」的模型。",
 	generating: "正在生成图片…",
 	image: "图片",
 	viewImage: "查看图片",
@@ -209,6 +245,17 @@ const zh = {
 const SUBSCRIPTIONS_AUTH_CHANNEL$2 = "/subscriptions-auth";
 /** Poll cadence while a provider login attempt is busy. */
 const POLL_INTERVAL_MS$1 = 2e3;
+/**
+* Model count above which the expanded default-effort list also offers a name
+* filter; below it the list is short enough to scan.
+*/
+const MODEL_FILTER_THRESHOLD = 8;
+/**
+* Height cap of the expanded default-effort list, in px. Past it the list
+* scrolls internally so a provider with dozens of models cannot stretch the
+* card (roughly 7 rows, which keeps the next card's header on screen).
+*/
+const MODEL_LIST_MAX_HEIGHT = 260;
 /** Card display metadata, in page order (names are brand names, not translated). */
 const PROVIDERS = [
 	{
@@ -252,6 +299,14 @@ async function callSubscriptionsAuth(rpc, endpoint, payload) {
 function messageOf(error) {
 	return error instanceof Error ? error.message : String(error);
 }
+/** Copy a keyed map without the entries whose key is not in `live`. */
+function dropStale(map, live) {
+	const stale = Object.keys(map).filter((key) => !live.has(key));
+	if (stale.length === 0) return map;
+	const next = { ...map };
+	for (const key of stale) delete next[key];
+	return next;
+}
 /**
 * English-dictionary fallback for a missing inject `t` (standalone renders);
 * the slot inject always supplies the locale-bound one.
@@ -399,6 +454,36 @@ const styles$4 = {
 		lineHeight: "18px",
 		color: "var(--dsw-alias-label-tertiary)"
 	},
+	accountRow: {
+		display: "flex",
+		flexDirection: "column",
+		gap: 6,
+		border: "1px solid var(--dsw-alias-border-l2)",
+		borderRadius: 8,
+		padding: "8px 10px",
+		marginTop: 4
+	},
+	accountHeader: {
+		display: "flex",
+		alignItems: "center",
+		gap: 8
+	},
+	accountName: {
+		fontSize: 13,
+		lineHeight: "20px",
+		color: "var(--dsw-alias-label-primary)",
+		userSelect: "all"
+	},
+	starButton: {
+		border: "none",
+		background: "transparent",
+		padding: 0,
+		font: "inherit",
+		fontSize: 14,
+		lineHeight: "20px",
+		cursor: "pointer",
+		color: "var(--dsw-alias-state-warn-label)"
+	},
 	usageTrack: {
 		height: 6,
 		borderRadius: 3,
@@ -410,6 +495,90 @@ const styles$4 = {
 		height: "100%",
 		borderRadius: 3
 	},
+	defaultEffort: {
+		display: "flex",
+		flexDirection: "column",
+		gap: 6,
+		marginTop: 4,
+		borderTop: "1px solid var(--dsw-alias-border-l2)",
+		paddingTop: 8
+	},
+	defaultEffortToggle: {
+		boxSizing: "border-box",
+		display: "flex",
+		alignItems: "center",
+		gap: 8,
+		width: "100%",
+		padding: 0,
+		border: "none",
+		background: "transparent",
+		font: "inherit",
+		textAlign: "left",
+		cursor: "pointer"
+	},
+	defaultEffortChevron: {
+		marginLeft: "auto",
+		flexShrink: 0,
+		fontSize: 10,
+		lineHeight: "18px",
+		color: "var(--dsw-alias-label-tertiary)"
+	},
+	defaultEffortList: {
+		display: "flex",
+		flexDirection: "column",
+		gap: 6,
+		maxHeight: MODEL_LIST_MAX_HEIGHT,
+		overflowY: "auto",
+		paddingRight: 2
+	},
+	defaultEffortRow: {
+		display: "flex",
+		alignItems: "center",
+		justifyContent: "space-between",
+		gap: 8
+	},
+	defaultEffortName: {
+		fontSize: 12,
+		lineHeight: "18px",
+		color: "var(--dsw-alias-label-primary)",
+		overflow: "hidden",
+		textOverflow: "ellipsis",
+		whiteSpace: "nowrap"
+	},
+	defaultEffortSaving: {
+		marginLeft: "auto",
+		flexShrink: 0,
+		fontSize: 12,
+		lineHeight: "18px",
+		color: "var(--dsw-alias-label-tertiary)"
+	},
+	defaultEffortSelect: {
+		maxWidth: 220,
+		flexShrink: 0,
+		height: 28,
+		boxSizing: "border-box",
+		border: "1px solid var(--dsw-alias-border-l2)",
+		borderRadius: 8,
+		padding: "0 8px",
+		font: "inherit",
+		fontSize: 12,
+		lineHeight: "18px",
+		background: "var(--dsw-alias-bg-layer-1)",
+		color: "var(--dsw-alias-label-primary)"
+	},
+	defaultEffortFilter: {
+		height: 28,
+		width: "100%",
+		boxSizing: "border-box",
+		border: "1px solid var(--dsw-alias-border-l2)",
+		borderRadius: 8,
+		padding: "0 8px",
+		font: "inherit",
+		fontSize: 12,
+		lineHeight: "18px",
+		background: "var(--dsw-alias-bg-layer-1)",
+		color: "var(--dsw-alias-label-primary)"
+	},
 	manual: {
 		marginTop: 4,
 		fontSize: 12,
@@ -541,10 +710,20 @@ const styles$4 = {
 /** Status dot color for one provider state. */
 function dotColor(status) {
 	if (status?.busy === true) return "var(--dsw-alias-state-warn-label)";
-	if (status?.loggedIn === true) return "var(--dsw-alias-state-success-primary)";
+	if ((status?.accounts.length ?? 0) > 0) return "var(--dsw-alias-state-success-primary)";
 	return "var(--dsw-alias-label-dimmed)";
 }
 /**
+* Whether a provider has at least one connected account. Multi-account made
+* "logged in" a property of the account list rather than a flag, so every
+* logged-in test goes through this one predicate.
+* @param status - the provider's last reported state, possibly absent.
+* @returns true when the provider serves at least one account.
+*/
+function hasAccount(status) {
+	return (status?.accounts.length ?? 0) > 0;
+}
+/**
 * One-line status text for one provider state.
 * @param t - section translate.
 * @param status - the provider's last reported state.
@@ -553,15 +732,7 @@ function dotColor(status) {
 function statusText(t, status) {
 	if (status === void 0) return t("checking");
 	if (status.busy) return t("loginInProgress");
-	if (status.loggedIn) {
-		const params = {};
-		if (status.account !== void 0) params.account = status.account;
-		if (status.expiresAt !== void 0) params.date = new Date(status.expiresAt).toLocaleString();
-		if (params.account !== void 0 && params.date !== void 0) return t("loggedInAccountExpires", params);
-		if (params.account !== void 0) return t("loggedInAccount", params);
-		if (params.date !== void 0) return t("loggedInExpires", params);
-		return t("loggedIn");
-	}
+	if (status.accounts.length > 0) return t("loggedInCount", { count: status.accounts.length });
 	return t("notLoggedIn");
 }
 /**
@@ -593,6 +764,55 @@ function messageColor(tone) {
 	return tone === "error" ? "var(--dsw-alias-state-error-primary)" : "var(--dsw-alias-state-success-primary)";
 }
 /**
+* Derive one provider's default-effort section from its catalog and filter.
+* Pure so the collapsed-header counts and the filter stay testable without a
+* DOM: rows come only from models that advertise levels, the count of the rest
+* rides as one line, and the filter matches display name or model id.
+* @param models - the provider's catalog models, or undefined while loading.
+* @param filter - the raw filter input (trimmed and lowercased here).
+* @returns the section's rows and header counts.
+*/
+function deriveModelDefaultsView(models, filter) {
+	const all = models ?? [];
+	const withEfforts = all.filter((model) => model.efforts.length > 0);
+	const query = filter.trim().toLowerCase();
+	return {
+		shown: query === "" ? withEfforts : withEfforts.filter((model) => model.name.toLowerCase().includes(query) || model.id.toLowerCase().includes(query)),
+		total: withEfforts.length,
+		overridden: withEfforts.filter((model) => model.configured !== void 0).length,
+		withoutEfforts: all.length - withEfforts.length,
+		showFilter: withEfforts.length > MODEL_FILTER_THRESHOLD
+	};
+}
+/**
+* Whether the default-effort catalog needs (re)fetching.
+*
+* Fetching is gated on an *attempt* signature rather than on the payload
+* being empty: an empty answer is a legitimate result (a narrowed
+* `config.providers`, or a catalog that is momentarily unavailable), and
+* treating it as "not loaded yet" re-ran this effect forever. The signature
+* also covers the accounts, so logging a second provider in refetches
+* instead of leaving that card on the previous answer.
+* @param input - the decision inputs.
+* @returns true when the caller should start a fetch.
+*/
+function shouldFetchModelDefaults(input) {
+	if (input.failed) return false;
+	if (input.loggedIn.length === 0) return false;
+	if (!input.open.some((provider) => input.loggedIn.includes(provider))) return false;
+	return input.loadedFor !== input.signature;
+}
+/**
+* Stable signature of the accounts a catalog answer depends on. A change
+* means a previous answer is stale (an account arrived or left), so the next
+* open disclosure refetches.
+* @param statuses - the per-provider status snapshot.
+* @returns a signature string, stable across renders with equal accounts.
+*/
+function modelDefaultsSignature(statuses) {
+	return PROVIDERS.map(({ id }) => `${id}:${(statuses[id]?.accounts ?? []).map((account) => account.key).sort().join(",")}`).join("|");
+}
+/**
 * The Subscriptions settings page component.
 * @param props - the slot inject face ({@link SubscriptionsSectionInjected}).
 * @returns the section body, or a notice while the RPC face is absent.
@@ -611,12 +831,13 @@ function SubscriptionsSection(props) {
 	/** Pending device-flow codes (copilot), shown while the attempt polls. */
 	const [deviceCodes, setDeviceCodes] = (0, react.useState)({});
 	const [copiedCode, setCopiedCode] = (0, react.useState)(void 0);
+	/** Usage snapshots keyed `${provider}:${accountKey}` — every account tracks its own windows. */
 	const [usages, setUsages] = (0, react.useState)({});
 	const [usageErrors, setUsageErrors] = (0, react.useState)({});
 	const [usageLoading, setUsageLoading] = (0, react.useState)({});
 	const mountedRef = (0, react.useRef)(true);
 	const pollersRef = (0, react.useRef)(/* @__PURE__ */ new Map());
-	/** Providers with a `usage` call in flight; guards the auto-fetch effect against re-entry. */
+	/** Accounts with a `usage` call in flight; guards the auto-fetch effect against re-entry. */
 	const usageInflightRef = (0, react.useRef)(/* @__PURE__ */ new Set());
 	/** Proxy config as last answered by `proxyGet`/`proxySet`. */
 	const [proxy, setProxy] = (0, react.useState)(void 0);
@@ -633,6 +854,24 @@ function SubscriptionsSection(props) {
 	const [proxyTesting, setProxyTesting] = (0, react.useState)(false);
 	const [proxyMessage, setProxyMessage] = (0, react.useState)(void 0);
 	const [proxyTestResult, setProxyTestResult] = (0, react.useState)(void 0);
+	/** Per-model default-effort picker state as answered by `modelDefaults`. */
+	const [modelDefaults, setModelDefaults] = (0, react.useState)({});
+	const [modelDefaultsLoading, setModelDefaultsLoading] = (0, react.useState)(false);
+	const [modelDefaultsLoadError, setModelDefaultsLoadError] = (0, react.useState)(void 0);
+	/** One set in flight: the `${provider}/${model}` key. */
+	const [modelDefaultsSaving, setModelDefaultsSaving] = (0, react.useState)(void 0);
+	/** Per-model save failures, keyed `${provider}/${model}`. */
+	const [modelDefaultsSaveErrors, setModelDefaultsSaveErrors] = (0, react.useState)({});
+	/** Providers whose default-effort disclosure is open (collapsed by default). */
+	const [modelDefaultsOpen, setModelDefaultsOpen] = (0, react.useState)({});
+	/** Per-provider name filter of the expanded list. */
+	const [modelDefaultsFilters, setModelDefaultsFilters] = (0, react.useState)({});
+	/** Account signature the last completed catalog fetch was answered for. */
+	const [modelDefaultsLoadedFor, setModelDefaultsLoadedFor] = (0, react.useState)(void 0);
+	/** Optimistic in-flight selections, keyed `${provider}/${model}` ('' = follow provider). */
+	const [modelDefaultsPending, setModelDefaultsPending] = (0, react.useState)({});
+	/** Guard the catalog effect against concurrent loads. */
+	const modelDefaultsInflightRef = (0, react.useRef)(false);
 	const setProviderError = (0, react.useCallback)((provider, message) => {
 		if (!mountedRef.current) return;
 		setErrors((prev) => {
@@ -662,7 +901,7 @@ function SubscriptionsSection(props) {
 		setStatuses(response.providers);
 		for (const { id } of PROVIDERS) {
 			const status = response.providers[id];
-			if (status.loggedIn || !status.busy) {
+			if (status.accounts.length > 0 || !status.busy) {
 				stopPolling(id);
 				setDeviceCodes((prev) => {
 					if (prev[id] === void 0) return prev;
@@ -694,68 +933,176 @@ function SubscriptionsSection(props) {
 			pollersRef.current.clear();
 		};
 	}, [refresh, startPolling]);
-	const loadUsage = (0, react.useCallback)(async (provider) => {
-		if (rpc === void 0 || usageInflightRef.current.has(provider)) return;
-		usageInflightRef.current.add(provider);
+	const loadUsage = (0, react.useCallback)(async (provider, account, force = false) => {
+		const key = `${provider}:${account}`;
+		if (rpc === void 0 || usageInflightRef.current.has(key)) return;
+		usageInflightRef.current.add(key);
 		setUsageLoading((prev) => ({
 			...prev,
-			[provider]: true
+			[key]: true
 		}));
 		try {
-			const usage = await callSubscriptionsAuth(rpc, "usage", { provider });
+			const usage = await callSubscriptionsAuth(rpc, "usage", {
+				provider,
+				account,
+				...force ? { force: true } : {}
+			});
 			if (!mountedRef.current) return;
 			setUsages((prev) => ({
 				...prev,
-				[provider]: usage
+				[key]: usage
 			}));
 			setUsageErrors((prev) => {
 				const next = { ...prev };
-				delete next[provider];
+				delete next[key];
 				return next;
 			});
 		} catch (error) {
 			if (mountedRef.current) setUsageErrors((prev) => ({
 				...prev,
-				[provider]: messageOf(error)
+				[key]: messageOf(error)
 			}));
 		} finally {
-			usageInflightRef.current.delete(provider);
+			usageInflightRef.current.delete(key);
 			if (mountedRef.current) setUsageLoading((prev) => ({
 				...prev,
-				[provider]: false
+				[key]: false
 			}));
 		}
 	}, [rpc]);
 	(0, react.useEffect)(() => {
-		for (const { id } of PROVIDERS) {
-			const status = statuses[id];
-			if (status === void 0) continue;
-			if (status.loggedIn) {
-				if (usages[id] === void 0 && usageErrors[id] === void 0) loadUsage(id);
-			} else if (usages[id] !== void 0 || usageErrors[id] !== void 0) {
-				setUsages((prev) => {
-					const next = { ...prev };
-					delete next[id];
-					return next;
-				});
-				setUsageErrors((prev) => {
-					const next = { ...prev };
-					delete next[id];
-					return next;
-				});
-			}
+		const live = /* @__PURE__ */ new Set();
+		for (const { id } of PROVIDERS) for (const account of statuses[id]?.accounts ?? []) {
+			const key = `${id}:${account.key}`;
+			live.add(key);
+			if (usages[key] === void 0 && usageErrors[key] === void 0) loadUsage(id, account.key);
 		}
+		setUsages((prev) => dropStale(prev, live));
+		setUsageErrors((prev) => dropStale(prev, live));
 	}, [
 		statuses,
 		usages,
 		usageErrors,
 		loadUsage
 	]);
-	const login = (0, react.useCallback)(async (provider) => {
+	const loadModelDefaultsData = (0, react.useCallback)(async (signature) => {
+		if (rpc === void 0 || modelDefaultsInflightRef.current) return;
+		modelDefaultsInflightRef.current = true;
+		setModelDefaultsLoading(true);
+		try {
+			const catalog = await callSubscriptionsAuth(rpc, "modelDefaults", {});
+			if (!mountedRef.current) return;
+			const next = {};
+			for (const entry of catalog) next[entry.provider] = entry;
+			setModelDefaults(next);
+			setModelDefaultsLoadError(void 0);
+			setModelDefaultsLoadedFor(signature);
+			setModelDefaultsSaveErrors({});
+		} catch (error) {
+			if (mountedRef.current) setModelDefaultsLoadError(messageOf(error));
+		} finally {
+			modelDefaultsInflightRef.current = false;
+			if (mountedRef.current) setModelDefaultsLoading(false);
+		}
+	}, [rpc]);
+	(0, react.useEffect)(() => {
+		const loggedIn = PROVIDERS.filter(({ id }) => hasAccount(statuses[id])).map(({ id }) => id);
+		const signature = modelDefaultsSignature(statuses);
+		if (loggedIn.length > 0) {
+			if (shouldFetchModelDefaults({
+				loggedIn,
+				open: PROVIDERS.filter(({ id }) => modelDefaultsOpen[id] === true).map(({ id }) => id),
+				loadedFor: modelDefaultsLoadedFor,
+				signature,
+				failed: modelDefaultsLoadError !== void 0
+			})) loadModelDefaultsData(signature);
+		} else if (modelDefaultsLoadedFor !== void 0 || Object.keys(modelDefaults).length > 0 || Object.keys(modelDefaultsOpen).length > 0) {
+			setModelDefaults({});
+			setModelDefaultsSaveErrors({});
+			setModelDefaultsLoadError(void 0);
+			setModelDefaultsLoadedFor(void 0);
+			setModelDefaultsLoading(false);
+			setModelDefaultsOpen({});
+			setModelDefaultsFilters({});
+		}
+	}, [
+		statuses,
+		modelDefaults,
+		modelDefaultsOpen,
+		modelDefaultsLoadError,
+		modelDefaultsLoadedFor,
+		loadModelDefaultsData
+	]);
+	/** Open or close one provider's default-effort disclosure. */
+	const toggleModelDefaults = (0, react.useCallback)((provider) => {
+		setModelDefaultsOpen((prev) => ({
+			...prev,
+			[provider]: prev[provider] !== true
+		}));
+	}, []);
+	const setModelDefault = (0, react.useCallback)(async (provider, model, effort) => {
+		if (rpc === void 0) return;
+		const key = `${provider}/${model}`;
+		setModelDefaultsSaving(key);
+		setModelDefaultsPending((prev) => ({
+			...prev,
+			[key]: effort ?? ""
+		}));
+		setModelDefaultsSaveErrors((prev) => {
+			const next = { ...prev };
+			delete next[key];
+			return next;
+		});
+		try {
+			await callSubscriptionsAuth(rpc, "setModelDefault", {
+				provider,
+				model,
+				...effort === void 0 ? {} : { effort }
+			});
+			if (!mountedRef.current) return;
+			setModelDefaults((prev) => {
+				const section = prev[provider];
+				if (section === void 0) return prev;
+				return {
+					...prev,
+					[provider]: {
+						...section,
+						models: section.models.map((entry) => {
+							if (entry.id !== model) return entry;
+							if (effort !== void 0) return {
+								...entry,
+								configured: effort
+							};
+							const { configured: _cleared,...rest } = entry;
+							return rest;
+						})
+					}
+				};
+			});
+		} catch (error) {
+			if (mountedRef.current) setModelDefaultsSaveErrors((prev) => ({
+				...prev,
+				[key]: messageOf(error)
+			}));
+		} finally {
+			if (mountedRef.current) {
+				setModelDefaultsSaving((current) => current === key ? void 0 : current);
+				setModelDefaultsPending((prev) => {
+					const next = { ...prev };
+					delete next[key];
+					return next;
+				});
+			}
+		}
+	}, [rpc]);
+	const login = (0, react.useCallback)(async (provider, method) => {
 		if (rpc === void 0) return;
 		setProviderError(provider, void 0);
 		try {
-			const response = await callSubscriptionsAuth(rpc, "login", { provider });
+			const response = await callSubscriptionsAuth(rpc, "login", {
+				provider,
+				...method === void 0 ? {} : { method }
+			});
 			if (typeof response.authorizeUrl === "string" && response.authorizeUrl === "") {
 				await refresh();
 				return;
@@ -765,9 +1112,9 @@ function SubscriptionsSection(props) {
 			setStatuses((prev) => ({
 				...prev,
 				[provider]: {
+					accounts: prev[provider]?.accounts ?? [],
 					...prev[provider],
-					busy: true,
-					loggedIn: false
+					busy: true
 				}
 			}));
 			if (typeof response.userCode === "string" && response.userCode.length > 0) setDeviceCodes((prev) => ({
@@ -827,12 +1174,18 @@ function SubscriptionsSection(props) {
 		setProviderError,
 		refresh
 	]);
-	const logout = (0, react.useCallback)(async (provider, name) => {
+	const logout = (0, react.useCallback)(async (provider, account, display, name) => {
 		if (rpc === void 0) return;
-		if (!window.confirm(t("logoutConfirm", { provider: name }))) return;
+		if (!window.confirm(t("logoutAccountConfirm", {
+			provider: name,
+			account: display
+		}))) return;
 		setProviderError(provider, void 0);
 		try {
-			await callSubscriptionsAuth(rpc, "logout", { provider });
+			await callSubscriptionsAuth(rpc, "logout", {
+				provider,
+				account
+			});
 		} catch (error) {
 			setProviderError(provider, messageOf(error));
 		}
@@ -843,6 +1196,23 @@ function SubscriptionsSection(props) {
 		setProviderError,
 		refresh
 	]);
+	const setDefault = (0, react.useCallback)(async (provider, account) => {
+		if (rpc === void 0) return;
+		setProviderError(provider, void 0);
+		try {
+			await callSubscriptionsAuth(rpc, "setDefault", {
+				provider,
+				account
+			});
+		} catch (error) {
+			setProviderError(provider, messageOf(error));
+		}
+		await refresh();
+	}, [
+		rpc,
+		setProviderError,
+		refresh
+	]);
 	const copyDeviceCode = (0, react.useCallback)((provider, userCode) => {
 		navigator.clipboard?.writeText(userCode).then(() => {
 			if (!mountedRef.current) return;
@@ -993,9 +1363,7 @@ function SubscriptionsSection(props) {
 				const status = statuses[id];
 				const busy = status?.busy === true;
 				const deviceCode = deviceCodes[id];
-				const usage = usages[id];
-				const usageError = usageErrors[id];
-				const showUsage = status?.loggedIn === true && usage?.supported !== false && (usage !== void 0 || usageError !== void 0 || usageLoading[id] === true);
+				const accounts = status?.accounts ?? [];
 				return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					style: styles$4.card,
 					children: [
@@ -1021,10 +1389,119 @@ function SubscriptionsSection(props) {
 							style: styles$4.errorLine,
 							children: errors[id]
 						}),
+						accounts.map((account) => {
+							const usageKey = `${id}:${account.key}`;
+							const usage = usages[usageKey];
+							const usageError = usageErrors[usageKey];
+							const display = account.account ?? account.key;
+							const showUsage = usage?.supported !== false && (usage !== void 0 || usageError !== void 0 || usageLoading[usageKey] === true);
+							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								style: styles$4.accountRow,
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+									style: styles$4.accountHeader,
+									children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											style: styles$4.starButton,
+											title: account.isDefault ? t("defaultBadge") : t("setDefault"),
+											onClick: () => {
+												if (!account.isDefault) setDefault(id, account.key);
+											},
+											children: account.isDefault ? "★" : "☆"
+										}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+											style: styles$4.accountName,
+											children: display
+										}),
+										account.plan !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+											style: styles$4.usagePlan,
+											children: account.plan
+										}),
+										account.expiresAt !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+											style: styles$4.statusLine,
+											children: t("accountExpires", { date: new Date(account.expiresAt).toLocaleString() })
+										}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											style: {
+												...styles$4.button,
+												marginLeft: "auto",
+												flexShrink: 0
+											},
+											onClick: () => {
+												logout(id, account.key, display, name);
+											},
+											children: t("logout")
+										})
+									]
+								}), showUsage && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+									style: styles$4.usage,
+									children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											style: styles$4.usageHeader,
+											children: [
+												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+													style: styles$4.usageTitle,
+													children: t("usageTitle")
+												}),
+												usage?.plan !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+													style: styles$4.usagePlan,
+													children: t("usagePlan", { plan: usage.plan })
+												}),
+												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+													type: "button",
+													style: {
+														...styles$4.usageRefresh,
+														...usageLoading[usageKey] === true ? {
+															opacity: .5,
+															cursor: "default"
+														} : {}
+													},
+													disabled: usageLoading[usageKey] === true,
+													onClick: () => {
+														loadUsage(id, account.key, true);
+													},
+													children: t("usageRefresh")
+												})
+											]
+										}),
+										usage === void 0 && usageError === void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											style: styles$4.statusLine,
+											children: t("usageLoading")
+										}),
+										usageError !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											style: styles$4.errorLine,
+											children: t("usageError", { message: usageError })
+										}),
+										usage?.windows !== void 0 && usage.windows.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											style: styles$4.statusLine,
+											children: t("usageEmpty")
+										}),
+										(usage?.windows ?? []).map((window$1, index) => {
+											const percent = Math.min(100, Math.max(0, window$1.usedPercent));
+											return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+												style: styles$4.usageRow,
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+													style: styles$4.usageMeta,
+													children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: usageWindowLabel(t, window$1) }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [`${String(Math.round(percent))}%`, window$1.resetsAt !== void 0 && ` · ${t("usageResets", { date: new Date(window$1.resetsAt).toLocaleString() })}`] })]
+												}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+													style: styles$4.usageTrack,
+													children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { style: {
+														...styles$4.usageFill,
+														width: `${String(percent)}%`,
+														background: usageBarColor(percent)
+													} })
+												})]
+											}, index);
+										})
+									]
+								})]
+							}, account.key);
+						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							style: styles$4.actions,
 							children: [
-								!busy && status?.loggedIn !== true && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								!busy && accounts.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",
 									style: styles$4.button,
 									onClick: () => {
@@ -1032,86 +1509,172 @@ function SubscriptionsSection(props) {
 									},
 									children: t("login")
 								}),
-								busy && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								!busy && accounts.length > 0 && id === "claude" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",
 									style: styles$4.button,
 									onClick: () => {
-										cancel(id);
+										login(id, "oauth");
 									},
-									children: t("cancel")
+									children: t("addAccountOAuth")
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									style: styles$4.button,
+									onClick: () => {
+										login(id, "keychain");
+									},
+									children: t("addAccountKeychain")
+								})] }),
+								!busy && accounts.length > 0 && id !== "claude" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									style: styles$4.button,
+									onClick: () => {
+										login(id);
+									},
+									children: t("addAccount")
 								}),
-								status?.loggedIn === true && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								busy && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",
 									style: styles$4.button,
 									onClick: () => {
-										logout(id, name);
+										cancel(id);
 									},
-									children: t("logout")
+									children: t("cancel")
 								})
 							]
 						}),
-						showUsage && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							style: styles$4.usage,
-							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									style: styles$4.usageHeader,
-									children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											style: styles$4.usageTitle,
-											children: t("usageTitle")
+						!busy && accounts.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							style: styles$4.statusLine,
+							children: t("addAccountHint")
+						}),
+						accounts.length > 0 && (() => {
+							const open = modelDefaultsOpen[id] === true;
+							const catalog = modelDefaults[id];
+							const filter = modelDefaultsFilters[id] ?? "";
+							const view = deriveModelDefaultsView(catalog?.models, filter);
+							const saveErrors = Object.entries(modelDefaultsSaveErrors).filter(([key]) => key.startsWith(`${id}/`));
+							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								style: styles$4.defaultEffort,
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+										type: "button",
+										style: styles$4.defaultEffortToggle,
+										"aria-expanded": open,
+										onClick: () => {
+											toggleModelDefaults(id);
+										},
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												style: styles$4.usageTitle,
+												children: t("modelDefaultsTitle")
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												style: styles$4.usagePlan,
+												children: catalog === void 0 ? modelDefaultsLoading ? t("modelDefaultsLoading") : "" : view.total === 0 ? t("modelDefaultsSummaryEmpty") : view.overridden === 0 ? t("modelDefaultsSummaryNone", { total: view.total }) : t("modelDefaultsSummary", {
+													total: view.total,
+													configured: view.overridden
+												})
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												style: styles$4.defaultEffortChevron,
+												"aria-hidden": "true",
+												children: open ? "▲" : "▼"
+											})
+										]
+									}),
+									saveErrors.map(([key, message]) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+										style: styles$4.errorLine,
+										role: "alert",
+										children: t("modelDefaultsSaveFailedNamed", {
+											model: catalog?.models.find((entry) => `${id}/${entry.id}` === key)?.name ?? key.slice(id.length + 1),
+											message
+										})
+									}, key)),
+									open && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											style: styles$4.statusLine,
+											children: t("modelDefaultsHint")
 										}),
-										usage?.plan !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											style: styles$4.usagePlan,
-											children: t("usagePlan", { plan: usage.plan })
+										modelDefaultsLoadError !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											style: styles$4.errorLine,
+											children: t("modelDefaultsLoadFailed", { message: modelDefaultsLoadError })
+										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+											style: styles$4.actions,
+											children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+												type: "button",
+												style: styles$4.button,
+												onClick: () => {
+													setModelDefaultsLoadError(void 0);
+												},
+												children: t("modelDefaultsRetry")
+											})
+										})] }),
+										modelDefaultsLoadError === void 0 && catalog === void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											style: styles$4.statusLine,
+											children: t("modelDefaultsLoading")
 										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-											type: "button",
-											style: {
-												...styles$4.usageRefresh,
-												...usageLoading[id] === true ? {
-													opacity: .5,
-													cursor: "default"
-												} : {}
-											},
-											disabled: usageLoading[id] === true,
-											onClick: () => {
-												loadUsage(id);
-											},
-											children: t("usageRefresh")
+										view.showFilter && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+											style: styles$4.defaultEffortFilter,
+											value: filter,
+											placeholder: t("modelDefaultsFilterPlaceholder"),
+											"aria-label": t("modelDefaultsFilterPlaceholder"),
+											onChange: (event) => {
+												setModelDefaultsFilters((prev) => ({
+													...prev,
+													[id]: event.target.value
+												}));
+											}
+										}),
+										view.shown.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+											style: styles$4.defaultEffortList,
+											children: view.shown.map((model) => {
+												const rowKey = `${id}/${model.id}`;
+												const saving = modelDefaultsSaving === rowKey;
+												const labelId = `dsh-model-default-${id}-${model.id}`;
+												return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+													style: styles$4.defaultEffortRow,
+													children: [
+														/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+															id: labelId,
+															style: styles$4.defaultEffortName,
+															title: model.id,
+															children: model.name
+														}),
+														saving && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+															style: styles$4.defaultEffortSaving,
+															children: t("modelDefaultsSaving")
+														}),
+														/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+															style: styles$4.defaultEffortSelect,
+															"aria-labelledby": labelId,
+															value: modelDefaultsPending[rowKey] ?? model.configured ?? "",
+															disabled: saving,
+															onChange: (event) => {
+																setModelDefault(id, model.id, event.target.value === "" ? void 0 : event.target.value);
+															},
+															children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+																value: "",
+																children: t("modelDefaultsFollowProvider")
+															}), model.efforts.map((effort) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+																value: effort.id,
+																children: effort.name
+															}, effort.id))]
+														})
+													]
+												}, model.id);
+											})
+										}),
+										catalog !== void 0 && view.shown.length === 0 && filter.trim() !== "" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											style: styles$4.statusLine,
+											children: t("modelDefaultsFilterEmpty", { query: filter.trim() })
+										}),
+										view.withoutEfforts > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											style: styles$4.statusLine,
+											children: t("modelDefaultsNoLevels", { count: view.withoutEfforts })
 										})
-									]
-								}),
-								usage === void 0 && usageError === void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-									style: styles$4.statusLine,
-									children: t("usageLoading")
-								}),
-								usageError !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-									style: styles$4.errorLine,
-									children: t("usageError", { message: usageError })
-								}),
-								usage?.windows !== void 0 && usage.windows.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-									style: styles$4.statusLine,
-									children: t("usageEmpty")
-								}),
-								(usage?.windows ?? []).map((window$1, index) => {
-									const percent = Math.min(100, Math.max(0, window$1.usedPercent));
-									return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-										style: styles$4.usageRow,
-										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-											style: styles$4.usageMeta,
-											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: usageWindowLabel(t, window$1) }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [`${String(Math.round(percent))}%`, window$1.resetsAt !== void 0 && ` · ${t("usageResets", { date: new Date(window$1.resetsAt).toLocaleString() })}`] })]
-										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-											style: styles$4.usageTrack,
-											children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { style: {
-												...styles$4.usageFill,
-												width: `${String(percent)}%`,
-												background: usageBarColor(percent)
-											} })
-										})]
-									}, index);
-								})
-							]
-						}),
+									] })
+								]
+							});
+						})(),
 						busy && deviceCode !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							style: styles$4.deviceCode,
 							children: [
@@ -1969,14 +2532,21 @@ function VideoGenerateToolview(props) {
 * known state, so a transient failure never locks the toggle away.
 *
 * `sessionId` is a plain string: slot and command contexts brand it through
-* different dsh-session copies, and only the API-client boundary needs one.
+* different dsh-session copies, and only the service boundary needs one.
+*
+* `models` resolves lazily per call: the ui-model-selection service may
+* register after this plugin applies, and a shell without it (no model seat
+* at all) simply keeps the toggle hidden.
 */
-function createSpeedLoader(connection, sessionId) {
+function createSpeedLoader(connection, models, sessionId) {
 	return async () => {
 		const state = await callSubscriptionsAuth(connection.rpc, "speed", { sessionId });
-		const { result } = await connection.api.sessions.models({ sessionId });
-		if (!result.ok) throw new Error(`session.models failed: ${result.error.code}: ${result.error.message}`);
-		const current = result.value.current;
+		const directories = models();
+		if (directories === void 0) return {
+			visible: false,
+			tier: state.tier
+		};
+		const { current } = await directories.directoryFor(sessionId).load();
 		return {
 			visible: current !== null && current.provider === "codex" && state.fastModels.includes(current.model),
 			tier: state.tier
@@ -2256,13 +2826,14 @@ function apply(ctx) {
 		locale: NS,
 		inject: videoToolviewInjected
 	}, VideoGenerateToolview));
+	const models = () => ctx.get("modelDirectories");
 	ctx.slots.inject("conversation.input.right", () => ctx.slots.register({
 		name: "conversation.input.right",
 		id: "codex-speed",
 		order: 0,
 		locale: NS,
 		inject: (sessionId) => ({
-			loadSpeed: createSpeedLoader(connection, sessionId),
+			loadSpeed: createSpeedLoader(connection, models, sessionId),
 			setSpeed: createSpeedSetter(connection, sessionId)
 		})
 	}, SpeedSelect));
@@ -2275,7 +2846,7 @@ function apply(ctx) {
 			ui: {
 				kind: "popupSelect",
 				options: async (session) => {
-					const state = await createSpeedLoader(connection, session.sessionId)();
+					const state = await createSpeedLoader(connection, models, session.sessionId)();
 					if (!state.visible) throw new Error(t("commandFastUnavailable"));
 					return [{
 						id: "standard",