zidane 6.5.1 → 6.5.3

package/dist/tui.js

@@ -1,28 +1,29 @@
-import { $t as toggleChainEntry, A as redirectUriFromAuthUrl, At as resolveTheme, Bn as TODO_STATUS_GLYPHS, Bt as useDiscovery, Cr as stripSpawnTokensLine, Ct as SETTINGS_TOGGLES, D as formatPathForCwd, Dr as toolResultText, En as discoverAgentsMd, Er as toolCallPreview, Et as useSettings, F as loadMcpToolsCache, G as parentServerName, Gt as resolveStoragePaths, Ht as ConfigProvider, I as mcpToolsCachePath, Jt as chainsEqual, K as createFileMcpCredentialStore, Kt as buildRunModel, L as refreshMcpToolsCatalog, M as runOAuthLogin, N as supportsOAuth, O as fetchOAuthRedirect, Or as updateToolEventOutcomes, Pn as accentColor, Q as getMcpAuthStatus, Rt as createDiscoverySlot, Sr as serverToolResultSummary, St as SETTINGS_INPUTS, T as suggestSafelistEntries, Tn as chatAutoCompactBehavior, Tt as clampFps, U as buildVisibleMcpRows, Ut as useConfig, V as useMcpToolToggleMap, Vt as useDiscoveryOptional, W as indexOfServerRow, Wt as resolveConfig, X as useMcpAuthDispatch, Xn as useActiveTodos, Xt as providerKeySetChanged, Y as McpAuthProvider, Yt as filterChainFallbacks, Z as useMcpAuthState, Zt as restoreChainFallbacks, _ as useSafeModeQueue, _r as lastContextSizeFromTurns, _t as listProjectFiles, a as useSurfaces, an as removeMcpServer, b as getSafelist, br as marginTopFor, bt as SETTINGS_CATEGORIES, c as useStreamBuffer, cn as dedupMcpServersByName, cr as buildPlanSystem, d as discoverProjectSkills, dr as createChatTurnsReadTool, dt as EMPTY_HINTS, en as useCompletion, et as ASK_USER_TOOL, fn as tryOpenBrowser, ft as clipHintsToWidth, g as useSafeModeActions, gn as useUpdateCheck, gr as eventsFromTurns, h as SafeModeProvider, hn as buildUpdateHint, hr as deriveSessionTitle, ht as buildHints, i as useSelectStyle, in as mcpsWritePath, it as createInteractionTools, j as oauthUsesManualCodePaste, kr as usageByModel, kt as resolveChipColor, l as buildSkillsConfig, lr as envSection, lt as useInteractionsActions, m as writeSessionExport, mn as bootTick, mt as truncateTrailing, n as ThemeProvider, nn as hasClaudeCodeSetup, nt as PRESENT_PLAN_TOOL, on as upsertMcpServer, ot as makeRequestInteraction, pr as compactSummaryEvent, pt as hintsLength, qn as pruneTodosByRun, qt as chainPositionOf, r as useColors, rn as importFromClaudeCode, rt as buildResumedToolResultsTurn, s as useTheme, sn as buildMcpServers, sr as buildBuildSystem, st as pendingInteractionsFromTurns, t as computeTurnAnchors, tn as countClaudeSessionFiles, tt as InteractionsProvider, u as defaultSkillScanPaths, un as discoverProjectMcps, ur as chatReferenceTokensForPrompt, ut as useInteractionsQueue, vr as listSessionMeta, vt as useEnabledToggleSet, wr as sumRunCosts, wt as SettingsProvider, x as isOnSafelist, xt as SETTINGS_CHOICES, y as addToSafelist, yr as loadState, yt as DEFAULT_SETTINGS, z as subscribeMcpToolsCache, zt as DiscoveryProvider } from "./transcript-anchors-DEIr0tJC.js";
 import { C as estimateRebilledCostUsd } from "./openai-compat-CnHeo4Lz.js";
-import { $ as installExtensionFromSpec, $t as groupBindings, A as selectFilesFromSession, C as resolveLegacySessionDir, Cn as resolveExtensionConfigValue, D as resolveTasksDir, Dn as OUTPUT_RESERVE_TOKENS, E as resolveSessionDir, Et as isSpawnTool, G as summaryToTurn, It as looksBinary, M as compactConversation, O as buildPostCompactAttachments, On as effectiveContextWindow, Pt as tailTruncate, Qt as formatBindingForDisplay, Rt as createModelSearchTool, S as resolveLegacyPersistDir, T as resolvePersistDir, X as createExtensionPromptBridge, Xt as KEYBINDING_KEY_COL_WIDTH, Z as ExtensionInstallError, Zt as ensureKeybindingsFile, at as createExtensionHud, bt as basic_default, cn as registerExtensionHostModules, dt as filterExtensionRegistry, en as keybindingsPath, f as applyCompactSummaryCutoff, fn as inlineLoadedExtension, ft as filterRegistryPlugins, gn as createDebugLog, hn as scanExtensionDirectories, ht as createExtensionHostRuntimeBridge, it as updateInstalledExtension, lt as composeExtensionPreset, mn as parseExtensionScanPathEnv, mt as partitionExtensionCatalog, on as resolveExtensionKeybindings, ot as discoverAndBuildExtensionRegistry, rt as removeInstalledExtension, t as createAgent, tn as matchesBinding, ut as disposeExtensionRegistry, v as cleanupPersistedSession, w as resolveMcpWarningsDir, wn as sanitizeExtensionConfigActionPatch, x as rehomePersistedStubs, yn as coerceExtensionConfigInput } from "./agent-BVNkC1h4.js";
+import { t as buildContextSegments } from "./context-segments-1mcqSCM3.js";
+import { $ as installExtensionFromSpec, $t as groupBindings, A as selectFilesFromSession, C as resolveLegacySessionDir, Cn as resolveExtensionConfigValue, D as resolveTasksDir, Dn as OUTPUT_RESERVE_TOKENS, E as resolveSessionDir, Et as isSpawnTool, G as summaryToTurn, It as looksBinary, M as compactConversation, O as buildPostCompactAttachments, On as effectiveContextWindow, Pt as tailTruncate, Qt as formatBindingForDisplay, Rt as createModelSearchTool, S as resolveLegacyPersistDir, T as resolvePersistDir, X as createExtensionPromptBridge, Xt as KEYBINDING_KEY_COL_WIDTH, Z as ExtensionInstallError, Zt as ensureKeybindingsFile, at as createExtensionHud, bt as basic_default, cn as registerExtensionHostModules, dt as filterExtensionRegistry, en as keybindingsPath, f as applyCompactSummaryCutoff, fn as inlineLoadedExtension, ft as filterRegistryPlugins, gn as createDebugLog, hn as scanExtensionDirectories, ht as createExtensionHostRuntimeBridge, it as updateInstalledExtension, lt as composeExtensionPreset, mn as parseExtensionScanPathEnv, mt as partitionExtensionCatalog, on as resolveExtensionKeybindings, ot as discoverAndBuildExtensionRegistry, rt as removeInstalledExtension, t as createAgent, tn as matchesBinding, ut as disposeExtensionRegistry, v as cleanupPersistedSession, w as resolveMcpWarningsDir, wn as sanitizeExtensionConfigActionPatch, x as rehomePersistedStubs, yn as coerceExtensionConfigInput } from "./agent-8kfGIDb_.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";
 import { u as errorMessage } from "./errors-BwBxu3zD.js";
-import { R as projectUserPaths, c as SkillInstallError, l as installSkillFromSpec, z as findGitRoot } from "./skills-Cp9vnBwd.js";
+import { E as buildCatalog, R as projectUserPaths, c as SkillInstallError, l as installSkillFromSpec, z as findGitRoot } from "./skills-Cp9vnBwd.js";
 import { n as defaultPluginDataRoot, r as loadAgentPlugin } from "./plugins-2PMTVcp-.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 { _ as hasAuthorizationHeader, h as McpOAuthProvider, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-C6IkXNOS.js";
