@henryqw/pi-multi-codex 1.0.3 → 1.0.5

package/README.md

@@ -13,11 +13,11 @@ pi install npm:@henryqw/pi-multi-codex
 
 ## Works with
 
-| Package | Why |
-| --- | --- |
-| [`@henryqw/pi-footer`](https://pi.henry.wang/extensions/pi-footer) | Improves. Shows the active slot's quota or five-hour block in the footer. |
-| [`@henryqw/pi-subagent`](https://pi.henry.wang/extensions/pi-subagent) | Improves. Isolated children keep Main's active Codex slot. |
-| [`@henryqw/pi-task-models`](https://pi.henry.wang/extensions/pi-task-models) | Improves. Numbered slots share one profile route. |
+| Package | Relationship | Purpose |
+| --- | --- | --- |
+| [`@henryqw/pi-footer`](https://pi.henry.wang/extensions/pi-footer) | Improves | Shows the active slot's quota or five-hour block in the footer. |
+| [`@henryqw/pi-subagent`](https://pi.henry.wang/extensions/pi-subagent) | Improves | Isolated children keep Main's active Codex slot. |
+| [`@henryqw/pi-task-models`](https://pi.henry.wang/extensions/pi-task-models) | Improves | Numbered slots share one profile route. |
 
 ## Use
 
@@ -25,6 +25,8 @@ Run `/login` and authenticate `OpenAI Codex` for slot 1 first. Run `/codex-add`,
 
 `/codex-status` lists the new slot. It shows cached quota when available, or `unavailable` until the first successful snapshot.
 
+The footer and `/codex-status` show the five-hour reset countdown for Free, Go, and Plus tiers. They show the seven-day reset countdown for Pro Lite and other tiers.
+
 | Surface | Type | Purpose |
 | --- | --- | --- |
 | `/codex-add` | command | Create the next numbered slot, then authenticate that slot. |
@@ -47,24 +49,20 @@ A numbered slot is one Codex account position in Pi.
 
 ## Config
 
-Automatic HTTP 429 switching is on by default. To disable it, create `~/.pi/agent/config/pi-multi-codex/config.json`:
+Package-owned: `~/.pi/agent/config/pi-multi-codex/config.json`
 
-```json
-{
-  "autoSwitchOn429": false
-}
-```
+| Name | Description | Values | Default |
+| --- | --- | --- | --- |
+| `autoSwitchOn429` | Switches to another eligible slot after an HTTP 429. | Boolean. | `true` |
 
-The config must contain only `autoSwitchOn429` as a boolean. Invalid config is preserved and disables automatic switching.
+Set `autoSwitchOn429` to `false` to disable automatic switching. The config must contain only this field as a boolean. Invalid config is preserved and disables automatic switching.
 
 ## State and storage
 
 The extension maintains a generated, credential-free quota cache at `~/.pi/agent/config/pi-multi-codex/usage.json`.
 
-## Data, cost, and privacy
+## Limits and recovery
 
 The extension reads `auth.json`. It never writes or refreshes credentials.
 
-## Limits and recovery
-
 Scoped sessions can switch only to exact scoped aliases.

package/extensions/multi-codex.ts

@@ -1,9 +1,9 @@
 import { createHash, randomUUID } from "node:crypto";
 import { readFileSync } from "node:fs";
-import { chmod, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
+import { mkdir, readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { setTimeout as delay } from "node:timers/promises";
-import { createConfigStore, extensionConfigDir } from "@henryqw/pi-config-store";
+import { createConfigStore, extensionConfigDir, writePrivateTextFileAtomically } from "@henryqw/pi-config-store";
 import { lock } from "proper-lockfile";
 import {
 	createAssistantMessageEventStream,
@@ -54,6 +54,7 @@ type UsageSnapshot = {
 	fetchedAt?: number;
 	remaining?: number;
 	reset?: number;
+	fiveHourReset?: number;
 	limitedUntil?: number | null;
 };
 
@@ -70,7 +71,7 @@ type UsageState = {
 	untrusted?: true;
 };
 
-type ParsedUsage = { remaining: number; reset: number; limitedUntil?: number; tier?: string };
+type ParsedUsage = { remaining: number; reset: number; fiveHourReset?: number; limitedUntil?: number; tier?: string };
 type Config = { autoSwitchOn429: boolean };
 
 const NATIVE_PROVIDER_ID = "openai-codex";
@@ -187,9 +188,10 @@ function readSnapshot(value: unknown): UsageSnapshot | undefined {
 		typeof value.remaining !== "number" ||
 		!Number.isFinite(value.remaining) ||
 		!validTime(value.reset) ||
+		(value.fiveHourReset !== undefined && !validTime(value.fiveHourReset)) ||
 		(value.limitedUntil !== null && !validTime(value.limitedUntil))
 	)) return undefined;
-	if (!successful && value.limitedUntil !== undefined) return undefined;
+	if (!successful && (value.fiveHourReset !== undefined || value.limitedUntil !== undefined)) return undefined;
 	return {
 		slot: value.slot,
 		accountHash: value.accountHash,
@@ -200,6 +202,7 @@ function readSnapshot(value: unknown): UsageSnapshot | undefined {
 				fetchedAt: value.fetchedAt as number,
 				remaining: Math.max(0, Math.min(100, value.remaining as number)),
 				reset: value.reset as number,
+				...(validTime(value.fiveHourReset) ? { fiveHourReset: value.fiveHourReset } : {}),
 				limitedUntil: value.limitedUntil as number | null,
 			}
 			: {}),
@@ -258,22 +261,11 @@ async function saveState(state: UsageState, signal?: AbortSignal): Promise<void>
 	signal?.throwIfAborted();
 	if (state.untrusted) return;
 	const file = cachePath();
-	const directory = extensionConfigDir("pi-multi-codex");
-	await mkdir(directory, { recursive: true, mode: 0o700 });
 	const data = `${JSON.stringify({
 		slots: [...state.slots.values()].sort((a, b) => a.slot - b.slot),
 		locks: [...state.locks.values()].sort((a, b) => a.slot - b.slot),
 	})}\n`;
-	const temporary = `${file}.${randomUUID()}.tmp`;
-	try {
-		await writeFile(temporary, data, { encoding: "utf8", mode: 0o600, flag: "wx", signal });
-		signal?.throwIfAborted();
-		await rename(temporary, file);
-		signal?.throwIfAborted();
-		await chmod(file, 0o600);
-	} finally {
-		await rm(temporary, { force: true }).catch(() => undefined);
-	}
+	await writePrivateTextFileAtomically(file, data, { signal });
 }
 
 async function withCacheMutex<T>(operation: (signal: AbortSignal) => Promise<T>, signal?: AbortSignal): Promise<T> {
@@ -323,6 +315,13 @@ function isFiveHourLimited(snapshot: UsageSnapshot, now: number): boolean {
 	return validTime(snapshot.limitedUntil) && snapshot.limitedUntil > now;
 }
 
+function displayedReset(snapshot: UsageSnapshot, now: number): { label: "5h" | "7d"; time: number } {
+	if (["free", "go", "plus"].includes(snapshot.tier ?? "") && validTime(snapshot.fiveHourReset) && snapshot.fiveHourReset > now) {
+		return { label: "5h", time: snapshot.fiveHourReset };
+	}
+	return { label: "7d", time: snapshot.reset! };
+}
+
 function checkedRecently(snapshot: UsageSnapshot | undefined, identity: SlotIdentity, now: number): boolean {
 	return Boolean(
 		snapshot &&
@@ -352,7 +351,7 @@ function resetTime(window: JsonRecord, now: number): number | undefined {
 	return resetAfter === undefined || resetAfter < 0 ? undefined : now + resetAfter * 1000;
 }
 
-/** Extract seven-day quota and any active five-hour block. */
+/** Extract seven-day quota and the five-hour window. */
 export function parseCodexUsage(value: unknown, now = Date.now()): ParsedUsage | undefined {
 	if (!isRecord(value)) return undefined;
 	const rateLimit = isRecord(value.rate_limit) ? value.rate_limit : value;
@@ -366,11 +365,13 @@ export function parseCodexUsage(value: unknown, now = Date.now()): ParsedUsage |
 		?? (windows.length === 1 && numberValue(windows[0].value.limit_window_seconds) === undefined ? windows[0] : undefined);
 	if (!sevenDay || sevenDay.reset <= now) return undefined;
 	const fiveHour = windows.find((window) => numberValue(window.value.limit_window_seconds) === 5 * 60 * 60);
-	const limitedUntil = fiveHour && fiveHour.used >= 100 && fiveHour.reset > now ? fiveHour.reset : undefined;
+	const fiveHourReset = fiveHour && fiveHour.reset > now ? fiveHour.reset : undefined;
+	const limitedUntil = fiveHour && fiveHour.used >= 100 ? fiveHourReset : undefined;
 	const tier = validTier(value.plan_type) ? value.plan_type : validTier(value.tier) ? value.tier : undefined;
 	return {
 		remaining: Math.max(0, Math.min(100, 100 - sevenDay.used)),
 		reset: sevenDay.reset,
+		...(fiveHourReset ? { fiveHourReset } : {}),
 		...(limitedUntil ? { limitedUntil } : {}),
 		...(tier ? { tier } : {}),
 	};
@@ -609,6 +610,7 @@ class CodexQuotaStatus {
 					fetchedAt: checkedAt,
 					remaining: outcome.remaining,
 					reset: outcome.reset,
+					...(outcome.fiveHourReset && outcome.fiveHourReset > checkedAt ? { fiveHourReset: outcome.fiveHourReset } : {}),
 					limitedUntil: outcome.limitedUntil && outcome.limitedUntil > checkedAt ? outcome.limitedUntil : null,
 				});
 			} else {
@@ -691,7 +693,9 @@ class CodexQuotaStatus {
 				if (isFiveHourLimited(snapshot, now)) {
 					return `Codex slot ${slot}${tier}: five-hour limit reached, resets in ${formatDuration(snapshot.limitedUntil! - now)} (${status})`;
 				}
-				return `Codex slot ${slot}${tier}: ${formatPercent(snapshot.remaining)}% remaining, resets in ${formatDuration(snapshot.reset - now)} (${status})`;
+				const display = displayedReset(snapshot, now);
+				const resetWindow = display.label === "5h" ? "five-hour" : "seven-day";
+				return `Codex slot ${slot}${tier}: ${formatPercent(snapshot.remaining)}% of the seven-day quota remaining; ${resetWindow} reset in ${formatDuration(display.time - now)} (${status})`;
 			});
 	}
 }
@@ -914,7 +918,8 @@ export default function multiCodex(pi: ExtensionAPI): void {
 			return ctx.ui.theme?.fg ? ctx.ui.theme.fg("error", text) : text;
 		}
 		if (!isFresh(snapshot, identity, now)) return `${prefix} · stale`;
-		const text = `${prefix} · ${formatPercent(snapshot.remaining)}% · 7d ${formatDuration(snapshot.reset - now)}`;
+		const display = displayedReset(snapshot, now);
+		const text = `${prefix} · ${formatPercent(snapshot.remaining)}% · ${display.label} ${formatDuration(display.time - now)}`;
 		const color = snapshot.remaining >= 50 ? "success" : snapshot.remaining >= 25 ? "warning" : "error";
 		return ctx.ui.theme?.fg ? ctx.ui.theme.fg(color, text) : text;
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-multi-codex",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Use multiple ChatGPT Codex OAuth accounts in Pi.",
   "keywords": [
     "pi-package",
@@ -46,7 +46,7 @@
     "image": "https://raw.githubusercontent.com/HenryQW/pi-harness/main/extensions/pi-multi-codex/example.png"
   },
   "dependencies": {
-    "@henryqw/pi-config-store": "^1.0.0",
+    "@henryqw/pi-config-store": "^1.1.0",
     "proper-lockfile": "^4.1.2"
   },
   "devDependencies": {