dsh-codex-subscription 2.6.9 → 2.7.1

package/README.en.md

@@ -106,7 +106,7 @@ This plugin supports the latest DeepSeek Harness release recorded in its package
 2. Paste this package name, with its version, into the **Package name or address** field:
 
    ```text
-   dsh-codex-subscription@2.6.9
+   dsh-codex-subscription@2.7.1
    ```
 
 3. Click **Install** and wait for completion. Follow the page instructions; save your work before restarting if requested.
@@ -118,7 +118,7 @@ Why the version is included: DSH's plugin page only installs versions that are a
 <summary>Terminal installation (with an existing dsh command)</summary>
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@2.6.9
+dsh plugin --profile web add dsh-codex-subscription@2.7.1
 ```
 
 Follow the restart instructions, then sign in under **Settings → Codex**. Both the Plugins page and the terminal use DSH's installation management.
@@ -131,7 +131,7 @@ Follow the restart instructions, then sign in under **Settings → Codex**. Both
 After signing in and selecting a Codex model in Web, install the same plugin in the Headless profile:
 
 ```sh
-dsh plugin --profile headless add dsh-codex-subscription@2.6.9
+dsh plugin --profile headless add dsh-codex-subscription@2.7.1
 dsh --profile headless "Reply with only the word: ok"
 ```
 
@@ -266,7 +266,7 @@ Find this plugin on the DSH **Plugins** page and use its update or uninstall act
 <summary>Terminal commands</summary>
 
 ```sh
-dsh plugin --profile web update dsh-codex-subscription@2.6.9
+dsh plugin --profile web update dsh-codex-subscription@2.7.1
 ```
 
 Run only when you want to uninstall:
@@ -282,7 +282,7 @@ dsh plugin --profile web remove dsh-codex-subscription
 <details>
 <summary>DSH 0.2.0-rc.2 reports the plugin as incompatible?</summary>
 
-DSH 0.2.0-rc.2 did not exist when any release before 2.2.10 was published, and a published package's compatibility declaration cannot be changed. Install 2.2.10 or later (a bare package name can resolve to an older release during the first 24 hours, so enter `dsh-codex-subscription@2.2.10`) from the **Plugins** page, or run `dsh plugin --profile web update dsh-codex-subscription@2.6.9`, then restart DSH.
+DSH 0.2.0-rc.2 did not exist when any release before 2.2.10 was published, and a published package's compatibility declaration cannot be changed. Install 2.2.10 or later (a bare package name can resolve to an older release during the first 24 hours, so enter `dsh-codex-subscription@2.2.10`) from the **Plugins** page, or run `dsh plugin --profile web update dsh-codex-subscription@2.7.1`, then restart DSH.
 
 </details>
 

package/README.md

@@ -106,7 +106,7 @@
 2. 在 **包名或地址** 输入框中粘贴下面的包名（已带版本号）：
 
    ```text
-   dsh-codex-subscription@2.6.9
+   dsh-codex-subscription@2.7.1
    ```
 
 3. 点击 **安装**，等待安装完成；按页面提示操作，需要重启时先保存工作。
@@ -118,7 +118,7 @@
 <summary>终端安装（已能运行 dsh 命令）</summary>
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@2.6.9
+dsh plugin --profile web add dsh-codex-subscription@2.7.1
 ```
 
 安装完成后按提示重启 DSH，再到 **设置 → Codex 订阅** 登录。插件页面和终端均由 DSH 管理安装。
@@ -131,7 +131,7 @@ dsh plugin --profile web add dsh-codex-subscription@2.6.9
 先在 Web 中完成登录并选择一次 Codex 模型，再把同一个插件安装到 Headless profile：
 
 ```sh
-dsh plugin --profile headless add dsh-codex-subscription@2.6.9
+dsh plugin --profile headless add dsh-codex-subscription@2.7.1
 dsh --profile headless "只回复：ok"
 ```
 
@@ -295,7 +295,7 @@ DSH 实机设置截图。
 <summary>终端方式</summary>
 
 ```sh
-dsh plugin --profile web update dsh-codex-subscription@2.6.9
+dsh plugin --profile web update dsh-codex-subscription@2.7.1
 ```
 
 仅在需要卸载时运行：
@@ -311,7 +311,7 @@ dsh plugin --profile web remove dsh-codex-subscription
 <details>
 <summary>DSH 0.2.0-rc.2 提示插件不兼容？</summary>
 
-2.2.10 之前的所有版本发布时 DSH 0.2.0-rc.2 还不存在，其兼容声明无法事后修改。请安装 2.2.10 或更高版本（只填包名时，发布满 24 小时前可能装到旧版，请直接填 `dsh-codex-subscription@2.2.10`）：在 **插件** 页面更新，或运行 `dsh plugin --profile web update dsh-codex-subscription@2.6.9`，然后重启 DSH。
+2.2.10 之前的所有版本发布时 DSH 0.2.0-rc.2 还不存在，其兼容声明无法事后修改。请安装 2.2.10 或更高版本（只填包名时，发布满 24 小时前可能装到旧版，请直接填 `dsh-codex-subscription@2.2.10`）：在 **插件** 页面更新，或运行 `dsh plugin --profile web update dsh-codex-subscription@2.7.1`，然后重启 DSH。
 
 </details>
 

package/lib/client.js

