@eddyskywalker/dsh-chatgpt-subscription 0.13.2 → 0.15.0

package/lib/client.js

@@ -685,6 +685,22 @@ window.__ModuleLoader__.load({
 					...body
 				});
 			}
+			/**
+			* Import this machine's Codex CLI sign-in, answering with the refreshed status.
+			*
+			* The body names the source rather than the URL carrying it, so the host can
+			* refuse a sign-in it does not import with a sentence instead of a silent
+			* no-op. The type is 'codex' alone on purpose: Claude Code and MiniMax Code are
+			* imported from their own provider settings, and a union here would invite a
+			* call the host always answers with a 400.
+			*/
+			adoptLocalLogin(source) {
+				return post$2(`${ROUTE_PREFIX}/adopt`, { source });
+			}
+			/** Forget every imported snapshot. The CLIs' own files are never touched. */
+			disableAdoptedLocalLogins() {
+				return post$2(`${ROUTE_PREFIX}/adopt/disable`, {});
+			}
 			refresh() {
 				return post$2(`${ROUTE_PREFIX}/token/refresh`, {});
 			}
@@ -1436,6 +1452,38 @@ window.__ModuleLoader__.load({
 					setStatus(next);
 				});
 			};
+			/**
+			* Forget every imported snapshot: the undo for the local sign-in import below.
+			*
+			* ONE control for the whole pool rather than one per row, because the host's
+			* route deliberately ignores an accountId and clears every imported row at once.
+			* That is not an oversight to route around: the pool refuses to delete an
+			* adopted credential, so a per-row control here could only ever be a button that
+			* silently clears its neighbours — a worse bug than offering no button at all.
+			* The Codex CLI's own file is not deleted, rewritten or moved by this; it only
+			* makes this plugin forget the copy it took.
+			*/
+			const stopImporting = async () => {
+				await run("adopt-disable", async () => {
+					setStatus(await apiRef.current.disableAdoptedLocalLogins());
+				});
+			};
+			/**
+			* Copy this machine's Codex CLI sign-in into the pool as a snapshot.
+			*
+			* The status is re-read rather than taken from the route's answer: the route
+			* answers with the pool's refreshed status, which knows nothing about the
+			* CLI file, so adopting from its value would flip the block to "not detected"
+			* one click after the import succeeded. The file is still there — the import
+			* copies it — so /status is the answer that tells the truth, and the row the
+			* account just created comes back with it.
+			*/
+			const importLocalSignIn = async () => {
+				await run("adopt", async () => {
+					await apiRef.current.adoptLocalLogin("codex");
+					await load(true);
+				});
+			};
 			const setRotationStrategy = async (strategy) => {
 				await run("strategy", async () => {
 					const next = await apiRef.current.accountAction("strategy", { strategy });
@@ -1472,6 +1520,7 @@ window.__ModuleLoader__.load({
 					setBusy(null);
 				}
 			};
+			const importedAccounts = (status?.accounts ?? []).filter((account) => account.removable === false);
 			status?.account;
 			const preferences = status?.preferences;
 			const quota = status?.quota;
@@ -1515,6 +1564,21 @@ window.__ModuleLoader__.load({
 							onRelogin: (accountId) => relogin(accountId),
 							onSetStrategy: (strategy) => void setRotationStrategy(strategy),
 							showQuota: true,
+							renderLoginActions: () => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsha-account-add-actions",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									className: "dsha-btn dsha-btn-primary",
+									disabled: busy !== null,
+									onClick: () => void startLogin(),
+									children: login?.active ? t("pending") : t("addAccount")
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									className: "dsha-btn",
+									disabled: busy !== null,
+									"aria-label": t("localCodexLoginImport"),
+									onClick: () => void importLocalSignIn(),
+									children: busy === "adopt" ? t("localCodexLoginImporting") : t("localCodexLoginImport")
+								})]
+							}),
 							renderDetails: (entry) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: entry.planLabel && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
 								t("plan"),
 								": ",
@@ -1548,7 +1612,21 @@ window.__ModuleLoader__.load({
 										onClick: refreshToken,
 										children: t("refreshToken")
 									}) : null]
