@os-eco/overstory-cli 0.6.4 → 0.6.6

package/src/doctor/consistency.test.ts

@@ -195,7 +195,7 @@ describe("checkConsistency", () => {
 			capability: "builder",
 			worktreePath: join(overstoryDir, "worktrees", "dead-agent"),
 			branchName: "overstory/dead-agent/test-123",
-			beadId: "test-123",
+			taskId: "test-123",
 			tmuxSession: "overstory-testproject-dead-agent",
 			state: "working",
 			pid: 99999, // Non-existent PID
@@ -231,7 +231,7 @@ describe("checkConsistency", () => {
 			capability: "builder",
 			worktreePath: join(overstoryDir, "worktrees", "live-agent"),
 			branchName: "overstory/live-agent/test-123",
-			beadId: "test-123",
+			taskId: "test-123",
 			tmuxSession: "overstory-testproject-live-agent",
 			state: "working",
 			pid: 12345,
@@ -266,7 +266,7 @@ describe("checkConsistency", () => {
 			capability: "builder",
 			worktreePath: missingWorktreePath,
 			branchName: "overstory/missing-agent/test-123",
-			beadId: "test-123",
+			taskId: "test-123",
 			tmuxSession: "overstory-testproject-missing-agent",
 			state: "working",
 			pid: null,
@@ -302,7 +302,7 @@ describe("checkConsistency", () => {
 			capability: "builder",
 			worktreePath,
 			branchName: "overstory/agent-without-tmux/test-123",
-			beadId: "test-123",
+			taskId: "test-123",
 			tmuxSession: "overstory-testproject-agent-without-tmux",
 			state: "working",
 			pid: null,
@@ -341,7 +341,7 @@ describe("checkConsistency", () => {
 			capability: "builder",
 			worktreePath,
 			branchName: "overstory/consistent-agent/test-123",
-			beadId: "test-123",
+			taskId: "test-123",
 			tmuxSession: "overstory-testproject-consistent-agent",
 			state: "working",
 			pid: 12345,
@@ -414,7 +414,7 @@ describe("checkConsistency", () => {
 			capability: "builder",
 			worktreePath: join(overstoryDir, "worktrees", "builder-1"),
 			branchName: "overstory/builder-1/test-123",
-			beadId: "test-123",
+			taskId: "test-123",
 			tmuxSession: "overstory-testproject-builder-1",
 			state: "working",
 			pid: null,
@@ -433,7 +433,7 @@ describe("checkConsistency", () => {
 			capability: "builder",
 			worktreePath: join(overstoryDir, "worktrees", "builder-2"),
 			branchName: "overstory/builder-2/test-456",
-			beadId: "test-456",
+			taskId: "test-456",
 			tmuxSession: "overstory-testproject-builder-2",
 			state: "working",
 			pid: null,
@@ -469,7 +469,7 @@ describe("checkConsistency", () => {
 				capability: "builder",
 				worktreePath: join(overstoryDir, "worktrees", `builder-${i}`),
 				branchName: `overstory/builder-${i}/test-${i}`,
-				beadId: `test-${i}`,
+				taskId: `test-${i}`,
 				tmuxSession: `overstory-testproject-builder-${i}`,
 				state: "working",
 				pid: null,
@@ -489,7 +489,7 @@ describe("checkConsistency", () => {
 			capability: "reviewer",
 			worktreePath: join(overstoryDir, "worktrees", "reviewer-1"),
 			branchName: "overstory/reviewer-1/test-r1",
-			beadId: "test-r1",
+			taskId: "test-r1",
 			tmuxSession: "overstory-testproject-reviewer-1",
 			state: "working",
 			pid: null,
@@ -523,7 +523,7 @@ describe("checkConsistency", () => {
 				capability: "builder",
 				worktreePath: join(overstoryDir, "worktrees", `builder-${i}`),
 				branchName: `overstory/builder-${i}/test-${i}`,
-				beadId: `test-${i}`,
+				taskId: `test-${i}`,
 				tmuxSession: `overstory-testproject-builder-${i}`,
 				state: "working",
 				pid: null,
@@ -542,7 +542,7 @@ describe("checkConsistency", () => {
 				capability: "reviewer",
 				worktreePath: join(overstoryDir, "worktrees", `reviewer-${i}`),
 				branchName: `overstory/reviewer-${i}/test-r${i}`,
-				beadId: `test-r${i}`,
+				taskId: `test-r${i}`,
 				tmuxSession: `overstory-testproject-reviewer-${i}`,
 				state: "working",
 				pid: null,
@@ -585,7 +585,7 @@ describe("checkConsistency", () => {
 			capability: "builder",
 			worktreePath: join(overstoryDir, "worktrees", "builder-1"),
 			branchName: "overstory/builder-1/test-1",
-			beadId: "test-1",
+			taskId: "test-1",
 			tmuxSession: "overstory-testproject-builder-1",
 			state: "working",
 			pid: null,
@@ -604,7 +604,7 @@ describe("checkConsistency", () => {
 			capability: "reviewer",
 			worktreePath: join(overstoryDir, "worktrees", "reviewer-1"),
 			branchName: "overstory/reviewer-1/test-r1",
-			beadId: "test-r1",
+			taskId: "test-r1",
 			tmuxSession: "overstory-testproject-reviewer-1",
 			state: "working",
 			pid: null,
@@ -624,7 +624,7 @@ describe("checkConsistency", () => {
 			capability: "builder",
 			worktreePath: join(overstoryDir, "worktrees", "builder-2"),
 			branchName: "overstory/builder-2/test-2",
-			beadId: "test-2",
+			taskId: "test-2",
 			tmuxSession: "overstory-testproject-builder-2",
 			state: "working",
 			pid: null,

package/src/doctor/dependencies.test.ts

@@ -66,7 +66,7 @@ describe("checkDependencies", () => {
 		expect(toolNames).toContain("tmux availability");
 		expect(toolNames).toContain("sd availability");
 		expect(toolNames).toContain("mulch availability");
-		expect(toolNames).toContain("overstory availability");
+		expect(toolNames).toContain("ov availability");
 		expect(toolNames).toContain("cn availability");
 	});
 
@@ -201,9 +201,9 @@ describe("checkDependencies", () => {
 			expect(mlAlias?.category).toBe("dependencies");
 			expect(["pass", "warn"]).toContain(mlAlias?.status ?? "");
 		}
-		const ovCheck = checks.find((c) => c.name === "overstory availability");
+		const ovCheck = checks.find((c) => c.name === "ov availability");
 		if (ovCheck?.status === "pass") {
-			const ovAlias = checks.find((c) => c.name === "ov alias");
+			const ovAlias = checks.find((c) => c.name === "overstory alias");
 			expect(ovAlias).toBeDefined();
 			expect(["pass", "warn"]).toContain(ovAlias?.status ?? "");
 		}
@@ -229,9 +229,9 @@ describe("checkDependencies", () => {
 		}
 	});
 
-	test("includes overstory availability check", async () => {
+	test("includes ov availability check", async () => {
 		const checks = await checkDependencies(mockConfig, "/tmp/.overstory");
-		const ovCheck = checks.find((c) => c.name === "overstory availability");
+		const ovCheck = checks.find((c) => c.name === "ov availability");
 		expect(ovCheck).toBeDefined();
 		expect(ovCheck?.category).toBe("dependencies");
 	});

package/src/doctor/dependencies.ts

@@ -42,10 +42,10 @@ export const checkDependencies: DoctorCheckFn = async (
 			installHint: "@os-eco/mulch-cli",
 		},
 		{
-			name: "overstory",
+			name: "ov",
 			versionFlag: "--version",
 			required: true,
-			alias: "ov",
+			alias: "overstory",
 			installHint: "@os-eco/overstory-cli",
 		},
 		{

package/src/doctor/logs.ts

@@ -177,7 +177,7 @@ export const checkLogs: DoctorCheckFn = async (_config, overstoryDir): Promise<D
 			totalBytes > DISK_USAGE_WARN_THRESHOLD
 				? [
 						`Exceeds ${formatBytes(DISK_USAGE_WARN_THRESHOLD)} threshold`,
-						"Consider running 'overstory worktree clean --completed' to remove old logs",
+						"Consider running 'ov worktree clean --completed' to remove old logs",
 					]
 				: undefined,
 		fixable: totalBytes > DISK_USAGE_WARN_THRESHOLD,

package/src/doctor/merge-queue.test.ts

@@ -77,13 +77,13 @@ describe("checkMergeQueue", () => {
 		const queue = createMergeQueue(dbPath);
 		queue.enqueue({
 			branchName: "feature/test",
-			beadId: "beads-abc",
+			taskId: "beads-abc",
 			agentName: "test-agent",
 			filesModified: ["src/test.ts"],
 		});
 		queue.enqueue({
 			branchName: "feature/another",
-			beadId: "beads-def",
+			taskId: "beads-def",
 			agentName: "another-agent",
 			filesModified: ["src/another.ts"],
 		});
@@ -194,13 +194,13 @@ describe("checkMergeQueue", () => {
 		const queue = createMergeQueue(dbPath);
 		queue.enqueue({
 			branchName: "feature/duplicate",
-			beadId: "beads-abc",
+			taskId: "beads-abc",
 			agentName: "test-agent",
 			filesModified: ["src/test.ts"],
 		});
 		queue.enqueue({
 			branchName: "feature/duplicate",
-			beadId: "beads-def",
+			taskId: "beads-def",
 			agentName: "another-agent",
 			filesModified: ["src/another.ts"],
 		});

package/src/doctor/structure.test.ts

@@ -104,7 +104,7 @@ describe("checkStructure", () => {
 		await Bun.write(
 			join(overstoryDir, ".gitignore"),
 			`# Wildcard+whitelist: ignore everything, whitelist tracked files
-# Auto-healed by overstory prime on each session start
+# Auto-healed by ov prime on each session start
 *
 !.gitignore
 !config.yaml

package/src/doctor/structure.ts

@@ -32,7 +32,7 @@ export const checkStructure: DoctorCheckFn = async (
 		category: "structure",
 		status: overstoryDirExists ? "pass" : "fail",
 		message: overstoryDirExists ? "Directory exists" : "Directory missing",
-		details: overstoryDirExists ? undefined : ["Run 'overstory init' to create it"],
+		details: overstoryDirExists ? undefined : ["Run 'ov init' to create it"],
 		fixable: !overstoryDirExists,
 	});
 

package/src/doctor/version.test.ts

@@ -70,7 +70,7 @@ describe("checkVersion", () => {
 		const versionCheck = checks.find((c) => c.name === "version-current");
 		expect(versionCheck).toBeDefined();
 		expect(versionCheck?.status).toBeOneOf(["pass", "warn", "fail"]);
-		expect(versionCheck?.message).toContain("overstory");
+		expect(versionCheck?.message).toContain("ov");
 	});
 
 	test("includes package-json-sync check", async () => {
@@ -88,8 +88,8 @@ describe("checkVersion", () => {
 		expect(versionCheck).toBeDefined();
 
 		if (versionCheck?.status === "pass") {
-			// Message should contain version in format "overstory vX.Y.Z"
-			expect(versionCheck.message).toMatch(/overstory v\d+\.\d+\.\d+/);
+			// Message should contain version in format "ov vX.Y.Z"
+			expect(versionCheck.message).toMatch(/ov v\d+\.\d+\.\d+/);
 		}
 	});
 

package/src/doctor/version.ts

@@ -47,7 +47,7 @@ async function checkCurrentVersion(toolRoot: string): Promise<DoctorCheck> {
 			name: "version-current",
 			category: "version",
 			status: "pass",
-			message: `overstory v${packageJson.version}`,
+			message: `ov v${packageJson.version}`,
 		};
 	} catch (error) {
 		return {

package/src/e2e/init-sling-lifecycle.test.ts

@@ -22,9 +22,13 @@ import type { OverlayConfig } from "../types.ts";
 const EXPECTED_AGENT_DEFS = [
 	"builder.md",
 	"coordinator.md",
+	"issue-reviews.md",
 	"lead.md",
 	"merger.md",
 	"monitor.md",
+	"pr-reviews.md",
+	"prioritize.md",
+	"release.md",
 	"reviewer.md",
 	"scout.md",
 	"supervisor.md",
@@ -109,7 +113,7 @@ describe("E2E: init→sling lifecycle on external project", () => {
 		expect(config.project.name).toBeTruthy();
 	});
 
-	test("manifest loads successfully with all 8 agents", async () => {
+	test("manifest loads successfully with all 12 agents", async () => {
 		await initCommand({});
 
 		const manifestPath = join(tempDir, ".overstory", "agent-manifest.json");
@@ -174,7 +178,7 @@ describe("E2E: init→sling lifecycle on external project", () => {
 
 		const overlayConfig: OverlayConfig = {
 			agentName: "test-agent",
-			beadId: "test-bead-001",
+			taskId: "test-bead-001",
 			specPath: null,
 			branchName: "overstory/test-agent/test-bead-001",
 			worktreePath: join(tempDir, ".overstory", "worktrees", "test-agent"),
@@ -241,7 +245,7 @@ describe("E2E: init→sling lifecycle on external project", () => {
 		const builderDef = await Bun.file(join(agentDefsDir, "builder.md")).text();
 		const overlayConfig: OverlayConfig = {
 			agentName: "lifecycle-builder",
-			beadId: "lifecycle-001",
+			taskId: "lifecycle-001",
 			specPath: join(tempDir, ".overstory", "specs", "lifecycle-001.md"),
 			branchName: "overstory/lifecycle-builder/lifecycle-001",
 			worktreePath: join(tempDir, ".overstory", "worktrees", "lifecycle-builder"),
@@ -269,7 +273,7 @@ describe("E2E: init→sling lifecycle on external project", () => {
 		expect(overlayContent).toContain("orchestrator");
 		expect(overlayContent).toContain("`src/main.ts`");
 		expect(overlayContent).toContain("`src/utils.ts`");
-		expect(overlayContent).toContain("mulch prime typescript");
+		expect(overlayContent).toContain("ml prime typescript");
 
 		// No unresolved placeholders
 		expect(overlayContent).not.toMatch(/\{\{[A-Z_]+\}\}/);

package/src/errors.ts

@@ -152,7 +152,7 @@ export class MergeError extends OverstoryError {
 
 /**
  * Raised when input validation fails.
- * Examples: invalid agent names, malformed beadIds, bad CLI arguments.
+ * Examples: invalid agent names, malformed taskIds, bad CLI arguments.
  */
 export class ValidationError extends OverstoryError {
 	readonly field: string | null;

package/src/index.ts

@@ -4,7 +4,7 @@
  * Overstory CLI — main entry point and command router.
  *
  * Routes subcommands to their respective handlers in src/commands/.
- * Usage: overstory <command> [args...]
+ * Usage: ov <command> [args...]
  */
 
 import { Command } from "commander";
@@ -42,7 +42,7 @@ import { createWorktreeCommand } from "./commands/worktree.ts";
 import { OverstoryError, WorktreeError } from "./errors.ts";
 import { setQuiet } from "./logging/color.ts";
 
-const VERSION = "0.6.4";
+const VERSION = "0.6.6";
 
 const COMMANDS = [
 	"agents",
@@ -113,9 +113,9 @@ function suggestCommand(input: string): string | undefined {
 const program = new Command();
 
 program
-	.name("overstory")
+	.name("ov")
 	.description("Multi-agent orchestration for Claude Code")
-	.version(`overstory v${VERSION}`, "-v, --version")
+	.version(`ov v${VERSION}`, "-v, --version")
 	.option("-q, --quiet", "Suppress non-error output")
 	.option("--json", "JSON output")
 	.option("--verbose", "Verbose output");
@@ -180,8 +180,8 @@ specCmd
 	.argument("<bead-id>", "Task ID for the spec file")
 	.option("--body <content>", "Spec content (or pipe via stdin)")
 	.option("--agent <name>", "Agent writing the spec (for attribution)")
-	.action(async (beadId, opts) => {
-		await specWriteCommand(beadId, opts);
+	.action(async (taskId, opts) => {
+		await specWriteCommand(taskId, opts);
 	});
 
 program
@@ -295,7 +295,7 @@ program.on("command:*", (operands) => {
 	if (suggestion) {
 		process.stderr.write(`Did you mean '${suggestion}'?\n`);
 	}
-	process.stderr.write("Run 'overstory --help' for usage.\n");
+	process.stderr.write("Run 'ov --help' for usage.\n");
 	process.exit(1);
 });
 
@@ -307,20 +307,22 @@ if (import.meta.main)
 	main().catch((err: unknown) => {
 		// Friendly message when running outside a git repository
 		if (err instanceof WorktreeError && err.message.includes("not a git repository")) {
-			process.stderr.write("Not in an overstory project. Run 'overstory init' first.\n");
+			process.stderr.write("Not in an overstory project. Run 'ov init' first.\n");
 			process.exit(1);
 		}
 		if (err instanceof OverstoryError) {
 			process.stderr.write(`Error [${err.code}]: ${err.message}\n`);
-			process.exit(1);
+			process.exitCode = 1;
+			return;
 		}
 		if (err instanceof Error) {
 			process.stderr.write(`Error: ${err.message}\n`);
 			if (process.argv.includes("--verbose")) {
 				process.stderr.write(`${err.stack}\n`);
 			}
-			process.exit(1);
+			process.exitCode = 1;
+			return;
 		}
 		process.stderr.write(`Unknown error: ${String(err)}\n`);
-		process.exit(1);
+		process.exitCode = 1;
 	});

package/src/mail/broadcast.test.ts

@@ -30,7 +30,7 @@ describe("resolveGroupAddress", () => {
 			capability,
 			worktreePath: `/worktrees/${agentName}`,
 			branchName: `branch-${agentName}`,
-			beadId: "bead-001",
+			taskId: "bead-001",
 			tmuxSession: `overstory-test-${agentName}`,
 			state: "working",
 			pid: 12345,

package/src/mail/client.test.ts

@@ -225,7 +225,7 @@ describe("createMailClient", () => {
 			});
 
 			const result = client.checkInject("orchestrator");
-			expect(result).toContain(`overstory mail reply ${id}`);
+			expect(result).toContain(`ov mail reply ${id}`);
 		});
 
 		test("formats multiple messages with correct count", () => {
@@ -598,7 +598,7 @@ describe("createMailClient", () => {
 	describe("sendProtocol", () => {
 		test("sends a worker_done message with serialized payload", () => {
 			const payload: WorkerDonePayload = {
-				beadId: "beads-abc",
+				taskId: "beads-abc",
 				branch: "agent/builder-1",
 				exitCode: 0,
 				filesModified: ["src/foo.ts", "src/bar.ts"],
@@ -625,7 +625,7 @@ describe("createMailClient", () => {
 				subject: "Merged",
 				body: "Branch merged",
 				type: "merged",
-				payload: { branch: "agent/b1", beadId: "beads-xyz", tier: "clean-merge" as const },
+				payload: { branch: "agent/b1", taskId: "beads-xyz", tier: "clean-merge" as const },
 			});
 
 			const msg = store.getById(id);
@@ -640,7 +640,7 @@ describe("createMailClient", () => {
 				body: "Build failing",
 				type: "escalation",
 				priority: "urgent",
-				payload: { severity: "critical" as const, beadId: null, context: "OOM" },
+				payload: { severity: "critical" as const, taskId: null, context: "OOM" },
 			});
 
 			const msg = store.getById(id);
@@ -656,7 +656,7 @@ describe("createMailClient", () => {
 				type: "assign",
 				threadId: "thread-dispatch-1",
 				payload: {
-					beadId: "beads-123",
+					taskId: "beads-123",
 					specPath: ".overstory/specs/beads-123.md",
 					workerName: "builder-1",
 					branch: "agent/builder-1",
@@ -671,7 +671,7 @@ describe("createMailClient", () => {
 	describe("parsePayload", () => {
 		test("parses a valid JSON payload", () => {
 			const payload: WorkerDonePayload = {
-				beadId: "beads-abc",
+				taskId: "beads-abc",
 				branch: "agent/builder-1",
 				exitCode: 0,
 				filesModified: ["src/foo.ts"],
@@ -727,7 +727,7 @@ describe("createMailClient", () => {
 	describe("checkInject with protocol messages", () => {
 		test("includes payload in injection output for protocol messages", () => {
 			const payload: WorkerDonePayload = {
-				beadId: "beads-abc",
+				taskId: "beads-abc",
 				branch: "agent/builder-1",
 				exitCode: 0,
 				filesModified: ["src/foo.ts"],

package/src/mail/client.ts

@@ -96,7 +96,7 @@ function formatForInjection(messages: MailMessage[]): string {
 	}
 
 	const lines: string[] = [
-		`📬 You have ${messages.length} new message${messages.length === 1 ? "" : "s"}:`,
+		`You have ${messages.length} new message${messages.length === 1 ? "" : "s"}:`,
 		"",
 	];
 
@@ -108,7 +108,7 @@ function formatForInjection(messages: MailMessage[]): string {
 		if (msg.payload !== null && PROTOCOL_TYPES.has(msg.type)) {
 			lines.push(`Payload: ${msg.payload}`);
 		}
-		lines.push(`[Reply with: overstory mail reply ${msg.id} --body "..."]`);
+		lines.push(`[Reply with: ov mail reply ${msg.id} --body "..."]`);
 		lines.push("");
 	}
 

package/src/mail/store.test.ts

@@ -638,7 +638,7 @@ describe("createMailStore", () => {
 
 		test("stores JSON payload string", () => {
 			const payload = JSON.stringify({
-				beadId: "beads-abc",
+				taskId: "beads-abc",
 				branch: "agent/builder-1",
 				exitCode: 0,
 				filesModified: ["src/foo.ts"],
@@ -661,7 +661,7 @@ describe("createMailStore", () => {
 		});
 
 		test("returns payload in getUnread results", () => {
-			const payload = JSON.stringify({ severity: "critical", beadId: null, context: "OOM" });
+			const payload = JSON.stringify({ severity: "critical", taskId: null, context: "OOM" });
 			store.insert({
 				id: "msg-escalation",
 				from: "builder-1",
@@ -682,7 +682,7 @@ describe("createMailStore", () => {
 		test("returns payload in getAll results", () => {
 			const payload = JSON.stringify({
 				branch: "agent/b1",
-				beadId: "beads-xyz",
+				taskId: "beads-xyz",
 				tier: "clean-merge",
 			});
 			store.insert({

package/src/merge/queue.test.ts

@@ -23,14 +23,14 @@ describe("createMergeQueue", () => {
 	function makeInput(
 		overrides?: Partial<{
 			branchName: string;
-			beadId: string;
+			taskId: string;
 			agentName: string;
 			filesModified: string[];
 		}>,
 	) {
 		return {
 			branchName: overrides?.branchName ?? "overstory/test-agent/bead-123",
-			beadId: overrides?.beadId ?? "bead-123",
+			taskId: overrides?.taskId ?? "bead-123",
 			agentName: overrides?.agentName ?? "test-agent",
 			filesModified: overrides?.filesModified ?? ["src/test.ts"],
 		};
@@ -52,7 +52,7 @@ describe("createMergeQueue", () => {
 			const after = new Date().toISOString();
 
 			expect(entry.branchName).toBe("overstory/test-agent/bead-123");
-			expect(entry.beadId).toBe("bead-123");
+			expect(entry.taskId).toBe("bead-123");
 			expect(entry.agentName).toBe("test-agent");
 			expect(entry.filesModified).toEqual(["src/test.ts"]);
 			expect(entry.enqueuedAt).toBeDefined();
@@ -65,7 +65,7 @@ describe("createMergeQueue", () => {
 			const queue = createMergeQueue(queuePath);
 			const input = makeInput({
 				branchName: "overstory/builder-1/bead-xyz",
-				beadId: "bead-xyz",
+				taskId: "bead-xyz",
 				agentName: "builder-1",
 				filesModified: ["src/a.ts", "src/b.ts"],
 			});
@@ -73,7 +73,7 @@ describe("createMergeQueue", () => {
 			const entry = queue.enqueue(input);
 
 			expect(entry.branchName).toBe("overstory/builder-1/bead-xyz");
-			expect(entry.beadId).toBe("bead-xyz");
+			expect(entry.taskId).toBe("bead-xyz");
 			expect(entry.agentName).toBe("builder-1");
 			expect(entry.filesModified).toEqual(["src/a.ts", "src/b.ts"]);
 		});
@@ -82,8 +82,8 @@ describe("createMergeQueue", () => {
 	describe("dequeue", () => {
 		test("returns first pending entry (FIFO)", () => {
 			const queue = createMergeQueue(queuePath);
-			queue.enqueue(makeInput({ branchName: "branch-a", beadId: "bead-a" }));
-			queue.enqueue(makeInput({ branchName: "branch-b", beadId: "bead-b" }));
+			queue.enqueue(makeInput({ branchName: "branch-a", taskId: "bead-a" }));
+			queue.enqueue(makeInput({ branchName: "branch-b", taskId: "bead-b" }));
 
 			const dequeued = queue.dequeue();
 
@@ -363,17 +363,17 @@ describe("createMergeQueue", () => {
 			const entries = queue.list();
 
 			expect(entries).toHaveLength(1);
-			expect(entries[0]?.beadId).toBe("bead-1");
+			expect(entries[0]?.taskId).toBe("bead-1");
 			expect(entries[0]?.branchName).toBe("overstory/test/bead-1");
 
 			// New inserts should also work
 			const newEntry = queue.enqueue({
 				branchName: "overstory/test/bead-2",
-				beadId: "bead-2",
+				taskId: "bead-2",
 				agentName: "test",
 				filesModified: ["src/b.ts"],
 			});
-			expect(newEntry.beadId).toBe("bead-2");
+			expect(newEntry.taskId).toBe("bead-2");
 
 			queue.close();
 		});
@@ -383,7 +383,7 @@ describe("createMergeQueue", () => {
 			const queue1 = createMergeQueue(queuePath);
 			queue1.enqueue({
 				branchName: "overstory/test/bead-1",
-				beadId: "bead-1",
+				taskId: "bead-1",
 				agentName: "test",
 				filesModified: [],
 			});
@@ -394,7 +394,7 @@ describe("createMergeQueue", () => {
 			const entries = queue2.list();
 
 			expect(entries).toHaveLength(1);
-			expect(entries[0]?.beadId).toBe("bead-1");
+			expect(entries[0]?.taskId).toBe("bead-1");
 			queue2.close();
 		});
 	});

package/src/merge/queue.ts

@@ -74,7 +74,7 @@ function rowToEntry(row: MergeQueueRow): MergeEntry {
 
 	return {
 		branchName: row.branch_name,
-		beadId: row.task_id,
+		taskId: row.task_id,
 		agentName: row.agent_name,
 		filesModified,
 		enqueuedAt: row.enqueued_at,
@@ -172,7 +172,7 @@ export function createMergeQueue(dbPath: string): MergeQueue {
 
 			const row = insertStmt.get({
 				$branch_name: input.branchName,
-				$task_id: input.beadId,
+				$task_id: input.taskId,
 				$agent_name: input.agentName,
 				$files_modified: filesModifiedJson,
 				$enqueued_at: enqueuedAt,