@opengsd/gsd-pi 1.2.0 → 1.3.0-dev.65546769

package/src/resources/extensions/gsd/tests/integration/merge-strategy-regular.test.ts

@@ -0,0 +1,157 @@
+// Integration regression for #549: merge_strategy: merge is not respected.
+//
+// mergeMilestoneToMain always called nativeMergeSquash regardless of the
+// git.merge_strategy preference. When a user set `merge_strategy: merge`
+// (to respect a global `merge.ff = false`), the squash path still ran.
+//
+// Fix (#549): an `effectiveStrategy` variable selects nativeMergeRegular
+// (--no-ff --no-commit) when merge_strategy === "merge", leaving MERGE_HEAD
+// so nativeCommit produces a real merge commit with two parents.
+//
+// These tests verify:
+//   1. merge_strategy: merge → merge commit topology (two parents on main).
+//   2. No merge_strategy set → squash commit topology (one parent on main).
+//   3. Error messages reference the correct strategy label ("Merge" vs
+//      "Squash merge") so users are not misled when a conflict or dirty-tree
+//      error occurs under the merge strategy.
+
+import { describe, test, afterEach } from "node:test";
+import assert from "node:assert/strict";
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  realpathSync,
+  rmSync,
+  writeFileSync,
+} from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { execSync } from "node:child_process";
+
+import { createAutoWorktree, mergeMilestoneToMain } from "../../auto-worktree.ts";
+import { closeDatabase } from "../../gsd-db.ts";
+import { getSliceBranchName } from "../../worktree.ts";
+
+function run(cmd: string, cwd: string): string {
+  // Safe: all inputs are hardcoded test strings, not user input
+  return execSync(cmd, {
+    cwd,
+    stdio: ["ignore", "pipe", "pipe"],
+    encoding: "utf-8",
+  }).trim();
+}
+
+function createTempRepo(): string {
+  const dir = realpathSync(mkdtempSync(join(tmpdir(), "merge-strategy-test-")));
+  run("git init", dir);
+  run("git config user.email test@test.com", dir);
+  run("git config user.name Test", dir);
+  run("git config core.autocrlf false", dir);
+  writeFileSync(join(dir, "README.md"), "# test\n");
+  mkdirSync(join(dir, ".gsd"), { recursive: true });
+  writeFileSync(join(dir, ".gsd", "STATE.md"), "# State\n");
+  run("git add .", dir);
+  run("git commit -m init", dir);
+  run("git branch -M main", dir);
+  return dir;
+}
+
+function makeRoadmap(milestoneId: string, title: string): string {
+  return `# ${milestoneId}: ${title}\n\n## Slices\n- [x] **S01: Feature**\n`;
+}
+
+function addSliceToMilestone(
+  repo: string,
+  wtPath: string,
+  milestoneId: string,
+  sliceId: string,
+  sliceTitle: string,
+  fileName: string,
+): void {
+  const normalizedPath = wtPath.replaceAll("\\", "/");
+  const marker = "/.gsd/worktrees/";
+  const idx = normalizedPath.indexOf(marker);
+  const worktreeName =
+    idx !== -1 ? normalizedPath.slice(idx + marker.length).split("/")[0] : null;
+
+  const sliceBranch = getSliceBranchName(milestoneId, sliceId, worktreeName);
+
+  run(`git checkout -b ${sliceBranch}`, wtPath);
+  writeFileSync(join(wtPath, fileName), `export const feature = true;\n`);
+  run("git add .", wtPath);
+  run(`git commit -m "feat: ${sliceTitle}"`, wtPath);
+  run(`git checkout milestone/${milestoneId}`, wtPath);
+  run(
+    `git merge --no-ff ${sliceBranch} -m "feat(${milestoneId}/${sliceId}): ${sliceTitle}"`,
+    wtPath,
+  );
+  run(`git branch -d ${sliceBranch}`, wtPath);
+}
+
+/** Number of parents of the most recent commit on a branch. */
+function parentCount(repo: string, branch: string): number {
+  const parents = run(`git log -1 --format=%P ${branch}`, repo);
+  return parents.trim() === "" ? 0 : parents.trim().split(/\s+/).length;
+}
+
+describe("mergeMilestoneToMain merge_strategy dispatch (#549)", { timeout: 300_000 }, () => {
+  const savedCwd = process.cwd();
+  const tempDirs: string[] = [];
+
+  function freshRepo(): string {
+    const d = createTempRepo();
+    tempDirs.push(d);
+    return d;
+  }
+
+  afterEach(() => {
+    process.chdir(savedCwd);
+    closeDatabase();
+    for (const d of tempDirs) {
+      if (existsSync(d)) rmSync(d, { recursive: true, force: true });
+    }
+    tempDirs.length = 0;
+  });
+
+  test("#549: merge_strategy: merge produces a true merge commit with two parents", () => {
+    const repo = freshRepo();
+
+    // Write project preferences with merge_strategy: merge
+    writeFileSync(
+      join(repo, ".gsd", "PREFERENCES.md"),
+      "---\nversion: 1\ngit:\n  merge_strategy: merge\n---\n",
+    );
+
+    const wtPath = createAutoWorktree(repo, "M549");
+    addSliceToMilestone(repo, wtPath, "M549", "S01", "Feature A", "feature-a.ts");
+
+    const roadmap = makeRoadmap("M549", "Merge strategy milestone");
+    mergeMilestoneToMain(repo, "M549", roadmap);
+
+    assert.equal(
+      parentCount(repo, "main"),
+      2,
+      "merge_strategy: merge must produce a true merge commit with 2 parents on main",
+    );
+    assert.ok(existsSync(join(repo, "feature-a.ts")), "feature-a.ts present on main");
+  });
+
+  test("default (no merge_strategy): squash commit has one parent on main", () => {
+    const repo = freshRepo();
+    // No PREFERENCES.md — default squash path
+
+    const wtPath = createAutoWorktree(repo, "M550");
+    addSliceToMilestone(repo, wtPath, "M550", "S01", "Feature B", "feature-b.ts");
+
+    const roadmap = makeRoadmap("M550", "Squash strategy milestone");
+    mergeMilestoneToMain(repo, "M550", roadmap);
+
+    assert.equal(
+      parentCount(repo, "main"),
+      1,
+      "default (squash) must produce a single-parent commit on main",
+    );
+    assert.ok(existsSync(join(repo, "feature-b.ts")), "feature-b.ts present on main");
+  });
+});

