skydive-cli 0.6.0-beta.19 → 0.6.0-beta.21

package/dist/js/{boot-BWiSsPQJ.mjs → boot-BDibPsNk.mjs}

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
-import { a as errorMessage, i as sendErrorMessage, n as errorDetail, o as isRecord, t as createRestClient } from "./rest-DQFiN7VL.mjs";
-import { C as DEFAULT_APP_URL, E as getConfigPath, K as saveTheme, L as recordDefaultAgent, M as getSavedTheme, S as DEFAULT_API_URL, U as resolveWebUrl, _ as parseConnectCard, c as actionableCardVerb, d as parseOauthConnectParams, f as prioritizeActionableCards, g as computeSettledLabel, h as composeQuestionAnswer, i as resolveAgent, j as getReviewStateDir, l as cardActionErrorMessage, m as resolveConnectUrl, p as reconcileMaskedInput, s as MASK_CHAR, u as parseExternalOauthConnectParams, v as specKeyFor } from "./print-BC2o90gX.mjs";
-import { A as installAgentAlias, C as themeVersion, D as machineOsFromPlatform, F as detectShell, L as getActiveWorkspaceId, M as takenAliasNames, O as aliasActivationHint, S as themeModeFromColorFgBg, T as themesForMode, V as setActiveWorkspace, _ as monoTheme, a as WORDMARK, b as themeForMode, d as profilingEnabled, f as record, g as findTheme, h as applyTheme, i as MARK_CELLS, j as slugifyAliasName, k as dedupeAliasName, m as DEFAULT_THEME_ID, n as buildCrashReport, p as writeArtifact, r as writeCrashReport, s as splashFitsWidth, t as installCrashHandler, v as noColorRequested, x as themeMode, y as theme, z as listWorkspaces } from "./install-Bs9OISd4.mjs";
+import { a as errorMessage, i as sendErrorMessage, n as errorDetail, o as isRecord, t as createRestClient } from "./rest-CiwSFzD8.mjs";
+import { C as DEFAULT_APP_URL, E as getConfigPath, K as saveTheme, L as recordDefaultAgent, M as getSavedTheme, S as DEFAULT_API_URL, U as resolveWebUrl, _ as parseConnectCard, c as actionableCardVerb, d as parseOauthConnectParams, f as prioritizeActionableCards, g as computeSettledLabel, h as composeQuestionAnswer, i as resolveAgent, j as getReviewStateDir, l as cardActionErrorMessage, m as resolveConnectUrl, p as reconcileMaskedInput, s as MASK_CHAR, u as parseExternalOauthConnectParams, v as specKeyFor } from "./print-DPOx1Zm4.mjs";
+import { A as installAgentAlias, C as themeVersion, D as machineOsFromPlatform, F as detectShell, L as getActiveWorkspaceId, M as takenAliasNames, O as aliasActivationHint, S as themeModeFromColorFgBg, T as themesForMode, V as setActiveWorkspace, _ as monoTheme, a as WORDMARK, b as themeForMode, d as profilingEnabled, f as record, g as findTheme, h as applyTheme, i as MARK_CELLS, j as slugifyAliasName, k as dedupeAliasName, m as DEFAULT_THEME_ID, n as buildCrashReport, p as writeArtifact, r as writeCrashReport, s as splashFitsWidth, t as installCrashHandler, v as noColorRequested, x as themeMode, y as theme, z as listWorkspaces } from "./install-YcAgiY79.mjs";
 import { t as HttpError } from "./http-error-BF2NZZE3.mjs";
 import { i as billingBlockedOutcomeFromSendResponse } from "./billing-blocked-D3l5kJlX.mjs";
-import { t as PortalClient } from "./client-HWCoL5Jm.mjs";
+import { t as PortalClient } from "./client-HGcuhUqy.mjs";
 import { t as defaultTlsCertSource } from "./tls-cert-Rua2oV7n.mjs";
 import "./api-BFQ4PQDA.mjs";
-import "./daemon-Dl3nN-w4.mjs";
+import "./daemon-C7mYwnPA.mjs";
 import { t as SandboxStream } from "./client-l6orYfqq.mjs";
-import { t as PortalDaemonClient } from "./daemon-client-BUakFQGS.mjs";
+import { t as PortalDaemonClient } from "./daemon-client-CNiHI_BQ.mjs";
 import { t as runRawPtyPassthrough } from "./raw-pty-dndn1Kxc.mjs";
 import * as os$1 from "node:os";
 import { homedir, platform, release, tmpdir } from "node:os";
