Scope pool lastUsed preservation

Author: ndycode

lib/runtime/account-pool.ts

@@ -16,6 +16,7 @@ export type TokenSuccessWithAccount = Extract<
 export async function persistAccountPoolResults(params: {
 	results: TokenSuccessWithAccount[];
 	replaceAll?: boolean;
+	preserveLastUsedOnUpdate?: boolean;
 	modelFamilies: readonly ModelFamily[];
 	withAccountStorageTransaction: <T>(
 		handler: (
@@ -31,7 +32,11 @@ export async function persistAccountPoolResults(params: {
 	) => string | undefined;
 	sanitizeEmail: (email: string | undefined) => string | undefined;
 }): Promise<void> {
-	const { results, replaceAll = false } = params;
+	const {
+		results,
+		replaceAll = false,
+		preserveLastUsedOnUpdate = false,
+	} = params;
 	if (results.length === 0) return;
 
 	await params.withAccountStorageTransaction(async (loadedStorage, persist) => {
@@ -161,7 +166,9 @@ export async function persistAccountPoolResults(params: {
 				refreshToken: result.refresh,
 				accessToken: result.access,
 				expiresAt: result.expires,
-				lastUsed: existing.lastUsed ?? now,
+				lastUsed: preserveLastUsedOnUpdate
+					? (existing.lastUsed ?? now)
+					: now,
 				workspaces: mergedWorkspaces,
 				currentWorkspaceIndex: nextCurrentWorkspaceIndex,
 			};

test/account-pool.test.ts

@@ -53,7 +53,68 @@ describe("account pool helper", () => {
 		});
 	});
 
-	it("preserves lastUsed when updating an existing account", async () => {
+	it("advances lastUsed when updating an existing account by default", async () => {
+		const persist = vi.fn(async () => undefined);
+		const originalLastUsed = 456;
+		const nowSpy = vi.spyOn(Date, "now").mockReturnValue(789);
+
+		try {
+			await persistAccountPoolResults({
+				results: [
+					{
+						type: "success",
+						access: "access-token-next",
+						refresh: "refresh-token",
+						expires: 999,
+					},
+				],
+				replaceAll: false,
+				modelFamilies: ["codex"],
+				withAccountStorageTransaction: async (handler) =>
+					handler(
+						{
+							version: 3,
+							activeIndex: 0,
+							activeIndexByFamily: { codex: 0 },
+							accounts: [
+								{
+									accountId: "acct_1",
+									email: "user@example.com",
+									refreshToken: "refresh-token",
+									accessToken: "access-token-old",
+									expiresAt: 123,
+									addedAt: 111,
+									lastUsed: originalLastUsed,
+									enabled: true,
+								},
+							],
+						},
+						persist,
+					),
+				findMatchingAccountIndex: () => 0,
+				extractAccountId: () => "acct_1",
+				extractAccountEmail: () => "user@example.com",
+				sanitizeEmail: (email) => email,
+			});
+		} finally {
+			nowSpy.mockRestore();
+		}
+
+		expect(persist).toHaveBeenCalledWith(
+			expect.objectContaining({
+				accounts: [
+					expect.objectContaining({
+						refreshToken: "refresh-token",
+						accessToken: "access-token-next",
+						expiresAt: 999,
+						lastUsed: 789,
+					}),
+				],
+			}),
+		);
+	});
+
+	it("preserves lastUsed for report-style updates when requested", async () => {
 		const persist = vi.fn(async () => undefined);
 		const originalLastUsed = 456;
 
@@ -67,6 +128,7 @@ describe("account pool helper", () => {
 				},
 			],
 			replaceAll: false,
+			preserveLastUsedOnUpdate: true,
 			modelFamilies: ["codex"],
 			withAccountStorageTransaction: async (handler) =>
 				handler(

test/codex-manager-report-command.test.ts

@@ -224,6 +224,40 @@ describe("runReportCommand", () => {
 		});
 	});
 
+	it("records probe error when usable token exists but account id is missing", async () => {
+		const deps = createDeps({
+			hasUsableAccessToken: vi.fn(() => true),
+			loadAccounts: vi.fn(async () =>
+				createStorage([
+					{
+						email: "missing-id@example.com",
+						refreshToken: "refresh-token-1",
+						accessToken: "not-a-jwt",
+						expiresAt: 5_000,
+						addedAt: 1,
+						lastUsed: 1,
+						enabled: true,
+					},
+				]),
+			),
+		});
+
+		const result = await runReportCommand(["--live", "--json"], deps);
+
+		expect(result).toBe(0);
+		expect(deps.queuedRefresh).not.toHaveBeenCalled();
+		expect(deps.saveAccounts).not.toHaveBeenCalled();
+		expect(deps.fetchCodexQuotaSnapshot).not.toHaveBeenCalled();
+		const jsonOutput = JSON.parse(
+			(deps.logInfo as ReturnType<typeof vi.fn>).mock.calls.at(-1)?.[0] ?? "{}",
+		) as { forecast: { probeErrors: string[] } };
+		expect(jsonOutput.forecast.probeErrors).toEqual(
+			expect.arrayContaining([
+				expect.stringContaining("missing accountId for live probe"),
+			]),
+		);
+	});
+
 	it("persists refreshed probe tokens before report live probes", async () => {
 		const storage = createStorage([
 			{