package/src/resources/extensions/gsd/tests/integration/run-uat.test.ts

@@ -317,6 +317,24 @@ test('(k2) run-uat prompt references gsd_uat_result_save, not direct write', ()
   );
 });
 
+test('(k3) run-uat prompt warns that .gsd glob misses can be symlink traversal artifacts', async () => {
+  const base = createFixtureBase();
+  try {
+    const uatRel = '.gsd/milestones/M001/slices/S01/S01-UAT.md';
+    const uatContent = makeUatContent('runtime-executable');
+    writeSliceFile(base, 'M001', 'S01', 'UAT', uatContent);
+
+    const prompt = await buildRunUatPrompt('M001', 'S01', uatRel, uatContent, base);
+
+    assert.match(prompt, /\.gsd\/\*\*/);
+    assert.match(prompt, /symlink-backed/i);
+    assert.match(prompt, /do not infer that the GSD harness is missing/i);
+    assert.match(prompt, /use the preloaded UAT context/i);
+  } finally {
+    cleanup(base);
+  }
+});
+
 test('(l) dispatch preconditions via resolveSliceFile', () => {
     const base = createFixtureBase();
     const uatContent = makeUatContent('artifact-driven');
@@ -731,6 +749,75 @@ test('(u) run-uat prompt promotes artifact-driven browser specs to browser-execu
     }
 });
 
