From 83cfb6112ca8945d400ec3ec606932d7207096fa Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Mon, 22 Jun 2026 22:07:37 +0800 Subject: [PATCH] chore(deadcode): remove stale session test facades --- src/config/sessions/delivery-info.test.ts | 4 ++-- src/config/sessions/delivery-info.ts | 1 - src/config/sessions/store-writer.test.ts | 13 +++++-------- src/config/sessions/store-writer.ts | 8 -------- src/config/sessions/store.ts | 1 - src/test-utils/session-state-cleanup.test.ts | 4 ++-- 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/config/sessions/delivery-info.test.ts b/src/config/sessions/delivery-info.test.ts index 7d6b5085bc7..0d86b9b7ba0 100644 --- a/src/config/sessions/delivery-info.test.ts +++ b/src/config/sessions/delivery-info.test.ts @@ -2,6 +2,7 @@ import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { setActivePluginRegistry } from "../../plugins/runtime.js"; import { createSessionConversationTestRegistry } from "../../test-utils/session-conversation-registry.js"; +import { parseSessionThreadInfo } from "./thread-info.js"; import type { SessionEntry } from "./types.js"; const storeState = vi.hoisted(() => { @@ -37,7 +38,6 @@ vi.mock("./targets.js", () => ({ })); let extractDeliveryInfo: typeof import("./delivery-info.js").extractDeliveryInfo; -let parseSessionThreadInfo: typeof import("./delivery-info.js").parseSessionThreadInfo; const buildEntry = (deliveryContext: SessionEntry["deliveryContext"]): SessionEntry => ({ sessionId: "session-1", @@ -46,7 +46,7 @@ const buildEntry = (deliveryContext: SessionEntry["deliveryContext"]): SessionEn }); beforeAll(async () => { - ({ extractDeliveryInfo, parseSessionThreadInfo } = await import("./delivery-info.js")); + ({ extractDeliveryInfo } = await import("./delivery-info.js")); }); beforeEach(() => { diff --git a/src/config/sessions/delivery-info.ts b/src/config/sessions/delivery-info.ts index 9cead0c2118..7ad00a21ff0 100644 --- a/src/config/sessions/delivery-info.ts +++ b/src/config/sessions/delivery-info.ts @@ -19,7 +19,6 @@ import { readSessionStoreSnapshot } from "./store.js"; import { resolveAllAgentSessionStoreTargetsSync } from "./targets.js"; import { parseSessionThreadInfo } from "./thread-info.js"; import type { SessionEntry } from "./types.js"; -export { parseSessionThreadInfo }; function hasRoutableDeliveryContext(context?: { channel?: string; diff --git a/src/config/sessions/store-writer.test.ts b/src/config/sessions/store-writer.test.ts index e6fd64fdbee..1cd370f6932 100644 --- a/src/config/sessions/store-writer.test.ts +++ b/src/config/sessions/store-writer.test.ts @@ -1,11 +1,8 @@ // Session store writer tests cover serialized session writes and cleanup. import { afterEach, describe, expect, it } from "vitest"; import { createDeferred } from "../../test-utils/deferred.js"; -import { - clearSessionStoreCacheForTest, - getSessionStoreWriterQueueSizeForTest, - withSessionStoreWriterForTest, -} from "./store.js"; +import { runExclusiveSessionStoreWrite } from "./store-writer.js"; +import { clearSessionStoreCacheForTest, getSessionStoreWriterQueueSizeForTest } from "./store.js"; describe("session store writer", () => { afterEach(() => { @@ -18,13 +15,13 @@ describe("session store writer", () => { const releaseFirst = createDeferred(); const order: string[] = []; - const first = withSessionStoreWriterForTest(storePath, async () => { + const first = runExclusiveSessionStoreWrite(storePath, async () => { order.push("first:start"); firstStarted.resolve(); await releaseFirst.promise; order.push("first:end"); }); - const second = withSessionStoreWriterForTest(storePath, async () => { + const second = runExclusiveSessionStoreWrite(storePath, async () => { order.push("second"); }); @@ -40,7 +37,7 @@ describe("session store writer", () => { }); it("rejects empty store paths before enqueuing work", async () => { - await expect(withSessionStoreWriterForTest("", async () => undefined)).rejects.toThrow( + await expect(runExclusiveSessionStoreWrite("", async () => undefined)).rejects.toThrow( /storePath must be a non-empty string/, ); expect(getSessionStoreWriterQueueSizeForTest()).toBe(0); diff --git a/src/config/sessions/store-writer.ts b/src/config/sessions/store-writer.ts index 967cd424756..a015566821f 100644 --- a/src/config/sessions/store-writer.ts +++ b/src/config/sessions/store-writer.ts @@ -2,14 +2,6 @@ import { runQueuedStoreWrite } from "../../shared/store-writer-queue.js"; import { WRITER_QUEUES } from "./store-writer-state.js"; -/** Runs a callback under the same per-store writer queue used in production. */ -export async function withSessionStoreWriterForTest( - storePath: string, - fn: () => Promise, -): Promise { - return await runExclusiveSessionStoreWrite(storePath, fn); -} - export async function runExclusiveSessionStoreWrite( storePath: string, fn: () => Promise, diff --git a/src/config/sessions/store.ts b/src/config/sessions/store.ts index 8441777f3af..4b07e5027ce 100644 --- a/src/config/sessions/store.ts +++ b/src/config/sessions/store.ts @@ -82,7 +82,6 @@ export { drainSessionStoreWriterQueuesForTest, getSessionStoreWriterQueueSizeForTest, } from "./store-writer-state.js"; -export { withSessionStoreWriterForTest } from "./store-writer.js"; export { loadSessionStore, readSessionEntries, diff --git a/src/test-utils/session-state-cleanup.test.ts b/src/test-utils/session-state-cleanup.test.ts index 16f6a5c3b3c..f7d8f04b206 100644 --- a/src/test-utils/session-state-cleanup.test.ts +++ b/src/test-utils/session-state-cleanup.test.ts @@ -4,10 +4,10 @@ import os from "node:os"; import path from "node:path"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { resetSessionWriteLockStateForTest } from "../agents/session-write-lock.js"; +import { runExclusiveSessionStoreWrite } from "../config/sessions/store-writer.js"; import { clearSessionStoreCacheForTest, getSessionStoreWriterQueueSizeForTest, - withSessionStoreWriterForTest, } from "../config/sessions/store.js"; import { resetFileLockStateForTest } from "../infra/file-lock.js"; import { createDeferred } from "./deferred.js"; @@ -67,7 +67,7 @@ describe("cleanupSessionStateForTest", () => { }); let running: Promise | undefined; try { - running = withSessionStoreWriterForTest(storePath, async () => { + running = runExclusiveSessionStoreWrite(storePath, async () => { started.resolve(); await release.promise; });