@os-eco/overstory-cli 0.6.4 → 0.6.6

package/src/metrics/summary.test.ts

@@ -33,7 +33,7 @@ afterEach(async () => {
 function makeSession(overrides: Partial<SessionMetrics> = {}): SessionMetrics {
 	return {
 		agentName: "test-agent",
-		beadId: "test-task-123",
+		taskId: "test-task-123",
 		capability: "builder",
 		startedAt: new Date("2026-01-01T00:00:00Z").toISOString(),
 		completedAt: new Date("2026-01-01T00:05:00Z").toISOString(),
@@ -66,9 +66,9 @@ describe("generateSummary", () => {
 	});
 
 	test("counts total and completed sessions correctly", () => {
-		store.recordSession(makeSession({ beadId: "task-1", completedAt: "2026-01-01T00:05:00Z" }));
-		store.recordSession(makeSession({ beadId: "task-2", completedAt: null }));
-		store.recordSession(makeSession({ beadId: "task-3", completedAt: "2026-01-01T00:10:00Z" }));
+		store.recordSession(makeSession({ taskId: "task-1", completedAt: "2026-01-01T00:05:00Z" }));
+		store.recordSession(makeSession({ taskId: "task-2", completedAt: null }));
+		store.recordSession(makeSession({ taskId: "task-3", completedAt: "2026-01-01T00:10:00Z" }));
 
 		const summary = generateSummary(store);
 
@@ -79,21 +79,21 @@ describe("generateSummary", () => {
 	test("groups by capability with correct counts and avg durations", () => {
 		store.recordSession(
 			makeSession({
-				beadId: "task-1",
+				taskId: "task-1",
 				capability: "builder",
 				durationMs: 100_000,
 			}),
 		);
 		store.recordSession(
 			makeSession({
-				beadId: "task-2",
+				taskId: "task-2",
 				capability: "builder",
 				durationMs: 200_000,
 			}),
 		);
 		store.recordSession(
 			makeSession({
-				beadId: "task-3",
+				taskId: "task-3",
 				capability: "scout",
 				durationMs: 50_000,
 			}),
@@ -112,10 +112,10 @@ describe("generateSummary", () => {
 	});
 
 	test("respects the limit parameter for recentSessions", () => {
-		store.recordSession(makeSession({ beadId: "task-1" }));
-		store.recordSession(makeSession({ beadId: "task-2" }));
-		store.recordSession(makeSession({ beadId: "task-3" }));
-		store.recordSession(makeSession({ beadId: "task-4" }));
+		store.recordSession(makeSession({ taskId: "task-1" }));
+		store.recordSession(makeSession({ taskId: "task-2" }));
+		store.recordSession(makeSession({ taskId: "task-3" }));
+		store.recordSession(makeSession({ taskId: "task-4" }));
 
 		const summary = generateSummary(store, 2);
 
@@ -124,9 +124,9 @@ describe("generateSummary", () => {
 	});
 
 	test("sessions without completedAt counted in total but not completed", () => {
-		store.recordSession(makeSession({ beadId: "task-1", completedAt: null }));
-		store.recordSession(makeSession({ beadId: "task-2", completedAt: null }));
-		store.recordSession(makeSession({ beadId: "task-3", completedAt: "2026-01-01T00:05:00Z" }));
+		store.recordSession(makeSession({ taskId: "task-1", completedAt: null }));
+		store.recordSession(makeSession({ taskId: "task-2", completedAt: null }));
+		store.recordSession(makeSession({ taskId: "task-3", completedAt: "2026-01-01T00:05:00Z" }));
 
 		const summary = generateSummary(store);
 
@@ -137,7 +137,7 @@ describe("generateSummary", () => {
 	test("aggregates token totals across all sessions", () => {
 		store.recordSession(
 			makeSession({
-				beadId: "task-1",
+				taskId: "task-1",
 				inputTokens: 10_000,
 				outputTokens: 2_000,
 				cacheReadTokens: 50_000,
@@ -147,7 +147,7 @@ describe("generateSummary", () => {
 		);
 		store.recordSession(
 			makeSession({
-				beadId: "task-2",
+				taskId: "task-2",
 				inputTokens: 20_000,
 				outputTokens: 3_000,
 				cacheReadTokens: 80_000,
@@ -166,7 +166,7 @@ describe("generateSummary", () => {
 	});
 
 	test("token totals are zero when no sessions have token data", () => {
-		store.recordSession(makeSession({ beadId: "task-1" }));
+		store.recordSession(makeSession({ taskId: "task-1" }));
 
 		const summary = generateSummary(store);
 
@@ -180,14 +180,14 @@ describe("generateSummary", () => {
 	test("token totals skip null cost entries gracefully", () => {
 		store.recordSession(
 			makeSession({
-				beadId: "task-1",
+				taskId: "task-1",
 				inputTokens: 100,
 				estimatedCostUsd: 0.5,
 			}),
 		);
 		store.recordSession(
 			makeSession({
-				beadId: "task-2",
+				taskId: "task-2",
 				inputTokens: 200,
 				estimatedCostUsd: null, // no cost data
 			}),
@@ -202,7 +202,7 @@ describe("generateSummary", () => {
 	test("capability breakdown excludes incomplete sessions from avgDurationMs", () => {
 		store.recordSession(
 			makeSession({
-				beadId: "task-1",
+				taskId: "task-1",
 				capability: "builder",
 				durationMs: 100_000,
 				completedAt: null,
@@ -210,14 +210,14 @@ describe("generateSummary", () => {
 		);
 		store.recordSession(
 			makeSession({
-				beadId: "task-2",
+				taskId: "task-2",
 				capability: "builder",
 				durationMs: 200_000,
 			}),
 		);
 		store.recordSession(
 			makeSession({
-				beadId: "task-3",
+				taskId: "task-3",
 				capability: "builder",
 				durationMs: 300_000,
 			}),
@@ -242,8 +242,8 @@ describe("formatSummary", () => {
 	});
 
 	test("shows total/completed/average duration", () => {
-		store.recordSession(makeSession({ beadId: "task-1", durationMs: 100_000 }));
-		store.recordSession(makeSession({ beadId: "task-2", durationMs: 200_000 }));
+		store.recordSession(makeSession({ taskId: "task-1", durationMs: 100_000 }));
+		store.recordSession(makeSession({ taskId: "task-2", durationMs: 200_000 }));
 
 		const summary = generateSummary(store);
 		const formatted = formatSummary(summary);
@@ -254,8 +254,8 @@ describe("formatSummary", () => {
 	});
 
 	test("shows capability breakdown", () => {
-		store.recordSession(makeSession({ beadId: "task-1", capability: "builder" }));
-		store.recordSession(makeSession({ beadId: "task-2", capability: "scout" }));
+		store.recordSession(makeSession({ taskId: "task-1", capability: "builder" }));
+		store.recordSession(makeSession({ taskId: "task-2", capability: "scout" }));
 
 		const summary = generateSummary(store);
 		const formatted = formatSummary(summary);
@@ -268,14 +268,14 @@ describe("formatSummary", () => {
 	test("shows recent sessions with status (done vs running)", () => {
 		store.recordSession(
 			makeSession({
-				beadId: "task-1",
+				taskId: "task-1",
 				agentName: "agent-done",
 				completedAt: "2026-01-01T00:05:00Z",
 			}),
 		);
 		store.recordSession(
 			makeSession({
-				beadId: "task-2",
+				taskId: "task-2",
 				agentName: "agent-running",
 				completedAt: null,
 			}),
@@ -293,7 +293,7 @@ describe("formatSummary", () => {
 	});
 
 	test("formatDuration: <1000ms shows ms", () => {
-		store.recordSession(makeSession({ beadId: "task-1", durationMs: 500 }));
+		store.recordSession(makeSession({ taskId: "task-1", durationMs: 500 }));
 
 		const summary = generateSummary(store);
 		const formatted = formatSummary(summary);
@@ -302,7 +302,7 @@ describe("formatSummary", () => {
 	});
 
 	test("formatDuration: <60000ms shows seconds", () => {
-		store.recordSession(makeSession({ beadId: "task-1", durationMs: 5_500 }));
+		store.recordSession(makeSession({ taskId: "task-1", durationMs: 5_500 }));
 
 		const summary = generateSummary(store);
 		const formatted = formatSummary(summary);
@@ -311,7 +311,7 @@ describe("formatSummary", () => {
 	});
 
 	test("formatDuration: >=60000ms shows minutes+seconds", () => {
-		store.recordSession(makeSession({ beadId: "task-1", durationMs: 125_000 }));
+		store.recordSession(makeSession({ taskId: "task-1", durationMs: 125_000 }));
 
 		const summary = generateSummary(store);
 		const formatted = formatSummary(summary);
@@ -322,7 +322,7 @@ describe("formatSummary", () => {
 	test("shows token usage section when sessions have token data", () => {
 		store.recordSession(
 			makeSession({
-				beadId: "task-1",
+				taskId: "task-1",
 				inputTokens: 15_000,
 				outputTokens: 3_000,
 				cacheReadTokens: 100_000,
@@ -344,7 +344,7 @@ describe("formatSummary", () => {
 	});
 
 	test("hides token usage section when no token data exists", () => {
-		store.recordSession(makeSession({ beadId: "task-1" }));
+		store.recordSession(makeSession({ taskId: "task-1" }));
 
 		const summary = generateSummary(store);
 		const formatted = formatSummary(summary);
@@ -355,7 +355,7 @@ describe("formatSummary", () => {
 	test("shows per-session cost in recent sessions", () => {
 		store.recordSession(
 			makeSession({
-				beadId: "task-1",
+				taskId: "task-1",
 				agentName: "agent-costly",
 				inputTokens: 10_000,
 				outputTokens: 2_000,
@@ -373,7 +373,7 @@ describe("formatSummary", () => {
 	test("formats large token counts with M suffix", () => {
 		store.recordSession(
 			makeSession({
-				beadId: "task-1",
+				taskId: "task-1",
 				inputTokens: 2_500_000,
 				outputTokens: 500_000,
 				cacheReadTokens: 0,

package/src/mulch/client.test.ts

@@ -360,7 +360,7 @@ describe("createMulchClient", () => {
 			await addProc.exited;
 
 			const client = createMulchClient(tempDir);
-			// The flag is passed correctly, but may fail if the bead ID is invalid
+			// The flag is passed correctly, but may fail if the task ID is invalid
 			// or if other required fields are missing. This test documents that the
 			// flag is properly passed to the CLI.
 			try {

package/src/mulch/client.ts

@@ -116,7 +116,7 @@ export function createMulchClient(cwd: string): MulchClient {
 		args: string[],
 		context: string,
 	): Promise<{ stdout: string; stderr: string }> {
-		const { stdout, stderr, exitCode } = await runCommand(["mulch", ...args], cwd);
+		const { stdout, stderr, exitCode } = await runCommand(["ml", ...args], cwd);
 		if (exitCode !== 0) {
 			throw new AgentError(`mulch ${context} failed (exit ${exitCode}): ${stderr.trim()}`);
 		}

package/src/sessions/compat.test.ts

@@ -39,7 +39,7 @@ function makeJsonSession(overrides: Record<string, unknown> = {}): Record<string
 		capability: "builder",
 		worktreePath: "/tmp/worktrees/test-agent",
 		branchName: "overstory/test-agent/task-1",
-		beadId: "task-1",
+		taskId: "task-1",
 		tmuxSession: "overstory-test-agent",
 		state: "working",
 		pid: 12345,
@@ -198,7 +198,7 @@ describe("data integrity", () => {
 			capability: "scout",
 			worktreePath: "/tmp/worktrees/full-agent",
 			branchName: "overstory/full-agent/task-42",
-			beadId: "task-42",
+			taskId: "task-42",
 			tmuxSession: "overstory-full-agent",
 			state: "stalled",
 			pid: 99999,
@@ -221,7 +221,7 @@ describe("data integrity", () => {
 		expect(result?.capability).toBe("scout");
 		expect(result?.worktreePath).toBe("/tmp/worktrees/full-agent");
 		expect(result?.branchName).toBe("overstory/full-agent/task-42");
-		expect(result?.beadId).toBe("task-42");
+		expect(result?.taskId).toBe("task-42");
 		expect(result?.tmuxSession).toBe("overstory-full-agent");
 		expect(result?.state).toBe("stalled");
 		expect(result?.pid).toBe(99999);

package/src/sessions/compat.ts

@@ -25,7 +25,7 @@ function normalizeSession(raw: Record<string, unknown>): AgentSession {
 		capability: raw.capability as string,
 		worktreePath: raw.worktreePath as string,
 		branchName: raw.branchName as string,
-		beadId: raw.beadId as string,
+		taskId: raw.taskId as string,
 		tmuxSession: raw.tmuxSession as string,
 		state: raw.state as AgentSession["state"],
 		pid: (raw.pid as number | null) ?? null,

package/src/sessions/store.test.ts

@@ -35,7 +35,7 @@ function makeSession(overrides: Partial<AgentSession> = {}): AgentSession {
 		capability: "builder",
 		worktreePath: "/tmp/worktrees/test-agent",
 		branchName: "overstory/test-agent/task-1",
-		beadId: "task-1",
+		taskId: "task-1",
 		tmuxSession: "overstory-test-agent",
 		state: "booting",
 		pid: 12345,
@@ -81,7 +81,7 @@ describe("upsert", () => {
 			capability: "scout",
 			worktreePath: "/tmp/worktrees/roundtrip",
 			branchName: "overstory/roundtrip-agent/task-42",
-			beadId: "task-42",
+			taskId: "task-42",
 			tmuxSession: "overstory-roundtrip-agent",
 			state: "working",
 			pid: 99999,
@@ -547,11 +547,11 @@ describe("edge cases", () => {
 	});
 
 	test("empty string fields are stored correctly", () => {
-		const session = makeSession({ beadId: "", capability: "builder" });
+		const session = makeSession({ taskId: "", capability: "builder" });
 		store.upsert(session);
 
 		const result = store.getByName("test-agent");
-		expect(result?.beadId).toBe("");
+		expect(result?.taskId).toBe("");
 	});
 });
 

package/src/sessions/store.ts

@@ -113,7 +113,7 @@ function rowToSession(row: SessionRow): AgentSession {
 		capability: row.capability,
 		worktreePath: row.worktree_path,
 		branchName: row.branch_name,
-		beadId: row.task_id,
+		taskId: row.task_id,
 		tmuxSession: row.tmux_session,
 		state: row.state as AgentState,
 		pid: row.pid,
@@ -276,7 +276,7 @@ export function createSessionStore(dbPath: string): SessionStore {
 				$capability: session.capability,
 				$worktree_path: session.worktreePath,
 				$branch_name: session.branchName,
-				$task_id: session.beadId,
+				$task_id: session.taskId,
 				$tmux_session: session.tmuxSession,
 				$state: session.state,
 				$pid: session.pid,

package/src/types.ts

@@ -129,7 +129,7 @@ export interface AgentSession {
 	capability: string; // Which agent definition
 	worktreePath: string;
 	branchName: string;
-	beadId: string; // Task being worked
+	taskId: string; // Task being worked
 	tmuxSession: string; // Tmux session name
 	state: AgentState;
 	pid: number | null; // Claude Code PID
@@ -151,7 +151,7 @@ export interface AgentIdentity {
 	sessionsCompleted: number;
 	expertiseDomains: string[];
 	recentTasks: Array<{
-		beadId: string;
+		taskId: string;
 		summary: string;
 		completedAt: string;
 	}>;
@@ -210,7 +210,7 @@ export interface MailMessage {
 
 /** Worker signals task completion to supervisor. */
 export interface WorkerDonePayload {
-	beadId: string;
+	taskId: string;
 	branch: string;
 	exitCode: number;
 	filesModified: string[];
@@ -219,7 +219,7 @@ export interface WorkerDonePayload {
 /** Supervisor signals branch is verified and ready for merge. */
 export interface MergeReadyPayload {
 	branch: string;
-	beadId: string;
+	taskId: string;
 	agentName: string;
 	filesModified: string[];
 }
@@ -227,14 +227,14 @@ export interface MergeReadyPayload {
 /** Merger signals branch was merged successfully. */
 export interface MergedPayload {
 	branch: string;
-	beadId: string;
+	taskId: string;
 	tier: ResolutionTier;
 }
 
 /** Merger signals merge failed, needs rework. */
 export interface MergeFailedPayload {
 	branch: string;
-	beadId: string;
+	taskId: string;
 	conflictFiles: string[];
 	errorMessage: string;
 }
@@ -242,7 +242,7 @@ export interface MergeFailedPayload {
 /** Any agent escalates an issue to a higher-level decision-maker. */
 export interface EscalationPayload {
 	severity: "warning" | "error" | "critical";
-	beadId: string | null;
+	taskId: string | null;
 	context: string;
 }
 
@@ -254,7 +254,7 @@ export interface HealthCheckPayload {
 
 /** Coordinator dispatches work to a supervisor. */
 export interface DispatchPayload {
-	beadId: string;
+	taskId: string;
 	specPath: string;
 	capability: Capability;
 	fileScope: string[];
@@ -262,7 +262,7 @@ export interface DispatchPayload {
 
 /** Supervisor assigns work to a specific worker. */
 export interface AssignPayload {
-	beadId: string;
+	taskId: string;
 	specPath: string;
 	workerName: string;
 	branch: string;
@@ -284,7 +284,7 @@ export interface MailPayloadMap {
 
 export interface OverlayConfig {
 	agentName: string;
-	beadId: string;
+	taskId: string;
 	specPath: string | null;
 	branchName: string;
 	worktreePath: string;
@@ -312,7 +312,7 @@ export type ResolutionTier = "clean-merge" | "auto-resolve" | "ai-resolve" | "re
 
 export interface MergeEntry {
 	branchName: string;
-	beadId: string;
+	taskId: string;
 	agentName: string;
 	filesModified: string[];
 	enqueuedAt: string;
@@ -376,7 +376,7 @@ export interface LogEvent {
 
 export interface SessionMetrics {
 	agentName: string;
-	beadId: string;
+	taskId: string;
 	capability: string;
 	startedAt: string;
 	completedAt: string | null;
@@ -645,7 +645,7 @@ export interface MulchCompactResult {
  */
 export interface SessionCheckpoint {
 	agentName: string;
-	beadId: string;
+	taskId: string;
 	sessionId: string; // The AgentSession.id that created this checkpoint
 	timestamp: string; // ISO
 	progressSummary: string; // Human-readable summary of work done so far
@@ -677,7 +677,7 @@ export interface AgentLayers {
 	sandbox: {
 		worktreePath: string;
 		branchName: string;
-		beadId: string;
+		taskId: string;
 	};
 	session: {
 		id: string;

package/src/watchdog/daemon.test.ts

@@ -66,7 +66,7 @@ function makeSession(overrides: Partial<AgentSession> = {}): AgentSession {
 		capability: "builder",
 		worktreePath: "/tmp/test",
 		branchName: "overstory/test-agent/test-task",
-		beadId: "test-task",
+		taskId: "test-task",
 		tmuxSession: "overstory-test-agent",
 		state: "working",
 		pid: process.pid, // Use our own PID so isProcessRunning returns true
@@ -798,7 +798,7 @@ describe("daemon tick", () => {
 			agentName: "old-agent",
 			worktreePath: "/tmp/test",
 			branchName: "overstory/old-agent/task",
-			beadId: "task",
+			taskId: "task",
 			tmuxSession: "overstory-old-agent",
 			state: "working",
 			pid: process.pid,
@@ -1133,7 +1133,7 @@ describe("daemon mulch failure recording", () => {
 		const session = makeSession({
 			agentName: "dying-agent",
 			capability: "builder",
-			beadId: "task-123",
+			taskId: "task-123",
 			tmuxSession: "overstory-dying-agent",
 			state: "working",
 			lastActivity: new Date().toISOString(),
@@ -1158,7 +1158,7 @@ describe("daemon mulch failure recording", () => {
 		expect(failureMock.calls[0]?.tier).toBe(0);
 		expect(failureMock.calls[0]?.session.agentName).toBe("dying-agent");
 		expect(failureMock.calls[0]?.session.capability).toBe("builder");
-		expect(failureMock.calls[0]?.session.beadId).toBe("task-123");
+		expect(failureMock.calls[0]?.session.taskId).toBe("task-123");
 		// Reason should be either the reconciliationNote or default "Process terminated"
 		expect(failureMock.calls[0]?.reason).toBeDefined();
 	});
@@ -1169,7 +1169,7 @@ describe("daemon mulch failure recording", () => {
 		const session = makeSession({
 			agentName: "triaged-agent",
 			capability: "scout",
-			beadId: "task-456",
+			taskId: "task-456",
 			tmuxSession: "overstory-triaged-agent",
 			state: "stalled",
 			lastActivity: staleActivity,
@@ -1198,7 +1198,7 @@ describe("daemon mulch failure recording", () => {
 		expect(failureMock.calls[0]?.tier).toBe(1);
 		expect(failureMock.calls[0]?.session.agentName).toBe("triaged-agent");
 		expect(failureMock.calls[0]?.session.capability).toBe("scout");
-		expect(failureMock.calls[0]?.session.beadId).toBe("task-456");
+		expect(failureMock.calls[0]?.session.taskId).toBe("task-456");
 		expect(failureMock.calls[0]?.triageSuggestion).toBe("terminate");
 		expect(failureMock.calls[0]?.reason).toContain("AI triage");
 	});
@@ -1267,11 +1267,11 @@ describe("daemon mulch failure recording", () => {
 		expect(failureMock.calls).toHaveLength(0);
 	});
 
-	test("recordFailure includes evidenceBead when beadId is present", async () => {
+	test("recordFailure includes evidenceBead when taskId is present", async () => {
 		const session = makeSession({
 			agentName: "beaded-agent",
 			capability: "builder",
-			beadId: "task-789",
+			taskId: "task-789",
 			tmuxSession: "overstory-beaded-agent",
 			state: "working",
 			lastActivity: new Date().toISOString(),
@@ -1292,7 +1292,7 @@ describe("daemon mulch failure recording", () => {
 		});
 
 		expect(failureMock.calls).toHaveLength(1);
-		expect(failureMock.calls[0]?.session.beadId).toBe("task-789");
+		expect(failureMock.calls[0]?.session.taskId).toBe("task-789");
 	});
 
 	test("Tier 0: recordFailure called at escalation level 3+ (progressive termination)", async () => {
@@ -1301,7 +1301,7 @@ describe("daemon mulch failure recording", () => {
 		const session = makeSession({
 			agentName: "doomed-agent",
 			capability: "builder",
-			beadId: "task-999",
+			taskId: "task-999",
 			tmuxSession: "overstory-doomed-agent",
 			state: "stalled",
 			lastActivity: staleActivity,

package/src/watchdog/daemon.ts

@@ -73,7 +73,7 @@ async function recordFailure(
 			type: "failure",
 			description,
 			tags: ["watchdog", "auto-recorded"],
-			evidenceBead: session.beadId || undefined,
+			evidenceBead: session.taskId || undefined,
 		});
 	} catch {
 		// Fire-and-forget: recording failures must not break the watchdog

package/src/watchdog/health.test.ts

@@ -36,7 +36,7 @@ function makeSession(overrides: Partial<AgentSession> = {}): AgentSession {
 		capability: "builder",
 		worktreePath: "/tmp/test",
 		branchName: "overstory/test-agent/test-task",
-		beadId: "test-task",
+		taskId: "test-task",
 		tmuxSession: "overstory-test-agent",
 		state: "booting",
 		pid: ALIVE_PID,