refactor: extract live sync wrapper

Author: ndycode

index.ts

@@ -209,6 +209,7 @@ import {
 } from "./lib/runtime/account-status.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";
 import { buildManualOAuthFlow } from "./lib/runtime/manual-oauth-flow.js";
 import {
 	applyPreemptiveQuotaSettingsFromConfig,
@@ -560,12 +561,13 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 		pluginConfig: ReturnType<typeof loadPluginConfig>,
 		authFallback?: OAuthAuthDetails,
 	): Promise<void> => {
-		const next = await ensureLiveAccountSyncState({
-			enabled: getLiveAccountSync(pluginConfig),
-			targetPath: getStoragePath(),
+		const next = await ensureLiveAccountSyncEntry({
+			pluginConfig,
+			authFallback,
 			currentSync: liveAccountSync,
 			currentPath: liveAccountSyncPath,
-			authFallback,
+			getLiveAccountSync,
+			getStoragePath,
 			createSync: (oauthFallback) =>
 				new LiveAccountSync(
 					async () => {
@@ -579,6 +581,7 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 			registerCleanup,
 			logWarn,
 			pluginName: PLUGIN_NAME,
+			ensureLiveAccountSyncState,
 		});
 		liveAccountSync = next.liveAccountSync;
 		liveAccountSyncPath = next.liveAccountSyncPath;

lib/runtime/live-sync-entry.ts

@@ -0,0 +1,52 @@
+import type { OAuthAuthDetails } from "../types.js";
+
+type LiveAccountSyncLike = {
+	stop: () => void;
+	syncToPath: (path: string) => Promise<void>;
+};
+
+export async function ensureLiveAccountSyncEntry<
+	TSync extends LiveAccountSyncLike,
+>(params: {
+	pluginConfig: ReturnType<typeof import("../config.js").loadPluginConfig>;
+	authFallback?: OAuthAuthDetails;
+	currentSync: TSync | null;
+	currentPath: string | null;
+	getLiveAccountSync: (
+		config: ReturnType<typeof import("../config.js").loadPluginConfig>,
+	) => boolean;
+	getStoragePath: () => string;
+	createSync: (authFallback?: OAuthAuthDetails) => TSync;
+	registerCleanup: (cleanup: () => void) => void;
+	logWarn: (message: string) => void;
+	pluginName: string;
+	ensureLiveAccountSyncState: (args: {
+		enabled: boolean;
+		targetPath: string;
+		currentSync: TSync | null;
+		currentPath: string | null;
+		authFallback?: OAuthAuthDetails;
+		createSync: (authFallback?: OAuthAuthDetails) => TSync;
+		registerCleanup: (cleanup: () => void) => void;
+		logWarn: (message: string) => void;
+		pluginName: string;
+	}) => Promise<{
+		liveAccountSync: TSync | null;
+		liveAccountSyncPath: string | null;
+	}>;
+}): Promise<{
+	liveAccountSync: TSync | null;
+	liveAccountSyncPath: string | null;
+}> {
+	return params.ensureLiveAccountSyncState({
+		enabled: params.getLiveAccountSync(params.pluginConfig),
+		targetPath: params.getStoragePath(),
+		currentSync: params.currentSync,
+		currentPath: params.currentPath,
+		authFallback: params.authFallback,
+		createSync: params.createSync,
+		registerCleanup: params.registerCleanup,
+		logWarn: params.logWarn,
+		pluginName: params.pluginName,
+	});
+}

test/live-sync-entry.test.ts

@@ -0,0 +1,38 @@
+import { describe, expect, it, vi } from "vitest";
+import { ensureLiveAccountSyncEntry } from "../lib/runtime/live-sync-entry.js";
+
+describe("live sync entry", () => {
+	it("delegates plugin-config-derived arguments into the live sync state helper", async () => {
+		const ensureLiveAccountSyncState = vi.fn(async () => ({
+			liveAccountSync: { stop: vi.fn(), syncToPath: vi.fn() },
+			liveAccountSyncPath: "/tmp/accounts.json",
+		}));
+
+		const result = await ensureLiveAccountSyncEntry({
+			pluginConfig: {} as never,
+			authFallback: {
+				type: "oauth",
+				accessToken: "a",
+				refreshToken: "r",
+			} as never,
+			currentSync: null,
+			currentPath: null,
+			getLiveAccountSync: () => true,
+			getStoragePath: () => "/tmp/accounts.json",
+			createSync: vi.fn(() => ({ stop: vi.fn(), syncToPath: vi.fn() })),
+			registerCleanup: vi.fn(),
+			logWarn: vi.fn(),
+			pluginName: "plugin",
+			ensureLiveAccountSyncState,
+		});
+
+		expect(ensureLiveAccountSyncState).toHaveBeenCalledWith(
+			expect.objectContaining({
+				enabled: true,
+				targetPath: "/tmp/accounts.json",
+				pluginName: "plugin",
+			}),
+		);
+		expect(result.liveAccountSyncPath).toBe("/tmp/accounts.json");
+	});
+});