@os-eco/overstory-cli 0.7.2 → 0.7.3

package/README.md

@@ -75,7 +75,7 @@ Every command supports `--json` where noted. Global flags: `-q`/`--quiet`, `--ti
 | Command | Description |
 |---------|-------------|
 | `ov init` | Initialize `.overstory/` in current project (`--yes`, `--name`) |
-| `ov sling <task-id>` | Spawn a worker agent (`--capability`, `--name`, `--spec`, `--files`, `--parent`, `--depth`, `--skip-scout`, `--skip-review`, `--max-agents`, `--dispatch-max-agents`, `--skip-task-check`, `--runtime`, `--json`) |
+| `ov sling <task-id>` | Spawn a worker agent (`--capability`, `--name`, `--spec`, `--files`, `--parent`, `--depth`, `--skip-scout`, `--skip-review`, `--max-agents`, `--dispatch-max-agents`, `--skip-task-check`, `--no-scout-check`, `--runtime`, `--json`) |
 | `ov stop <agent-name>` | Terminate a running agent (`--clean-worktree`, `--json`) |
 | `ov prime` | Load context for orchestrator/agent (`--agent`, `--compact`) |
 | `ov spec write <task-id>` | Write a task specification (`--body`) |

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@os-eco/overstory-cli",
-	"version": "0.7.2",
+	"version": "0.7.3",
 	"description": "Multi-agent orchestration for Claude Code — spawn worker agents in git worktrees via tmux, coordinate through SQLite mail, merge with tiered conflict resolution",
 	"author": "Jaymin West",
 	"license": "MIT",

package/src/agents/hooks-deployer.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 { AgentError } from "../errors.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
 import {
 	buildBashFileGuardScript,
 	buildBashPathBoundaryScript,
@@ -26,7 +27,7 @@ describe("deployHooks", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("creates .claude/settings.local.json in worktree directory", async () => {
@@ -1482,7 +1483,7 @@ describe("structural enforcement integration", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("non-implementation agents have more guards than implementation agents", async () => {
@@ -2055,7 +2056,7 @@ describe("bash path boundary integration", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("builder gets Bash path boundary guard in deployed hooks", async () => {
@@ -2249,7 +2250,7 @@ describe("PATH prefix in deployed hooks", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("SessionStart hook commands include PATH prefix", async () => {

package/src/agents/identity.test.ts

@@ -1,8 +1,9 @@
 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 { AgentError } from "../errors.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { AgentIdentity } from "../types.ts";
 import { createIdentity, loadIdentity, updateIdentity } from "./identity.ts";
 
@@ -14,7 +15,7 @@ describe("identity", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	describe("createIdentity", () => {

package/src/agents/manifest.test.ts

@@ -1,8 +1,9 @@
 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 { AgentError } from "../errors.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { AgentManifest, OverstoryConfig } from "../types.ts";
 import { createManifestLoader, resolveModel, resolveProviderEnv } from "./manifest.ts";
 
@@ -41,7 +42,7 @@ describe("createManifestLoader", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	/** Write the manifest JSON and create matching .md files. */
@@ -806,7 +807,7 @@ describe("manifest validation accepts arbitrary model strings", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("accepts provider-prefixed model string", async () => {

package/src/agents/overlay.test.ts

@@ -1,8 +1,9 @@
 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 { AgentError } from "../errors.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { OverlayConfig, QualityGate } from "../types.ts";
 import {
 	formatQualityGatesBash,
@@ -584,7 +585,7 @@ describe("writeOverlay", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("creates .claude/CLAUDE.md in worktree directory", async () => {

package/src/commands/agents.test.ts

@@ -3,10 +3,11 @@
  */
 
 import { afterEach, beforeEach, describe, expect, it, mock } 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 { createSessionStore } from "../sessions/store.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { AgentSession } from "../types.ts";
 import { agentsCommand, discoverAgents, extractFileScope } from "./agents.ts";
 
@@ -65,7 +66,7 @@ Some expertise here.
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 });
 
@@ -235,7 +236,7 @@ describe("discoverAgents", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 });
 
@@ -322,6 +323,6 @@ logging:
 	afterEach(async () => {
 		process.stdout.write = originalStdoutWrite;
 		process.chdir(originalCwd);
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 });

package/src/commands/completions.test.ts

@@ -12,8 +12,8 @@ import {
 } from "./completions.ts";
 
 describe("COMMANDS array", () => {
-	it("should have exactly 30 commands", () => {
-		expect(COMMANDS).toHaveLength(30);
+	it("should have exactly 33 commands", () => {
+		expect(COMMANDS).toHaveLength(33);
 	});
 
 	it("should include all expected command names", () => {
@@ -48,6 +48,9 @@ describe("COMMANDS array", () => {
 		expect(names).toContain("feed");
 		expect(names).toContain("logs");
 		expect(names).toContain("stop");
+		expect(names).toContain("ecosystem");
+		expect(names).toContain("upgrade");
+		expect(names).toContain("completions");
 	});
 });
 
@@ -59,7 +62,7 @@ describe("generateBash", () => {
 		expect(script).toContain("_init_completion");
 	});
 
-	it("should include all 27 command names", () => {
+	it("should include all 33 command names", () => {
 		const script = generateBash();
 		for (const cmd of COMMANDS) {
 			expect(script).toContain(cmd.name);
@@ -93,7 +96,7 @@ describe("generateZsh", () => {
 		expect(script).toContain("_arguments");
 	});
 
-	it("should include all 27 command names", () => {
+	it("should include all 33 command names", () => {
 		const script = generateZsh();
 		for (const cmd of COMMANDS) {
 			expect(script).toContain(cmd.name);
@@ -123,7 +126,7 @@ describe("generateFish", () => {
 		expect(script).toContain("__fish_use_subcommand");
 	});
 
-	it("should include all 27 command names", () => {
+	it("should include all 33 command names", () => {
 		const script = generateFish();
 		for (const cmd of COMMANDS) {
 			expect(script).toContain(cmd.name);

package/src/commands/completions.ts

@@ -58,6 +58,9 @@ export const COMMANDS: readonly CommandDef[] = [
 		desc: "Initialize .overstory/ in current project",
 		flags: [
 			{ name: "--force", desc: "Overwrite existing configuration" },
+			{ name: "--yes", desc: "Accept all defaults without prompting" },
+			{ name: "-y", desc: "Alias for --yes" },
+			{ name: "--name", desc: "Project name", takesValue: true },
 			{ name: "--help", desc: "Show help" },
 		],
 	},
@@ -76,7 +79,13 @@ export const COMMANDS: readonly CommandDef[] = [
 			{ name: "--files", desc: "Exclusive file scope (comma-separated)", takesValue: true },
 			{ name: "--parent", desc: "Parent agent name", takesValue: true },
 			{ name: "--depth", desc: "Current hierarchy depth", takesValue: true },
+			{ name: "--skip-scout", desc: "Skip scout phase for lead agents" },
+			{ name: "--skip-review", desc: "Skip review phase for lead agents" },
+			{ name: "--skip-task-check", desc: "Skip task existence validation" },
 			{ name: "--force-hierarchy", desc: "Bypass hierarchy validation" },
+			{ name: "--max-agents", desc: "Max children per lead", takesValue: true },
+			{ name: "--dispatch-max-agents", desc: "Per-lead max agents ceiling", takesValue: true },
+			{ name: "--runtime", desc: "Runtime adapter", takesValue: true },
 			{ name: "--json", desc: "JSON output" },
 			{ name: "--help", desc: "Show help" },
 		],
@@ -107,6 +116,7 @@ export const COMMANDS: readonly CommandDef[] = [
 			{ name: "--json", desc: "JSON output" },
 			{ name: "--verbose", desc: "Extra per-agent detail" },
 			{ name: "--agent", desc: "Filter by agent", takesValue: true },
+			{ name: "--all", desc: "Show sessions from all runs" },
 			{ name: "--watch", desc: "Watch mode" },
 			{ name: "--interval", desc: "Poll interval in ms", takesValue: true },
 			{ name: "--help", desc: "Show help" },
@@ -138,6 +148,7 @@ export const COMMANDS: readonly CommandDef[] = [
 		flags: [
 			{ name: "--branch", desc: "Specific branch to merge", takesValue: true },
 			{ name: "--all", desc: "All completed branches" },
+			{ name: "--into", desc: "Target branch to merge into", takesValue: true },
 			{ name: "--dry-run", desc: "Check for conflicts only" },
 			{ name: "--json", desc: "JSON output" },
 			{ name: "--help", desc: "Show help" },
@@ -190,8 +201,10 @@ export const COMMANDS: readonly CommandDef[] = [
 					"merge",
 					"logs",
 					"version",
+					"ecosystem",
 				],
 			},
+			{ name: "--fix", desc: "Attempt to auto-fix issues" },
 			{ name: "--help", desc: "Show help" },
 		],
 	},
@@ -606,6 +619,29 @@ export const COMMANDS: readonly CommandDef[] = [
 			},
 		],
 	},
+	{
+		name: "ecosystem",
+		desc: "Show a summary dashboard of all installed os-eco tools",
+		flags: [
+			{ name: "--json", desc: "JSON output" },
+			{ name: "--help", desc: "Show help" },
+		],
+	},
+	{
+		name: "upgrade",
+		desc: "Upgrade overstory to the latest version",
+		flags: [
+			{ name: "--check", desc: "Compare current vs latest without installing" },
+			{ name: "--all", desc: "Upgrade all os-eco tools" },
+			{ name: "--json", desc: "JSON output" },
+			{ name: "--help", desc: "Show help" },
+		],
+	},
+	{
+		name: "completions",
+		desc: "Generate shell completions",
+		flags: [{ name: "--help", desc: "Show help" }],
+	},
 ] as const;
 
 export function generateBash(): string {
@@ -618,7 +654,7 @@ export function generateBash(): string {
 		"  local cur prev words cword",
 		"  _init_completion || return",
 		"",
-		"  local commands='init sling prime stop status dashboard inspect merge nudge clean doctor log logs watch trace errors feed replay costs metrics spec coordinator supervisor hooks monitor mail group worktree run'",
+		"  local commands='agents init sling prime stop status dashboard inspect merge nudge clean doctor log logs watch trace errors feed replay costs metrics spec coordinator supervisor hooks monitor mail group worktree run ecosystem upgrade completions'",
 		"",
 		"  # Top-level completion",
 		"  if [[ $cword -eq 1 ]]; then",

package/src/commands/costs.test.ts

@@ -9,12 +9,13 @@
  */
 
 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 { ValidationError } from "../errors.ts";
 import { createMetricsStore } from "../metrics/store.ts";
 import { createSessionStore } from "../sessions/store.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
 import type { SessionMetrics } from "../types.ts";
 import { costsCommand } from "./costs.ts";
 
@@ -72,7 +73,7 @@ describe("costsCommand", () => {
 	afterEach(async () => {
 		process.stdout.write = originalWrite;
 		process.chdir(originalCwd);
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	function output(): string {
@@ -1052,7 +1053,7 @@ describe("costsCommand", () => {
 
 		afterEach(async () => {
 			process.env.HOME = originalHome;
-			await rm(tempHome, { recursive: true, force: true });
+			await cleanupTempDir(tempHome);
 		});
 
 		test("--self shows orchestrator cost when transcript exists", async () => {

package/src/commands/dashboard.test.ts

@@ -7,18 +7,27 @@
  */
 
 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 { ValidationError } from "../errors.ts";
+import { createEventStore } from "../events/store.ts";
+import { color } from "../logging/color.ts";
 import { createSessionStore } from "../sessions/store.ts";
+import { cleanupTempDir } from "../test-helpers.ts";
+import type { DashboardStores } from "./dashboard.ts";
 import {
 	closeDashboardStores,
+	computeAgentPanelHeight,
 	dashboardCommand,
+	dimBox,
 	filterAgentsByRun,
 	horizontalLine,
 	openDashboardStores,
 	pad,
+	renderAgentPanel,
+	renderFeedPanel,
+	renderTasksPanel,
 	truncate,
 } from "./dashboard.ts";
 
@@ -40,7 +49,7 @@ describe("dashboardCommand", () => {
 
 	afterEach(async () => {
 		process.stdout.write = originalWrite;
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	function output(): string {
@@ -203,6 +212,202 @@ describe("filterAgentsByRun", () => {
 	});
 });
 
+describe("dimBox", () => {
+	test("dimBox.vertical equals color.dim(│)", () => {
+		expect(dimBox.vertical).toBe(color.dim("│"));
+	});
+
+	test("dimBox.horizontal equals color.dim(─)", () => {
+		expect(dimBox.horizontal).toBe(color.dim("─"));
+	});
+
+	test("dimBox.tee equals color.dim(├)", () => {
+		expect(dimBox.tee).toBe(color.dim("├"));
+	});
+
+	test("dimBox.teeRight equals color.dim(┤)", () => {
+		expect(dimBox.teeRight).toBe(color.dim("┤"));
+	});
+
+	test("dimBox values equal color.dim() applied to their characters", () => {
+		// dimBox values are always equal to color.dim(char) regardless of whether
+		// Chalk emits ANSI codes (it may suppress them in non-TTY / NO_COLOR envs).
+		expect(dimBox.topLeft).toBe(color.dim("┌"));
+		expect(dimBox.topRight).toBe(color.dim("┐"));
+		expect(dimBox.bottomLeft).toBe(color.dim("└"));
+		expect(dimBox.bottomRight).toBe(color.dim("┘"));
+		expect(dimBox.cross).toBe(color.dim("┼"));
+	});
+});
+
+describe("computeAgentPanelHeight", () => {
+	test("0 agents: clamps to minimum 8", () => {
+		// max(8, min(floor(30*0.5), 0+4)) = max(8, min(15,4)) = max(8,4) = 8
+		expect(computeAgentPanelHeight(30, 0)).toBe(8);
+	});
+
+	test("4 agents: still clamps to minimum 8", () => {
+		// max(8, min(15, 4+4)) = max(8, 8) = 8
+		expect(computeAgentPanelHeight(30, 4)).toBe(8);
+	});
+
+	test("20 agents with height 30: clamps to floor(height*0.5)", () => {
+		// max(8, min(15, 24)) = max(8,15) = 15
+		expect(computeAgentPanelHeight(30, 20)).toBe(15);
+	});
+
+	test("10 agents with height 30: grows with agent count", () => {
+		// max(8, min(15, 14)) = max(8,14) = 14
+		expect(computeAgentPanelHeight(30, 10)).toBe(14);
+	});
+
+	test("small height: respects 50% cap", () => {
+		// height=20: max(8, min(10, 20+4)) = max(8,10) = 10
+		expect(computeAgentPanelHeight(20, 20)).toBe(10);
+	});
+});
+
+// Helper to build a minimal DashboardData for panel tests
+function makeDashboardData(
+	overrides: Partial<{
+		tasks: Array<{ id: string; title: string; priority: number; status: string; type: string }>;
+		recentEvents: Array<{
+			id: number;
+			agentName: string;
+			eventType: string;
+			level: string;
+			createdAt: string;
+			runId: null;
+			sessionId: null;
+			toolName: null;
+			toolArgs: null;
+			toolDurationMs: null;
+			data: null;
+		}>;
+	}> = {},
+) {
+	return {
+		currentRunId: null,
+		status: {
+			currentRunId: null,
+			agents: [],
+			worktrees: [],
+			tmuxSessions: [],
+			unreadMailCount: 0,
+			mergeQueueCount: 0,
+			recentMetricsCount: 0,
+		},
+		recentMail: [],
+		mergeQueue: [],
+		metrics: { totalSessions: 0, avgDuration: 0, byCapability: {} },
+		tasks: overrides.tasks ?? [],
+		recentEvents: (overrides.recentEvents as never[]) ?? [],
+	};
+}
+
+describe("renderTasksPanel", () => {
+	test("renders task id in output", () => {
+		const data = makeDashboardData({
+			tasks: [{ id: "t1", title: "Test task", priority: 2, status: "open", type: "task" }],
+		});
+		const out = renderTasksPanel(data, 1, 80, 10, 1);
+		expect(out).toContain("t1");
+	});
+
+	test("renders task title in output", () => {
+		const data = makeDashboardData({
+			tasks: [{ id: "t1", title: "Test task", priority: 2, status: "open", type: "task" }],
+		});
+		const out = renderTasksPanel(data, 1, 80, 10, 1);
+		expect(out).toContain("Test task");
+	});
+
+	test("renders priority label in output", () => {
+		const data = makeDashboardData({
+			tasks: [{ id: "t1", title: "Test task", priority: 2, status: "open", type: "task" }],
+		});
+		const out = renderTasksPanel(data, 1, 80, 10, 1);
+		expect(out).toContain("P2");
+	});
+
+	test("shows 'No tracker data' when tasks list is empty", () => {
+		const data = makeDashboardData({ tasks: [] });
+		const out = renderTasksPanel(data, 1, 80, 10, 1);
+		expect(out).toContain("No tracker data");
+	});
+
+	test("renders Tasks header", () => {
+		const data = makeDashboardData({ tasks: [] });
+		const out = renderTasksPanel(data, 1, 80, 6, 1);
+		expect(out).toContain("Tasks");
+	});
+
+	test("renders multiple tasks", () => {
+		const data = makeDashboardData({
+			tasks: [
+				{ id: "abc-001", title: "First task", priority: 1, status: "open", type: "task" },
+				{ id: "abc-002", title: "Second task", priority: 3, status: "in_progress", type: "bug" },
+			],
+		});
+		const out = renderTasksPanel(data, 1, 80, 10, 1);
+		expect(out).toContain("abc-001");
+		expect(out).toContain("abc-002");
+	});
+});
+
+describe("renderFeedPanel", () => {
+	test("shows 'No recent events' when recentEvents is empty", () => {
+		const data = makeDashboardData({ recentEvents: [] });
+		const out = renderFeedPanel(data, 1, 80, 8, 1);
+		expect(out).toContain("No recent events");
+	});
+
+	test("renders Feed header", () => {
+		const data = makeDashboardData({ recentEvents: [] });
+		const out = renderFeedPanel(data, 1, 80, 8, 1);
+		expect(out).toContain("Feed");
+	});
+
+	test("renders event agent name when events are present", () => {
+		const event = {
+			id: 1,
+			agentName: "test-agent",
+			eventType: "tool_end" as const,
+			level: "info" as const,
+			createdAt: new Date().toISOString(),
+			runId: null,
+			sessionId: null,
+			toolName: null,
+			toolArgs: null,
+			toolDurationMs: null,
+			data: null,
+		};
+		const data = makeDashboardData({ recentEvents: [event] });
+		// formatEventLine is a stub — returns "" — so output won't have agent name from it.
+		// But the panel itself should not throw and should render the border structure.
+		const out = renderFeedPanel(data, 1, 80, 8, 1);
+		// Panel renders without error and contains Feed header
+		expect(out).toContain("Feed");
+		// At least 1 row rendered (not the "No recent events" path)
+		expect(out).not.toContain("No recent events");
+	});
+});
+
+describe("renderAgentPanel", () => {
+	test("renders Agents header", () => {
+		const data = makeDashboardData({});
+		const out = renderAgentPanel(data, 100, 12, 3);
+		expect(out).toContain("Agents");
+	});
+
+	test("renders with dimmed border characters", () => {
+		const data = makeDashboardData({});
+		const out = renderAgentPanel(data, 100, 12, 3);
+		// dimBox.vertical is a dimmed ANSI string — present in output
+		expect(out).toContain(dimBox.vertical);
+	});
+});
+
 describe("openDashboardStores", () => {
 	let tempDir: string;
 
@@ -211,14 +416,12 @@ describe("openDashboardStores", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("sessionStore is non-null when .overstory/ has sessions.db", async () => {
-		// Create the .overstory directory and seed a sessions.db via createSessionStore
 		const overstoryDir = join(tempDir, ".overstory");
 		await mkdir(overstoryDir, { recursive: true });
-		// createSessionStore creates and initialises sessions.db
 		const seeder = createSessionStore(join(overstoryDir, "sessions.db"));
 		seeder.close();
 
@@ -271,6 +474,38 @@ describe("openDashboardStores", () => {
 			closeDashboardStores(stores);
 		}
 	});
+
+	test("eventStore is null when events.db does not exist", async () => {
+		const overstoryDir = join(tempDir, ".overstory");
+		await mkdir(overstoryDir, { recursive: true });
+		const seeder = createSessionStore(join(overstoryDir, "sessions.db"));
+		seeder.close();
+
+		const stores = openDashboardStores(tempDir);
+		try {
+			expect(stores.eventStore).toBeNull();
+		} finally {
+			closeDashboardStores(stores);
+		}
+	});
+
+	test("eventStore is non-null when events.db exists", async () => {
+		const overstoryDir = join(tempDir, ".overstory");
+		await mkdir(overstoryDir, { recursive: true });
+		const seeder = createSessionStore(join(overstoryDir, "sessions.db"));
+		seeder.close();
+
+		// Create events.db via createEventStore
+		const eventsDb = createEventStore(join(overstoryDir, "events.db"));
+		eventsDb.close();
+
+		const stores = openDashboardStores(tempDir);
+		try {
+			expect(stores.eventStore).not.toBeNull();
+		} finally {
+			closeDashboardStores(stores);
+		}
+	});
 });
 
 describe("closeDashboardStores", () => {
@@ -281,7 +516,7 @@ describe("closeDashboardStores", () => {
 	});
 
 	afterEach(async () => {
-		await rm(tempDir, { recursive: true, force: true });
+		await cleanupTempDir(tempDir);
 	});
 
 	test("closing stores does not throw", async () => {
@@ -305,4 +540,28 @@ describe("closeDashboardStores", () => {
 		// Second close should not throw due to best-effort try/catch
 		expect(() => closeDashboardStores(stores)).not.toThrow();
 	});
+
+	test("closing stores with eventStore does not throw", async () => {
+		const overstoryDir = join(tempDir, ".overstory");
+		await mkdir(overstoryDir, { recursive: true });
+		const seeder = createSessionStore(join(overstoryDir, "sessions.db"));
+		seeder.close();
+		const eventsDb = createEventStore(join(overstoryDir, "events.db"));
+		eventsDb.close();
+
+		const stores = openDashboardStores(tempDir);
+		expect(() => closeDashboardStores(stores)).not.toThrow();
+	});
+});
+
+// Type check: DashboardStores includes eventStore
+test("DashboardStores type includes eventStore field", () => {
+	const stores: DashboardStores = {
+		sessionStore: null as never,
+		mailStore: null,
+		mergeQueue: null,
+		metricsStore: null,
+		eventStore: null,
+	};
+	expect(stores.eventStore).toBeNull();
 });