@bjesuiter/codex-switcher 1.1.0 → 1.2.0

package/README.md

@@ -40,7 +40,10 @@ Opens your browser to authenticate with OpenAI. After successful login, your cre
 cdx switch
 ```
 
-Interactive picker to select an account. Writes credentials to `~/.local/share/opencode/auth.json`.
+Interactive picker to select an account. Writes credentials to:
+- `~/.local/share/opencode/auth.json` (OpenCode)
+- `~/.pi/agent/auth.json` (Pi agent, or `$PI_CODING_AGENT_DIR/auth.json` when `PI_CODING_AGENT_DIR` is set)
+- `~/.codex/auth.json` (Codex CLI; requires `id_token`)
 
 ```bash
 cdx switch --next
@@ -101,7 +104,10 @@ Running `cdx` without arguments opens an interactive menu to:
 
 - OAuth credentials are stored securely in macOS Keychain
 - Account list is stored in `~/.config/cdx/accounts.json`
-- Active account credentials are written to `~/.local/share/opencode/auth.json`
+- Active account credentials are written to:
+  - `~/.local/share/opencode/auth.json`
+  - `~/.pi/agent/auth.json` (or `$PI_CODING_AGENT_DIR/auth.json`)
+  - `~/.codex/auth.json` (when `id_token` exists)
 
 ## For Developers
 

package/cdx.mjs

@@ -11,18 +11,24 @@ import { randomBytes } from "node:crypto";
 import http from "node:http";
 
 //#region package.json
-var version = "1.1.0";
+var version = "1.2.0";
 
 //#endregion
 //#region lib/paths.ts
 const defaultConfigDir = path.join(os.homedir(), ".config", "cdx");
