@bike4mind/cli 2.1.0 → 3.0.0

package/dist/index.mjs

@@ -1,31 +1,31 @@
 #!/usr/bin/env node
-import { $ as CustomCommandStore, A as createAgentDelegateTool, B as ALWAYS_DENIED_FOR_AGENTS, C as createTodoStore, D as createCoordinateTaskTool, E as parseAgentConfig, F as PermissionManager, H as DEFAULT_MAX_ITERATIONS, J as setWebSocketToolExecutor, K as clearFeatureModuleTools, L as wrapTools, M as substituteArguments, O as createResumeAgentTool, P as findIterationBoundary, Q as RemoteSkillSource, R as getProcessHooks, S as createFindDefinitionTool, T as createSkillTool, U as DEFAULT_RETRY_CONFIG, V as DEFAULT_AGENT_MODEL, W as DEFAULT_THOROUGHNESS, X as buildSystemPrompt, Y as getPlanModeFilePath, Z as buildSkillsPromptSection, _ as createDecisionLogTool, at as searchCommands, b as createGetFileStructureTool, ct as formatFileSize, d as createReviewGateStore, dt as COMPACTION_SUMMARY_MARKER, et as CheckpointStore, f as createReviewGateTool, g as formatBlockersOutput, h as createBlockerTools, j as FallbackLlmBackend, k as createBackgroundAgentTools, lt as searchFiles, m as createBlockerStore, nt as hasFileReferences, ot as mergeCommands, p as formatReviewGatesOutput, pt as MAX_PASTE_SIZE, q as registerFeatureModuleTools, rt as processFileReferences, s as buildSandbox, st as rewireReservedNames, tt as SessionStore, u as isTransientNetworkError, ut as warmFileCache, v as createDecisionStore, w as createWriteTodosTool, x as createWorkItemTools, y as formatDecisionsOutput } from "./AgentHistoryStore-DdYKfx7C.mjs";
-import { a as selectLiveSubagentTokens, i as selectLiveSubagentCredits, n as selectActiveBackgroundShells, o as useCliStore, r as selectCompletedBackgroundShells, t as selectActiveBackgroundAgents } from "./store-CvjTpQPs.mjs";
+import { $ as processFileReferences, A as createAgentDelegateTool, C as createTodoStore, D as createCoordinateTaskTool, E as parseAgentConfig, F as PermissionManager, G as DEFAULT_THOROUGHNESS, H as DEFAULT_AGENT_MODEL, I as buildCliToolList, J as getPlanModeFilePath, M as substituteArguments, O as createResumeAgentTool, P as findIterationBoundary, Q as CustomCommandStore, S as createFindDefinitionTool, T as createSkillTool, U as DEFAULT_MAX_ITERATIONS, V as ALWAYS_DENIED_FOR_AGENTS, W as DEFAULT_RETRY_CONFIG, X as buildSkillsPromptSection, Y as buildSystemPrompt, Z as RemoteSkillSource, _ as createDecisionLogTool, at as rewireReservedNames, b as createGetFileStructureTool, ct as warmFileCache, d as createReviewGateStore, et as hasFileReferences, f as createReviewGateTool, ft as MAX_PASTE_SIZE, g as formatBlockersOutput, h as createBlockerTools, it as mergeCommands, j as FallbackLlmBackend, k as createBackgroundAgentTools, m as createBlockerStore, nt as SessionStore, ot as formatFileSize, p as formatReviewGatesOutput, q as setWebSocketToolExecutor, rt as searchCommands, s as buildSandbox, st as searchFiles, tt as CheckpointStore, u as isConnectionDrop, ut as COMPACTION_SUMMARY_MARKER, v as createDecisionStore, w as createWriteTodosTool, x as createWorkItemTools, y as formatDecisionsOutput, z as getProcessHooks } from "./AgentHistoryStore-DVxv1kSO.mjs";
+import { a as selectLiveSubagentTokens, i as selectLiveSubagentCredits, n as selectActiveBackgroundShells, o as useCliStore, r as selectCompletedBackgroundShells, t as selectActiveBackgroundAgents } from "./store-BxmPEI3v.mjs";
+import { Bt as selfClaimedActorKindSchema, F as ChatModels, Ft as DELEGATION_PAYLOAD_SCHEMA_NAME, It as actorColorIndex, Lt as actorKindMarker, P as CREDIT_DEDUCT_TRANSACTION_TYPES, Pt as ACTOR_COLOR_SLOTS, Rt as actorKindSchema, Z as REVIEW_GATE_STATUS_VALUES, _ as logger, c as getCreditsUrl, d as resolveApiEndpoint, et as SUBQUEST_STATUS_VALUES, g as parseApiUrl, ht as isEarlyStop, kt as tokenEstimateMultiplier, l as getEnvironmentName, m as LOCAL_DEV_URL, n as extractCompactInstructions, o as isReadOnlyTool, s as ApiEndpointUnconfiguredError, t as ConfigStore, u as requireApiUrl, v as SESSION_ID_PATTERN, y as isValidSessionId, zt as delegationPayloadSchema } from "./ConfigStore-51UaP9pJ.mjs";
 import { r as isFeatureEnabled, t as PluginStore } from "./PluginStore-DwvOJ-G3.mjs";
-import { A as ChatModels, At as delegationPayloadSchema, Dt as actorColorIndex, Et as DELEGATION_PAYLOAD_SCHEMA_NAME, G as REVIEW_GATE_STATUS_VALUES, Ot as actorKindMarker, Tt as ACTOR_COLOR_SLOTS, _ as requireApiUrl, bt as tokenEstimateMultiplier, d as isReadOnlyTool, f as ApiEndpointUnconfiguredError, g as parseApiUrl, h as getEnvironmentName, i as isValidSessionId, jt as selfClaimedActorKindSchema, k as CREDIT_DEDUCT_TRANSACTION_TYPES, kt as actorKindSchema, m as getCreditsUrl, n as logger, ot as isEarlyStop, p as LOCAL_DEV_URL, q as SUBQUEST_STATUS_VALUES, r as SESSION_ID_PATTERN, s as extractCompactInstructions, t as ConfigStore, v as resolveApiEndpoint } from "./ConfigStore-BygzEI6H.mjs";
-import { i as getTokenCounter, n as ConversationContext, r as reconstructTurnBlocks, t as WorkItemsClient } from "./WorkItemsClient-ClBC49y0.mjs";
-import { a as deferredToolRegistry, i as createToolSearchTool, n as buildSupportingStores, o as NotifyingLlmBackend, r as buildLlmBackend, t as buildAgent } from "./buildAgent-B7cMwRAy.mjs";
+import { i as getTokenCounter, n as ConversationContext, r as reconstructTurnBlocks, t as WorkItemsClient } from "./WorkItemsClient-BMY0Qq1s.mjs";
+import { a as deferredToolRegistry, i as createToolSearchTool, n as buildSupportingStores, o as NotifyingLlmBackend, r as buildLlmBackend, t as buildAgent } from "./buildAgent-CrSRKYU_.mjs";
 import { t as getShellSessionManager } from "./ShellSessionManager-6o8KZzl1-vrbPAUTq.mjs";
-import { i as OAuthClient, t as ApiClient } from "./ApiClient-dIB3YQc2.mjs";
-import { t as version } from "./package-CRNnNXxq.mjs";
-import { r as checkForUpdate } from "./updateChecker-CQW8bxo6.mjs";
+import { a as ApiClient, s as OAuthClient } from "./dist-BsG2Hlp-.mjs";
+import { t as version } from "./package-DEsNSP54.mjs";
+import { s as getStartupUpdateStatus } from "./updateChecker-CCLVVdH0.mjs";
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useReducer, useRef, useState, useSyncExternalStore } from "react";
 import { Box, Static, Text, measureElement, render, useApp, useInput, usePaste, useStdout } from "ink";
-import { execFile, execSync, spawn } from "child_process";
 import { randomBytes } from "crypto";
 import { constants, existsSync, promises, readFileSync, statSync } from "fs";
 import { homedir } from "os";
 import path, { basename, extname, join } from "path";
 import { v4 } from "uuid";
 import * as path$1 from "node:path";
