oc-codex-multi-auth 6.0.0 → 6.1.1

package/dist/lib/storage/export-import.d.ts

@@ -0,0 +1,84 @@
+/**
+ * Account export / import / preview pipeline.
+ *
+ * Split out of `lib/storage.ts` in RC-2. All three public functions here are
+ * thin wrappers around `withAccountStorageTransaction` so they inherit the
+ * same mutex + atomic-write guarantees as ordinary saves. The pre-import
+ * backup path is delegated to `./backup.ts`.
+ */
+/**
+ * Backup policy for `importAccounts`.
+ *
+ * - `none`: do not create a pre-import backup (destructive; opt-in only).
+ * - `timestamped`: create a timestamped pre-import backup, continue on failure.
+ *   This is the default — see audit finding `docs/audits/04-high-priority.md`.
+ * - `best-effort`: legacy alias for `timestamped`, retained for callers that
+ *   were written against the prior enum.
+ * - `required`: backup must succeed or the import aborts.
+ */
+export type ImportBackupMode = "none" | "timestamped" | "best-effort" | "required";
+export interface ImportAccountsOptions {
+    /**
+     * Optional prefix used for pre-import backup file names.
+     * Only applied when backupMode is not "none".
+     */
+    preImportBackupPrefix?: string;
+    /**
+     * Backup policy before import apply. Defaults to `"timestamped"` so that the
+     * prior on-disk state is preserved unless the caller explicitly opts out via
+     * `{ backupMode: "none" }`.
+     */
+    backupMode?: ImportBackupMode;
+}
+export type ImportBackupStatus = "created" | "skipped" | "failed";
+export interface ImportAccountsResult {
+    imported: number;
+    total: number;
+    skipped: number;
+    backupStatus: ImportBackupStatus;
+    backupPath?: string;
+    backupError?: string;
+}
+export interface ImportPreviewResult {
+    imported: number;
+    total: number;
+    skipped: number;
+}
+/**
+ * Import preview/apply analysis is pure in-memory work: it does not touch disk
+ * and it does not log token or workspace values. The surrounding
+ * `withAccountStorageTransaction` caller keeps Windows lock-retry and
+ * serialized read-modify-write behavior; see `test/storage.test.ts` for the
+ * overlapping transaction regression and pre-import backup lock coverage.
+ */
+export declare function previewImportAccounts(filePath: string): Promise<ImportPreviewResult>;
+/**
+ * Exports current accounts to a JSON file for backup/migration.
+ *
+ * Safety default (audit `docs/audits/04-high-priority.md`):
+ * `force` defaults to `false` so an existing export file is never silently
+ * overwritten. Callers that need the prior destructive behaviour must opt in
+ * via `exportAccounts(path, true)`.
+ *
+ * @param filePath - Destination file path.
+ * @param force - If true, overwrite any existing file at `filePath`. Defaults to
+ *   `false`; when false and the file exists, a `StorageError` is thrown.
+ * @throws StorageError if the file already exists and `force` is `false`.
+ * @throws Error if there are no accounts to export.
+ */
+export declare function exportAccounts(filePath: string, force?: boolean): Promise<void>;
+/**
+ * Imports accounts from a JSON file, merging with existing accounts.
+ * Deduplicates by identity key first (organizationId -> accountId -> refreshToken),
+ * then applies legacy email dedupe only to entries without organizationId/accountId.
+ *
+ * Safety default (audit `docs/audits/04-high-priority.md`):
+ * `options.backupMode` defaults to `"timestamped"` so a pre-import snapshot of
+ * the existing accounts file is always written before apply. Callers that need
+ * the prior destructive default must pass `{ backupMode: "none" }` explicitly.
+ *
+ * @param filePath - Source file path
+ * @throws Error if file is invalid or would exceed MAX_ACCOUNTS
+ */
+export declare function importAccounts(filePath: string, options?: ImportAccountsOptions): Promise<ImportAccountsResult>;
+//# sourceMappingURL=export-import.d.ts.map

package/dist/lib/storage/export-import.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"export-import.d.ts","sourceRoot":"","sources":["../../../lib/storage/export-import.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAsBH;;;;;;;;;GASG;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,aAAa,GAAG,aAAa,GAAG,UAAU,CAAC;AAEnF,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC/B;AAED,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;AAElE,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,kBAAkB,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAoDD;;;;;;GAMG;AAEH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,mBAAmB,CAAC,CAY9B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBnF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,oBAAoB,CAAC,CA2H/B"}

