opencode-openai-codex-multi-auth 4.4.1 → 4.4.6

package/dist/lib/storage.js

@@ -2,37 +2,240 @@ import { existsSync } from "node:fs";
 import { promises as fs } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-const STORAGE_DIR = join(homedir(), ".opencode");
 const STORAGE_FILE = "openai-codex-accounts.json";
+const AUTH_DEBUG_ENABLED = process.env.OPENCODE_OPENAI_AUTH_DEBUG === "1";
+function debug(...args) {
+    if (!AUTH_DEBUG_ENABLED)
+        return;
+    console.debug(...args);
+}
+function getOpencodeConfigDir() {
+    const xdgConfigHome = process.env.XDG_CONFIG_HOME;
+    if (xdgConfigHome && xdgConfigHome.trim()) {
+        return join(xdgConfigHome, "opencode");
+    }
+    return join(homedir(), ".config", "opencode");
+}
+function getLegacyOpencodeDir() {
+    return join(homedir(), ".opencode");
+}
 export function getStoragePath() {
-    return join(STORAGE_DIR, STORAGE_FILE);
+    return join(getOpencodeConfigDir(), STORAGE_FILE);
+}
+function getLegacyStoragePath() {
+    return join(getLegacyOpencodeDir(), STORAGE_FILE);
+}
+function normalizeStorage(parsed) {
+    if (!parsed || typeof parsed !== "object")
+        return null;
+    const storage = parsed;
+    if (storage.version !== 3)
+        return null;
+    if (!Array.isArray(storage.accounts))
+        return null;
+    const activeIndex = typeof storage.activeIndex === "number" && Number.isFinite(storage.activeIndex)
+        ? Math.max(0, Math.floor(storage.activeIndex))
+        : 0;
+    const clampedActiveIndex = storage.accounts.length > 0
+        ? Math.min(activeIndex, storage.accounts.length - 1)
+        : 0;
+    return {
+        version: 3,
+        accounts: storage.accounts,
+        activeIndex: clampedActiveIndex,
+        activeIndexByFamily: storage.activeIndexByFamily ?? {},
+    };
+}
+function areRateLimitStatesEqual(left, right) {
+    const leftKeys = Object.keys(left);
+    const rightKeys = Object.keys(right);
+    if (leftKeys.length !== rightKeys.length)
+        return false;
+    for (const key of leftKeys) {
+        if (left[key] !== right[key])
+            return false;
+    }
+    return true;
+}
+function findAccountMatchIndex(accounts, candidate) {
+    if (candidate.accountId) {
+        const matchIndex = accounts.findIndex((account) => account.accountId === candidate.accountId);
+        if (matchIndex >= 0)
+            return matchIndex;
+    }
+    if (candidate.email) {
+        const matchIndex = accounts.findIndex((account) => account.email === candidate.email);
+        if (matchIndex >= 0)
+            return matchIndex;
+    }
+    if (candidate.refreshToken) {
+        return accounts.findIndex((account) => account.refreshToken === candidate.refreshToken);
+    }
+    return -1;
+}
+function mergeAccounts(existing, incoming) {
+    const merged = existing.map((account) => ({ ...account }));
+    let changed = false;
+    for (const candidate of incoming) {
+        const matchIndex = findAccountMatchIndex(merged, candidate);
+        if (matchIndex < 0) {
+            merged.push({ ...candidate });
+            changed = true;
+            continue;
+        }
+        const current = merged[matchIndex];
+        const updated = { ...current };
+        let didUpdate = false;
+        if (!updated.refreshToken && candidate.refreshToken) {
+            updated.refreshToken = candidate.refreshToken;
+            didUpdate = true;
+        }
+        if (!updated.accountId && candidate.accountId) {
+            updated.accountId = candidate.accountId;
+            didUpdate = true;
+        }
+        if (!updated.email && candidate.email) {
+            updated.email = candidate.email;
+            didUpdate = true;
+        }
+        const candidateAddedAt = typeof candidate.addedAt === "number" && Number.isFinite(candidate.addedAt)
+            ? candidate.addedAt
+            : undefined;
+        const currentAddedAt = typeof updated.addedAt === "number" && Number.isFinite(updated.addedAt)
+            ? updated.addedAt
+            : undefined;
+        if (typeof candidateAddedAt === "number" &&
+            (typeof currentAddedAt !== "number" || candidateAddedAt < currentAddedAt)) {
+            updated.addedAt = candidateAddedAt;
+            didUpdate = true;
+        }
+        const candidateLastUsed = typeof candidate.lastUsed === "number" && Number.isFinite(candidate.lastUsed)
+            ? candidate.lastUsed
+            : undefined;
+        const currentLastUsed = typeof updated.lastUsed === "number" && Number.isFinite(updated.lastUsed)
+            ? updated.lastUsed
+            : undefined;
+        if (typeof candidateLastUsed === "number" &&
+            (typeof currentLastUsed !== "number" || candidateLastUsed > currentLastUsed)) {
+            updated.lastUsed = candidateLastUsed;
+            didUpdate = true;
+        }
+        if (candidate.lastSwitchReason && !updated.lastSwitchReason) {
+            updated.lastSwitchReason = candidate.lastSwitchReason;
+            didUpdate = true;
+        }
+        if (candidate.rateLimitResetTimes) {
+            const mergedRateLimits = {
+                ...candidate.rateLimitResetTimes,
+                ...updated.rateLimitResetTimes,
+            };
+            const currentRateLimits = updated.rateLimitResetTimes ?? {};
+            if (!areRateLimitStatesEqual(currentRateLimits, mergedRateLimits)) {
+                updated.rateLimitResetTimes = mergedRateLimits;
+                didUpdate = true;
+            }
+        }
+        if (typeof candidate.coolingDownUntil === "number") {
+            const currentCooldown = typeof updated.coolingDownUntil === "number" &&
+                Number.isFinite(updated.coolingDownUntil)
+                ? updated.coolingDownUntil
+                : undefined;
+            if (typeof currentCooldown !== "number" ||
+                candidate.coolingDownUntil > currentCooldown) {
+                updated.coolingDownUntil = candidate.coolingDownUntil;
+                didUpdate = true;
+            }
+        }
+        if (candidate.cooldownReason && !updated.cooldownReason) {
+            updated.cooldownReason = candidate.cooldownReason;
+            didUpdate = true;
+        }
+        if (didUpdate) {
+            merged[matchIndex] = updated;
+            changed = true;
+        }
+    }
+    return { accounts: merged, changed };
+}
+async function migrateLegacyAccountsFileIfNeeded() {
+    const newPath = getStoragePath();
+    const legacyPath = getLegacyStoragePath();
+    const newExists = existsSync(newPath);
+    const legacyExists = existsSync(legacyPath);
+    if (!legacyExists)
+        return;
+    if (!newExists) {
+        await fs.mkdir(dirname(newPath), { recursive: true });
+        try {
+            await fs.rename(legacyPath, newPath);
+        }
+        catch {
+            try {
+                await fs.copyFile(legacyPath, newPath);
+                await fs.unlink(legacyPath);
+            }
+            catch {
+                // Best-effort; ignore.
+            }
+        }
+        return;
+    }
+    try {
+        const [newRaw, legacyRaw] = await Promise.all([
+            fs.readFile(newPath, "utf-8"),
+            fs.readFile(legacyPath, "utf-8"),
+        ]);
+        const newStorage = normalizeStorage(JSON.parse(newRaw));
+        const legacyStorage = normalizeStorage(JSON.parse(legacyRaw));
+        if (!legacyStorage || legacyStorage.accounts.length === 0)
+            return;
+        if (!newStorage) {
+            debug("[StorageMigration] New storage invalid, adopting legacy accounts");
+            await fs.writeFile(newPath, JSON.stringify(legacyStorage, null, 2), "utf-8");
+            return;
+        }
+        const { accounts: mergedAccounts, changed } = mergeAccounts(newStorage.accounts, legacyStorage.accounts);
+        if (!changed)
+            return;
+        const baseActiveIndex = newStorage.accounts.length > 0 ? newStorage.activeIndex : legacyStorage.activeIndex;
+        const activeIndex = mergedAccounts.length > 0
+            ? Math.min(Math.max(0, baseActiveIndex), mergedAccounts.length - 1)
+            : 0;
+        const activeIndexByFamily = {
+            ...legacyStorage.activeIndexByFamily,
+            ...newStorage.activeIndexByFamily,
+        };
+        const mergedStorage = {
+            version: 3,
+            accounts: mergedAccounts,
+            activeIndex,
+            activeIndexByFamily,
+        };
+        debug(`[StorageMigration] Merged legacy accounts (new: ${newStorage.accounts.length}, legacy: ${legacyStorage.accounts.length}, merged: ${mergedAccounts.length})`);
+        await fs.writeFile(newPath, JSON.stringify(mergedStorage, null, 2), "utf-8");
+        try {
+            await fs.unlink(legacyPath);
+        }
+        catch {
+            // Best-effort; ignore.
+        }
+    }
+    catch {
+        // Best-effort; ignore.
+    }
 }
 export async function loadAccounts() {
+    await migrateLegacyAccountsFileIfNeeded();
     const filePath = getStoragePath();
+    debug(`[LoadAccounts] Loading from: ${filePath}`);
     try {
-        if (!existsSync(filePath))
+        if (!existsSync(filePath)) {
+            debug(`[LoadAccounts] File does not exist: ${filePath}`);
             return null;
+        }
         const raw = await fs.readFile(filePath, "utf-8");
         const parsed = JSON.parse(raw);
-        if (!parsed || typeof parsed !== "object")
-            return null;
-        const storage = parsed;
-        if (storage.version !== 3)
-            return null;
-        if (!Array.isArray(storage.accounts))
-            return null;
-        const activeIndex = typeof storage.activeIndex === "number" && Number.isFinite(storage.activeIndex)
-            ? Math.max(0, Math.floor(storage.activeIndex))
-            : 0;
-        const clampedActiveIndex = storage.accounts.length > 0
-            ? Math.min(activeIndex, storage.accounts.length - 1)
-            : 0;
-        return {
-            version: 3,
-            accounts: storage.accounts,
-            activeIndex: clampedActiveIndex,
-            activeIndexByFamily: storage.activeIndexByFamily ?? {},
-        };
+        return normalizeStorage(parsed);
     }
     catch {
         return null;
@@ -40,7 +243,26 @@ export async function loadAccounts() {
 }
 export async function saveAccounts(storage) {
     const filePath = getStoragePath();
-    await fs.mkdir(dirname(filePath), { recursive: true });
-    await fs.writeFile(filePath, JSON.stringify(storage, null, 2), "utf-8");
+    debug(`[SaveAccounts] Saving to ${filePath} with ${storage.accounts.length} accounts`);
+    try {
+        await fs.mkdir(dirname(filePath), { recursive: true });
+        const jsonContent = JSON.stringify(storage, null, 2);
+        debug(`[SaveAccounts] Writing ${jsonContent.length} bytes`);
+        await fs.writeFile(filePath, jsonContent, "utf-8");
+        if (AUTH_DEBUG_ENABLED) {
+            const verifyContent = await fs.readFile(filePath, "utf-8");
+            const verifyStorage = normalizeStorage(JSON.parse(verifyContent));
+            if (verifyStorage) {
+                debug(`[SaveAccounts] Verification successful - ${verifyStorage.accounts.length} accounts in file`);
+            }
+            else {
+                debug("[SaveAccounts] Verification failed - invalid storage format");
+            }
+        }
+    }
+    catch (error) {
+        console.error("[SaveAccounts] Error saving accounts:", error);
+        throw error;
+    }
 }
 //# sourceMappingURL=storage.js.map

package/dist/lib/storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../lib/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAI1C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,CAAC;AACjD,MAAM,YAAY,GAAG,4BAA4B,CAAC;AAElD,MAAM,UAAU,cAAc;IAC7B,OAAO,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY;IACjC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,IAAI,CAAC;QACJ,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAC;QACvC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;QAE1C,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QACvD,MAAM,OAAO,GAAG,MAAmC,CAAC;QACpD,IAAI,OAAO,CAAC,OAAO,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAC;QAElD,MAAM,WAAW,GAChB,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC;YAC9E,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC,CAAC;QACN,MAAM,kBAAkB,GACvB,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YAC1B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YACpD,CAAC,CAAC,CAAC,CAAC;QAEN,OAAO;YACN,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,OAAO,CAAC,QAAwC;YAC1D,WAAW,EAAE,kBAAkB;YAC/B,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,IAAI,EAAE;SACtD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,CAAC;IACb,CAAC;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAyB;IAC3D,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;AACzE,CAAC"}
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../lib/storage.ts"],"names":[],"mappings":"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"}

package/dist/lib/terminal.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Run an interactive prompt without breaking OpenCode's TUI.
+ *
+ * OpenCode enables raw mode and mouse tracking for its UI. Node's readline can
+ * toggle raw mode on close, which can leave mouse tracking enabled but raw mode
+ * disabled — causing mouse movements to appear as garbage input (e.g. "M2^J").
+ */
+export declare function withTerminalModeRestored<T>(fn: () => Promise<T>): Promise<T>;
+//# sourceMappingURL=terminal.d.ts.map

package/dist/lib/terminal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../lib/terminal.ts"],"names":[],"mappings":"AAoBA;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CA8BlF"}

package/dist/lib/terminal.js

@@ -0,0 +1,56 @@
+import { stdin as input, stdout as output } from "node:process";
+const AUTH_DEBUG_ENABLED = process.env.OPENCODE_OPENAI_AUTH_DEBUG === "1";
+function debug(...args) {
+    if (!AUTH_DEBUG_ENABLED)
+        return;
+    console.debug(...args);
+}
+function disableMouseTracking() {
+    if (!output.isTTY)
+        return;
+    // Disable common xterm mouse tracking modes.
+    output.write("\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1006l");
+}
+function enableMouseTracking() {
+    if (!output.isTTY)
+        return;
+    output.write("\x1b[?1000h\x1b[?1002h\x1b[?1003h\x1b[?1006h");
+}
+/**
+ * Run an interactive prompt without breaking OpenCode's TUI.
+ *
+ * OpenCode enables raw mode and mouse tracking for its UI. Node's readline can
+ * toggle raw mode on close, which can leave mouse tracking enabled but raw mode
+ * disabled — causing mouse movements to appear as garbage input (e.g. "M2^J").
+ */
+export async function withTerminalModeRestored(fn) {
+    if (!input.isTTY) {
+        debug("[TerminalGuard] No TTY detected, skipping terminal guard");
+        return await fn();
+    }
+    const wasRaw = input.isRaw;
+    debug(`[TerminalGuard] Starting guard - wasRaw: ${wasRaw}, isTTY: ${input.isTTY}`);
+    try {
+        debug("[TerminalGuard] Disabling mouse tracking");
+        disableMouseTracking();
+        // Ensure we can accept normal line input during prompts.
+        if (typeof input.setRawMode === "function") {
+            debug("[TerminalGuard] Setting raw mode to false");
+            input.setRawMode(false);
+        }
+        return await fn();
+    }
+    finally {
+        debug(`[TerminalGuard] Restoring terminal state - wasRaw: ${wasRaw}`);
+        if (typeof wasRaw === "boolean" && typeof input.setRawMode === "function") {
+            input.setRawMode(wasRaw);
+        }
+        // If OpenCode was previously in raw mode, re-enable mouse tracking so the UI
+        // doesn't get stuck in a non-mouse state.
+        if (wasRaw) {
+            debug("[TerminalGuard] Re-enabling mouse tracking");
+            enableMouseTracking();
+        }
+    }
+}
+//# sourceMappingURL=terminal.js.map

package/dist/lib/terminal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../lib/terminal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,KAAK,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AAEhE,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,GAAG,CAAC;AAE1E,SAAS,KAAK,CAAC,GAAG,IAAe;IAChC,IAAI,CAAC,kBAAkB;QAAE,OAAO;IAChC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,oBAAoB;IAC5B,IAAI,CAAC,MAAM,CAAC,KAAK;QAAE,OAAO;IAC1B,6CAA6C;IAC7C,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,mBAAmB;IAC3B,IAAI,CAAC,MAAM,CAAC,KAAK;QAAE,OAAO;IAC1B,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;AAC9D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAI,EAAoB;IACrE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAClB,KAAK,CAAC,0DAA0D,CAAC,CAAC;QAClE,OAAO,MAAM,EAAE,EAAE,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAAI,KAAwC,CAAC,KAAK,CAAC;IAC/D,KAAK,CAAC,4CAA4C,MAAM,YAAY,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IAEnF,IAAI,CAAC;QACJ,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAClD,oBAAoB,EAAE,CAAC;QACvB,yDAAyD;QACzD,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;YAC5C,KAAK,CAAC,2CAA2C,CAAC,CAAC;YACnD,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,MAAM,EAAE,EAAE,CAAC;IACnB,CAAC;YAAS,CAAC;QACV,KAAK,CAAC,sDAAsD,MAAM,EAAE,CAAC,CAAC;QACtE,IAAI,OAAO,MAAM,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;YAC3E,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC;QACD,6EAA6E;QAC7E,0CAA0C;QAC1C,IAAI,MAAM,EAAE,CAAC;YACZ,KAAK,CAAC,4CAA4C,CAAC,CAAC;YACpD,mBAAmB,EAAE,CAAC;QACvB,CAAC;IACF,CAAC;AACF,CAAC"}

package/dist/lib/types.d.ts

@@ -1,6 +1,6 @@
 import type { Auth, Provider, Model } from "@opencode-ai/sdk";
 /**
- * Plugin configuration from ~/.opencode/openai-codex-auth-config.json
+ * Plugin configuration from ~/.config/opencode/openai-codex-auth-config.json
  */
 export interface PluginConfig {
     /**
@@ -55,7 +55,7 @@ export interface PluginConfig {
      */
     retryAllAccountsMaxRetries?: number;
 }
-export type AccountSelectionStrategy = "sticky" | "round-robin";
+export type AccountSelectionStrategy = "sticky" | "round-robin" | "hybrid";
 export type OAuthAuthDetails = Extract<Auth, {
     type: "oauth";
 }>;

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-openai-codex-multi-auth",
-  "version": "4.4.1",
+  "version": "4.4.6",
   "description": "OpenAI ChatGPT (Codex backend) OAuth auth plugin for opencode - use your ChatGPT Plus/Pro subscription instead of API credits",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -49,7 +49,8 @@
     "config/",
     "scripts/",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+    "THIRD_PARTY_NOTICES.md"
   ],
   "engines": {
     "node": ">=20.0.0"

package/scripts/install-opencode-codex-auth.js

@@ -61,11 +61,10 @@ const cacheNodeModulesLegacyGitHub = join(cacheDir, "node_modules", LEGACY_GITHU
 const cacheBunLock = join(cacheDir, "bun.lock");
 const cachePackageJson = join(cacheDir, "package.json");
 const opencodeAuthPath = join(homedir(), ".opencode", "auth", "openai.json");
-const pluginConfigPath = join(
-	homedir(),
-	".opencode",
-	"openai-codex-auth-config.json",
-);
+const pluginConfigPath = join(configDir, "openai-codex-auth-config.json");
+const legacyPluginConfigPath = join(homedir(), ".opencode", "openai-codex-auth-config.json");
+const legacyAccountsPath = join(homedir(), ".opencode", "openai-codex-accounts.json");
+const accountsPath = join(configDir, "openai-codex-accounts.json");
 const pluginLogDir = join(homedir(), ".opencode", "logs", "codex-plugin");
 const opencodeCacheDir = join(homedir(), ".opencode", "cache");
 
@@ -272,10 +271,16 @@ async function clearPluginArtifacts() {
 	if (dryRun) {
 		log(`[dry-run] Would remove ${opencodeAuthPath}`);
 		log(`[dry-run] Would remove ${pluginConfigPath}`);
+		log(`[dry-run] Would remove ${legacyPluginConfigPath}`);
+		log(`[dry-run] Would remove ${accountsPath}`);
+		log(`[dry-run] Would remove ${legacyAccountsPath}`);
 		log(`[dry-run] Would remove ${pluginLogDir}`);
 	} else {
 		await rm(opencodeAuthPath, { force: true });
 		await rm(pluginConfigPath, { force: true });
+		await rm(legacyPluginConfigPath, { force: true });
+		await rm(accountsPath, { force: true });
+		await rm(legacyAccountsPath, { force: true });
 		await rm(pluginLogDir, { recursive: true, force: true });
 	}