-import { replaceDynamicSection } from "./prompt.js";
+import { _ as hasAuthorizationHeader, h as McpOAuthProvider, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-D9fqOQo5.js";
+import { replaceDynamicSection, splitSystemPrompt } from "./prompt.js";
 import { a as getExtensionSessionState, c as setExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, t as createSession } from "./session-VpLrNaFQ.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-D0MPvBaS.js";
 import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.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-CR3fDHXh.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-B8ZuBcKC.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-D3CKhgbI.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-CS_e8ng1.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
-import { $ as buildContextualDiff, A as createSkillsCompletionProvider, B as EDIT_TOOL_NAMES, C as chunkMarkdownForRender, D as splitMarkdownCodeBlocks, E as normalizeMarkdownCodeFences, G as isVisibleDuringSearch, H as isTurnHighlighted, I as createCommandsCompletionProvider, J as selectableTurnIds, K as promptHistoryFromEvents, L as blendHsl, N as createFilesCompletionProvider, O as stripHtmlCommentsOutsideCode, R as buildLinearRamp, T as codeTokenHasClosingFence, U as isUserBashEvent, V as isEditErrorResult, W as isVisible, X as streamEventSearchText, Y as selectionAfterTurnRemoval, Z as turnSelectionOwnership, _ as turnContextSize, _t as summarizeOutcomes, a as TOOL_DISPLAY, at as filetypeFromPath, b as filterModelCatalog, bt as createChatsCompletionProvider, ct as summarizeEditPayload, d as finalizeStreamingMarkdown, et as buildUnifiedDiff, f as finalizeStreamingMarkdownForOwner, ft as mergeApprovalAndBodyOutcomes, g as revealEarlierTranscriptEvents, gt as stripEditOutcomesAnnotation, h as replaceTranscriptTurnEvents, ht as rewriteMultiEditHeader, i as turnAsText, it as extractEditPayload, j as uniqueSkillNamesFromReferences, mt as resolveApprovalForPayload, n as deleteTurnSafely, o as displayNameFor, ot as previewEditPayload, p as hiddenEarlierTranscriptCount, pt as parseEditOutcomesFromResult, q as retagUserPromptEvents, r as truncateTurnsAt, s as formatToolCall, tt as clipDiffForRender, u as capTranscriptEvents, ut as buildEditOutcomesAnnotation, v as splitPromptSegments, w as closeDanglingCodeFence, y as buildModelCatalog, z as BASH_CALL_ID_PREFIX } from "./turn-operations-C3IijXMW.js";
+import { $ as buildContextualDiff, A as createSkillsCompletionProvider, B as EDIT_TOOL_NAMES, C as chunkMarkdownForRender, D as splitMarkdownCodeBlocks, E as normalizeMarkdownCodeFences, G as isVisibleDuringSearch, H as isTurnHighlighted, I as createCommandsCompletionProvider, J as selectableTurnIds, K as promptHistoryFromEvents, L as blendHsl, N as createFilesCompletionProvider, O as stripHtmlCommentsOutsideCode, R as buildLinearRamp, T as codeTokenHasClosingFence, U as isUserBashEvent, V as isEditErrorResult, W as isVisible, X as streamEventSearchText, Y as selectionAfterTurnRemoval, Z as turnSelectionOwnership, _ as turnContextSize, _t as summarizeOutcomes, a as TOOL_DISPLAY, at as filetypeFromPath, b as filterModelCatalog, bt as createChatsCompletionProvider, ct as summarizeEditPayload, d as finalizeStreamingMarkdown, et as buildUnifiedDiff, f as finalizeStreamingMarkdownForOwner, ft as mergeApprovalAndBodyOutcomes, g as revealEarlierTranscriptEvents, gt as stripEditOutcomesAnnotation, h as replaceTranscriptTurnEvents, ht as rewriteMultiEditHeader, i as turnAsText, it as extractEditPayload, j as uniqueSkillNamesFromReferences, mt as resolveApprovalForPayload, n as deleteTurnSafely, o as displayNameFor, ot as previewEditPayload, p as hiddenEarlierTranscriptCount, pt as parseEditOutcomesFromResult, q as retagUserPromptEvents, r as truncateTurnsAt, s as formatToolCall, tt as clipDiffForRender, u as capTranscriptEvents, ut as buildEditOutcomesAnnotation, v as splitPromptSegments, w as closeDanglingCodeFence, y as buildModelCatalog, z as BASH_CALL_ID_PREFIX } from "./turn-operations-iGu5J08j.js";
 import { a as searchHighlightRanges, c as searchSessionHistoryIndexAsync, i as highlightSegments, n as buildSessionSearchIndexAsync, r as filterSessionSearchCatalog, u as searchSessionIndexAsync } from "./history-search-C4bk1Wz_.js";
+import { $ as McpAuthProvider, $t as filterChainFallbacks, An as discoverAgentsMd, Ar as toolCallPreview, At as useSettings, B as mcpToolsCachePath, C as addToSafelist, Cr as loadState, Ct as DEFAULT_SETTINGS, Dr as stripSpawnTokensLine, Dt as SETTINGS_TOGGLES, Er as serverToolResultSummary, Et as SETTINGS_INPUTS, F as oauthUsesManualCodePaste, G as useMcpToolToggleMap, Gt as useDiscoveryOptional, Ht as createDiscoverySlot, I as runOAuthLogin, J as indexOfServerRow, Jt as resolveConfig, Kt as ConfigProvider, L as supportsOAuth, M as fetchOAuthRedirect, Mr as updateToolEventOutcomes, Nr as usageByModel, Nt as resolveChipColor, Or as sumRunCosts, Ot as SettingsProvider, P as redirectUriFromAuthUrl, Pt as resolveTheme, Qt as chainsEqual, Rn as accentColor, Sr as listSessionMeta, St as useEnabledToggleSet, T as isOnSafelist, Tt as SETTINGS_CHOICES, U as subscribeMcpToolsCache, Ut as DiscoveryProvider, V as refreshMcpToolsCatalog, Wn as TODO_STATUS_GLYPHS, Wt as useDiscovery, X as createFileMcpCredentialStore, Xt as buildRunModel, Y as parentServerName, Yt as resolveStoragePaths, Zn as pruneTodosByRun, Zt as chainPositionOf, _r as compactSummaryEvent, _t as hintsLength, a as useSurfaces, an as countClaudeSessionFiles, at as InteractionsProvider, b as useSafeModeActions, bn as useUpdateCheck, br as eventsFromTurns, c as discoverSystemMd, cn as mcpsWritePath, ct as createInteractionTools, d as userSystemMdPath, dn as buildMcpServers, dr as buildBuildSystem, dt as pendingInteractionsFromTurns, en as providerKeySetChanged, er as useActiveTodos, et as useMcpAuthDispatch, f as useStreamBuffer, fn as dedupMcpServersByName, fr as buildPlanSystem, gn as tryOpenBrowser, gt as clipHintsToWidth, h as discoverProjectSkills, hr as createChatTurnsReadTool, ht as EMPTY_HINTS, i as useSelectStyle, in as useCompletion, it as ASK_USER_TOOL, j as formatPathForCwd, jr as toolResultText, k as suggestSafelistEntries, kn as chatAutoCompactBehavior, kt as clampFps, l as renderSystemMdSeed, ln as removeMcpServer, m as defaultSkillScanPaths, mn as discoverProjectMcps, mr as chatReferenceTokensForPrompt, mt as useInteractionsQueue, n as ThemeProvider, nt as getMcpAuthStatus, on as hasClaudeCodeSetup, ot as PRESENT_PLAN_TOOL, p as buildSkillsConfig, pr as envSection, pt as useInteractionsActions, q as buildVisibleMcpRows, qt as useConfig, r as useColors, rn as toggleChainEntry, s as useTheme, sn as importFromClaudeCode, st as buildResumedToolResultsTurn, t as computeTurnAnchors, tn as restoreChainFallbacks, tt as useMcpAuthState, u as userScopeOverridesLoad, un as upsertMcpServer, ut as makeRequestInteraction, v as writeSessionExport, vn as bootTick, vt as truncateTrailing, w as getSafelist, wr as marginTopFor, wt as SETTINGS_CATEGORIES, x as useSafeModeQueue, xr as lastContextSizeFromTurns, xt as listProjectFiles, y as SafeModeProvider, yn as buildUpdateHint, yr as deriveSessionTitle, yt as buildHints, z as loadMcpToolsCache } from "./transcript-anchors-uU_KZLsp.js";
 import { basename, delimiter, dirname, join, relative, resolve } from "node:path";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
@@ -2642,7 +2643,7 @@ const NO_SEARCH_MATCHES = {
 * needs a stable id on `StreamEvent` itself, which is a data-model change
 * rather than a rendering one.
 */
-function Transcript({ events, settings, selectedTurnId = null, busy = false, searchQuery, searchPending = false, onLoadEarlier, onSelectTurn, onOpenTurn }) {
+function Transcript({ events, settings, selectedTurnId = null, busy = false, searchQuery, searchPending = false, interactionPending = false, onLoadEarlier, onSelectTurn, onOpenTurn }) {
 	const COLOR = useColors();
 	const showThrobber = busy && settings.showThrobber;
 	const codeSettle = useRef({
@@ -2766,13 +2767,13 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 	}, [events]);
 	const modal = useModalState();
 	useKeyboard(useCallback((key) => {
-		if (modal?.isOpen) return;
+		if (modal?.isOpen || interactionPending) return;
 		if (key.name !== "pageup" && key.name !== "pagedown") return;
 		const scrollbox = scrollboxRef.current;
 		if (!scrollbox) return;
 		const direction = key.name === "pageup" ? -1 : 1;
 		scrollbox.scrollBy(direction, key.shift ? "content" : "viewport");
-	}, [modal]));
+	}, [modal, interactionPending]));
 	const anchors = useMemo(() => computeTurnAnchors(items), [items]);
 	const liveByItem = useMemo(() => {
 		const map = /* @__PURE__ */ new Map();
@@ -6005,6 +6006,88 @@ function readToolsByServer(dataDir) {
 	return out;
 }
 //#endregion
+//#region src/tui/editor-command.ts
+/**
+* `$EDITOR` / `$VISUAL` command parsing.
+*
+* These variables conventionally hold a command LINE, not a bare executable —
+* `code --wait`, `cursor --wait`, `subl -w`, `emacsclient -nw` are all normal
+* values. Spawning the whole string as argv[0] looks for a file literally named
+* `cursor --wait` and fails with ENOENT, so the flags have to be split off.
+*
+* Kept separate from `app.tsx` (and free of `node:child_process`) so the
+* tokenizer is unit-testable without pulling in the TUI.
+*/
+/**
+* Split an editor command line into `[executable, ...args]`.
+*
+* Whitespace-separated, with single and double quotes honored so an editor
+* living under a path with spaces still works
+* (`"/Applications/My App/bin/ed" -w`). Quotes group and are stripped;
+* backslash escaping is deliberately NOT implemented, because on Windows
+* backslash is the path separator and treating `C:\tools\ed` as escapes would
+* corrupt far more command lines than it would rescue.
+*
+* Returns `[]` for an empty or whitespace-only spec, so callers can fall back
+* to the platform opener rather than spawning `''`.
+*/
+function parseEditorCommand(spec) {
+	const tokens = [];
+	let current = "";
+	let quote = null;
+	let quoted = false;
+	for (const ch of spec) {
+		if (quote) {
+			if (ch === quote) quote = null;
+			else current += ch;
+			continue;
+		}
+		if (ch === "\"" || ch === "'") {
+			quote = ch;
+			quoted = true;
+			continue;
+		}
+		if (ch === " " || ch === "	" || ch === "\n" || ch === "\r") {
+			if (current !== "" || quoted) {
+				tokens.push(current);
+				current = "";
+				quoted = false;
+			}
+			continue;
+		}
+		current += ch;
+	}
+	if (current !== "" || quoted) tokens.push(current);
+	return tokens;
+}
+/**
+* Re-quote a single argv token for a shell that will re-parse the joined command
+* line — i.e. `spawn(..., { shell: true })`, which Node uses on Windows so that
+* `.cmd` / `.bat` wrappers (how `code`, `cursor` and friends ship there) resolve.
+*
+* Node does NOT re-quote when `shell` is set: it joins `[cmd, ...args]` with
+* spaces and hands the string over. Since {@link parseEditorCommand} has already
+* STRIPPED the user's quotes, handing tokens back unquoted would split
+* `C:\Program Files\ed.exe` at the space and try to run `C:\Program`. This puts
+* the quotes back.
+*
+* Only tokens that need it are quoted, so a plain `code` stays `code`. A literal
+* double quote is doubled, which is how `cmd.exe` escapes one inside a quoted
+* run.
+*
+* The test covers `cmd.exe` METACHARACTERS, not just whitespace: `&`, `|`, `^`,
+* `<`, `>` and friends carry none of the obvious "needs quoting" signals, so a
+* repo cloned into `C:\work\a&b` would otherwise hand `C:\work\a&b\AGENTS.md`
+* over bare, and cmd would split it at the `&` and run the tail as a second
+* command. `%` and `!` are included so a path containing them can't be mistaken
+* for a variable reference at parse time.
+*/
+function quoteForShell(token) {
+	if (token === "") return "\"\"";
+	if (!/[\s"&|^<>%()!]/.test(token)) return token;
+	return `"${token.replace(/"/g, "\"\"")}"`;
+}
+//#endregion
 //#region src/tui/extension-modal.ts
 /**
 * Resolve a modal contribution to a renderable node. Eager nodes pass through;
@@ -8746,7 +8829,7 @@ function InteractionBlock({ request, onResolve }) {
 		onResolve
 	});
 }
-function InteractionShell({ title, maxHeight, children }) {
+function InteractionShell({ title, maxHeight, minHeight, children }) {
 	return /* @__PURE__ */ jsx$1("box", {
 		title,
 		style: {
@@ -8755,14 +8838,48 @@ function InteractionShell({ title, maxHeight, children }) {
 			paddingLeft: 1,
 			paddingRight: 1,
 			flexDirection: "column",
-			flexShrink: 0,
+			flexShrink: 1,
 			overflow: "hidden",
-			...maxHeight !== void 0 ? { maxHeight } : {}
+			...maxHeight !== void 0 ? { maxHeight } : {},
+			minHeight: minHeight ?? 0
 		},
 		children
 	});
 }
 /**
+* Resolve a key event to a page-scroll direction, or `null` when it isn't one.
+*
+* `pageup` / `pagedown` only, and modifier-free. `shift` is rejected because
+* `shift+page*` means jump-to-top/bottom for the transcript — a panel must not
+* quietly redefine it as a page step. `ctrl+u` / `ctrl+d` are deliberately NOT
+* used: OpenTUI's `defaultTextareaKeyBindings` maps `ctrl+u` to
+* delete-to-line-start, `ctrl+d` to delete and `ctrl+shift+d` to delete-line,
+* and a textarea question is focused on exactly the same condition as these
+* handlers — so those chords would delete the user's answer AND scroll in one
+* keypress. The page keys appear nowhere in that table.
+*/
+function pageScrollDirection(key) {
+	if (key.ctrl || key.meta || key.option || key.shift) return null;
+	if (key.name === "pageup") return -1;
+	if (key.name === "pagedown") return 1;
+	return null;
+}
+/**
+* Scroll one page, keeping a 1-row overlap so the line at the fold stays
+* visible (standard pager UX).
+*
+* Measures `viewport.height`, NOT the renderable's own `height`: the latter
+* includes anything outside the scrolling viewport, which made the step
+* overshoot what the user could actually see. `scrollBy` clamps at both ends.
+*/
+function pageScrollBy(scrollbox, direction) {
+	const page = Math.max(1, scrollbox.viewport.height - 1);
+	scrollbox.scrollBy({
+		x: 0,
+		y: direction * page
+	});
+}
+/**
 * 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
@@ -8779,15 +8896,10 @@ function PlanReviewPanel({ request }) {
 	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 direction = pageScrollDirection(key);
 		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 (direction === null || !sb) return;
+		pageScrollBy(sb, direction);
 	});
 	return /* @__PURE__ */ jsxs("box", {
 		title: " plan ",
@@ -8978,30 +9090,76 @@ function PlanInteractionBlock({ request, onResolve }) {
 	}, "pick");
 }
 /**
-* Cap the question-wizard's height to ~60% of the terminal so the
-* transcript above stays readable when the model fires a long batch.
-* The inner scrollbox handles overflow; the active question is
-* scrolled into view on every advance.
+* Rows the wizard leaves to the transcript above it, and the smallest cap we
+* will ever impose.
+*
+* The cap used to be `'60%'`. A PERCENTAGE `maxHeight` resolves against the
+* parent's height, and the wizard's parent is a content-sized column whose
+* height is indefinite — so Yoga had nothing to take 60% OF and the cap
+* silently did not apply. The shell then grew to whatever the (under-)estimated
+* content claimed and drew its border there, which is how questions ended up
+* rendered below a closed frame. Resolving the cap to a ROW COUNT from the
+* terminal's own dimensions removes that failure mode entirely.
 */
-const QUESTION_WIZARD_MAX_HEIGHT = "60%";
+const WIZARD_RESERVED_ROWS = 8;
+const WIZARD_MIN_ROWS = 8;
+/**
+* Cap the question wizard's height in ROWS, derived from the terminal.
+*
+* Three guards, applied outward:
+*   - **{@link WIZARD_RESERVED_ROWS}** keeps the wizard clear of the top so some
+*     transcript stays visible. This dominates below ~32 rows, so the docstring
+*     claim of "~75%" only actually bites on tall terminals; shorter ones get
+*     `rows − 8`.
+*   - **{@link WIZARD_MIN_ROWS}** floors the result so a short terminal still
+*     gets a usable form rather than a two-line slot.
+*   - **`terminalRows`** ceilings it. Without this the floor wins outright below
+*     8 rows and the function returns a cap TALLER than the viewport — the exact
+*     class of bug this cap exists to prevent (a frame positioned outside what
+*     the terminal can show). On a terminal that small the wizard takes the
+*     whole screen, which is the honest outcome.
+*/
+function wizardMaxRows(terminalRows) {
+	const generous = Math.floor(terminalRows * .75);
+	const leaveRoom = terminalRows - WIZARD_RESERVED_ROWS;
+	return Math.min(terminalRows, Math.max(WIZARD_MIN_ROWS, Math.min(generous, leaveRoom)));
+}
+/**
+* Rows a string occupies once soft-wrapped into `width` columns.
+*
+* The sizing estimates used to count `\n` only, with a comment waving off
+* wrapping as drift the scrollbox would absorb. It doesn't: the estimate feeds
+* the scrollbox's explicit height, so under-counting makes the panel shorter
+* than its content and the frame lands mid-text. A wrapped markdown intro or a
+* wrapped choice description is the common case, not an edge one.
+*
+* Word-boundary-agnostic on purpose: `ceil(len / width)` stays within a row of
+* real word wrapping, and being one row over costs nothing.
+*
+* Assumes one column per code point, so CJK and wide emoji (two cells each)
+* under-count by up to half — the same assumption `truncateToCols` makes in
+* `settings-modal.tsx`. The consequence is a panel sized short of its content,
+* not content the user cannot reach: the scrollbox measures its own children for
+* `scrollHeight`, so the tail stays scrollable either way.
+*/
+function wrappedRows(text, width) {
+	if (width <= 0) return text.split("\n").length;
+	let rows = 0;
+	for (const line of text.split("\n")) rows += Math.max(1, Math.ceil(line.length / width));
+	return rows;
+}
 /**
 * Rows the intro contributes to the wizard's content-sized height.
 *
-* A line count, plus the one-row bottom margin. Wrapping makes this a lower
-* bound, and long intros are capped: past {@link INTRO_ROWS_CAP} the panel would
-* hit its 60% ceiling anyway and the scrollbox takes over, so counting further
-* buys nothing. Zero when there is no intro, which keeps a bare confirm question
-* at its ~4-row size.
+* A wrapped line count, plus the one-row bottom margin. Long intros are capped:
+* past {@link INTRO_ROWS_CAP} the panel is at its {@link wizardMaxRows} ceiling
+* anyway and the scrollbox takes over, so counting further buys nothing. Zero
+* when there is no intro, which keeps a bare confirm question at its ~4-row size.
 */
-const INTRO_ROWS_CAP = 12;
-function introRows(intro) {
+const INTRO_ROWS_CAP = 24;
+function introRows(intro, width = Number.POSITIVE_INFINITY) {
 	if (!intro) return 0;
-	let lines = 1;
-	for (let i = 0; i < intro.length; i++) {
-		if (intro[i] === "\n") lines++;
-		if (lines > INTRO_ROWS_CAP) return 13;
-	}
-	return lines + 1;
+	return Math.min(INTRO_ROWS_CAP, wrappedRows(intro, width)) + 1;
 }
 /**
 * Estimated render height (rows) of one {@link QuestionRow}, mirroring its
@@ -9011,15 +9169,17 @@ function introRows(intro) {
 * confirm pair (2), or the 1-line summary / `waiting…` placeholder.
 *
 * Drives content-sized wizards: a single confirm question claims ~4 rows
-* instead of stretching to the 60% cap (which stays as the overflow
-* ceiling — an under-estimate degrades to scrolling, never clipping the
-* active input out of reach, thanks to scroll-into-view on advance).
-* Multi-line prompts/descriptions are counted by their newlines; soft
-* wrapping is deliberately ignored — the scrollbox absorbs the drift.
+* instead of stretching to the {@link wizardMaxRows} ceiling, which stays as
+* the overflow bound — an under-estimate degrades to scrolling, never clipping
+* the active input out of reach, thanks to scroll-into-view on advance.
+*
+* Prompts, descriptions, and each choice's own description are measured with
+* {@link wrappedRows} at `width`, so a wrapped line is counted as the rows it
+* actually occupies.
 */
-function estimateQuestionRowHeight(question, status) {
-	const lines = (s) => s.split("\n").length;
-	let height = lines(question.prompt) + (question.description ? lines(question.description) : 0) + 1;
+function estimateQuestionRowHeight(question, status, width = Number.POSITIVE_INFINITY) {
+	const textWidth = width === Number.POSITIVE_INFINITY ? width : Math.max(1, width - 5);
+	let height = wrappedRows(question.prompt, textWidth) + (question.description ? wrappedRows(question.description, textWidth) : 0) + 1;
 	if (status !== "active") return height + 1;
 	switch (question.type) {
 		case "text":
@@ -9029,7 +9189,8 @@ function estimateQuestionRowHeight(question, status) {
 			height += 6;
 			break;
 		case "select":
-			height += question.choices.length + (question.multi ? 1 : 0);
+			for (const choice of question.choices) height += 1 + (choice.description ? wrappedRows(choice.description, textWidth) : 0);
+			height += question.multi ? 1 : 0;
 			break;
 		case "confirm":
 			height += 2;
@@ -9077,6 +9238,13 @@ function QuestionInteractionBlock({ request, onResolve }) {
 		if (!canGoBack) return;
 		setActiveIndex((i) => Math.max(0, i - 1));
 	});
+	useKeyboard((key) => {
+		if (!focused) return;
+		const direction = pageScrollDirection(key);
+		const scrollbox = scrollboxRef.current;
+		if (direction === null || !scrollbox) return;
+		pageScrollBy(scrollbox, direction);
+	});
 	useEffect(() => {
 		const scrollbox = scrollboxRef.current;
 		if (!scrollbox) return;
@@ -9087,14 +9255,30 @@ function QuestionInteractionBlock({ request, onResolve }) {
 		});
 		return () => cancelAnimationFrame(handle);
 	}, [activeIndex, questions]);
-	const contentRows = useMemo(() => introRows(intro) + questions.reduce((sum, q, i) => sum + estimateQuestionRowHeight(q, i < activeIndex ? "done" : i === activeIndex ? "active" : "pending"), 0), [
+	const { width: termCols, height: termRows } = useTerminalDimensions();
+	const maxRows = wizardMaxRows(termRows);
+	const contentCols = Math.max(1, termCols - 4);
+	const measuredRows = useMemo(() => introRows(intro, contentCols) + questions.reduce((sum, q, i) => sum + estimateQuestionRowHeight(q, i < activeIndex ? "done" : i === activeIndex ? "active" : "pending", contentCols), 0), [
 		intro,
 		questions,
-		activeIndex
+		activeIndex,
+		contentCols
 	]);
+	const highWaterRef = useRef({
+		key: "",
+		rows: 0
+	});
+	const highWaterKey = `${request.id}:${contentCols}`;
+	if (highWaterRef.current.key !== highWaterKey) highWaterRef.current = {
+		key: highWaterKey,
+		rows: 0
+	};
+	highWaterRef.current.rows = Math.max(highWaterRef.current.rows, measuredRows);
+	const contentRows = Math.min(highWaterRef.current.rows, maxRows);
 	return /* @__PURE__ */ jsxs(InteractionShell, {
 		title: questions.length > 1 ? ` answer ${activeIndex + 1}/${questions.length} · esc to abort run ` : " answer · esc to abort run ",
-		maxHeight: QUESTION_WIZARD_MAX_HEIGHT,
+		maxHeight: maxRows,
+		minHeight: Math.min(maxRows, contentRows + 2, Math.max(WIZARD_MIN_ROWS, termRows - 2)),
 		children: [/* @__PURE__ */ jsxs("scrollbox", {
 			ref: scrollboxRef,
 			focusable: false,
@@ -11651,6 +11835,7 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 					searchQuery: transcriptSearchActive ? transcriptSearchQuery : void 0,
 					searchPending: transcriptSearchSearching,
 					busy: !transcriptSearchActive && busy && !pending && !pendingInteraction,
+					interactionPending: pendingInteraction != null,
 					onLoadEarlier: transcriptSearchActive ? void 0 : onLoadEarlierTranscript
 				})
 			}),
@@ -13810,6 +13995,62 @@ function parentExtensionName(row) {
 function indexOfExtensionRow(rows, extName) {
 	return rows.findIndex((r) => r.kind === "extension" && r.ext.name === extName);
 }
+/**
+* Filter segments by the active query and resolve each one's expanded state.
+*
+* Deliberately does NOT auto-expand matches the way the Extensions tab does:
+* the search corpus includes each segment's full text, so a query typically
+* matches deep inside a long document — auto-expanding every hit would dump
+* thousands of lines into the viewport on a keystroke. The user expands the row
+* they care about.
+*/
+function buildVisibleInstructionRows(opts) {
+	const { segments, expanded, queryActive, matchSegment } = opts;
+	const out = [];
+	for (const segment of segments) {
+		if (queryActive && !matchSegment(segment)) continue;
+		out.push({
+			segment,
+			expanded: expanded.has(segment.id)
+		});
+	}
+	return out;
+}
+/**
+* Split a segment's text into renderable preview lines, clamped to
+* {@link INSTRUCTION_PREVIEW_LINE_CAP}.
+*
+* `hidden` is how many lines were dropped off the tail, so the view can render
+* an honest "+N more lines" marker instead of silently truncating. Tabs are
+* expanded to two spaces because the terminal text renderable doesn't
+* interpret `\t`, and `\r` is stripped so CRLF files don't leave artefacts at
+* every line end.
+*/
+function instructionPreviewLines(text) {
+	const all = text.replace(/\r\n?/g, "\n").replace(/\t/g, "  ").split("\n");
+	while (all.length > 0 && all[all.length - 1].trim() === "") all.pop();
+	if (all.length <= 400) return {
+		lines: all,
+		hidden: 0
+	};
+	return {
+		lines: all.slice(0, 400),
+		hidden: all.length - 400
+	};
+}
+/**
+* Short badge for a segment's origin — the "where does this come from" column.
+* `'file'` is intentionally the only one that reads like a location, since it's
+* the only origin the user can act on.
+*/
+function instructionOriginBadge(segment) {
+	switch (segment.origin) {
+		case "file": return "file";
+		case "generated": return "generated";
+		case "mcp": return "mcp server";
+		case "built-in": return "built-in";
+	}
+}
 //#endregion
 //#region src/tui/logs-view.ts
 /** Level order for the tab's min-level filter (matches the logger's ordering). */
@@ -14606,13 +14847,14 @@ const TAB_LABELS = {
 	...Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, c.label])),
 	keybindings: "Keybindings",
 	authentication: "Authentication",
+	instructions: "Instructions",
 	skills: "Skills",
 	mcps: "MCP servers",
 	extensions: "Extensions & Plugins",
 	logs: "Logs"
 };
 function isCategoryTab(id) {
-	return id !== "skills" && id !== "mcps" && id !== "keybindings" && id !== "authentication" && id !== "extensions" && id !== "logs";
+	return id !== "skills" && id !== "mcps" && id !== "keybindings" && id !== "authentication" && id !== "extensions" && id !== "instructions" && id !== "logs";
 }
 function anchorIdFor(index) {
 	return `settings-row-${index}`;
@@ -14889,6 +15131,16 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	const mcpToolToggleMap = useMcpToolToggleMap({ catalogByServer: mcpToolsByServer });
 	const [expandedMcps, setExpandedMcps] = useState(() => /* @__PURE__ */ new Set());
 	const [expandedExtensions, setExpandedExtensions] = useState(() => /* @__PURE__ */ new Set());
+	const [expandedInstructions, setExpandedInstructions] = useState(() => /* @__PURE__ */ new Set());
+	const [instructionsNotice, setInstructionsNotice] = useState(null);
+	const [instructionSegments, setInstructionSegments] = useState([]);
+	const [instructionsLoading, setInstructionsLoading] = useState(false);
+	const [instructionsError, setInstructionsError] = useState(void 0);
+	const [instructionsLive, setInstructionsLive] = useState(true);
+	const [instructionsRefreshKey, setInstructionsRefreshKey] = useState(0);
+	const [instructionsShadowedSystem, setInstructionsShadowedSystem] = useState(void 0);
+	const [instructionsCanOverride, setInstructionsCanOverride] = useState(true);
+	const [instructionsOverrideBlockedBy, setInstructionsOverrideBlockedBy] = useState(void 0);
 	const onRefreshMcpToolsRef = useRef(actions?.onRefreshMcpTools);
 	onRefreshMcpToolsRef.current = actions?.onRefreshMcpTools;
 	const [mcpToolsRefreshing, setMcpToolsRefreshing] = useState(false);
@@ -14905,6 +15157,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		const tabs = [...SETTINGS_CATEGORIES.map((c) => c.id)];
 		if (keybindings) tabs.push("keybindings");
 		if (authentication) tabs.push("authentication");
+		if (actions?.getContextSegments) tabs.push("instructions");
 		tabs.push("skills", "mcps");
 		if (extensionsCatalogProp || extensionsInactiveProp) tabs.push("extensions");
 		if (logs) tabs.push("logs");
@@ -14912,6 +15165,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	}, [
 		keybindings,
 		authentication,
+		actions?.getContextSegments,
 		extensionsCatalogProp,
 		extensionsInactiveProp,
 		logs
@@ -15090,6 +15344,32 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		for (const d of mcpsCatalogLiveRef.current) mcpColdProbedRef.current.add(d.config.name);
 		fireMcpToolsRefresh();
 	}, [activeTab, fireMcpToolsRefresh]);
+	useEffect(() => {
+		const fetchSegments = actions?.getContextSegments;
+		if (activeTab !== "instructions" || !fetchSegments) return;
+		let cancelled = false;
+		setInstructionsLoading(true);
+		Promise.resolve(fetchSegments()).then((result) => {
+			if (cancelled) return;
+			setInstructionSegments(result.segments);
+			setInstructionsLive(result.live);
+			setInstructionsCanOverride(result.canOverrideSystem);
+			setInstructionsOverrideBlockedBy(result.overrideBlockedBy);
+			setInstructionsShadowedSystem(result.shadowedSystemPath);
+			setInstructionsError(void 0);
+		}).catch((err) => {
+			if (!cancelled) setInstructionsError(errorMessage(err));
+		}).finally(() => {
+			if (!cancelled) setInstructionsLoading(false);
+		});
+		return () => {
+			cancelled = true;
+		};
+	}, [
+		activeTab,
+		actions?.getContextSegments,
+		instructionsRefreshKey
+	]);
 	useEffect(() => {
 		if (activeTab !== "mcps") return;
 		const cold = mcpsCatalog.filter((d) => mcpsToggle.enabledSet.has(d.config.name) && (mcpToolsByServer[d.config.name]?.length ?? 0) === 0 && !mcpColdProbedRef.current.has(d.config.name));
@@ -15217,12 +15497,24 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		mcpToolsByServer
 	]);
 	const filteredProviders = useMemo(() => (authentication?.providers ?? []).filter((p) => matchesTerms(providerCorpus(p), queryTerms)), [authentication?.providers, queryTerms]);
+	const instructionVisibleRows = useMemo(() => buildVisibleInstructionRows({
+		segments: instructionSegments,
+		expanded: expandedInstructions,
+		queryActive,
+		matchSegment: (seg) => matchesTerms(instructionCorpus(seg), queryTerms)
+	}), [
+		instructionSegments,
+		expandedInstructions,
+		queryActive,
+		queryTerms
+	]);
 	const authRowCount = filteredProviders.length;
 	const filteredSize = {
 		...Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, filteredByCategory[c.id].length])),
 		skills: filteredSkills.length,
 		mcps: mcpVisibleRows.length,
 		extensions: extensionVisibleRows.length,
+		instructions: instructionVisibleRows.length,
 		keybindings: 0,
 		logs: 0,
 		authentication: authRowCount
@@ -15320,8 +15612,20 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		});
 	}, [extensionVisibleRows]);
 	const toggleExpandFocusedExtensionRow = useCallback(() => toggleExpandExtensionRowAt(cursor), [toggleExpandExtensionRowAt, cursor]);
+	const toggleExpandInstructionRowAt = useCallback((index) => {
+		const row = instructionVisibleRows[index];
+		if (!row) return;
+		setExpandedInstructions((prev) => {
+			const next = new Set(prev);
+			if (!next.delete(row.segment.id)) next.add(row.segment.id);
+			return next;
+		});
+	}, [instructionVisibleRows]);
+	const toggleExpandFocusedInstructionRow = useCallback(() => toggleExpandInstructionRowAt(cursor), [toggleExpandInstructionRowAt, cursor]);
 	const mcpRowCount = mcpVisibleRows.length;
 	const extensionRowCount = extensionVisibleRows.length;
+	const instructionRowCount = instructionVisibleRows.length;
+	const instructionExpandedCount = expandedInstructions.size;
 	useEffect(() => {
 		if (activeTab === "keybindings" || activeTab === "logs") return;
 		const sb = scrollboxRef.current;
@@ -15345,7 +15649,9 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		activeTab,
 		query,
 		mcpRowCount,
-		extensionRowCount
+		extensionRowCount,
+		instructionRowCount,
+		instructionExpandedCount
 	]);
 	useEffect(() => {
 		if (mcpRowCount === 0) return;
@@ -15367,6 +15673,19 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			};
 		});
 	}, [extensionRowCount]);
