@bike4mind/cli 0.8.0 → 0.9.0

package/dist/index.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { n as useCliStore, t as selectActiveBackgroundAgents } from "./store-B0ImnWR4.mjs";
-import { $ as CommandHistoryStore, A as formatStep, B as DEFAULT_RETRY_CONFIG, C as WebSocketToolExecutor, D as ServerLlmBackend, E as WebSocketLlmBackend, F as PermissionManager, G as OllamaBackend, H as clearFeatureModuleTools, I as generateCliTools, J as buildSkillsPromptSection, K as getPlanModeFilePath, L as ALWAYS_DENIED_FOR_AGENTS, M as loadContextFiles, N as getApiUrl, O as McpManager, P as getEnvironmentName, Q as CheckpointStore, R as DEFAULT_AGENT_MODEL, S as ApiClient, T as FallbackLlmBackend, U as registerFeatureModuleTools, V as DEFAULT_THOROUGHNESS, W as setWebSocketToolExecutor, X as ReActAgent, Y as isReadOnlyTool, Z as CustomCommandStore, _ as createAgentDelegateTool, a as createBlockerTools, at as mergeCommands, b as createSkillTool, c as createDecisionStore, ct as warmFileCache, d as createFindDefinitionTool, et as SessionStore, f as createTodoStore, g as BackgroundAgentManager, h as createBackgroundAgentTools, i as createBlockerStore, it as searchCommands, j as extractCompactInstructions, k as substituteArguments, l as formatDecisionsOutput, m as createCoordinateTaskTool, n as createReviewGateTool, nt as hasFileReferences, o as formatBlockersOutput, ot as formatFileSize, p as createWriteTodosTool, q as buildSystemPrompt, r as formatReviewGatesOutput, rt as processFileReferences, s as createDecisionLogTool, st as searchFiles, t as createReviewGateStore, tt as OAuthClient, u as createGetFileStructureTool, v as AgentStore, w as WebSocketConnectionManager, x as parseAgentConfig, y as SubagentOrchestrator, z as DEFAULT_MAX_ITERATIONS } from "./tools-Dg1HL5PO.mjs";
-import { Mt as validateNotebookPath$1, g as ChatModels, jt as validateJupyterKernelName, m as CREDIT_DEDUCT_TRANSACTION_TYPES, n as logger, t as ConfigStore } from "./ConfigStore-Bj1IOvWn.mjs";
-import { a as version, t as checkForUpdate } from "./updateChecker-Bbkc_8IL.mjs";
+import { n as useCliStore, t as selectActiveBackgroundAgents } from "./store-DLduYYGR.mjs";
+import { $ as CommandHistoryStore, A as formatStep, B as DEFAULT_RETRY_CONFIG, C as WebSocketToolExecutor, D as ServerLlmBackend, E as WebSocketLlmBackend, F as PermissionManager, G as OllamaBackend, H as clearFeatureModuleTools, I as generateCliTools, J as buildSkillsPromptSection, K as getPlanModeFilePath, L as ALWAYS_DENIED_FOR_AGENTS, M as loadContextFiles, N as getApiUrl, O as McpManager, P as getEnvironmentName, Q as CheckpointStore, R as DEFAULT_AGENT_MODEL, S as ApiClient, T as FallbackLlmBackend, U as registerFeatureModuleTools, V as DEFAULT_THOROUGHNESS, W as setWebSocketToolExecutor, X as ReActAgent, Y as isReadOnlyTool, Z as CustomCommandStore, _ as createAgentDelegateTool, a as createBlockerTools, at as mergeCommands, b as createSkillTool, c as createDecisionStore, ct as warmFileCache, d as createFindDefinitionTool, et as SessionStore, f as createTodoStore, g as BackgroundAgentManager, h as createBackgroundAgentTools, i as createBlockerStore, it as searchCommands, j as extractCompactInstructions, k as substituteArguments, l as formatDecisionsOutput, m as createCoordinateTaskTool, n as createReviewGateTool, nt as hasFileReferences, o as formatBlockersOutput, ot as formatFileSize, p as createWriteTodosTool, q as buildSystemPrompt, r as formatReviewGatesOutput, rt as processFileReferences, s as createDecisionLogTool, st as searchFiles, t as createReviewGateStore, tt as OAuthClient, u as createGetFileStructureTool, v as AgentStore, w as WebSocketConnectionManager, x as parseAgentConfig, y as SubagentOrchestrator, z as DEFAULT_MAX_ITERATIONS } from "./tools-B0Y_zziv.mjs";
+import { Nt as validateJupyterKernelName, Pt as validateNotebookPath$1, g as ChatModels, m as CREDIT_DEDUCT_TRANSACTION_TYPES, n as logger, t as ConfigStore } from "./ConfigStore-CAKSUXCi.mjs";
+import { a as version, t as checkForUpdate } from "./updateChecker-CtczXQeW.mjs";
 import React, { useCallback, useEffect, useMemo, useReducer, useRef, useState } from "react";
-import { Box, Static, Text, render, useApp, useInput } from "ink";
+import { Box, Static, Text, render, useApp, useInput, usePaste, useStdout } from "ink";
 import { execSync } from "child_process";
 import { randomBytes, randomUUID } from "crypto";
 import { existsSync, promises, readFileSync, statSync } from "fs";
@@ -13,6 +13,7 @@ import path, { basename, extname, join } from "path";
 import { v4 } from "uuid";
 import * as path$1 from "node:path";
 import Spinner from "ink-spinner";
+import { useShallow } from "zustand/react/shallow";
 import TextInput from "ink-text-input";
 import { marked } from "marked";
 import { highlight } from "cli-highlight";
@@ -24,20 +25,23 @@ import axios, { isAxiosError } from "axios";
 import { get_encoding } from "tiktoken";
 import WsWebSocket from "ws";
 //#region src/components/StatusBar.tsx
