zidane 6.3.4 → 6.3.6

package/dist/tui.js

@@ -1,5 +1,5 @@
-import { $ as InteractionsProvider, $t as countClaudeSessionFiles, A as runOAuthLogin, Bt as ConfigProvider, Cn as discoverAgentsMd, Cr as toolCallPreview, Ct as clampFps, D as formatPathForCwd, Dt as resolveChipColor, Er as usageByModel, F as refreshMcpToolsCatalog, Gt as chainPositionOf, H as indexOfServerRow, Ht as resolveConfig, It as createDiscoverySlot, J as useMcpAuthDispatch, Jt as providerKeySetChanged, Kt as chainsEqual, L as subscribeMcpToolsCache, Ln as TODO_STATUS_GLYPHS, Lt as DiscoveryProvider, N as loadMcpToolsCache, O as fetchOAuthRedirect, Ot as resolveTheme, P as mcpToolsCachePath, Q as ASK_USER_TOOL, Qt as useCompletion, Rt as useDiscovery, Sn as chatAutoCompactBehavior, St as SettingsProvider, T as suggestSafelistEntries, Tr as updateToolEventOutcomes, U as parentServerName, Ut as resolveStoragePaths, V as buildVisibleMcpRows, Vt as useConfig, W as createFileMcpCredentialStore, Wn as pruneTodosByRun, Wt as buildRunModel, X as getMcpAuthStatus, Y as useMcpAuthState, Yt as restoreChainFallbacks, Zt as toggleChainEntry, _ as useSafeModeQueue, _r as marginTopFor, _t as DEFAULT_SETTINGS, a as useSurfaces, an as buildMcpServers, ar as buildPlanSystem, at as pendingInteractionsFromTurns, b as getSafelist, br as stripSpawnTokensLine, bt as SETTINGS_INPUTS, c as useStreamBuffer, cr as createChatTurnsReadTool, ct as useInteractionsQueue, d as discoverProjectSkills, dn as bootTick, dt as hintsLength, en as hasClaudeCodeSetup, et as PRESENT_PLAN_TOOL, fn as buildUpdateHint, fr as deriveSessionTitle, ft as truncateTrailing, g as useSafeModeActions, gr as loadState, gt as useEnabledToggleSet, h as SafeModeProvider, hr as listSessionMeta, ht as listProjectFiles, i as useSelectStyle, in as upsertMcpServer, ir as buildBuildSystem, it as makeRequestInteraction, j as supportsOAuth, jn as accentColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, ln as tryOpenBrowser, lt as EMPTY_HINTS, m as writeSessionExport, mr as lastContextSizeFromTurns, n as ThemeProvider, nn as mcpsWritePath, nt as createInteractionTools, or as envSection, pn as useUpdateCheck, pr as eventsFromTurns, pt as buildHints, q as McpAuthProvider, qn as useActiveTodos, qt as filterChainFallbacks, r as useColors, rn as removeMcpServer, s as useTheme, sn as discoverProjectMcps, sr as chatReferenceTokensForPrompt, st as useInteractionsActions, t as computeTurnAnchors, tn as importFromClaudeCode, tt as buildResumedToolResultsTurn, u as defaultSkillScanPaths, ur as compactSummaryEvent, ut as clipHintsToWidth, vt as SETTINGS_CATEGORIES, wr as toolResultText, wt as useSettings, x as isOnSafelist, xr as sumRunCosts, xt as SETTINGS_TOGGLES, y as addToSafelist, yr as serverToolResultSummary, yt as SETTINGS_CHOICES, z as useMcpToolToggleMap, zt as useDiscoveryOptional } from "./transcript-anchors-9LKsM0OZ.js";
-import { $t as registerExtensionHostModules, Et as looksBinary, G as installExtensionFromSpec, Gt as keybindingsPath, H as createExtensionPromptBridge, Ht as ensureKeybindingsFile, Kt as matchesBinding, L as summaryToTurn, Ot as createModelSearchTool, Q as discoverAndBuildExtensionRegistry, S as selectFilesFromSession, U as ExtensionInstallError, Ut as formatBindingForDisplay, Vt as KEYBINDING_KEY_COL_WIDTH, Wt as groupBindings, X as updateInstalledExtension, Y as removeInstalledExtension, Z as createExtensionHud, Zt as resolveExtensionKeybindings, _ as resolveMcpWarningsDir, _n as OUTPUT_RESERVE_TOKENS, _t as isSpawnTool, an as parseExtensionScanPathEnv, at as partitionExtensionCatalog, b as buildPostCompactAttachments, c as applyCompactSummaryCutoff, dt as basic_default, g as rehomePersistedStubs, ln as coerceExtensionConfigInput, m as cleanupPersistedSession, mn as sanitizeExtensionConfigActionPatch, nt as disposeExtensionRegistry, on as scanExtensionDirectories, ot as createExtensionHostRuntimeBridge, pn as resolveExtensionConfigValue, rn as inlineLoadedExtension, rt as filterExtensionRegistry, t as createAgent, tt as composeExtensionPreset, v as resolvePersistDir, vn as effectiveContextWindow, w as compactConversation, wt as tailTruncate, y as resolveTasksDir } from "./agent-BJuiohV_.js";
+import { $ as InteractionsProvider, $t as countClaudeSessionFiles, A as runOAuthLogin, Bt as ConfigProvider, Cn as discoverAgentsMd, Cr as toolCallPreview, Ct as clampFps, D as formatPathForCwd, Dt as resolveChipColor, Er as usageByModel, F as refreshMcpToolsCatalog, Gt as chainPositionOf, H as indexOfServerRow, Ht as resolveConfig, It as createDiscoverySlot, J as useMcpAuthDispatch, Jt as providerKeySetChanged, Kt as chainsEqual, L as subscribeMcpToolsCache, Ln as TODO_STATUS_GLYPHS, Lt as DiscoveryProvider, N as loadMcpToolsCache, O as fetchOAuthRedirect, Ot as resolveTheme, P as mcpToolsCachePath, Q as ASK_USER_TOOL, Qt as useCompletion, Rt as useDiscovery, Sn as chatAutoCompactBehavior, St as SettingsProvider, T as suggestSafelistEntries, Tr as updateToolEventOutcomes, U as parentServerName, Ut as resolveStoragePaths, V as buildVisibleMcpRows, Vt as useConfig, W as createFileMcpCredentialStore, Wn as pruneTodosByRun, Wt as buildRunModel, X as getMcpAuthStatus, Y as useMcpAuthState, Yt as restoreChainFallbacks, Zt as toggleChainEntry, _ as useSafeModeQueue, _r as marginTopFor, _t as DEFAULT_SETTINGS, a as useSurfaces, an as buildMcpServers, ar as buildPlanSystem, at as pendingInteractionsFromTurns, b as getSafelist, br as stripSpawnTokensLine, bt as SETTINGS_INPUTS, c as useStreamBuffer, cr as createChatTurnsReadTool, ct as useInteractionsQueue, d as discoverProjectSkills, dn as bootTick, dt as hintsLength, en as hasClaudeCodeSetup, et as PRESENT_PLAN_TOOL, fn as buildUpdateHint, fr as deriveSessionTitle, ft as truncateTrailing, g as useSafeModeActions, gr as loadState, gt as useEnabledToggleSet, h as SafeModeProvider, hr as listSessionMeta, ht as listProjectFiles, i as useSelectStyle, in as upsertMcpServer, ir as buildBuildSystem, it as makeRequestInteraction, j as supportsOAuth, jn as accentColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, ln as tryOpenBrowser, lt as EMPTY_HINTS, m as writeSessionExport, mr as lastContextSizeFromTurns, n as ThemeProvider, nn as mcpsWritePath, nt as createInteractionTools, or as envSection, pn as useUpdateCheck, pr as eventsFromTurns, pt as buildHints, q as McpAuthProvider, qn as useActiveTodos, qt as filterChainFallbacks, r as useColors, rn as removeMcpServer, s as useTheme, sn as discoverProjectMcps, sr as chatReferenceTokensForPrompt, st as useInteractionsActions, t as computeTurnAnchors, tn as importFromClaudeCode, tt as buildResumedToolResultsTurn, u as defaultSkillScanPaths, ur as compactSummaryEvent, ut as clipHintsToWidth, vt as SETTINGS_CATEGORIES, wr as toolResultText, wt as useSettings, x as isOnSafelist, xr as sumRunCosts, xt as SETTINGS_TOGGLES, y as addToSafelist, yr as serverToolResultSummary, yt as SETTINGS_CHOICES, z as useMcpToolToggleMap, zt as useDiscoveryOptional } from "./transcript-anchors-Bsmm4435.js";
+import { $ as removeInstalledExtension, At as looksBinary, C as resolveTasksDir, E as selectFilesFromSession, Gt as KEYBINDING_KEY_COL_WIDTH, Jt as groupBindings, K as createExtensionPromptBridge, Kt as ensureKeybindingsFile, Mt as createModelSearchTool, O as compactConversation, Ot as tailTruncate, S as resolveSessionDir, Sn as effectiveContextWindow, V as summaryToTurn, Xt as matchesBinding, Y as installExtensionFromSpec, Yt as keybindingsPath, _ as rehomePersistedStubs, _n as resolveExtensionConfigValue, at as composeExtensionPreset, b as resolveMcpWarningsDir, c as applyCompactSummaryCutoff, et as updateInstalledExtension, ht as basic_default, ln as parseExtensionScanPathEnv, lt as partitionExtensionCatalog, m as cleanupPersistedSession, nt as discoverAndBuildExtensionRegistry, ot as disposeExtensionRegistry, pn as coerceExtensionConfigInput, q as ExtensionInstallError, qt as formatBindingForDisplay, rn as registerExtensionHostModules, sn as inlineLoadedExtension, st as filterExtensionRegistry, t as createAgent, tn as resolveExtensionKeybindings, tt as createExtensionHud, un as scanExtensionDirectories, ut as createExtensionHostRuntimeBridge, v as resolveLegacyPersistDir, vn as sanitizeExtensionConfigActionPatch, w as buildPostCompactAttachments, x as resolvePersistDir, xn as OUTPUT_RESERVE_TOKENS, xt as isSpawnTool, y as resolveLegacySessionDir } from "./agent-xjMzFclr.js";
 import { a as formatDuration, c as previewLine, i as fmtTokens, l as shortId, n as compactPath, o as formatTaskStatus, r as fmtCost, s as formatTaskSummary, t as ageString } from "./format-BF745pLL.js";
 import { n as appendCapped } from "./output-cap-C9zukcCj.js";
 import { i as killProcessGroup, n as SUPPORTS_PROCESS_GROUPS, r as createProcessContext } from "./contexts-DWVt7MvF.js";
