zidane 6.5.4 → 6.5.6

package/dist/tui.js

@@ -1,29 +1,29 @@
-import { C as estimateRebilledCostUsd } from "./openai-compat-CnHeo4Lz.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 { C as estimateRebilledCostUsd } from "./openai-compat-BoTi-9fd.js";
+import { t as buildContextSegments } from "./context-segments-CJCtJ9sU.js";
+import { $ as installExtensionFromSpec, $t as groupBindings, A as selectFilesFromSession, An as OUTPUT_RESERVE_TOKENS, C as resolveLegacySessionDir, D as resolveTasksDir, Dn as sanitizeExtensionConfigActionPatch, E as resolveSessionDir, En as resolveExtensionConfigValue, Et as isSpawnTool, G as summaryToTurn, It as looksBinary, M as compactConversation, O as buildPostCompactAttachments, Pt as tailTruncate, Qt as formatBindingForDisplay, Rt as createModelSearchTool, S as resolveLegacyPersistDir, Sn as coerceExtensionConfigInput, T as resolvePersistDir, X as createExtensionPromptBridge, Xt as KEYBINDING_KEY_COL_WIDTH, Z as ExtensionInstallError, Zt as ensureKeybindingsFile, _n as parseExtensionScanPathEnv, at as createExtensionHud, bt as basic_default, dn as registerExtensionHostModules, dt as filterExtensionRegistry, en as keybindingsPath, f as applyCompactSummaryCutoff, ft as filterRegistryPlugins, hn as inlineLoadedExtension, ht as createExtensionHostRuntimeBridge, it as updateInstalledExtension, jn as effectiveContextWindow, lt as composeExtensionPreset, mt as partitionExtensionCatalog, on as resolveExtensionKeybindings, ot as discoverAndBuildExtensionRegistry, rt as removeInstalledExtension, t as createAgent, tn as matchesBinding, ut as disposeExtensionRegistry, v as cleanupPersistedSession, vn as scanExtensionDirectories, w as resolveMcpWarningsDir, x as rehomePersistedStubs, yn as createDebugLog } from "./agent-CcTWL-Z6.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 { 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 { u as errorMessage } from "./errors-DKiMrOKq.js";
+import { E as buildCatalog, R as projectUserPaths, c as SkillInstallError, l as installSkillFromSpec, z as findGitRoot } from "./skills-BMGH_KK1.js";
+import { n as defaultPluginDataRoot, r as loadAgentPlugin } from "./plugins-onDvTHEm.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-D9fqOQo5.js";
+import { _ as hasAuthorizationHeader, h as McpOAuthProvider, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-CVtSQTWg.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 { a as getExtensionSessionState, c as setExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, t as createSession } from "./session-CyRLSsVa.js";
 import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
-import { o as withTimeout } from "./timeout-BDetbuN6.js";
+import { s as withTimeout } from "./timeout-CjOG2mea.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-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-BLy7X1SY.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-CB23LyI1.js";
+import { E as renderDefaultCallbackPage, T as restoreModelOptions, b as modelSupportsReasoning, c as setPreferredCredential, g as getContextWindow, h as enabledModelOptions, l as setProviderCredential, n as applyApiKeyEnv, t as detectAuth, w as piIdOf, y as modelOptionsFor } from "./auth-BAclQnl3.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-iGu5J08j.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-7_Ff7INF.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-Bv8HQ3S2.js";
+import { $ as McpAuthProvider, $t as resolveStoragePaths, At as SETTINGS_INPUTS, B as mcpToolsCachePath, C as addToSafelist, Cn as buildUpdateHint, Ct as buildHints, Dr as listSessionMeta, Dt as DEFAULT_SETTINGS, Er as lastContextSizeFromTurns, Et as useEnabledToggleSet, F as oauthUsesManualCodePaste, Fr as toolCallPreview, G as useMcpToolToggleMap, Hn as accentColor, I as runOAuthLogin, Ir as toolResultText, J as indexOfServerRow, Jn as TODO_STATUS_GLYPHS, Jt as useDiscovery, Kt as createDiscoverySlot, L as supportsOAuth, Lr as updateToolEventOutcomes, Lt as resolveChipColor, M as fetchOAuthRedirect, Mr as stripSpawnTokensLine, Mt as SettingsProvider, Nn as chatAutoCompactBehavior, Nr as sumRunCosts, Nt as clampFps, Or as loadState, Ot as SETTINGS_CATEGORIES, P as redirectUriFromAuthUrl, Pn as discoverAgentsMd, Pt as useSettings, Qt as resolveConfig, Rr as usageByModel, Rt as resolveTheme, Sn as bootTick, Sr as compactSummaryEvent, St as truncateTrailing, T as isOnSafelist, Tr as eventsFromTurns, Tt as listProjectFiles, U as subscribeMcpToolsCache, V as refreshMcpToolsCatalog, X as createFileMcpCredentialStore, Xt as ConfigProvider, Y as parentServerName, Yt as useDiscoveryOptional, Zt as useConfig, _r as buildPlanSystem, _t as useInteractionsActions, a as useSurfaces, an as restoreChainFallbacks, ar as useActiveTodos, b as useSafeModeActions, bn as tryOpenBrowser, br as createChatTurnsReadTool, bt as clipHintsToWidth, c as discoverSystemMd, cn as useCompletion, ct as PRESENT_PLAN_TOOL, d as userSystemMdPath, dn as importFromClaudeCode, dt as createInteractionTools, en as buildRunModel, et as useMcpAuthDispatch, f as useStreamBuffer, fn as mcpsWritePath, gn as dedupMcpServersByName, gr as buildBuildSystem, h as discoverProjectSkills, hn as buildMcpServers, ht as pendingInteractionsFromTurns, i as useSelectStyle, in as providerKeySetChanged, ir as todoProgressLabel, it as ASK_USER_TOOL, j as formatPathForCwd, jr as serverToolResultSummary, jt as SETTINGS_TOGGLES, k as suggestSafelistEntries, kr as marginTopFor, kt as SETTINGS_CHOICES, l as renderSystemMdSeed, ln as countClaudeSessionFiles, lt as buildResumedToolResultsTurn, m as defaultSkillScanPaths, mn as upsertMcpServer, mt as makeRequestInteraction, n as ThemeProvider, nn as chainsEqual, nt as getMcpAuthStatus, ot as HOST_INTERACTION_ID_PREFIX, p as buildSkillsConfig, pn as removeMcpServer, pt as isModelInteraction, q as buildVisibleMcpRows, qt as DiscoveryProvider, r as useColors, rn as filterChainFallbacks, rr as setTodosForRun, s as useTheme, sn as toggleChainEntry, st as InteractionsProvider, t as computeTurnAnchors, tn as chainPositionOf, tr as pruneTodosByRun, tt as useMcpAuthState, u as userScopeOverridesLoad, un as hasClaudeCodeSetup, ut as createAutomaticInteractionResponse, v as writeSessionExport, vn as discoverProjectMcps, vr as envSection, vt as useInteractionsQueue, w as getSafelist, wn as useUpdateCheck, wr as deriveSessionTitle, x as useSafeModeQueue, xt as hintsLength, y as SafeModeProvider, yr as chatReferenceTokensForPrompt, yt as EMPTY_HINTS, z as loadMcpToolsCache } from "./transcript-anchors-D-Yuimif.js";
 import { basename, delimiter, dirname, join, relative, resolve } from "node:path";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
@@ -6079,8 +6079,14 @@ function parseEditorCommand(spec) {
 * `<`, `>` 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.
+* command.
+*
+* `%` and `!` are in the class so such a token is quoted rather than passed
+* bare — but be clear about the limit: quoting does NOT stop cmd.exe expanding
+* `%VAR%`, nor `!VAR!` where delayed expansion is on. Double quotes suppress
+* splitting and other syntax, not expansion. That is a property of the shell
+* which no amount of quoting can close; the worst case is a wrong path, not an
+* injected command.
 */
 function quoteForShell(token) {
 	if (token === "") return "\"\"";
@@ -7500,36 +7506,31 @@ function runEditorOnText(initialText, options = {}) {
 //#endregion
 //#region src/tui/clipboard-image.ts
 /**
-* Read an IMAGE from the OS clipboard.
-*
-* The companion to the write-only {@link import('./clipboard')} module. Pasting
-* a clipboard image into a terminal is fundamentally different from pasting
-* text: terminals deliver text via bracketed paste (`PasteEvent`), but they do
-* NOT transmit binary clipboard image data that way — on macOS a `cmd+V` of a
-* screenshot usually produces no paste event at all. So to support "paste the
-* image I just copied" we have to read the OS clipboard directly via a
-* platform helper, on an explicit trigger.
+* Read image or text content directly from the OS clipboard.
 *
-* Every outcome is classified (never thrown) so the caller can show the right
-* message:
-*   - `ok`              → bytes + sniffed media type, ready to attach.
-*   - `no-image`        → clipboard holds no image (probably text) — soft no-op.
-*   - `helper-missing`  → the platform helper isn't installed (`detail` carries
-*                         an install hint).
-*   - `unsupported-env` → remote session (SSH): the helper would read the
-*                         REMOTE box's clipboard, not the user's.
-*   - `failed`          → helper ran but produced no usable image.
+* Images are never carried by terminal paste. Text normally is, but some
+* integrated-terminal PTYs freeze while forwarding large bracketed pastes. The
+* explicit app-owned shortcut therefore reads either representation through a
+* platform helper, keeping the clipboard payload out of the terminal stream.
 *
-* SSH note: like OSC 52 on the write side, there's no portable way to reach the
-* user's LOCAL clipboard image over SSH, so we detect it and bail with a clear
-* message rather than silently reading the wrong machine's clipboard.
+* Every outcome is classified rather than thrown so the composer can surface a
+* precise notice. Remote sessions are rejected because native helpers would
+* read the remote machine's clipboard, not the user's local clipboard.
+*/
+/**
+* Cap on clipboard TEXT (raw bytes), matching the dragged-file attachment
+* ceiling in the composer. Native reads deliberately bypass the terminal's
+* paste backpressure, which used to be the de-facto limit — without a cap a
+* multi-gigabyte clipboard would be buffered here, folded into `paste.txt`,
+* persisted in the session, and shipped to the provider.
 */
+const MAX_CLIPBOARD_TEXT_BYTES = 20 * 1024 * 1024;
 /** True in a remote session, where a local clipboard helper would read the wrong box. */
 function isRemoteSession(env = process.env) {
 	return !!(env.SSH_CONNECTION || env.SSH_TTY || env.SSH_CLIENT);
 }
 /** Spawn a helper and capture its (binary) stdout. Never throws. */
-function captureViaSpawn(cmd, args, timeoutMs = 5e3) {
+function captureViaSpawn(cmd, args, timeoutMs = 5e3, maxBytes = Infinity) {
 	return new Promise((resolveP) => {
 		let child;
 		try {
@@ -7549,8 +7550,19 @@ function captureViaSpawn(cmd, args, timeoutMs = 5e3) {
 		}
 		const out = [];
 		const err = [];
+		let size = 0;
+		let truncated = false;
 		const timer = setTimeout(() => child.kill("SIGKILL"), timeoutMs);
-		child.stdout?.on("data", (chunk) => out.push(chunk));
+		child.stdout?.on("data", (chunk) => {
+			if (truncated) return;
+			size += chunk.length;
+			if (size > maxBytes) {
+				truncated = true;
+				child.kill("SIGKILL");
+				return;
+			}
+			out.push(chunk);
+		});
 		child.stderr?.setEncoding("utf8");
 		child.stderr?.on("data", (chunk) => err.push(chunk));
 		child.on("error", () => {
@@ -7568,7 +7580,8 @@ function captureViaSpawn(cmd, args, timeoutMs = 5e3) {
 				code,
 				stdout: Buffer.concat(out),
 				stderr: err.join(""),
-				spawnError: false
+				spawnError: false,
+				truncated
 			});
 		});
 	});
@@ -7715,6 +7728,143 @@ async function readClipboardImage(hooks = {}) {
 		detail: "no clipboard helper available in this environment"
 	};
 }
+async function readClipboardTextWith(capture, platform, env) {
+	let command;
+	let args;
+	let installHint;
+	/**
+	* Second text target to try when the first isn't on the clipboard.
+	* `xclip` has no "any text" alias, so a source offering only the legacy
+	* `STRING` target fails the `UTF8_STRING` read; retrying keeps such
+	* sources working without falling back to an untyped read, which would
+	* hand back image bytes on an image-only clipboard.
+	*/
+	let fallbackArgs;
+	/**
+	* Whether the helper was asked for a SPECIFIC text target. Such a helper
+	* exits non-zero when the clipboard doesn't offer that type, which means
+	* "no text here", not "the helper broke" — so the exit classifies as
+	* `no-text` instead of surfacing its stderr as an inline notice.
+	* `pbpaste` / PowerShell are untyped: they exit 0 with empty output on an
+	* empty clipboard and reach the same verdict via the length check below.
+	*/
+	let textTargetsExhausted = false;
+	if (platform === "darwin") {
+		command = "pbpaste";
+		args = [];
+		installHint = "pbpaste is required to paste text";
+	} else if (platform === "win32") {
+		command = "powershell";
+		args = [
+			"-NoProfile",
+			"-NonInteractive",
+			"-Command",
+			"Add-Type -AssemblyName System.Windows.Forms; [Console]::OutputEncoding=[System.Text.UTF8Encoding]::new($false); [Console]::Out.Write([System.Windows.Forms.Clipboard]::GetText())"
+		];
+		installHint = "PowerShell is required to paste text";
+	} else if (env.WAYLAND_DISPLAY) {
+		command = "wl-paste";
+		args = [
+			"--no-newline",
+			"--type",
+			"text"
+		];
+		textTargetsExhausted = true;
+		installHint = "install wl-clipboard to paste text";
+	} else if (env.DISPLAY) {
+		command = "xclip";
+		args = [
+			"-selection",
+			"clipboard",
+			"-t",
+			"UTF8_STRING",
+			"-o"
+		];
+		fallbackArgs = [
+			"-selection",
+			"clipboard",
+			"-t",
+			"STRING",
+			"-o"
+		];
+		textTargetsExhausted = true;
+		installHint = "install xclip to paste text";
+	} else return {
+		ok: false,
+		reason: "helper-missing",
+		detail: "no clipboard helper available in this environment"
+	};
+	let result = await capture(command, args, void 0, MAX_CLIPBOARD_TEXT_BYTES);
+	if (result.spawnError) return {
+		ok: false,
+		reason: "helper-missing",
+		detail: installHint
+	};
+	if (result.code !== 0 && !result.truncated && fallbackArgs) result = await capture(command, fallbackArgs, void 0, MAX_CLIPBOARD_TEXT_BYTES);
+	if (result.truncated || result.stdout.length > 20971520) return {
+		ok: false,
+		reason: "too-large",
+		detail: `clipboard text exceeds ${Math.round(MAX_CLIPBOARD_TEXT_BYTES / (1024 * 1024))} MB — paste it from a file instead`
+	};
+	if (result.code !== 0 && textTargetsExhausted) return {
+		ok: false,
+		reason: "no-text"
+	};
+	if (result.code !== 0) return {
+		ok: false,
+		reason: "failed",
+		detail: result.stderr.trim() || "clipboard helper failed"
+	};
+	if (result.stdout.length === 0) return {
+		ok: false,
+		reason: "no-text"
+	};
+	return {
+		ok: true,
+		text: result.stdout.toString("utf8")
+	};
+}
+/** Read text directly from the OS clipboard without sending it through the terminal PTY. */
+async function readClipboardText(hooks = {}) {
+	const platform = hooks.platform ?? process.platform;
+	const env = hooks.env ?? process.env;
+	if (isRemoteSession(env)) return {
+		ok: false,
+		reason: "unsupported-env",
+		detail: "clipboard paste is unavailable over SSH — paste the text through your local terminal instead"
+	};
+	return readClipboardTextWith(hooks.capture ?? captureViaSpawn, platform, env);
+}
+/** Prefer clipboard images, then fall back to text read outside the terminal PTY. */
+async function readClipboardContent(hooks = {}) {
+	const image = await readClipboardImage(hooks);
+	if (image.ok) return {
+		ok: true,
+		kind: "image",
+		data: image.data,
+		mediaType: image.mediaType
+	};
+	const text = await readClipboardText(hooks);
+	if (text.ok) return {
+		ok: true,
+		kind: "text",
+		text: text.text
+	};
+	if (text.reason === "no-text" && image.reason === "no-image") return {
+		ok: false,
+		reason: "empty"
+	};
+	if (text.reason === "no-text") return {
+		ok: false,
+		reason: image.reason === "no-image" ? "empty" : image.reason,
+		...image.detail ? { detail: image.detail } : {}
+	};
+	return {
+		ok: false,
+		reason: text.reason,
+		...text.detail ? { detail: text.detail } : {}
+	};
+}
 //#endregion
 //#region src/tui/completion-popup.tsx
 /**
@@ -9258,23 +9408,17 @@ function QuestionInteractionBlock({ request, onResolve }) {
 	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), [
+	const contentRows = useMemo(() => {
+		const introHeight = introRows(intro, contentCols);
+		const heightWithFocus = (focus) => introHeight + questions.reduce((sum, q, i) => sum + estimateQuestionRowHeight(q, i < focus ? "done" : i === focus ? "active" : "pending", contentCols), 0);
+		const tallest = questions.length === 0 ? introHeight : questions.reduce((max, _, focus) => Math.max(max, heightWithFocus(focus)), 0);
+		return Math.min(tallest, maxRows);
+	}, [
 		intro,
 		questions,
-		activeIndex,
-		contentCols
+		contentCols,
+		maxRows
 	]);
-	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: maxRows,
@@ -10328,72 +10472,6 @@ function McpAuthorizingPanel({ serverName, authUrl, maxLineWidth, chromeWidth, i
 	});
 }
 //#endregion
-//#region src/tui/todo-indicator.tsx
-/**
-* Layout budget when truncating the content. The bar never wraps —
-* single-line by contract — so we subtract every column consumed by
-* surrounding chrome before measuring how much room is left for the
-* todo's `content` text.
-*
-*   - 2 cols ⇒ `<ChatScreen>`'s `border: true` (1 cell each side).
-*   - 2 cols ⇒ this indicator's own `paddingLeft: 1 + paddingRight: 1`
-*              (mirrors the queue block's outer padding so the bar
-*              and queue read as aligned siblings).
-*   - 4 cols ⇒ the indicator's own visible chrome: glyph "◐" (1) +
-*              two spaces (2) + 1 col of trailing breathing room.
-*
-* That's 8 cols total of non-content overhead. Below `MIN_VISIBLE_TAIL`
-* the bar bails — a one-or-two-char tail isn't worth painting.
-*/
-const SCREEN_BORDER_COLS = 2;
-const INDICATOR_PADDING_COLS = 2;
-const CHROME_COLS = 4;
-const MIN_VISIBLE_TAIL = 8;
-function truncateForWidth(text, max) {
-	if (max <= 0) return "";
-	if (text.length <= max) return text;
-	if (max <= 1) return "…";
-	return `${text.slice(0, max - 1)}…`;
-}
-function TodoIndicator({ session }) {
-	const { settings } = useSettings();
-	const COLOR = useColors();
-	const { width: termWidth } = useTerminalDimensions();
-	const state = useActiveTodos(session);
-	if (!settings.showTodoIndicator) return null;
-	const item = state.inProgress;
-	if (!item) return null;
-	const usable = Math.max(0, termWidth - SCREEN_BORDER_COLS - INDICATOR_PADDING_COLS - CHROME_COLS);
-	if (usable < MIN_VISIBLE_TAIL) return null;
-	const display = truncateForWidth(item.content.replace(/\s+/g, " ").trim(), usable);
-	return /* @__PURE__ */ jsx$1("box", {
-		style: {
-			marginTop: 1,
-			flexShrink: 0,
-			flexDirection: "row",
-			paddingLeft: 1,
-			paddingRight: 1
-		},
-		children: /* @__PURE__ */ jsxs("text", {
-			wrapMode: "none",
-			children: [
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: TODO_STATUS_GLYPHS.in_progress
-				}),
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.mute,
-					children: "  "
-				}),
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.dim,
-					children: display
-				})
-			]
-		})
-	});
-}
-//#endregion
 //#region src/tui/screens.tsx
 /** How long a clipboard-paste status line stays before self-clearing. */
 const NOTICE_TTL_MS = 5e3;
