From d8ad72bf8d4a21c9d533aa09dc69e2c38eb69ac9 Mon Sep 17 00:00:00 2001
From: Gustavo Madeira Santana <gumadeiras@gmail.com>
Date: Mon, 30 Mar 2026 00:14:40 -0400
Subject: [PATCH] Tests: stabilize session-state cleanup mocks

---
 src/test-utils/session-state-cleanup.test.ts | 32 ++++++++------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/test-utils/session-state-cleanup.test.ts b/src/test-utils/session-state-cleanup.test.ts
index 9c469a313c2..55a7ffa0e1e 100644
--- a/src/test-utils/session-state-cleanup.test.ts
+++ b/src/test-utils/session-state-cleanup.test.ts
@@ -2,28 +2,23 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  getSessionStoreLockQueueSizeForTest,
+  withSessionStoreLockForTest,
+} from "../config/sessions/store.js";
+import { cleanupSessionStateForTest } from "./session-state-cleanup.js";
 
 const acquireSessionWriteLockMock = vi.hoisted(() =>
   vi.fn(async () => ({ release: vi.fn(async () => {}) })),
 );
 
-let getSessionStoreLockQueueSizeForTest: typeof import("../config/sessions/store.js").getSessionStoreLockQueueSizeForTest;
-let withSessionStoreLockForTest: typeof import("../config/sessions/store.js").withSessionStoreLockForTest;
-let cleanupSessionStateForTest: typeof import("./session-state-cleanup.js").cleanupSessionStateForTest;
-
-async function loadFreshCleanupModules() {
-  vi.resetModules();
-  vi.doMock("../agents/session-write-lock.js", async (importOriginal) => {
-    const original = await importOriginal<typeof import("../agents/session-write-lock.js")>();
-    return {
-      ...original,
-      acquireSessionWriteLock: acquireSessionWriteLockMock,
-    };
-  });
-  ({ getSessionStoreLockQueueSizeForTest, withSessionStoreLockForTest } =
-    await import("../config/sessions/store.js"));
-  ({ cleanupSessionStateForTest } = await import("./session-state-cleanup.js"));
-}
+vi.mock("../agents/session-write-lock.js", async (importOriginal) => {
+  const original = await importOriginal<typeof import("../agents/session-write-lock.js")>();
+  return {
+    ...original,
+    acquireSessionWriteLock: acquireSessionWriteLockMock,
+  };
+});
 
 function createDeferred<T>() {
   let resolve!: (value: T | PromiseLike<T>) => void;
@@ -36,9 +31,8 @@ function createDeferred<T>() {
 }
 
 describe("cleanupSessionStateForTest", () => {
-  beforeEach(async () => {
+  beforeEach(() => {
     acquireSessionWriteLockMock.mockClear();
-    await loadFreshCleanupModules();
   });
 
   afterEach(async () => {