test: fix EBUSY database lock failures on Windows during teardown

packages/cli/src/commands/migrate.test.ts

@@ -183,7 +183,13 @@ function makeCortexkitDb() {
 
 afterEach(() => {
     for (const db of databases.splice(0)) db.close();
-    for (const dir of tempDirs.splice(0)) rmSync(dir, { recursive: true, force: true });
+    for (const dir of tempDirs.splice(0)) {
+        try {
+            rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            // Ignore EBUSY on Windows
+        }
+    }
 });
 
 describe("migrateOpenCodeSessionToPi", () => {

packages/plugin/src/config/index.test.ts

@@ -42,8 +42,16 @@ function loadWithUserConfig(configText: string, extraEnv: Record<string, string>
             if (v === undefined) delete process.env[k];
             else process.env[k] = v;
         }
-        rmSync(xdg, { recursive: true, force: true });
-        rmSync(projectDir, { recursive: true, force: true });
+        try {
+            rmSync(xdg, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            /* Ignore EBUSY on Windows */
+        }
+        try {
+            rmSync(projectDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            /* Ignore EBUSY on Windows */
+        }
     }
 }
 
@@ -81,8 +89,16 @@ function loadWithUserAndProjectConfig(
             if (v === undefined) delete process.env[k];
             else process.env[k] = v;
         }
-        rmSync(xdg, { recursive: true, force: true });
-        rmSync(projectDir, { recursive: true, force: true });
+        try {
+            rmSync(xdg, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            /* Ignore EBUSY on Windows */
+        }
+        try {
+            rmSync(projectDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            /* Ignore EBUSY on Windows */
+        }
     }
 }
 

packages/plugin/src/config/variable.test.ts

@@ -14,7 +14,11 @@ describe("substituteConfigVariables", () => {
     });
 
     afterEach(() => {
-        rmSync(tmpDir, { recursive: true, force: true });
+        try {
+            rmSync(tmpDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            /* Ignore EBUSY on Windows */
+        }
         process.env = { ...ORIGINAL_ENV };
     });
 

packages/plugin/src/features/magic-context/boundary-execution-cas-race.test.ts

@@ -5,6 +5,7 @@ import { mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { Database } from "../../shared/sqlite";
+import { closeQuietly } from "../../shared/sqlite-helpers";
 import {
     type DeferredExecutePayload,
     peekDeferredExecutePending,
@@ -50,16 +51,22 @@ function payload(id: string): DeferredExecutePayload {
 describe("deferred execute CAS race", () => {
     it("15. one WAL handle wins set-if-absent and the other no-ops", () => {
         const dir = mkdtempSync(join(tmpdir(), "boundary-exec-race-"));
+        const path = join(dir, "context.db");
+        const a = createRaceDb(path);
+        const b = createRaceDb(path);
         try {
-            const path = join(dir, "context.db");
-            const a = createRaceDb(path);
-            const b = createRaceDb(path);
             const first = setDeferredExecutePendingIfAbsent(a, "s1", payload("a"));
             const second = setDeferredExecutePendingIfAbsent(b, "s1", payload("b"));
             expect([first, second].filter(Boolean)).toHaveLength(1);
             expect(peekDeferredExecutePending(a, "s1")?.id).toBe(first ? "a" : "b");
         } finally {
-            rmSync(dir, { recursive: true, force: true });
+            closeQuietly(a);
+            closeQuietly(b);
+            try {
+                rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+            } catch {
+                // Ignore EBUSY on Windows
+            }
         }
     });
 });

packages/plugin/src/features/magic-context/compartment-lease.test.ts

@@ -43,10 +43,12 @@ describe("compartment state lease", () => {
         const db = makeDb();
         const first = acquireCompartmentLease(db, "ses", "holder-a");
         expect(first).not.toBeNull();
+
         db.prepare("UPDATE compartment_state_lease SET expires_at = ? WHERE session_id = ?").run(
             Date.now() + 1_000,
             "ses",
         );
+
         const second = acquireCompartmentLease(db, "ses", "holder-a");
         expect(second).not.toBeNull();
         expect(second!.expiresAt).toBeGreaterThan(first!.acquiredAt + 1_000);
@@ -56,10 +58,12 @@ describe("compartment state lease", () => {
     it("lets another holder reclaim an expired lease", () => {
         const db = makeDb();
         expect(acquireCompartmentLease(db, "ses", "holder-a")).not.toBeNull();
+
         db.prepare("UPDATE compartment_state_lease SET expires_at = ? WHERE session_id = ?").run(
             Date.now() - 1,
             "ses",
         );
+
         expect(acquireCompartmentLease(db, "ses", "holder-b")).not.toBeNull();
         expect(isCompartmentLeaseHeld(db, "ses", "holder-b")).toBe(true);
         expect(isCompartmentLeaseHeld(db, "ses", "holder-a")).toBe(false);
@@ -70,6 +74,7 @@ describe("compartment state lease", () => {
         const db = makeDb();
         expect(acquireCompartmentLease(db, "ses", "holder-a")).not.toBeNull();
         expect(renewCompartmentLease(db, "ses", "holder-b")).toBe(false);
+
         db.prepare("UPDATE compartment_state_lease SET expires_at = ? WHERE session_id = ?").run(
             Date.now() - 1,
             "ses",
@@ -81,10 +86,12 @@ describe("compartment state lease", () => {
     it("release is a no-op after another holder reclaims the row", () => {
         const db = makeDb();
         expect(acquireCompartmentLease(db, "ses", "holder-a")).not.toBeNull();
+
         db.prepare("UPDATE compartment_state_lease SET expires_at = ? WHERE session_id = ?").run(
             Date.now() - 1,
             "ses",
         );
+
         expect(acquireCompartmentLease(db, "ses", "holder-b")).not.toBeNull();
         releaseCompartmentLease(db, "ses", "holder-a");
         expect(isCompartmentLeaseHeld(db, "ses", "holder-b")).toBe(true);
@@ -105,7 +112,11 @@ describe("compartment state lease", () => {
         } finally {
             closeQuietly(dbA);
             closeQuietly(dbB);
-            rmSync(dir, { recursive: true, force: true });
+            try {
+                rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+            } catch {
+                // Ignore EBUSY on Windows
+            }
         }
     });
 
@@ -114,10 +125,13 @@ describe("compartment state lease", () => {
         const path = join(dir, "context.db");
         const setup = makeDb(path);
         closeQuietly(setup);
+
         try {
-            const pluginRoot = process.cwd().endsWith("/packages/plugin")
-                ? process.cwd()
-                : join(process.cwd(), "packages", "plugin");
+            const projectRoot = process.cwd().includes("packages")
+                ? join(process.cwd(), "..", "..")
+                : process.cwd();
+            const pluginRoot = join(projectRoot, "packages", "plugin");
+
             const script = `
                 const sqlite = await import(${JSON.stringify(`file://${pluginRoot}/src/shared/sqlite.ts`)});
                 const storageDb = await import(${JSON.stringify(`file://${pluginRoot}/src/features/magic-context/storage-db.ts`)});
@@ -128,13 +142,18 @@ describe("compartment state lease", () => {
                 db.close();
                 console.log(JSON.stringify({ ok }));
             `;
+
             const [a, b] = await Promise.all([
                 $`bun -e ${script} holder-a`.json() as Promise<{ ok: boolean }>,
                 $`bun -e ${script} holder-b`.json() as Promise<{ ok: boolean }>,
             ]);
             expect([a.ok, b.ok].filter(Boolean)).toHaveLength(1);
         } finally {
-            rmSync(dir, { recursive: true, force: true });
+            try {
+                rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+            } catch {
+                // Ignore EBUSY on Windows
+            }
         }
     });
 });

packages/plugin/src/features/magic-context/compartment-storage-v6.test.ts

@@ -16,7 +16,13 @@ function useTempDataHome(prefix: string): string {
 
 afterEach(() => {
     closeDatabase();
-    for (const dir of tempDirs) rmSync(dir, { recursive: true, force: true });
+    for (const dir of tempDirs) {
+        try {
+            rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            // Ignore EBUSY on Windows
+        }
+    }
     tempDirs.length = 0;
     process.env.XDG_DATA_HOME = undefined;
 });

packages/plugin/src/features/magic-context/compression-depth-storage.test.ts

@@ -31,7 +31,11 @@ afterEach(() => {
     process.env.XDG_DATA_HOME = originalXdgDataHome;
 
     for (const dir of tempDirs) {
-        rmSync(dir, { recursive: true, force: true });
+        try {
+            rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            /* Ignore EBUSY on Windows */
+        }
     }
     tempDirs.length = 0;
 });

packages/plugin/src/features/magic-context/key-files/project-key-files.test.ts

@@ -30,7 +30,12 @@ const originalHome = process.env.HOME;
 afterEach(() => {
     setAftAvailabilityOverride(null);
     process.env.HOME = originalHome;
-    for (const dir of tempDirs) rmSync(dir, { recursive: true, force: true });
+    for (const dir of tempDirs)
+        try {
+            rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            /* Ignore EBUSY on Windows */
+        }
     tempDirs.length = 0;
 });
 

packages/plugin/src/features/magic-context/memory/embedding.test.ts

@@ -132,7 +132,11 @@ describe("embedding module", () => {
             _resetEmbeddingSweepGuard();
             process.env.XDG_DATA_HOME = originalXdgDataHome;
             for (const dir of tempDirs) {
-                rmSync(dir, { recursive: true, force: true });
+                try {
+                    rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+                } catch {
+                    /* Ignore EBUSY on Windows */
+                }
             }
             tempDirs.length = 0;
         });

packages/plugin/src/features/magic-context/migrations-v11.test.ts

@@ -1,3 +1,5 @@
+/// <reference types="bun-types" />
+
 import { afterEach, describe, expect, test } from "bun:test";
 import { mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
@@ -27,7 +29,13 @@ function useTempDataHome(prefix: string): string {
 
 afterEach(() => {
     closeDatabase();
-    for (const dir of tempDirs) rmSync(dir, { recursive: true, force: true });
+    for (const dir of tempDirs) {
+        try {
+            rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            // Ignore EBUSY on Windows where closeDatabase doesn't synchronously release locks
+        }
+    }
     tempDirs.length = 0;
     process.env.XDG_DATA_HOME = undefined;
 });

packages/plugin/src/features/magic-context/migrations-v12.test.ts

@@ -21,7 +21,13 @@ function count(db: Database, table: string): number {
 
 afterEach(() => {
     closeDatabase();
-    for (const dir of tempDirs) rmSync(dir, { recursive: true, force: true });
+    for (const dir of tempDirs) {
+        try {
+            rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            // Ignore EBUSY on Windows
+        }
+    }
     tempDirs.length = 0;
     process.env.XDG_DATA_HOME = undefined;
 });

packages/plugin/src/features/magic-context/migrations-v13.test.ts

@@ -22,7 +22,13 @@ function useTempDataHome(prefix: string): string {
 
 afterEach(() => {
     closeDatabase();
-    for (const dir of tempDirs) rmSync(dir, { recursive: true, force: true });
+    for (const dir of tempDirs) {
+        try {
+            rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            // Ignore EBUSY on Windows
+        }
+    }
     tempDirs.length = 0;
     process.env.XDG_DATA_HOME = undefined;
 });

packages/plugin/src/features/magic-context/migrations-v16.test.ts

@@ -14,7 +14,13 @@ function useTempDataHome(prefix: string): void {
 
 afterEach(() => {
     closeDatabase();
-    for (const dir of tempDirs) rmSync(dir, { recursive: true, force: true });
+    for (const dir of tempDirs) {
+        try {
+            rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            // Ignore EBUSY on Windows
+        }
+    }
     tempDirs.length = 0;
     process.env.XDG_DATA_HOME = undefined;
 });

packages/plugin/src/features/magic-context/migrations-v18-pi-marker.test.ts

@@ -21,7 +21,13 @@ function useTempDataHome(prefix: string): void {
 
 afterEach(() => {
     closeDatabase();
-    for (const dir of tempDirs) rmSync(dir, { recursive: true, force: true });
+    for (const dir of tempDirs) {
+        try {
+            rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            // Ignore EBUSY on Windows
+        }
+    }
     tempDirs.length = 0;
     process.env.XDG_DATA_HOME = undefined;
 });

packages/plugin/src/features/magic-context/migrations-v20.test.ts

@@ -21,7 +21,11 @@ describe("migration v20", () => {
         } finally {
             closeDatabase();
             process.env.XDG_DATA_HOME = undefined;
-            rmSync(dir, { recursive: true, force: true });
+            try {
+                rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+            } catch {
+                // Ignore EBUSY on Windows
+            }
         }
     });
 });

packages/plugin/src/features/magic-context/migrations-v21.test.ts

@@ -20,7 +20,11 @@ describe("migration v21", () => {
         } finally {
             closeDatabase();
             process.env.XDG_DATA_HOME = undefined;
-            rmSync(dir, { recursive: true, force: true });
+            try {
+                rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+            } catch {
+                // Ignore EBUSY on Windows
+            }
         }
     });
 });

packages/plugin/src/features/magic-context/project-embedding-registry.test.ts

@@ -64,7 +64,11 @@ describe("project embedding registry", () => {
         closeDatabase();
         process.env.XDG_DATA_HOME = originalXdgDataHome;
         for (const dir of tempDirs) {
-            rmSync(dir, { recursive: true, force: true });
+            try {
+                rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+            } catch {
+                /* Ignore EBUSY on Windows */
+            }
         }
         tempDirs.length = 0;
     });

packages/plugin/src/features/magic-context/resolve-subagent-fallback.test.ts

@@ -51,7 +51,11 @@ describe("resolveIsSubagentFromOpenCodeDb", () => {
         } else {
             process.env.XDG_DATA_HOME = originalXdg;
         }
-        rmSync(tempDir, { recursive: true, force: true });
+        try {
+            rmSync(tempDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+        } catch {
+            /* Ignore EBUSY on Windows */
+        }
     });
 
     it("returns true for a child session with a non-empty parent_id", () => {