@@ -7,18 +7,18 @@ import { l as errorMessage } from "./errors-DJUxZg9b.js";
 import { M as findGitRoot } from "./resolve-BPTA1RpX.js";
 import { a as createRingBufferSink, i as createLoggingHooks, l as logFileTimestamp, n as createFileSink, o as fanoutSink, r as createLogger, s as formatLogLine, t as consoleSink } from "./logger-DBX9uYOw.js";
 import { i as sniffImageMediaType } from "./media-sniff-UKijEaiQ.js";
-import { g as hasAuthorizationHeader, m as McpOAuthProvider, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-UIBc81Zm.js";
-import { x as estimateRebilledCostUsd } from "./openai-compat-BF1pSB_F.js";
+import { g as hasAuthorizationHeader, m as McpOAuthProvider, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-B5iXOceC.js";
+import { C as estimateRebilledCostUsd } from "./openai-compat-Bf9uMTMa.js";
 import { replaceDynamicSection } from "./prompt.js";
-import { a as getExtensionSessionState, c as setExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, t as createSession } from "./session-BE9_p0sN.js";
+import { a as getExtensionSessionState, c as setExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, t as createSession } from "./session-Bdk31kA5.js";
 import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { o as withTimeout } from "./timeout-BDetbuN6.js";
 import { i as installCacheBreakLogger } from "./cache-telemetry-ehVdWsg2.js";
 import { a as generateStructuredData, c as shouldAutoGenerateTitle, f as commandBlockToEvent, g as parseCommandInvocation, h as executeCommand, n as patchInlineGhost, p as commandBlocksToContent, r as resolveInlineSuggestion, s as generateSessionTitle, t as createPathAutocompleteProvider } from "./inline-autocomplete-DC2cxprN.js";
 import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.js";
 import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-C7eIjWYm.js";
-import { a as ZIDANE_EXTENSION_SKILL_NAME, d as extensionScaffold, f as readSkillEditMarker, h as withZidaneSkillEditSkill, i as SKILL_EDIT_METADATA_KEY, l as editSessionMetadata, m as withZidaneExtensionSkill, o as ZIDANE_SKILL_EDIT_SKILL_NAME, t as loginMcpServer, u as extensionDirForCwd } from "./login-ClSY8pN6.js";
-import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning, w as renderDefaultCallbackPage } from "./auth-WkdClN2Y.js";
+import { a as ZIDANE_EXTENSION_SKILL_NAME, d as extensionScaffold, f as readSkillEditMarker, h as withZidaneSkillEditSkill, i as SKILL_EDIT_METADATA_KEY, l as editSessionMetadata, m as withZidaneExtensionSkill, o as ZIDANE_SKILL_EDIT_SKILL_NAME, t as loginMcpServer, u as extensionDirForCwd } from "./login-DZHMF7Gl.js";
+import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning, w as renderDefaultCallbackPage } from "./auth-Dptb8U5J.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
 import { $ as clipDiffForRender, B as isTurnHighlighted, C as chunkMarkdownForRender, E as stripHtmlCommentsOutsideCode, F as blendHsl, G as retagUserPromptEvents, H as isVisible, I as buildLinearRamp, J as streamEventSearchText, K as selectableTurnIds, L as BASH_CALL_ID_PREFIX, O as createSkillsCompletionProvider, P as createCommandsCompletionProvider, Q as buildUnifiedDiff, R as EDIT_TOOL_NAMES, T as splitMarkdownCodeBlocks, U as isVisibleDuringSearch, V as isUserBashEvent, W as promptHistoryFromEvents, Y as turnSelectionOwnership, Z as buildContextualDiff, _ as turnContextSize, a as TOOL_DISPLAY, b as filterModelCatalog, ct as buildEditOutcomesAnnotation, d as finalizeStreamingMarkdown, dt as parseEditOutcomesFromResult, f as finalizeStreamingMarkdownForOwner, ft as resolveApprovalForPayload, g as revealEarlierTranscriptEvents, h as replaceTranscriptTurnEvents, ht as summarizeOutcomes, i as turnAsText, it as previewEditPayload, j as createFilesCompletionProvider, k as uniqueSkillNamesFromReferences, mt as stripEditOutcomesAnnotation, n as deleteTurnSafely, nt as extractEditPayload, o as displayNameFor, ot as summarizeEditPayload, p as hiddenEarlierTranscriptCount, pt as rewriteMultiEditHeader, q as selectionAfterTurnRemoval, r as truncateTurnsAt, rt as filetypeFromPath, s as formatToolCall, u as capTranscriptEvents, ut as mergeApprovalAndBodyOutcomes, v as splitPromptSegments, vt as createChatsCompletionProvider, w as normalizeMarkdownCodeFences, y as buildModelCatalog, z as isEditErrorResult } from "./turn-operations-CBdrdYiF.js";
