@os-eco/overstory-cli 0.6.1 → 0.6.5

package/src/commands/logs.ts

@@ -10,26 +10,13 @@
 
 import { readdir, stat } from "node:fs/promises";
 import { join } from "node:path";
+import { Command } from "commander";
 import { loadConfig } from "../config.ts";
 import { ValidationError } from "../errors.ts";
+import type { ColorFn } from "../logging/color.ts";
 import { color } from "../logging/color.ts";
 import type { LogEvent } from "../types.ts";
 
-/**
- * Parse a named flag value from args.
- */
-function getFlag(args: string[], flag: string): string | undefined {
-	const idx = args.indexOf(flag);
-	if (idx === -1 || idx + 1 >= args.length) {
-		return undefined;
-	}
-	return args[idx + 1];
-}
-
-function hasFlag(args: string[], flag: string): boolean {
-	return args.includes(flag);
-}
-
 /**
  * Parse relative time formats like "1h", "30m", "2d", "10s" into a Date object.
  * Falls back to parsing as ISO 8601 if not in relative format.
@@ -247,21 +234,53 @@ function filterEvents(
 	});
 }
 
+/** Resolve a log level string to a color function. */
+function getLevelColor(level: string): ColorFn {
+	switch (level) {
+		case "debug":
+			return color.gray;
+		case "info":
+			return color.blue;
+		case "warn":
+			return color.yellow;
+		case "error":
+			return color.red;
+		default:
+			return color.gray;
+	}
+}
+
+/** Resolve a log level to its label string. */
+function getLevelLabel(level: string): string {
+	switch (level) {
+		case "debug":
+			return "DBG";
+		case "info":
+			return "INF";
+		case "warn":
+			return "WRN";
+		case "error":
+			return "ERR";
+		default:
+			return String(level).slice(0, 3).toUpperCase();
+	}
+}
+
 /**
  * Print log events with ANSI colors and date separators.
  */
 function printLogs(events: LogEvent[]): void {
 	const w = process.stdout.write.bind(process.stdout);
 
-	w(`${color.bold}Logs${color.reset}\n`);
+	w(`${color.bold("Logs")}\n`);
 	w(`${"=".repeat(70)}\n`);
 
 	if (events.length === 0) {
-		w(`${color.dim}No log files found.${color.reset}\n`);
+		w(`${color.dim("No log files found.")}\n`);
 		return;
 	}
 
-	w(`${color.dim}${events.length} ${events.length === 1 ? "entry" : "entries"}${color.reset}\n\n`);
+	w(`${color.dim(`${events.length} ${events.length === 1 ? "entry" : "entries"}`)}\n\n`);
 
 	let lastDate = "";
 
@@ -272,44 +291,21 @@ function printLogs(events: LogEvent[]): void {
 			if (lastDate !== "") {
 				w("\n");
 			}
-			w(`${color.dim}--- ${date} ---${color.reset}\n`);
+			w(`${color.dim(`--- ${date} ---`)}\n`);
 			lastDate = date;
 		}
 
 		const time = formatAbsoluteTime(event.timestamp);
-
-		// Format level display
-		let levelStr: string;
-		let levelColorCode: string;
-		switch (event.level) {
-			case "debug":
-				levelStr = "DBG";
-				levelColorCode = color.gray;
-				break;
-			case "info":
-				levelStr = "INF";
-				levelColorCode = color.blue;
-				break;
-			case "warn":
-				levelStr = "WRN";
-				levelColorCode = color.yellow;
-				break;
-			case "error":
-				levelStr = "ERR";
-				levelColorCode = color.red;
-				break;
-			default:
-				levelStr = String(event.level).slice(0, 3).toUpperCase();
-				levelColorCode = color.gray;
-		}
+		const levelColorFn = getLevelColor(event.level);
+		const levelStr = getLevelLabel(event.level);
 
 		const agentLabel = event.agentName ? `[${event.agentName}]` : "[unknown]";
 		const detail = buildLogDetail(event);
-		const detailSuffix = detail ? ` ${color.dim}${detail}${color.reset}` : "";
+		const detailSuffix = detail ? ` ${color.dim(detail)}` : "";
 
 		w(
-			`${time} ${levelColorCode}${levelStr}${color.reset} ` +
-				`${event.event} ${color.dim}${agentLabel}${color.reset}${detailSuffix}\n`,
+			`${time} ${levelColorFn(levelStr)} ` +
+				`${event.event} ${color.dim(agentLabel)}${detailSuffix}\n`,
 		);
 	}
 }
