@os-eco/overstory-cli 0.7.0 → 0.7.2

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.7.0";
+export const VERSION = "0.7.2";
 
 const rawArgs = process.argv.slice(2);
 

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);

package/src/runtimes/claude.test.ts

@@ -611,6 +611,6 @@ describe("ClaudeRuntime integration: registry resolves 'claude' as default", ()
 	test("getRuntime rejects unknown runtimes", async () => {
 		const { getRuntime } = await import("./registry.ts");
 		expect(() => getRuntime("codex")).toThrow('Unknown runtime: "codex"');
-		expect(() => getRuntime("pi")).toThrow('Unknown runtime: "pi"');
+		expect(() => getRuntime("opencode")).toThrow('Unknown runtime: "opencode"');
 	});
 });