zidane 5.7.8 → 5.8.2

package/dist/tui.js

@@ -1,20 +1,20 @@
-import { $ as useMcpAuthDispatch, $t as deriveSessionTitle, A as runOAuthLogin, An as buildUpdateHint, At as clampFps, B as refreshMcpToolsCatalog, Bn as AUTO_COMPACT_MIN_GROWTH_FRACTION, Ct as listProjectFiles, D as formatPathForCwd, Dn as tryOpenBrowser, Dt as SETTINGS_CHOICES, En as useCompletion, Et as SETTINGS_CATEGORIES, Ft as resolveTheme, Gt as useDiscovery, H as subscribeMcpToolsCache, Hn as detectAuth, J as parentServerName, Jn as setProviderCredential, Jt as useConfig, K as buildVisibleMcpRows, Kt as useDiscoveryOptional, M as buildMcpServers, Mr as buildBuildSystem, Nr as buildPlanSystem, O as fetchOAuthRedirect, Ot as SETTINGS_TOGGLES, P as discoverProjectMcps, Pr as envSection, Pt as resolveChipColor, Q as McpAuthProvider, Qn as findGitRoot, R as loadMcpToolsCache, T as suggestSafelistEntry, Tt as DEFAULT_SETTINGS, Ut as createDiscoverySlot, Vn as shouldAutoCompact, W as useMcpToolToggleMap, Wt as DiscoveryProvider, Xn as discoverAgentsMd, Y as createFileMcpCredentialStore, Yt as resolveConfig, _ as useSafeModeQueue, _n as ensureKeybindingsFile, _t as hintsLength, a as useSurfaces, ar as accentColor, at as InteractionsProvider, b as getSafelist, bn as keybindingsPath, bt as generateSessionTitle, c as useStreamBuffer, cn as sumRunCosts, ct as createInteractionTools, d as discoverProjectSkills, dn as toolResultText, dr as TODO_STATUS_GLYPHS, dt as pendingInteractionsFromTurns, en as eventsFromTurns, et as useMcpAuthState, fn as updateToolEventOutcomes, g as useSafeModeActions, gn as KEYBINDING_KEY_COL_WIDTH, gt as clipHintsToWidth, h as SafeModeProvider, ht as EMPTY_HINTS, i as useSelectStyle, in as marginTopFor, j as supportsOAuth, jn as useUpdateCheck, jt as useSettings, k as oauthUsesManualCodePaste, kn as bootTick, kt as SettingsProvider, l as buildSkillsConfig, m as writeSessionExport, mn as KEYBINDING_DEFS, mt as useInteractionsQueue, n as ThemeProvider, nn as listSessionMeta, on as serverToolResultSummary, pt as useInteractionsActions, q as indexOfServerRow, qt as ConfigProvider, r as useColors, rt as splitMarkdownCodeBlocks, s as useTheme, sn as stripSpawnTokensLine, st as buildResumedToolResultsTurn, t as computeTurnAnchors, tn as lastContextSizeFromTurns, tt as getMcpAuthStatus, u as defaultSkillScanPaths, un as toolCallPreview, ut as makeRequestInteraction, vn as formatBindingForDisplay, vt as truncateTrailing, wt as useEnabledToggleSet, x as isOnSafelist, xn as matchesBinding, xr as useActiveTodos, xt as buildHints, y as addToSafelist, yn as groupBindings } from "./transcript-anchors-Cl7lbbeP.js";
-import { B as enabledModelOptions, E as cleanupPersistedSession, F as OUTPUT_RESERVE_TOKENS, G as modelSupportsReasoning, O as resolvePersistDir, V as getContextWindow, W as modelOptionsFor, X as restoreModelOptions, Y as piIdOf, d as createAgent, k as resolveTasksDir, z as effectiveContextWindow } from "./tools-dkB_jARJ.js";
+import { $ as useMcpAuthDispatch, $t as deriveSessionTitle, A as runOAuthLogin, An as buildUpdateHint, At as clampFps, B as refreshMcpToolsCatalog, Bn as AUTO_COMPACT_MIN_GROWTH_FRACTION, Ct as listProjectFiles, D as formatPathForCwd, Dn as tryOpenBrowser, Dt as SETTINGS_CHOICES, En as useCompletion, Et as SETTINGS_CATEGORIES, Ft as resolveTheme, Gt as useDiscovery, H as subscribeMcpToolsCache, Hn as detectAuth, J as parentServerName, Jn as setProviderCredential, Jt as useConfig, K as buildVisibleMcpRows, Kt as useDiscoveryOptional, M as buildMcpServers, Mr as buildBuildSystem, Nr as buildPlanSystem, O as fetchOAuthRedirect, Ot as SETTINGS_TOGGLES, P as discoverProjectMcps, Pr as envSection, Pt as resolveChipColor, Q as McpAuthProvider, Qn as findGitRoot, R as loadMcpToolsCache, T as suggestSafelistEntry, Tt as DEFAULT_SETTINGS, Ut as createDiscoverySlot, Vn as shouldAutoCompact, W as useMcpToolToggleMap, Wt as DiscoveryProvider, Xn as discoverAgentsMd, Y as createFileMcpCredentialStore, Yt as resolveConfig, _ as useSafeModeQueue, _n as ensureKeybindingsFile, _t as hintsLength, a as useSurfaces, ar as accentColor, at as InteractionsProvider, b as getSafelist, bn as keybindingsPath, bt as generateSessionTitle, c as useStreamBuffer, cn as sumRunCosts, ct as createInteractionTools, d as discoverProjectSkills, dn as toolResultText, dr as TODO_STATUS_GLYPHS, dt as pendingInteractionsFromTurns, en as eventsFromTurns, et as useMcpAuthState, fn as updateToolEventOutcomes, g as useSafeModeActions, gn as KEYBINDING_KEY_COL_WIDTH, gt as clipHintsToWidth, h as SafeModeProvider, ht as EMPTY_HINTS, i as useSelectStyle, in as marginTopFor, j as supportsOAuth, jn as useUpdateCheck, jt as useSettings, k as oauthUsesManualCodePaste, kn as bootTick, kt as SettingsProvider, l as buildSkillsConfig, m as writeSessionExport, mn as KEYBINDING_DEFS, mt as useInteractionsQueue, n as ThemeProvider, nn as listSessionMeta, on as serverToolResultSummary, pt as useInteractionsActions, q as indexOfServerRow, qt as ConfigProvider, r as useColors, rt as splitMarkdownCodeBlocks, s as useTheme, sn as stripSpawnTokensLine, st as buildResumedToolResultsTurn, t as computeTurnAnchors, tn as lastContextSizeFromTurns, tt as getMcpAuthStatus, u as defaultSkillScanPaths, un as toolCallPreview, ut as makeRequestInteraction, vn as formatBindingForDisplay, vt as truncateTrailing, wt as useEnabledToggleSet, x as isOnSafelist, xn as matchesBinding, xr as useActiveTodos, xt as buildHints, y as addToSafelist, yn as groupBindings } from "./transcript-anchors-C571npbs.js";
+import { A as resolveTasksDir, B as effectiveContextWindow, E as cleanupPersistedSession, G as modelOptionsFor, H as getContextWindow, I as OUTPUT_RESERVE_TOKENS, K as modelSupportsReasoning, O as resolveMcpWarningsDir, V as enabledModelOptions, X as piIdOf, Z as restoreModelOptions, d as createAgent, k as resolvePersistDir } from "./tools-BzQtic6M.js";
 import { a as compactPath, c as formatTaskStatus, d as shortId, i as ageString, l as formatTaskSummary, o as fmtTokens, s as formatDuration, u as previewLine } from "./edit-utils-DnfNoj16.js";
 import { l as errorMessage } from "./errors-CoQnKRf1.js";
 import { A as replaceDynamicSection } from "./messages-CvRQTdbR.js";
 import { n as sniffImageMediaType } from "./image-sniff-B7uFSNO1.js";
 import { n as createProcessContext } from "./contexts-BD2U_xpi.js";
