dsh-plugin-subscriptions 0.5.0 → 0.5.1

package/lib/client/locales.d.ts

@@ -19,6 +19,10 @@ export declare const en: {
     manualPlaceholder: string;
     submit: string;
     loginMissingUrl: string;
+    deviceCodePrompt: string;
+    deviceCodeCopy: string;
+    deviceCodeCopied: string;
+    deviceCodeOpenPage: string;
     usageTitle: string;
     usageRefresh: string;
     usageLoading: string;
@@ -68,6 +72,10 @@ export declare const zh: {
     manualPlaceholder: string;
     submit: string;
     loginMissingUrl: string;
+    deviceCodePrompt: string;
+    deviceCodeCopy: string;
+    deviceCodeCopied: string;
+    deviceCodeOpenPage: string;
     usageTitle: string;
     usageRefresh: string;
     usageLoading: string;

package/lib/client/locales.js

@@ -19,6 +19,10 @@ export const en = {
     manualPlaceholder: 'Paste the callback URL or code',
     submit: 'Submit',
     loginMissingUrl: 'login answered without an authorizeUrl',
+    deviceCodePrompt: 'Enter this code on the GitHub verification page:',
+    deviceCodeCopy: 'Copy code',
+    deviceCodeCopied: 'Copied',
+    deviceCodeOpenPage: 'Open GitHub verification page',
     usageTitle: 'Usage',
     usageRefresh: 'Refresh',
     usageLoading: 'Loading usage…',
@@ -68,6 +72,10 @@ export const zh = {
     manualPlaceholder: '粘贴回调 URL 或授权码',
     submit: '提交',
     loginMissingUrl: 'login 响应缺少 authorizeUrl',
+    deviceCodePrompt: '在 GitHub 验证页面输入此验证码：',
+    deviceCodeCopy: '复制验证码',
+    deviceCodeCopied: '已复制',
+    deviceCodeOpenPage: '打开 GitHub 验证页面',
     usageTitle: '用量',
     usageRefresh: '刷新',
     usageLoading: '用量加载中…',

package/lib/client.js

@@ -52,6 +52,10 @@ const en = {
 	manualPlaceholder: "Paste the callback URL or code",
 	submit: "Submit",
 	loginMissingUrl: "login answered without an authorizeUrl",
+	deviceCodePrompt: "Enter this code on the GitHub verification page:",
+	deviceCodeCopy: "Copy code",
+	deviceCodeCopied: "Copied",
+	deviceCodeOpenPage: "Open GitHub verification page",
 	usageTitle: "Usage",
 	usageRefresh: "Refresh",
 	usageLoading: "Loading usage…",
@@ -101,6 +105,10 @@ const zh = {
 	manualPlaceholder: "粘贴回调 URL 或授权码",
 	submit: "提交",
 	loginMissingUrl: "login 响应缺少 authorizeUrl",
+	deviceCodePrompt: "在 GitHub 验证页面输入此验证码：",
+	deviceCodeCopy: "复制验证码",
+	deviceCodeCopied: "已复制",
+	deviceCodeOpenPage: "打开 GitHub 验证页面",
 	usageTitle: "用量",
 	usageRefresh: "刷新",
 	usageLoading: "用量加载中…",
@@ -150,6 +158,10 @@ const PROVIDERS = [
 	{
 		id: "grok",
 		name: "Grok (X Premium)"
+	},
+	{
+		id: "copilot",
+		name: "GitHub Copilot"
 	}
 ];
 /** Business error returned by the `/subscriptions-auth` channel (error branch message). */
@@ -350,6 +362,24 @@ const styles$4 = {
 		lineHeight: "22px",
 		background: "var(--dsw-alias-bg-layer-1)",
 		color: "var(--dsw-alias-label-primary)"
+	},
+	deviceCode: {
+		marginTop: 4,
+		display: "flex",
+		flexDirection: "column",
+		gap: 6,
+		border: "1px solid var(--dsw-alias-border-l2)",
+		borderRadius: 8,
+		padding: "10px 12px",
+		background: "var(--dsw-alias-bg-layer-1)"
+	},
+	deviceCodeText: {
+		fontFamily: "monospace",
+		fontSize: 18,
+		lineHeight: "24px",
+		letterSpacing: 2,
+		color: "var(--dsw-alias-label-primary)",
+		userSelect: "all"
 	}
 };
 /** Status dot color for one provider state. */
@@ -407,8 +437,12 @@ function SubscriptionsSection(props) {
 	const [manualDrafts, setManualDrafts] = (0, react.useState)({
 		codex: "",
 		claude: "",
-		grok: ""
+		grok: "",
+		copilot: ""
 	});
+	/** Pending device-flow codes (copilot), shown while the attempt polls. */
+	const [deviceCodes, setDeviceCodes] = (0, react.useState)({});
+	const [copiedCode, setCopiedCode] = (0, react.useState)(void 0);
 	const [usages, setUsages] = (0, react.useState)({});
 	const [usageErrors, setUsageErrors] = (0, react.useState)({});
 	const [usageLoading, setUsageLoading] = (0, react.useState)({});
@@ -445,7 +479,15 @@ function SubscriptionsSection(props) {
 		setStatuses(response.providers);
 		for (const { id } of PROVIDERS) {
 			const status = response.providers[id];
-			if (status.loggedIn || !status.busy) stopPolling(id);
+			if (status.loggedIn || !status.busy) {
+				stopPolling(id);
+				setDeviceCodes((prev) => {
+					if (prev[id] === void 0) return prev;
+					const next = { ...prev };
+					delete next[id];
+					return next;
+				});
+			}
 		}
 	}, [rpc, stopPolling]);
 	const startPolling = (0, react.useCallback)((provider) => {
@@ -536,7 +578,6 @@ function SubscriptionsSection(props) {
 				return;
 			}
 			if (typeof response.authorizeUrl !== "string") throw new SubscriptionsAuthError(t("loginMissingUrl"));
-			window.open(response.authorizeUrl, "_blank", "noopener");
 			if (!mountedRef.current) return;
 			setStatuses((prev) => ({
 				...prev,
@@ -546,6 +587,14 @@ function SubscriptionsSection(props) {
 					loggedIn: false
 				}
 			}));
+			if (typeof response.userCode === "string" && response.userCode.length > 0) setDeviceCodes((prev) => ({
+				...prev,
+				[provider]: {
+					userCode: response.userCode,
+					verificationUrl: response.authorizeUrl
+				}
+			}));
+			else window.open(response.authorizeUrl, "_blank", "noopener");
 			startPolling(provider);
 		} catch (error) {
 			setProviderError(provider, messageOf(error));
@@ -611,6 +660,15 @@ function SubscriptionsSection(props) {
 		setProviderError,
 		refresh
 	]);
+	const copyDeviceCode = (0, react.useCallback)((provider, userCode) => {
+		navigator.clipboard?.writeText(userCode).then(() => {
+			if (!mountedRef.current) return;
+			setCopiedCode(provider);
+			setTimeout(() => {
+				if (mountedRef.current) setCopiedCode((current) => current === provider ? void 0 : current);
+			}, 1500);
+		}).catch(() => void 0);
+	}, []);
 	if (rpc === void 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 		style: styles$4.intro,
 		children: t("unavailable")
@@ -623,6 +681,7 @@ function SubscriptionsSection(props) {
 		}), PROVIDERS.map(({ id, name }) => {
 			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);
@@ -742,7 +801,38 @@ function SubscriptionsSection(props) {
 							})
 						]
 					}),
-					busy && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", {
+					busy && deviceCode !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						style: styles$4.deviceCode,
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								style: styles$4.statusLine,
+								children: t("deviceCodePrompt")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								style: styles$4.deviceCodeText,
+								children: deviceCode.userCode
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								style: styles$4.actions,
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									style: styles$4.button,
+									onClick: () => {
+										copyDeviceCode(id, deviceCode.userCode);
+									},
+									children: copiedCode === id ? t("deviceCodeCopied") : t("deviceCodeCopy")
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									style: styles$4.button,
+									onClick: () => {
+										window.open(deviceCode.verificationUrl, "_blank", "noopener");
+									},
+									children: t("deviceCodeOpenPage")
+								})]
+							})
+						]
+					}),
+					busy && deviceCode === void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", {
 						style: styles$4.manual,
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("summary", { children: t("manualSummary") }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							style: styles$4.manualRow,