@os-eco/overstory-cli 0.8.6 → 0.8.7

package/src/runtimes/claude.test.ts

@@ -220,14 +220,16 @@ describe("ClaudeRuntime", () => {
 			expect(state).toEqual({ phase: "ready" });
 		});
 
-		test("returns ready for prompt indicator + shift+tab", () => {
+		test("returns loading for prompt indicator + shift+tab (no bypass permissions)", () => {
+			// shift+tab appears in ALL Claude Code sessions — it must NOT trigger ready
 			const state = runtime.detectReady("Claude Code\n\u276f\nshift+tab to chat");
-			expect(state).toEqual({ phase: "ready" });
+			expect(state).toEqual({ phase: "loading" });
 		});
 
-		test('returns ready for Try " + shift+tab', () => {
+		test('returns loading for Try " + shift+tab (no bypass permissions)', () => {
+			// False-positive scenario: shift+tab alone is not a reliable readiness signal
 			const state = runtime.detectReady('Try "help"\nshift+tab');
-			expect(state).toEqual({ phase: "ready" });
+			expect(state).toEqual({ phase: "loading" });
 		});
 
 		test("returns dialog for trust dialog", () => {
@@ -235,6 +237,20 @@ describe("ClaudeRuntime", () => {
 			expect(state).toEqual({ phase: "dialog", action: "Enter" });
 		});
 
+		test("returns dialog for bypass permissions confirmation", () => {
+			const state = runtime.detectReady(
+				"WARNING: Claude Code running in Bypass Permissions mode\n❯ 1. No, exit\n2. Yes, I accept",
+			);
+			expect(state).toEqual({ phase: "dialog", action: "type:2" });
+		});
+
+		test("bypass permissions confirmation takes precedence over ready indicators", () => {
+			const state = runtime.detectReady(
+				"WARNING: Claude Code running in Bypass Permissions mode\n❯ 1. No, exit\n2. Yes, I accept\nbypass permissions",
+			);
+			expect(state).toEqual({ phase: "dialog", action: "type:2" });
+		});
+
 		test("trust dialog takes precedence over ready indicators", () => {
 			const state = runtime.detectReady("trust this folder\n\u276f\nbypass permissions");
 			expect(state).toEqual({ phase: "dialog", action: "Enter" });
@@ -577,9 +593,10 @@ describe("ClaudeRuntime integration: detectReady matches pre-refactor tmux behav
 		expect(state.phase).toBe("ready");
 	});
 
-	test("ready: 'Try \"help\"' + 'shift+tab'", () => {
+	test("loading: 'Try \"help\"' + 'shift+tab' (no bypass permissions — false-positive fix)", () => {
+		// shift+tab appears in all Claude Code sessions, must not trigger ready without bypass permissions
 		const state = runtime.detectReady('Try "help"\nshift+tab');
-		expect(state.phase).toBe("ready");
+		expect(state.phase).toBe("loading");
 	});
 
 	test("not ready: only prompt (no status bar)", () => {
@@ -597,6 +614,14 @@ describe("ClaudeRuntime integration: detectReady matches pre-refactor tmux behav
 		expect(state.phase).toBe("dialog");
 		expect((state as { phase: "dialog"; action: string }).action).toBe("Enter");
 	});
+
+	test("dialog: bypass permissions confirmation", () => {
+		const state = runtime.detectReady(
+			"WARNING: Claude Code running in Bypass Permissions mode\n❯ 1. No, exit\n2. Yes, I accept",
+		);
+		expect(state.phase).toBe("dialog");
+		expect((state as { phase: "dialog"; action: string }).action).toBe("type:2");
+	});
 });
 
 describe("ClaudeRuntime integration: buildEnv matches pre-refactor env injection", () => {
@@ -652,6 +677,6 @@ describe("ClaudeRuntime integration: registry resolves 'claude' as default", ()
 	test("getRuntime rejects unknown runtimes", async () => {
 		const { getRuntime } = await import("./registry.ts");
 		expect(() => getRuntime("aider")).toThrow('Unknown runtime: "aider"');
-		expect(() => getRuntime("cursor")).toThrow('Unknown runtime: "cursor"');
+		expect(() => getRuntime("nonexistent")).toThrow('Unknown runtime: "nonexistent"');
 	});
 });

package/src/runtimes/claude.ts

@@ -31,6 +31,9 @@ export class ClaudeRuntime implements AgentRuntime {
 	/** Unique identifier for this runtime. */
 	readonly id = "claude";
 
+	/** Stability level. Claude Code is the primary runtime. */
+	readonly stability = "stable" as const;
+
 	/** Relative path to the instruction file within a worktree. */
 	readonly instructionPath = ".claude/CLAUDE.md";
 
@@ -136,14 +139,25 @@ export class ClaudeRuntime implements AgentRuntime {
 	 *
 	 * Detection phases:
 	 * - Trust dialog: "trust this folder" detected → `{ phase: "dialog", action: "Enter" }`
-	 * - Ready: prompt indicator (❯ or 'Try "') AND status bar ("bypass permissions"
-	 *   or "shift+tab") both present → `{ phase: "ready" }`
+	 * - Ready: prompt indicator (❯ or 'Try "') AND status bar ("bypass permissions")
+	 *   both present → `{ phase: "ready" }`
 	 * - Otherwise → `{ phase: "loading" }`
 	 *
 	 * @param paneContent - Captured tmux pane content to analyze
 	 * @returns Current readiness phase
 	 */
 	detectReady(paneContent: string): ReadyState {
+		// Claude Code v2.1.71+ shows a dedicated bypass confirmation screen.
+		// It already contains both a prompt marker and the phrase "bypass permissions",
+		// so it must be detected before the normal ready heuristics.
+		if (
+			paneContent.includes("WARNING: Claude Code running in Bypass Permissions mode") &&
+			paneContent.includes("1. No, exit") &&
+			paneContent.includes("2. Yes, I accept")
+		) {
+			return { phase: "dialog", action: "type:2" };
+		}
+
 		// Trust dialog takes precedence — it replaces the normal TUI temporarily.
 		// The caller should send the action key to dismiss it.
 		if (paneContent.includes("trust this folder")) {
@@ -155,8 +169,9 @@ export class ClaudeRuntime implements AgentRuntime {
 		const hasPrompt = paneContent.includes("\u276f") || paneContent.includes('Try "');
 
 		// Phase 2: status bar text confirms full TUI render.
-		const hasStatusBar =
-			paneContent.includes("bypass permissions") || paneContent.includes("shift+tab");
+		// Only match 'bypass permissions' — 'shift+tab' appears in ALL Claude Code sessions
+		// regardless of permission mode and would cause false-positive ready detection.
+		const hasStatusBar = paneContent.includes("bypass permissions");
 
 		if (hasPrompt && hasStatusBar) {
 			return { phase: "ready" };

package/src/runtimes/codex.test.ts

@@ -151,6 +151,19 @@ describe("CodexRuntime", () => {
 			expect(cmd).not.toContain("This inline content should be ignored");
 		});
 
+		test("sharedWritableDirs are exposed with --add-dir", () => {
+			const opts: SpawnOpts = {
+				model: "gpt-5-codex",
+				permissionMode: "bypass",
+				cwd: "/tmp/worktree",
+				sharedWritableDirs: ["/project/.overstory", "/project/.git"],
+				env: {},
+			};
+			const cmd = runtime.buildSpawnCommand(opts);
+			expect(cmd).toContain("--add-dir '/project/.overstory'");
+			expect(cmd).toContain("--add-dir '/project/.git'");
+		});
+
 		test("without appendSystemPrompt uses default AGENTS.md prompt", () => {
 			const opts: SpawnOpts = {
 				model: "gpt-5-codex",

package/src/runtimes/codex.ts

@@ -37,6 +37,9 @@ export class CodexRuntime implements AgentRuntime {
 	/** Unique identifier for this runtime. */
 	readonly id = "codex";
 
+	/** Stability level. Codex adapter is experimental — not fully validated. */
+	readonly stability = "experimental" as const;
+
 	/** Relative path to the instruction file within a worktree. */
 	readonly instructionPath = "AGENTS.md";
 
@@ -46,6 +49,16 @@ export class CodexRuntime implements AgentRuntime {
 	 */
 	private static readonly MANIFEST_ALIASES = new Set(["sonnet", "opus", "haiku"]);
 
+	/**
+	 * Escape a directory path for use in a single-quoted shell argument.
+	 *
+	 * @param path - Absolute directory path
+	 * @returns POSIX shell-safe path string
+	 */
+	private static shellEscape(path: string): string {
+		return path.replace(/'/g, "'\\''");
+	}
+
 	/**
 	 * Build the shell command string to spawn a Codex agent in a tmux pane.
 	 *
@@ -68,16 +81,19 @@ export class CodexRuntime implements AgentRuntime {
 		if (!CodexRuntime.MANIFEST_ALIASES.has(opts.model)) {
 			cmd += ` --model ${opts.model}`;
 		}
+		for (const dir of opts.sharedWritableDirs ?? []) {
+			cmd += ` --add-dir '${CodexRuntime.shellEscape(dir)}'`;
+		}
 
 		if (opts.appendSystemPromptFile) {
 			// Read role definition from file at shell expansion time — avoids tmux
 			// IPC message size limits. Append the "read AGENTS.md" instruction.
-			const escaped = opts.appendSystemPromptFile.replace(/'/g, "'\\''");
+			const escaped = CodexRuntime.shellEscape(opts.appendSystemPromptFile);
 			cmd += ` "$(cat '${escaped}')"' Read AGENTS.md for your task assignment and begin immediately.'`;
 		} else if (opts.appendSystemPrompt) {
 			// Inline role definition + instruction to read AGENTS.md.
 			const prompt = `${opts.appendSystemPrompt}\n\nRead AGENTS.md for your task assignment and begin immediately.`;
-			const escaped = prompt.replace(/'/g, "'\\''");
+			const escaped = CodexRuntime.shellEscape(prompt);
 			cmd += ` '${escaped}'`;
 		} else {
 			cmd += ` 'Read AGENTS.md for your task assignment and begin immediately.'`;

package/src/runtimes/copilot.ts

@@ -28,6 +28,9 @@ export class CopilotRuntime implements AgentRuntime {
 	/** Unique identifier for this runtime. */
 	readonly id = "copilot";
 
+	/** Stability level. Copilot adapter is experimental — not fully validated. */
+	readonly stability = "experimental" as const;
+
 	/** Relative path to the instruction file within a worktree. */
 	readonly instructionPath = ".github/copilot-instructions.md";