@henryqw/pi-multi-codex 2.0.2 → 2.0.4

package/README.md

@@ -21,14 +21,14 @@ pi install npm:@henryqw/pi-multi-codex
 
 ## Use
 
-Run `/login` and authenticate `OpenAI Codex` for slot 1 first. Run `/codex-add`, then run `/login` and select the new `OpenAI Codex #<n>` provider. Restart Pi or update model scope, then run `/codex-status`. The status lists the new slot with cached quota when available, or `unavailable` until the first successful snapshot.
+Run `/login` and authenticate `OpenAI Codex (legacy)` for slot 1 first. Run `/codex-add`, then run `/login` and select the new `OpenAI Codex #<n>` provider. Restart Pi or update model scope, then run `/codex-status`. The status lists the new slot with cached quota when available, or `unavailable` until the first successful snapshot.
 
 | Surface | Type | Purpose |
 | --- | --- | --- |
 | `/codex-add` | command | For people: create the next numbered slot, then authenticate that slot. |
 | `/codex-status` | command | For people: show shared quota snapshots and five-hour blocks; never waits on network. |
 | `/codex-switch` | command | For people: select an authenticated, scope-allowed slot for the current Codex model. |
-| Pi model selector (`OpenAI Codex`, `OpenAI Codex #<n>`) | ui | Choose an authenticated account slot. |
+| Pi model selector (`OpenAI Codex (legacy)`, `OpenAI Codex #<n>`) | ui | Choose an authenticated account slot. |
 | Pi status `pi-multi-codex` | ui | Report the active slot's fresh quota, five-hour limit countdown, or stale/unavailable state; `@henryqw/pi-footer` displays it in the footer. |
 
 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. A numbered slot is one Codex account position in Pi.
@@ -41,6 +41,7 @@ The footer and `/codex-status` show the five-hour reset countdown for Free, Go,
 - After HTTP 429, failover can use authenticated, registered, scope-allowed, untried slots with stale or missing quota.
 - Failover skips known active five-hour blocks. It ranks fresh known quota first, then unranked slots by slot number.
 - Routing preserves the model ID.
+- Only physical Codex models are slots. A virtual model listed under `openai-codex`, such as `openai-codex/auto`, is never routed to a slot and shows no quota status.
 - During one agent run, each eligible slot is tried at most once after HTTP 429 responses.
 - Automatic retry stops when no untried eligible slot remains.
 - The footer shows the active slot's fresh quota or five-hour block.
