@os-eco/overstory-cli 0.6.6 → 0.6.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@os-eco/overstory-cli",
-	"version": "0.6.6",
+	"version": "0.6.7",
 	"description": "Multi-agent orchestration for Claude Code — spawn worker agents in git worktrees via tmux, coordinate through SQLite mail, merge with tiered conflict resolution",
 	"author": "Jaymin West",
 	"license": "MIT",

package/src/commands/coordinator.ts

@@ -282,7 +282,7 @@ async function startCoordinator(
 
 	if (isRunningAsRoot()) {
 		throw new AgentError(
-			"Cannot spawn agents as root (UID 0). The claude CLI rejects --dangerously-skip-permissions when run as root, causing the tmux session to die immediately. Run overstory as a non-root user.",
+			"Cannot spawn agents as root (UID 0). The claude CLI rejects --permission-mode bypassPermissions when run as root, causing the tmux session to die immediately. Run overstory as a non-root user.",
 		);
 	}
 
@@ -357,7 +357,7 @@ async function startCoordinator(
 		// (overstory-gaio, overstory-0kwf).
 		const agentDefPath = join(projectRoot, ".overstory", "agent-defs", "coordinator.md");
 		const agentDefFile = Bun.file(agentDefPath);
-		let claudeCmd = `claude --model ${model} --dangerously-skip-permissions`;
+		let claudeCmd = `claude --model ${model} --permission-mode bypassPermissions`;
 		if (await agentDefFile.exists()) {
 			const agentDef = await agentDefFile.text();
 			// Single-quote the content for safe shell expansion (only escape single quotes)
@@ -417,7 +417,7 @@ async function startCoordinator(
 		await tmux.sendKeys(tmuxSession, beacon);
 
 		// Follow-up Enters with increasing delays to ensure submission
-		for (const delay of [1_000, 2_000]) {
+		for (const delay of [1_000, 2_000, 3_000, 5_000]) {
 			await Bun.sleep(delay);
 			await tmux.sendKeys(tmuxSession, "");
 		}

package/src/commands/monitor.ts

@@ -67,7 +67,7 @@ async function startMonitor(opts: { json: boolean; attach: boolean }): Promise<v
 
 	if (isRunningAsRoot()) {
 		throw new AgentError(
-			"Cannot spawn agents as root (UID 0). The claude CLI rejects --dangerously-skip-permissions when run as root, causing the tmux session to die immediately. Run overstory as a non-root user.",
+			"Cannot spawn agents as root (UID 0). The claude CLI rejects --permission-mode bypassPermissions when run as root, causing the tmux session to die immediately. Run overstory as a non-root user.",
 		);
 	}
 
@@ -137,7 +137,7 @@ async function startMonitor(opts: { json: boolean; attach: boolean }): Promise<v
 		// Spawn tmux session at project root with Claude Code (interactive mode).
 		const agentDefPath = join(projectRoot, ".overstory", "agent-defs", "monitor.md");
 		const agentDefFile = Bun.file(agentDefPath);
-		let claudeCmd = `claude --model ${model} --dangerously-skip-permissions`;
+		let claudeCmd = `claude --model ${model} --permission-mode bypassPermissions`;
 		if (await agentDefFile.exists()) {
 			const agentDef = await agentDefFile.text();
 			const escaped = agentDef.replace(/'/g, "'\\''");

package/src/commands/sling.ts

@@ -308,7 +308,7 @@ export async function slingCommand(taskId: string, opts: SlingOptions): Promise<
 
 	if (isRunningAsRoot()) {
 		throw new AgentError(
-			"Cannot spawn agents as root (UID 0). The claude CLI rejects --dangerously-skip-permissions when run as root, causing the tmux session to die immediately. Run overstory as a non-root user.",
+			"Cannot spawn agents as root (UID 0). The claude CLI rejects --permission-mode bypassPermissions when run as root, causing the tmux session to die immediately. Run overstory as a non-root user.",
 			{ agentName: name },
 		);
 	}
@@ -614,7 +614,7 @@ export async function slingCommand(taskId: string, opts: SlingOptions): Promise<
 		// 12. Create tmux session running claude in interactive mode
 		const tmuxSessionName = `overstory-${config.project.name}-${name}`;
 		const { model, env } = resolveModel(config, manifest, capability, agentDef.model);
-		const claudeCmd = `claude --model ${model} --dangerously-skip-permissions`;
+		const claudeCmd = `claude --model ${model} --permission-mode bypassPermissions`;
 		const pid = await createSession(tmuxSessionName, worktreePath, claudeCmd, {
 			...env,
 			OVERSTORY_AGENT_NAME: name,
@@ -673,7 +673,7 @@ export async function slingCommand(taskId: string, opts: SlingOptions): Promise<
 		// 13c. Follow-up Enters with increasing delays to ensure submission.
 		// Claude Code's TUI may consume early Enters during late initialization
 		// (overstory-yhv6). An Enter on an empty input line is harmless.
-		for (const delay of [1_000, 2_000]) {
+		for (const delay of [1_000, 2_000, 3_000, 5_000]) {
 			await Bun.sleep(delay);
 			await sendKeys(tmuxSessionName, "");
 		}

package/src/commands/status.ts

@@ -9,6 +9,7 @@ import { join } from "node:path";
 import { Command } from "commander";
 import { loadConfig } from "../config.ts";
 import { ValidationError } from "../errors.ts";
+import { color } from "../logging/color.ts";
 import { createMailStore } from "../mail/store.ts";
 import { createMergeQueue } from "../merge/queue.ts";
 import { createMetricsStore } from "../metrics/store.ts";
@@ -254,15 +255,15 @@ export function printStatus(data: StatusData): void {
 	const now = Date.now();
 	const w = process.stdout.write.bind(process.stdout);
 
-	w("📊 Overstory Status\n");
+	w("Overstory Status\n");
 	w(`${"═".repeat(60)}\n\n`);
 	if (data.currentRunId) {
-		w(`🏃 Run: ${data.currentRunId}\n`);
+		w(`Run: ${data.currentRunId}\n`);
 	}
 
 	// Active agents
 	const active = data.agents.filter((a) => a.state !== "zombie" && a.state !== "completed");
-	w(`🤖 Agents: ${active.length} active\n`);
+	w(`Agents: ${active.length} active\n`);
 	if (active.length > 0) {
 		const tmuxSessionNames = new Set(data.tmuxSessions.map((s) => s.name));
 		for (const agent of active) {
@@ -272,7 +273,7 @@ export function printStatus(data: StatusData): void {
 					: now;
 			const duration = formatDuration(endTime - new Date(agent.startedAt).getTime());
 			const tmuxAlive = tmuxSessionNames.has(agent.tmuxSession);
-			const aliveMarker = tmuxAlive ? "●" : "○";
+			const aliveMarker = tmuxAlive ? color.green(">") : color.red("x");
 			w(`   ${aliveMarker} ${agent.agentName} [${agent.capability}] `);
 			w(`${agent.state} | ${agent.taskId} | ${duration}\n`);
 
@@ -291,7 +292,7 @@ export function printStatus(data: StatusData): void {
 
 	// Worktrees
 	const overstoryWts = data.worktrees.filter((wt) => wt.branch.startsWith("overstory/"));
-	w(`🌳 Worktrees: ${overstoryWts.length}\n`);
+	w(`Worktrees: ${overstoryWts.length}\n`);
 	for (const wt of overstoryWts) {
 		w(`   ${wt.branch}\n`);
 	}
@@ -301,13 +302,13 @@ export function printStatus(data: StatusData): void {
 	w("\n");
 
 	// Mail
-	w(`📬 Mail: ${data.unreadMailCount} unread\n`);
+	w(`Mail: ${data.unreadMailCount} unread\n`);
 
 	// Merge queue
-	w(`🔀 Merge queue: ${data.mergeQueueCount} pending\n`);
+	w(`Merge queue: ${data.mergeQueueCount} pending\n`);
 
 	// Metrics
-	w(`📈 Sessions recorded: ${data.recentMetricsCount}\n`);
+	w(`Sessions recorded: ${data.recentMetricsCount}\n`);
 }
 
 interface StatusOpts {
@@ -347,7 +348,9 @@ async function executeStatus(opts: StatusOpts): Promise<void> {
 	}
 
 	if (watch) {
-		process.stderr.write("⚠️  --watch is deprecated. Use 'ov dashboard' for live monitoring.\n\n");
+		process.stderr.write(
+			"Warning: --watch is deprecated. Use 'ov dashboard' for live monitoring.\n\n",
+		);
 		// Polling loop (kept for one release cycle)
 		while (true) {
 			// Clear screen

package/src/commands/supervisor.ts

@@ -92,7 +92,7 @@ async function startSupervisor(opts: {
 
 	if (isRunningAsRoot()) {
 		throw new AgentError(
-			"Cannot spawn agents as root (UID 0). The claude CLI rejects --dangerously-skip-permissions when run as root, causing the tmux session to die immediately. Run overstory as a non-root user.",
+			"Cannot spawn agents as root (UID 0). The claude CLI rejects --permission-mode bypassPermissions when run as root, causing the tmux session to die immediately. Run overstory as a non-root user.",
 		);
 	}
 
@@ -165,7 +165,7 @@ async function startSupervisor(opts: {
 		const tmuxSession = `overstory-${config.project.name}-supervisor-${opts.name}`;
 		const agentDefPath = join(projectRoot, ".overstory", "agent-defs", "supervisor.md");
 		const agentDefFile = Bun.file(agentDefPath);
-		let claudeCmd = `claude --model ${model} --dangerously-skip-permissions`;
+		let claudeCmd = `claude --model ${model} --permission-mode bypassPermissions`;
 		if (await agentDefFile.exists()) {
 			const agentDef = await agentDefFile.text();
 			const escaped = agentDef.replace(/'/g, "'\\''");
@@ -190,7 +190,7 @@ async function startSupervisor(opts: {
 		await sendKeys(tmuxSession, beacon);
 
 		// Follow-up Enters with increasing delays to ensure submission
-		for (const delay of [1_000, 2_000]) {
+		for (const delay of [1_000, 2_000, 3_000, 5_000]) {
 			await Bun.sleep(delay);
 			await sendKeys(tmuxSession, "");
 		}

package/src/index.ts

@@ -42,7 +42,7 @@ import { createWorktreeCommand } from "./commands/worktree.ts";
 import { OverstoryError, WorktreeError } from "./errors.ts";
 import { setQuiet } from "./logging/color.ts";
 
-const VERSION = "0.6.6";
+const VERSION = "0.6.7";
 
 const COMMANDS = [
 	"agents",

package/src/worktree/tmux.test.ts

@@ -957,7 +957,7 @@ describe("waitForTuiReady", () => {
 	});
 
 	test("returns true immediately when pane has content on first poll", async () => {
-		spawnSpy.mockImplementation(() => mockSpawnResult("Claude Code ready", "", 0));
+		spawnSpy.mockImplementation(() => mockSpawnResult('Try "help" to get started', "", 0));
 
 		const ready = await waitForTuiReady("overstory-agent", 5_000, 500);
 
@@ -977,7 +977,7 @@ describe("waitForTuiReady", () => {
 					return mockSpawnResult("", "", 0);
 				}
 				// 4th poll: content appears
-				return mockSpawnResult("Welcome to Claude Code!", "", 0);
+				return mockSpawnResult("Welcome to Claude Code!\n\n\u276f", "", 0);
 			}
 			// has-session: session is alive throughout
 			return mockSpawnResult("", "", 0);
@@ -1011,7 +1011,7 @@ describe("waitForTuiReady", () => {
 
 	test("uses default timeout and poll interval", async () => {
 		// Return content immediately
-		spawnSpy.mockImplementation(() => mockSpawnResult("ready", "", 0));
+		spawnSpy.mockImplementation(() => mockSpawnResult('Try "help"', "", 0));
 
 		const ready = await waitForTuiReady("overstory-agent");
 

package/src/worktree/tmux.ts

@@ -447,13 +447,13 @@ export async function capturePaneContent(name: string, lines = 50): Promise<stri
  */
 export async function waitForTuiReady(
 	name: string,
-	timeoutMs = 15_000,
+	timeoutMs = 30_000,
 	pollIntervalMs = 500,
 ): Promise<boolean> {
 	const maxAttempts = Math.ceil(timeoutMs / pollIntervalMs);
 	for (let i = 0; i < maxAttempts; i++) {
 		const content = await capturePaneContent(name);
-		if (content !== null) {
+		if (content !== null && (content.includes("\u276f") || content.includes('Try "'))) {
 			return true;
 		}
 		// Check if session died — no point waiting if it's gone