-								})
+								}),
+								importedAccounts.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "dsha-muted",
+									children: formatPoolLabel(t("stopImportingHint"), { count: importedAccounts.length })
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									className: "dsha-actions",
+									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										className: "dsha-btn",
+										type: "button",
+										disabled: busy !== null,
+										"aria-label": formatPoolLabel(t("stopImportingLabel"), { count: importedAccounts.length }),
+										onClick: () => void stopImporting(),
+										children: busy === "adopt-disable" ? t("stopImportingBusy") : t("stopImporting")
+									})
+								})] }) : null
 							]
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Section, {
@@ -7143,9 +7221,6 @@ window.__ModuleLoader__.load({
 			importClaudeCode: "导入本机 Claude Code 登录态",
 			importing: "导入中...",
 			stopImporting: "停止导入",
-			importHint: "读取本机 Claude Code 的登录凭据，作为只读快照加入账号池。不会修改、移动或删除 Claude Code 自己的文件，停止导入只是让本插件忘记这份快照。",
-			importUnavailable: "未找到可导入的本机 Claude Code 登录态。",
-			importSearched: "查找位置：{paths}",
 			connection: "连接",
 			testConnection: "测试连接",
 			testingConnection: "测试中...",
@@ -7263,9 +7338,6 @@ window.__ModuleLoader__.load({
 			importClaudeCode: "Import the local Claude Code sign-in",
 			importing: "Importing...",
 			stopImporting: "Stop importing",
-			importHint: "Reads the local Claude Code credential and adds it to the account pool as a read-only snapshot. Claude Code's own file is never modified, moved or deleted; stopping the import only makes this plugin forget the snapshot.",
-			importUnavailable: "No usable local Claude Code sign-in was found.",
-			importSearched: "Searched: {paths}",
 			connection: "Connection",
 			testConnection: "Test connection",
 			testingConnection: "Testing...",
@@ -7919,118 +7991,102 @@ window.__ModuleLoader__.load({
 								entry.source === "claude-code" ? t.sourceClaudeCode : t.sourceManaged
 							] })
 						] }),
-						children: [
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "dsha-muted",
-								style: { paddingTop: 12 },
-								children: t.importHint
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "dsha-muted",
-								children: status?.claudeCodeSignInAvailable === true ? t.importClaudeCode : t.importUnavailable
-							}),
-							status?.claudeCodePaths !== void 0 && status.claudeCodePaths.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "dsha-muted dshcl-mono",
-								children: t.importSearched.replace("{paths}", status.claudeCodePaths.join(" · "))
-							}),
-							hasAdopted && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-								className: "dsha-actions",
-								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-									className: "dsha-btn",
-									disabled: busy !== null,
-									"aria-label": t.stopImporting,
-									onClick: () => void stopImporting(),
-									children: busy === "adopt-disable" ? t.importing : t.stopImporting
-								})
-							}),
-							flow !== null && flow.status !== "idle" && flow.status !== "complete" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-								className: "dshcl-flow",
-								children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t.signInSection }),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-										className: "dsha-muted",
-										children: flow?.status === "error" ? `${t.loginFailed}: ${flow.error ?? ""}` : flow?.status === "exchanging" ? t.loginExchanging : flow?.mode === "manual" ? t.loginModeManual : t.loginModeLoopback
-									}),
-									flow?.hint !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-										className: "dsha-muted",
-										children: flow.hint
+						children: [hasAdopted && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "dsha-actions",
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								className: "dsha-btn",
+								disabled: busy !== null,
+								"aria-label": t.stopImporting,
+								onClick: () => void stopImporting(),
+								children: busy === "adopt-disable" ? t.importing : t.stopImporting
+							})
+						}), flow !== null && flow.status !== "idle" && flow.status !== "complete" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "dshcl-flow",
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t.signInSection }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "dsha-muted",
+									children: flow?.status === "error" ? `${t.loginFailed}: ${flow.error ?? ""}` : flow?.status === "exchanging" ? t.loginExchanging : flow?.mode === "manual" ? t.loginModeManual : t.loginModeLoopback
+								}),
+								flow?.hint !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "dsha-muted",
+									children: flow.hint
+								}),
+								flow?.fallbackReason !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "dsha-notice",
+									children: t.loginFallbackReason.replace("{detail}", flow.fallbackReason)
+								}),
+								flow?.authUrl !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsha-label",
+										children: t.authorizeUrl
 									}),
-									flow?.fallbackReason !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-										className: "dsha-notice",
-										children: t.loginFallbackReason.replace("{detail}", flow.fallbackReason)
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", {
+										className: "dshcl-flow-url",
+										children: flow.authUrl
 									}),
-									flow?.authUrl !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "dsha-label",
-											children: t.authorizeUrl
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", {
-											className: "dshcl-flow-url",
-											children: flow.authUrl
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-											className: "dsha-actions",
-											children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("a", {
-												className: "dsha-btn",
-												href: flow.authUrl,
-												target: "_blank",
-												rel: "noreferrer noopener",
-												children: t.openAuthorizeUrl
-											})
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+										className: "dsha-actions",
+										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("a", {
+											className: "dsha-btn",
+											href: flow.authUrl,
+											target: "_blank",
+											rel: "noreferrer noopener",
+											children: t.openAuthorizeUrl
 										})