@@ -10418,6 +10496,26 @@ const MAX_FILE_ATTACHMENT_BYTES = 20 * 1024 * 1024;
 * every subsequent render of the prompt) crawl.
 */
 const PASTE_INLINE_MAX_CHARS = 1e4;
+/**
+* Normalize terminal/native clipboard text and decide whether the composer
+* should insert it or fold it into a text attachment.
+*/
+function planTextPaste(text, attachmentsEnabled) {
+	const normalized = stripAnsiSequences(text).replace(/\r\n?/g, "\n");
+	const lines = normalized.trim().split("\n");
+	if (attachmentsEnabled && (lines.length > 10 || normalized.length > PASTE_INLINE_MAX_CHARS)) return {
+		kind: "attachment",
+		attachment: {
+			name: "paste.txt",
+			content: Buffer.from(normalized, "utf8"),
+			mediaType: "text/plain"
+		}
+	};
+	return {
+		kind: "inline",
+		text: normalized
+	};
+}
 /** `image/png` → `png` etc., for naming the synthesized clipboard attachment. */
 function extForImageMediaType(mediaType) {
 	const sub = mediaType.split("/")[1] ?? "png";
@@ -11091,6 +11189,7 @@ function OAuthRunningStep({ descriptor, dataDir, onSuccess, onError }) {
 					kind: "oauth",
 					...creds
 				});