+import { z as z$1 } from "zod";
+import axios, { isAxiosError } from "axios";
 import Spinner from "ink-spinner";
 import { useShallow } from "zustand/react/shallow";
 import TextInput from "ink-text-input";
-import { z as z$1 } from "zod";
-import axios, { isAxiosError } from "axios";
+import { execFile, spawn } from "child_process";
+import { promisify } from "util";
 import { marked } from "marked";
 import { highlight } from "cli-highlight";
-import { promisify } from "util";
 import SelectInput from "ink-select-input";
 import jwt from "jsonwebtoken";
 import open from "open";
@@ -121,52 +121,54 @@ function CustomTextInput({ value, onChange, onSubmit, onPaste, pasteIndicator, p
 			setCursorOffset(cursorOffset + 1);
 			return;
 		}
-		if (key.meta && !key.ctrl) if (key.shift) {
-			if (key.leftArrow) {
-				const newPos = findPreviousWordBoundary(value, cursorOffset);
-				setCursorOffset(newPos);
-				return;
-			}
-			if (key.rightArrow) {
-				const newPos = findNextWordBoundary(value, cursorOffset);
-				setCursorOffset(newPos);
-				return;
-			}
-			if (key.backspace) {
-				const beforeCursor = value.slice(0, cursorOffset);
-				const afterCursor = value.slice(cursorOffset);
-				const newPos = findPreviousWordBoundary(beforeCursor, beforeCursor.length);
-				const newValue = beforeCursor.slice(0, newPos) + afterCursor;
-				emitChange(newValue);
-				setCursorOffset(newPos);
-				return;
-			}
-			if (key.delete) {
-				const beforeCursor = value.slice(0, cursorOffset);
-				const afterCursor = value.slice(cursorOffset);
-				const newPos = findNextWordBoundary(afterCursor, 0);
-				const newValue = beforeCursor + afterCursor.slice(newPos);
-				emitChange(newValue);
-				return;
-			}
-		} else {
-			if (key.leftArrow) {
-				setCursorOffset(0);
-				return;
-			}
-			if (key.rightArrow) {
-				setCursorOffset(value.length);
-				return;
-			}
-			if (key.backspace) {
-				const afterCursor = value.slice(cursorOffset);
-				emitChange(afterCursor);
-				setCursorOffset(0);
-				return;
-			}
-			if (key.delete) {
-				emitChange(value.slice(0, cursorOffset));
-				return;
+		if (key.meta && !key.ctrl) {
+			if (key.shift) {
+				if (key.leftArrow) {
+					const newPos = findPreviousWordBoundary(value, cursorOffset);
+					setCursorOffset(newPos);
+					return;
+				}
+				if (key.rightArrow) {
+					const newPos = findNextWordBoundary(value, cursorOffset);
+					setCursorOffset(newPos);
+					return;
+				}
+				if (key.backspace) {
+					const beforeCursor = value.slice(0, cursorOffset);
+					const afterCursor = value.slice(cursorOffset);
+					const newPos = findPreviousWordBoundary(beforeCursor, beforeCursor.length);
+					const newValue = beforeCursor.slice(0, newPos) + afterCursor;
+					emitChange(newValue);
+					setCursorOffset(newPos);
+					return;
+				}
+				if (key.delete) {
+					const beforeCursor = value.slice(0, cursorOffset);
+					const afterCursor = value.slice(cursorOffset);
+					const newPos = findNextWordBoundary(afterCursor, 0);
+					const newValue = beforeCursor + afterCursor.slice(newPos);
+					emitChange(newValue);
+					return;
+				}
+			} else {
+				if (key.leftArrow) {
+					setCursorOffset(0);
+					return;
+				}
+				if (key.rightArrow) {
+					setCursorOffset(value.length);
+					return;
+				}
+				if (key.backspace) {
+					const afterCursor = value.slice(cursorOffset);
+					emitChange(afterCursor);
+					setCursorOffset(0);
+					return;
+				}
+				if (key.delete) {
+					emitChange(value.slice(0, cursorOffset));
+					return;
+				}
 			}
 		}
 		if (key.home) {
@@ -2107,6 +2109,138 @@ function McpViewer({ config, mcpManager, onClose }) {
 	}, "Press Esc or q to close")));
 }
 //#endregion