package/dist/lib/storage/export-import.js

@@ -0,0 +1,222 @@
+/**
+ * Account export / import / preview pipeline.
+ *
+ * Split out of `lib/storage.ts` in RC-2. All three public functions here are
+ * thin wrappers around `withAccountStorageTransaction` so they inherit the
+ * same mutex + atomic-write guarantees as ordinary saves. The pre-import
+ * backup path is delegated to `./backup.ts`.
+ */
+import { promises as fs, existsSync } from "node:fs";
+import { basename, dirname } from "node:path";
+import { ACCOUNT_LIMITS } from "../constants.js";
+import { createLogger } from "../logger.js";
+import { MODEL_FAMILIES } from "../prompts/codex.js";
+import { createTimestampedBackupPath, writePreImportBackupFile } from "./backup.js";
+import { StorageError } from "./errors.js";
+import { clampIndex, deduplicateAccountsForStorage, extractActiveKeys, findAccountIndexByIdentityKeys, } from "./identity.js";
+import { withAccountStorageTransaction } from "./load-save.js";
+import { normalizeAccountStorage } from "./normalize.js";
+import { resolvePath } from "./paths.js";
+const log = createLogger("storage");
+async function readAndNormalizeImportFile(filePath) {
+    const resolvedPath = resolvePath(filePath);
+    if (!existsSync(resolvedPath)) {
+        throw new Error(`Import file not found: ${resolvedPath}`);
+    }
+    const content = await fs.readFile(resolvedPath, "utf-8");
+    let imported;
+    try {
+        imported = JSON.parse(content);
+    }
+    catch {
+        throw new Error(`Invalid JSON in import file: ${resolvedPath}`);
+    }
+    // Pass the resolved path so an UNSUPPORTED_SCHEMA_VERSION error includes
+    // the actual import file in its diagnostics.
+    const normalized = normalizeAccountStorage(imported, resolvedPath);
+    if (!normalized) {
+        throw new Error("Invalid account storage format");
+    }
+    return { resolvedPath, normalized };
+}
+function analyzeImportedAccounts(existingAccounts, importedAccounts) {
+    const merged = [...existingAccounts, ...importedAccounts];
+    const accounts = deduplicateAccountsForStorage(merged);
+    if (accounts.length > ACCOUNT_LIMITS.MAX_ACCOUNTS) {
+        throw new Error(`Import would exceed maximum of ${ACCOUNT_LIMITS.MAX_ACCOUNTS} accounts (would have ${accounts.length})`);
+    }
+    const imported = Math.max(0, accounts.length - existingAccounts.length);
+    const skipped = Math.max(0, importedAccounts.length - imported);
+    return {
+        accounts,
+        imported,
+        total: accounts.length,
+        skipped,
+    };
+}
+/**
+ * Import preview/apply analysis is pure in-memory work: it does not touch disk
+ * and it does not log token or workspace values. The surrounding
+ * `withAccountStorageTransaction` caller keeps Windows lock-retry and
+ * serialized read-modify-write behavior; see `test/storage.test.ts` for the
+ * overlapping transaction regression and pre-import backup lock coverage.
+ */
+export async function previewImportAccounts(filePath) {
+    const { normalized } = await readAndNormalizeImportFile(filePath);
+    return withAccountStorageTransaction((existing) => {
+        const existingAccounts = existing?.accounts ?? [];
+        const analysis = analyzeImportedAccounts(existingAccounts, normalized.accounts);
+        return Promise.resolve({
+            imported: analysis.imported,
+            total: analysis.total,
+            skipped: analysis.skipped,
+        });
+    });
+}
+/**
+ * Exports current accounts to a JSON file for backup/migration.
+ *
+ * Safety default (audit `docs/audits/04-high-priority.md`):
+ * `force` defaults to `false` so an existing export file is never silently
+ * overwritten. Callers that need the prior destructive behaviour must opt in
+ * via `exportAccounts(path, true)`.
+ *
+ * @param filePath - Destination file path.
+ * @param force - If true, overwrite any existing file at `filePath`. Defaults to
+ *   `false`; when false and the file exists, a `StorageError` is thrown.
+ * @throws StorageError if the file already exists and `force` is `false`.
+ * @throws Error if there are no accounts to export.
+ */
+export async function exportAccounts(filePath, force = false) {
+    const resolvedPath = resolvePath(filePath);
+    if (!force && existsSync(resolvedPath)) {
+        throw new StorageError(`Refusing to overwrite existing export file: ${resolvedPath}. Pass force=true to overwrite.`, "EEXIST", resolvedPath, "Re-run the export with force=true if you intend to replace the existing file, or choose a new path.");
+    }
+    const storage = await withAccountStorageTransaction((current) => Promise.resolve(current));
+    if (!storage || storage.accounts.length === 0) {
+        throw new Error("No accounts to export");
+    }
+    await fs.mkdir(dirname(resolvedPath), { recursive: true });
+    const content = JSON.stringify(storage, null, 2);
+    await fs.writeFile(resolvedPath, content, { encoding: "utf-8", mode: 0o600 });
+    log.info("Exported accounts", { path: resolvedPath, count: storage.accounts.length });
+}
+/**
+ * Imports accounts from a JSON file, merging with existing accounts.
+ * Deduplicates by identity key first (organizationId -> accountId -> refreshToken),
+ * then applies legacy email dedupe only to entries without organizationId/accountId.
+ *
+ * Safety default (audit `docs/audits/04-high-priority.md`):
+ * `options.backupMode` defaults to `"timestamped"` so a pre-import snapshot of
+ * the existing accounts file is always written before apply. Callers that need
+ * the prior destructive default must pass `{ backupMode: "none" }` explicitly.
+ *
+ * @param filePath - Source file path
+ * @throws Error if file is invalid or would exceed MAX_ACCOUNTS
+ */
+export async function importAccounts(filePath, options = {}) {
+    const { resolvedPath, normalized } = await readAndNormalizeImportFile(filePath);
+    const backupMode = options.backupMode ?? "timestamped";
+    const backupPrefix = options.preImportBackupPrefix ?? "codex-pre-import-backup";
+    const { imported: importedCount, total, skipped: skippedCount, backupStatus, backupPath, backupError, } = await withAccountStorageTransaction(async (existing, persist) => {
+        const existingStorage = existing ??
+            {
+                version: 3,
+                accounts: [],
+                activeIndex: 0,
+                activeIndexByFamily: {},
+            };
+        const existingAccounts = existingStorage.accounts;
+        const existingActiveIndex = existingStorage.activeIndex;
+        const clampedExistingActiveIndex = clampIndex(existingActiveIndex, existingAccounts.length);
+        const existingActiveKeys = extractActiveKeys(existingAccounts, clampedExistingActiveIndex);
+        const existingActiveIndexByFamily = existingStorage.activeIndexByFamily ?? {};
+        let backupStatus = "skipped";
+        let backupPath;
+        let backupError;
+        let backupLogError;
+        if (backupMode !== "none" && existingAccounts.length > 0) {
+            backupPath = createTimestampedBackupPath(backupPrefix);
+            try {
+                await writePreImportBackupFile(backupPath, existingStorage);
+                backupStatus = "created";
+            }
+            catch (error) {
+                backupStatus = "failed";
+                backupError = error instanceof Error ? error.message : String(error);
+                const backupCode = error?.code;
+                backupLogError = backupCode
+                    ? `pre-import backup failed (${backupCode})`
+                    : "pre-import backup failed";
+                if (backupMode === "required") {
+                    throw new Error(backupCode
+                        ? `Pre-import backup failed (${backupCode})`
+                        : "Pre-import backup failed");
+                }
+                log.warn("Pre-import backup failed; continuing import apply", {
+                    backupFile: backupPath ? basename(backupPath) : undefined,
+                    error: backupLogError,
+                });
+            }
+        }
+        const analysis = analyzeImportedAccounts(existingAccounts, normalized.accounts);
+        const deduplicatedAccounts = analysis.accounts;
+        const mappedActiveIndex = (() => {
+            if (deduplicatedAccounts.length === 0)
+                return 0;
+            if (existingActiveKeys.length > 0) {
+                const idx = findAccountIndexByIdentityKeys(deduplicatedAccounts, existingActiveKeys);
+                if (idx >= 0)
+                    return idx;
+            }
+            return clampIndex(clampedExistingActiveIndex, deduplicatedAccounts.length);
+        })();
+        const activeIndexByFamily = {};
+        for (const family of MODEL_FAMILIES) {
+            const rawFamilyIndex = existingActiveIndexByFamily[family];
+            const familyIndex = typeof rawFamilyIndex === "number" && Number.isFinite(rawFamilyIndex)
+                ? rawFamilyIndex
+                : clampedExistingActiveIndex;
+            const familyKeys = extractActiveKeys(existingAccounts, clampIndex(familyIndex, existingAccounts.length));
+            if (familyKeys.length > 0) {
+                const idx = findAccountIndexByIdentityKeys(deduplicatedAccounts, familyKeys);
+                activeIndexByFamily[family] = idx >= 0 ? idx : mappedActiveIndex;
+                continue;
+            }
+            activeIndexByFamily[family] = mappedActiveIndex;
+        }
+        const newStorage = {
+            version: 3,
+            accounts: deduplicatedAccounts,
+            activeIndex: mappedActiveIndex,
+            activeIndexByFamily,
+        };
+        await persist(newStorage);
+        return {
+            imported: analysis.imported,
+            total: analysis.total,
+            skipped: analysis.skipped,
+            backupStatus,
+            backupPath,
+            backupError,
+        };
+    });
+    log.info("Imported accounts", {
+        path: resolvedPath,
+        imported: importedCount,
+        skipped: skippedCount,
+        total,
+        backupStatus,
+        backupFile: backupPath ? basename(backupPath) : undefined,
+        backupError: backupError ? "available on command result" : undefined,
+    });
+    return {
+        imported: importedCount,
+        total,
+        skipped: skippedCount,
+        backupStatus,
+        backupPath,
+        backupError,
+    };
+}
+//# sourceMappingURL=export-import.js.map

