dsh-codex-subscription 1.12.2 → 1.13.1

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.12.2` package below; do not install a moving branch.
+- Use the exact `1.13.1` 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.2-rc.1 plugin --profile web add dsh-codex-subscription@1.12.2
+npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web add dsh-codex-subscription@1.13.1
 ```
 
 With an existing global `dsh` command:
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@1.12.2
+dsh plugin --profile web add dsh-codex-subscription@1.13.1
 ```
 
 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.2-rc.1` in place of `dsh`.
 
-1. `dsh-codex-subscription` version `1.12.2` appears exactly once.
+1. `dsh-codex-subscription` version `1.13.1` 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

@@ -43,7 +43,7 @@ DSH-Portable exposes the same standard plugin command, so the command above also
 | **Recoverable and diagnosable** | Sign-in state reconciles automatically; Settings can create a support report without credentials or account identifiers |
 | **Visible quota** | Keep backend-provided standard Codex, Spark, and other limits separate |
 | **Composer quota** | Choose a compact percentage, progress bar, or no inline quota display |
-| **Safe quota reset** | See the next expiry and deliberately try a reset with a cooldown and acknowledgement |
+| **Safe quota reset** | See each reset credit separately and deliberately try one with a cooldown and acknowledgement |
 | **Subscription search** | Explicitly route search globally through DSH default search or the signed-in Codex subscription |
 | **Codex image generation and editing (Beta)** | Generate without references, or explicitly edit one selected image; preview, zoom, annotate regions, download the original, and continue in the same composer |
 | **Fast mode** | Switch between Standard and Fast directly in the composer |
@@ -133,12 +133,12 @@ Restart DSH manually after installation, then:
 
 ## Features
 
-- ChatGPT OAuth sign-in with credentials kept on the host; manually add, switch, and remove accounts without automatic rotation or quota pooling;
+- ChatGPT OAuth sign-in with credentials kept on the host; accounts are identified by a privacy-masked email that can be clicked to reveal, and can be manually added, switched, or removed 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;
 - Separate standard Codex, Codex-Spark, Credits, and other independent limits;
-- Visible quota-reset count and earliest expiry, with deliberate early redemption, layered confirmation, and no automatic retry;
+- One row per available quota reset with its disclosed name and expiry, plus deliberate early redemption, layered confirmation, and no automatic retry;
 - Optional percentage, progress bar, or Beta runway estimate for the selected Codex model (off by default);
 - Standard or Fast mode for supported Codex models directly in the composer;
 - Standard, Extended, and per-model Custom context windows; Custom accepts a full numeric token count, stays within each audited model capacity, and feeds DSH's native agent compaction policy;
@@ -159,7 +159,7 @@ Standard Codex uses the lowest remaining window returned by the service; Spark u
 
 ### Safe quota reset
 
-If ChatGPT reports an available quota reset, Settings shows its count and earliest disclosed expiry in a compact row.
+If ChatGPT reports available quota resets, Settings shows each one in its own compact row with its disclosed name and expiry.
 You may deliberately try it before a quota reaches 100%, which is useful for a reset nearing expiry. ChatGPT still
 decides whether a window needs resetting and may return **nothing to reset** without spending the reset. The final
 action requires an acknowledgement checkbox and five-second cooldown. Cancel never consumes a reset, rapid repeated

package/README.md

@@ -44,7 +44,7 @@ DSH-Portable 也提供相同的标准插件命令，因此同样使用上面的
 | **可恢复、可诊断** | 登录状态会自动对账；设置页可生成不含凭据和账号标识的支持报告 |
 | **额度可见** | 普通 Codex、Spark 等服务端实际返回的额度分开显示 |
 | **输入框额度** | 可选择紧凑百分比、进度条或完全关闭输入框额度显示 |
-| **安全额度重置** | 直接查看最早到期时间，并通过冷静期和知情确认主动尝试重置 |
+| **安全额度重置** | 每张重置卡单独显示，并通过冷静期和知情确认主动尝试重置 |
 | **订阅搜索** | 可将全部模型的搜索明确路由到 DSH 默认搜索或已登录的 Codex 订阅 |
 | **Codex 图片生成与编辑（Beta）** | 可无参考图全新生成，也可明确选择会话图片继续编辑；支持预览、缩放、区域备注、下载原图并衔接回当前输入框 |
 | **高速模式** | 直接在输入框切换标准或高速，无需离开当前会话 |
@@ -134,12 +134,12 @@ dsh --profile web --dump-config
 
 ## 功能
 
-- ChatGPT OAuth 登录，凭据保留在本机；可手动添加、切换和移除多个账号，不会自动轮换或合并额度；
+- ChatGPT OAuth 登录，凭据保留在本机；账号以默认隐藏部分字符的邮箱区分，点击可切换完整显示；可手动添加、切换和移除多个账号，不会自动轮换或合并额度；
 - Codex 模型和 Beta 图片生成与编辑直接出现在 DSH 会话中；
 - 搜索来源是全局设置，可在 DSH 默认搜索与 Codex 订阅搜索之间切换；它对所有模型和会话生效，不会随当前模型自动切换；
 - 设置页显示服务端返回的额度、重置时间和更新时间；
 - 普通 Codex、Codex-Spark、Credits 等独立额度分开显示；
-- 显示重置卡数量与最早到期时间，也允许在额度未完全用尽时主动尝试，并经过分层确认且不会自动重试；
+- 每张可用重置卡单独显示名称和到期时间，也允许在额度未完全用尽时主动尝试，并经过分层确认且不会自动重试；
 - 输入框可用百分比、进度条或可选的 Beta 续航预测显示当前 Codex 模型的剩余额度（默认关闭）；
 - 输入框可为支持的 Codex 模型切换标准或高速模式；
 - 上下文窗口提供标准、扩展和逐模型自定义；自定义直接填写完整 Token 数值，并在已审核的模型容量内交给 DSH 原生 Agent 压缩策略处理；
@@ -159,7 +159,7 @@ Spark 使用独立额度。插件不会写死“5 小时 + 每周”，也不会
 
 ### 安全使用额度重置
 
-ChatGPT 返回可用重置卡时，设置页会用紧凑的一行显示数量和服务端提供的最早到期时间。即使额度尚未到 100%，
+ChatGPT 返回可用重置卡时，设置页会把每张卡分别显示为紧凑的一行，并展示服务端提供的名称和到期时间。即使额度尚未到 100%，
 也可以主动尝试使用，适合重置卡即将过期的情况；是否需要重置仍由 ChatGPT 判断，服务端可能返回“当前无需重置”且不扣次数。
 最终操作需要勾选知情确认并等待 5 秒。取消不会消耗，快速连续点击只允许一次请求，网络结果不确定时也不会自动重试。
 

package/lib/client.js

@@ -220,6 +220,148 @@ window.__ModuleLoader__.load({
 			}
 		}
 		//#endregion
