@os-eco/overstory-cli 0.6.11 → 0.7.2

package/src/commands/costs.ts

@@ -13,6 +13,7 @@ import { loadConfig } from "../config.ts";
 import { ValidationError } from "../errors.ts";
 import { jsonError, jsonOutput } from "../json.ts";
 import { color } from "../logging/color.ts";
+import { renderHeader, separator } from "../logging/theme.ts";
 import { createMetricsStore } from "../metrics/store.ts";
 import { estimateCost, parseTranscriptUsage } from "../metrics/transcript.ts";
 import { openSessionStore } from "../sessions/compat.ts";
@@ -141,10 +142,8 @@ function groupByCapability(sessions: SessionMetrics[]): CapabilityGroup[] {
 /** Print the standard per-agent cost summary table. */
 function printCostSummary(sessions: SessionMetrics[]): void {
 	const w = process.stdout.write.bind(process.stdout);
-	const separator = "\u2500".repeat(70);
 
-	w(`${color.bold("Cost Summary")}\n`);
-	w(`${"=".repeat(70)}\n`);
+	w(`${renderHeader("Cost Summary")}\n`);
 
 	if (sessions.length === 0) {
 		w(`${color.dim("No session data found.")}\n`);
@@ -156,7 +155,7 @@ function printCostSummary(sessions: SessionMetrics[]): void {
 			`${padLeft("Input", 10)}${padLeft("Output", 10)}` +
 			`${padLeft("Cache", 10)}${padLeft("Cost", 10)}\n`,
 	);
-	w(`${color.dim(separator)}\n`);
+	w(`${color.dim(separator())}\n`);
 
 	for (const s of sessions) {
 		const cacheTotal = s.cacheReadTokens + s.cacheCreationTokens;
@@ -170,7 +169,7 @@ function printCostSummary(sessions: SessionMetrics[]): void {
 	}
 
 	const totals = computeTotals(sessions);
-	w(`${color.dim(separator)}\n`);
+	w(`${color.dim(separator())}\n`);
 	w(
 		`${color.green(
 			color.bold(
@@ -187,10 +186,8 @@ function printCostSummary(sessions: SessionMetrics[]): void {
 /** Print the capability-grouped cost table. */
 function printByCapability(sessions: SessionMetrics[]): void {
 	const w = process.stdout.write.bind(process.stdout);
-	const separator = "\u2500".repeat(70);
 
-	w(`${color.bold("Cost by Capability")}\n`);
-	w(`${"=".repeat(70)}\n`);
+	w(`${renderHeader("Cost by Capability")}\n`);
 
 	if (sessions.length === 0) {
 		w(`${color.dim("No session data found.")}\n`);
@@ -202,7 +199,7 @@ function printByCapability(sessions: SessionMetrics[]): void {
 			`${padLeft("Input", 10)}${padLeft("Output", 10)}` +
 			`${padLeft("Cache", 10)}${padLeft("Cost", 10)}\n`,
 	);
-	w(`${color.dim(separator)}\n`);
+	w(`${color.dim(separator())}\n`);
 
 	const groups = groupByCapability(sessions);
 
@@ -218,7 +215,7 @@ function printByCapability(sessions: SessionMetrics[]): void {
 	}
 
 	const totals = computeTotals(sessions);
-	w(`${color.dim(separator)}\n`);
+	w(`${color.dim(separator())}\n`);
 	w(
 		`${color.green(
 			color.bold(
@@ -299,17 +296,15 @@ async function executeCosts(opts: CostsOpts): Promise<void> {
 			});
 		} else {
 			const w = process.stdout.write.bind(process.stdout);
-			const separator = "\u2500".repeat(70);
 
-			w(`${color.bold("Orchestrator Session Cost")}\n`);
-			w(`${"=".repeat(70)}\n`);
+			w(`${renderHeader("Orchestrator Session Cost")}\n`);
 			w(`${padRight("Model:", 12)}${usage.modelUsed ?? "unknown"}\n`);
 			w(`${padRight("Transcript:", 12)}${transcriptPath}\n`);
-			w(`${color.dim(separator)}\n`);
+			w(`${color.dim(separator())}\n`);
 			w(`${padRight("Input tokens:", 22)}${padLeft(formatNumber(usage.inputTokens), 12)}\n`);
 			w(`${padRight("Output tokens:", 22)}${padLeft(formatNumber(usage.outputTokens), 12)}\n`);
 			w(`${padRight("Cache tokens:", 22)}${padLeft(formatNumber(cacheTotal), 12)}\n`);
-			w(`${color.dim(separator)}\n`);
+			w(`${color.dim(separator())}\n`);
 			w(
 				`${color.green(color.bold(padRight("Estimated cost:", 22) + padLeft(formatCost(cost), 12)))}\n`,
 			);
@@ -453,16 +448,14 @@ async function executeCosts(opts: CostsOpts): Promise<void> {
 				});
 			} else {
 				const w = process.stdout.write.bind(process.stdout);
-				const separator = "\u2500".repeat(70);
 
-				w(`${color.bold(`Live Token Usage (${agentData.length} active agents)`)}\n`);
-				w(`${"=".repeat(70)}\n`);
+				w(`${renderHeader(`Live Token Usage (${agentData.length} active agents)`)}\n`);
 				w(
 					`${padRight("Agent", 19)}${padRight("Capability", 12)}` +
 						`${padLeft("Input", 10)}${padLeft("Output", 10)}` +
 						`${padLeft("Cache", 10)}${padLeft("Cost", 10)}\n`,
 				);
-				w(`${color.dim(separator)}\n`);
+				w(`${color.dim(separator())}\n`);
 
 				for (const agent of agentData) {
 					const cacheTotal = agent.cacheReadTokens + agent.cacheCreationTokens;
@@ -475,7 +468,7 @@ async function executeCosts(opts: CostsOpts): Promise<void> {
 					);
 				}
 
-				w(`${color.dim(separator)}\n`);
+				w(`${color.dim(separator())}\n`);
 				w(
 					`${color.green(
 						color.bold(

package/src/commands/dashboard.ts

@@ -14,8 +14,14 @@ import { join, resolve } 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 { accent, color, noColor, visibleLength } from "../logging/color.ts";
+import { accent, brand, color, visibleLength } from "../logging/color.ts";
+import {
+	formatDuration,
+	formatRelativeTime,
+	mergeStatusColor,
+	priorityColor,
+} from "../logging/format.ts";
+import { stateColor, stateIcon } from "../logging/theme.ts";
 import { createMailStore, type MailStore } from "../mail/store.ts";
 import { createMergeQueue, type MergeQueue } from "../merge/queue.ts";
 import { createMetricsStore, type MetricsStore } from "../metrics/store.ts";
@@ -54,38 +60,6 @@ const BOX = {
 	cross: "┼",
 };
 
-/**
- * Format a duration in ms to a human-readable string.
- */
-function formatDuration(ms: number): string {
-	const seconds = Math.floor(ms / 1000);
-	if (seconds < 60) return `${seconds}s`;
-	const minutes = Math.floor(seconds / 60);
-	const remainSec = seconds % 60;
-	if (minutes < 60) return `${minutes}m ${remainSec}s`;
-	const hours = Math.floor(minutes / 60);
-	const remainMin = minutes % 60;
-	return `${hours}h ${remainMin}m`;
-}
-
-/**
- * Format a timestamp to "time ago" format.
- */
-function timeAgo(timestamp: string): string {
-	const now = Date.now();
-	const then = new Date(timestamp).getTime();
-	const diffMs = now - then;
-	const diffSec = Math.floor(diffMs / 1000);
-
-	if (diffSec < 60) return `${diffSec}s ago`;
-	const diffMin = Math.floor(diffSec / 60);
-	if (diffMin < 60) return `${diffMin}m ago`;
-	const diffHr = Math.floor(diffMin / 60);
-	if (diffHr < 24) return `${diffHr}h ago`;
-	const diffDay = Math.floor(diffHr / 24);
-	return `${diffDay}d ago`;
-}
-
 /**
  * Truncate a string to fit within maxLen characters, adding ellipsis if needed.
  */
@@ -297,7 +271,7 @@ async function loadDashboardData(
 	let recentMetricsCount = 0;
 	if (stores.metricsStore) {
 		try {
-			recentMetricsCount = stores.metricsStore.getRecentSessions(100).length;
+			recentMetricsCount = stores.metricsStore.countSessions();
 		} catch {
 			// best effort
 		}
@@ -357,32 +331,34 @@ async function loadDashboardData(
 	const byCapability: Record<string, number> = {};
 	if (stores.metricsStore) {
 		try {
-			const sessions = stores.metricsStore.getRecentSessions(100);
-
-			const filtered =
-				runId && filteredAgents.length > 0
-					? (() => {
-							const agentNames = new Set(filteredAgents.map((a) => a.agentName));
-							return sessions.filter((s) => agentNames.has(s.agentName));
-						})()
-					: sessions;
+			if (runId && filteredAgents.length > 0) {
+				// Run-scoped: filter sessions by agent names, compute all values from the filtered set
+				const agentNames = new Set(filteredAgents.map((a) => a.agentName));
+				const sessions = stores.metricsStore.getRecentSessions(100);
+				const filtered = sessions.filter((s) => agentNames.has(s.agentName));
 
-			totalSessions = filtered.length;
+				totalSessions = filtered.length;
 
-			// When run-scoped, compute avg duration from filtered sessions manually
-			if (runId && filteredAgents.length > 0) {
 				const completedSessions = filtered.filter((s) => s.completedAt !== null);
 				if (completedSessions.length > 0) {
 					avgDuration =
 						completedSessions.reduce((sum, s) => sum + s.durationMs, 0) / completedSessions.length;
 				}
+
+				for (const session of filtered) {
+					const cap = session.capability;
+					byCapability[cap] = (byCapability[cap] ?? 0) + 1;
+				}
 			} else {
+				// All-runs view: use countSessions() to get accurate total (not capped at 100)
+				totalSessions = stores.metricsStore.countSessions();
 				avgDuration = stores.metricsStore.getAverageDuration();
-			}
 
-			for (const session of filtered) {
-				const cap = session.capability;
-				byCapability[cap] = (byCapability[cap] ?? 0) + 1;
+				const sessions = stores.metricsStore.getRecentSessions(100);
+				for (const session of sessions) {
+					const cap = session.capability;
+					byCapability[cap] = (byCapability[cap] ?? 0) + 1;
+				}
 			}
 		} catch {
 			// best effort
@@ -402,7 +378,7 @@ async function loadDashboardData(
  * Render the header bar (line 1).
  */
 function renderHeader(width: number, interval: number, currentRunId?: string | null): string {
-	const left = color.bold(`ov dashboard v${PKG_VERSION}`);
+	const left = brand.bold(`ov dashboard v${PKG_VERSION}`);
 	const now = new Date().toLocaleTimeString();
 	const scope = currentRunId ? ` [run: ${accent(currentRunId.slice(0, 8))}]` : " [all runs]";
 	const right = `${now}${scope} | refresh: ${interval}ms`;
@@ -412,46 +388,6 @@ function renderHeader(width: number, interval: number, currentRunId?: string | n
 	return `${line}\n${separator}`;
 }
 
-/**
- * Get color function for agent state.
- */
-function getStateColor(state: string): ColorFn {
-	switch (state) {
-		case "working":
-			return color.green;
-		case "booting":
-			return color.yellow;
-		case "stalled":
-			return color.red;
-		case "zombie":
-			return color.dim;
-		case "completed":
-			return color.cyan;
-		default:
-			return noColor;
-	}
-}
-
-/**
- * Get status icon for agent state.
- */
-function getStateIcon(state: string): string {
-	switch (state) {
-		case "working":
-			return ">";
-		case "booting":
-			return "-";
-		case "stalled":
-			return "!";
-		case "zombie":
-			return "x";
-		case "completed":
-			return "x";
-		default:
-			return "?";
-	}
-}
-
 /**
  * Render the agent panel (top ~40% of screen).
  */
@@ -465,7 +401,7 @@ function renderAgentPanel(
 	let output = "";
 
 	// Panel header
-	const headerLine = `${BOX.vertical} ${color.bold("Agents")} (${data.status.agents.length})`;
+	const headerLine = `${BOX.vertical} ${brand.bold("Agents")} (${data.status.agents.length})`;
 	const headerPadding = " ".repeat(Math.max(0, width - visibleLength(headerLine) - 1));
 	output += `${CURSOR.cursorTo(startRow, 1)}${headerLine}${headerPadding}${BOX.vertical}\n`;
 
@@ -495,8 +431,8 @@ function renderAgentPanel(
 		const agent = visibleAgents[i];
 		if (!agent) continue;
 
-		const icon = getStateIcon(agent.state);
-		const stateColor = getStateColor(agent.state);
+		const icon = stateIcon(agent.state);
+		const stateColorFn = stateColor(agent.state);
 		const name = accent(pad(truncate(agent.agentName, 15), 15));
 		const capability = pad(truncate(agent.capability, 12), 12);
 		const state = pad(agent.state, 10);
@@ -510,7 +446,7 @@ function renderAgentPanel(
 		const tmuxAlive = data.status.tmuxSessions.some((s) => s.name === agent.tmuxSession);
 		const tmuxDot = tmuxAlive ? color.green(">") : color.red("x");
 
-		const line = `${BOX.vertical} ${stateColor(icon)}  ${name} ${capability} ${stateColor(state)} ${taskId} ${durationPadded} ${tmuxDot}    ${BOX.vertical}`;
+		const line = `${BOX.vertical} ${stateColorFn(icon)}  ${name} ${capability} ${stateColorFn(state)} ${taskId} ${durationPadded} ${tmuxDot}    ${BOX.vertical}`;
 		output += `${CURSOR.cursorTo(startRow + 3 + i, 1)}${line}\n`;
 	}
 
@@ -527,24 +463,6 @@ function renderAgentPanel(
 	return output;
 }
 
-/**
- * Get color function for mail priority.
- */
-function getPriorityColor(priority: string): ColorFn {
-	switch (priority) {
-		case "urgent":
-			return color.red;
-		case "high":
-			return color.yellow;
-		case "normal":
-			return noColor;
-		case "low":
-			return color.dim;
-		default:
-			return noColor;
-	}
-}
-
 /**
  * Render the mail panel (middle-left ~30% height, ~60% width).
  */
@@ -559,7 +477,7 @@ function renderMailPanel(
 	let output = "";
 
 	const unreadCount = data.status.unreadMailCount;
-	const headerLine = `${BOX.vertical} ${color.bold("Mail")} (${unreadCount} unread)`;
+	const headerLine = `${BOX.vertical} ${brand.bold("Mail")} (${unreadCount} unread)`;
 	const headerPadding = " ".repeat(Math.max(0, panelWidth - visibleLength(headerLine) - 1));
 	output += `${CURSOR.cursorTo(startRow, 1)}${headerLine}${headerPadding}${BOX.vertical}\n`;
 
@@ -573,12 +491,12 @@ function renderMailPanel(
 		const msg = messages[i];
 		if (!msg) continue;
 
-		const priorityColorFn = getPriorityColor(msg.priority);
+		const priorityColorFn = priorityColor(msg.priority);
 		const priority = msg.priority === "normal" ? "" : `[${msg.priority}] `;
 		const from = accent(truncate(msg.from, 12));
 		const to = accent(truncate(msg.to, 12));
 		const subject = truncate(msg.subject, panelWidth - 40);
-		const time = timeAgo(msg.createdAt);
+		const time = formatRelativeTime(msg.createdAt);
 
 		const coloredPriority = priority ? priorityColorFn(priority) : "";
 		const line = `${BOX.vertical} ${coloredPriority}${from} → ${to}: ${subject} (${time})`;
@@ -595,24 +513,6 @@ function renderMailPanel(
 	return output;
 }
 
-/**
- * Get color function for merge queue status.
- */
-function getMergeStatusColor(status: string): ColorFn {
-	switch (status) {
-		case "pending":
-			return color.yellow;
-		case "merging":
-			return color.blue;
-		case "conflict":
-			return color.red;
-		case "merged":
-			return color.green;
-		default:
-			return noColor;
-	}
-}
-
 /**
  * Render the merge queue panel (middle-right ~30% height, ~40% width).
  */
@@ -627,7 +527,7 @@ function renderMergeQueuePanel(
 	const panelWidth = width - startCol + 1;
 	let output = "";
 
-	const headerLine = `${BOX.vertical} ${color.bold("Merge Queue")} (${data.mergeQueue.length})`;
+	const headerLine = `${BOX.vertical} ${brand.bold("Merge Queue")} (${data.mergeQueue.length})`;
 	const headerPadding = " ".repeat(Math.max(0, panelWidth - visibleLength(headerLine) - 1));
 	output += `${CURSOR.cursorTo(startRow, startCol)}${headerLine}${headerPadding}${BOX.vertical}\n`;
 
@@ -641,7 +541,7 @@ function renderMergeQueuePanel(
 		const entry = entries[i];
 		if (!entry) continue;
 
-		const statusColorFn = getMergeStatusColor(entry.status);
+		const statusColorFn = mergeStatusColor(entry.status);
 		const status = pad(entry.status, 10);
 		const agent = accent(truncate(entry.agentName, 15));
 		const branch = truncate(entry.branchName, panelWidth - 30);
@@ -674,7 +574,7 @@ function renderMetricsPanel(
 	const separator = horizontalLine(width, BOX.tee, BOX.horizontal, BOX.teeRight);
 	output += `${CURSOR.cursorTo(startRow, 1)}${separator}\n`;
 
-	const headerLine = `${BOX.vertical} ${color.bold("Metrics")}`;
+	const headerLine = `${BOX.vertical} ${brand.bold("Metrics")}`;
 	const headerPadding = " ".repeat(Math.max(0, width - visibleLength(headerLine) - 1));
 	output += `${CURSOR.cursorTo(startRow + 1, 1)}${headerLine}${headerPadding}${BOX.vertical}\n`;
 

package/src/commands/doctor.test.ts

@@ -127,7 +127,7 @@ describe("doctorCommand", () => {
 			const out = output();
 
 			expect(out).toContain("Overstory Doctor");
-			expect(out).toContain("================");
+			expect(out).toContain("────────────────");
 		});
 
 		test("shows summary line with zero counts", async () => {

package/src/commands/doctor.ts

@@ -21,6 +21,7 @@ import { checkVersion } from "../doctor/version.ts";
 import { ValidationError } from "../errors.ts";
 import { jsonOutput } from "../json.ts";
 import { color } from "../logging/color.ts";
+import { renderHeader } from "../logging/theme.ts";
 
 /** Registry of all check modules in execution order. */
 const ALL_CHECKS: Array<{ category: DoctorCategory; fn: DoctorCheckFn }> = [
@@ -63,8 +64,7 @@ function printHumanReadable(
 ): void {
 	const w = process.stdout.write.bind(process.stdout);
 
-	w(`${color.bold("Overstory Doctor")}\n`);
-	w("================\n\n");
+	w(`${renderHeader("Overstory Doctor")}\n\n`);
 
 	// Group checks by category
 	const byCategory = new Map<DoctorCategory, DoctorCheck[]>();

package/src/commands/ecosystem.ts

@@ -8,6 +8,7 @@
 import { Command } from "commander";
 import { jsonError, jsonOutput } from "../json.ts";
 import { accent, brand, color, muted } from "../logging/color.ts";
+import { thickSeparator } from "../logging/theme.ts";
 
 const TOOLS = [
 	{ name: "overstory", cli: "ov", npm: "@os-eco/overstory-cli" },
@@ -167,7 +168,7 @@ function formatDoctorLine(summary: DoctorSummary): string {
 
 function printHumanOutput(results: ToolResult[]): void {
 	process.stdout.write(`${brand.bold("os-eco Ecosystem")}\n`);
-	process.stdout.write(`${"═".repeat(60)}\n`);
+	process.stdout.write(`${thickSeparator()}\n`);
 	process.stdout.write("\n");
 
 	for (const tool of results) {

package/src/commands/errors.test.ts

@@ -226,7 +226,7 @@ describe("errorsCommand", () => {
 			const out = output();
 
 			expect(out).toContain("Errors");
-			expect(out).toContain("=".repeat(70));
+			expect(out).toContain("─".repeat(70));
 		});
 
 		test("shows error count", async () => {
@@ -344,8 +344,7 @@ describe("errorsCommand", () => {
 			await errorsCommand([]);
 			const out = output();
 
-			expect(out).toContain("reason=disk full");
-			expect(out).toContain("code=500");
+			expect(out).toContain('data={"reason":"disk full","code":500}');
 		});
 
 		test("long data values are truncated", async () => {
@@ -364,8 +363,8 @@ describe("errorsCommand", () => {
 
 			// The full 200-char value should not appear
 			expect(out).not.toContain(longValue);
-			// But a truncated version with "..." should
-			expect(out).toContain("...");
+			// But a truncated version with "…" should
+			expect(out).toContain("…");
 		});
 
 		test("non-JSON data is shown raw if short", async () => {

package/src/commands/errors.ts

@@ -13,67 +13,10 @@ import { ValidationError } from "../errors.ts";
 import { createEventStore } from "../events/store.ts";
 import { jsonOutput } from "../json.ts";
 import { accent, color } from "../logging/color.ts";
+import { buildEventDetail, formatAbsoluteTime, formatDate } from "../logging/format.ts";
+import { separator } from "../logging/theme.ts";
 import type { StoredEvent } from "../types.ts";
 
-/**
- * Format an absolute time from an ISO timestamp.
- * Returns "HH:MM:SS" portion.
- */
-function formatAbsoluteTime(timestamp: string): string {
-	const match = /T(\d{2}:\d{2}:\d{2})/.exec(timestamp);
-	if (match?.[1]) {
-		return match[1];
-	}
-	return timestamp;
-}
-
-/**
- * Format the date portion of an ISO timestamp.
- * Returns "YYYY-MM-DD".
- */
-function formatDate(timestamp: string): string {
-	const match = /^(\d{4}-\d{2}-\d{2})/.exec(timestamp);
-	if (match?.[1]) {
-		return match[1];
-	}
-	return "";
-}
-
-/**
- * Build a detail string for an error event based on its fields.
- */
-function buildErrorDetail(event: StoredEvent): string {
-	const parts: string[] = [];
-
-	if (event.toolName) {
-		parts.push(`tool=${event.toolName}`);
-	}
-
-	if (event.data) {
-		try {
-			const parsed: unknown = JSON.parse(event.data);
-			if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-				const data = parsed as Record<string, unknown>;
-				for (const [key, value] of Object.entries(data)) {
-					if (value !== null && value !== undefined) {
-						const strValue = typeof value === "string" ? value : JSON.stringify(value);
-						// Truncate long values
-						const truncated = strValue.length > 80 ? `${strValue.slice(0, 77)}...` : strValue;
-						parts.push(`${key}=${truncated}`);
-					}
-				}
-			}
-		} catch {
-			// data is not valid JSON; show it raw if short enough
-			if (event.data.length <= 80) {
-				parts.push(event.data);
-			}
-		}
-	}
-
-	return parts.join(" ");
-}
-
 /**
  * Group errors by agent name, preserving insertion order.
  */
@@ -96,8 +39,7 @@ function groupByAgent(events: StoredEvent[]): Map<string, StoredEvent[]> {
 function printErrors(events: StoredEvent[]): void {
 	const w = process.stdout.write.bind(process.stdout);
 
-	w(`${color.bold(color.red("Errors"))}\n`);
-	w(`${"=".repeat(70)}\n`);
+	w(`${color.bold(color.red("Errors"))}\n${separator()}\n`);
 
 	if (events.length === 0) {
 		w(`${color.dim("No errors found.")}\n`);
@@ -124,7 +66,7 @@ function printErrors(events: StoredEvent[]): void {
 			const time = formatAbsoluteTime(event.createdAt);
 			const timestamp = date ? `${date} ${time}` : time;
 
-			const detail = buildErrorDetail(event);
+			const detail = buildEventDetail(event);
 			const detailSuffix = detail ? ` ${color.dim(detail)}` : "";
 
 			w(`  ${color.dim(timestamp)} ${color.red(color.bold("ERROR"))}${detailSuffix}\n`);

package/src/commands/feed.test.ts

@@ -561,8 +561,8 @@ describe("feedCommand", () => {
 
 			// The full 200-char value should not appear
 			expect(out).not.toContain(longValue);
-			// But a truncated version with "..." should
-			expect(out).toContain("...");
+			// But a truncated version with "…" should
+			expect(out).toContain("…");
 		});
 
 		test("agent color assignment is stable", async () => {