refactor: extract account storage scope wrapper

Author: ndycode

index.ts

@@ -207,6 +207,7 @@ import {
 	getRateLimitResetTimeForFamily,
 	resolveActiveIndex,
 } from "./lib/runtime/account-status.js";
+import { applyAccountStorageScopeEntry } from "./lib/runtime/account-storage-scope-entry.js";
 import { runBrowserOAuthFlow } from "./lib/runtime/browser-oauth-flow.js";
 import { handleRuntimeEvent } from "./lib/runtime/event-handler.js";
 import { ensureLiveAccountSyncEntry } from "./lib/runtime/live-sync-entry.js";
@@ -544,7 +545,8 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 	const applyAccountStorageScope = (
 		pluginConfig: ReturnType<typeof loadPluginConfig>,
 	): void =>
-		applyAccountStorageScopeFromConfig(pluginConfig, {
+		applyAccountStorageScopeEntry({
+			pluginConfig,
 			getPerProjectAccounts,
 			getStorageBackupEnabled,
 			setStorageBackupEnabled,
@@ -557,6 +559,7 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 			pluginName: PLUGIN_NAME,
 			setStoragePath,
 			cwd: () => process.cwd(),
+			applyAccountStorageScopeFromConfig,
 		});
 
 	const ensureLiveAccountSync = async (

lib/runtime/account-storage-scope-entry.ts

@@ -0,0 +1,49 @@
+export function applyAccountStorageScopeEntry(params: {
+	pluginConfig: ReturnType<typeof import("../config.js").loadPluginConfig>;
+	getPerProjectAccounts: (
+		config: ReturnType<typeof import("../config.js").loadPluginConfig>,
+	) => boolean;
+	getStorageBackupEnabled: (
+		config: ReturnType<typeof import("../config.js").loadPluginConfig>,
+	) => boolean;
+	setStorageBackupEnabled: (enabled: boolean) => void;
+	isCodexCliSyncEnabled: () => boolean;
+	getWarningShown: () => boolean;
+	setWarningShown: (shown: boolean) => void;
+	logWarn: (message: string) => void;
+	pluginName: string;
+	setStoragePath: (path: string | null) => void;
+	cwd: () => string;
+	applyAccountStorageScopeFromConfig: (
+		pluginConfig: ReturnType<typeof import("../config.js").loadPluginConfig>,
+		deps: {
+			getPerProjectAccounts: (
+				config: ReturnType<typeof import("../config.js").loadPluginConfig>,
+			) => boolean;
+			getStorageBackupEnabled: (
+				config: ReturnType<typeof import("../config.js").loadPluginConfig>,
+			) => boolean;
+			setStorageBackupEnabled: (enabled: boolean) => void;
+			isCodexCliSyncEnabled: () => boolean;
+			getWarningShown: () => boolean;
+			setWarningShown: (shown: boolean) => void;
+			logWarn: (message: string) => void;
+			pluginName: string;
+			setStoragePath: (path: string | null) => void;
+			cwd: () => string;
+		},
+	) => void;
+}): void {
+	params.applyAccountStorageScopeFromConfig(params.pluginConfig, {
+		getPerProjectAccounts: params.getPerProjectAccounts,
+		getStorageBackupEnabled: params.getStorageBackupEnabled,
+		setStorageBackupEnabled: params.setStorageBackupEnabled,
+		isCodexCliSyncEnabled: params.isCodexCliSyncEnabled,
+		getWarningShown: params.getWarningShown,
+		setWarningShown: params.setWarningShown,
+		logWarn: params.logWarn,
+		pluginName: params.pluginName,
+		setStoragePath: params.setStoragePath,
+		cwd: params.cwd,
+	});
+}

test/account-storage-scope-entry.test.ts

@@ -0,0 +1,38 @@
+import { describe, expect, it, vi } from "vitest";
+import { applyAccountStorageScopeEntry } from "../lib/runtime/account-storage-scope-entry.js";
+
+describe("account storage scope entry", () => {
+	it("delegates to the config-based storage scope helper with all injected deps", () => {
+		const applyAccountStorageScopeFromConfig = vi.fn();
+		applyAccountStorageScopeEntry({
+			pluginConfig: {} as never,
+			getPerProjectAccounts: vi.fn(() => true),
+			getStorageBackupEnabled: vi.fn(() => true),
+			setStorageBackupEnabled: vi.fn(),
+			isCodexCliSyncEnabled: vi.fn(() => false),
+			getWarningShown: vi.fn(() => false),
+			setWarningShown: vi.fn(),
+			logWarn: vi.fn(),
+			pluginName: "plugin",
+			setStoragePath: vi.fn(),
+			cwd: vi.fn(() => "/tmp/project"),
+			applyAccountStorageScopeFromConfig,
+		});
+
+		expect(applyAccountStorageScopeFromConfig).toHaveBeenCalledWith(
+			expect.anything(),
+			expect.objectContaining({
+				getPerProjectAccounts: expect.any(Function),
+				getStorageBackupEnabled: expect.any(Function),
+				setStorageBackupEnabled: expect.any(Function),
+				isCodexCliSyncEnabled: expect.any(Function),
+				getWarningShown: expect.any(Function),
+				setWarningShown: expect.any(Function),
+				logWarn: expect.any(Function),
+				pluginName: "plugin",
+				setStoragePath: expect.any(Function),
+				cwd: expect.any(Function),
+			}),
+		);
+	});
+});