+	useEffect(() => {
+		if (instructionRowCount === 0) return;
+		setCursorByTab((prev) => {
+			if (prev.instructions < instructionRowCount) return prev;
+			return {
+				...prev,
+				instructions: instructionRowCount - 1
+			};
+		});
+	}, [instructionRowCount]);
+	useEffect(() => {
+		setInstructionsNotice(null);
+	}, [cursor, activeTab]);
 	useEffect(() => {
 		if (activeTab !== "keybindings") return;
 		const sb = scrollboxRef.current;
@@ -15466,6 +15785,22 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			} else if (row.kind === "tool") mcpToolToggleMap[row.serverName]?.toggle(row.tool.name);
 			return;
 		}
+		if (activeTab === "instructions") {
+			const row = instructionVisibleRows[index];
+			if (!row) return;
+			const { segment } = row;
+			if (segment.id === "system" && !segment.path && actions?.onCreateSystemPrompt) {
+				if (!instructionsCanOverride) {
+					setInstructionsNotice(instructionsOverrideBlockedBy === "scope" ? "Your instruction scope excludes user-scope files, so a SYSTEM.md in your home directory would not be loaded. Change it on the Agent tab. Press tab to read the prompt inline." : "This profile supplies its own system prompt — a SYSTEM.md override would not apply. Press tab to read it inline.");
+					return;
+				}
+				Promise.resolve(actions.onCreateSystemPrompt()).catch((err) => setInstructionsNotice(`Could not create SYSTEM.md: ${errorMessage(err)}`));
+				return;
+			}
+			if (segment.path) Promise.resolve(actions?.onOpenInstructionsFile?.(segment.path)).catch((err) => setInstructionsNotice(`Could not open ${segment.label}: ${errorMessage(err)}`));
+			else setInstructionsNotice(`"${segment.label}" is ${instructionOriginBadge(segment)} — no file to open. Press tab to read it inline.`);
+			return;
+		}
 		if (activeTab === "keybindings") {
 			actions?.onOpenKeybindings?.();
 			return;
@@ -15492,7 +15827,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		fireMcpToolsRefresh,
 		mcpToolToggleMap,
 		actions,
-		filteredProviders
+		filteredProviders,
+		instructionVisibleRows,
+		instructionsCanOverride,
+		instructionsOverrideBlockedBy
 	]);
 	/**
 	* True while an inline editor or overlay dialog owns the modal's input
@@ -15549,6 +15887,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			activateRowAt(index);
 			return;
 		}
+		if (activeTab === "instructions") {
+			toggleExpandInstructionRowAt(index);
+			return;
+		}
 		if (activeTab === "skills") return;
 		if (isCategoryTab(activeTab) && filteredByCategory[activeTab][index]?.kind === "toggle") return;
 		activateRowAt(index);
@@ -15560,6 +15902,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		filteredByCategory,
 		toggleExpandMcpRowAt,
 		toggleExpandExtensionRowAt,
+		toggleExpandInstructionRowAt,
 		activateRowAt
 	]);
 	/** Tab-strip clicks — same input-capture guard as row clicks. */
