fix(twitch): export clearRegistryForTest for cross-test isolation (#83887)

clawsweeper[bot] · clawsweeper[bot] · commit 38c3fadc9163 · 2026-05-20T00:20:08.000Z
Co-authored-by: hcl &lt;7755017+hclsys@users.noreply.github.com&gt;

Co-authored-by: clawsweeper[bot] &lt;274271284+clawsweeper[bot]@users.noreply.github.com&gt;
diff --git a/extensions/twitch/src/client-manager-registry.test.ts b/extensions/twitch/src/client-manager-registry.test.ts
@@ -16,18 +16,20 @@ function makeLogger(): ChannelLogSink {
 }
 
 describe("client manager registry", () => {
-  afterEach(() => {
-    clearRegistryForTest();
+  afterEach(async () => {
+    await clearRegistryForTest();
   });
 
-  it("clears cached managers for hot module test isolation", () => {
+  it("clears cached managers for hot module test isolation", async () => {
     const firstManager = getOrCreateClientManager("default", makeLogger());
+    const disconnectAll = vi.spyOn(firstManager, "disconnectAll");
 
     expect(getClientManager("default")).toBe(firstManager);
     expect(getOrCreateClientManager("default", makeLogger())).toBe(firstManager);
 
-    clearRegistryForTest();
+    await clearRegistryForTest();
 
+    expect(disconnectAll).toHaveBeenCalledOnce();
     expect(getClientManager("default")).toBeUndefined();
     expect(getOrCreateClientManager("default", makeLogger())).not.toBe(firstManager);
   });
diff --git a/extensions/twitch/src/client-manager-registry.ts b/extensions/twitch/src/client-manager-registry.ts
@@ -93,12 +93,17 @@ export async function removeClientManager(accountId: string): Promise<void> {
  * this, the module-level `registry` Map survives across tests when vitest
  * is run with `--isolate=false` (or any harness that does not tear the
  * module graph down between cases), and a stale entry from one test will
- * shadow `getOrCreateClientManager` calls in subsequent tests — silently
+ * shadow `getOrCreateClientManager` calls in subsequent tests, silently
  * handing back another test's mocked logger/manager. See #83887.
  *
- * Production code MUST NOT call this. It is safe to call when the registry
- * is empty (clear() is a no-op on an empty Map).
+ * Production code MUST NOT call this. It disconnects cached managers before
+ * clearing the registry so tests do not leave handlers or clients behind.
  */
-export function clearRegistryForTest(): void {
-  registry.clear();
+export async function clearRegistryForTest(): Promise<void> {
+  const entries = [...registry.values()];
+  try {
+    await Promise.all(entries.map((entry) => entry.manager.disconnectAll()));
+  } finally {
+    registry.clear();
+  }
 }