@@ -61,6 +62,6 @@ The extension maintains a generated, credential-free quota cache at `~/.pi/agent
 
 ## Limits and recovery
 
-The extension reads `auth.json`. It never writes or refreshes credentials.
+The extension reads `auth.json` to identify account slots but does not directly edit credentials. When it asks Pi's auth resolver for a token to check quota, Pi may refresh expired OAuth credentials and update its auth store.
 
 Scoped sessions can switch only to exact scoped aliases.

package/extensions/multi-codex.ts

@@ -46,17 +46,21 @@ type SlotIdentity = {
 type SlotAuthResolver = (slot: number) => Promise<string | undefined>;
 type QuotaRefresh = { session: AbortController; resolveSlotAuth: SlotAuthResolver };
 
-type UsageSnapshot = {
-	slot: number;
-	accountHash: string;
-	tier?: string;
-	checkedAt: number;
-	fetchedAt?: number;
-	remaining?: number;
-	reset?: number;
+type SnapshotBase = { slot: number; accountHash: string; tier?: string; checkedAt: number };
+type MeasuredSnapshot = SnapshotBase & {
+	fetchedAt: number;
+	remaining: number;
+	reset: number;
 	fiveHourReset?: number;
-	limitedUntil?: number | null;
+	limitedUntil: number | null;
 };
+type UsageSnapshot = MeasuredSnapshot | (SnapshotBase & {
+	fetchedAt?: never;
+	remaining?: never;
+	reset?: never;
+	fiveHourReset?: never;
+	limitedUntil?: never;
+});
 
 type UsageLock = {
 	slot: number;
@@ -76,7 +80,7 @@ type Config = { autoSwitchOn429: boolean };
 
 const NATIVE_PROVIDER_ID = "openai-codex";
 const CODEX_ALIAS_PATTERN = /^openai-codex-([2-9]|[1-9]\d+)$/;
-const NO_ACCOUNTS_MESSAGE = "No Codex OAuth accounts found. Run /login and select OpenAI Codex.";
+const NO_ACCOUNTS_MESSAGE = "No Codex OAuth accounts found. Run /login and select OpenAI Codex (legacy).";
 const AGENT_STARTED_ENTRY = "pi-multi-codex:agent-started";
 const USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
 const REFRESH_MS = 5 * 60_000;
@@ -182,30 +186,27 @@ function validTier(value: unknown): value is string {
 
 function readSnapshot(value: unknown): UsageSnapshot | undefined {
 	if (!isRecord(value) || !validSlot(value.slot) || !validHash(value.accountHash) || !validTime(value.checkedAt)) return undefined;
-	const successful = value.fetchedAt !== undefined || value.remaining !== undefined || value.reset !== undefined;
-	if (successful && (
-		!validTime(value.fetchedAt) ||
-		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.fiveHourReset !== undefined || value.limitedUntil !== undefined)) return undefined;
-	return {
+	const base = {
 		slot: value.slot,
 		accountHash: value.accountHash,
 		...(validTier(value.tier) ? { tier: value.tier } : {}),
 		checkedAt: value.checkedAt,
-		...(successful
-			? {
-				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,
-			}
-			: {}),
+	};
+	const successful = value.fetchedAt !== undefined || value.remaining !== undefined || value.reset !== undefined;
+	if (!successful) {
+		if (value.fiveHourReset !== undefined || value.limitedUntil !== undefined) return undefined;
+		return base;
+	}
+	if (!validTime(value.fetchedAt) || 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;
+	return {
+		...base,
+		fetchedAt: value.fetchedAt,
+		remaining: Math.max(0, Math.min(100, value.remaining)),
+		reset: value.reset,
+		...(validTime(value.fiveHourReset) ? { fiveHourReset: value.fiveHourReset } : {}),
+		limitedUntil: value.limitedUntil,
 	};
 }
 
@@ -299,12 +300,14 @@ async function withCacheMutex<T>(operation: (signal: AbortSignal) => Promise<T>,
 	throw new Error("Cache mutex acquisition ended unexpectedly.");
 }
 
-function isFresh(snapshot: UsageSnapshot | undefined, identity: SlotIdentity, now: number): boolean {
+function isMeasured(snapshot: UsageSnapshot | undefined): snapshot is MeasuredSnapshot {
+	return snapshot?.fetchedAt !== undefined;
+}
+
+function isFresh(snapshot: UsageSnapshot | undefined, identity: SlotIdentity, now: number): snapshot is MeasuredSnapshot {
 	return Boolean(
-		snapshot &&
+		isMeasured(snapshot) &&
 		snapshot.accountHash === identity.accountHash &&
-		validTime(snapshot.fetchedAt) &&
-		validTime(snapshot.reset) &&
 		snapshot.fetchedAt <= now &&
 		snapshot.reset > now &&
 		now - snapshot.fetchedAt < REFRESH_MS,
@@ -312,14 +315,14 @@ function isFresh(snapshot: UsageSnapshot | undefined, identity: SlotIdentity, no
 }
 
 function isFiveHourLimited(snapshot: UsageSnapshot, now: number): boolean {
-	return validTime(snapshot.limitedUntil) && snapshot.limitedUntil > now;
+	return isMeasured(snapshot) && snapshot.limitedUntil !== null && 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) {
+function displayedReset(snapshot: MeasuredSnapshot, now: number): { label: "5h" | "7d"; time: number } {
+	if (["free", "go", "plus"].includes(snapshot.tier ?? "") && snapshot.fiveHourReset !== undefined && snapshot.fiveHourReset > now) {
 		return { label: "5h", time: snapshot.fiveHourReset };
 	}
-	return { label: "7d", time: snapshot.reset! };
+	return { label: "7d", time: snapshot.reset };
 }
 
 function checkedRecently(snapshot: UsageSnapshot | undefined, identity: SlotIdentity, now: number): boolean {
@@ -328,7 +331,7 @@ function checkedRecently(snapshot: UsageSnapshot | undefined, identity: SlotIden
 		snapshot.accountHash === identity.accountHash &&
 		snapshot.checkedAt <= now &&
 		now - snapshot.checkedAt < REFRESH_MS &&
-		(!validTime(snapshot.fetchedAt) || (validTime(snapshot.reset) && snapshot.reset > now)),
+		(!isMeasured(snapshot) || snapshot.reset > now),
 	);
 }
 
@@ -491,7 +494,7 @@ class CodexQuotaStatus {
 				? lock.heartbeatAt + LOCK_STALE_MS + 1
 				: undefined;
 			const snapshotDue = isFresh(snapshot, identity, now)
-				? Math.min(snapshot!.fetchedAt! + REFRESH_MS, snapshot!.reset!) + 1
+				? Math.min(snapshot.fetchedAt + REFRESH_MS, snapshot.reset) + 1
 				: checkedRecently(snapshot, identity, now)
 					? snapshot!.checkedAt + REFRESH_MS + 1
 					: now;
@@ -614,7 +617,7 @@ class CodexQuotaStatus {
 					limitedUntil: outcome.limitedUntil && outcome.limitedUntil > checkedAt ? outcome.limitedUntil : null,
 				});
 			} else {
-				state.slots.set(slot, previous?.accountHash === identity.accountHash && (!validTime(previous.reset) || previous.reset > checkedAt)
+				state.slots.set(slot, previous?.accountHash === identity.accountHash && (!isMeasured(previous) || previous.reset > checkedAt)
 					? { ...previous, checkedAt }
 					: { slot, accountHash: identity.accountHash, checkedAt });
 			}
@@ -685,7 +688,7 @@ class CodexQuotaStatus {
 			.map(([slot, credential]) => {
 				const identity = identityFor(credential);
 				const snapshot = state.slots.get(slot);
-				if (!identity || !snapshot || snapshot.accountHash !== identity.accountHash || !validTime(snapshot.fetchedAt) || typeof snapshot.remaining !== "number" || !validTime(snapshot.reset)) {
+				if (!identity || !isMeasured(snapshot) || snapshot.accountHash !== identity.accountHash) {
 					return `Codex slot ${slot}: unavailable`;
 				}
 				const tier = snapshot.tier ? ` (${snapshot.tier})` : "";
@@ -815,8 +818,9 @@ function providerForSlot(slot: number): string {
 	return slot === 1 ? NATIVE_PROVIDER_ID : `${NATIVE_PROVIDER_ID}-${slot}`;
 }
 
-function isManagedProvider(provider: string | undefined): boolean {
-	return provider !== undefined && slotForProvider(provider) !== undefined;
+/** A physical Codex model on a slot provider. Virtual models listed under `openai-codex` route elsewhere and are not slots. */
+function isManagedModel(model: Model<any> | undefined): model is CodexModel {
+	return model?.api === "openai-codex-responses" && slotForProvider(model.provider) !== undefined;
 }
 
 function sessionHasAgentWork(ctx: ExtensionContext): boolean {
@@ -871,7 +875,7 @@ export default function multiCodex(pi: ExtensionAPI): void {
 				if ((slot !== 1 && !registered.has(slot)) || !allowsModel(ctx, model, slot)) return [];
 				const identity = identityFor(credential);
 				const snapshot = state.slots.get(slot);
-				if (!identity || !isFresh(snapshot, identity, now) || typeof snapshot?.remaining !== "number" || isFiveHourLimited(snapshot, now)) return [];
+				if (!identity || !isFresh(snapshot, identity, now) || isFiveHourLimited(snapshot, now)) return [];
 				return [{ slot, remaining: snapshot.remaining }];
 			});
 	};
@@ -895,7 +899,7 @@ export default function multiCodex(pi: ExtensionAPI): void {
 				const identity = identityFor(credential);
 				const snapshot = state.slots.get(slot);
 				if (identity && snapshot?.accountHash === identity.accountHash && isFiveHourLimited(snapshot, now)) return [];
-				const remaining = identity && isFresh(snapshot, identity, now) ? snapshot?.remaining : undefined;
+				const remaining = identity && isFresh(snapshot, identity, now) ? snapshot.remaining : undefined;
 				return [{ slot, remaining }];
 			})
 			.sort((left, right) => (right.remaining ?? -1) - (left.remaining ?? -1) || left.slot - right.slot)
@@ -904,12 +908,12 @@ export default function multiCodex(pi: ExtensionAPI): void {
 
 	const footerText = (ctx: ExtensionContext): string | undefined => {
 		const model = ctx.model;
-		const slot = slotForProvider(model?.provider ?? "");
-		if (!model || !slot) return undefined;
+		const slot = isManagedModel(model) ? slotForProvider(model.provider) : undefined;
+		if (!slot) return undefined;
 		const identity = currentIdentity(slot);
 		const snapshot = quota.snapshot(slot);
 		const prefix = `Codex #${slot}`;