@@ -15628,6 +15971,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			toggleExpandFocusedExtensionRow();
 			return;
 		}
+		if (activeTab === "instructions" && key.name === "tab") {
+			toggleExpandFocusedInstructionRow();
+			return;
+		}
 		if (key.name === "return") {
 			activateRowAt(cursor);
 			return;
@@ -15832,6 +16179,14 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				actions.onRefreshSkills();
 				return;
 			}
+			if (activeTab === "instructions" && actions?.onRefreshInstructions) {
+				setInstructionsNotice("reloading…");
+				actions.onRefreshInstructions().then((outcome) => {
+					setInstructionsRefreshKey((n) => n + 1);
+					setInstructionsNotice(outcome === "rebuilt" ? "reloaded — agent rebuilt; MCP servers reconnect on the next turn" : outcome === "queued" ? "reloaded — agent rebuild queued until the current run finishes" : "reloaded from disk");
+				}).catch((err) => setInstructionsNotice(`Refresh failed: ${errorMessage(err)}`));
+				return;
+			}
 			if (activeTab === "extensions" && actions?.onRefreshPlugins) {
 				actions.onRefreshPlugins();
 				return;
@@ -15981,6 +16336,21 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						contentCols,
 						authState
 					}),
+					activeTab === "instructions" && /* @__PURE__ */ jsx$1(InstructionsList, {
+						onRowClick: clickRowAt,
+						rows: instructionVisibleRows,
+						totalCount: instructionSegments.length,
+						loading: instructionsLoading,
+						error: instructionsError,
+						live: instructionsLive,
+						shadowedSystemPath: instructionsShadowedSystem,
+						canOverrideSystem: instructionsCanOverride,
+						overrideBlockedBy: instructionsOverrideBlockedBy,
+						cursor,
+						highlightBg: SURFACE.selection,
+						query,
+						contentCols
+					}),
 					activeTab === "keybindings" && keybindings && /* @__PURE__ */ jsx$1(KeybindingsList, {
 						bindings: keybindings,
 						extensionRows: extensionKeybindings,
@@ -16013,6 +16383,13 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				style: { flexShrink: 0 },
 				children: renderMcpDetailPanel(focusedMcp, focusedMcpStatus, COLOR)
 			}),
