zidane 5.6.0 → 5.6.2

package/dist/tui.js

@@ -1,30 +1,37 @@
-import { $n as blendHsl, $t as lastContextSizeFromTurns, A as getSafelist, An as summarizeOutcomes, Ar as getContextWindow, B as oauthUsesManualCodePaste, Bt as DiscoveryProvider, Cn as buildEditOutcomesAnnotation, Ct as useEnabledToggleSet, D as useSafeModeQueue, Dn as resolveApprovalForPayload, Dt as SettingsProvider, E as useSafeModeActions, En as parseEditOutcomesFromResult, Et as SETTINGS_TOGGLES, F as suggestSafelistEntry, Fn as ensureKeybindingsFile, G as indexOfEntry, Gt as resolveConfig, H as supportsOAuth, Ht as useDiscoveryOptional, Ir as piIdOf, J as discoverProjectMcps, Jt as deriveSessionTitle, K as buildMcpServers, Kn as createFilesCompletionProvider, Kt as EDIT_TOOL_NAMES, L as splitPromptSegments, Ln as matchesBinding, Mr as modelSupportsReasoning, Mt as resolveChipColor, Nt as resolveTheme, On as rewriteMultiEditHeader, Ot as clampFps, Qn as useCompletion, Qt as isVisible, R as formatPathForCwd, Sr as setProviderCredential, St as listProjectFiles, T as SafeModeProvider, Tn as mergeApprovalAndBodyOutcomes, Tt as SETTINGS_CHOICES, U as buildModelCatalog, Un as createSkillsCompletionProvider, Ur as accentColor, Ut as ConfigProvider, V as runOAuthLogin, Vt as useDiscovery, W as filterModelCatalog, Wn as uniqueSkillNamesFromReferences, Wt as useConfig, Xt as isEditErrorResult, Yr as TODO_STATUS_GLYPHS, Yt as eventsFromTurns, Z as createFileMcpCredentialStore, Zt as isTurnHighlighted, _ as turnContextSize, _i as buildPlanSystem, _n as extractEditPayload, _t as clipHintsToWidth, a as computeTurnAnchors, ai as useActiveTodos, an as stripSpawnTokensLine, ar as useUpdateCheck, at as splitMarkdownCodeBlocks, b as defaultSkillScanPaths, c as formatToolCall, cn as toolCallPreview, d as useSelectStyle, dn as updateToolEventOutcomes, en as listSessionMeta, er as buildLinearRamp, et as McpAuthProvider, f as useSurfaces, ft as makeRequestInteraction, g as finalizeStreamingMarkdownForOwner, gi as buildBuildSystem, gr as detectAuth, gt as useInteractionsQueue, h as finalizeStreamingMarkdown, hr as shouldAutoCompact, ht as useInteractionsActions, i as turnAsText, in as selectableTurnIds, ir as buildUpdateHint, j as isOnSafelist, jn as findGitRoot, k as addToSafelist, kn as stripEditOutcomesAnnotation, kt as useSettings, l as ThemeProvider, ln as toolResultText, lt as buildResumedToolResultsTurn, m as useTheme, mn as buildUnifiedDiff, mr as AUTO_COMPACT_MIN_GROWTH_FRACTION, n as deleteTurnSafely, nn as marginTopFor, nt as useMcpAuthState, o as TOOL_DISPLAY, on as sumRunCosts, pn as buildContextualDiff, pt as pendingInteractionsFromTurns, r as truncateTurnsAt, rr as bootTick, rt as getMcpAuthStatus, s as displayNameFor, st as InteractionsProvider, tr as tryOpenBrowser, tt as useMcpAuthDispatch, u as useColors, un as turnSelectionOwnership, ut as createInteractionTools, v as useStreamBuffer, vn as filetypeFromPath, vt as hintsLength, w as writeSessionExport, wt as DEFAULT_SETTINGS, x as discoverProjectSkills, xn as summarizeEditPayload, xt as generateSessionTitle, y as buildSkillsConfig, yn as previewEditPayload, yt as truncateTrailing, z as fetchOAuthRedirect, zt as createDiscoverySlot } from "./turn-operations-fhinWY4m.js";
-import { A as resolvePersistDir, B as formatTaskStatus, H as previewLine, I as ageString, L as compactPath, O as cleanupPersistedSession, R as fmtTokens, U as shortId, V as formatTaskSummary, j as resolveTasksDir, p as createAgent, z as formatDuration } from "./tools-Co3VYhgM.js";
+import { $r as TODO_STATUS_GLYPHS, $t as isEditErrorResult, A as getSafelist, An as resolveApprovalForPayload, At as SettingsProvider, B as oauthUsesManualCodePaste, Bn as keybindingsPath, Br as piIdOf, Ct as buildHints, D as useSafeModeQueue, Dt as DEFAULT_SETTINGS, E as useSafeModeActions, En as buildEditOutcomesAnnotation, Er as setProviderCredential, Et as useEnabledToggleSet, F as suggestSafelistEntry, Ft as resolveChipColor, G as indexOfEntry, Gt as useDiscoveryOptional, H as supportsOAuth, Ht as createDiscoverySlot, In as KEYBINDING_DEFS, Ir as modelSupportsReasoning, It as resolveTheme, J as discoverProjectMcps, Jn as uniqueSkillNamesFromReferences, Jt as resolveConfig, K as buildMcpServers, Kt as ConfigProvider, L as splitPromptSegments, Mn as stripEditOutcomesAnnotation, Mt as useSettings, Nn as summarizeOutcomes, On as mergeApprovalAndBodyOutcomes, Ot as SETTINGS_CHOICES, Pn as findGitRoot, Pr as getContextWindow, Qt as eventsFromTurns, R as formatPathForCwd, Rn as ensureKeybindingsFile, Si as envSection, Sn as previewEditPayload, St as generateSessionTitle, T as SafeModeProvider, Tt as listProjectFiles, U as buildModelCatalog, Ut as DiscoveryProvider, V as runOAuthLogin, Vn as matchesBinding, W as filterModelCatalog, Wt as useDiscovery, Xn as createFilesCompletionProvider, Yt as EDIT_TOOL_NAMES, Z as createFileMcpCredentialStore, Zt as deriveSessionTitle, _ as turnContextSize, _n as buildUnifiedDiff, _t as EMPTY_HINTS, a as computeTurnAnchors, an as marginTopFor, ar as tryOpenBrowser, at as splitMarkdownCodeBlocks, b as defaultSkillScanPaths, bi as buildBuildSystem, bn as extractEditPayload, br as detectAuth, bt as truncateTrailing, c as formatToolCall, cn as stripSpawnTokensLine, cr as buildUpdateHint, d as useSelectStyle, dn as toolCallPreview, en as isTurnHighlighted, et as McpAuthProvider, f as useSurfaces, fn as toolResultText, ft as makeRequestInteraction, g as finalizeStreamingMarkdownForOwner, gn as buildContextualDiff, gt as useInteractionsQueue, h as finalizeStreamingMarkdown, ht as useInteractionsActions, i as turnAsText, ir as buildLinearRamp, j as isOnSafelist, jn as rewriteMultiEditHeader, jt as clampFps, k as addToSafelist, kn as parseEditOutcomesFromResult, kt as SETTINGS_TOGGLES, l as ThemeProvider, li as useActiveTodos, ln as sumRunCosts, lr as useUpdateCheck, lt as buildResumedToolResultsTurn, m as useTheme, mn as updateToolEventOutcomes, n as deleteTurnSafely, nn as lastContextSizeFromTurns, nr as useCompletion, nt as useMcpAuthState, o as TOOL_DISPLAY, pn as turnSelectionOwnership, pt as pendingInteractionsFromTurns, qn as createSkillsCompletionProvider, qr as accentColor, qt as useConfig, r as truncateTurnsAt, rn as listSessionMeta, rr as blendHsl, rt as getMcpAuthStatus, s as displayNameFor, sn as selectableTurnIds, sr as bootTick, st as InteractionsProvider, tn as isVisible, tt as useMcpAuthDispatch, u as useColors, ut as createInteractionTools, v as useStreamBuffer, vr as AUTO_COMPACT_MIN_GROWTH_FRACTION, vt as clipHintsToWidth, w as writeSessionExport, wn as summarizeEditPayload, x as discoverProjectSkills, xi as buildPlanSystem, xn as filetypeFromPath, y as buildSkillsConfig, yr as shouldAutoCompact, yt as hintsLength, z as fetchOAuthRedirect, zn as formatBindingForDisplay } from "./turn-operations-B8ySajUl.js";
+import { A as resolvePersistDir, B as formatTaskStatus, H as previewLine, I as ageString, L as compactPath, O as cleanupPersistedSession, R as fmtTokens, U as shortId, V as formatTaskSummary, j as resolveTasksDir, p as createAgent, z as formatDuration } from "./tools-CslsHpKb.js";
+import { n as createProcessContext } from "./contexts-BOtMvzli.js";
 import { c as errorMessage } from "./errors-DdZXnyXE.js";
 import { s as McpOAuthProvider, t as connectMcpServers } from "./mcp-ngMS0S6N.js";