-		if (!identity || !snapshot || snapshot.accountHash !== identity.accountHash || !validTime(snapshot.fetchedAt) || typeof snapshot.remaining !== "number" || !validTime(snapshot.reset)) {
+		if (!identity || !isMeasured(snapshot) || snapshot.accountHash !== identity.accountHash) {
 			return `${prefix} · unavailable`;
 		}
 		const now = Date.now();
@@ -938,7 +942,7 @@ export default function multiCodex(pi: ExtensionAPI): void {
 	};
 
 	const updatePendingCandidate = (ctx: ExtensionContext): void => {
-		if (!ctx.model || !isManagedProvider(ctx.model.provider)) return;
+		if (!isManagedModel(ctx.model)) return;
 		const slot = selectFreshSlot(ctx, ctx.model);
 		automaticCandidate = slot ? { ...ctx.model, provider: providerForSlot(slot) } : ctx.model;
 	};
@@ -967,7 +971,7 @@ export default function multiCodex(pi: ExtensionAPI): void {
 				ctx.ui.notify("Pi Multi Codex config is invalid. Automatic 429 switching is disabled; the file was left unchanged.", "warning");
 			}
 		}
-		automaticOpen = isManagedProvider(ctx.model?.provider) && !sessionHasAgentWork(ctx);
+		automaticOpen = isManagedModel(ctx.model) && !sessionHasAgentWork(ctx);
 		automaticCandidate = ctx.model;
 		// Cache-only ranking happens before background refresh starts.
 		updatePendingCandidate(ctx);