+			activeTab === "instructions" && instructionsNotice && /* @__PURE__ */ jsx$1("box", {
+				style: { flexShrink: 0 },
+				children: /* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.mute,
+					children: instructionsNotice
+				})
+			}),
 			activeTab === "extensions" && extEditNotice && /* @__PURE__ */ jsx$1("box", {
 				style: { flexShrink: 0 },
 				children: /* @__PURE__ */ jsx$1("text", {
@@ -16125,7 +16502,9 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						if (row?.kind !== "config" || row.item.type !== "string" || !row.item.secret) return false;
 						const stored = settings.extensionConfig?.[row.extName]?.[row.item.key];
 						return stored !== void 0 && stored !== row.item.default;
-					})()
+					})(),
+					focusedInstructionOpenable: activeTab === "instructions" && instructionVisibleRows[cursor]?.segment.path !== void 0,
+					focusedInstructionCreatable: activeTab === "instructions" && actions?.onCreateSystemPrompt !== void 0 && instructionsCanOverride && instructionVisibleRows[cursor]?.segment.id === "system" && instructionVisibleRows[cursor]?.segment.path === void 0
 				})
 			}),
 			extInstallActive && /* @__PURE__ */ jsx$1(ExtensionInstallDialog, {
@@ -17225,6 +17604,101 @@ function renderEmptyToolsListRow({ serverName, anchorId, focused, bg, COLOR, ref
 		})]
 	}, `tool-empty:${serverName}`);
 }
