refactor: extract clear accounts entry wrapper

Author: ndycode

lib/storage.ts

@@ -11,12 +11,11 @@ import {
 } from "./named-backup-export.js";
 import { MODEL_FAMILIES, type ModelFamily } from "./prompts/codex.js";
 import { clearAccountStorageArtifacts } from "./storage/account-clear.js";
+import { clearAccountsEntry } from "./storage/account-clear-entry.js";
 import { cloneAccountStorageForPersistence } from "./storage/account-persistence.js";
 import {
-	clearFlaggedAccountsEntry,
 	exportAccountsSnapshot,
 	importAccountsSnapshot,
-	saveFlaggedAccountsEntry,
 } from "./storage/account-port.js";
 import { saveAccountsToDisk } from "./storage/account-save.js";
 import { buildBackupMetadata } from "./storage/backup-metadata-builder.js";
@@ -1847,17 +1846,18 @@ export async function saveAccounts(storage: AccountStorageV3): Promise<void> {
  * Silently ignores if file doesn't exist.
  */
 export async function clearAccounts(): Promise<void> {
-	return withStorageLock(async () => {
-		const path = getStoragePath();
-		await clearAccountStorageArtifacts({
-			path,
-			resetMarkerPath: getIntentionalResetMarkerPath(path),
-			walPath: getAccountsWalPath(path),
-			backupPaths: await getAccountsBackupRecoveryCandidatesWithDiscovery(path),
-			logError: (message, details) => {
-				log.error(message, details);
-			},
-		});
+	const path = getStoragePath();
+	return clearAccountsEntry({
+		path,
+		withStorageLock,
+		resetMarkerPath: getIntentionalResetMarkerPath(path),
+		walPath: getAccountsWalPath(path),
+		getBackupPaths: () =>
+			getAccountsBackupRecoveryCandidatesWithDiscovery(path),
+		clearAccountStorageArtifacts,
+		logError: (message, details) => {
+			log.error(message, details);
+		},
 	});
 }
 

lib/storage/account-clear-entry.ts

@@ -0,0 +1,25 @@
+export async function clearAccountsEntry(params: {
+	path: string;
+	withStorageLock: <T>(fn: () => Promise<T>) => Promise<T>;
+	resetMarkerPath: string;
+	walPath: string;
+	getBackupPaths: () => Promise<string[]>;
+	clearAccountStorageArtifacts: (args: {
+		path: string;
+		resetMarkerPath: string;
+		walPath: string;
+		backupPaths: string[];
+		logError: (message: string, details: Record<string, unknown>) => void;
+	}) => Promise<void>;
+	logError: (message: string, details: Record<string, unknown>) => void;
+}): Promise<void> {
+	return params.withStorageLock(async () => {
+		await params.clearAccountStorageArtifacts({
+			path: params.path,
+			resetMarkerPath: params.resetMarkerPath,
+			walPath: params.walPath,
+			backupPaths: await params.getBackupPaths(),
+			logError: params.logError,
+		});
+	});
+}

test/account-clear-entry.test.ts

@@ -0,0 +1,25 @@
+import { describe, expect, it, vi } from "vitest";
+import { clearAccountsEntry } from "../lib/storage/account-clear-entry.js";
+
+describe("account clear entry", () => {
+	it("delegates clear through the storage lock and backup resolver", async () => {
+		const clearAccountStorageArtifacts = vi.fn(async () => undefined);
+		await clearAccountsEntry({
+			path: "/tmp/accounts.json",
+			withStorageLock: async (fn) => fn(),
+			resetMarkerPath: "/tmp/accounts.reset-intent",
+			walPath: "/tmp/accounts.wal",
+			getBackupPaths: async () => ["/tmp/accounts.json.bak"],
+			clearAccountStorageArtifacts,
+			logError: vi.fn(),
+		});
+
+		expect(clearAccountStorageArtifacts).toHaveBeenCalledWith({
+			path: "/tmp/accounts.json",
+			resetMarkerPath: "/tmp/accounts.reset-intent",
+			walPath: "/tmp/accounts.wal",
+			backupPaths: ["/tmp/accounts.json.bak"],
+			logError: expect.any(Function),
+		});
+	});
+});