@victor-software-house/pi-multicodex 2.0.11 → 2.0.13

package/account-manager.ts

@@ -52,12 +52,16 @@ export class AccountManager {
 	 * (rename, compaction) can resolve a valid API key via AuthStorage.
 	 */
 	private syncActiveTokenToAuthJson(account: Account): void {
-		writeActiveTokenToAuthJson({
-			access: account.accessToken,
-			refresh: account.refreshToken,
-			expires: account.expiresAt,
-			accountId: account.accountId,
-		}).catch(() => {});
+		try {
+			writeActiveTokenToAuthJson({
+				access: account.accessToken,
+				refresh: account.refreshToken,
+				expires: account.expiresAt,
+				accountId: account.accountId,
+			});
+		} catch {
+			// Best-effort sync — do not block token resolution.
+		}
 	}
 
 	onStateChange(handler: StateChangeHandler): () => void {

package/auth.ts

@@ -1,4 +1,9 @@
-import { promises as fs } from "node:fs";
+import {
+	existsSync,
+	promises as fs,
+	readFileSync,
+	writeFileSync,
+} from "node:fs";
 import type { OAuthCredentials } from "@mariozechner/pi-ai/oauth";
 import { getAgentAuthPath } from "pi-provider-utils/agent-paths";
 
@@ -90,18 +95,26 @@ export function parseImportedOpenAICodexAuth(
  * (rename, compaction, inline suggestions) can resolve a valid API key through
  * the normal AuthStorage path.
  */
-export async function writeActiveTokenToAuthJson(creds: {
+/**
+ * Synchronously write the active account's tokens to auth.json so pi's
+ * background features (rename, compaction) can resolve a valid API key.
+ *
+ * Uses synchronous I/O to avoid interleaved writes with pi's own code.
+ */
+export function writeActiveTokenToAuthJson(creds: {
 	access: string;
 	refresh: string;
 	expires: number;
 	accountId?: string;
-}): Promise<void> {
+}): void {
 	let auth: Record<string, unknown> = {};
 	try {
-		const raw = await fs.readFile(AUTH_FILE, "utf8");
-		const parsed = JSON.parse(raw) as unknown;
-		if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-			auth = parsed as Record<string, unknown>;
+		if (existsSync(AUTH_FILE)) {
+			const raw = readFileSync(AUTH_FILE, "utf8");
+			const parsed = JSON.parse(raw) as unknown;
+			if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+				auth = parsed as Record<string, unknown>;
+			}
 		}
 	} catch {
 		// File missing or corrupt — start fresh.
@@ -115,7 +128,7 @@ export async function writeActiveTokenToAuthJson(creds: {
 		accountId: creds.accountId,
 	};
 
-	await fs.writeFile(AUTH_FILE, JSON.stringify(auth, null, 2));
+	writeFileSync(AUTH_FILE, JSON.stringify(auth, null, 2));
 }
 
 export async function loadImportedOpenAICodexAuth(): Promise<
@@ -128,11 +141,8 @@ export async function loadImportedOpenAICodexAuth(): Promise<
 			return undefined;
 		}
 		return parseImportedOpenAICodexAuth(parsed as Record<string, unknown>);
-	} catch (error) {
-		const withCode = error as Error & { code?: string };
-		if (withCode.code === "ENOENT") {
-			return undefined;
-		}
-		throw error;
+	} catch {
+		// File missing, corrupt, or unreadable — treat as no imported auth.
+		return undefined;
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@victor-software-house/pi-multicodex",
-	"version": "2.0.11",
+	"version": "2.0.13",
 	"description": "Codex account rotation extension for pi",
 	"license": "MIT",
 	"type": "module",

package/provider.ts

@@ -42,6 +42,22 @@ export function getOpenAICodexMirror(): {
 	};
 }
 
+function getActiveApiKey(accountManager: AccountManager): string {
+	const active = accountManager.getActiveAccount();
+	if (active && !active.needsReauth) {
+		return active.accessToken;
+	}
+	// Fallback: first available account with a valid token.
+	for (const account of accountManager.getAccounts()) {
+		if (!account.needsReauth && account.accessToken) {
+			return account.accessToken;
+		}
+	}
+	// Placeholder — AuthStorage will override on every actual API call
+	// as long as auth.json has valid tokens.
+	return "pending-login";
+}
+
 export function buildMulticodexProviderConfig(accountManager: AccountManager) {
 	const mirror = getOpenAICodexMirror();
 	const baseProvider = getApiProvider("openai-codex-responses");
@@ -53,7 +69,7 @@ export function buildMulticodexProviderConfig(accountManager: AccountManager) {
 
 	return {
 		baseUrl: mirror.baseUrl,
-		apiKey: "managed-by-extension",
+		apiKey: getActiveApiKey(accountManager),
 		api: "openai-codex-responses" as const,
 		streamSimple: createStreamWrapper(accountManager, baseProvider),
 		models: mirror.models,