-const StatusBar = React.memo(function StatusBar({ sessionName, model, tokenUsage, creditsUsage }) {
+const StatusBar = React.memo(function StatusBar({ isBashMode, model, tokenUsage, creditsUsage }) {
 	const interactionMode = useCliStore((state) => state.interactionMode);
 	return /* @__PURE__ */ React.createElement(Box, {
 		flexDirection: "row",
 		justifyContent: "space-between",
 		width: "100%",
 		paddingX: 1
-	}, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, sessionName), /* @__PURE__ */ React.createElement(Box, { gap: 2 }, interactionMode === "auto-accept" && /* @__PURE__ */ React.createElement(Text, {
+	}, /* @__PURE__ */ React.createElement(Box, { gap: 2 }, isBashMode ? /* @__PURE__ */ React.createElement(Text, {
+		color: "yellow",
+		bold: true
+	}, "BASH") : null, interactionMode === "auto-accept" && /* @__PURE__ */ React.createElement(Text, {
 		color: "green",
 		bold: true
 	}, "AUTO ACCEPT: Edits"), interactionMode === "plan" && /* @__PURE__ */ React.createElement(Text, {
 		color: "yellow",
 		bold: true
-	}, "PLAN MODE"), tokenUsage > 0 && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, tokenUsage.toLocaleString(), " tokens"), creditsUsage !== void 0 && creditsUsage > 0 && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, creditsUsage.toLocaleString(), " ", creditsUsage === 1 ? "credit" : "credits"), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, model)));
+	}, "PLAN MODE")), /* @__PURE__ */ React.createElement(Box, { gap: 2 }, tokenUsage > 0 && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, tokenUsage.toLocaleString(), " tokens"), creditsUsage !== void 0 && creditsUsage > 0 && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, creditsUsage.toLocaleString(), " ", creditsUsage === 1 ? "credit" : "credits"), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, model)));
 });
 /**
 * Maximum paste size in characters (~500KB) to prevent memory issues
@@ -77,6 +81,20 @@ function CustomTextInput({ value, onChange, onSubmit, onPaste, pasteIndicator, p
 		while (pos < text.length && /\s/.test(text[pos])) pos++;
 		return pos;
 	};
+	usePaste((text) => {
+		const normalized = (text.length > 5e5 ? text.slice(0, MAX_PASTE_SIZE) : text).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+		if (normalized.split("\n").length >= 5 && onPaste) {
+			onPaste(normalized);
+			return;
+		}
+		if (pasteIndicator) {
+			emitChange(normalized);
+			setCursorOffset(normalized.length);
+			return;
+		}
+		emitChange(value.slice(0, cursorOffset) + normalized + value.slice(cursorOffset));
+		setCursorOffset(cursorOffset + normalized.length);
+	}, { isActive: !disabled });
 	useInput((input, key) => {
 		if (key.return && !key.meta && !key.shift) {
 			if (value.length > 0 && value[cursorOffset - 1] === "\\") {
@@ -101,7 +119,7 @@ function CustomTextInput({ value, onChange, onSubmit, onPaste, pasteIndicator, p
 				setCursorOffset(findNextWordBoundary(value, cursorOffset));
 				return;
 			}
-			if (key.backspace || key.delete) {
+			if (key.backspace) {
 				const beforeCursor = value.slice(0, cursorOffset);
 				const afterCursor = value.slice(cursorOffset);
 				const newPos = findPreviousWordBoundary(beforeCursor, beforeCursor.length);
@@ -109,6 +127,13 @@ function CustomTextInput({ value, onChange, onSubmit, onPaste, pasteIndicator, p
 				setCursorOffset(newPos);
 				return;
 			}
+			if (key.delete) {
+				const beforeCursor = value.slice(0, cursorOffset);
+				const afterCursor = value.slice(cursorOffset);
+				const newPos = findNextWordBoundary(afterCursor, 0);
+				emitChange(beforeCursor + afterCursor.slice(newPos));
+				return;
+			}
 		} else {
 			if (key.leftArrow) {
 				setCursorOffset(0);
@@ -118,11 +143,15 @@ function CustomTextInput({ value, onChange, onSubmit, onPaste, pasteIndicator, p
 				setCursorOffset(value.length);
 				return;
 			}
-			if (key.backspace || key.delete) {
+			if (key.backspace) {
 				emitChange(value.slice(cursorOffset));
 				setCursorOffset(0);
 				return;
 			}
+			if (key.delete) {
+				emitChange(value.slice(0, cursorOffset));
+				return;
+			}
 		}
 		if (key.home) {
 			setCursorOffset(0);
@@ -191,7 +220,7 @@ function CustomTextInput({ value, onChange, onSubmit, onPaste, pasteIndicator, p
 				}
 				return;
 		}
-		if (key.backspace || key.delete) {
+		if (key.backspace) {
 			if (pasteIndicator) {
 				emitChange("");
 				setCursorOffset(0);
@@ -203,6 +232,15 @@ function CustomTextInput({ value, onChange, onSubmit, onPaste, pasteIndicator, p
 			}
 			return;
 		}
+		if (key.delete) {
+			if (pasteIndicator) {
+				emitChange("");
+				setCursorOffset(0);
+				return;
+			}
+			if (cursorOffset < value.length) emitChange(value.slice(0, cursorOffset) + value.slice(cursorOffset + 1));
+			return;
+		}
 		if (key.leftArrow && !key.meta && !key.ctrl) {
 			setCursorOffset(Math.max(0, cursorOffset - 1));
 			return;
@@ -724,10 +762,9 @@ function InputPrompt({ onSubmit, onBashCommand, onImageDetected, disabled = fals
 		setFileAutocomplete(null);
 	};
 	const handlePaste = (content) => {
-		const truncated = content.length > 5e5 ? content.slice(0, MAX_PASTE_SIZE) : content;
-		const lineCount = truncated.split("\n").length;
+		const lineCount = content.split("\n").length;
 		const prefix = value.trim();
-		setPastedContent(prefix ? `${prefix}\n${truncated}` : truncated, lineCount);
+		setPastedContent(prefix ? `${prefix}\n${content}` : content, lineCount);
 	};
 	const handleChange = async (newValue) => {
 		if (pastedContent) clearPaste();
@@ -883,7 +920,7 @@ function groupJobsByTurn(jobs) {
 * Only renders when there are active (running/queued) background agents.
 */
 function BackgroundAgentStatus() {
-	const activeJobs = useCliStore(selectActiveBackgroundAgents);
+	const activeJobs = useCliStore(useShallow(selectActiveBackgroundAgents));
 	const permissionPrompt = useCliStore((state) => state.permissionPrompt);
 	const { groups, ungrouped } = useMemo(() => groupJobsByTurn(activeJobs), [activeJobs]);
 	if (activeJobs.length === 0) return null;
@@ -985,6 +1022,7 @@ function renderDiffPreview(preview) {
 		}, line);
 	});
 }
