dsh-plugin-subscription-oauth 0.10.2 → 0.11.0

package/lib/client/locales.d.ts

@@ -8,7 +8,7 @@
 /** English strings. */
 export declare const en: {
     readonly nav: "Subscriptions";
-    readonly intro: "Sign in with a subscription account — Kimi Code, Grok (X Premium) or Google Antigravity. DeepSeek Harness keeps the tokens on this machine and streams every request through the provider's own API.";
+    readonly intro: "Sign in with the AI subscriptions you already pay for — no API key. Pick a provider below, connect once, and its models join the model picker with live plan usage. Tokens stay on this machine.";
     readonly loading: "Checking subscriptions…";
     readonly unavailable: "The subscriptions page needs the web connection service, which this composition does not provide.";
     readonly statusConnected: "Connected · {count} account(s)";
@@ -26,6 +26,7 @@ export declare const en: {
     readonly logout: "Sign out";
     readonly makeDefault: "Use by default";
     readonly defaultBadge: "Default";
+    readonly badgeLive: "Live";
     readonly accountNeedsLogin: "Sign in again";
     readonly accountNeedsLoginHint: "The provider refused this account's grant, so its token cannot be renewed";
     readonly accountExpired: "token expired";
@@ -122,6 +123,7 @@ export declare const zh: {
     logout: string;
     makeDefault: string;
     defaultBadge: string;
+    badgeLive: string;
     accountNeedsLogin: string;
     accountNeedsLoginHint: string;
     accountExpired: string;

package/lib/client/locales.js

@@ -8,7 +8,7 @@
 /** English strings. */
 export const en = {
     nav: 'Subscriptions',
-    intro: 'Sign in with a subscription account — Kimi Code, Grok (X Premium) or Google Antigravity. DeepSeek Harness keeps the tokens on this machine and streams every request through the provider\'s own API.',
+    intro: 'Sign in with the AI subscriptions you already pay for — no API key. Pick a provider below, connect once, and its models join the model picker with live plan usage. Tokens stay on this machine.',
     loading: 'Checking subscriptions…',
     unavailable: 'The subscriptions page needs the web connection service, which this composition does not provide.',
     statusConnected: 'Connected · {count} account(s)',
@@ -26,6 +26,7 @@ export const en = {
     logout: 'Sign out',
     makeDefault: 'Use by default',
     defaultBadge: 'Default',
+    badgeLive: 'Live',
     accountNeedsLogin: 'Sign in again',
     accountNeedsLoginHint: 'The provider refused this account\'s grant, so its token cannot be renewed',
     accountExpired: 'token expired',
@@ -102,7 +103,7 @@ export const en = {
 /** Chinese strings. */
 export const zh = {
     nav: '订阅',
-    intro: '使用订阅账号登录 —— Kimi Code、Grok (X Premium) 或 Google Antigravity。DeepSeek Harness 将令牌保存在本机，并通过各服务自己的 API 发起请求。',
+    intro: '使用你已付费的 AI 订阅 —— 无需 API Key。在下方选择服务，连接一次，其模型即进入模型选择器并显示实时额度。令牌仅保存在本机。',
     loading: '正在检查订阅…',
     unavailable: '订阅页面需要 Web 连接服务，当前组合未提供该服务。',
     statusConnected: '已连接 {count} 个账号',
@@ -120,6 +121,7 @@ export const zh = {
     logout: '退出登录',
     makeDefault: '设为默认',
     defaultBadge: '默认',
+    badgeLive: '已连接',
     accountNeedsLogin: '需重新登录',
     accountNeedsLoginHint: '服务方已拒绝该账号的授权，令牌无法自动续期',
     accountExpired: '令牌已过期',

package/lib/client.js

@@ -39,7 +39,7 @@ react_jsx_runtime = __toESM(react_jsx_runtime);
 /** English strings. */
 const en = {
 	nav: "Subscriptions",
-	intro: "Sign in with a subscription account — Kimi Code, Grok (X Premium) or Google Antigravity. DeepSeek Harness keeps the tokens on this machine and streams every request through the provider's own API.",
+	intro: "Sign in with the AI subscriptions you already pay for — no API key. Pick a provider below, connect once, and its models join the model picker with live plan usage. Tokens stay on this machine.",
 	loading: "Checking subscriptions…",
 	unavailable: "The subscriptions page needs the web connection service, which this composition does not provide.",
 	statusConnected: "Connected · {count} account(s)",
@@ -57,6 +57,7 @@ const en = {
 	logout: "Sign out",
 	makeDefault: "Use by default",
 	defaultBadge: "Default",
+	badgeLive: "Live",
 	accountNeedsLogin: "Sign in again",
 	accountNeedsLoginHint: "The provider refused this account's grant, so its token cannot be renewed",
 	accountExpired: "token expired",
@@ -133,7 +134,7 @@ const en = {
 /** Chinese strings. */
 const zh = {
 	nav: "订阅",
-	intro: "使用订阅账号登录 —— Kimi Code、Grok (X Premium) 或 Google Antigravity。DeepSeek Harness 将令牌保存在本机，并通过各服务自己的 API 发起请求。",
+	intro: "使用你已付费的 AI 订阅 —— 无需 API Key。在下方选择服务，连接一次，其模型即进入模型选择器并显示实时额度。令牌仅保存在本机。",
 	loading: "正在检查订阅…",
 	unavailable: "订阅页面需要 Web 连接服务，当前组合未提供该服务。",
 	statusConnected: "已连接 {count} 个账号",
@@ -151,6 +152,7 @@ const zh = {
 	logout: "退出登录",
 	makeDefault: "设为默认",
 	defaultBadge: "默认",
+	badgeLive: "已连接",
 	accountNeedsLogin: "需重新登录",
 	accountNeedsLoginHint: "服务方已拒绝该账号的授权，令牌无法自动续期",
 	accountExpired: "令牌已过期",
@@ -877,30 +879,52 @@ const styles = {
 		maxWidth: SECTION_WIDTH,
 		color: "var(--dsw-alias-label-primary)"
 	},
+	sectionHeader: {
+		display: "flex",
+		flexDirection: "column",
+		gap: 4,
+		marginBottom: 2
+	},
+	heading: {
+		margin: 0,
+		fontSize: 18,
+		lineHeight: "26px",
+		fontWeight: 600,
+		color: "var(--dsw-alias-label-primary)"
+	},
 	intro: {
 		margin: 0,
 		color: "var(--dsw-alias-label-tertiary)",
-		fontSize: 14,
-		lineHeight: "22px"
+		fontSize: 13,
+		lineHeight: "20px",
+		maxWidth: 560
 	},
 	card: {
 		border: "0.5px solid var(--dsw-alias-settings-card-stroke, var(--dsw-alias-border-l4))",
-		borderRadius: "var(--dsw-radius-xl, 20px)",
+		borderRadius: "var(--dsw-radius-xl, 16px)",
 		background: "var(--dsw-alias-settings-card-fill, var(--dsw-alias-bg-layer-2))",
-		padding: "12px 14px",
+		padding: "14px 16px",
 		display: "flex",
 		flexDirection: "column",
-		gap: 6
+		gap: 8,
+		transition: "border-color 120ms ease, background 120ms ease"
+	},
+	cardOpen: {
+		borderColor: "var(--dsw-alias-border-l2, var(--dsw-alias-border-l3))",
+		background: "var(--dsw-alias-settings-card-fill-hover, var(--dsw-alias-settings-card-fill, var(--dsw-alias-bg-layer-2)))"
 	},
 	cardHeader: {
 		display: "flex",
 		alignItems: "center",
-		gap: 8
+		gap: 10,
+		cursor: "pointer",
+		userSelect: "none"
 	},
 	cardBody: {
 		display: "flex",
 		flexDirection: "column",
-		gap: 6
+		gap: 10,
+		marginTop: 2
 	},
 	cardSummary: {
 		fontSize: 12,
@@ -911,18 +935,23 @@ const styles = {
 		width: 8,
 		height: 8,
 		borderRadius: "50%",
-		flexShrink: 0
+		flexShrink: 0,
+		boxShadow: "0 0 0 3px var(--dsw-alias-state-success-primary, transparent)"
 	},
 	name: {
-		fontWeight: 500,
+		fontWeight: 600,
 		fontSize: 14,
 		lineHeight: "22px",
 		color: "var(--dsw-alias-label-primary)"
 	},
 	providerId: {
-		fontSize: 12,
-		lineHeight: "18px",
-		color: "var(--dsw-alias-label-dimmed)"
+		fontSize: 11,
+		lineHeight: "16px",
+		color: "var(--dsw-alias-label-dimmed)",
+		padding: "1px 6px",
+		borderRadius: 999,
+		background: "var(--dsw-alias-bg-layer-3, var(--dsw-alias-bg-layer-1))",
+		fontFamily: "monospace"
 	},
 	statusLine: {
 		margin: 0,
@@ -954,9 +983,9 @@ const styles = {
 		flexDirection: "column",
 		gap: 6,
 		border: "0.5px solid var(--dsw-alias-border-l2)",
-		borderRadius: "var(--dsw-radius-lg, 16px)",
-		padding: "8px 10px",
-		marginTop: 4
+		borderRadius: "var(--dsw-radius-lg, 12px)",
+		padding: "10px 12px",
+		background: "var(--dsw-alias-bg-layer-1)"
 	},
 	accountHeader: {
 		display: "flex",
@@ -982,14 +1011,33 @@ const styles = {
 		userSelect: "all"
 	},
 	badge: {
-		fontSize: 11,
-		lineHeight: "16px",
-		padding: "0 6px",
-		borderRadius: 8,
-		background: "var(--dsw-alias-bg-layer-1)",
+		fontSize: 10,
+		lineHeight: "14px",
+		padding: "1px 7px",
+		borderRadius: 999,
+		fontWeight: 500,
+		background: "var(--dsw-alias-bg-layer-3, var(--dsw-alias-bg-layer-1))",
 		border: "0.5px solid var(--dsw-alias-border-l2)",
 		color: "var(--dsw-alias-label-secondary)"
 	},
+	badgeDefault: {
+		fontSize: 10,
+		lineHeight: "14px",
+		padding: "1px 7px",
+		borderRadius: 999,
+		fontWeight: 500,
+		background: "var(--dsw-alias-state-success-primary, #067647)",
+		color: "var(--dsw-alias-label-primary-foreground, #fff)"
+	},
+	badgeWarn: {
+		fontSize: 10,
+		lineHeight: "14px",
+		padding: "1px 7px",
+		borderRadius: 999,
+		fontWeight: 500,
+		background: "var(--dsw-alias-state-warn-primary, #f5a524)",
+		color: "var(--dsw-alias-label-primary-foreground, #fff)"
+	},
 	pushRight: {
 		marginLeft: "auto",
 		flexShrink: 0
@@ -1097,10 +1145,10 @@ const styles = {
 	usage: {
 		display: "flex",
 		flexDirection: "column",
-		gap: 6,
-		marginTop: 4,
+		gap: 8,
+		marginTop: 2,
 		borderTop: "0.5px solid var(--dsw-alias-border-l2)",
-		paddingTop: 8
+		paddingTop: 10
 	},
 	usageHeader: {
 		display: "flex",
@@ -1111,7 +1159,7 @@ const styles = {
 	usageRow: {
 		display: "flex",
 		flexDirection: "column",
-		gap: 3
+		gap: 4
 	},
 	usageLine: {
 		display: "flex",
@@ -1123,7 +1171,17 @@ const styles = {
 		height: 6,
 		borderRadius: 999,
 		background: "var(--dsw-alias-bg-layer-3, var(--dsw-alias-bg-layer-2))",
-		overflow: "hidden"
+		overflow: "hidden",
+		boxShadow: "inset 0 0 0 1px #8a8f9833"
+	},
+	usageAccount: {
+		display: "flex",
+		flexDirection: "column",
+		gap: 6,
+		padding: "8px 10px",
+		borderRadius: "var(--dsw-radius-md, 10px)",
+		background: "var(--dsw-alias-bg-layer-1)",
+		border: "0.5px solid var(--dsw-alias-border-l2)"
 	},
 	modelRow: {
 		display: "flex",
@@ -1284,7 +1342,7 @@ function UsageBlock(props) {
 				children: t("usageNone")
 			}),
 			usage.map((entry) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				style: styles.usageRow,
+				style: styles.usageAccount,
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					style: styles.usageLine,
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
@@ -1522,10 +1580,23 @@ function ProviderCard(props) {
 	*/
 	const summaryLine = !connectable ? t("statusAuto", { count: models.filter((model) => model.visible).length }) : busy ? t("statusBusy") : status.loggedIn ? t("statusConnected", { count: accounts.length }) : t("statusSignedOut");
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-		style: styles.card,
+		style: cardOpen ? {
+			...styles.card,
+			...styles.cardOpen
+		} : styles.card,
 		children: [
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				style: styles.cardHeader,
+				role: "button",
+				tabIndex: 0,
+				"aria-expanded": cardOpen,
+				onClick: toggleCardOpen,
+				onKeyDown: (event) => {
+					if (event.key === "Enter" || event.key === " ") {
+						event.preventDefault();
+						toggleCardOpen();
+					}
+				},
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						style: {
@@ -1542,6 +1613,10 @@ function ProviderCard(props) {
 						style: styles.providerId,
 						children: status.provider
 					}),
+					status.loggedIn && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						style: styles.badgeDefault,
+						children: t("badgeLive")
+					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						style: styles.cardSummary,
 						children: summaryLine
@@ -1552,7 +1627,10 @@ function ProviderCard(props) {
 						style: styles.pushRight,
 						"aria-expanded": cardOpen,
 						"aria-controls": `dsh-subscription-card-${status.provider}`,
-						onClick: toggleCardOpen,
+						onClick: (event) => {
+							event.stopPropagation();
+							toggleCardOpen();
+						},
 						children: cardOpen ? t("collapse") : t("edit")
 					})
 				]
@@ -1601,11 +1679,11 @@ function ProviderCard(props) {
 									children: account.label
 								}),
 								account.isDefault && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									style: styles.badge,
+									style: styles.badgeDefault,
 									children: t("defaultBadge")
 								}),
 								account.needsLogin === true && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									style: styles.badge,
+									style: styles.badgeWarn,
 									title: t("accountNeedsLoginHint"),
 									children: t("accountNeedsLogin")
 								}),
@@ -2079,6 +2157,20 @@ function SubscriptionsSection(props) {
 		startPolling,
 		stopPolling
 	]);
+	/**
+	* Signed-in providers read first: a route with a live account is the one a
+	* reader most likely wants, and `auto` (which owns no account) leads the rest.
+	* The sort is stable, so equal ranks keep the host's configured order.
+	*/
+	const orderedProviders = (0, react.useMemo)(() => {
+		const providers = status?.providers ?? [];
+		const rank = (provider) => {
+			if (provider.provider === "auto") return 0;
+			if (provider.loggedIn) return 1;
+			return 2;
+		};
+		return [...providers].sort((left, right) => rank(left) - rank(right));
+	}, [status?.providers]);
 	/** Run one action for one provider, reporting its own failure. */
 	const act = (0, react.useCallback)(async (provider, run) => {
 		setBusyAction(true);
@@ -2248,9 +2340,15 @@ function SubscriptionsSection(props) {
 		style: styles.section,
 		children: [
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: subscriptionsCss }),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-				style: styles.intro,
-				children: t("intro")
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				style: styles.sectionHeader,
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h2", {
+					style: styles.heading,
+					children: t("nav")
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+					style: styles.intro,
+					children: t("intro")
+				})]
 			}),
 			error !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 				className: "dsh-subscription-error",
@@ -2260,7 +2358,7 @@ function SubscriptionsSection(props) {
 				style: styles.statusLine,
 				children: t("loading")
 			}),
-			status?.providers.map((provider) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ProviderCard, {
+			orderedProviders.map((provider) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ProviderCard, {
 				status: provider,
 				t,
 				busyAction,