@os-eco/overstory-cli 0.6.11 → 0.7.2

package/src/config.ts

@@ -62,6 +62,17 @@ export const DEFAULT_CONFIG: OverstoryConfig = {
 		verbose: false,
 		redactSecrets: true,
 	},
+	runtime: {
+		default: "claude",
+		pi: {
+			provider: "anthropic",
+			modelMap: {
+				opus: "anthropic/claude-opus-4-6",
+				sonnet: "anthropic/claude-sonnet-4-6",
+				haiku: "anthropic/claude-haiku-4-5",
+			},
+		},
+	},
 };
 
 const CONFIG_FILENAME = "config.yaml";
@@ -625,6 +636,34 @@ function validateConfig(config: OverstoryConfig): void {
 		}
 	}
 
+	// runtime.default must be a string if present
+	if (config.runtime !== undefined && typeof config.runtime.default !== "string") {
+		process.stderr.write(
+			`[overstory] WARNING: runtime.default must be a string. Got: ${typeof config.runtime.default}. Ignoring.\n`,
+		);
+	}
+
+	// runtime.pi: validate provider and modelMap if present
+	if (config.runtime?.pi) {
+		const pi = config.runtime.pi;
+		if (!pi.provider || typeof pi.provider !== "string") {
+			throw new ValidationError("runtime.pi.provider must be a non-empty string", {
+				field: "runtime.pi.provider",
+				value: pi.provider,
+			});
+		}
+		if (pi.modelMap && typeof pi.modelMap === "object") {
+			for (const [alias, qualified] of Object.entries(pi.modelMap)) {
+				if (!qualified || typeof qualified !== "string") {
+					throw new ValidationError(`runtime.pi.modelMap.${alias} must be a non-empty string`, {
+						field: `runtime.pi.modelMap.${alias}`,
+						value: qualified,
+					});
+				}
+			}
+		}
+	}
+
 	// models: validate each value — accepts aliases and provider-prefixed refs
 	const validAliases = ["sonnet", "opus", "haiku"];
 	const toolHeavyRoles = ["builder", "scout"];

package/src/doctor/consistency.test.ts

@@ -207,6 +207,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 		store.close();
 
@@ -243,6 +244,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 		store.close();
 
@@ -278,6 +280,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 		store.close();
 
@@ -314,6 +317,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 		store.close();
 
@@ -353,6 +357,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 		store.close();
 
