test(windows): reuse rmWithRetries in watcher suites

Author: PatrickSys

tests/auto-refresh-e2e.test.ts

@@ -5,6 +5,7 @@ import path from 'path';
 import { startFileWatcher } from '../src/core/file-watcher.js';
 import { createAutoRefreshController } from '../src/core/auto-refresh.js';
 import { CodebaseIndexer } from '../src/core/indexer.js';
+import { rmWithRetries } from './test-helpers.js';
 import {
   CODEBASE_CONTEXT_DIRNAME,
   KEYWORD_INDEX_FILENAME
@@ -72,7 +73,7 @@ describe('Auto-refresh E2E', () => {
   });
 
   afterEach(async () => {
-    await fs.rm(tempDir, { recursive: true, force: true });
+    await rmWithRetries(tempDir);
   });
 
   it('updates index after a file edit without manual refresh_index', async () => {

tests/file-watcher.test.ts

@@ -3,6 +3,7 @@ import { promises as fs } from 'fs';
 import path from 'path';
 import os from 'os';
 import { startFileWatcher } from '../src/core/file-watcher.js';
+import { rmWithRetries } from './test-helpers.js';
 
 describe('FileWatcher', () => {
   let tempDir: string;
@@ -12,7 +13,7 @@ describe('FileWatcher', () => {
   });
 
   afterEach(async () => {
-    await fs.rm(tempDir, { recursive: true, force: true });
+    await rmWithRetries(tempDir);
   });
 
   it('triggers onChanged after debounce window', async () => {

tests/impact-2hop.test.ts

@@ -5,6 +5,7 @@ import path from 'path';
 import { CodebaseIndexer } from '../src/core/indexer.js';
 import { dispatchTool } from '../src/tools/index.js';
 import type { ToolContext } from '../src/tools/types.js';
+import { rmWithRetries } from './test-helpers.js';
 import {
   CODEBASE_CONTEXT_DIRNAME,
   INTELLIGENCE_FILENAME,
@@ -18,24 +19,6 @@ describe('Impact candidates (2-hop)', () => {
   let tempRoot: string | null = null;
   const token = 'UNIQUETOKEN123';
 
-  async function rmWithRetries(targetPath: string): Promise<void> {
-    const maxAttempts = 8;
-    let delayMs = 25;
-
-    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-      try {
-        await fs.rm(targetPath, { recursive: true, force: true });
-        return;
-      } catch (error) {
-        const code = (error as { code?: string }).code;
-        const retryable = code === 'ENOTEMPTY' || code === 'EPERM' || code === 'EBUSY';
-        if (!retryable || attempt === maxAttempts) throw error;
-        await new Promise((r) => setTimeout(r, delayMs));
-        delayMs *= 2;
-      }
-    }
-  }
-
   beforeEach(async () => {
     tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'impact-2hop-'));
     const srcDir = path.join(tempRoot, 'src');

tests/search-snippets.test.ts

@@ -3,28 +3,11 @@ import { promises as fs } from 'fs';
 import os from 'os';
 import path from 'path';
 import { CodebaseIndexer } from '../src/core/indexer.js';
+import { rmWithRetries } from './test-helpers.js';
 
 describe('Search Snippets with Scope Headers', () => {
   let tempRoot: string | null = null;
 
-  async function rmWithRetries(targetPath: string): Promise<void> {
-    const maxAttempts = 8;
-    let delayMs = 25;
-
-    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-      try {
-        await fs.rm(targetPath, { recursive: true, force: true });
-        return;
-      } catch (error) {
-        const code = (error as { code?: string }).code;
-        const retryable = code === 'ENOTEMPTY' || code === 'EPERM' || code === 'EBUSY';
-        if (!retryable || attempt === maxAttempts) throw error;
-        await new Promise((r) => setTimeout(r, delayMs));
-        delayMs *= 2;
-      }
-    }
-  }
-
   beforeEach(async () => {
     vi.resetModules();
     tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'search-snippets-test-'));

tests/test-helpers.ts

@@ -0,0 +1,19 @@
+import { promises as fs } from 'fs';
+
+export async function rmWithRetries(targetPath: string): Promise<void> {
+  const maxAttempts = 8;
+  let delayMs = 25;
+
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      await fs.rm(targetPath, { recursive: true, force: true });
+      return;
+    } catch (error) {
+      const code = (error as { code?: string }).code;
+      const retryable = code === 'ENOTEMPTY' || code === 'EPERM' || code === 'EBUSY';
+      if (!retryable || attempt === maxAttempts) throw error;
+      await new Promise((resolve) => setTimeout(resolve, delayMs));
+      delayMs *= 2;
+    }
+  }
+}