@@ -1074,6 +1074,7 @@ window.__ModuleLoader__.load({
 			"account/select",
 			"account/remove",
 			"usage",
+			"usage/accounts",
 			"diagnostics",
 			"preferences/status",
 			"preferences/models",
@@ -5468,6 +5469,8 @@ window.__ModuleLoader__.load({
 		const IconChevronDownOutline14 = _deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14 ?? _deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutlineRegular;
 		const IconChevronRightOutline14 = _deepseek_ai_dsh_client_ui_primitives.IconChevronRightOutline14 ?? _deepseek_ai_dsh_client_ui_primitives.IconChevronRightOutlineRegular;
 		const Menu = _deepseek_ai_dsh_client_ui_primitives.Menu;
+		const MenuSurface = _deepseek_ai_dsh_client_ui_primitives.MenuSurface;
+		const MenuGroup = _deepseek_ai_dsh_client_ui_primitives.MenuGroup;
 		const Tooltip = _deepseek_ai_dsh_client_ui_primitives.Tooltip;
 		const IconChevronLeftOutline14 = _deepseek_ai_dsh_client_ui_primitives.IconChevronLeftOutline14 ?? _deepseek_ai_dsh_client_ui_primitives.IconChevronLeftOutlineRegular;
 		const IconCloseOutline16 = _deepseek_ai_dsh_client_ui_primitives.IconCloseOutline16 ?? _deepseek_ai_dsh_client_ui_primitives.IconCloseOutlineRegular;
@@ -6037,7 +6040,13 @@ window.__ModuleLoader__.load({
 			resetNoCredit: "没有可用的额度重置。",
 			resetAlready: "这次重置请求已处理。",
 			resetFailed: "无法使用额度重置。",
+			accountQuotaLeft: "{label}剩余 {value}%",
+			accountQuotaResets: "{value} 重置",
+			accountQuotaLoading: "正在读取额度…",
+			accountQuotaError: "暂时读不到这个账号的额度",
+			accountQuotaNone: "没有额度窗口信息",
 			resetRenewLogin: "登录状态已失效，请重新登录。",
+			resetBlocked: "ChatGPT 的网络防护拦截了这次请求（HTTP 403），登录状态没有问题。请稍后再试，或检查网络、代理或 VPN。",
 			resetExpired: "本次确认已失效，请重新开始。",
 			resetInProgress: "额度重置正在处理中。",
 			resetTooEarly: "请等待冷静期结束后再确认。",
@@ -6643,7 +6652,13 @@ window.__ModuleLoader__.load({
 			resetNoCredit: "No quota reset is available.",
 			resetAlready: "This reset request was already processed.",
 			resetFailed: "Could not use the quota reset.",
+			accountQuotaLeft: "{label} {value}% left",
+			accountQuotaResets: "resets {value}",
+			accountQuotaLoading: "Reading quota…",
+			accountQuotaError: "The quota of this account could not be read right now",
+			accountQuotaNone: "No quota window reported",
 			resetRenewLogin: "Your sign-in expired. Sign in again.",
+			resetBlocked: "ChatGPT network protection blocked this request (HTTP 403). Your sign-in is fine; try again later or check your network, proxy or VPN.",
 			resetExpired: "This confirmation expired. Start again.",
 			resetInProgress: "A quota reset is already in progress.",
 			resetTooEarly: "Wait for the cooldown before confirming.",
@@ -6849,6 +6864,9 @@ window.__ModuleLoader__.load({
 .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}
+.codexSubscriptionAccountMain{display:flex;flex-direction:column;gap:2px;padding:6px 0;min-width:0}
+.codexSubscriptionAccountQuota{display:flex;flex-wrap:wrap;gap:2px 12px;font-size:12px;color:var(--dsw-alias-text-l2)}
+.codexSubscriptionAccountQuota[data-state=error]{color:var(--dsw-alias-text-danger,#c0392b)}
 .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)}
@@ -6969,7 +6987,7 @@ window.__ModuleLoader__.load({
 .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}
 .codexModelSelect{position:relative;min-width:0}
-.codexModelSelectTrigger{display:flex;align-items:center;gap:4px;min-width:0;max-width:min(360px,45cqw);height:28px;padding:0 4px 0 8px;border:0;border-radius:24px;outline:0;background:transparent;color:var(--dsw-alias-label-secondary);font-size:13px;font-weight:500;line-height:20px;cursor:pointer}
+.codexModelSelectTrigger{display:flex;align-items:center;gap:4px;min-width:0;max-width:min(360px,45cqw);height:28px;padding:0 4px 0 8px;border:0;border-radius:var(--dsw-radius-sm);outline:0;background:transparent;color:var(--dsw-alias-label-secondary);font-size:13px;font-weight:500;line-height:20px;cursor:pointer}
 .codexModelSelectTrigger:hover:not(:disabled),.codexModelSelectTrigger[aria-expanded=true]{background:var(--dsw-alias-interactive-bg-hover)}
 .codexModelSelectTrigger:focus-visible{box-shadow:0 0 0 2px var(--dsw-alias-border-l3)}
 .codexModelSelectTrigger:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}
@@ -6978,34 +6996,32 @@ window.__ModuleLoader__.load({
 .codexModelSelectEffort{flex:none;color:var(--dsw-alias-label-caption)}
 .codexModelSelectChevron{flex:none;color:var(--dsw-alias-label-caption);transition:transform 120ms}
 .codexModelSelectTrigger[aria-expanded=true] .codexModelSelectChevron{transform:rotate(180deg)}
-.codexModelSelectMenu,.codexModelSelectSubmenu{position:absolute;z-index:30;box-sizing:border-box;width:max-content;min-width:min(240px,calc(100vw - 32px));max-width:min(420px,calc(100vw - 32px));max-height:min(360px,calc(100vh - 96px));padding:4px;border:1px solid var(--dsw-alias-border-inverted);border-radius:12px;background:var(--dsw-alias-bg-layer-2,#2c2c2e);box-shadow:var(--dsw-shadow-lv3);color:var(--dsw-alias-label-primary);overflow:hidden}
-.codexModelSelectMenu{right:0;bottom:calc(100% + 8px)}
-.codexModelSelectSubmenu{right:calc(100% + 8px);bottom:0;min-width:min(230px,calc(100vw - 32px))}
-/* Keep search outside the scroll viewport; let the model list fit the bounded menu. */
-.codexModelSelectModelMenu{display:flex;flex-direction:column}
-.codexModelSelectCell{display:flex;align-items:center;gap:8px;width:100%;min-width:100%;height:40px;box-sizing:border-box;padding:0 10px;border:0;border-radius:10px;background:transparent;color:inherit;font-size:14px;line-height:22px;text-align:left;cursor:pointer}
-.codexModelSelectCell:hover,.codexModelSelectCell:focus-visible,.codexModelSelectCell[data-open=true]{background:var(--dsw-alias-interactive-bg-hover);outline:0}
-.codexModelSelectCell:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}
+/* The menu follows DSH's own model picker: one floating surface above the trigger, rows drill into the same surface. */
+.codexModelSelectMenu{z-index:1100;--dsw-elevation-stroke-color:var(--dsw-alias-border-l1);box-sizing:border-box;position:fixed;display:flex;flex-direction:column;width:max-content;min-width:min(240px,100vw - 32px);max-width:min(420px,100vw - 32px);max-height:min(360px,100vh - 96px);padding:4px;border:0;box-shadow:var(--dsw-elevation-prominent);color:var(--dsw-alias-label-primary);--dsh-scrollbar-thumb:var(--dsw-alias-scrollbar-bg-l2);--dsh-scrollbar-thumb-hover:var(--dsw-alias-scrollbar-hover-l2);overflow:hidden}
+.codexModelSelectCell{box-sizing:border-box;display:flex;align-items:center;gap:6px;width:auto;min-width:100%;height:34px;padding:0 8px;border:none;border-radius:var(--dsw-radius-md);outline:none;background:transparent;color:var(--dsw-alias-label-primary);font-size:13px;line-height:20px;text-align:left;cursor:pointer}
+.codexModelSelectCell:hover,.codexModelSelectCell:focus-visible{background:var(--dsw-alias-interactive-bg-hover)}
 .codexModelSelectCellLabel{flex:none;white-space:nowrap}
 .codexModelSelectCellValue{flex:auto;min-width:0;overflow:hidden;color:var(--dsw-alias-label-tertiary);text-align:right;text-overflow:ellipsis;white-space:nowrap}
-.codexModelSelectCellChevron{flex:none;color:var(--dsw-alias-label-tertiary)}
-.codexModelSelectSearch{display:block;flex-shrink:0;width:100%;box-sizing:border-box;height:32px;margin:0 0 4px;padding:0 10px;border:1px solid var(--dsw-alias-border-l3);border-radius:8px;outline:0;background:transparent;color:inherit;font:inherit;font-size:13px}
-.codexModelSelectSearch:focus-visible{box-shadow:0 0 0 2px var(--dsw-alias-border-l3)}
+.codexModelSelectCellChevron{flex:none;width:12px;height:12px;color:var(--dsw-alias-menu-icon)}
+.codexModelSelectSearchRow{flex-shrink:0;position:relative;margin:2px 0 3px}
+.codexModelSelectSearchRow .codexModelSelectSearch{display:flex;height:auto;padding:5px 7px;border:0 solid transparent;border-radius:var(--dsw-radius-md);background:transparent}
+.codexModelSelectSearchRow .codexModelSelectSearch:focus-within{border-color:transparent}
+.codexModelSelectSearchRow .codexModelSelectSearch input{padding:0;font-size:12px;line-height:normal}
+.codexModelSelectSearchRow .codexModelSelectSearch input::placeholder{color:var(--dsw-alias-label-caption)}
 .codexModelSelectGroups{flex:1 1 auto;min-height:0;overflow-y:auto}
-.codexModelSelectGroup+.codexModelSelectGroup{margin-top:4px}
-.codexModelSelectGroupTitle{position:sticky;top:0;z-index:1;padding:5px 8px 3px;background:var(--dsw-alias-bg-layer-2,#2c2c2e);color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:500;line-height:18px}
-.codexModelSelectOption{display:flex;align-items:center;gap:8px;width:100%;min-width:100%;min-height:38px;box-sizing:border-box;padding:6px 8px;border:0;border-radius:10px;outline:0;background:transparent;color:inherit;text-align:left;cursor:pointer}
+.codexModelSelectGroupTitle{padding:5px 8px 3px;color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:500;line-height:18px}
+.codexModelSelectOption{box-sizing:border-box;display:flex;align-items:center;gap:6px;width:auto;min-width:100%;min-height:34px;padding:5px 7px;border:none;border-radius:var(--dsw-radius-md);outline:none;background:transparent;color:inherit;text-align:left;cursor:pointer}
 .codexModelSelectOption:hover:not(:disabled),.codexModelSelectOption:focus-visible{background:var(--dsw-alias-interactive-bg-hover)}
 .codexModelSelectOption:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}
-.codexModelSelectOptionCopy{display:flex;flex:1;min-width:0;flex-direction:column}
-.codexModelSelectOptionName{overflow:hidden;color:inherit;font-size:14px;font-weight:500;line-height:20px;text-overflow:ellipsis;white-space:nowrap}
-.codexModelSelectOptionDescription{overflow:hidden;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px;text-overflow:ellipsis;white-space:nowrap}
-.codexModelSelectCheck{display:grid;place-items:center;flex:0 0 18px;color:var(--dsw-alias-label-primary)}
-.codexModelSelectStatus,.codexModelSelectEmpty{padding:10px;color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:20px}
-.codexModelSelectError,.codexModelSelectWarning{display:flex;align-items:flex-start;justify-content:space-between;gap:8px;margin-bottom:4px;padding:7px 8px;border-radius:8px;background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}
+.codexModelSelectOptionCopy{display:flex;flex:1;flex-direction:column;min-width:0}
+.codexModelSelectOptionName{overflow:hidden;color:inherit;font-size:13px;font-weight:400;line-height:18px;text-overflow:ellipsis;white-space:nowrap}
+.codexModelSelectOptionDescription{overflow:hidden;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:16px;text-overflow:ellipsis;white-space:nowrap}
+.codexModelSelectCheck{display:grid;place-items:center;flex:0 0 14px;color:var(--dsw-alias-label-primary)}
+.codexModelSelectCheck svg{width:14px;height:14px}
+.codexModelSelectStatus,.codexModelSelectEmpty{padding:8px;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}
+.codexModelSelectError,.codexModelSelectWarning{display:flex;align-items:flex-start;justify-content:space-between;gap:6px;margin-bottom:3px;padding:6px 7px;border-radius:var(--dsw-radius-md);background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary);font-size:11px;line-height:16px}
 .codexModelSelectWarning{background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-state-warn-label)}
-.codexModelSelectRetry{flex:none;padding:0;border:0;background:transparent;color:inherit;font:inherit;font-weight:600;cursor:pointer}
-.codexModelSelectMenu{overflow:visible}
+.codexModelSelectRetry{flex:none;padding:0;border:none;background:transparent;color:inherit;font:inherit;font-weight:600;cursor:pointer}
 .codexImageTool{display:flex;flex-direction:column;gap:8px;margin:4px 0;color:var(--dsw-alias-label-primary)}
 .codexImageToolRow{display:flex;align-items:center;min-height:24px;gap:8px;font-size:13px;line-height:20px}
 .codexImageToolIcon{display:block;flex-shrink:0;width:16px;height:16px;color:var(--dsw-alias-label-secondary)}
@@ -9078,7 +9094,9 @@ window.__ModuleLoader__.load({
 			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 });
+		/** The language DSH shows its interface in, so dates and numbers match the text around them rather than the OS. */
+		const uiLocale = () => typeof document === "undefined" ? void 0 : document.documentElement.lang || void 0;
+		const percent = (value) => Number(value).toLocaleString(uiLocale(), { maximumFractionDigits: 1 });
 		const isApproximateWindow = (seconds, expected) => seconds >= expected * .95 && seconds <= expected * 1.05;
 		const windowLabel = (seconds, t) => {
 			if (isApproximateWindow(seconds, 18e3)) return t("windowFiveHours");
@@ -9155,7 +9173,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.6.9";
+		const PACKAGE_VERSION = "2.7.1";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -9383,7 +9401,7 @@ window.__ModuleLoader__.load({
 		}
 		function shortReset(quota, t) {
 			if (!Number.isSafeInteger(quota.resetsAt)) return t("resetUnknown");
-			const value = (/* @__PURE__ */ new Date(quota.resetsAt * 1e3)).toLocaleString(void 0, {
+			const value = (/* @__PURE__ */ new Date(quota.resetsAt * 1e3)).toLocaleString(uiLocale(), {
 				month: "numeric",
 				day: "numeric",
 				hour: "2-digit",
@@ -9426,6 +9444,11 @@ window.__ModuleLoader__.load({
 		const ForwardRef = /*#__PURE__*/ react.forwardRef(BoltIcon);
 		//#endregion
 		//#region src/client-model-select.jsx
+		const MEASURE_STYLE = {
+			visibility: "hidden",
+			left: 0,
+			top: 0
+		};
 		function CodexModelSelect({ locked, available, directory, load, select, preference, t }) {
 			const state = (0, react.useSyncExternalStore)(directory.subscribe, directory.getSnapshot);
 			const preferenceSnapshot = usePreferenceSnapshot(preference);
@@ -9433,6 +9456,8 @@ window.__ModuleLoader__.load({
 			const [pane, setPane] = (0, react.useState)("root");
 			const [query, setQuery] = (0, react.useState)("");
 			const rootRef = (0, react.useRef)(null);
+			const menuRef = (0, react.useRef)(null);
+			const [menuPos, setMenuPos] = (0, react.useState)(null);
 			const triggerRef = (0, react.useRef)(null);
 			const id = (0, react.useId)();
 			const choices = (0, react.useMemo)(() => state.groups.flatMap((group) => group.models.map((model) => ({
@@ -9516,7 +9541,7 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => {
 				if (!open) return void 0;
 				const closeOutside = (event) => {
-					if (!rootRef.current?.contains(event.target)) {
+					if (!rootRef.current?.contains(event.target) && !menuRef.current?.contains(event.target)) {
 						setOpen(false);
 						setPane("root");
 						setQuery("");
@@ -9525,6 +9550,39 @@ window.__ModuleLoader__.load({
 				document.addEventListener("mousedown", closeOutside);
 				return () => document.removeEventListener("mousedown", closeOutside);
 			}, [open]);
+			(0, react.useLayoutEffect)(() => {
+				if (!open) {
+					setMenuPos(null);
+					return;
+				}
+				const place = () => {
+					const rect = triggerRef.current?.getBoundingClientRect();
+					if (rect === void 0) return;
+					const margin = 12;
+					const width = menuRef.current?.offsetWidth ?? 0;
+					const height = menuRef.current?.offsetHeight ?? 0;
+					let left = rect.right - width;
+					let top = rect.top - 8 - height;
+					if (width > 0) left = Math.min(Math.max(left, margin), window.innerWidth - width - margin);
+					if (height > 0) top = Math.min(Math.max(top, margin), window.innerHeight - height - margin);
+					setMenuPos({
+						left,
+						top
+					});
+				};
+				place();
+				window.addEventListener("scroll", place, true);
+				window.addEventListener("resize", place);
+				return () => {
+					window.removeEventListener("scroll", place, true);
+					window.removeEventListener("resize", place);
+				};
+			}, [
+				open,
+				pane,
+				state,
+				query
+			]);
 			(0, react.useEffect)(() => {
 				if (pane !== "model") setQuery("");
 			}, [pane]);
@@ -9598,10 +9656,10 @@ window.__ModuleLoader__.load({
 				type: "button",
 				role: "menuitem",
 				className: "codexModelSelectCell",
-				"data-open": pane === target,
-				"aria-haspopup": "menu",
-				"aria-expanded": pane === target,
-				onClick: () => setPane((current) => current === target ? "root" : target),
+				onClick: () => {
+					setQuery("");
+					setPane(target);
+				},
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						className: "codexModelSelectCellLabel",
@@ -9614,141 +9672,147 @@ window.__ModuleLoader__.load({
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronRightOutline14, { className: "codexModelSelectCellChevron" })
 				]
 			});
-			let submenu = null;
-			if (pane === "model") submenu = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				className: "codexModelSelectSubmenu codexModelSelectModelMenu",
-				role: "menu",
-				"aria-label": t("modelLabel"),
-				children: [
-					state.status === "loading" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "codexModelSelectStatus",
-						children: t("modelsLoading")
-					}) : null,
-					state.error === null ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "codexModelSelectError",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: fill(t("modelFailed"), { value: state.error }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-							className: "codexModelSelectRetry",
-							type: "button",
-							onClick: load,
-							children: t("modelRetry")
-						})]
-					}),
-					state.failures.map((failure) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "codexModelSelectWarning",
-						children: fill(t("groupFailed"), {
-							name: failure.name,
-							value: failure.message
-						})
-					}, failure.id)),
-					searchable ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+			const group = (key, label, children) => MenuGroup === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+				role: "group",
+				"aria-label": label,
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "codexModelSelectGroupTitle",
+					children: label
+				}), children]
+			}, key) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MenuGroup, {
+				label,
+				children
+			}, key);
+			let content = null;
+			if (pane === "root") content = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+				cell("model", t("modelLabel"), modelLabel),
+				reasoning === void 0 ? null : cell("effort", t("effortLabel"), effortLabel),
+				(speedSupported || ultrafastSupported) && cell("speed", t("speedTitle"), t(speedKey)),
+				verbositySupported && cell("verbosity", t("verbosityTitle"), verbosityLabel)
+			] });
+			else if (pane === "model") content = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+				searchable ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "codexModelSelectSearchRow",
+					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
 						className: "codexModelSelectSearch",
-						type: "search",
+						type: "text",
+						role: "searchbox",
 						value: query,
 						autoFocus: true,
 						placeholder: t("modelSearch"),
 						"aria-label": t("modelSearch"),
 						onChange: (event) => setQuery(event.target.value)
-					}) : null,
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "codexModelSelectGroups scrollable",
-						children: shownGroups.map((group) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-							className: "codexModelSelectGroup",
-							role: "group",
-							"aria-labelledby": `${id}-${group.id}`,
-							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-									className: "codexModelSelectGroupTitle",
-									id: `${id}-${group.id}`,
-									children: group.name
-								}),
-								group.allHidden === true ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-									className: "codexModelSelectEmpty",
-									children: t("modelsHidden")
-								}) : null,
-								group.models.map((model) => option({
-									key: model.id,
-									label: model.name,
-									description: model.description,
-									selected: state.current?.provider === group.id && state.current.model === model.id,
-									disabled: busy,
-									onClick: () => chooseModel({
-										provider: group.id,
-										model: model.id
-									})
-								}))
-							]
-						}, group.id))
-					}),
-					state.status === "ready" && visibleGroups.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "codexModelSelectEmpty",
-						children: t(choices.length === 0 ? "modelsEmpty" : "modelsHidden")
-					}) : null,
-					state.status === "ready" && visibleGroups.length > 0 && shownGroups.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					})
+				}) : null,
+				state.status === "loading" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "codexModelSelectStatus",
+					children: t("modelsLoading")
+				}) : null,
+				state.error === null ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "codexModelSelectError",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: fill(t("modelFailed"), { value: state.error }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						className: "codexModelSelectRetry",
+						type: "button",
+						onClick: load,
+						children: t("modelRetry")
+					})]
+				}),
+				state.failures.map((failure) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "codexModelSelectWarning",
+					children: fill(t("groupFailed"), {
+						name: failure.name,
+						value: failure.message
+					})
+				}, failure.id)),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "codexModelSelectGroups scrollable",
+					role: "menu",
+					"aria-label": t("modelLabel"),
+					children: shownGroups.map((entry) => group(entry.id, entry.name, /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [entry.allHidden === true ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: "codexModelSelectEmpty",
-						children: t("modelNoMatch")
-					}) : null
-				]
-			});
-			else if (pane === "effort") submenu = /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-				className: "codexModelSelectSubmenu",
-				role: "menu",
-				"aria-label": t("effortLabel"),
-				children: effortChoices.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						children: t("modelsHidden")
+					}) : null, entry.models.map((model) => option({
+						key: model.id,
+						label: model.name,
+						selected: state.current?.provider === entry.id && state.current.model === model.id,
+						disabled: busy,
+						onClick: () => chooseModel({
+							provider: entry.id,
+							model: model.id
+						})
+					}))] })))
+				}),
+				state.status === "ready" && visibleGroups.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 					className: "codexModelSelectEmpty",
-					children: t("effortsEmpty")
-				}) : effortChoices.map((level) => option({
-					key: level.key,
-					label: level.label,
-					description: level.description,
-					selected: effectiveEffort === level.effort,
-					disabled: busy,
-					onClick: () => chooseEffort(level.effort)
-				}))
-			});
-			else if (pane === "speed") submenu = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				className: "codexModelSelectSubmenu",
-				role: "menu",
-				"aria-label": t("speedTitle"),
-				children: [
-					option({
-						key: SPEED_MODE_STANDARD,
-						label: t("speedStandard"),
-						description: t("speedStandardHint"),
-						selected: !fast,
-						disabled: !speedWritable,
-						onClick: () => chooseSpeed(SPEED_MODE_STANDARD)
-					}),
-					speedSupported && option({
-						key: "fast",
-						label: t("speedFast"),
-						description: t(state.current?.model === "gpt-6-astra" ? "speedFastAstraHint" : "speedFastHint"),
-						selected: fast && !ultrafast,
-						disabled: !speedWritable,
-						onClick: () => chooseSpeed("fast")
-					}),
-					ultrafastSupported && option({
-						key: "ultrafast",
-						label: t("speedUltrafast"),
-						description: t("speedUltrafastHint"),
-						selected: ultrafast,
-						disabled: !speedWritable,
-						onClick: () => chooseSpeed("ultrafast")
-					})
-				]
-			});
-			else if (pane === "verbosity") submenu = /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-				className: "codexModelSelectSubmenu",
-				role: "menu",
-				"aria-label": t("verbosityTitle"),
-				children: verbosityItems.map((item) => option({
-					key: item.id,
-					label: item.label,
-					description: item.description,
-					selected: preferenceSnapshot.outputVerbosity === item.id,
-					disabled: !verbosityWritable,
-					onClick: () => chooseVerbosity(item.id)
-				}))
-			});
+					children: t(choices.length === 0 ? "modelsEmpty" : "modelsHidden")
+				}) : null,
+				state.status === "ready" && visibleGroups.length > 0 && shownGroups.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "codexModelSelectEmpty",
+					children: t("modelNoMatch")
+				}) : null
+			] });
+			else if (pane === "effort") content = effortChoices.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: "codexModelSelectEmpty",
+				children: t("effortsEmpty")
+			}) : effortChoices.map((level) => option({
+				key: level.key,
+				label: level.label,
+				description: level.description,
+				selected: effectiveEffort === level.effort,
+				disabled: busy,
+				onClick: () => chooseEffort(level.effort)
+			}));
+			else if (pane === "speed") content = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+				option({
+					key: SPEED_MODE_STANDARD,
+					label: t("speedStandard"),
+					description: t("speedStandardHint"),
+					selected: !fast,
+					disabled: !speedWritable,
+					onClick: () => chooseSpeed(SPEED_MODE_STANDARD)
+				}),
+				speedSupported && option({
+					key: "fast",
+					label: t("speedFast"),
+					description: t(state.current?.model === "gpt-6-astra" ? "speedFastAstraHint" : "speedFastHint"),
+					selected: fast && !ultrafast,
+					disabled: !speedWritable,
+					onClick: () => chooseSpeed("fast")
+				}),
+				ultrafastSupported && option({
+					key: "ultrafast",
+					label: t("speedUltrafast"),
+					description: t("speedUltrafastHint"),
+					selected: ultrafast,
+					disabled: !speedWritable,
+					onClick: () => chooseSpeed("ultrafast")
+				})
+			] });
+			else if (pane === "verbosity") content = verbosityItems.map((item) => option({
+				key: item.id,
+				label: item.label,
+				description: item.description,
+				selected: preferenceSnapshot.outputVerbosity === item.id,
+				disabled: !verbosityWritable,
+				onClick: () => chooseVerbosity(item.id)
+			}));
+			const menu = open ? (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsx)(MenuSurface ?? "div", {
+				ref: menuRef,
+				id: `${id}-menu`,
+				className: "codexModelSelectMenu",
+				style: menuPos ?? MEASURE_STYLE,
+				role: pane === "model" ? "group" : "menu",
+				"aria-label": t("modelMenuAria"),
+				"aria-busy": state.status === "loading" || busy,
+				onKeyDown: (event) => {
+					if (event.key !== "Escape") return;
+					event.preventDefault();
+					event.stopPropagation();
+					if (pane === "root") close(true);
+					else setPane("root");
+				},
+				children: content
+			}), document.body) : null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "codexModelSelect",
 				ref: rootRef,