@@ -426,6 +431,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 
 		store.upsert({
@@ -445,6 +451,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 		store.close();
 
@@ -481,6 +488,7 @@ describe("checkConsistency", () => {
 				lastActivity: new Date().toISOString(),
 				escalationLevel: 0,
 				stalledSince: null,
+				transcriptPath: null,
 			});
 		}
 
@@ -501,6 +509,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 		store.close();
 
@@ -535,6 +544,7 @@ describe("checkConsistency", () => {
 				lastActivity: new Date().toISOString(),
 				escalationLevel: 0,
 				stalledSince: null,
+				transcriptPath: null,
 			});
 
 			store.upsert({
@@ -554,6 +564,7 @@ describe("checkConsistency", () => {
 				lastActivity: new Date().toISOString(),
 				escalationLevel: 0,
 				stalledSince: null,
+				transcriptPath: null,
 			});
 		}
 		store.close();
@@ -597,6 +608,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 
 		store.upsert({
@@ -616,6 +628,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 
 		// Lead-2 has builders only (bad)
@@ -636,6 +649,7 @@ describe("checkConsistency", () => {
 			lastActivity: new Date().toISOString(),
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		});
 		store.close();
 

package/src/e2e/init-sling-lifecycle.test.ts

@@ -27,7 +27,6 @@ const EXPECTED_AGENT_DEFS = [
 	"monitor.md",
 	"reviewer.md",
 	"scout.md",
-	"supervisor.md",
 ];
 
 describe("E2E: init→sling lifecycle on external project", () => {
@@ -77,7 +76,7 @@ describe("E2E: init→sling lifecycle on external project", () => {
 		const gitignoreFile = Bun.file(join(overstoryDir, ".gitignore"));
 		expect(await gitignoreFile.exists()).toBe(true);
 
-		// agent-defs/ contains all 8 agent definition files
+		// agent-defs/ contains all 7 agent definition files (supervisor deprecated)
 		const agentDefsDir = join(overstoryDir, "agent-defs");
 		const agentDefFiles = (await readdir(agentDefsDir)).filter((f) => f.endsWith(".md")).sort();
 		expect(agentDefFiles).toEqual(EXPECTED_AGENT_DEFS);
@@ -109,7 +108,7 @@ describe("E2E: init→sling lifecycle on external project", () => {
 		expect(config.project.name).toBeTruthy();
 	});
 
-	test("manifest loads successfully with all 8 agents", async () => {
+	test("manifest loads successfully with all 7 agents (supervisor deprecated)", async () => {
 		await initCommand({});
 
 		const manifestPath = join(tempDir, ".overstory", "agent-manifest.json");
@@ -118,7 +117,7 @@ describe("E2E: init→sling lifecycle on external project", () => {
 
 		const manifest = await loader.load();
 
-		// All 8 agents present
+		// All 7 agents present (supervisor removed: deprecated, use lead instead)
 		const agentNames = Object.keys(manifest.agents).sort();
 		expect(agentNames).toEqual([
 			"builder",
@@ -128,7 +127,6 @@ describe("E2E: init→sling lifecycle on external project", () => {
 			"monitor",
 			"reviewer",
 			"scout",
-			"supervisor",
 		]);
 
 		// Each agent has a valid file reference

package/src/index.ts

@@ -45,7 +45,7 @@ import { OverstoryError, WorktreeError } from "./errors.ts";
 import { jsonError } from "./json.ts";
 import { brand, chalk, muted, setQuiet } from "./logging/color.ts";
 
-export const VERSION = "0.6.11";
+export const VERSION = "0.7.2";
 
 const rawArgs = process.argv.slice(2);
 
@@ -255,6 +255,7 @@ program
 	.option("--max-agents <n>", "Max children per lead (overrides config)")
 	.option("--skip-review", "Skip review phase for lead agents")
 	.option("--dispatch-max-agents <n>", "Per-lead max agents ceiling (injected into overlay)")
+	.option("--runtime <name>", "Runtime adapter (default: config or claude)")
 	.option("--json", "Output result as JSON")
 	.action(async (taskId, opts) => {
 		await slingCommand(taskId, opts);

package/src/logging/format.ts

@@ -0,0 +1,214 @@
+/**
+ * Shared formatting utilities for overstory CLI output.
+ *
+ * Duration, timestamp, event detail, agent color mapping, and status color
+ * helpers used across all observability commands.
+ */
+
+import type { StoredEvent } from "../types.ts";
+import type { ColorFn } from "./color.ts";
+import { color, noColor } from "./color.ts";
+import { AGENT_COLORS } from "./theme.ts";
+
+// === Duration ===
+
+/**
+ * Formats a duration in milliseconds to a human-readable string.
+ * Examples: "0s", "12s", "3m 45s", "2h 15m"
+ */
+export function formatDuration(ms: number): string {
+	if (ms === 0) return "0s";
+	const totalSeconds = Math.floor(ms / 1000);
+	const hours = Math.floor(totalSeconds / 3600);
+	const minutes = Math.floor((totalSeconds % 3600) / 60);
+	const seconds = totalSeconds % 60;
+	if (hours > 0) {
+		return minutes > 0 ? `${hours}h ${minutes}m` : `${hours}h`;
+	}
+	if (minutes > 0) {
+		return seconds > 0 ? `${minutes}m ${seconds}s` : `${minutes}m`;
+	}
+	return `${seconds}s`;
+}
+
+// === Timestamps ===
+
+/**
+ * Extracts "HH:MM:SS" from an ISO 8601 timestamp string.
+ * Returns the raw substring if the timestamp is well-formed.
+ */
+export function formatAbsoluteTime(timestamp: string): string {
+	// ISO format: "YYYY-MM-DDTHH:MM:SS..." or "YYYY-MM-DD HH:MM:SS..."
+	const match = timestamp.match(/T?(\d{2}:\d{2}:\d{2})/);
+	return match?.[1] ?? timestamp;
+}
+
+/**
+ * Extracts "YYYY-MM-DD" from an ISO 8601 timestamp string.
+ */
+export function formatDate(timestamp: string): string {
+	const match = timestamp.match(/^(\d{4}-\d{2}-\d{2})/);
+	return match?.[1] ?? timestamp;
+}
+
+/**
+ * Formats a timestamp as a human-readable relative time string.
+ * Examples: "12s ago", "3m ago", "2h ago", "5d ago"
+ */
+export function formatRelativeTime(timestamp: string): string {
+	const now = Date.now();
+	const then = new Date(timestamp).getTime();
+	const diffMs = now - then;
+	if (diffMs < 0) return "just now";
+	const diffSeconds = Math.floor(diffMs / 1000);
+	const diffMinutes = Math.floor(diffSeconds / 60);
+	const diffHours = Math.floor(diffMinutes / 60);
+	const diffDays = Math.floor(diffHours / 24);
+	if (diffDays > 0) return `${diffDays}d ago`;
+	if (diffHours > 0) return `${diffHours}h ago`;
+	if (diffMinutes > 0) return `${diffMinutes}m ago`;
+	return `${diffSeconds}s ago`;
+}
+
+// === Event Details ===
+
+/**
+ * Builds a compact "key=value" detail string from a StoredEvent's fields.
+ * Values are truncated to maxValueLen (default 80) characters.
+ */
+export function buildEventDetail(event: StoredEvent, maxValueLen = 80): string {
+	const parts: string[] = [];
+
+	if (event.toolName) {
+		parts.push(`tool=${event.toolName}`);
+	}
+	if (event.toolArgs) {
+		const truncated =
+			event.toolArgs.length > maxValueLen
+				? `${event.toolArgs.slice(0, maxValueLen)}…`
+				: event.toolArgs;
+		parts.push(`args=${truncated}`);
+	}
+	if (event.toolDurationMs !== null && event.toolDurationMs !== undefined) {
+		parts.push(`dur=${event.toolDurationMs}ms`);
+	}
+	if (event.data) {
+		const truncated =
+			event.data.length > maxValueLen ? `${event.data.slice(0, maxValueLen)}…` : event.data;
+		parts.push(`data=${truncated}`);
+	}
+
+	return parts.join(" ");
+}
+
+// === Agent Color Mapping ===
+
+/**
+ * Builds a stable color map for agents by first-appearance order in events.
+ * Agents are assigned colors from AGENT_COLORS cycling as needed.
+ */
+export function buildAgentColorMap(events: StoredEvent[]): Map<string, ColorFn> {
+	const colorMap = new Map<string, ColorFn>();
+	let idx = 0;
+	for (const event of events) {
+		if (!colorMap.has(event.agentName)) {
+			const colorFn = AGENT_COLORS[idx % AGENT_COLORS.length] ?? noColor;
+			colorMap.set(event.agentName, colorFn);
+			idx++;
+		}
+	}
+	return colorMap;
+}
+
+/**
+ * Extends an existing agent color map with new agents from the given events.
+ * Used in follow mode to add agents discovered in incremental event batches.
+ */
+export function extendAgentColorMap(colorMap: Map<string, ColorFn>, events: StoredEvent[]): void {
+	let idx = colorMap.size;
+	for (const event of events) {
+		if (!colorMap.has(event.agentName)) {
+			const colorFn = AGENT_COLORS[idx % AGENT_COLORS.length] ?? noColor;
+			colorMap.set(event.agentName, colorFn);
+			idx++;
+		}
+	}
+}
+
+// === Status Colors ===
+
+/**
+ * Returns a color function for a merge status string.
+ * pending=yellow, merging=blue, conflict=red, merged=green
+ */
+export function mergeStatusColor(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 (text: string) => text;
+	}
+}
+
+/**
+ * Returns a color function for a priority string.
+ * urgent=red, high=yellow, normal=identity, low=dim
+ */
+export function priorityColor(priority: string): ColorFn {
+	switch (priority) {
+		case "urgent":
+			return color.red;
+		case "high":
+			return color.yellow;
+		case "normal":
+			return (text: string) => text;
+		case "low":
+			return color.dim;
+		default:
+			return (text: string) => text;
+	}
+}
+
+/**
+ * Returns a color function for a log level string.
+ * debug=gray, info=blue, warn=yellow, error=red
+ */
+export function logLevelColor(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 (text: string) => text;
+	}
+}
+
+/**
+ * Returns a 3-character label for a log level string.
+ * debug="DBG", info="INF", warn="WRN", error="ERR"
+ */
+export function logLevelLabel(level: string): string {
+	switch (level) {
+		case "debug":
+			return "DBG";
+		case "info":
+			return "INF";
+		case "warn":
+			return "WRN";
+		case "error":
+			return "ERR";
+		default:
+			return level.slice(0, 3).toUpperCase();
+	}
+}

package/src/logging/theme.ts

@@ -0,0 +1,132 @@
+/**
+ * Canonical visual theme for overstory CLI output.
+ *
+ * Single source of truth for state colors, event labels, agent palette,
+ * separators, and header rendering. All observability commands import from here.
+ */
+
+import type { AgentState, EventType } from "../types.ts";
+import type { ColorFn } from "./color.ts";
+import { brand, color, noColor, visibleLength } from "./color.ts";
+
+// === Agent State Theme ===
+
+/** Maps agent states to their visual color functions. */
+const STATE_COLORS: Record<AgentState, ColorFn> = {
+	working: color.green,
+	booting: color.yellow,
+	stalled: color.red,
+	zombie: color.dim,
+	completed: color.cyan,
+};
+
+/** Maps agent states to their icon characters. */
+const STATE_ICONS: Record<AgentState, string> = {
+	working: ">",
+	booting: "~",
+	stalled: "!",
+	zombie: "x",
+	completed: "\u2713",
+};
+
+/** Returns the color function for a given agent state. Falls back to noColor. */
+export function stateColor(state: string): ColorFn {
+	return STATE_COLORS[state as AgentState] ?? noColor;
+}
+
+/** Returns the raw icon character for a given agent state. Falls back to "?". */
+export function stateIcon(state: string): string {
+	return STATE_ICONS[state as AgentState] ?? "?";
+}
+
+/** Returns a colored icon string for a given agent state. */
+export function stateIconColored(state: string): string {
+	return stateColor(state)(stateIcon(state));
+}
+
+// === Event Label Theme ===
+
+export interface EventLabel {
+	/** 5-character compact label (for feed). */
+	compact: string;
+	/** 10-character full label (for trace/replay). */
+	full: string;
+	/** Color function for this event type. */
+	color: ColorFn;
+}
+
+/** Maps event types to their compact (5-char) and full (10-char) labels, plus color. */
+const EVENT_LABELS: Record<EventType, EventLabel> = {
+	tool_start: { compact: "TOOL+", full: "TOOL START", color: color.blue },
+	tool_end: { compact: "TOOL-", full: "TOOL END  ", color: color.blue },
+	session_start: { compact: "SESS+", full: "SESSION  +", color: color.green },
+	session_end: { compact: "SESS-", full: "SESSION  -", color: color.yellow },
+	mail_sent: { compact: "MAIL>", full: "MAIL SENT ", color: color.cyan },
+	mail_received: { compact: "MAIL<", full: "MAIL RECV ", color: color.cyan },
+	spawn: { compact: "SPAWN", full: "SPAWN     ", color: color.magenta },
+	error: { compact: "ERROR", full: "ERROR     ", color: color.red },
+	custom: { compact: "CUSTM", full: "CUSTOM    ", color: color.gray },
+};
+
+/** Returns the EventLabel for a given event type. */
+export function eventLabel(eventType: EventType): EventLabel {
+	return EVENT_LABELS[eventType];
+}
+
+// === Agent Colors (for multi-agent displays) ===
+
+/** Stable palette for assigning distinct colors to agents in multi-agent displays. */
+export const AGENT_COLORS: readonly ColorFn[] = [
+	color.blue,
+	color.green,
+	color.yellow,
+	color.cyan,
+	color.magenta,
+] as const;
+
+// === Separators ===
+
+/** Unicode thin horizontal box-drawing character. */
+export const SEPARATOR_CHAR = "\u2500";
+
+/** Unicode double horizontal box-drawing character (thick). */
+export const THICK_SEPARATOR_CHAR = "\u2550";
+
+/** Default line width for separators and headers. */
+export const DEFAULT_WIDTH = 70;
+
+/** Returns a thin separator line of the given width (default 70). */
+export function separator(width?: number): string {
+	return SEPARATOR_CHAR.repeat(width ?? DEFAULT_WIDTH);
+}
+
+/** Returns a thick (double-line) separator of the given width (default 70). */
+export function thickSeparator(width?: number): string {
+	return THICK_SEPARATOR_CHAR.repeat(width ?? DEFAULT_WIDTH);
+}
+
+// === Header Rendering ===
+
+/**
+ * Pads a string to the given visible width, accounting for ANSI escape codes.
+ * If the string is already wider than width, returns it unchanged.
+ */
+export function padVisible(str: string, width: number): string {
+	const visible = visibleLength(str);
+	if (visible >= width) return str;
+	return str + " ".repeat(width - visible);
+}
+
+/**
+ * Renders a primary header: brand bold title + newline + thin separator.
+ */
+export function renderHeader(title: string, width?: number): string {
+	return `${brand.bold(title)}\n${separator(width)}`;
+}
+
+/**
+ * Renders a secondary header: color bold title + newline + dim thin separator.
+ */
+export function renderSubHeader(title: string, width?: number): string {
+	return `${color.bold(title)}\n${color.dim(separator(width))}`;
+}

package/src/mail/broadcast.test.ts

@@ -41,6 +41,7 @@ describe("resolveGroupAddress", () => {
 			lastActivity: "2024-01-01T00:01:00Z",
 			escalationLevel: 0,
 			stalledSince: null,
+			transcriptPath: null,
 		};
 	}
 

package/src/merge/resolver.ts

@@ -13,10 +13,12 @@
 
 import { MergeError } from "../errors.ts";
 import type { MulchClient } from "../mulch/client.ts";
+import { getRuntime } from "../runtimes/registry.ts";
 import type {
 	ConflictHistory,
 	MergeEntry,
 	MergeResult,
+	OverstoryConfig,
 	ParsedConflictPattern,
 	ResolutionTier,
 } from "../types.ts";
@@ -243,6 +245,7 @@ async function tryAiResolve(
 	conflictFiles: string[],
 	repoRoot: string,
 	pastResolutions?: string[],
+	config?: OverstoryConfig,
 ): Promise<{ success: boolean; remainingConflicts: string[] }> {
 	const remainingConflicts: string[] = [];
 
@@ -265,7 +268,9 @@ async function tryAiResolve(
 				content,
 			].join(" ");
 
-			const proc = Bun.spawn(["claude", "--print", "-p", prompt], {
+			const runtime = getRuntime(config?.runtime?.printCommand ?? config?.runtime?.default, config);
+			const argv = runtime.buildPrintCommand(prompt);
+			const proc = Bun.spawn(argv, {
 				cwd: repoRoot,
 				stdout: "pipe",
 				stderr: "pipe",
@@ -315,6 +320,7 @@ async function tryReimagine(
 	entry: MergeEntry,
 	canonicalBranch: string,
 	repoRoot: string,
+	config?: OverstoryConfig,
 ): Promise<{ success: boolean }> {
 	// Abort the current merge
 	await runGit(repoRoot, ["merge", "--abort"]);
@@ -348,7 +354,9 @@ async function tryReimagine(
 				branchContent,
 			].join("");
 
-			const proc = Bun.spawn(["claude", "--print", "-p", prompt], {
+			const runtime = getRuntime(config?.runtime?.printCommand ?? config?.runtime?.default, config);
+			const argv = runtime.buildPrintCommand(prompt);
+			const proc = Bun.spawn(argv, {
 				cwd: repoRoot,
 				stdout: "pipe",
 				stderr: "pipe",
@@ -556,6 +564,7 @@ export function createMergeResolver(options: {
 	aiResolveEnabled: boolean;
 	reimagineEnabled: boolean;
 	mulchClient?: MulchClient;
+	config?: OverstoryConfig;
 }): MergeResolver {
 	return {
 		async resolve(
@@ -632,7 +641,12 @@ export function createMergeResolver(options: {
 			// Tier 3: AI-resolve
 			if (options.aiResolveEnabled && !history.skipTiers.includes("ai-resolve")) {
 				lastTier = "ai-resolve";
-				const aiResult = await tryAiResolve(conflictFiles, repoRoot, history.pastResolutions);
+				const aiResult = await tryAiResolve(
+					conflictFiles,
+					repoRoot,
+					history.pastResolutions,
+					options.config,
+				);
 				if (aiResult.success) {
 					if (options.mulchClient) {
 						recordConflictPattern(options.mulchClient, entry, "ai-resolve", conflictFiles, true);
@@ -651,7 +665,12 @@ export function createMergeResolver(options: {
 			// Tier 4: Re-imagine
 			if (options.reimagineEnabled && !history.skipTiers.includes("reimagine")) {
 				lastTier = "reimagine";
-				const reimagineResult = await tryReimagine(entry, canonicalBranch, repoRoot);
+				const reimagineResult = await tryReimagine(
+					entry,
+					canonicalBranch,
+					repoRoot,
+					options.config,
+				);
 				if (reimagineResult.success) {
 					if (options.mulchClient) {
 						recordConflictPattern(options.mulchClient, entry, "reimagine", conflictFiles, true);