+				if (descriptor.envKey) delete process.env[descriptor.envKey];
 				onSuccess();
 			} catch (err) {
 				if (cancelled) return;
@@ -11738,7 +11837,7 @@ const EMPTY_QUEUED_MESSAGES = [];
 function shouldRenderTranscriptSearch(searchMode, query) {
 	return searchMode && query.trim().length > 0;
 }
-function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EMPTY_QUEUED_MESSAGES, queueSelectionIndex = null, queueShortcuts, onEnterQueueFromEmptyPrompt, settings, onSubmit, session, pending, onApproval, pendingInteraction, onInteraction, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, selectedTurnId, onSelectTurn, onOpenTurn, transcriptSearchMode = false, transcriptSearchQuery = "", transcriptSearchEvents = [], transcriptSearchSearching = false, onTranscriptSearchModeChange, onTranscriptSearchQueryChange, onTranscriptSearchNavigate, onTranscriptSearchOpen, onLoadEarlierTranscript, promptTriggerHints, attachImageBinding, editorBinding, sessionDetailsBinding, liveSession = null }) {
+function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EMPTY_QUEUED_MESSAGES, queueSelectionIndex = null, queueShortcuts, onEnterQueueFromEmptyPrompt, settings, onSubmit, session, pending, onApproval, pendingInteraction, onInteraction, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, selectedTurnId, onSelectTurn, onOpenTurn, transcriptSearchMode = false, transcriptSearchQuery = "", transcriptSearchEvents = [], transcriptSearchSearching = false, onTranscriptSearchModeChange, onTranscriptSearchQueryChange, onTranscriptSearchNavigate, onTranscriptSearchOpen, onLoadEarlierTranscript, promptTriggerHints, attachImageBinding, editorBinding, sessionDetailsBinding }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	const titleText = session?.title ?? "New session";
@@ -11806,6 +11905,7 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 	}, [onPopupOpenChange]);
 	const fileEditPending = pending && isFileEditTool(pending.tool) ? pending : null;
 	const planPending = !pending && pendingInteraction?.kind === "plan" ? pendingInteraction : null;
+	const approvalPending = pending && !fileEditPending ? pending : null;
 	const modal = useModal();
 	useEffect(() => {
 		if (!fileEditPending) return;
@@ -11861,47 +11961,58 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 				request: fileEditPending,
 				onDecide: onApproval
 			}, fileEditPending.id),