+//#region src/storage/CommandHistoryStore.ts
+/**
+* Maximum number of history entries to keep
+*/
+const MAX_HISTORY_ENTRIES = 1e3;
+/**
+* Manages command history stored in JSONL format
+* Uses append-friendly JSONL for efficient writes
+*/
+var CommandHistoryStore = class {
+	constructor(historyPath) {
+		this.history = null;
+		this.historyPath = historyPath || path.join(homedir(), ".bike4mind", "history.jsonl");
+	}
+	/**
+	* Initialize history directory
+	*/
+	async init() {
+		const dir = path.dirname(this.historyPath);
+		try {
+			await promises.mkdir(dir, { recursive: true });
+		} catch (error) {
+			console.error("Failed to initialize history directory:", error);
+			throw error;
+		}
+	}
+	/**
+	* Load command history from disk
+	* Returns array of commands (newest first)
+	*/
+	async load() {
+		if (this.history) return this.history;
+		try {
+			const entries = (await promises.readFile(this.historyPath, "utf-8")).trim().split("\n").filter((line) => line.length > 0).map((line) => {
+				try {
+					return JSON.parse(line);
+				} catch {
+					return null;
+				}
+			}).filter((entry) => entry !== null);
+			this.history = entries.sort((a, b) => b.timestamp - a.timestamp).map((entry) => entry.command);
+			return this.history;
+		} catch (error) {
+			if (error.code === "ENOENT") {
+				this.history = [];
+				return this.history;
+			}
+			throw error;
+		}
+	}
+	/**
+	* Add a command to history
+	* Skips if it's the same as the most recent command (deduplicate)
+	*/
+	async add(command) {
+		await this.load();
+		if (!command || !command.trim()) return;
+		if (this.history && this.history.length > 0 && this.history[0] === command) return;
+		const entry = {
+			command,
+			timestamp: Date.now()
+		};
+		await this.init();
+		const line = JSON.stringify(entry) + "\n";
+		await promises.appendFile(this.historyPath, line, "utf-8");
+		this.history = [command, ...this.history || []];
+		if (this.history.length > MAX_HISTORY_ENTRIES) await this.trim();
+	}
+	/**
+	* Trim history to max entries
+	* Rewrites the entire file with the most recent entries
+	*/
+	async trim() {
+		if (!this.history || this.history.length <= MAX_HISTORY_ENTRIES) return;
+		const trimmedCommands = this.history.slice(0, MAX_HISTORY_ENTRIES);
+		const lines = trimmedCommands.reverse().map((command) => {
+			return JSON.stringify({
+				command,
+				timestamp: Date.now()
+			});
+		}).join("\n");
+		await promises.writeFile(this.historyPath, lines + "\n", "utf-8");
+		this.history = trimmedCommands;
+	}
+	/**
+	* Clear all command history
+	*/
+	async clear() {
+		try {
+			await promises.unlink(this.historyPath);
+		} catch (error) {
+			if (error.code !== "ENOENT") throw error;
+		}
+		this.history = [];
+	}
+	/**
+	* Get all commands (newest first)
+	*/
+	async list() {
+		return this.load();
+	}
+};
+//#endregion
+//#region src/storage/buildGlobalConfigPatch.ts
+/**
+* Compute the minimal global-config patch for a /config editor save: only the
+* editor-owned fields (defaultModel, preferences, features) that the user
+* actually changed vs the current effective (merged) config. Unchanged fields
+* are omitted, so a repo-injected value the user never touched is never
+* laundered into the global layer by a save() that spreads the merged config.
+*
+* defaultModel and preferences diff per key. features stays whole-object when
+* anything changed, on purpose: ConfigStore.save() feeds config.features to
+* mergeFeatures as the caller's COMPLETE desired set (absence of a key means
+* "removed"), so a per-key diff would make save() delete untouched keys. That
+* whole-object features path is only latently launderable today (no repo layer
+* populates features); tightening it needs a coordinated change to save()'s
+* concurrent-writer merge and is tracked separately.
+*/
+function buildGlobalConfigPatch(prev, next) {
+	const patch = {};
+	if (next.defaultModel !== prev?.defaultModel) patch.defaultModel = next.defaultModel;
+	const changedPreferences = {};
+	for (const [key, value] of Object.entries(next.preferences)) {
+		const prevValue = (prev?.preferences)?.[key];
+		if (JSON.stringify(value) !== JSON.stringify(prevValue)) changedPreferences[key] = value;
+	}
+	if (Object.keys(changedPreferences).length > 0) patch.preferences = changedPreferences;
+	if (JSON.stringify(next.features ?? {}) !== JSON.stringify(prev?.features ?? {})) patch.features = next.features;
+	return patch;
+}
+//#endregion
 //#region src/components/MarkdownRenderer.tsx
 function MarkdownRenderer({ content, columns: columnsProp }) {
 	const columns = columnsProp ?? process.stdout.columns ?? 80;
@@ -2342,6 +2476,12 @@ function stepRows(steps, index, showThoughts) {
 	if (step.type !== "action") return 0;
 	return steps[index + 1]?.type === "observation" ? 3 : 2;
 }
+/** Rows a whole window occupies, excluding the trace Box chrome. */
+function measureTraceRows(steps, { showThoughts = true } = {}) {
+	let rows = 0;
+	for (let i = 0; i < steps.length; i++) rows += stepRows(steps, i, showThoughts);
+	return rows;
+}
 const countRenderable = (steps, showThoughts) => steps.filter((step) => isRenderable(step, showThoughts)).length;
 const EMPTY_WINDOW = {
 	steps: [],
@@ -2382,32 +2522,96 @@ function windowLiveTrace(steps, { rows, showThoughts = true }) {
 		hiddenSteps: countRenderable(steps.slice(0, newest), showThoughts)
 	};
 }
+/** Rows the live reply Box spends beyond its text: its bottom margin. */
+const REPLY_BOX_CHROME_ROWS = 1;
+/**
+* Hard-wraps streamed reply text into rows of at most `columns` characters.
+* MessageItem renders each row as its own `truncate-end` line, so a row is
+* exactly one terminal row; a wide character can only clip a row's end in the
+* live view, never add a row. The full markdown render lands via <Static>.
+*/
+function wrapReplyRows(text, columns) {
+	const width = Math.max(1, Math.floor(columns));
+	const rows = [];
+	for (const line of text.split("\n")) {
+		if (line.length === 0) {
+			rows.push("");
+			continue;
+		}
+		for (let start = 0; start < line.length; start += width) rows.push(line.slice(start, start + width));
+	}
+	return rows;
+}
+/**
+* Splits the live frame's row budget between the step trace and the streaming
+* reply. The reply gets what the trace leaves over, and never less than half
+* the budget once it needs it, so a long trace cannot starve the answer the
+* user is waiting on. The reply shows its tail: the newest text is what moves.
+*/
+function splitLiveRows(rows, { steps, replyRows, showThoughts = true }) {
+	const budget = Math.max(0, Math.floor(rows));
+	if (replyRows.length === 0) return {
+		traceRows: budget,
+		replyRows: []
+	};
+	const traceNeeded = steps.length > 0 ? measureTraceRows(steps, { showThoughts }) + TRACE_BOX_CHROME_ROWS : 0;
+	const replyNeeded = replyRows.length + REPLY_BOX_CHROME_ROWS;
+	const replyBudget = Math.min(replyNeeded, Math.max(budget - traceNeeded, Math.ceil(budget / 2)));
+	const visibleReplyRows = replyBudget - REPLY_BOX_CHROME_ROWS;
+	if (visibleReplyRows <= 0) return {
+		traceRows: budget,
+		replyRows: []
+	};
+	return {
+		traceRows: budget - replyBudget,
+		replyRows: replyRows.slice(-visibleReplyRows)
+	};
+}
 //#endregion
 //#region src/components/MessageItem.tsx
 const TOOLS_WITH_HIDDEN_ARGS = /* @__PURE__ */ new Set(["edit_local_file"]);
-const MessageItem = React.memo(function MessageItem({ message, showThoughts = true, liveTraceRows }) {
+/** Left padding of the reply body, in columns. */
+const REPLY_INDENT = 2;
+const MessageItem = React.memo(function MessageItem({ message, showThoughts = true, liveRows }) {
 	const isUser = message.role === "user";
 	const [terminalCols] = useStdoutDimensions();
-	const isLive = liveTraceRows !== void 0;
+	const isLive = liveRows !== void 0;
 	const traceWrap = isLive ? "truncate-end" : "wrap";
 	const oneLine = (text) => isLive ? text.replace(/\s+/g, " ") : text;
+	const hasReply = !isUser && message.content !== "...";
 	const allSteps = message.metadata?.steps;
+	const liveSplit = React.useMemo(() => {
+		if (liveRows === void 0) return void 0;
+		const replyRows = hasReply ? wrapReplyRows(message.content, terminalCols - REPLY_INDENT) : [];
+		return splitLiveRows(liveRows, {
+			steps: allSteps ?? [],
+			replyRows,
+			showThoughts
+		});
+	}, [
+		liveRows,
+		hasReply,
+		message.content,
+		terminalCols,
+		allSteps,
+		showThoughts
+	]);
 	const { steps: traceSteps, hiddenSteps } = React.useMemo(() => {
 		if (!allSteps) return {
 			steps: [],
 			hiddenSteps: 0
 		};
-		if (liveTraceRows === void 0) return {
+		if (liveSplit === void 0) return {
 			steps: allSteps,
 			hiddenSteps: 0
 		};
 		return windowLiveTrace(allSteps, {
-			rows: liveTraceRows,
+			rows: liveSplit.traceRows,
 			showThoughts
 		});
 	}, [
 		allSteps,
-		liveTraceRows,
+		liveSplit,
 		showThoughts
 	]);
 	const visibleTraceSteps = traceSteps.filter((s) => showThoughts && s.type === "thought" || s.type === "action").length;
@@ -2452,13 +2656,20 @@ const MessageItem = React.memo(function MessageItem({ message, showThoughts = tr
 			}, `Result: ${oneLine(truncateValue(result, 200))}`)));
 		}
 		return null;
-	}).filter(Boolean)), !isUser && message.content !== "..." && /* @__PURE__ */ React.createElement(Box, {
-		paddingLeft: 2,
+	}).filter(Boolean)), liveSplit && liveSplit.replyRows.length > 0 && /* @__PURE__ */ React.createElement(Box, {
+		paddingLeft: REPLY_INDENT,
+		marginBottom: 1,
+		flexDirection: "column"
+	}, liveSplit.replyRows.map((row, idx) => /* @__PURE__ */ React.createElement(Text, {
+		key: idx,
+		wrap: "truncate-end"
+	}, row || " "))), !isLive && hasReply && /* @__PURE__ */ React.createElement(Box, {
+		paddingLeft: REPLY_INDENT,
 		marginBottom: 1
 	}, message.metadata?.permissionDenied ? /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "⚠️ ", message.content) : /* @__PURE__ */ React.createElement(MarkdownRenderer, {
 		content: message.content,
 		columns: terminalCols
-	})), !isUser && message.metadata?.earlyStopReason && /* @__PURE__ */ React.createElement(Box, { paddingLeft: 2 }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, message.metadata.earlyStopReason === "degenerate_repetition" ? "⚠ Response stopped early: it began repeating itself. Try rephrasing the request." : "⚠ Response was cut off at the output-token limit. Type \"continue\" to resume, or raise Max Tokens in /config.")), !isUser && message.content !== "..." && message.metadata && /* @__PURE__ */ React.createElement(Box, {
+	})), !isUser && message.metadata?.earlyStopReason && /* @__PURE__ */ React.createElement(Box, { paddingLeft: 2 }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, message.metadata.earlyStopReason === "degenerate_repetition" ? "⚠ Response stopped early: it began repeating itself. Try rephrasing the request." : "⚠ Response was cut off at the output-token limit. Type \"continue\" to resume, or raise Max Tokens in /config.")), !isLive && hasReply && message.metadata && /* @__PURE__ */ React.createElement(Box, {
 		paddingLeft: 2,
 		marginBottom: 1
 	}, (message.metadata.tokenUsage?.total || message.metadata.creditsUsed) && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "(", message.metadata.tokenUsage?.total ? `${message.metadata.tokenUsage.total.toLocaleString()} tokens` : "", message.metadata.creditsUsed && message.metadata.creditsUsed > 0 ? (message.metadata.tokenUsage?.total ? " • " : "") + `used ${message.metadata.creditsUsed.toLocaleString()} ${message.metadata.creditsUsed === 1 ? "credit" : "credits"}` : "", ")")));