+test('(w) run-uat prompt promotes browser-executable harness specs to runtime-executable (M006/S01)', async () => {
+    const base = createFixtureBase();
+    try {
+      const uatRel = '.gsd/milestones/M006/slices/S01/S01-UAT.md';
+      const uatContent = [
+        '# S01 UAT',
+        '',
+        '## UAT Type',
+        '- UAT mode: browser-executable',
+        '',
+        '## Preconditions',
+        '- Start the local app server with `npm run start`.',
+        '- Open the app at `http://127.0.0.1:4173`.',
+        '',
+        '## Evidence',
+        '- Fresh closeout verification command: `npm run test:uat`',
+      ].join('\n');
+      writeSliceFile(base, 'M006', 'S01', 'UAT', uatContent);
+
+      const prompt = await buildRunUatPrompt('M006', 'S01', uatRel, uatContent, base);
+
+      assert.match(prompt, /\*\*Detected UAT mode:\*\*\s*`runtime-executable`/);
+      assert.match(prompt, /uatType: "runtime-executable"/);
+      assert.match(prompt, /Runtime harness override/i);
+      assert.match(prompt, /Do \*\*not\*\* call `uat-service-start`/);
+      assert.doesNotMatch(prompt, /uatType: "browser-executable"/);
+    } finally {
+      cleanup(base);
+    }
+});
+
+test('(w2) run-uat prompt promotes harness from slice context when UAT only names test:server (M007/S01)', async () => {
+    const base = createFixtureBase();
+    try {
+      const uatRel = '.gsd/milestones/M007/slices/S01/S01-UAT.md';
+      const uatContent = [
+        '# S01 UAT',
+        '',
+        '## UAT Type',
+        '- UAT mode: browser-executable',
+        '',
+        '## Preconditions',
+        '- Start the dev/local verification server with `npm run test:server`.',
+        '- Open the app at the localhost URL printed by the server.',
+      ].join('\n');
+      writeSliceFile(base, 'M007', 'S01', 'UAT', uatContent);
+      writeSliceFile(
+        base,
+        'M007',
+        'S01',
+        'SUMMARY',
+        [
+          '# S01 Summary',
+          '',
+          'Verification: `npm run test:uat` passed with clean browser diagnostics.',
+        ].join('\n'),
+      );
+
+      const prompt = await buildRunUatPrompt('M007', 'S01', uatRel, uatContent, base);
+
+      assert.match(prompt, /\*\*Detected UAT mode:\*\*\s*`runtime-executable`/);
+      assert.match(prompt, /Runtime harness override/i);
+      assert.match(prompt, /npm run test:server/);
+      assert.match(prompt, /uatType: "runtime-executable"/);
+    } finally {
+      cleanup(base);
+    }
+});
+
 test('(v) run-uat prompt keeps deferred browser work artifact-driven', async () => {
     const base = createFixtureBase();
     try {
@@ -748,4 +835,134 @@ test('(v) run-uat prompt keeps deferred browser work artifact-driven', async ()
       cleanup(base);
     }
 });
+
+test('(x) checkNeedsRunUat returns runtime-executable when slice SUMMARY names a self-contained harness (M007/S01)', async () => {
+    // Regression: the dispatch gate must surface the same effective UAT mode
+    // that buildRunUatPrompt emits. When the UAT file alone declares
+    // `browser-executable` but the slice SUMMARY references `npm run test:uat`,
+    // the prompt promotes to `runtime-executable` — and so must the gate, or
+    // the auto-dispatch path requires browser tools / warms up the browser
+    // daemon (and may stop dispatch entirely) for a UAT that never touches
+    // the browser. See cursor[bot] review on PR #696.
+    const base = createFixtureBase();
+    try {
+      const roadmapDir = join(base, '.gsd', 'milestones', 'M007');
+      mkdirSync(roadmapDir, { recursive: true });
+      writeFileSync(
+        join(roadmapDir, 'M007-ROADMAP.md'),
+        [
+          '# M007: Test roadmap',
+          '',
+          '## Slices',
+          '',
+          '- [x] **S01: Only slice** `risk:low` `depends:[]`',
+          '',
+          '## Boundary Map',
+          '',
+        ].join('\n'),
+      );
+      writeSliceFile(
+        base,
+        'M007',
+        'S01',
+        'UAT',
+        [
+          '# S01 UAT',
+          '',
+          '## UAT Type',
+          '- UAT mode: browser-executable',
+          '',
+          '## Preconditions',
+          '- Start the dev/local verification server with `npm run test:server`.',
+        ].join('\n'),
+      );
+      writeSliceFile(
+        base,
+        'M007',
+        'S01',
+        'SUMMARY',
+        [
+          '# S01 Summary',
+          '',
+          'Verification: `npm run test:uat` passed with clean browser diagnostics.',
+        ].join('\n'),
+      );
+
+      const state = {
+        activeMilestone: { id: 'M007', title: 'Test roadmap' },
+        activeSlice: null,
+        activeTask: null,
+        phase: 'validating-milestone',
+        recentDecisions: [],
+        blockers: [],
+        nextAction: 'Validate M007',
+        registry: [],
+      } as const;
+
+      const result = await checkNeedsRunUat(base, 'M007', state as any, { uat_dispatch: true } as any);
+      assert.deepStrictEqual(
+        result,
+        { sliceId: 'S01', uatType: 'runtime-executable' },
+        'dispatch gate must mirror the prompt`s runtime-executable promotion so it does not require browser tools',
+      );
+    } finally {
+      cleanup(base);
+    }
+});
+
+test('(x2) checkNeedsRunUat leaves true browser-executable UAT unpromoted when no harness is referenced', async () => {
+    // Counter-test for (x): when the slice SUMMARY does NOT name a
+    // self-contained harness, the dispatch gate must still require browser
+    // tools for a genuinely browser-executable UAT.
+    const base = createFixtureBase();
+    try {
+      const roadmapDir = join(base, '.gsd', 'milestones', 'M008');
+      mkdirSync(roadmapDir, { recursive: true });
+      writeFileSync(
+        join(roadmapDir, 'M008-ROADMAP.md'),
+        [
+          '# M008: Test roadmap',
+          '',
+          '## Slices',
+          '',
+          '- [x] **S01: Only slice** `risk:low` `depends:[]`',
+          '',
+          '## Boundary Map',
+          '',
+        ].join('\n'),
+      );
+      writeSliceFile(base, 'M008', 'S01', 'UAT', makeBrowserObservableUatContent('browser-executable'));
+      writeSliceFile(
+        base,
+        'M008',
+        'S01',
+        'SUMMARY',
+        [
+          '# S01 Summary',
+          '',
+          'Verification: clicked through the UI and confirmed the search box filters todos.',
+        ].join('\n'),
+      );
+
+      const state = {
+        activeMilestone: { id: 'M008', title: 'Test roadmap' },
+        activeSlice: null,
+        activeTask: null,
+        phase: 'validating-milestone',
+        recentDecisions: [],
+        blockers: [],
+        nextAction: 'Validate M008',
+        registry: [],
+      } as const;
+
+      const result = await checkNeedsRunUat(base, 'M008', state as any, { uat_dispatch: true } as any);
+      assert.deepStrictEqual(
+        result,
+        { sliceId: 'S01', uatType: 'browser-executable' },
+        'a true browser-executable UAT without a harness reference must keep its browser-executable mode',
+      );
+    } finally {
+      cleanup(base);
+    }
+});
 });