-import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-D5lQWoFx.js";
+import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-BOj03nVe.js";
 import { n as formatTokenUsage } from "./stats-Lc3zL3RM.js";
 import { n as loadSession, t as createSession } from "./session-BoEW_wCR.js";
 import { createTuiStore } from "./session/sqlite.js";
+import { basename, join, relative } from "node:path";
 import { homedir } from "node:os";
 import { spawn } from "node:child_process";
 import * as fs from "node:fs";
+import { readFileSync, readdirSync, statSync } from "node:fs";
 import { Buffer } from "node:buffer";
 import { createContext, createElement, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { BoxRenderable, CodeRenderable, RGBA, SyntaxStyle, TextRenderable, addDefaultParsers, createCliRenderer, decodePasteBytes, defaultTextareaKeyBindings, getTreeSitterClient, stripAnsiSequences } from "@opentui/core";
 import { createRoot, useKeyboard, useRenderer, useSelectionHandler, useTerminalDimensions } from "@opentui/react";
 import { Fragment, jsx, jsxs } from "@opentui/react/jsx-runtime";
+import { Fzf, byLengthAsc } from "fzf";
 //#region src/tui/modal.tsx
 const ModalContext = createContext(null);
 function ModalRoot({ children }) {
 	const [active, setActive] = useState(null);
+	const [lockCount, setLockCount] = useState(0);
 	const api = useMemo(() => ({
 		open: (node) => setActive(node),
 		close: () => setActive(null),
+		lock: () => setLockCount((c) => c + 1),
+		unlock: () => setLockCount((c) => Math.max(0, c - 1)),
 		get isOpen() {
-			return active !== null;
+			return active !== null || lockCount > 0;
 		}
-	}), [active]);
+	}), [active, lockCount]);
 	return /* @__PURE__ */ jsxs(ModalContext.Provider, {
 		value: api,
 		children: [/* @__PURE__ */ jsx("box", {
@@ -1341,7 +1348,8 @@ function EventLineImpl({ event, depthOffset = 0, hideChildLabel = false, selecte
 		case "separator": return /* @__PURE__ */ jsx("text", { children: " " });
 		case "user-prompt": return /* @__PURE__ */ jsx(UserPromptBlock, {
 			text: safeText,
-			refs: event.refs
+			refs: event.refs,
+			attachments: event.attachments
 		});
 		case "info": return /* @__PURE__ */ jsx("box", {
 			style: row,
@@ -1608,7 +1616,7 @@ function CompactSummaryBlock({ event, indent }) {
 */
 /** Prompt chevron rendered ahead of every user-prompt block. */
 const USER_PROMPT_PREFIX = "❯ ";
-function UserPromptBlock({ text, refs }) {
+function UserPromptBlock({ text, refs, attachments }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	const boxStyle = {
@@ -1617,17 +1625,54 @@ function UserPromptBlock({ text, refs }) {
 		paddingLeft: 1,
 		paddingRight: 1
 	};
-	if (!refs || refs.length === 0) return /* @__PURE__ */ jsx("box", {
+	const attachmentChips = attachments && attachments.length > 0 ? /* @__PURE__ */ jsx("box", {
+		style: {
+			flexDirection: "row",
+			flexWrap: "wrap",
+			paddingTop: text.length > 0 ? 0 : 0
+		},
+		children: attachments.map((att, idx) => {
+			const sz = att.size;
+			const label = sz < 1024 ? `${sz}B` : sz < 1024 * 1024 ? `${(sz / 1024).toFixed(1)}KB` : `${(sz / (1024 * 1024)).toFixed(1)}MB`;
+			const icon = att.mediaType.startsWith("image/") ? "🖼" : "📎";
+			const chipColor = resolveChipColor(SURFACE.chips, "file");
+			return /* @__PURE__ */ jsxs("text", { children: [
+				idx > 0 ? " " : "",
+				icon,
+				/* @__PURE__ */ jsxs("span", {
+					fg: chipColor.fg,
+					bg: chipColor.bg,
+					children: [
+						" ",
+						att.name,
+						" ",
+						"(",
+						label,
+						")",
+						" "
+					]
+				})
+			] }, `att-${idx}`);
+		})
+	}) : null;
+	if (!refs || refs.length === 0) return /* @__PURE__ */ jsxs("box", {
 		style: boxStyle,
-		children: /* @__PURE__ */ jsxs("text", { children: [/* @__PURE__ */ jsx("span", {
-			fg: COLOR.brand,
-			children: USER_PROMPT_PREFIX
-		}), text] })
+		children: [
+			text.length > 0 && /* @__PURE__ */ jsxs("text", { children: [/* @__PURE__ */ jsx("span", {
+				fg: COLOR.brand,
+				children: USER_PROMPT_PREFIX
+			}), text] }),
+			!text.length && attachmentChips && /* @__PURE__ */ jsx("text", {
+				fg: COLOR.brand,
+				children: USER_PROMPT_PREFIX
+			}),
+			attachmentChips
+		]
 	});
 	const segments = splitPromptSegments(text, refs);
-	return /* @__PURE__ */ jsx("box", {
+	return /* @__PURE__ */ jsxs("box", {
 		style: boxStyle,
-		children: /* @__PURE__ */ jsxs("box", {
+		children: [/* @__PURE__ */ jsxs("box", {
 			style: {
 				flexDirection: "row",
 				flexWrap: "wrap"
@@ -1644,7 +1689,7 @@ function UserPromptBlock({ text, refs }) {
 					children: seg.text
 				}, i);
 			})]
-		})
+		}), attachmentChips]
 	});
 }
 /** Click-feedback delay before `[copied]` reverts to `[copy]`, in ms. */
@@ -2444,6 +2489,316 @@ function TodoInProgressList({ input, dim }) {
 	});
 }
 //#endregion
+//#region src/tui/cwd-picker.tsx
+const VISIBLE_ROWS$1 = 12;
+const HOME = homedir();
+const MAX_ENTRIES = 5e4;
+const MAX_DEPTH = 5;
+const SKIP_DIRS = new Set([
+	"node_modules",
+	".git",
+	".hg",
+	".svn",
+	"__pycache__",
+	".cache",
+	".npm",
+	".yarn",
+	"dist",
+	"build",
+	".next",
+	".nuxt",
+	"coverage",
+	".venv",
+	"venv",
+	".tox",
+	"vendor",
+	"target",
+	".gradle",
+	".idea",
+	".vscode"
+]);
+function walkDirs(base) {
+	const results = [];
+	const queue = [{
+		dir: base,
+		depth: 0
+	}];
+	while (queue.length > 0 && results.length < MAX_ENTRIES) {
+		const { dir, depth } = queue.shift();
+		let entries;
+		try {
+			entries = readdirSync(dir, { withFileTypes: true });
+		} catch {
+			continue;
+		}
+		for (const e of entries) {
+			if (results.length >= MAX_ENTRIES) break;
+			if (e.name.startsWith(".") || SKIP_DIRS.has(e.name)) continue;
+			try {
+				const full = join(dir, e.name);
+				if (e.isDirectory() || e.isSymbolicLink() && statSync(full).isDirectory()) {
+					results.push({
+						rel: relative(base, full),
+						path: full
+					});
+					if (depth + 1 < MAX_DEPTH) queue.push({
+						dir: full,
+						depth: depth + 1
+					});
+				}
+			} catch {}
+		}
+	}
+	return results;
+}
+function compactHome(p) {
+	return p === HOME ? "~" : p.startsWith(`${HOME}/`) ? `~${p.slice(HOME.length)}` : p;
+}
+function highlightName(name, positions, hlColor, dimColor) {
+	const spans = [];
+	let run = "";
+	let runHL = false;
+	for (let i = 0; i < name.length; i++) {
+		const hl = positions.has(i);
+		if (hl !== runHL && run) {
+			spans.push({
+				text: run,
+				color: runHL ? hlColor : dimColor
+			});
+			run = "";
+		}
+		run += name[i];
+		runHL = hl;
+	}
+	if (run) spans.push({
+		text: run,
+		color: runHL ? hlColor : dimColor
+	});
+	return spans;
+}
+function CwdPickerModal({ currentCwd, onPick }) {
+	const COLOR = useColors();
+	const SURFACE = useSurfaces();
+	const inputRef = useRef(null);
+	const [query, setQuery] = useState("");
+	const [browsePath, setBrowsePath] = useState(HOME);
+	const [selectedIdx, setSelectedIdx] = useState(0);
+	useEffect(() => {
+		inputRef.current?.focus();
+	}, []);
+	const dirs = useMemo(() => walkDirs(browsePath), [browsePath]);
+	const fzf = useMemo(() => new Fzf(dirs, {
+		selector: (d) => d.rel,
+		tiebreakers: [byLengthAsc],
+		limit: 200
+	}), [dirs]);
+	const results = useMemo(() => {
+		if (!query) return dirs.slice(0, 200).map((item) => ({
+			item,
+			start: 0,
+			end: 0,
+			score: 0,
+			positions: /* @__PURE__ */ new Set()
+		}));
+		return fzf.find(query);
+	}, [
+		fzf,
+		dirs,
+		query
+	]);
+	const safeIndex = results.length === 0 ? 0 : Math.min(selectedIdx, results.length - 1);
+	const handleQueryChange = useCallback((next) => {
+		setQuery(next);
+		setSelectedIdx(0);
+	}, []);
+	const commit = () => {
+		const row = results[safeIndex];
+		if (row) onPick(row.item.path);
+	};
+	const drillDown = () => {
+		const row = results[safeIndex];
+		if (row) {
+			setBrowsePath(row.item.path);
+			setQuery("");
+			setSelectedIdx(0);
+		}
+	};
+	const goUp = () => {
+		const parent = join(browsePath, "..");
+		if (parent !== browsePath) {
+			setBrowsePath(parent);
+			setQuery("");
+			setSelectedIdx(0);
+		}
+	};
+	const viewport = useMemo(() => {
+		if (results.length <= VISIBLE_ROWS$1) return {
+			start: 0,
+			slice: results
+		};
+		const half = Math.floor(VISIBLE_ROWS$1 / 2);
+		let start = Math.max(0, safeIndex - half);
+		if (start + VISIBLE_ROWS$1 > results.length) start = results.length - VISIBLE_ROWS$1;
+		return {
+			start,
+			slice: results.slice(start, start + VISIBLE_ROWS$1)
+		};
+	}, [results, safeIndex]);
+	useKeyboard((key) => {
+		if (key.name === "up") {
+			setSelectedIdx((i) => results.length === 0 ? i : ((i - 1) % results.length + results.length) % results.length);
+			return;
+		}
+		if (key.name === "down") {
+			setSelectedIdx((i) => results.length === 0 ? i : (i + 1) % results.length);
+			return;
+		}
+		if (key.name === "tab") {
+			drillDown();
+			return;
+		}
+		if (key.name === "left" && !query) {
+			goUp();
+			return;
+		}
+		if (key.name === "right" && !query) {
+			drillDown();
+			return;
+		}
+		if (key.name === "return") commit();
+	});
+	return /* @__PURE__ */ jsxs(Modal, {
+		title: "change directory",
+		maxWidth: 80,
+		children: [
+			/* @__PURE__ */ jsxs("text", {
+				fg: COLOR.dim,
+				children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: "browsing "
+					}),
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.brand,
+						children: compactHome(browsePath)
+					}),
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: ` · ${dirs.length} dirs`
+					})
+				]
+			}),
+			/* @__PURE__ */ jsx("box", {
+				style: {
+					border: true,
+					borderColor: COLOR.borderActive,
+					paddingLeft: 1,
+					paddingRight: 1,
+					height: 3
+				},
+				children: /* @__PURE__ */ jsx("input", {
+					ref: inputRef,
+					focused: true,
+					placeholder: "fuzzy search directories…",
+					onInput: handleQueryChange,
+					onSubmit: () => {},
+					style: { flexGrow: 1 }
+				})
+			}),
+			/* @__PURE__ */ jsx("box", {
+				style: {
+					flexDirection: "column",
+					height: VISIBLE_ROWS$1,
+					flexShrink: 0
+				},
+				children: results.length === 0 ? /* @__PURE__ */ jsxs("text", {
+					fg: COLOR.dim,
+					children: [/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: "no directories match "
+					}), /* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: query.trim()
+					})]
+				}) : viewport.slice.map((result, i) => {
+					const focused = viewport.start + i === safeIndex;
+					const current = result.item.path === currentCwd;
+					const marker = current ? "●" : " ";
+					const nameColor = focused ? COLOR.brand : COLOR.dim;
+					const spans = query ? highlightName(result.item.rel, result.positions, COLOR.warn, nameColor) : [{
+						text: result.item.rel,
+						color: nameColor
+					}];
+					return /* @__PURE__ */ jsx("box", {
+						style: {
+							height: 1,
+							paddingLeft: 1,
+							paddingRight: 1,
+							flexShrink: 0,
+							backgroundColor: focused ? SURFACE.selection : void 0
+						},
+						children: /* @__PURE__ */ jsxs("text", {
+							wrapMode: "none",
+							children: [
+								/* @__PURE__ */ jsx("span", {
+									fg: current ? COLOR.brand : COLOR.mute,
+									children: marker
+								}),
+								/* @__PURE__ */ jsx("span", {
+									fg: COLOR.mute,
+									children: " "
+								}),
+								spans.map((s, si) => /* @__PURE__ */ jsx("span", {
+									fg: s.color,
+									children: s.text
+								}, si)),
+								/* @__PURE__ */ jsx("span", {
+									fg: COLOR.mute,
+									children: "/"
+								})
+							]
+						})
+					}, result.item.path);
+				})
+			}),
+			/* @__PURE__ */ jsxs("text", {
+				fg: COLOR.dim,
+				children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "↑↓"
+					}),
+					" navigate · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "tab"
+					}),
+					" enter dir · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "←"
+					}),
+					" parent · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "↵"
+					}),
+					" select · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "esc"
+					}),
+					" close · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: `${results.length} match${results.length === 1 ? "" : "es"}`
+					})
+				]
+			})
+		]
+	});
+}
+//#endregion
 //#region src/tui/discovery-shell.tsx
 /**
 * SWR throttles. `files` is short so a long-open `@` popover picks up
@@ -2786,6 +3141,220 @@ function EffortRow({ level, isCurrent, isFocused, highlightBg }) {
 	});
 }
 //#endregion
+//#region src/tui/keybindings-modal.tsx
+/**
+* Fixed column width for the rendered key — derived once from
+* {@link KEYBINDING_DEFS} so adding an action with a wider default spec
+* (`ctrl+shift+x`, etc.) automatically grows the column instead of
+* truncating the label. Falls back to a sensible minimum so empty /
+* one-glyph defaults don't collapse the layout.
+*/
+const KEY_COL_WIDTH = (() => {
+	let max = 8;
+	for (const def of KEYBINDING_DEFS) {
+		const width = formatBindingForDisplay(def.default).length;
+		if (width > max) max = width;
+	}
+	return max + 2;
+})();
+function KeybindingsModal({ bindings, filePath, onEditFile, onClose }) {
+	const COLOR = useColors();
+	const SURFACE = useSurfaces();
+	const { height: termHeight } = useTerminalDimensions();
+	const scrollRef = useRef(null);
+	const sections = useMemo(() => groupBindings(bindings), [bindings]);
+	useKeyboard((key) => {
+		if (key.name === "return") onEditFile();
+	});
+	const idealHeight = Math.floor((termHeight - 4) * .7);
+	const maxHeight = Math.max(18, Math.min(40, idealHeight));
+	const totalCount = KEYBINDING_DEFS.length;
+	return /* @__PURE__ */ jsxs(Modal, {
+		title: "keybindings",
+		bottomTitle: "↵ edit file · esc close",
+		rightTitle: /* @__PURE__ */ jsx(CountsBadge$1, { count: totalCount }),
+		maxWidth: 104,
+		minWidth: 64,
+		maxHeight,
+		onClose,
+		children: [/* @__PURE__ */ jsx("box", {
+			style: {
+				flexDirection: "column",
+				flexGrow: 1,
+				flexShrink: 1,
+				overflow: "hidden"
+			},
+			children: /* @__PURE__ */ jsx("scrollbox", {
+				ref: scrollRef,
+				focusable: false,
+				stickyScroll: false,
+				style: {
+					flexGrow: 1,
+					flexShrink: 1
+				},
+				children: sections.map((section, sectionIdx) => /* @__PURE__ */ jsxs("box", {
+					style: {
+						flexDirection: "column",
+						flexShrink: 0,
+						marginTop: sectionIdx === 0 ? 0 : 1
+					},
+					children: [/* @__PURE__ */ jsx(SectionHeader, { label: section.group }), section.rows.map((row) => /* @__PURE__ */ jsx(BindingRow, {
+						def: row.def,
+						spec: row.spec
+					}, row.def.action))]
+				}, section.group))
+			})
+		}), /* @__PURE__ */ jsx(EditFileButton, {
+			filePath,
+			highlightBg: SURFACE.selection,
+			brand: COLOR.brand,
+			mute: COLOR.mute,
+			dim: COLOR.dim
+		})]
+	});
+}
+function SectionHeader({ label }) {
+	return /* @__PURE__ */ jsx("box", {
+		style: {
+			flexShrink: 0,
+			paddingLeft: 1,
+			paddingRight: 1
+		},
+		children: /* @__PURE__ */ jsx("text", {
+			wrapMode: "none",
+			children: /* @__PURE__ */ jsx("span", {
+				fg: useColors().brand,
+				children: label
+			})
+		})
+	});
+}
+function BindingRow({ def, spec }) {
+	const COLOR = useColors();
+	const display = formatBindingForDisplay(spec);
+	const keyText = (display || "—").padEnd(KEY_COL_WIDTH, " ");
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "column",
+			flexShrink: 0,
+			paddingLeft: 3,
+			paddingRight: 1
+		},
+		children: [/* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
+			children: [/* @__PURE__ */ jsx("span", {
+				fg: display ? COLOR.warn : COLOR.mute,
+				children: keyText
+			}), /* @__PURE__ */ jsx("span", {
+				fg: COLOR.dim,
+				children: def.label
+			})]
+		}), /* @__PURE__ */ jsx("box", {
+			style: {
+				flexShrink: 0,
+				paddingLeft: KEY_COL_WIDTH
+			},
+			children: /* @__PURE__ */ jsx("text", {
+				wrapMode: "word",
+				fg: COLOR.mute,
+				children: def.description
+			})
+		})]
+	});
+}
+function EditFileButton({ filePath, highlightBg, brand, mute, dim }) {
+	const display = filePath ? compactPath(filePath) : "~/.zidane/keybindings.json";
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexShrink: 0,
+			flexDirection: "column",
+			paddingLeft: 1,
+			paddingRight: 1,
+			backgroundColor: highlightBg
+		},
+		children: [/* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
+			children: [
+				/* @__PURE__ */ jsx("span", {
+					fg: brand,
+					children: "▶ "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: brand,
+					children: "Edit keybindings file"
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: mute,
+					children: "  "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: brand,
+					children: "›"
+				})
+			]
+		}), /* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
+			children: [/* @__PURE__ */ jsx("span", {
+				fg: mute,
+				children: "  "
+			}), /* @__PURE__ */ jsx("span", {
+				fg: dim,
+				children: `${display} — restart to apply changes`
+			})]
+		})]
+	});
+}
+function CountsBadge$1({ count }) {
+	const COLOR = useColors();
+	return /* @__PURE__ */ jsxs("text", {
+		wrapMode: "none",
+		children: [
+			/* @__PURE__ */ jsx("span", {
+				fg: COLOR.mute,
+				children: " "
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: COLOR.accent,
+				children: String(count)
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: COLOR.mute,
+				children: ` action${count === 1 ? "" : "s"} `
+			})
+		]
+	});
+}
+/**
+* Walk `KEYBINDING_DEFS` in order and bucket rows into contiguous
+* sections by `group`. Preserves catalog order — if two actions in the
+* same group are split by an entry from another group, they'd render
+* as two separate sections with the same header (catalog order wins
+* over "merge same-group entries" so the on-screen story matches the
+* on-disk file).
+*/
+function groupBindings(bindings) {
+	const sections = [];
+	for (const def of KEYBINDING_DEFS) {
+		const last = sections[sections.length - 1];
+		const spec = bindings[def.action] ?? "";
+		if (last && last.group === def.group) {
+			last.rows.push({
+				def,
+				spec
+			});
+			continue;
+		}
+		sections.push({
+			group: def.group,
+			rows: [{
+				def,
+				spec
+			}]
+		});
+	}
+	return sections;
+}
+//#endregion
 //#region src/tui/model-picker.tsx
 /**
 * Cross-provider, searchable model picker.
@@ -5848,7 +6417,61 @@ function renderProjectLabel(rowProject, currentProject, COLOR) {
 /** Visible content lines: 1 minimum, 5 maximum (textarea scrolls past 5). */
 const MIN_CONTENT_LINES = 1;
 const MAX_CONTENT_LINES = 5;
