@victor-software-house/pi-multicodex 2.0.8 → 2.0.10

package/account-manager.ts

@@ -2,6 +2,7 @@ import {
 	type OAuthCredentials,
 	refreshOpenAICodexToken,
 } from "@mariozechner/pi-ai/oauth";
+import { AuthStorage } from "@mariozechner/pi-coding-agent";
 import { normalizeUnknownError } from "pi-provider-utils/streams";
 import { loadImportedOpenAICodexAuth } from "./auth";
 import { isAccountAvailable, pickBestAccount } from "./selection";
@@ -79,6 +80,7 @@ export class AccountManager {
 			existing.expiresAt = creds.expires;
 			existing.importSource = options?.importSource;
 			existing.importFingerprint = options?.importFingerprint;
+			existing.needsReauth = undefined;
 			if (accountId) {
 				existing.accountId = accountId;
 			}
@@ -230,10 +232,22 @@ export class AccountManager {
 		return this.usageCache.get(email);
 	}
 
+	getAccountsNeedingReauth(): Account[] {
+		return this.data.accounts.filter((a) => a.needsReauth);
+	}
+
+	private markNeedsReauth(account: Account): void {
+		account.needsReauth = true;
+		this.save();
+		this.notifyStateChanged();
+	}
+
 	async refreshUsageForAccount(
 		account: Account,
 		options?: { force?: boolean; signal?: AbortSignal },
 	): Promise<CodexUsageSnapshot | undefined> {
+		if (account.needsReauth) return this.usageCache.get(account.email);
+
 		const cached = this.usageCache.get(account.email);
 		const now = Date.now();
 		if (
@@ -339,10 +353,25 @@ export class AccountManager {
 	}
 
 	async ensureValidToken(account: Account): Promise<string> {
+		if (account.needsReauth) {
+			const hint = account.importSource
+				? "/login openai-codex"
+				: `/multicodex use ${account.email}`;
+			throw new Error(
+				`${account.email}: re-authentication required — run ${hint}`,
+			);
+		}
+
 		if (Date.now() < account.expiresAt - 5 * 60 * 1000) {
 			return account.accessToken;
 		}
 
+		// For the imported pi account, delegate to AuthStorage so we share pi's
+		// file lock and never race with pi's own refresh path.
+		if (account.importSource === "pi-openai-codex") {
+			return this.ensureValidTokenForImportedAccount(account);
+		}
+
 		const inflight = this.refreshPromises.get(account.email);
 		if (inflight) {
 			return inflight;
@@ -362,6 +391,9 @@ export class AccountManager {
 				this.save();
 				this.notifyStateChanged();
 				return account.accessToken;
+			} catch (error) {
+				this.markNeedsReauth(account);
+				throw error;
 			} finally {
 				this.refreshPromises.delete(account.email);
 			}
@@ -370,4 +402,71 @@ export class AccountManager {
 		this.refreshPromises.set(account.email, promise);
 		return promise;
 	}
+
+	/**
+	 * Refresh path for the imported pi account.
+	 *
+	 * Uses AuthStorage so our refresh is serialised by the same file lock that
+	 * pi's own credential refresh uses. This prevents "refresh_token_reused"
+	 * errors caused by pi and multicodex both refreshing the same token
+	 * simultaneously.
+	 */
+	private async ensureValidTokenForImportedAccount(
+		account: Account,
+	): Promise<string> {
+		// Check if pi already refreshed since our last sync.
+		const latest = await loadImportedOpenAICodexAuth();
+		if (latest && Date.now() < latest.credentials.expires - 5 * 60 * 1000) {
+			account.accessToken = latest.credentials.access;
+			account.refreshToken = latest.credentials.refresh;
+			account.expiresAt = latest.credentials.expires;
+			account.importFingerprint = latest.fingerprint;
+			const accountId =
+				typeof latest.credentials.accountId === "string"
+					? latest.credentials.accountId
+					: undefined;
+			if (accountId) {
+				account.accountId = accountId;
+			}
+			this.save();
+			this.notifyStateChanged();
+			return account.accessToken;
+		}
+
+		// Both our copy and auth.json are expired — let AuthStorage refresh with
+		// its file lock so only one caller (us or pi) fires the API call.
+		let apiKey: string | undefined;
+		try {
+			const authStorage = AuthStorage.create();
+			apiKey = await authStorage.getApiKey("openai-codex");
+		} catch {
+			// AuthStorage refresh failed; mark for re-auth below.
+		}
+		if (!apiKey) {
+			this.markNeedsReauth(account);
+			throw new Error(
+				`${account.email}: token refresh failed — run /login openai-codex to re-authenticate`,
+			);
+		}
+
+		// Read the refreshed tokens back from auth.json.
+		const refreshed = await loadImportedOpenAICodexAuth();
+		if (refreshed) {
+			account.accessToken = refreshed.credentials.access;
+			account.refreshToken = refreshed.credentials.refresh;
+			account.expiresAt = refreshed.credentials.expires;
+			account.importFingerprint = refreshed.fingerprint;
+			const accountId =
+				typeof refreshed.credentials.accountId === "string"
+					? refreshed.credentials.accountId
+					: undefined;
+			if (accountId) {
+				account.accountId = accountId;
+			}
+			this.save();
+			this.notifyStateChanged();
+		}
+
+		return apiKey;
+	}
 }

package/commands.ts

@@ -80,11 +80,16 @@ function parseResetTarget(value: string): ResetTarget | undefined {
 	return undefined;
 }
 
-function getAccountLabel(email: string, quotaExhaustedUntil?: number): string {
-	if (!quotaExhaustedUntil || quotaExhaustedUntil <= Date.now()) {
-		return email;
-	}
-	return `${email} (Quota)`;
+function getAccountLabel(
+	email: string,
+	options?: { quotaExhaustedUntil?: number; needsReauth?: boolean },
+): string {
+	const tags: string[] = [];
+	if (options?.needsReauth) tags.push("Reauth");
+	if (options?.quotaExhaustedUntil && options.quotaExhaustedUntil > Date.now())
+		tags.push("Quota");
+	if (tags.length === 0) return email;
+	return `${email} (${tags.join(", ")})`;
 }
 
 function formatAccountStatusLine(
@@ -100,9 +105,11 @@ function formatAccountStatusLine(
 		account.quotaExhaustedUntil && account.quotaExhaustedUntil > Date.now();
 	const untouched = isUsageUntouched(usage) ? "untouched" : null;
 	const imported = account.importSource ? "imported" : null;
+	const reauth = account.needsReauth ? "needs reauth" : null;
 	const tags = [
 		active?.email === account.email ? "active" : null,
 		manual?.email === account.email ? "manual" : null,
+		reauth,
 		quotaHit ? "quota" : null,
 		untouched,
 		imported,
@@ -234,7 +241,10 @@ async function openAccountSelectionPanel(
 	const accounts = accountManager.getAccounts();
 	const items = accounts.map((account) => ({
 		value: account.email,
-		label: getAccountLabel(account.email, account.quotaExhaustedUntil),
+		label: getAccountLabel(account.email, {
+			quotaExhaustedUntil: account.quotaExhaustedUntil,
+			needsReauth: account.needsReauth,
+		}),
 	}));
 
 	return ctx.ui.custom<AccountPanelResult>((_tui, theme, _kb, done) => {

package/extension.ts

@@ -28,7 +28,7 @@ export default function multicodexExtension(pi: ExtensionAPI) {
 
 	pi.on("session_start", (_event: unknown, ctx: ExtensionContext) => {
 		lastContext = ctx;
-		handleSessionStart(accountManager);
+		handleSessionStart(accountManager, (msg) => ctx.ui.notify(msg, "warning"));
 		statusController.startAutoRefresh();
 		void (async () => {
 			await statusController.loadPreferences(ctx);
@@ -41,7 +41,9 @@ export default function multicodexExtension(pi: ExtensionAPI) {
 		(event: { reason?: string }, ctx: ExtensionContext) => {
 			lastContext = ctx;
 			if (event.reason === "new") {
-				handleNewSessionSwitch(accountManager);
+				handleNewSessionSwitch(accountManager, (msg) =>
+					ctx.ui.notify(msg, "warning"),
+				);
 			}
 			void statusController.refreshFor(ctx);
 		},

package/hooks.ts

@@ -1,10 +1,27 @@
 import type { AccountManager } from "./account-manager";
 
+type WarningHandler = (message: string) => void;
+
 async function refreshAndActivateBestAccount(
 	accountManager: AccountManager,
+	warningHandler?: WarningHandler,
 ): Promise<void> {
 	await accountManager.syncImportedOpenAICodexAuth();
 	await accountManager.refreshUsageForAllAccounts({ force: true });
+
+	const needsReauth = accountManager.getAccountsNeedingReauth();
+	if (needsReauth.length > 0) {
+		const hints = needsReauth.map((a) => {
+			const cmd = a.importSource
+				? "/login openai-codex"
+				: `/multicodex use ${a.email}`;
+			return `${a.email} (${cmd})`;
+		});
+		warningHandler?.(
+			`Multicodex: ${needsReauth.length} account(s) need re-authentication: ${hints.join(", ")}`,
+		);
+	}
+
 	const manual = accountManager.getAvailableManualAccount();
 	if (manual) return;
 	if (accountManager.hasManualAccount()) {
@@ -13,11 +30,17 @@ async function refreshAndActivateBestAccount(
 	await accountManager.activateBestAccount();
 }
 
-export function handleSessionStart(accountManager: AccountManager): void {
+export function handleSessionStart(
+	accountManager: AccountManager,
+	warningHandler?: WarningHandler,
+): void {
 	if (accountManager.getAccounts().length === 0) return;
-	void refreshAndActivateBestAccount(accountManager);
+	void refreshAndActivateBestAccount(accountManager, warningHandler);
 }
 
-export function handleNewSessionSwitch(accountManager: AccountManager): void {
-	void refreshAndActivateBestAccount(accountManager);
+export function handleNewSessionSwitch(
+	accountManager: AccountManager,
+	warningHandler?: WarningHandler,
+): void {
+	void refreshAndActivateBestAccount(accountManager, warningHandler);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@victor-software-house/pi-multicodex",
-	"version": "2.0.8",
+	"version": "2.0.10",
 	"description": "Codex account rotation extension for pi",
 	"license": "MIT",
 	"type": "module",
@@ -89,6 +89,7 @@
 		"@semantic-release/release-notes-generator": "^14.1.0",
 		"@types/node": "^25.5.0",
 		"@typescript/native-preview": "7.0.0-dev.20260314.1",
+		"conventional-changelog-conventionalcommits": "^9.3.0",
 		"semantic-release": "^25.0.3",
 		"typescript": "^5.9.3",
 		"vitest": "^4.1.0"

package/selection.ts

@@ -6,6 +6,7 @@ import {
 } from "./usage";
 
 export function isAccountAvailable(account: Account, now: number): boolean {
+	if (account.needsReauth) return false;
 	return !account.quotaExhaustedUntil || account.quotaExhaustedUntil <= now;
 }
 

package/storage.ts

@@ -12,6 +12,7 @@ export interface Account {
 	quotaExhaustedUntil?: number;
 	importSource?: "pi-openai-codex";
 	importFingerprint?: string;
+	needsReauth?: boolean;
 }
 
 export interface StorageData {