@victor-software-house/pi-multicodex 2.0.7 → 2.0.9

package/README.md

@@ -78,6 +78,7 @@ You can customize which fields appear and their ordering with `/multicodex foote
 - **Token refresh.** OAuth tokens are refreshed before expiry so requests do not fail due to stale credentials.
 - **Usage tracking.** Usage data is fetched from the Codex API and cached for 5 minutes per account. The footer renders cached data immediately and refreshes in the background.
 - **Quota cooldown.** When an account is exhausted, it stays on cooldown until its next known reset time (or 1 hour if the reset time is unknown).
+- **Shared utility seams.** Provider mirroring, stream primitives, and `~/.pi/agent/*` path helpers are shared with `pi-credential-vault` through `@victor-software-house/pi-provider-utils`. MultiCodex still owns account storage, token policy, footer behavior, and command UX.
 
 ## Local development
 

package/abort-utils.ts

@@ -1,24 +1,9 @@
-export function createLinkedAbortController(
-	signal?: AbortSignal,
-): AbortController {
-	const controller = new AbortController();
-	if (signal?.aborted) {
-		controller.abort();
-		return controller;
-	}
-
-	signal?.addEventListener("abort", () => controller.abort(), { once: true });
-	return controller;
-}
-
-export function createTimeoutController(
-	signal: AbortSignal | undefined,
-	timeoutMs: number,
-): { controller: AbortController; clear: () => void } {
-	const controller = createLinkedAbortController(signal);
-	const timeout = setTimeout(() => controller.abort(), timeoutMs);
-	return {
-		controller,
-		clear: () => clearTimeout(timeout),
-	};
-}
+/**
+ * Re-export abort controller helpers from the shared package.
+ *
+ * Existing imports within this package continue to work unchanged.
+ */
+export {
+	createLinkedAbortController,
+	createTimeoutController,
+} from "pi-provider-utils/streams";

package/account-manager.ts