+const TOOLS_WITH_HIDDEN_ARGS$1 = new Set(["edit_local_file"]);
 /**
 * Permission prompt component
 *
@@ -992,6 +1030,7 @@ function renderDiffPreview(preview) {
 * Waits indefinitely for user response (like Claude Code).
 */
 function PermissionPrompt({ toolName, toolDescription, args, preview, canBeTrusted, onResponse }) {
+	const hideArgs = TOOLS_WITH_HIDDEN_ARGS$1.has(toolName);
 	const items = canBeTrusted ? [
 		{
 			label: "✓ Allow once",
@@ -1082,7 +1121,7 @@ function PermissionPrompt({ toolName, toolDescription, args, preview, canBeTrust
 	}, headerText)), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "Tool: "), /* @__PURE__ */ React.createElement(Text, {
 		bold: true,
 		color: "cyan"
-	}, toolName)), toolDescription && /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "Action: "), /* @__PURE__ */ React.createElement(Text, null, toolDescription)), /* @__PURE__ */ React.createElement(Box, {
+	}, toolName)), toolDescription && /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "Action: "), /* @__PURE__ */ React.createElement(Text, null, toolDescription)), !hideArgs && /* @__PURE__ */ React.createElement(Box, {
 		marginTop: 1,
 		flexDirection: "column"
 	}, /* @__PURE__ */ React.createElement(Text, { bold: true }, "Arguments:"), /* @__PURE__ */ React.createElement(Box, {
@@ -1409,6 +1448,39 @@ function ReviewGatePrompt({ description, options, recommendation, onResponse })
 	}))), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, noteMode ? note.trim().length === 0 ? "Note required — type a note + Enter to submit, ↑↓ to switch action" : "Type note + Enter to submit, ↑↓ to switch action" : "Press 1-4, y/n, or ↑↓ + Enter")));
 }
 //#endregion
+//#region src/components/ExitHandoffPrompt.tsx
+/**
+* Single-shot y/n prompt shown on exit when the session is eligible for a
+* handoff (meaningful content, no existing handoff). Defaults to "yes" on
+* Enter so the common case (preserve continuity) is one keystroke away.
+*/
+function ExitHandoffPrompt({ onResponse }) {
+	const respondedRef = useRef(false);
+	const [responded, setResponded] = useState(false);
+	const respond = useCallback((generate) => {
+		if (respondedRef.current) return;
+		respondedRef.current = true;
+		setResponded(true);
+		onResponse(generate);
+	}, [onResponse]);
+	useInput((input, key) => {
+		if (respondedRef.current) return;
+		const lower = input.toLowerCase();
+		if (lower === "y" || key.return) respond(true);
+		else if (lower === "n" || key.escape) respond(false);
+	}, { isActive: !responded });
+	return /* @__PURE__ */ React.createElement(Box, {
+		flexDirection: "column",
+		borderStyle: "round",
+		borderColor: "cyan",
+		paddingX: 1,
+		marginY: 1
+	}, /* @__PURE__ */ React.createElement(Text, {
+		bold: true,
+		color: "cyan"
+	}, "🤝 Generate a handoff for this session before exiting? (Y/n)"), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "The handoff captures key findings, next steps, and open blockers."));
+}
+//#endregion
 //#region src/components/ConfigEditor.tsx
 /**
 * Max iterations options: 10, 20, 30, 40, 50, Infinite (null)
@@ -1549,6 +1621,18 @@ function buildConfigItems(availableModels) {
 				autoCompact: value
 			}
 		})
+	}, {
+		key: "showThoughts",
+		label: "Show Thoughts",
+		type: "boolean",
+		getValue: (config) => config.preferences.showThoughts ?? true,
+		setValue: (config, value) => ({
+			...config,
+			preferences: {
+				...config.preferences,
+				showThoughts: value
+			}
+		})
 	}, {
 		key: "theme",
 		label: "Theme",
@@ -1859,21 +1943,22 @@ function McpViewer({ config, mcpManager, onClose }) {
 }
 //#endregion
 //#region src/components/MarkdownRenderer.tsx
-function MarkdownRenderer({ content }) {
+function MarkdownRenderer({ content, columns: columnsProp }) {
+	const columns = columnsProp ?? process.stdout.columns ?? 80;
 	const tokens = marked.lexer(content);
-	return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, tokens.map((token, idx) => renderToken(token, idx)));
+	return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, tokens.map((token, idx) => renderToken(token, idx, columns)));
 }
-function renderToken(token, idx) {
+function renderToken(token, idx, columns) {
 	switch (token.type) {
 		case "heading": return renderHeading(token, idx);
 		case "code": return renderCodeBlock(token, idx);
 		case "paragraph": return renderParagraph(token, idx);
 		case "list": return renderList(token, idx);
-		case "blockquote": return renderBlockquote(token, idx);
+		case "blockquote": return renderBlockquote(token, idx, columns);
 		case "hr": return /* @__PURE__ */ React.createElement(Text, {
 			key: idx,
 			dimColor: true
-		}, "─".repeat(50));
+		}, "─".repeat(Math.max(1, columns - 4)));
 		case "space": return null;
 		default:
 			if ("text" in token) return /* @__PURE__ */ React.createElement(Text, { key: idx }, token.text);
@@ -1932,14 +2017,14 @@ function renderListItem(item, idx, ordered, number) {
 		paddingLeft: 2
 	}, /* @__PURE__ */ React.createElement(Text, null, bullet, " ", parseInlineText(item.text)));
 }
-function renderBlockquote(token, idx) {
+function renderBlockquote(token, idx, columns) {
 	return /* @__PURE__ */ React.createElement(Box, {
 		key: idx,
 		paddingLeft: 2,
 		borderStyle: "single",
 		borderLeft: true,
 		borderColor: "gray"
-	}, token.tokens.map((t, i) => renderToken(t, i)));
+	}, token.tokens.map((t, i) => renderToken(t, i, columns)));
 }
 /**
 * Parse inline markdown formatting (bold, italic, code, links)
@@ -1981,34 +2066,45 @@ function truncateValue(value, maxLength) {
 	if (str.length <= maxLength) return str;
 	return str.slice(0, maxLength) + "...";
 }
+const TOOLS_WITH_HIDDEN_ARGS = new Set(["edit_local_file"]);
 /**
 * Returns display properties for a message role
 */