-			/* @__PURE__ */ jsx$1("box", {
+			/* @__PURE__ */ jsxs("box", {
 				style: {
 					flexDirection: "column",
 					flexShrink: 0,
 					backgroundColor: SURFACE.background
 				},
-				children: pending && !fileEditPending ? /* @__PURE__ */ jsx$1(ApprovalBlock, {
-					request: pending,
-					onPick: onApproval
-				}) : pendingInteraction ? /* @__PURE__ */ jsx$1(InteractionBlock, {
-					request: pendingInteraction,
-					onResolve: onInteraction
-				}, pendingInteraction.id) : /* @__PURE__ */ jsxs(Fragment, { children: [
-					queuedMessages.length > 0 && !completionPopupOpen && /* @__PURE__ */ jsx$1(QueuedMessagesBlock, {
-						messages: queuedMessages,
-						selectionIndex: queueSelectionIndex,
-						shortcuts: queueShortcuts
+				children: [
+					approvalPending && /* @__PURE__ */ jsx$1(ApprovalBlock, {
+						request: approvalPending,
+						onPick: onApproval
 					}),
-					/* @__PURE__ */ jsx$1(TodoIndicator, { session: liveSession }),
-					/* @__PURE__ */ jsx$1(ExtensionBanners, {}),
-					/* @__PURE__ */ jsx$1(PromptBlock, {
-						userPrompts,
-						onSubmit,
-						completionProviders,
-						inlineAutocompleteProviders,
-						onCompletionTab,
-						enterSelectsCompletion,
-						onPopupOpenChange: handlePopupOpenChange,
-						searchMode: transcriptSearchMode,
-						onSearchModeChange: onTranscriptSearchModeChange,
-						onSearchQueryChange: onTranscriptSearchQueryChange,
-						onSearchNavigate: onTranscriptSearchNavigate,
-						onSearchOpen: onTranscriptSearchOpen,
-						selectMode: queueSelectionIndex != null ? "queue" : null,
-						triggerHints: promptTriggerHints,
-						busy,
-						onEnterQueueFromEmpty: onEnterQueueFromEmptyPrompt,
-						attachImageBinding,
-						editorBinding
+					pendingInteraction && !approvalPending && /* @__PURE__ */ jsx$1(InteractionBlock, {
+						request: pendingInteraction,
+						onResolve: onInteraction
+					}, pendingInteraction.id),
+					/* @__PURE__ */ jsxs("box", {
+						style: {
+							flexDirection: "column",
+							flexShrink: 0,
+							visible: approvalPending == null && pendingInteraction == null
+						},
+						children: [
+							queuedMessages.length > 0 && !completionPopupOpen && /* @__PURE__ */ jsx$1(QueuedMessagesBlock, {
+								messages: queuedMessages,
+								selectionIndex: queueSelectionIndex,
+								shortcuts: queueShortcuts
+							}),
+							/* @__PURE__ */ jsx$1(ExtensionBanners, {}),
+							/* @__PURE__ */ jsx$1(PromptBlock, {
+								userPrompts,
+								onSubmit,
+								completionProviders,
+								inlineAutocompleteProviders,
+								onCompletionTab,
+								enterSelectsCompletion,
+								onPopupOpenChange: handlePopupOpenChange,
+								searchMode: transcriptSearchMode,
+								onSearchModeChange: onTranscriptSearchModeChange,
+								onSearchQueryChange: onTranscriptSearchQueryChange,
+								onSearchNavigate: onTranscriptSearchNavigate,
+								onSearchOpen: onTranscriptSearchOpen,
+								selectMode: queueSelectionIndex != null ? "queue" : null,
+								triggerHints: promptTriggerHints,
+								busy,
+								onEnterQueueFromEmpty: onEnterQueueFromEmptyPrompt,
+								attachImageBinding,
+								editorBinding,
+								suspended: approvalPending != null || pendingInteraction != null
+							})
+						]
 					})
-				] })
+				]
 			}),
 			!planPending && !fileEditPending && /* @__PURE__ */ jsx$1(TitleOverlay, {
 				title: titleText,
@@ -12071,9 +12182,23 @@ function queueRowId(index) {
 * (where committed messages live) and the prompt (where the user is
 * typing the next one). Dropped entirely when the queue is empty.
 */
+/**
+* Badge text for a queued message's attachment count, or `null` when there is
+* nothing to show.
+*
+* Split out from the row so the logic — pluralization, and the distinction
+* between "no attachments" and "this preview predates the field" — is testable
+* without standing up `ChatScreen`'s provider stack. Padded with spaces because
+* it renders as a filled chip and needs breathing room inside its background.
+*/
+function attachmentBadgeLabel(count) {
+	if (count === void 0 || count <= 0) return null;
+	return ` +${count} ${count === 1 ? "attachment" : "attachments"} `;
+}
 function QueuedMessagesBlock({ messages, selectionIndex, shortcuts }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
+	const attachmentChip = resolveChipColor(SURFACE.chips, "file");
 	const scrollboxRef = useRef(null);
 	const enterHintKey = shortcuts?.enter ? formatBindingForDisplay(shortcuts.enter) : "↑";
 	useEffect(() => {
@@ -12136,6 +12261,11 @@ function QueuedMessagesBlock({ messages, selectionIndex, shortcuts }) {
 									fg: COLOR.mute,
 									children: "❯ "
 								}),
+								attachmentBadgeLabel(msg.attachments) !== null && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
+									fg: attachmentChip.fg,
+									bg: attachmentChip.bg,
+									children: attachmentBadgeLabel(msg.attachments)
+								}), /* @__PURE__ */ jsx$1("span", { children: " " })] }),
 								/* @__PURE__ */ jsx$1("span", {
 									fg: focused ? COLOR.brand : COLOR.dim,
 									children: previewText(msg.text)
@@ -12225,7 +12355,7 @@ const INLINE_GHOST_DEBOUNCE_MS = 120;
 function isTranscriptSearchExitKey(event, cursorOffset) {
 	return event.name === "escape" || (event.name === "backspace" || event.name === "delete") && !event.ctrl && !event.meta && !event.shift && cursorOffset === 0;
 }
-function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, searchMode = false, onSearchModeChange, onSearchQueryChange, onSearchNavigate, onSearchOpen, selectMode = null, triggerHints, busy = false, onEnterQueueFromEmpty, attachImageBinding, editorBinding }) {
+function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, searchMode = false, onSearchModeChange, onSearchQueryChange, onSearchNavigate, onSearchOpen, selectMode = null, triggerHints, busy = false, onEnterQueueFromEmpty, attachImageBinding, editorBinding, clipboardReader = readClipboardContent, suspended = false }) {
 	const focused = useModalAwareFocus();
 	const renderer = useRenderer();
 	const COLOR = useColors();
@@ -12488,30 +12618,12 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 		syncBuffer();
 		return true;
 	}, [completion, syncBuffer]);
-	/**
-	* Multi-line paste handler. The textarea's default `handlePaste`
-	* forwards the decoded bytes to `insertText` in one call, which the
-	* native edit buffer treats as raw characters — embedded `\n` lands
-	* as a literal glyph rather than splitting the line, and bracketed
-	* paste from macOS Terminal often substitutes CR for LF on top of
-	* that. The result was a multi-line paste collapsing to one giant
-	* row.
-	*
-	* We `preventDefault` to skip the textarea's default path, normalize
-	* `\r\n` / `\r` to `\n`, then drive the edit buffer explicitly:
-	* `insertText` for each segment, `newLine()` between segments. The
-	* cursor is positioned at the end of the pasted block (the natural
-	* place to keep typing).
-	*/
-	const onPaste = useCallback((event) => {
-		event.preventDefault();
+	/** Apply decoded clipboard text through the shared file/attachment/inline policy. */
+	const applyTextPaste = useCallback((text) => {
 		const ta = textareaRef.current;
 		if (!ta) return;
-		const normalized = stripAnsiSequences(decodePasteBytes(event.bytes)).replace(/\r\n?/g, "\n");
-		if (normalized.length === 0) {
-			if (attachmentsEnabled) attachClipboardImage();
-			return;
-		}
+		const normalized = stripAnsiSequences(text).replace(/\r\n?/g, "\n");
+		if (normalized.length === 0) return;
 		if (attachmentsEnabled && !normalized.includes("\n")) {
 			const trimmed = normalized.trim().replace(/^["']|["']$/g, "");
 			let resolved = trimmed.startsWith("file://") ? decodeURIComponent(trimmed.slice(7)) : trimmed;
@@ -12535,15 +12647,12 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 				}
 			} catch {}
 		}
-		const lines = normalized.trim().split("\n");
-		if (attachmentsEnabled && (lines.length > 10 || normalized.length > PASTE_INLINE_MAX_CHARS)) {
-			setAttachments((prev) => [...prev, {
-				name: "paste.txt",
-				content: Buffer.from(normalized, "utf-8"),
-				mediaType: "text/plain"
-			}]);
+		const pastePlan = planTextPaste(normalized, attachmentsEnabled);
+		if (pastePlan.kind === "attachment") {
+			setAttachments((prev) => [...prev, pastePlan.attachment]);
 			return;
 		}
+		const lines = pastePlan.text.trim().split("\n");
 		for (let i = 0; i < lines.length; i++) {
 			if (i > 0) ta.newLine();
 			const part = lines[i];
@@ -12551,9 +12660,64 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 		}
 		syncBuffer();
 	}, [
-		syncBuffer,
 		attachmentsEnabled,
-		attachClipboardImage,
+		showNotice,
+		syncBuffer
+	]);
+	/**
+	* Prevent the textarea's one-shot insert and explicitly preserve multiline
+	* paste. Empty terminal paste remains the image-clipboard probe.
+	*/
+	const onPaste = useCallback((event) => {
+		event.preventDefault();
+		const raw = decodePasteBytes(event.bytes);
+		if (stripAnsiSequences(raw).replace(/\r\n?/g, "\n").length === 0) {
+			if (attachmentsEnabled) attachClipboardImage();
+			return;
+		}
+		applyTextPaste(raw);
+	}, [
+		applyTextPaste,
+		attachmentsEnabled,
+		attachClipboardImage
+	]);
+	/**
+	* Read the OS clipboard on the app-owned keybinding. Unlike terminal paste,
+	* this moves only the shortcut bytes through the PTY, avoiding large-paste
+	* backpressure bugs in integrated terminals. Text is re-injected through the
+	* exact same paste handler as bracketed paste; images retain the existing
+	* attachment behavior.
+	*/
+	const pasteClipboard = useCallback(async () => {
+		const result = await clipboardReader();
+		if (!result.ok) {
+			showNotice(result.reason === "empty" ? "clipboard has no text or image" : result.detail ?? "could not read the clipboard");
+			return;
+		}
+		if (result.kind === "text") {
+			applyTextPaste(result.text);
+			return;
+		}
+		if (!attachmentsEnabled) {
+			showNotice("attachments are disabled — enable them in Settings → Agent");
+			return;
+		}
+		if (result.data.length > MAX_IMAGE_BYTES) {
+			showNotice(`clipboard image too large (${formatBytes(result.data.length)}) — max ${formatBytes(MAX_IMAGE_BYTES)}`);
+			return;
+		}
+		setAttachments((prev) => {
+			const n = prev.filter((a) => a.name.startsWith("clipboard-")).length + 1;
+			return [...prev, {
+				name: `clipboard-${n}.${extForImageMediaType(result.mediaType)}`,
+				content: result.data,
+				mediaType: result.mediaType
+			}];
+		});
+	}, [
+		applyTextPaste,
+		attachmentsEnabled,
+		clipboardReader,
 		showNotice
 	]);
 	/**
@@ -12620,7 +12784,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 	const onKeyDown = useCallback((event) => {
 		if (attachImageBinding && matchesBinding(event, attachImageBinding)) {
 			event.preventDefault();
-			attachClipboardImage();
+			pasteClipboard();
 			return;
 		}
 		if (editorBinding && matchesBinding(event, editorBinding)) {
@@ -12752,7 +12916,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 		enterSelectsCompletion,
 		syncBuffer,
 		attachImageBinding,
-		attachClipboardImage,
+		pasteClipboard,
 		editorBinding,
 		openExternalEditor,
 		attachments,
@@ -12848,7 +13012,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 						},
 						children: [/* @__PURE__ */ jsx$1("textarea", {
 							ref: textareaRef,
-							focused: focused && !selectMode,
+							focused: focused && !selectMode && !suspended,
 							keyBindings: TEXTAREA_BINDINGS,
 							wrapMode: "word",
 							placeholder: selectMode === "queue" ? "— queue-select mode — press ⎋ to resume typing —" : searchMode ? "Search this conversation…" : shellMode ? "Run a shell command…" : "Ask zidane…",
@@ -13692,6 +13856,78 @@ function statusColor(status, COLOR) {
 	}
 }
 //#endregion
+//#region src/chat/auth-rows.ts
+/**
+* Stored credentials, i.e. the ones a user can actually choose between.
+*
+* `env` is excluded: it is observed rather than stored, and is usually just the
+* mirror `applyApiKeyEnv` wrote from the stored API key, so counting it would
+* advertise a choice that does not exist.
+*/
+function selectableSources(provider) {
+	return provider.methods.filter((m) => m.source !== "env");
+}
+/** A provider earns a chevron only when there is a real choice to reveal. */
+function isExpandableProvider(provider) {
+	return selectableSources(provider).length > 1;
+}
+/**
+* Flatten the provider list plus the expanded set into the visible-row list.
+*
+*   - `providers` — filtered / ordered provider list (post-search).
+*   - `expanded`  — keys of providers whose sources are open. Keys for
+*                   providers that are no longer expandable are ignored rather
+*                   than cleaned up, so stale expansion state (a credential
+*                   removed while the modal is open) can't desync the cursor.
+*/
+function buildVisibleAuthRows(providers, expanded) {
+	const out = [];
+	for (const provider of providers) {
+		const expandable = isExpandableProvider(provider);
+		out.push({
+			kind: "provider",
+			provider,
+			expandable
+		});
+		if (!expandable || !expanded.has(provider.key)) continue;
+		for (const method of selectableSources(provider)) out.push({
+			kind: "source",
+			providerKey: provider.key,
+			method
+		});
+		if (provider.envKey) {
+			const envMethod = provider.methods.find((m) => m.source === "env");
+			out.push({
+				kind: "source",
+				providerKey: provider.key,
+				method: envMethod ?? {
+					source: "env",
+					detail: provider.envKey,
+					active: false
+				}
+			});
+		}
+	}
+	return out;
+}
+/**
+* Provider key a row "belongs to" — its own for a provider header, the parent's
+* for a source row.
+*/
+function parentProviderKey(row) {
+	return row.kind === "provider" ? row.provider.key : row.providerKey;
+}
+/**
+* Index in `rows` of the header for the given provider key, or `-1`.
+*
+* Collapse handlers snap the cursor up to the parent BEFORE the row list
+* shrinks; without that the cursor keeps its flat index and silently lands on
+* whichever sibling row slid into that slot.
+*/
+function indexOfProviderRow(rows, providerKey) {
+	return rows.findIndex((r) => r.kind === "provider" && r.provider.key === providerKey);
+}
+//#endregion
 //#region src/chat/contribution-origin.ts
 /**
 * Union the three skill sources into the list the Skills tab shows, in the
@@ -15132,6 +15368,17 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	const [expandedMcps, setExpandedMcps] = useState(() => /* @__PURE__ */ new Set());
 	const [expandedExtensions, setExpandedExtensions] = useState(() => /* @__PURE__ */ new Set());
 	const [expandedInstructions, setExpandedInstructions] = useState(() => /* @__PURE__ */ new Set());
+	const [expandedProviders, setExpandedProviders] = useState(() => /* @__PURE__ */ new Set());
+	/**
+	* Provider list after an in-modal credential swap.
+	*
+	* `authentication.providers` is a snapshot frozen when the modal opened, so
+	* promoting a credential would leave the ● marker pointing at the old winner
+	* until the user closed and re-opened — which reads as "nothing happened".
+	* The host returns freshly-detected providers from the action and they land
+	* here, so the swap is visible in place.
+	*/
+	const [providersAfterSwap, setProvidersAfterSwap] = useState(null);
 	const [instructionsNotice, setInstructionsNotice] = useState(null);
 	const [instructionSegments, setInstructionSegments] = useState([]);
 	const [instructionsLoading, setInstructionsLoading] = useState(false);
@@ -15496,7 +15743,11 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		expandedMcps,
 		mcpToolsByServer
 	]);
-	const filteredProviders = useMemo(() => (authentication?.providers ?? []).filter((p) => matchesTerms(providerCorpus(p), queryTerms)), [authentication?.providers, queryTerms]);
+	const filteredProviders = useMemo(() => (providersAfterSwap ?? authentication?.providers ?? []).filter((p) => matchesTerms(providerCorpus(p), queryTerms)), [
+		providersAfterSwap,
+		authentication?.providers,
+		queryTerms
+	]);
 	const instructionVisibleRows = useMemo(() => buildVisibleInstructionRows({
 		segments: instructionSegments,
 		expanded: expandedInstructions,
@@ -15508,7 +15759,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		queryActive,
 		queryTerms
 	]);
-	const authRowCount = filteredProviders.length;
+	const authVisibleRows = useMemo(() => buildVisibleAuthRows(filteredProviders, expandedProviders), [filteredProviders, expandedProviders]);
+	const authRowCount = authVisibleRows.length;
 	const filteredSize = {
 		...Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, filteredByCategory[c.id].length])),
 		skills: filteredSkills.length,
@@ -15622,6 +15874,27 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		});
 	}, [instructionVisibleRows]);
 	const toggleExpandFocusedInstructionRow = useCallback(() => toggleExpandInstructionRowAt(cursor), [toggleExpandInstructionRowAt, cursor]);
