@os-eco/overstory-cli 0.6.4 → 0.6.5

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/e2e/init-sling-lifecycle.test.ts

@@ -174,7 +174,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 +241,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"),

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

@@ -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.5";
 
 const COMMANDS = [
 	"agents",
@@ -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

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

@@ -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/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,

package/src/merge/resolver.test.ts

@@ -24,6 +24,7 @@ import {
 	createMergeResolver,
 	looksLikeProse,
 	parseConflictPatterns,
+	resolveConflictsUnion,
 } from "./resolver.ts";
 
 /**
@@ -53,7 +54,7 @@ function mockSpawnResult(
 function makeTestEntry(overrides?: Partial<MergeEntry>): MergeEntry {
 	return {
 		branchName: overrides?.branchName ?? "feature-branch",
-		beadId: overrides?.beadId ?? "bead-123",
+		taskId: overrides?.taskId ?? "bead-123",
 		agentName: overrides?.agentName ?? "test-agent",
 		filesModified: overrides?.filesModified ?? ["src/test.ts"],
 		enqueuedAt: overrides?.enqueuedAt ?? new Date().toISOString(),
@@ -551,7 +552,7 @@ describe("createMergeResolver", () => {
 
 			const entry = makeTestEntry({
 				branchName: "overstory/my-agent/bead-xyz",
-				beadId: "bead-xyz",
+				taskId: "bead-xyz",
 				agentName: "my-agent",
 				filesModified: ["src/test.ts"],
 			});
@@ -564,7 +565,7 @@ describe("createMergeResolver", () => {
 			const result = await resolver.resolve(entry, defaultBranch, repoDir);
 
 			expect(result.entry.branchName).toBe("overstory/my-agent/bead-xyz");
-			expect(result.entry.beadId).toBe("bead-xyz");
+			expect(result.entry.taskId).toBe("bead-xyz");
 			expect(result.entry.agentName).toBe("my-agent");
 		});
 	});
@@ -744,7 +745,7 @@ describe("createMergeResolver", () => {
 
 				const entry = makeTestEntry({
 					branchName: "feature-branch",
-					beadId: "bead-abc-123",
+					taskId: "bead-abc-123",
 					agentName: "test-builder",
 					filesModified: ["src/test.ts"],
 				});
@@ -811,7 +812,7 @@ describe("createMergeResolver", () => {
 
 				const entry = makeTestEntry({
 					branchName: "feature-branch",
-					beadId: "bead-fail-456",
+					taskId: "bead-fail-456",
 					agentName: "test-agent",
 					filesModified: ["src/test.ts"],
 				});
@@ -906,7 +907,7 @@ describe("createMergeResolver", () => {
 
 				const entry = makeTestEntry({
 					branchName: "feature-branch",
-					beadId: "bead-ai-789",
+					taskId: "bead-ai-789",
 					filesModified: ["src/test.ts"],
 				});
 
@@ -981,7 +982,7 @@ describe("createMergeResolver", () => {
 
 				const entry = makeTestEntry({
 					branchName: "feature-branch",
-					beadId: "bead-reimagine-xyz",
+					taskId: "bead-reimagine-xyz",
 					filesModified: ["src/reimagine-target.ts"],
 				});
 
@@ -1288,6 +1289,157 @@ describe("createMergeResolver", () => {
 		});
 	});
 
+	describe("resolveConflictsUnion", () => {
+		test("returns null when no conflict markers are present", () => {
+			expect(resolveConflictsUnion("no conflicts here\n")).toBeNull();
+			expect(resolveConflictsUnion("")).toBeNull();
+		});
+
+		test("keeps both canonical and incoming content for a single conflict", () => {
+			const content = [
+				"<<<<<<< HEAD\n",
+				'{"id":"a"}\n',
+				'{"id":"c"}\n',
+				"=======\n",
+				'{"id":"a"}\n',
+				'{"id":"b"}\n',
+				">>>>>>> feature-branch\n",
+			].join("");
+			const result = resolveConflictsUnion(content);
+			expect(result).not.toBeNull();
+			expect(result).toContain('{"id":"a"}\n{"id":"c"}\n');
+			expect(result).toContain('{"id":"a"}\n{"id":"b"}\n');
+			// No conflict markers remain
+			expect(result).not.toContain("<<<<<<<");
+			expect(result).not.toContain("=======");
+			expect(result).not.toContain(">>>>>>>");
+		});
+
+		test("resolves multiple conflict blocks with union strategy", () => {
+			const block = (canonical: string, incoming: string): string =>
+				`<<<<<<< HEAD\n${canonical}\n=======\n${incoming}\n>>>>>>> branch\n`;
+			const content = `${block("line-a\n", "line-b\n")}middle\n${block("line-c\n", "line-d\n")}`;
+			const result = resolveConflictsUnion(content);
+			expect(result).not.toBeNull();
+			expect(result).toContain("line-a\n");
+			expect(result).toContain("line-b\n");
+			expect(result).toContain("middle\n");
+			expect(result).toContain("line-c\n");
+			expect(result).toContain("line-d\n");
+			expect(result).not.toContain("<<<<<<<");
+		});
+	});
+
+	describe("merge=union gitattribute support", () => {
+		test("union strategy preserves lines from both sides (git handles cleanly or via auto-resolve)", async () => {
+			const repoDir = await createTempGitRepo();
+			try {
+				const defaultBranch = await getDefaultBranch(repoDir);
+
+				// Set up .gitattributes with merge=union for *.jsonl files so that
+				// both git's built-in union driver AND overstory's Tier 2 union path
+				// are configured to keep all lines from both sides.
+				await commitFile(repoDir, ".gitattributes", "*.jsonl merge=union\n");
+				// Common ancestor: one line
+				await commitFile(repoDir, "data.jsonl", '{"id":"a"}\n');
+
+				// Feature branch: adds line b
+				await runGitInDir(repoDir, ["checkout", "-b", "feature-branch"]);
+				await commitFile(repoDir, "data.jsonl", '{"id":"a"}\n{"id":"b"}\n');
+
+				// Back to main: adds line c (diverges from ancestor)
+				await runGitInDir(repoDir, ["checkout", defaultBranch]);
+				await commitFile(repoDir, "data.jsonl", '{"id":"a"}\n{"id":"c"}\n');
+
+				const entry = makeTestEntry({
+					branchName: "feature-branch",
+					filesModified: ["data.jsonl"],
+				});
+
+				const resolver = createMergeResolver({
+					aiResolveEnabled: false,
+					reimagineEnabled: false,
+				});
+
+				const result = await resolver.resolve(entry, defaultBranch, repoDir);
+
+				// With merge=union, git either resolves cleanly (Tier 1) or
+				// overstory's union path handles it (Tier 2). Either way, success
+				// and both sides' content must be preserved.
+				expect(result.success).toBe(true);
+				expect(result.entry.status).toBe("merged");
+
+				// Both sides' lines must be present — no lines dropped
+				const file = Bun.file(join(repoDir, "data.jsonl"));
+				const content = await file.text();
+				expect(content).toContain('{"id":"a"}');
+				expect(content).toContain('{"id":"b"}');
+				expect(content).toContain('{"id":"c"}');
+			} finally {
+				await cleanupTempDir(repoDir);
+			}
+		});
+
+		test("Tier 2 union auto-resolve keeps both sides when git produces conflict markers", async () => {
+			// This test verifies the Tier 2 code path: when git produces conflict
+			// markers for a file that has merge=union set in .gitattributes,
+			// overstory resolves it by keeping both canonical and incoming content.
+			// We produce conflict markers by doing a content conflict on a file whose
+			// attribute is set to merge=union AFTER the conflict state exists, then
+			// run only the auto-resolve path via a standalone resolver call.
+			//
+			// To force conflict markers despite merge=union: we DON'T commit
+			// .gitattributes before the merge, so git uses the default driver and
+			// produces conflict markers. Then we write .gitattributes to the working
+			// tree (not committed) so git check-attr sees it and our code detects union.
+			const repoDir = await createTempGitRepo();
+			try {
+				const defaultBranch = await getDefaultBranch(repoDir);
+
+				// Common ancestor
+				await commitFile(repoDir, "data.jsonl", '{"id":"a"}\n');
+
+				// Feature branch: adds line b (also appends to same position as main)
+				await runGitInDir(repoDir, ["checkout", "-b", "feature-branch"]);
+				await commitFile(repoDir, "data.jsonl", '{"id":"a"}\n{"id":"b"}\n');
+
+				// Back to main: adds line c — diverges from ancestor at same position
+				await runGitInDir(repoDir, ["checkout", defaultBranch]);
+				await commitFile(repoDir, "data.jsonl", '{"id":"a"}\n{"id":"c"}\n');
+
+				// Now WRITE .gitattributes to working tree (not committed).
+				// git check-attr reads from the working tree during Tier 2.
+				await Bun.write(`${repoDir}/.gitattributes`, "*.jsonl merge=union\n");
+
+				// Attempt merge — git uses default driver (no committed .gitattributes)
+				// so it WILL produce conflict markers if branches diverge at same position.
+				// (If git resolves cleanly, the test still passes because content is preserved.)
+				const entry = makeTestEntry({
+					branchName: "feature-branch",
+					filesModified: ["data.jsonl"],
+				});
+
+				const resolver = createMergeResolver({
+					aiResolveEnabled: false,
+					reimagineEnabled: false,
+				});
+
+				const result = await resolver.resolve(entry, defaultBranch, repoDir);
+
+				expect(result.success).toBe(true);
+				expect(result.entry.status).toBe("merged");
+
+				const file = Bun.file(join(repoDir, "data.jsonl"));
+				const content = await file.text();
+				expect(content).toContain('{"id":"a"}');
+				expect(content).toContain('{"id":"b"}');
+				expect(content).toContain('{"id":"c"}');
+			} finally {
+				await cleanupTempDir(repoDir);
+			}
+		});
+	});
+
 	describe("AI-resolve with history context", () => {
 		test("includes historical context in AI prompt when available", async () => {
 			const repoDir = await createTempGitRepo();

package/src/merge/resolver.ts

@@ -89,6 +89,47 @@ function resolveConflictsKeepIncoming(content: string): string | null {
 	});
 }
 
+/**
+ * Parse conflict markers in file content and keep ALL lines from both sides.
+ * Used when the file has `merge=union` gitattribute — dedup-on-read handles duplicates.
+ *
+ * A conflict block looks like:
+ * ```
+ * <<<<<<< HEAD
+ * canonical content
+ * =======
+ * incoming content
+ * >>>>>>> branch
+ * ```
+ *
+ * This function replaces each conflict block with canonical + incoming content concatenated.
+ * Returns the resolved content, or null if no conflict markers were found.
+ */
+export function resolveConflictsUnion(content: string): string | null {
+	const conflictPattern = /^<{7} .+\n([\s\S]*?)^={7}\n([\s\S]*?)^>{7} .+\n?/gm;
+
+	if (!conflictPattern.test(content)) {
+		return null;
+	}
+
+	// Reset regex lastIndex after test()
+	conflictPattern.lastIndex = 0;
+
+	return content.replace(conflictPattern, (_match, canonical: string, incoming: string) => {
+		return canonical + incoming;
+	});
+}
+
+/**
+ * Check if a file has the `merge=union` gitattribute set.
+ * Returns true if `git check-attr merge -- <file>` ends with ": merge: union".
+ */
+async function checkMergeUnion(repoRoot: string, filePath: string): Promise<boolean> {
+	const { stdout, exitCode } = await runGit(repoRoot, ["check-attr", "merge", "--", filePath]);
+	if (exitCode !== 0) return false;
+	return stdout.trim().endsWith(": merge: union");
+}
+
 /**
  * Read a file's content using Bun.file().
  */
@@ -138,7 +179,10 @@ async function tryAutoResolve(
 
 		try {
 			const content = await readFile(filePath);
-			const resolved = resolveConflictsKeepIncoming(content);
+			const isUnion = await checkMergeUnion(repoRoot, file);
+			const resolved = isUnion
+				? resolveConflictsUnion(content)
+				: resolveConflictsKeepIncoming(content);
 
 			if (resolved === null) {
 				// No conflict markers found (shouldn't happen but be defensive)
@@ -496,7 +540,7 @@ function recordConflictPattern(
 			type: "pattern",
 			description,
 			tags: ["merge-conflict"],
-			evidenceBead: entry.beadId,
+			evidenceBead: entry.taskId,
 		})
 		.catch(() => {});
 }