-									] }),
-									flow?.redirectUri !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-										className: "dsha-row",
-										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "dsha-label",
-											children: t.redirectUri
-										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "dsha-value dshcl-mono",
-											children: flow.redirectUri
-										})]
-									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-										className: "dshcl-paste",
-										children: [
-											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t.manualPasteSection }),
-											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-												className: "dsha-muted",
-												children: t.manualPasteHint
-											}),
-											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-												className: "dshcl-paste-row",
-												children: [
-													/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-														type: "text",
-														className: "dsha-select",
-														"aria-label": t.manualPasteSection,
-														placeholder: t.manualPastePlaceholder,
-														value: pasteValue,
-														disabled: busy !== null,
-														onChange: (event) => setPasteValue(event.currentTarget.value),
-														onKeyDown: (event) => {
-															if (event.key === "Enter") submitPaste();
-														}
-													}),
-													/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-														className: "dsha-btn dsha-btn-primary",
-														disabled: busy !== null || pasteValue.trim() === "",
-														onClick: () => void submitPaste(),
-														children: busy === "login-input" ? t.manualPasteSubmitting : t.manualPasteSubmit
-													}),
-													/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-														className: "dsha-btn",
-														disabled: busy !== null,
-														onClick: () => void cancelLogin(),
-														children: t.cancelSignIn
-													})
-												]
-											})
-										]
 									})
-								]
-							})
-						]
+								] }),
+								flow?.redirectUri !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+									className: "dsha-row",
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsha-label",
+										children: t.redirectUri
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsha-value dshcl-mono",
+										children: flow.redirectUri
+									})]
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+									className: "dshcl-paste",
+									children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t.manualPasteSection }),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											className: "dsha-muted",
+											children: t.manualPasteHint
+										}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "dshcl-paste-row",
+											children: [
+												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+													type: "text",
+													className: "dsha-select",
+													"aria-label": t.manualPasteSection,
+													placeholder: t.manualPastePlaceholder,
+													value: pasteValue,
+													disabled: busy !== null,
+													onChange: (event) => setPasteValue(event.currentTarget.value),
+													onKeyDown: (event) => {
+														if (event.key === "Enter") submitPaste();
+													}
+												}),
+												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+													className: "dsha-btn dsha-btn-primary",
+													disabled: busy !== null || pasteValue.trim() === "",
+													onClick: () => void submitPaste(),
+													children: busy === "login-input" ? t.manualPasteSubmitting : t.manualPasteSubmit
+												}),
+												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+													className: "dsha-btn",
+													disabled: busy !== null,
+													onClick: () => void cancelLogin(),
+													children: t.cancelSignIn
+												})
+											]
+										})
+									]
+								})
+							]
+						})]
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 						className: "dsha-group",
@@ -9334,6 +9390,12 @@ window.__ModuleLoader__.load({
 				hubSwitchOn: "启用 {name}",
 				hubSwitchOff: "停用 {name}",
 				hubCardLabel: "{name}，{annotation}",
+				localCodexLoginImport: "导入本机 Codex CLI 登录",
+				localCodexLoginImporting: "导入中…",
+				stopImporting: "停止导入全部本机登录",
+				stopImportingLabel: "停止导入全部本机登录（当前 {count} 个）",
+				stopImportingBusy: "停止导入中…",
+				stopImportingHint: "停止导入只会让本插件忘记本机 CLI 登录的副本；Codex CLI 自己的登录文件不会被删除或修改。账号池不允许逐条删除借来的凭据，所以这里一次会停止全部导入。",
 				modelChecklistCount: "已启用 {count}/{total}"
 			},
 			en: {
@@ -9484,6 +9546,12 @@ window.__ModuleLoader__.load({
 				hubSwitchOn: "Enable {name}",
 				hubSwitchOff: "Disable {name}",
 				hubCardLabel: "{name}, {annotation}",
+				localCodexLoginImport: "Import the local Codex CLI sign-in",
+				localCodexLoginImporting: "Importing…",
+				stopImporting: "Stop importing all local sign-ins",
+				stopImportingLabel: "Stop importing all local sign-ins ({count} currently imported)",
+				stopImportingBusy: "Stopping the import…",
+				stopImportingHint: "Stopping the import only makes this plugin forget its copy of the local CLI sign-in; the Codex CLI own sign-in file is never deleted or changed. The account pool does not allow deleting a borrowed credential one at a time, so this stops every import at once.",
 				modelChecklistCount: "{count}/{total} enabled"
 			}
 		};