@os-eco/overstory-cli 0.6.4 → 0.6.6

package/src/commands/agents.ts

@@ -1,5 +1,5 @@
 /**
- * CLI command: overstory agents <sub> [--json]
+ * CLI command: ov agents <sub> [--json]
  *
  * Discover and query agents by capability.
  */
@@ -8,6 +8,7 @@ import { join } from "node:path";
 import { Command } from "commander";
 import { loadConfig } from "../config.ts";
 import { ValidationError } from "../errors.ts";
+import { color } from "../logging/color.ts";
 import { openSessionStore } from "../sessions/compat.ts";
 import { type AgentSession, SUPPORTED_CAPABILITIES } from "../types.ts";
 
@@ -18,7 +19,7 @@ export interface DiscoveredAgent {
 	agentName: string;
 	capability: string;
 	state: string;
-	beadId: string;
+	taskId: string;
 	branchName: string;
 	parentAgent: string | null;
 	depth: number;
@@ -117,7 +118,7 @@ export async function discoverAgents(
 					agentName: session.agentName,
 					capability: session.capability,
 					state: session.state,
-					beadId: session.beadId,
+					taskId: session.taskId,
 					branchName: session.branchName,
 					parentAgent: session.parentAgent,
 					depth: session.depth,
@@ -140,11 +141,11 @@ export async function discoverAgents(
 function getStateIcon(state: string): string {
 	switch (state) {
 		case "working":
-			return "●";
+			return color.cyan(">");
 		case "booting":
-			return "○";
+			return color.green("-");
 		case "stalled":
-			return "◌";
+			return color.yellow("!");
 		default:
 			return " ";
 	}
@@ -166,7 +167,7 @@ function printAgents(agents: DiscoveredAgent[]): void {
 	for (const agent of agents) {
 		const icon = getStateIcon(agent.state);
 		w(`  ${icon} ${agent.agentName} [${agent.capability}]\n`);
-		w(`    State: ${agent.state} | Task: ${agent.beadId}\n`);
+		w(`    State: ${agent.state} | Task: ${agent.taskId}\n`);
 		w(`    Branch: ${agent.branchName}\n`);
 		w(`    Parent: ${agent.parentAgent ?? "none"} | Depth: ${agent.depth}\n`);
 
@@ -181,7 +182,7 @@ function printAgents(agents: DiscoveredAgent[]): void {
 }
 
 /**
- * Create the Commander command for `overstory agents`.
+ * Create the Commander command for `ov agents`.
  */
 export function createAgentsCommand(): Command {
 	const cmd = new Command("agents").description("Discover and query agents");
@@ -229,7 +230,7 @@ export function createAgentsCommand(): Command {
 }
 
 /**
- * Entry point for `overstory agents <subcommand>`.
+ * Entry point for `ov agents <subcommand>`.
  */
 export async function agentsCommand(args: string[]): Promise<void> {
 	const cmd = createAgentsCommand();

package/src/commands/clean.test.ts

@@ -113,7 +113,7 @@ describe("--all", () => {
 		const store = createMetricsStore(metricsDbPath);
 		store.recordSession({
 			agentName: "test-agent",
-			beadId: "task-1",
+			taskId: "task-1",
 			capability: "builder",
 			startedAt: new Date().toISOString(),
 			completedAt: null,
@@ -148,7 +148,7 @@ describe("--all", () => {
 			capability: "builder",
 			worktreePath: "/tmp/wt",
 			branchName: "overstory/test/task",
-			beadId: "task-1",
+			taskId: "task-1",
 			tmuxSession: "overstory-test-agent",
 			state: "completed",
 			pid: 12345,
@@ -177,7 +177,7 @@ describe("--all", () => {
 		const queue = createMergeQueue(queuePath);
 		queue.enqueue({
 			branchName: "test-branch",
-			beadId: "beads-test",
+			taskId: "beads-test",
 			agentName: "test",
 			filesModified: ["src/test.ts"],
 		});
@@ -292,7 +292,7 @@ describe("individual flags", () => {
 			capability: "builder",
 			worktreePath: "/tmp/wt",
 			branchName: "overstory/test/task",
-			beadId: "task-1",
+			taskId: "task-1",
 			tmuxSession: "overstory-test-agent",
 			state: "completed",
 			pid: 12345,
@@ -413,7 +413,7 @@ describe("synthetic session-end events", () => {
 			capability: "builder",
 			worktreePath: "/tmp/wt",
 			branchName: "overstory/test-builder/task-1",
-			beadId: "task-1",
+			taskId: "task-1",
 			tmuxSession: "overstory-test-builder",
 			state: "working",
 			pid: 12345,

package/src/commands/clean.ts

@@ -1,5 +1,5 @@
 /**
- * CLI command: overstory clean [--all] [--mail] [--sessions] [--metrics]
+ * CLI command: ov clean [--all] [--mail] [--sessions] [--metrics]
  *   [--logs] [--worktrees] [--branches] [--agents] [--specs]
  *
  * Nuclear cleanup of overstory runtime state.
@@ -394,7 +394,7 @@ async function checkMulchHealth(repoRoot: string): Promise<{
 }
 
 /**
- * Entry point for `overstory clean [flags]`.
+ * Entry point for `ov clean [flags]`.
  *
  * @param opts - Command options
  */
@@ -556,7 +556,7 @@ export async function cleanCommand(opts: CleanOptions): Promise<void> {
 		const healthLines: string[] = [];
 
 		if (health.domainsNearLimit.length > 0) {
-			healthLines.push("\n⚠️  Mulch domains approaching governance limits:");
+			healthLines.push("\nWarning: Mulch domains approaching governance limits:");
 			for (const d of health.domainsNearLimit) {
 				healthLines.push(
 					`   ${d.domain}: ${d.recordCount} records (warn threshold: ${d.warnThreshold})`,
@@ -566,13 +566,13 @@ export async function cleanCommand(opts: CleanOptions): Promise<void> {
 
 		if (health.stalePruneCandidates > 0) {
 			healthLines.push(
-				`\n📦 Stale records found: ${health.stalePruneCandidates} candidate${health.stalePruneCandidates === 1 ? "" : "s"} (run 'mulch prune' to remove)`,
+				`\nStale records found: ${health.stalePruneCandidates} candidate${health.stalePruneCandidates === 1 ? "" : "s"} (run 'mulch prune' to remove)`,
 			);
 		}
 
 		if (health.doctorWarnings > 0 || health.doctorIssues > 0) {
 			healthLines.push(
-				`\n🩺 Mulch health check: ${health.doctorWarnings} warning${health.doctorWarnings === 1 ? "" : "s"}, ${health.doctorIssues} issue${health.doctorIssues === 1 ? "" : "s"} (run 'mulch doctor' for details)`,
+				`\nMulch health check: ${health.doctorWarnings} warning${health.doctorWarnings === 1 ? "" : "s"}, ${health.doctorIssues} issue${health.doctorIssues === 1 ? "" : "s"} (run 'mulch doctor' for details)`,
 			);
 		}
 

package/src/commands/completions.test.ts

@@ -54,8 +54,8 @@ describe("COMMANDS array", () => {
 describe("generateBash", () => {
 	it("should return a bash completion script", () => {
 		const script = generateBash();
-		expect(script).toContain("_overstory()");
-		expect(script).toContain("complete -F _overstory overstory");
+		expect(script).toContain("_ov()");
+		expect(script).toContain("complete -F _ov ov");
 		expect(script).toContain("_init_completion");
 	});
 
@@ -87,8 +87,8 @@ describe("generateBash", () => {
 describe("generateZsh", () => {
 	it("should return a zsh completion script", () => {
 		const script = generateZsh();
-		expect(script).toContain("#compdef overstory");
-		expect(script).toContain("_overstory()");
+		expect(script).toContain("#compdef ov");
+		expect(script).toContain("_ov()");
 		expect(script).toContain("_describe");
 		expect(script).toContain("_arguments");
 	});
@@ -119,7 +119,7 @@ describe("generateZsh", () => {
 describe("generateFish", () => {
 	it("should return a fish completion script", () => {
 		const script = generateFish();
-		expect(script).toContain("complete -c overstory");
+		expect(script).toContain("complete -c ov");
 		expect(script).toContain("__fish_use_subcommand");
 	});
 
@@ -160,8 +160,8 @@ describe("completionsCommand", () => {
 
 		try {
 			completionsCommand(["bash"]);
-			expect(output).toContain("_overstory()");
-			expect(output).toContain("complete -F _overstory overstory");
+			expect(output).toContain("_ov()");
+			expect(output).toContain("complete -F _ov ov");
 		} finally {
 			process.stdout.write = originalWrite;
 		}
@@ -178,8 +178,8 @@ describe("completionsCommand", () => {
 
 		try {
 			completionsCommand(["zsh"]);
-			expect(output).toContain("#compdef overstory");
-			expect(output).toContain("_overstory()");
+			expect(output).toContain("#compdef ov");
+			expect(output).toContain("_ov()");
 		} finally {
 			process.stdout.write = originalWrite;
 		}
@@ -196,7 +196,7 @@ describe("completionsCommand", () => {
 
 		try {
 			completionsCommand(["fish"]);
-			expect(output).toContain("complete -c overstory");
+			expect(output).toContain("complete -c ov");
 		} finally {
 			process.stdout.write = originalWrite;
 		}

package/src/commands/completions.ts

@@ -609,11 +609,11 @@ export const COMMANDS: readonly CommandDef[] = [
 
 export function generateBash(): string {
 	const lines: string[] = [
-		"# Bash completion for overstory",
+		"# Bash completion for ov",
 		"# Source this file to enable completions:",
-		"#   source <(overstory --completions bash)",
+		"#   source <(ov --completions bash)",
 		"",
-		"_overstory() {",
+		"_ov() {",
 		"  local cur prev words cword",
 		"  _init_completion || return",
 		"",
@@ -668,19 +668,19 @@ export function generateBash(): string {
 	lines.push("  return 0");
 	lines.push("}");
 	lines.push("");
-	lines.push("complete -F _overstory overstory");
+	lines.push("complete -F _ov ov");
 
 	return lines.join("\n");
 }
 
 export function generateZsh(): string {
 	const lines: string[] = [
-		"#compdef overstory",
-		"# Zsh completion for overstory",
+		"#compdef ov",
+		"# Zsh completion for ov",
 		"# Place this file in your fpath or source it:",
-		"#   source <(overstory --completions zsh)",
+		"#   source <(ov --completions zsh)",
 		"",
-		"_overstory() {",
+		"_ov() {",
 		"  local -a commands",
 		"  commands=(",
 	];
@@ -778,24 +778,24 @@ export function generateZsh(): string {
 	lines.push("  esac");
 	lines.push("}");
 	lines.push("");
-	lines.push('_overstory "$@"');
+	lines.push('_ov "$@"');
 
 	return lines.join("\n");
 }
 
 export function generateFish(): string {
 	const lines: string[] = [
-		"# Fish completion for overstory",
-		"# Place this file in ~/.config/fish/completions/overstory.fish or source it:",
-		"#   overstory --completions fish | source",
+		"# Fish completion for ov",
+		"# Place this file in ~/.config/fish/completions/ov.fish or source it:",
+		"#   ov --completions fish | source",
 		"",
-		"# Remove all existing completions for overstory",
-		"complete -c overstory -e",
+		"# Remove all existing completions for ov",
+		"complete -c ov -e",
 		"",
 		"# Global options",
-		"complete -c overstory -l help -d 'Show help'",
-		"complete -c overstory -l version -d 'Show version'",
-		"complete -c overstory -l completions -d 'Generate shell completions' -xa 'bash zsh fish'",
+		"complete -c ov -l help -d 'Show help'",
+		"complete -c ov -l version -d 'Show version'",
+		"complete -c ov -l completions -d 'Generate shell completions' -xa 'bash zsh fish'",
 		"",
 	];
 
@@ -803,15 +803,13 @@ export function generateFish(): string {
 	for (const cmd of COMMANDS) {
 		// Command name
 		lines.push(`# ${cmd.desc}`);
-		lines.push(
-			`complete -c overstory -f -n '__fish_use_subcommand' -a '${cmd.name}' -d '${cmd.desc}'`,
-		);
+		lines.push(`complete -c ov -f -n '__fish_use_subcommand' -a '${cmd.name}' -d '${cmd.desc}'`);
 
 		if (cmd.subcommands && cmd.subcommands.length > 0) {
 			// Subcommand names
 			for (const subcmd of cmd.subcommands) {
 				lines.push(
-					`complete -c overstory -f -n '__fish_seen_subcommand_from ${cmd.name}; and not __fish_seen_subcommand_from ${cmd.subcommands.map((s) => s.name).join(" ")}' -a '${subcmd.name}' -d '${subcmd.desc}'`,
+					`complete -c ov -f -n '__fish_seen_subcommand_from ${cmd.name}; and not __fish_seen_subcommand_from ${cmd.subcommands.map((s) => s.name).join(" ")}' -a '${subcmd.name}' -d '${subcmd.desc}'`,
 				);
 
 				// Subcommand flags
@@ -822,12 +820,12 @@ export function generateFish(): string {
 
 						if (flag.values) {
 							lines.push(
-								`complete -c overstory -f -n ${cond} -l '${flagName}' -d '${flag.desc}' -xa '${flag.values.join(" ")}'`,
+								`complete -c ov -f -n ${cond} -l '${flagName}' -d '${flag.desc}' -xa '${flag.values.join(" ")}'`,
 							);
 						} else if (flag.takesValue) {
-							lines.push(`complete -c overstory -n ${cond} -l '${flagName}' -d '${flag.desc}'`);
+							lines.push(`complete -c ov -n ${cond} -l '${flagName}' -d '${flag.desc}'`);
 						} else {
-							lines.push(`complete -c overstory -f -n ${cond} -l '${flagName}' -d '${flag.desc}'`);
+							lines.push(`complete -c ov -f -n ${cond} -l '${flagName}' -d '${flag.desc}'`);
 						}
 					}
 				}
@@ -842,12 +840,12 @@ export function generateFish(): string {
 
 				if (flag.values) {
 					lines.push(
-						`complete -c overstory -f -n ${cond} -l '${flagName}' -d '${flag.desc}' -xa '${flag.values.join(" ")}'`,
+						`complete -c ov -f -n ${cond} -l '${flagName}' -d '${flag.desc}' -xa '${flag.values.join(" ")}'`,
 					);
 				} else if (flag.takesValue) {
-					lines.push(`complete -c overstory -n ${cond} -l '${flagName}' -d '${flag.desc}'`);
+					lines.push(`complete -c ov -n ${cond} -l '${flagName}' -d '${flag.desc}'`);
 				} else {
-					lines.push(`complete -c overstory -f -n ${cond} -l '${flagName}' -d '${flag.desc}'`);
+					lines.push(`complete -c ov -f -n ${cond} -l '${flagName}' -d '${flag.desc}'`);
 				}
 			}
 		}
@@ -875,7 +873,7 @@ export function completionsCommand(args: string[]): void {
 
 	if (!shell) {
 		process.stderr.write("Error: missing shell argument\n");
-		process.stderr.write("Usage: overstory --completions <bash|zsh|fish>\n");
+		process.stderr.write("Usage: ov --completions <bash|zsh|fish>\n");
 		process.exit(1);
 	}
 

package/src/commands/coordinator.test.ts

@@ -286,7 +286,7 @@ function makeCoordinatorSession(overrides: Partial<AgentSession> = {}): AgentSes
 		capability: "coordinator",
 		worktreePath: tempDir,
 		branchName: "main",
-		beadId: "",
+		taskId: "",
 		tmuxSession: "overstory-test-project-coordinator",
 		state: "working",
 		pid: 99999,
@@ -437,7 +437,7 @@ describe("startCoordinator", () => {
 		expect(session?.pid).toBe(99999);
 		expect(session?.parentAgent).toBeNull();
 		expect(session?.depth).toBe(0);
-		expect(session?.beadId).toBe("");
+		expect(session?.taskId).toBe("");
 		expect(session?.branchName).toBe("main");
 		expect(session?.worktreePath).toBe(tempDir);
 		expect(session?.id).toMatch(/^session-\d+-coordinator$/);
@@ -1025,9 +1025,9 @@ describe("buildCoordinatorBeacon", () => {
 	test("includes startup instructions", () => {
 		const beacon = buildCoordinatorBeacon();
 		expect(beacon).toContain("mulch prime");
-		expect(beacon).toContain("overstory mail check --agent coordinator");
+		expect(beacon).toContain("ov mail check --agent coordinator");
 		expect(beacon).toContain("bd ready");
-		expect(beacon).toContain("overstory group status");
+		expect(beacon).toContain("ov group status");
 	});
 
 	test("defaults to bd ready when no cliName provided", () => {

package/src/commands/coordinator.ts

@@ -1,9 +1,9 @@
 /**
- * CLI command: overstory coordinator start|stop|status
+ * CLI command: ov coordinator start|stop|status
  *
  * Manages the persistent coordinator agent lifecycle. The coordinator runs
  * at the project root (NOT in a worktree), receives work via mail and beads,
- * and dispatches agents via overstory sling.
+ * and dispatches agents via ov sling.
  *
  * Unlike regular agents spawned by sling, the coordinator:
  * - Has no worktree (operates on the main working tree)
@@ -115,7 +115,7 @@ async function removeWatchdogPid(projectRoot: string): Promise<void> {
 
 /**
  * Default watchdog implementation for production use.
- * Starts/stops the watchdog daemon via `overstory watch --background`.
+ * Starts/stops the watchdog daemon via `ov watch --background`.
  */
 function createDefaultWatchdog(projectRoot: string): NonNullable<CoordinatorDeps["_watchdog"]> {
 	return {
@@ -132,7 +132,7 @@ function createDefaultWatchdog(projectRoot: string): NonNullable<CoordinatorDeps
 			}
 
 			// Start watchdog in background
-			const proc = Bun.spawn(["overstory", "watch", "--background"], {
+			const proc = Bun.spawn(["ov", "watch", "--background"], {
 				cwd: projectRoot,
 				stdout: "pipe",
 				stderr: "pipe",
@@ -189,12 +189,12 @@ function createDefaultWatchdog(projectRoot: string): NonNullable<CoordinatorDeps
 
 /**
  * Default monitor implementation for production use.
- * Starts/stops the monitor agent via `overstory monitor start/stop`.
+ * Starts/stops the monitor agent via `ov monitor start/stop`.
  */
 function createDefaultMonitor(projectRoot: string): NonNullable<CoordinatorDeps["_monitor"]> {
 	return {
 		async start(): Promise<{ pid: number } | null> {
-			const proc = Bun.spawn(["overstory", "monitor", "start", "--no-attach", "--json"], {
+			const proc = Bun.spawn(["ov", "monitor", "start", "--no-attach", "--json"], {
 				cwd: projectRoot,
 				stdout: "pipe",
 				stderr: "pipe",
@@ -210,7 +210,7 @@ function createDefaultMonitor(projectRoot: string): NonNullable<CoordinatorDeps[
 			}
 		},
 		async stop(): Promise<boolean> {
-			const proc = Bun.spawn(["overstory", "monitor", "stop", "--json"], {
+			const proc = Bun.spawn(["ov", "monitor", "stop", "--json"], {
 				cwd: projectRoot,
 				stdout: "pipe",
 				stderr: "pipe",
@@ -219,7 +219,7 @@ function createDefaultMonitor(projectRoot: string): NonNullable<CoordinatorDeps[
 			return exitCode === 0;
 		},
 		async isRunning(): Promise<boolean> {
-			const proc = Bun.spawn(["overstory", "monitor", "status", "--json"], {
+			const proc = Bun.spawn(["ov", "monitor", "status", "--json"], {
 				cwd: projectRoot,
 				stdout: "pipe",
 				stderr: "pipe",
@@ -248,9 +248,9 @@ export function buildCoordinatorBeacon(cliName = "bd"): string {
 	const parts = [
 		`[OVERSTORY] ${COORDINATOR_NAME} (coordinator) ${timestamp}`,
 		"Depth: 0 | Parent: none | Role: persistent orchestrator",
-		"HIERARCHY: You ONLY spawn leads (overstory sling --capability lead). Leads spawn scouts, builders, reviewers. NEVER spawn non-lead agents directly.",
+		"HIERARCHY: You ONLY spawn leads (ov sling --capability lead). Leads spawn scouts, builders, reviewers. NEVER spawn non-lead agents directly.",
 		"DELEGATION: For any exploration/scouting, spawn a lead who will spawn scouts. Do NOT explore the codebase yourself beyond initial planning.",
-		`Startup: run mulch prime, check mail (overstory mail check --agent ${COORDINATOR_NAME}), check ${cliName} ready, check overstory group status, then begin work`,
+		`Startup: run mulch prime, check mail (ov mail check --agent ${COORDINATOR_NAME}), check ${cliName} ready, check ov group status, then begin work`,
 	];
 	return parts.join(" — ");
 }
@@ -379,7 +379,7 @@ async function startCoordinator(
 			capability: "coordinator",
 			worktreePath: projectRoot, // Coordinator uses project root, not a worktree
 			branchName: config.project.canonicalBranch, // Operates on canonical branch
-			beadId: "", // No specific bead assignment
+			taskId: "", // No specific bead assignment
 			tmuxSession,
 			state: "booting",
 			pid,
@@ -686,7 +686,7 @@ async function statusCoordinator(
 }
 
 /**
- * Create the Commander command for `overstory coordinator`.
+ * Create the Commander command for `ov coordinator`.
  */
 export function createCoordinatorCommand(deps: CoordinatorDeps = {}): Command {
 	const cmd = new Command("coordinator").description("Manage the persistent coordinator agent");
@@ -735,7 +735,7 @@ export function createCoordinatorCommand(deps: CoordinatorDeps = {}): Command {
 }
 
 /**
- * Entry point for `overstory coordinator <subcommand>`.
+ * Entry point for `ov coordinator <subcommand>`.
  *
  * @param args - CLI arguments after "coordinator"
  * @param deps - Optional dependency injection for testing (tmux)