+	const toggleExpandProviderRowAt = useCallback((index) => {
+		const row = authVisibleRows[index];
+		if (!row) return;
+		if (row.kind === "provider" && !row.expandable) return;
+		const providerKey = parentProviderKey(row);
+		setExpandedProviders((prev) => {
+			const next = new Set(prev);
+			if (next.has(providerKey)) {
+				if (row.kind === "source") {
+					const parentIndex = indexOfProviderRow(authVisibleRows, providerKey);
+					if (parentIndex >= 0) setCursorByTab((c) => ({
+						...c,
+						authentication: parentIndex
+					}));
+				}
+				next.delete(providerKey);
+			} else next.add(providerKey);
+			return next;
+		});
+	}, [authVisibleRows]);
+	const toggleExpandFocusedProviderRow = useCallback(() => toggleExpandProviderRowAt(cursor), [toggleExpandProviderRowAt, cursor]);
 	const mcpRowCount = mcpVisibleRows.length;
 	const extensionRowCount = extensionVisibleRows.length;
 	const instructionRowCount = instructionVisibleRows.length;
@@ -15806,8 +16079,17 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			return;
 		}
 		if (activeTab === "authentication") {
-			const provider = filteredProviders[index];
-			if (provider) actions?.onConfigureProvider?.(provider);
+			const row = authVisibleRows[index];
+			if (!row) return;
+			if (row.kind === "provider") {
+				actions?.onConfigureProvider?.(row.provider);
+				return;
+			}
+			if (row.method.source === "env" || row.method.active) return;
+			const provider = filteredProviders.find((p) => p.key === row.providerKey);
+			if (!provider) return;
+			const refreshed = actions?.onSetPreferredCredential?.(provider, row.method.source);
+			if (refreshed) setProvidersAfterSwap(refreshed);
 		}
 	}, [
 		activeTab,
@@ -15828,6 +16110,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		mcpToolToggleMap,
 		actions,
 		filteredProviders,
+		authVisibleRows,
 		instructionVisibleRows,
 		instructionsCanOverride,
 		instructionsOverrideBlockedBy
@@ -15975,6 +16258,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			toggleExpandFocusedInstructionRow();
 			return;
 		}
+		if (activeTab === "authentication" && key.name === "tab") {
+			toggleExpandFocusedProviderRow();
+			return;
+		}
 		if (key.name === "return") {
 			activateRowAt(cursor);
 			return;
@@ -16359,6 +16646,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 					activeTab === "authentication" && authentication && /* @__PURE__ */ jsx$1(AuthenticationList, {
 						view: authentication,
 						providers: filteredProviders,
+						rows: authVisibleRows,
 						cursor,
 						highlightBg: SURFACE.selection,
 						query
@@ -17761,7 +18049,7 @@ function LogsList({ buffer, filePath, minLevel, query, scrollboxRef }) {
 		]
 	});
 }
-function AuthenticationList({ view, providers, cursor, highlightBg, query }) {
+function AuthenticationList({ view, providers, rows, cursor, highlightBg, query }) {
 	const COLOR = useColors();
 	const home = homedir();
 	const totalProviders = view.providers?.length ?? 0;
@@ -17842,10 +18130,51 @@ function AuthenticationList({ view, providers, cursor, highlightBg, query }) {
 				})
 			}),
 			totalProviders > 0 && providers.length === 0 && /* @__PURE__ */ jsx$1(EmptyRow, { label: `no providers match "${query}"` }),
