From 862f34ade729be743bde74393130bbdea83256cb Mon Sep 17 00:00:00 2001
From: AJ <yspdev@gmail.com>
Date: Wed, 21 Jan 2026 21:22:45 -0800
Subject: [PATCH] fix: read account_id from Codex CLI auth for workspace
 billing

---
 src/agents/cli-credentials.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/agents/cli-credentials.ts b/src/agents/cli-credentials.ts
index f224e0238..5ca5629ff 100644
--- a/src/agents/cli-credentials.ts
+++ b/src/agents/cli-credentials.ts
@@ -55,6 +55,7 @@ export type CodexCliCredential = {
   access: string;
   refresh: string;
   expires: number;
+  accountId?: string;
 };
 
 export type QwenCliCredential = {
@@ -143,6 +144,7 @@ function readCodexKeychainCredentials(options?: {
     const expires = Number.isFinite(lastRefresh)
       ? lastRefresh + 60 * 60 * 1000
       : Date.now() + 60 * 60 * 1000;
+    const accountId = typeof tokens?.account_id === "string" ? tokens.account_id : undefined;
 
     log.info("read codex credentials from keychain", {
       source: "keychain",
@@ -155,6 +157,7 @@ function readCodexKeychainCredentials(options?: {
       access: accessToken,
       refresh: refreshToken,
       expires,
+      accountId,
     };
   } catch {
     return null;
@@ -443,6 +446,7 @@ export function readCodexCliCredentials(options?: {
     access: accessToken,
     refresh: refreshToken,
     expires,
+    accountId: typeof tokens.account_id === "string" ? tokens.account_id : undefined,
   };
 }