@nghyane/arcane 0.1.25 → 0.1.27

package/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 ## [Unreleased]
 
+## [0.1.27] - 2026-03-08
+
+### Fixed
+
+- Fix GitHub tool: typed API interfaces replacing `any`, cache key collision with different media types, 403 rate limit not retried, `retry-after` NaN crash, raw file detection returning `[object Object]` for JSON files
+- Fix bash timeout misreported as "Command aborted" instead of "Command timed out"
+- Fix unhandled promise rejection crash in interactive bash PTY finalization
+- Reorder HTML render pipeline to native-first, avoiding unnecessary network calls to jina.ai
+
+### Changed
+
+- Add GitHub tool guidance to system prompt
+- Remove dead code: `normalizeBashCommand`, `expandSkillUrls`, `BashToolOptions`, `isInteractiveResult`
+
+## [0.1.26] - 2026-03-08
+
+### Fixed
+
+- Improve session search by indexing all user messages instead of only the first
+- Fix quoted phrase parsing in find_thread search queries
+- Sort search results by relevance instead of date
+
+### Removed
+
+- Remove gemini-image and save-memory tools
+
+### Changed
+
+- Rename reviewer-tool.ts to reviewer.ts, subagent-tool.ts to subagent.ts
+- RenderMermaid tool now displays diagram directly in TUI output
+
 ## [0.1.25] - 2026-03-08
 
 ### Added

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@nghyane/arcane",
-	"version": "0.1.25",
+	"version": "0.1.27",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/nghyane/arcane",
 	"author": "Can Bölük",

package/src/exec/bash-executor.ts