-const CWD_DISPLAY = compactPath(process.cwd());
+const IMAGE_MEDIA_TYPES = {
+	png: "image/png",
+	jpg: "image/jpeg",
+	jpeg: "image/jpeg",
+	gif: "image/gif",
+	webp: "image/webp",
+	svg: "image/svg+xml",
+	bmp: "image/bmp"
+};
+const MIME_BY_EXT = {
+	txt: "text/plain",
+	md: "text/markdown",
+	json: "application/json",
+	yaml: "text/yaml",
+	yml: "text/yaml",
+	toml: "text/plain",
+	xml: "application/xml",
+	html: "text/html",
+	htm: "text/html",
+	css: "text/css",
+	csv: "text/csv",
+	tsv: "text/tab-separated-values",
+	js: "text/javascript",
+	mjs: "text/javascript",
+	cjs: "text/javascript",
+	ts: "text/typescript",
+	mts: "text/typescript",
+	cts: "text/typescript",
+	tsx: "text/typescript",
+	jsx: "text/javascript",
+	py: "text/x-python",
+	rb: "text/x-ruby",
+	rs: "text/x-rust",
+	go: "text/x-go",
+	java: "text/x-java",
+	c: "text/x-c",
+	h: "text/x-c",
+	cpp: "text/x-c++",
+	hpp: "text/x-c++",
+	sh: "text/x-shellscript",
+	bash: "text/x-shellscript",
+	zsh: "text/x-shellscript",
+	fish: "text/x-shellscript",
+	sql: "text/x-sql",
+	graphql: "text/x-graphql",
+	pdf: "application/pdf",
+	zip: "application/zip",
+	tar: "application/x-tar",
+	gz: "application/gzip",
+	log: "text/plain",
+	env: "text/plain",
+	cfg: "text/plain",
+	ini: "text/plain",
+	conf: "text/plain"
+};
 /**
 * Stable empty-array reference — keeps `queuedMessages` default referentially
 * stable across renders so memoized children don't bust their deps. Declared
@@ -5856,10 +6479,10 @@ const CWD_DISPLAY = compactPath(process.cwd());
 * default-value reference at the prop destructure.
 */
 const EMPTY_QUEUED_MESSAGES = [];