package/dist/lib/storage/export-import.js.map

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

package/dist/lib/storage/flagged.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Flagged-account storage: load/save/clear + transactional update.
+ *
+ * Split out of `lib/storage.ts` in RC-2. Flagged accounts live in a sibling
+ * file next to the main accounts file and follow the same mutex, temp-file +
+ * rename, and legacy-file migration pattern — just with a simpler V1-only
+ * schema and different legacy filenames (flagged-accounts.json and the
+ * older blocked-accounts.json).
+ */
+import type { AccountMetadataV3 } from "./migrations.js";
+export interface FlaggedAccountMetadataV1 extends AccountMetadataV3 {
+    flaggedAt: number;
+    flaggedReason?: string;
+    lastError?: string;
+}
+export interface FlaggedAccountStorageV1 {
+    version: 1;
+    accounts: FlaggedAccountMetadataV1[];
+}
+export declare function getFlaggedAccountsPath(): string;
+export declare function loadFlaggedAccounts(): Promise<FlaggedAccountStorageV1>;
+/**
+ * Executes a read-modify-write transaction for flagged account storage under the
+ * shared storage lock so concurrent callers cannot lose updates.
+ */
+export declare function withFlaggedAccountStorageTransaction<T>(handler: (current: FlaggedAccountStorageV1, persist: (storage: FlaggedAccountStorageV1) => Promise<void>) => Promise<T>): Promise<T>;
+export declare function saveFlaggedAccounts(storage: FlaggedAccountStorageV1): Promise<void>;
+export declare function clearFlaggedAccounts(): Promise<void>;
+//# sourceMappingURL=flagged.d.ts.map

