@os-eco/overstory-cli 0.8.3 → 0.8.5

package/README.md

@@ -19,7 +19,8 @@ Requires [Bun](https://bun.sh) v1.0+, git, and tmux. At least one supported agen
 - [GitHub Copilot](https://github.com/features/copilot) (`copilot` CLI)
 - [Codex](https://github.com/openai/codex) (`codex` CLI)
 - [Gemini CLI](https://github.com/google-gemini/gemini-cli) (`gemini` CLI)
-- [Sapling](https://github.com/nichochar/sapling) (`sp` CLI)
+- [Sapling](https://github.com/jayminwest/sapling) (`sp` CLI)
+- [OpenCode](https://opencode.ai) (`opencode` CLI)
 
 ```bash
 bun install -g @os-eco/overstory-cli
@@ -282,7 +283,7 @@ overstory/
     metrics/                      SQLite metrics + pricing + transcript parsing
     doctor/                       Health check modules (11 checks)
     insights/                     Session insight analyzer for auto-expertise
-    runtimes/                     AgentRuntime abstraction (registry + adapters: Claude, Pi, Copilot, Codex, Gemini, Sapling)
+    runtimes/                     AgentRuntime abstraction (registry + adapters: Claude, Pi, Copilot, Codex, Gemini, Sapling, OpenCode)
     tracker/                      Pluggable task tracker (beads + seeds backends)
     mulch/                        mulch client (programmatic API + CLI wrapper)
     e2e/                          End-to-end lifecycle tests

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@os-eco/overstory-cli",
-	"version": "0.8.3",
+	"version": "0.8.5",
 	"description": "Multi-agent orchestration for AI coding agents — spawn workers in git worktrees via tmux, coordinate through SQLite mail, merge with tiered conflict resolution. Pluggable runtime adapters for Claude Code, Pi, and more.",
 	"author": "Jaymin West",
 	"license": "MIT",

package/src/agents/manifest.test.ts

@@ -551,13 +551,17 @@ describe("resolveModel", () => {
 
 	test("returns manifest model when no config override", () => {
 		const config = makeConfig();
-		expect(resolveModel(config, baseManifest, "coordinator", "haiku")).toEqual({ model: "opus" });
+		expect(resolveModel(config, baseManifest, "coordinator", "haiku")).toEqual({
+			model: "opus",
+			isExplicitOverride: false,
+		});
 	});
 
 	test("config override takes precedence over manifest", () => {
 		const config = makeConfig({ coordinator: "sonnet" });
 		expect(resolveModel(config, baseManifest, "coordinator", "haiku")).toEqual({
 			model: "sonnet",
+			isExplicitOverride: true,
 		});
 	});
 
@@ -565,12 +569,16 @@ describe("resolveModel", () => {
 		const config = makeConfig();
 		expect(resolveModel(config, baseManifest, "unknown-role", "haiku")).toEqual({
 			model: "haiku",
+			isExplicitOverride: false,
 		});
 	});
 
 	test("config override works for roles not in manifest", () => {
 		const config = makeConfig({ supervisor: "opus" });
-		expect(resolveModel(config, baseManifest, "supervisor", "sonnet")).toEqual({ model: "opus" });
+		expect(resolveModel(config, baseManifest, "supervisor", "sonnet")).toEqual({
+			model: "opus",
+			isExplicitOverride: true,
+		});
 	});
 
 	test("returns gateway env for provider-prefixed model", () => {
@@ -592,6 +600,7 @@ describe("resolveModel", () => {
 				ANTHROPIC_API_KEY: "",
 				ANTHROPIC_DEFAULT_SONNET_MODEL: "openai/gpt-5.3",
 			},
+			isExplicitOverride: true,
 		});
 	});
 
@@ -618,6 +627,7 @@ describe("resolveModel", () => {
 					ANTHROPIC_DEFAULT_SONNET_MODEL: "openai/gpt-5.3",
 					ANTHROPIC_AUTH_TOKEN: "test-token-123",
 				},
+				isExplicitOverride: true,
 			});
 		} finally {
 			if (savedEnv === undefined) {
@@ -631,7 +641,7 @@ describe("resolveModel", () => {
 	test("unknown provider falls through to model as-is", () => {
 		const config = makeConfig({ coordinator: "unknown-provider/some-model" });
 		const result = resolveModel(config, baseManifest, "coordinator", "opus");
-		expect(result).toEqual({ model: "unknown-provider/some-model" });
+		expect(result).toEqual({ model: "unknown-provider/some-model", isExplicitOverride: true });
 	});
 
 	test("native provider returns model string without env", () => {
@@ -640,7 +650,7 @@ describe("resolveModel", () => {
 			{ "native-gw": { type: "native" } },
 		);
 		const result = resolveModel(config, baseManifest, "coordinator", "opus");
-		expect(result).toEqual({ model: "native-gw/claude-3-5-sonnet" });
+		expect(result).toEqual({ model: "native-gw/claude-3-5-sonnet", isExplicitOverride: true });
 	});
 
 	test("handles deeply nested model ID (slashes in model name)", () => {
@@ -676,6 +686,18 @@ describe("resolveModel", () => {
 		expect(result.model).toBe("sonnet");
 		expect(result.env?.ANTHROPIC_DEFAULT_SONNET_MODEL).toBe("org/model/version");
 	});
+
+	test("resolveModel sets isExplicitOverride true when config.models has override", () => {
+		const config = makeConfig({ builder: "opus" });
+		const result = resolveModel(config, baseManifest, "builder", "haiku");
+		expect(result.isExplicitOverride).toBe(true);
+	});
+
+	test("resolveModel sets isExplicitOverride false when using manifest default", () => {
+		const config = makeConfig();
+		const result = resolveModel(config, baseManifest, "coordinator", "haiku");
+		expect(result.isExplicitOverride).toBe(false);
+	});
 });
 
 describe("expandAliasFromEnv", () => {
@@ -783,7 +805,10 @@ describe("resolveModel env var expansion", () => {
 		process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL = "us.anthropic.claude-3-5-haiku-20241022-v1:0";
 		try {
 			const result = resolveModel(makeConfig(), baseManifest, "scout", "sonnet");
-			expect(result).toEqual({ model: "us.anthropic.claude-3-5-haiku-20241022-v1:0" });
+			expect(result).toEqual({
+				model: "us.anthropic.claude-3-5-haiku-20241022-v1:0",
+				isExplicitOverride: false,
+			});
 		} finally {
 			if (saved === undefined) {
 				delete process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
@@ -798,7 +823,7 @@ describe("resolveModel env var expansion", () => {
 		delete process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
 		try {
 			const result = resolveModel(makeConfig(), baseManifest, "scout", "sonnet");
-			expect(result).toEqual({ model: "haiku" });
+			expect(result).toEqual({ model: "haiku", isExplicitOverride: false });
 		} finally {
 			if (saved !== undefined) {
 				process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL = saved;
@@ -813,7 +838,7 @@ describe("resolveModel env var expansion", () => {
 			// Config overrides to a direct model string (not an alias)
 			const config = makeConfig({ builder: "claude-3-5-sonnet-20241022" });
 			const result = resolveModel(config, baseManifest, "builder", "haiku");
-			expect(result).toEqual({ model: "claude-3-5-sonnet-20241022" });
+			expect(result).toEqual({ model: "claude-3-5-sonnet-20241022", isExplicitOverride: true });
 		} finally {
 			if (saved === undefined) {
 				delete process.env.ANTHROPIC_DEFAULT_SONNET_MODEL;
@@ -829,7 +854,7 @@ describe("resolveModel env var expansion", () => {
 		try {
 			const config = makeConfig({ scout: "opus" });
 			const result = resolveModel(config, baseManifest, "scout", "haiku");
-			expect(result).toEqual({ model: "bedrock-opus-id" });
+			expect(result).toEqual({ model: "bedrock-opus-id", isExplicitOverride: true });
 		} finally {
 			if (saved === undefined) {
 				delete process.env.ANTHROPIC_DEFAULT_OPUS_MODEL;

package/src/agents/manifest.ts

@@ -353,10 +353,11 @@ export function resolveModel(
 ): ResolvedModel {
 	const configModel = config.models[role];
 	const rawModel = configModel ?? manifest.agents[role]?.model ?? fallback;
+	const isExplicitOverride = configModel !== undefined;
 
 	// Simple alias — expand via env var if set (e.g. ANTHROPIC_DEFAULT_SONNET_MODEL)
 	if (MODEL_ALIASES.has(rawModel)) {
-		return { model: expandAliasFromEnv(rawModel) };
+		return { model: expandAliasFromEnv(rawModel), isExplicitOverride };
 	}
 
 	// Provider-prefixed: split on first "/" to get provider name and model ID
@@ -366,10 +367,10 @@ export function resolveModel(
 		const modelId = rawModel.substring(slashIdx + 1);
 		const providerEnv = resolveProviderEnv(providerName, modelId, config.providers);
 		if (providerEnv) {
-			return { model: DEFAULT_GATEWAY_ALIAS, env: providerEnv };
+			return { model: DEFAULT_GATEWAY_ALIAS, env: providerEnv, isExplicitOverride };
 		}
 	}
 
 	// Unknown format — return as-is (may be a direct model string)
-	return { model: rawModel };
+	return { model: rawModel, isExplicitOverride };
 }

package/src/commands/agents.ts

@@ -10,7 +10,7 @@ import { loadConfig } from "../config.ts";
 import { ValidationError } from "../errors.ts";
 import { jsonOutput } from "../json.ts";
 import { accent, color } from "../logging/color.ts";
-import { getRuntime } from "../runtimes/registry.ts";
+import { getAllRuntimes, getRuntime } from "../runtimes/registry.ts";
 import { openSessionStore } from "../sessions/compat.ts";
 import { type AgentSession, SUPPORTED_CAPABILITIES } from "../types.ts";
 
@@ -30,12 +30,10 @@ export interface DiscoveredAgent {
 	lastActivity: string;
 }
 
-/** Known instruction file paths, tried in order until one exists. */
-const KNOWN_INSTRUCTION_PATHS = [
-	join(".claude", "CLAUDE.md"), // Claude Code, Pi
-	"AGENTS.md", // Codex (future)
-	"GEMINI.md", // Gemini CLI
-];
+/** Build the list of known instruction file paths from all registered runtimes. */
+function getKnownInstructionPaths(): string[] {
+	return [...new Set(getAllRuntimes().map((r) => r.instructionPath))];
+}
 
 /**
  * Extract file scope from an agent's overlay instruction file.
@@ -52,9 +50,10 @@ export async function extractFileScope(
 ): Promise<string[]> {
 	try {
 		let content: string | null = null;
+		const knownPaths = getKnownInstructionPaths();
 		const pathsToTry = runtimeInstructionPath
-			? [runtimeInstructionPath, ...KNOWN_INSTRUCTION_PATHS]
-			: KNOWN_INSTRUCTION_PATHS;
+			? [runtimeInstructionPath, ...knownPaths]
+			: knownPaths;
 		for (const relPath of pathsToTry) {
 			const overlayPath = join(worktreePath, relPath);
 			const overlayFile = Bun.file(overlayPath);

package/src/commands/coordinator.ts

@@ -363,7 +363,7 @@ async function startCoordinator(
 		);
 		const manifest = await manifestLoader.load();
 		const resolvedModel = resolveModel(config, manifest, "coordinator", "opus");
-		const runtime = getRuntime(undefined, config);
+		const runtime = getRuntime(undefined, config, "coordinator");
 
 		// Deploy hooks to the project root so the coordinator gets event logging,
 		// mail check --inject, and activity tracking via the standard hook pipeline.

package/src/commands/costs.ts

@@ -14,9 +14,11 @@ 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 { estimateCost } from "../metrics/pricing.ts";
 import { createMetricsStore } from "../metrics/store.ts";
-import { estimateCost, parseTranscriptUsage } from "../metrics/transcript.ts";
+import { parseTranscriptUsage } from "../metrics/transcript.ts";
 import { getRuntime } from "../runtimes/registry.ts";
+import type { AgentRuntime } from "../runtimes/types.ts";
 import { openSessionStore } from "../sessions/compat.ts";
 import type { SessionMetrics } from "../types.ts";
 
@@ -43,41 +45,21 @@ function padLeft(str: string, width: number): string {
 	return str.length >= width ? str : " ".repeat(width - str.length) + str;
 }
 
-/**
- * Resolve the transcript directory for a given runtime and project root.
- *
- * @param runtimeId - The runtime identifier (e.g. "claude")
- * @param projectRoot - Absolute path to the project root
- * @returns Absolute path to the transcript directory, or null if not supported
- */
-function getTranscriptDir(runtimeId: string, projectRoot: string): string | null {
-	const homeDir = process.env.HOME ?? "";
-	if (homeDir.length === 0) return null;
-	switch (runtimeId) {
-		case "claude": {
-			const projectKey = projectRoot.replace(/\//g, "-");
-			return join(homeDir, ".claude", "projects", projectKey);
-		}
-		default:
-			return null;
-	}
-}
-
 /**
  * Discover the orchestrator's transcript JSONL file for the given runtime.
  *
  * Scans the runtime-specific transcript directory for JSONL files and returns
  * the most recently modified one, corresponding to the current orchestrator session.
  *
- * @param runtimeId - The runtime identifier (e.g. "claude")
+ * @param runtime - The agent runtime adapter
  * @param projectRoot - Absolute path to the project root
  * @returns Absolute path to the most recent transcript, or null if none found
  */
 async function discoverOrchestratorTranscript(
-	runtimeId: string,
+	runtime: AgentRuntime,
 	projectRoot: string,
 ): Promise<string | null> {
-	const transcriptDir = getTranscriptDir(runtimeId, projectRoot);
+	const transcriptDir = runtime.getTranscriptDir(projectRoot);
 	if (transcriptDir === null) return null;
 
 	let entries: string[];
@@ -292,7 +274,7 @@ async function executeCosts(opts: CostsOpts): Promise<void> {
 	// Handle --self flag (early return for self-scan)
 	if (self) {
 		const runtime = getRuntime(undefined, config);
-		const transcriptPath = await discoverOrchestratorTranscript(runtime.id, config.project.root);
+		const transcriptPath = await discoverOrchestratorTranscript(runtime, config.project.root);
 		if (!transcriptPath) {
 			if (json) {
 				jsonError("costs", `No transcript found for runtime '${runtime.id}'`);