dsh-codex-subscription 1.11.3 → 1.12.0

package/AGENTS.md

@@ -6,7 +6,7 @@ Use this guide when a user asks an Agent to install, update, verify, or remove
 ## Safety
 
 - Confirm the target DSH installation and profile. Use `web` only when it is the user's target.
-- Use the exact `1.11.3` package below; do not install a moving branch.
+- Use the exact `1.12.0` package below; do not install a moving branch.
 - Never print OAuth credentials, account IDs, authorization callbacks, or credential-store contents.
 - Preserve the DSH profile, unrelated plugins, sessions, and saved sign-in.
 - Do not start, stop, or restart DSH without explicit permission.
@@ -34,13 +34,13 @@ For an official DSH installation run through npm, keep the complete `npx` prefix
 run command does not create a global `dsh` command:
 
 ```sh
-npx -y @deepseek-ai/dsh@0.1.1-rc.2 plugin --profile web add dsh-codex-subscription@1.11.3
+npx -y @deepseek-ai/dsh@0.1.1-rc.2 plugin --profile web add dsh-codex-subscription@1.12.0
 ```
 
 With an existing global `dsh` command:
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@1.11.3
+dsh plugin --profile web add dsh-codex-subscription@1.12.0
 ```
 
 Use the same `add` command to update or repair. This is the complete package-changing operation.
@@ -58,7 +58,7 @@ dsh --profile web --dump-config
 
 For the official npm route, run the same checks with `npx -y @deepseek-ai/dsh@0.1.1-rc.2` in place of `dsh`.
 
-1. `dsh-codex-subscription` version `1.11.3` appears exactly once.
+1. `dsh-codex-subscription` version `1.12.0` appears exactly once.
 2. `codex-subscription` appears exactly once in the composed config.
 3. No unrelated plugin or profile was changed and DSH was not restarted.
 

package/README.en.md

@@ -133,7 +133,7 @@ Restart DSH manually after installation, then:
 
 ## Features
 
-- ChatGPT OAuth sign-in with credentials kept on the host;
+- ChatGPT OAuth sign-in with credentials kept on the host; manually add, switch, and remove accounts without automatic rotation or quota pooling;
 - Codex models and Beta image generation/editing directly inside DSH conversations;
 - A clear global choice between DSH default search and Codex subscription search; it applies to every model and session rather than following the selected model;
 - Actual backend-provided quota, reset time, and freshness;
@@ -153,7 +153,7 @@ The plugin can follow an existing HTTPS proxy from the process environment or op
   <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/composer-quota-en.png" width="800" alt="Codex quota inside the composer">
 </p>
 
-Choose Off, Percent, Progress bar, or Beta Runway in Settings. The compact display appears only for a selected Codex model. Runway is opt-in and estimates the current pace only from official remaining-percentage observations kept in local runtime memory; it stays quiet with insufficient evidence and recalibrates after a reset, account change, or disable.
+Choose Off, Percent, Progress bar, or Beta Runway in Settings. The compact display appears only for a selected Codex model. Runway is opt-in and estimates pace only from official remaining-percentage observations. It needs at least three samples; sustained high use usually produces a range in 5–10 minutes, while low use takes longer or reports a stable state. Non-sensitive observations from the last 24 hours are kept locally so calibration can continue after restart; a quota reset, account switch, or disabling the feature starts a new calibration period.
 Standard Codex uses the lowest remaining window returned by the service; Spark uses its independent quota. The plugin does not hard-code a
 “5-hour + weekly” layout or invent Credits and spending caps that the service did not return.
 

package/README.md

@@ -134,7 +134,7 @@ dsh --profile web --dump-config
 
 ## 功能
 
-- ChatGPT OAuth 登录，凭据保留在本机；
+- ChatGPT OAuth 登录，凭据保留在本机；可手动添加、切换和移除多个账号，不会自动轮换或合并额度；
 - Codex 模型和 Beta 图片生成与编辑直接出现在 DSH 会话中；
 - 搜索来源是全局设置，可在 DSH 默认搜索与 Codex 订阅搜索之间切换；它对所有模型和会话生效，不会随当前模型自动切换；
 - 设置页显示服务端返回的额度、重置时间和更新时间；
@@ -154,7 +154,7 @@ dsh --profile web --dump-config
   <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/composer-quota.png" width="800" alt="中文 DSH 输入框内的 Codex 剩余额度进度条">
 </p>
 
-可在设置中选择关闭、百分比、进度条或 Beta 续航预测；紧凑额度只在选择 Codex 模型时显示。续航预测仅在用户主动选择后，根据本机运行内存中观察到的官方剩余百分比估算当前消耗速度；样本不足时保持安静，额度重置、登录变化或关闭功能后会重新校准。普通 Codex 使用服务端返回窗口中剩余最少的一项，
+可在设置中选择关闭、百分比、进度条或 Beta 续航预测；紧凑额度只在选择 Codex 模型时显示。续航预测仅在用户主动选择后，根据官方剩余百分比估算当前消耗速度。它至少需要 3 个样本；持续高消耗时通常 5–10 分钟即可给出范围，消耗较低时会延长观察或显示稳定。最近 24 小时的无敏感信息观测会保存在本机，重启后可以继续校准；额度重置、账号切换或关闭功能会开启新的校准周期。普通 Codex 使用服务端返回窗口中剩余最少的一项，
 Spark 使用独立额度。插件不会写死“5 小时 + 每周”，也不会虚构服务端没有返回的 Credits 或消费上限。
 
 ### 安全使用额度重置

package/compatibility.json

@@ -8,6 +8,7 @@
     "0.1.1-rc.2"
   ],
   "previews": [
-    "0.1.2-alpha.2"
+    "0.1.2-alpha.2",
+    "0.1.2-alpha.3"
   ]
 }

package/lib/client.js

@@ -245,6 +245,13 @@ window.__ModuleLoader__.load({
 			browserLogin: "浏览器登录",
 			deviceLogin: "设备代码登录",
 			logout: "退出登录",
+			addAccount: "添加账号",
+			accountLabel: "账号名称",
+			switchAccount: "切换",
+			removeAccount: "移除",
+			removeConfirm: "确认移除",
+			removeCancel: "保留",
+			signOutAll: "退出全部账号",
 			cancel: "取消",
 			submit: "提交授权码",
 			openLogin: "打开登录页",
@@ -329,7 +336,7 @@ window.__ModuleLoader__.load({
 			quickQuotaBar: "进度条",
 			quickQuotaForecast: "续航预测",
 			quickQuotaBeta: "Beta",
-			quickQuotaForecastHint: "至少观察 30 分钟且额度变化 1% 后显示；重启 DSH 后重新校准。",
+			quickQuotaForecastHint: "按消耗速度自适应校准；高消耗通常 5–10 分钟可估算，低消耗会显示用量稳定。进度会在本机保留。",
 			contextTitle: "上下文窗口",
 			contextStandard: "标准",
 			contextStandardHint: "使用模型目录默认值；官方 Agent 预设会自动管理上下文。",
@@ -421,6 +428,13 @@ window.__ModuleLoader__.load({
 			browserLogin: "Browser sign-in",
 			deviceLogin: "Device-code sign-in",
 			logout: "Sign out",
+			addAccount: "Add account",
+			accountLabel: "Account name",
+			switchAccount: "Switch",
+			removeAccount: "Remove",
+			removeConfirm: "Confirm remove",
+			removeCancel: "Keep",
+			signOutAll: "Sign out all",
 			cancel: "Cancel",
 			submit: "Submit authorization code",
 			openLogin: "Open sign-in page",
@@ -505,7 +519,7 @@ window.__ModuleLoader__.load({
 			quickQuotaBar: "Progress bar",
 			quickQuotaForecast: "Runway",
 			quickQuotaBeta: "Beta",
-			quickQuotaForecastHint: "Appears after at least 30 minutes and a 1% quota change; restarting DSH recalibrates it.",
+			quickQuotaForecastHint: "Calibrates to actual consumption: high use is usually estimated in 5–10 minutes, while low use is shown as stable. Progress is kept locally.",
 			contextTitle: "Context window",
 			contextStandard: "Standard",
 			contextStandardHint: "Use the model catalog default; official agent presets manage context automatically.",
@@ -602,6 +616,7 @@ window.__ModuleLoader__.load({
 .codexSubscriptionSwitch{position:relative;flex:0 0 auto;width:32px;height:18px;padding:0;border:1px solid var(--dsw-alias-border-l3);border-radius:999px;background:var(--dsw-alias-bg-module-platform);cursor:pointer}.codexSubscriptionSwitch:disabled{cursor:not-allowed;opacity:.5}.codexSubscriptionSwitch[aria-checked=true]{background:var(--dsw-alias-label-secondary);border-color:var(--dsw-alias-label-secondary)}.codexSubscriptionSwitchKnob{position:absolute;top:2px;left:2px;width:12px;height:12px;border-radius:50%;background:var(--dsw-alias-bg-layer-1);transition:transform 120ms var(--ds-ease-in-out)}.codexSubscriptionSwitch[aria-checked=true] .codexSubscriptionSwitchKnob{transform:translateX(14px)}
 .codexSubscriptionSearch{display:flex;flex-direction:column;gap:7px}.codexSubscriptionSearchChoices{display:grid;grid-template-columns:repeat(auto-fit,minmax(150px,1fr));gap:6px}.codexSubscriptionSearchChoice{display:grid;grid-template-columns:14px minmax(0,1fr);align-items:center;column-gap:8px;min-width:0;border:1px solid var(--dsw-alias-border-l2);border-radius:10px;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary);padding:9px 10px;text-align:left;cursor:pointer}.codexSubscriptionSearchChoice:has(input:disabled){cursor:not-allowed;opacity:.5}.codexSubscriptionSearchChoice:has(input:checked){border-color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2)}.codexSubscriptionSearchChoice:has(input:focus-visible){outline:2px solid var(--dsw-alias-border-l3);outline-offset:2px}.codexSubscriptionSearchInput{width:14px;height:14px;margin:0;accent-color:var(--dsw-alias-label-primary);cursor:inherit}.codexSubscriptionSearchCopy{display:block;min-width:0;pointer-events:none}.codexSubscriptionSearchCopy strong,.codexSubscriptionSearchCopy span{display:block}.codexSubscriptionSearchCopy strong{font-size:12px;line-height:18px;font-weight:500;color:var(--dsw-alias-label-secondary)}.codexSubscriptionSearchChoice:has(input:checked) strong{color:var(--dsw-alias-label-primary)}.codexSubscriptionSearchCopy span{font-size:11px;line-height:16px;color:var(--dsw-alias-label-tertiary)}.codexSubscriptionDivider{height:1px;background:var(--dsw-alias-border-l2)}
 .codexSubscriptionAccountRow,.codexSubscriptionSectionHead{display:flex;align-items:center;justify-content:space-between;gap:12px}.codexSubscriptionStatus{display:flex;align-items:center;gap:8px;font-size:14px;line-height:22px;font-weight:500}
+.codexSubscriptionAccounts{display:flex;flex-direction:column;border-top:1px solid var(--dsw-alias-border-l2)}.codexSubscriptionAccount{display:flex;align-items:center;justify-content:space-between;gap:10px;min-height:42px;border-bottom:1px solid var(--dsw-alias-border-l2);font-size:13px}.codexSubscriptionAccount:last-child{border-bottom:0}.codexSubscriptionAccount[data-active=true]>span{font-weight:600}.codexSubscriptionFlow label{display:flex;flex-direction:column;gap:6px;font-size:12px;color:var(--dsw-alias-label-secondary)}
 .codexSubscriptionDot{width:8px;height:8px;border-radius:50%;background:var(--dsw-alias-label-dimmed)}.codexSubscriptionDot[data-state=connected]{background:var(--dsw-alias-state-success-primary)}.codexSubscriptionDot[data-state=disconnected]{background:var(--dsw-alias-state-error-primary)}
 .codexSubscriptionActions{display:flex;align-items:center;gap:8px;flex-wrap:wrap}.codexSubscriptionFlow{display:flex;flex-direction:column;gap:10px;padding:12px 14px;border-radius:10px;background:var(--dsw-alias-bg-module-platform)}
 .codexSubscriptionFlow p{font-size:13px;line-height:20px;color:var(--dsw-alias-label-secondary)}.codexSubscriptionCode{width:max-content;max-width:100%;font:600 16px/22px ui-monospace,SFMono-Regular,Consolas,monospace;letter-spacing:.08em;overflow-wrap:anywhere}
@@ -1873,6 +1888,9 @@ window.__ModuleLoader__.load({
 		function AccountCard({ rpc, t, account, setAccount, onSignedOut }) {
 			const [flow, setFlow] = (0, react.useState)();
 			const [manualCode, setManualCode] = (0, react.useState)("");
+			const [adding, setAdding] = (0, react.useState)(false);
+			const [accountLabel, setAccountLabel] = (0, react.useState)("");
+			const [removeId, setRemoveId] = (0, react.useState)();
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [error, setError] = (0, react.useState)();
 			const call = (endpoint, payload = {}) => rpc.call(CHANNEL, endpoint, payload).then(unwrap);
@@ -1883,35 +1901,52 @@ window.__ModuleLoader__.load({
 					"cancelled"
 				].includes(flow.phase)) return void 0;
 				const timer = window.setInterval(() => {
-					readLoginProgress({
+					(adding ? call("login/status", { id: flow.id }).then(async (nextFlow) => ({
+						flow: nextFlow,
+						account: nextFlow.phase === "authenticated" ? await call("status") : void 0
+					})) : readLoginProgress({
 						flow,
 						readFlow: () => call("login/status", { id: flow.id }),
 						readAccount: () => call("status")
-					}).then((next) => {
+					})).then((next) => {
 						setFlow(next.flow);
 						setError(void 0);
 						if (next.account !== void 0) {
 							setAccount(next.account);
+							onSignedOut();
+							setAdding(false);
+							setAccountLabel("");
+							setFlow(void 0);
 							notifyQuickQuota();
 						}
 					}).catch(() => setError(t("failed")));
 				}, 800);
 				return () => window.clearInterval(timer);
-			}, [flow?.id, flow?.phase]);
-			const begin = (method) => {
+			}, [
+				flow?.id,
+				flow?.phase,
+				adding
+			]);
+			const begin = (method, label) => {
 				setFlow(void 0);
 				setBusy(true);
 				setError(void 0);
 				call("login/start", {
 					method,
-					openExternal: true
+					openExternal: true,
+					...label === void 0 ? {} : { label }
 				}).then(setFlow).catch(() => setError(t("failed"))).finally(() => setBusy(false));
 			};
 			const cancel = () => {
 				if (flow?.id === void 0) return;
 				setBusy(true);
 				call("login/cancel", { id: flow.id }).then((next) => {
-					setFlow(next);
+					setFlow(adding ? void 0 : next);
+					if (adding) {
+						setAdding(false);
+						setAccountLabel("");
+					}
+					if (adding) return void 0;
 					return call("status").then((account) => {
 						if (account.authenticated === true) {
 							setAccount(account);
@@ -1948,8 +1983,38 @@ window.__ModuleLoader__.load({
 					notifyQuickQuota();
 				}).catch(() => setError(t("failed"))).finally(() => setBusy(false));
 			};
+			const selectAccount = (id) => {
+				setBusy(true);
+				setError(void 0);
+				call("account/select", { id }).then((next) => {
+					setAccount(next);
+					onSignedOut();
+					notifyQuickQuota();
+				}).catch(() => setError(t("failed"))).finally(() => setBusy(false));
+			};
+			const removeAccount = (id) => {
+				if (removeId !== id) {
+					setRemoveId(id);
+					return;
+				}
+				setBusy(true);
+				setError(void 0);
+				call("account/remove", { id }).then((next) => {
+					setAccount(next);
+					setRemoveId(void 0);
+					onSignedOut();
+					notifyQuickQuota();
+				}).catch(() => setError(t("failed"))).finally(() => setBusy(false));
+			};
 			const signedIn = account?.authenticated === true;
 			const accountReady = account !== void 0;
+			const accounts = account?.accounts ?? [];
+			const activeAccount = accounts.find((candidate) => candidate.active);
+			const loginVisible = flow !== void 0 && ![
+				"authenticated",
+				"failed",
+				"cancelled"
+			].includes(flow.phase);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "codexSubscriptionCard",
 				children: [
@@ -1963,16 +2028,26 @@ window.__ModuleLoader__.load({
 								className: "codexSubscriptionDot",
 								"data-state": accountReady ? signedIn ? "connected" : "disconnected" : "loading",
 								"aria-hidden": "true"
-							}), accountReady ? signedIn ? t("connected") : t("disconnected") : t("accountLoading")]
+							}), accountReady ? signedIn ? activeAccount?.label ?? t("connected") : t("disconnected") : t("accountLoading")]
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: "codexSubscriptionActions",
-							children: signedIn ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							children: signedIn ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 								type: "button",
 								variant: "outline",
-								disabled: busy,
+								disabled: busy || loginVisible,
+								onClick: () => {
+									setFlow(void 0);
+									setAdding(true);
+									setAccountLabel(`Account ${accounts.length + 1}`);
+								},
+								children: t("addAccount")
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+								type: "button",
+								variant: "outline",
+								disabled: busy || loginVisible,
 								onClick: logout,
-								children: t("logout")
-							}) : accountReady && (flow === void 0 || ["failed", "cancelled"].includes(flow.phase)) ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+								children: t("signOutAll")
+							})] }) : accountReady && (flow === void 0 || ["failed", "cancelled"].includes(flow.phase)) ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 								type: "button",
 								variant: "primary",
 								disabled: busy,
@@ -1987,7 +2062,77 @@ window.__ModuleLoader__.load({
 							})] }) : null
 						})]
 					}),
-					!signedIn && flow?.phase === "waiting_device" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					signedIn && accounts.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: "codexSubscriptionAccounts",
+						children: accounts.map((candidate) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "codexSubscriptionAccount",
+							"data-active": candidate.active,
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: candidate.label }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "codexSubscriptionActions",
+								children: [
+									candidate.active ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+										type: "button",
+										variant: "outline",
+										disabled: busy || loginVisible,
+										onClick: () => selectAccount(candidate.id),
+										children: t("switchAccount")
+									}),
+									accounts.length > 1 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+										type: "button",
+										variant: "outline",
+										disabled: busy || loginVisible,
+										onClick: () => removeAccount(candidate.id),
+										children: removeId === candidate.id ? t("removeConfirm") : t("removeAccount")
+									}) : null,
+									removeId === candidate.id ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+										type: "button",
+										variant: "outline",
+										disabled: busy,
+										onClick: () => setRemoveId(void 0),
+										children: t("removeCancel")
+									}) : null
+								]
+							})]
+						}, candidate.id))
+					}) : null,
+					signedIn && adding && flow === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexSubscriptionFlow",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [t("accountLabel"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
+							className: "codexSubscriptionInput",
+							value: accountLabel,
+							maxLength: 48,
+							onChange: (event) => setAccountLabel(event.currentTarget.value)
+						})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "codexSubscriptionActions",
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+									type: "button",
+									variant: "primary",
+									disabled: busy || accountLabel.trim() === "",
+									onClick: () => begin("browser", accountLabel.trim()),
+									children: t("browserLogin")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+									type: "button",
+									variant: "outline",
+									disabled: busy || accountLabel.trim() === "",
+									onClick: () => begin("device_code", accountLabel.trim()),
+									children: t("deviceLogin")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+									type: "button",
+									variant: "outline",
+									disabled: busy,
+									onClick: () => {
+										setAdding(false);
+										setAccountLabel("");
+									},
+									children: t("cancel")
+								})
+							]
+						})]
+					}) : null,
+					flow?.phase === "waiting_device" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "codexSubscriptionFlow",
 						children: [
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("deviceHint") }),
@@ -2004,7 +2149,7 @@ window.__ModuleLoader__.load({
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("waiting") })
 						]
 					}) : null,
-					!signedIn && flow?.phase === "waiting_input" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("form", {
+					flow?.phase === "waiting_input" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("form", {
 						className: "codexSubscriptionFlow",
 						onSubmit: submit,
 						children: [
@@ -2033,7 +2178,7 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}) : null,
-					!signedIn && flow !== void 0 && ["starting", "waiting_browser"].includes(flow.phase) ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					flow !== void 0 && ["starting", "waiting_browser"].includes(flow.phase) ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "codexSubscriptionFlow",
 						children: [
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("waiting") }),