package/dist/lib/storage/flagged.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"flagged.d.ts","sourceRoot":"","sources":["../../../lib/storage/flagged.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAaH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIzD,MAAM,WAAW,wBAAyB,SAAQ,iBAAiB;IACjE,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,CAAC,CAAC;IACX,QAAQ,EAAE,wBAAwB,EAAE,CAAC;CACtC;AAED,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C;AAoLD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAE5E;AAED;;;GAGG;AACH,wBAAsB,oCAAoC,CAAC,CAAC,EAC1D,OAAO,EAAE,CACP,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,CAAC,OAAO,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,CAAC,KACzD,OAAO,CAAC,CAAC,CAAC,GACd,OAAO,CAAC,CAAC,CAAC,CAKZ;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIzF;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAW1D"}

package/dist/lib/storage/flagged.js

@@ -0,0 +1,207 @@
+/**
+ * Flagged-account storage: load/save/clear + transactional update.
+ *
+ * Split out of `lib/storage.ts` in RC-2. Flagged accounts live in a sibling
+ * file next to the main accounts file and follow the same mutex, temp-file +
+ * rename, and legacy-file migration pattern — just with a simpler V1-only
+ * schema and different legacy filenames (flagged-accounts.json and the
+ * older blocked-accounts.json).
+ */
+import { promises as fs, existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { FLAGGED_ACCOUNTS_FILE_NAME, LEGACY_BLOCKED_ACCOUNTS_FILE_NAME, LEGACY_FLAGGED_ACCOUNTS_FILE_NAME, } from "../constants.js";
+import { createLogger } from "../logger.js";
+import { renameWithWindowsRetry } from "./atomic-write.js";
+import { getWorkspaceIdentityKey, isRecord } from "./identity.js";
+import { getStoragePath, withStorageLock } from "./state.js";
+const log = createLogger("storage");
+export function getFlaggedAccountsPath() {
+    return join(dirname(getStoragePath()), FLAGGED_ACCOUNTS_FILE_NAME);
+}
+function getLegacyFlaggedAccountsPath() {
+    return join(dirname(getStoragePath()), LEGACY_FLAGGED_ACCOUNTS_FILE_NAME);
+}
+function getLegacyBlockedAccountsPath() {
+    return join(dirname(getStoragePath()), LEGACY_BLOCKED_ACCOUNTS_FILE_NAME);
+}
+function normalizeFlaggedStorage(data) {
+    if (!isRecord(data) || data.version !== 1 || !Array.isArray(data.accounts)) {
+        return { version: 1, accounts: [] };
+    }
+    const byIdentityKey = new Map();
+    for (const rawAccount of data.accounts) {
+        if (!isRecord(rawAccount))
+            continue;
+        const refreshToken = typeof rawAccount.refreshToken === "string" ? rawAccount.refreshToken.trim() : "";
+        if (!refreshToken)
+            continue;
+        const flaggedAt = typeof rawAccount.flaggedAt === "number" ? rawAccount.flaggedAt : Date.now();
+        const isAccountIdSource = (value) => value === "token" || value === "id_token" || value === "org" || value === "manual";
+        const isSwitchReason = (value) => value === "rate-limit" || value === "initial" || value === "rotation";
+        const isCooldownReason = (value) => value === "auth-failure" || value === "network-error";
+        const normalizeTags = (value) => {
+            if (!Array.isArray(value))
+                return undefined;
+            const normalized = value
+                .filter((entry) => typeof entry === "string")
+                .map((entry) => entry.trim().toLowerCase())
+                .filter((entry) => entry.length > 0);
+            return normalized.length > 0 ? Array.from(new Set(normalized)) : undefined;
+        };
+        let rateLimitResetTimes;
+        if (isRecord(rawAccount.rateLimitResetTimes)) {
+            const normalizedRateLimits = {};
+            for (const [key, value] of Object.entries(rawAccount.rateLimitResetTimes)) {
+                if (typeof value === "number") {
+                    normalizedRateLimits[key] = value;
+                }
+            }
+            if (Object.keys(normalizedRateLimits).length > 0) {
+                rateLimitResetTimes = normalizedRateLimits;
+            }
+        }
+        const accountIdSource = isAccountIdSource(rawAccount.accountIdSource)
+            ? rawAccount.accountIdSource
+            : undefined;
+        const lastSwitchReason = isSwitchReason(rawAccount.lastSwitchReason)
+            ? rawAccount.lastSwitchReason
+            : undefined;
+        const cooldownReason = isCooldownReason(rawAccount.cooldownReason)
+            ? rawAccount.cooldownReason
+            : undefined;
+        const accountTags = normalizeTags(rawAccount.accountTags);
+        const accountNote = typeof rawAccount.accountNote === "string" && rawAccount.accountNote.trim()
+            ? rawAccount.accountNote.trim()
+            : undefined;
+        const normalized = {
+            refreshToken,
+            addedAt: typeof rawAccount.addedAt === "number" ? rawAccount.addedAt : flaggedAt,
+            lastUsed: typeof rawAccount.lastUsed === "number" ? rawAccount.lastUsed : flaggedAt,
+            organizationId: typeof rawAccount.organizationId === "string" ? rawAccount.organizationId : undefined,
+            accountId: typeof rawAccount.accountId === "string" ? rawAccount.accountId : undefined,
+            accountIdSource,
+            accountLabel: typeof rawAccount.accountLabel === "string" ? rawAccount.accountLabel : undefined,
+            accountTags,
+            accountNote,
+            email: typeof rawAccount.email === "string" ? rawAccount.email : undefined,
+            enabled: typeof rawAccount.enabled === "boolean" ? rawAccount.enabled : undefined,
+            lastSwitchReason,
+            rateLimitResetTimes,
+            coolingDownUntil: typeof rawAccount.coolingDownUntil === "number" ? rawAccount.coolingDownUntil : undefined,
+            cooldownReason,
+            flaggedAt,
+            flaggedReason: typeof rawAccount.flaggedReason === "string" ? rawAccount.flaggedReason : undefined,
+            lastError: typeof rawAccount.lastError === "string" ? rawAccount.lastError : undefined,
+        };
+        // Keep flagged dedup aligned with active cleanup so sibling workspaces only
+        // collapse when they resolve to the same shared workspace identity.
+        byIdentityKey.set(getWorkspaceIdentityKey(normalized), normalized);
+    }
+    return {
+        version: 1,
+        accounts: Array.from(byIdentityKey.values()),
+    };
+}
+async function loadFlaggedAccountsUnlocked(saveUnlocked) {
+    const path = getFlaggedAccountsPath();
+    const empty = { version: 1, accounts: [] };
+    try {
+        const content = await fs.readFile(path, "utf-8");
+        const data = JSON.parse(content);
+        return normalizeFlaggedStorage(data);
+    }
+    catch (error) {
+        const code = error.code;
+        if (code !== "ENOENT") {
+            log.error("Failed to load flagged account storage", { path, error: String(error) });
+            return empty;
+        }
+    }
+    for (const legacyPath of [getLegacyFlaggedAccountsPath(), getLegacyBlockedAccountsPath()]) {
+        if (!existsSync(legacyPath)) {
+            continue;
+        }
+        try {
+            const legacyContent = await fs.readFile(legacyPath, "utf-8");
+            const legacyData = JSON.parse(legacyContent);
+            const migrated = normalizeFlaggedStorage(legacyData);
+            if (migrated.accounts.length > 0) {
+                await saveUnlocked(migrated);
+            }
+            try {
+                await fs.unlink(legacyPath);
+            }
+            catch {
+                // Best effort cleanup.
+            }
+            log.info("Migrated legacy flagged account storage", {
+                from: legacyPath,
+                to: path,
+                accounts: migrated.accounts.length,
+            });
+            return migrated;
+        }
+        catch (error) {
+            log.error("Failed to migrate legacy flagged account storage", {
+                from: legacyPath,
+                to: path,
+                error: String(error),
+            });
+            return empty;
+        }
+    }
+    return empty;
+}
+async function saveFlaggedAccountsUnlocked(storage) {
+    const path = getFlaggedAccountsPath();
+    const uniqueSuffix = `${Date.now()}.${Math.random().toString(36).slice(2, 8)}`;
+    const tempPath = `${path}.${uniqueSuffix}.tmp`;
+    try {
+        await fs.mkdir(dirname(path), { recursive: true });
+        const content = JSON.stringify(normalizeFlaggedStorage(storage), null, 2);
+        await fs.writeFile(tempPath, content, { encoding: "utf-8", mode: 0o600 });
+        await renameWithWindowsRetry(tempPath, path);
+    }
+    catch (error) {
+        try {
+            await fs.unlink(tempPath);
+        }
+        catch {
+            // Ignore cleanup failures.
+        }
+        log.error("Failed to save flagged account storage", { path, error: String(error) });
+        throw error;
+    }
+}
+export async function loadFlaggedAccounts() {
+    return withStorageLock(async () => loadFlaggedAccountsUnlocked(saveFlaggedAccountsUnlocked));
+}
+/**
+ * Executes a read-modify-write transaction for flagged account storage under the
+ * shared storage lock so concurrent callers cannot lose updates.
+ */
+export async function withFlaggedAccountStorageTransaction(handler) {
+    return withStorageLock(async () => {
+        const current = await loadFlaggedAccountsUnlocked(saveFlaggedAccountsUnlocked);
+        return handler(current, saveFlaggedAccountsUnlocked);
+    });
+}
+export async function saveFlaggedAccounts(storage) {
+    return withStorageLock(async () => {
+        await saveFlaggedAccountsUnlocked(storage);
+    });
+}
+export async function clearFlaggedAccounts() {
+    return withStorageLock(async () => {
+        try {
+            await fs.unlink(getFlaggedAccountsPath());
+        }
+        catch (error) {
+            const code = error.code;
+            if (code !== "ENOENT") {
+                log.error("Failed to clear flagged account storage", { error: String(error) });
+            }
+        }
+    });
+}
+//# sourceMappingURL=flagged.js.map

package/dist/lib/storage/flagged.js.map

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

package/dist/lib/storage/identity.d.ts

@@ -0,0 +1,72 @@
+/**
+ * Account identity + dedup helpers.
+ *
+ * Split out of `lib/storage.ts` in RC-2. This module is pure and synchronous:
+ * it owns the identity-key hierarchy (`organizationId` -> `accountId` ->
+ * `refreshToken`) and the dedup + merge rules used by `normalizeAccountStorage`
+ * and the import transaction.
+ *
+ * The two public exports that were already re-exported from `lib/storage.ts`
+ * (`deduplicateAccounts`, `deduplicateAccountsByEmail`) keep their original
+ * shape so external callers can import them via either the barrel or this
+ * submodule.
+ */
+import type { AccountMetadataV3 } from "./migrations.js";
+export type AccountLike = {
+    organizationId?: string;
+    accountId?: string;
+    accountIdSource?: AccountMetadataV3["accountIdSource"];
+    accountLabel?: string;
+    email?: string;
+    refreshToken: string;
+    addedAt?: number;
+    lastUsed?: number;
+};
+export declare function getWorkspaceIdentityKey(account: {
+    organizationId?: string;
+    accountId?: string;
+    refreshToken: string;
+}): string;
+export declare function isRecord(value: unknown): value is Record<string, unknown>;
+export declare function clampIndex(index: number, length: number): number;
+export declare function toAccountIdentityKeys(account: Pick<AccountMetadataV3, "organizationId" | "accountId" | "refreshToken">): string[];
+export declare function toAccountIdentityKey(account: Pick<AccountMetadataV3, "organizationId" | "accountId" | "refreshToken">): string | undefined;
+export declare function extractActiveKeys(accounts: unknown[], activeIndex: number): string[];
+export declare function findAccountIndexByIdentityKeys(accounts: Pick<AccountMetadataV3, "organizationId" | "accountId" | "refreshToken">[], identityKeys: string[]): number;
+/**
+ * Removes duplicate accounts, keeping the most recently used entry for each unique key.
+ * Deduplication identity hierarchy: organizationId -> accountId -> refreshToken.
+ * @param accounts - Array of accounts to deduplicate
+ * @returns New array with duplicates removed
+ */
+export declare function deduplicateAccounts<T extends {
+    organizationId?: string;
+    accountId?: string;
+    refreshToken: string;
+    lastUsed?: number;
+    addedAt?: number;
+}>(accounts: T[]): T[];
+/**
+ * Removes duplicate legacy accounts by email, keeping the most recently used entry.
+ * Accounts with organizationId/accountId are never merged by email to avoid collapsing workspace variants.
+ * Accounts without email are always preserved.
+ * @param accounts - Array of accounts to deduplicate
+ * @returns New array with email duplicates removed
+ */
+export declare function deduplicateAccountsByEmail<T extends {
+    organizationId?: string;
+    accountId?: string;
+    email?: string;
+    lastUsed?: number;
+    addedAt?: number;
+}>(accounts: T[]): T[];
+/**
+ * Applies storage deduplication semantics used by normalize/import paths.
+ * 1) Dedupe only exact identity duplicates (organizationId -> accountId -> refreshToken),
+ *    preserving distinct workspace variants that share a refresh token.
+ * 2) Then apply legacy email dedupe only for entries that still do not have organizationId/accountId.
+ */
+export declare function deduplicateAccountsForStorage<T extends AccountLike & {
+    email?: string;
+}>(accounts: T[]): T[];
+//# sourceMappingURL=identity.d.ts.map