@victor-software-house/pi-multicodex 2.1.2 → 2.1.4

package/account-manager.ts

@@ -153,6 +153,7 @@ export class AccountManager {
 		creds: OAuthCredentials,
 		options?: {
 			importSource?: "pi-openai-codex";
+			importMode?: "linked" | "synthetic";
 			importFingerprint?: string;
 		},
 	): boolean {
@@ -182,6 +183,10 @@ export class AccountManager {
 			account.importSource = options.importSource;
 			changed = true;
 		}
+		if (options?.importMode && account.importMode !== options.importMode) {
+			account.importMode = options.importMode;
+			changed = true;
+		}
 		if (
 			options?.importFingerprint &&
 			account.importFingerprint !== options.importFingerprint
@@ -202,6 +207,7 @@ export class AccountManager {
 		creds: OAuthCredentials,
 		options?: {
 			importSource?: "pi-openai-codex";
+			importMode?: "linked" | "synthetic";
 			importFingerprint?: string;
 			preserveActive?: boolean;
 		},
@@ -221,7 +227,13 @@ export class AccountManager {
 			) {
 				changed = this.updateAccountEmail(duplicate, email) || changed;
 			}
-			changed = this.applyCredentials(target, creds, options) || changed;
+			changed =
+				this.applyCredentials(target, creds, {
+					...options,
+					importMode:
+						options?.importMode ??
+						(duplicate?.importMode === "synthetic" ? "linked" : undefined),
+				}) || changed;
 		} else {
 			target = {
 				email,
@@ -231,6 +243,7 @@ export class AccountManager {
 				accountId:
 					typeof creds.accountId === "string" ? creds.accountId : undefined,
 				importSource: options?.importSource,
+				importMode: options?.importMode,
 				importFingerprint: options?.importFingerprint,
 			};
 			this.data.accounts.push(target);
@@ -300,12 +313,33 @@ export class AccountManager {
 		);
 	}
 
+	private clearImportedLink(account: Account): boolean {
+		let changed = false;
+		if (account.importSource) {
+			account.importSource = undefined;
+			changed = true;
+		}
+		if (account.importMode) {
+			account.importMode = undefined;
+			changed = true;
+		}
+		if (account.importFingerprint) {
+			account.importFingerprint = undefined;
+			changed = true;
+		}
+		return changed;
+	}
+
 	async syncImportedOpenAICodexAuth(): Promise<boolean> {
 		const imported = await loadImportedOpenAICodexAuth();
 		if (!imported) return false;
 
 		const existingImported = this.getImportedAccount();
-		if (existingImported?.importFingerprint === imported.fingerprint) {
+		if (
+			existingImported?.importFingerprint === imported.fingerprint &&
+			(existingImported.importMode !== "synthetic" ||
+				existingImported.email === imported.identifier)
+		) {
 			return false;
 		}
 
@@ -314,25 +348,20 @@ export class AccountManager {
 			existingImported?.email,
 		);
 		if (matchingAccount) {
-			const wasActiveImported =
-				existingImported && this.data.activeEmail === existingImported.email;
-			const wasManualImported =
-				existingImported && this.manualEmail === existingImported.email;
 			let changed = this.applyCredentials(
 				matchingAccount,
 				imported.credentials,
 				{
 					importSource: "pi-openai-codex",
+					importMode: "linked",
 					importFingerprint: imported.fingerprint,
 				},
 			);
 			if (existingImported && existingImported !== matchingAccount) {
-				changed = this.removeAccountRecord(existingImported) || changed;
-				if (wasActiveImported) {
-					this.data.activeEmail = matchingAccount.email;
-				}
-				if (wasManualImported) {
-					this.manualEmail = matchingAccount.email;
+				if (existingImported.importMode === "synthetic") {
+					changed = this.removeAccountRecord(existingImported) || changed;
+				} else {
+					changed = this.clearImportedLink(existingImported) || changed;
 				}
 			}
 			if (changed) {
@@ -342,7 +371,7 @@ export class AccountManager {
 			return changed;
 		}
 
-		if (existingImported) {
+		if (existingImported?.importMode === "synthetic") {
 			const target = this.getAccount(imported.identifier);
 			let changed = false;
 			if (!target && existingImported.email !== imported.identifier) {
@@ -354,6 +383,7 @@ export class AccountManager {
 			changed =
 				this.applyCredentials(existingImported, imported.credentials, {
 					importSource: "pi-openai-codex",
+					importMode: "synthetic",
 					importFingerprint: imported.fingerprint,
 				}) || changed;
 			if (changed) {
@@ -363,8 +393,17 @@ export class AccountManager {
 			return changed;
 		}
 
+		if (existingImported) {
+			const changed = this.clearImportedLink(existingImported);
+			if (changed) {
+				this.save();
+				this.notifyStateChanged();
+			}
+		}
+
 		this.addOrUpdateAccount(imported.identifier, imported.credentials, {
 			importSource: "pi-openai-codex",
+			importMode: "synthetic",
 			importFingerprint: imported.fingerprint,
 			preserveActive: true,
 		});

package/auth.ts

@@ -45,7 +45,44 @@ function getRequiredString(
 	return typeof value === "string" && value.trim() ? value.trim() : undefined;
 }
 
-function createImportedIdentifier(accountId: string): string {
+function decodeJwtPayload(token: string): Record<string, unknown> | undefined {
+	const parts = token.split(".");
+	if (parts.length !== 3) return undefined;
+	const payload = parts[1];
+	if (!payload) return undefined;
+	try {
+		const normalized = payload.replace(/-/g, "+").replace(/_/g, "/");
+		const padded = normalized.padEnd(
+			normalized.length + ((4 - (normalized.length % 4)) % 4),
+			"=",
+		);
+		const decoded = Buffer.from(padded, "base64").toString("utf8");
+		const parsed = JSON.parse(decoded) as unknown;
+		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+			return undefined;
+		}
+		return parsed as Record<string, unknown>;
+	} catch {
+		return undefined;
+	}
+}
+
+function getProfileEmail(accessToken: string): string | undefined {
+	const payload = decodeJwtPayload(accessToken);
+	const profile = payload?.["https://api.openai.com/profile"];
+	if (!profile || typeof profile !== "object" || Array.isArray(profile)) {
+		return undefined;
+	}
+	const email = (profile as Record<string, unknown>).email;
+	return typeof email === "string" && email.trim() ? email.trim() : undefined;
+}
+
+function createImportedIdentifier(
+	accessToken: string,
+	accountId: string,
+): string {
+	const email = getProfileEmail(accessToken);
+	if (email) return email;
 	return `${IMPORTED_ACCOUNT_PREFIX} ${accountId.slice(0, 8)}`;
 }
 
@@ -84,7 +121,7 @@ export function parseImportedOpenAICodexAuth(
 		accountId,
 	};
 	return {
-		identifier: createImportedIdentifier(accountId ?? "default"),
+		identifier: createImportedIdentifier(access, accountId ?? "default"),
 		fingerprint: createFingerprint({ access, refresh, expires, accountId }),
 		credentials,
 	};

package/commands.ts

@@ -99,7 +99,7 @@ function formatAccountStatusLine(
 	const quotaHit =
 		account.quotaExhaustedUntil && account.quotaExhaustedUntil > Date.now();
 	const untouched = isUsageUntouched(usage) ? "untouched" : null;
-	const imported = account.importSource ? "linked-auth" : null;
+	const imported = account.importSource ? "pi auth" : null;
 	const reauth = account.needsReauth ? "needs reauth" : null;
 	const tags = [
 		active?.email === account.email ? "active" : null,

package/package.json

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

package/storage.ts

@@ -11,6 +11,7 @@ export interface Account {
 	lastUsed?: number;
 	quotaExhaustedUntil?: number;
 	importSource?: "pi-openai-codex";
+	importMode?: "linked" | "synthetic";
 	importFingerprint?: string;
 	needsReauth?: boolean;
 }