oc-codex-multi-auth 6.22.0 → 6.24.0

package/dist/index.d.ts

@@ -41,5 +41,11 @@ import type { Plugin } from "@opencode-ai/plugin";
  */
 export declare const OpenAIOAuthPlugin: Plugin;
 export declare const OpenAIAuthPlugin: Plugin;
-export default OpenAIOAuthPlugin;
+declare const _default: {
+    id: string;
+    server: Plugin;
+    /** V2 loads the same package through setup instead of the V1 server hook. */
+    setup(context: import("@opencode/plugin").Plugin.Context): Promise<() => Promise<void>>;
+};
+export default _default;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAYH,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,qBAAqB,CAAC;AAqV/D;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,iBAAiB,EAAE,MAiqJ/B,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAoB,CAAC;AAElD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAYH,OAAO,KAAK,EAAE,MAAM,EAAsB,MAAM,qBAAqB,CAAC;AAsVtE;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,iBAAiB,EAAE,MAA2E,CAAC;AA+qJ5G,eAAO,MAAM,gBAAgB,QAAoB,CAAC;;;;IAKjD,6EAA6E;mBACxD,OAAO,kBAAkB,EAAE,MAAM,CAAC,OAAO;;AAJ/D,wBAQE"}

package/dist/index.js

@@ -40,7 +40,7 @@ import { applyAccountSelectionFallbacks, persistResolvedAccountSelection, persis
 import { coordinateFlaggedPersistedRefresh, coordinatePersistedRefresh, } from "./lib/storage/coordinated-refresh.js";
 import { promptAddAnotherAccount, promptLoginMode } from "./lib/cli.js";
 import { getCodexMode, getRequestTransformMode, getFastSession, getFastSessionStrategy, getFastSessionMaxInputItems, getRetryProfile, getRetryBudgetOverrides, getRateLimitToastDebounceMs, getRetryAllAccountsMaxRetries, getRetryAllAccountsMaxWaitMs, getRetryAllAccountsRateLimited, getFallbackToGpt52OnUnsupportedGpt53, getUnsupportedCodexPolicy, getUnsupportedCodexFallbackChain, getTokenRefreshSkewMs, getSessionRecovery, getAutoResume, getAutoUpdate, getToastDurationMs, getAccountToastsEnabled, getPerProjectAccounts, getEmptyResponseMaxRetries, getEmptyResponseRetryDelayMs, getPidOffsetEnabled, getRotationStrategy, getModelAccountPool, getModelAccountPoolMode, getFetchTimeoutMs, getStreamStallTimeoutMs, getCodexTuiV2, getCodexTuiColorProfile, getCodexTuiGlyphMode, getBeginnerSafeMode, getCodexTuiMaskEmail, getQuotaDisplay, loadPluginConfig, } from "./lib/config.js";
-import { AUTH_LABELS, CODEX_BASE_URL, DUMMY_API_KEY, LOG_STAGES, PLUGIN_NAME, PROVIDER_ID, ACCOUNT_LIMITS, } from "./lib/constants.js";
+import { AUTH_LABELS, CODEX_BASE_URL, DUMMY_API_KEY, LOG_STAGES, PLUGIN_NAME, PROVIDER_ID, ACCOUNT_LIMITS, MAX_QUOTA_FALLBACK_SWITCHES, } from "./lib/constants.js";
 import { initLogger, logRequest, logDebug, logInfo, logWarn, logError, setCorrelationId, clearCorrelationId, } from "./lib/logger.js";
 import { createQuotaMonitor } from "./lib/quota-notifications.js";
 import { checkAndNotify } from "./lib/auto-update-checker.js";
@@ -179,8 +179,16 @@ function resolveOpenAIBaseURL() {
  * }
  * ```
  */
-export const OpenAIOAuthPlugin = async ({ client }) => {
-    initLogger(client);
+export const OpenAIOAuthPlugin = async ({ client }) => createPluginRuntime({ client });
+/**
+ * Shared request/account runtime; V2 has no V1 client or host auth.json.
+ *
+ * Not exported: V1 hosts call every function this module exports as a plugin,
+ * so an exported factory would boot a second runtime beside the real one. The
+ * V2 entry receives it through `setup` instead.
+ */
+async function createPluginRuntime({ client, directory = process.cwd() }) {
+    initLogger(client ?? {});
     let customBaseURLWarningShown = false;
     let customBaseURLErrorShown = false;
     let cachedAccountManager = null;
@@ -456,7 +464,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
     };
     const showToast = async (message, variant = "success", options) => {
         try {
-            await client.tui.showToast({
+            await client?.tui.showToast({
                 body: {
                     message,
                     variant,
@@ -1478,6 +1486,8 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
             if (event.type === "server.instance.disposed") {
                 quotaMonitor.dispose();
                 disposeAccountsWatcher();
+                await cachedAccountManager?.flushPendingSave();
+                cachedAccountManager?.disposeShutdownHandler();
                 return;
             }
             // Handle TUI account selection events
@@ -1585,8 +1595,9 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
     };
     const startupPluginConfig = loadPluginConfig();
     const startupPerProjectAccounts = getPerProjectAccounts(startupPluginConfig);
-    setStoragePath(startupPerProjectAccounts ? process.cwd() : null);
-    await backfillHostOpenAIAuthFromPool();
+    setStoragePath(startupPerProjectAccounts ? directory : null);
+    if (client)
+        await backfillHostOpenAIAuthFromPool();
     quotaMonitor.start();
     return {
         event: eventHandler,
@@ -1635,7 +1646,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                 let perProjectAccounts = getPerProjectAccounts(pluginConfig);
                 let storageTransition;
                 const activeFetches = new Set();
-                setStoragePath(perProjectAccounts ? process.cwd() : null);
+                setStoragePath(perProjectAccounts ? directory : null);
                 const authFallback = auth.type === "oauth" ? auth : undefined;
                 // Prefer multi-account auth metadata when available, but still handle
                 // plain OAuth credentials (for OpenCode versions that inject internal
@@ -1744,8 +1755,8 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                             prewarmOpenCodeCodexPrompt();
                         }
                     }
-                    const recoveryHook = sessionRecoveryEnabled
-                        ? createSessionRecoveryHook({ client, directory: process.cwd() }, { sessionRecovery: true, autoResume: autoResumeEnabled })
+                    const recoveryHook = sessionRecoveryEnabled && client
+                        ? createSessionRecoveryHook({ client, directory }, { sessionRecovery: true, autoResume: autoResumeEnabled })
                         : null;
                     const pluginOrigin = getPluginOrigin();
                     if (pluginOrigin && !startupOriginRecorded) {
@@ -1800,7 +1811,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                         await Promise.all(activeFetches);
                                         // Drain the old pool's pending write before changing the global path.
                                         await cachedAccountManager?.flushPendingSave();
-                                        setStoragePath(currentPerProjectAccounts ? process.cwd() : null);
+                                        setStoragePath(currentPerProjectAccounts ? directory : null);
                                         invalidateAccountManagerCache();
                                         perProjectAccounts = currentPerProjectAccounts;
                                     })().finally(() => { storageTransition = undefined; });
@@ -2148,9 +2159,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                     }
                                 };
                                 // A degraded model must not degrade again without bound, even if a
-                                // custom chain is cyclic. The attempted set already prevents
-                                // revisiting a model; this caps the total hops per request.
-                                const MAX_QUOTA_FALLBACK_SWITCHES = 3;
+                                // custom chain is cyclic. See MAX_QUOTA_FALLBACK_SWITCHES.
                                 let quotaFallbackSwitches = 0;
                                 while (true) {
                                     if (cachedAccountManager && cachedAccountManager !== accountManager) {
@@ -3129,7 +3138,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                         const authPluginConfig = loadPluginConfig();
                         applyUiRuntimeFromConfig(authPluginConfig);
                         const authPerProjectAccounts = getPerProjectAccounts(authPluginConfig);
-                        setStoragePath(authPerProjectAccounts ? process.cwd() : null);
+                        setStoragePath(authPerProjectAccounts ? directory : null);
                         const accounts = [];
                         // Programmatic input, not a menu choice: a headless caller or
                         // script passes it to say "never launch a browser". Ignoring it
@@ -3888,7 +3897,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                         const manualBrowserPluginConfig = loadPluginConfig();
                         applyUiRuntimeFromConfig(manualBrowserPluginConfig);
                         const manualBrowserPerProjectAccounts = getPerProjectAccounts(manualBrowserPluginConfig);
-                        setStoragePath(manualBrowserPerProjectAccounts ? process.cwd() : null);
+                        setStoragePath(manualBrowserPerProjectAccounts ? directory : null);
                         const session = await startLoopbackFlow({ openBrowser: false });
                         if (session.type === "unavailable") {
                             const message = unavailableMessage(session.lifecycle);
@@ -3936,7 +3945,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                         const devicePluginConfig = loadPluginConfig();
                         applyUiRuntimeFromConfig(devicePluginConfig);
                         const devicePerProjectAccounts = getPerProjectAccounts(devicePluginConfig);
-                        setStoragePath(devicePerProjectAccounts ? process.cwd() : null);
+                        setStoragePath(devicePerProjectAccounts ? directory : null);
                         const started = await createDeviceCodeSession();
                         if (started.type === "failed") {
                             return {
@@ -3974,7 +3983,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                         const manualPluginConfig = loadPluginConfig();
                         applyUiRuntimeFromConfig(manualPluginConfig);
                         const manualPerProjectAccounts = getPerProjectAccounts(manualPluginConfig);
-                        setStoragePath(manualPerProjectAccounts ? process.cwd() : null);
+                        setStoragePath(manualPerProjectAccounts ? directory : null);
                         const { pkce, state, url } = await createAuthorizationFlow();
                         return buildManualOAuthFlow(pkce, url, state, false);
                     },
@@ -3983,7 +3992,16 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
         },
         tool: createToolRegistry(ctx),
     };
-};
+}
+;
 export const OpenAIAuthPlugin = OpenAIOAuthPlugin;
-export default OpenAIOAuthPlugin;
+export default {
+    id: "oc-codex-multi-auth",
+    server: OpenAIOAuthPlugin,
+    /** V2 loads the same package through setup instead of the V1 server hook. */
+    async setup(context) {
+        const { setupV2 } = await import("./lib/opencode-v2.js");
+        return setupV2(context, createPluginRuntime);
+    },
+};
 //# sourceMappingURL=index.js.map