@@ -2,6 +2,8 @@ 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";
 import {
@@ -20,14 +22,10 @@ const QUOTA_COOLDOWN_MS = 60 * 60 * 1000;
 type WarningHandler = (message: string) => void;
 type StateChangeHandler = () => void;
 
-function getErrorMessage(error: unknown): string {
-	if (error instanceof Error) return error.message;
-	return typeof error === "string" ? error : JSON.stringify(error);
-}
-
 export class AccountManager {
 	private data: StorageData;
 	private usageCache = new Map<string, CodexUsageSnapshot>();
+	private refreshPromises = new Map<string, Promise<string>>();
 	private warningHandler?: WarningHandler;
 	private manualEmail?: string;
 	private stateChangeHandlers = new Set<StateChangeHandler>();
@@ -258,7 +256,7 @@ export class AccountManager {
 			return usage;
 		} catch (error) {
 			this.warningHandler?.(
-				`Multicodex: failed to fetch usage for ${account.email}: ${getErrorMessage(
+				`Multicodex: failed to fetch usage for ${account.email}: ${normalizeUnknownError(
 					error,
 				)}`,
 			);
@@ -346,17 +344,98 @@ export class AccountManager {
 			return account.accessToken;
 		}
 
-		const result = await refreshOpenAICodexToken(account.refreshToken);
-		account.accessToken = result.access;
-		account.refreshToken = result.refresh;
-		account.expiresAt = result.expires;
-		const accountId =
-			typeof result.accountId === "string" ? result.accountId : undefined;
-		if (accountId) {
-			account.accountId = accountId;
+		// 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);
 		}
-		this.save();
-		this.notifyStateChanged();
-		return account.accessToken;
+
+		const inflight = this.refreshPromises.get(account.email);
+		if (inflight) {
+			return inflight;
+		}
+
+		const promise = (async () => {
+			try {
+				const result = await refreshOpenAICodexToken(account.refreshToken);
+				account.accessToken = result.access;
+				account.refreshToken = result.refresh;
+				account.expiresAt = result.expires;
+				const accountId =
+					typeof result.accountId === "string" ? result.accountId : undefined;
+				if (accountId) {
+					account.accountId = accountId;
+				}
+				this.save();
+				this.notifyStateChanged();
+				return account.accessToken;
+			} finally {
+				this.refreshPromises.delete(account.email);
+			}
+		})();
+
+		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.
+		const authStorage = AuthStorage.create();
+		const apiKey = await authStorage.getApiKey("openai-codex");
+		if (!apiKey) {
+			throw new Error(
+				"OpenAI Codex: token refresh failed — please re-authenticate with /login",
+			);
+		}
+
+		// 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/auth.ts

@@ -1,9 +1,8 @@
 import { promises as fs } from "node:fs";
-import os from "node:os";
-import path from "node:path";
 import type { OAuthCredentials } from "@mariozechner/pi-ai/oauth";
+import { getAgentAuthPath } from "pi-provider-utils/agent-paths";
 
-const AUTH_FILE = path.join(os.homedir(), ".pi", "agent", "auth.json");
+const AUTH_FILE = getAgentAuthPath();
 const IMPORTED_ACCOUNT_PREFIX = "OpenAI Codex";
 
 interface AuthEntry {

package/commands.ts

@@ -1,5 +1,4 @@
 import { promises as fs, constants as fsConstants } from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import { loginOpenAICodex } from "@mariozechner/pi-ai/oauth";
 import type {
@@ -15,13 +14,15 @@ import {
 	SelectList,
 	Text,
 } from "@mariozechner/pi-tui";
+import { getAgentSettingsPath } from "pi-provider-utils/agent-paths";
+import { normalizeUnknownError } from "pi-provider-utils/streams";
 import type { AccountManager } from "./account-manager";
 import { openLoginInBrowser } from "./browser";
 import type { createUsageStatusController } from "./status";
 import { STORAGE_FILE } from "./storage";
 import { formatResetAt, isUsageUntouched } from "./usage";
 
-const SETTINGS_FILE = path.join(os.homedir(), ".pi", "agent", "settings.json");
+const SETTINGS_FILE = getAgentSettingsPath();
 const NO_ACCOUNTS_MESSAGE =
 	"No managed accounts found. Use /multicodex use <identifier> first.";
 const HELP_TEXT =
@@ -46,11 +47,6 @@ type AccountPanelResult =
 	| { action: "remove"; email: string }
 	| undefined;
 
-function getErrorMessage(error: unknown): string {
-	if (error instanceof Error) return error.message;
-	return typeof error === "string" ? error : JSON.stringify(error);
-}
-
 function toAutocompleteItems(values: readonly string[]): AutocompleteItem[] {
 	return values.map((value) => ({ value, label: value }));
 }
@@ -202,7 +198,7 @@ async function loginAndActivateAccount(
 		ctx.ui.notify(`Now using ${identifier}`, "info");
 		return true;
 	} catch (error) {
-		ctx.ui.notify(`Login failed: ${getErrorMessage(error)}`, "error");
+		ctx.ui.notify(`Login failed: ${normalizeUnknownError(error)}`, "error");
 		return false;
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@victor-software-house/pi-multicodex",
-	"version": "2.0.7",
+	"version": "2.0.9",
 	"description": "Codex account rotation extension for pi",
 	"license": "MIT",
 	"type": "module",
@@ -78,9 +78,9 @@
 		"@biomejs/biome": "^2.4.7",
 		"@commitlint/cli": "^20.4.4",
 		"@commitlint/config-conventional": "^20.4.4",
-		"@mariozechner/pi-ai": "^0.58.1",
-		"@mariozechner/pi-coding-agent": "^0.58.1",
-		"@mariozechner/pi-tui": "^0.58.1",
+		"@mariozechner/pi-ai": "^0.63.1",
+		"@mariozechner/pi-coding-agent": "^0.63.1",
+		"@mariozechner/pi-tui": "^0.63.1",
 		"@semantic-release/changelog": "^6.0.3",
 		"@semantic-release/commit-analyzer": "^13.0.1",
 		"@semantic-release/git": "^10.0.1",
@@ -89,11 +89,15 @@
 		"@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"
 	},
 	"engines": {
 		"node": "24.14.0"
+	},
+	"dependencies": {
+		"pi-provider-utils": "^0.0.0"
 	}
 }

package/provider.ts

@@ -1,12 +1,5 @@
-import {
-	type Api,
-	type AssistantMessageEventStream,
-	type Context,
-	getApiProvider,
-	getModels,
-	type Model,
-	type SimpleStreamOptions,
-} from "@mariozechner/pi-ai";
+import { getApiProvider } from "@mariozechner/pi-ai";
+import { mirrorProvider } from "pi-provider-utils/providers";
 import type { AccountManager } from "./account-manager";
 import { createStreamWrapper } from "./stream-wrapper";
 
@@ -31,32 +24,25 @@ export function getOpenAICodexMirror(): {
 	baseUrl: string;
 	models: ProviderModelDef[];
 } {
-	const sourceModels = getModels("openai-codex");
+	const mirror = mirrorProvider("openai-codex");
+	if (!mirror) {
+		return { baseUrl: "https://chatgpt.com/backend-api", models: [] };
+	}
 	return {
-		baseUrl: sourceModels[0]?.baseUrl || "https://chatgpt.com/backend-api",
-		models: sourceModels.map((model) => ({
-			id: model.id,
-			name: model.name,
-			reasoning: model.reasoning,
-			input: model.input,
-			cost: model.cost,
-			contextWindow: model.contextWindow,
-			maxTokens: model.maxTokens,
+		baseUrl: mirror.baseUrl,
+		models: mirror.models.map((m) => ({
+			id: m.id,
+			name: m.name,
+			reasoning: m.reasoning,
+			input: [...m.input],
+			cost: { ...m.cost },
+			contextWindow: m.contextWindow,
+			maxTokens: m.maxTokens,
 		})),
 	};
 }
 
-export function buildMulticodexProviderConfig(accountManager: AccountManager): {
-	baseUrl: string;
-	apiKey: string;
-	api: "openai-codex-responses";
-	streamSimple: (
-		model: Model<Api>,
-		context: Context,
-		options?: SimpleStreamOptions,
-	) => AssistantMessageEventStream;
-	models: ProviderModelDef[];
-} {
+export function buildMulticodexProviderConfig(accountManager: AccountManager) {
 	const mirror = getOpenAICodexMirror();
 	const baseProvider = getApiProvider("openai-codex-responses");
 	if (!baseProvider) {
@@ -68,7 +54,7 @@ export function buildMulticodexProviderConfig(accountManager: AccountManager): {
 	return {
 		baseUrl: mirror.baseUrl,
 		apiKey: "managed-by-extension",
-		api: "openai-codex-responses",
+		api: "openai-codex-responses" as const,
 		streamSimple: createStreamWrapper(accountManager, baseProvider),
 		models: mirror.models,
 	};

package/status.ts

@@ -1,6 +1,3 @@
-import { promises as fs } from "node:fs";
-import os from "node:os";
-import path from "node:path";
 import type { Api, Model } from "@mariozechner/pi-ai";
 import type {
 	ExtensionCommandContext,
@@ -13,13 +10,18 @@ import {
 	SettingsList,
 	Text,
 } from "@mariozechner/pi-tui";
+import {
+	getAgentSettingsPath,
+	readJsonObjectFileAsync,
+	writeJsonObjectFileAsync,
+} from "pi-provider-utils/agent-paths";
 import type { AccountManager } from "./account-manager";
 import { PROVIDER_ID } from "./provider";
 import type { CodexUsageSnapshot } from "./usage";
 
 const STATUS_KEY = "multicodex-usage";
 const SETTINGS_KEY = "pi-multicodex";
-const SETTINGS_FILE = path.join(os.homedir(), ".pi", "agent", "settings.json");
+const SETTINGS_FILE = getAgentSettingsPath();
 const REFRESH_INTERVAL_MS = 60_000;
 const MODEL_SELECT_REFRESH_DEBOUNCE_MS = 250;
 const UNKNOWN_PERCENT = "--";
@@ -90,26 +92,13 @@ function normalizePreferences(value: unknown): FooterPreferences {
 }
 
 async function readSettingsFile(): Promise<Record<string, unknown>> {
-	try {
-		const raw = await fs.readFile(SETTINGS_FILE, "utf8");
-		const parsed = JSON.parse(raw) as unknown;
-		return asObject(parsed) ?? {};
-	} catch (error) {
-		const withCode = error as Error & { code?: string };
-		if (withCode.code === "ENOENT") return {};
-		throw error;
-	}
+	return readJsonObjectFileAsync(SETTINGS_FILE);
 }
 
 async function writeSettingsFile(
 	settings: Record<string, unknown>,
 ): Promise<void> {
-	await fs.mkdir(path.dirname(SETTINGS_FILE), { recursive: true });
-	await fs.writeFile(
-		SETTINGS_FILE,
-		`${JSON.stringify(settings, null, 2)}\n`,
-		"utf8",
-	);
+	await writeJsonObjectFileAsync(SETTINGS_FILE, settings);
 }
 
 export async function loadFooterPreferences(): Promise<FooterPreferences> {

package/storage.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
+import { getAgentPath } from "pi-provider-utils/agent-paths";
 
 export interface Account {
 	email: string;
@@ -19,12 +19,7 @@ export interface StorageData {
 	activeEmail?: string;
 }
 
-export const STORAGE_FILE = path.join(
-	os.homedir(),
-	".pi",
-	"agent",
-	"codex-accounts.json",
-);
+export const STORAGE_FILE = getAgentPath("codex-accounts.json");
 
 export function loadStorage(): StorageData {
 	try {

package/stream-wrapper.ts

@@ -1,6 +1,5 @@
 import {
 	type Api,
-	type AssistantMessage,
 	type AssistantMessageEvent,
 	type AssistantMessageEventStream,
 	type Context,
@@ -8,7 +7,12 @@ import {
 	type Model,
 	type SimpleStreamOptions,
 } from "@mariozechner/pi-ai";
-import { createLinkedAbortController } from "./abort-utils";
+import {
+	createErrorAssistantMessage,
+	createLinkedAbortController,
+	normalizeUnknownError,
+	rewriteProviderOnEvent,
+} from "pi-provider-utils/streams";
 import type { AccountManager } from "./account-manager";
 import { isQuotaErrorMessage } from "./quota";
 
@@ -22,51 +26,6 @@ type ApiProviderRef = {
 	) => AssistantMessageEventStream;
 };
 
-function withProvider(
-	event: AssistantMessageEvent,
-	provider: string,
-): AssistantMessageEvent {
-	if ("partial" in event) {
-		return { ...event, partial: { ...event.partial, provider } };
-	}
-	if (event.type === "done") {
-		return { ...event, message: { ...event.message, provider } };
-	}
-	if (event.type === "error") {
-		return { ...event, error: { ...event.error, provider } };
-	}
-	return event;
-}
-
-function createErrorAssistantMessage(
-	model: Model<Api>,
-	message: string,
-): AssistantMessage {
-	return {
-		role: "assistant",
-		content: [],
-		api: model.api,
-		provider: model.provider,
-		model: model.id,
-		usage: {
-			input: 0,
-			output: 0,
-			cacheRead: 0,
-			cacheWrite: 0,
-			totalTokens: 0,
-			cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-		},
-		stopReason: "error",
-		errorMessage: message,
-		timestamp: Date.now(),
-	};
-}
-
-function getErrorMessage(error: unknown): string {
-	if (error instanceof Error) return error.message;
-	return typeof error === "string" ? error : JSON.stringify(error);
-}
-
 export function createStreamWrapper(
 	accountManager: AccountManager,
 	baseProvider: ApiProviderRef,
@@ -151,13 +110,13 @@ export function createStreamWrapper(
 								break;
 							}
 
-							stream.push(withProvider(event, model.provider));
+							stream.push(rewriteProviderOnEvent(event, model.provider));
 							stream.end();
 							return;
 						}
 
 						forwardedAny = true;
-						stream.push(withProvider(event, model.provider));
+						stream.push(rewriteProviderOnEvent(event, model.provider));
 
 						if (event.type === "done") {
 							stream.end();
@@ -173,7 +132,7 @@ export function createStreamWrapper(
 					return;
 				}
 			} catch (error) {
-				const message = getErrorMessage(error);
+				const message = normalizeUnknownError(error);
 				const errorEvent: AssistantMessageEvent = {
 					type: "error",
 					reason: "error",
@@ -182,7 +141,7 @@ export function createStreamWrapper(
 						`Multicodex failed: ${message}`,
 					),
 				};
-				stream.push(withProvider(errorEvent, model.provider));
+				stream.push(rewriteProviderOnEvent(errorEvent, model.provider));
 				stream.end();
 			}
 		})();