Wrap concurrent tests with process-global test lock

Add sessionPromptTest and settingsTest helpers wrapping Deno.test with withProcessGlobalTestLock to prevent parallel test interference from HOME/env mutations.\n\n- Remove stale cleanupLocalCatalogFixtures calls in session-catalog\n- Remove redundant write-version.js check in ACP server test\n- Add JSDoc type annotation in worktree test

Author: gandazgul

src/acp/server.test.js

@@ -180,13 +180,6 @@ Deno.test("ACP server diagnostics stay out of protocol output", async () => {
 });
 
 Deno.test("CLI --mode acp routes to ACP stdio without stdout diagnostics", async () => {
-    const versionResult = await new Deno.Command(Deno.execPath(), {
-        args: ["run", "-A", "scripts/write-version.js"],
-        stdout: "null",
-        stderr: "null",
-    }).output();
-    assertEquals(versionResult.code, 0);
-
     const child = new Deno.Command(Deno.execPath(), {
         args: ["run", "-A", "src/cli.js", "--mode", "acp"],
         stdin: "piped",

src/shared/owner-coordination/sessions.test.js

@@ -1,4 +1,5 @@
 import { assert, assertEquals, assertRejects } from "@std/assert";
+import { withProcessGlobalTestLock } from "../../testing/process-global-lock.js";
 import { getRunWieldSessionDir } from "../session/root-session.js";
 import { openOwnerCoordinationDatabase } from "./database.js";
 import { registerProject } from "./projects.js";
@@ -39,41 +40,46 @@ async function writeTranscript(cwd, piSessionId, options = {}) {
 }
 
 Deno.test("Session listing lazily catalogs legacy transcripts without storing message bodies", async () => {
-    const previousHome = Deno.env.get("HOME");
-    const dir = await Deno.makeTempDir({ prefix: "runwield-session-catalog-" });
-    Deno.env.set("HOME", dir);
-    const database = openOwnerCoordinationDatabase({ dbPath: `${dir}/owner.sqlite3` });
-    try {
-        const root = `${dir}/repo`;
-        await Deno.mkdir(root);
-        const project = registerProject(database, { root, idFactory: idFactory(), now: () => "t1" });
-        const transcriptPath = await writeTranscript(root, "pi-1", {
-            body: JSON.stringify({ type: "message", message: { content: [{ type: "text", text: "secret body" }] } }),
-        });
-        const before = await Deno.stat(transcriptPath);
-        const result = await listProjectSessions(database, project.projectId, {
-            idFactory: idFactory(),
-            now: () => "t2",
-        });
-        const after = await Deno.stat(transcriptPath);
+    await withProcessGlobalTestLock(async () => {
+        const previousHome = Deno.env.get("HOME");
+        const dir = await Deno.makeTempDir({ prefix: "runwield-session-catalog-" });
+        Deno.env.set("HOME", dir);
+        const database = openOwnerCoordinationDatabase({ dbPath: `${dir}/owner.sqlite3` });
+        try {
+            const root = `${dir}/repo`;
+            await Deno.mkdir(root);
+            const project = registerProject(database, { root, idFactory: idFactory(), now: () => "t1" });
+            const transcriptPath = await writeTranscript(root, "pi-1", {
+                body: JSON.stringify({
+                    type: "message",
+                    message: { content: [{ type: "text", text: "secret body" }] },
+                }),
+            });
+            const before = await Deno.stat(transcriptPath);
+            const result = await listProjectSessions(database, project.projectId, {
+                idFactory: idFactory(),
+                now: () => "t2",
+            });
+            const after = await Deno.stat(transcriptPath);
 
-        assertEquals(result.diagnostics, []);
-        assertEquals(result.sessions.length, 1);
-        assertEquals(result.sessions[0].projectId, project.projectId);
-        assertEquals(result.sessions[0].piSessionId, "pi-1");
-        assertEquals(result.sessions[0].transcriptPath, transcriptPath);
-        assertEquals(before.mtime?.getTime(), after.mtime?.getTime());
+            assertEquals(result.diagnostics, []);
+            assertEquals(result.sessions.length, 1);
+            assertEquals(result.sessions[0].projectId, project.projectId);
+            assertEquals(result.sessions[0].piSessionId, "pi-1");
+            assertEquals(result.sessions[0].transcriptPath, transcriptPath);
+            assertEquals(before.mtime?.getTime(), after.mtime?.getTime());
 
-        const rows = database.handle.prepare("SELECT display_name FROM runwield_sessions").all();
-        assertEquals(rows, [{ display_name: null }]);
-        const raw = JSON.stringify(database.handle.prepare("SELECT * FROM session_transcript_locators").all());
-        assert(!raw.includes("secret body"));
-    } finally {
-        database.close();
-        if (previousHome === undefined) Deno.env.delete("HOME");
-        else Deno.env.set("HOME", previousHome);
-        await Deno.remove(dir, { recursive: true });
-    }
+            const rows = database.handle.prepare("SELECT display_name FROM runwield_sessions").all();
+            assertEquals(rows, [{ display_name: null }]);
+            const raw = JSON.stringify(database.handle.prepare("SELECT * FROM session_transcript_locators").all());
+            assert(!raw.includes("secret body"));
+        } finally {
+            database.close();
+            if (previousHome === undefined) Deno.env.delete("HOME");
+            else Deno.env.set("HOME", previousHome);
+            await Deno.remove(dir, { recursive: true });
+        }
+    });
 });
 
 Deno.test("Session catalog scans registered symlink alias session directories", async () => {

src/shared/session/session-catalog.test.js

@@ -16,15 +16,7 @@ import { HostedSession } from "./hosted-session.js";
 import { getAgentDisplayName, listAvailableAgents } from "./agents.js";
 import { getCustomSetting } from "../settings.js";
 import { loadPlan } from "../../plan-store.js";
-
-const localPromptsDir = join(Deno.cwd(), ".wld", "prompts");
-const localSkillsDir = join(Deno.cwd(), ".wld", "skills");
-
-async function cleanupLocalCatalogFixtures() {
-    await Deno.remove(join(localPromptsDir, "code-review.md")).catch(() => {});
-    await Deno.remove(join(localPromptsDir, "coverage-local.md")).catch(() => {});
-    await Deno.remove(join(localSkillsDir, "coverage-skill"), { recursive: true }).catch(() => {});
-}
+import { withProcessGlobalTestLock } from "../../testing/process-global-lock.js";
 
 Deno.test("two project roots keep local catalogs settings and Plans isolated", async () => {
     const alpha = await Deno.makeTempDir({ prefix: "runwield-project-alpha-" });
@@ -185,7 +177,6 @@ Deno.test("expandPromptTemplate strips front matter and appends user instruction
 });
 
 Deno.test("listSkills and expandSkillCommand read local skill definitions", async () => {
-    await cleanupLocalCatalogFixtures();
     const projectRoot = await Deno.makeTempDir({ prefix: "runwield-local-skill-" });
     const skillName = `coverage-skill-${crypto.randomUUID()}`;
     const skillDir = join(projectRoot, ".wld", "skills", skillName);
@@ -221,12 +212,10 @@ Deno.test("listSkills and expandSkillCommand read local skill definitions", asyn
         );
     } finally {
         await Deno.remove(projectRoot, { recursive: true }).catch(() => {});
-        await cleanupLocalCatalogFixtures();
     }
 });
 
 Deno.test("listSkills advertises bundled skills from the runtime-readable cache", async () => {
-    await cleanupLocalCatalogFixtures();
     const skills = await listSkills();
     const ketch = skills.find((item) => item.name === "ketch");
 
@@ -285,72 +274,72 @@ Deno.test("readGlobalAgentMd falls through configured global instruction paths",
 });
 
 Deno.test("assembleFinalSystemPrompt fills tools, instruction files, skills, and bundled paths", async () => {
-    await cleanupLocalCatalogFixtures();
-    const originalHome = Deno.env.get("HOME");
-    const tempHome = await Deno.makeTempDir({ prefix: "runwield-assemble-prompt-" });
-    const projectRoot = await Deno.makeTempDir({ prefix: "runwield-assemble-project-" });
-    const projectHarnessPath = join(projectRoot, "RUNWIELD.md");
-    const skillName = `coverage-skill-${crypto.randomUUID()}`;
-    const skillDir = join(projectRoot, ".wld", "skills", skillName);
-    const skillPath = join(skillDir, "SKILL.md");
-
-    try {
-        Deno.env.set("HOME", tempHome);
-        await Deno.mkdir(join(tempHome, ".wld"), { recursive: true });
-        await Deno.writeTextFile(join(tempHome, ".wld", "RUNWIELD.md"), "Global prompt context");
-        await Deno.writeTextFile(projectHarnessPath, "Project prompt context");
-        await Deno.mkdir(skillDir, { recursive: true });
-        await Deno.writeTextFile(
-            skillPath,
-            [
-                "---",
-                `name: "${skillName}"`,
-                'description: "Available for prompt assembly"',
-                "---",
-                "Use this skill carefully.",
-            ].join("\n"),
-        );
-
-        const prompt = await assembleFinalSystemPrompt(
-            /** @type {any} */ ({
-                systemPrompt: [
-                    "Tools:",
-                    "{{AVAILABLE_TOOLS}}",
-                    "Global:",
-                    "{{GLOBAL_AGENTSMD}}",
-                    "Project:",
-                    "{{PROJECT_AGENTSMD}}",
-                    "Memories:",
-                    "{{MEMORIES}}",
-                    "Skills:",
-                    "{{SKILLS}}",
-                    "Bundled:",
-                    "{{BUNDLED_AGENT_DEFS_DIR}}",
+    await withProcessGlobalTestLock(async () => {
+        const originalHome = Deno.env.get("HOME");
+        const tempHome = await Deno.makeTempDir({ prefix: "runwield-assemble-prompt-" });
+        const projectRoot = await Deno.makeTempDir({ prefix: "runwield-assemble-project-" });
+        const projectHarnessPath = join(projectRoot, "RUNWIELD.md");
+        const skillName = `coverage-skill-${crypto.randomUUID()}`;
+        const skillDir = join(projectRoot, ".wld", "skills", skillName);
+        const skillPath = join(skillDir, "SKILL.md");
+
+        try {
+            Deno.env.set("HOME", tempHome);
+            await Deno.mkdir(join(tempHome, ".wld"), { recursive: true });
+            await Deno.writeTextFile(join(tempHome, ".wld", "RUNWIELD.md"), "Global prompt context");
+            await Deno.writeTextFile(projectHarnessPath, "Project prompt context");
+            await Deno.mkdir(skillDir, { recursive: true });
+            await Deno.writeTextFile(
+                skillPath,
+                [
+                    "---",
+                    `name: "${skillName}"`,
+                    'description: "Available for prompt assembly"',
+                    "---",
+                    "Use this skill carefully.",
                 ].join("\n"),
-            }),
-            ["read", "custom_tool", "unknown_tool"],
-            /** @type {any[]} */ ([{
-                name: "custom_tool",
-                description: "custom description",
-                promptSnippet: "custom snippet",
-            }]),
-            projectRoot,
-        );
+            );
 
-        assertStringIncludes(prompt, "- read -");
-        assertStringIncludes(prompt, "- custom_tool - custom snippet");
-        assertStringIncludes(prompt, "- unknown_tool - Built-in tool");
-        assertStringIncludes(prompt, "Global prompt context");
-        assertStringIncludes(prompt, "Project prompt context");
-        assertStringIncludes(prompt, `${skillName} - Available for prompt assembly (read: ${skillPath})`);
-        assertStringIncludes(prompt, "agent-definitions");
-    } finally {
-        if (originalHome === undefined) Deno.env.delete("HOME");
-        else Deno.env.set("HOME", originalHome);
-        await Deno.remove(tempHome, { recursive: true }).catch(() => {});
-        await Deno.remove(projectRoot, { recursive: true }).catch(() => {});
-        await cleanupLocalCatalogFixtures();
-    }
+            const prompt = await assembleFinalSystemPrompt(
+                /** @type {any} */ ({
+                    systemPrompt: [
+                        "Tools:",
+                        "{{AVAILABLE_TOOLS}}",
+                        "Global:",
+                        "{{GLOBAL_AGENTSMD}}",
+                        "Project:",
+                        "{{PROJECT_AGENTSMD}}",
+                        "Memories:",
+                        "{{MEMORIES}}",
+                        "Skills:",
+                        "{{SKILLS}}",
+                        "Bundled:",
+                        "{{BUNDLED_AGENT_DEFS_DIR}}",
+                    ].join("\n"),
+                }),
+                ["read", "custom_tool", "unknown_tool"],
+                /** @type {any[]} */ ([{
+                    name: "custom_tool",
+                    description: "custom description",
+                    promptSnippet: "custom snippet",
+                }]),
+                projectRoot,
+            );
+
+            assertStringIncludes(prompt, "- read -");
+            assertStringIncludes(prompt, "- custom_tool - custom snippet");
+            assertStringIncludes(prompt, "- unknown_tool - Built-in tool");
+            assertStringIncludes(prompt, "Global prompt context");
+            assertStringIncludes(prompt, "Project prompt context");
+            assertStringIncludes(prompt, `${skillName} - Available for prompt assembly (read: ${skillPath})`);
+            assertStringIncludes(prompt, "agent-definitions");
+        } finally {
+            if (originalHome === undefined) Deno.env.delete("HOME");
+            else Deno.env.set("HOME", originalHome);
+            await Deno.remove(tempHome, { recursive: true }).catch(() => {});
+            await Deno.remove(projectRoot, { recursive: true }).catch(() => {});
+        }
+    });
 });
 
 Deno.test("steerRootSession sends image content only while root is streaming", async () => {