@@ -136,6 +136,7 @@ const useStore = create((set, get) => ({
 	portalClient: null,
 	toast: null,
 	seedPrompt: null,
+	seedAttachments: [],
 	autoGrantMachine: false,
 	forcedOnboarding: false,
 	earlyInput: "",
@@ -3120,6 +3121,393 @@ function WorkspacePicker({ appUrl, sessionToken, onSelect, onCancel }) {
 	});
 }
 
+//#endregion
+//#region src/chat/paste.ts
+const MAX_PATH_PASTE_CHARS = 4096;
+/**
+* Decode a `file://` URL to a filesystem path, host-independently. Node's
+* `fileURLToPath` maps to the *running* OS's path shape, so a POSIX file URL
+* pasted on Windows would come back as a backslash drive-relative path. A
+* dropped-file URL is decided by its own shape, not by our host: a Windows
+* drive URL (`file:///C:/...`) yields a Windows path, anything else a POSIX
+* path. Returns null for a malformed URL.
+*/
+function fileUrlToPath(url) {
+	let parsed;
+	try {
+		parsed = new URL(url);
+	} catch (_error) {
+		return null;
+	}
+	if (parsed.protocol !== "file:") return null;
+	const decoded = decodeURIComponent(parsed.pathname);
+	if (/^\/[a-zA-Z]:\//.test(decoded)) return decoded.slice(1).replace(/\//g, "\\");
+	return decoded;
+}
+/**
+* Parse the text a terminal emits for dropped files. This only identifies
+* path-shaped candidates; filesystem and content validation happen later.
+*/
+function parseDroppedPaths(text) {
+	const trimmed = text.trim();
+	if (!trimmed || trimmed.length > MAX_PATH_PASTE_CHARS || /[\r\n]/.test(trimmed)) return null;
+	const tokens = [];
+	let current = "";
+	let quote = null;
+	for (let i = 0; i < trimmed.length; i += 1) {
+		const ch = trimmed.charAt(i);
+		if (quote) {
+			if (ch === quote) quote = null;
+			else if (ch === "\\" && quote === "\"" && i + 1 < trimmed.length) {
+				current += trimmed.charAt(i + 1);
+				i += 1;
+			} else current += ch;
+			continue;
+		}
+		if (ch === "'" || ch === "\"") {
+			quote = ch;
+			continue;
+		}
+		if (ch === "\\" && i + 1 < trimmed.length) {
+			current += trimmed.charAt(i + 1);
+			i += 1;
+			continue;
+		}
+		if (ch === " " || ch === "	") {
+			if (current) {
+				tokens.push(current);
+				current = "";
+			}
+			continue;
+		}
+		current += ch;
+	}
+	if (quote) return null;
+	if (current) tokens.push(current);
+	if (tokens.length === 0) return null;
+	const paths = [];
+	for (const token of tokens) {
+		let path = token;
+		if (path.startsWith("file://")) {
+			const resolved = fileUrlToPath(path);
+			if (resolved === null) return null;
+			path = resolved;
+		}
+		if (path.startsWith("~/")) path = `${homedir()}${path.slice(1)}`;
+		if (!isAbsolute(path) && !win32.isAbsolute(path) && !path.startsWith("./") && !path.startsWith("../")) return null;
+		paths.push(path);
+	}
+	return paths;
+}
+const TEXT_MIME_BY_EXT = {
+	".txt": "text/plain",
+	".md": "text/markdown",
+	".markdown": "text/markdown",
+	".csv": "text/csv",
+	".tsv": "text/tab-separated-values",
+	".json": "application/json",
+	".yaml": "application/yaml",
+	".yml": "application/yaml",
+	".xml": "application/xml",
+	".html": "text/html",
+	".htm": "text/html",
+	".css": "text/css",
+	".js": "text/javascript",
+	".ts": "text/plain",
+	".tsx": "text/plain",
+	".jsx": "text/plain",
+	".py": "text/x-python",
+	".sh": "text/x-shellscript",
+	".log": "text/plain",
+	".svg": "image/svg+xml"
+};
+/** Decide how to handle a paste. `kind: 'binary'` events carry the mime of
+* bytes the terminal forwarded; text events carry the decoded paste text.
+*
+* The empty-text case is the fix for "can't paste an image": on macOS the
+* reflex is Cmd+V, which the terminal turns into a bracketed *text* paste, so
+* a screenshot on the clipboard arrives as empty bytes. We route that to an OS
+* clipboard read instead of dropping it, matching the explicit ctrl+v path. */
+function routePaste(input) {
+	if (input.kind === "binary") {
+		if (input.mimeType?.startsWith("image/")) return {
+			kind: "binary-image",
+			mediaType: input.mimeType
+		};
+		return { kind: "text" };
+	}
+	const paths = parseDroppedPaths(input.text);
+	if (paths) return {
+		kind: "dropped-paths",
+		paths,
+		text: input.text
+	};
+	if (input.text.trim() === "") return { kind: "clipboard-image" };
+	return { kind: "text" };
+}
+/**
+* Resolve path candidates into attachable files. Every path must be an
+* existing regular file; otherwise the caller should restore the original
+* paste as text (an all-or-nothing rule so a paste meant as text — which
+* merely *looks* path-shaped — is never partially eaten).
+*
+* Any file type attaches. The mediaType comes from magic bytes when
+* detectable, an extension map for the plain-text formats magic can't see,
+* and application/octet-stream as the last resort — the attachments API
+* accepts any mediaType (100MB cap enforced server-side at presign).
+*/
+async function resolveDroppedFiles(paths) {
+	try {
+		const files = await Promise.all(paths.map(async (path) => {
+			if (!(await stat(path)).isFile()) return null;
+			const data = new Uint8Array(await readFile(path));
+			const mediaType = (await fileTypeFromBuffer(data))?.mime ?? TEXT_MIME_BY_EXT[extname(path).toLowerCase()] ?? "application/octet-stream";
+			return {
+				fileName: basename(path),
+				mediaType,
+				data
+			};
+		}));
+		if (!files.every((file) => file !== null)) return null;
+		return files;
+	} catch (_error) {
+		return null;
+	}
+}
+
+//#endregion
+//#region src/chat/tui/composer-attachments.tsx
+/**
+* Attachments a composer can stage for its next send, shared by every screen
+* that owns a composer (the chat transcript and the agent home). Staging
+* starts the upload immediately — the web composer's behavior — so submit
+* only awaits the in-flight uploads and collects their server ids.
+*/
+/** Files one composer can hold at once, so a stray multi-file drop can't
+* queue an unbounded pile of uploads. */
+const MAX_COMPOSER_ATTACHMENTS = 10;
+/**
+* Owns a composer's staged attachments and the paste routing that feeds them.
+*
+* `pasteDisabled` suppresses attaching while the screen has something else in
+* front of the composer (an overlay, a prompt, a channel with no composer at
+* all); the paste then falls through to whatever is focused, untouched.
+* `onPasteText` restores a paste that only *looked* like dropped file paths —
+* the filesystem check is async, so the text has to be held and put back.
+* `onError` receives user-facing failures (the cap, a failed upload) because
+* each screen surfaces them differently: the transcript takes an error row,
+* the home takes its status line.
+*/
+function useComposerAttachments(input) {
+	const { rest, agentId, pasteDisabled, onPasteText, onError } = input;
+	const [staged, setStaged] = useState([]);
+	const uploadsRef = useRef(/* @__PURE__ */ new Map());
+	const stagedRef = useRef(staged);
+	stagedRef.current = staged;
+	const stageFile = useCallback(({ fileName, mediaType, data }) => {
+		if (!rest) return;
+		if (stagedRef.current.length >= MAX_COMPOSER_ATTACHMENTS) {
+			onError(`attachment limit reached (${MAX_COMPOSER_ATTACHMENTS}); ${fileName} skipped`);
+			return;
+		}
+		const tempId = crypto.randomUUID();
+		setStaged((prev) => [...prev, {
+			tempId,
+			fileName,
+			sizeBytes: data.byteLength,
+			status: "uploading",
+			errorText: null
+		}]);
+		const promise = rest.uploadAttachment({
+			agentId,
+			fileName,
+			mediaType,
+			data
+		});
+		uploadsRef.current.set(tempId, promise);
+		promise.then(() => {
+			setStaged((prev) => prev.map((a) => a.tempId === tempId ? {
+				...a,
+				status: "ready"
+			} : a));
+		}).catch((err) => {
+			setStaged((prev) => prev.map((a) => a.tempId === tempId ? {
+				...a,
+				status: "error",
+				errorText: errorMessage(err)
+			} : a));
+		});
+	}, [
+		rest,
+		agentId,
+		onError
+	]);
+	const stageFiles = useCallback((files) => {
+		for (const file of files) stageFile(file);
+	}, [stageFile]);
+	const stageClipboardImage = useCallback(async () => {
+		const image = await readClipboardImage();
+		if (!image) return;
+		stageFile(image);
+	}, [stageFile]);
+	const dropLast = useCallback(() => {
+		const last = stagedRef.current.at(-1);
+		if (!last) return;
+		uploadsRef.current.delete(last.tempId);
+		setStaged((prev) => prev.filter((a) => a.tempId !== last.tempId));
+	}, []);
+	const clearStaged = useCallback(() => setStaged([]), []);
+	const collectForSend = useCallback(async (staged) => {
+		const files = [];
+		const rows = [];
+		const failed = [];
+		const settled = await Promise.allSettled(staged.map((a) => uploadsRef.current.get(a.tempId)));
+		for (const [i, result] of settled.entries()) {
+			const row = staged[i];
+			if (!row) continue;
+			if (result.status === "fulfilled" && result.value) {
+				files.push(result.value);
+				rows.push({
+					...row,
+					status: "ready",
+					errorText: null
+				});
+			} else {
+				uploadsRef.current.delete(row.tempId);
+				failed.push({
+					attachment: row,
+					reason: result.status === "rejected" ? result.reason : null
+				});
+			}
+		}
+		return {
+			files,
+			rows,
+			failed
+		};
+	}, []);
+	const releaseUploaded = useCallback((rows) => {
+		for (const row of rows) uploadsRef.current.delete(row.tempId);
+	}, []);
+	const adoptUploaded = useCallback((uploaded) => uploaded.map((file) => {
+		const tempId = crypto.randomUUID();
+		uploadsRef.current.set(tempId, Promise.resolve(file));
+		return {
+			tempId,
+			fileName: file.fileName,
+			sizeBytes: file.sizeBytes,
+			status: "ready",
+			errorText: null
+		};
+	}), []);
+	const restoreStaged = useCallback((rows) => {
+		const restore = rows.filter((a) => uploadsRef.current.has(a.tempId));
+		if (restore.length === 0) return;
+		setStaged((prev) => [...restore.map((a) => ({
+			...a,
+			status: "ready",
+			errorText: null
+		})), ...prev]);
+	}, []);
+	usePaste((event) => {
+		if (pasteDisabled) return;
+		const text = event.metadata?.kind === "binary" ? "" : decodePasteBytes(event.bytes);
+		const route = routePaste({
+			kind: event.metadata?.kind,
+			mimeType: event.metadata?.mimeType,
+			text
+		});
+		switch (route.kind) {
+			case "binary-image":
+				event.preventDefault();
+				stageFiles([{
+					fileName: pastedImageName(route.mediaType),
+					mediaType: route.mediaType,
+					data: event.bytes
+				}]);
+				return;
+			case "clipboard-image":
+				event.preventDefault();
+				stageClipboardImage();
+				return;
+			case "dropped-paths":
+				event.preventDefault();
+				resolveDroppedFiles(route.paths).then((files) => {
+					if (files) {
+						stageFiles(files);
+						return;
+					}
+					onPasteText(route.text);
+				});
+				return;
+			case "text": return;
+		}
+	});
+	return {
+		staged,
+		stagedRef,
+		stageFiles,
+		stageClipboardImage,
+		dropLast,
+		clearStaged,
+		collectForSend,
+		adoptUploaded,
+		releaseUploaded,
+		restoreStaged
+	};
+}
+/** Name for clipboard image bytes, which arrive with no filename of their
+* own: `pasted-image-<timestamp>.<ext>` from the paste's own media type. */
+function pastedImageName(mediaType) {
+	const ext = mediaType.split("/")[1]?.split("+")[0] ?? "png";
+	return `pasted-image-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}.${ext}`;
+}
+function formatBytes$2(bytes) {
+	if (bytes < 1024) return `${bytes} B`;
+	if (bytes < 1024 * 1024) return `${Math.round(bytes / 1024)} KB`;
+	return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
+/** Status glyph for a staged attachment chip: uploading / ready / failed. */
+function attachmentGlyph(a) {
+	switch (a.status) {
+		case "uploading": return "↑";
+		case "ready": return "✓";
+		case "error": return `✗ ${a.errorText ?? "upload failed"}`;
+	}
+}
+/** Rows a rendered tray occupies: one per attachment plus the hint line and
+* its top margin, so a screen can budget its own layout around it. */
+function attachmentTrayRows(count) {
+	return count === 0 ? 0 : count + 2;
+}
+/** The staged-attachment tray under a composer: a chip per file with its
+* upload state, and the chord that removes the last one. */
+function AttachmentTray({ attachments }) {
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			paddingLeft: 1,
+			paddingRight: 1,
+			flexShrink: 0,
+			marginTop: 1,
+			flexDirection: "column"
+		},
+		children: [attachments.map((a) => /* @__PURE__ */ jsxs("text", {
+			fg: a.status === "error" ? theme.error : theme.muted,
+			children: [
+				"📎 ",
+				a.fileName,
+				" (",
+				formatBytes$2(a.sizeBytes),
+				") ",
+				attachmentGlyph(a)
+			]
+		}, a.tempId)), /* @__PURE__ */ jsx("text", {
+			fg: theme.dim,
+			children: "ctrl+x remove last"
+		})]
+	});
+}
+
 //#endregion
 //#region src/chat/tui/list-line.ts
 /**
@@ -3474,6 +3862,17 @@ function ConversationHome({ agent, initialQuery, conversations, showAutomated, o
 	const [archiveOverrides, setArchiveOverrides] = useState(/* @__PURE__ */ new Map());
 	const [confirmId, setConfirmId] = useState(null);
 	const [error, setError] = useState(null);