-			providers.map((p, i) => {
-				const isCurrent = view.currentProviderKey === p.key;
+			rows.map((row, i) => {
 				const focused = i === cursor;
 				const bg = focused ? highlightBg : void 0;
+				if (row.kind === "source") {
+					const { method } = row;
+					const isEnv = method.source === "env";
+					const dotColor = isEnv ? COLOR.model : method.active ? COLOR.accent : COLOR.mute;
+					return /* @__PURE__ */ jsx$1("box", {
+						id: anchorIdFor(i),
+						style: {
+							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: dotColor,
+									children: isEnv || method.active ? "● " : "○ "
+								}),
+								/* @__PURE__ */ jsx$1("span", {
+									fg: isEnv ? COLOR.model : method.active ? COLOR.accent : focused ? COLOR.brand : COLOR.dim,
+									children: method.source
+								}),
+								/* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.mute,
+									children: `  ${displayPath$1(method.detail, home)}`
+								}),
+								method.active && /* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.mute,
+									children: "  (in use)"
+								})
+							]
+						})
+					}, `${i}:${row.providerKey}:${method.source}`);
+				}
+				const p = row.provider;
+				const expanded = row.expandable && rows[i + 1]?.kind === "source";
+				const isCurrent = view.currentProviderKey === p.key;
 				const marker = focused ? "▶ " : isCurrent ? "▸ " : "  ";
 				const labelColor = focused || isCurrent ? COLOR.brand : p.available ? COLOR.dim : COLOR.mute;
 				return /* @__PURE__ */ jsxs("box", {
@@ -17875,9 +18204,17 @@ function AuthenticationList({ view, providers, cursor, highlightBg, query }) {
 							isCurrent && /* @__PURE__ */ jsx$1("span", {
 								fg: COLOR.mute,
 								children: "  (active)"
+							}),
+							row.expandable && /* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.mute,
+								children: `  ${expanded ? "▾" : "▸"} ${selectableSources(p).length} sources`
+							}),
+							row.expandable && focused && /* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.dim,
+								children: "  tab"
 							})
 						]
-					}), p.methods.length > 0 && /* @__PURE__ */ jsx$1("text", {
+					}), p.methods.length > 0 && !expanded && /* @__PURE__ */ jsx$1("text", {
 						wrapMode: "none",
 						fg: COLOR.mute,
 						children: `    ${p.methods.map((m) => `${m.source}: ${displayPath$1(m.detail, home)}`).join(" · ")}`
@@ -18496,7 +18833,109 @@ function restoreTerminalTitle(out = process.stdout) {
 	} catch {}
 }
 //#endregion
+//#region src/chat/todo-edits.ts
+/**
+* Prefix for ids minted here, distinguishing user-authored rows from the
+* model's own ids in a session file. Purely diagnostic — nothing branches on
+* it — but it makes "who added this" answerable after the fact.
+*/
+const USER_TODO_ID_PREFIX = "user-";
+/**
+* Mint an id that cannot collide with an existing row.
+*
+* Counter-based rather than random: a stable, readable id keeps session diffs
+* legible, and the collision check makes it safe against ids the model already
+* used (including previous `user-*` ones after a reload).
+*/
+function nextTodoId(items) {
+	const taken = new Set(items.map((i) => i.id));
+	for (let n = 1;; n++) {
+		const id = `${USER_TODO_ID_PREFIX}${n}`;
+		if (!taken.has(id)) return id;
+	}
+}
+/**
+* Append a todo. Returns the list unchanged when `content` is blank — an empty
+* row is never what the user meant, and rejecting it here means every caller
+* (keyboard, click, future GUI) gets the same guard.
+*/
+function addTodo(items, content) {
+	const trimmed = content.trim();
+	if (!trimmed) return [...items];
+	return [...items, {
+		id: nextTodoId(items),
+		content: trimmed,
+		status: "pending"
+	}];
+}
+/**
+* Replace one todo's text. Blank content is rejected (see {@link addTodo}); an
+* unknown id is a no-op rather than an error, because the list can be replaced
+* by a `todowrite` between render and keypress.
+*/
+function editTodo(items, id, content) {
+	const trimmed = content.trim();
+	if (!trimmed) return [...items];
+	return items.map((item) => item.id === id ? {
+		...item,
+		content: trimmed
+	} : item);
+}
+/** Drop one todo. Unknown id is a no-op, same rationale as {@link editTodo}. */
+function removeTodo(items, id) {
+	return items.filter((item) => item.id !== id);
+}
+/** Drop everything. Separate from `removeTodo` so the caller's intent is explicit at the call site. */
+function clearTodos() {
+	return [];
+}
+/**
+* Advance a todo's status one step: pending → in_progress → completed →
+* pending. `cancelled` also lands on `pending`, so a dropped item can be
+* revived without a dedicated key.
+*
+* Cycling INTO `in_progress` demotes any other in-progress row to `pending`:
+* the list's whole purpose is "what is being worked on right now", and two
+* live rows make that unanswerable — `TodoIndicator`'s successor
+* (`todoProgressLabel`) reads the first one and would silently ignore the rest.
+*/
+function cycleTodoStatus(items, id) {
+	const target = items.find((item) => item.id === id);
+	if (!target) return [...items];
+	const next = nextStatus(target.status);
+	return items.map((item) => {
+		if (item.id === id) return {
+			...item,
+			status: next
+		};
+		if (next === "in_progress" && item.status === "in_progress") return {
+			...item,
+			status: "pending"
+		};
+		return item;
+	});
+}
+function nextStatus(status) {
+	switch (status) {
+		case "pending": return "in_progress";
+		case "in_progress": return "completed";
+		default: return "pending";
+	}
+}
+//#endregion
 //#region src/tui/todos-modal.tsx
+/**
+* Steering text for a "retry this todo" request.
+*
+* Quotes the content so a model reading it can match the row verbatim against
+* its own list, and names the status because "retry" means different things
+* for a row it believes is `completed` versus one it abandoned as `cancelled`.
+* Pure + exported so the wording is pinned by a test rather than living only
+* inside a JSX callback.
+*/
+function buildTodoRetryMessage(item) {
+	return `Retry this todo (currently ${item.status}): "${item.content}"`;
+}
 /** Floor on the modal height — keeps the header + at least a few rows visible on tiny terminals. */
 const MIN_MODAL_HEIGHT = 12;
 /** Ceiling on the modal height — prevents a giant list from blanket-filling a tall window. */
@@ -18534,11 +18973,16 @@ function statusColors(status, COLOR) {
 		};
 	}
 }
-function TodoRow({ item, rowId }) {
+function TodoRow({ item, rowId, focused, onClick }) {
 	const COLOR = useColors();
 	const colors = statusColors(item.status, COLOR);
 	return /* @__PURE__ */ jsx$1("box", {
 		id: rowId,
+		onMouseDown: onClick && ((event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			onClick();
+		}),
 		style: {
 			flexShrink: 0,
 			flexDirection: "row"
@@ -18546,6 +18990,10 @@ function TodoRow({ item, rowId }) {
 		children: /* @__PURE__ */ jsxs("text", {
 			wrapMode: "word",
 			children: [
+				/* @__PURE__ */ jsx$1("span", {
+					fg: focused ? COLOR.brand : COLOR.mute,
+					children: focused ? "▶ " : "  "
+				}),
 				/* @__PURE__ */ jsx$1("span", {
 					fg: colors.glyph,
 					children: TODO_STATUS_GLYPHS[item.status]
@@ -18562,10 +19010,14 @@ function TodoRow({ item, rowId }) {
 		})
 	});
 }
-function TodosModal({ session, agent }) {
+function TodosModal({ session, agent, onSteer }) {
 	const COLOR = useColors();
+	const modal = useModal();
 	const { height: termHeight } = useTerminalDimensions();
 	const [, setTick] = useState(0);
+	const [cursorRaw, setCursorRaw] = useState(0);
+	const [mode, setMode] = useState("list");
+	const [draft, setDraft] = useState("");
 	useEffect(() => {
 		if (!agent) return;
 		return agent.hooks.hook("tool:after", (ctx) => {
@@ -18588,46 +19040,213 @@ function TodosModal({ session, agent }) {
 	const maxHeight = Math.max(MIN_MODAL_HEIGHT, Math.min(MAX_MODAL_HEIGHT$1, idealHeight));
 	const display = state.todos.length > 0 ? state.todos : state.archive;
 	const total = display.length;
-	return /* @__PURE__ */ jsx$1(Modal, {
+	const cursor = total === 0 ? 0 : Math.min(cursorRaw, total - 1);
+	const focusedItem = display[cursor] ?? null;
+	/**
+	* Write a transformed list back to the run.
+	*
+	* Editing while the ARCHIVE is on screen promotes it back to the live slot,
+	* which is the only coherent option: `setTodosForRun` owns the live slot, and
+	* an edit the user just made must be the list that's displayed next.
+	*/
+	const commit = useCallback((next) => {
+		if (!session || !state.runId) return;
+		setTodosForRun(session, state.runId, next, { clearArchive: true });
+		setTick((t) => t + 1);
+	}, [session, state.runId]);
+	const editable = session !== null && state.runId !== null;
+	/** Enter add / edit mode, seeding the draft from the focused row for edits. */
+	const beginEdit = useCallback((next) => {
+		setDraft(next === "edit" ? focusedItem?.content ?? "" : "");
+		setMode(next);
+	}, [focusedItem]);
+	useKeyboard((key) => {
+		if (!editable) return;
+		if (mode === "add" || mode === "edit") {
+			if (key.name === "escape") {
+				setDraft("");
+				setMode("list");
+			}
+			return;
+		}
+		if (mode === "confirm-clear") {
+			if (key.name === "y") {
+				commit(clearTodos());
+				setMode("list");
+			} else if (key.name === "n" || key.name === "escape") setMode("list");
+			return;
+		}
+		if (key.name === "up") {
+			setCursorRaw((c) => Math.max(0, c - 1));
+			return;
+		}
+		if (key.name === "down") {
+			setCursorRaw((c) => Math.min(Math.max(0, total - 1), c + 1));
+			return;
+		}
+		if (key.name === "a") {
+			beginEdit("add");
+			return;
+		}
+		if (key.ctrl && key.name === "d") {
+			if (total > 0) setMode("confirm-clear");
+			return;
+		}
+		if (key.name === "d") {
+			if (focusedItem) commit(removeTodo(display, focusedItem.id));
+			return;
+		}
+		if (key.name === "e" || key.name === "return") {
+			if (focusedItem) beginEdit("edit");
+			return;
+		}
+		if (key.name === "space") {
+			if (focusedItem) commit(cycleTodoStatus(display, focusedItem.id));
+			return;
+		}
+		if (key.name === "r") {
+			if (focusedItem && onSteer) {
+				onSteer(buildTodoRetryMessage(focusedItem));
+				modal.close();
+			}
+		}
+	});
+	const submitInput = useCallback(() => {
+		const value = draft.trim();
+		if (value) {
+			if (mode === "add") commit(addTodo(display, value));
+			else if (mode === "edit" && focusedItem) commit(editTodo(display, focusedItem.id, value));
+		}
+		setDraft("");
+		setMode("list");
+	}, [
+		draft,
+		mode,
+		commit,
+		display,
+		focusedItem
+	]);
+	return /* @__PURE__ */ jsxs(Modal, {
 		title: "todos",
 		bottomTitle: total > 0 ? `${total} item${total === 1 ? "" : "s"} · esc close` : "esc close",
 		rightTitle: display.length > 0 ? /* @__PURE__ */ jsx$1(CountsBadge, { items: display }) : null,
 		maxWidth: 100,
 		maxHeight,
-		children: total === 0 ? /* @__PURE__ */ jsxs("text", { children: [
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.mute,
-				children: "(no todos yet — the agent hasn't called "
+		disableEscape: mode !== "list",
+		children: [
+			total === 0 ? /* @__PURE__ */ jsxs("text", { children: [
+				/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.mute,
+					children: "(no todos yet — the agent hasn't called "
+				}),
+				/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.warn,
+					children: "todowrite"
+				}),
+				/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.mute,
+					children: ")"
+				})
+			] }) : /* @__PURE__ */ jsx$1("box", {
+				style: {
+					flexDirection: "column",
+					flexGrow: 1,
+					flexShrink: 1,
+					overflow: "hidden"
+				},
+				children: /* @__PURE__ */ jsx$1("scrollbox", {
+					ref: scrollRef,
+					focusable: false,
+					stickyScroll: false,
+					style: {
+						flexGrow: 1,
+						flexShrink: 1
+					},
+					children: display.map((item, i) => /* @__PURE__ */ jsx$1(TodoRow, {
+						item,
+						rowId: `todo-row-${item.id}`,
+						focused: editable && i === cursor,
+						onClick: editable ? () => setCursorRaw(i) : void 0
+					}, item.id))
+				})
 			}),
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "todowrite"
+			editable && (mode === "add" || mode === "edit") && /* @__PURE__ */ jsxs("box", {
+				style: {
+					flexShrink: 0,
+					flexDirection: "row",
+					paddingTop: 1
+				},
+				children: [/* @__PURE__ */ jsx$1("text", {
+					wrapMode: "none",
+					children: /* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.warn,
+						children: mode === "add" ? "+ " : "✎ "
+					})
+				}), /* @__PURE__ */ jsx$1("input", {
+					focused: true,
+					value: draft,
+					placeholder: mode === "add" ? "new todo…" : "edit todo…",
+					onInput: setDraft,
+					onSubmit: () => submitInput(),
+					style: { flexGrow: 1 }
+				})]
 			}),
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.mute,
-				children: ")"
-			})
-		] }) : /* @__PURE__ */ jsx$1("box", {
-			style: {
-				flexDirection: "column",
-				flexGrow: 1,
-				flexShrink: 1,
-				overflow: "hidden"
-			},
-			children: /* @__PURE__ */ jsx$1("scrollbox", {
-				ref: scrollRef,
-				focusable: false,
-				stickyScroll: false,
+			editable && mode === "confirm-clear" && /* @__PURE__ */ jsxs("box", {
 				style: {
-					flexGrow: 1,
-					flexShrink: 1
+					flexShrink: 0,
+					flexDirection: "column",
+					paddingTop: 1
 				},
-				children: display.map((item) => /* @__PURE__ */ jsx$1(TodoRow, {
-					item,
-					rowId: `todo-row-${item.id}`
-				}, item.id))
+				children: [/* @__PURE__ */ jsx$1("text", {
+					wrapMode: "none",
+					children: /* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.error,
+						children: `delete all ${total} todo${total === 1 ? "" : "s"}?`
+					})
+				}), /* @__PURE__ */ jsx$1(ModalHints, { hints: [{
+					key: "y",
+					label: "yes",
+					keyColor: COLOR.error
+				}, {
+					key: "n",
+					label: "cancel"
+				}] })]
+			}),
+			editable && mode === "list" && /* @__PURE__ */ jsx$1("box", {
+				style: {
+					flexShrink: 0,
+					flexDirection: "column",
+					paddingTop: 1
+				},
+				children: /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+					{
+						key: "a",
+						label: "add"
+					},
+					total > 0 && {
+						key: "e",
+						label: "edit"
+					},
+					total > 0 && {
+						key: "space",
+						label: "status"
+					},
+					total > 0 && {
+						key: "d",
+						label: "remove"
+					},
+					total > 0 && onSteer !== void 0 && {
+						key: "r",
+						label: "retry"
+					},
+					total > 0 && {
+						key: "ctrl+d",
+						label: "delete all",
+						keyColor: COLOR.error
+					}
+				] })
 			})
-		})
+		]
 	});
 }
 /**
@@ -19560,10 +20179,19 @@ function AppShell() {
 	useEffect(() => {
 		persistToolResultsRef.current = settings.persistToolResults;
 	}, [settings.persistToolResults]);
-	const allowInteractionRef = useRef(settings.allowInteraction);
+	const interactionModeRef = useRef(settings.interactionMode);
 	useEffect(() => {
-		allowInteractionRef.current = settings.allowInteraction;
-	}, [settings.allowInteraction]);
+		interactionModeRef.current = settings.interactionMode;
+	}, [settings.interactionMode]);
+	useEffect(() => {
+		if (settings.interactionMode !== "skip" || !pendingInteraction) return;
+		if (!isModelInteraction(pendingInteraction)) return;
+		interactions.resolveHead(createAutomaticInteractionResponse(pendingInteraction));
+	}, [
+		interactions,
+		pendingInteraction,
+		settings.interactionMode
+	]);
 	const userInstructionsScopeRef = useRef(settings.userInstructionsScope);
 	useEffect(() => {
 		userInstructionsScopeRef.current = settings.userInstructionsScope;
@@ -20470,7 +21098,7 @@ function AppShell() {
 		const profile = pickedAgentRef.current;
 		if (profile.id !== "build" && profile.id !== "plan") return;
 		return agent.hooks.hook("system:transform", (ctx) => {
-			const allowInteraction = allowInteractionRef.current !== false;
+			const allowInteraction = interactionModeRef.current !== "disabled";
 			const envOpts = {
 				cwd,
 				...projectDir !== cwd ? { projectRoot: projectDir } : {},
@@ -20814,8 +21442,11 @@ function AppShell() {
 			enabled: enabledMcpsRef.current,
 			...disabledMcpToolsRef.current ? { disabledTools: disabledMcpToolsRef.current } : {}
 		}), ...pluginContributions.mcpServers];
-		const allowInteraction = allowInteractionRef.current !== false;
-		const interactionTools = allowInteraction ? createInteractionTools({ requestInteraction: makeRequestInteraction(interactions) }) : {};
+		const allowInteraction = interactionModeRef.current !== "disabled";
+		const interactionTools = allowInteraction ? createInteractionTools({
+			requestInteraction: makeRequestInteraction(interactions),
+			shouldSkipInteractions: () => interactionModeRef.current === "skip"
+		}) : {};
 		const actualCwd = cwdRef.current;
 		const { agentsMd, systemFile, system: builtInSystem } = composeHostContext(profile, allowInteraction);
 		sessionInstructionFilesRef.current = agentsMd.files;
@@ -21716,6 +22347,35 @@ function AppShell() {
 		interactions
 	]);
 	/**
+	* Persist the matched `tool_result` turn for a resolved batch WITHOUT
+	* running. Automatic mode uses this on activation so opening an old
+	* session repairs its history (every `tool_use` matched) instead of
+	* silently starting a billed run nobody asked for; the next prompt
+	* continues normally.
+	*/
+	const persistResumedInteractions = useCallback(async (requests, responses) => {
+		const session = sessionRef.current;
+		if (!session) {
+			debugLog("resume-interaction: missing session", { count: requests.length });
+			return false;
+		}
+		const turnId = await session.generateTurnId();
+		const runId = requests[0]?.runId;
+		let turn;
+		try {
+			turn = buildResumedToolResultsTurn(requests, responses, {
+				turnId,
+				runId
+			});
+		} catch (err) {
+			debugLog("resume-interaction: turn build failed", err);
+			return false;
+		}
+		await session.appendTurns([turn]);
+		if (sessionRef.current === session) setEvents(capTranscriptEvents(eventsFromTurns(session.turns, session.runs)));
+		return true;
+	}, []);
+	/**
 	* Continue a session from where pending interactions left it. Appends
 	* a single user turn containing one `tool_result` per pending request
 	* (in pending order) and triggers a prompt-less `agent.run()` so the
@@ -21830,7 +22490,12 @@ function AppShell() {
 		const pending = pendingInteractionsFromTurns(session.turns);
 		if (pending.length > 0) {
 			const collected = /* @__PURE__ */ new Map();
+			const automatic = interactionModeRef.current === "skip";
 			for (const request of pending) {
+				if (automatic) {
+					collected.set(request.id, createAutomaticInteractionResponse(request));
+					continue;
+				}
 				const entry = {
 					request,
 					resolve: (response) => {
@@ -21841,6 +22506,7 @@ function AppShell() {
 				};
 				interactions.enqueue(entry);
 			}
+			if (automatic) persistResumedInteractions(pending, collected).catch((err) => debugLog("resume-interaction: automatic persist failed", err));
 		}
 	}, [
 		teardown,
@@ -21850,6 +22516,7 @@ function AppShell() {
 		projectDir,
 		interactions,
 		continueResumedInteractions,
+		persistResumedInteractions,
 		extensionRegistry
 	]);
 	/** Ref mirror — same rationale as `refreshSessionsRef` above. */
@@ -22890,7 +23557,8 @@ function AppShell() {
 			interaction: {
 				confirm: async (prompt, confirmOpts) => {
 					const response = await requestCommandInteraction({
-						id: `command_${crypto.randomUUID()}`,
+						id: `${HOST_INTERACTION_ID_PREFIX}${crypto.randomUUID()}`,
+						origin: "host",
 						kind: "question",
 						tool: ASK_USER_TOOL,
 						createdAt: Date.now(),
@@ -22910,7 +23578,8 @@ function AppShell() {
 				},
 				askUser: async (form) => {
 					const response = await requestCommandInteraction({
-						id: `command_${crypto.randomUUID()}`,
+						id: `${HOST_INTERACTION_ID_PREFIX}${crypto.randomUUID()}`,
+						origin: "host",
 						kind: "question",
 						tool: ASK_USER_TOOL,
 						createdAt: Date.now(),
@@ -22921,7 +23590,8 @@ function AppShell() {
 				},
 				presentPlan: async (plan) => {
 					const response = await requestCommandInteraction({
-						id: `command_${crypto.randomUUID()}`,
+						id: `${HOST_INTERACTION_ID_PREFIX}${crypto.randomUUID()}`,
+						origin: "host",
 						kind: "plan",
 						tool: PRESENT_PLAN_TOOL,
 						createdAt: Date.now(),
@@ -23485,6 +24155,50 @@ function AppShell() {
 		if (staleWarnLog) await staleWarnLog.close().catch((err) => debugLog("rebuildActiveAgent: warnLog.close failed", err));
 	}, []);
 	rebuildActiveAgentRef.current = rebuildActiveAgent;
+	/**
+	* Promote one of a provider's stored credentials — Settings → Authentication
+	* → `↵` on a source row, for a provider holding both an API key and an OAuth
+	* grant.
+	*
+	* The preference IS the storage layout (the canonical file key holds the
+	* winner), so persisting it is the entire change — there is no separate
+	* precedence setting to keep in sync. `applyApiKeyEnv` then re-reconciles
+	* `process.env`, which is the step that actually makes it take effect: a
+	* promoted API key has to be injected, and a promoted OAuth grant has to
+	* CLEAR the ambient var so the refresh path runs instead of a stale token.
+	*
+	* Returns freshly-detected providers instead of closing the modal. The
+	* settings modal's provider list is frozen at open time, so an earlier
+	* version closed the modal to avoid showing a stale active marker — which
+	* made a SUCCESSFUL swap look like the key did nothing, since the panel
+	* vanished at the moment of success. Handing detection back lets the modal
+	* re-render the marker in place and stay put.
+	*
+	* Gated like `onConfigureProvider` so a mid-run credential swap can't race
+	* the agent.
+	*/
+	const onSetPreferredCredential = useMemo(() => {
+		if (busy || pendingApproval) return void 0;
+		return (provider, source) => {
+			const descriptor = providerRegistry[provider.key];
+			if (!descriptor) return void 0;
+			setPreferredCredential(config.paths.userDir, descriptor, source);
+			applyApiKeyEnv(config.paths.userDir, providerRegistry, { log: (message) => getTuiLogging()?.sink.emit({
+				level: "debug",
+				timestamp: Date.now(),
+				message: message.trimEnd(),
+				attrs: { scope: "chat" }
+			}) });
+			if (provider.key === pickedRef.current?.provider.key) rebuildActiveAgent().catch((err) => debugLog("onSetPreferredCredential: rebuild failed", err));
+			return detectAuth(config.paths.userDir, providerRegistry);
+		};
+	}, [
+		busy,
+		pendingApproval,
+		config.paths.userDir,
+		providerRegistry,
+		rebuildActiveAgent
+	]);
 	useEffect(() => {
 		const prev = mcpRuntimeKeyRef.current;
 		if (prev === null) {
@@ -23651,7 +24365,7 @@ function AppShell() {
 		})();
 	}, [modal, config.paths.userDir]);
 	const onReadContextSegments = useCallback(async () => {
-		const { shadowedSystemFiles, supportsOverride } = composeHostContext(pickedAgentRef.current, allowInteractionRef.current !== false);
+		const { shadowedSystemFiles, supportsOverride } = composeHostContext(pickedAgentRef.current, interactionModeRef.current !== "disabled");
 		const shadowedSystemPath = shadowedSystemFiles[0]?.path;
 		const scopeLoadsUserOverride = userScopeOverridesLoad(userInstructionsScopeRef.current);
 		const canOverrideSystem = supportsOverride && scopeLoadsUserOverride;
@@ -23668,7 +24382,7 @@ function AppShell() {
 			...overrideBlockedBy ? { overrideBlockedBy } : {},
 			...shadowedSystemPath ? { shadowedSystemPath } : {}
 		};
-		const { agentsMd, systemFile, system } = composeHostContext(pickedAgentRef.current, allowInteractionRef.current !== false);
+		const { agentsMd, systemFile, system } = composeHostContext(pickedAgentRef.current, interactionModeRef.current !== "disabled");
 		const enabled = enabledSkillsRef.current;
 		const sessionSkills = enabled === void 0 ? [...skillsCatalogRef.current] : skillsCatalogRef.current.filter((s) => enabled.includes(s.name));
 		return {
@@ -23705,7 +24419,7 @@ function AppShell() {
 	const onCreateSystemPrompt = useCallback(async () => {
 		const path = userSystemMdPath({ prefix: config.prefix });
 		if (!existsSync(path)) {
-			const { doctrineOnlySystem, supportsOverride } = composeHostContext(pickedAgentRef.current, allowInteractionRef.current !== false);
+			const { doctrineOnlySystem, supportsOverride } = composeHostContext(pickedAgentRef.current, interactionModeRef.current !== "disabled");
 			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;
@@ -24425,6 +25139,7 @@ function AppShell() {
 				},
 				actions: {
 					onConfigureProvider,
+					onSetPreferredCredential,
 					onOpenKeybindings: onOpenKeybindingsFile,
 					getContextSegments: onReadContextSegments,
 					onOpenInstructionsFile,
@@ -24507,7 +25222,8 @@ function AppShell() {
 		if (matchesBinding(key, keybindings.openTodos) && screen === "chat" && currentSession) {
 			modal.open(/* @__PURE__ */ jsx$1(TodosModal, {
 				session: sessionRef.current,
-				agent: agentRef.current
+				agent: agentRef.current,
+				onSteer: (message) => onSubmitPrompt(message, [], [])
 			}));
 			return;
 		}
@@ -24695,6 +25411,7 @@ function AppShell() {
 		COLOR.warn,
 		COLOR.dim
 	]);
+	const todoProgress = todoProgressLabel(useActiveTodos(sessionRef.current));
 	const hints = useMemo(() => {
 		const base = buildHints({
 			screen,
@@ -24720,6 +25437,7 @@ function AppShell() {
 			inFlightToolCount: inFlightTools.reduce((n, entry) => entry.childId === void 0 ? n + 1 : n, 0) + backgroundTasks.reduce((n, entry) => entry.childId === void 0 ? n + 1 : n, 0),
 			activeSkillCount: activeSkillNames.size,
 			skillsChipColor: COLOR.brand,
+			todoProgress: settings.showTodoIndicator ? todoProgress : null,
 			updateHint,
 			cacheBreakHint,
 			sessionsScopeAll: sessionsShowAll
@@ -24741,6 +25459,8 @@ function AppShell() {
 		currentSession,
 		hasMultipleAgents,
 		settings.uiMode,
+		settings.showTodoIndicator,
+		todoProgress,
 		picked,
 		pickedAgent,
 		COLOR,
@@ -24762,7 +25482,8 @@ function AppShell() {
 			start: r.start,
 			end: r.end,
 			providerId: r.providerId
-		}))
+		})),
+		attachments: m.attachments.length
 	})), [messageQueue]);
 	const queueShortcuts = useMemo(() => ({
 		enter: keybindings.enterQueueSelection,
@@ -24853,7 +25574,6 @@ function AppShell() {
 						settings,
 						onSubmit: onSubmitPrompt,
 						session: currentSession,
-						liveSession: sessionRef.current,
 						pending: pendingApproval,
 						onApproval: resolveHead,
 						pendingInteraction,