@os-eco/overstory-cli 0.7.2 → 0.7.3

package/src/commands/sling.ts

@@ -123,6 +123,7 @@ export interface SlingOptions {
 	skipReview?: boolean;
 	dispatchMaxAgents?: string;
 	runtime?: string;
+	noScoutCheck?: boolean;
 }
 
 export interface AutoDispatchOptions {
@@ -215,6 +216,38 @@ export function parentHasScouts(
 	return sessions.some((s) => s.parentAgent === parentAgent && s.capability === "scout");
 }
 
+/**
+ * Determine whether to emit the scout-before-build warning.
+ *
+ * Returns true when all of the following hold:
+ *  - The incoming capability is "builder" (only builders trigger the check)
+ *  - A parent agent is set (orphaned builders don't trigger it)
+ *  - The parent has not yet spawned any scouts
+ *  - noScoutCheck is false (caller has not suppressed the warning)
+ *  - skipScout is false (the lead is not intentionally running without scouts)
+ *
+ * Extracted from slingCommand for testability (overstory-6eyw).
+ *
+ * @param capability - The requested agent capability
+ * @param parentAgent - The --parent flag value (null = coordinator/human)
+ * @param sessions - All sessions (not just active) for parentHasScouts query
+ * @param noScoutCheck - True when --no-scout-check flag is set
+ * @param skipScout - True when --skip-scout flag is set (lead opted out of scouting)
+ */
+export function shouldShowScoutWarning(
+	capability: string,
+	parentAgent: string | null,
+	sessions: ReadonlyArray<{ parentAgent: string | null; capability: string }>,
+	noScoutCheck: boolean,
+	skipScout: boolean,
+): boolean {
+	if (capability !== "builder") return false;
+	if (parentAgent === null) return false;
+	if (noScoutCheck) return false;
+	if (skipScout) return false;
+	return !parentHasScouts(sessions, parentAgent);
+}
+
 /**
  * Check if any active agent is already working on the given task ID.
  * Returns the agent name if locked, or null if the task is free.
@@ -319,6 +352,43 @@ export function validateHierarchy(
 	}
 }
 
+/**
+ * Extract mulch record IDs and their domains from mulch prime output text.
+ * Parses the markdown structure produced by ml prime: domain headings
+ * (## <name>) followed by record lines containing (mx-XXXXXX) identifiers.
+ * @param primeText - The output text from ml prime
+ * @returns Array of {id, domain} pairs. Deduplicated.
+ */
+export function extractMulchRecordIds(primeText: string): Array<{ id: string; domain: string }> {
+	const results: Array<{ id: string; domain: string }> = [];
+	const seen = new Set<string>();
+	let currentDomain = "";
+
+	for (const line of primeText.split("\n")) {
+		const domainMatch = line.match(/^## ([\w-]+)/);
+		if (domainMatch) {
+			currentDomain = domainMatch[1] ?? "";
+			continue;
+		}
+		if (currentDomain) {
+			const idRegex = /\(mx-([a-f0-9]+)\)/g;
+			let match = idRegex.exec(line);
+			while (match !== null) {
+				const shortId = match[1] ?? "";
+				if (shortId) {
+					const key = `${currentDomain}:mx-${shortId}`;
+					if (!seen.has(key)) {
+						seen.add(key);
+						results.push({ id: `mx-${shortId}`, domain: currentDomain });
+					}
+				}
+				match = idRegex.exec(line);
+			}
+		}
+	}
+	return results;
+}
+
 /**
  * Entry point for `ov sling <task-id> [flags]`.
  *
@@ -544,7 +614,16 @@ export async function slingCommand(taskId: string, opts: SlingOptions): Promise<
 		// 5c. Structural enforcement: warn when a lead spawns a builder without prior scouts.
 		// This is a non-blocking warning — it does not prevent the spawn, but surfaces
 		// the scout-skip pattern so agents and operators can see it happening.
-		if (capability === "builder" && parentAgent && !parentHasScouts(store.getAll(), parentAgent)) {
+		// Use --no-scout-check to suppress this warning when intentionally skipping scouts.
+		if (
+			shouldShowScoutWarning(
+				capability,
+				parentAgent,
+				store.getAll(),
+				opts.noScoutCheck ?? false,
+				skipScout,
+			)
+		) {
 			process.stderr.write(
 				`Warning: "${parentAgent}" is spawning builder "${name}" without having spawned any scouts.\n`,
 			);
@@ -596,7 +675,10 @@ export async function slingCommand(taskId: string, opts: SlingOptions): Promise<
 		if (config.mulch.enabled && fileScope.length > 0) {
 			try {
 				const mulch = createMulchClient(config.project.root);
-				mulchExpertise = await mulch.prime(undefined, undefined, { files: fileScope });
+				mulchExpertise = await mulch.prime(undefined, undefined, {
+					files: fileScope,
+					sortByScore: true,
+				});
 			} catch {
 				// Non-fatal: mulch expertise is supplementary context
 				mulchExpertise = undefined;
@@ -709,7 +791,23 @@ export async function slingCommand(taskId: string, opts: SlingOptions): Promise<
 			});
 		}
 
-		// 11b. Preflight: verify tmux is available before attempting session creation
+		// 11b. Save applied mulch record IDs for session-end outcome tracking.
+		// Written to .overstory/agents/{name}/applied-records.json so log.ts
+		// can append outcomes when the session completes.
+		if (mulchExpertise) {
+			const appliedRecords = extractMulchRecordIds(mulchExpertise);
+			if (appliedRecords.length > 0) {
+				const appliedRecordsPath = join(identityBaseDir, name, "applied-records.json");
+				const appliedData = { taskId, agentName: name, capability, records: appliedRecords };
+				try {
+					await Bun.write(appliedRecordsPath, `${JSON.stringify(appliedData, null, "\t")}\n`);
+				} catch {
+					// Non-fatal: outcome tracking is supplementary context
+				}
+			}
+		}
+
+		// 11c. Preflight: verify tmux is available before attempting session creation
 		await ensureTmuxAvailable();
 
 		// 12. Create tmux session running claude in interactive mode

package/src/commands/status.test.ts

@@ -1,10 +1,10 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdir, mkdtemp, rm } from "node:fs/promises";
+import { mkdir, mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { stripAnsi } from "../logging/color.ts";
 import { createSessionStore } from "../sessions/store.ts";
-import { createTempGitRepo } from "../test-helpers.ts";
+import { cleanupTempDir, createTempGitRepo } from "../test-helpers.ts";
 import type { AgentSession } from "../types.ts";
 import {
 	gatherStatus,
@@ -344,7 +344,7 @@ describe("run scoping", () => {
 			// out-of-scope builder must NOT appear
 			expect(names).not.toContain("builder-2");
 		} finally {
-			await rm(tempDir, { recursive: true, force: true });
+			await cleanupTempDir(tempDir);
 		}
 	});
 });
@@ -391,7 +391,7 @@ describe("--watch deprecation", () => {
 		} finally {
 			process.stderr.write = originalStderr;
 			process.chdir(originalCwd);
-			await rm(tmpDir, { recursive: true, force: true });
+			await cleanupTempDir(tmpDir);
 		}
 
 		const err = stderrChunks.join("");
@@ -432,7 +432,7 @@ describe("gatherStatus reconciliation", () => {
 			expect(agent).toBeDefined();
 			expect(agent?.state).toBe("zombie");
 		} finally {
-			await rm(tempDir, { recursive: true, force: true });
+			await cleanupTempDir(tempDir);
 		}
 	});
 
@@ -461,7 +461,7 @@ describe("gatherStatus reconciliation", () => {
 			expect(agent).toBeDefined();
 			expect(agent?.state).toBe("completed");
 		} finally {
-			await rm(tempDir, { recursive: true, force: true });
+			await cleanupTempDir(tempDir);
 		}
 	});
 
@@ -491,7 +491,7 @@ describe("gatherStatus reconciliation", () => {
 			expect(agent).toBeDefined();
 			expect(agent?.state).toBe("zombie");
 		} finally {
-			await rm(tempDir, { recursive: true, force: true });
+			await cleanupTempDir(tempDir);
 		}
 	});
 });
@@ -522,7 +522,7 @@ describe("subprocess caching (invalidateStatusCache)", () => {
 			expect(Array.isArray(result1.worktrees)).toBe(true);
 			expect(Array.isArray(result2.worktrees)).toBe(true);
 		} finally {
-			await rm(tempDir, { recursive: true, force: true });
+			await cleanupTempDir(tempDir);
 		}
 	});
 });

package/src/commands/trace.test.ts

@@ -9,13 +9,14 @@
  */
 
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdtemp, rm } from "node:fs/promises";
+import { mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { ValidationError } from "../errors.ts";
 import { createEventStore } from "../events/store.ts";
 import { stripAnsi } from "../logging/color.ts";
 import { createSessionStore } from "../sessions/store.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { InsertEvent } from "../types.ts";
 import { traceCommand } from "./trace.ts";
 
@@ -66,7 +67,7 @@ describe("traceCommand", () => {
 	afterEach(async () => {
 		process.stdout.write = originalWrite;
 		process.chdir(originalCwd);
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	function output(): string {

package/src/commands/watch.test.ts

@@ -1,7 +1,8 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdtemp, rm } from "node:fs/promises";
+import { mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { cleanupTempDir } from "../test-helpers.ts";
 import { watchCommand } from "./watch.ts";
 
 /**
@@ -66,7 +67,7 @@ describe("watchCommand", () => {
 		process.stderr.write = originalStderrWrite;
 		process.exitCode = originalExitCode;
 		process.chdir(originalCwd);
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	function output(): string {

package/src/config.test.ts

@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdir, mkdtemp, realpath, rm } from "node:fs/promises";
+import { mkdir, mkdtemp, realpath } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { DEFAULT_CONFIG, DEFAULT_QUALITY_GATES, loadConfig, resolveProjectRoot } from "./config.ts";
@@ -14,7 +14,7 @@ describe("loadConfig", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	async function writeConfig(yaml: string): Promise<void> {
@@ -428,7 +428,7 @@ describe("validateConfig", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	async function writeConfig(yaml: string): Promise<void> {

package/src/doctor/agents.test.ts

@@ -6,9 +6,10 @@
  */
 
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdir, mkdtemp, rm } from "node:fs/promises";
+import { mkdir, mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { OverstoryConfig } from "../types.ts";
 import { checkAgents } from "./agents.ts";
 
@@ -74,7 +75,7 @@ describe("checkAgents", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("fails when manifest is missing", async () => {

package/src/doctor/logs.test.ts

@@ -6,9 +6,10 @@
  */
 
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { mkdir, mkdtemp, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { OverstoryConfig } from "../types.ts";
 import { checkLogs } from "./logs.ts";
 
@@ -77,7 +78,7 @@ describe("checkLogs", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("warns when logs/ directory does not exist", async () => {

package/src/doctor/structure.test.ts

@@ -6,9 +6,10 @@
  */
 
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdir, mkdtemp, rm, utimes } from "node:fs/promises";
+import { mkdir, mkdtemp, utimes } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { OverstoryConfig } from "../types.ts";
 import { checkStructure } from "./structure.ts";
 
@@ -73,7 +74,7 @@ describe("checkStructure", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("fails when .overstory/ directory does not exist", async () => {

package/src/index.ts

@@ -45,7 +45,7 @@ import { OverstoryError, WorktreeError } from "./errors.ts";
 import { jsonError } from "./json.ts";
 import { brand, chalk, muted, setQuiet } from "./logging/color.ts";
 
-export const VERSION = "0.7.2";
+export const VERSION = "0.7.3";
 
 const rawArgs = process.argv.slice(2);
 
@@ -96,6 +96,7 @@ const COMMANDS = [
 	"costs",
 	"metrics",
 	"upgrade",
+	"completions",
 ];
 
 function editDistance(a: string, b: string): number {
@@ -254,6 +255,7 @@ program
 	.option("--force-hierarchy", "Bypass hierarchy validation")
 	.option("--max-agents <n>", "Max children per lead (overrides config)")
 	.option("--skip-review", "Skip review phase for lead agents")
+	.option("--no-scout-check", "Suppress the parentHasScouts scout-before-build warning")
 	.option("--dispatch-max-agents <n>", "Per-lead max agents ceiling (injected into overlay)")
 	.option("--runtime <name>", "Runtime adapter (default: config or claude)")
 	.option("--json", "Output result as JSON")

package/src/logging/color.ts

@@ -10,7 +10,7 @@ import chalk from "chalk";
 // --- Brand palette (os-eco brand colors) ---
 
 /** Forest green — Overstory primary brand color. */
-export const brand = chalk.rgb(27, 94, 32);
+export const brand = chalk.rgb(46, 125, 50);
 
 /** Amber — highlights, warnings. */
 export const accent = chalk.rgb(255, 183, 77);

package/src/logging/format.test.ts

@@ -0,0 +1,110 @@
+import { describe, expect, test } from "bun:test";
+import type { StoredEvent } from "../types.ts";
+import { stripAnsi } from "./color.ts";
+import { formatEventLine, numericPriorityColor } from "./format.ts";
+
+// Minimal StoredEvent fixture for testing formatEventLine
+const BASE_EVENT: StoredEvent = {
+	id: 1,
+	runId: "run-001",
+	agentName: "agent1",
+	sessionId: null,
+	eventType: "tool_start",
+	level: "info",
+	toolName: "bash",
+	toolArgs: null,
+	toolDurationMs: null,
+	data: null,
+	createdAt: "2024-01-15T10:30:45.000Z",
+};
+
+describe("numericPriorityColor", () => {
+	test("returns a function for priority 1", () => {
+		const fn = numericPriorityColor(1);
+		expect(typeof fn).toBe("function");
+		// Function must accept a string and return a string
+		expect(typeof fn("x")).toBe("string");
+	});
+
+	test("returns a function for priority 2", () => {
+		const fn = numericPriorityColor(2);
+		expect(typeof fn).toBe("function");
+		expect(typeof fn("x")).toBe("string");
+	});
+
+	test("priority 3 is identity (returns input unchanged)", () => {
+		const fn = numericPriorityColor(3);
+		// Priority 3 = normal = (text) => text, always identity regardless of chalk level
+		expect(fn("x")).toBe("x");
+		expect(fn("hello world")).toBe("hello world");
+	});
+
+	test("returns a function for priority 4", () => {
+		const fn = numericPriorityColor(4);
+		expect(typeof fn).toBe("function");
+		expect(typeof fn("x")).toBe("string");
+	});
+
+	test("unknown priority returns identity function", () => {
+		const fn = numericPriorityColor(99);
+		expect(typeof fn).toBe("function");
+		expect(fn("x")).toBe("x");
+	});
+
+	test("all priority functions preserve input text (visible content after strip)", () => {
+		for (const p of [1, 2, 3, 4]) {
+			const fn = numericPriorityColor(p);
+			expect(stripAnsi(fn("hello"))).toBe("hello");
+		}
+	});
+});
+
+describe("formatEventLine", () => {
+	test("returns a non-empty string", () => {
+		const colorMap = new Map<string, (t: string) => string>();
+		const result = formatEventLine(BASE_EVENT, colorMap);
+		expect(result.length).toBeGreaterThan(0);
+	});
+
+	test("includes agent name in the result", () => {
+		const colorMap = new Map<string, (t: string) => string>();
+		const result = formatEventLine(BASE_EVENT, colorMap);
+		// Strip ANSI so we can do plain text comparison
+		expect(stripAnsi(result)).toContain("agent1");
+	});
+
+	test("includes time portion (10:30:45) in the result", () => {
+		const colorMap = new Map<string, (t: string) => string>();
+		const result = formatEventLine(BASE_EVENT, colorMap);
+		expect(stripAnsi(result)).toContain("10:30:45");
+	});
+
+	test("result does NOT end with a newline", () => {
+		const colorMap = new Map<string, (t: string) => string>();
+		const result = formatEventLine(BASE_EVENT, colorMap);
+		expect(result.endsWith("\n")).toBe(false);
+	});
+
+	test("error level result is a non-empty string", () => {
+		const colorMap = new Map<string, (t: string) => string>();
+		const errorEvent: StoredEvent = { ...BASE_EVENT, level: "error" };
+		const result = formatEventLine(errorEvent, colorMap);
+		expect(result.length).toBeGreaterThan(0);
+		expect(result.endsWith("\n")).toBe(false);
+	});
+
+	test("uses color from colorMap when agent is registered", () => {
+		const blueColor = (t: string) => `\x1b[34m${t}\x1b[39m`;
+		const colorMap = new Map<string, (t: string) => string>([["agent1", blueColor]]);
+		const result = formatEventLine(BASE_EVENT, colorMap);
+		// The colored agent name should appear in the output
+		expect(result).toContain("\x1b[34m");
+	});
+
+	test("falls back to gray when agent is not in colorMap", () => {
+		const colorMap = new Map<string, (t: string) => string>();
+		// Should not throw — gray fallback is used
+		const result = formatEventLine(BASE_EVENT, colorMap);
+		expect(result.length).toBeGreaterThan(0);
+	});
+});

package/src/logging/format.ts

@@ -8,7 +8,7 @@
 import type { StoredEvent } from "../types.ts";
 import type { ColorFn } from "./color.ts";
 import { color, noColor } from "./color.ts";
-import { AGENT_COLORS } from "./theme.ts";
+import { AGENT_COLORS, eventLabel } from "./theme.ts";
 
 // === Duration ===
 
@@ -175,6 +175,25 @@ export function priorityColor(priority: string): ColorFn {
 	}
 }
 
+/**
+ * Returns a color function for a numeric tracker priority.
+ * 1=urgent (red), 2=high (yellow), 3=normal (identity), 4=low (dim)
+ */
+export function numericPriorityColor(priority: number): ColorFn {
+	switch (priority) {
+		case 1:
+			return color.red;
+		case 2:
+			return color.yellow;
+		case 3:
+			return (text: string) => text;
+		case 4:
+			return color.dim;
+		default:
+			return (text: string) => text;
+	}
+}
+
 /**
  * Returns a color function for a log level string.
  * debug=gray, info=blue, warn=yellow, error=red
@@ -212,3 +231,25 @@ export function logLevelLabel(level: string): string {
 			return level.slice(0, 3).toUpperCase();
 	}
 }
+
+/**
+ * Format a single event as a compact feed line.
+ * Returns the formatted string WITHOUT a trailing newline.
+ * Used by both ov feed and the dashboard Feed panel.
+ */
+export function formatEventLine(event: StoredEvent, colorMap: Map<string, ColorFn>): string {
+	const timeStr = formatAbsoluteTime(event.createdAt);
+	const label = eventLabel(event.eventType);
+	const levelColorFn =
+		event.level === "error" ? color.red : event.level === "warn" ? color.yellow : null;
+	const applyLevel = (text: string) => (levelColorFn ? levelColorFn(text) : text);
+	const detail = buildEventDetail(event, 60);
+	const detailSuffix = detail ? ` ${color.dim(detail)}` : "";
+	const agentColorFn = colorMap.get(event.agentName) ?? color.gray;
+	const agentLabel = ` ${agentColorFn(event.agentName.padEnd(15))}`;
+	return (
+		`${color.dim(timeStr)} ` +
+		`${applyLevel(label.color(color.bold(label.compact)))}` +
+		`${agentLabel}${detailSuffix}`
+	);
+}

package/src/logging/logger.test.ts

@@ -1,7 +1,8 @@
 import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
-import { access, mkdtemp, readdir, readFile, rm } from "node:fs/promises";
+import { access, mkdtemp, readdir, readFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { LogEvent } from "../types.ts";
 import { createLogger } from "./logger.ts";
 
@@ -15,7 +16,7 @@ describe("createLogger", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	async function readLogFile(filename: string): Promise<string> {

package/src/mail/client.test.ts

@@ -1,8 +1,9 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdtemp, rm } from "node:fs/promises";
+import { mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { MailError } from "../errors.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { WorkerDonePayload } from "../types.ts";
 import { createMailClient, type MailClient, parsePayload } from "./client.ts";
 import { createMailStore, type MailStore } from "./store.ts";
@@ -20,7 +21,7 @@ describe("createMailClient", () => {
 
 	afterEach(async () => {
 		client.close();
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	describe("send", () => {

package/src/mail/store.test.ts

@@ -1,8 +1,9 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdtemp, rm } from "node:fs/promises";
+import { mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { MailError } from "../errors.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { MailMessage } from "../types.ts";
 import { createMailStore, type MailStore } from "./store.ts";
 
@@ -17,7 +18,7 @@ describe("createMailStore", () => {
 
 	afterEach(async () => {
 		store.close();
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	describe("insert", () => {

package/src/merge/queue.test.ts

@@ -1,9 +1,10 @@
 import { Database } from "bun:sqlite";
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdtemp, rm } from "node:fs/promises";
+import { mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { MergeError } from "../errors.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
 import { createMergeQueue } from "./queue.ts";
 
 describe("createMergeQueue", () => {
@@ -17,7 +18,7 @@ describe("createMergeQueue", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	function makeInput(