@os-eco/overstory-cli 0.6.4 → 0.6.6

package/src/commands/stop.test.ts

@@ -137,7 +137,7 @@ function makeAgentSession(overrides: Partial<AgentSession> = {}): AgentSession {
 		capability: "builder",
 		worktreePath: join(tempDir, ".overstory", "worktrees", "my-builder"),
 		branchName: "overstory/my-builder/bead-123",
-		beadId: "bead-123",
+		taskId: "bead-123",
 		tmuxSession: "overstory-test-project-my-builder",
 		state: "working",
 		pid: 99999,

package/src/commands/stop.ts

@@ -1,5 +1,5 @@
 /**
- * CLI command: overstory stop <agent-name>
+ * CLI command: ov stop <agent-name>
  *
  * Explicitly terminates a running agent by:
  * 1. Looking up the agent session by name
@@ -37,7 +37,7 @@ export interface StopDeps {
 }
 
 /**
- * Entry point for `overstory stop <agent-name>`.
+ * Entry point for `ov stop <agent-name>`.
  *
  * @param agentName - Name of the agent to stop
  * @param opts - Command options

package/src/commands/supervisor.test.ts

@@ -11,10 +11,10 @@ import { buildSupervisorBeacon, supervisorCommand } from "./supervisor.ts";
  */
 
 describe("buildSupervisorBeacon", () => {
-	test("contains agent name and beadId from opts", () => {
+	test("contains agent name and taskId from opts", () => {
 		const beacon = buildSupervisorBeacon({
 			name: "supervisor-1",
-			beadId: "task-abc123",
+			taskId: "task-abc123",
 			depth: 1,
 			parent: "coordinator",
 		});
@@ -26,7 +26,7 @@ describe("buildSupervisorBeacon", () => {
 	test("contains [OVERSTORY] prefix", () => {
 		const beacon = buildSupervisorBeacon({
 			name: "supervisor-1",
-			beadId: "task-1",
+			taskId: "task-1",
 			depth: 1,
 			parent: "coordinator",
 		});
@@ -37,7 +37,7 @@ describe("buildSupervisorBeacon", () => {
 	test("contains (supervisor) designation", () => {
 		const beacon = buildSupervisorBeacon({
 			name: "supervisor-1",
-			beadId: "task-1",
+			taskId: "task-1",
 			depth: 1,
 			parent: "coordinator",
 		});
@@ -48,7 +48,7 @@ describe("buildSupervisorBeacon", () => {
 	test("contains depth and parent info from opts", () => {
 		const beacon = buildSupervisorBeacon({
 			name: "supervisor-1",
-			beadId: "task-1",
+			taskId: "task-1",
 			depth: 2,
 			parent: "lead-cli",
 		});
@@ -60,7 +60,7 @@ describe("buildSupervisorBeacon", () => {
 	test("contains startup instructions", () => {
 		const beacon = buildSupervisorBeacon({
 			name: "supervisor-1",
-			beadId: "task-1",
+			taskId: "task-1",
 			depth: 1,
 			parent: "coordinator",
 		});
@@ -69,9 +69,9 @@ describe("buildSupervisorBeacon", () => {
 		expect(beacon).toContain("mulch prime");
 
 		// Should include mail check with agent name
-		expect(beacon).toContain("overstory mail check --agent supervisor-1");
+		expect(beacon).toContain("ov mail check --agent supervisor-1");
 
-		// Should include bd show with beadId
+		// Should include bd show with taskId
 		expect(beacon).toContain("bd show task-1");
 	});
 
@@ -79,13 +79,13 @@ describe("buildSupervisorBeacon", () => {
 		const before = new Date();
 		const beacon = buildSupervisorBeacon({
 			name: "supervisor-1",
-			beadId: "task-1",
+			taskId: "task-1",
 			depth: 1,
 			parent: "coordinator",
 		});
 		const after = new Date();
 
-		// Extract timestamp from beacon (format: [OVERSTORY] {name} (supervisor) {timestamp} task:{beadId})
+		// Extract timestamp from beacon (format: [OVERSTORY] {name} (supervisor) {timestamp} task:{taskId})
 		const timestampMatch = beacon.match(/\(supervisor\)\s+(\S+)\s+task:/);
 		expect(timestampMatch).toBeTruthy();
 

package/src/commands/supervisor.ts

@@ -1,5 +1,5 @@
 /**
- * CLI command: overstory supervisor start|stop|status
+ * CLI command: ov supervisor start|stop|status
  *
  * Manages per-project supervisor agent lifecycle. The supervisor is a persistent
  * agent that runs at the project root (NOT in a worktree), assigned to a specific
@@ -36,13 +36,13 @@ import { isRunningAsRoot } from "./sling.ts";
  * Build the supervisor startup beacon.
  *
  * @param opts.name - Supervisor agent name
- * @param opts.beadId - Bead task ID
+ * @param opts.taskId - Bead task ID
  * @param opts.depth - Hierarchy depth (default 1)
  * @param opts.parent - Parent agent name (default "coordinator")
  */
 export function buildSupervisorBeacon(opts: {
 	name: string;
-	beadId: string;
+	taskId: string;
 	depth: number;
 	parent: string;
 	trackerCli?: string;
@@ -50,9 +50,9 @@ export function buildSupervisorBeacon(opts: {
 	const cli = opts.trackerCli ?? "bd";
 	const timestamp = new Date().toISOString();
 	const parts = [
-		`[OVERSTORY] ${opts.name} (supervisor) ${timestamp} task:${opts.beadId}`,
+		`[OVERSTORY] ${opts.name} (supervisor) ${timestamp} task:${opts.taskId}`,
 		`Depth: ${opts.depth} | Parent: ${opts.parent} | Role: per-project supervisor`,
-		`Startup: run mulch prime, check mail (overstory mail check --agent ${opts.name}), read task (${cli} show ${opts.beadId}), then begin supervising`,
+		`Startup: run mulch prime, check mail (ov mail check --agent ${opts.name}), read task (${cli} show ${opts.taskId}), then begin supervising`,
 	];
 	return parts.join(" — ");
 }
@@ -182,7 +182,7 @@ async function startSupervisor(opts: {
 
 		const beacon = buildSupervisorBeacon({
 			name: opts.name,
-			beadId: opts.task,
+			taskId: opts.task,
 			depth: opts.depth,
 			parent: opts.parent,
 			trackerCli: trackerCliName(resolvedBackend),
@@ -202,7 +202,7 @@ async function startSupervisor(opts: {
 			capability: "supervisor",
 			worktreePath: projectRoot, // Supervisor uses project root, not a worktree
 			branchName: config.project.canonicalBranch, // Operates on canonical branch
-			beadId: opts.task,
+			taskId: opts.task,
 			tmuxSession,
 			state: "booting",
 			pid,
@@ -222,7 +222,7 @@ async function startSupervisor(opts: {
 			capability: "supervisor",
 			tmuxSession,
 			projectRoot,
-			beadId: opts.task,
+			taskId: opts.task,
 			parent: opts.parent,
 			depth: opts.depth,
 			pid,
@@ -347,7 +347,7 @@ async function statusSupervisor(opts: { name?: string; json: boolean }): Promise
 				agentName: session.agentName,
 				state: session.state,
 				tmuxSession: session.tmuxSession,
-				beadId: session.beadId,
+				taskId: session.taskId,
 				parentAgent: session.parentAgent,
 				depth: session.depth,
 				pid: session.pid,
@@ -362,7 +362,7 @@ async function statusSupervisor(opts: { name?: string; json: boolean }): Promise
 				process.stdout.write(`Supervisor '${opts.name}': ${stateLabel}\n`);
 				process.stdout.write(`  Session:   ${session.id}\n`);
 				process.stdout.write(`  Tmux:      ${session.tmuxSession}\n`);
-				process.stdout.write(`  Task:      ${session.beadId}\n`);
+				process.stdout.write(`  Task:      ${session.taskId}\n`);
 				process.stdout.write(`  Parent:    ${session.parentAgent}\n`);
 				process.stdout.write(`  Depth:     ${session.depth}\n`);
 				process.stdout.write(`  PID:       ${session.pid}\n`);
@@ -401,7 +401,7 @@ async function statusSupervisor(opts: { name?: string; json: boolean }): Promise
 								? ("zombie" as const)
 								: session.state,
 						tmuxSession: session.tmuxSession,
-						beadId: session.beadId,
+						taskId: session.taskId,
 						parentAgent: session.parentAgent,
 						depth: session.depth,
 						startedAt: session.startedAt,
@@ -416,7 +416,7 @@ async function statusSupervisor(opts: { name?: string; json: boolean }): Promise
 				for (const status of statuses) {
 					const stateLabel = status.running ? "running" : status.state;
 					process.stdout.write(
-						`  ${status.agentName}: ${stateLabel} (task: ${status.beadId}, parent: ${status.parentAgent})\n`,
+						`  ${status.agentName}: ${stateLabel} (task: ${status.taskId}, parent: ${status.parentAgent})\n`,
 					);
 				}
 			}
@@ -427,7 +427,7 @@ async function statusSupervisor(opts: { name?: string; json: boolean }): Promise
 }
 
 /**
- * Create the Commander command for `overstory supervisor`.
+ * Create the Commander command for `ov supervisor`.
  */
 export function createSupervisorCommand(): Command {
 	const cmd = new Command("supervisor").description("Manage per-project supervisor agents");
@@ -480,7 +480,7 @@ export function createSupervisorCommand(): Command {
 }
 
 /**
- * Entry point for `overstory supervisor <subcommand>`.
+ * Entry point for `ov supervisor <subcommand>`.
  */
 export async function supervisorCommand(args: string[]): Promise<void> {
 	const cmd = createSupervisorCommand();

package/src/commands/trace.test.ts

@@ -509,7 +509,7 @@ describe("traceCommand", () => {
 	// === Target resolution ===
 
 	describe("target resolution", () => {
-		test("agent name is used as-is when not a bead ID pattern", async () => {
+		test("agent name is used as-is when not a task ID pattern", async () => {
 			const dbPath = join(tempDir, ".overstory", "events.db");
 			const store = createEventStore(dbPath);
 			store.insert(makeEvent({ agentName: "my-custom-agent" }));
@@ -523,8 +523,8 @@ describe("traceCommand", () => {
 			expect(parsed[0]?.agentName).toBe("my-custom-agent");
 		});
 
-		test("bead ID pattern is detected and resolved to agent name via SessionStore", async () => {
-			// Create a session that maps bead ID to agent name
+		test("task ID pattern is detected and resolved to agent name via SessionStore", async () => {
+			// Create a session that maps task ID to agent name
 			const sessDbPath = join(tempDir, ".overstory", "sessions.db");
 			const sessionStore = createSessionStore(sessDbPath);
 			sessionStore.upsert({
@@ -533,7 +533,7 @@ describe("traceCommand", () => {
 				capability: "builder",
 				worktreePath: "/tmp/wt",
 				branchName: "feat/task",
-				beadId: "overstory-rj1k",
+				taskId: "overstory-rj1k",
 				tmuxSession: "tmux-001",
 				state: "completed",
 				pid: null,
@@ -561,7 +561,7 @@ describe("traceCommand", () => {
 			expect(parsed[0]?.agentName).toBe("builder-for-task");
 		});
 
-		test("unresolved bead ID falls back to using bead ID as agent name", async () => {
+		test("unresolved task ID falls back to using task ID as agent name", async () => {
 			// Create sessions.db but with no matching bead
 			const sessDbPath = join(tempDir, ".overstory", "sessions.db");
 			const sessionStore = createSessionStore(sessDbPath);
@@ -579,13 +579,13 @@ describe("traceCommand", () => {
 			expect(parsed).toEqual([]);
 		});
 
-		test("short agent names without bead pattern are not resolved as bead IDs", async () => {
+		test("short agent names without task pattern are not resolved as task IDs", async () => {
 			const dbPath = join(tempDir, ".overstory", "events.db");
 			const store = createEventStore(dbPath);
 			store.insert(makeEvent({ agentName: "scout" }));
 			store.close();
 
-			// "scout" does not match bead pattern word-alphanumeric
+			// "scout" does not match task pattern word-alphanumeric
 			await traceCommand(["scout", "--json"]);
 			const out = output();
 

package/src/commands/trace.ts

@@ -1,8 +1,8 @@
 /**
- * CLI command: overstory trace <target> [--json] [--since <ts>] [--until <ts>] [--limit <n>]
+ * CLI command: ov trace <target> [--json] [--since <ts>] [--until <ts>] [--limit <n>]
  *
  * Shows a chronological timeline of events for an agent or bead task.
- * Target can be an agent name or a bead ID (resolved to agent name via SessionStore).
+ * Target can be an agent name or a task ID (resolved to agent name via SessionStore).
  */
 
 import { join } from "node:path";
@@ -29,10 +29,10 @@ const EVENT_LABELS: Record<EventType, { label: string; color: ColorFn }> = {
 };
 
 /**
- * Detect whether a target string looks like a bead ID.
- * Bead IDs follow the pattern: word-alphanumeric (e.g., "overstory-rj1k", "myproject-abc1").
+ * Detect whether a target string looks like a task ID.
+ * Task IDs follow the pattern: word-alphanumeric (e.g., "overstory-rj1k", "myproject-abc1").
  */
-function looksLikeBeadId(target: string): boolean {
+function looksLikeTaskId(target: string): boolean {
 	return /^[a-z][a-z0-9]*-[a-z0-9]{3,}$/i.test(target);
 }
 
@@ -220,16 +220,16 @@ async function executeTrace(target: string, opts: TraceOpts): Promise<void> {
 	// Resolve target to agent name
 	let agentName = target;
 
-	if (looksLikeBeadId(target)) {
-		// Try to resolve bead ID to agent name via SessionStore
+	if (looksLikeTaskId(target)) {
+		// Try to resolve task ID to agent name via SessionStore
 		const { store: sessionStore } = openSessionStore(overstoryDir);
 		try {
 			const allSessions = sessionStore.getAll();
-			const matchingSession = allSessions.find((s) => s.beadId === target);
+			const matchingSession = allSessions.find((s) => s.taskId === target);
 			if (matchingSession) {
 				agentName = matchingSession.agentName;
 			} else {
-				// No session found for this bead ID; treat it as an agent name anyway
+				// No session found for this task ID; treat it as an agent name anyway
 				// (the event query will return empty results if no events match)
 				agentName = target;
 			}
@@ -275,7 +275,7 @@ async function executeTrace(target: string, opts: TraceOpts): Promise<void> {
 export function createTraceCommand(): Command {
 	return new Command("trace")
 		.description("Chronological event timeline for agent/bead")
-		.argument("<target>", "Agent name or bead ID")
+		.argument("<target>", "Agent name or task ID")
 		.option("--json", "Output as JSON array of StoredEvent objects")
 		.option("--since <timestamp>", "Start time filter (ISO 8601)")
 		.option("--until <timestamp>", "End time filter (ISO 8601)")

package/src/commands/watch.ts

@@ -20,12 +20,12 @@ import { isProcessRunning } from "../watchdog/health.ts";
 function formatCheck(check: HealthCheck): string {
 	const actionIcon =
 		check.action === "terminate"
-			? "💀"
+			? "x"
 			: check.action === "escalate"
-				? "⚠️"
+				? "!"
 				: check.action === "investigate"
-					? "🔍"
-					: "✅";
+					? ">"
+					: "x";
 	const pidLabel = check.pidAlive === null ? "n/a" : check.pidAlive ? "up" : "down";
 	let line = `${actionIcon} ${check.agentName}: ${check.state} (tmux=${check.tmuxAlive ? "up" : "down"}, pid=${pidLabel})`;
 	if (check.reconciliationNote) {
@@ -84,7 +84,7 @@ async function removePidFile(pidFilePath: string): Promise<void> {
  */
 async function resolveOverstoryBin(): Promise<string> {
 	try {
-		const proc = Bun.spawn(["which", "overstory"], {
+		const proc = Bun.spawn(["which", "ov"], {
 			stdout: "pipe",
 			stderr: "pipe",
 		});