@@ -9784,20 +9848,7 @@ window.__ModuleLoader__.load({
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronDownOutline14, { className: "codexModelSelectChevron" })
 					]
-				}), open ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: "codexModelSelectMenu",
-					id: `${id}-menu`,
-					role: "menu",
-					"aria-label": t("modelMenuAria"),
-					"aria-busy": state.status === "loading" || busy,
-					children: [
-						cell("model", t("modelLabel"), modelLabel),
-						reasoning === void 0 ? null : cell("effort", t("effortLabel"), effortLabel),
-						(speedSupported || ultrafastSupported) && cell("speed", t("speedTitle"), t(speedKey)),
-						verbositySupported && cell("verbosity", t("verbosityTitle"), verbosityLabel),
-						submenu
-					]
-				}) : null]
+				}), menu]
 			});
 		}
 		//#endregion
@@ -11152,6 +11203,73 @@ window.__ModuleLoader__.load({
 			}
 		}
 		//#endregion
+		//#region src/client-account-quota.jsx
+		const when = (seconds) => (/* @__PURE__ */ new Date(seconds * 1e3)).toLocaleString(uiLocale(), {
+			month: "numeric",
+			day: "numeric",
+			hour: "2-digit",
+			minute: "2-digit"
+		});
+		/** Quota of every signed-in account (read-only; the active account does not change). */
+		function useAccountQuotas(rpc, ids) {
+			const [entries, setEntries] = (0, react.useState)({});
+			const [busy, setBusy] = (0, react.useState)(false);
+			const request = (0, react.useRef)(0);
+			const key = ids.join(",");
+			const load = (force) => {
+				if (ids.length < 2) {
+					setEntries({});
+					return;
+				}
+				const id = ++request.current;
+				setBusy(true);
+				recoveryCall(rpc, "usage/accounts", { force }).then((value) => {
+					if (request.current === id) setEntries(Object.fromEntries((value?.accounts ?? []).map((entry) => [entry.id, entry])));
+				}).catch(() => {
+					if (request.current === id) setEntries(Object.fromEntries(ids.map((account) => [account, {
+						id: account,
+						error: "Could not read ChatGPT usage"
+					}])));
+				}).finally(() => {
+					if (request.current === id) setBusy(false);
+				});
+			};
+			(0, react.useEffect)(() => {
+				load(false);
+				return () => {
+					request.current += 1;
+				};
+			}, [key]);
+			return {
+				entries,
+				busy,
+				refresh: () => load(true)
+			};
+		}
+		function AccountQuota({ entry, loading, t }) {
+			if (entry === void 0) return loading ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", {
+				className: "codexSubscriptionAccountQuota",
+				children: t("accountQuotaLoading")
+			}) : null;
+			if (entry.error !== void 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", {
+				className: "codexSubscriptionAccountQuota",
+				"data-state": "error",
+				children: entry.error === "ChatGPT sign-in needs to be renewed" ? t("resetRenewLogin") : t("accountQuotaError")
+			});
+			const windows = entry.usage?.rateLimits?.find((limit) => limit.id === "codex")?.windows ?? [];
+			if (windows.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", {
+				className: "codexSubscriptionAccountQuota",
+				children: t("accountQuotaNone")
+			});
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", {
+				className: "codexSubscriptionAccountQuota",
+				children: windows.map((window) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [fill(t("accountQuotaLeft"), {
+					label: windowLabel(window.windowSeconds, t),
+					value: percent(window.remainingPercent)
+				}), window.resetsAt === void 0 ? "" : ` · ${fill(t("accountQuotaResets"), { value: when(window.resetsAt) })}`] }, window.windowSeconds))
+			});
+		}
+		//#endregion
 		//#region src/client-account.jsx
 		const LOGIN_FAILURES = [
 			"account-claim",
@@ -11173,6 +11291,7 @@ window.__ModuleLoader__.load({
 				children: emailVisible ? candidate.email : maskEmail(candidate.email)
 			});
 		}