+function InstructionsList({ rows, totalCount, loading, error, live, shadowedSystemPath, canOverrideSystem, overrideBlockedBy, cursor, highlightBg, query, contentCols, onRowClick }) {
+	const COLOR = useColors();
+	if (error) return /* @__PURE__ */ jsx$1("text", {
+		fg: COLOR.error,
+		children: `Could not read context: ${error}`
+	});
+	if (loading && totalCount === 0) return /* @__PURE__ */ jsx$1(EmptyRow, { label: "reading session context…" });
+	if (totalCount === 0) return /* @__PURE__ */ jsx$1(EmptyRow, { label: "this profile loads no default context" });
+	if (rows.length === 0) return /* @__PURE__ */ jsx$1(EmptyRow, { label: `no context matches "${query}"` });
+	const INDENT = "    ";
+	const detailCols = Math.max(0, contentCols - 1 - 1 - 4);
+	return /* @__PURE__ */ jsxs("box", {
+		style: { flexDirection: "column" },
+		children: [
+			!live && /* @__PURE__ */ jsx$1("text", {
+				fg: COLOR.mute,
+				children: " No active session — showing what your next one will load. MCP and extension context is added at run time."
+			}),
+			shadowedSystemPath !== void 0 && /* @__PURE__ */ jsx$1("text", {
+				fg: COLOR.mute,
+				children: canOverrideSystem ? ` ${displayPath$1(shadowedSystemPath, homedir())} is shadowed by the project SYSTEM.md and is not loaded.` : overrideBlockedBy === "scope" ? ` ${displayPath$1(shadowedSystemPath, homedir())} is not loaded — your instruction scope excludes it.` : ` ${displayPath$1(shadowedSystemPath, homedir())} is not loaded — this profile supplies its own system prompt.`
+			}),
+			rows.map(({ segment, expanded }, i) => {
+				const focused = i === cursor;
+				const bg = focused ? highlightBg : void 0;
+				const openable = segment.path !== void 0;
+				const secondLine = segment.path ? displayPath$1(segment.path, homedir()) : segment.detail ?? "";
+				const preview = expanded ? instructionPreviewLines(segment.text) : null;
+				return /* @__PURE__ */ jsxs("box", {
+					onMouseDown: onRowClick && ((event) => {
+						event.stopPropagation();
+						event.preventDefault();
+						onRowClick(i, "row");
+					}),
+					id: anchorIdFor(i),
+					style: {
+						flexDirection: "column",
+						flexShrink: 0,
+						paddingLeft: 1,
+						paddingRight: 1,
+						backgroundColor: bg
+					},
+					children: [
+						/* @__PURE__ */ jsxs("text", {
+							wrapMode: "none",
+							children: [
+								/* @__PURE__ */ jsx$1("span", {
+									fg: focused ? COLOR.brand : COLOR.mute,
+									children: focused ? "▶ " : "  "
+								}),
+								/* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.mute,
+									children: expanded ? "▾ " : "▸ "
+								}),
+								/* @__PURE__ */ jsx$1("span", {
+									fg: focused ? COLOR.brand : COLOR.dim,
+									children: segment.label
+								}),
+								/* @__PURE__ */ jsxs("span", {
+									fg: COLOR.mute,
+									children: [" · ", instructionOriginBadge(segment)]
+								}),
+								/* @__PURE__ */ jsxs("span", {
+									fg: COLOR.mute,
+									children: [" · ~", fmtTokens(segment.tokens)]
+								})
+							]
+						}),
+						secondLine !== "" && /* @__PURE__ */ jsx$1("text", {
+							wrapMode: "none",
+							fg: openable ? COLOR.model : COLOR.mute,
+							children: `${INDENT}${truncateToCols(secondLine, detailCols)}`
+						}),
+						preview && /* @__PURE__ */ jsxs("box", {
+							style: {
+								flexDirection: "column",
+								paddingLeft: 4,
+								paddingTop: 1
+							},
+							children: [preview.lines.map((line, n) => /* @__PURE__ */ jsx$1("text", {
+								wrapMode: "none",
+								fg: COLOR.dim,
+								children: line === "" ? " " : truncateToCols(line, detailCols)
+							}, n)), preview.hidden > 0 && /* @__PURE__ */ jsx$1("text", {
+								wrapMode: "none",
+								fg: COLOR.mute,
+								children: `… +${preview.hidden} more line${preview.hidden === 1 ? "" : "s"}${openable ? " — press ↵ to open the file" : ""}`
+							})]
+						})
+					]
+				}, segment.id);
+			})
+		]
+	});
+}
 function KeybindingsList({ bindings, extensionRows, query }) {
 	const sections = useMemo(() => groupBindings(bindings, extensionRows), [bindings, extensionRows]);
 	const filteredSections = useMemo(() => {
@@ -17713,7 +18187,7 @@ function renderMcpErrors(errors, home, warnColor, dimColor) {
 		}, err.path))
 	});
 }
-function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps, canRefreshPlugins, canEditExtension, canCreateExtension, canUpdateExtension, canRemoveExtension, canInstallExtension, canInstallSkill, canEditSkill, canAddMcp, canRemoveSkill, canRemoveMcp, focusedExtensionExpandable, focusedSecretClearable = false }) {
+function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps, canRefreshPlugins, canEditExtension, canCreateExtension, canUpdateExtension, canRemoveExtension, canInstallExtension, canInstallSkill, canEditSkill, canAddMcp, canRemoveSkill, canRemoveMcp, focusedExtensionExpandable, focusedSecretClearable = false, focusedInstructionOpenable = false, focusedInstructionCreatable = false }) {
 	const COLOR = useColors();
 	const onServerRow = focusedMcpRow?.kind === "server";
 	const showLogin = activeTab === "mcps" && onServerRow && !!focusedMcp && !!focusedMcpStatus && canLogin$1(focusedMcp, focusedMcpStatus);
@@ -17737,8 +18211,15 @@ function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focu
 			label: "type to filter"
 		}] : [{
 			key: "↵",
-			label: isCategoryTab(activeTab) ? "toggle/cycle/select" : activeTab === "keybindings" ? "edit file" : activeTab === "authentication" ? "switch / re-authenticate" : "toggle"
+			label: isCategoryTab(activeTab) ? "toggle/cycle/select" : activeTab === "keybindings" ? "edit file" : activeTab === "authentication" ? "switch / re-authenticate" : activeTab === "instructions" ? focusedInstructionOpenable ? "open file" : focusedInstructionCreatable ? "create SYSTEM.md override" : "no file to open" : "toggle"
 		}],