-import { s as McpOAuthProvider, t as connectMcpServers } from "./mcp-Kqzz-Rs_.js";
+import { c as McpOAuthProvider, n as connectMcpServers } from "./mcp-Br3b1Xm3.js";
 import { r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
-import { a as selectFilesFromSession, b as summaryToTurn, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-C8Kc4gH0.js";
+import { d as compactConversation, i as createLogger, l as selectFilesFromSession, r as consoleSink, s as buildPostCompactAttachments, t as loginMcpServer, w as summaryToTurn } from "./login-BjY_sBdn.js";
 import { n as loadSession, t as createSession } from "./session-BzLou2_-.js";
 import { createTuiStore } from "./session/sqlite.js";
 import { B as summarizeOutcomes, C as buildContextualDiff, D as extractEditPayload, F as mergeApprovalAndBodyOutcomes, G as createFilesCompletionProvider, H as createSkillsCompletionProvider, I as parseEditOutcomesFromResult, L as resolveApprovalForPayload, N as buildEditOutcomesAnnotation, O as filetypeFromPath, Q as buildLinearRamp, R as rewriteMultiEditHeader, U as uniqueSkillNamesFromReferences, Z as blendHsl, _ as isEditErrorResult, a as TOOL_DISPLAY, b as selectableTurnIds, c as finalizeStreamingMarkdown, d as turnContextSize, f as splitPromptSegments, g as EDIT_TOOL_NAMES, h as indexOfEntry, i as turnAsText, j as summarizeEditPayload, k as previewEditPayload, l as finalizeStreamingMarkdownForOwner, m as filterModelCatalog, n as deleteTurnSafely, o as displayNameFor, p as buildModelCatalog, r as truncateTurnsAt, s as formatToolCall, v as isTurnHighlighted, w as buildUnifiedDiff, x as turnSelectionOwnership, y as isVisible, z as stripEditOutcomesAnnotation } from "./turn-operations-CCHfR9eC.js";
 import { basename, join, relative } from "node:path";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
-import { readFileSync, readdirSync, statSync } from "node:fs";
+import { createWriteStream, mkdirSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { spawn } from "node:child_process";
 import { homedir } from "node:os";
 import { createContext, createElement, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
@@ -22,6 +22,54 @@ import { Fzf, byLengthAsc } from "fzf";
 import { BoxRenderable, CodeRenderable, RGBA, SyntaxStyle, TextRenderable, addDefaultParsers, createCliRenderer, decodePasteBytes, defaultTextareaKeyBindings, getTreeSitterClient, stripAnsiSequences } from "@opentui/core";
 import { createRoot, useKeyboard, useRenderer, useSelectionHandler, useTerminalDimensions } from "@opentui/react";
 import { Fragment, jsx, jsxs } from "@opentui/react/jsx-runtime";
+//#region src/mcp/warn-log.ts
+/**
+* Subscribe to `mcp:warn`
+* (stdio child stderr lines, see `attachStderrWarnPump` in ./index.ts)
+* and append each to `<dir>/warnings.log`.
+*
+* The stream opens lazily on the first warning so
+* a healthy session never touches disk.
+*/
+function attachMcpWarnLog(hooks, opts) {
+	let stream = null;
+	let logger = null;
+	const ensureLogger = () => {
+		if (logger) return logger;
+		try {
+			mkdirSync(opts.dir, { recursive: true });
+			const s = createWriteStream(join(opts.dir, "warnings.log"), { flags: "a" });
+			s.on("error", () => {});
+			stream = s;
+			logger = createLogger(consoleSink({
+				stream: s,
+				minLevel: "warn"
+			}));
+			return logger;
+		} catch {
+			return null;
+		}
+	};
+	const unhook = hooks.hook("mcp:warn", ({ name, message }) => {
+		ensureLogger()?.warn("mcp warn", {
+			server: name,
+			message
+		});
+	});
+	return { close: async () => {
+		unhook();
+		const s = stream;
+		stream = null;
+		logger = null;
+		if (!s) return;
+		await new Promise((resolve) => {
+			s.once("close", () => resolve());
+			s.once("error", () => resolve());
+			s.end();
+		});
+	} };
+}
+//#endregion
 //#region src/tui/modal.tsx
 const ModalContext = createContext(null);
 function ModalRoot({ children }) {
@@ -602,7 +650,7 @@ function CrushThrobber({ label, size = 15, from, to, labelColor }) {
 * rather than reading as "punched out" rectangles. Top-level keys
 * absent from the base theme become brand-new entries.
 */
-function buildMdStyle(theme, overrides) {
+function buildMdStyle(theme, overrides, flattenFg) {
 	const styles = {};
 	for (const [token, style] of Object.entries(theme.syntax)) {
 		const out = {};
@@ -612,6 +660,11 @@ function buildMdStyle(theme, overrides) {
 		if (style.italic) out.italic = true;
 		if (style.underline) out.underline = true;
 		if (style.dim) out.dim = true;
+		if (flattenFg) {
+			out.fg = flattenFg;
+			out.bold = false;
+			out.underline = false;
+		}
 		styles[token] = out;
 	}
 	if (overrides) for (const [token, patch] of Object.entries(overrides)) styles[token] = {
@@ -630,7 +683,8 @@ function MdStyleProvider({ children }) {
 			selected: buildMdStyle(theme, {
 				"markup.raw": { bg: selectionBg },
 				"markup.raw.block": { bg: selectionBg }
-			})
+			}),
+			dimmed: buildMdStyle(theme, void 0, RGBA.fromHex(theme.colors.dim))
 		};
 	}, [theme]);
 	return createElement(MdStyleContext.Provider, { value: bundle }, children);
@@ -652,6 +706,7 @@ function MdStyleProvider({ children }) {
 function useMdStyle(opts = {}) {
 	const bundle = useContext(MdStyleContext);
 	if (!bundle) throw new Error("useMdStyle must be used inside <MdStyleProvider>");
+	if (opts.dimmed) return bundle.dimmed;
 	return opts.selected ? bundle.selected : bundle.regular;
 }
 const CHIP_TOKEN_PREFIX = "completion.reference";
@@ -781,6 +836,7 @@ const EventLine = memo(({ event, previous, depthOffset = 0, selected = false, an
 		},
 		children: /* @__PURE__ */ jsx(EventLineImpl, {
 			event,
+			previous,
 			depthOffset,
 			hideChildLabel,
 			selected
@@ -1194,17 +1250,20 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 				foregroundColor: COLOR.mute
 			}
 		},
-		children: [items.map((item, i) => item.kind === "event" ? /* @__PURE__ */ jsx(EventLine, {
-			event: item.event,
-			previous: item.previous,
-			selected: isTurnHighlighted(item.event, selectedTurnId, ownership),
-			anchorId: anchors.ids[i][0]
-		}, i) : /* @__PURE__ */ jsx(SubagentBlock, {
-			events: item.events,
-			previous: item.previous,
-			selectedTurnId,
-			anchorIds: anchors.ids[i]
-		}, i)), showThrobber && /* @__PURE__ */ jsx("box", {
+		children: [items.map((item, i) => {
+			if (item.kind === "event") return /* @__PURE__ */ jsx(EventLine, {
+				event: item.event,
+				previous: item.previous,
+				selected: isTurnHighlighted(item.event, selectedTurnId, ownership),
+				anchorId: anchors.ids[i][0]
+			}, i);
+			return /* @__PURE__ */ jsx(SubagentBlock, {
+				events: item.events,
+				previous: item.previous,
+				selectedTurnId,
+				anchorIds: anchors.ids[i]
+			}, i);
+		}), showThrobber && /* @__PURE__ */ jsx("box", {
 			style: { marginTop: items.length > 0 ? 1 : 0 },
 			children: /* @__PURE__ */ jsx(CrushThrobber, {
 				label: throbberLabel,
@@ -1319,6 +1378,7 @@ function EmptyState() {
 }
 /** Left-pad applied per depth level (in columns). */
 const INDENT_PER_DEPTH = 2;
+const THINKING_GUTTER_WIDTH = 4;
 function indentFor(depth) {
 	return depth && depth > 0 ? depth * INDENT_PER_DEPTH : 0;
 }
@@ -1342,7 +1402,7 @@ function rowStyle(paddingLeft) {
 		alignSelf: "stretch"
 	};
 }
-function EventLineImpl({ event, depthOffset = 0, hideChildLabel = false, selected = false }) {
+function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = false, selected = false }) {
 	const COLOR = useColors();
 	const { settings } = useSettings();
 	const safeText = event.text === "" ? " " : event.text;
@@ -1362,13 +1422,41 @@ function EventLineImpl({ event, depthOffset = 0, hideChildLabel = false, selecte
 				children: safeText
 			})
 		});
-		case "thinking": return /* @__PURE__ */ jsx("box", {
-			style: row,
-			children: /* @__PURE__ */ jsx("text", {
-				fg: COLOR.dim,
-				children: safeText
-			})
-		});
+		case "thinking": {
+			const startsRun = !(previous?.kind === "thinking" && previous.childId === event.childId);
+			const thinkingText = safeText.replace(/\*\*([^*]+)\*\*/g, "$1");
+			return /* @__PURE__ */ jsx("box", {
+				style: row,
+				children: /* @__PURE__ */ jsxs("box", {
+					style: {
+						flexDirection: "row",
+						alignSelf: "stretch",
+						flexShrink: 0
+					},
+					children: [/* @__PURE__ */ jsx("box", {
+						style: {
+							width: THINKING_GUTTER_WIDTH,
+							flexShrink: 0,
+							flexDirection: "column"
+						},
+						children: /* @__PURE__ */ jsx("text", {
+							fg: startsRun ? COLOR.accent : COLOR.mute,
+							children: startsRun ? "🧠" : " "
+						})
+					}), /* @__PURE__ */ jsx("box", {
+						style: {
+							flexGrow: 1,
+							flexShrink: 1,
+							flexDirection: "column"
+						},
+						children: /* @__PURE__ */ jsx("text", {
+							fg: COLOR.dim,
+							children: thinkingText
+						})
+					})]
+				})
+			});
+		}
 		case "tool":
 			if (event.edit && settings.showEditDiffs) return /* @__PURE__ */ jsx("box", {
 				style: row,
@@ -2020,7 +2108,10 @@ function parseBlockIndex(id) {
 const MarkdownBlock = memo(({ text, dim, selected = false }) => {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
-	const mdStyle = useMdStyle({ selected });
+	const mdStyle = useMdStyle({
+		selected,
+		dimmed: dim
+	});
 	const renderer = useRenderer();
 	const content = text.replace(/^\n+|\n+$/g, "");
 	const bag = useRef({
@@ -5038,8 +5129,50 @@ function InteractionShell({ title, maxHeight, children }) {
 		children
 	});
 }
-/** Number of plan-body lines rendered inline before we truncate. */
+/** Number of plan-body lines rendered inline in the collapsed preview. */
 const PLAN_BODY_MAX_LINES = 8;
+const PLAN_PREVIEW_MIN_COLUMNS = 20;
+/**
+* Cap the plan picker at ~60% of the terminal when the user expands a
+* long plan, so the transcript above stays readable. The inner scrollbox
+* handles overflow so the full plan is reachable before committing — the
+* decision picker stays pinned below the scrollable region.
+*/
+const PLAN_EXPANDED_MAX_HEIGHT = "60%";
+function estimatedVisualRows(line, columns) {
+	if (line.length === 0) return 1;
+	return Math.max(1, Math.ceil(line.length / columns));
+}
+function buildPlanPreview(plan, columns) {
+	const width = Math.max(PLAN_PREVIEW_MIN_COLUMNS, Math.floor(columns));
+	const lines = plan.split("\n");
+	const preview = [];
+	let usedRows = 0;
+	for (let i = 0; i < lines.length; i++) {
+		const line = lines[i] ?? "";
+		const rows = estimatedVisualRows(line, width);
+		if (usedRows + rows <= PLAN_BODY_MAX_LINES) {
+			preview.push(line);
+			usedRows += rows;
+			continue;
+		}
+		const remainingRows = Math.max(0, PLAN_BODY_MAX_LINES - usedRows);
+		if (remainingRows > 0) {
+			const maxChars = Math.max(1, remainingRows * width);
+			preview.push(line.length > maxChars ? line.slice(0, maxChars).trimEnd() : line);
+		}
+		return {
+			previewText: preview.join("\n"),
+			overflow: true,
+			hiddenLineCount: lines.length - i - 1
+		};
+	}
+	return {
+		previewText: plan,
+		overflow: false,
+		hiddenLineCount: 0
+	};
+}
 const PLAN_OPTIONS = [
 	{
 		id: "approve",
@@ -5061,28 +5194,40 @@ function PlanInteractionBlock({ request, onResolve }) {
 	const COLOR = useColors();
 	const mdStyle = useMdStyle();
 	const focused = useModalAwareFocus();
+	const { width: terminalWidth } = useTerminalDimensions();
 	const [stage, setStage] = useState("pick");
 	const [decision, setDecision] = useState(null);
+	const [expanded, setExpanded] = useState(false);
 	const textareaRef = useRef(null);
+	const scrollboxRef = useRef(null);
 	const { title, plan, steps } = request.payload;
+	const { previewText, overflow, hiddenLineCount } = useMemo(() => {
+		return buildPlanPreview(plan, terminalWidth - 8);
+	}, [plan, terminalWidth]);
 	useKeyboard((key) => {
 		if (!focused) return;
-		if (key.name !== "tab" || !key.shift) return;
 		if (key.ctrl || key.meta || key.option) return;
-		if (stage !== "comment") return;
-		setStage("pick");
-	});
-	const { bodyText, truncated } = useMemo(() => {
-		const lines = plan.split("\n");
-		if (lines.length <= PLAN_BODY_MAX_LINES) return {
-			bodyText: plan,
-			truncated: false
-		};
-		return {
-			bodyText: lines.slice(0, PLAN_BODY_MAX_LINES).join("\n"),
-			truncated: true
-		};
-	}, [plan]);
+		if (key.name === "tab") {
+			if (key.shift) {
+				if (stage !== "comment") return;
+				setStage("pick");
+				return;
+			}
+			if (stage !== "pick" || !overflow) return;
+			setExpanded((e) => !e);
+			return;
+		}
+		if (key.shift) return;
+		if (key.name !== "pageup" && key.name !== "pagedown") return;
+		if (stage !== "pick" || !expanded) return;
+		const sb = scrollboxRef.current;
+		if (!sb) return;
+		const page = Math.max(1, sb.viewport.height - 1);
+		sb.scrollBy({
+			x: 0,
+			y: key.name === "pageup" ? -page : page
+		});
+	});
 	const onPick = useCallback((value) => {
 		if (value === "approve") {
 			onResolve({
@@ -5157,15 +5302,60 @@ function PlanInteractionBlock({ request, onResolve }) {
 			})
 		]
 	});
+	const stepsBlock = steps && steps.length > 0 ? /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "column",
+			marginTop: 1
+		},
+		children: [/* @__PURE__ */ jsx("text", {
+			fg: COLOR.mute,
+			children: "steps:"
+		}), steps.map((step, i) => /* @__PURE__ */ jsxs("text", {
+			fg: COLOR.dim,
+			wrapMode: "word",
+			children: [
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: `  ${i + 1}. `
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.brand,
+					children: step.title
+				}),
+				step.description && /* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: ` — ${step.description}`
+				})
+			]
+		}, step.id))]
+	}) : null;
 	return /* @__PURE__ */ jsxs(InteractionShell, {
 		title: " approve plan · esc to abort run ",
+		maxHeight: expanded ? PLAN_EXPANDED_MAX_HEIGHT : void 0,
 		children: [
 			/* @__PURE__ */ jsx("text", {
 				fg: COLOR.brand,
 				wrapMode: "none",
+				style: { flexShrink: 0 },
 				children: title
 			}),
-			/* @__PURE__ */ jsxs("box", {
+			expanded ? /* @__PURE__ */ jsxs("scrollbox", {
+				ref: scrollboxRef,
+				focusable: false,
+				style: {
+					flexGrow: 1,
+					flexShrink: 1,
+					marginTop: 1,
+					marginBottom: 1
+				},
+				children: [/* @__PURE__ */ jsx("markdown", {
+					content: plan,
+					syntaxStyle: mdStyle,
+					streaming: false,
+					internalBlockMode: "coalesced",
+					fg: COLOR.dim
+				}), stepsBlock]
+			}) : /* @__PURE__ */ jsxs("box", {
 				style: {
 					flexDirection: "column",
 					marginTop: 1,
@@ -5173,43 +5363,41 @@ function PlanInteractionBlock({ request, onResolve }) {
 				},
 				children: [
 					/* @__PURE__ */ jsx("markdown", {
-						content: bodyText,
+						content: previewText,
 						syntaxStyle: mdStyle,
 						streaming: false,
 						internalBlockMode: "coalesced",
 						fg: COLOR.dim
 					}),
-					truncated && /* @__PURE__ */ jsx("text", {
+					overflow && /* @__PURE__ */ jsxs("text", {
 						fg: COLOR.mute,
-						children: `… plan body truncated (${plan.split("\n").length - PLAN_BODY_MAX_LINES} more lines). Open the session details to see full content.`
+						wrapMode: "word",
+						children: [
+							hiddenLineCount > 0 ? `… ${hiddenLineCount} more line${hiddenLineCount === 1 ? "" : "s"} · ` : "… more content · ",
+							/* @__PURE__ */ jsx("span", {
+								fg: COLOR.warn,
+								children: "↹"
+							}),
+							" to expand and scroll"
+						]
 					}),
-					steps && steps.length > 0 && /* @__PURE__ */ jsxs("box", {
-						style: {
-							flexDirection: "column",
-							marginTop: 1
-						},
-						children: [/* @__PURE__ */ jsx("text", {
-							fg: COLOR.mute,
-							children: "steps:"
-						}), steps.map((step, i) => /* @__PURE__ */ jsxs("text", {
-							fg: COLOR.dim,
-							wrapMode: "word",
-							children: [
-								/* @__PURE__ */ jsx("span", {
-									fg: COLOR.warn,
-									children: `  ${i + 1}. `
-								}),
-								/* @__PURE__ */ jsx("span", {
-									fg: COLOR.brand,
-									children: step.title
-								}),
-								step.description && /* @__PURE__ */ jsx("span", {
-									fg: COLOR.mute,
-									children: ` — ${step.description}`
-								})
-							]
-						}, step.id))]
-					})
+					stepsBlock
+				]
+			}),
+			expanded && /* @__PURE__ */ jsxs("text", {
+				fg: COLOR.mute,
+				style: { flexShrink: 0 },
+				children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "↹"
+					}),
+					" to collapse · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "pgup/pgdn"
+					}),
+					" to scroll"
 				]
 			}),
 			/* @__PURE__ */ jsx(OptionList, {
@@ -11034,6 +11222,7 @@ function AppShell() {
 	queueSelectionIndexRef.current = queueSelectionIndex;
 	const agentRef = useRef(null);
 	const sessionRef = useRef(null);
+	const warnLogRef = useRef(null);
 	useEffect(() => {
 		const handle = agentRef.current?.handle;
 		if (handle) handle.cwd = cwd;
@@ -11352,6 +11541,10 @@ function AppShell() {
 			ctx.result = result;
 			if (mergedOutcomes) applyEditAnnotationsToStream(ctx.callId, mergedOutcomes);
 		});
+		warnLogRef.current = attachMcpWarnLog(agent.hooks, { dir: resolveMcpWarningsDir({
+			userDir: cacheDir,
+			sessionId: session.id
+		}) });
 		agent.hooks.hook("mcp:auth:required", ({ name, reason }) => {
 			dispatchAuthRef.current({
 				type: "auth-required",
@@ -11693,6 +11886,10 @@ function AppShell() {
 		await agentRef.current?.destroy().catch((err) => debugLog("agent.destroy failed", err));
 		agentRef.current = null;
 		sessionRef.current = null;
+		if (warnLogRef.current) {
+			await warnLogRef.current.close().catch((err) => debugLog("teardown: warnLog.close failed", err));
+			warnLogRef.current = null;
+		}
 		autoCompactAbortRef.current?.abort();
 		autoCompactAbortRef.current = null;
 		autoCompactInFlightRef.current = null;
@@ -12301,10 +12498,11 @@ function AppShell() {
 		const session = sessionRef.current;
 		const p = pickedRef.current;
 		if (!session || !p) return;
-		const fresh = buildAgentRef.current(session, p.provider.key);
 		const stale = agentRef.current;
-		agentRef.current = fresh;
+		const staleWarnLog = warnLogRef.current;
+		agentRef.current = buildAgentRef.current(session, p.provider.key);
 		if (stale) await stale.destroy().catch((err) => debugLog("rebuildActiveAgent: destroy failed", err));
+		if (staleWarnLog) await staleWarnLog.close().catch((err) => debugLog("rebuildActiveAgent: warnLog.close failed", err));
 	}, []);
 	const onLoginMcp = useCallback(async (name) => {
 		const entry = mcpsCatalogRef.current.find((d) => d.config.name === name);
@@ -12521,6 +12719,10 @@ function AppShell() {
 			userDir: cacheDir,
 			sessionId: id
 		}));
+		cleanupPersistedSession(resolveMcpWarningsDir({
+			userDir: cacheDir,
+			sessionId: id
+		}));
 		const wasCurrent = id === currentSession?.id;
 		if (wasCurrent) {
 			await teardown();
@@ -12892,6 +13094,10 @@ function AppShell() {
 				return;
 			}
 		}
+		if (matchesBinding(key, keybindings.newSession) && screen === "chat" && picked && !busy) {
+			onCreateSession();
+			return;
+		}
 		if (matchesBinding(key, keybindings.openModelPicker) && screen === "chat" && picked && !busy) {
 			modal.open(/* @__PURE__ */ jsx(ModelPickerModal, {
 				providers: availableProviders,
@@ -12995,7 +13201,7 @@ function AppShell() {
 				setQuitConfirmSelected("cancel");
 				return;
 			}
-			if (key.name === "c" && key.ctrl) {
+			if (key.name === "c" && key.ctrl && !key.shift) {
 				renderer.destroy();
 				return;
 			}
@@ -13013,7 +13219,7 @@ function AppShell() {
 			}
 			return;
 		}
-		if (key.name === "c" && key.ctrl) {
+		if (key.name === "c" && key.ctrl && !key.shift) {
 			const mode = settingsRef.current.ctrlCBehavior;
 			if (mode === "quit") {
 				renderer.destroy();