@@ -2542,7 +2753,7 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 	useInput(() => setPromptInputTick((tick) => tick + 1), { isActive: promptKey !== "" });
 	const promptRows = promptKey === "" ? 0 : measuredPrompt?.key === promptKey ? measuredPrompt.rows : Infinity;
 	const [terminalCols, terminalRows] = useStdoutDimensions();
-	const liveTraceRows = Math.max(0, terminalRows - LIVE_CHROME_ROWS - messageQueue.length - promptRows);
+	const liveRows = Math.max(0, terminalRows - LIVE_CHROME_ROWS - messageQueue.length - promptRows);
 	const handleSubmit = React.useCallback(async (input) => {
 		const trimmed = input.trim();
 		if (!trimmed) return;
@@ -2610,7 +2821,7 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 	}, /* @__PURE__ */ React.createElement(MessageItem, {
 		message,
 		showThoughts,
-		liveTraceRows
+		liveRows
 	})))), /* @__PURE__ */ React.createElement(Box, {
 		ref: promptRef,
 		flexDirection: "column"
@@ -2813,10 +3024,12 @@ function RewindSelector({ messages, onSelect, onCancel }) {
 	const [step, setStep] = useState("selection");
 	const [selectedMessageIndex, setSelectedMessageIndex] = useState(null);
 	useInput((input, key) => {
-		if (key.escape) if (step === "confirmation") {
-			setStep("selection");
-			setSelectedMessageIndex(null);
-		} else onCancel();
+		if (key.escape) {
+			if (step === "confirmation") {
+				setStep("selection");
+				setSelectedMessageIndex(null);
+			} else onCancel();
+		}
 	});
 	const items = messages.map((msg, idx) => ({
 		msg,
@@ -2879,10 +3092,12 @@ function SessionSelector({ sessions, currentSession, onSelect, onCancel }) {
 	const [step, setStep] = useState("selection");
 	const [selectedSession, setSelectedSession] = useState(null);
 	useInput((_input, key) => {
-		if (key.escape) if (step === "confirmation") {
-			setStep("selection");
-			setSelectedSession(null);
-		} else onCancel();
+		if (key.escape) {
+			if (step === "confirmation") {
+				setStep("selection");
+				setSelectedSession(null);
+			} else onCancel();
+		}
 	});
 	const hasUnsavedWork = currentSession && currentSession.messages.length > 0;
 	const formatTimeAgo = (timestamp) => {
@@ -3206,138 +3421,6 @@ function LoginFlow({ apiUrl = "http://localhost:3000", configStore, onSuccess, o
 	}, deviceFlow?.user_code)), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, /* @__PURE__ */ React.createElement(Spinner, { type: "dots" }), " ", statusMessage)), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "Expires in ", deviceFlow ? Math.floor(deviceFlow.expires_in / 60) : 0, " minutes")));
 }
 //#endregion
-//#region src/storage/CommandHistoryStore.ts
-/**
-* Maximum number of history entries to keep
-*/
-const MAX_HISTORY_ENTRIES = 1e3;
-/**
-* Manages command history stored in JSONL format
-* Uses append-friendly JSONL for efficient writes
-*/
-var CommandHistoryStore = class {
-	constructor(historyPath) {
-		this.history = null;
-		this.historyPath = historyPath || path.join(homedir(), ".bike4mind", "history.jsonl");
-	}
-	/**
-	* Initialize history directory
-	*/
-	async init() {
-		const dir = path.dirname(this.historyPath);
-		try {
-			await promises.mkdir(dir, { recursive: true });
-		} catch (error) {
-			console.error("Failed to initialize history directory:", error);
-			throw error;
-		}
-	}
-	/**
-	* Load command history from disk
-	* Returns array of commands (newest first)
-	*/
-	async load() {
-		if (this.history) return this.history;
-		try {
-			const entries = (await promises.readFile(this.historyPath, "utf-8")).trim().split("\n").filter((line) => line.length > 0).map((line) => {
-				try {
-					return JSON.parse(line);
-				} catch {
-					return null;
-				}
-			}).filter((entry) => entry !== null);
-			this.history = entries.sort((a, b) => b.timestamp - a.timestamp).map((entry) => entry.command);
-			return this.history;
-		} catch (error) {
-			if (error.code === "ENOENT") {
-				this.history = [];
-				return this.history;
-			}
-			throw error;
-		}
-	}
-	/**
-	* Add a command to history
-	* Skips if it's the same as the most recent command (deduplicate)
-	*/
-	async add(command) {
-		await this.load();
-		if (!command || !command.trim()) return;
-		if (this.history && this.history.length > 0 && this.history[0] === command) return;
-		const entry = {
-			command,
-			timestamp: Date.now()
-		};
-		await this.init();
-		const line = JSON.stringify(entry) + "\n";
-		await promises.appendFile(this.historyPath, line, "utf-8");
-		this.history = [command, ...this.history || []];
-		if (this.history.length > MAX_HISTORY_ENTRIES) await this.trim();
-	}
-	/**
-	* Trim history to max entries
-	* Rewrites the entire file with the most recent entries
-	*/
-	async trim() {
-		if (!this.history || this.history.length <= MAX_HISTORY_ENTRIES) return;
-		const trimmedCommands = this.history.slice(0, MAX_HISTORY_ENTRIES);
-		const lines = trimmedCommands.reverse().map((command) => {
-			return JSON.stringify({
-				command,
-				timestamp: Date.now()
-			});
-		}).join("\n");
-		await promises.writeFile(this.historyPath, lines + "\n", "utf-8");
-		this.history = trimmedCommands;
-	}
-	/**
-	* Clear all command history
-	*/
-	async clear() {
-		try {
-			await promises.unlink(this.historyPath);
-		} catch (error) {
-			if (error.code !== "ENOENT") throw error;
-		}
-		this.history = [];
-	}
-	/**
-	* Get all commands (newest first)
-	*/
-	async list() {
-		return this.load();
-	}
-};
-//#endregion
-//#region src/storage/buildGlobalConfigPatch.ts
-/**
-* Compute the minimal global-config patch for a /config editor save: only the
-* editor-owned fields (defaultModel, preferences, features) that the user
-* actually changed vs the current effective (merged) config. Unchanged fields
-* are omitted, so a repo-injected value the user never touched is never
-* laundered into the global layer by a save() that spreads the merged config.
-*
-* defaultModel and preferences diff per key. features stays whole-object when
-* anything changed, on purpose: ConfigStore.save() feeds config.features to
-* mergeFeatures as the caller's COMPLETE desired set (absence of a key means
-* "removed"), so a per-key diff would make save() delete untouched keys. That
-* whole-object features path is only latently launderable today (no repo layer
-* populates features); tightening it needs a coordinated change to save()'s
-* concurrent-writer merge and is tracked separately.
-*/
-function buildGlobalConfigPatch(prev, next) {
-	const patch = {};
-	if (next.defaultModel !== prev?.defaultModel) patch.defaultModel = next.defaultModel;
-	const changedPreferences = {};
-	for (const [key, value] of Object.entries(next.preferences)) {
-		const prevValue = (prev?.preferences)?.[key];
-		if (JSON.stringify(value) !== JSON.stringify(prevValue)) changedPreferences[key] = value;
-	}
-	if (Object.keys(changedPreferences).length > 0) patch.preferences = changedPreferences;
-	if (JSON.stringify(next.features ?? {}) !== JSON.stringify(prev?.features ?? {})) patch.features = next.features;
-	return patch;
-}
-//#endregion
 //#region src/utils/formatStep.ts
 const MAX_INPUT_LENGTH = 500;
 /**
@@ -4054,7 +4137,7 @@ async function writeLocalHandoffFile(session, options = {}) {
 function isLlmUnavailableError(error) {
 	if (!(error instanceof Error)) return false;
 	const message = error.message;
-	return message.includes("Rate limit exceeded") || message.includes("Authentication expired") || message.includes("Authentication failed") || message.includes("Cannot connect to Bike4Mind server") || message.includes("ECONNREFUSED") || message.includes("ETIMEDOUT") || message.includes("ENOTFOUND") || message.includes("ECONNRESET") || message.includes("Failed to complete LLM request") || /Request failed with status 5\d\d/.test(message) || /^5\d\d\b/.test(message);
+	return message.includes("Rate limit exceeded") || message.includes("Authentication expired") || message.includes("Authentication failed") || message.includes("Cannot connect to Bike4Mind server") || message.includes("ECONNREFUSED") || message.includes("ETIMEDOUT") || message.includes("ENOTFOUND") || message.includes("ECONNRESET") || message.includes("Failed to complete LLM request") || /Request failed with status 5\d\d/.test(message) || /^5\d\d\b/.test(message) || /\(upstream 5\d\d\)/.test(message);
 }
 //#endregion
 //#region src/utils/compaction.ts
@@ -4187,18 +4270,14 @@ function flattenContent(content) {
 * @param session - The session this turn belongs to. Only used for
 *   `createCompactedSession`'s summary-message formatting (and workflow
 *   handoff parity); its `messages` are not read or mutated.
-* @param initialMessageCount - Length of the protected prefix (system +
-*   previousMessages + current query) passed into the matching `agent.run()`
-*   call. Must match exactly - it is the boundary below which messages are
-*   never touched, so the turn's own query is never summarized away.
 *
 * Workflow state (decisions/blockers) needs no flush here: this handler only
 * rewrites the in-flight `IMessage[]` working history and discards the
 * compacted session's metadata, leaving the stores and `session.metadata`
 * untouched. The turn's own post-run save syncs the stores afterwards.
 */
-function createReactiveCompactionHandler(agent, session, initialMessageCount) {
-	return async (messages) => {
+function createReactiveCompactionHandler(agent, session) {
+	return async (messages, initialMessageCount) => {
 		const cutIndex = findIterationBoundary(messages, PRESERVE_RECENT_ITERATIONS, initialMessageCount);
 		const toSummarize = messages.slice(initialMessageCount, cutIndex);
 		if (toSummarize.length === 0) return null;
@@ -4419,13 +4498,147 @@ var MessageBuilder = class {
 		if (typeof message.content === "string") return message.content;
 		return message.content.map((item) => {
 			if (item.type === "text") return item.text;
-			else if (item.type === "image") if (item.source.type === "url") return `[Image: ${item.source.url}]`;
-			else return `[Image: base64 ${item.source.media_type}]`;
+			else if (item.type === "image") {
+				if (item.source.type === "url") return `[Image: ${item.source.url}]`;
+				else return `[Image: base64 ${item.source.media_type}]`;
+			}
 			return "";
 		}).join("");
 	}
 };
 //#endregion
+//#region src/utils/runBangCommand.ts
+/** How long a `!command` may run before it is killed (ms). */
+const BANG_COMMAND_TIMEOUT_MS = 3e5;
+const BANG_COMMAND_MAX_OUTPUT_CHARS = 10485760;
+const USE_PROCESS_GROUP = process.platform !== "win32";
+const runningCommands = /* @__PURE__ */ new Map();
+/** Signal the command's whole process tree, so `make && ./server` does not outlive a kill. */
+function killCommand(child) {
+	try {
+		if (USE_PROCESS_GROUP && child.pid !== void 0) process.kill(-child.pid, "SIGTERM");
+		else child.kill("SIGTERM");
+	} catch {}
+}
+/** Kills every `!command` still running; called on CLI exit so none is orphaned. Their results resolve `null`. */
+function killRunningBangCommands() {
+	for (const stop of runningCommands.values()) stop("exit");
+	runningCommands.clear();
+}
+/**
+* Runs a `!command` typed in the TUI without blocking the event loop, through the platform shell
+* like the execSync it replaces. Never rejects: every failure comes back as `isError` output, except
+* a command killed because the CLI is exiting, which resolves `null` (nothing should be recorded).
+*/
+function runBangCommand(command, { cwd, timeoutMs = BANG_COMMAND_TIMEOUT_MS, signal }) {
+	return new Promise((resolve) => {
+		let child;
+		try {
+			child = spawn(command, {
+				cwd,
+				shell: true,
+				detached: USE_PROCESS_GROUP,
+				stdio: [
+					"ignore",
+					"pipe",
+					"pipe"
+				]
+			});
+		} catch (error) {
+			resolve({
+				output: error instanceof Error ? error.message : String(error),
+				isError: true
+			});
+			return;
+		}
+		let stdout = "";
+		let stderr = "";
+		let failure = null;
+		const stop = (reason) => {
+			failure ??= reason;
+			killCommand(child);
+		};
+		runningCommands.set(child, stop);
+		const collect = (append) => (text) => {
+			if (failure) return;
+			append(text);
+			if (stdout.length + stderr.length > BANG_COMMAND_MAX_OUTPUT_CHARS) stop("overflow");
+		};
+		child.stdout?.setEncoding("utf-8");
+		child.stderr?.setEncoding("utf-8");
+		child.stdout?.on("data", collect((text) => stdout += text));
+		child.stderr?.on("data", collect((text) => stderr += text));
+		const timer = setTimeout(() => stop("timeout"), timeoutMs);
+		const cancel = () => stop("cancelled");
+		if (signal?.aborted) cancel();
+		signal?.addEventListener("abort", cancel, { once: true });
+		const finish = (result) => {
+			clearTimeout(timer);
+			signal?.removeEventListener("abort", cancel);
+			runningCommands.delete(child);
+			resolve(result);
+		};
+		child.on("error", (error) => finish({
+			output: error.message,
+			isError: true
+		}));
+		child.on("close", (code) => {
+			if (failure === "exit") finish(null);
+			else if (failure === "timeout") {
+				const partial = stdout ? `${stdout.trimEnd()}\n` : "";
+				finish({
+					output: `${partial}Command timed out after ${Math.round(timeoutMs / 1e3)}s`,
+					isError: true
+				});
+			} else if (failure === "cancelled") finish({
+				output: "Command cancelled",
+				isError: true
+			});
+			else if (failure === "overflow") finish({
+				output: `Command output exceeded ${BANG_COMMAND_MAX_OUTPUT_CHARS / 1024 / 1024} MB`,
+				isError: true
+			});
+			else if (code === 0) finish({
+				output: stdout,
+				isError: false
+			});
+			else finish({
+				output: stderr || stdout || `Command failed: ${command}`,
+				isError: true
+			});
+		});
+	});
+}
+//#endregion
+//#region src/session/whenTurnIdle.ts
+/**
+* Runs `callback` once nothing holds the session (see `holdSession` in store/index.ts). Agent
+* turns, custom commands, background completion and compaction write the session back from a
+* snapshot taken at their start, so anything appended to it meanwhile would be clobbered.
+*
+* The callback runs synchronously as the last hold is released, before a queued turn can start
+* and take its own snapshot. It runs inside that release, so a throw is logged rather than
+* escaping into the releasing operation's `finally`.
+*/
+function whenTurnIdle(callback) {
+	const runCallback = () => {
+		try {
+			callback();
+		} catch (error) {
+			logger.debug(`[whenTurnIdle] callback failed: ${error instanceof Error ? error.message : String(error)}`);
+		}
+	};
+	if (useCliStore.getState().sessionHolds === 0) {
+		runCallback();
+		return;
+	}
+	const unsubscribe = useCliStore.subscribe((state) => {
+		if (state.sessionHolds > 0) return;
+		unsubscribe();
+		runCallback();
+	});
+}
+//#endregion
 //#region src/utils/peonNotifier.ts
 /**
 * peon-ping notifier - native b4m adapter for peon-ping (https://peonping.com).
@@ -7767,6 +7980,12 @@ var BridgePresence = class {
 const bridgePresence = new BridgePresence();
 //#endregion
 //#region src/bootstrap/wireAgentEvents.ts
+/** Apply `update` to the in-flight assistant message, if one is pending. */
+function updatePendingAssistant(update) {
+	const { pendingMessages, updatePendingMessage } = useCliStore.getState();
+	const lastIdx = pendingMessages.length - 1;
+	if (lastIdx >= 0 && pendingMessages[lastIdx].role === "assistant") updatePendingMessage(lastIdx, update(pendingMessages[lastIdx]));
+}
 /**
 * Wire the main agent's step events to the UI store and the tavern transcript,
 * and mirror the same handlers onto delegated subagents via the orchestrator's
@@ -7778,26 +7997,52 @@ const bridgePresence = new BridgePresence();
 * singleton; neither owns React-lifecycle state.
 */
 function wireAgentEvents(input) {
-	const { agent, agentContext, orchestrator } = input;
-	agent.observationQueue = agentContext.observationQueue;
+	const { agent, orchestrator } = input;
 	const stepHandler = (step) => {
-		const { pendingMessages, updatePendingMessage } = useCliStore.getState();
-		const lastIdx = pendingMessages.length - 1;
-		if (lastIdx >= 0 && pendingMessages[lastIdx].role === "assistant") {
-			const existingSteps = pendingMessages[lastIdx].metadata?.steps || [];
-			const formattedStep = formatStep(step);
-			updatePendingMessage(lastIdx, {
-				...pendingMessages[lastIdx],
-				metadata: {
-					...pendingMessages[lastIdx].metadata,
-					steps: [...existingSteps, formattedStep]
-				}
-			});
-		}
+		updatePendingAssistant((message) => ({
+			...message,
+			metadata: {
+				...message.metadata,
+				steps: [...message.metadata?.steps || [], formatStep(step)]
+			}
+		}));
+	};
+	let liveText = {
+		messageId: "",
+		iteration: -1,
+		text: ""
+	};
+	const textDeltaHandler = ({ delta, iteration }) => {
+		updatePendingAssistant((message) => {
+			const sameStream = liveText.messageId === message.id && liveText.iteration === iteration;
+			liveText = {
+				messageId: message.id,
+				iteration,
+				text: (sameStream ? liveText.text : "") + delta
+			};
+			return {
+				...message,
+				content: liveText.text
+			};
+		});
+	};
+	const clearLiveText = () => {
+		if (!liveText.text) return;
+		liveText = {
+			...liveText,
+			text: ""
+		};
+		updatePendingAssistant((message) => ({
+			...message,
+			content: "..."
+		}));
 	};
 	agent.on("thought", stepHandler);
 	agent.on("observation", stepHandler);
 	agent.on("action", stepHandler);
+	agent.on("text_delta", textDeltaHandler);
+	agent.on("thought", clearLiveText);
+	agent.on("action", clearLiveText);
 	const pendingToolUseIds = /* @__PURE__ */ new Map();
 	const summarizeToolInput = (input) => {
 		if (input == null) return void 0;
@@ -8152,6 +8397,14 @@ async function handleSandboxTrustDomainCommand(deps, domains) {
 * recurses with the same context for messages submitted mid-turn.
 */
 async function runTurn(message, ctx) {
+	const releaseSession = useCliStore.getState().holdSession();
+	try {
+		await runHeldTurn(message, ctx);
+	} finally {
+		releaseSession();
+	}
+}
+async function runHeldTurn(message, ctx) {
 	const { agent, sessionStore, configStore, commandHistoryStore, customCommandStore, messageBuilder, config, availableModels, agentStore, contextContent, additionalDirectories, featureRegistry, backgroundManager, todoStore, decisionStore, blockerStore, postEditDiagnostics, workflowStores, setCommandHistory, setAbortController } = ctx;
 	const storeSession = useCliStore.getState().session;
 	if (!agent || !storeSession) {
@@ -8194,7 +8447,10 @@ async function runTurn(message, ctx) {
 			try {
 				const { prompt: compactionPrompt, preservedMessages } = buildCompactionPrompt(activeSession.messages, { claudeMdInstructions: extractCompactInstructions(contextContent || "") });
 				if (compactionPrompt) {
-					const result = await agent.run(compactionPrompt, { maxIterations: 1 });
+					const result = await agent.run(compactionPrompt, {
+						maxIterations: 1,
+						streamText: false
+					});
 					const sessionToCompact = withFlushedWorkflowState(activeSession, workflowStores);
 					await sessionStore.save(sessionToCompact);
 					const newSession = createCompactedSession(sessionToCompact, result.finalAnswer, preservedMessages, !!(process.env.B4M_SESSION_ID || process.env.B4M_RESUME_ID));
@@ -8270,7 +8526,7 @@ async function runTurn(message, ctx) {
 				isReadOnlyTool,
 				workflowReminder,
 				drainFeedback: diagnostics ? (phase) => diagnostics.drain(DRAIN_BUDGET_MS[phase], abortController.signal) : void 0,
-				onContextLimit: createReactiveCompactionHandler(agent, activeSession, 1 + previousMessages.length + 1)
+				onContextLimit: createReactiveCompactionHandler(agent, activeSession)
 			});
 		} finally {
 			diagnostics?.endTurn();
@@ -8348,7 +8604,7 @@ async function runTurn(message, ctx) {
 			}
 		}
 		const rawMessage = error instanceof Error ? error.message : String(error);
-		if (error instanceof Error && isTransientNetworkError(error)) {
+		if (isConnectionDrop(error)) {
 			console.error("\n❌ The connection to the server dropped mid-response. Type \"continue\" to resume.\n");
 			logger.debug(`Full error details: ${error.stack || error.message}`);
 			return;
@@ -8500,6 +8756,14 @@ async function resumeSession(ctx, selected) {
 * console notice) when there is no session/agent or too little to compact.
 */
 async function compactSession(ctx, options = {}) {
+	const releaseSession = useCliStore.getState().holdSession();
+	try {
+		await compactHeldSession(ctx, options);
+	} finally {
+		releaseSession();
+	}
+}
+async function compactHeldSession(ctx, options) {
 	const session = useCliStore.getState().session;
 	if (!session || !ctx.agent) {
 		console.log("No active session");
@@ -8520,7 +8784,10 @@ async function compactSession(ctx, options = {}) {
 	console.log("🗜️  Compacting conversation...\n");
 	useCliStore.getState().setIsThinking(true);
 	try {
-		const summary = (await ctx.agent.run(compactionPrompt, { maxIterations: 1 })).finalAnswer;
+		const summary = (await ctx.agent.run(compactionPrompt, {
+			maxIterations: 1,
+			streamText: false
+		})).finalAnswer;
 		await ctx.sessionStore.save(session);
 		const oldSessionName = session.name;
 		const newSession = createCompactedSession(session, summary, preservedMessages, !!(process.env.B4M_SESSION_ID || process.env.B4M_RESUME_ID));
@@ -8735,6 +9002,7 @@ function CliApp() {
 		} catch (err) {
 			logger.debug(`[CLEANUP] Shell session reap error: ${err}`);
 		}
+		killRunningBangCommands();
 		const session = useCliStore.getState().session;
 		if (session) cleanupTasks.push(state.sessionStore.save(session).catch((err) => {
 			logger.debug(`[CLEANUP] Session save error: ${err.message}`);
@@ -9028,7 +9296,6 @@ function CliApp() {
 			};
 			const agentContext = {
 				currentAgent: null,
-				observationQueue: [],
 				onFileChanged: (filePath) => postEditDiagnosticsRef.current.enqueue(filePath)
 			};
 			const { mcpManager, agentStore, contextResult, mcpTools, loadedB4mTools, deferredB4mTools, orchestrator, backgroundManager, historyStore } = await buildSupportingStores({
@@ -9095,7 +9362,7 @@ function CliApp() {
 				allowedDirectories: additionalDirectories
 			};
 			const enableSkillTool = config.preferences.enableSkillTool !== false;
-			const skillTool = enableSkillTool ? wrapTools([createSkillTool({
+			const skillTool = enableSkillTool ? createSkillTool({
 				customCommandStore: state.customCommandStore,
 				subagentOrchestrator: orchestrator,
 				sessionId: newSession.id,
@@ -9104,28 +9371,29 @@ function CliApp() {
 					promptFn
 				},
 				allowedDirectories: additionalDirectories
-			})], cliWrapDeps)[0] : null;
-			const findDefinitionTool = wrapTools([createFindDefinitionTool(additionalDirectories)], cliWrapDeps)[0];
-			const getFileStructureTool = wrapTools([createGetFileStructureTool(additionalDirectories)], cliWrapDeps)[0];
+			}) : null;
 			const workItemTools = config.preferences.enableWorkItemTools ? createWorkItemTools(new WorkItemsClient(apiClient)) : [];
-			const cliTools = [
+			const agentToolsRef = { current: null };
+			const toolSearchTool = deferredToolRegistry.size() > 0 ? createToolSearchTool(() => {
+				if (!agentToolsRef.current) throw new Error("tool_search invoked before agent context was wired");
+				return agentToolsRef.current;
+			}) : null;
+			const cliTools = buildCliToolList({
+				toolSearchTool,
 				agentDelegateTool,
-				...backgroundTools,
+				backgroundTools,
 				resumeAgentTool,
 				writeTodosTool,
 				decisionLogTool,
-				...blockerTools,
+				blockerTools,
 				reviewGateTool,
-				findDefinitionTool,
-				getFileStructureTool,
-				...workItemTools
-			];
-			if (skillTool) cliTools.push(skillTool);
-			if (dynamicAgentTool) cliTools.push(dynamicAgentTool);
-			if (config.preferences.enableCoordinatorMode === true) {
-				const coordinateTaskTool = createCoordinateTaskTool(orchestrator, agentStore, newSession.id);
-				cliTools.push(coordinateTaskTool);
-			}
+				findDefinitionTool: createFindDefinitionTool(additionalDirectories),
+				getFileStructureTool: createGetFileStructureTool(additionalDirectories),
+				workItemTools,
+				skillTool,
+				dynamicAgentTool,
+				coordinateTaskTool: config.preferences.enableCoordinatorMode === true ? createCoordinateTaskTool(orchestrator, agentStore, newSession.id) : null
+			}, cliWrapDeps);
 			const pluginDescriptors = await new PluginStore().discover();
 			const { registry: featureRegistry, loaded: loadedPlugins, skipped: skippedPlugins } = await buildFeatureRegistry({
 				builtins: createBuiltinModules(config, apiClient),
@@ -9135,18 +9403,10 @@ function CliApp() {
 				reservedToolNames: [...loadedB4mTools, ...cliTools].map((t) => t.toolSchema.name).concat("tool_search")
 			});
 			rewireReservedNames(state, featureRegistry);
-			const featureModuleToolNames = featureRegistry.getAllToolNames();
-			if (featureModuleToolNames.length > 0) registerFeatureModuleTools(featureModuleToolNames);
 			if (wsManager && featureRegistry.hasModules) featureRegistry.registerAllWsHandlers(wsManager);
 			const featureTools = featureRegistry.getAllTools();
-			const agentToolsRef = { current: null };
-			const toolSearchTool = deferredToolRegistry.size() > 0 ? createToolSearchTool(() => {
-				if (!agentToolsRef.current) throw new Error("tool_search invoked before agent context was wired");
-				return agentToolsRef.current;
-			}) : null;
 			const allTools = [
 				...loadedB4mTools,
-				...toolSearchTool ? [toolSearchTool] : [],
 				...cliTools,
 				...featureTools
 			];
@@ -9163,7 +9423,7 @@ function CliApp() {
 			}
 			if (loadedPlugins.length > 0) startupLog.push(`🔌 Plugins loaded: ${loadedPlugins.join(", ")}`);
 			if (skippedPlugins.length > 0) startupLog.push(`⚠️ Plugins skipped: ${skippedPlugins.map((s) => s.name).join(", ")} (see debug log)`);
-			logger.debug(`Total tools available to agent: ${allTools.length} (${loadedB4mTools.length} B4M loaded + ${cliTools.length} CLI + ${featureTools.length} feature + ${toolSearchTool ? 1 : 0} tool_search, ${deferredB4mTools.length} B4M + ${mcpTools.length} MCP deferred)`);
+			logger.debug(`Total tools available to agent: ${allTools.length} (${loadedB4mTools.length} B4M loaded + ${cliTools.length} CLI + ${featureTools.length} feature, ${deferredB4mTools.length} B4M + ${mcpTools.length} MCP deferred)`);
 			if (contextResult.globalContext) startupLog.push(`📄 Global context: ${contextResult.globalContext.filename}`);
 			if (contextResult.projectContext) startupLog.push(`📄 Project context: ${contextResult.projectContext.filename}`);
 			for (const error of contextResult.errors) startupLog.push(`⚠️  Context file error: ${error}`);
@@ -9193,7 +9453,6 @@ function CliApp() {
 			});
 			wireAgentEvents({
 				agent,
-				agentContext,
 				orchestrator
 			});
 			setState((prev) => ({
@@ -9329,6 +9588,7 @@ function CliApp() {
 			return;
 		}
 		useCliStore.getState().setIsThinking(true);
+		const releaseSession = useCliStore.getState().holdSession();
 		const abortController = new AbortController();
 		setState((prev) => ({
 			...prev,
@@ -9403,7 +9663,7 @@ function CliApp() {
 					signal: abortController.signal,
 					parallelExecution: cliConfig.preferences.enableParallelToolExecution === true,
 					isReadOnlyTool,
-					onContextLimit: createReactiveCompactionHandler(state.agent, session, 1 + previousMessages.length + 1)
+					onContextLimit: createReactiveCompactionHandler(state.agent, session)
 				});
 			} finally {
 				state.backgroundManager?.setCurrentTurn(null);
@@ -9520,6 +9780,7 @@ function CliApp() {
 			}));
 			state.agent.off("thought", stepHandler);
 			state.agent.off("action", stepHandler);
+			releaseSession();
 		}
 	};
 	const handleMessage = (message) => runTurn(message, {
@@ -9572,11 +9833,12 @@ function CliApp() {
 	* without adding a user message to the conversation.
 	*/
 	const handleBackgroundCompletion = async () => {
-		const session = useCliStore.getState().session;
-		if (!state.agent || !session) return;
 		const authTokens = await state.configStore.getAuthTokens();
 		if (!authTokens || new Date(authTokens.expiresAt) <= /* @__PURE__ */ new Date()) return;
+		const session = useCliStore.getState().session;
+		if (!state.agent || !session) return;
 		useCliStore.getState().setIsThinking(true);
+		const releaseSession = useCliStore.getState().holdSession();
 		const abortController = new AbortController();
 		setState((prev) => ({
 			...prev,
@@ -9649,59 +9911,74 @@ function CliApp() {
 				abortController: null
 			}));
 			useCliStore.getState().setIsThinking(false);
+			releaseSession();
 		}
 	};
-	const handleBashCommand = useCallback((command) => {
-		const session = useCliStore.getState().session;
-		if (!session) return;
-		let output;
-		let isError = false;
-		try {
-			output = execSync(command, {
-				encoding: "utf-8",
-				stdio: [
-					"pipe",
-					"pipe",
-					"pipe"
+	const handleBashCommand = useCallback(async (command) => {
+		if (!useCliStore.getState().session) return;
+		const ownsInput = !useCliStore.getState().isThinking;
+		const sessionId = useCliStore.getState().session?.id;
+		const abortController = new AbortController();
+		if (ownsInput) {
+			useCliStore.getState().setIsThinking(true);
+			setState((prev) => ({
+				...prev,
+				abortController
+			}));
+		}
+		const result = await runBangCommand(command, {
+			cwd: process.cwd(),
+			signal: abortController.signal
+		});
+		if (!result) return;
+		const { output, isError } = result;
+		whenTurnIdle(() => {
+			const session = useCliStore.getState().session;
+			if (!session || session.id !== sessionId) return;
+			const userMessage = {
+				id: v4(),
+				role: "user",
+				content: `$ ${command}`,
+				timestamp: (/* @__PURE__ */ new Date()).toISOString()
+			};
+			const assistantMessage = {
+				id: v4(),
+				role: "assistant",
+				content: isError ? `\u274c Error:\n${output}` : output.trim() || "(no output)",
+				timestamp: (/* @__PURE__ */ new Date()).toISOString()
+			};
+			const updatedSession = {
+				...session,
+				messages: [
+					...session.messages,
+					userMessage,
+					assistantMessage
 				],
-				cwd: process.cwd(),
-				maxBuffer: 10485760
+				updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+			};
+			setStoreSession(updatedSession);
+			state.sessionStore.save(updatedSession).catch((error) => {
+				logger.debug(`[BASH] Session save error: ${error instanceof Error ? error.message : String(error)}`);
+			});
+		});
+		setState((prev) => prev.abortController === abortController ? {
+			...prev,
+			abortController: null
+		} : prev);
+		if (ownsInput && !abortController.signal.aborted && useCliStore.getState().sessionHolds === 0) {
+			useCliStore.getState().setIsThinking(false);
+			const queued = useCliStore.getState().dequeueAllMessages();
+			if (queued.length > 0) setImmediate(() => {
+				handleMessageRef.current?.(queued.join("\n\n"));
 			});
-		} catch (error) {
-			const execError = error;
-			output = execError.stderr || execError.message || "Command failed";
-			isError = true;
 		}
-		const userMessage = {
-			id: v4(),
-			role: "user",
-			content: `$ ${command}`,
-			timestamp: (/* @__PURE__ */ new Date()).toISOString()
-		};
-		const assistantMessage = {
-			id: v4(),
-			role: "assistant",
-			content: isError ? `❌ Error:\n${output}` : output.trim() || "(no output)",
-			timestamp: (/* @__PURE__ */ new Date()).toISOString()
-		};
-		const updatedSession = {
-			...session,
-			messages: [
-				...session.messages,
-				userMessage,
-				assistantMessage
-			],
-			updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-		};
-		setStoreSession(updatedSession);
-		state.sessionStore.save(updatedSession);
 	}, [state.sessionStore]);
 	const handleImageDetected = async (imageData) => {
 		try {
 			let imageStore = state.imageStore;
 			if (!imageStore) {
 				if (!imageStoreInitPromise.current) imageStoreInitPromise.current = (async () => {
-					const { ImageStore: ImageStoreClass } = await import("./ImageStore-kVo-oHoS.mjs");
+					const { ImageStore: ImageStoreClass } = await import("./ImageStore-DuI3tgwQ.mjs");
 					const newImageStore = new ImageStoreClass();
 					setState((prev) => ({
 						...prev,
@@ -9820,8 +10097,12 @@ function CliApp() {
 		if (!prompt) return null;
 		console.log("📝 Generating session handoff...");
 		useCliStore.getState().setIsThinking(true);
+		const releaseSession = useCliStore.getState().holdSession();
 		try {
-			const result = await state.agent.run(prompt, { maxIterations: 1 });
+			const result = await state.agent.run(prompt, {
+				maxIterations: 1,
+				streamText: false
+			});
 			const handoff = parseHandoffResponse(result.finalAnswer);
 			if (!handoff) {
 				console.warn("⚠️  Handoff generation returned no parseable JSON; skipping.");
@@ -9852,6 +10133,7 @@ function CliApp() {
 			return null;
 		} finally {
 			useCliStore.getState().setIsThinking(false);
+			releaseSession();
 		}
 	};
 	/**
@@ -10424,7 +10706,7 @@ function CliApp() {
 					return;
 				}
 				try {
-					const diffOutput = state.checkpointStore.getCheckpointDiff(diffTarget);
+					const diffOutput = await state.checkpointStore.getCheckpointDiff(diffTarget);
 					if (!diffOutput.trim()) console.log("No differences found between checkpoint and current state.");
 					else console.log(diffOutput);
 				} catch (err) {
@@ -10462,12 +10744,13 @@ function CliApp() {
 						timestamp: now
 					};
 				} catch (error) {
-					if (isAxiosError(error)) if (error.response?.status === 401) console.log("\n❌ Authentication failed. Run /login to re-authenticate.\n");
-					else if (error.response?.status === 403) console.log("\n❌ Access denied. You may not have permission to view usage data.\n");
-					else if (error.response?.status === 404) console.log("\n❌ Usage endpoint not available on this server.\n");
-					else if (error.code === "ECONNREFUSED" || error.code === "ENOTFOUND") console.log("\n❌ Cannot connect to server. Check your API configuration with /api-info\n");
-					else console.log(`\n❌ Error fetching usage data: ${error.message}\n`);
-					else if (error instanceof Error) console.log(`\n❌ Error: ${error.message}\n`);
+					if (isAxiosError(error)) {
+						if (error.response?.status === 401) console.log("\n❌ Authentication failed. Run /login to re-authenticate.\n");
+						else if (error.response?.status === 403) console.log("\n❌ Access denied. You may not have permission to view usage data.\n");
+						else if (error.response?.status === 404) console.log("\n❌ Usage endpoint not available on this server.\n");
+						else if (error.code === "ECONNREFUSED" || error.code === "ENOTFOUND") console.log("\n❌ Cannot connect to server. Check your API configuration with /api-info\n");
+						else console.log(`\n❌ Error fetching usage data: ${error.message}\n`);
+					} else if (error instanceof Error) console.log(`\n❌ Error: ${error.message}\n`);
 					else console.log("\n❌ Unexpected error fetching usage data. Please try again.\n");
 					break;
 				}
@@ -11038,7 +11321,6 @@ function CliApp() {
 		let newFeatureRegistry = state.featureRegistry;
 		if (featuresChanged && state.agent) {
 			state.featureRegistry?.disposeAll();
-			clearFeatureModuleTools();
 			const apiClient = new ApiClient(requireApiUrl(updatedConfig.apiConfig), state.configStore);
 			const oldFeatureToolNames = new Set(state.featureRegistry?.getAllToolNames() ?? []);
 			const baseTools = state.agent.getTools().filter((t) => !oldFeatureToolNames.has(t.toolSchema.name));
@@ -11053,8 +11335,6 @@ function CliApp() {
 			newFeatureRegistry = rebuiltRegistry;
 			rewireReservedNames(state, rebuiltRegistry);
 			for (const skippedPlugin of rebuilt.skipped) console.error(`\n\x1b[33m⚠️ Plugin ${skippedPlugin.name} skipped: ${skippedPlugin.reason}\x1b[0m`);
-			const newToolNames = newFeatureRegistry.getAllToolNames();
-			if (newToolNames.length > 0) registerFeatureModuleTools(newToolNames);
 			if (state.wsManager && newFeatureRegistry.hasModules) newFeatureRegistry.registerAllWsHandlers(state.wsManager);
 			const newFeatureTools = newFeatureRegistry.getAllTools();
 			state.agent.setTools([...baseTools, ...newFeatureTools]);
@@ -11360,10 +11640,8 @@ function CliApp() {
 		}
 	});
 }
-try {
-	const updateResult = await Promise.race([checkForUpdate(version), new Promise((resolve) => setTimeout(() => resolve(null), 3e3))]);
-	if (updateResult?.updateAvailable) console.log(`\x1b[33m  ⬆ Update available: v${updateResult.currentVersion} → v${updateResult.latestVersion} (run: b4m update)\x1b[0m\n`);
-} catch {}
+const cachedUpdate = await getStartupUpdateStatus(version);
+if (cachedUpdate?.updateAvailable) console.log(`\x1b[33m  \u2b06 Update available: v${cachedUpdate.currentVersion} \u2192 v${cachedUpdate.latestVersion} (run: b4m update)\x1b[0m\n`);
 if (import.meta.url.includes("/src/") || process.env.NODE_ENV === "development") logger.debug("🔧 Running in development mode (using TypeScript source)\n");
 warmFileCache();
 render(/* @__PURE__ */ React.createElement(CliApp, null), { exitOnCtrlC: false });