@@ -326,7 +322,7 @@ async function followLogs(
 ): Promise<void> {
 	const w = process.stdout.write.bind(process.stdout);
 
-	w(`${color.bold}Following logs (Ctrl+C to stop)${color.reset}\n\n`);
+	w(`${color.bold("Following logs (Ctrl+C to stop)")}\n\n`);
 
 	// Track file positions for tailing
 	const filePositions = new Map<string, number>();
@@ -376,38 +372,16 @@ async function followLogs(
 
 								// Print immediately
 								const time = formatAbsoluteTime(event.timestamp);
-
-								let levelStr: string;
-								let levelColorCode: string;
-								switch (event.level) {
-									case "debug":
-										levelStr = "DBG";
-										levelColorCode = color.gray;
-										break;
-									case "info":
-										levelStr = "INF";
-										levelColorCode = color.blue;
-										break;
-									case "warn":
-										levelStr = "WRN";
-										levelColorCode = color.yellow;
-										break;
-									case "error":
-										levelStr = "ERR";
-										levelColorCode = color.red;
-										break;
-									default:
-										levelStr = String(event.level).slice(0, 3).toUpperCase();
-										levelColorCode = color.gray;
-								}
+								const levelColorFn = getLevelColor(event.level);
+								const levelStr = getLevelLabel(event.level);
 
 								const agentLabel = event.agentName ? `[${event.agentName}]` : "[unknown]";
 								const detail = buildLogDetail(event);
-								const detailSuffix = detail ? ` ${color.dim}${detail}${color.reset}` : "";
+								const detailSuffix = detail ? ` ${color.dim(detail)}` : "";
 
 								w(
-									`${time} ${levelColorCode}${levelStr}${color.reset} ` +
-										`${event.event} ${color.dim}${agentLabel}${color.reset}${detailSuffix}\n`,
+									`${time} ${levelColorFn(levelStr)} ` +
+										`${event.event} ${color.dim(agentLabel)}${detailSuffix}\n`,
 								);
 							}
 						} catch {
@@ -427,36 +401,24 @@ async function followLogs(
 	}
 }
 