@@ -233,17 +233,43 @@ function inCheckboxZone(event, startCol, width = 4) {
 	const col = event.x - target.x;
 	return col >= startCol && col < startCol + width;
 }
+/**
+* True when a click on a compound hint landed on its SECONDARY chord —
+* `extra.key` or `extra.label` (e.g. the `/l medium fast` run inside
+* `ctrl+m/l claude-opus-4-8 medium fast`). Same coordinate technique as
+* {@link inCheckboxZone}: the hint must stay ONE `<text>` renderable
+* because {@link hintSpans} interleaves primary and secondary spans
+* (`key`, `extra.key`, ` label`, ` extra.label`), so the zones can only
+* be told apart by glyph column.
+*
+* The leading space before `label` belongs to the primary zone; line 0 is
+* pinned so a wrapped continuation line reads as primary. Degrades to
+* `false` (primary semantics) when the target's geometry is unavailable.
+*/
+function inHintExtraZone(event, hint) {
+	if (!hint.extra) return false;
+	const target = event.target;
+	if (!target || typeof target.x !== "number" || typeof target.y !== "number") return false;
+	if (event.y - target.y !== 0) return false;
+	const col = event.x - target.x;
+	const keyLen = hint.key === "" ? 0 : hint.key.length;
+	const extraKeyEnd = keyLen + hint.extra.key.length;
+	if (col >= keyLen && col < extraKeyEnd) return true;
+	return col >= extraKeyEnd + (hint.key === "" ? 0 : 1) + hint.label.length;
+}
 /** Spans for one hint's text content — shared by hover and rest states. */
 function hintSpans(hint, COLOR, hovered) {
-	const keyColor = hovered ? COLOR.accent : hint.keyColor ?? COLOR.warn;
-	const labelColor = hovered ? COLOR.accent : hint.labelColor ?? COLOR.dim;
+	const primaryHover = hovered === "primary";
+	const extraHover = hovered === "extra";
+	const keyColor = primaryHover ? COLOR.accent : hint.keyColor ?? COLOR.warn;
+	const labelColor = primaryHover ? COLOR.accent : hint.labelColor ?? COLOR.dim;
 	return /* @__PURE__ */ jsxs(Fragment, { children: [
 		hint.key !== "" && /* @__PURE__ */ jsx$1("span", {
 			fg: keyColor,
 			children: hint.key
 		}),
 		hint.extra && /* @__PURE__ */ jsx$1("span", {
-			fg: hovered ? COLOR.accent : hint.extra.keyColor ?? COLOR.mute,
+			fg: extraHover ? COLOR.accent : hint.extra.keyColor ?? COLOR.mute,
 			children: hint.extra.key
 		}),
 		/* @__PURE__ */ jsx$1("span", {
@@ -251,33 +277,58 @@ function hintSpans(hint, COLOR, hovered) {
 			children: hint.key === "" ? hint.label : ` ${hint.label}`
 		}),
 		hint.extra && /* @__PURE__ */ jsx$1("span", {
-			fg: hovered ? COLOR.accent : hint.extra.labelColor ?? COLOR.dim,
+			fg: extraHover ? COLOR.accent : hint.extra.labelColor ?? COLOR.dim,
 			children: ` ${hint.extra.label}`
 		})
 	] });
 }
 /**
+* Hover zone for a pointer event, or `null` when the zone under the
+* pointer has no key to dispatch (an inert half must not light up).
+* Split out so the render surface stays declarative and the mapping is
+* testable without a renderer.
+*/
+function hoverZoneFor(event, hint, clickable) {
+	if ((inHintExtraZone(event, hint) ? "extra" : "primary") === "extra") return clickable.extra ? "extra" : null;
+	return clickable.primary ? "primary" : null;
+}
+/**
 * One hint as its own `<text>` renderable — clickable when its key spec
 * parses, hover-highlighted in the theme accent. Non-parseable hints
 * render identically but inert, so decorative chips cost nothing.
+*
+* A compound hint (`ctrl+m/l gpt-5 high fast`) carries TWO targets in the
+* one renderable: the primary pair dispatches `hint.key`, the secondary
+* chord + label dispatch `extra.keySpec`. Both click and hover resolve the
+* zone by glyph column ({@link inHintExtraZone}), so hovering the model id
+* highlights only the model id.
 */
 function ClickableHint({ hint }) {
 	const COLOR = useColors();
 	const renderer = useRenderer();
-	const [hovered, setHovered] = useState(false);
-	if (!(parseHintKeySpec(hint.key) !== null)) return /* @__PURE__ */ jsx$1("text", {
+	const [hovered, setHovered] = useState(null);
+	const primaryClickable = parseHintKeySpec(hint.key) !== null;
+	const extraSpec = hint.extra ? hint.extra.keySpec ?? hint.extra.key : null;
+	const extraClickable = extraSpec !== null && parseHintKeySpec(extraSpec) !== null;
+	if (!primaryClickable && !extraClickable) return /* @__PURE__ */ jsx$1("text", {
 		selectable: false,
-		children: hintSpans(hint, COLOR, false)
+		children: hintSpans(hint, COLOR, null)
 	});
+	const clickable = {
+		primary: primaryClickable,
+		extra: extraClickable
+	};
 	return /* @__PURE__ */ jsx$1("text", {
 		selectable: false,
 		onMouseDown: (event) => {
 			event.stopPropagation();
 			event.preventDefault();
-			dispatchHintKey(renderer, hint.key);
+			if (extraClickable && inHintExtraZone(event, hint)) dispatchHintKey(renderer, extraSpec);
+			else if (primaryClickable) dispatchHintKey(renderer, hint.key);
 		},
-		onMouseOver: () => setHovered(true),
-		onMouseOut: () => setHovered(false),
+		onMouseOver: (event) => setHovered(hoverZoneFor(event, hint, clickable)),
+		onMouseMove: (event) => setHovered(hoverZoneFor(event, hint, clickable)),
+		onMouseOut: () => setHovered(null),
 		children: hintSpans(hint, COLOR, hovered)
 	});
 }
@@ -2280,7 +2331,8 @@ function StatusSpinner({ color }) {
 	});
 }
 /**
-* Bordered container for one run of subagent events. The box's border +
+* Bordered container for one subagent's events inside a run — concurrent
+* siblings each get their own box (see {@link partitionTranscript}). The box's border +
 * left padding give the visual "this is a subagent" affordance, so events
 * inside render with `depthOffset: 1` — a direct child of the parent
 * (depth 1) sits flush against the box's inner padding rather than being
@@ -2857,18 +2909,21 @@ function partitionTranscript(events, settings, searchReveal) {
 	const groupKeys = settings.groupToolCalls && searchReveal === void 0 ? computeToolGroupKeys(visible) : null;
 	const groups = /* @__PURE__ */ new Map();
 	const items = [];
-	let run = [];
+	let lanes = /* @__PURE__ */ new Map();
 	let runPrevious;
 	const flush = () => {
-		if (run.length > 0) {
+		if (lanes.size === 0) return;
+		let previous = runPrevious;
+		for (const lane of lanes.values()) {
 			items.push({
 				kind: "child-run",
-				events: run,
-				previous: runPrevious
+				events: lane,
+				previous
 			});
-			run = [];
-			runPrevious = void 0;
+			previous = lane[lane.length - 1];
 		}
+		lanes = /* @__PURE__ */ new Map();
+		runPrevious = void 0;
 	};
 	for (let i = 0; i < visible.length; i++) {
 		const event = visible[i];
@@ -2890,8 +2945,10 @@ function partitionTranscript(events, settings, searchReveal) {
 			continue;
 		}
 		if (!settings.hideSubagentOutput && isChild(event)) {
-			if (run.length === 0) runPrevious = visible[i - 1];
-			run.push(event);
+			if (lanes.size === 0) runPrevious = visible[i - 1];
+			const lane = lanes.get(event.childId ?? "");
+			if (lane) lane.push(event);
+			else lanes.set(event.childId ?? "", [event]);
 		} else {
 			flush();
 			items.push({
@@ -8444,8 +8501,10 @@ const COMMENT_TEXTAREA_BINDINGS = (() => {
 * doesn't differentiate at this layer). Two surfaces driven off the
 * request's discriminator:
 *
-*   - `plan` → renders the title + markdown body + (optional) step list,
-*     then a 3-option decision picker. Reject and revise can flow into a
+*   - `plan` → renders the title + a 3-option decision picker. The plan
+*     BODY is not here — it lives in {@link PlanReviewPanel}, which the
+*     host mounts in the content/transcript slot; the two pair (panel
+*     above, this block below). Reject and revise can flow into a
 *     comment textarea for free-text feedback before final submit.
 *
 *   - `question` → renders the question text, then a choice picker
@@ -8481,49 +8540,102 @@ function InteractionShell({ title, maxHeight, children }) {
 		children
 	});
 }
-/** 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.
+* The plan BODY half of plan review — pairs with {@link InteractionBlock}
+* (which renders only the title + decision picker for `plan` requests).
+* The chat screen hides the Transcript (same `visible: false` pattern as
+* the file-edit approval modal) and mounts this panel in its place, so
+* the plan body gets the full conversation area: always expanded, one
+* scrollbox, no preview/collapse state. Hosts embedding these standalone
+* must mount BOTH — the picker alone shows a plan the user cannot read.
 */
-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
-	};
+function PlanReviewPanel({ request }) {
+	const COLOR = useColors();
+	const mdStyle = useMdStyle();
+	const focused = useModalAwareFocus();
+	const scrollboxRef = useRef(null);
+	const { title, plan, steps } = request.payload;
+	useKeyboard((key) => {
+		if (!focused) return;
+		if (key.ctrl || key.meta || key.option || key.shift) return;
+		if (key.name !== "pageup" && key.name !== "pagedown") 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
+		});
+	});
+	return /* @__PURE__ */ jsxs("box", {
+		title: " plan ",
+		style: {
+			border: true,
+			borderColor: COLOR.warn,
+			paddingLeft: 1,
+			paddingRight: 1,
+			flexGrow: 1,
+			flexDirection: "column"
+		},
+		children: [
+			/* @__PURE__ */ jsx$1("text", {
+				fg: COLOR.brand,
+				wrapMode: "word",
+				style: { flexShrink: 0 },
+				children: title
+			}),
+			/* @__PURE__ */ jsxs("scrollbox", {
+				ref: scrollboxRef,
+				focusable: false,
+				style: {
+					flexGrow: 1,
+					flexShrink: 1,
+					marginTop: 1
+				},
+				children: [/* @__PURE__ */ jsx$1("markdown", {
+					content: plan,
+					syntaxStyle: mdStyle,
+					streaming: false,
+					internalBlockMode: "coalesced",
+					fg: COLOR.dim
+				}), steps && steps.length > 0 && /* @__PURE__ */ jsxs("box", {
+					style: {
+						flexDirection: "column",
+						marginTop: 1
+					},
+					children: [/* @__PURE__ */ jsx$1("text", {
+						fg: COLOR.mute,
+						children: "steps:"
+					}), steps.map((step, i) => /* @__PURE__ */ jsxs("text", {
+						fg: COLOR.dim,
+						wrapMode: "word",
+						children: [
+							/* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.warn,
+								children: `  ${i + 1}. `
+							}),
+							/* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.brand,
+								children: step.title
+							}),
+							step.description && /* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.mute,
+								children: ` · ${step.description}`
+							})
+						]
+					}, step.id))]
+				})]
+			}),
+			/* @__PURE__ */ jsxs("text", {
+				fg: COLOR.mute,
+				style: { flexShrink: 0 },
+				children: [/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.warn,
+					children: "pgup/pgdn"
+				}), " or mouse wheel to scroll"]
+			})
+		]
+	});
 }
 const PLAN_OPTIONS = [
 	{
@@ -8544,41 +8656,17 @@ const PLAN_OPTIONS = [
 ];
 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]);
+	const { title } = request.payload;
 	useKeyboard((key) => {
 		if (!focused) return;
 		if (key.ctrl || key.meta || key.option) return;
-		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
-		});
+		if (key.name !== "tab" || !key.shift) return;
+		if (stage !== "comment") return;
+		setStage("pick");
 	});
 	const onPick = useCallback((value) => {
 		if (value === "approve") {
@@ -8654,109 +8742,17 @@ function PlanInteractionBlock({ request, onResolve }) {
 			})
 		]
 	}, "comment");
-	const stepsBlock = steps && steps.length > 0 ? /* @__PURE__ */ jsxs("box", {
-		style: {
-			flexDirection: "column",
-			marginTop: 1
-		},
-		children: [/* @__PURE__ */ jsx$1("text", {
-			fg: COLOR.mute,
-			children: "steps:"
-		}), steps.map((step, i) => /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.dim,
-			wrapMode: "word",
-			children: [
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: `  ${i + 1}. `
-				}),
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.brand,
-					children: step.title
-				}),
-				step.description && /* @__PURE__ */ jsx$1("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$1("text", {
-				fg: COLOR.brand,
-				wrapMode: "none",
-				style: { flexShrink: 0 },
-				children: title
-			}),
-			expanded ? /* @__PURE__ */ jsxs("scrollbox", {
-				ref: scrollboxRef,
-				focusable: false,
-				style: {
-					flexGrow: 1,
-					flexShrink: 1,
-					marginTop: 1,
-					marginBottom: 1
-				},
-				children: [/* @__PURE__ */ jsx$1("markdown", {
-					content: plan,
-					syntaxStyle: mdStyle,
-					streaming: false,
-					internalBlockMode: "coalesced",
-					fg: COLOR.dim
-				}), stepsBlock]
-			}) : /* @__PURE__ */ jsxs("box", {
-				style: {
-					flexDirection: "column",
-					marginTop: 1,
-					marginBottom: 1
-				},
-				children: [
-					/* @__PURE__ */ jsx$1("markdown", {
-						content: previewText,
-						syntaxStyle: mdStyle,
-						streaming: false,
-						internalBlockMode: "coalesced",
-						fg: COLOR.dim
-					}),
-					overflow && /* @__PURE__ */ jsxs("text", {
-						fg: COLOR.mute,
-						wrapMode: "word",
-						children: [
-							hiddenLineCount > 0 ? `… ${hiddenLineCount} more line${hiddenLineCount === 1 ? "" : "s"} · ` : "… more content · ",
-							/* @__PURE__ */ jsx$1("span", {
-								fg: COLOR.warn,
-								children: "↹"
-							}),
-							" to expand and scroll"
-						]
-					}),
-					stepsBlock
-				]
-			}),
-			expanded && /* @__PURE__ */ jsxs("text", {
-				fg: COLOR.mute,
-				style: { flexShrink: 0 },
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↹"
-					}),
-					" to collapse · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "pgup/pgdn"
-					}),
-					" to scroll"
-				]
-			}),
-			/* @__PURE__ */ jsx$1(OptionList, {
-				items: PLAN_OPTIONS,
-				onPick
-			})
-		]
+		children: [/* @__PURE__ */ jsx$1("text", {
+			fg: COLOR.brand,
+			wrapMode: "word",
+			style: { flexShrink: 0 },
+			children: title
+		}), /* @__PURE__ */ jsx$1(OptionList, {
+			items: PLAN_OPTIONS,
+			onPick
+		})]
 	}, "pick");
 }
 /**
@@ -11208,6 +11204,7 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 		onPopupOpenChange?.(open);
 	}, [onPopupOpenChange]);
 	const fileEditPending = pending && isFileEditTool(pending.tool) ? pending : null;
+	const planPending = !pending && pendingInteraction?.kind === "plan" ? pendingInteraction : null;
 	const modal = useModal();
 	useEffect(() => {
 		if (!fileEditPending) return;
@@ -11226,7 +11223,7 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 					borderColor: COLOR.border,
 					flexGrow: 1,
 					flexDirection: "column",
-					visible: !fileEditPending
+					visible: !fileEditPending && !planPending
 				},
 				children: /* @__PURE__ */ jsx$1(Transcript, {
 					events: displayedEvents,
@@ -11246,7 +11243,7 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 					flexShrink: 0,
 					backgroundColor: SURFACE.background
 				},
-				children: [!fileEditPending && /* @__PURE__ */ jsx$1("box", { style: {
+				children: [!fileEditPending && !planPending && /* @__PURE__ */ jsx$1("box", { style: {
 					height: 1,
 					marginTop: -1,
 					marginLeft: 1,
@@ -11257,6 +11254,7 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 					flexShrink: 0
 				} }), /* @__PURE__ */ jsx$1(ExtensionStatusLine, {})]
 			}),
+			planPending && /* @__PURE__ */ jsx$1(PlanReviewPanel, { request: planPending }, planPending.id),
 			fileEditPending && /* @__PURE__ */ jsx$1(FileEditApprovalModal, {
 				request: fileEditPending,
 				onDecide: onApproval
@@ -11273,7 +11271,7 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 				}) : pendingInteraction ? /* @__PURE__ */ jsx$1(InteractionBlock, {
 					request: pendingInteraction,
 					onResolve: onInteraction
-				}) : /* @__PURE__ */ jsxs(Fragment, { children: [
+				}, pendingInteraction.id) : /* @__PURE__ */ jsxs(Fragment, { children: [
 					queuedMessages.length > 0 && !completionPopupOpen && /* @__PURE__ */ jsx$1(QueuedMessagesBlock, {
 						messages: queuedMessages,
 						selectionIndex: queueSelectionIndex,
@@ -22170,13 +22168,19 @@ function AppShell() {
 			store,
 			...source.projectRoot ? { projectRoot: source.projectRoot } : {}
 		});
-		const rehomed = await rehomePersistedStubs(slice, resolvePersistDir({
+		const forkPersistDir = resolvePersistDir({
+			userDir: cacheDir,
+			sessionId: fork.id
+		});
+		let rehomed = await rehomePersistedStubs(slice, resolvePersistDir({
 			userDir: cacheDir,
 			sessionId: source.id
-		}), resolvePersistDir({
+		}), forkPersistDir);
+		const legacyPersistDir = resolveLegacyPersistDir({
 			userDir: cacheDir,
-			sessionId: fork.id
-		}));
+			sessionId: source.id
+		});
+		if (legacyPersistDir !== void 0) rehomed = await rehomePersistedStubs(rehomed, legacyPersistDir, forkPersistDir);
 		fork.setTurns(rehomed);
 		fork.setRuns(inheritedRuns);
 		try {
@@ -22275,18 +22279,17 @@ function AppShell() {
 			debugLog("delete session failed", err);
 			return;
 		}
-		cleanupPersistedSession(resolvePersistDir({
+		cleanupPersistedSession(resolveSessionDir({
 			userDir: cacheDir,
 			sessionId: id
 		}));
-		cleanupPersistedSession(resolveTasksDir({
+		for (const stale of [resolveLegacyPersistDir({
 			userDir: cacheDir,
 			sessionId: id
-		}));
-		cleanupPersistedSession(resolveMcpWarningsDir({
+		}), resolveLegacySessionDir({
 			userDir: cacheDir,
 			sessionId: id
-		}));
+		})]) if (stale !== void 0) cleanupPersistedSession(stale);
 		const wasCurrent = id === currentSession?.id;
 		if (wasCurrent) {
 			await teardown();
@@ -24690,6 +24693,6 @@ async function runTui(options = {}) {
 	process.exit(0);
 }
 //#endregion
-export { AgentPickerModal, App, AuthScreen, ChatScreen, CompletionPopup, EffortPickerModal, ExtensionRenderersProvider, ExtensionsSettingsModal, Footer, InteractionBlock, McpsSettingsModal, Modal, ModalRoot, ModelOptionsPickerModal, ModelPickerModal, SessionDetailsModal, SessionsScreen, SettingsModal, SkillsSettingsModal, Spinner, StatusSpinner, TOOL_DISPLAY, TitleOverlay, ToggleListModal, Transcript, TurnDetailsModal, accentColor, buildMdStyle, clipHintsToWidth, computeTurnAnchors, displayNameFor, formatToolCall, hintsLength, isEditErrorResult, isTurnHighlighted, isVisible, marginTopFor, onInputSubmit, registerTuiHostModules, renderHintSpans, runTui, selectableTurnIds, splitMarkdownCodeBlocks, splitPromptSegments, truncateTrailing, turnSelectionOwnership, useExtensionRenderers, useMdStyle, useModal, useModalAwareFocus, useRowVisible, useSessionState };
+export { AgentPickerModal, App, AuthScreen, ChatScreen, CompletionPopup, EffortPickerModal, ExtensionRenderersProvider, ExtensionsSettingsModal, Footer, InteractionBlock, McpsSettingsModal, Modal, ModalRoot, ModelOptionsPickerModal, ModelPickerModal, PlanReviewPanel, SessionDetailsModal, SessionsScreen, SettingsModal, SkillsSettingsModal, Spinner, StatusSpinner, TOOL_DISPLAY, TitleOverlay, ToggleListModal, Transcript, TurnDetailsModal, accentColor, buildMdStyle, clipHintsToWidth, computeTurnAnchors, displayNameFor, formatToolCall, hintsLength, isEditErrorResult, isTurnHighlighted, isVisible, marginTopFor, onInputSubmit, registerTuiHostModules, renderHintSpans, runTui, selectableTurnIds, splitMarkdownCodeBlocks, splitPromptSegments, truncateTrailing, turnSelectionOwnership, useExtensionRenderers, useMdStyle, useModal, useModalAwareFocus, useRowVisible, useSessionState };
 
 //# sourceMappingURL=tui.js.map