-const defaultPaths = {
+const resolvePiAuthPath = () => {
+	const piAgentDir = process.env.PI_CODING_AGENT_DIR?.trim();
+	if (piAgentDir) return path.join(piAgentDir, "auth.json");
+	return path.join(os.homedir(), ".pi", "agent", "auth.json");
+};
+const createDefaultPaths = () => ({
 	configDir: defaultConfigDir,
 	configPath: path.join(defaultConfigDir, "accounts.json"),
 	authPath: path.join(os.homedir(), ".local", "share", "opencode", "auth.json"),
-	codexAuthPath: path.join(os.homedir(), ".codex", "auth.json")
-};
-let currentPaths = { ...defaultPaths };
+	codexAuthPath: path.join(os.homedir(), ".codex", "auth.json"),
+	piAuthPath: resolvePiAuthPath()
+});
+let currentPaths = createDefaultPaths();
 const getPaths = () => currentPaths;
 const setPaths = (paths) => {
 	currentPaths = {
@@ -32,13 +38,14 @@ const setPaths = (paths) => {
 	if (paths.configDir && !paths.configPath) currentPaths.configPath = path.join(paths.configDir, "accounts.json");
 };
 const resetPaths = () => {
-	currentPaths = { ...defaultPaths };
+	currentPaths = createDefaultPaths();
 };
 const createTestPaths = (testDir) => ({
 	configDir: path.join(testDir, "config"),
 	configPath: path.join(testDir, "config", "accounts.json"),
 	authPath: path.join(testDir, "auth", "auth.json"),
-	codexAuthPath: path.join(testDir, "codex", "auth.json")
+	codexAuthPath: path.join(testDir, "codex", "auth.json"),
+	piAuthPath: path.join(testDir, "pi", "auth.json")
 });
 
 //#endregion
@@ -80,11 +87,26 @@ const writeCodexAuthFile = async (payload) => {
 	existing.last_refresh = (/* @__PURE__ */ new Date()).toISOString();
 	await writeFile(codexAuthPath, JSON.stringify(existing, null, 2), "utf8");
 };
+const writePiAuthFile = async (payload) => {
+	const { piAuthPath } = getPaths();
+	await mkdir(path.dirname(piAuthPath), { recursive: true });
+	const existing = await readExistingJson(piAuthPath);
+	existing["openai-codex"] = {
+		type: "oauth",
+		access: payload.access,
+		refresh: payload.refresh,
+		expires: payload.expires,
+		accountId: payload.accountId
+	};
+	await writeFile(piAuthPath, JSON.stringify(existing, null, 2), "utf8");
+};
 const writeAllAuthFiles = async (payload) => {
 	await writeAuthFile(payload);
+	await writePiAuthFile(payload);
 	if (payload.idToken) {
 		await writeCodexAuthFile(payload);
 		return {
+			piWritten: true,
 			codexWritten: true,
 			codexMissingIdToken: false,
 			codexCleared: false
@@ -99,6 +121,7 @@ const writeAllAuthFiles = async (payload) => {
 		codexCleared = false;
 	}
 	return {
+		piWritten: true,
 		codexWritten: false,
 		codexMissingIdToken: true,
 		codexCleared
@@ -608,6 +631,25 @@ const readCodexAuthAccount = async () => {
 		};
 	}
 };
+const readPiAuthAccount = async () => {
+	const { piAuthPath } = getPaths();
+	if (!existsSync(piAuthPath)) return {
+		exists: false,
+		accountId: null
+	};
+	try {
+		const raw = await readFile(piAuthPath, "utf8");
+		return {
+			exists: true,
+			accountId: JSON.parse(raw)["openai-codex"]?.accountId ?? null
+		};
+	} catch {
+		return {
+			exists: true,
+			accountId: null
+		};
+	}
+};
 const getAccountStatus = (accountId, isCurrent, label) => {
 	const keychainExists = keychainPayloadExists(accountId);
 	let expiresAt = null;
@@ -636,11 +678,16 @@ const getStatus = async () => {
 			accounts.push(getAccountStatus(account.accountId, i === config.current, account.label));
 		}
 	}
-	const [opencodeAuth, codexAuth] = await Promise.all([readOpenCodeAuthAccount(), readCodexAuthAccount()]);
+	const [opencodeAuth, codexAuth, piAuth] = await Promise.all([
+		readOpenCodeAuthAccount(),
+		readCodexAuthAccount(),
+		readPiAuthAccount()
+	]);
 	return {
 		accounts,
 		opencodeAuth,
-		codexAuth
+		codexAuth,
+		piAuth
 	};
 };
 
@@ -709,9 +756,11 @@ const handleSwitchAccount = async () => {
 	await saveConfig(config);
 	const displayName = selectedAccount.label ?? selectedAccount.accountId;
 	const opencodeMark = "✓";
+	const piMark = result.piWritten ? "✓" : "✗";
 	const codexMark = result.codexWritten ? "✓" : result.codexCleared ? "⚠ missing id_token (cleared)" : "⚠ missing id_token";
 	p.log.success(`Switched to account ${displayName}`);
 	p.log.message(`  OpenCode:  ${opencodeMark}`);
+	p.log.message(`  Pi Agent:  ${piMark}`);
 	p.log.message(`  Codex CLI: ${codexMark}`);
 };
 const handleAddAccount = async () => {
@@ -748,9 +797,11 @@ const handleRefreshAccount = async () => {
 		else {
 			const authResult = await writeActiveAuthFilesIfCurrent(result.accountId);
 			if (authResult) {
+				const piMark = authResult.piWritten ? "✓" : "✗";
 				const codexMark = authResult.codexWritten ? "✓" : authResult.codexCleared ? "⚠ missing id_token (cleared)" : "⚠ missing id_token";
 				p.log.message("Updated active auth files:");
 				p.log.message("  OpenCode:  ✓");
+				p.log.message(`  Pi Agent:  ${piMark}`);
 				p.log.message(`  Codex CLI: ${codexMark}`);
 			}
 		}
@@ -862,9 +913,11 @@ const handleStatus = async () => {
 	}
 	const ocStatus = status.opencodeAuth.exists ? `active: ${status.opencodeAuth.accountId ?? "unknown"}` : "not found";
 	const cxStatus = status.codexAuth.exists ? `active: ${status.codexAuth.accountId ?? "unknown"}` : "not found";
+	const piStatus = status.piAuth.exists ? `active: ${status.piAuth.accountId ?? "unknown"}` : "not found";
 	p.log.info(`Auth files:`);
 	p.log.message(`  OpenCode: ${ocStatus}`);
 	p.log.message(`  Codex CLI: ${cxStatus}`);
+	p.log.message(`  Pi Agent: ${piStatus}`);
 };
 const runInteractiveMode = async () => {
 	p.intro("cdx - OpenAI Account Switcher");
@@ -1118,9 +1171,11 @@ const switchNext = async () => {
 	await saveConfig(config);
 	const displayName = nextAccount.label ?? payload.accountId;
 	const opencodeMark = "✓";
+	const piMark = result.piWritten ? "✓" : "✗";
 	const codexMark = result.codexWritten ? "✓" : result.codexCleared ? "⚠ missing id_token (cleared)" : "⚠ missing id_token";
 	process.stdout.write(`Switched to account ${displayName}\n`);
 	process.stdout.write(`  OpenCode:  ${opencodeMark}\n`);
+	process.stdout.write(`  Pi Agent:  ${piMark}\n`);
 	process.stdout.write(`  Codex CLI: ${codexMark}\n`);
 };
 const switchToAccount = async (identifier) => {
@@ -1133,9 +1188,11 @@ const switchToAccount = async (identifier) => {
 	await saveConfig(config);
 	const displayName = account.label ?? account.accountId;
 	const opencodeMark = "✓";
+	const piMark = result.piWritten ? "✓" : "✗";
 	const codexMark = result.codexWritten ? "✓" : result.codexCleared ? "⚠ missing id_token (cleared)" : "⚠ missing id_token";
 	process.stdout.write(`Switched to account ${displayName}\n`);
 	process.stdout.write(`  OpenCode:  ${opencodeMark}\n`);
+	process.stdout.write(`  Pi Agent:  ${piMark}\n`);
 	process.stdout.write(`  Codex CLI: ${codexMark}\n`);
 };
 const interactiveMode = runInteractiveMode;
@@ -1167,9 +1224,11 @@ const createProgram = (deps = {}) => {
 				}
 				const authResult = await writeActiveAuthFilesIfCurrent(result.accountId);
 				if (authResult) {
+					const piMark = authResult.piWritten ? "✓" : "✗";
 					const codexMark = authResult.codexWritten ? "✓" : authResult.codexCleared ? "⚠ missing id_token (cleared)" : "⚠ missing id_token";
 					process.stdout.write("Updated active auth files:\n");
 					process.stdout.write("  OpenCode:  ✓\n");
+					process.stdout.write(`  Pi Agent:  ${piMark}\n`);
 					process.stdout.write(`  Codex CLI: ${codexMark}\n`);
 				}
 			} else await handleRefreshAccount();
@@ -1241,6 +1300,8 @@ const createProgram = (deps = {}) => {
 			process.stdout.write(`  OpenCode: ${ocStatus}\n`);
 			const cxStatus = status.codexAuth.exists ? `active: ${resolveLabel(status.codexAuth.accountId)}` : "not found";
 			process.stdout.write(`  Codex CLI: ${cxStatus}\n`);
+			const piStatus = status.piAuth.exists ? `active: ${resolveLabel(status.piAuth.accountId)}` : "not found";
+			process.stdout.write(`  Pi Agent: ${piStatus}\n`);
 			process.stdout.write("\n");
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error);
@@ -1320,4 +1381,4 @@ if (import.meta.main) main().catch((error) => {
 });
 
 //#endregion
-export { createProgram, createTestPaths, getPaths, interactiveMode, loadConfig, resetPaths, runInteractiveMode, saveConfig, setPaths, switchNext, switchToAccount, writeAllAuthFiles, writeAuthFile, writeCodexAuthFile };
+export { createProgram, createTestPaths, getPaths, interactiveMode, loadConfig, resetPaths, runInteractiveMode, saveConfig, setPaths, switchNext, switchToAccount, writeAllAuthFiles, writeAuthFile, writeCodexAuthFile, writePiAuthFile };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bjesuiter/codex-switcher",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "description": "CLI tool to switch between multiple OpenAI accounts for OpenCode",
   "bin": {