codex-multi-auth 0.1.0 → 0.1.2

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * OpenAI ChatGPT (Codex) OAuth Authentication Plugin for opencode
+ * OpenAI ChatGPT (Codex) OAuth Authentication Plugin for Codex CLI host runtime
  *
  * COMPLIANCE NOTICE:
  * This plugin uses OpenAI's official OAuth authentication flow (the same method
@@ -22,7 +22,7 @@
  * @repository https://github.com/ndycode/codex-multi-auth
 
  */
-import { tool } from "@opencode-ai/plugin/tool";
+import { tool } from "@codex-ai/plugin/tool";
 import { createAuthorizationFlow, exchangeAuthorizationCode, parseAuthorizationInput, redactOAuthUrlForLog, REDIRECT_URI, } from "./lib/auth/auth.js";
 import { queuedRefresh } from "./lib/refresh-queue.js";
 import { openBrowserUrl } from "./lib/auth/browser.js";
@@ -34,7 +34,7 @@ import { initLogger, logRequest, logDebug, logInfo, logWarn, logError, setCorrel
 import { checkAndNotify } from "./lib/auto-update-checker.js";
 import { handleContextOverflow } from "./lib/context-overflow.js";
 import { AccountManager, getAccountIdCandidates, extractAccountEmail, extractAccountId, formatAccountLabel, formatCooldown, formatWaitTime, sanitizeEmail, selectBestAccountCandidate, shouldUpdateAccountIdFromToken, resolveRequestAccountId, parseRateLimitReason, lookupCodexCliTokensByEmail, isCodexCliSyncEnabled, } from "./lib/accounts.js";
-import { getStoragePath, loadAccounts, saveAccounts, withAccountStorageTransaction, clearAccounts, setStoragePath, exportAccounts, importAccounts, loadFlaggedAccounts, saveFlaggedAccounts, clearFlaggedAccounts, StorageError, formatStorageErrorHint, setStorageBackupEnabled, } from "./lib/storage.js";
+import { getStoragePath, loadAccounts, saveAccounts, withAccountStorageTransaction, clearAccounts, setStoragePath, exportAccounts, importAccounts, loadFlaggedAccounts, saveFlaggedAccounts, clearFlaggedAccounts, normalizeEmailKey, StorageError, formatStorageErrorHint, setStorageBackupEnabled, } from "./lib/storage.js";
 import { createCodexHeaders, extractRequestUrl, handleErrorResponse, handleSuccessResponse, getUnsupportedCodexModelInfo, resolveUnsupportedCodexFallbackModel, refreshAndUpdateToken, rewriteUrlForCodex, shouldRefreshToken, transformRequestForCodex, } from "./lib/request/fetch-helpers.js";
 import { applyFastSessionDefaults } from "./lib/request/request-transformer.js";
 import { getRateLimitBackoff, RATE_LIMIT_SHORT_RETRY_THRESHOLD_MS, resetRateLimitBackoff, } from "./lib/request/rate-limit-backoff.js";
@@ -52,14 +52,14 @@ import { buildTableHeader, buildTableRow } from "./lib/table-formatter.js";
 import { setUiRuntimeOptions } from "./lib/ui/runtime.js";
 import { paintUiText, formatUiBadge, formatUiHeader, formatUiItem, formatUiKeyValue, formatUiSection } from "./lib/ui/format.js";
 import { getModelFamily, getCodexInstructions, MODEL_FAMILIES, prewarmCodexInstructions, } from "./lib/prompts/codex.js";
-import { prewarmOpenCodeCodexPrompt } from "./lib/prompts/opencode-codex.js";
+import { prewarmHostCodexPrompt } from "./lib/prompts/host-codex-prompt.js";
 import { createSessionRecoveryHook, isRecoverableError, detectErrorType, getRecoveryToastContent, } from "./lib/recovery.js";
 import { createHashlineEditTool, createHashlineReadTool, } from "./lib/tools/hashline-tools.js";
 import { registerCleanup } from "./lib/shutdown.js";
 /**
- * OpenAI Codex OAuth authentication plugin for opencode
+ * OpenAI Codex OAuth authentication plugin for Codex CLI host runtime
  *
- * This plugin enables opencode to use OpenAI's Codex backend via ChatGPT Plus/Pro
+ * This plugin enables the host runtime to use OpenAI's Codex backend via ChatGPT Plus/Pro
  * OAuth authentication, allowing users to leverage their ChatGPT subscription
  * instead of OpenAI Platform API credits.
  *
@@ -211,7 +211,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
         validate: (input) => {
             const parsed = parseAuthorizationInput(input);
             if (!parsed.code) {
-                return "No authorization code found. Paste the full callback URL (e.g., http://localhost:1455/auth/callback?code=...)";
+                return `No authorization code found. Paste the full callback URL (e.g., ${REDIRECT_URI}?code=...)`;
             }
             if (!parsed.state) {
                 return "Missing OAuth state. Paste the full callback URL including both code and state parameters.";
@@ -296,8 +296,9 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                 if (account.accountId) {
                     indexByAccountId.set(account.accountId, i);
                 }
-                if (account.email) {
-                    indexByEmail.set(account.email, i);
+                const emailKey = normalizeEmailKey(account.email);
+                if (emailKey) {
+                    indexByEmail.set(emailKey, i);
                 }
             }
             for (const result of results) {
@@ -343,7 +344,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                     continue;
                 const oldToken = existing.refreshToken;
                 const oldEmail = existing.email;
-                const nextEmail = accountEmail ?? existing.email;
+                const nextEmail = accountEmail ?? sanitizeEmail(existing.email);
                 const nextAccountId = accountId ?? existing.accountId;
                 const nextAccountIdSource = accountId ? accountIdSource ?? existing.accountIdSource : existing.accountIdSource;
                 const nextAccountLabel = accountLabel ?? existing.accountLabel;
@@ -365,11 +366,13 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                 if (accountId) {
                     indexByAccountId.set(accountId, existingIndex);
                 }
-                if (oldEmail && oldEmail !== nextEmail) {
-                    indexByEmail.delete(oldEmail);
+                const oldEmailKey = normalizeEmailKey(oldEmail);
+                const nextEmailKey = normalizeEmailKey(nextEmail);
+                if (oldEmailKey && oldEmailKey !== nextEmailKey) {
+                    indexByEmail.delete(oldEmailKey);
                 }
-                if (nextEmail) {
-                    indexByEmail.set(nextEmail, existingIndex);
+                if (nextEmailKey) {
+                    indexByEmail.set(nextEmailKey, existingIndex);
                 }
             }
             if (accounts.length === 0)
@@ -426,7 +429,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
             return storage;
         const skipHydrate = process.env.VITEST_WORKER_ID !== undefined ||
             process.env.NODE_ENV === "test" ||
-            process.env.OPENCODE_SKIP_EMAIL_HYDRATE === "1";
+            process.env.CODEX_SKIP_EMAIL_HYDRATE === "1";
         if (skipHydrate)
             return storage;
         const accountsCopy = storage.accounts.map((account) => account ? { ...account } : account);
@@ -710,12 +713,12 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
              * This function:
                          * 1. Validates OAuth authentication
                          * 2. Loads multi-account pool from disk (fallback to current auth)
-                         * 3. Loads user configuration from opencode.json
+                         * 3. Loads user configuration from runtime model config
                          * 4. Fetches Codex system instructions from GitHub (cached)
                          * 5. Returns SDK configuration with custom fetch implementation
              *
              * @param getAuth - Function to retrieve current auth state
-             * @param provider - Provider configuration from opencode.json
+             * @param provider - Provider configuration from runtime model config
              * @returns SDK configuration object or empty object for non-OAuth auth
              */
             async loader(getAuth, provider) {
@@ -731,7 +734,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                     return {};
                 }
                 // Prefer multi-account auth metadata when available, but still handle
-                // plain OAuth credentials (for OpenCode versions that inject internal
+                // plain OAuth credentials (for legacy runtime versions that inject internal
                 // Codex auth first and omit the multiAccount marker).
                 const authWithMulti = auth;
                 if (!authWithMulti.multiAccount) {
@@ -824,7 +827,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                         const configuredModels = Object.keys(userConfig.models ?? {});
                         prewarmCodexInstructions(configuredModels);
                         if (codexMode) {
-                            prewarmOpenCodeCodexPrompt();
+                            prewarmHostCodexPrompt();
                         }
                     }
                     const recoveryHook = sessionRecoveryEnabled
@@ -2470,7 +2473,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
         },
         tool: {
             edit: createHashlineEditTool(),
-            // OpenCode v1.2.x exposes apply_patch (not edit) to the model.
+            // Legacy runtime v1.2.x exposes apply_patch (not edit) to the model.
             // Register the same hashline-capable implementation under both names.
             apply_patch: createHashlineEditTool(),
             hashline_read: createHashlineReadTool(),