+		const signedInIds = (account) => account?.authenticated === true ? (account.accounts ?? []).map((candidate) => candidate.id).filter((id) => typeof id === "string") : [];
 		function AccountCard({ rpc, t, account, setAccount, onSignedOut }) {
 			const [flow, setFlow] = (0, react.useState)();
 			const flowGeneration = (0, react.useRef)(0);
@@ -11185,6 +11304,7 @@ window.__ModuleLoader__.load({
 			const [emailVisibilityKey, setEmailVisibilityKey] = (0, react.useState)(accountVisibilityKey);
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [error, setError] = (0, react.useState)();
+			const quotas = useAccountQuotas(rpc, signedInIds(account));
 			const call = (endpoint, payload = {}) => recoveryCall(rpc, endpoint, payload);
 			(0, react.useEffect)(() => {
 				if (emailVisibilityKey === accountVisibilityKey) return;
@@ -11380,12 +11500,19 @@ 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)(AccountEmail, {
-								candidate,
-								fallback: candidate.label,
-								t,
-								emailVisible: emailVisibleForAccount,
-								onClick: toggleEmail
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "codexSubscriptionAccountMain",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountEmail, {
+									candidate,
+									fallback: candidate.label,
+									t,
+									emailVisible: emailVisibleForAccount,
+									onClick: toggleEmail
+								}), accounts.length > 1 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountQuota, {
+									entry: quotas.entries[candidate.id],
+									loading: quotas.busy,
+									t
+								}) : null]
 							}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: "codexSubscriptionActions",
 								children: [
@@ -11789,7 +11916,7 @@ window.__ModuleLoader__.load({
 							children: [
 								t("diagnosticsSnapshotTime"),
 								" ",
-								new Date(report.generatedAt).toLocaleString()
+								new Date(report.generatedAt).toLocaleString(uiLocale())
 							]
 						}) : null,
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -11807,7 +11934,7 @@ window.__ModuleLoader__.load({
 									" · ",
 									t(`diagnosticSource_${event.source}`),
 									" · ",
-									new Date(event.observedAt).toLocaleTimeString()
+									new Date(event.observedAt).toLocaleTimeString(uiLocale())
 								] }, `${event.source}:${event.action}`)) }) : null
 							] }, item.code)) }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("diagnosticsNoRecordedFailure") })
 						}),
