codex-multi-auth 2.17.3 → 2.18.0

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-multi-auth",
-	"version": "2.17.3",
+	"version": "2.18.0",
   "description": "Install and operate codex-multi-auth for the official @openai/codex CLI with multi-account OAuth rotation, switching, health checks, and recovery tools.",
   "interface": {
     "composerIcon": "./assets/codex-multi-auth-icon.svg"

package/README.md

@@ -5,10 +5,14 @@
 [![CI](https://github.com/ndycode/codex-multi-auth/actions/workflows/ci.yml/badge.svg)](https://github.com/ndycode/codex-multi-auth/actions/workflows/ci.yml)
 [![MIT license](https://img.shields.io/npm/l/codex-multi-auth.svg)](LICENSE)
 
+<img width="1270" height="729" alt="codex-multi-auth terminal dashboard for Codex CLI multi-account OAuth account status" src="https://github.com/user-attachments/assets/0cecb77e-a6d3-432a-ba48-3577db0c7093" />
+
 `codex-multi-auth` is a multi-account OAuth manager for the official `@openai/codex` CLI. It keeps a named pool of ChatGPT sign-ins on your machine, lets you switch the active account, and — when you run Codex through its optional wrapper — rotates accounts across live requests through a loopback-only proxy. It never installs or shadows a `codex` binary; the official OpenAI install keeps owning that command.
 
 Use it when one Codex account is not enough: you hit rate limits or quota windows, you split work across organizations and workspaces, you want per-project account pools, or you run unattended agents that need JSON diagnostics and safe repair commands instead of one opaque auth file.
 
+Using OpenCode rather than the Codex CLI? The sibling project [`oc-codex-multi-auth`](https://github.com/ndycode/oc-codex-multi-auth) is the plugin that manages the same kind of account pool there.
+
 ## What it does
 
 - **Account pool** — OAuth login for multiple ChatGPT accounts, stored locally under `~/.codex/multi-auth` (files `0600`, directories `0700`), with per-project pools under `projects/<project-key>/`.
@@ -71,7 +75,7 @@ mcodex                          # same wrapper, shorter name
 | Accounts | `login`, `list`, `status`, `switch <i>`, `unpin`, `workspace` | sign in, inspect the pool, pin or switch the active account, pick workspaces |
 | Selection | `forecast`, `best`, `why-selected`, `check`, `limits`, `models` | preview, explain, and probe which account serves the next request |
 | Runtime | `rotation status` `enable` `disable` `bind-app` `unbind-app` `reset-runtime` `reset-rate-limits` | inspect and control live rotation and the app bind |
-| Repair | `fix`, `doctor`, `verify`, `verify-flagged`, `uninstall` | diagnose and repair storage, flagged accounts, and install residue |
+| Repair | `fix`, `doctor`, `report`, `verify`, `verify-flagged`, `uninstall` | diagnose and repair storage, flagged accounts, and install residue; machine-readable health report |
 | Governance | `usage`, `budget`, `account`, `monitor`, `history`, `resets` | usage ledger, budget limits, tags/weights/pause/drain, snapshots |
 | Local clients | `bridge`, `integrations` | bearer tokens and client snippets for the loopback bridge |
 | Config | `config explain` `template`, `init-config`, `debug bundle`, `features` | effective-config report, config templates, sanitized debug bundle |
@@ -81,7 +85,7 @@ Everyday examples:
 ```bash
 codex-multi-auth switch 2                     # pin account #2
 codex-multi-auth report --live --json         # full machine-readable health report
-codex-multi-auth fix --live --model gpt-5.5   # live repair probes with a chosen model
+codex-multi-auth fix --live --model gpt-6.1-sol   # live repair probes with a chosen model
 codex-multi-auth doctor --fix                 # diagnose and apply the safest fixes
 codex-multi-auth usage --since 24h --by model # local usage ledger summary
 codex-multi-auth rotation status              # is live rotation enabled?
@@ -89,7 +93,7 @@ codex-multi-auth rotation status              # is live rotation enabled?
 
 ## Runtime rotation, in one paragraph
 
-With rotation on (the default), request-bearing wrapper commands — `exec`, `review`, `resume`, `fork`, `app`, and the bare TUI — route through a local proxy that picks the healthiest account per request, refreshes tokens as needed, and fails over across the pool on rate limits within a bounded retry budget. The proxy listens on loopback only, authenticates its own clients with a per-process token, forwards only Responses API and model-discovery calls, and never writes account emails or tokens to client headers or logs. Plain `codex` is never touched: rotation exists only inside `codex-multi-auth-codex`/`mcodex` sessions, or inside the packaged desktop app after an opt-in, reversible bind. Turn it off with `codex-multi-auth rotation disable` or `CODEX_MULTI_AUTH_RUNTIME_ROTATION_PROXY=0`.
+With rotation on (the default), request-bearing wrapper commands — `exec`, `review`, `resume`, `fork`, `app`, and the bare TUI — route through a local proxy that picks the healthiest account per request, refreshes tokens as needed, and fails over across the pool on rate limits within a bounded retry budget. The proxy listens on loopback only, authenticates its own clients with a per-process token, forwards only Responses API, model-discovery, image, and thread-goal calls, and never writes account emails or tokens to client headers or logs. Plain `codex` is never touched: rotation exists only inside `codex-multi-auth-codex`/`mcodex` sessions, or inside the packaged desktop app after an opt-in, reversible bind. Turn it off with `codex-multi-auth rotation disable` or `CODEX_MULTI_AUTH_RUNTIME_ROTATION_PROXY=0`.
 
 ## Where state lives
 
@@ -128,10 +132,12 @@ Common symptoms — wrong active account, OAuth callback port `1455` already bou
 | [docs/faq.md](docs/faq.md) | Common questions |
 | [docs/upgrade.md](docs/upgrade.md) | Version and legacy-package migration |
 | [docs/privacy.md](docs/privacy.md) | Data handling and local storage behavior |
+| [config/README.md](config/README.md) | Modern vs. legacy catalog templates |
+| [CHANGELOG.md](CHANGELOG.md) | Release history (short version) |
 
 ## Release notes
 
-- Current stable: [v2.17.3](docs/releases/v2.17.3.md) — `npm i -g codex-multi-auth`
+- Current stable: [v2.18.0](docs/releases/v2.18.0.md) — `npm i -g codex-multi-auth`
 - Earlier stable lines: [v2.6.0](docs/releases/v2.6.0.md), [v2.5.0](docs/releases/v2.5.0.md)
 - Full release archive: [docs/README.md#release-history](docs/README.md#release-history)
 

package/config/README.md

@@ -17,7 +17,7 @@ These files are optional model/provider templates for host/plugin configurations
 
 ## Defaults Included
 
-- Current documented OpenAI/Codex model families: GPT-6 Astra (`gpt-6-astra`, `gpt-6-astra-aeon`), GPT-6 Sol (`gpt-6-sol`) and GPT-6 Luna (`gpt-6-luna`), then `gpt-5.6-sol`/`terra`/`luna`, `gpt-5.5` and `gpt-5.5-pro`. Retired models (`gpt-5.4*`, `gpt-5.3-codex` and older) were removed; their ids still resolve to a replacement, see `docs/configuration.md`
+- Current documented OpenAI/Codex model families: GPT-6.1 Sol (`gpt-6.1-sol`, the default), GPT-6 Astra (`gpt-6-astra`), GPT-6 Sol (`gpt-6-sol`) and GPT-6 Luna (`gpt-6-luna`), then `gpt-5.6-sol`/`terra`/`luna`. Retired models (`gpt-5.5`/`gpt-5.5-pro`, `gpt-5.4*`, `gpt-5.3-codex` and older, plus the leaked `gpt-6-astra-aeon` slug) were removed from the picker; their ids still resolve to a replacement, see `docs/configuration.md`
 - The GPT-6 entries carry `limit.context: 272000`, the `context_window` in the upstream Codex catalog. The GPT-5.6 entries still carry the pre-cut `372000` and were left alone here; change them only alongside a deliberate review, since the value feeds a picker rather than the context budget guard (which refuses to estimate either family)
 - The Daybreak cyber models resolve at the code level but are deliberately absent from these templates, matching their hidden visibility in the upstream Codex picker
 - `store: false`

package/config/codex-legacy.json

@@ -165,8 +165,8 @@
             "store": false
           }
         },
-        "gpt-6-astra-aeon-low": {
-          "name": "GPT 6 Astra Aeon Low (OAuth)",
+        "gpt-6.1-sol-low": {
+          "name": "GPT 6.1 Sol Low (OAuth)",
           "limit": {
             "context": 272000,
             "output": 128000
@@ -190,8 +190,8 @@
             "store": false
           }
         },
-        "gpt-6-astra-aeon-medium": {
-          "name": "GPT 6 Astra Aeon Medium (OAuth)",
+        "gpt-6.1-sol-medium": {
+          "name": "GPT 6.1 Sol Medium (OAuth)",
           "limit": {
             "context": 272000,
             "output": 128000
@@ -215,8 +215,8 @@
             "store": false
           }
         },
-        "gpt-6-astra-aeon-high": {
-          "name": "GPT 6 Astra Aeon High (OAuth)",
+        "gpt-6.1-sol-high": {
+          "name": "GPT 6.1 Sol High (OAuth)",
           "limit": {
             "context": 272000,
             "output": 128000
@@ -240,8 +240,8 @@
             "store": false
           }
         },
-        "gpt-6-astra-aeon-xhigh": {
-          "name": "GPT 6 Astra Aeon Extra High (OAuth)",
+        "gpt-6.1-sol-xhigh": {
+          "name": "GPT 6.1 Sol Xhigh (OAuth)",
           "limit": {
             "context": 272000,
             "output": 128000
@@ -265,8 +265,8 @@
             "store": false
           }
         },
-        "gpt-6-astra-aeon-max": {
-          "name": "GPT 6 Astra Aeon Max (OAuth)",
+        "gpt-6.1-sol-max": {
+          "name": "GPT 6.1 Sol Max (OAuth)",
           "limit": {
             "context": 272000,
             "output": 128000
@@ -290,8 +290,8 @@
             "store": false
           }
         },
-        "gpt-6-astra-aeon-ultra": {
-          "name": "GPT 6 Astra Aeon Ultra (OAuth)",
+        "gpt-6.1-sol-ultra": {
+          "name": "GPT 6.1 Sol Ultra (OAuth)",
           "limit": {
             "context": 272000,
             "output": 128000
@@ -1014,206 +1014,6 @@
             ],
             "store": false
           }
-        },
-        "gpt-5.5-none": {
-          "name": "GPT 5.5 None (OAuth)",
-          "limit": {
-            "context": 272000,
-            "output": 128000
-          },
-          "modalities": {
-            "input": [
-              "text",
-              "image"
-            ],
-            "output": [
-              "text"
-            ]
-          },
-          "options": {
-            "reasoningEffort": "none",
-            "reasoningSummary": "auto",
-            "textVerbosity": "medium",
-            "include": [
-              "reasoning.encrypted_content"
-            ],
-            "store": false
-          }
-        },
-        "gpt-5.5-low": {
-          "name": "GPT 5.5 Low (OAuth)",
-          "limit": {
-            "context": 272000,
-            "output": 128000
-          },
-          "modalities": {
-            "input": [
-              "text",
-              "image"
-            ],
-            "output": [
-              "text"
-            ]
-          },
-          "options": {
-            "reasoningEffort": "low",
-            "reasoningSummary": "auto",
-            "textVerbosity": "medium",
-            "include": [
-              "reasoning.encrypted_content"
-            ],
-            "store": false
-          }
-        },
-        "gpt-5.5-medium": {
-          "name": "GPT 5.5 Medium (OAuth)",
-          "limit": {
-            "context": 272000,
-            "output": 128000
-          },
-          "modalities": {
-            "input": [
-              "text",
-              "image"
-            ],
-            "output": [
-              "text"
-            ]
-          },
-          "options": {
-            "reasoningEffort": "medium",
-            "reasoningSummary": "auto",
-            "textVerbosity": "medium",
-            "include": [
-              "reasoning.encrypted_content"
-            ],
-            "store": false
-          }
-        },
-        "gpt-5.5-high": {
-          "name": "GPT 5.5 High (OAuth)",
-          "limit": {
-            "context": 272000,
-            "output": 128000
-          },
-          "modalities": {
-            "input": [
-              "text",
-              "image"
-            ],
-            "output": [
-              "text"
-            ]
-          },
-          "options": {
-            "reasoningEffort": "high",
-            "reasoningSummary": "detailed",
-            "textVerbosity": "medium",
-            "include": [
-              "reasoning.encrypted_content"
-            ],
-            "store": false
-          }
-        },
-        "gpt-5.5-xhigh": {
-          "name": "GPT 5.5 Extra High (OAuth)",
-          "limit": {
-            "context": 272000,
-            "output": 128000
-          },
-          "modalities": {
-            "input": [
-              "text",
-              "image"
-            ],
-            "output": [
-              "text"
-            ]
-          },
-          "options": {
-            "reasoningEffort": "xhigh",
-            "reasoningSummary": "detailed",
-            "textVerbosity": "medium",
-            "include": [
-              "reasoning.encrypted_content"
-            ],
-            "store": false
-          }
-        },
-        "gpt-5.5-pro-medium": {
-          "name": "GPT 5.5 Pro Medium (OAuth)",
-          "limit": {
-            "context": 272000,
-            "output": 128000
-          },
-          "modalities": {
-            "input": [
-              "text",
-              "image"
-            ],
-            "output": [
-              "text"
-            ]
-          },
-          "options": {
-            "reasoningEffort": "medium",
-            "reasoningSummary": "detailed",
-            "textVerbosity": "medium",
-            "include": [
-              "reasoning.encrypted_content"
-            ],
-            "store": false
-          }
-        },
-        "gpt-5.5-pro-high": {
-          "name": "GPT 5.5 Pro High (OAuth)",
-          "limit": {
-            "context": 272000,
-            "output": 128000
-          },
-          "modalities": {
-            "input": [
-              "text",
-              "image"
-            ],
-            "output": [
-              "text"
-            ]
-          },
-          "options": {
-            "reasoningEffort": "high",
-            "reasoningSummary": "detailed",
-            "textVerbosity": "medium",
-            "include": [
-              "reasoning.encrypted_content"
-            ],
-            "store": false
-          }
-        },
-        "gpt-5.5-pro-xhigh": {
-          "name": "GPT 5.5 Pro Extra High (OAuth)",
-          "limit": {
-            "context": 272000,
-            "output": 128000
-          },
-          "modalities": {
-            "input": [
-              "text",
-              "image"
-            ],
-            "output": [
-              "text"
-            ]
-          },
-          "options": {
-            "reasoningEffort": "xhigh",
-            "reasoningSummary": "detailed",
-            "textVerbosity": "medium",
-            "include": [
-              "reasoning.encrypted_content"
-            ],
-            "store": false
-          }
         }
       }
     }

package/config/codex-modern.json

@@ -15,8 +15,8 @@
         "store": false
       },
       "models": {
-        "gpt-6-astra": {
-          "name": "GPT 6 Astra (OAuth)",
+        "gpt-6.1-sol": {
+          "name": "GPT 6.1 Sol (OAuth)",
           "limit": {
             "context": 272000,
             "output": 128000
@@ -63,8 +63,8 @@
             }
           }
         },
-        "gpt-6-astra-aeon": {
-          "name": "GPT 6 Astra Aeon (OAuth)",
+        "gpt-6-astra": {
+          "name": "GPT 6 Astra (OAuth)",
           "limit": {
             "context": 272000,
             "output": 128000
@@ -340,82 +340,6 @@
               "textVerbosity": "medium"
             }
           }
-        },
-        "gpt-5.5": {
-          "name": "GPT 5.5 (OAuth)",
-          "limit": {
-            "context": 272000,
-            "output": 128000
-          },
-          "modalities": {
-            "input": [
-              "text",
-              "image"
-            ],
-            "output": [
-              "text"
-            ]
-          },
-          "variants": {
-            "none": {
-              "reasoningEffort": "none",
-              "reasoningSummary": "auto",
-              "textVerbosity": "medium"
-            },
-            "low": {
-              "reasoningEffort": "low",
-              "reasoningSummary": "auto",
-              "textVerbosity": "medium"
-            },
-            "medium": {
-              "reasoningEffort": "medium",
-              "reasoningSummary": "auto",
-              "textVerbosity": "medium"
-            },
-            "high": {
-              "reasoningEffort": "high",
-              "reasoningSummary": "detailed",
-              "textVerbosity": "medium"
-            },
-            "xhigh": {
-              "reasoningEffort": "xhigh",
-              "reasoningSummary": "detailed",
-              "textVerbosity": "medium"
-            }
-          }
-        },
-        "gpt-5.5-pro": {
-          "name": "GPT 5.5 Pro (OAuth)",
-          "limit": {
-            "context": 272000,
-            "output": 128000
-          },
-          "modalities": {
-            "input": [
-              "text",
-              "image"
-            ],
-            "output": [
-              "text"
-            ]
-          },
-          "variants": {
-            "medium": {
-              "reasoningEffort": "medium",
-              "reasoningSummary": "detailed",
-              "textVerbosity": "medium"
-            },
-            "high": {
-              "reasoningEffort": "high",
-              "reasoningSummary": "detailed",
-              "textVerbosity": "medium"
-            },
-            "xhigh": {
-              "reasoningEffort": "xhigh",
-              "reasoningSummary": "detailed",
-              "textVerbosity": "medium"
-            }
-          }
         }
       }
     }

package/config/minimal-codex.json

@@ -9,7 +9,7 @@
       }
     }
   },
-  "model": "openai/gpt-5.3-codex"
+  "model": "openai/gpt-5.6-sol"
 }
 
 

package/dist/lib/context-budget/model-context-windows.d.ts

@@ -6,7 +6,7 @@
  * behavior (see the v2.5.0 release notes) closely enough to launch that no
  * estimate here has been reviewed for it yet.
  */
-export declare const UNESTIMATED_ROUTABLE_MODELS: readonly ["gpt-5.6-sol", "gpt-5.6-terra", "gpt-5.6-luna", "gpt-6-astra", "gpt-6-astra-aeon", "gpt-6-sol", "gpt-6-luna", "gpt-daybreak-blue-latest", "gpt-daybreak-red-latest"];
+export declare const UNESTIMATED_ROUTABLE_MODELS: readonly ["gpt-5.6-sol", "gpt-5.6-terra", "gpt-5.6-luna", "gpt-6-astra", "gpt-6-sol", "gpt-6-luna", "gpt-6.1-sol", "gpt-daybreak-blue-latest", "gpt-daybreak-red-latest"];
 export interface EffectiveContextWindow {
     tokens: number;
     source: "override" | "estimate";

package/dist/lib/context-budget/model-context-windows.js

@@ -23,14 +23,11 @@ import { getNormalizedModel } from "../request/helpers/model-map.js";
  * it to UNESTIMATED_ROUTABLE_MODELS instead.
  */
 //
-// Retired models (`gpt-5.1` through `gpt-5.4-*`, `gpt-5-mini`/`nano`, the codex
-// models) are deliberately absent. Their ids now route to a replacement, and
-// estimating the window from the retired name would evaluate a request against
-// a model it no longer runs on.
-const ESTIMATED_MODEL_CONTEXT_WINDOWS = {
-    "gpt-5.5": 260_000,
-    "gpt-5.5-pro": 260_000,
-};
+// Retired models (`gpt-5.1` through `gpt-5.5-pro`, `gpt-5-mini`/`nano`, the
+// codex models) are deliberately absent. Their ids now route to a
+// replacement, and estimating the window from the retired name would
+// evaluate a request against a model it no longer runs on.
+const ESTIMATED_MODEL_CONTEXT_WINDOWS = {};
 /**
  * Routable models this guard consciously does not estimate a window for.
  * `getEffectiveContextWindow` returns `null` for these absent an override,
@@ -52,11 +49,11 @@ export const UNESTIMATED_ROUTABLE_MODELS = [
     // measured ceiling for this transport, so it stays unestimated too. Set
     // `contextBudgetGuardModelWindowOverrides` once you know your real ceiling.
     "gpt-6-astra",
-    "gpt-6-astra-aeon",
-    // Sol and Luna carry the same 272K Codex / 872K max split in the upstream
-    // catalog as Astra, so the same reasoning keeps them unestimated.
+    // Sol, Luna and 6.1 Sol carry the same 272K Codex / 872K max split in the
+    // upstream catalog as Astra, so the same reasoning keeps them unestimated.
     "gpt-6-sol",
     "gpt-6-luna",
+    "gpt-6.1-sol",
     "gpt-daybreak-blue-latest",
     "gpt-daybreak-red-latest",
 ];
@@ -79,8 +76,8 @@ function normalizeModelName(model) {
  * the way they type the model still wins, then the catalog's canonical id for
  * it. `getNormalizedModel` is deliberately the exact/alias-only resolver —
  * `resolveNormalizedModel` falls back to `DEFAULT_MODEL` for anything it does
- * not recognize, which would hand an unknown model gpt-5.5's window and
- * evaluate a real session against a fabricated number.
+ * not recognize, which would hand an unknown model the default model's
+ * window and evaluate a real session against a fabricated number.
  */
 function windowLookupCandidates(model) {
     const raw = normalizeModelName(model);

package/dist/lib/oc-chatgpt-target-detection.d.ts

@@ -35,7 +35,8 @@ export type OcChatgptTargetDetectionResult = OcChatgptTargetFound | OcChatgptTar
 /**
  * Detects the oc-chatgpt multi-auth storage target by evaluating explicit, canonical, and per-project candidate roots.
  *
- * Examines an explicit override (OC_CHATGPT_MULTI_AUTH_DIR or options.explicitRoot), the canonical user store (~/.opencode),
+ * Examines an explicit override (OC_CODEX_MULTI_AUTH_DIR, the legacy OC_CHATGPT_MULTI_AUTH_DIR alias, or
+ * options.explicitRoot), the canonical user store (~/.opencode),
  * and a per-project storage location (derived from options.projectRoot or the current working directory). For each candidate
  * it checks for account artifacts and storage signals and returns a single resolved target, an ambiguity listing multiple
  * matching candidates, or a "none" result with the attempted candidates. This function performs synchronous filesystem checks
@@ -45,7 +46,7 @@ export type OcChatgptTargetDetectionResult = OcChatgptTargetFound | OcChatgptTar
  *
  * @param options - Optional overrides:
  *   - explicitRoot: absolute path to force as the candidate root (use `null` to explicitly disable); if omitted the
- *     OC_CHATGPT_MULTI_AUTH_DIR environment variable is considered.
+ *     OC_CODEX_MULTI_AUTH_DIR environment variable is considered, then the legacy OC_CHATGPT_MULTI_AUTH_DIR alias.
  *   - projectRoot: explicit project root to derive per-project storage; if omitted the current working directory is used to
  *     discover the project root.
  * @returns An OcChatgptTargetDetectionResult describing either a resolved `target` (with `descriptor` and a `resolution`

package/dist/lib/oc-chatgpt-target-detection.js

@@ -2,7 +2,14 @@ import { existsSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, normalize, relative, resolve, sep, win32 } from "node:path";
 import { findProjectRoot, getProjectStorageKey, resolveProjectStorageIdentityRoot, } from "./storage/paths.js";
-const ACCOUNT_FILE_NAME = "openai-codex-accounts.json";
+// The sibling plugin renamed its account file from `openai-codex-accounts.json`
+// (oc-chatgpt-multi-auth era) to `oc-codex-multi-auth-accounts.json`; both are
+// detected, preferring the current name when a root holds both.
+const ACCOUNT_FILE_NAMES = [
+    "oc-codex-multi-auth-accounts.json",
+    "openai-codex-accounts.json",
+];
+const ACCOUNT_FILE_NAME = ACCOUNT_FILE_NAMES[0];
 const BACKUPS_DIR_NAME = "backups";
 const PROJECTS_DIR_NAME = "projects";
 const CANONICAL_HOME_BASENAME = ".opencode";
@@ -107,17 +114,32 @@ function deduplicatePaths(paths) {
     }
     return result;
 }
+/**
+ * Returns the path of the primary account file under `root`, preferring the
+ * current `oc-codex-multi-auth-accounts.json` name over the legacy
+ * `openai-codex-accounts.json` name when both exist, or `null` when neither
+ * file (nor its `.wal` sidecar) is present.
+ */
+function findPrimaryAccountPath(root) {
+    for (const name of ACCOUNT_FILE_NAMES) {
+        const accountPath = join(root, name);
+        if (existsSync(accountPath) || existsSync(`${accountPath}.wal`)) {
+            return accountPath;
+        }
+    }
+    return null;
+}
 /**
  * Detects whether an account file or rotated account artifacts exist under the specified storage root.
  *
- * Scans for the canonical account file and its WAL variant, rotated/archived files matching the account filename pattern (excluding `.tmp`, `.wal`, and names containing `.rotate.`), and the backups directory. The probe is tolerant of unreadable directories (errors are ignored) and does not read file contents. Callers should be aware of concurrent filesystem changes — a `false` result does not guarantee no artifact will appear shortly after. On Windows, filesystem matching should be considered case-insensitive by callers. This check does not expose or parse any token contents.
+ * Scans for an account file under either known name (`oc-codex-multi-auth-accounts.json` or the legacy `openai-codex-accounts.json`) and its WAL variant, rotated/archived files matching either account filename pattern (excluding `.tmp`, `.wal`, and names containing `.rotate.`), and the backups directory. The probe is tolerant of unreadable directories (errors are ignored) and does not read file contents. Callers should be aware of concurrent filesystem changes — a `false` result does not guarantee no artifact will appear shortly after. On Windows, filesystem matching should be considered case-insensitive by callers. This check does not expose or parse any token contents.
  *
  * @param root - Filesystem path of the storage root to probe
+ * @param primaryAccountPath - Result of `findPrimaryAccountPath(root)`, so callers resolve the descriptor path once
  * @returns `true` if any account file or rotated account artifact exists under `root` or its backups directory, `false` otherwise.
  */
-function hasAccountArtifacts(root) {
-    const accountPath = join(root, ACCOUNT_FILE_NAME);
-    if (existsSync(accountPath) || existsSync(`${accountPath}.wal`)) {
+function hasAccountArtifacts(root, primaryAccountPath) {
+    if (primaryAccountPath !== null) {
         return true;
     }
     const hasRotated = (dir) => {
@@ -126,7 +148,7 @@ function hasAccountArtifacts(root) {
             for (const entry of entries) {
                 if (!entry.isFile())
                     continue;
-                if (!entry.name.startsWith(`${ACCOUNT_FILE_NAME}.`))
+                if (!ACCOUNT_FILE_NAMES.some((name) => entry.name.startsWith(`${name}.`)))
                     continue;
                 if (entry.name.endsWith(".tmp"))
                     continue;
@@ -146,7 +168,7 @@ function hasAccountArtifacts(root) {
         return true;
     }
     const backupsDir = join(root, BACKUPS_DIR_NAME);
-    if (existsSync(join(backupsDir, ACCOUNT_FILE_NAME))) {
+    if (ACCOUNT_FILE_NAMES.some((name) => existsSync(join(backupsDir, name)))) {
         return true;
     }
     if (hasRotated(backupsDir)) {
@@ -191,7 +213,8 @@ function inferScopeFromRoot(root, canonicalRoot) {
 /**
  * Detects the oc-chatgpt multi-auth storage target by evaluating explicit, canonical, and per-project candidate roots.
  *
- * Examines an explicit override (OC_CHATGPT_MULTI_AUTH_DIR or options.explicitRoot), the canonical user store (~/.opencode),
+ * Examines an explicit override (OC_CODEX_MULTI_AUTH_DIR, the legacy OC_CHATGPT_MULTI_AUTH_DIR alias, or
+ * options.explicitRoot), the canonical user store (~/.opencode),
  * and a per-project storage location (derived from options.projectRoot or the current working directory). For each candidate
  * it checks for account artifacts and storage signals and returns a single resolved target, an ambiguity listing multiple
  * matching candidates, or a "none" result with the attempted candidates. This function performs synchronous filesystem checks
@@ -201,14 +224,17 @@ function inferScopeFromRoot(root, canonicalRoot) {
  *
  * @param options - Optional overrides:
  *   - explicitRoot: absolute path to force as the candidate root (use `null` to explicitly disable); if omitted the
- *     OC_CHATGPT_MULTI_AUTH_DIR environment variable is considered.
+ *     OC_CODEX_MULTI_AUTH_DIR environment variable is considered, then the legacy OC_CHATGPT_MULTI_AUTH_DIR alias.
  *   - projectRoot: explicit project root to derive per-project storage; if omitted the current working directory is used to
  *     discover the project root.
  * @returns An OcChatgptTargetDetectionResult describing either a resolved `target` (with `descriptor` and a `resolution`
  *   of `"accounts"` or `"signals"`), an `ambiguous` outcome listing conflicting candidates, or `none` with the tried candidates.
  */
 export function detectOcChatgptMultiAuthTarget(options) {
-    const explicitFromEnv = (process.env.OC_CHATGPT_MULTI_AUTH_DIR ?? "").trim();
+    const explicitFromEnv = (firstNonEmpty([
+        process.env.OC_CODEX_MULTI_AUTH_DIR,
+        process.env.OC_CHATGPT_MULTI_AUTH_DIR,
+    ]) ?? "").trim();
     const hasExplicitRootOption = options !== undefined && "explicitRoot" in options;
     const explicitRoot = (hasExplicitRootOption ? (options.explicitRoot ?? "") : explicitFromEnv).trim();
     const userHome = getResolvedUserHomeDir();
@@ -233,9 +259,10 @@ export function detectOcChatgptMultiAuthTarget(options) {
             : inferredScope === "project"
                 ? "project"
                 : "default-global";
-        const accountPath = join(root, ACCOUNT_FILE_NAME);
+        const primaryAccountPath = findPrimaryAccountPath(root);
+        const accountPath = primaryAccountPath ?? join(root, ACCOUNT_FILE_NAME);
         const backupRoot = join(root, BACKUPS_DIR_NAME);
-        const hasAccountArtifactsFlag = hasAccountArtifacts(root);
+        const hasAccountArtifactsFlag = hasAccountArtifacts(root, primaryAccountPath);
         return {
             scope: inferredScope,
             source,
@@ -314,7 +341,7 @@ export function detectOcChatgptMultiAuthTarget(options) {
     }
     return {
         kind: "none",
-        reason: "No oc-chatgpt-multi-auth target root found; create ~/.opencode or supply OC_CHATGPT_MULTI_AUTH_DIR.",
+        reason: "No oc-chatgpt-multi-auth target root found; create ~/.opencode or supply OC_CODEX_MULTI_AUTH_DIR (legacy OC_CHATGPT_MULTI_AUTH_DIR is still accepted).",
         tried: candidates.map(({ scope, source, root, accountPath, backupRoot }) => ({
             scope,
             source,