+		...activeTab === "instructions" ? [{
+			key: "tab",
+			label: "read inline"
+		}, {
+			key: "ctrl+r",
+			label: "reload"
+		}] : [],
 		...activeTab === "mcps" && focusedMcpRow ? [{
 			key: "tab",
 			label: focusedMcpRow.kind === "server" ? "expand/collapse" : "collapse"
@@ -17904,6 +18385,21 @@ function keybindingCorpus(row) {
 	if (row.kind === "extension") return `${row.spec} ${row.label} ${row.description} ${row.id}`.toLowerCase();
 	return `${row.spec} ${row.def.label} ${row.def.description} ${row.def.action}`.toLowerCase();
 }
+/**
+* Search corpus for an Instructions row — label, origin, detail, path AND the
+* segment's full text. Including the body is the point: it turns the shared
+* search box into "which instruction source told the agent this?", which is
+* the question this tab exists to answer.
+*/
+function instructionCorpus(segment) {
+	return [
+		segment.label,
+		instructionOriginBadge(segment),
+		segment.detail ?? "",
+		segment.path ?? "",
+		segment.text
+	].join(" ").toLowerCase();
+}
 function providerCorpus(p) {
 	return `${p.label} ${p.key} ${p.methods.map((m) => `${m.source} ${m.detail}`).join(" ")}`.toLowerCase();
 }
@@ -18820,29 +19316,45 @@ const debugLog = createDebugLog("tui");
 * spawned process is detached + unref'd so closing the TUI doesn't
 * kill the editor (and vice versa).
 *
-* Resolves once the spawn is dispatched — we don't wait for the
-* editor to exit. The user is expected to save and either restart
+* Resolves once the spawn is DISPATCHED (the `'spawn'` event) — we don't wait
+* for the editor to exit. The user is expected to save and either restart
 * the TUI (for changes that need to be picked up at launch, like
 * keybindings) or simply continue working.
+*
+* Rejects when the spawn fails. `child_process.spawn` reports ENOENT through an
+* `'error'` EVENT rather than a throw, so a missing binary used to surface as an
+* unhandled emitter error — crashing into OpenTUI's error console right past
+* every caller's `try`/`catch`. Funnelling both outcomes into the promise is
+* what makes those guards effective.
 */
 async function launchEditor(path) {
 	const envEditor = (process.env.VISUAL ?? process.env.EDITOR ?? "").trim();
+	const win32 = process.platform === "win32";
+	const q = win32 ? quoteForShell : (s) => s;
 	const [cmd, args] = (() => {
-		if (envEditor) return [envEditor, [path]];
+		const [bin, ...editorArgs] = parseEditorCommand(envEditor);
+		if (bin) return [q(bin), [...editorArgs.map(q), q(path)]];
 		if (process.platform === "darwin") return ["open", [path]];
-		if (process.platform === "win32") return ["cmd", [
+		if (win32) return ["cmd", [
 			"/c",
 			"start",
 			"\"\"",
-			path
+			q(path)
 		]];
 		return ["xdg-open", [path]];
 	})();
-	spawn(cmd, args, {
-		detached: true,
-		stdio: "ignore",
-		shell: process.platform === "win32"
-	}).unref();
+	await new Promise((resolve, reject) => {
+		const child = spawn(cmd, args, {
+			detached: true,
+			stdio: "ignore",
+			shell: win32
+		});
+		child.once("error", reject);
+		child.once("spawn", () => {
+			child.unref();
+			resolve();
+		});
+	});
 }
 /**
 * Session-metadata key under which the TUI persists the user's "pinned"
@@ -19056,6 +19568,29 @@ function AppShell() {
 	useEffect(() => {
 		userInstructionsScopeRef.current = settings.userInstructionsScope;
 	}, [settings.userInstructionsScope]);
+	const sessionInstructionFilesRef = useRef([]);
+	/**
+	* Path of the `SYSTEM.md` override the CURRENT session's prompt was built
+	* from, or `null` when the built-in doctrine is in force. Same activation-time
+	* semantics as `sessionInstructionFilesRef`: what the live prompt came from,
+	* not what's on disk right now.
+	*/
+	const sessionSystemFileRef = useRef(null);
+	/**
+	* Path of the project-scope override whose warning is already in the visible
+	* transcript, so a rebuild that changes nothing stays quiet. Reset by
+	* `activateSession` because `teardown` clears the transcript the note lived in.
+	*/
+	const announcedSystemOverrideRef = useRef(null);
+	/**
+	* The rendered AGENTS.md block this session's prompt was built with, or `null`
+	* when none loaded. Threaded into `getContextSegments` so the base-prompt
+	* segment can subtract it: the agent receives the block as an opaque substring
+	* of the system string and can't find it on its own, and without this the
+	* instruction text would be reported twice — once inside the system prompt
+	* segment, once as its own file rows.
+	*/
+	const sessionRulesBlockRef = useRef(null);
 	const subagentModelsRef = useRef(settings.subagentModels);
 	useEffect(() => {
 		subagentModelsRef.current = settings.subagentModels;
@@ -20118,6 +20653,110 @@ function AppShell() {
 			return d ? getContextWindow(d, entry.model) ?? void 0 : void 0;
 		});
 	}, [providerRegistry]);
+	/**
+	* The host-composed half of a session's context: the instruction files
+	* discovered for the current cwd + scope, and the system prompt they get
+	* rendered into.
+	*
+	* Extracted from `buildAgent` so session activation and the Settings →
+	* Instructions tab share ONE composition path. The tab has to answer "what
+	* does my context contain" on screens where no agent exists yet (home,
+	* sessions list, model picker — settings opens everywhere but `auth`), and a
+	* second copy of this logic would drift from what sessions actually load.
+	*
+	* Cheap and side-effect-free: a handful of `existsSync` + small reads plus
+	* pure string composition, safe to call on every settings open.
+	*/
+	/**
+	* Warn in the transcript when a PROJECT-scope `SYSTEM.md` is in force.
+	*
+	* Such a file replaces the built-in doctrine — including the destructive-action
+	* and git fragments — so one that merely exists at the root of a checkout can
+	* silently drop "destructive actions need explicit confirmation" and "never
+	* force-push without confirmation". `AGENTS.md` can only APPEND, and renders
+	* under a header marking it as user-authored guidance; deleting doctrine is a
+	* different risk profile from adding to it. The user-scope file stays quiet:
+	* they wrote it themselves, in their own home directory.
+	*
+	* Called from EVERY path that installs a prompt — session activation and
+	* `rebuildActiveAgent` (which serves the Instructions tab's `ctrl+r`, both its
+	* immediate and its deferred-until-idle branch, plus post-login and
+	* extension-swap rebuilds). Announcing only on activation meant that dropping a
+	* `SYSTEM.md` into a checkout and hitting `ctrl+r` swapped the safety guidance
+	* out in silence.
+	*
+	* De-duped on the announced path so an unchanged rebuild doesn't repeat itself.
+	*/
+	const announceProjectSystemOverride = useCallback(() => {
+		const override = sessionSystemFileRef.current;
+		if (override?.source !== "project") {
+			announcedSystemOverrideRef.current = null;
+			return;
+		}
+		if (announcedSystemOverrideRef.current === override.path) return;
+		announcedSystemOverrideRef.current = override.path;
+		stream.appendImmediate({
+			kind: "info",
+			text: `\u26A0 ${override.path} is replacing the built-in system prompt, including the destructive-action and git safety guidance. Settings \u2192 Instructions to read it.`
+		});
+	}, [stream]);
+	const composeHostContext = useCallback((profile, allowInteraction) => {
+		const actualCwd = cwdRef.current;
+		const agentsMd = discoverAgentsMd({
+			cwd: actualCwd,
+			prefix: config.prefix,
+			scope: userInstructionsScopeRef.current,
+			ruler: importRulerConfigsRef.current !== false
+		});
+		const systemMd = discoverSystemMd({
+			cwd: actualCwd,
+			prefix: config.prefix,
+			scope: userInstructionsScopeRef.current
+		});
+		const supportsOverride = profile.id === "build" || profile.id === "plan";
+		const envOpts = {
+			cwd: actualCwd,
+			...projectDir !== actualCwd ? { projectRoot: projectDir } : {},
+			allowInteraction,
+			...agentsMd.block ? { userInstructions: agentsMd.block } : {},
+			...systemMd.file ? { systemOverride: systemMd.file.contents } : {}
+		};
+		const build = profile.id === "build" ? buildBuildSystem : profile.id === "plan" ? buildPlanSystem : null;
+		const system = build ? build(envOpts) : null;
+		return {
+			agentsMd,
+			/** The override actually in force, or `null` when this profile ignores overrides. */
+			systemFile: supportsOverride ? systemMd.file : null,
+			/**
+			* Overrides that exist on disk but aren't loaded. On a profile that can't
+			* accept one, that's EVERY discovered file — not just the precedence
+			* losers — so the tab can explain the silence.
+			*/
+			shadowedSystemFiles: supportsOverride ? systemMd.shadowed : [...systemMd.file ? [systemMd.file] : [], ...systemMd.shadowed],
+			supportsOverride,
+			envOpts,
+			system,
+			/**
+			* The BUILT-IN prompt: no AGENTS.md block, and deliberately no active
+			* `SYSTEM.md` either — the correct seed for a new override.
+			*
+			* Seeding from `system` would bake the instructions into the override and
+			* the next session would append them again (the override replaces the
+			* doctrine; `userInstructions` still composes below it). Clearing
+			* `systemOverride` too means this always answers "what would the built-in
+			* doctrine be", so a future "reset my override" or "diff against default"
+			* caller can't be handed a copy of the override it was trying to replace.
+			*
+			* A thunk so the extra composition only happens on the create path, not
+			* on every session activation.
+			*/
+			doctrineOnlySystem: () => build ? build({
+				...envOpts,
+				userInstructions: void 0,
+				systemOverride: void 0
+			}) : null
+		};
+	}, [config.prefix, projectDir]);
 	const buildAgent = useCallback((session, key) => {
 		const descriptor = providerRegistry[key];
 		if (!descriptor) throw new Error(`No provider registered for key "${key}"`);
@@ -20178,19 +20817,13 @@ function AppShell() {
 		const allowInteraction = allowInteractionRef.current !== false;
 		const interactionTools = allowInteraction ? createInteractionTools({ requestInteraction: makeRequestInteraction(interactions) }) : {};
 		const actualCwd = cwdRef.current;
-		const agentsMd = discoverAgentsMd({
-			cwd: actualCwd,
-			prefix: config.prefix,
-			scope: userInstructionsScopeRef.current,
-			ruler: importRulerConfigsRef.current !== false
-		});
-		const envOpts = {
-			cwd: actualCwd,
-			...projectDir !== actualCwd ? { projectRoot: projectDir } : {},
-			allowInteraction,
-			...agentsMd.block ? { userInstructions: agentsMd.block } : {}
-		};
-		const builtInSystem = profile.id === "build" ? buildBuildSystem(envOpts) : profile.id === "plan" ? buildPlanSystem(envOpts) : null;
+		const { agentsMd, systemFile, system: builtInSystem } = composeHostContext(profile, allowInteraction);
+		sessionInstructionFilesRef.current = agentsMd.files;
+		sessionRulesBlockRef.current = agentsMd.block;
+		sessionSystemFileRef.current = systemFile ? {
+			path: systemFile.path,
+			source: systemFile.source
+		} : null;
 		const persistDir = resolvePersistDir({
 			userDir: cacheDir,
 			sessionId: session.id
@@ -21168,6 +21801,8 @@ function AppShell() {
 		sessionRef.current = session;
 		agentRef.current = buildAgent(session, key);
 		if (extensionRegistrySwapKeyRef.current === null || extensionRegistrySwapKeyRef.current === extensionRegistry) pendingAgentRebuildRef.current = false;
+		announcedSystemOverrideRef.current = null;
+		announceProjectSystemOverride();
 		const persistedPins = readPinnedSkills(session.metadata["zidane.activeSkills"]);
 		setActiveSkillNames(persistedPins);
 		setEvents(capTranscriptEvents(eventsFromTurns(session.turns, session.runs)));
@@ -22823,6 +23458,8 @@ function AppShell() {
 	const mcpLoginAbortsRef = useRef(/* @__PURE__ */ new Map());
 	const buildAgentRef = useRef(buildAgent);
 	buildAgentRef.current = buildAgent;
+	const announceProjectSystemOverrideRef = useRef(announceProjectSystemOverride);
+	announceProjectSystemOverrideRef.current = announceProjectSystemOverride;
 	/**
 	* Rebuild the agent for the active session — used post-login so the
 	* newly-authenticated MCP server actually connects. The current agent's
@@ -22843,6 +23480,7 @@ function AppShell() {
 		const staleWarnLog = warnLogRef.current;
 		const fresh = buildAgentRef.current(session, p.provider.key);
 		agentRef.current = fresh;
+		announceProjectSystemOverrideRef.current();
 		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));
 	}, []);
@@ -23012,6 +23650,106 @@ function AppShell() {
 			}
 		})();
 	}, [modal, config.paths.userDir]);
+	const onReadContextSegments = useCallback(async () => {
+		const { shadowedSystemFiles, supportsOverride } = composeHostContext(pickedAgentRef.current, allowInteractionRef.current !== false);
+		const shadowedSystemPath = shadowedSystemFiles[0]?.path;
+		const scopeLoadsUserOverride = userScopeOverridesLoad(userInstructionsScopeRef.current);
+		const canOverrideSystem = supportsOverride && scopeLoadsUserOverride;
+		const overrideBlockedBy = !supportsOverride ? "profile" : !scopeLoadsUserOverride ? "scope" : void 0;
+		const agent = agentRef.current;
+		if (agent) return {
+			segments: await agent.getContextSegments({
+				rulesFiles: sessionInstructionFilesRef.current,
+				...sessionRulesBlockRef.current ? { rulesBlock: sessionRulesBlockRef.current } : {},
+				...sessionSystemFileRef.current ? { systemPath: sessionSystemFileRef.current.path } : {}
+			}) ?? [],
+			live: true,
+			canOverrideSystem,
+			...overrideBlockedBy ? { overrideBlockedBy } : {},
+			...shadowedSystemPath ? { shadowedSystemPath } : {}
+		};
+		const { agentsMd, systemFile, system } = composeHostContext(pickedAgentRef.current, allowInteractionRef.current !== false);
+		const enabled = enabledSkillsRef.current;
+		const sessionSkills = enabled === void 0 ? [...skillsCatalogRef.current] : skillsCatalogRef.current.filter((s) => enabled.includes(s.name));
+		return {
+			segments: buildContextSegments({
+				...system ? { baseSystem: system } : {},
+				...systemFile ? { systemPath: systemFile.path } : {},
+				...agentsMd.block ? { rulesBlock: agentsMd.block } : {},
+				rulesFiles: agentsMd.files,
+				skillsCatalog: buildCatalog(sessionSkills)
+			}),
+			live: false,
+			canOverrideSystem,
+			...overrideBlockedBy ? { overrideBlockedBy } : {},
+			...shadowedSystemPath ? { shadowedSystemPath } : {}
+		};
+	}, [composeHostContext]);
+	const onOpenInstructionsFile = useCallback(async (path) => {
+		await launchEditor(path);
+		modal.close();
+	}, [modal]);
+	/**
+	* Create `~/.{prefix}/SYSTEM.md` and open it — the `↵` action on the System
+	* prompt row when no override exists yet.
+	*
+	* Seeded with the doctrine currently in effect (see `renderSystemMdSeed`), so
+	* creating the file changes nothing until the user edits it. An empty seed
+	* would strip every line of doctrine the instant the file appeared.
+	*
+	* Idempotent: if the file already exists we open it rather than clobbering the
+	* user's text. `composeHostContext` gives us the exact prompt the next session
+	* would use as the seed source, and we take only the STATIC half so the
+	* per-turn `<env>` block never gets frozen into the file.
+	*/
+	const onCreateSystemPrompt = useCallback(async () => {
+		const path = userSystemMdPath({ prefix: config.prefix });
+		if (!existsSync(path)) {
+			const { doctrineOnlySystem, supportsOverride } = composeHostContext(pickedAgentRef.current, allowInteractionRef.current !== false);
+			if (!supportsOverride) throw new Error(`the "${pickedAgentRef.current.id}" profile supplies its own system prompt, so a SYSTEM.md override would not apply`);
+			if (!userScopeOverridesLoad(userInstructionsScopeRef.current)) throw new Error(`userInstructionsScope is "${userInstructionsScopeRef.current}", so a SYSTEM.md in your home directory would not be loaded`);
+			const doctrine = splitSystemPrompt(doctrineOnlySystem() ?? "").static;
+			if (doctrine.trim().length === 0) throw new Error("could not compose a system prompt to seed the override from");
+			mkdirSync(dirname(path), { recursive: true });
+			writeFileSync(path, renderSystemMdSeed(doctrine, userInstructionsScopeRef.current), "utf8");
+		}
+		await launchEditor(path);
+		modal.close();
+	}, [
+		modal,
+		config.prefix,
+		composeHostContext
+	]);
+	/**
+	* `ctrl+r` on the Instructions tab: re-read the instruction files from disk
+	* and make the live agent actually use them.
+	*
+	* Re-discovery is implicit — `composeHostContext` hits the filesystem on every
+	* call, so the modal's own re-fetch picks up new files. The work here is
+	* rebuilding the agent so a session that's already running switches to the new
+	* prompt without a TUI restart.
+	*
+	* Deferred while a run is in flight: swapping the system prompt underneath a
+	* streaming turn is not safe, so we raise the same `pendingAgentRebuild` flag
+	* that MCP-settings changes and extension-registry swaps use and let
+	* `drainFollowUps` apply it once the turn ends.
+	*
+	* Returns which of the two happened so the tab can say so — a rebuild that
+	* silently didn't take effect yet is worse than no rebuild.
+	*
+	* Side effect worth surfacing: `rebuildActiveAgent` destroys the stale agent,
+	* which closes its MCP connections. The fresh agent reconnects lazily on its
+	* next run, so the turn after a reload pays that cost. The tab's notice says so.
+	*/
+	const onRefreshInstructions = useCallback(async () => {
+		if (!agentRef.current || !sessionRef.current) return "no-session";
+		if (runningRef.current) {
+			pendingAgentRebuildRef.current = true;
+			return "queued";
+		}
+		await rebuildActiveAgent();
+		return "rebuilt";
+	}, [rebuildActiveAgent]);
 	const hasMultipleAgents = useMemo(() => Object.keys(liveAgentRegistry).length > 1, [liveAgentRegistry]);
 	const turnIds = useMemo(() => selectableTurnIds(events, settings), [events, settings]);
 	useEffect(() => {
@@ -23688,6 +24426,10 @@ function AppShell() {
 				actions: {
 					onConfigureProvider,
 					onOpenKeybindings: onOpenKeybindingsFile,
+					getContextSegments: onReadContextSegments,
+					onOpenInstructionsFile,
+					onCreateSystemPrompt,
+					onRefreshInstructions,
 					onLoginMcp,
 					onLogoutMcp,
 					onCancelLoginMcp,