+		//#region src/preference-controller.js
+		const CHANNEL$1 = "/codex-subscription";
+		const unwrap$1 = (response) => {
+			if (!response?.ok) throw new Error(response?.error?.message ?? "Codex RPC failed");
+			return response.value;
+		};
+		function createPreferenceController(scope, rpc) {
+			let updating = false;
+			let error = false;
+			let fallbackStatus = "loading";
+			let fallback;
+			let pendingPatch;
+			let failedPatch;
+			let generation = 0;
+			let contextModels = [];
+			let verbosityModels = [];
+			const nativeSnapshot = () => scope.getSnapshot();
+			const read = () => {
+				const native = nativeSnapshot();
+				const current = native.status === "ready" ? native : fallbackStatus === "ready" ? fallback : native;
+				const value = pendingPatch === void 0 ? current.value : {
+					...current.value,
+					...pendingPatch
+				};
+				return Object.freeze({
+					status: current.status,
+					quickQuotaMode: normalizeQuickQuotaMode(value?.[QUICK_QUOTA_MODE_FIELD], value?.[LEGACY_QUICK_QUOTA_FIELD]),
+					searchProvider: normalizeSearchProvider(value?.[SEARCH_PROVIDER_FIELD]),
+					speedMode: normalizeSpeedMode(value?.[SPEED_MODE_FIELD]),
+					outputVerbosity: normalizeOutputVerbosity(value?.[OUTPUT_VERBOSITY_FIELD]),
+					contextMode: normalizeContextMode(value?.[CONTEXT_MODE_FIELD]),
+					customContextWindow: normalizeCustomContextWindow(value?.[CUSTOM_CONTEXT_WINDOW_FIELD]),
+					customContextWindows: Object.fromEntries(Object.entries(CUSTOM_CONTEXT_MODEL_FIELDS).map(([modelKey, field]) => [modelKey, normalizeCustomContextWindow(value?.[field] ?? CUSTOM_CONTEXT_MODEL_DEFAULTS[modelKey], CUSTOM_CONTEXT_MODEL_CAPS[modelKey])])),
+					contextModels,
+					verbosityModels,
+					writable: !updating && current.status === "ready" && current.writable === true,
+					saving: updating,
+					error
+				});
+			};
+			let snapshot = read();
+			const listeners = /* @__PURE__ */ new Set();
+			const publish = () => {
+				snapshot = read();
+				for (const listener of listeners) listener();
+			};
+			const disposeScope = scope.subscribe(() => {
+				error = false;
+				if (!updating) failedPatch = void 0;
+				publish();
+			});
+			const acceptFallback = (value) => {
+				contextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
+				verbosityModels = Array.isArray(value?.verbosityModels) ? value.verbosityModels : [];
+				fallbackStatus = "ready";
+				fallback = {
+					status: "ready",
+					value: {
+						[QUICK_QUOTA_MODE_FIELD]: normalizeQuickQuotaMode(value?.[QUICK_QUOTA_MODE_FIELD], value?.[LEGACY_QUICK_QUOTA_FIELD]),
+						[SEARCH_PROVIDER_FIELD]: normalizeSearchProvider(value?.[SEARCH_PROVIDER_FIELD]),
+						[SPEED_MODE_FIELD]: normalizeSpeedMode(value?.[SPEED_MODE_FIELD]),
+						[OUTPUT_VERBOSITY_FIELD]: normalizeOutputVerbosity(value?.[OUTPUT_VERBOSITY_FIELD]),
+						[CONTEXT_MODE_FIELD]: normalizeContextMode(value?.[CONTEXT_MODE_FIELD]),
+						[CUSTOM_CONTEXT_WINDOW_FIELD]: normalizeCustomContextWindow(value?.[CUSTOM_CONTEXT_WINDOW_FIELD]),
+						...Object.fromEntries(Object.entries(CUSTOM_CONTEXT_MODEL_FIELDS).map(([modelKey, field]) => [field, normalizeCustomContextWindow(value?.[field] ?? CUSTOM_CONTEXT_MODEL_DEFAULTS[modelKey], CUSTOM_CONTEXT_MODEL_CAPS[modelKey])]))
+					},
+					writable: value?.writable === true
+				};
+			};
+			const load = async () => {
+				const current = ++generation;
+				updating = false;
+				pendingPatch = void 0;
+				fallbackStatus = "loading";
+				fallback = void 0;
+				error = false;
+				publish();
+				try {
+					const value = unwrap$1(await rpc.call(CHANNEL$1, "preferences/status", {}));
+					if (current !== generation) return;
+					if (nativeSnapshot().status === "ready") {
+						contextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
+						verbosityModels = Array.isArray(value?.verbosityModels) ? value.verbosityModels : [];
+					} else acceptFallback(value);
+					publish();
+				} catch {
+					if (current !== generation || nativeSnapshot().status === "ready") return;
+					fallbackStatus = "unavailable";
+					publish();
+				}
+			};
+			const set = async (patch) => {
+				if (snapshot.status !== "ready" || snapshot.writable !== true) return;
+				const current = ++generation;
+				const entries = Object.entries(patch);
+				updating = true;
+				pendingPatch = patch;
+				error = false;
+				failedPatch = void 0;
+				publish();
+				try {
+					if (nativeSnapshot().status === "ready") {
+						for (const [field, value] of entries) {
+							if (current !== generation) return;
+							await scope.set(field, value);
+						}
+						if (current !== generation) return;
+						const accepted = nativeSnapshot().value;
+						error = entries.some(([field, value]) => accepted?.[field] !== value);
+						pendingPatch = void 0;
+					} else {
+						const value = unwrap$1(await rpc.call(CHANNEL$1, "preferences/update", patch));
+						if (current !== generation) return;
+						acceptFallback(value);
+						pendingPatch = void 0;
+					}
+				} catch {
+					if (current === generation) {
+						pendingPatch = void 0;
+						error = true;
+						failedPatch = patch;
+					}
+				} finally {
+					if (current === generation) {
+						updating = false;
+						publish();
+					}
+				}
+			};
+			return {
+				getSnapshot: () => snapshot,
+				subscribe: (listener) => {
+					listeners.add(listener);
+					return () => listeners.delete(listener);
+				},
+				load,
+				set,
+				retry: () => failedPatch === void 0 ? load() : set(failedPatch),
+				dispose: disposeScope
+			};
+		}
+		//#endregion
 		//#region src/client.jsx
 		const inject = [
 			"slots",
@@ -246,7 +388,6 @@ window.__ModuleLoader__.load({
 			deviceLogin: "设备代码登录",
 			logout: "退出登录",
 			addAccount: "添加账号",
-			accountLabel: "账号名称",
 			switchAccount: "切换",
 			removeAccount: "移除",
 			removeConfirm: "确认移除",
@@ -262,12 +403,15 @@ window.__ModuleLoader__.load({
 			loadFailed: "无法读取账户状态。",
 			accountRetry: "重试",
 			diagnostics: "支持诊断",
-			diagnosticsHint: "生成不含凭据、账号标识和授权时间的诊断信息。",
 			diagnosticsLoad: "生成诊断",
+			diagnosticsLoading: "生成中…",
 			diagnosticsCopy: "复制诊断",
 			diagnosticsCopied: "已复制",
 			diagnosticsFailed: "无法生成诊断信息。",
 			feedbackOpen: "反馈问题",
+			showEmail: "显示完整邮箱",
+			hideEmail: "隐藏邮箱",
+			emailUnavailable: "邮箱不可用",
 			searchTitle: "搜索来源",
 			searchScope: "自动按当前会话模型分流；手动选择会覆盖所有模型和会话。",
 			searchAuto: "自动",
@@ -299,21 +443,21 @@ window.__ModuleLoader__.load({
 			creditsUnit: "credits",
 			unlimited: "不限额",
 			monthlyCreditLimit: "Credits 月度消费上限",
-			resetCredits: "可用额度重置次数",
-			resetCreditsValue: "{count} 次",
-			resetUse: "使用重置",
-			resetPreparing: "正在读取重置详情…",
+			resetCredits: "额度重置",
+			resetCreditDefaultName: "额度重置",
+			resetUse: "使用",
+			resetPreparing: "准备中…",
 			resetConfirmTitle: "确认使用额度重置",
-			resetWarning: "若 ChatGPT 执行重置，将立即消耗 1 次且无法撤销。",
-			resetEarlyWarning: "当前模型额度尚未用尽；ChatGPT 可能执行重置，也可能判定暂无需重置且不消耗次数。",
+			resetWarning: "执行后会消耗 1 次，且无法撤销。",
+			resetEarlyWarning: "当前额度未用尽，服务可能不执行重置。",
 			resetAcknowledge: "我知道这次操作可能立即消耗 1 次重置",
 			resetCreditExpires: "到期：{value}",
 			resetCreditExpiryUnknown: "到期时间未提供",
 			resetCreditExpiryLoading: "正在读取到期时间…",
 			resetCreditExpiryFailed: "无法读取到期时间",
-			resetWait: "请再等待 {count} 秒",
-			resetFinal: "消耗 1 次并重置额度",
-			resetUsing: "正在重置…",
+			resetWait: "请等待 {count} 秒",
+			resetFinal: "确认使用",
+			resetUsing: "使用中…",
 			resetSuccess: "额度重置已完成。",
 			resetNothing: "当前没有可重置的额度，未消耗新的重置次数。",
 			resetNoCredit: "没有可用的额度重置。",
@@ -326,7 +470,7 @@ window.__ModuleLoader__.load({
 			resetAcknowledgeRequired: "请先确认已了解这次操作可能消耗重置次数。",
 			resetAccountChanged: "登录账号已变更，请重新开始。",
 			resetUncertain: "服务端返回结果不确定。请再次确认，插件会复用同一个请求，不会另外发起一次重置。",
-			creditsNote: "仅显示 Codex 为此账户或工作区实际返回的额外 Credits、消费上限或额度重置次数；三者不是同一项。",
+			creditsNote: "额外 Credits、消费上限、重置次数分别显示。",
 			creditsUsed: "已用 {used} / {limit} credits",
 			spendReached: "Credits 月度消费上限已用尽。",
 			unavailable: "暂无数据",
@@ -429,7 +573,6 @@ window.__ModuleLoader__.load({
 			deviceLogin: "Device-code sign-in",
 			logout: "Sign out",
 			addAccount: "Add account",
-			accountLabel: "Account name",
 			switchAccount: "Switch",
 			removeAccount: "Remove",
 			removeConfirm: "Confirm remove",
@@ -445,12 +588,15 @@ window.__ModuleLoader__.load({
 			loadFailed: "Could not read account status.",
 			accountRetry: "Retry",
 			diagnostics: "Support diagnostics",
-			diagnosticsHint: "Create a report without credentials, account identifiers, or authorization timestamps.",
 			diagnosticsLoad: "Create report",
+			diagnosticsLoading: "Creating…",
 			diagnosticsCopy: "Copy report",
 			diagnosticsCopied: "Copied",
 			diagnosticsFailed: "Could not create diagnostics.",
 			feedbackOpen: "Report a problem",
+			showEmail: "Show full email",
+			hideEmail: "Hide email",
+			emailUnavailable: "Email unavailable",
 			searchTitle: "Search source",
 			searchScope: "Auto follows the current session model; an explicit choice overrides every model and session.",
 			searchAuto: "Auto",
@@ -482,21 +628,21 @@ window.__ModuleLoader__.load({
 			creditsUnit: "credits",
 			unlimited: "Unlimited",
 			monthlyCreditLimit: "Monthly Credits spending cap",
-			resetCredits: "Available quota resets",
-			resetCreditsValue: "{count} available",
-			resetUse: "Use reset",
-			resetPreparing: "Reading reset details…",
+			resetCredits: "Quota resets",
+			resetCreditDefaultName: "Quota reset",
+			resetUse: "Use",
+			resetPreparing: "Preparing…",
 			resetConfirmTitle: "Confirm quota reset",
-			resetWarning: "If ChatGPT performs the reset, one reset is consumed immediately and cannot be restored.",
-			resetEarlyWarning: "No model quota is exhausted. ChatGPT may reset it, or report that nothing needs resetting without consuming a reset.",
+			resetWarning: "This consumes one reset and cannot be undone.",
+			resetEarlyWarning: "Quota remains. The service may decline the reset.",
 			resetAcknowledge: "I understand this may consume one reset now",
 			resetCreditExpires: "Expires {value}",
 			resetCreditExpiryUnknown: "Expiration time not provided",
 			resetCreditExpiryLoading: "Reading expiration…",
 			resetCreditExpiryFailed: "Could not read expiration",
-			resetWait: "Wait {count} more seconds",
-			resetFinal: "Consume one reset",
-			resetUsing: "Resetting…",
+			resetWait: "Wait {count} seconds",
+			resetFinal: "Confirm use",
+			resetUsing: "Using…",
 			resetSuccess: "Quota reset completed.",
 			resetNothing: "There is currently nothing to reset; no new reset was consumed.",
 			resetNoCredit: "No quota reset is available.",
@@ -509,7 +655,7 @@ window.__ModuleLoader__.load({
 			resetAcknowledgeRequired: "Confirm that you understand this may consume a reset.",
 			resetAccountChanged: "The signed-in account changed. Start again.",
 			resetUncertain: "The server result is uncertain. Confirm again to check the same request; the plugin will not start a separate reset.",
-			creditsNote: "Shows only extra Credits, spending caps, or quota resets returned for this account or workspace; these are separate items.",
+			creditsNote: "Extra Credits, spending caps, and resets are separate items.",
 			creditsUsed: "{used} / {limit} credits used",
 			spendReached: "The monthly Credits spending cap has been reached.",
 			unavailable: "No data yet",
@@ -615,14 +761,15 @@ window.__ModuleLoader__.load({
 .codexSubscriptionContext{display:flex;flex-direction:column;gap:8px}.codexSubscriptionContextHead{display:flex;align-items:flex-start;justify-content:space-between;gap:12px}.codexSubscriptionContextCopy{display:flex;min-width:0;flex:1;flex-direction:column;gap:2px}.codexSubscriptionContextHint{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}.codexSubscriptionContextTrigger{height:32px;min-width:108px;display:inline-flex;align-items:center;justify-content:space-between;gap:10px;padding:0 10px 0 12px;border:0;border-radius:999px;outline:0;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;cursor:pointer}.codexSubscriptionContextTrigger:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.codexSubscriptionContextTrigger:focus-visible{box-shadow:0 0 0 2px var(--dsw-alias-border-l3)}.codexSubscriptionContextTrigger:disabled{color:var(--dsw-alias-label-dimmed);cursor:not-allowed}.codexSubscriptionContextTrigger svg{color:var(--dsw-alias-label-tertiary);transition:transform 120ms var(--ds-ease-in-out)}.codexSubscriptionContextTrigger[aria-expanded=true] svg{transform:rotate(180deg)}.codexSubscriptionContextModels{display:flex;flex-direction:column;border-top:1px solid var(--dsw-alias-border-l2)}.codexSubscriptionContextModel{min-height:42px;display:flex;align-items:center;justify-content:space-between;gap:12px;border-bottom:1px solid var(--dsw-alias-border-l2)}.codexSubscriptionContextModel:last-child{border-bottom:0}.codexSubscriptionContextModelCopy{display:flex;min-width:0;flex-direction:column}.codexSubscriptionContextModelCopy strong{font-size:12px;line-height:18px;font-weight:500}.codexSubscriptionContextModelCopy span{font-size:11px;line-height:16px;color:var(--dsw-alias-label-tertiary)}.codexSubscriptionContextInput{width:116px}
 .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)}
+.codexSubscriptionQuotaModes[data-saving=true] .codexSubscriptionQuotaMode:has(input:disabled){cursor:wait;opacity:1}.codexSubscriptionSearchChoices[data-saving=true] .codexSubscriptionSearchChoice:has(input:disabled){cursor:wait;opacity:1}
 .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)}
+.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] .codexSubscriptionEmail,.codexSubscriptionAccount[data-active=true]>span{font-weight:600}.codexSubscriptionEmail{max-width:100%;overflow:hidden;padding:2px 4px;border:0;border-radius:5px;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;text-align:left;text-overflow:ellipsis;white-space:nowrap;cursor:pointer}.codexSubscriptionEmail:hover{background:var(--dsw-alias-interactive-bg-hover)}.codexSubscriptionEmail:focus-visible{outline:2px solid var(--dsw-alias-border-l3);outline-offset:1px}.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}
 .codexSubscriptionError{font-size:13px;line-height:20px;color:var(--dsw-alias-state-error-primary)}.codexSubscriptionInput{width:100%;box-sizing:border-box}
 .codexSubscriptionRecover{display:flex;align-items:center;justify-content:space-between;gap:12px}.codexSubscriptionRecover .codexSubscriptionError{flex:1}.codexSubscriptionRecover button{flex:0 0 auto}
-.codexSubscriptionDiagnostics pre{max-height:240px;margin:0;padding:10px 12px;border-radius:8px;background:var(--dsw-alias-bg-module-platform);overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;font:11px/17px ui-monospace,SFMono-Regular,Consolas,monospace;color:var(--dsw-alias-label-secondary)}.codexSubscriptionLink{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;min-height:32px;padding:0 13px;border:1px solid var(--dsw-alias-border-l2);border-radius:999px;background:transparent;color:var(--dsw-alias-label-primary);font-size:13px;line-height:20px;text-decoration:none;white-space:nowrap}.codexSubscriptionLink:hover{background:var(--dsw-alias-bg-module-platform)}.codexSubscriptionLink:focus-visible{outline:2px solid var(--dsw-alias-border-l3);outline-offset:2px}
+.codexSubscriptionDiagnostics{padding:8px 12px;gap:8px;background:transparent;color:var(--dsw-alias-label-secondary)}.codexSubscriptionDiagnostics pre{max-height:240px;margin:0;padding:10px 12px;border-radius:8px;background:var(--dsw-alias-bg-module-platform);overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;font:11px/17px ui-monospace,SFMono-Regular,Consolas,monospace;color:var(--dsw-alias-label-secondary)}.codexSubscriptionLink{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;min-height:32px;padding:0 13px;border:1px solid var(--dsw-alias-border-l2);border-radius:999px;background:transparent;color:var(--dsw-alias-label-primary);font-size:13px;line-height:20px;text-decoration:none;white-space:nowrap}.codexSubscriptionLink:hover{background:var(--dsw-alias-bg-module-platform)}.codexSubscriptionLink:focus-visible{outline:2px solid var(--dsw-alias-border-l3);outline-offset:2px}
 .codexSubscriptionSectionTitle{display:flex;flex:1;min-width:0;flex-direction:column;gap:2px}.codexSubscriptionFreshness{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}
 .codexSubscriptionRefresh{flex:0 0 auto;min-width:72px;width:max-content;white-space:nowrap!important;word-break:keep-all!important;overflow-wrap:normal!important;writing-mode:horizontal-tb!important}.codexSubscriptionRefresh *{white-space:nowrap!important;word-break:keep-all!important;writing-mode:horizontal-tb!important}
 .codexSubscriptionEmpty{padding:18px;border:1px dashed var(--dsw-alias-border-l3);border-radius:10px;text-align:center;font-size:13px;line-height:20px;color:var(--dsw-alias-label-tertiary)}
@@ -632,7 +779,7 @@ window.__ModuleLoader__.load({
 .codexSubscriptionLimit progress::-webkit-progress-bar{background:var(--dsw-alias-border-l3);border-radius:999px}.codexSubscriptionLimit progress::-webkit-progress-value{background:var(--dsw-alias-brand-primary,#3964fe);border-radius:999px}.codexSubscriptionLimit progress::-moz-progress-bar{background:var(--dsw-alias-brand-primary,#3964fe);border-radius:999px}.codexSubscriptionLimitMeta{display:flex;justify-content:space-between;gap:10px;flex-wrap:wrap;font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}
 .codexSubscriptionCreditSection{display:flex;flex-direction:column;gap:7px}.codexSubscriptionCreditNote{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}.codexSubscriptionCreditRows{display:grid;grid-template-columns:repeat(auto-fit,minmax(180px,1fr));gap:8px}.codexSubscriptionCreditBalance,.codexSubscriptionSpendLimit{min-width:0;border-radius:10px;padding:12px 14px;background:var(--dsw-alias-bg-module-platform)}
 .codexSubscriptionCreditBalance{display:flex;flex-direction:column;gap:6px}.codexSubscriptionCreditBalance span,.codexSubscriptionCreditLabel{font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}.codexSubscriptionCreditBalance strong{font:600 18px/24px ui-monospace,SFMono-Regular,Consolas,monospace;font-variant-numeric:tabular-nums;overflow-wrap:anywhere}
-.codexSubscriptionResetSummary{display:flex;align-items:center;justify-content:space-between;gap:10px}.codexSubscriptionResetMeta{display:flex;min-width:0;flex-direction:column;gap:1px}.codexSubscriptionResetBalance{display:flex;flex-direction:column;gap:8px}.codexSubscriptionResetBalance .codexSubscriptionActions{justify-content:flex-start}.codexSubscriptionResetFlow{display:flex;flex-direction:column;gap:10px;border-top:1px solid var(--dsw-alias-border-l2);padding-top:10px}.codexSubscriptionResetFlow h4{margin:0;font-size:13px;line-height:20px;font-weight:500}.codexSubscriptionResetWarning{font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}.codexSubscriptionResetExpiry{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}.codexSubscriptionResetCheck{display:flex;align-items:flex-start;gap:8px;padding:9px 10px;border-radius:8px;background:var(--dsw-alias-bg-module-platform);font-size:12px;line-height:18px;color:var(--dsw-alias-label-primary);cursor:pointer}.codexSubscriptionResetCheck input{margin:3px 0 0;accent-color:var(--dsw-alias-label-primary)}.codexSubscriptionResetFinal{border-color:var(--dsw-alias-state-error-primary)!important;color:var(--dsw-alias-state-error-primary)!important}.codexSubscriptionResetResult{font-size:12px;line-height:18px;color:var(--dsw-alias-state-success-primary)}
+.codexSubscriptionCreditRows{display:flex;flex-direction:column;gap:6px}.codexSubscriptionResetMeta{display:flex;min-width:0;flex-direction:column;gap:1px}.codexSubscriptionResetBalance{display:flex;flex-direction:column;gap:8px}.codexSubscriptionResetCard{display:flex;align-items:center;justify-content:space-between;gap:10px;min-width:0;padding:9px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:9px;background:var(--dsw-alias-bg-module-platform)}.codexSubscriptionResetCard .codexSubscriptionResetMeta{flex:1}.codexSubscriptionResetCard strong{overflow:hidden;font-size:12px;line-height:18px;font-weight:500;text-overflow:ellipsis;white-space:nowrap}.codexSubscriptionResetCard .codexSubscriptionActions{flex:0 0 auto}.codexSubscriptionResetCard .codexSubscriptionResetUse{min-height:28px;padding:0 10px}.codexSubscriptionResetBalance .codexSubscriptionActions{justify-content:flex-start}.codexSubscriptionResetFlow{display:flex;flex-direction:column;gap:10px;border-top:1px solid var(--dsw-alias-border-l2);padding-top:10px}.codexSubscriptionResetFlow h4{margin:0;font-size:13px;line-height:20px;font-weight:500}.codexSubscriptionResetWarning{font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}.codexSubscriptionResetExpiry{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}.codexSubscriptionResetCheck{display:flex;align-items:flex-start;gap:8px;padding:9px 10px;border-radius:8px;background:var(--dsw-alias-bg-module-platform);font-size:12px;line-height:18px;color:var(--dsw-alias-label-primary);cursor:pointer}.codexSubscriptionResetCheck input{margin:3px 0 0;accent-color:var(--dsw-alias-label-primary)}.codexSubscriptionResetFinal{border-color:var(--dsw-alias-state-error-primary)!important;color:var(--dsw-alias-state-error-primary)!important}.codexSubscriptionResetResult{font-size:12px;line-height:18px;color:var(--dsw-alias-state-success-primary)}
 .codexSubscriptionResetUse:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.codexSubscriptionResetUse:focus-visible{outline:2px solid var(--dsw-alias-border-l3);outline-offset:1px}
 .codexSubscriptionSpendLimit{display:flex;flex-direction:column;gap:8px}.codexSubscriptionSpendTop{display:flex;align-items:baseline;justify-content:space-between;gap:12px}.codexSubscriptionSpendTop strong{font:600 16px/22px ui-monospace,SFMono-Regular,Consolas,monospace;font-variant-numeric:tabular-nums}.codexSubscriptionSpendLimit progress{width:100%;height:6px;border:0;border-radius:999px;overflow:hidden;background:var(--dsw-alias-border-l3);accent-color:var(--dsw-alias-brand-primary,#3964fe);-webkit-appearance:none;appearance:none}.codexSubscriptionSpendLimit progress::-webkit-progress-bar{background:var(--dsw-alias-border-l3);border-radius:999px}.codexSubscriptionSpendLimit progress::-webkit-progress-value{background:var(--dsw-alias-brand-primary,#3964fe);border-radius:999px}.codexSubscriptionSpendLimit progress::-moz-progress-bar{background:var(--dsw-alias-brand-primary,#3964fe);border-radius:999px}
 .codexComposerQuota{display:inline-flex;align-items:center;flex:0 0 auto;height:28px;box-sizing:border-box;padding:0;color:var(--dsw-alias-label-secondary);font-family:inherit;font-size:12px;line-height:20px;font-weight:500;font-variant-numeric:tabular-nums;white-space:nowrap;user-select:none}.codexComposerQuotaBar{display:block;width:40px;height:4px;border:0;border-radius:999px;overflow:hidden;background:var(--dsw-alias-border-l3);accent-color:var(--dsw-alias-label-secondary);-webkit-appearance:none;appearance:none}.codexComposerQuotaBar::-webkit-progress-bar{background:var(--dsw-alias-border-l3);border-radius:999px}.codexComposerQuotaBar::-webkit-progress-value{background:var(--dsw-alias-label-secondary);border-radius:999px}.codexComposerQuotaBar::-moz-progress-bar{background:var(--dsw-alias-label-secondary);border-radius:999px}
@@ -664,6 +811,12 @@ window.__ModuleLoader__.load({
 			return response.value;
 		};
 		const fill = (text, values) => Object.entries(values).reduce((next, [key, value]) => next.replace(`{${key}}`, String(value)), text);
+		const maskEmail = (value) => {
+			if (typeof value !== "string" || !value.includes("@")) return "••••";
+			const [local, domain] = value.split("@", 2);
+			if (local.length <= 2) return `${local.slice(0, 1)}••@${domain}`;
+			return `${local[0]}•••${local.at(-1)}@${domain}`;
+		};
 		const hours = (seconds) => Math.round(seconds / 3600 * 10) / 10;
 		const percent = (value) => Number(value).toLocaleString(void 0, { maximumFractionDigits: 1 });
 		const isApproximateWindow = (seconds, expected) => seconds >= expected * .95 && seconds <= expected * 1.05;
@@ -1108,131 +1261,6 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
-		function createPreferenceController(scope, rpc) {
-			let updating = false;
-			let error = false;
-			let fallbackStatus = "loading";
-			let fallback;
-			let failedPatch;
-			let generation = 0;
-			let contextModels = [];
-			let verbosityModels = [];
-			const nativeSnapshot = () => scope.getSnapshot();
-			const read = () => {
-				const native = nativeSnapshot();
-				const current = native.status === "ready" ? native : fallbackStatus === "ready" ? fallback : native;
-				return Object.freeze({
-					status: updating ? "updating" : current.status,
-					quickQuotaMode: normalizeQuickQuotaMode(current.value?.[QUICK_QUOTA_MODE_FIELD], current.value?.[LEGACY_QUICK_QUOTA_FIELD]),
-					searchProvider: normalizeSearchProvider(current.value?.[SEARCH_PROVIDER_FIELD]),
-					speedMode: normalizeSpeedMode(current.value?.[SPEED_MODE_FIELD]),
-					outputVerbosity: normalizeOutputVerbosity(current.value?.[OUTPUT_VERBOSITY_FIELD]),
-					contextMode: normalizeContextMode(current.value?.[CONTEXT_MODE_FIELD]),
-					customContextWindow: normalizeCustomContextWindow(current.value?.[CUSTOM_CONTEXT_WINDOW_FIELD]),
-					customContextWindows: Object.fromEntries(Object.entries(CUSTOM_CONTEXT_MODEL_FIELDS).map(([modelKey, field]) => [modelKey, normalizeCustomContextWindow(current.value?.[field] ?? CUSTOM_CONTEXT_MODEL_DEFAULTS[modelKey], CUSTOM_CONTEXT_MODEL_CAPS[modelKey])])),
-					contextModels,
-					verbosityModels,
-					writable: !updating && current.status === "ready" && current.writable === true,
-					error
-				});
-			};
-			let snapshot = read();
-			const listeners = /* @__PURE__ */ new Set();
-			const publish = () => {
-				snapshot = read();
-				for (const listener of listeners) listener();
-			};
-			const disposeScope = scope.subscribe(() => {
-				error = false;
-				failedPatch = void 0;
-				publish();
-			});
-			const acceptFallback = (value) => {
-				contextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
-				verbosityModels = Array.isArray(value?.verbosityModels) ? value.verbosityModels : [];
-				fallbackStatus = "ready";
-				fallback = {
-					status: "ready",
-					value: {
-						[QUICK_QUOTA_MODE_FIELD]: normalizeQuickQuotaMode(value?.[QUICK_QUOTA_MODE_FIELD], value?.[LEGACY_QUICK_QUOTA_FIELD]),
-						[SEARCH_PROVIDER_FIELD]: normalizeSearchProvider(value?.[SEARCH_PROVIDER_FIELD]),
-						[SPEED_MODE_FIELD]: normalizeSpeedMode(value?.[SPEED_MODE_FIELD]),
-						[OUTPUT_VERBOSITY_FIELD]: normalizeOutputVerbosity(value?.[OUTPUT_VERBOSITY_FIELD]),
-						[CONTEXT_MODE_FIELD]: normalizeContextMode(value?.[CONTEXT_MODE_FIELD]),
-						[CUSTOM_CONTEXT_WINDOW_FIELD]: normalizeCustomContextWindow(value?.[CUSTOM_CONTEXT_WINDOW_FIELD]),
-						...Object.fromEntries(Object.entries(CUSTOM_CONTEXT_MODEL_FIELDS).map(([modelKey, field]) => [field, normalizeCustomContextWindow(value?.[field] ?? CUSTOM_CONTEXT_MODEL_DEFAULTS[modelKey], CUSTOM_CONTEXT_MODEL_CAPS[modelKey])]))
-					},
-					writable: value?.writable === true
-				};
-			};
-			const load = async () => {
-				const current = ++generation;
-				updating = false;
-				fallbackStatus = "loading";
-				fallback = void 0;
-				error = false;
-				publish();
-				nativeSnapshot();
-				try {
-					const value = unwrap(await rpc.call(CHANNEL, "preferences/status", {}));
-					if (current !== generation) return;
-					if (nativeSnapshot().status === "ready") {
-						contextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
-						verbosityModels = Array.isArray(value?.verbosityModels) ? value.verbosityModels : [];
-					} else acceptFallback(value);
-					publish();
-				} catch {
-					if (current !== generation || nativeSnapshot().status === "ready") return;
-					fallbackStatus = "unavailable";
-					publish();
-				}
-			};
-			const set = async (patch) => {
-				if (snapshot.status !== "ready" || snapshot.writable !== true) return;
-				const current = ++generation;
-				const entries = Object.entries(patch);
-				updating = true;
-				error = false;
-				failedPatch = void 0;
-				publish();
-				try {
-					if (nativeSnapshot().status === "ready") {
-						for (const [field, value] of entries) {
-							if (current !== generation) return;
-							await scope.set(field, value);
-						}
-						if (current !== generation) return;
-						const accepted = nativeSnapshot().value;
-						error = entries.some(([field, value]) => accepted?.[field] !== value);
-					} else {
-						const value = unwrap(await rpc.call(CHANNEL, "preferences/update", patch));
-						if (current !== generation) return;
-						acceptFallback(value);
-					}
-				} catch {
-					if (current === generation) {
-						error = true;
-						failedPatch = patch;
-					}
-				} finally {
-					if (current === generation) {
-						updating = false;
-						publish();
-					}
-				}
-			};
-			return {
-				getSnapshot: () => snapshot,
-				subscribe: (listener) => {
-					listeners.add(listener);
-					return () => listeners.delete(listener);
-				},
-				load,
-				set,
-				retry: () => failedPatch === void 0 ? load() : set(failedPatch),
-				dispose: disposeScope
-			};
-		}
 		const usePreferenceSnapshot = (preference) => (0, react.useSyncExternalStore)(preference.subscribe, preference.getSnapshot);
 		const notifyQuickQuota = () => window.dispatchEvent(new Event(QUICK_QUOTA_REFRESH_EVENT));
 		const formatRunway = (seconds, t) => {
@@ -1331,6 +1359,8 @@ window.__ModuleLoader__.load({
 					}) : null]
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "codexSubscriptionQuotaModes",
+					"data-saving": snapshot.saving || void 0,
+					"aria-busy": snapshot.saving || void 0,
 					role: "radiogroup",
 					"aria-label": t("quickQuotaSetting"),
 					children: [
@@ -1375,6 +1405,8 @@ window.__ModuleLoader__.load({
 					})]
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "codexSubscriptionSearchChoices",
+					"data-saving": snapshot.saving || void 0,
+					"aria-busy": snapshot.saving || void 0,
 					role: "radiogroup",
 					"aria-label": t("searchTitle"),
 					children: [
@@ -1885,15 +1917,37 @@ window.__ModuleLoader__.load({
 				}) : null]
 			});
 		}
+		function AccountEmail({ candidate, fallback, t, emailVisible, onClick }) {
+			if (typeof candidate?.email !== "string" || candidate.email.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				title: t("emailUnavailable"),
+				children: fallback ?? candidate?.label ?? t("emailUnavailable")
+			});
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+				type: "button",
+				className: "codexSubscriptionEmail",
+				"aria-label": t(emailVisible ? "hideEmail" : "showEmail"),
+				"aria-pressed": emailVisible,
+				onClick,
+				children: emailVisible ? candidate.email : maskEmail(candidate.email)
+			});
+		}
 		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 [emailVisible, setEmailVisible] = (0, react.useState)(false);
+			const accounts = account?.accounts ?? [];
+			const accountVisibilityKey = `${account?.authenticated === true ? "signed-in" : "signed-out"}:${accounts.map((candidate) => `${candidate.id ?? ""}:${candidate.active === true}:${candidate.email ?? ""}`).join("|")}`;
+			const [emailVisibilityKey, setEmailVisibilityKey] = (0, react.useState)(accountVisibilityKey);
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [error, setError] = (0, react.useState)();
 			const call = (endpoint, payload = {}) => rpc.call(CHANNEL, endpoint, payload).then(unwrap);
+			(0, react.useEffect)(() => {
+				if (emailVisibilityKey === accountVisibilityKey) return;
+				setEmailVisible(false);
+				setEmailVisibilityKey(accountVisibilityKey);
+			}, [accountVisibilityKey, emailVisibilityKey]);
 			(0, react.useEffect)(() => {
 				if (flow?.id === void 0 || [
 					"authenticated",
@@ -1915,7 +1969,6 @@ window.__ModuleLoader__.load({
 							setAccount(next.account);
 							onSignedOut();
 							setAdding(false);
-							setAccountLabel("");
 							setFlow(void 0);
 							notifyQuickQuota();
 						}
@@ -1931,10 +1984,11 @@ window.__ModuleLoader__.load({
 				setFlow(void 0);
 				setBusy(true);
 				setError(void 0);
+				const loginLabel = adding && label === void 0 ? `Account ${accounts.length + 1}` : label;
 				call("login/start", {
 					method,
 					openExternal: true,
-					...label === void 0 ? {} : { label }
+					...loginLabel === void 0 ? {} : { label: loginLabel }
 				}).then(setFlow).catch(() => setError(t("failed"))).finally(() => setBusy(false));
 			};
 			const cancel = () => {
@@ -1942,10 +1996,7 @@ window.__ModuleLoader__.load({
 				setBusy(true);
 				call("login/cancel", { id: flow.id }).then((next) => {
 					setFlow(adding ? void 0 : next);
-					if (adding) {
-						setAdding(false);
-						setAccountLabel("");
-					}
+					if (adding) setAdding(false);
 					if (adding) return void 0;
 					return call("status").then((account) => {
 						if (account.authenticated === true) {
@@ -2008,13 +2059,16 @@ window.__ModuleLoader__.load({
 			};
 			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);
+			const toggleEmail = () => {
+				setEmailVisibilityKey(accountVisibilityKey);
+				setEmailVisible((value) => emailVisibilityKey === accountVisibilityKey ? !value : true);
+			};
+			const emailVisibleForAccount = emailVisible && emailVisibilityKey === accountVisibilityKey;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "codexSubscriptionCard",
 				children: [
@@ -2028,7 +2082,7 @@ window.__ModuleLoader__.load({
 								className: "codexSubscriptionDot",
 								"data-state": accountReady ? signedIn ? "connected" : "disconnected" : "loading",
 								"aria-hidden": "true"
-							}), accountReady ? signedIn ? activeAccount?.label ?? t("connected") : t("disconnected") : t("accountLoading")]
+							}), accountReady ? signedIn ? t("connected") : t("disconnected") : t("accountLoading")]
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: "codexSubscriptionActions",
 							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, {
@@ -2038,7 +2092,6 @@ window.__ModuleLoader__.load({
 								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, {
@@ -2067,7 +2120,13 @@ window.__ModuleLoader__.load({
 						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", {
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountEmail, {
+								candidate,
+								fallback: candidate.label,
+								t,
+								emailVisible: emailVisibleForAccount,
+								onClick: toggleEmail
+							}), /* @__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, {
@@ -2095,42 +2154,34 @@ window.__ModuleLoader__.load({
 							})]
 						}, candidate.id))
 					}) : null,
-					signedIn && adding && flow === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					signedIn && adding && flow === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("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", {
+						children: /* @__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()),
+									disabled: busy,
+									onClick: () => begin("browser"),
 									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()),
+									disabled: busy,
+									onClick: () => begin("device_code"),
 									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("");
-									},
+									onClick: () => setAdding(false),
 									children: t("cancel")
 								})
 							]
-						})]
+						})
 					}) : null,
 					flow?.phase === "waiting_device" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "codexSubscriptionFlow",
@@ -2240,12 +2291,9 @@ window.__ModuleLoader__.load({
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "codexSubscriptionSectionHead",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: "codexSubscriptionSectionTitle",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t("diagnostics") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "codexSubscriptionNote",
-								children: t("diagnosticsHint")
-							})]
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t("diagnostics") })
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: "codexSubscriptionActions",
 							children: [
@@ -2254,7 +2302,7 @@ window.__ModuleLoader__.load({
 									variant: "outline",
 									disabled: busy,
 									onClick: load,
-									children: t("diagnosticsLoad")
+									children: busy ? t("diagnosticsLoading") : t("diagnosticsLoad")
 								}),
 								report === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 									type: "button",
@@ -2307,29 +2355,19 @@ window.__ModuleLoader__.load({
 				})
 			});
 		}
-		function ResetCreditControl({ rpc, t, count, nextExpiresAt, hasExhaustedQuota, onConsumed }) {
-			const [challenge, setChallenge] = (0, react.useState)();
-			const [resetBusy, setResetBusy] = (0, react.useState)(false);
-			const [resetAcknowledged, setResetAcknowledged] = (0, react.useState)(false);
-			const [resetCountdown, setResetCountdown] = (0, react.useState)(0);
-			const [resetError, setResetError] = (0, react.useState)();
-			const [resetResult, setResetResult] = (0, react.useState)();
-			const [inspectedExpiry, setInspectedExpiry] = (0, react.useState)(nextExpiresAt);
-			const [expiryState, setExpiryState] = (0, react.useState)(nextExpiresAt === void 0 ? "loading" : "ready");
+		function ResetCreditList({ rpc, t, count, nextExpiresAt, initialCredits, refreshKey, hasExhaustedQuota, onConsumed }) {
+			const [credits, setCredits] = (0, react.useState)(initialCredits ?? (nextExpiresAt === void 0 ? [] : [{ expiresAt: nextExpiresAt }]));
+			const [state, setState] = (0, react.useState)("loading");
 			(0, react.useEffect)(() => {
-				if (nextExpiresAt !== void 0) {
-					setInspectedExpiry(nextExpiresAt);
-					setExpiryState("ready");
-					return;
-				}
 				let live = true;
-				setExpiryState("loading");
+				setState("loading");
+				setCredits([]);
 				rpc.call(CHANNEL, "reset-credit/inspect", {}).then(unwrap).then((value) => {
 					if (!live) return;
-					setInspectedExpiry(value.nextExpiresAt);
-					setExpiryState("ready");
+					setCredits(Array.isArray(value.credits) ? value.credits : []);
+					setState("ready");
 				}).catch(() => {
-					if (live) setExpiryState("error");
+					if (live) setState("error");
 				});
 				return () => {
 					live = false;
@@ -2337,8 +2375,35 @@ window.__ModuleLoader__.load({
 			}, [
 				rpc,
 				count,
-				nextExpiresAt
+				refreshKey
 			]);
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "codexSubscriptionResetBalance",
+				"aria-label": t("resetCredits"),
+				children: [credits.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+					className: "codexSubscriptionCreditNote",
+					role: "status",
+					children: state === "loading" ? t("resetCreditExpiryLoading") : t("resetCreditExpiryFailed")
+				}) : credits.map((credit, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditControl, {
+					rpc,
+					t,
+					credit,
+					hasExhaustedQuota,
+					onConsumed
+				}, credit.ref ?? `pending-${index}`)), state === "error" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+					className: "codexSubscriptionCreditNote",
+					role: "status",
+					children: t("resetCreditExpiryFailed")
+				}) : null]
+			});
+		}
+		function ResetCreditControl({ rpc, t, credit, hasExhaustedQuota, onConsumed }) {
+			const [challenge, setChallenge] = (0, react.useState)();
+			const [resetBusy, setResetBusy] = (0, react.useState)(false);
+			const [resetAcknowledged, setResetAcknowledged] = (0, react.useState)(false);
+			const [resetCountdown, setResetCountdown] = (0, react.useState)(0);
+			const [resetError, setResetError] = (0, react.useState)();
+			const [resetResult, setResetResult] = (0, react.useState)();
 			(0, react.useEffect)(() => {
 				if (challenge === void 0) {
 					setResetCountdown(0);
@@ -2350,11 +2415,11 @@ window.__ModuleLoader__.load({
 				return () => window.clearInterval(timer);
 			}, [challenge]);
 			const prepareReset = () => {
-				if (resetBusy) return;
+				if (resetBusy || typeof credit.ref !== "string") return;
 				setResetBusy(true);
 				setResetError(void 0);
 				setResetResult(void 0);
-				rpc.call(CHANNEL, "reset-credit/prepare", {}).then(unwrap).then((next) => {
+				rpc.call(CHANNEL, "reset-credit/prepare", { creditRef: credit.ref }).then(unwrap).then((next) => {
 					setChallenge(next);
 					setResetAcknowledged(false);
 				}).catch((error) => setResetError(resetCreditErrorText(error, t))).finally(() => setResetBusy(false));
@@ -2384,36 +2449,26 @@ window.__ModuleLoader__.load({
 				}).catch((error) => setResetError(resetCreditErrorText(error, t))).finally(() => setResetBusy(false));
 			};
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				className: "codexSubscriptionResetBalance",
+				className: "codexSubscriptionResetCard",
 				children: [
-					challenge === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "codexSubscriptionResetSummary",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "codexSubscriptionResetMeta",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: fill(t("resetCreditsValue"), { count }) }), expiryState === "loading" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: "codexSubscriptionResetExpiry",
-								role: "status",
-								children: t("resetCreditExpiryLoading")
-							}) : expiryState === "error" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: "codexSubscriptionResetExpiry",
-								children: t("resetCreditExpiryFailed")
-							}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditExpiry, {
-								expiresAt: inspectedExpiry,
-								t
-							})]
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-							className: "codexSubscriptionActions",
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-								className: "codexSubscriptionResetUse",
-								type: "button",
-								variant: "outline",
-								disabled: resetBusy,
-								"aria-busy": resetBusy,
-								onClick: prepareReset,
-								children: resetBusy ? t("resetPreparing") : t("resetUse")
-							})
+					challenge === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexSubscriptionResetMeta",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: credit.name ?? t("resetCreditDefaultName") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditExpiry, {
+							expiresAt: credit.expiresAt,
+							t
 						})]
-					}) }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: "codexSubscriptionActions",
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							className: "codexSubscriptionResetUse",
+							type: "button",
+							variant: "outline",
+							disabled: resetBusy || typeof credit.ref !== "string",
+							"aria-busy": resetBusy,
+							onClick: prepareReset,
+							children: resetBusy ? t("resetPreparing") : t("resetUse")
+						})
+					})] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "codexSubscriptionResetFlow",
 						role: "group",
 						"aria-labelledby": "codex-reset-confirm-title",
@@ -2498,6 +2553,7 @@ window.__ModuleLoader__.load({
 		}
 		function UsageCard({ rpc, t, signedIn, resetKey }) {
 			const [usage, setUsage] = (0, react.useState)();
+			const [usageRefreshGeneration, setUsageRefreshGeneration] = (0, react.useState)(0);
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [error, setError] = (0, react.useState)();
 			const request = (0, react.useRef)(0);
@@ -2509,6 +2565,7 @@ window.__ModuleLoader__.load({
 				rpc.call(CHANNEL, "usage", { force }).then(unwrap).then((next) => {
 					if (request.current === id) {
 						setUsage(next);
+						setUsageRefreshGeneration((value) => value + 1);
 						if (force) notifyQuickQuota();
 					}
 				}).catch((error) => {
@@ -2626,11 +2683,13 @@ window.__ModuleLoader__.load({
 								}) : null,
 								visibleUsage?.resetCredits?.availableCount > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 									className: "codexSubscriptionCreditBalance",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("resetCredits") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditControl, {
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("resetCredits") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditList, {
 										rpc,
 										t,
 										count: visibleUsage.resetCredits.availableCount,
 										nextExpiresAt: visibleUsage.resetCredits.nextExpiresAt,
+										initialCredits: visibleUsage.resetCredits.credits,
+										refreshKey: `${resetKey}:${usageRefreshGeneration}`,
 										hasExhaustedQuota: exhausted,
 										onConsumed: () => load(true)
 									})]

package/lib/index.js

@@ -21,6 +21,41 @@ import { dirname, join, resolve } from "node:path";
 const VERSION = 1;
 const DEFAULT_LABEL = "Account 1";
 const clone$1 = (value) => value === void 0 ? void 0 : structuredClone(value);
+const EMAIL_MAX_LENGTH = 254;
+const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/u;
+/** Keep only a bounded, display-safe email address from a trusted OAuth result. */
+function normalizeAccountEmail(value) {
+	if (typeof value !== "string") return void 0;
+	const email = value.trim();
+	return email.length > 0 && email.length <= EMAIL_MAX_LENGTH && EMAIL_PATTERN.test(email) ? email : void 0;
+}
+function decodeJwtPayload(access) {
+	if (typeof access !== "string") return void 0;
+	const encoded = access.split(".")[1];
+	if (typeof encoded !== "string" || encoded.length === 0) return void 0;
+	try {
+		return JSON.parse(Buffer.from(encoded, "base64url").toString("utf8"));
+	} catch {
+		return;
+	}
+}
+function emailFromAccessToken(access) {
+	const payload = decodeJwtPayload(access);
+	return normalizeAccountEmail(payload?.["https://api.openai.com/profile"]?.email ?? payload?.email);
+}
+/** Normalize the one non-secret account attribute that may cross the UI boundary. */
+function sanitizeOAuthCredential(value) {
+	const credential = assertOAuthCredential$1(value);
+	const email = emailFromAccessToken(credential.access) ?? normalizeAccountEmail(credential.email);
+	if (email === void 0) {
+		delete credential.email;
+		return credential;
+	}
+	return {
+		...credential,
+		email
+	};
+}
 function assertOAuthCredential$1(value) {
 	if (value === null || typeof value !== "object" || value.type !== "oauth" || typeof value.access !== "string" || value.access.length === 0 || typeof value.refresh !== "string" || value.refresh.length === 0 || typeof value.expires !== "number" || !Number.isFinite(value.expires)) throw new Error("Codex account vault received a malformed OAuth credential");
 	return clone$1(value);
@@ -48,7 +83,7 @@ function assertVaultRecord(record) {
 		return {
 			id: account.id,
 			label: normalizeLabel(account.label),
-			credential: assertOAuthCredential$1(account.credential)
+			credential: sanitizeOAuthCredential(account.credential)
 		};
 	});
 	if (!ids.has(record.payload.activeId)) throw new Error("Codex account vault active account is missing");
@@ -80,7 +115,7 @@ var PendingOAuthCredentialStore = class {
 	async modify(providerId, update) {
 		if (providerId !== "openai-codex") throw new Error("Pending Codex login received an unknown provider");
 		const next = await update(clone$1(this.#credential));
-		if (next !== void 0) this.#credential = assertOAuthCredential$1(next);
+		if (next !== void 0) this.#credential = sanitizeOAuthCredential(next);
 		return clone$1(this.#credential);
 	}
 	async delete(providerId) {
@@ -170,7 +205,8 @@ var DshOAuthAccountVault = class {
 				id: account.id,
 				label: account.label,
 				active: account.id === payload.activeId,
-				expiresAt: account.credential.expires
+				expiresAt: account.credential.expires,
+				...account.credential.email === void 0 ? {} : { email: account.credential.email }
 			}));
 		});
 	}
@@ -186,7 +222,7 @@ var DshOAuthAccountVault = class {
 	add(label, credential) {
 		return this.#enqueue(async () => {
 			const normalizedLabel = normalizeLabel(label);
-			const validated = assertOAuthCredential$1(credential);
+			const validated = sanitizeOAuthCredential(credential);
 			await this.#ensurePayload();
 			const id = this.createId();
 			const account = (await this.#modifyPayload((current) => ({
@@ -202,7 +238,8 @@ var DshOAuthAccountVault = class {
 				id,
 				label: account.label,
 				active: true,
-				expiresAt: account.credential.expires
+				expiresAt: account.credential.expires,
+				...account.credential.email === void 0 ? {} : { email: account.credential.email }
 			};
 		});
 	}
@@ -222,7 +259,7 @@ var DshOAuthAccountVault = class {
 			if (await this.#ensurePayload() === void 0) {
 				const initial = await update(void 0);
 				if (initial === void 0) return void 0;
-				const credential = assertOAuthCredential$1(initial);
+				const credential = sanitizeOAuthCredential(initial);
 				await this.credentials.set(this.legacyRef, JSON.stringify(credential));
 				await this.#ensurePayload();
 				return clone$1(credential);
@@ -236,7 +273,8 @@ var DshOAuthAccountVault = class {
 					result = previous;
 					return current;
 				}
-				const credential = assertOAuthCredential$1(next);
+				const credential = sanitizeOAuthCredential(next);
+				if (credential.email === void 0 && previous.email !== void 0) credential.email = previous.email;
 				const accounts = [...current.accounts];
 				accounts[index] = {
 					...accounts[index],
@@ -1265,7 +1303,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "1.12.2";
+const PACKAGE_VERSION = "1.13.1";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -2244,15 +2282,23 @@ function resetCreditsOf(value) {
 	if (value === void 0 || value === null) return void 0;
 	if (!record$1(value) || !Number.isSafeInteger(value.available_count) || value.available_count < 0) throw new Error("Codex returned malformed reset credit details");
 	if (value.credits !== void 0 && value.credits !== null && !Array.isArray(value.credits)) throw new Error("Codex returned malformed reset credit details");
-	const expirations = (value.credits ?? []).filter((credit) => record$1(credit) && credit.status?.toLowerCase?.() === "available").map((credit) => {
-		if (Number.isSafeInteger(credit.expires_at) && credit.expires_at > 0) return credit.expires_at * 1e3;
-		if (typeof credit.expires_at === "string" && credit.expires_at.length <= 64) {
+	const available = (value.credits ?? []).filter((credit) => record$1(credit) && credit.status?.toLowerCase?.() === "available").map((credit) => {
+		const name = typeof credit.title === "string" && credit.title.trim().length > 0 ? credit.title.trim().slice(0, 120) : void 0;
+		let expiresAt;
+		if (Number.isSafeInteger(credit.expires_at) && credit.expires_at > 0) expiresAt = credit.expires_at * 1e3;
+		else if (typeof credit.expires_at === "string" && credit.expires_at.length <= 64) {
 			const parsed = Date.parse(credit.expires_at);
-			if (Number.isFinite(parsed) && parsed > 0) return parsed;
+			if (Number.isFinite(parsed) && parsed > 0) expiresAt = parsed;
 		}
-	}).filter((expiration) => expiration !== void 0);
+		return {
+			...name === void 0 ? {} : { name },
+			...expiresAt === void 0 ? {} : { expiresAt }
+		};
+	});
+	const expirations = available.map((credit) => credit.expiresAt).filter((expiration) => expiration !== void 0);
 	return {
 		availableCount: value.available_count,
+		...available.length === 0 ? {} : { credits: available },
 		...expirations.length === 0 ? {} : { nextExpiresAt: Math.min(...expirations) }
 	};
 }
@@ -2691,10 +2737,13 @@ function parseDetails(value, now) {
 	if (available.length === 0) throw new Error("No usable quota reset is available");
 	return {
 		availableCount: value.available_count,
-		creditId: available[0].credit.id,
-		title: safeCopy(available[0].credit.title),
-		description: safeCopy(available[0].credit.description),
-		creditExpiresAt: available[0].expiresAt
+		credits: available.map(({ credit, expiresAt }, index) => ({
+			creditId: credit.id,
+			title: safeCopy(credit.title),
+			description: safeCopy(credit.description),
+			creditExpiresAt: expiresAt,
+			index
+		}))
 	};
 }
 function parseConsumeResult(value) {
@@ -2728,6 +2777,23 @@ function createCodexResetCreditService(options) {
 	const challengeTtlMs = options.challengeTtlMs ?? DEFAULT_CHALLENGE_TTL_MS;
 	const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
 	const challenges = /* @__PURE__ */ new Map();
+	const creditRefs = /* @__PURE__ */ new Map();
+	let creditRefSequence = 0;
+	const rememberCreditRef = (accountId, credit) => {
+		const ref = `${randomUUID$1()}-${++creditRefSequence}`;
+		creditRefs.set(ref, {
+			accountId,
+			creditId: credit.creditId,
+			index: credit.index
+		});
+		while (creditRefs.size > 64) creditRefs.delete(creditRefs.keys().next().value);
+		return ref;
+	};
+	const publicCredit = (accountId, credit) => ({
+		ref: rememberCreditRef(accountId, credit),
+		...credit.title === void 0 ? {} : { name: credit.title },
+		...credit.creditExpiresAt === void 0 ? {} : { expiresAt: credit.creditExpiresAt }
+	});
 	const resolveCredentials = async (signal) => credentialsOf(await getAuth({ signal }), await readCredential({ signal }));
 	const readDetails = async (signal, credentials) => {
 		const { access, accountId } = credentials ?? await resolveCredentials(signal);
@@ -2757,16 +2823,27 @@ function createCodexResetCreditService(options) {
 	};
 	return Object.freeze({
 		async inspect({ signal } = {}) {
-			const { details } = await readDetails(signal);
+			const { accountId, details } = await readDetails(signal);
 			return {
 				availableCount: details.availableCount,
-				...details.creditExpiresAt === void 0 ? {} : { nextExpiresAt: details.creditExpiresAt }
+				credits: details.credits.map((credit) => publicCredit(accountId, credit)),
+				...details.credits[0]?.creditExpiresAt === void 0 ? {} : { nextExpiresAt: details.credits[0].creditExpiresAt }
 			};
 		},
-		async prepare({ signal } = {}) {
+		async prepare({ creditRef, signal } = {}) {
 			const credentials = await resolveCredentials(signal);
 			for (const [challengeId, challenge] of challenges) {
-				if (challenge.accountId !== credentials.accountId || challenge.uncertain !== true) continue;
+				if (challenge.accountId === credentials.accountId && challenge.uncertain === false && challenge.creditRef === creditRef) if (now() > challenge.expiresAt) challenges.delete(challengeId);
+				else return {
+					challengeId,
+					availableCount: challenge.availableCount,
+					readyAt: challenge.readyAt,
+					expiresAt: challenge.expiresAt,
+					...challenge.creditExpiresAt === void 0 ? {} : { creditExpiresAt: challenge.creditExpiresAt },
+					...challenge.title === void 0 ? {} : { title: challenge.title },
+					...challenge.description === void 0 ? {} : { description: challenge.description }
+				};
+				if (challenge.accountId !== credentials.accountId || challenge.uncertain !== true || creditRef !== void 0 && challenge.creditRef !== creditRef) continue;
 				if (now() > challenge.expiresAt) {
 					challenges.delete(challengeId);
 					continue;
@@ -2782,22 +2859,31 @@ function createCodexResetCreditService(options) {
 				};
 			}
 			const { accountId, details } = await readDetails(signal, credentials);
+			let selected = details.credits[0];
+			if (creditRef !== void 0) {
+				const reference = typeof creditRef === "string" ? creditRefs.get(creditRef) : void 0;
+				if (reference === void 0 || reference.accountId !== accountId) throw new Error("This quota reset confirmation is no longer valid");
+				selected = details.credits.find((credit) => credit.creditId === reference.creditId && credit.index === reference.index);
+				if (selected === void 0) throw new Error("This quota reset confirmation is no longer valid");
+			}
+			if (selected === void 0) throw new Error("No usable quota reset is available");
 			const preparedAt = now();
 			const readyAt = preparedAt + confirmDelayMs;
-			const expiresAt = Math.min(preparedAt + challengeTtlMs, details.creditExpiresAt ?? Number.MAX_SAFE_INTEGER);
+			const expiresAt = Math.min(preparedAt + challengeTtlMs, selected.creditExpiresAt ?? Number.MAX_SAFE_INTEGER);
 			if (expiresAt <= readyAt) throw new Error("The available quota reset expires too soon");
 			const challengeId = randomUUID$1();
 			challenges.set(challengeId, {
 				state: "prepared",
 				accountId,
-				creditId: details.creditId,
+				creditRef,
+				creditId: selected.creditId,
 				redeemRequestId: randomUUID$1(),
 				readyAt,
 				expiresAt,
 				availableCount: details.availableCount,
-				creditExpiresAt: details.creditExpiresAt,
-				title: details.title,
-				description: details.description,
+				creditExpiresAt: selected.creditExpiresAt,
+				title: selected.title,
+				description: selected.description,
 				uncertain: false
 			});
 			return {
@@ -2805,9 +2891,9 @@ function createCodexResetCreditService(options) {
 				availableCount: details.availableCount,
 				readyAt,
 				expiresAt,
-				...details.creditExpiresAt === void 0 ? {} : { creditExpiresAt: details.creditExpiresAt },
-				...details.title === void 0 ? {} : { title: details.title },
-				...details.description === void 0 ? {} : { description: details.description }
+				...selected.creditExpiresAt === void 0 ? {} : { creditExpiresAt: selected.creditExpiresAt },
+				...selected.title === void 0 ? {} : { title: selected.title },
+				...selected.description === void 0 ? {} : { description: selected.description }
 			};
 		},
 		async consume({ challengeId, acknowledged, signal } = {}) {
@@ -2885,6 +2971,7 @@ function createCodexResetCreditService(options) {
 		},
 		clear() {
 			challenges.clear();
+			creditRefs.clear();
 		}
 	});
 }
@@ -3026,7 +3113,10 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 			signal.throwIfAborted();
 			return {
 				ok: true,
-				value: endpoint === "reset-credit/inspect" ? await resetCreditService.inspect({ signal }) : endpoint === "reset-credit/prepare" ? await resetCreditService.prepare({ signal }) : await resetCreditService.consume({
+				value: endpoint === "reset-credit/inspect" ? await resetCreditService.inspect({ signal }) : endpoint === "reset-credit/prepare" ? await resetCreditService.prepare({
+					creditRef: payload?.creditRef,
+					signal
+				}) : await resetCreditService.consume({
 					challengeId: payload?.challengeId,
 					acknowledged: payload?.acknowledged,
 					signal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "1.12.2",
+  "version": "1.13.1",
   "description": "Use ChatGPT and Codex subscriptions in DeepSeek Harness with OAuth, quota, safe resets, web search, images, and Fast mode",
   "type": "module",
   "main": "./lib/index.js",