-function ChatScreen({ events, busy, compacting = false, queuedMessages = EMPTY_QUEUED_MESSAGES, queueSelectionIndex = null, queueShortcuts, onEnterQueueFromEmptyPrompt, settings, onSubmit, session, pending, onApproval, pendingInteraction, onInteraction, completionProviders, onPopupOpenChange, selectedTurnId, promptTriggerHints, 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, onPopupOpenChange, selectedTurnId, promptTriggerHints, liveSession = null }) {
 	const COLOR = useColors();
 	const titleText = session?.title ?? "untitled";
-	const showSessionShortcut = !!session && !busy && !pending && !pendingInteraction;
+	const showSessionShortcut = !!session && !busy && !pending && !pendingInteraction && settings.uiMode !== "minimal";
 	const userMessageCount = useMemo(() => events.filter((e) => e.kind === "user-prompt").length, [events]);
 	const { width: termWidth } = useTerminalDimensions();
 	const hasStatusIcon = busy || compacting;
@@ -5895,7 +6518,7 @@ function ChatScreen({ events, busy, compacting = false, queuedMessages = EMPTY_Q
 		const statsLen = segments.reduce((sum, s) => sum + s.text.length, 0);
 		const cwdBudget = Math.max(0, termWidth - 4 - titleText.length - iconReserve - OVERLAY_RESERVED - statsLen - 3);
 		if (cwdBudget >= 6) segments.unshift({
-			text: compactPath(CWD_DISPLAY, cwdBudget),
+			text: compactPath(cwd, cwdBudget),
 			color: COLOR.dim
 		}, {
 			text: " · ",
@@ -5903,6 +6526,7 @@ function ChatScreen({ events, busy, compacting = false, queuedMessages = EMPTY_Q
 		});
 		return segments;
 	}, [
+		cwd,
 		session,
 		userMessageCount,
 		COLOR,
@@ -5921,8 +6545,8 @@ function ChatScreen({ events, busy, compacting = false, queuedMessages = EMPTY_Q
 	const modal = useModal();
 	useEffect(() => {
 		if (!fileEditPending) return;
-		modal.open(/* @__PURE__ */ jsx(Fragment, {}));
-		return () => modal.close();
+		modal.lock();
+		return () => modal.unlock();
 	}, [fileEditPending, modal]);
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
@@ -6281,44 +6905,16 @@ function QueuedMessagesBlock({ messages, selectionIndex, shortcuts }) {
 function previewText(text) {
 	return text.replace(/\n+/g, " ↵ ");
 }
-const KEY_GLYPHS = {
-	up: "↑",
-	down: "↓",
-	left: "←",
-	right: "→",
-	return: "↵",
-	enter: "↵",
-	delete: "⌫",
-	backspace: "⌫",
-	escape: "esc",
-	space: "␣",
-	tab: "⇥"
-};
-/**
-* Render a binding spec (`"ctrl+return"`, `"backspace"`, `"delete"`) as a
-* compact display string the user recognizes at a glance. Substitutes
-* arrow / enter / backspace glyphs for their verbose names so the hint
-* row stays narrow; modifier names + plain keys pass through unchanged.
-*
-* Kept pure / local: every consumer in this file would otherwise embed
-* the same `replace` chain, and a future `keybindings.json` override
-* (e.g. `"backspace"` for drop) renders correctly without code edits.
-*/
-function formatBindingForDisplay(spec) {
-	const segments = spec.toLowerCase().split("+");
-	const key = segments.pop() ?? "";
-	const modifiers = segments.join("+");
-	const glyph = KEY_GLYPHS[key] ?? key;
-	return modifiers ? `${modifiers}+${glyph}` : glyph;
-}
 /** Stable empty providers reference — avoids `useCompletion` rerun on every render when no providers are wired. */
 const EMPTY_PROVIDERS = [];
 function PromptBlock({ userPrompts, onSubmit, completionProviders, onPopupOpenChange, selectMode = null, triggerHints, busy = false, onEnterQueueFromEmpty }) {
 	const focused = useModalAwareFocus();
 	const COLOR = useColors();
+	const SURFACE = useSurfaces();
 	const textareaRef = useRef(null);
 	/** Auto-grow: visible content rows the textarea currently occupies (clamped 1..5). */
 	const [contentLines, setContentLines] = useState(MIN_CONTENT_LINES);
+	const [attachments, setAttachments] = useState([]);
 	/**
 	* Mirror of the textarea buffer + cursor, updated on every `onContentChange`.
 	* Drives `useCompletion` — the textarea stays uncontrolled (we don't push
@@ -6358,8 +6954,8 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onPopupOpenCh
 	}, []);
 	const submit = useCallback(() => {
 		const value = textareaRef.current?.plainText ?? "";
-		if (!value.trim()) return;
-		onSubmit(value, completion.references);
+		if (!value.trim() && attachments.length === 0) return;
+		onSubmit(value, completion.references, attachments);
 		textareaRef.current?.clear();
 		historyRef.current = null;
 		setBufferState({
@@ -6367,7 +6963,12 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onPopupOpenCh
 			cursor: 0
 		});
 		setContentLines(MIN_CONTENT_LINES);
-	}, [onSubmit, completion.references]);
+		setAttachments([]);
+	}, [
+		onSubmit,
+		completion.references,
+		attachments
+	]);
 	const commitCompletion = useCallback(() => {
 		const result = completion.commit();
 		if (!result) return false;
@@ -6399,6 +7000,32 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onPopupOpenCh
 		if (!ta) return;
 		const normalized = stripAnsiSequences(decodePasteBytes(event.bytes)).replace(/\r\n?/g, "\n");
 		if (normalized.length === 0) return;
+		if (!normalized.includes("\n")) {
+			const trimmed = normalized.trim().replace(/^["']|["']$/g, "");
+			let resolved = trimmed.startsWith("file://") ? decodeURIComponent(trimmed.slice(7)) : trimmed;
+			if (resolved.startsWith("~/")) resolved = (process.env.HOME ?? "") + resolved.slice(1);
+			if (resolved.length > 0 && (resolved.startsWith("/") || resolved.startsWith("."))) try {
+				if (statSync(resolved).isFile()) {
+					const buf = readFileSync(resolved);
+					const ext = (resolved.split(".").pop() ?? "").toLowerCase();
+					const mediaType = IMAGE_MEDIA_TYPES[ext] ?? MIME_BY_EXT[ext] ?? "application/octet-stream";
+					setAttachments((prev) => [...prev, {
+						name: basename(resolved),
+						content: buf,
+						mediaType
+					}]);
+					return;
+				}
+			} catch {}
+		}
+		if (normalized.includes("\n")) {
+			setAttachments((prev) => [...prev, {
+				name: "paste.txt",
+				content: Buffer.from(normalized, "utf-8"),
+				mediaType: "text/plain"
+			}]);
+			return;
+		}
 		const parts = normalized.split("\n");
 		for (let i = 0; i < parts.length; i++) {
 			if (i > 0) ta.newLine();
@@ -6478,7 +7105,15 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onPopupOpenCh
 		const buffer = textareaRef.current;
 		if (!buffer) return;
 		if (event.name === "up") {
-			if (buffer.cursorOffset !== 0) return;
+			if (buffer.cursorOffset !== 0) {
+				const { row } = buffer.editorView.getCursor();
+				if (row === 0) {
+					event.preventDefault();
+					buffer.cursorOffset = 0;
+					syncBuffer();
+				}
+				return;
+			}
 			event.preventDefault();
 			if (buffer.plainText.length === 0 && onEnterQueueFromEmpty?.()) return;
 			cycleHistory(-1);
@@ -6492,7 +7127,8 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onPopupOpenCh
 		completion,
 		commitCompletion,
 		cycleHistory,
-		onEnterQueueFromEmpty
+		onEnterQueueFromEmpty,
+		syncBuffer
 	]);
 	const boxHeight = Math.min(MAX_CONTENT_LINES, contentLines) + 2;
 	return /* @__PURE__ */ jsxs("box", {
@@ -6505,36 +7141,71 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onPopupOpenCh
 				flexDirection: "column",
 				flexShrink: 0
 			},
-			children: [/* @__PURE__ */ jsx("box", {
-				style: {
-					border: true,
-					borderColor: selectMode ? COLOR.warn : COLOR.borderActive,
-					paddingLeft: 1,
-					paddingRight: 1,
-					height: boxHeight,
-					flexDirection: "column"
-				},
-				children: /* @__PURE__ */ jsx("textarea", {
-					ref: textareaRef,
-					focused: focused && !selectMode,
-					keyBindings: TEXTAREA_BINDINGS,
-					wrapMode: "word",
-					placeholder: selectMode === "turn" ? "— turn-select mode — press ⎋ to resume typing —" : selectMode === "queue" ? "— queue-select mode — press ⎋ to resume typing —" : "Ask zidane…",
-					syntaxStyle: chipStyle,
+			children: [
+				attachments.length > 0 && /* @__PURE__ */ jsx("box", {
 					style: {
-						flexGrow: 1,
-						height: "100%"
+						flexDirection: "row",
+						flexWrap: "wrap",
+						paddingLeft: 1,
+						paddingRight: 1,
+						paddingBottom: 0
+					},
+					children: attachments.map((att, idx) => {
+						const sz = att.content.length;
+						const label = sz < 1024 ? `${sz}B` : sz < 1024 * 1024 ? `${(sz / 1024).toFixed(1)}KB` : `${(sz / (1024 * 1024)).toFixed(1)}MB`;
+						const icon = att.mediaType.startsWith("image/") ? "🖼" : "📎";
+						const chipColor = resolveChipColor(SURFACE.chips, "file");
+						return /* @__PURE__ */ jsxs("text", { children: [
+							idx > 0 ? " " : "",
+							icon,
+							/* @__PURE__ */ jsxs("span", {
+								fg: chipColor.fg,
+								bg: chipColor.bg,
+								children: [
+									" ",
+									att.name,
+									" ",
+									"(",
+									label,
+									")",
+									" "
+								]
+							})
+						] }, `${att.name}-${idx}`);
+					})
+				}),
+				/* @__PURE__ */ jsx("box", {
+					style: {
+						border: true,
+						borderColor: selectMode ? COLOR.warn : COLOR.borderActive,
+						paddingLeft: 1,
+						paddingRight: 1,
+						height: boxHeight,
+						flexDirection: "column"
 					},
-					onSubmit: submit,
-					onContentChange: syncBuffer,
-					onKeyDown,
-					onPaste
+					children: /* @__PURE__ */ jsx("textarea", {
+						ref: textareaRef,
+						focused: focused && !selectMode,
+						keyBindings: TEXTAREA_BINDINGS,
+						wrapMode: "word",
+						placeholder: selectMode === "turn" ? "— turn-select mode — press ⎋ to resume typing —" : selectMode === "queue" ? "— queue-select mode — press ⎋ to resume typing —" : "Ask zidane…",
+						syntaxStyle: chipStyle,
+						style: {
+							flexGrow: 1,
+							height: "100%"
+						},
+						onSubmit: submit,
+						onContentChange: syncBuffer,
+						onKeyDown,
+						onPaste
+					})
+				}),
+				/* @__PURE__ */ jsx(PromptHints, {
+					selectMode,
+					triggerHints,
+					busy
 				})
-			}), /* @__PURE__ */ jsx(PromptHints, {
-				selectMode,
-				triggerHints,
-				busy
-			})]
+			]
 		}), !selectMode && /* @__PURE__ */ jsx("box", {
 			style: {
 				position: "absolute",
@@ -6638,11 +7309,13 @@ const PROMPT_HINTS_SELECT_QUEUE = [{
 */
 function PromptHints({ selectMode, triggerHints, busy = false }) {
 	const COLOR = useColors();
+	const { settings } = useSettings();
 	const { width: termWidth } = useTerminalDimensions();
-	const primary = selectMode === "turn" ? PROMPT_HINTS_SELECT_TURN : selectMode === "queue" ? PROMPT_HINTS_SELECT_QUEUE : busy ? PROMPT_HINTS_BUSY : PROMPT_HINTS_NORMAL;
+	const minimalResting = !selectMode && !busy && settings.uiMode === "minimal";
+	const primary = selectMode === "turn" ? PROMPT_HINTS_SELECT_TURN : selectMode === "queue" ? PROMPT_HINTS_SELECT_QUEUE : busy ? PROMPT_HINTS_BUSY : minimalResting ? EMPTY_HINTS : PROMPT_HINTS_NORMAL;
 	const hints = useMemo(() => {
 		const budget = Math.max(0, termWidth - 5);
-		const tooLongCombined = !!triggerHints && triggerHints.length > 0 && !selectMode && hintsLength(primary) + 3 + hintsLength(triggerHints) > budget;
+		const tooLongCombined = !!triggerHints && triggerHints.length > 0 && !selectMode && primary.length > 0 && hintsLength(primary) + 3 + hintsLength(triggerHints) > budget;
 		return clipHintsToWidth(selectMode || !triggerHints || triggerHints.length === 0 || tooLongCombined ? primary : [...primary, ...triggerHints], budget);
 	}, [
 		selectMode,
@@ -8939,7 +9612,15 @@ function AppShell() {
 	useEffect(() => {
 		smoothStreamingRef.current = settings.smoothStreaming;
 	}, [settings.smoothStreaming]);
-	const [projectDir] = useState(() => findGitRoot(process.cwd()) ?? process.cwd());
+	const [projectDir, setProjectDir] = useState(() => findGitRoot(process.cwd()) ?? process.cwd());
+	const [cwd, setCwdRaw] = useState(process.cwd);
+	const cwdRef = useRef(cwd);
+	cwdRef.current = cwd;
+	const setCwd = useCallback((next) => {
+		process.chdir(next);
+		setCwdRaw(next);
+		setProjectDir(findGitRoot(next) ?? next);
+	}, []);
 	const safelistRef = useRef(null);
 	const readSafelist = useCallback(() => {
 		if (safelistRef.current === null) safelistRef.current = getSafelist(dataDir, projectDir);
@@ -8971,9 +9652,8 @@ function AppShell() {
 	const ensureSkillsCatalogRef = useRef(ensureSkillsCatalog);
 	ensureSkillsCatalogRef.current = ensureSkillsCatalog;
 	const formatFilePathForCwd = useMemo(() => {
-		const cwd = process.cwd();
 		return (entry) => formatPathForCwd(entry.path, projectDir, cwd);
-	}, [projectDir]);
+	}, [projectDir, cwd]);
 	const completionProviders = useMemo(() => [createSkillsCompletionProvider({
 		getCatalog: () => skillsCatalogRef.current,
 		getEnabled: () => enabledSkillsRef.current,
@@ -9142,6 +9822,25 @@ function AppShell() {
 	queueSelectionIndexRef.current = queueSelectionIndex;
 	const agentRef = useRef(null);
 	const sessionRef = useRef(null);
+	useEffect(() => {
+		const handle = agentRef.current?.handle;
+		if (handle) handle.cwd = cwd;
+	}, [cwd]);
+	useEffect(() => {
+		const agent = agentRef.current;
+		if (!agent) return;
+		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 freshEnv = envSection({
+				cwd,
+				...projectDir !== cwd ? { projectRoot: projectDir } : {},
+				allowInteraction
+			});
+			ctx.system = ctx.system.replace(/<env>[\s\S]*?<\/env>/, freshEnv);
+		});
+	}, [cwd, projectDir]);
 	/**
 	* Live registry of in-flight tool calls — populated by `tool:before`
 	* (and `child:tool:before`), drained by `tool:after` / `tool:error` /
@@ -9287,7 +9986,7 @@ function AppShell() {
 		});
 		const allowInteraction = allowInteractionRef.current !== false;
 		const interactionTools = allowInteraction ? createInteractionTools({ requestInteraction: makeRequestInteraction(interactions) }) : {};
-		const actualCwd = process.cwd();
+		const actualCwd = cwdRef.current;
 		const envOpts = {
 			cwd: actualCwd,
 			...projectDir !== actualCwd ? { projectRoot: projectDir } : {},
@@ -9323,6 +10022,7 @@ function AppShell() {
 				...persistBehavior,
 				tasksDir
 			},
+			execution: createProcessContext({ cwd: actualCwd }),
 			provider: descriptor.factory(),
 			session,
 			mcpConnector: (configs) => connectMcpServers(configs, void 0, agent.hooks, { buildAuthProvider: (cfg) => new McpOAuthProvider({
@@ -10147,7 +10847,7 @@ function AppShell() {
 	* busy-state lifecycle so the title spinner stays mounted continuously
 	* across back-to-back queued messages.
 	*/
-	const runSingleMessage = useCallback(async (prompt, references) => {
+	const runSingleMessage = useCallback(async (prompt, references, attachments) => {
 		const agent = agentRef.current;
 		const session = sessionRef.current;
 		if (!agent || !session || !picked) return;
@@ -10160,10 +10860,16 @@ function AppShell() {
 			end: r.end,
 			providerId: r.providerId
 		}));
+		const attachmentMeta = attachments.map((a) => ({
+			name: a.name,
+			mediaType: a.mediaType,
+			size: a.content.length
+		}));
 		stream.appendImmediate({
 			kind: "user-prompt",
 			text: prompt,
-			...refSpans.length > 0 ? { refs: refSpans } : {}
+			...refSpans.length > 0 ? { refs: refSpans } : {},
+			...attachmentMeta.length > 0 ? { attachments: attachmentMeta } : {}
 		});
 		if (autoCompactInFlightRef.current) await autoCompactInFlightRef.current.catch(() => {});
 		const newRefs = uniqueSkillNamesFromReferences(references);
@@ -10174,9 +10880,34 @@ function AppShell() {
 			debugLog(`activateSkill("${name}")`, err);
 		}
 		try {
+			const runPrompt = attachments.length === 0 ? prompt : [...prompt.length > 0 ? [{
+				type: "text",
+				text: prompt
+			}] : [], ...attachments.map((att) => {
+				if (att.mediaType.startsWith("image/")) return {
+					type: "image",
+					mediaType: att.mediaType,
+					data: att.content.toString("base64"),
+					name: att.name
+				};
+				if (att.mediaType.startsWith("text/")) return {
+					type: "document",
+					mediaType: att.mediaType,
+					data: att.content.toString("utf-8"),
+					encoding: "text",
+					name: att.name
+				};
+				return {
+					type: "document",
+					mediaType: att.mediaType,
+					data: att.content.toString("base64"),
+					encoding: "base64",
+					name: att.name
+				};
+			})];
 			await agent.run({
 				model: picked.model,
-				prompt,
+				prompt: runPrompt,
 				...picked.effort ? { thinking: picked.effort } : {}
 			});
 			await session.save().catch((err) => debugLog("session.save failed", err));
@@ -10198,15 +10929,16 @@ function AppShell() {
 			stream.flushAndUpdate(finalizeStreamingMarkdown);
 		}
 	}, [picked, stream]);
-	const onSubmitPrompt = useCallback((prompt, references) => {
-		if (!prompt.trim()) return;
+	const onSubmitPrompt = useCallback((prompt, references, attachments) => {
+		if (!prompt.trim() && attachments.length === 0) return;
 		const agent = agentRef.current;
 		const session = sessionRef.current;
 		if (!agent || !session || !picked) return;
 		if (runningRef.current) {
 			messageQueueRef.current = [...messageQueueRef.current, {
 				prompt,
-				references
+				references,
+				attachments
 			}];
 			setMessageQueue(messageQueueRef.current.slice());
 			return;
@@ -10215,7 +10947,7 @@ function AppShell() {
 		(async () => {
 			setBusy(true);
 			try {
-				await runSingleMessage(prompt, references);
+				await runSingleMessage(prompt, references, attachments);
 				while (messageQueueRef.current.length > 0) {
 					const next = messageQueueRef.current[0];
 					messageQueueRef.current = messageQueueRef.current.slice(1);
@@ -10226,7 +10958,7 @@ function AppShell() {
 						if (prev <= 0) return null;
 						return prev - 1;
 					});
-					await runSingleMessage(next.prompt, next.references);
+					await runSingleMessage(next.prompt, next.references, next.attachments);
 				}
 			} finally {
 				setBusy(false);
@@ -10852,6 +11584,15 @@ function AppShell() {
 			}));
 			return;
 		}
+		if (matchesBinding(key, keybindings.openKeybindings) && screen !== "auth") {
+			modal.open(/* @__PURE__ */ jsx(KeybindingsModal, {
+				bindings: keybindings,
+				filePath: keybindingsPath(config.paths.userDir),
+				onEditFile: onOpenKeybindingsFile,
+				onClose: () => modal.close()
+			}));
+			return;
+		}
 		if (matchesBinding(key, keybindings.enterSelectTurnMode) && screen === "chat" && !busy && !pendingApproval && !pendingInteraction) {
 			enterSelectMode();
 			return;
@@ -10883,6 +11624,16 @@ function AppShell() {
 			}));
 			return;
 		}
+		if (matchesBinding(key, keybindings.changeCwd) && screen !== "auth") {
+			modal.open(/* @__PURE__ */ jsx(CwdPickerModal, {
+				currentCwd: cwdRef.current,
+				onPick: (dir) => {
+					setCwd(dir);
+					modal.close();
+				}
+			}));
+			return;
+		}
 		if (key.name !== "escape") return;
 		if (busy || pendingApproval) return onAbort();
 		if (popupOpenRef.current) return;
@@ -10917,6 +11668,7 @@ function AppShell() {
 		pendingInteractionResumed: pendingInteractionIsResumed,
 		currentSession,
 		hasMultipleAgents,
+		uiMode: settings.uiMode,
 		modelLabel: picked?.model ?? null,
 		modelColor: COLOR.model,
 		effortLabel: modelHasReasoning ? picked?.effort ?? "medium" : null,
@@ -10937,6 +11689,7 @@ function AppShell() {
 		pendingInteractionIsResumed,
 		currentSession,
 		hasMultipleAgents,
+		settings.uiMode,
 		picked,
 		pickedAgent,
 		COLOR,
@@ -11016,6 +11769,7 @@ function AppShell() {
 					currentProjectRoot: projectDir
 				}),
 				screen === "chat" && /* @__PURE__ */ jsx(ChatScreen, {
+					cwd,
 					events,
 					busy,
 					compacting,
@@ -11055,162 +11809,6 @@ function effortForModel(descriptor, modelId, remembered) {
 	if (!modelSupportsReasoning(descriptor, modelId)) return void 0;
 	return remembered?.[modelId] ?? "medium";
 }
-/**
-* Build the footer's shortcut hints for the current screen. On the chat
-* screen the model id rides next to its `ctrl+m` shortcut and the agent
-* label rides next to `shift+tab`, each in its accent color — the bar
-* doubles as the status display without needing separate badges. When
-* the active model exposes reasoning, the `ctrl+m` hint grows a
-* secondary `/n` chord with the current effort label, surfacing the
-* effort picker as a discoverable, in-place affordance.
-*/
-function buildHints({ screen, busy, pending, pendingInteractionLive, pendingInteractionResumed, currentSession, hasMultipleAgents, modelLabel, modelColor, effortLabel, effortColor, effortKeyColor, agentLabel, agentColor, keybindings, inFlightToolCount, activeSkillCount, skillsChipColor, updateHint }) {
-	if (pending) return [
-		{
-			key: "↑↓",
-			label: "navigate"
-		},
-		{
-			key: "↵",
-			label: "select"
-		},
-		{
-			key: "esc",
-			label: "abort run"
-		}
-	];
-	if (pendingInteractionLive) return [
-		{
-			key: "↑↓",
-			label: "navigate"
-		},
-		{
-			key: "↵",
-			label: "select"
-		},
-		{
-			key: "esc",
-			label: "abort run"
-		}
-	];
-	if (pendingInteractionResumed) return [
-		{
-			key: "↑↓",
-			label: "navigate"
-		},
-		{
-			key: "↵",
-			label: "select"
-		},
-		{
-			key: "esc",
-			label: "leave for later"
-		}
-	];
-	if (busy) {
-		const baseBusyHints = [];
-		if (inFlightToolCount > 0) baseBusyHints.push({
-			key: keybindings.cancelToolCall,
-			label: inFlightToolCount === 1 ? "cancel" : `cancel (${inFlightToolCount})`
-		});
-		baseBusyHints.push({
-			key: "esc",
-			label: "abort"
-		});
-		return baseBusyHints;
-	}
-	if (screen === "auth") return [
-		{
-			key: "↑↓",
-			label: "navigate"
-		},
-		{
-			key: "↵",
-			label: "select"
-		},
-		{
-			key: "esc",
-			label: "exit"
-		}
-	];
-	if (screen === "sessions") return [
-		{
-			key: "↑↓",
-			label: "navigate"
-		},
-		{
-			key: "↵",
-			label: "open"
-		},
-		{
-			key: keybindings.openSessionDetails,
-			label: "session"
-		},
-		{
-			key: keybindings.openSettings,
-			label: "settings"
-		},
-		{
-			key: "esc",
-			label: currentSession ? "back" : "exit"
-		}
-	];
-	const modelHint = modelLabel ? {
-		key: keybindings.openModelPicker,
-		label: modelLabel,
-		labelColor: modelColor,
-		...effortLabel ? { extra: {
-			key: shortChord(keybindings.openEffortPicker),
-			keyColor: effortKeyColor,
-			label: effortLabel,
-			labelColor: effortColor
-		} } : {}
-	} : null;
-	const skillsChip = activeSkillCount > 0 ? {
-		key: "✦",
-		keyColor: skillsChipColor,
-		label: activeSkillCount === 1 ? "1 skill" : `${activeSkillCount} skills`,
-		labelColor: skillsChipColor
-	} : null;
-	const cancelTaskChip = inFlightToolCount > 0 ? {
-		key: keybindings.cancelToolCall,
-		label: inFlightToolCount === 1 ? "cancel task" : `cancel task (${inFlightToolCount})`
-	} : null;
-	return [
-		...hasMultipleAgents ? [{
-			key: keybindings.cycleAgent,
-			label: agentLabel,
-			labelColor: agentColor
-		}] : [],
-		...modelHint ? [modelHint] : [],
-		...skillsChip ? [skillsChip] : [],
-		...cancelTaskChip ? [cancelTaskChip] : [],
-		...currentSession ? [{
-			key: keybindings.openSessionDetails,
-			label: "session"
-		}] : [],
-		{
-			key: keybindings.openSettings,
-			label: "settings"
-		},
-		{
-			key: "esc",
-			label: "sessions"
-		},
-		...updateHint ? [updateHint] : []
-	];
-}
-/**
-* Shorten a binding spec for display as a "chord continuation" — the
-* `/n` after `ctrl+m model` in the chat footer. We only strip the
-* `ctrl+` prefix so user-customized chords (`alt+n`, `meta+shift+n`)
-* still render in full. Falls back to the verbatim spec when no
-* `ctrl+` prefix is found, which keeps the visual contract honest:
-* the rendered key always matches the bound trigger.
-*/
-function shortChord(spec) {
-	return spec.startsWith("ctrl+") ? `/${spec.slice(5)}` : spec;
-}
 //#endregion
 //#region src/tui/tree-sitter.ts
 /**