-const MessageItem = React.memo(function MessageItem({ message }) {
+const MessageItem = React.memo(function MessageItem({ message, showThoughts = true }) {
 	const isUser = message.role === "user";
+	const { stdout } = useStdout();
+	const terminalCols = stdout?.columns ?? 80;
+	const userPromptText = `❯ ${message.content}`;
+	const paddedUserPromptText = userPromptText.length >= terminalCols - 2 ? userPromptText : userPromptText.padEnd(terminalCols - 2);
 	return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, isUser && message.content && /* @__PURE__ */ React.createElement(Box, { marginBottom: 1 }, /* @__PURE__ */ React.createElement(Text, {
 		backgroundColor: "whiteBright",
-		color: "black"
-	}, "❯ ", message.content, " ")), !isUser && message.metadata?.steps && message.metadata.steps.filter((s) => ["thought", "action"].includes(s.type)).length > 0 && /* @__PURE__ */ React.createElement(Box, {
+		color: "black",
+		wrap: "truncate-end"
+	}, paddedUserPromptText)), !isUser && message.metadata?.steps && message.metadata.steps.filter((s) => showThoughts && s.type === "thought" || s.type === "action").length > 0 && /* @__PURE__ */ React.createElement(Box, {
 		paddingLeft: 2,
 		flexDirection: "column",
 		marginBottom: 1
 	}, message.metadata.steps.map((step, idx) => {
-		if (step.type === "thought") return /* @__PURE__ */ React.createElement(Box, {
-			key: idx,
-			marginTop: 1,
-			flexDirection: "column"
-		}, /* @__PURE__ */ React.createElement(Text, { color: "blue" }, "💭 Thought:"), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   ${step.content}`));
+		if (step.type === "thought") {
+			if (!showThoughts) return null;
+			return /* @__PURE__ */ React.createElement(Box, {
+				key: idx,
+				marginTop: 1,
+				flexDirection: "column"
+			}, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `💭 ${step.content}`));
+		}
 		if (step.type === "action") {
 			const toolName = step.metadata?.toolName || "unknown";
+			const formattedToolName = toolName.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
 			const toolInput = step.metadata?.toolInput;
+			const hideArgs = TOOLS_WITH_HIDDEN_ARGS.has(toolName);
 			const observationStep = message.metadata?.steps?.[idx + 1];
 			const result = observationStep?.type === "observation" ? observationStep.content : null;
 			return /* @__PURE__ */ React.createElement(Box, {
 				key: idx,
 				marginTop: 1,
 				flexDirection: "column"
-			}, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "🔧 ", toolName), toolInput && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   Input: ${truncateValue(toolInput, 100)}`), result && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   Result: ${truncateValue(result, 200)}`));
+			}, /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, formattedToolName), toolInput && !hideArgs && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, ` • ${truncateValue(toolInput, 100)}`)), result && /* @__PURE__ */ React.createElement(Box, { paddingLeft: 2 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `Result: ${truncateValue(result, 200)}`)));
 		}
 		return null;
 	}).filter(Boolean)), !isUser && message.content !== "..." && /* @__PURE__ */ React.createElement(Box, {
@@ -2022,9 +2118,9 @@ const MessageItem = React.memo(function MessageItem({ message }) {
 //#endregion
 //#region src/components/App.tsx
 function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPermissionResponse, onUserQuestionResponse, onReviewGateResponse, onImageDetected, commandHistory = [], commands = [], config, availableModels = [], onSaveConfig, prefillInput, onPrefillConsumed, mcpManager }) {
-	const messages = useCliStore((state) => state.session?.messages || []);
+	const messages = useCliStore(useShallow((state) => state.session?.messages || []));
 	const pendingMessages = useCliStore((state) => state.pendingMessages);
-	const sessionName = useCliStore((state) => state.session?.name || "New Session");
+	const messageQueue = useCliStore((state) => state.messageQueue);
 	const currentModel = useCliStore((state) => state.session?.model || ChatModels.CLAUDE_4_5_SONNET);
 	const totalTokens = useCliStore((state) => state.session?.metadata.totalTokens || 0);
 	const totalCredits = useCliStore((state) => state.session?.metadata.totalCredits);
@@ -2032,6 +2128,8 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 	const permissionPrompt = useCliStore((state) => state.permissionPrompt);
 	const userQuestionPrompt = useCliStore((state) => state.userQuestionPrompt);
 	const reviewGatePrompt = useCliStore((state) => state.reviewGatePrompt);
+	const exitHandoffPrompt = useCliStore((state) => state.exitHandoffPrompt);
+	const setExitHandoffPrompt = useCliStore((state) => state.setExitHandoffPrompt);
 	const showConfigEditor = useCliStore((state) => state.showConfigEditor);
 	const setShowConfigEditor = useCliStore((state) => state.setShowConfigEditor);
 	const showMcpViewer = useCliStore((state) => state.showMcpViewer);
@@ -2056,6 +2154,9 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 		if (key.tab && key.shift) cycleInteractionMode();
 	});
 	const [isBashMode, setIsBashMode] = useState(false);
+	const showThoughts = config?.preferences.showThoughts ?? true;
+	const { stdout } = useStdout();
+	const terminalCols = stdout?.columns ?? 80;
 	const handleSubmit = React.useCallback(async (input) => {
 		const trimmed = input.trim();
 		if (!trimmed) return;
@@ -2064,17 +2165,21 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 			await onCommand(command, args);
 			return;
 		}
+		let messageToSend = trimmed;
+		if (hasFileReferences(trimmed)) {
+			const processed = await processFileReferences(trimmed);
+			messageToSend = processed.content;
+			if (processed.errors.length > 0) {
+				const errorBlock = processed.errors.map((e) => `[Warning: ${e}]`).join("\n");
+				messageToSend = `${messageToSend}\n\n${errorBlock}`;
+			}
+		}
+		if (useCliStore.getState().isThinking) {
+			useCliStore.getState().enqueueMessage(messageToSend);
+			return;
+		}
 		setIsThinking(true);
 		try {
-			let messageToSend = trimmed;
-			if (hasFileReferences(trimmed)) {
-				const processed = await processFileReferences(trimmed);
-				messageToSend = processed.content;
-				if (processed.errors.length > 0) {
-					const errorBlock = processed.errors.map((e) => `[Warning: ${e}]`).join("\n");
-					messageToSend = `${messageToSend}\n\n${errorBlock}`;
-				}
-			}
 			await onMessage(messageToSend);
 		} finally {
 			setIsThinking(false);
@@ -2084,7 +2189,10 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 		onCommand,
 		setIsThinking
 	]);
-	return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, showConfigEditor && config && onSaveConfig ? /* @__PURE__ */ React.createElement(Box, {
+	return /* @__PURE__ */ React.createElement(Box, {
+		flexDirection: "column",
+		height: "100%"
+	}, showConfigEditor && config && onSaveConfig ? /* @__PURE__ */ React.createElement(Box, {
 		flexDirection: "column",
 		paddingX: 1
 	}, /* @__PURE__ */ React.createElement(ConfigEditor, {
@@ -2103,11 +2211,17 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 		key: message.id,
 		flexDirection: "column",
 		paddingX: 1
-	}, /* @__PURE__ */ React.createElement(MessageItem, { message }))), /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, pendingMessages.map((message) => /* @__PURE__ */ React.createElement(Box, {
+	}, /* @__PURE__ */ React.createElement(MessageItem, {
+		message,
+		showThoughts
+	}))), /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, pendingMessages.map((message) => /* @__PURE__ */ React.createElement(Box, {
 		key: message.id,
 		flexDirection: "column",
 		paddingX: 1
-	}, /* @__PURE__ */ React.createElement(MessageItem, { message })))), permissionPrompt && /* @__PURE__ */ React.createElement(Box, {
+	}, /* @__PURE__ */ React.createElement(MessageItem, {
+		message,
+		showThoughts
+	})))), permissionPrompt && /* @__PURE__ */ React.createElement(Box, {
 		key: permissionPrompt.id,
 		flexDirection: "column",
 		paddingX: 1
@@ -2133,88 +2247,59 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 		options: reviewGatePrompt.options,
 		recommendation: reviewGatePrompt.recommendation,
 		onResponse: (response) => onReviewGateResponse(response, reviewGatePrompt.id)
-	})), !permissionPrompt && !userQuestionPrompt && !reviewGatePrompt && /* @__PURE__ */ React.createElement(AgentThinking, null), /* @__PURE__ */ React.createElement(BackgroundAgentStatus, null), /* @__PURE__ */ React.createElement(CompletedGroupNotification, null), exitRequested && /* @__PURE__ */ React.createElement(Box, {
+	})), exitHandoffPrompt && /* @__PURE__ */ React.createElement(Box, {
+		key: exitHandoffPrompt.id,
+		flexDirection: "column",
+		paddingX: 1
+	}, /* @__PURE__ */ React.createElement(ExitHandoffPrompt, { onResponse: (generate) => {
+		const target = exitHandoffPrompt;
+		setExitHandoffPrompt(null);
+		target.resolve(generate);
+	} })), !permissionPrompt && !userQuestionPrompt && !reviewGatePrompt && !exitHandoffPrompt && /* @__PURE__ */ React.createElement(AgentThinking, null), /* @__PURE__ */ React.createElement(BackgroundAgentStatus, null), /* @__PURE__ */ React.createElement(CompletedGroupNotification, null), exitRequested && /* @__PURE__ */ React.createElement(Box, {
 		paddingX: 1,
 		marginBottom: 1
 	}, /* @__PURE__ */ React.createElement(Text, {
 		color: "yellow",
 		bold: true
-	}, "Press Ctrl+C again to exit")), /* @__PURE__ */ React.createElement(Box, {
+	}, "Press Ctrl+C again to exit"))), /* @__PURE__ */ React.createElement(Box, {
+		flexDirection: "column",
+		flexShrink: 0
+	}, messageQueue.length > 0 && /* @__PURE__ */ React.createElement(Box, {
+		flexDirection: "column",
+		paddingX: 1,
+		marginBottom: 1
+	}, messageQueue.map((queuedMessage, idx) => {
+		const rowText = `❯ ${queuedMessage}`;
+		const padded = rowText.length >= terminalCols - 2 ? rowText : rowText.padEnd(terminalCols - 2);
+		return /* @__PURE__ */ React.createElement(Text, {
+			key: idx,
+			backgroundColor: "gray",
+			color: "white",
+			wrap: "truncate-end"
+		}, padded);
+	})), /* @__PURE__ */ React.createElement(Box, {
 		borderStyle: "single",
 		borderColor: isBashMode ? "yellow" : "cyan",
-		paddingX: 1
+		borderTop: true,
+		borderBottom: true
 	}, /* @__PURE__ */ React.createElement(InputPrompt, {
 		onSubmit: handleSubmit,
 		onBashCommand,
 		onImageDetected,
-		disabled: isThinking || !!permissionPrompt || !!userQuestionPrompt || !!reviewGatePrompt,
+		disabled: !!permissionPrompt || !!userQuestionPrompt || !!reviewGatePrompt || !!exitHandoffPrompt,
 		history: commandHistory,
 		commands,
 		prefillInput,
 		onPrefillConsumed,
 		onBashModeChange: setIsBashMode
 	})), /* @__PURE__ */ React.createElement(StatusBar, {
-		sessionName,
+		isBashMode,
 		model: currentModel,
 		tokenUsage: totalTokens,
 		creditsUsage: totalCredits
-	})));
+	}))));
 }
 //#endregion
-//#region src/components/MessageList.tsx
-/**
-* Strip <think>...</think> tags from message content for cleaner display
-* The agent uses these tags internally for reasoning, but users don't need to see them
-*/
-function stripThinkingTags(content) {
-	return content.replace(/<think>[\s\S]*?<\/think>/g, "").trim();
-}
-React.memo(function MessageList({ messages }) {
-	if (messages.length === 0) return /* @__PURE__ */ React.createElement(Box, { paddingY: 1 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "No messages yet. Type a message to start!"));
-	return /* @__PURE__ */ React.createElement(Box, {
-		flexDirection: "column",
-		gap: 1,
-		paddingY: 1
-	}, messages.map((message, index) => /* @__PURE__ */ React.createElement(Box, {
-		key: index,
-		flexDirection: "column",
-		marginBottom: 1
-	}, /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, {
-		bold: true,
-		color: message.role === "user" ? "cyan" : "green"
-	}, message.role === "user" ? "👤 You" : "🤖 Assistant"), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, " • ", new Date(message.timestamp).toLocaleTimeString())), /* @__PURE__ */ React.createElement(Box, { paddingLeft: 2 }, message.metadata?.permissionDenied ? /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "⚠️ ", stripThinkingTags(message.content)) : /* @__PURE__ */ React.createElement(Text, null, stripThinkingTags(message.content))), message.metadata?.steps && message.metadata.steps.length > 0 && /* @__PURE__ */ React.createElement(Box, {
-		paddingLeft: 2,
-		marginTop: 1,
-		flexDirection: "column"
-	}, /* @__PURE__ */ React.createElement(Text, {
-		dimColor: true,
-		bold: true
-	}, "🔧 Agent Reasoning Trace (", message.metadata.steps.filter((s) => s.type === "action").length, " tools used,", " ", message.metadata.steps.length, " total steps)", message.metadata.tokenUsage && ` • ${message.metadata.tokenUsage.total} tokens`), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "Step types: ", message.metadata.steps.map((s) => s.type).join(", ")), message.metadata.steps.map((step, idx) => {
-		if (step.type === "thought") return /* @__PURE__ */ React.createElement(Box, {
-			key: idx,
-			paddingLeft: 2,
-			marginTop: 1,
-			flexDirection: "column"
-		}, /* @__PURE__ */ React.createElement(Text, { color: "blue" }, "💭 Thought:"), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   ${step.content.slice(0, 200)}${step.content.length > 200 ? "..." : ""}`));
-		if (step.type === "action") {
-			const toolName = step.metadata?.toolName || "unknown";
-			const toolInput = step.metadata?.toolInput;
-			const observationStep = message.metadata.steps[idx + 1];
-			const result = observationStep?.type === "observation" ? observationStep.content : null;
-			return /* @__PURE__ */ React.createElement(Box, {
-				key: idx,
-				paddingLeft: 2,
-				marginTop: 1,
-				flexDirection: "column"
-			}, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "🔧 Action: ", toolName), toolInput && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   Input: ${typeof toolInput === "string" ? toolInput : JSON.stringify(toolInput).slice(0, 100)}`), result && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   Result: ${typeof result === "string" ? result.slice(0, 200) : JSON.stringify(result).slice(0, 200)}${(typeof result === "string" ? result.length : JSON.stringify(result).length) > 200 ? "..." : ""}`));
-		}
-		return null;
-	}).filter(Boolean)), message.metadata?.tokenUsage && (!message.metadata.steps || message.metadata.steps.length === 0) && /* @__PURE__ */ React.createElement(Box, { paddingLeft: 2 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `${message.metadata.tokenUsage.total} tokens`)))));
-}, (prevProps, nextProps) => {
-	if (prevProps.messages.length !== nextProps.messages.length) return false;
-	return prevProps.messages === nextProps.messages;
-});
-//#endregion
 //#region src/components/TrustLocationSelector.tsx
 function TrustLocationSelector({ inProject, onSelect, onCancel }) {
 	const items = [];
@@ -2551,89 +2636,6 @@ function getTokenCounter() {
 	if (!tokenCounter) tokenCounter = new TokenCounter();
 	return tokenCounter;
 }
-//#endregion
-//#region src/utils/compaction.ts
-/**
-* Build a prompt for the LLM to summarize the conversation.
-*
-* Preserves the most recent exchanges to maintain conversational flow,
-* while summarizing older messages to reduce context size.
-*
-* @param messages - All messages in the current session
-* @param options - Compaction options
-* @returns The summarization prompt and messages to preserve
-*/
-function buildCompactionPrompt(messages, options = {}) {
-	const preserveCount = (options.preserveRecentExchanges ?? 2) * 2;
-	if (messages.length <= preserveCount) return {
-		prompt: "",
-		preservedMessages: messages
-	};
-	const messagesToSummarize = messages.slice(0, -preserveCount);
-	const preservedMessages = messages.slice(-preserveCount);
-	let prompt = `You are summarizing a conversation for context continuity. Create a concise summary that captures:
-
-- Key decisions made
-- Important context established
-- Files and code discussed
-- Current task state
-- Any pending items or next steps
-
-`;
-	if (options.claudeMdInstructions) prompt += `Project-specific compaction instructions:\n${options.claudeMdInstructions}\n\n`;
-	if (options.userInstructions) prompt += `Additional focus: ${options.userInstructions}\n\n`;
-	prompt += `CONVERSATION TO SUMMARIZE:\n\n`;
-	const roleLabels = {
-		user: "User",
-		assistant: "Assistant",
-		system: "System"
-	};
-	for (const msg of messagesToSummarize) {
-		const roleLabel = roleLabels[msg.role] || "System";
-		const content = msg.content.length > 2e3 ? msg.content.slice(0, 2e3) + "...[truncated]" : msg.content;
-		prompt += `**${roleLabel}:** ${content}\n\n`;
-	}
-	prompt += `\nProvide a concise summary (aim for 500-1000 words) that an AI assistant can use to continue this conversation with full context.`;
-	return {
-		prompt,
-		preservedMessages
-	};
-}
-/**
-* Create a new compacted session from an original session.
-*
-* The new session contains:
-* 1. A system message with the conversation summary
-* 2. The preserved recent messages
-*
-* @param originalSession - The session being compacted
-* @param summary - The LLM-generated summary of older messages
-* @param preservedMessages - Recent messages to keep verbatim
-* @returns A new session with compacted context
-*/
-function createCompactedSession(originalSession, summary, preservedMessages) {
-	const summaryMessage = {
-		id: v4(),
-		role: "user",
-		content: `[Previous conversation summary]\n\n${summary}`,
-		timestamp: (/* @__PURE__ */ new Date()).toISOString()
-	};
-	return {
-		id: v4(),
-		name: `${originalSession.name} (compacted)`,
-		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-		updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-		model: originalSession.model,
-		messages: [summaryMessage, ...preservedMessages],
-		metadata: {
-			totalTokens: 0,
-			totalCost: 0,
-			toolCallCount: 0,
-			compactedFrom: originalSession.id,
-			...originalSession.metadata.workflow ? { workflow: originalSession.metadata.workflow } : {}
-		}
-	};
-}
 /**
 * Prefix tag used to mark a system message as an injected handoff. Kept as a
 * single source of truth so the dedup-on-resume check and the system-message
@@ -2809,28 +2811,127 @@ function appendSection(lines, heading, items) {
 	lines.push("");
 }
 /**
-* True when a message is a previously-injected handoff system message.
+* True when a message is a previously-injected handoff message.
 * Used to deduplicate handoff injections across save/resume cycles.
+*
+* Stored as `user` (not `system`) so it survives the user/assistant filter
+* applied to `previousMessages` before each agent.run() call — otherwise the
+* handoff would be persisted but never reach the LLM.
 */
 function isInjectedHandoff(message) {
-	return message.role === "system" && message.content.startsWith("[Session handoff from previous session]");
+	return message.role === "user" && message.content.startsWith("[Session handoff from previous session]");
 }
 /**
-* Return a new message list with the handoff prepended as a system message.
+* Return a new message list with the handoff prepended as a user message.
 * Any previously-injected handoff anywhere in the list is removed so the
 * message list stays stable across repeated save/resume cycles. We scan the
 * whole list rather than just index 0 because compaction can prepend a
-* summary system message, pushing the prior handoff to a later index.
+* summary message, pushing the prior handoff to a later index.
 */
 function injectHandoffMessage(messages, handoff) {
 	return [{
 		id: v4(),
-		role: "system",
+		role: "user",
 		content: buildHandoffSystemMessage(handoff),
 		timestamp: (/* @__PURE__ */ new Date()).toISOString()
 	}, ...messages.filter((m) => !isInjectedHandoff(m))];
 }
 //#endregion
+//#region src/utils/compaction.ts
+/**
+* Build a prompt for the LLM to summarize the conversation.
+*
+* Preserves the most recent exchanges to maintain conversational flow,
+* while summarizing older messages to reduce context size.
+*
+* @param messages - All messages in the current session
+* @param options - Compaction options
+* @returns The summarization prompt and messages to preserve
+*/
+function buildCompactionPrompt(messages, options = {}) {
+	const preserveCount = (options.preserveRecentExchanges ?? 2) * 2;
+	if (messages.length <= preserveCount) return {
+		prompt: "",
+		preservedMessages: messages
+	};
+	const messagesToSummarize = messages.slice(0, -preserveCount);
+	const preservedMessages = messages.slice(-preserveCount);
+	let prompt = `You are summarizing a conversation for context continuity. Create a concise summary that captures:
+
+- Key decisions made
+- Important context established
+- Files and code discussed
+- Current task state
+- Any pending items or next steps
+
+`;
+	if (options.claudeMdInstructions) prompt += `Project-specific compaction instructions:\n${options.claudeMdInstructions}\n\n`;
+	if (options.userInstructions) prompt += `Additional focus: ${options.userInstructions}\n\n`;
+	prompt += `CONVERSATION TO SUMMARIZE:\n\n`;
+	const roleLabels = {
+		user: "User",
+		assistant: "Assistant",
+		system: "System"
+	};
+	for (const msg of messagesToSummarize) {
+		const roleLabel = roleLabels[msg.role] || "System";
+		const content = msg.content.length > 2e3 ? msg.content.slice(0, 2e3) + "...[truncated]" : msg.content;
+		prompt += `**${roleLabel}:** ${content}\n\n`;
+	}
+	prompt += `\nProvide a concise summary (aim for 500-1000 words) that an AI assistant can use to continue this conversation with full context.`;
+	return {
+		prompt,
+		preservedMessages
+	};
+}
+/**
+* Create a new compacted session from an original session.
+*
+* The new session contains:
+* 1. A system message with the conversation summary
+* 2. The preserved recent messages
+*
+* @param originalSession - The session being compacted
+* @param summary - The LLM-generated summary of older messages
+* @param preservedMessages - Recent messages to keep verbatim
+* @returns A new session with compacted context
+*/
+function createCompactedSession(originalSession, summary, preservedMessages) {
+	const summaryMessage = {
+		id: v4(),
+		role: "user",
+		content: `[Previous conversation summary]\n\n${summary}`,
+		timestamp: (/* @__PURE__ */ new Date()).toISOString()
+	};
+	const handoff = originalSession.metadata.workflow?.handoff;
+	const handoffMessage = handoff ? {
+		id: v4(),
+		role: "user",
+		content: buildHandoffSystemMessage(handoff),
+		timestamp: (/* @__PURE__ */ new Date()).toISOString()
+	} : null;
+	const messages = handoffMessage ? [
+		handoffMessage,
+		summaryMessage,
+		...preservedMessages
+	] : [summaryMessage, ...preservedMessages];
+	return {
+		id: v4(),
+		name: `${originalSession.name} (compacted)`,
+		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+		updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		model: originalSession.model,
+		messages,
+		metadata: {
+			totalTokens: 0,
+			totalCost: 0,
+			toolCallCount: 0,
+			compactedFrom: originalSession.id,
+			...originalSession.metadata.workflow ? { workflow: originalSession.metadata.workflow } : {}
+		}
+	};
+}
+//#endregion
 //#region src/utils/imageRenderer.ts
 /**
 * Manages image placeholder rendering in conversation
@@ -5342,7 +5443,9 @@ function summarizeUserQuestion(payload) {
 	return first ? first.slice(0, 240) : void 0;
 }
 let exitTimestamp = null;
+let exitInProgress = false;
 const EXIT_TIMEOUT_MS = 2e3;
+const EXIT_HANDOFF_PROMPT_TIMEOUT_MS = 3e4;
 let usageCache = null;
 function CliApp() {
 	const { exit } = useApp();
@@ -5440,14 +5543,20 @@ function CliApp() {
 					abortController: null
 				}));
 				useCliStore.getState().setIsThinking(false);
-			}
+				useCliStore.getState().clearMessageQueue();
+			} else useCliStore.getState().clearMessageQueue();
 			return;
 		}
 		if (key.ctrl && input === "c") {
+			if (exitInProgress) return;
 			const now = Date.now();
 			if (exitTimestamp && now - exitTimestamp < EXIT_TIMEOUT_MS) {
 				logger.debug("[EXIT] Second Ctrl+C - cleaning up and exiting...");
-				performCleanup().then(() => {
+				exitInProgress = true;
+				exitTimestamp = null;
+				maybePromptExitHandoff().catch((err) => {
+					logger.debug(`[EXIT] Handoff prompt error: ${err instanceof Error ? err.message : String(err)}`);
+				}).then(() => performCleanup()).then(() => {
 					exit();
 				});
 			} else {
@@ -6421,7 +6530,8 @@ function CliApp() {
 		}
 	};
 	const handleMessage = async (message) => {
-		if (!state.agent || !state.session) {
+		const storeSession = useCliStore.getState().session;
+		if (!state.agent || !storeSession) {
 			console.error("❌ CLI failed to initialize. Try restarting b4m.\n");
 			return;
 		}
@@ -6438,7 +6548,7 @@ function CliApp() {
 		await state.commandHistoryStore.add(message);
 		setCommandHistory(await state.commandHistoryStore.list());
 		const config = state.config;
-		let activeSession = state.session;
+		let activeSession = storeSession;
 		if (config?.preferences.autoCompact !== false && activeSession.messages.length >= 6) {
 			const tokenCounter = getTokenCounter();
 			const threshold = tokenCounter.getContextWindow(activeSession.model, state.availableModels) * .8;
@@ -6615,6 +6725,15 @@ function CliApp() {
 				type: "status",
 				status: wasAborted ? "idle" : "awaiting_input"
 			});
+			if (!wasAborted) {
+				const queued = useCliStore.getState().dequeueAllMessages();
+				if (queued.length > 0) {
+					const combined = queued.join("\n\n");
+					setImmediate(() => {
+						handleMessage(combined);
+					});
+				}
+			}
 		}
 	};
 	handleMessageRef.current = handleMessage;
@@ -6852,6 +6971,118 @@ function CliApp() {
 			useCliStore.getState().setIsThinking(false);
 		}
 	};
+	/**
+	* If the active session is eligible for a handoff, prompt the user to
+	* generate one before exiting. Eligibility: session exists, has at least
+	* SHORT_SESSION_THRESHOLD messages, no handoff already, and an agent is
+	* available to run the generation.
+	*
+	* `generateHandoff` mutates the passed-in session in place, then we save
+	* that exact reference. We don't rely on the trailing `performCleanup()` to
+	* persist the change because `state.session` may have been replaced while we
+	* waited for the prompt (e.g. by a background-agent update), making the
+	* mutated snapshot orphaned. Best-effort: any failure is logged and
+	* swallowed so it never blocks exit.
+	*/
+	const maybePromptExitHandoff = async () => {
+		const session = state.session;
+		if (!session) return;
+		if (!state.agent) return;
+		if (session.messages.length < 4) return;
+		if (session.metadata.workflow?.handoff) return;
+		const promptId = v4();
+		let timer;
+		if (!await new Promise((resolve) => {
+			let settled = false;
+			const settle = (value) => {
+				if (settled) return;
+				settled = true;
+				if (timer) clearTimeout(timer);
+				resolve(value);
+			};
+			useCliStore.getState().setExitHandoffPrompt({
+				id: promptId,
+				resolve: settle
+			});
+			timer = setTimeout(() => {
+				logger.debug("[EXIT] Handoff prompt timed out — defaulting to no handoff");
+				if (useCliStore.getState().exitHandoffPrompt?.id === promptId) useCliStore.getState().setExitHandoffPrompt(null);
+				settle(false);
+			}, EXIT_HANDOFF_PROMPT_TIMEOUT_MS);
+		})) return;
+		try {
+			if (await generateHandoff(session)) {
+				await state.sessionStore.save(session);
+				console.log("🤝 Handoff generated.");
+			}
+		} catch (err) {
+			const reason = err instanceof Error ? err.message : String(err);
+			logger.debug(`[EXIT] Handoff generation/save failed: ${reason}`);
+		}
+	};
+	const printDecisions = () => {
+		console.log("\n📋 Decision Log\n");
+		console.log(formatDecisionsOutput(decisionStoreRef.current.decisions));
+		console.log("");
+	};
+	const printBlockers = () => {
+		console.log("\n🚧 Blockers\n");
+		console.log(formatBlockersOutput(blockerStoreRef.current.blockers));
+		console.log("");
+	};
+	const printReviewGates = () => {
+		console.log("\n🛑 Review Gates\n");
+		console.log(formatReviewGatesOutput(reviewGateStoreRef.current.reviewGates));
+		console.log("");
+	};
+	const printWorkflowOverview = () => {
+		const decisionCount = decisionStoreRef.current.decisions.length;
+		const blockers = blockerStoreRef.current.blockers;
+		const openBlockers = blockers.filter((b) => b.status === "open").length;
+		const gateCount = reviewGateStoreRef.current.reviewGates.length;
+		const handoff = state.session?.metadata.workflow?.handoff;
+		console.log("\n🔧 Workflow Overview\n");
+		console.log(`  📋 Decisions: ${decisionCount}`);
+		console.log(`  🚧 Blockers: ${openBlockers} open / ${blockers.length} total`);
+		console.log(`  🛑 Review gates: ${gateCount}`);
+		console.log(`  🤝 Handoff: ${handoff ? `generated at ${handoff.generatedAt}` : "none"}`);
+		console.log("\n  Use /workflow <decisions|blockers|handoff|review-gates> for details.\n");
+	};
+	/**
+	* Show the existing handoff or generate a fresh one. Shared by `/handoff` and
+	* `/workflow handoff`. Pass `['generate']` (or `['regen']`) to force regeneration.
+	*/
+	const runHandoffCommand = async (args) => {
+		if (!state.session) {
+			console.log("No active session");
+			return;
+		}
+		const existing = state.session.metadata.workflow?.handoff;
+		const wantsRegen = args[0] === "generate" || args[0] === "regen";
+		if (existing && !wantsRegen) {
+			console.log("\n🤝 Session handoff\n");
+			console.log(formatHandoffOutput(existing));
+			console.log("Run /handoff generate to refresh.\n");
+			return;
+		}
+		if (state.session.messages.length < 4) {
+			console.log(`Not enough messages to generate a handoff (need at least 4)`);
+			return;
+		}
+		if (!state.agent) {
+			console.log("Cannot generate handoff: no active agent");
+			return;
+		}
+		const handoff = await generateHandoff(state.session);
+		if (!handoff) {
+			console.log("❌ Failed to generate handoff");
+			return;
+		}
+		await state.sessionStore.save(state.session);
+		console.log("\n🤝 Session handoff\n");
+		console.log(formatHandoffOutput(handoff));
+		console.log("\n✅ Session saved with refreshed handoff");
+	};
 	const handleCommand = async (command, args) => {
 		const customCommand = state.customCommandStore.getCommand(command);
 		if (customCommand) try {
@@ -6970,7 +7201,10 @@ Multi-line Input:
 			}
 			case "exit":
 			case "quit":
+				if (exitInProgress) break;
 				logger.debug("[EXIT /exit command - cleaning up and exiting...");
+				exitInProgress = true;
+				await maybePromptExitHandoff();
 				await performCleanup();
 				exit();
 				break;
@@ -7968,50 +8202,43 @@ Multi-line Input:
 				break;
 			}
 			case "decisions":
-				console.log("\n📋 Decision Log\n");
-				console.log(formatDecisionsOutput(decisionStoreRef.current.decisions));
-				console.log("");
+				printDecisions();
 				break;
 			case "blockers":
-				console.log("\n🚧 Blockers\n");
-				console.log(formatBlockersOutput(blockerStoreRef.current.blockers));
-				console.log("");
+				printBlockers();
 				break;
 			case "review-gates":
-				console.log("\n🛑 Review Gates\n");
-				console.log(formatReviewGatesOutput(reviewGateStoreRef.current.reviewGates));
-				console.log("");
+				printReviewGates();
 				break;
-			case "handoff": {
-				if (!state.session) {
-					console.log("No active session");
-					break;
-				}
-				const existing = state.session.metadata.workflow?.handoff;
-				const wantsRegen = args[0] === "generate" || args[0] === "regen";
-				if (existing && !wantsRegen) {
-					console.log("\n🤝 Session handoff\n");
-					console.log(formatHandoffOutput(existing));
-					console.log("Run /handoff generate to refresh.\n");
-					break;
-				}
-				if (state.session.messages.length < 4) {
-					console.log(`Not enough messages to generate a handoff (need at least 4)`);
-					break;
-				}
-				if (!state.agent) {
-					console.log("Cannot generate handoff: no active agent");
-					break;
-				}
-				const handoff = await generateHandoff(state.session);
-				if (!handoff) {
-					console.log("❌ Failed to generate handoff");
-					break;
+			case "handoff":
+				await runHandoffCommand(args);
+				break;
+			case "workflow": {
+				const sub = args[0];
+				const subArgs = args.slice(1);
+				switch (sub) {
+					case void 0:
+					case "":
+						printWorkflowOverview();
+						break;
+					case "decisions":
+						printDecisions();
+						break;
+					case "blockers":
+						printBlockers();
+						break;
+					case "review-gates":
+					case "gates":
+						printReviewGates();
+						break;
+					case "handoff":
+						await runHandoffCommand(subArgs);
+						break;
+					default:
+						console.log(`Unknown /workflow subcommand: ${sub}`);
+						console.log("Available: decisions, blockers, handoff, review-gates (alias: gates)");
+						break;
 				}
-				await state.sessionStore.save(state.session);
-				console.log("\n🤝 Session handoff\n");
-				console.log(formatHandoffOutput(handoff));
-				console.log("\n✅ Session saved with refreshed handoff");
 				break;
 			}
 			case "dirs": {
@@ -8262,9 +8489,6 @@ try {
 } catch {}
 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,
-	alternateScreen: true
-});
+render(/* @__PURE__ */ React.createElement(CliApp, null), { exitOnCtrlC: false });
 //#endregion
 export {};