@@ -980,7 +984,7 @@ export default function multiCodex(pi: ExtensionAPI): void {
 		triedSlots.clear();
 		providerRequest = undefined;
 		const model = ctx.model;
-		const slot = slotForProvider(model?.provider ?? "");
+		const slot = isManagedModel(model) ? slotForProvider(model.provider) : undefined;
 		const identity = slot ? currentIdentity(slot) : undefined;
 		const snapshot = slot ? quota.snapshot(slot) : undefined;
 		if (!automaticOpen && (preserveModelChoice || !identity || snapshot?.accountHash !== identity.accountHash || !isFiveHourLimited(snapshot, Date.now()))) return;
@@ -988,7 +992,7 @@ export default function multiCodex(pi: ExtensionAPI): void {
 		// Close before await: no timer, refresh, queued turn, or provider event can route later.
 		automaticOpen = false;
 		const candidate = automaticCandidate;
-		if (!model || !candidate || !isManagedProvider(model.provider) || candidate.id !== model.id || candidate.provider === model.provider) return;
+		if (!isManagedModel(model) || !candidate || candidate.id !== model.id || candidate.provider === model.provider) return;
 		await setModelAutomatically(candidate);
 		updateFooter(ctx);
 	});
@@ -1011,7 +1015,7 @@ export default function multiCodex(pi: ExtensionAPI): void {
 		const model = ctx.model;
 		const failedSlot = slotForProvider(event.message.provider);
 		if (
-			!model
+			!isManagedModel(model)
 			|| !failedSlot
 			|| request.provider !== event.message.provider
 			|| model.provider !== event.message.provider
@@ -1066,7 +1070,7 @@ export default function multiCodex(pi: ExtensionAPI): void {
 		handler: async (_args, ctx) => {
 			const slots = syncSlots();
 			if (!slots.has(1)) {
-				ctx.ui.notify("Run /login and select OpenAI Codex for slot 1 first.", "warning");
+				ctx.ui.notify("Run /login and select OpenAI Codex (legacy) for slot 1 first.", "warning");
 				return;
 			}
 
@@ -1090,7 +1094,7 @@ export default function multiCodex(pi: ExtensionAPI): void {
 		description: "switch current Codex model to another authenticated slot",
 		handler: async (_args, ctx) => {
 			const model = ctx.model;
-			if (!model || !isManagedProvider(model.provider)) {
+			if (!isManagedModel(model)) {
 				ctx.ui.notify("Select an OpenAI Codex model before switching slots.", "warning");
 				return;
 			}
@@ -1105,7 +1109,7 @@ export default function multiCodex(pi: ExtensionAPI): void {
 				ctx.ui.notify(
 					scopedModels.length > 0
 						? "No authenticated Codex slot matches this session's model scope. Restart Pi or update scoped models."
-						: "No authenticated Codex slots found. Run /login and select OpenAI Codex.",
+						: "No authenticated Codex slots found. Run /login and select OpenAI Codex (legacy).",
 					"warning",
 				);
 				return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-multi-codex",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Use multiple ChatGPT Codex OAuth accounts in Pi.",
   "keywords": [
     "pi-package",
@@ -25,8 +25,8 @@
     "pack:check": "npm pack --dry-run"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": ">=0.86.0 <0.88.0",
-    "@earendil-works/pi-coding-agent": ">=0.86.0 <0.88.0"
+    "@earendil-works/pi-ai": ">=0.86.0 <0.100.0",
+    "@earendil-works/pi-coding-agent": ">=0.86.0 <0.100.0"
   },
   "repository": {
     "type": "git",
@@ -50,8 +50,8 @@
     "proper-lockfile": "^4.1.2"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "0.87.0",
-    "@earendil-works/pi-coding-agent": "0.87.0",
+    "@earendil-works/pi-ai": "0.99.1",
+    "@earendil-works/pi-coding-agent": "0.99.1",
     "@types/proper-lockfile": "^4.1.4"
   }
 }