Skip to content

refactor: extract shared account view helpers (Architecture PR #1) #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ndycode wants to merge 13 commits into from
Closed

refactor: extract shared account view helpers (Architecture PR #1) #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2013dbe
refactor: extract shared account view helpers
ndycode Mar 3, 2026
00dba6e
refactor: centralize active-index family mutations
ndycode Mar 3, 2026
0d96ab3
refactor: unify active-index normalization flow
ndycode Mar 3, 2026
a0b9d72
refactor: share family rate-limit status formatting
ndycode Mar 3, 2026
f8bf733
refactor: share family index label formatting
ndycode Mar 3, 2026
0e0edf8
refactor: extract account-removal index reconciliation
ndycode Mar 3, 2026
6b7b2e8
refactor: centralize account storage clone/empty factories
ndycode Mar 3, 2026
c953709
fix: resolve PR33 review issues on index normalization and account re…
ndycode Mar 5, 2026
3135264
test: align PR33 family reindex assertion with helper behavior
ndycode Mar 5, 2026
2817384
fix: resolve PR33 deletion reindex and manage-delete guards
ndycode Mar 5, 2026
786a5c0
fix: normalize codex-remove family indices after deletion
ndycode Mar 5, 2026
ce93aa0
fix: reconcile family indexes on legacy account deletion
ndycode Mar 5, 2026
d818232
fix: preserve undefined family map in storage cloning
ndycode Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
213 changes: 71 additions & 142 deletions index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,21 @@ import {
lookupCodexCliTokensByEmail,
isCodexCliSyncEnabled,
} from "./lib/accounts.js";
import {
resolveActiveIndex,
formatRateLimitEntry,
formatActiveIndexByFamilyLabels,
formatRateLimitStatusByFamily,
} from "./lib/accounts/account-view.js";
import {
cloneAccountStorage,
createEmptyAccountStorage,
} from "./lib/accounts/storage-view.js";
import {
setActiveIndexForAllFamilies,
normalizeActiveIndexByFamily,
removeAccountAndReconcileActiveIndexes,
} from "./lib/accounts/active-index.js";
import {
getStoragePath,
loadAccounts,
Expand Down Expand Up @@ -676,21 +691,6 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
}
};

const resolveActiveIndex = (
storage: {
activeIndex: number;
activeIndexByFamily?: Partial<Record<ModelFamily, number>>;
accounts: unknown[];
},
family: ModelFamily = "codex",
): number => {
const total = storage.accounts.length;
if (total === 0) return 0;
const rawCandidate = storage.activeIndexByFamily?.[family] ?? storage.activeIndex;
const raw = Number.isFinite(rawCandidate) ? rawCandidate : 0;
return Math.max(0, Math.min(raw, total - 1));
};

const hydrateEmails = async (
storage: AccountStorageV3 | null,
): Promise<AccountStorageV3 | null> => {
Expand Down Expand Up @@ -755,40 +755,6 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
return storage;
};

const getRateLimitResetTimeForFamily = (
account: { rateLimitResetTimes?: Record<string, number | undefined> },
now: number,
family: ModelFamily,
): number | null => {
const times = account.rateLimitResetTimes;
if (!times) return null;

let minReset: number | null = null;
const prefix = `${family}:`;
for (const [key, value] of Object.entries(times)) {
if (typeof value !== "number") continue;
if (value <= now) continue;
if (key !== family && !key.startsWith(prefix)) continue;
if (minReset === null || value < minReset) {
minReset = value;
}
}

return minReset;
};

const formatRateLimitEntry = (
account: { rateLimitResetTimes?: Record<string, number | undefined> },
now: number,
family: ModelFamily = "codex",
): string | null => {
const resetAt = getRateLimitResetTimeForFamily(account, now, family);
if (typeof resetAt !== "number") return null;
const remaining = resetAt - now;
if (remaining <= 0) return null;
return `resets in ${formatWaitTime(remaining)}`;
};

const applyUiRuntimeFromConfig = (
pluginConfig: ReturnType<typeof loadPluginConfig>,
): UiRuntimeOptions => {
Expand Down Expand Up @@ -986,8 +952,9 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
return;
}

const index = props.index ?? props.accountIndex;
if (typeof index === "number") {
const rawIndex = props.index ?? props.accountIndex;
if (typeof rawIndex === "number" && Number.isFinite(rawIndex)) {
const index = Math.floor(rawIndex);
const storage = await loadAccounts();
if (!storage || index < 0 || index >= storage.accounts.length) {
return;
Expand All @@ -999,11 +966,7 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
account.lastUsed = now;
account.lastSwitchReason = "rotation";
}
storage.activeIndex = index;
storage.activeIndexByFamily = storage.activeIndexByFamily ?? {};
for (const family of MODEL_FAMILIES) {
storage.activeIndexByFamily[family] = index;
}
setActiveIndexForAllFamilies(storage, index);

await saveAccounts(storage);
if (cachedAccountManager) {
Expand Down Expand Up @@ -2431,21 +2394,18 @@ while (attempted.size < Math.max(1, accountCount)) {
let startFresh = explicitLoginMode === "fresh";
let refreshAccountIndex: number | undefined;

const clampActiveIndices = (storage: AccountStorageV3): void => {
const count = storage.accounts.length;
if (count === 0) {
storage.activeIndex = 0;
storage.activeIndexByFamily = {};
return;
}
storage.activeIndex = Math.max(0, Math.min(storage.activeIndex, count - 1));
storage.activeIndexByFamily = storage.activeIndexByFamily ?? {};
for (const family of MODEL_FAMILIES) {
const raw = storage.activeIndexByFamily[family];
const candidate =
typeof raw === "number" && Number.isFinite(raw) ? raw : storage.activeIndex;
storage.activeIndexByFamily[family] = Math.max(0, Math.min(candidate, count - 1));
const reconcileActiveIndicesAfterRemoval = (
storage: AccountStorageV3,
targetIndex: number,
): boolean => {
const removed = removeAccountAndReconcileActiveIndexes(storage, targetIndex);
if (!removed) {
return false;
}
normalizeActiveIndexByFamily(storage, storage.accounts.length, {
clearFamilyMapWhenEmpty: true,
});
return true;
};

const isFlaggableFailure = (failure: Extract<TokenResult, { type: "failed" }>): boolean => {
Expand Down Expand Up @@ -2706,14 +2666,8 @@ while (attempted.size < Math.max(1, accountCount)) {
const runAccountCheck = async (deepProbe: boolean): Promise<void> => {
const loadedStorage = await hydrateEmails(await loadAccounts());
const workingStorage = loadedStorage
? {
...loadedStorage,
accounts: loadedStorage.accounts.map((account) => ({ ...account })),
activeIndexByFamily: loadedStorage.activeIndexByFamily
? { ...loadedStorage.activeIndexByFamily }
: {},
}
: { version: 3 as const, accounts: [], activeIndex: 0, activeIndexByFamily: {} };
? cloneAccountStorage(loadedStorage)
: createEmptyAccountStorage();

if (workingStorage.accounts.length === 0) {
console.log("\nNo accounts to check.\n");
Expand Down Expand Up @@ -2935,11 +2889,23 @@ while (attempted.size < Math.max(1, accountCount)) {
}

if (removeFromActive.size > 0) {
workingStorage.accounts = workingStorage.accounts.filter(
(account) => !removeFromActive.has(account.refreshToken),
);
clampActiveIndices(workingStorage);
storageChanged = true;
const indexesToRemove: number[] = [];
for (let i = 0; i < workingStorage.accounts.length; i += 1) {
const account = workingStorage.accounts[i];
if (account && removeFromActive.has(account.refreshToken)) {
indexesToRemove.push(i);
}
}
indexesToRemove.sort((a, b) => b - a);
let removedAny = false;
for (const indexToRemove of indexesToRemove) {
if (reconcileActiveIndicesAfterRemoval(workingStorage, indexToRemove)) {
removedAny = true;
}
}
if (removedAny) {
storageChanged = true;
}
}

if (storageChanged) {
Expand Down Expand Up @@ -3059,14 +3025,8 @@ while (attempted.size < Math.max(1, accountCount)) {
while (true) {
const loadedStorage = await hydrateEmails(await loadAccounts());
const workingStorage = loadedStorage
? {
...loadedStorage,
accounts: loadedStorage.accounts.map((account) => ({ ...account })),
activeIndexByFamily: loadedStorage.activeIndexByFamily
? { ...loadedStorage.activeIndexByFamily }
: {},
}
: { version: 3 as const, accounts: [], activeIndex: 0, activeIndexByFamily: {} };
? cloneAccountStorage(loadedStorage)
: createEmptyAccountStorage();
const flaggedStorage = await loadFlaggedAccounts();

if (workingStorage.accounts.length === 0 && flaggedStorage.accounts.length === 0) {
Expand Down Expand Up @@ -3137,8 +3097,13 @@ while (attempted.size < Math.max(1, accountCount)) {
if (typeof menuResult.deleteAccountIndex === "number") {
const target = workingStorage.accounts[menuResult.deleteAccountIndex];
if (target) {
workingStorage.accounts.splice(menuResult.deleteAccountIndex, 1);
clampActiveIndices(workingStorage);
const removed = reconcileActiveIndicesAfterRemoval(
workingStorage,
menuResult.deleteAccountIndex,
);
if (!removed) {
continue;
}
await saveAccounts(workingStorage);
await saveFlaggedAccounts({
version: 1,
Expand Down Expand Up @@ -3566,11 +3531,7 @@ while (attempted.size < Math.max(1, accountCount)) {
account.lastSwitchReason = "rotation";
}

storage.activeIndex = targetIndex;
storage.activeIndexByFamily = storage.activeIndexByFamily ?? {};
for (const family of MODEL_FAMILIES) {
storage.activeIndexByFamily[family] = targetIndex;
}
setActiveIndexForAllFamilies(storage, targetIndex);
try {
await saveAccounts(storage);
} catch (saveError) {
Expand Down Expand Up @@ -3647,21 +3608,14 @@ while (attempted.size < Math.max(1, accountCount)) {

lines.push("");
lines.push(...formatUiSection(ui, "Active index by model family"));
for (const family of MODEL_FAMILIES) {
const idx = storage.activeIndexByFamily?.[family];
const familyIndexLabel =
typeof idx === "number" && Number.isFinite(idx) ? String(idx + 1) : "-";
lines.push(formatUiItem(ui, `${family}: ${familyIndexLabel}`));
for (const line of formatActiveIndexByFamilyLabels(storage.activeIndexByFamily)) {
lines.push(formatUiItem(ui, line));
}

lines.push("");
lines.push(...formatUiSection(ui, "Rate limits by model family (per account)"));
storage.accounts.forEach((account, index) => {
const statuses = MODEL_FAMILIES.map((family) => {
const resetAt = getRateLimitResetTimeForFamily(account, now, family);
if (typeof resetAt !== "number") return `${family}=ok`;
return `${family}=${formatWaitTime(resetAt - now)}`;
});
const statuses = formatRateLimitStatusByFamily(account, now);
lines.push(formatUiItem(ui, `Account ${index + 1}: ${statuses.join(" | ")}`));
});

Expand Down Expand Up @@ -3700,21 +3654,14 @@ while (attempted.size < Math.max(1, accountCount)) {

lines.push("");
lines.push("Active index by model family:");
for (const family of MODEL_FAMILIES) {
const idx = storage.activeIndexByFamily?.[family];
const familyIndexLabel =
typeof idx === "number" && Number.isFinite(idx) ? String(idx + 1) : "-";
lines.push(` ${family}: ${familyIndexLabel}`);
for (const line of formatActiveIndexByFamilyLabels(storage.activeIndexByFamily)) {
lines.push(` ${line}`);
}

lines.push("");
lines.push("Rate limits by model family (per account):");
storage.accounts.forEach((account, index) => {
const statuses = MODEL_FAMILIES.map((family) => {
const resetAt = getRateLimitResetTimeForFamily(account, now, family);
if (typeof resetAt !== "number") return `${family}=ok`;
return `${family}=${formatWaitTime(resetAt - now)}`;
});
const statuses = formatRateLimitStatusByFamily(account, now);
lines.push(` Account ${index + 1}: ${statuses.join(" | ")}`);
});

Expand Down Expand Up @@ -3933,31 +3880,13 @@ while (attempted.size < Math.max(1, accountCount)) {

const label = formatAccountLabel(account, targetIndex);

storage.accounts.splice(targetIndex, 1);

if (storage.accounts.length === 0) {
storage.activeIndex = 0;
storage.activeIndexByFamily = {};
} else {
if (storage.activeIndex >= storage.accounts.length) {
storage.activeIndex = 0;
} else if (storage.activeIndex > targetIndex) {
storage.activeIndex -= 1;
}

if (storage.activeIndexByFamily) {
for (const family of MODEL_FAMILIES) {
const idx = storage.activeIndexByFamily[family];
if (typeof idx === "number") {
if (idx >= storage.accounts.length) {
storage.activeIndexByFamily[family] = 0;
} else if (idx > targetIndex) {
storage.activeIndexByFamily[family] = idx - 1;
}
}
}
}
const removed = removeAccountAndReconcileActiveIndexes(storage, targetIndex);
if (!removed) {
return `Account ${index} not found.`;
}
normalizeActiveIndexByFamily(storage, storage.accounts.length, {
clearFamilyMapWhenEmpty: true,
});

try {
await saveAccounts(storage);
Expand Down
Loading