@os-eco/overstory-cli 0.6.4 → 0.6.6

package/src/commands/worktree.test.ts

@@ -68,7 +68,7 @@ describe("worktreeCommand", () => {
 			capability: "builder",
 			worktreePath: join(tempDir, ".overstory", "worktrees", "test-agent"),
 			branchName: "overstory/test-agent/task-1",
-			beadId: "task-1",
+			taskId: "task-1",
 			tmuxSession: "overstory-test-agent-fake", // FAKE tmux session name
 			state: "working",
 			pid: 12345,
@@ -156,7 +156,7 @@ describe("worktreeCommand", () => {
 					capability: "builder",
 					worktreePath,
 					branchName: "overstory/test-agent/task-1",
-					beadId: "task-1",
+					taskId: "task-1",
 					tmuxSession: "overstory-test-agent",
 					state: "working",
 					pid: 12345,
@@ -173,7 +173,7 @@ describe("worktreeCommand", () => {
 			await worktreeCommand(["list"]);
 			const out = output();
 
-			expect(out).toContain("🌳 Agent worktrees: 1");
+			expect(out).toContain("Agent worktrees: 1");
 			expect(out).toContain("overstory/test-agent/task-1");
 			expect(out).toContain("Agent: test-agent");
 			expect(out).toContain("State: working");
@@ -203,7 +203,7 @@ describe("worktreeCommand", () => {
 					capability: "builder",
 					worktreePath,
 					branchName: "overstory/test-agent/task-1",
-					beadId: "task-1",
+					taskId: "task-1",
 					tmuxSession: "overstory-test-agent",
 					state: "working",
 					pid: 12345,
@@ -226,7 +226,7 @@ describe("worktreeCommand", () => {
 				head: string;
 				agentName: string | null;
 				state: string | null;
-				beadId: string | null;
+				taskId: string | null;
 			}>;
 
 			expect(parsed).toHaveLength(1);
@@ -234,7 +234,7 @@ describe("worktreeCommand", () => {
 			expect(parsed[0]?.branch).toBe("overstory/test-agent/task-1");
 			expect(parsed[0]?.agentName).toBe("test-agent");
 			expect(parsed[0]?.state).toBe("working");
-			expect(parsed[0]?.beadId).toBe("task-1");
+			expect(parsed[0]?.taskId).toBe("task-1");
 		});
 
 		test("worktrees without sessions show unknown state", async () => {
@@ -291,7 +291,7 @@ describe("worktreeCommand", () => {
 					capability: "builder",
 					worktreePath,
 					branchName: "overstory/completed-agent/task-done",
-					beadId: "task-done",
+					taskId: "task-done",
 					tmuxSession: "overstory-completed-agent",
 					state: "completed",
 					pid: 12345,
@@ -308,7 +308,7 @@ describe("worktreeCommand", () => {
 			await worktreeCommand(["clean"]);
 			const out = output();
 
-			expect(out).toContain("🗑️  Removed: overstory/completed-agent/task-done");
+			expect(out).toContain("Removed: overstory/completed-agent/task-done");
 			expect(out).toContain("Cleaned 1 worktree");
 
 			// Verify the worktree directory is gone
@@ -345,7 +345,7 @@ describe("worktreeCommand", () => {
 					capability: "builder",
 					worktreePath,
 					branchName: "overstory/done-agent/task-x",
-					beadId: "task-x",
+					taskId: "task-x",
 					tmuxSession: "overstory-done-agent",
 					state: "completed",
 					pid: 12345,
@@ -383,7 +383,7 @@ describe("worktreeCommand", () => {
 					capability: "builder",
 					worktreePath: nonExistentPath,
 					branchName: "overstory/ghost-agent/task-ghost",
-					beadId: "task-ghost",
+					taskId: "task-ghost",
 					tmuxSession: "overstory-ghost-agent",
 					state: "zombie",
 					pid: null,
@@ -437,7 +437,7 @@ describe("worktreeCommand", () => {
 					capability: "builder",
 					worktreePath,
 					branchName: "overstory/stalled-agent/task-stuck",
-					beadId: "task-stuck",
+					taskId: "task-stuck",
 					tmuxSession: "overstory-stalled-agent",
 					state: "stalled",
 					pid: 12345,
@@ -468,7 +468,7 @@ describe("worktreeCommand", () => {
 				baseDir: worktreesDir,
 				agentName: "completed-agent",
 				baseBranch: "main",
-				beadId: "task-done",
+				taskId: "task-done",
 			});
 
 			const { path: workingPath } = await createWorktree({
@@ -476,7 +476,7 @@ describe("worktreeCommand", () => {
 				baseDir: worktreesDir,
 				agentName: "working-agent",
 				baseBranch: "main",
-				beadId: "task-wip",
+				taskId: "task-wip",
 			});
 
 			// Write sessions.db with both agents
@@ -486,7 +486,7 @@ describe("worktreeCommand", () => {
 					agentName: "completed-agent",
 					worktreePath: completedPath,
 					branchName: "overstory/completed-agent/task-done",
-					beadId: "task-done",
+					taskId: "task-done",
 					tmuxSession: "overstory-completed-agent-fake",
 					state: "completed",
 				}),
@@ -495,7 +495,7 @@ describe("worktreeCommand", () => {
 					agentName: "working-agent",
 					worktreePath: workingPath,
 					branchName: "overstory/working-agent/task-wip",
-					beadId: "task-wip",
+					taskId: "task-wip",
 					tmuxSession: "overstory-working-agent-fake",
 					state: "working",
 					pid: 12346,
@@ -522,7 +522,7 @@ describe("worktreeCommand", () => {
 				baseDir: worktreesDir,
 				agentName: "completed-agent",
 				baseBranch: "main",
-				beadId: "task-done",
+				taskId: "task-done",
 			});
 
 			const { path: workingPath } = await createWorktree({
@@ -530,7 +530,7 @@ describe("worktreeCommand", () => {
 				baseDir: worktreesDir,
 				agentName: "working-agent",
 				baseBranch: "main",
-				beadId: "task-wip",
+				taskId: "task-wip",
 			});
 
 			const { path: stalledPath } = await createWorktree({
@@ -538,7 +538,7 @@ describe("worktreeCommand", () => {
 				baseDir: worktreesDir,
 				agentName: "stalled-agent",
 				baseBranch: "main",
-				beadId: "task-stuck",
+				taskId: "task-stuck",
 			});
 
 			// Write sessions with different states
@@ -548,7 +548,7 @@ describe("worktreeCommand", () => {
 					agentName: "completed-agent",
 					worktreePath: completedPath,
 					branchName: "overstory/completed-agent/task-done",
-					beadId: "task-done",
+					taskId: "task-done",
 					state: "completed",
 				}),
 				makeSession({
@@ -556,7 +556,7 @@ describe("worktreeCommand", () => {
 					agentName: "working-agent",
 					worktreePath: workingPath,
 					branchName: "overstory/working-agent/task-wip",
-					beadId: "task-wip",
+					taskId: "task-wip",
 					state: "working",
 				}),
 				makeSession({
@@ -564,7 +564,7 @@ describe("worktreeCommand", () => {
 					agentName: "stalled-agent",
 					worktreePath: stalledPath,
 					branchName: "overstory/stalled-agent/task-stuck",
-					beadId: "task-stuck",
+					taskId: "task-stuck",
 					state: "stalled",
 				}),
 			]);
@@ -598,7 +598,7 @@ describe("worktreeCommand", () => {
 					capability: "builder",
 					worktreePath: path1,
 					branchName: "overstory/agent-1/task-1",
-					beadId: "task-1",
+					taskId: "task-1",
 					tmuxSession: "overstory-agent-1",
 					state: "completed",
 					pid: 12345,
@@ -616,7 +616,7 @@ describe("worktreeCommand", () => {
 					capability: "builder",
 					worktreePath: path2,
 					branchName: "overstory/agent-2/task-2",
-					beadId: "task-2",
+					taskId: "task-2",
 					tmuxSession: "overstory-agent-2",
 					state: "completed",
 					pid: 12346,
@@ -645,7 +645,7 @@ describe("worktreeCommand", () => {
 				baseDir: worktreesDir,
 				agentName: "unmerged-agent",
 				baseBranch: "main",
-				beadId: "task-unmerged",
+				taskId: "task-unmerged",
 			});
 
 			// Add an unmerged commit
@@ -657,7 +657,7 @@ describe("worktreeCommand", () => {
 					agentName: "unmerged-agent",
 					worktreePath: wtPath,
 					branchName: "overstory/unmerged-agent/task-unmerged",
-					beadId: "task-unmerged",
+					taskId: "task-unmerged",
 					state: "completed",
 				}),
 			]);
@@ -682,7 +682,7 @@ describe("worktreeCommand", () => {
 				baseDir: worktreesDir,
 				agentName: "unmerged-agent",
 				baseBranch: "main",
-				beadId: "task-force",
+				taskId: "task-force",
 			});
 
 			// Add an unmerged commit
@@ -694,7 +694,7 @@ describe("worktreeCommand", () => {
 					agentName: "unmerged-agent",
 					worktreePath: wtPath,
 					branchName: "overstory/unmerged-agent/task-force",
-					beadId: "task-force",
+					taskId: "task-force",
 					state: "completed",
 				}),
 			]);
@@ -704,7 +704,7 @@ describe("worktreeCommand", () => {
 
 			// Worktree should be removed
 			expect(existsSync(wtPath)).toBe(false);
-			expect(out).toContain("🗑️  Removed: overstory/unmerged-agent/task-force");
+			expect(out).toContain("Removed: overstory/unmerged-agent/task-force");
 		});
 
 		test("without --force, removes worktrees whose branches ARE merged", async () => {
@@ -716,7 +716,7 @@ describe("worktreeCommand", () => {
 				baseDir: worktreesDir,
 				agentName: "merged-agent",
 				baseBranch: "main",
-				beadId: "task-merged",
+				taskId: "task-merged",
 			});
 
 			// Add a commit and merge it into main
@@ -729,7 +729,7 @@ describe("worktreeCommand", () => {
 					agentName: "merged-agent",
 					worktreePath: wtPath,
 					branchName: branch,
-					beadId: "task-merged",
+					taskId: "task-merged",
 					state: "completed",
 				}),
 			]);
@@ -751,7 +751,7 @@ describe("worktreeCommand", () => {
 				baseDir: worktreesDir,
 				agentName: "unmerged-json-agent",
 				baseBranch: "main",
-				beadId: "task-json",
+				taskId: "task-json",
 			});
 
 			// Add an unmerged commit
@@ -763,7 +763,7 @@ describe("worktreeCommand", () => {
 					agentName: "unmerged-json-agent",
 					worktreePath: wtPath,
 					branchName: "overstory/unmerged-json-agent/task-json",
-					beadId: "task-json",
+					taskId: "task-json",
 					state: "completed",
 				}),
 			]);
@@ -782,5 +782,181 @@ describe("worktreeCommand", () => {
 			expect(parsed.cleaned).toEqual([]);
 			expect(parsed.skipped).toEqual(["overstory/unmerged-json-agent/task-json"]);
 		});
+
+		test("lead worktree with .seeds/ changes preserves them to canonical before cleanup", async () => {
+			const worktreesDir = join(tempDir, ".overstory", "worktrees");
+			await mkdir(worktreesDir, { recursive: true });
+
+			const { path: wtPath, branch } = await createWorktree({
+				repoRoot: tempDir,
+				baseDir: worktreesDir,
+				agentName: "lead-with-seeds",
+				baseBranch: "main",
+				taskId: "task-lead-seeds",
+			});
+
+			// Commit a .seeds/ file in the lead worktree
+			await commitFile(
+				wtPath,
+				".seeds/issues/test-issue.yaml",
+				"id: test-issue\ntitle: Test Issue\nstatus: open\n",
+				"seeds: add test issue",
+			);
+
+			writeSessionsToStore([
+				makeSession({
+					id: "session-lead-seeds",
+					agentName: "lead-with-seeds",
+					capability: "lead",
+					worktreePath: wtPath,
+					branchName: branch,
+					taskId: "task-lead-seeds",
+					state: "completed",
+				}),
+			]);
+
+			await worktreeCommand(["clean"]);
+			const out = output();
+
+			// The worktree should be removed
+			expect(existsSync(wtPath)).toBe(false);
+
+			// The .seeds/ changes should have been preserved to main
+			const showProc = Bun.spawn(["git", "show", "main:.seeds/issues/test-issue.yaml"], {
+				cwd: tempDir,
+				stdout: "pipe",
+				stderr: "pipe",
+			});
+			const showOut = await new Response(showProc.stdout).text();
+			const showExit = await showProc.exited;
+			expect(showExit).toBe(0);
+			expect(showOut).toContain("test-issue");
+
+			// Output should mention preservation
+			expect(out).toContain("Preserved .seeds/");
+		});
+
+		test("lead worktree without .seeds/ changes cleans normally", async () => {
+			const worktreesDir = join(tempDir, ".overstory", "worktrees");
+			await mkdir(worktreesDir, { recursive: true });
+
+			const { path: wtPath, branch } = await createWorktree({
+				repoRoot: tempDir,
+				baseDir: worktreesDir,
+				agentName: "lead-no-seeds",
+				baseBranch: "main",
+				taskId: "task-lead-no-seeds",
+			});
+
+			// Commit a non-.seeds/ file
+			await commitFile(wtPath, "src/work.ts", "export const x = 1;", "non-seeds work");
+
+			writeSessionsToStore([
+				makeSession({
+					id: "session-lead-no-seeds",
+					agentName: "lead-no-seeds",
+					capability: "lead",
+					worktreePath: wtPath,
+					branchName: branch,
+					taskId: "task-lead-no-seeds",
+					state: "completed",
+				}),
+			]);
+
+			await worktreeCommand(["clean"]);
+			const out = output();
+
+			// Worktree should be removed
+			expect(existsSync(wtPath)).toBe(false);
+			// Output should NOT mention .seeds/ preservation
+			expect(out).not.toContain("Preserved .seeds/");
+			// Should still report as cleaned
+			expect(out).toContain("Cleaned 1 worktree");
+		});
+
+		test("lead worktrees are cleaned without --force even with unmerged non-seeds changes", async () => {
+			const worktreesDir = join(tempDir, ".overstory", "worktrees");
+			await mkdir(worktreesDir, { recursive: true });
+
+			const { path: wtPath, branch } = await createWorktree({
+				repoRoot: tempDir,
+				baseDir: worktreesDir,
+				agentName: "lead-unmerged",
+				baseBranch: "main",
+				taskId: "task-lead-unmerged",
+			});
+
+			// Add unmerged non-.seeds/ commit
+			await commitFile(wtPath, "src/lead-work.ts", "export const y = 2;", "unmerged lead work");
+
+			writeSessionsToStore([
+				makeSession({
+					id: "session-lead-unmerged",
+					agentName: "lead-unmerged",
+					capability: "lead",
+					worktreePath: wtPath,
+					branchName: branch,
+					taskId: "task-lead-unmerged",
+					state: "completed",
+				}),
+			]);
+
+			// Run clean WITHOUT --force — leads bypass merge check
+			await worktreeCommand(["clean"]);
+			const out = output();
+
+			// Lead worktree SHOULD be removed (not skipped)
+			expect(existsSync(wtPath)).toBe(false);
+			expect(out).toContain("Cleaned 1 worktree");
+			expect(out).not.toContain("Skipped");
+		});
+
+		test("--json output includes seedsPreserved array", async () => {
+			const worktreesDir = join(tempDir, ".overstory", "worktrees");
+			await mkdir(worktreesDir, { recursive: true });
+
+			const { path: wtPath, branch } = await createWorktree({
+				repoRoot: tempDir,
+				baseDir: worktreesDir,
+				agentName: "lead-seeds-json",
+				baseBranch: "main",
+				taskId: "task-seeds-json",
+			});
+
+			// Commit a .seeds/ file in the lead worktree
+			await commitFile(
+				wtPath,
+				".seeds/issues/json-issue.yaml",
+				"id: json-issue\ntitle: JSON Issue\nstatus: open\n",
+				"seeds: add json issue",
+			);
+
+			writeSessionsToStore([
+				makeSession({
+					id: "session-lead-json",
+					agentName: "lead-seeds-json",
+					capability: "lead",
+					worktreePath: wtPath,
+					branchName: branch,
+					taskId: "task-seeds-json",
+					state: "completed",
+				}),
+			]);
+
+			await worktreeCommand(["clean", "--json"]);
+			const out = output();
+
+			const parsed = JSON.parse(out.trim()) as {
+				cleaned: string[];
+				failed: string[];
+				skipped: string[];
+				pruned: number;
+				mailPurged: number;
+				seedsPreserved: string[];
+			};
+
+			expect(parsed.cleaned).toContain(branch);
+			expect(parsed.seedsPreserved).toContain(branch);
+		});
 	});
 });

package/src/commands/worktree.ts

@@ -1,5 +1,5 @@
 /**
- * CLI command: overstory worktree list | clean [--completed] [--all]
+ * CLI command: ov worktree list | clean [--completed] [--all]
  *
  * List shows worktrees with agent status.
  * Clean removes worktree dirs, branch refs (if merged), and tmux sessions.
@@ -13,11 +13,16 @@ import { ValidationError } from "../errors.ts";
 import { createMailStore } from "../mail/store.ts";
 import { openSessionStore } from "../sessions/compat.ts";
 import type { AgentSession } from "../types.ts";
-import { isBranchMerged, listWorktrees, removeWorktree } from "../worktree/manager.ts";
+import {
+	isBranchMerged,
+	listWorktrees,
+	preserveSeedsChanges,
+	removeWorktree,
+} from "../worktree/manager.ts";
 import { isSessionAlive, killSession } from "../worktree/tmux.ts";
 
 /**
- * Handle `overstory worktree list`.
+ * Handle `ov worktree list`.
  */
 async function handleList(root: string, json: boolean): Promise<void> {
 	const worktrees = await listWorktrees(root);
@@ -41,7 +46,7 @@ async function handleList(root: string, json: boolean): Promise<void> {
 				head: wt.head,
 				agentName: session?.agentName ?? null,
 				state: session?.state ?? null,
-				beadId: session?.beadId ?? null,
+				taskId: session?.taskId ?? null,
 			};
 		});
 		process.stdout.write(`${JSON.stringify(entries, null, "\t")}\n`);
@@ -53,12 +58,12 @@ async function handleList(root: string, json: boolean): Promise<void> {
 		return;
 	}
 
-	process.stdout.write(`🌳 Agent worktrees: ${overstoryWts.length}\n\n`);
+	process.stdout.write(`Agent worktrees: ${overstoryWts.length}\n\n`);
 	for (const wt of overstoryWts) {
 		const session = sessions.find((s) => s.worktreePath === wt.path);
 		const state = session?.state ?? "unknown";
 		const agent = session?.agentName ?? "?";
-		const bead = session?.beadId ?? "?";
+		const bead = session?.taskId ?? "?";
 		process.stdout.write(`  ${wt.branch}\n`);
 		process.stdout.write(`    Agent: ${agent} | State: ${state} | Task: ${bead}\n`);
 		process.stdout.write(`    Path: ${wt.path}\n\n`);
@@ -66,7 +71,7 @@ async function handleList(root: string, json: boolean): Promise<void> {
 }
 
 /**
- * Handle `overstory worktree clean [--completed] [--all] [--force]`.
+ * Handle `ov worktree clean [--completed] [--all] [--force]`.
  */
 async function handleClean(
 	opts: { all: boolean; force: boolean; completedOnly: boolean },
@@ -92,6 +97,7 @@ async function handleClean(
 	const cleaned: string[] = [];
 	const failed: string[] = [];
 	const skipped: string[] = [];
+	const seedsPreserved: string[] = [];
 
 	try {
 		for (const wt of overstoryWts) {
@@ -102,8 +108,11 @@ async function handleClean(
 				continue;
 			}
 
-			// Check if the branch has been merged into the canonical branch (unless --force)
-			if (!force && wt.branch.length > 0) {
+			// Lead branches are never merged via the normal pipeline — skip merge check for leads.
+			const isLead = session?.capability === "lead";
+
+			// Check if the branch has been merged into the canonical branch (unless --force or lead)
+			if (!force && !isLead && wt.branch.length > 0) {
 				let merged = false;
 				try {
 					merged = await isBranchMerged(root, wt.branch, canonicalBranch);
@@ -131,8 +140,8 @@ async function handleClean(
 				}
 			}
 
-			// Warn about force-deleting unmerged branch
-			if (force && wt.branch.length > 0) {
+			// Warn about force-deleting unmerged branch (non-lead only)
+			if (force && !isLead && wt.branch.length > 0) {
 				let merged = false;
 				try {
 					merged = await isBranchMerged(root, wt.branch, canonicalBranch);
@@ -140,7 +149,30 @@ async function handleClean(
 					merged = false;
 				}
 				if (!merged && !json) {
-					process.stdout.write(`⚠️  Force-deleting unmerged branch: ${wt.branch}\n`);
+					process.stdout.write(`Warning: Force-deleting unmerged branch: ${wt.branch}\n`);
+				}
+			}
+
+			// Preserve .seeds/ changes from lead worktrees before removal.
+			// Lead branches are never merged, so .seeds/ files would otherwise be lost.
+			if (isLead && wt.branch.length > 0) {
+				const result = await preserveSeedsChanges(
+					root,
+					wt.branch,
+					canonicalBranch,
+					session?.agentName ?? "unknown-lead",
+				);
+				if (result.preserved) {
+					seedsPreserved.push(wt.branch);
+					if (!json) {
+						process.stdout.write(
+							`Preserved .seeds/ changes from lead ${session?.agentName ?? "unknown-lead"}\n`,
+						);
+					}
+				} else if (result.error) {
+					process.stderr.write(
+						`Warning: Failed to preserve .seeds/ from ${wt.branch}: ${result.error}\n`,
+					);
 				}
 			}
 
@@ -154,13 +186,13 @@ async function handleClean(
 				cleaned.push(wt.branch);
 
 				if (!json) {
-					process.stdout.write(`🗑️  Removed: ${wt.branch}\n`);
+					process.stdout.write(`Removed: ${wt.branch}\n`);
 				}
 			} catch (err) {
 				failed.push(wt.branch);
 				if (!json) {
 					const msg = err instanceof Error ? err.message : String(err);
-					process.stderr.write(`⚠️  Failed to remove ${wt.branch}: ${msg}\n`);
+					process.stderr.write(`Warning: Failed to remove ${wt.branch}: ${msg}\n`);
 				}
 			}
 		}
@@ -210,13 +242,14 @@ async function handleClean(
 
 		if (json) {
 			process.stdout.write(
-				`${JSON.stringify({ cleaned, failed, skipped, pruned: pruneCount, mailPurged })}\n`,
+				`${JSON.stringify({ cleaned, failed, skipped, pruned: pruneCount, mailPurged, seedsPreserved })}\n`,
 			);
 		} else if (
 			cleaned.length === 0 &&
 			pruneCount === 0 &&
 			failed.length === 0 &&
-			skipped.length === 0
+			skipped.length === 0 &&
+			seedsPreserved.length === 0
 		) {
 			process.stdout.write("No worktrees to clean.\n");
 		} else {
@@ -240,9 +273,14 @@ async function handleClean(
 					`Pruned ${pruneCount} zombie session${pruneCount === 1 ? "" : "s"} from store.\n`,
 				);
 			}
+			if (seedsPreserved.length > 0) {
+				process.stdout.write(
+					`Preserved .seeds/ changes from ${seedsPreserved.length} lead${seedsPreserved.length === 1 ? "" : "s"}.\n`,
+				);
+			}
 			if (skipped.length > 0) {
 				process.stdout.write(
-					`\n⚠️  Skipped ${skipped.length} worktree${skipped.length === 1 ? "" : "s"} with unmerged branches:\n`,
+					`\nWarning: Skipped ${skipped.length} worktree${skipped.length === 1 ? "" : "s"} with unmerged branches:\n`,
 				);
 				for (const branch of skipped) {
 					process.stdout.write(`  ${branch}\n`);
@@ -297,7 +335,7 @@ export function createWorktreeCommand(): Command {
 }
 
 /**
- * Entry point for `overstory worktree <subcommand> [flags]`.
+ * Entry point for `ov worktree <subcommand> [flags]`.
  *
  * Subcommands: list, clean.
  */