-const LOGS_HELP = `overstory logs -- Query NDJSON log files from .overstory/logs
-
-Usage: overstory logs [options]
-
-Options:
-  --agent <name>         Filter logs by agent name
-  --level <level>        Filter by log level: debug, info, warn, error
-  --since <time>         Start time filter (ISO 8601 or relative: 1h, 30m, 2d, 10s)
-  --until <time>         End time filter (ISO 8601)
-  --limit <n>            Max entries to show (default: 100, returns most recent)
-  --follow               Tail logs in real time (poll every 1s, Ctrl+C to stop)
-  --json                 Output as JSON array of LogEvent objects
-  --help, -h             Show this help`;
-
-/**
- * Entry point for `overstory logs` command.
- */
-export async function logsCommand(args: string[]): Promise<void> {
-	if (args.includes("--help") || args.includes("-h")) {
-		process.stdout.write(`${LOGS_HELP}\n`);
-		return;
-	}
+interface LogsOpts {
+	agent?: string;
+	level?: string;
+	since?: string;
+	until?: string;
+	limit?: string;
+	follow?: boolean;
+	json?: boolean;
+}
 
-	const json = hasFlag(args, "--json");
-	const follow = hasFlag(args, "--follow");
-	const agentName = getFlag(args, "--agent");
-	const level = getFlag(args, "--level");
-	const sinceStr = getFlag(args, "--since");
-	const untilStr = getFlag(args, "--until");
-	const limitStr = getFlag(args, "--limit");
+async function executeLogs(opts: LogsOpts): Promise<void> {
+	const json = opts.json ?? false;
+	const follow = opts.follow ?? false;
+	const agentName = opts.agent;
+	const level = opts.level;
+	const sinceStr = opts.since;
+	const untilStr = opts.until;
+	const limitStr = opts.limit;
 	const limit = limitStr ? Number.parseInt(limitStr, 10) : 100;
 
 	if (Number.isNaN(limit) || limit < 1) {
@@ -544,3 +506,38 @@ export async function logsCommand(args: string[]): Promise<void> {
 
 	printLogs(limited);
 }
+
+export function createLogsCommand(): Command {
+	return new Command("logs")
+		.description("Query NDJSON logs across agents")
+		.option("--agent <name>", "Filter logs by agent name")
+		.option("--level <level>", "Filter by log level: debug, info, warn, error")
+		.option("--since <time>", "Start time filter (ISO 8601 or relative: 1h, 30m, 2d, 10s)")
+		.option("--until <time>", "End time filter (ISO 8601)")
+		.option("--limit <n>", "Max entries to show (default: 100, returns most recent)")
+		.option("--follow", "Tail logs in real time (poll every 1s, Ctrl+C to stop)")
+		.option("--json", "Output as JSON array of LogEvent objects")
+		.action(async (opts: LogsOpts) => {
+			await executeLogs(opts);
+		});
+}
+
+export async function logsCommand(args: string[]): Promise<void> {
+	const cmd = createLogsCommand();
+	cmd.exitOverride();
+	try {
+		await cmd.parseAsync(args, { from: "user" });
+	} catch (err: unknown) {
+		if (err && typeof err === "object" && "code" in err) {
+			const code = (err as { code: string }).code;
+			if (code === "commander.helpDisplayed" || code === "commander.version") {
+				return;
+			}
+			if (code.startsWith("commander.")) {
+				const message = err instanceof Error ? err.message : String(err);
+				throw new ValidationError(message, { field: "args" });
+			}
+		}
+		throw err;
+	}
+}

package/src/commands/mail.test.ts

@@ -761,7 +761,7 @@ describe("mailCommand", () => {
 					capability: "coordinator",
 					worktreePath: "/worktrees/orchestrator",
 					branchName: "main",
-					beadId: "bead-001",
+					taskId: "bead-001",
 					tmuxSession: "overstory-test-orchestrator",
 					state: "working" as const,
 					pid: 12345,
@@ -779,7 +779,7 @@ describe("mailCommand", () => {
 					capability: "builder",
 					worktreePath: "/worktrees/builder-1",
 					branchName: "builder-1",
-					beadId: "bead-002",
+					taskId: "bead-002",
 					tmuxSession: "overstory-test-builder-1",
 					state: "working" as const,
 					pid: 12346,
@@ -797,7 +797,7 @@ describe("mailCommand", () => {
 					capability: "builder",
 					worktreePath: "/worktrees/builder-2",
 					branchName: "builder-2",
-					beadId: "bead-003",
+					taskId: "bead-003",
 					tmuxSession: "overstory-test-builder-2",
 					state: "working" as const,
 					pid: 12347,
@@ -815,7 +815,7 @@ describe("mailCommand", () => {
 					capability: "scout",
 					worktreePath: "/worktrees/scout-1",
 					branchName: "scout-1",
-					beadId: "bead-004",
+					taskId: "bead-004",
 					tmuxSession: "overstory-test-scout-1",
 					state: "working" as const,
 					pid: 12348,
@@ -1135,7 +1135,7 @@ describe("mailCommand", () => {
 						| "monitor",
 					worktreePath: `/worktrees/${session.agentName}`,
 					branchName: session.agentName,
-					beadId: `bead-${idx}`,
+					taskId: `bead-${idx}`,
 					tmuxSession: `overstory-test-${session.agentName}`,
 					state: "working" as const,
 					pid: 10000 + idx,