package/src/resources/extensions/gsd/tests/interactive-routing-bypass.test.ts

@@ -20,6 +20,7 @@ function withRoutingPrefs<T>(fn: () => T): T {
       join(tempProject, ".gsd", "PREFERENCES.md"),
       [
         "---",
+        "token_profile: burn-max",
         "dynamic_routing:",
         "  enabled: true",
         "  tier_models:",

package/src/resources/extensions/gsd/tests/journal-integration.test.ts

@@ -15,12 +15,27 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
+/** Create a temp project root with a git repo for phase-function tests. */
+function makeTestBase(prefix: string): string {
+  const base = mkdtempSync(join(tmpdir(), prefix));
+  execFileSync("git", ["init", "--initial-branch=main"], { cwd: base, stdio: "ignore" });
+  execFileSync("git", ["config", "user.email", "test@test.com"], { cwd: base, stdio: "ignore" });
+  execFileSync("git", ["config", "user.name", "Test"], { cwd: base, stdio: "ignore" });
+  writeFileSync(join(base, "README.md"), "# test\n");
+  execFileSync("git", ["add", "README.md"], { cwd: base, stdio: "ignore" });
+  execFileSync("git", ["commit", "-m", "chore: seed"], { cwd: base, stdio: "ignore" });
+  return base;
+}
+
 import type { JournalEntry } from "../journal.js";
 import type { LoopDeps } from "../auto/loop-deps.js";
 import { WorktreeStateProjection } from "../worktree-state-projection.js";
 import type { IterationContext, LoopState, PreDispatchData, IterationData } from "../auto/types.js";
 import type { SessionLockStatus } from "../session-lock.js";
-import { runDispatch, runUnitPhase, runPreDispatch, runFinalize } from "../auto/phases.js";
+import { runDispatch } from "../auto/dispatch.js";
+import { runUnitPhase } from "../auto/unit-phase.js";
+import { runPreDispatch } from "../auto/pre-dispatch.js";
+import { runFinalize } from "../auto/finalize.js";
 import { readUnitRuntimeRecord } from "../unit-runtime.js";
 import { ModelPolicyDispatchBlockedError } from "../auto-model-selection.js";
 import {
@@ -182,7 +197,7 @@ function makeSession() {
     verbose: false,
     stepMode: false,
     paused: false,
-    basePath: "/tmp/project",
+    basePath: makeTestBase("gsd-journal-session-"),
     originalBasePath: "",
     currentMilestoneId: "M001",
     currentUnit: null,
@@ -296,10 +311,18 @@ test("runDispatch emits dispatch-stop when dispatch returns stop action", async
   assert.equal(stopEvents[0].flowId, ic.flowId);
 });
 
-test("runDispatch checks prior-slice completion against the project root in worktree mode", async () => {
+test("runDispatch checks prior-slice completion against the project root in worktree mode", async (t) => {
   const capture = createEventCapture();
   const guardCalls: Array<{ fn: string; args: unknown[] }> = [];
+  const projectRoot = makeTestBase("gsd-wt-prior-slice-");
+  const milestoneId = "M029-xoklo9";
+  const worktreeRoot = join(projectRoot, ".gsd", "worktrees", milestoneId);
+  execFileSync("git", ["worktree", "add", "-b", `auto/${milestoneId}`, worktreeRoot], { cwd: projectRoot, stdio: "ignore" });
+  t.after(() => rmSync(projectRoot, { recursive: true, force: true }));
+
   const deps = makeMockDeps(capture, {
+    getIsolationMode: () => "worktree",
+    autoWorktreeBranch: (mid: string) => `auto/${mid}`,
     getMainBranch: (basePath: string) => {
       guardCalls.push({ fn: "getMainBranch", args: [basePath] });
       return "main";
@@ -320,19 +343,21 @@ test("runDispatch checks prior-slice completion against the project root in work
   const ic = makeIC(deps, {
     s: {
       ...makeSession(),
-      basePath: "/tmp/project/.gsd/worktrees/M029-xoklo9",
-      originalBasePath: "/tmp/project",
+      basePath: worktreeRoot,
+      originalBasePath: projectRoot,
+      canonicalProjectRoot: projectRoot,
+      currentMilestoneId: milestoneId,
     } as any,
   });
   const preData: PreDispatchData = {
     state: {
       phase: "executing",
-      activeMilestone: { id: "M029-xoklo9", title: "Test", status: "active" },
+      activeMilestone: { id: milestoneId, title: "Test", status: "active" },
       activeSlice: { id: "S01", title: "Slice 1" },
-      registry: [{ id: "M029-xoklo9", status: "active" }],
+      registry: [{ id: milestoneId, status: "active" }],
       blockers: [],
     } as any,
-    mid: "M029-xoklo9",
+    mid: milestoneId,
     midTitle: "Test Milestone",
   };
 
@@ -342,12 +367,12 @@ test("runDispatch checks prior-slice completion against the project root in work
     consecutiveFinalizeTimeouts: 0,
   });
 
-  assert.equal(result.action, "next");
+  assert.equal(result.action, "next", "dispatch must proceed under worktree isolation");
   assert.deepEqual(guardCalls, [
-    { fn: "getMainBranch", args: ["/tmp/project"] },
+    { fn: "getMainBranch", args: [projectRoot] },
     {
       fn: "getPriorSliceCompletionBlocker",
-      args: ["/tmp/project", "main", "execute-task", "M001/S01/T01"],
+      args: [projectRoot, "main", "execute-task", "M001/S01/T01"],
     },
   ]);
 });
@@ -434,6 +459,9 @@ test("runDispatch pauses when execute-task artifacts exist but DB status is stil
   const sliceDir = join(base, ".gsd", "milestones", "M001", "slices", "S01");
   const tasksDir = join(sliceDir, "tasks");
   mkdirSync(tasksDir, { recursive: true });
+  execFileSync("git", ["init", "--initial-branch=main"], { cwd: base, stdio: "ignore" });
+  execFileSync("git", ["config", "user.email", "test@test.com"], { cwd: base, stdio: "ignore" });
+  execFileSync("git", ["config", "user.name", "Test"], { cwd: base, stdio: "ignore" });
   openDatabase(join(base, ".gsd", "gsd.db"));
   insertMilestone({ id: "M001", title: "Test", status: "active" });
   insertSlice({ id: "S01", milestoneId: "M001", title: "Slice", status: "in_progress" });
@@ -517,6 +545,9 @@ test("runDispatch pauses at Level 2 when execute-task artifacts exist but DB sta
   const sliceDir = join(base, ".gsd", "milestones", "M001", "slices", "S01");
   const tasksDir = join(sliceDir, "tasks");
   mkdirSync(tasksDir, { recursive: true });
+  execFileSync("git", ["init", "--initial-branch=main"], { cwd: base, stdio: "ignore" });
+  execFileSync("git", ["config", "user.email", "test@test.com"], { cwd: base, stdio: "ignore" });
+  execFileSync("git", ["config", "user.name", "Test"], { cwd: base, stdio: "ignore" });
   openDatabase(join(base, ".gsd", "gsd.db"));
   insertMilestone({ id: "M001", title: "Test", status: "active" });
   insertSlice({ id: "S01", milestoneId: "M001", title: "Slice", status: "in_progress" });
@@ -888,7 +919,7 @@ test("runUnitPhase increments unitDispatchCount for repeated artifact-missing re
 
 test("runUnitPhase pre-dispatch model validation failures do not emit unit-start or dispatch runtime state", async (t) => {
   const capture = createEventCapture();
-  const base = mkdtempSync(join(tmpdir(), `gsd-pre-dispatch-block-${randomUUID()}`));
+  const base = makeTestBase(`gsd-pre-dispatch-block-${randomUUID()}`);
   t.after(() => rmSync(base, { recursive: true, force: true }));
 
   const deps = makeMockDeps(capture, {
@@ -1084,7 +1115,7 @@ test("terminal event is emitted on blocked state", async () => {
 });
 
 test("#4671: plan-v2 missing CONTEXT.md reaches dispatch recovery instead of pausing", async () => {
-  const basePath = mkdtempSync(join(tmpdir(), "gsd-4671-predispatch-"));
+  const basePath = makeTestBase("gsd-4671-predispatch-");
   mkdirSync(join(basePath, ".gsd", "milestones", "M001", "slices", "S01", "tasks"), { recursive: true });
   openDatabase(join(basePath, ".gsd", "gsd.db"));
   try {
@@ -1141,7 +1172,7 @@ test("#4671: plan-v2 missing CONTEXT.md reaches dispatch recovery instead of pau
 });
 
 test("plan-v2 empty graph rederives state before pausing", async () => {
-  const basePath = mkdtempSync(join(tmpdir(), "gsd-plan-v2-empty-graph-"));
+  const basePath = makeTestBase("gsd-plan-v2-empty-graph-");
   mkdirSync(join(basePath, ".gsd", "milestones", "M001"), { recursive: true });
   writeFileSync(
     join(basePath, ".gsd", "milestones", "M001", "M001-CONTEXT.md"),
@@ -1204,7 +1235,7 @@ test("plan-v2 empty graph rederives state before pausing", async () => {
 });
 
 test("plan-v2 empty graph pauses after one failed rederive", async () => {
-  const basePath = mkdtempSync(join(tmpdir(), "gsd-plan-v2-empty-graph-pause-"));
+  const basePath = makeTestBase("gsd-plan-v2-empty-graph-pause-");
   mkdirSync(join(basePath, ".gsd", "milestones", "M001"), { recursive: true });
   writeFileSync(
     join(basePath, ".gsd", "milestones", "M001", "M001-CONTEXT.md"),
@@ -1394,7 +1425,7 @@ test("session-failed cancellations close out and emit unit-end before hard stop"
 test("runFinalize pauses and emits unit-end when pre-verification times out", async () => {
   const capture = createEventCapture();
   let pauseCalls = 0;
-  const basePath = mkdtempSync(join(tmpdir(), "gsd-finalize-timeout-"));
+  const basePath = makeTestBase("gsd-finalize-timeout-");
 
   const deps = makeMockDeps(capture, {
     pauseAuto: async () => { pauseCalls++; },