@@ -11825,7 +11952,7 @@ window.__ModuleLoader__.load({
 							] }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("tbody", { children: (report.inspection?.capabilities ?? []).map((item) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: t(`diagnosticCapability_${item.id}`) }),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("td", { children: [t(`diagnosticReason_${item.reason}`), item.blockedBy ? ` · ${t(`diagnosticCapability_${item.blockedBy}`)}` : ""] }),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("td", { children: [item.latest ? `${item.latest.action} · ${t(`diagnosticSource_${item.latest.source}`)} · ${t(`diagnosticOutcome_${item.latest.status}`)} · ${new Date(item.latest.observedAt).toLocaleTimeString()}` : t("diagnosticsUnverified"), item.unresolved?.length ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("diagnosticsUnresolved") }) : null] })
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("td", { children: [item.latest ? `${item.latest.action} · ${t(`diagnosticSource_${item.latest.source}`)} · ${t(`diagnosticOutcome_${item.latest.status}`)} · ${new Date(item.latest.observedAt).toLocaleTimeString(uiLocale())}` : t("diagnosticsUnverified"), item.unresolved?.length ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("diagnosticsUnresolved") }) : null] })
 							] }, item.id)) })]
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
@@ -11972,8 +12099,8 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client-usage.jsx
-		const count = (value) => Number(value).toLocaleString();
-		const creditAmount = (value) => Number.isFinite(Number(value)) && String(value).trim() !== "" ? Number(value).toLocaleString(void 0, { maximumFractionDigits: 2 }) : value;
+		const count = (value) => Number(value).toLocaleString(uiLocale());
+		const creditAmount = (value) => Number.isFinite(Number(value)) && String(value).trim() !== "" ? Number(value).toLocaleString(uiLocale(), { maximumFractionDigits: 2 }) : value;
 		function CreditExpiry({ credits, t }) {
 			const date = validDate(credits.expiresAt);
 			if (date === void 0 || credits.unlimited) return null;
@@ -11984,7 +12111,7 @@ window.__ModuleLoader__.load({
 				"data-soon": status.soon,
 				role: "status",
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", { children: [fill(t(status.daysLeft === 0 ? "creditsExpiredToday" : "creditsExpires"), {
-					date: date.toLocaleDateString(),
+					date: date.toLocaleDateString(uiLocale()),
 					days: status.daysLeft
 				}), estimate ? ` ${t("creditsExpiryEstimate")}` : ""] })
 			});