@@ -27,6 +27,7 @@ export interface BashResult {
 	output: string;
 	exitCode: number | undefined;
 	cancelled: boolean;
+	timedOut: boolean;
 	truncated: boolean;
 	totalLines: number;
 	totalBytes: number;
@@ -44,11 +45,8 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 	const { shell, env: shellEnv, prefix } = settings.getShellConfig();
 	const snapshotPath = shell.includes("bash") ? await getOrCreateSnapshot(shell, shellEnv) : null;
 
-	// Apply command prefix if configured
 	const prefixedCommand = prefix ? `${prefix} ${command}` : command;
-	const finalCommand = prefixedCommand;
 
-	// Create output sink for truncation and artifact handling
 	const sink = new OutputSink({
 		onChunk: options?.onChunk,
 		artifactPath: options?.artifactPath,
@@ -64,6 +62,7 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 		return {
 			exitCode: undefined,
 			cancelled: true,
+			timedOut: false,
 			...(await sink.dump("Command cancelled")),
 		};
 	}
@@ -96,7 +95,7 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 	try {
 		const runPromise = shellSession.run(
 			{
-				command: finalCommand,
+				command: prefixedCommand,
 				cwd: options?.cwd,
 				env: options?.env ? { ...NON_INTERACTIVE_ENV, ...options.env } : NON_INTERACTIVE_ENV,
 				timeoutMs: options?.timeout,
@@ -121,11 +120,11 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 			return {
 				exitCode: undefined,
 				cancelled: true,
+				timedOut: true,
 				...(await sink.dump(`Command exceeded hard timeout after ${Math.round(hardTimeoutMs / 1000)} seconds`)),
 			};
 		}
 
-		// Handle timeout
 		if (winner.result.timedOut) {
 			const annotation = options?.timeout
 				? `Command timed out after ${Math.round(options.timeout / 1000)} seconds`
@@ -133,25 +132,26 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 			resetSession = true;
 			return {
 				exitCode: undefined,
-				cancelled: true,
+				cancelled: false,
+				timedOut: true,
 				...(await sink.dump(annotation)),
 			};
 		}
 
-		// Handle cancellation
 		if (winner.result.cancelled) {
 			resetSession = true;
 			return {
 				exitCode: undefined,
 				cancelled: true,
+				timedOut: false,
 				...(await sink.dump("Command cancelled")),
 			};
 		}
 
-		// Normal completion
 		return {
 			exitCode: winner.result.exitCode,
 			cancelled: false,
+			timedOut: false,
 			...(await sink.dump()),
 		};
 	} catch (err) {

package/src/modes/controllers/command-controller.ts

@@ -415,9 +415,7 @@ export class CommandController {
 	}
 
 	async handleMemoryCommand(_text: string): Promise<void> {
-		this.ctx.showWarning(
-			"The /memory command has been removed. Use save_memory tool or add facts to AGENTS.md directly.",
-		);
+		this.ctx.showWarning("The /memory command has been removed. Add facts to AGENTS.md directly.");
 	}
 
 	async handleClearCommand(): Promise<void> {

package/src/modes/controllers/selector-controller.ts

@@ -18,7 +18,7 @@ import {
 	setTheme,
 	theme,
 } from "../../theme/theme";
-import { setPreferredImageProvider, setPreferredSearchProvider } from "../../tools";
+import { setPreferredSearchProvider } from "../../tools";
 import { AssistantMessageComponent } from "../components/assistant-message";
 import { ExtensionDashboard } from "../components/extensions";
 import { HistorySearchComponent } from "../components/history-search";
@@ -289,9 +289,6 @@ export class SelectorController {
 					value as "auto" | "exa" | "jina" | "zai" | "perplexity" | "anthropic" | "gemini" | "codex",
 				);
 				break;
-			case "imageProvider":
-				setPreferredImageProvider(value as "auto" | "gemini" | "openrouter");
-				break;
 
 			// All other settings are handled by the definitions (get/set on SettingsManager)
 			// No additional side effects needed

package/src/prompts/system/system-prompt.md

@@ -171,7 +171,7 @@ Best practices:
 
 ### Cross-session Knowledge
 
-Tools: `find_thread`, `read_thread`, `save_memory`
+Tools: `find_thread`, `read_thread`
 **Proactive search triggers** — use `find_thread` when:
 - User mentions past work: "we did this before", "last time", "in a previous session"
 - User asks "what did we do about X" or "how did we solve Y"
@@ -181,7 +181,16 @@ Tools: `find_thread`, `read_thread`, `save_memory`
 - Question is about current session context
 - Generic coding question with no project-specific history
 - User explicitly provides all needed context
-**save_memory**: only when user says "remember this" or states a clear preference. If unsure, ask.
+
+{{#has tools "github"}}
+### GitHub
+
+Tool: `github`
+Use for **remote** GitHub API calls — repos, issues, PRs, commits, file contents, tree listings. Never use for the local repo; use read/grep/explore for local files.
+- **Use `github`** for: reading issues/PRs, listing commits, fetching files from remote repos, searching repos, getting repo metadata.
+- **Use `librarian`** for: cross-repo exploration, understanding architectural patterns, tracing how other projects solve problems.
+- **Avoid `bash gh`** when `github` covers the action — the tool has caching, pagination, and structured output.
+{{/has}}
 
 ### Verification
 Work incrementally. Make a small change, verify it works, then continue. Prefer a sequence of small, validated edits over one large change. Use commands from AGENTS.md or the project's config to verify. Address all errors caused by your changes before yielding.

package/src/sdk.ts

@@ -71,7 +71,6 @@ import {
 	PythonTool,
 	ReadTool,
 	type SubagentContext,
-	setPreferredImageProvider,
 	setPreferredSearchProvider,
 	type Tool,
 	type ToolSession,
@@ -79,7 +78,6 @@ import {
 	warmupLspServers,
 } from "./tools";
 import { ToolContextStore } from "./tools/context";
-import { getGeminiImageTools } from "./tools/gemini-image";
 import { EventBus } from "./utils/event-bus";
 import { time } from "./utils/timings";
 
@@ -559,7 +557,6 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 
 	// Initialize provider preferences from settings
 	setPreferredSearchProvider(settings.get("providers.webSearch") ?? "auto");
-	setPreferredImageProvider(settings.get("providers.image") ?? "auto");
 
 	const sessionManager = options.sessionManager ?? SessionManager.create(cwd);
 	time("sessionManager");
@@ -803,13 +800,6 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		}
 	}
 
-	// Add Gemini image tools if GEMINI_AARCANE_KEY (or GOOGLE_AARCANE_KEY) is available
-	const geminiImageTools = await getGeminiImageTools();
-	time("getGeminiImageTools");
-	if (geminiImageTools.length > 0) {
-		customTools.push(...(geminiImageTools as unknown as CustomTool[]));
-	}
-
 	// Add specialized Exa web search tools if EXA_AARCANE_KEY is available
 	const exaSettings = settings.getGroup("exa");
 	if (exaSettings.enabled && exaSettings.enableSearch) {

package/src/session/session-index.ts

@@ -7,8 +7,7 @@ import { getAgentDir } from "@nghyane/arcane-utils/dirs";
 export interface SessionIndexEntry {
 	sessionId: string;
 	title: string;
-	firstMessage: string;
-	files: string;
+	content: string;
 	cwd: string;
 	createdAt: number;
 	messageCount: number;
@@ -30,6 +29,7 @@ interface SearchRow {
 	snippet: string;
 }
 
+const CONTENT_MAX_LENGTH = 5000;
 const FILE_PATH_PARAMS = new Set(["path", "file", "filePath", "glob", "pattern", "command_working_directory"]);
 
 export class SessionIndex {
@@ -49,46 +49,68 @@ export class SessionIndex {
 PRAGMA journal_mode=WAL;
 PRAGMA synchronous=NORMAL;
 PRAGMA busy_timeout=5000;
+`);
+
+		this.#migrateIfNeeded();
 
+		this.#db.exec(`
 CREATE TABLE IF NOT EXISTS session_index (
     session_id TEXT PRIMARY KEY,
     title TEXT,
-    first_message TEXT,
-    files TEXT,
+    content TEXT,
     cwd TEXT,
     created_at INTEGER,
     message_count INTEGER
 );
 
 CREATE VIRTUAL TABLE IF NOT EXISTS session_fts USING fts5(
-    title, first_message, files,
+    title, content,
     content='session_index', content_rowid='rowid'
 );
 
 CREATE TRIGGER IF NOT EXISTS session_index_ai AFTER INSERT ON session_index BEGIN
-    INSERT INTO session_fts(rowid, title, first_message, files)
-    VALUES (new.rowid, new.title, new.first_message, new.files);
+    INSERT INTO session_fts(rowid, title, content)
+    VALUES (new.rowid, new.title, new.content);
 END;
 
 CREATE TRIGGER IF NOT EXISTS session_index_ad AFTER DELETE ON session_index BEGIN
-    INSERT INTO session_fts(session_fts, rowid, title, first_message, files)
-    VALUES ('delete', old.rowid, old.title, old.first_message, old.files);
+    INSERT INTO session_fts(session_fts, rowid, title, content)
+    VALUES ('delete', old.rowid, old.title, old.content);
 END;
 
 CREATE TRIGGER IF NOT EXISTS session_index_au AFTER UPDATE ON session_index BEGIN
-    INSERT INTO session_fts(session_fts, rowid, title, first_message, files)
-    VALUES ('delete', old.rowid, old.title, old.first_message, old.files);
-    INSERT INTO session_fts(rowid, title, first_message, files)
-    VALUES (new.rowid, new.title, new.first_message, new.files);
+    INSERT INTO session_fts(session_fts, rowid, title, content)
+    VALUES ('delete', old.rowid, old.title, old.content);
+    INSERT INTO session_fts(rowid, title, content)
+    VALUES (new.rowid, new.title, new.content);
 END;
 `);
 
 		this.#upsertStmt = this.#db.prepare(
-			"INSERT OR REPLACE INTO session_index (session_id, title, first_message, files, cwd, created_at, message_count) VALUES (?, ?, ?, ?, ?, ?, ?)",
+			"INSERT OR REPLACE INTO session_index (session_id, title, content, cwd, created_at, message_count) VALUES (?, ?, ?, ?, ?, ?)",
 		);
 		this.#hasStmt = this.#db.prepare("SELECT 1 FROM session_index WHERE session_id = ?");
 	}
 
+	#migrateIfNeeded(): void {
+		try {
+			const row = this.#db.prepare("PRAGMA table_info(session_index)").all() as Array<{ name: string }>;
+			const columns = new Set(row.map(r => r.name));
+			if (columns.has("first_message") || !columns.has("content")) {
+				this.#db.exec(`
+					DROP TRIGGER IF EXISTS session_index_ai;
+					DROP TRIGGER IF EXISTS session_index_ad;
+					DROP TRIGGER IF EXISTS session_index_au;
+					DROP TABLE IF EXISTS session_fts;
+					DROP TABLE IF EXISTS session_index;
+				`);
+				logger.debug("SessionIndex: migrated to schema v2 (dropped old tables)");
+			}
+		} catch (error) {
+			logger.warn("SessionIndex migration check failed", { error: String(error) });
+		}
+	}
+
 	static open(dbPath: string = path.join(getAgentDir(), "session-index.db")): SessionIndex {
 		if (!SessionIndex.#instance) {
 			SessionIndex.#instance = new SessionIndex(dbPath);
@@ -101,8 +123,7 @@ END;
 			this.#upsertStmt.run(
 				entry.sessionId,
 				entry.title,
-				entry.firstMessage,
-				entry.files,
+				entry.content,
 				entry.cwd,
 				entry.createdAt,
 				entry.messageCount,
@@ -139,7 +160,7 @@ END;
 FROM session_fts f
 JOIN session_index si ON si.rowid = f.rowid
 WHERE ${conditions.join(" AND ")}
-ORDER BY si.created_at DESC
+ORDER BY rank
 LIMIT ?`;
 
 		try {
@@ -159,8 +180,8 @@ LIMIT ?`;
 
 	async indexSessionFile(filePath: string): Promise<void> {
 		try {
-			const content = await Bun.file(filePath).text();
-			const entries = parseJsonlLenient<Record<string, unknown>>(content);
+			const raw = await Bun.file(filePath).text();
+			const entries = parseJsonlLenient<Record<string, unknown>>(raw);
 			if (entries.length === 0) return;
 
 			const header = entries.find(e => e.type === "session") as
@@ -168,7 +189,7 @@ LIMIT ?`;
 				| undefined;
 			if (!header?.id) return;
 
-			let firstMessage = "";
+			const userMessages: string[] = [];
 			let messageCount = 0;
 			const fileSet = new Set<string>();
 
@@ -179,8 +200,9 @@ LIMIT ?`;
 
 				messageCount++;
 
-				if (msg.role === "user" && !firstMessage) {
-					firstMessage = extractTextContent(msg.content);
+				if (msg.role === "user") {
+					const text = extractTextContent(msg.content);
+					if (text) userMessages.push(text);
 				}
 
 				if (msg.role === "assistant") {
@@ -188,14 +210,15 @@ LIMIT ?`;
 				}
 			}
 
+			const firstMessage = userMessages[0] ?? "";
 			const title = header.title || firstMessage.slice(0, 100) || "Untitled";
+			const content = [userMessages.join("\n"), [...fileSet].join(" ")].join("\n").slice(0, CONTENT_MAX_LENGTH);
 			const createdAt = header.timestamp ? Math.floor(new Date(header.timestamp).getTime() / 1000) : 0;
 
 			this.upsert({
 				sessionId: header.id,
 				title,
-				firstMessage: firstMessage.slice(0, 500),
-				files: [...fileSet].join(" "),
+				content,
 				cwd: header.cwd || "",
 				createdAt,
 				messageCount,
@@ -283,21 +306,25 @@ LIMIT ?`;
 		return null;
 	}
 
-	#buildFtsQuery(query: string): string | null {
-		const tokens = query
+	#buildFtsQuery(raw: string): string | null {
+		const phrases: string[] = [];
+		const withoutPhrases = raw.replace(/"([^"]+)"/g, (_, phrase: string) => {
+			const trimmed = phrase.trim();
+			if (trimmed) phrases.push(`"${trimmed}"`);
+			return "";
+		});
+
+		const words = withoutPhrases
 			.trim()
 			.split(/\s+/)
-			.map(t => t.trim())
-			.filter(Boolean);
-
-		if (tokens.length === 0) return null;
-
-		return tokens
-			.map(token => {
-				const escaped = token.replace(/"/g, '""');
+			.filter(Boolean)
+			.map(w => {
+				const escaped = w.replace(/"/g, '""');
 				return `"${escaped}"*`;
-			})
-			.join(" ");
+			});
+
+		const parts = [...phrases, ...words];
+		return parts.length > 0 ? parts.join(" ") : null;
 	}
 }
 

package/src/tools/bash-interactive.ts

@@ -303,15 +303,29 @@ export async function runInteractiveBashPty(
 				component.setComplete({ exitCode: run.exitCode, cancelled: run.cancelled, timedOut: run.timedOut });
 				tui.requestRender();
 				void (async () => {
-					await component.flushOutput();
-					await pendingChunks;
-					const summary = await sink.dump();
-					done({
-						exitCode: run.exitCode,
-						cancelled: run.cancelled,
-						timedOut: run.timedOut,
-						...summary,
-					});
+					try {
+						await component.flushOutput();
+						await pendingChunks;
+						const summary = await sink.dump();
+						done({
+							exitCode: run.exitCode,
+							cancelled: run.cancelled,
+							timedOut: run.timedOut,
+							...summary,
+						});
+					} catch {
+						done({
+							exitCode: run.exitCode,
+							cancelled: run.cancelled,
+							timedOut: run.timedOut,
+							output: "",
+							truncated: false,
+							totalLines: 0,
+							totalBytes: 0,
+							outputLines: 0,
+							outputBytes: 0,
+						});
+					}
 				})();
 			};
 			const cols = Math.max(20, tui.terminal.columns - 2);

package/src/tools/bash-interceptor.ts

@@ -82,7 +82,6 @@ export function checkBashInterception(
 	availableTools: string[],
 	rules: BashInterceptorRule[] = DEFAULT_BASH_INTERCEPTOR_RULES,
 ): InterceptionResult {
-	// Normalize command for pattern matching
 	const normalizedCommand = command.trim();
 	const compiled = compileRules(rules);
 

package/src/tools/bash-normalize.ts

@@ -1,72 +1,3 @@
-/**
- * Bash command normalizer - extracts patterns that are better handled natively.
- *
- * Detects and extracts:
- * - `| head -n N` / `| head -N` - extracted to headLines
- * - `| tail -n N` / `| tail -N` - extracted to tailLines
- */
-
-interface NormalizedCommand {
-	/** Cleaned command with patterns stripped */
-	command: string;
-	/** Extracted head line count, if any */
-	headLines?: number;
-	/** Extracted tail line count, if any */
-	tailLines?: number;
-}
-
-/**
- * Pattern to match trailing pipe to head/tail.
- * Captures: full match, command (head/tail), line count
- *
- * Matches:
- * - `| head -n 50`
- * - `| head -50`
- * - `| tail -n 100`
- * - `| tail -100`
- *
- * Does NOT match head/tail with other flags or without line count.
- */
-const TRAILING_HEAD_TAIL_PATTERN = /\|\s*(head|tail)\s+(?:-n\s*(\d+)|(-\d+))\s*$/;
-
-/**
- * Normalize a bash command by stripping patterns better handled natively.
- *
- * Extracts `| head -n N` and `| tail -n N` suffixes into separate fields
- * so they can be applied post-execution without breaking streaming.
- *
- * Strips `2>&1` since we already merge stdout/stderr.
- */
-export function normalizeBashCommand(command: string): NormalizedCommand {
-	let normalized = command;
-	let headLines: number | undefined;
-	let tailLines: number | undefined;
-
-	// Extract trailing head/tail
-	const match = normalized.match(TRAILING_HEAD_TAIL_PATTERN);
-	if (match) {
-		const [fullMatch, cmd, nValue, dashValue] = match;
-		const lineCount = nValue ? Number.parseInt(nValue, 10) : Number.parseInt(dashValue.slice(1), 10);
-
-		if (cmd === "head") {
-			headLines = lineCount;
-		} else {
-			tailLines = lineCount;
-		}
-
-		normalized = normalized.slice(0, -fullMatch.length);
-	}
-
-	// Preserve internal whitespace (important for heredocs / indentation-sensitive scripts)
-	normalized = normalized.trim();
-
-	return {
-		command: normalized,
-		headLines,
-		tailLines,
-	};
-}
-
 /**
  * Apply head/tail limits to output text.
  *
@@ -86,13 +17,11 @@ export function applyHeadTail(
 	let headApplied: number | undefined;
 	let tailApplied: number | undefined;
 
-	// Apply head first (keep first N lines)
 	if (headLines !== undefined && headLines > 0 && lines.length > headLines) {
 		lines = lines.slice(0, headLines);
 		headApplied = headLines;
 	}
 
-	// Then apply tail (keep last N lines)
 	if (tailLines !== undefined && tailLines > 0 && lines.length > tailLines) {
 		lines = lines.slice(-tailLines);
 		tailApplied = tailLines;

package/src/tools/bash-skill-urls.ts

@@ -4,9 +4,6 @@ import { validateRelativePath } from "../internal-urls/skill-protocol";
 import type { InternalResource } from "../internal-urls/types";
 import { ToolError } from "./tool-errors";
 
-/** Regex to find skill:// tokens in command text. */
-const SKILL_URL_PATTERN = /'skill:\/\/[^'\s")`\\]+'|"skill:\/\/[^"\s')`\\]+"|skill:\/\/[^\s'")`\\]+/g;
-
 /** Regex to find supported internal URL tokens in command text. */
 const INTERNAL_URL_PATTERN =
 	/'(?:skill|agent|artifact|plan|rule):\/\/[^'\s")`\\]+'|"(?:skill|agent|artifact|plan|rule):\/\/[^"\s')`\\]+"|(?:skill|agent|artifact|plan|rule):\/\/[^\s'")`\\]+/g;
@@ -133,23 +130,6 @@ async function resolveInternalUrlToPath(
 	return path.resolve(resource.sourcePath);
 }
 
-/**
- * Expand all skill:// URIs in a bash command string.
- * Returns the command with URIs replaced by shell-escaped absolute paths.
- * Throws ToolError if any URI cannot be resolved.
- */
-export function expandSkillUrls(command: string, skills: readonly Skill[]): string {
-	if (skills.length === 0 || !command.includes("skill://")) {
-		return command;
-	}
-
-	return command.replace(SKILL_URL_PATTERN, token => {
-		const url = unquoteToken(token);
-		const resolvedPath = resolveSkillUrlToPath(url, skills);
-		return shellEscape(resolvedPath);
-	});
-}
-
 /**
  * Expand supported internal URLs in a bash command string to shell-escaped absolute paths.
  * Supported schemes: skill://, agent://, artifact://, plan://, rule://

package/src/tools/bash.ts

@@ -38,20 +38,10 @@ export interface BashToolDetails {
 	meta?: OutputMeta;
 }
 
-export interface BashToolOptions {}
-
 function normalizeResultOutput(result: BashResult | BashInteractiveResult): string {
 	return result.output || "";
 }
 
-function isInteractiveResult(result: BashResult | BashInteractiveResult): result is BashInteractiveResult {
-	return "timedOut" in result;
-}
-/**
- * Bash tool implementation.
- *
- * Executes bash commands with optional timeout and working directory.
- */
 export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails, Theme> {
 	readonly name = "bash";
 	readonly label = "Bash";
@@ -71,11 +61,9 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails, T
 	): Promise<AgentToolResult<BashToolDetails>> {
 		let command = rawCommand;
 
-		// Only apply explicit head/tail params from tool input.
 		const headLines = head;
 		const tailLines = tail;
 
-		// Check interception if enabled and available tools are known
 		if (this.session.settings.get("bashInterceptor.enabled")) {
 			const rules = this.session.settings.getBashInterceptorRules();
 			const interception = checkBashInterception(command, ctx?.toolNames ?? [], rules);
@@ -103,14 +91,11 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails, T
 			throw new ToolError(`Working directory is not a directory: ${commandCwd}`);
 		}
 
-		// Clamp to reasonable range: 1s - 3600s (1 hour)
 		const timeoutSec = Math.max(1, Math.min(3600, rawTimeout));
 		const timeoutMs = timeoutSec * 1000;
 
-		// Track output for streaming updates (tail only)
 		const tailBuffer = createTailBuffer(DEFAULT_MAX_BYTES);
 
-		// Set up artifacts environment and allocation
 		const artifactsDir = this.session.getArtifactsDir?.();
 		const extraEnv = artifactsDir ? { ARTIFACTS: artifactsDir } : undefined;
 		const { artifactPath, artifactId } = await allocateOutputArtifact(this.session, "bash");
@@ -148,16 +133,15 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails, T
 						}
 					},
 				});
+		if (result.timedOut) {
+			throw new ToolError(normalizeResultOutput(result) || `Command timed out after ${timeoutSec} seconds`);
+		}
 		if (result.cancelled) {
 			if (signal?.aborted) {
 				throw new ToolAbortError(normalizeResultOutput(result) || "Command aborted");
 			}
 			throw new ToolError(normalizeResultOutput(result) || "Command aborted");
 		}
-		if (isInteractiveResult(result) && result.timedOut) {
-			throw new ToolError(normalizeResultOutput(result) || `Command timed out after ${timeoutSec} seconds`);
-		}
-		// Apply head/tail filtering if specified
 		let outputText = normalizeResultOutput(result);
 		const headTailResult = applyHeadTail(outputText, headLines, tailLines);
 		if (headTailResult.applied) {
@@ -171,7 +155,7 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails, T
 		if (result.exitCode === undefined) {
 			throw new ToolError(`${outputText}\n\nCommand failed: missing exit status`);
 		}
-		if (result.exitCode !== 0 && result.exitCode !== undefined) {
+		if (result.exitCode !== 0) {
 			throw new ToolError(`${outputText}\n\nCommand exited with code ${result.exitCode}`);
 		}