+	const [sending, setSending] = useState(false);
+	const { staged: attachments, stageClipboardImage, dropLast: dropLastAttachment, collectForSend } = useComposerAttachments({
+		rest,
+		agentId: agent.id,
+		pasteDisabled: confirmId !== null || isSearchInput || sending,
+		onPasteText: (text) => {
+			composerRef.current?.insertText(text);
+			handleComposerChange();
+		},
+		onError: setError
+	});
 	const isArchived = (c) => archiveOverrides.get(c.id) ?? c.viewerArchivedAt != null;
 	const list = ((isSearching && search?.query === debouncedQuery && search.state.kind === "ready" ? search.state.conversations : null) ?? conversations).filter((c) => !removedIds.has(c.id) && (showArchived || !isArchived(c)));
 	useEffect(() => {
@@ -3497,10 +3896,14 @@ function ConversationHome({ agent, initialQuery, conversations, showAutomated, o
 	const searchState = isSearching ? search?.state : void 0;
 	const searchStatusSegment = !isSearching ? "" : searchState?.kind === "loading" || search === null ? "searching…" : searchState?.kind === "error" ? `search failed: ${searchState.message}` : list.length === 0 ? "no matches" : "";
 	const trimmedMessage = isSearchInput ? "" : input.trim();
-	const enterHint = isSearchInput ? "filtering" : trimmedMessage ? "↵ send" : "↵ open";
+	const hasMessage = trimmedMessage.length > 0 || attachments.length > 0;
+	const enterHint = isSearchInput ? "filtering" : hasMessage ? "↵ send" : "↵ open";
 	const status = confirmConv ? {
 		fg: theme.error,
 		text: truncate(`delete “${confirmConv.title ?? "(untitled)"}”? y/n`, innerWidth)
+	} : sending ? {
+		fg: theme.muted,
+		text: "uploading attachments…"
 	} : error ? {
 		fg: theme.error,
 		text: truncate(error, innerWidth)
@@ -3519,7 +3922,8 @@ function ConversationHome({ agent, initialQuery, conversations, showAutomated, o
 		].filter((segment) => segment !== ""), innerWidth)
 	};
 	const identityRows = height >= 24 ? 3 : 0;
-	const fixedRows = 6 + brandHeaderRows(height, width) + identityRows;
+	const trayRows = attachmentTrayRows(attachments.length);
+	const fixedRows = 6 + brandHeaderRows(height, width) + identityRows + trayRows;
 	const composerRows = Math.max(1, Math.min(composerLines, height - fixedRows - 2 - MIN_LIST_ROWS));
 	const visibleRows = Math.max(MIN_LIST_ROWS, height - fixedRows - (composerRows + 2));
 	const start = windowStart(clamped, rows.length, visibleRows);
@@ -3534,8 +3938,22 @@ function ConversationHome({ agent, initialQuery, conversations, showAutomated, o
 			conversation: row.hit.item
 		});
 	};
-	const sendNewConversation = (message) => {
-		useStore.setState({ seedPrompt: message });
+	const sendNewConversation = async (message) => {
+		setSending(true);
+		const { files, failed } = await collectForSend(attachments);
+		setSending(false);
+		if (!message && files.length === 0) {
+			setError("attachment upload failed");
+			return;
+		}
+		if (failed.length > 0) {
+			const plural = failed.length === 1 ? "" : "s";
+			setError(`${failed.length} attachment${plural} failed to upload; sending without ${plural ? "them" : "it"}`);
+		}
+		useStore.setState({
+			seedPrompt: message,
+			seedAttachments: files
+		});
 		onPick({
 			kind: "chat",
 			agent,
@@ -3559,7 +3977,8 @@ function ConversationHome({ agent, initialQuery, conversations, showAutomated, o
 		setHighlight(0);
 	};
 	const submit = () => {
-		if (trimmedMessage) sendNewConversation(trimmedMessage);
+		if (sending) return;
+		if (hasMessage) sendNewConversation(trimmedMessage);
 		else openHighlighted();
 	};
 	/**
@@ -3653,6 +4072,15 @@ function ConversationHome({ agent, initialQuery, conversations, showAutomated, o
 				toggleArchived(row.hit.item);
 			}
 			key.preventDefault();
+		} else if (key.name === "v" && key.ctrl) {
+			if (confirmId === null && !isSearchInput) {
+				setError(null);
+				stageClipboardImage();
+			}
+			key.preventDefault();
+		} else if (key.name === "x" && key.ctrl) {
+			dropLastAttachment();
+			key.preventDefault();
 		} else if (key.name === "tab" && key.shift) {
 			onToggleArchived();
 			key.preventDefault();
@@ -3736,6 +4164,7 @@ function ConversationHome({ agent, initialQuery, conversations, showAutomated, o
 							}
 						})
 					}),
+					attachments.length > 0 ? /* @__PURE__ */ jsx(AttachmentTray, { attachments }) : null,
 					/* @__PURE__ */ jsx("text", {
 						fg: status.fg,
 						children: status.text
@@ -3890,242 +4319,88 @@ function layoutRow(title, time, tag, width) {
 	const GLYPH = 2;
 	const tagCost = tag ? tag.length + 1 : 0;
 	const timeCost = time.length + 1;
-	const titleBudget = width - GLYPH - tagCost - timeCost;
-	if (titleBudget < 8) return {
-		title: truncate(title, Math.max(1, width - GLYPH - tagCost)),
-		time: ""
-	};
-	const fitTitle = truncate(title, titleBudget);
-	const used = GLYPH + fitTitle.length + tagCost;
-	const pad = Math.max(1, width - used - time.length);
-	return {
-		title: fitTitle,
-		time: `${" ".repeat(pad)}${time}`
-	};
-}
-function relativeTime(iso) {
-	const diffMs = Date.now() - new Date(iso).getTime();
-	if (diffMs < 6e4) return "just now";
-	if (diffMs < 36e5) return `${Math.floor(diffMs / 6e4)}m ago`;
-	if (diffMs < 864e5) return `${Math.floor(diffMs / 36e5)}h ago`;
-	return `${Math.floor(diffMs / 864e5)}d ago`;
-}
-
-//#endregion
-//#region src/chat/conversation-ref.ts
-/**
-* Parsing the conversation reference a user hands `/conversation`.
-*
-* The whole point of the command is that you paste whatever you already have
-* in front of you, so every form the platform hands out has to work: a bare
-* id, the `https://skydive.com/c/<id>` link an agent replies with, or the
-* `skydive chat --resume <id>` line the TUI prints on exit. All three carry
-* exactly one id, so we pull the first uuid out of the string rather than
-* teaching this about URL shapes and command syntax.
-*
-* Validating here (instead of letting the API answer) is what turns a typo
-* into "not a conversation id" in the composer rather than a request that
-* cannot succeed.
-*/
-const uuidPattern = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i;
-/**
-* The conversation id in `input`, lowercased, or null when there isn't one.
-* Trailing punctuation, query strings and surrounding prose are tolerated —
-* a pasted link or command line is the expected input, not the exception.
-*/
-function parseConversationRef(input) {
-	const match = uuidPattern.exec(input);
-	return match ? match[0].toLowerCase() : null;
-}
-
-//#endregion
-//#region src/chat/transcript-export.ts
-function messageText(message) {
-	const chunks = [];
-	for (const part of message.parts) if ((part.type === "text" || part.type === "reasoning") && "text" in part && typeof part.text === "string") chunks.push(part.text);
-	else if (part.type === "dynamic-tool" && "toolName" in part) chunks.push(`[tool: ${typeof part.toolName === "string" ? part.toolName : "tool"}]`);
-	return chunks.join("\n").trim();
-}
-function messageLabel(message) {
-	if (message.role === "user") return "User";
-	if (message.role === "assistant") return message.metadata?.custom?.agentName ?? "Assistant";
-	return message.role.charAt(0).toUpperCase() + message.role.slice(1);
-}
-function parseTranscriptFormat(value) {
-	const normalized = value.trim().toLowerCase();
-	if (!normalized || normalized === "md" || normalized === "markdown") return "markdown";
-	if (normalized === "txt" || normalized === "text") return "text";
-	return null;
-}
-function formatTranscript(messages, format) {
-	const entries = messages.flatMap((message) => {
-		const text = messageText(message);
-		if (!text) return [];
-		const label = messageLabel(message);
-		return [format === "markdown" ? `## ${label}\n\n${text}` : `[${label}]\n${text}`];
-	});
-	if (format === "markdown") return `# Conversation transcript\n\n${entries.join("\n\n")}\n`;
-	return `${entries.join("\n\n")}\n`;
-}
-async function exportTranscript(options) {
-	const extension = options.format === "markdown" ? "md" : "txt";
-	const filePath = path.join(options.cwd, `skydive-conversation-${options.conversationId}.${extension}`);
-	await writeFile(filePath, formatTranscript(options.messages, options.format), "utf8");
-	return filePath;
-}
-
-//#endregion
-//#region src/chat/paste.ts
-const MAX_PATH_PASTE_CHARS = 4096;
-/**
-* Decode a `file://` URL to a filesystem path, host-independently. Node's
-* `fileURLToPath` maps to the *running* OS's path shape, so a POSIX file URL
-* pasted on Windows would come back as a backslash drive-relative path. A
-* dropped-file URL is decided by its own shape, not by our host: a Windows
-* drive URL (`file:///C:/...`) yields a Windows path, anything else a POSIX
-* path. Returns null for a malformed URL.
-*/
-function fileUrlToPath(url) {
-	let parsed;
-	try {
-		parsed = new URL(url);
-	} catch (_error) {
-		return null;
-	}
-	if (parsed.protocol !== "file:") return null;
-	const decoded = decodeURIComponent(parsed.pathname);
-	if (/^\/[a-zA-Z]:\//.test(decoded)) return decoded.slice(1).replace(/\//g, "\\");
-	return decoded;
-}
-/**
-* Parse the text a terminal emits for dropped files. This only identifies
-* path-shaped candidates; filesystem and content validation happen later.
-*/
-function parseDroppedPaths(text) {
-	const trimmed = text.trim();
-	if (!trimmed || trimmed.length > MAX_PATH_PASTE_CHARS || /[\r\n]/.test(trimmed)) return null;
-	const tokens = [];
-	let current = "";
-	let quote = null;
-	for (let i = 0; i < trimmed.length; i += 1) {
-		const ch = trimmed.charAt(i);
-		if (quote) {
-			if (ch === quote) quote = null;
-			else if (ch === "\\" && quote === "\"" && i + 1 < trimmed.length) {
-				current += trimmed.charAt(i + 1);
-				i += 1;
-			} else current += ch;
-			continue;
-		}
-		if (ch === "'" || ch === "\"") {
-			quote = ch;
-			continue;
-		}
-		if (ch === "\\" && i + 1 < trimmed.length) {
-			current += trimmed.charAt(i + 1);
-			i += 1;
-			continue;
-		}
-		if (ch === " " || ch === "	") {
-			if (current) {
-				tokens.push(current);
-				current = "";
-			}
-			continue;
-		}
-		current += ch;
-	}
-	if (quote) return null;
-	if (current) tokens.push(current);
-	if (tokens.length === 0) return null;
-	const paths = [];
-	for (const token of tokens) {
-		let path = token;
-		if (path.startsWith("file://")) {
-			const resolved = fileUrlToPath(path);
-			if (resolved === null) return null;
-			path = resolved;
-		}
-		if (path.startsWith("~/")) path = `${homedir()}${path.slice(1)}`;
-		if (!isAbsolute(path) && !win32.isAbsolute(path) && !path.startsWith("./") && !path.startsWith("../")) return null;
-		paths.push(path);
-	}
-	return paths;
-}
-const TEXT_MIME_BY_EXT = {
-	".txt": "text/plain",
-	".md": "text/markdown",
-	".markdown": "text/markdown",
-	".csv": "text/csv",
-	".tsv": "text/tab-separated-values",
-	".json": "application/json",
-	".yaml": "application/yaml",
-	".yml": "application/yaml",
-	".xml": "application/xml",
-	".html": "text/html",
-	".htm": "text/html",
-	".css": "text/css",
-	".js": "text/javascript",
-	".ts": "text/plain",
-	".tsx": "text/plain",
-	".jsx": "text/plain",
-	".py": "text/x-python",
-	".sh": "text/x-shellscript",
-	".log": "text/plain",
-	".svg": "image/svg+xml"
-};
-/** Decide how to handle a paste. `kind: 'binary'` events carry the mime of
-* bytes the terminal forwarded; text events carry the decoded paste text.
-*
-* The empty-text case is the fix for "can't paste an image": on macOS the
-* reflex is Cmd+V, which the terminal turns into a bracketed *text* paste, so
-* a screenshot on the clipboard arrives as empty bytes. We route that to an OS
-* clipboard read instead of dropping it, matching the explicit ctrl+v path. */
-function routePaste(input) {
-	if (input.kind === "binary") {
-		if (input.mimeType?.startsWith("image/")) return {
-			kind: "binary-image",
-			mediaType: input.mimeType
-		};
-		return { kind: "text" };
-	}
-	const paths = parseDroppedPaths(input.text);
-	if (paths) return {
-		kind: "dropped-paths",
-		paths,
-		text: input.text
+	const titleBudget = width - GLYPH - tagCost - timeCost;
+	if (titleBudget < 8) return {
+		title: truncate(title, Math.max(1, width - GLYPH - tagCost)),
+		time: ""
 	};
-	if (input.text.trim() === "") return { kind: "clipboard-image" };
-	return { kind: "text" };
+	const fitTitle = truncate(title, titleBudget);
+	const used = GLYPH + fitTitle.length + tagCost;
+	const pad = Math.max(1, width - used - time.length);
+	return {
+		title: fitTitle,
+		time: `${" ".repeat(pad)}${time}`
+	};
+}
+function relativeTime(iso) {
+	const diffMs = Date.now() - new Date(iso).getTime();
+	if (diffMs < 6e4) return "just now";
+	if (diffMs < 36e5) return `${Math.floor(diffMs / 6e4)}m ago`;
+	if (diffMs < 864e5) return `${Math.floor(diffMs / 36e5)}h ago`;
+	return `${Math.floor(diffMs / 864e5)}d ago`;
 }
+
+//#endregion
+//#region src/chat/conversation-ref.ts
 /**
-* Resolve path candidates into attachable files. Every path must be an
-* existing regular file; otherwise the caller should restore the original
-* paste as text (an all-or-nothing rule so a paste meant as text — which
-* merely *looks* path-shaped — is never partially eaten).
+* Parsing the conversation reference a user hands `/conversation`.
 *
-* Any file type attaches. The mediaType comes from magic bytes when
-* detectable, an extension map for the plain-text formats magic can't see,
-* and application/octet-stream as the last resort — the attachments API
-* accepts any mediaType (100MB cap enforced server-side at presign).
+* The whole point of the command is that you paste whatever you already have
+* in front of you, so every form the platform hands out has to work: a bare
+* id, the `https://skydive.com/c/<id>` link an agent replies with, or the
+* `skydive chat --resume <id>` line the TUI prints on exit. All three carry
+* exactly one id, so we pull the first uuid out of the string rather than
+* teaching this about URL shapes and command syntax.
+*
+* Validating here (instead of letting the API answer) is what turns a typo
+* into "not a conversation id" in the composer rather than a request that
+* cannot succeed.
 */
-async function resolveDroppedFiles(paths) {
-	try {
-		const files = await Promise.all(paths.map(async (path) => {
-			if (!(await stat(path)).isFile()) return null;
-			const data = new Uint8Array(await readFile(path));
-			const mediaType = (await fileTypeFromBuffer(data))?.mime ?? TEXT_MIME_BY_EXT[extname(path).toLowerCase()] ?? "application/octet-stream";
-			return {
-				fileName: basename(path),
-				mediaType,
-				data
-			};
-		}));
-		if (!files.every((file) => file !== null)) return null;
-		return files;
-	} catch (_error) {
-		return null;
-	}
+const uuidPattern = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i;
+/**
+* The conversation id in `input`, lowercased, or null when there isn't one.
+* Trailing punctuation, query strings and surrounding prose are tolerated —
+* a pasted link or command line is the expected input, not the exception.
+*/
+function parseConversationRef(input) {
+	const match = uuidPattern.exec(input);
+	return match ? match[0].toLowerCase() : null;
+}
+
+//#endregion
+//#region src/chat/transcript-export.ts
+function messageText(message) {
+	const chunks = [];
+	for (const part of message.parts) if ((part.type === "text" || part.type === "reasoning") && "text" in part && typeof part.text === "string") chunks.push(part.text);
+	else if (part.type === "dynamic-tool" && "toolName" in part) chunks.push(`[tool: ${typeof part.toolName === "string" ? part.toolName : "tool"}]`);
+	return chunks.join("\n").trim();
+}
+function messageLabel(message) {
+	if (message.role === "user") return "User";
+	if (message.role === "assistant") return message.metadata?.custom?.agentName ?? "Assistant";
+	return message.role.charAt(0).toUpperCase() + message.role.slice(1);
+}
+function parseTranscriptFormat(value) {
+	const normalized = value.trim().toLowerCase();
+	if (!normalized || normalized === "md" || normalized === "markdown") return "markdown";
+	if (normalized === "txt" || normalized === "text") return "text";
+	return null;
+}
+function formatTranscript(messages, format) {
+	const entries = messages.flatMap((message) => {
+		const text = messageText(message);
+		if (!text) return [];
+		const label = messageLabel(message);
+		return [format === "markdown" ? `## ${label}\n\n${text}` : `[${label}]\n${text}`];
+	});
+	if (format === "markdown") return `# Conversation transcript\n\n${entries.join("\n\n")}\n`;
+	return `${entries.join("\n\n")}\n`;
+}
+async function exportTranscript(options) {
+	const extension = options.format === "markdown" ? "md" : "txt";
+	const filePath = path.join(options.cwd, `skydive-conversation-${options.conversationId}.${extension}`);
+	await writeFile(filePath, formatTranscript(options.messages, options.format), "utf8");
+	return filePath;
 }
 
 //#endregion
@@ -5994,9 +6269,9 @@ function stripLeadingMarker(s) {
 }
 const ELISION_MARKER_TAG = "⋯ elided";
 function elisionMarker(bytes) {
-	return `${ELISION_MARKER_TAG} ${formatBytes$2(bytes)} to save memory ⋯`;
+	return `${ELISION_MARKER_TAG} ${formatBytes$1(bytes)} to save memory ⋯`;
 }
-function formatBytes$2(n) {
+function formatBytes$1(n) {
 	if (n < 1024) return `${n} chars`;
 	if (n < 1024 * 1024) return `${(n / 1024).toFixed(1)} KB`;
 	return `${(n / (1024 * 1024)).toFixed(1)} MB`;
@@ -7018,6 +7293,14 @@ function latestTodosFromHistory(messages) {
 	}
 	return null;
 }
+/**
+* Whether the plan has work left in it: any row still pending or in
+* progress. A plan with none is a record of finished work, which is what lets
+* a reopened conversation fold its card to the header row.
+*/
+function todosHaveLiveWork(todos) {
+	return todos.some((todo) => todo.status === "pending" || todo.status === "in_progress");
+}
 /** How many todo rows the card shows before it caps the tail with "+N more". */
 const MAX_VISIBLE_ROWS$1 = 6;
 /** Fit `rest` under `rowBudget`, spending the last row on a "+N more" tail. */
@@ -7060,13 +7343,13 @@ function todosCanExpand(todos, cap) {
 * done-summary line + rendered rows + optional "+N more" tail + top margin.
 * Must track `windowTodos` and `TodoCardView`'s layout.
 *
-* `collapsed` is the minimized card: the header row (label, progress counter
-* and the chevron that brings the rows back) plus the top margin, and nothing
-* else, however long the list is.
+* `minimized` is the card folded down to its header row (label, progress
+* counter and the chevron that brings the rows back) plus the top margin, and
+* nothing else, however long the list is.
 */
-function todoCardHeight(todos, { expanded, collapsed }) {
+function todoCardHeight(todos, { expanded, minimized }) {
 	if (todos.length === 0) return 0;
-	if (collapsed) return 2;
+	if (minimized) return 2;
 	const w = windowTodos(todos, {
 		cap: MAX_VISIBLE_ROWS$1,
 		expanded
@@ -7114,13 +7397,17 @@ function rowColor$1(status) {
 * The card has two independent click targets, one per axis of "how much do I
 * show":
 *  - the **header** minimizes the card to that one row and back
-*    (`collapsed` / `onToggleCollapsed`), which is what keeps a long plan from
+*    (`minimized` / `onToggleMinimized`), which is what keeps a long plan from
 *    eating the screen above the composer. The chevron carries the affordance.
 *  - the **body** unfolds the completed work the window hides
 *    (`expanded` / `onToggleExpanded`), the same interaction reasoning and
 *    tool output already use. Only clickable when something is actually folded.
+*
+* Each surface names the other in its hint, since a chevron alone can't say
+* which click does which: folded, the `✔ N done` row offers the unfold;
+* unfolded, the header says the rows are what folds back.
 */
-function TaskCardContent({ label, todos, isActive, collapsed, expanded, onToggleCollapsed, onToggleExpanded }) {
+function TaskCardContent({ label, todos, isActive, minimized, expanded, onToggleMinimized, onToggleExpanded }) {
 	const completed = todos.filter((todo) => todo.status === "completed").length;
 	const canExpand = todosCanExpand(todos, MAX_VISIBLE_ROWS$1);
 	const { doneSummary, rows, moreCount } = windowTodos(todos, {
@@ -7131,11 +7418,11 @@ function TaskCardContent({ label, todos, isActive, collapsed, expanded, onToggle
 		style: { flexDirection: "column" },
 		children: [/* @__PURE__ */ jsxs("box", {
 			style: { flexDirection: "row" },
-			onMouseDown: onToggleCollapsed,
+			onMouseDown: onToggleMinimized,
 			children: [
 				/* @__PURE__ */ jsx("text", {
 					fg: theme.dim,
-					children: collapsed ? "▸ " : "▾ "
+					children: minimized ? "▸ " : "▾ "
 				}),
 				/* @__PURE__ */ jsx("text", {
 					fg: isActive ? theme.accent : theme.muted,
@@ -7149,9 +7436,13 @@ function TaskCardContent({ label, todos, isActive, collapsed, expanded, onToggle
 						"/",
 						todos.length
 					]
-				})
+				}),
+				!minimized && expanded && canExpand ? /* @__PURE__ */ jsxs("text", {
+					fg: theme.dim,
+					children: ["  ", "· click a row to fold"]
+				}) : null
 			]
-		}), collapsed ? null : /* @__PURE__ */ jsxs("box", {
+		}), minimized ? null : /* @__PURE__ */ jsxs("box", {
 			style: { flexDirection: "column" },
 			onMouseDown: canExpand ? onToggleExpanded : void 0,
 			children: [
@@ -7210,11 +7501,11 @@ function TaskCardContent({ label, todos, isActive, collapsed, expanded, onToggle
 * work. `isActive` dims the header while the run is idle. `expanded` unfolds
 * the completed work the window hides — a settled plan collapses to `✔ N done`
 * otherwise, and clicking the body (or `/plan expand`) brings the rows back.
-* `collapsed` is the minimized card: header only, so a long plan can be kept
-* out of the way (click the header, or `/plan collapse`) without losing the
-* label and progress counter the way `/plan hide` does.
+* `minimized` is the card folded down to its header row, so a long plan can be
+* kept out of the way (click the header, or `/plan minimize`) without losing
+* the label and progress counter the way `/plan hide` does.
 */
-function TodoCardView({ todos, isActive, collapsed, expanded, onToggleCollapsed, onToggleExpanded }) {
+function TodoCardView({ todos, isActive, minimized, expanded, onToggleMinimized, onToggleExpanded }) {
 	if (todos.length === 0) return null;
 	return /* @__PURE__ */ jsx("box", {
 		style: {
@@ -7228,9 +7519,9 @@ function TodoCardView({ todos, isActive, collapsed, expanded, onToggleCollapsed,
 			label: "Plan",
 			todos,
 			isActive,
-			collapsed,
+			minimized,
 			expanded,
-			onToggleCollapsed,
+			onToggleMinimized,
 			onToggleExpanded
 		})
 	});
@@ -7574,13 +7865,13 @@ function SubagentRowView({ row, selected, width, nowMs, onOpen }) {
 * the card reports its rows up through ConversationContext so the screen
 * knows what's selectable).
 *
-* `collapsed` minimizes the card to its header row: a wide fan-out is 10 rows
+* `minimized` folds the card down to its header row: a wide fan-out is 10 rows
 * of the terminal for as long as the conversation lives, so clicking the
 * header (or `/subagent collapse`) folds the rows away and leaves the label,
 * the live glyph and the N/M counter. The chat screen owns the flag because it
 * reserves the card's rows to keep the composer pinned.
 */
-function ToolSubagent({ items, isActive: _isActive, collapsed, onToggleCollapsed, onHeightChange }) {
+function ToolSubagent({ items, isActive: _isActive, minimized, onToggleMinimized, onHeightChange }) {
 	const { rest, conversationId, openConversation, onSubagentBatch, subagentSelection } = useConversationContext();
 	const { width } = useTerminalDimensions();
 	const optimistic = /* @__PURE__ */ new Map();
@@ -7614,7 +7905,8 @@ function ToolSubagent({ items, isActive: _isActive, collapsed, onToggleCollapsed
 		queued,
 		fetched
 	});
-	const live = fetched === null || rows.some((row) => isLiveStatus(row.status));
+	const resolved = fetched !== null;
+	const live = !resolved || rows.some((row) => isLiveStatus(row.status));
 	const [nowMs, setNowMs] = useState(() => Date.now());
 	useEffect(() => {
 		if (!live || rows.length === 0) return;
@@ -7623,9 +7915,9 @@ function ToolSubagent({ items, isActive: _isActive, collapsed, onToggleCollapsed
 	}, [live, rows.length]);
 	useEffect(() => {
 		const visibleRows = Math.min(rows.length, MAX_VISIBLE_ROWS);
-		onHeightChange?.(rows.length === 0 ? items.length > 0 ? 1 : 0 : collapsed ? 1 : 1 + visibleRows + (rows.length > MAX_VISIBLE_ROWS ? 1 : 0));
+		onHeightChange?.(rows.length === 0 ? items.length > 0 ? 1 : 0 : minimized ? 1 : 1 + visibleRows + (rows.length > MAX_VISIBLE_ROWS ? 1 : 0));
 	}, [
-		collapsed,
+		minimized,
 		items.length,
 		onHeightChange,
 		rows.length
@@ -7657,6 +7949,7 @@ function ToolSubagent({ items, isActive: _isActive, collapsed, onToggleCollapsed
 		onSubagentBatch({
 			toolCallId: conversationId,
 			live,
+			resolved,
 			rows: rows.map((row) => ({
 				id: row.id,
 				conversationId: row.conversationId
@@ -7666,6 +7959,7 @@ function ToolSubagent({ items, isActive: _isActive, collapsed, onToggleCollapsed
 		onSubagentBatch,
 		conversationId,
 		live,
+		resolved,
 		rows.map((row) => `${row.id}:${row.status}:${row.conversationId ?? ""}`).join("|")
 	]);
 	if (rows.length === 0) {
@@ -7686,11 +7980,11 @@ function ToolSubagent({ items, isActive: _isActive, collapsed, onToggleCollapsed
 		style: { flexDirection: "column" },
 		children: [/* @__PURE__ */ jsx("box", {
 			style: { flexDirection: "row" },
-			onMouseDown: onToggleCollapsed,
+			onMouseDown: onToggleMinimized,
 			children: /* @__PURE__ */ jsxs("text", { children: [
 				/* @__PURE__ */ jsx("span", {
 					fg: theme.dim,
-					children: collapsed ? "▸ " : "▾ "
+					children: minimized ? "▸ " : "▾ "
 				}),
 				live ? /* @__PURE__ */ jsx(Spinner, { color: theme.accent }) : rows.every((row) => row.status === "completed") ? /* @__PURE__ */ jsx("span", {
 					fg: theme.success,
@@ -7712,12 +8006,12 @@ function ToolSubagent({ items, isActive: _isActive, collapsed, onToggleCollapsed
 						rows.length
 					]
 				}),
-				openConversation && !collapsed ? /* @__PURE__ */ jsxs("span", {
+				openConversation && !minimized ? /* @__PURE__ */ jsxs("span", {
 					fg: theme.dim,
 					children: ["  ", selectedIndex !== null ? "↑/↓ select · ↵ view · esc back" : "/subagent to browse"]
 				}) : null
 			] })
-		}), collapsed ? null : /* @__PURE__ */ jsxs("box", {
+		}), minimized ? null : /* @__PURE__ */ jsxs("box", {
 			style: { flexDirection: "column" },
 			children: [visible.map((row, i) => {
 				const target = row.conversationId;
@@ -7744,11 +8038,11 @@ function ToolSubagent({ items, isActive: _isActive, collapsed, onToggleCollapsed
 * a settled batch keeps its rows — titles and drill-in — until the next
 * fan-out replaces the group.
 *
-* `collapsed` folds the rows away and leaves the header (click it, or
-* `/subagent collapse`), so a ten-task fan-out stops owning ten rows above the
+* `minimized` folds the rows away and leaves the header (click it, or
+* `/subagent minimize`), so a ten-task fan-out stops owning ten rows above the
 * composer for the rest of the conversation.
 */
-function SubagentCardView({ items, isActive, collapsed, onToggleCollapsed, onHeightChange }) {
+function SubagentCardView({ items, isActive, minimized, onToggleMinimized, onHeightChange }) {
 	const [height, setHeight] = useState(0);
 	useEffect(() => onHeightChange?.(height > 0 ? height + 1 : 0), [height, onHeightChange]);
 	return /* @__PURE__ */ jsx("box", {
@@ -7763,8 +8057,8 @@ function SubagentCardView({ items, isActive, collapsed, onToggleCollapsed, onHei
 		children: /* @__PURE__ */ jsx(ToolSubagent, {
 			items,
 			isActive,
-			collapsed,
-			onToggleCollapsed,
+			minimized,
+			onToggleMinimized,
 			onHeightChange: setHeight
 		})
 	});
@@ -8793,20 +9087,20 @@ const keybindGroups = [
 				action: "jump back to your last message"
 			},
 			{
-				keys: "click header",
-				action: "minimize / expand the pinned plan or subagents card"
+				keys: "click card header",
+				action: "minimize the pinned plan or subagents card, and restore it"
 			},
 			{
-				keys: "click",
+				keys: "click card body",
 				action: "expand a folded plan card back to its finished rows"
 			},
 			{
-				keys: "/plan [show|hide|collapse|expand]",
-				action: "show / hide / minimize / unfold the pinned plan card"
+				keys: "/plan [show|hide|minimize|expand|collapse]",
+				action: "show / hide / minimize the pinned plan card, or unfold it"
 			},
 			{
-				keys: "/subagent [collapse|expand]",
-				action: "browse the pinned subagents card, or minimize / expand it"
+				keys: "/subagent [minimize]",
+				action: "browse the pinned subagents card, or minimize it"
 			},
 			{
 				keys: "/rename <title>",
@@ -8960,6 +9254,18 @@ const keybindGroups = [
 				keys: "↵",
 				action: "open conversation"
 			},
+			{
+				keys: "ctrl+v",
+				action: "paste image from clipboard"
+			},
+			{
+				keys: "drag-drop",
+				action: "attach image files dropped onto the terminal"
+			},
+			{
+				keys: "ctrl+x",
+				action: "drop the last staged image"
+			},
 			{
 				keys: "ctrl+a",
 				action: "archive conversation (hides it for you only; again to restore)"
@@ -9511,12 +9817,9 @@ const slashCommands = [
 	{
 		name: "subagent",
 		aliases: ["subagents"],
-		argsHint: "[collapse|expand]",
-		description: "browse, minimize or expand the fan-out card",
-		action: {
-			kind: "subagent",
-			mode: "browse"
-		}
+		argsHint: "[minimize]",
+		description: "browse or minimize the fan-out card",
+		action: { kind: "subagent" }
 	},
 	{
 		name: "status",
@@ -9535,8 +9838,8 @@ const slashCommands = [
 	{
 		name: "plan",
 		aliases: ["todos", "todo"],
-		argsHint: "[show|hide|collapse|expand]",
-		description: "show, hide, minimize or expand the pinned plan",
+		argsHint: "[show|hide|minimize|expand|collapse]",
+		description: "show, hide, minimize, or unfold the pinned plan card",
 		action: {
 			kind: "plan",
 			mode: "toggle"
@@ -11847,7 +12150,7 @@ function canPreview(file) {
 	if (/\/(json|xml|javascript|typescript|x-sh|yaml)$/.test(file.mediaType)) return true;
 	return /\.(md|mdx|txt|json|jsonl|ya?ml|toml|ini|env|csv|ts|tsx|js|jsx|mjs|cjs|css|scss|html|xml|svg|py|rb|rs|go|java|kt|swift|c|cc|cpp|h|hpp|sh|zsh|fish|sql|graphql|gql)$/i.test(file.path);
 }
-function formatBytes$1(bytes) {
+function formatBytes(bytes) {
 	if (bytes < 1024) return `${bytes} B`;
 	if (bytes < 1024 * 1024) return `${Math.round(bytes / 1024)} KB`;
 	return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
@@ -11915,7 +12218,7 @@ function WorkspaceFilesTab({ agentId, viewportWidth, viewportHeight, active, she
 	]);
 	const visibleFiles = useMemo(() => load.kind === "ready" ? filterReviewFiles(load.files, fileSearch ?? "", (file) => file.path) : [], [load, fileSearch]);
 	const rows = useMemo(() => buildWorkspaceTree(visibleFiles), [visibleFiles]);
-	const navigatorPreferredWidth = reviewTreePreferredWidth(useMemo(() => buildReviewTree(visibleFiles, (file) => file.path), [visibleFiles]), (file) => ` · ${formatBytes$1(file.sizeBytes)}`.length);
+	const navigatorPreferredWidth = reviewTreePreferredWidth(useMemo(() => buildReviewTree(visibleFiles, (file) => file.path), [visibleFiles]), (file) => ` · ${formatBytes(file.sizeBytes)}`.length);
 	const shellDimensions = reviewShellDimensions({
 		width,
 		height: shellHeight,
@@ -11954,7 +12257,7 @@ function WorkspaceFilesTab({ agentId, viewportWidth, viewportHeight, active, she
 		if (!canPreview(selectedFile)) {
 			setPreview({
 				kind: "none",
-				message: `${selectedFile.mediaType} · ${formatBytes$1(selectedFile.sizeBytes)}\npreview unavailable for binary or large files`
+				message: `${selectedFile.mediaType} · ${formatBytes(selectedFile.sizeBytes)}\npreview unavailable for binary or large files`
 			});
 			return;
 		}
@@ -12193,7 +12496,7 @@ function WorkspaceFilesTab({ agentId, viewportWidth, viewportHeight, active, she
 					row.name,
 					/* @__PURE__ */ jsxs("span", {
 						fg: theme.faint,
-						children: [" · ", formatBytes$1(row.file.sizeBytes)]
+						children: [" · ", formatBytes(row.file.sizeBytes)]
 					})
 				]
 			}, row.file.id);
@@ -13375,16 +13678,13 @@ function routeInput(raw) {
 				const arg = match.rest.toLowerCase();
 				return {
 					kind: "plan",
-					mode: arg === "show" ? "show" : arg === "hide" ? "hide" : arg === "expand" ? "expand" : arg === "collapse" ? "collapse" : "toggle"
-				};
-			}
-			case "subagent": {
-				const arg = match.rest.toLowerCase();
-				return {
-					kind: "subagent",
-					mode: arg === "collapse" ? "collapse" : arg === "expand" ? "expand" : "browse"
+					mode: arg === "show" ? "show" : arg === "hide" ? "hide" : arg === "expand" ? "expand" : arg === "collapse" ? "collapse" : arg === "minimize" ? "minimize" : "toggle"
 				};
 			}
+			case "subagent": return {
+				kind: "subagent",
+				mode: match.rest.toLowerCase() === "minimize" ? "minimize" : "browse"
+			};
 			case "new-conversation":
 			case "fork":
 			case "archive-conversation":
@@ -13505,7 +13805,6 @@ const pageScrollFraction = .75;
 const HISTORY_PAGE_SIZE = 60;
 /** Cap composer growth; past this the textarea scrolls its content instead. */
 const maxComposerRows = 8;
-const maxAttachments = 10;
 /**
 * A server timestamp as local epoch ms, or null when it is missing or
 * unparseable so the caller can fall back to its own clock.
@@ -13515,18 +13814,9 @@ function parseStampMs(iso) {
 	const ms = Date.parse(iso);
 	return Number.isNaN(ms) ? null : ms;
 }
-function formatBytes(bytes) {
-	if (bytes < 1024) return `${bytes} B`;
-	if (bytes < 1024 * 1024) return `${Math.round(bytes / 1024)} KB`;
-	return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
-}
-/** Status glyph for a staged attachment chip: uploading / ready / failed. */
-function attachmentGlyph(a) {
-	switch (a.status) {
-		case "uploading": return "↑";
-		case "ready": return "✓";
-		case "error": return `✗ ${a.errorText ?? "upload failed"}`;
-	}
+/** State updater: undo an opened-finished fold, leave a reader's fold alone. */
+function unfoldSettled(current) {
+	return current === "settled" ? null : current;
 }
 /**
 * Open a URL in the user's local browser. Best-effort: over SSH there may be
@@ -13583,12 +13873,11 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 	const [planHidden, setPlanHidden] = useState(false);
 	const [planExpanded, setPlanExpanded] = useState(false);
 	const togglePlanExpanded = useCallback(() => setPlanExpanded((current) => !current), []);
-	const [planCollapsed, setPlanCollapsed] = useState(false);
-	const togglePlanCollapsed = useCallback(() => {
-		setPlanCollapsed((current) => {
-			if (current) setPlanExpanded(false);
-			return !current;
-		});
+	const [planMinimizedBy, setPlanMinimizedBy] = useState(null);
+	const planMinimized = planMinimizedBy !== null;
+	const togglePlanMinimized = useCallback(() => {
+		setPlanMinimizedBy((current) => current === null ? "reader" : null);
+		setPlanExpanded(false);
 	}, []);
 	const [subagentRows, setSubagentRows] = useState(0);
 	const [anchoredSubagentIds, setAnchoredSubagentIds] = useState([]);
@@ -13610,6 +13899,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 			setPlanExpanded(false);
 		}
 		hadTodosRef.current = hasTodos;
+		if (hasTodos && todosHaveLiveWork(todos)) setPlanMinimizedBy(unfoldSettled);
 	}, [todos]);
 	const [historyLoaded, setHistoryLoaded] = useState(initialConversationId === null);
 	const [input, setInput] = useState(() => useStore.getState().takeEarlyInput());
@@ -13621,12 +13911,11 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 	const [modelPickerView, setModelPickerView] = useState(null);
 	const modelPickerOpen = modelPickerView !== null;
 	const [subagentSelection, setSubagentSelection] = useState(null);
-	const [subagentCollapsed, setSubagentCollapsed] = useState(false);
-	const toggleSubagentCollapsed = useCallback(() => {
-		setSubagentCollapsed((current) => {
-			if (!current) setSubagentSelection(null);
-			return !current;
-		});
+	const [subagentMinimizedBy, setSubagentMinimizedBy] = useState(null);
+	const subagentMinimized = subagentMinimizedBy !== null;
+	const toggleSubagentMinimized = useCallback(() => {
+		setSubagentMinimizedBy((current) => current === null ? "reader" : null);
+		setSubagentSelection(null);
 	}, []);
 	const [subagentBatches, setSubagentBatches] = useState(() => /* @__PURE__ */ new Map());
 	const onSubagentBatch = useCallback((report) => {
@@ -13661,8 +13950,6 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 	}, [initialConversationId]);
 	const [ctrlCArmed, setCtrlCArmed] = useState(false);
 	const [composerRows, setComposerRows] = useState(1);
-	const [attachments, setAttachments] = useState([]);
-	const uploadsRef = useRef(/* @__PURE__ */ new Map());
 	const [forking, setForking] = useState(false);
 	const forkingRef = useRef(false);
 	const [credPrompt, setCredPrompt] = useState(null);
@@ -13672,6 +13959,20 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 	const [askPrompt, setAskPrompt] = useState(null);
 	const askPromptOpen = askPrompt !== null;
 	const [restartConfirm, setRestartConfirm] = useState(false);
+	const { staged: attachments, stagedRef: attachmentsRef, stageClipboardImage, dropLast: dropLastAttachment, clearStaged: clearAttachments, collectForSend, adoptUploaded, releaseUploaded, restoreStaged } = useComposerAttachments({
+		rest,
+		agentId: agent.id,
+		pasteDisabled: cardPickerOpen || modelPickerOpen || themePickerOpen || prPickerOpen || helpOpen || creditsOpen || bgTasksOpen || credPromptOpen || Boolean(grantPrompt) || computePromptOpen || askPromptOpen || restartConfirm || nonWebChannel !== null,
+		onPasteText: (text) => {
+			composerRef.current?.insertText(text);
+			handleComposerChange();
+		},
+		onError: (message) => setItems((prev) => [...prev, {
+			kind: "error",
+			id: crypto.randomUUID(),
+			text: message
+		}])
+	});
 	const [menuDismissed, setMenuDismissed] = useState(false);
 	const [menuHighlight, setMenuHighlight] = useState(0);
 	const commandQuery = grantPrompt || credPrompt || computePrompt || askPrompt || restartConfirm ? null : detectCommandTrigger(input);
@@ -13684,8 +13985,6 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 	conversationIdRef.current = conversationId;
 	const itemsRef = useRef(items);
 	itemsRef.current = items;
-	const attachmentsRef = useRef(attachments);
-	attachmentsRef.current = attachments;
 	const inputRef = useRef(input);
 	inputRef.current = input;
 	const credPromptRef = useRef(credPrompt);
@@ -13772,7 +14071,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 	const paneDragRef = useRef(null);
 	const composerBoxHeight = composerRows + 2;
 	const pendingVisible = !grantPrompt && !credPrompt && !computePrompt && !askPrompt && !nonWebChannel && attachments.length > 0;
-	const pendingRows = pendingVisible ? attachments.length + 2 : 0;
+	const pendingRows = pendingVisible ? attachmentTrayRows(attachments.length) : 0;
 	const credPromptHeight = 4 + (credPrompt && (credPrompt.error || credPrompt.submitting) ? 1 : 0);
 	const nonWebNoticeHeight = 5;
 	const computePromptHeight = 4;
@@ -13795,7 +14094,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 	const todoCardVisible = !credPrompt && !planHidden && !!todos && todos.length > 0;
 	const todoRows = todoCardVisible ? todoCardHeight(todos, {
 		expanded: planExpanded,
-		collapsed: planCollapsed
+		minimized: planMinimized
 	}) : 0;
 	const subagentItems = useMemo(() => {
 		const ids = new Set(anchoredSubagentIds);
@@ -13808,6 +14107,13 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 	}, [conversationId, subagentBatches]);
 	const anchoredSubagentBatchRef = useRef(anchoredSubagentBatch);
 	anchoredSubagentBatchRef.current = anchoredSubagentBatch;
+	const subagentStatusResolvedRef = useRef(false);
+	useEffect(() => {
+		if (!anchoredSubagentBatch?.resolved) return;
+		if (anchoredSubagentBatch.live) setSubagentMinimizedBy(unfoldSettled);
+		else if (!subagentStatusResolvedRef.current) setSubagentMinimizedBy((current) => current ?? "settled");
+		subagentStatusResolvedRef.current = true;
+	}, [anchoredSubagentBatch]);
 	useEffect(() => {
 		setSubagentSelection((sel) => {
 			if (!sel) return sel;
@@ -13908,7 +14214,9 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 				const anchors = subagentAnchorsFromHistory(loaded);
 				if (anchors.length > 0) setAnchoredSubagentIds((current) => [...new Set([...anchors, ...current])]);
 				seedPrLinks(loaded);
-				setTodos(latestTodosFromHistory(firstPage.messages));
+				const loadedTodos = latestTodosFromHistory(firstPage.messages);
+				setTodos(loadedTodos);
+				if (loadedTodos?.length && !todosHaveLiveWork(loadedTodos)) setPlanMinimizedBy("settled");
 				setHistoryLoaded(true);
 				let before = firstPage.hasMore ? firstPage.nextBefore : null;
 				while (before) {
@@ -14110,28 +14418,13 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 			startedAtMs: Date.now()
 		});
 		try {
-			const attachmentIds = [];
-			const restorable = [];
-			const settled = await Promise.allSettled(staged.map((a) => uploadsRef.current.get(a.tempId)));
-			for (const [i, result] of settled.entries()) {
-				const row = staged[i];
-				if (!row) continue;
-				if (result.status === "fulfilled" && result.value) {
-					attachmentIds.push(result.value.id);
-					restorable.push({
-						...row,
-						status: "ready",
-						errorText: null
-					});
-				} else {
-					uploadsRef.current.delete(row.tempId);
-					setItems((prev) => [...prev, {
-						kind: "error",
-						id: crypto.randomUUID(),
-						text: `attachment failed: ${row.fileName}${result.status === "rejected" ? ` (${errorDetail(result.reason)})` : ""}`
-					}]);
-				}
-			}
+			const { files, rows, failed } = await collectForSend(staged);
+			const attachmentIds = files.map((file) => file.id);
+			for (const { attachment, reason } of failed) setItems((prev) => [...prev, {
+				kind: "error",
+				id: crypto.randomUUID(),
+				text: `attachment failed: ${attachment.fileName}${reason === null ? "" : ` (${errorDetail(reason)})`}`
+			}]);
 			if (!trimmed && attachmentIds.length === 0) {
 				setItems((prev) => prev.filter((m) => m.id !== optimisticId));
 				if (!wasStreaming) setRun({ kind: "idle" });
@@ -14144,7 +14437,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 				attachmentIds,
 				clientSurface: "tui"
 			});
-			for (const row of restorable) uploadsRef.current.delete(row.tempId);
+			releaseUploaded(rows);
 			if (result.isNewConversation) setConversationId(result.conversationId);
 			if (result.steered) {
 				const directiveId = result.directive?.id;
@@ -14174,27 +14467,26 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 				text: sendErrorMessage(err)
 			}]);
 			if (echo) setInput((existing) => existing ? existing : trimmed);
-			const restore = staged.filter((a) => uploadsRef.current.has(a.tempId));
-			if (restore.length > 0) setAttachments((prev) => [...restore.map((a) => ({
-				...a,
-				status: "ready",
-				errorText: null
-			})), ...prev]);
+			restoreStaged(staged);
 			if (!wasStreaming) setRun({ kind: "idle" });
 		}
 	}, [
 		rest,
 		agent.id,
 		conversationId,
-		attachToRun
+		attachToRun,
+		collectForSend,
+		releaseUploaded,
+		restoreStaged
 	]);
 	const portalStatus = portal.status;
 	useEffect(() => {
-		const { seedPrompt, autoGrantMachine } = useStore.getState();
-		if (!seedPrompt || !isNewConversation(conversation)) return;
+		const { seedPrompt, seedAttachments, autoGrantMachine } = useStore.getState();
+		if (!seedPrompt && seedAttachments.length === 0 || !isNewConversation(conversation)) return;
 		if (autoGrantMachine && (portalStatus === "off" || portalStatus === "connecting")) return;
 		useStore.setState({
 			seedPrompt: null,
+			seedAttachments: [],
 			autoGrantMachine: false
 		});
 		(async () => {
@@ -14212,7 +14504,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 					variant: "warning"
 				});
 			}
-			await sendContent(seedPrompt, []);
+			await sendContent(seedPrompt ?? "", adoptUploaded(seedAttachments));
 		})();
 	}, [
 		conversation,
@@ -14220,7 +14512,8 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 		portalClient,
 		agent.id,
 		agent.name,
-		sendContent
+		sendContent,
+		adoptUploaded
 	]);
 	const cancelLatestSteer = useCallback(() => {
 		if (!rest) return false;
@@ -14627,95 +14920,6 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 		if (detectCommandTrigger(composer.plainText) === null) setMenuDismissed(false);
 		setComposerRows(Math.min(Math.max(composer.editorView.getTotalVirtualLineCount(), 1), maxComposerRows));
 	}, []);
-	/**
-	* Stage a pasted/dropped file in the composer tray and start its upload
-	* immediately (the web composer's behavior). Submit awaits the in-flight
-	* uploads and carries the resulting attachment ids; the composer never
-	* blocks while an upload runs.
-	*/
-	const stageAttachment = useCallback(({ fileName, mediaType, data }) => {
-		if (!rest) return;
-		if (attachmentsRef.current.length >= maxAttachments) {
-			setItems((prev) => [...prev, {
-				kind: "error",
-				id: crypto.randomUUID(),
-				text: `attachment limit reached (${maxAttachments}); ${fileName} skipped`
-			}]);
-			return;
-		}
-		const tempId = crypto.randomUUID();
-		setAttachments((prev) => [...prev, {
-			tempId,
-			fileName,
-			sizeBytes: data.byteLength,
-			status: "uploading",
-			errorText: null
-		}]);
-		const promise = rest.uploadAttachment({
-			agentId: agent.id,
-			fileName,
-			mediaType,
-			data
-		});
-		uploadsRef.current.set(tempId, promise);
-		promise.then(() => {
-			setAttachments((prev) => prev.map((a) => a.tempId === tempId ? {
-				...a,
-				status: "ready"
-			} : a));
-		}).catch((err) => {
-			setAttachments((prev) => prev.map((a) => a.tempId === tempId ? {
-				...a,
-				status: "error",
-				errorText: errorMessage(err)
-			} : a));
-		});
-	}, [rest, agent.id]);
-	const stageFiles = useCallback((files) => {
-		for (const file of files) stageAttachment(file);
-	}, [stageAttachment]);
-	const pasteImage = useCallback(async () => {
-		const image = await readClipboardImage();
-		if (!image) return;
-		stageAttachment(image);
-	}, [stageAttachment]);
-	usePaste((event) => {
-		if (cardPickerOpen || modelPickerOpen || themePickerOpen || prPickerOpen || helpOpen || creditsOpen || bgTasksOpen || credPromptOpen || grantPrompt || computePromptOpen || askPromptOpen || restartConfirm || nonWebChannel) return;
-		const text = event.metadata?.kind === "binary" ? "" : decodePasteBytes(event.bytes);
-		const route = routePaste({
-			kind: event.metadata?.kind,
-			mimeType: event.metadata?.mimeType,
-			text
-		});
-		switch (route.kind) {
-			case "binary-image": {
-				event.preventDefault();
-				const ext = route.mediaType.split("/")[1]?.split("+")[0] ?? "png";
-				stageFiles([{
-					fileName: `pasted-image-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}.${ext}`,
-					mediaType: route.mediaType,
-					data: event.bytes
-				}]);
-				return;
-			}
-			case "clipboard-image":
-				event.preventDefault();
-				pasteImage();
-				return;
-			case "dropped-paths":
-				event.preventDefault();
-				resolveDroppedFiles(route.paths).then((files) => {
-					if (files) {
-						stageFiles(files);
-						return;
-					}
-					composerRef.current?.insertText(route.text);
-					handleComposerChange();
-				});
-				return;
-			case "text": return;
-		}
-	});
 	const applyComposerText = useCallback((text, caret) => {
 		const composer = composerRef.current;
 		if (!composer) return;
@@ -15226,23 +15430,19 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 					else setPrPickerOpen(true);
 					break;
 				case "subagent": {
+					if (routed.mode === "minimize") {
+						const next = !subagentMinimized;
+						setSubagentMinimizedBy(next ? "reader" : null);
+						if (next) setSubagentSelection(null);
+						useStore.getState().showToast({ message: next ? "subagents minimized (/subagent minimize again to restore)" : "subagents restored" });
+						break;
+					}
 					const batch = anchoredSubagentBatchRef.current;
 					if (!batch || batch.rows.length === 0) {
 						useStore.getState().showToast({ message: "no subagents in this conversation yet" });
 						break;
 					}
-					if (routed.mode === "collapse") {
-						setSubagentCollapsed(true);
-						setSubagentSelection(null);
-						useStore.getState().showToast({ message: "subagents collapsed (/subagent expand)" });
-						break;
-					}
-					if (routed.mode === "expand") {
-						setSubagentCollapsed(false);
-						useStore.getState().showToast({ message: "subagents expanded" });
-						break;
-					}
-					setSubagentCollapsed(false);
+					setSubagentMinimizedBy(null);
 					setSubagentSelection({
 						toolCallId: batch.toolCallId,
 						index: 0
@@ -15279,22 +15479,25 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 						useStore.getState().showToast({ message: "no plan to show yet" });
 						break;
 					}
-					if (routed.mode === "collapse") {
-						setPlanCollapsed(true);
+					if (routed.mode === "minimize") {
+						const next = !planMinimized;
+						setPlanMinimizedBy(next ? "reader" : null);
+						setPlanHidden(false);
 						setPlanExpanded(false);
-						useStore.getState().showToast({ message: "plan collapsed (/plan expand)" });
+						useStore.getState().showToast({ message: next ? "plan minimized (/plan minimize again to restore)" : "plan restored" });
 						break;
 					}
-					if (routed.mode === "expand") {
-						setPlanCollapsed(false);
-						setPlanExpanded(true);
+					if (routed.mode === "expand" || routed.mode === "collapse") {
+						const nextExpanded = routed.mode === "expand";
+						setPlanExpanded(nextExpanded);
 						setPlanHidden(false);
-						useStore.getState().showToast({ message: "plan expanded (/plan collapse)" });
+						setPlanMinimizedBy(null);
+						useStore.getState().showToast({ message: nextExpanded ? "plan expanded (/plan collapse)" : "plan collapsed" });
 						break;
 					}
 					const nextHidden = routed.mode === "toggle" ? !planHidden : routed.mode === "hide";
 					setPlanHidden(nextHidden);
-					if (!nextHidden) setPlanCollapsed(false);
+					if (!nextHidden) setPlanMinimizedBy(null);
 					useStore.getState().showToast({ message: nextHidden ? "plan hidden (/plan show)" : "plan shown" });
 					break;
 				}
@@ -15362,7 +15565,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 		setInput("");
 		composerRef.current?.clear();
 		setComposerRows(1);
-		setAttachments([]);
+		clearAttachments();
 		sendContent(content, staged);
 	}, [
 		history,
@@ -15382,6 +15585,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 		compactConversation,
 		quit,
 		sendContent,
+		clearAttachments,
 		goTo,
 		agent,
 		appUrl,
@@ -15393,6 +15597,8 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 		promptForCards,
 		todos,
 		planHidden,
+		planMinimized,
+		subagentMinimized,
 		prLinks.length
 	]);
 	const submit = useCallback(() => {
@@ -15635,16 +15841,12 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 		}
 		if (key.name === "v" && key.ctrl) {
 			if (nonWebChannel) return;
-			pasteImage();
+			stageClipboardImage();
 			return;
 		}
 		if (key.name === "x" && key.ctrl || key.name === "backspace" && attachmentsRef.current.length > 0 && !composerRef.current?.plainText) {
 			if (nonWebChannel) return;
-			const last = attachmentsRef.current.at(-1);
-			if (last) {
-				uploadsRef.current.delete(last.tempId);
-				setAttachments((prev) => prev.filter((a) => a.tempId !== last.tempId));
-			}
+			dropLastAttachment();
 			return;
 		}
 		if (key.name === "l" && key.ctrl) openInBrowser();
@@ -16039,16 +16241,16 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 			/* @__PURE__ */ jsx(SubagentCardView, {
 				items: subagentItems,
 				isActive: run.kind !== "idle",
-				collapsed: subagentCollapsed,
-				onToggleCollapsed: toggleSubagentCollapsed,
+				minimized: subagentMinimized,
+				onToggleMinimized: toggleSubagentMinimized,
 				onHeightChange: setSubagentRows
 			}),
 			todoCardVisible && todos ? /* @__PURE__ */ jsx(TodoCardView, {
 				todos,
 				isActive: run.kind !== "idle",
-				collapsed: planCollapsed,
+				minimized: planMinimized,
 				expanded: planExpanded,
-				onToggleCollapsed: togglePlanCollapsed,
+				onToggleMinimized: togglePlanMinimized,
 				onToggleExpanded: togglePlanExpanded
 			}) : null,
 			compacting ? /* @__PURE__ */ jsxs("box", {
@@ -16068,29 +16270,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 					children: ["  ", "you can keep typing"]
 				})]
 			}) : null,
-			pendingVisible ? /* @__PURE__ */ jsxs("box", {
-				style: {
-					paddingLeft: 1,
-					paddingRight: 1,
-					flexShrink: 0,
-					marginTop: 1,
-					flexDirection: "column"
-				},
-				children: [attachments.map((a) => /* @__PURE__ */ jsxs("text", {
-					fg: a.status === "error" ? theme.error : theme.muted,
-					children: [
-						"📎 ",
-						a.fileName,
-						" (",
-						formatBytes(a.sizeBytes),
-						") ",
-						attachmentGlyph(a)
-					]
-				}, a.tempId)), /* @__PURE__ */ jsx("text", {
-					fg: theme.dim,
-					children: "ctrl+x remove last"
-				})]
-			}) : null,
+			pendingVisible ? /* @__PURE__ */ jsx(AttachmentTray, { attachments }) : null,
 			menuOpen ? /* @__PURE__ */ jsx(CompletionMenu, {
 				items: menuCommands.map((c) => ({
 					id: c.name,