@@ -11992,7 +12119,7 @@ window.__ModuleLoader__.load({
 		function ResetTime({ resetsAt, t }) {
 			const date = Number.isSafeInteger(resetsAt) ? validDate(resetsAt * 1e3) : void 0;
 			if (date === void 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("resetUnknown") });
-			const value = date.toLocaleString(void 0, {
+			const value = date.toLocaleString(uiLocale(), {
 				month: "numeric",
 				day: "numeric",
 				hour: "2-digit",
@@ -12000,7 +12127,7 @@ window.__ModuleLoader__.load({
 			});
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("time", {
 				dateTime: date.toISOString(),
-				title: date.toLocaleString(),
+				title: date.toLocaleString(uiLocale()),
 				children: fill(t("resets"), { value })
 			});
 		}
@@ -12010,8 +12137,8 @@ window.__ModuleLoader__.load({
 				className: "codexSubscriptionResetExpiry",
 				children: date === void 0 ? t("resetCreditExpiryUnknown") : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("time", {
 					dateTime: date.toISOString(),
-					title: date.toLocaleString(),
-					children: fill(t("resetCreditExpires"), { value: date.toLocaleDateString(void 0, {
+					title: date.toLocaleString(uiLocale()),
+					children: fill(t("resetCreditExpires"), { value: date.toLocaleDateString(uiLocale(), {
 						month: "long",
 						day: "numeric"
 					}) })
@@ -12203,6 +12330,7 @@ window.__ModuleLoader__.load({
 			return t((/* @__PURE__ */ new Map([
 				["ChatGPT subscription is not signed in", "resetRenewLogin"],
 				["ChatGPT sign-in needs to be renewed", "resetRenewLogin"],
+				["ChatGPT blocked this request before it reached your account (HTTP 403); your sign-in is fine, try again later or check your network, proxy or VPN", "resetBlocked"],
 				["No quota reset is available", "resetNoCredit"],
 				["No usable quota reset is available", "resetNoCredit"],
 				["The available quota reset expires too soon", "resetExpired"],
@@ -12265,7 +12393,7 @@ window.__ModuleLoader__.load({
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t("usage") }), fetchedAt === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("time", {
 								className: "codexSubscriptionFreshness",
 								dateTime: fetchedAt.toISOString(),
-								children: fill(t("usageUpdated"), { value: fetchedAt.toLocaleString() })
+								children: fill(t("usageUpdated"), { value: fetchedAt.toLocaleString(uiLocale()) })
 							})]
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
 							className: "codexSubscriptionRefresh",

package/lib/index.js

@@ -1135,6 +1135,7 @@ const RPC_ENDPOINTS = Object.freeze([
 	"account/select",
 	"account/remove",
 	"usage",
+	"usage/accounts",
 	"diagnostics",
 	"preferences/status",
 	"preferences/models",
@@ -2087,9 +2088,36 @@ function inheritedOriginalImageRef(session, assetId) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.6.9";
+const PACKAGE_VERSION = "2.7.1";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
+//#region src/http-failure.js
+const SIGN_IN_RENEW = "ChatGPT sign-in needs to be renewed";
+const REQUEST_BLOCKED = "ChatGPT blocked this request before it reached your account (HTTP 403); your sign-in is fine, try again later or check your network, proxy or VPN";
+const CHALLENGE_MARKERS = /just a moment|cf-chl|_cf_chl_opt|attention required|enable javascript and cookies|challenge-platform/iu;
+/** Whether error text is a Cloudflare / network-protection page (pi-ai keeps only the body of a failed request, not its status). */
+const isChallengePage = (text) => typeof text === "string" && /^\s*<(?:!doctype|html)/iu.test(text) && CHALLENGE_MARKERS.test(text);
+/** Whether a 403 response is a Cloudflare / network-protection page rather than an answer from the ChatGPT backend. */
+async function isBlockedByNetwork(response) {
+	if (response?.status !== 403) return false;
+	try {
+		const header = (name) => String(response.headers?.get?.(name) ?? "");
+		if (/challenge/iu.test(header("cf-mitigated"))) return true;
+		if (!/html/iu.test(header("content-type"))) return false;
+		if (/cloudflare/iu.test(header("server"))) return true;
+		const text = typeof response.clone === "function" ? (await response.clone().text()).slice(0, 8192) : "";
+		return CHALLENGE_MARKERS.test(text);
+	} catch {
+		return false;
+	}
+}
+/** The error message for a 401 or 403 answer, or undefined for any other status. */
+async function authFailureMessage(response) {
+	if (response?.status === 401) return SIGN_IN_RENEW;
+	if (response?.status !== 403) return void 0;
+	return await isBlockedByNetwork(response) ? REQUEST_BLOCKED : SIGN_IN_RENEW;
+}
+//#endregion
 //#region src/codex-images.js
 const CODEX_IMAGE_TOOL_NAME = "codex_image_generate";
 const CODEX_IMAGE_GENERATION_URL = "https://chatgpt.com/backend-api/codex/images/generations";
@@ -2592,7 +2620,8 @@ function createCodexImageTool(options) {
 				throw new Error(`Codex image ${editing ? "edit" : "generation"} request failed${requestFailureReason(error)}`, { cause: error });
 			}
 			if (!response.ok) {
-				if (response.status === 401 || response.status === 403) throw new Error("ChatGPT sign-in needs to be renewed");
+				const authFailure = await authFailureMessage(response);
+				if (authFailure !== void 0) throw new Error(authFailure);
 				const requestId = supportId(response);
 				if (response.status === 429) throw new Error(`${await limitMessage(response)}${requestId}`);
 				throw new Error(`Codex image ${editing ? "edit" : "generation"} failed (HTTP ${response.status})${requestId}`);
@@ -3000,6 +3029,42 @@ var DshOAuthAccountVault = class {
 			return clone$1(payload?.accounts.find((account) => account.id === payload.activeId)?.credential);
 		});
 	}
+	/** One account's credential, whether or not it is the active one. */
+	readAccount(id) {
+		return this.#enqueue(async () => {
+			const payload = await this.#ensurePayload();
+			return clone$1(payload?.accounts.find((account) => account.id === id)?.credential);
+		});
+	}
+	/** Update one account's credential (a token refresh) without changing which account is active. */
+	modifyAccount(id, update) {
+		return this.#enqueue(async () => {
+			let result;
+			await this.#modifyPayload(async (current) => {
+				const index = current.accounts.findIndex((account) => account.id === id);
+				if (index < 0) throw new Error("Unknown Codex account");
+				const previous = clone$1(current.accounts[index].credential);
+				const next = await update(previous);
+				if (next === void 0) {
+					result = previous;
+					return current;
+				}
+				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],
+					credential
+				};
+				result = clone$1(credential);
+				return {
+					...current,
+					accounts
+				};
+			});
+			return result;
+		});
+	}
 	activeId() {
 		return this.#enqueue(async () => (await this.#ensurePayload())?.activeId);
 	}
@@ -3099,11 +3164,11 @@ var DshOAuthAccountVault = class {
 };
 //#endregion
 //#region src/credential-store.js
-const PROVIDER$1 = "openai-codex";
+const PROVIDER$2 = "openai-codex";
 const abortIfNeeded = (options) => options?.signal?.throwIfAborted();
 const clone = (value) => value === void 0 ? void 0 : structuredClone(value);
-function assertProvider(providerId) {
-	if (providerId !== PROVIDER$1) throw new Error(`Codex credential store does not own provider ${JSON.stringify(providerId)}`);
+function assertProvider$1(providerId) {
+	if (providerId !== PROVIDER$2) throw new Error(`Codex credential store does not own provider ${JSON.stringify(providerId)}`);
 }
 function assertOAuthCredential(value) {
 	if (value === void 0) return void 0;
@@ -3136,7 +3201,7 @@ var DshOAuthCredentialStore = class {
 		this.vault = options.vault;
 	}
 	#enqueue(providerId, operation, options) {
-		assertProvider(providerId);
+		assertProvider$1(providerId);
 		const current = (this.#chains.get(providerId) ?? Promise.resolve()).catch(() => void 0).then(async () => {
 			abortIfNeeded(options);
 			return operation();
@@ -3149,7 +3214,7 @@ var DshOAuthCredentialStore = class {
 		return current;
 	}
 	async #read(providerId, options) {
-		assertProvider(providerId);
+		assertProvider$1(providerId);
 		abortIfNeeded(options);
 		if (this.vault !== void 0) {
 			const current = await this.vault.readActive();
@@ -3182,8 +3247,8 @@ var DshOAuthCredentialStore = class {
 	}
 	async list(options) {
 		abortIfNeeded(options);
-		return await this.read(PROVIDER$1, options) === void 0 ? [] : [{
-			providerId: PROVIDER$1,
+		return await this.read(PROVIDER$2, options) === void 0 ? [] : [{
+			providerId: PROVIDER$2,
 			type: "oauth"
 		}];
 	}
@@ -3233,16 +3298,16 @@ function createCodexAuthService(models, store, options = {}) {
 	const createPendingStore = options.createPendingStore ?? (() => new PendingOAuthCredentialStore());
 	return Object.freeze({
 		async status(options) {
-			const current = await store.read(PROVIDER$1, options);
+			const current = await store.read(PROVIDER$2, options);
 			const accounts = await accountVault?.list();
 			if (current === void 0) return {
 				authenticated: false,
-				provider: PROVIDER$1,
+				provider: PROVIDER$2,
 				...accounts === void 0 ? {} : { accounts }
 			};
 			return {
 				authenticated: true,
-				provider: PROVIDER$1,
+				provider: PROVIDER$2,
 				type: "oauth",
 				expiresAt: current.expires,
 				...accounts === void 0 ? {} : { accounts }
@@ -3253,13 +3318,13 @@ function createCodexAuthService(models, store, options = {}) {
 				if (accountVault === void 0 || createLoginModels === void 0) throw new Error("Codex multi-account is unavailable");
 				return runLogin(async () => {
 					const pending = createPendingStore();
-					await createLoginModels(pending).login(PROVIDER$1, "oauth", interaction);
+					await createLoginModels(pending).login(PROVIDER$2, "oauth", interaction);
 					const credential = pending.credential();
 					if (credential === void 0) throw new Error("Codex login did not return credentials");
 					await accountVault.add(input.label, credential);
 				});
 			}
-			return runLogin(() => models.login(PROVIDER$1, "oauth", interaction));
+			return runLogin(() => models.login(PROVIDER$2, "oauth", interaction));
 		},
 		async select(id) {
 			if (accountVault === void 0) throw new Error("Codex multi-account is unavailable");
@@ -3272,7 +3337,7 @@ function createCodexAuthService(models, store, options = {}) {
 			return this.status();
 		},
 		logout(options) {
-			return models.logout(PROVIDER$1, options);
+			return models.logout(PROVIDER$2, options);
 		}
 	});
 }
@@ -3808,6 +3873,13 @@ function normalizeTransportEvent(event, signal) {
 	if (signal?.aborted || event?.type !== "error" || event.reason !== "error") return event;
 	const message = event.error?.errorMessage;
 	if (typeof message !== "string") return event;
+	if (isChallengePage(message)) return {
+		...event,
+		error: {
+			...event.error,
+			errorMessage: REQUEST_BLOCKED
+		}
+	};
 	if (!TRANSIENT_WEBSOCKET_CLOSE.test(message) && !GATEWAY_REPLAY_BUFFER_EXCEEDED.test(message)) return event;
 	return {
 		...event,
@@ -4532,7 +4604,10 @@ function createCodexSearchProvider(options) {
 				if (signal?.aborted || error?.name === "AbortError") throw new WebError("Codex search aborted", "WEB_ABORTED", { cause: error });
 				throw new WebError("Codex search request failed", "WEB_PROVIDER_ERROR", { cause: error });
 			}
-			if (!response.ok) throw response.status === 401 || response.status === 403 ? new WebError("ChatGPT sign-in needs to be renewed", "WEB_PROVIDER_CREDENTIAL_MISSING") : new WebError(`Codex search request failed (HTTP ${response.status})`, "WEB_PROVIDER_ERROR");
+			if (!response.ok) {
+				const authFailure = await authFailureMessage(response);
+				throw authFailure === "ChatGPT sign-in needs to be renewed" ? new WebError(authFailure, "WEB_PROVIDER_CREDENTIAL_MISSING") : authFailure !== void 0 ? new WebError(authFailure, "WEB_PROVIDER_ERROR") : new WebError(`Codex search request failed (HTTP ${response.status})`, "WEB_PROVIDER_ERROR");
+			}
 			let value;
 			try {
 				value = await response.json();
@@ -5531,7 +5606,7 @@ function createCodexUsageReader(options) {
 			signal: requestSignal$1(signal, timeoutMs)
 		});
 		if (!response.ok) {
-			const error = /* @__PURE__ */ new Error(response.status === 401 || response.status === 403 ? "ChatGPT sign-in needs to be renewed" : `ChatGPT usage request failed (HTTP ${response.status})`);
+			const error = new Error(await authFailureMessage(response) ?? `ChatGPT usage request failed (HTTP ${response.status})`);
 			Object.defineProperty(error, "retryAfterMs", { value: retryAfterMs(response, now, maxRetryAfterMs) });
 			throw error;
 		}
@@ -5582,6 +5657,102 @@ function createCodexUsageReader(options) {
 	});
 }
 //#endregion
+//#region src/account-usage.js
+const PROVIDER$1 = "openai-codex";
+const MAX_PARALLEL = 4;
+const assertProvider = (providerId) => {
+	if (providerId !== PROVIDER$1) throw new Error("Codex account usage received an unknown provider");
+};
+/** pi-ai's OAuth credential store, bound to one account of the vault. */
+function accountCredentialStore(vault, id, expirySkewMs = 0) {
+	const shift = (credential) => credential === void 0 || expirySkewMs === 0 ? credential : {
+		...credential,
+		expires: credential.expires - expirySkewMs
+	};
+	return {
+		async read(providerId) {
+			assertProvider(providerId);
+			return shift(await vault.readAccount(id));
+		},
+		async list() {
+			return await vault.readAccount(id) === void 0 ? [] : [{
+				providerId: PROVIDER$1,
+				type: "oauth"
+			}];
+		},
+		async modify(providerId, update) {
+			assertProvider(providerId);
+			return vault.modifyAccount(id, async (current) => update(shift(current)));
+		},
+		async delete() {
+			throw new Error("An account usage read cannot remove a sign-in");
+		}
+	};
+}
+/**
+* @param {object} options
+* @param {{ list(): Promise<object[]>, readAccount(id: string): Promise<object|undefined>, modifyAccount: Function }} options.vault
+* @param {(credentials: object) => object} options.createModels builds a pi-ai Models over a credential store, with the Codex provider set
+* @param {typeof fetch} options.fetch
+*/
+function createAccountUsageReader({ vault, createModels, fetch, expirySkewMs = 0, now = Date.now, activeReader }) {
+	const readers = /* @__PURE__ */ new Map();
+	const readerFor = (id) => {
+		let reader = readers.get(id);
+		if (reader === void 0) {
+			const models = createModels(accountCredentialStore(vault, id, expirySkewMs));
+			reader = createCodexUsageReader({
+				getAuth: () => models.getAuth(PROVIDER$1),
+				readCredential: () => vault.readAccount(id).then((credential) => credential),
+				fetch,
+				now
+			});
+			readers.set(id, reader);
+		}
+		return reader;
+	};
+	const summarize = (error, signal) => {
+		if (signal?.aborted) throw error;
+		const message = error instanceof Error ? error.message : "";
+		return ["ChatGPT subscription is not signed in", "ChatGPT sign-in needs to be renewed"].includes(message) || message.includes("blocked this request") ? message : "Could not read ChatGPT usage";
+	};
+	return Object.freeze({
+		/** One entry per account: its usage reading, or the reason it could not be read. */
+		async readAll({ force = false, signal } = {}) {
+			const accounts = await vault.list();
+			for (const id of [...readers.keys()]) if (!accounts.some((account) => account.id === id)) readers.delete(id);
+			const entries = new Array(accounts.length);
+			let next = 0;
+			const worker = async () => {
+				while (next < accounts.length) {
+					const index = next++;
+					const account = accounts[index];
+					try {
+						const reader = account.active && activeReader !== void 0 ? activeReader : readerFor(account.id);
+						entries[index] = {
+							id: account.id,
+							usage: await reader.read({
+								force,
+								signal
+							})
+						};
+					} catch (error) {
+						entries[index] = {
+							id: account.id,
+							error: summarize(error, signal)
+						};
+					}
+				}
+			};
+			await Promise.all(Array.from({ length: Math.min(MAX_PARALLEL, accounts.length) }, worker));
+			return entries;
+		},
+		clear() {
+			readers.clear();
+		}
+	});
+}
+//#endregion
 //#region src/quota-retry.js
 const DEFAULT_MAX_WAIT_MS = 360 * 60 * 1e3;
 const DEFAULT_RESET_MARGIN_MS = 1e4;
@@ -6302,7 +6473,7 @@ function createCodexResetCreditService(options) {
 			},
 			signal: requestSignal(signal, timeoutMs)
 		});
-		if (!response.ok) throw new Error(response.status === 401 || response.status === 403 ? "ChatGPT sign-in needs to be renewed" : `ChatGPT quota reset request failed (HTTP ${response.status})`);
+		if (!response.ok) throw new Error(await authFailureMessage(response) ?? `ChatGPT quota reset request failed (HTTP ${response.status})`);
 		let raw;
 		try {
 			raw = await response.json();
@@ -6436,7 +6607,7 @@ function createCodexResetCreditService(options) {
 						throw new Error(UNCERTAIN_RESET_RESULT);
 					}
 					if (response.status !== 401 && response.status !== 403) retryable = false;
-					throw new Error(response.status === 401 || response.status === 403 ? "ChatGPT sign-in needs to be renewed" : `ChatGPT quota reset request failed (HTTP ${response.status})`);
+					throw new Error(await authFailureMessage(response) ?? `ChatGPT quota reset request failed (HTTP ${response.status})`);
 				}
 				let raw;
 				try {
@@ -6478,7 +6649,7 @@ const publicError = (code, message) => ({
 		details: { issues: [] }
 	}
 });
-function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditService, preferences, defaultModel, runtimeManagement, diagnosticsReader, modelCatalog, originalImages, resolveInheritedOriginal, closeConnections, onAccountChanged, onCleanupFailure }) {
+function createSubscriptionRpcHandler({ authHandler, usageReader, accountUsageReader, resetCreditService, preferences, defaultModel, runtimeManagement, diagnosticsReader, modelCatalog, originalImages, resolveInheritedOriginal, closeConnections, onAccountChanged, onCleanupFailure }) {
 	return async (endpoint, payload, signal) => {
 		if (endpoint === "default-model/status" || endpoint === "default-model/select") try {
 			signal.throwIfAborted();
@@ -6625,10 +6796,27 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 			};
 		} catch (error) {
 			if (signal.aborted) throw error;
-			const known = /* @__PURE__ */ new Set(["ChatGPT subscription is not signed in", "ChatGPT sign-in needs to be renewed"]);
+			const known = /* @__PURE__ */ new Set([
+				"ChatGPT subscription is not signed in",
+				"ChatGPT sign-in needs to be renewed",
+				REQUEST_BLOCKED
+			]);
 			const message = error instanceof Error && known.has(error.message) ? error.message : "Could not read ChatGPT usage";
 			return publicError("internal", message);
 		}
+		if (endpoint === "usage/accounts") try {
+			signal.throwIfAborted();
+			return {
+				ok: true,
+				value: { accounts: await accountUsageReader.readAll({
+					force: payload?.force === true,
+					signal
+				}) }
+			};
+		} catch (error) {
+			if (signal.aborted) throw error;
+			return publicError("internal", "Could not read the usage of the signed-in accounts");
+		}
 		if (endpoint === "reset-credit/inspect" || endpoint === "reset-credit/prepare" || endpoint === "reset-credit/consume") try {
 			signal.throwIfAborted();
 			return {
@@ -6647,6 +6835,7 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 			const known = /* @__PURE__ */ new Set([
 				"ChatGPT subscription is not signed in",
 				"ChatGPT sign-in needs to be renewed",
+				REQUEST_BLOCKED,
 				"No quota reset is available",
 				"No usable quota reset is available",
 				"The available quota reset expires too soon",
@@ -6669,7 +6858,7 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 				() => modelCatalog?.clear(),
 				() => onAccountChanged?.()
 			];
-			if (endpoint === "logout") tasks.push(() => usageReader.clear());
+			if (endpoint === "logout") tasks.push(() => usageReader.clear(), () => accountUsageReader?.clear());
 			if (endpoint === "account/remove" && typeof payload?.id === "string") tasks.push(() => usageReader.clearScope(payload.id));
 			if ((await Promise.allSettled(tasks.map((task) => Promise.resolve().then(task)))).some((value) => value.status === "rejected")) try {
 				onCleanupFailure?.();
@@ -7030,12 +7219,13 @@ function apply(ctx, config = {}) {
 		}
 	});
 	const coordinator = new CodexLoginCoordinator(auth);
+	const baseUsageReader = createCodexUsageReader({
+		getAuth: resolveAuth,
+		readCredential: (options) => store.read(PROVIDER, options),
+		fetch: (input, init) => network.fetch("quota", input, init)
+	});
 	const usageReader = createQuotaForecastReader({
-		reader: createCodexUsageReader({
-			getAuth: resolveAuth,
-			readCredential: (options) => store.read(PROVIDER, options),
-			fetch: (input, init) => network.fetch("quota", input, init)
-		}),
+		reader: baseUsageReader,
 		enabled: () => normalizeQuickQuotaMode(settings.get()[QUICK_QUOTA_MODE_FIELD], settings.get()[LEGACY_QUICK_QUOTA_FIELD]) === QUICK_QUOTA_MODE_FORECAST,
 		scope: async () => await accountVault?.activeId() ?? "legacy",
 		stateStore: new QuotaForecastStateStore({ filename: dshHomePath("state", "codex-subscription", "quota-forecast.json") })
@@ -7109,9 +7299,21 @@ function apply(ctx, config = {}) {
 			sketchBridge.dispose();
 		};
 	}, "codex-subscription: native sketch tool");
+	const accountUsageReader = createAccountUsageReader({
+		vault: accountVault,
+		createModels: (credentials) => {
+			const accountModels = createModels({ credentials });
+			accountModels.setProvider(provider);
+			return accountModels;
+		},
+		fetch: (input, init) => network.fetch("quota", input, init),
+		expirySkewMs: OAUTH_EXPIRY_SKEW_MS,
+		activeReader: baseUsageReader
+	});
 	const subscriptionHandler = createSubscriptionRpcHandler({
 		authHandler: createCodexRpcHandler(coordinator, { openExternal: openCodexAuthUrl }),
 		usageReader,
+		accountUsageReader,
 		resetCreditService,
 		preferences,
 		defaultModel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.6.9",
+  "version": "2.7.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",