@alivault/pico 0.11.0 → 0.13.0

package/.output/server/_ssr/{routes-DGf2MDLT.mjs → routes-DySm_W8N.mjs}

@@ -1,8 +1,8 @@
 import { i as __toESM } from "../_runtime.mjs";
 import { $ as require_react, A as TabsTab, B as Input, C as MenuPositioner, D as MenuGroupLabel, E as MenuItem, F as DialogPopup, H as useRender, I as DialogDescription$1, L as DialogClose$1, M as DialogTitle$1, N as DialogRoot, O as MenuGroup, P as DialogPortal$1, Q as require_jsx_runtime, R as DialogBackdrop, S as MenuRoot, T as MenuPopup, V as Button, Y as mergeProps, _ as AccordionItem$1, a as ContextMenuRoot, b as MenuTrigger, c as CollapsibleRoot, d as PopoverPortal, f as PopoverTrigger$1, g as AccordionHeader, h as AccordionTrigger$1, i as ContextMenuTrigger$1, j as TabsRoot, k as TabsList$1, l as PopoverPopup, m as AccordionPanel, n as ToggleGroup, o as CollapsiblePanel, p as PopoverRoot, r as Toggle, s as CollapsibleTrigger$1, t as AlertDialogRoot, u as PopoverPositioner, v as AccordionRoot, w as MenuPortal, x as MenuSubmenuRoot, y as MenuSubmenuTrigger, z as Separator } from "../_libs/@base-ui/react+[...].mjs";
 import { t as cva } from "../_libs/class-variance-authority+clsx.mjs";
-import { A as ExternalLink, B as ChevronRight, C as ImagePlus, D as Folder, E as GitCommitHorizontal, F as Command, G as ArrowUpRight, H as Check, J as ArrowDown, L as ChevronsUpDown, M as EllipsisVertical, N as Download, O as FolderPlus, P as Copy, R as ChevronsDownUp, T as GitBranch, U as ArrowUp, V as ChevronDown, W as ArrowUpToLine, _ as OctagonX, a as TriangleAlert, b as ListStart, c as SquarePen, d as Plus, f as PanelRight, h as PanelLeftClose, i as Undo2, j as Ellipsis, k as FileDiff, l as Settings2, m as PanelLeftOpen, n as WandSparkles, o as Tag, p as PanelLeft, q as ArrowLeft, r as Upload, s as Square, t as X, u as Search, v as Minimize2, w as GitPullRequestArrow, x as ListEnd, y as Maximize2 } from "../_libs/lucide-react.mjs";
-import { $ as normalizeThemeFamily, A as Tooltip$1, C as SESSION_DONE_SOUND_ENABLED_STORAGE_KEY, Ct as themeFamilyDescription, D as THEME_FAMILIES, Dt as themeFamilySupportsColorMode, E as THEME_COLOR_MODE_STORAGE_KEY, Et as themeFamilyLabel, F as appliedThemeClass, H as createInitialSessionState, I as appliedThemeClassColorMode, K as flattenTree, N as TooltipTrigger, O as THEME_STORAGE_KEY, Ot as thinkingSummaryText, P as VIEWER_CONTEXT_STORAGE_KEY, Q as normalizeThemeColorMode, R as buildItemsFromSync, S as SESSION_DONE_DESKTOP_NOTIFICATIONS_ENABLED_STORAGE_KEY, St as themeColorModeLabel, T as Spinner, Tt as themeFamilyKeywords, V as createContextId, X as normalizeSessionSelectionKeys, Y as normalizePromptImage, Z as normalizeStoredDirectoryList, _ as RIGHT_SIDEBAR_HISTORY_HEIGHT_STORAGE_KEY, _t as rememberStoredPromptDraft, a as COLLAPSED_DIRECTORIES_STORAGE_KEY, at as readStoredCollapsedDirectories, b as RIGHT_SIDEBAR_WIDTHS_STORAGE_KEY, bt as sameContextUsage, c as Kbd, ct as readStoredPinnedSessionKeys, d as PICO_DIFF_SHIKI_THEMES, dt as readStoredRightSidebarOpen, et as previewUrlForImage, f as PICO_SHIKI_VARIABLE_DEFAULTS, ft as readStoredSessionDoneDesktopNotificationsEnabled, g as RIGHT_SIDEBAR_FILE_TREE_WIDTH_STORAGE_KEY, gt as readStoredThemeColorMode, h as RIGHT_SIDEBAR_ACTIVE_TAB_STORAGE_KEY, ht as readStoredTheme, i as CENTER_MESSAGES_STORAGE_KEY, it as readStoredCenterMessages, j as TooltipContent, k as TitleTooltip, l as KeyboardShortcutContent, lt as readStoredPromptDraft, m as RECENT_DIRECTORIES_STORAGE_KEY, mt as readStoredSidebarDirectories, n as APPLIED_THEME_STORAGE_KEY, nt as promptDraftKeyMatchesOwner, o as DRAFT_DIRECTORY_STORAGE_KEY, ot as readStoredDraftDirectory, p as PINNED_SESSIONS_STORAGE_KEY, pt as readStoredSessionDoneSoundEnabled, q as getSessionTitle, r as AUTO_SCROLL_ENABLED_STORAGE_KEY, rt as readStoredAutoScrollEnabled, s as HIDE_TOOL_BLOCKS_STORAGE_KEY, st as readStoredHideToolBlocks, tt as promptDraftKey, ut as readStoredRecentDirectories, v as RIGHT_SIDEBAR_HISTORY_TAB_STORAGE_KEY, vt as safeLocalStorageGetItem, w as SIDEBAR_DIRECTORIES_STORAGE_KEY, wt as themeFamilyFixedMode, x as Route, xt as sessionListEntryKey, y as RIGHT_SIDEBAR_OPEN_STORAGE_KEY, yt as safeLocalStorageSetItem, z as cn } from "./routes-D3Hu5M6D.mjs";
+import { A as Folder, B as ChevronsUpDown, C as ListStart, D as GitPullRequestArrow, E as ImagePlus, F as EllipsisVertical, G as Check, I as Download, J as ArrowUpRight, K as ArrowUp, L as Copy, M as FileDiff, N as ExternalLink, O as GitBranch, P as Ellipsis, R as Command, S as Maximize2, U as ChevronRight, V as ChevronsDownUp, W as ChevronDown, X as ArrowLeft, Z as ArrowDown, _ as PanelLeftClose, a as TriangleAlert, b as Minus, c as Square, d as Settings2, f as Search, g as PanelLeftOpen, h as PanelLeft, i as Undo2, j as FolderPlus, k as GitCommitHorizontal, l as SquareTerminal, m as PanelRight, n as WandSparkles, o as Trash2, p as Plus, q as ArrowUpToLine, r as Upload, s as Tag, t as X, u as SquarePen, w as ListEnd, x as Minimize2, y as OctagonX } from "../_libs/lucide-react.mjs";
+import { $ as normalizeSessionSelectionKeys, A as THEME_STORAGE_KEY, At as themeFamilyDescription, B as buildItemsFromSync, C as SESSION_DONE_SOUND_ENABLED_STORAGE_KEY, Ct as rememberStoredPromptDraft, D as TERMINAL_PANEL_OPEN_STORAGE_KEY, Dt as sameContextUsage, E as TERMINAL_PANEL_HEIGHT_STORAGE_KEY, Et as safeLocalStorageSetItem, F as TooltipTrigger, Ft as thinkingSummaryText, G as exploreShellCommandNameFromTool, I as VIEWER_CONTEXT_STORAGE_KEY, It as toolArgsAreIncompleteJsonObject, L as appliedThemeClass, Lt as toolCategoryFromTool, M as Tooltip$1, Mt as themeFamilyKeywords, N as TooltipContent, Nt as themeFamilyLabel, O as THEME_COLOR_MODE_STORAGE_KEY, Ot as sessionListEntryKey, Pt as themeFamilySupportsColorMode, Q as normalizePromptImage, R as appliedThemeClassColorMode, Rt as toolCouldBecomeExploreFromTool, S as SESSION_DONE_DESKTOP_NOTIFICATIONS_ENABLED_STORAGE_KEY, St as readStoredThemeColorMode, T as Spinner, Tt as safeLocalStorageGetItem, U as createContextId, V as cn, W as createInitialSessionState, X as getSessionTitle, Y as flattenTree, _ as RIGHT_SIDEBAR_HISTORY_HEIGHT_STORAGE_KEY, _t as readStoredSessionDoneSoundEnabled, a as COLLAPSED_DIRECTORIES_STORAGE_KEY, at as promptDraftKeyMatchesOwner, b as RIGHT_SIDEBAR_WIDTHS_STORAGE_KEY, bt as readStoredTerminalTabs, c as Kbd, ct as readStoredCenterMessages, d as PICO_DIFF_SHIKI_THEMES, dt as readStoredHideToolBlocks, et as normalizeStoredDirectoryList, f as PICO_SHIKI_VARIABLE_DEFAULTS, ft as readStoredPinnedSessionKeys, g as RIGHT_SIDEBAR_FILE_TREE_WIDTH_STORAGE_KEY, gt as readStoredSessionDoneDesktopNotificationsEnabled, h as RIGHT_SIDEBAR_ACTIVE_TAB_STORAGE_KEY, ht as readStoredRightSidebarOpen, i as CENTER_MESSAGES_STORAGE_KEY, it as promptDraftKey, j as TitleTooltip, jt as themeFamilyFixedMode, k as THEME_FAMILIES, kt as themeColorModeLabel, l as KeyboardShortcutContent, lt as readStoredCollapsedDirectories, m as RECENT_DIRECTORIES_STORAGE_KEY, mt as readStoredRecentDirectories, n as APPLIED_THEME_STORAGE_KEY, nt as normalizeThemeFamily, o as DRAFT_DIRECTORY_STORAGE_KEY, ot as rawShellCommandTextFromTool, p as PINNED_SESSIONS_STORAGE_KEY, pt as readStoredPromptDraft, r as AUTO_SCROLL_ENABLED_STORAGE_KEY, rt as previewUrlForImage, s as HIDE_TOOL_BLOCKS_STORAGE_KEY, st as readStoredAutoScrollEnabled, tt as normalizeThemeColorMode, ut as readStoredDraftDirectory, v as RIGHT_SIDEBAR_HISTORY_TAB_STORAGE_KEY, vt as readStoredSidebarDirectories, w as SIDEBAR_DIRECTORIES_STORAGE_KEY, wt as rememberStoredTerminalTabs, x as Route, xt as readStoredTheme, y as RIGHT_SIDEBAR_OPEN_STORAGE_KEY, yt as readStoredTerminalPanelOpen } from "./routes-CuWg5WTI.mjs";
 import { i as useQuery, n as useIsMutating, o as useQueryClient, r as useIsFetching, t as useMutation } from "../_libs/tanstack__react-query.mjs";
 import { t as useHotkeys } from "../_libs/tanstack__react-hotkeys.mjs";
 import { a as matchesKeyboardEvent, i as batch, o as formatForDisplay, r as createStore } from "../_libs/@tanstack/hotkeys+[...].mjs";
@@ -22,7 +22,7 @@ import { t as remarkGfm } from "../_libs/remark-gfm.mjs";
 import { a as getBuiltInSpriteSheet, i as getBuiltInFileIconColor, n as FileTree, r as createFileTreeIconResolver, t as useFileTree } from "../_libs/@pierre/trees+[...].mjs";
 import { a as closestCenter, c as useDraggable, d as useSensors, f as CSS$1, i as PointerSensor, n as DragOverlay, t as DndContext, u as useSensor } from "../_libs/@dnd-kit/core+[...].mjs";
 import { a as verticalListSortingStrategy, i as useSortable, n as arrayMove, r as horizontalListSortingStrategy, t as SortableContext } from "../_libs/dnd-kit__sortable.mjs";
-//#region node_modules/.nitro/vite/services/ssr/assets/routes-DGf2MDLT.js
+//#region node_modules/.nitro/vite/services/ssr/assets/routes-DySm_W8N.js
 var import_react = /* @__PURE__ */ __toESM(require_react());
 var import_jsx_runtime = require_jsx_runtime();
 var MOBILE_BREAKPOINT = 768;
@@ -503,8 +503,9 @@ function SidebarProvider({ defaultOpen = true, open: openProp, onOpenChange: set
 		window.addEventListener("keydown", handleKeyDown);
 		return () => window.removeEventListener("keydown", handleKeyDown);
 	}, [toggleSidebarRef]);
+	const state = open ? "expanded" : "collapsed";
 	const contextValue = {
-		state: open ? "expanded" : "collapsed",
+		state,
 		open,
 		setOpen,
 		isMobile,
@@ -522,6 +523,7 @@ function SidebarProvider({ defaultOpen = true, open: openProp, onOpenChange: set
 		value: contextValue,
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 			"data-slot": "sidebar-wrapper",
+			"data-sidebar-state": state,
 			style: {
 				...style,
 				"--sidebar-width": sidebarWidth,
@@ -6150,6 +6152,17 @@ function updateDirectoryIndexLoadingState(current, directories, loading) {
 	}
 	return changed ? next : current;
 }
+function normalizeOptimisticSidebarPreview(value) {
+	const text = value.replace(/\s+/g, " ").trim();
+	if (!text) return "";
+	if (text.length <= 240) return text;
+	return `${text.slice(0, 239).trimEnd()}…`;
+}
+function sidebarEntryMatchesIdentity(entry, identity) {
+	const sessionId = identity.sessionId?.trim() || "";
+	const sessionPath = identity.sessionPath?.trim() || "";
+	return Boolean(sessionPath && entry.path === sessionPath || sessionId && entry.id === sessionId);
+}
 function upsertOptimisticSidebarSessionEntry(current, entry) {
 	const directory = entry.cwd.trim();
 	const optimisticId = entry.id.trim();
@@ -6175,6 +6188,40 @@ function upsertOptimisticSidebarSessionEntry(current, entry) {
 		}
 	};
 }
+function updateOptimisticSidebarSessionPreviewEntry(current, options) {
+	const preview = normalizeOptimisticSidebarPreview(options.preview);
+	if (!preview) return current;
+	let changed = false;
+	const next = { ...current };
+	for (const [directory, snapshot] of Object.entries(current)) {
+		const updatedEntries = [];
+		let sessionsChanged = false;
+		const sessions = snapshot.sessions.map((entry) => {
+			if (!sidebarEntryMatchesIdentity(entry, options)) return entry;
+			const nextEntry = {
+				...entry,
+				modified: options.modified,
+				lastUserMessageAt: options.modified,
+				lastMessageAt: options.modified,
+				lastMessagePreview: preview,
+				streaming: true,
+				unread: false
+			};
+			updatedEntries.push(nextEntry);
+			sessionsChanged ||= nextEntry !== entry;
+			return nextEntry;
+		});
+		if (!sessionsChanged) continue;
+		const updatedKeys = new Set(updatedEntries.map(sessionListEntryKey));
+		next[directory] = {
+			...snapshot,
+			revision: `optimistic-preview:${options.modified}:${snapshot.revision}`,
+			sessions: [...updatedEntries, ...sessions.filter((entry) => !updatedKeys.has(sessionListEntryKey(entry)))]
+		};
+		changed = true;
+	}
+	return changed ? next : current;
+}
 function removeOptimisticSidebarSessionEntry(current, optimisticId) {
 	const targetId = optimisticId?.trim() || "";
 	if (!targetId) return current;
@@ -10573,10 +10620,9 @@ var PICO_DIFF_COLOR_CSS = `
   --diffs-bg-deletion-emphasis-override: color-mix(in lab, var(--diffs-bg) 42%, var(--diffs-deletion-base));
 }
 
-@media (max-width: 640px) {
-  [data-annotation-content] {
-    inline-size: min(100%, calc(100vw - var(--diffs-column-number-width, 0px) - 1rem));
-  }
+[data-overflow="wrap"] [data-annotation-content] {
+  inline-size: var(--diffs-column-content-width, auto);
+  max-inline-size: min(100%, calc(100vw - 1rem));
 }
 
 [data-line-type="change-addition"]:is(
@@ -10768,22 +10814,7 @@ function formatToolArgString(value) {
 	return trimmed;
 }
 function rawShellCommandText(block) {
-	if (block.type !== "tool" || block.name !== "bash") return "";
-	if (typeof block.args === "string") {
-		const trimmed = block.args.trim();
-		if (!trimmed) return "";
-		try {
-			const parsed = JSON.parse(trimmed);
-			if (parsed && typeof parsed === "object" && "command" in parsed) {
-				const command = parsed.command;
-				return typeof command === "string" ? command.trim() : trimmed;
-			}
-		} catch {
-			return trimmed;
-		}
-		return trimmed;
-	}
-	return getToolArgText(normalizeToolArgs(block.args), "command") || toolCommandPreview(block);
+	return block.type === "tool" ? rawShellCommandTextFromTool(block.name, block.args) : "";
 }
 function toolCallText(block) {
 	if (block.type !== "tool") return "";
@@ -10817,64 +10848,12 @@ function toolOutputText(block) {
 	if (block.isError) return "Tool failed with no output.";
 	return "No output available.";
 }
-var EXPLORE_TOOL_NAMES = new Set([
-	"read",
-	"grep",
-	"glob",
-	"find",
-	"ls",
-	"list",
-	"rg"
-]);
-var EXPLORE_SHELL_COMMAND_NAMES = new Set([
-	"find",
-	"grep",
-	"ls",
-	"rg"
-]);
-var SKIPPABLE_SHELL_COMMAND_NAMES = new Set([
-	"cd",
-	"export",
-	"pwd",
-	"set"
-]);
-var SHELL_COMMAND_WRAPPER_NAMES = new Set([
-	"command",
-	"env",
-	"noglob",
-	"sudo",
-	"time"
-]);
-function shellCommandNameFromSegment(segment) {
-	let text = segment.trim();
-	while (text) {
-		const assignmentMatch = text.match(/^[A-Za-z_][A-Za-z0-9_]*=\S+\s+/);
-		if (assignmentMatch) {
-			text = text.slice(assignmentMatch[0].length).trimStart();
-			continue;
-		}
-		const commandMatch = text.match(/^([./A-Za-z0-9_-]+)\b/);
-		if (!commandMatch) return "";
-		const commandPath = commandMatch[1] || "";
-		const commandName = pathBaseName$1(commandPath);
-		if (!SHELL_COMMAND_WRAPPER_NAMES.has(commandName)) return commandName;
-		text = text.slice(commandPath.length).trimStart();
-	}
-	return "";
-}
 function exploreShellCommandName(block) {
-	if (block.type !== "tool" || block.name !== "bash") return "";
-	const segments = rawShellCommandText(block).split(/(?:&&|\|\||;)/);
-	for (const segment of segments) {
-		const commandName = shellCommandNameFromSegment(segment);
-		if (!commandName || SKIPPABLE_SHELL_COMMAND_NAMES.has(commandName)) continue;
-		return EXPLORE_SHELL_COMMAND_NAMES.has(commandName) ? commandName : "";
-	}
-	return "";
+	return block.type === "tool" ? exploreShellCommandNameFromTool(block.name, block.args) : "";
 }
 function matchesExploreToolBlock(block) {
 	if (block.type !== "tool") return false;
-	return block.category === "explore" || EXPLORE_TOOL_NAMES.has(block.name || "") || Boolean(exploreShellCommandName(block));
+	return block.category === "explore" || toolCategoryFromTool(block.name, block.args) === "explore";
 }
 function isExploreToolBlock(block) {
 	return matchesExploreToolBlock(block);
@@ -10882,7 +10861,10 @@ function isExploreToolBlock(block) {
 function isPendingUnclassifiedToolBlock(block) {
 	if (block.type !== "tool" || !block.running || matchesExploreToolBlock(block)) return false;
 	if (!block.name) return true;
-	if (block.name === "bash") return !rawShellCommandText(block);
+	if (block.name === "bash") {
+		const category = toolCategoryFromTool(block.name, block.args);
+		return !rawShellCommandText(block) || category !== "explore" && (toolArgsAreIncompleteJsonObject(block.args) || toolCouldBecomeExploreFromTool(block.name, block.args));
+	}
 	return false;
 }
 function getToolArgNumber(args, key) {
@@ -11176,18 +11158,22 @@ function assistantMessagesModelLabel(items) {
 function assistantItemIsWorking(item) {
 	return Boolean(item.streaming) || item.done === false || item.blocks.some((block) => block.type === "tool" && block.running);
 }
+function assistantItemIsStreaming(item) {
+	return Boolean(item.streaming);
+}
 function assistantMessagesShellSnapshotFromBlocks(snapshot, blocks) {
 	const anchorBlockIndex = blocks.findIndex(assistantBlockIsMessageJumpAnchor);
 	const anchorBlock = anchorBlockIndex >= 0 ? blocks[anchorBlockIndex] : void 0;
 	const copyText = assistantCopyTextFromItems(snapshot.items);
 	const modelLabel = assistantMessagesModelLabel(snapshot.items);
+	const streaming = snapshot.items.some(assistantItemIsStreaming);
 	const working = snapshot.items.some(assistantItemIsWorking);
-	const hasFooter = Boolean(copyText.trim() || modelLabel || working);
+	const hasFooter = Boolean(copyText.trim() || modelLabel);
 	return {
 		...anchorBlock ? { anchorBlockKey: assistantBlockRenderKey(anchorBlock, anchorBlockIndex) } : {},
 		hasBlocks: blocks.length > 0,
 		hasFooter,
-		streaming: working,
+		streaming,
 		working,
 		copyText,
 		modelLabel
@@ -11676,7 +11662,7 @@ function PlainToolOutput({ isError = false, text }) {
 		children: text
 	});
 }
-function scrollDistanceFromBottom(element) {
+function scrollDistanceFromBottom$1(element) {
 	return element.scrollHeight - element.clientHeight - element.scrollTop;
 }
 function scrollElementToBottom(element) {
@@ -11700,7 +11686,7 @@ function useRunningToolAutoScroll({ contentKey, enabled }) {
 	}, [contentKey, enabled]);
 	const handleScroll = (event) => {
 		if (!enabled) return;
-		autoScrollRef.current = scrollDistanceFromBottom(event.currentTarget) < 1;
+		autoScrollRef.current = scrollDistanceFromBottom$1(event.currentTarget) < 1;
 	};
 	return {
 		onScroll: handleScroll,
@@ -12006,53 +11992,67 @@ var UserMessageCard = import_react.memo(function UserMessageCard({ item }) {
 	const selectedImage = selectedImageIndex === null ? null : item.images[selectedImageIndex] ?? null;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "mr-2 ml-auto w-fit max-w-[80%]",
-		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-			className: "relative rounded-3xl bg-primary px-5 py-2.5 text-primary-foreground before:absolute before:-right-1.75 before:bottom-0 before:h-5.5 before:w-4 before:rounded-bl-[16px_14px] before:bg-primary before:content-[''] after:absolute after:-right-6.5 after:bottom-0 after:h-6.25 after:w-6.5 after:rounded-bl-[10px] after:bg-background after:content-['']",
-			children: [
-				labelText ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-					className: "mb-2 flex items-center gap-2",
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Badge, {
-						variant: "outline",
-						className: "border-primary-foreground/35 bg-primary-foreground/10 text-primary-foreground",
-						children: labelText
-					})
-				}) : null,
-				item.text ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-					className: "text-sm break-words whitespace-pre-wrap text-primary-foreground",
-					children: item.text
-				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-					className: "text-sm text-primary-foreground/80",
-					children: "Image prompt"
-				}),
-				item.images.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-					className: "mt-3 flex flex-wrap gap-3",
-					children: item.images.map((image, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", {
-						type: "button",
-						className: "max-w-full cursor-zoom-in overflow-hidden rounded-lg border border-primary-foreground/20 bg-primary-foreground/10 p-0 transition hover:opacity-90 focus-visible:ring-2 focus-visible:ring-primary-foreground/70 focus-visible:ring-offset-2 focus-visible:ring-offset-primary focus-visible:outline-none",
-						onClick: () => setSelectedImageIndex(index),
-						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", {
-							src: image.previewUrl,
-							alt: "Prompt upload",
-							className: "block h-28 max-w-full object-cover"
-						}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-							className: "sr-only",
-							children: "Open prompt upload"
-						})]
-					}, `${promptImageKey(image)}:${index}`))
-				}) : null
-			]
-		}), selectedImage ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ImageLightbox, {
-			open: true,
-			onOpenChange: (open) => {
-				if (!open) setSelectedImageIndex(null);
-			},
-			imageSrc: selectedImage.previewUrl,
-			imageAlt: "Prompt upload",
-			title: "Prompt upload preview",
-			description: "Expanded preview of an image attached to a user message."
-		}) : null]
+		children: [
+			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "relative rounded-3xl bg-primary px-5 py-2.5 text-primary-foreground before:absolute before:-right-1.75 before:bottom-0 before:h-5.5 before:w-4 before:rounded-bl-[16px_14px] before:bg-primary before:content-[''] after:absolute after:-right-6.5 after:bottom-0 after:h-6.25 after:w-6.5 after:rounded-bl-[10px] after:bg-background after:content-['']",
+				children: [
+					labelText ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+						className: "mb-2 flex items-center gap-2",
+						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Badge, {
+							variant: "outline",
+							className: "border-primary-foreground/35 bg-primary-foreground/10 text-primary-foreground",
+							children: labelText
+						})
+					}) : null,
+					item.text ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+						className: "text-sm break-words whitespace-pre-wrap text-primary-foreground",
+						children: item.text
+					}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+						className: "text-sm text-primary-foreground/80",
+						children: "Image prompt"
+					}),
+					item.images.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+						className: "mt-3 flex flex-wrap gap-3",
+						children: item.images.map((image, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", {
+							type: "button",
+							className: "max-w-full cursor-zoom-in overflow-hidden rounded-lg border border-primary-foreground/20 bg-primary-foreground/10 p-0 transition hover:opacity-90 focus-visible:ring-2 focus-visible:ring-primary-foreground/70 focus-visible:ring-offset-2 focus-visible:ring-offset-primary focus-visible:outline-none",
+							onClick: () => setSelectedImageIndex(index),
+							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", {
+								src: image.previewUrl,
+								alt: "Prompt upload",
+								className: "block h-28 max-w-full object-cover"
+							}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+								className: "sr-only",
+								children: "Open prompt upload"
+							})]
+						}, `${promptImageKey(image)}:${index}`))
+					}) : null
+				]
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(UserMessageFooter, { copyText: item.text }),
+			selectedImage ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ImageLightbox, {
+				open: true,
+				onOpenChange: (open) => {
+					if (!open) setSelectedImageIndex(null);
+				},
+				imageSrc: selectedImage.previewUrl,
+				imageAlt: "Prompt upload",
+				title: "Prompt upload preview",
+				description: "Expanded preview of an image attached to a user message."
+			}) : null
+		]
 	});
 });
+function UserMessageFooter({ copyText }) {
+	if (!copyText.trim()) return null;
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		className: "mt-1 flex justify-end gap-1.5 text-xs font-medium text-muted-foreground",
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageFooterCopyButton, {
+			idleLabel: "Copy user message",
+			text: copyText
+		})
+	});
+}
 function assistantBlockIsVisible({ block, hideThinking, hideToolBlocks }) {
 	switch (block.type) {
 		case "text": return Boolean(block.text.trim());
@@ -12070,7 +12070,7 @@ function assistantMessageHasVisibleBlocks({ item, hideThinking, hideToolBlocks }
 	}));
 }
 function assistantMessageHasFooterMeta(item) {
-	return Boolean(assistantItemIsWorking(item) || item.model || assistantCopyTextFromItems([item]));
+	return Boolean(item.model || assistantCopyTextFromItems([item]));
 }
 var AssistantBlockGroupView = import_react.memo(function AssistantBlockGroupView({ anchorBlockKey, descriptor, store, streaming }) {
 	if (descriptor.type === "explore") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AssistantExploreBlockGroupView, {
@@ -12151,7 +12151,7 @@ function AssistantBlockGroupsView({ anchorBlockKey, store, streaming }) {
 		streaming
 	}, descriptor.key)) });
 }
-function AssistantMessageFooterCopyButton({ text }) {
+function MessageFooterCopyButton({ className, idleLabel, text }) {
 	const [copyState, setCopyState] = import_react.useState("idle");
 	const canCopy = Boolean(text.trim());
 	const copyMessage = async () => {
@@ -12165,13 +12165,13 @@ function AssistantMessageFooterCopyButton({ text }) {
 			window.setTimeout(() => setCopyState("idle"), 1400);
 		}
 	};
-	const label = copyState === "copied" ? "Copied" : copyState === "error" ? "Retry copy" : "Copy assistant message";
+	const label = copyState === "copied" ? "Copied" : copyState === "error" ? "Retry copy" : idleLabel;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
 		title: label,
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
 			variant: "ghost",
 			size: "icon-xs",
-			className: "-ml-2 text-muted-foreground",
+			className: cn("text-muted-foreground", className),
 			disabled: !canCopy,
 			"aria-label": label,
 			onClick: copyMessage,
@@ -12185,13 +12185,17 @@ function AssistantMessageFooter({ copyText, modelLabel, streaming }) {
 	if (!showCopyButton && !modelLabel) return null;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "-mt-2 flex items-center gap-1.5 text-xs font-medium text-muted-foreground",
-		children: [showCopyButton ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AssistantMessageFooterCopyButton, { text: copyText }) : null, modelLabel ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+		children: [showCopyButton ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageFooterCopyButton, {
+			className: "-ml-2",
+			idleLabel: "Copy assistant message",
+			text: copyText
+		}) : null, modelLabel ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 			className: "truncate",
 			children: modelLabel
 		}) : null]
 	});
 }
-function AssistantMessagesStoreCard({ hideFooter = false, store }) {
+function AssistantMessagesStoreCard({ className, hideFooter = false, store }) {
 	const initialSnapshot = store.getSnapshot();
 	const initialBlocks = visibleAssistantBlocksFromSnapshot(initialSnapshot);
 	const assistantBlockStoreRef = import_react.useRef(null);
@@ -12215,20 +12219,21 @@ function AssistantMessagesStoreCard({ hideFooter = false, store }) {
 		store
 	]);
 	const shellSnapshot = import_react.useSyncExternalStore(shellStore.subscribe, shellStore.getSnapshot, shellStore.getSnapshot);
-	if (!shellSnapshot.hasBlocks && !shellSnapshot.hasFooter) return null;
+	const showFooter = Boolean(!hideFooter && !shellSnapshot.working && shellSnapshot.hasFooter);
+	if (!shellSnapshot.hasBlocks && !showFooter) return null;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-		className: "flex flex-col gap-4",
+		className: cn("flex flex-col gap-4", className),
 		"data-conversation-assistant-group": "true",
 		"data-conversation-streaming": shellSnapshot.streaming ? "true" : void 0,
 		children: [shellSnapshot.hasBlocks ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AssistantBlockGroupsView, {
 			anchorBlockKey: shellSnapshot.anchorBlockKey,
 			store: assistantBlockStore,
 			streaming: shellSnapshot.streaming
-		}) : null, hideFooter ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AssistantMessageFooter, {
+		}) : null, showFooter ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AssistantMessageFooter, {
 			copyText: shellSnapshot.copyText,
 			modelLabel: shellSnapshot.modelLabel,
 			streaming: shellSnapshot.streaming
-		})]
+		}) : null]
 	});
 }
 function createSelectionStore(initialValue = 0) {
@@ -14543,6 +14548,78 @@ function useAppShellMessageScroll({ autoScrollEnabled, isSessionViewLoading, ses
 		syncAfterConversationChange
 	};
 }
+var DEFAULT_SCROLL_GRADIENT_MAX_HEIGHT = 4;
+var EMPTY_SCROLL_GRADIENT_STATE = {
+	bottomHeight: 0,
+	topHeight: 0
+};
+function scrollDistanceFromBottom(element) {
+	return Math.max(0, element.scrollHeight - element.scrollTop - element.clientHeight);
+}
+function scrollGradientHeight(distanceFromEdge, maxHeight) {
+	return Math.min(maxHeight, Math.max(0, distanceFromEdge));
+}
+function scrollGradientState(element, maxHeight) {
+	if (!element) return EMPTY_SCROLL_GRADIENT_STATE;
+	return {
+		bottomHeight: scrollGradientHeight(scrollDistanceFromBottom(element), maxHeight),
+		topHeight: scrollGradientHeight(element.scrollTop, maxHeight)
+	};
+}
+function setScrollGradientState(setState, nextState) {
+	setState((currentState) => currentState.bottomHeight === nextState.bottomHeight && currentState.topHeight === nextState.topHeight ? currentState : nextState);
+}
+function useScrollGradients({ disabled = false, maxHeight = DEFAULT_SCROLL_GRADIENT_MAX_HEIGHT } = {}) {
+	const elementRef = import_react.useRef(null);
+	const [state, setState] = import_react.useState(EMPTY_SCROLL_GRADIENT_STATE);
+	const syncScrollGradients = import_react.useCallback((element = elementRef.current) => {
+		setScrollGradientState(setState, disabled ? EMPTY_SCROLL_GRADIENT_STATE : scrollGradientState(element, maxHeight));
+	}, [disabled, maxHeight]);
+	const setScrollElement = import_react.useCallback((element) => {
+		elementRef.current = element;
+		syncScrollGradients(element);
+	}, [syncScrollGradients]);
+	const onScroll = import_react.useCallback((event) => {
+		syncScrollGradients(event.currentTarget);
+	}, [syncScrollGradients]);
+	import_react.useLayoutEffect(() => {
+		const element = elementRef.current;
+		syncScrollGradients(element);
+		if (!element || typeof ResizeObserver === "undefined") return;
+		let animationFrame = 0;
+		const scheduleSync = () => {
+			window.cancelAnimationFrame(animationFrame);
+			animationFrame = window.requestAnimationFrame(() => {
+				animationFrame = 0;
+				syncScrollGradients(elementRef.current);
+			});
+		};
+		const resizeObserver = new ResizeObserver(scheduleSync);
+		resizeObserver.observe(element);
+		const content = element.firstElementChild;
+		if (content instanceof HTMLElement) resizeObserver.observe(content);
+		return () => {
+			window.cancelAnimationFrame(animationFrame);
+			resizeObserver.disconnect();
+		};
+	}, [syncScrollGradients]);
+	return {
+		bottomHeight: state.bottomHeight,
+		onScroll,
+		setScrollElement,
+		syncScrollGradients,
+		topHeight: state.topHeight
+	};
+}
+function ScrollGradientOverlays({ bottomClassName, bottomHeight, className, topClassName, topHeight }) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		className: cn("pointer-events-none absolute inset-x-0 top-0 z-10 bg-gradient-to-b from-black/10 to-transparent transition-[height,opacity] duration-150", topHeight > 0 ? "opacity-100" : "opacity-0", className, topClassName),
+		style: { height: topHeight }
+	}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		className: cn("pointer-events-none absolute inset-x-0 bottom-0 z-10 bg-gradient-to-t from-black/10 to-transparent transition-[height,opacity] duration-150", bottomHeight > 0 ? "opacity-100" : "opacity-0", className, bottomClassName),
+		style: { height: bottomHeight }
+	})] });
+}
 function ConversationLatestMessageButton({ conversationItemsStore, draft, onClick, scrollStateStore }) {
 	const hasMessages = useConversationHasMessages(conversationItemsStore);
 	const isDisabled = useMessageScrollValue(scrollStateStore, (snapshot) => draft || !hasMessages || snapshot.isMessagesNearBottom);
@@ -14609,6 +14686,11 @@ function AppShellConversationFrame({ autoScrollEnabled, children, centerMessages
 		isSessionViewLoading,
 		sessionState
 	});
+	const { bottomHeight: conversationScrollBottomGradientHeight, onScroll: onConversationScrollGradientScroll, setScrollElement: setConversationScrollGradientElement, topHeight: conversationScrollTopGradientHeight } = useScrollGradients({ disabled: isSessionViewLoading });
+	const setMessagesScrollAreaElement = import_react.useCallback((element) => {
+		messagesScrollAreaRef.current = element;
+		setConversationScrollGradientElement(element);
+	}, [messagesScrollAreaRef, setConversationScrollGradientElement]);
 	import_react.useImperativeHandle(ref, () => ({
 		jumpToNextMessage,
 		jumpToPreviousMessage,
@@ -14622,47 +14704,59 @@ function AppShellConversationFrame({ autoScrollEnabled, children, centerMessages
 	]);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "relative min-h-0 flex-1",
-		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-			ref: messagesScrollAreaRef,
-			"data-conversation-viewport": "true",
-			tabIndex: 0,
-			role: "region",
-			"aria-label": "Conversation messages",
-			className: "h-full overflow-x-hidden overflow-y-auto overscroll-contain px-4 outline-none [overflow-anchor:none]",
-			children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-				ref: messagesContentRef,
-				className: "flex min-h-full flex-col",
-				children: [
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConversationScrollRevisionObserver, {
-						conversationItemsStore,
-						disabled: isSessionViewLoading,
-						onRevisionChange: syncAfterConversationChange
-					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConversationContentChangeContext.Provider, {
-						value: syncAfterConversationChange,
-						children
-					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { ref: bottomRef })
-				]
-			})
-		}), !isSessionViewLoading ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConversationLatestMessageButton, {
-			conversationItemsStore,
-			draft: sessionState.draft,
-			onClick: scrollConversationToBottom,
-			scrollStateStore
-		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConversationPreviousMessageButton, {
-			centerMessages,
-			onClick: jumpToPreviousMessage,
-			scrollStateStore
-		})] }) : null]
+		children: [
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+				ref: setMessagesScrollAreaElement,
+				"data-conversation-viewport": "true",
+				tabIndex: 0,
+				role: "region",
+				"aria-label": "Conversation messages",
+				className: "h-full overflow-x-hidden overflow-y-auto overscroll-contain px-4 outline-none [overflow-anchor:none]",
+				onScroll: onConversationScrollGradientScroll,
+				children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+					ref: messagesContentRef,
+					className: "flex min-h-full flex-col",
+					children: [
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConversationScrollRevisionObserver, {
+							conversationItemsStore,
+							disabled: isSessionViewLoading,
+							onRevisionChange: syncAfterConversationChange
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConversationContentChangeContext.Provider, {
+							value: syncAfterConversationChange,
+							children
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { ref: bottomRef })
+					]
+				})
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ScrollGradientOverlays, {
+				bottomHeight: conversationScrollBottomGradientHeight,
+				topHeight: conversationScrollTopGradientHeight
+			}),
+			!isSessionViewLoading ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConversationLatestMessageButton, {
+				conversationItemsStore,
+				draft: sessionState.draft,
+				onClick: scrollConversationToBottom,
+				scrollStateStore
+			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConversationPreviousMessageButton, {
+				centerMessages,
+				onClick: jumpToPreviousMessage,
+				scrollStateStore
+			})] }) : null
+		]
 	});
 }
 function AppShellWorkingIndicatorLabel({ fallbackLabel, hiddenThinkingPreviewStore, useHiddenThinkingPreview }) {
 	const hiddenThinkingPreview = useSelector(hiddenThinkingPreviewStore);
 	const visibleLabel = useHiddenThinkingPreview && hiddenThinkingPreview ? hiddenThinkingPreview : fallbackLabel;
-	if (!visibleLabel.trim()) return null;
+	if (!visibleLabel.trim()) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		"aria-hidden": "true",
+		className: "invisible leading-5 font-medium",
+		children: "Working…"
+	});
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-		className: "font-medium text-foreground",
+		className: "leading-5 font-medium text-foreground",
 		children: visibleLabel
 	});
 }
@@ -14677,7 +14771,7 @@ function AppShellMessagesWorkingIndicator({ hiddenThinkingPreviewStore, onCancel
 		}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 			className: "min-w-0 flex-1",
 			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-				className: "flex min-w-0 items-center justify-start gap-2",
+				className: "flex min-h-5 min-w-0 items-center justify-start gap-2",
 				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 					className: "min-w-0 shrink-0",
 					children: state.done ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
@@ -14764,12 +14858,10 @@ function ConversationAssistantGroupView({ className, groupKey, hideFooter, hideT
 		store,
 		syncAfterConversationContentChange
 	]);
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AssistantMessagesStoreCard, {
 		className,
-		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AssistantMessagesStoreCard, {
-			hideFooter,
-			store: assistantMessagesStore
-		})
+		hideFooter,
+		store: assistantMessagesStore
 	});
 }
 function AppShellConversationItemGroups({ centerMessages, conversationItemsStore, hideFooter, hideThinking, hideToolBlocks }) {
@@ -14839,14 +14931,13 @@ function AppShellConversationWorkingFooter({ centerMessages, conversationItemsSt
 }
 function AppShellConversationMessageStack({ centerMessages, conversationItemsStore, hideToolBlocks, sessionStore }) {
 	const hideThinking = useSelector(sessionStore, (sessionState) => sessionState.hideThinkingBlock);
-	const streaming = useSelector(sessionStore, (sessionState) => sessionState.streaming);
 	if (!useConversationHasMessages(conversationItemsStore)) return null;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 		className: "flex flex-col gap-4 pt-4",
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppShellConversationItemGroups, {
 			centerMessages,
 			conversationItemsStore,
-			hideFooter: streaming,
+			hideFooter: false,
 			hideThinking,
 			hideToolBlocks
 		})
@@ -16711,6 +16802,7 @@ function GitRepositorySummary({ viewerContextId, cwd, active, onBranchClick }) {
 }
 function GitPanelToolbar({ viewerContextId, cwd, active }) {
 	const queryClient = useQueryClient();
+	const isMobile = useIsMobile();
 	const normalizedCwd = normalizeCwd(cwd);
 	const [branchDialogOpen, setBranchDialogOpen] = import_react.useState(false);
 	const [commitDialogOpen, setCommitDialogOpen] = import_react.useState(false);
@@ -16824,6 +16916,7 @@ function GitPanelToolbar({ viewerContextId, cwd, active }) {
 						kbd: formatShortcutLabel("Control+C"),
 						children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Button$1, {
 							variant: "outline",
+							size: isMobile ? "default" : "sm",
 							onClick: () => {
 								setCommitDialogOpen(true);
 							},
@@ -16835,6 +16928,7 @@ function GitPanelToolbar({ viewerContextId, cwd, active }) {
 						kbd: formatShortcutLabel("Control+P"),
 						children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Button$1, {
 							variant: "outline",
+							size: isMobile ? "default" : "sm",
 							disabled: gitActionBusy,
 							onClick: () => {
 								gitActionMutation.mutate("push");
@@ -16847,6 +16941,7 @@ function GitPanelToolbar({ viewerContextId, cwd, active }) {
 						kbd: formatShortcutLabel("Control+Shift+P"),
 						children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Button$1, {
 							variant: "outline",
+							size: isMobile ? "default" : "sm",
 							disabled: gitActionBusy,
 							onClick: () => {
 								gitActionMutation.mutate("force-push");
@@ -16859,6 +16954,7 @@ function GitPanelToolbar({ viewerContextId, cwd, active }) {
 						kbd: formatShortcutLabel("Alt+P"),
 						children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Button$1, {
 							variant: "outline",
+							size: isMobile ? "default" : "sm",
 							disabled: gitActionBusy,
 							onClick: () => {
 								gitActionMutation.mutate("pull");
@@ -16967,26 +17063,6 @@ function AlertDialogCancel({ className, variant = "outline", size = "default", .
 		...props
 	});
 }
-function setDerivedScrollState(setState, nextState) {
-	setState((current) => Object.is(current, nextState) ? current : nextState);
-}
-function hasScrolledContent(scrollElement) {
-	return Boolean(scrollElement && scrollElement.scrollTop > 0);
-}
-function hasRemainingScrollContent(scrollElement) {
-	if (!scrollElement) return false;
-	return scrollElement.scrollHeight - scrollElement.clientHeight - scrollElement.scrollTop > 1;
-}
-function getStuckScrollTriggerValue({ getValue, scrollElement, selector }) {
-	if (!scrollElement || scrollElement.scrollTop <= 0) return "";
-	const containerTop = scrollElement.getBoundingClientRect().top;
-	const triggers = Array.from(scrollElement.querySelectorAll(selector));
-	for (const trigger of triggers) {
-		const rect = trigger.getBoundingClientRect();
-		if (rect.top <= containerTop + 1 && rect.bottom > containerTop + 1) return getValue(trigger);
-	}
-	return "";
-}
 function GitSection({ title, meta, controls, className, bodyClassName, children }) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", {
 		className: cn("overflow-hidden rounded-xl border border-border/80 bg-card/50", className),
@@ -17030,10 +17106,7 @@ var initialGitCommitRowState = {
 	formDialog: null,
 	confirmDialog: null,
 	contextMenuOpen: false,
-	contextMenuKey: 0,
-	scrollValue: "",
-	commitBodyHeaderShadowed: false,
-	commitBodyFooterShadowed: false
+	contextMenuKey: 0
 };
 function gitCommitRowReducer(state, action) {
 	switch (action.type) {
@@ -17081,18 +17154,10 @@ function gitCommitRowReducer(state, action) {
 			contextMenuOpen: false,
 			contextMenuKey: state.contextMenuKey + 1
 		};
-		case "set-scroll-shadows":
-			if (state.scrollValue === action.value && state.commitBodyHeaderShadowed === action.headerShadowed && state.commitBodyFooterShadowed === action.footerShadowed) return state;
-			return {
-				...state,
-				scrollValue: action.value,
-				commitBodyHeaderShadowed: action.headerShadowed,
-				commitBodyFooterShadowed: action.footerShadowed
-			};
 	}
 }
 function gitGraphLaneColor(index, active = false) {
-	if (active) return "#f87171";
+	if (active) return "var(--warning)";
 	return GIT_GRAPH_LANE_COLORS[index % GIT_GRAPH_LANE_COLORS.length];
 }
 var GitCommitGraphBranch = class {
@@ -17717,8 +17782,8 @@ function useGitCommitRowView({ viewerContextId, cwd, graphWidth, line, value, on
 	const [rowState, dispatchRow] = import_react.useReducer(gitCommitRowReducer, initialGitCommitRowState);
 	const hashCopiedResetRef = import_react.useRef(void 0);
 	const messageCopiedResetRef = import_react.useRef(void 0);
-	const commitBodyScrollRef = import_react.useRef(null);
 	const contextMenuActionsRef = import_react.useRef(null);
+	const { bottomHeight: commitBodyBottomGradientHeight, onScroll: onCommitBodyGradientScroll, setScrollElement: setCommitBodyGradientElement, topHeight: commitBodyTopGradientHeight } = useScrollGradients();
 	const title = parsed.subject.trim();
 	const time = formatGitCommitDetailTime(parsed.relativeDate);
 	const fullTime = formatGitCommitFullDate(parsed.fullDate);
@@ -17727,19 +17792,6 @@ function useGitCommitRowView({ viewerContextId, cwd, graphWidth, line, value, on
 	const shortHash = parsed.hash || parsed.fullHash.slice(0, 7);
 	const canRunCommitAction = Boolean(viewerContextId && cwd && parsed.fullHash);
 	const { hashCopied, messageCopied, formDialog, confirmDialog, contextMenuOpen, contextMenuKey } = rowState;
-	const commitBodyHeaderShadowed = rowState.scrollValue === value && rowState.commitBodyHeaderShadowed;
-	const commitBodyFooterShadowed = rowState.scrollValue === value && rowState.commitBodyFooterShadowed;
-	const updateCommitBodyScrollShadows = (scrollElement) => {
-		dispatchRow({
-			type: "set-scroll-shadows",
-			value,
-			headerShadowed: hasScrolledContent(scrollElement),
-			footerShadowed: hasRemainingScrollContent(scrollElement)
-		});
-	};
-	import_react.useLayoutEffect(() => {
-		updateCommitBodyScrollShadows(commitBodyScrollRef.current);
-	});
 	import_react.useEffect(() => {
 		return () => {
 			if (typeof hashCopiedResetRef.current === "number") window.clearTimeout(hashCopiedResetRef.current);
@@ -17906,7 +17958,7 @@ function useGitCommitRowView({ viewerContextId, cwd, graphWidth, line, value, on
 		});
 	};
 	if (!parsed.hash && !parsed.subject) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-		className: "flex h-8 max-w-full min-w-0 items-center font-mono text-[13px] leading-5",
+		className: "flex h-8 max-w-full min-w-0 items-center text-[13px] leading-5",
 		children: parsed.subject ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 			className: "min-w-0 flex-1 truncate text-foreground",
 			children: parsed.subject
@@ -17914,7 +17966,7 @@ function useGitCommitRowView({ viewerContextId, cwd, graphWidth, line, value, on
 	});
 	const trigger = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AccordionTrigger, {
 		headerClassName: "min-w-0",
-		className: cn("h-8 min-h-8 w-full items-center gap-2 rounded-none px-1.5 py-0 font-mono text-[13px] leading-5 font-normal transition-[background-color,box-shadow,color] hover:no-underline focus-visible:ring-0 aria-expanded:bg-muted/50 **:data-[slot=accordion-trigger-icon]:size-4"),
+		className: cn("h-8 min-h-8 w-full items-center gap-2 rounded-none px-1.5 py-0 text-[13px] leading-5 font-normal transition-[background-color,box-shadow,color] hover:no-underline focus-visible:ring-0 aria-expanded:bg-muted/50 **:data-[slot=accordion-trigger-icon]:size-4"),
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 			className: "min-w-0 flex-1 truncate pr-8 text-foreground",
 			style: { paddingLeft: graphWidth },
@@ -18056,122 +18108,119 @@ function useGitCommitRowView({ viewerContextId, cwd, graphWidth, line, value, on
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AccordionContent, {
 				className: "relative h-[200px] border-b border-border/70 bg-muted/50 p-0",
-				children: [
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-						ref: commitBodyScrollRef,
-						className: "h-full overflow-y-auto pr-2 pb-2",
-						onScroll: (event) => {
-							updateCommitBodyScrollShadows(event.currentTarget);
-						},
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-							className: "grid content-start gap-1.5 pt-1 font-mono text-xs leading-4",
-							style: { paddingLeft: graphWidth },
-							children: [
-								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-									className: "flex min-w-0 flex-wrap items-center gap-1.5 font-sans",
-									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Button$1, {
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					ref: setCommitBodyGradientElement,
+					className: "h-full overflow-y-auto pr-2 pb-2",
+					onScroll: onCommitBodyGradientScroll,
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						className: "grid content-start gap-1.5 pt-1 text-xs leading-4",
+						style: { paddingLeft: graphWidth },
+						children: [
+							/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+								className: "flex min-w-0 flex-wrap items-center gap-1.5 font-sans",
+								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Button$1, {
+									type: "button",
+									size: "xs",
+									variant: "outline",
+									disabled: !canRunCommitAction,
+									onClick: () => openDiff("commit"),
+									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FileDiff, {}), "View diff"]
+								}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitCommitActionsMenu, { ...commitActionProps })]
+							}),
+							parsed.author || time || parsed.fullHash ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+								className: "flex max-w-full flex-wrap items-center gap-x-2 gap-y-1 text-muted-foreground",
+								children: [
+									parsed.author ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: parsed.author }) : null,
+									parsed.author && time ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+										"aria-hidden": true,
+										children: "·"
+									}) : null,
+									time ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+										title: fullTime,
+										side: "top",
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: time })
+									}) : null,
+									(parsed.author || time) && parsed.fullHash ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+										"aria-hidden": true,
+										children: "·"
+									}) : null,
+									parsed.fullHash ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+										className: "inline-flex min-w-0 items-center gap-1.5",
+										children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+											className: "min-w-0 truncate",
+											children: shortHash
+										}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+											title: hashCopied ? "Copied" : "Copy full commit hash",
+											side: "top",
+											children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+												type: "button",
+												"aria-label": "Copy full commit hash",
+												className: "inline-flex size-5 shrink-0 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:bg-muted hover:text-foreground",
+												onClick: (event) => {
+													event.preventDefault();
+													event.stopPropagation();
+													copyFullHashInline();
+												},
+												children: hashCopied ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Check, { className: "size-3.5 text-emerald-500" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Copy, { className: "size-3.5" })
+											})
+										})]
+									}) : null
+								]
+							}) : null,
+							/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+								className: "max-w-full break-words whitespace-normal text-foreground",
+								children: [title || "No commit message", title ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+									title: messageCopied ? "Copied" : "Copy commit message",
+									side: "top",
+									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
 										type: "button",
-										size: "xs",
-										variant: "outline",
-										disabled: !canRunCommitAction,
-										onClick: () => openDiff("commit"),
-										children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FileDiff, {}), "View diff"]
-									}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitCommitActionsMenu, { ...commitActionProps })]
-								}),
-								parsed.author || time || parsed.fullHash ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-									className: "flex max-w-full flex-wrap items-center gap-x-2 gap-y-1 text-muted-foreground",
+										"aria-label": "Copy commit message",
+										className: "ml-1 inline-flex size-4 items-center justify-center rounded-sm align-middle text-muted-foreground transition-colors hover:bg-muted hover:text-foreground",
+										onClick: (event) => {
+											event.preventDefault();
+											event.stopPropagation();
+											copyCommitMessageInline();
+										},
+										children: messageCopied ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Check, { className: "size-3.5 text-emerald-500" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Copy, { className: "size-3.5" })
+									})
+								}) : null]
+							}),
+							/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+								className: "flex min-w-0 flex-wrap items-center gap-x-3 gap-y-1",
+								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+									className: "text-emerald-500",
 									children: [
-										parsed.author ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: parsed.author }) : null,
-										parsed.author && time ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-											"aria-hidden": true,
-											children: "·"
-										}) : null,
-										time ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
-											title: fullTime,
-											side: "top",
-											children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: time })
-										}) : null,
-										(parsed.author || time) && parsed.fullHash ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-											"aria-hidden": true,
-											children: "·"
-										}) : null,
-										parsed.fullHash ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
-											className: "inline-flex min-w-0 items-center gap-1.5",
-											children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-												className: "min-w-0 truncate",
-												children: shortHash
-											}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
-												title: hashCopied ? "Copied" : "Copy full commit hash",
-												side: "top",
-												children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
-													type: "button",
-													"aria-label": "Copy full commit hash",
-													className: "inline-flex size-5 shrink-0 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:bg-muted hover:text-foreground",
-													onClick: (event) => {
-														event.preventDefault();
-														event.stopPropagation();
-														copyFullHashInline();
-													},
-													children: hashCopied ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Check, { className: "size-3.5 text-emerald-500" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Copy, { className: "size-3.5" })
-												})
-											})]
-										}) : null
+										"+",
+										insertions,
+										" addition",
+										insertions === 1 ? "" : "s"
 									]
-								}) : null,
-								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-									className: "max-w-full break-words whitespace-normal text-foreground",
-									children: [title || "No commit message", title ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
-										title: messageCopied ? "Copied" : "Copy commit message",
-										side: "top",
-										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
-											type: "button",
-											"aria-label": "Copy commit message",
-											className: "ml-1 inline-flex size-4 items-center justify-center rounded-sm align-middle text-muted-foreground transition-colors hover:bg-muted hover:text-foreground",
-											onClick: (event) => {
-												event.preventDefault();
-												event.stopPropagation();
-												copyCommitMessageInline();
-											},
-											children: messageCopied ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Check, { className: "size-3.5 text-emerald-500" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Copy, { className: "size-3.5" })
-										})
-									}) : null]
-								}),
-								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-									className: "flex min-w-0 flex-wrap items-center gap-x-3 gap-y-1",
-									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
-										className: "text-emerald-500",
-										children: [
-											"+",
-											insertions,
-											" addition",
-											insertions === 1 ? "" : "s"
-										]
-									}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
-										className: "text-red-400",
-										children: [
-											"-",
-											deletions,
-											" deletion",
-											deletions === 1 ? "" : "s"
-										]
-									})]
-								}),
-								parsed.fullHash ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitCommitFilesList, {
-									viewerContextId,
-									cwd,
-									commit: parsed.fullHash,
-									shortHash,
-									previousShortHash: parsed.parents[0]?.slice(0, 7) || "",
-									subject: title,
-									disabled: !canRunCommitAction,
-									onOpenCommitDiff
-								}) : null
-							]
-						})
-					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: cn("pointer-events-none absolute inset-x-0 top-0 h-1 bg-gradient-to-b from-black/10 to-transparent transition-opacity duration-150", commitBodyHeaderShadowed ? "opacity-100" : "opacity-0") }),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: cn("pointer-events-none absolute inset-x-0 bottom-0 h-1 bg-gradient-to-t from-black/10 to-transparent transition-opacity duration-150", commitBodyFooterShadowed ? "opacity-100" : "opacity-0") })
-				]
+								}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+									className: "text-red-400",
+									children: [
+										"-",
+										deletions,
+										" deletion",
+										deletions === 1 ? "" : "s"
+									]
+								})]
+							}),
+							parsed.fullHash ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitCommitFilesList, {
+								viewerContextId,
+								cwd,
+								commit: parsed.fullHash,
+								shortHash,
+								previousShortHash: parsed.parents[0]?.slice(0, 7) || "",
+								subject: title,
+								disabled: !canRunCommitAction,
+								onOpenCommitDiff
+							}) : null
+						]
+					})
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ScrollGradientOverlays, {
+					bottomHeight: commitBodyBottomGradientHeight,
+					topHeight: commitBodyTopGradientHeight
+				})]
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Dialog$1, {
 				open: formDialog !== null,
@@ -18422,6 +18471,22 @@ function GitCommitsSection({ viewerContextId, cwd, active, onOpenCommitDiff, onR
 		children: content
 	});
 }
+function setDerivedScrollState(setState, nextState) {
+	setState((current) => Object.is(current, nextState) ? current : nextState);
+}
+function hasScrolledContent(scrollElement) {
+	return Boolean(scrollElement && scrollElement.scrollTop > 0);
+}
+function getStuckScrollTriggerValue({ getValue, scrollElement, selector }) {
+	if (!scrollElement || scrollElement.scrollTop <= 0) return "";
+	const containerTop = scrollElement.getBoundingClientRect().top;
+	const triggers = Array.from(scrollElement.querySelectorAll(selector));
+	for (const trigger of triggers) {
+		const rect = trigger.getBoundingClientRect();
+		if (rect.top <= containerTop + 1 && rect.bottom > containerTop + 1) return getValue(trigger);
+	}
+	return "";
+}
 function GitFileStatus({ status }) {
 	const [indexCharacter, worktreeCharacter] = gitFileStatusCharacters(status);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
@@ -18461,6 +18526,30 @@ function GitFileDiff({ file }) {
 		}) : null]
 	});
 }
+function gitFileCanStage(file) {
+	const [indexStatus, worktreeStatus] = gitFileStatusCharacters(file.status);
+	return worktreeStatus !== " " || indexStatus === "?";
+}
+function gitFileCanUnstage(file) {
+	const [indexStatus] = gitFileStatusCharacters(file.status);
+	return indexStatus !== " " && indexStatus !== "?";
+}
+function reviewBulkGitActionSuccessLabel(action) {
+	switch (action) {
+		case "discard-all": return "Discarded all changes";
+		case "nuke-working-tree": return "Nuked working tree";
+		case "unstage-all": return "Unstaged all changes";
+		case "stage-all": return "Staged all changes";
+	}
+}
+function reviewBulkGitActionErrorFallback(action) {
+	switch (action) {
+		case "discard-all": return "Failed to discard changes";
+		case "nuke-working-tree": return "Failed to nuke working tree";
+		case "unstage-all": return "Failed to unstage changes";
+		case "stage-all": return "Failed to stage changes";
+	}
+}
 function reviewDiffCommentSideLabel(side) {
 	return side === "deletions" ? "old" : "new";
 }
@@ -18501,7 +18590,7 @@ function ReviewDiffPendingLineComment({ comment }) {
 		comment.onSubmit(normalizedText);
 	};
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("form", {
-		className: "m-2 w-[min(38rem,calc(100vw_-_5rem))] max-w-[calc(100%_-_1rem)] rounded-lg border border-border/70 bg-background p-2 shadow-sm",
+		className: "m-2 w-[calc(100%_-_1rem)] max-w-[38rem] rounded-lg border border-border/70 bg-background p-2 shadow-sm",
 		onPointerDown: (event) => event.stopPropagation(),
 		onSubmit: (event) => {
 			event.preventDefault();
@@ -18680,6 +18769,7 @@ function FileReviewContent(props) {
 }
 function useFileReviewContentView({ viewerContextId, cwd, active, diffLineComments = [], onAddDiffLineComment, onMaximizeHistory, onOpenCommitDiff, onOpenFile, showEmbeddedHistory = true }) {
 	const normalizedCwd = normalizeCwd(cwd);
+	const queryClient = useQueryClient();
 	const isMobile = useIsMobile();
 	const [state, dispatch] = import_react.useReducer(fileReviewReducer, initialFileReviewState, (initialState) => ({
 		...initialState,
@@ -18700,6 +18790,11 @@ function useFileReviewContentView({ viewerContextId, cwd, active, diffLineCommen
 		});
 	};
 	const changesScrollRef = import_react.useRef(null);
+	const { bottomHeight: changesScrollBottomGradientHeight, onScroll: onChangesScrollGradientScroll, setScrollElement: setChangesScrollGradientElement, topHeight: changesScrollTopGradientHeight } = useScrollGradients();
+	const setChangesScrollElement = import_react.useCallback((element) => {
+		changesScrollRef.current = element;
+		setChangesScrollGradientElement(element);
+	}, [setChangesScrollGradientElement]);
 	const reviewContentRef = import_react.useRef(null);
 	const historyPanelRef = import_react.useRef(null);
 	const historyScrollRef = import_react.useRef(null);
@@ -18720,14 +18815,41 @@ function useFileReviewContentView({ viewerContextId, cwd, active, diffLineCommen
 	});
 	const files = filesQuery.data;
 	const changedFiles = Array.isArray(files) ? files : [];
-	import_react.useEffect(() => {
-		if (previousNormalizedCwdRef.current === normalizedCwd) return;
-		previousNormalizedCwdRef.current = normalizedCwd;
-		dispatch({
-			type: "cwdChanged",
-			historyPanelHeight: readStoredGitHistoryPanelHeight()
-		});
-	}, [normalizedCwd]);
+	const canStageAll = changedFiles.some(gitFileCanStage);
+	const canUnstageAll = changedFiles.some(gitFileCanUnstage);
+	const canDiscardAll = changedFiles.length > 0;
+	const [confirmNukeWorkingTreeOpen, setConfirmNukeWorkingTreeOpen] = import_react.useState(false);
+	const bulkGitActionMutation = useMutation({
+		mutationFn: async (action) => {
+			return await fetchJson(buildRequestUrl(action === "discard-all" || action === "nuke-working-tree" ? "/api/git-discard" : "/api/git-stage", { contextId: viewerContextId }), {
+				method: "POST",
+				headers: { "content-type": "application/json" },
+				body: JSON.stringify({
+					action,
+					cwd: normalizedCwd
+				})
+			});
+		},
+		onSuccess: async (_response, action) => {
+			await invalidateGitQueries({
+				queryClient,
+				viewerContextId,
+				cwd: normalizedCwd
+			});
+			toast.success(reviewBulkGitActionSuccessLabel(action));
+		},
+		onError: (error, action) => {
+			toast.error(getErrorMessage(error, reviewBulkGitActionErrorFallback(action)));
+		}
+	});
+	import_react.useEffect(() => {
+		if (previousNormalizedCwdRef.current === normalizedCwd) return;
+		previousNormalizedCwdRef.current = normalizedCwd;
+		dispatch({
+			type: "cwdChanged",
+			historyPanelHeight: readStoredGitHistoryPanelHeight()
+		});
+	}, [normalizedCwd]);
 	const updateStickyReviewFileHeader = (scrollElement) => {
 		setDerivedScrollState(setStickyReviewFileValue, getStuckScrollTriggerValue({
 			getValue: (trigger) => trigger.dataset.reviewFileValue || "",
@@ -18822,12 +18944,28 @@ function useFileReviewContentView({ viewerContextId, cwd, active, diffLineCommen
 		normalizedCwd
 	]);
 	const hasOpenFile = openFiles.length > 0;
+	const bulkActionPending = bulkGitActionMutation.isPending;
+	const bulkActionDisabled = bulkActionPending || !viewerContextId || !normalizedCwd || typeof files === "undefined" || files === null || Boolean(filesQuery.error);
+	const discardAllPending = bulkGitActionMutation.isPending && bulkGitActionMutation.variables === "discard-all";
+	const nukeWorkingTreePending = bulkGitActionMutation.isPending && bulkGitActionMutation.variables === "nuke-working-tree";
+	const stageAllPending = bulkGitActionMutation.isPending && bulkGitActionMutation.variables === "stage-all";
+	const unstageAllPending = bulkGitActionMutation.isPending && bulkGitActionMutation.variables === "unstage-all";
 	const toggleAll = () => {
 		dispatch({
 			type: "openFilesChanged",
 			openFiles: hasOpenFile ? [] : changedFiles.map(reviewFileValue)
 		});
 	};
+	const runBulkGitAction = (action) => {
+		bulkGitActionMutation.mutate(action);
+	};
+	const requestNukeWorkingTree = () => {
+		setConfirmNukeWorkingTreeOpen(true);
+	};
+	const runConfirmedNukeWorkingTree = () => {
+		bulkGitActionMutation.mutate("nuke-working-tree");
+		setConfirmNukeWorkingTreeOpen(false);
+	};
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		ref: reviewContentRef,
 		className: "flex h-full min-h-0 flex-col bg-background",
@@ -18850,82 +18988,130 @@ function useFileReviewContentView({ viewerContextId, cwd, active, diffLineCommen
 						children: "Diffs"
 					})
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-					className: "flex shrink-0 items-center gap-2",
-					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
-						title: hasOpenFile ? "Collapse all" : "Expand all",
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+					className: "flex shrink-0 flex-wrap items-center justify-end gap-2",
+					children: [
+						/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenu, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DropdownMenuTrigger, {
+							render: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+								variant: "outline",
+								size: isMobile ? "icon" : "icon-sm",
+								"aria-label": "Diff actions",
+								disabled: bulkActionDisabled
+							}),
+							children: bulkActionPending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { size: "xs" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Ellipsis, { className: "size-4" })
+						}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DropdownMenuContent, {
+							align: "end",
+							className: "w-52",
+							children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuGroup, { children: [
+								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+									disabled: bulkActionDisabled || !canStageAll,
+									onClick: () => runBulkGitAction("stage-all"),
+									children: [stageAllPending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { size: "xs" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Plus, {}), "Stage all"]
+								}),
+								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+									disabled: bulkActionDisabled || !canUnstageAll,
+									onClick: () => runBulkGitAction("unstage-all"),
+									children: [unstageAllPending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { size: "xs" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Minus, {}), "Unstage all"]
+								}),
+								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+									variant: "destructive",
+									disabled: bulkActionDisabled || !canDiscardAll,
+									onClick: () => runBulkGitAction("discard-all"),
+									children: [discardAllPending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { size: "xs" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Undo2, {}), "Discard all"]
+								}),
+								/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DropdownMenuSeparator, {}),
+								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+									variant: "destructive",
+									disabled: bulkActionDisabled,
+									onClick: requestNukeWorkingTree,
+									children: [nukeWorkingTreePending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { size: "xs" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Trash2, {}), "Nuke working tree"]
+								})
+							] })
+						})] }),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+							title: hasOpenFile ? "Collapse all" : "Expand all",
+							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+								variant: "outline",
+								size: isMobile ? "icon" : "icon-sm",
+								"aria-label": hasOpenFile ? "Collapse all" : "Expand all",
+								disabled: changedFiles.length === 0,
+								onClick: toggleAll,
+								children: hasOpenFile ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronsDownUp, { className: "size-4" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronsUpDown, { className: "size-4" })
+							})
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToggleGroup$1, {
 							variant: "outline",
-							size: "icon",
-							"aria-label": hasOpenFile ? "Collapse all" : "Expand all",
-							disabled: changedFiles.length === 0,
-							onClick: toggleAll,
-							children: hasOpenFile ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronsDownUp, { className: "size-4" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronsUpDown, { className: "size-4" })
+							size: isMobile ? "default" : "sm",
+							value: [diffStyle],
+							onValueChange: (values) => {
+								const value = values[0];
+								if (value === "unified" || value === "split") dispatch({
+									type: "diffStyleChanged",
+									diffStyle: value
+								});
+							},
+							children: ["unified", "split"].map((value) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToggleGroupItem, {
+								value,
+								children: value === "unified" ? "Unified" : "Split"
+							}, value))
 						})
-					}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToggleGroup$1, {
-						variant: "outline",
-						value: [diffStyle],
-						onValueChange: (values) => {
-							const value = values[0];
-							if (value === "unified" || value === "split") dispatch({
-								type: "diffStyleChanged",
-								diffStyle: value
-							});
-						},
-						children: ["unified", "split"].map((value) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToggleGroupItem, {
-							value,
-							children: value === "unified" ? "Unified" : "Split"
-						}, value))
-					})]
+					]
 				})]
 			}),
-			/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-				ref: changesScrollRef,
-				className: "min-h-0 flex-1 overflow-auto",
-				onScroll: (event) => {
-					updateStickyReviewFileHeader(event.currentTarget);
-				},
-				children: !normalizedCwd ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
-					className: "px-3 py-2.5",
-					children: "No directory selected."
-				}) : !viewerContextId ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
-					className: "px-3 py-2.5",
-					children: "Waiting for viewer context…"
-				}) : filesQuery.isPending && typeof files === "undefined" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(GitSectionNote, {
-					className: "px-3 py-2.5",
-					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {}), " Loading changes…"]
-				}) : filesQuery.error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
-					tone: "destructive",
-					className: "px-3 py-2.5",
-					children: getErrorMessage(filesQuery.error, "Failed to load changes")
-				}) : files === null ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
-					className: "px-3 py-2.5",
-					children: "No git repository detected."
-				}) : changedFiles.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Accordion$1, {
-					multiple: true,
-					value: openFiles,
-					onValueChange: (nextOpenFiles) => {
-						dispatch({
-							type: "openFilesChanged",
-							openFiles: nextOpenFiles
-						});
+			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "relative min-h-0 flex-1",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					ref: setChangesScrollElement,
+					className: "h-full overflow-auto",
+					onScroll: (event) => {
+						updateStickyReviewFileHeader(event.currentTarget);
+						onChangesScrollGradientScroll(event);
 					},
-					className: "border-b border-border/80",
-					children: changedFiles.map((file) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReviewFileAccordionItem, {
-						viewerContextId,
-						cwd: normalizedCwd,
-						active,
-						diffLineComments,
-						diffStyle,
-						file,
-						open: openFiles.includes(reviewFileValue(file)),
-						stuck: stickyReviewFileValue === reviewFileValue(file),
-						onAddDiffLineComment,
-						onOpenFile
-					}, reviewFileValue(file)))
-				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
-					className: "px-3 py-2.5",
-					children: "Working tree clean."
-				})
+					children: !normalizedCwd ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
+						className: "px-3 py-2.5",
+						children: "No directory selected."
+					}) : !viewerContextId ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
+						className: "px-3 py-2.5",
+						children: "Waiting for viewer context…"
+					}) : filesQuery.isPending && typeof files === "undefined" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(GitSectionNote, {
+						className: "px-3 py-2.5",
+						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {}), " Loading changes…"]
+					}) : filesQuery.error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
+						tone: "destructive",
+						className: "px-3 py-2.5",
+						children: getErrorMessage(filesQuery.error, "Failed to load changes")
+					}) : files === null ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
+						className: "px-3 py-2.5",
+						children: "No git repository detected."
+					}) : changedFiles.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Accordion$1, {
+						multiple: true,
+						value: openFiles,
+						onValueChange: (nextOpenFiles) => {
+							dispatch({
+								type: "openFilesChanged",
+								openFiles: nextOpenFiles
+							});
+						},
+						className: "border-b border-border/80",
+						children: changedFiles.map((file) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReviewFileAccordionItem, {
+							viewerContextId,
+							cwd: normalizedCwd,
+							active,
+							diffLineComments,
+							diffStyle,
+							file,
+							open: openFiles.includes(reviewFileValue(file)),
+							stuck: stickyReviewFileValue === reviewFileValue(file),
+							onAddDiffLineComment,
+							onOpenFile
+						}, reviewFileValue(file)))
+					}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
+						className: "px-3 py-2.5",
+						children: "Working tree clean."
+					})
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ScrollGradientOverlays, {
+					bottomHeight: changesScrollBottomGradientHeight,
+					topHeight: changesScrollTopGradientHeight
+				})]
 			}),
 			showEmbeddedHistory && normalizedCwd && viewerContextId && files !== null && !filesQuery.error ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 				ref: historyPanelRef,
@@ -18984,7 +19170,21 @@ function useFileReviewContentView({ viewerContextId, cwd, active, diffLineCommen
 						})
 					}) : null
 				]
-			}) : null
+			}) : null,
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AlertDialog$1, {
+				open: confirmNukeWorkingTreeOpen,
+				onOpenChange: setConfirmNukeWorkingTreeOpen,
+				children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AlertDialogContent, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AlertDialogHeader, { children: [
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AlertDialogMedia, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TriangleAlert, {}) }),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AlertDialogTitle, { children: "Nuke working tree?" }),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AlertDialogDescription, { children: "This restores tracked files to HEAD and deletes untracked and ignored files in this repository. This cannot be undone from Pico." })
+				] }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AlertDialogFooter, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AlertDialogCancel, { children: "Cancel" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AlertDialogAction, {
+					variant: "destructive",
+					disabled: bulkActionDisabled,
+					onClick: runConfirmedNukeWorkingTree,
+					children: "Nuke working tree"
+				})] })] })
+			})
 		]
 	});
 }
@@ -19061,8 +19261,8 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffLineComment
 		onGutterUtilityClick: startLineComment
 	} : {};
 	const themeOptions = usePicoDiffThemeOptions();
-	const [indexStatus, worktreeStatus] = gitFileStatusCharacters(file.status);
-	const canStage = worktreeStatus !== " " || indexStatus === "?";
+	const canStage = gitFileCanStage(file);
+	const canUnstage = gitFileCanUnstage(file);
 	const invalidateChangedFileQueries = async () => {
 		await invalidateGitQueries({
 			queryClient,
@@ -19071,26 +19271,27 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffLineComment
 		});
 	};
 	const stageMutation = useMutation({
-		mutationFn: async () => await fetchJson(buildRequestUrl("/api/git-stage", { contextId: viewerContextId }), {
+		mutationFn: async (action) => await fetchJson(buildRequestUrl("/api/git-stage", { contextId: viewerContextId }), {
 			method: "POST",
 			headers: { "content-type": "application/json" },
 			body: JSON.stringify({
+				action,
 				cwd: normalizedCwd,
 				path: file.path,
 				previousPath: file.previousPath
 			})
 		}),
-		onSuccess: async () => {
+		onSuccess: async (_response, action) => {
 			await queryClient.invalidateQueries({
 				queryKey: picoQueryKeys.gitStatus(viewerContextId, normalizedCwd),
 				exact: true,
 				refetchType: "active"
 			});
 			await invalidateChangedFileQueries();
-			toast.success("Staged changes", { description: file.path });
+			toast.success(action === "unstage" ? "Unstaged changes" : "Staged changes", { description: file.path });
 		},
-		onError: (error) => {
-			toast.error(getErrorMessage(error, "Failed to stage changes"));
+		onError: (error, action) => {
+			toast.error(getErrorMessage(error, action === "unstage" ? "Failed to unstage changes" : "Failed to stage changes"));
 		}
 	});
 	const discardMutation = useMutation({
@@ -19127,6 +19328,9 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffLineComment
 		oldContent,
 		newContent
 	]);
+	const gitActionDisabled = actionPending || !viewerContextId || !normalizedCwd;
+	const stagePending = stageMutation.isPending && stageMutation.variables === "stage";
+	const unstagePending = stageMutation.isPending && stageMutation.variables === "unstage";
 	const openFile = (event) => {
 		event?.stopPropagation();
 		onOpenFile?.(file.path, { pin: true });
@@ -19137,50 +19341,81 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffLineComment
 	};
 	const stageFileChanges = (event) => {
 		event?.stopPropagation();
-		stageMutation.mutate();
+		stageMutation.mutate("stage");
+	};
+	const unstageFileChanges = (event) => {
+		event?.stopPropagation();
+		stageMutation.mutate("unstage");
 	};
+	const trigger = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AccordionTrigger$1, {
+		"data-review-file-trigger": true,
+		"data-review-file-value": value,
+		className: "group/review-file-trigger relative flex min-h-10 min-w-0 flex-1 items-center justify-between gap-3 rounded-none border border-transparent bg-background px-3 py-2 text-left text-[13px] font-medium transition-all outline-none hover:no-underline focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 aria-disabled:pointer-events-none aria-disabled:opacity-50 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 **:data-[slot=accordion-trigger-icon]:text-muted-foreground",
+		children: [
+			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+				className: "grid min-w-0 flex-1 grid-cols-[auto_auto_minmax(0,1fr)_auto] items-center gap-2",
+				children: [
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitFileStatus, { status: file.status }),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectFileTypeIcon, { path: file.path }),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+						className: "min-w-0 truncate text-left",
+						children: file.previousPath ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+							/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+								className: "text-muted-foreground",
+								children: file.previousPath
+							}),
+							/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+								className: "text-muted-foreground/70",
+								children: " → "
+							}),
+							/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: file.path })
+						] }) : file.path
+					}),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitFileDiff, { file })
+				]
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronRight, {
+				"data-slot": "accordion-trigger-icon",
+				className: "pointer-events-none size-4 shrink-0 group-aria-expanded/review-file-trigger:hidden"
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronDown, {
+				"data-slot": "accordion-trigger-icon",
+				className: "pointer-events-none hidden size-4 shrink-0 group-aria-expanded/review-file-trigger:inline"
+			})
+		]
+	});
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AccordionItem, {
 		value,
 		className: "border-border/70",
 		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AccordionHeader, {
 			className: cn("group/review-file-header sticky top-0 z-20 flex bg-background transition-shadow", stuck && "shadow-sm"),
-			children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AccordionTrigger$1, {
-				"data-review-file-trigger": true,
-				"data-review-file-value": value,
-				className: "group/review-file-trigger relative flex min-h-10 min-w-0 flex-1 items-center justify-between gap-3 rounded-none border border-transparent bg-background px-3 py-2 text-left font-mono text-[13px] font-medium transition-all outline-none hover:no-underline focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 aria-disabled:pointer-events-none aria-disabled:opacity-50 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 **:data-[slot=accordion-trigger-icon]:text-muted-foreground",
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ContextMenu$1, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContextMenuTrigger, { render: trigger }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ContextMenuContent, {
+				className: "w-48",
 				children: [
-					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
-						className: "grid min-w-0 flex-1 grid-cols-[auto_auto_minmax(0,1fr)_auto] items-center gap-2",
-						children: [
-							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitFileStatus, { status: file.status }),
-							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectFileTypeIcon, { path: file.path }),
-							/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-								className: "min-w-0 truncate text-left",
-								children: file.previousPath ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-									/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-										className: "text-muted-foreground",
-										children: file.previousPath
-									}),
-									/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-										className: "text-muted-foreground/70",
-										children: " → "
-									}),
-									/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: file.path })
-								] }) : file.path
-							}),
-							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitFileDiff, { file })
-						]
+					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ContextMenuItem, {
+						disabled: !onOpenFile,
+						onClick: openFile,
+						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrowUpRight, {}), "Open file"]
 					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronRight, {
-						"data-slot": "accordion-trigger-icon",
-						className: "pointer-events-none size-4 shrink-0 group-aria-expanded/review-file-trigger:hidden"
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContextMenuSeparator, {}),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ContextMenuItem, {
+						disabled: gitActionDisabled || !canStage,
+						onClick: stageFileChanges,
+						children: [stagePending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { size: "xs" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Plus, {}), "Stage changes"]
 					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronDown, {
-						"data-slot": "accordion-trigger-icon",
-						className: "pointer-events-none hidden size-4 shrink-0 group-aria-expanded/review-file-trigger:inline"
+					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ContextMenuItem, {
+						disabled: gitActionDisabled || !canUnstage,
+						onClick: unstageFileChanges,
+						children: [unstagePending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { size: "xs" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Minus, {}), "Unstage changes"]
+					}),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ContextMenuItem, {
+						variant: "destructive",
+						disabled: gitActionDisabled,
+						onClick: discardFileChanges,
+						children: [discardMutation.isPending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { size: "xs" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Undo2, {}), "Discard changes"]
 					})
 				]
-			})
+			})] })
 		}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AccordionContent, {
 			className: "bg-background p-0",
 			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
@@ -19425,7 +19660,7 @@ function assignClassName(element, className) {
 }
 function renderPendingCommitDiffLineComment(pendingComment) {
 	const form = document.createElement("form");
-	assignClassName(form, "m-2 w-[min(38rem,calc(100vw_-_5rem))] max-w-[calc(100%_-_1rem)] rounded-lg border border-border/70 bg-background p-2 shadow-sm");
+	assignClassName(form, "m-2 w-[calc(100%_-_1rem)] max-w-[38rem] rounded-lg border border-border/70 bg-background p-2 shadow-sm");
 	const header = document.createElement("div");
 	assignClassName(header, "mb-2 flex min-w-0 items-center justify-between gap-2 text-xs text-muted-foreground");
 	const label = document.createElement("span");
@@ -19568,7 +19803,7 @@ function CommitFileDiffAccordionItem({ comments, diffStyle, fileDiff, index, onS
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AccordionTrigger$1, {
 				"data-commit-file-trigger": true,
 				"data-commit-file-value": value,
-				className: "group/commit-file-trigger relative flex min-h-10 min-w-0 flex-1 items-center justify-between gap-3 rounded-none border border-transparent bg-background px-3 py-2 text-left font-mono text-[13px] font-medium transition-all outline-none hover:no-underline focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 aria-disabled:pointer-events-none aria-disabled:opacity-50 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 **:data-[slot=accordion-trigger-icon]:text-muted-foreground",
+				className: "group/commit-file-trigger relative flex min-h-10 min-w-0 flex-1 items-center justify-between gap-3 rounded-none border border-transparent bg-background px-3 py-2 text-left text-[13px] font-medium transition-all outline-none hover:no-underline focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 aria-disabled:pointer-events-none aria-disabled:opacity-50 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 **:data-[slot=accordion-trigger-icon]:text-muted-foreground",
 				children: [
 					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
 						className: "grid min-w-0 flex-1 grid-cols-[minmax(0,1fr)_auto] items-baseline gap-3",
@@ -19706,8 +19941,14 @@ function CommitDiffHeaderTitle({ tab }) {
 function CommitDiffContent({ viewerContextId, cwd, active, diffLineComments, onAddDiffLineComment, tab }) {
 	const [diffStyle, setDiffStyle] = import_react.useState("unified");
 	const [stickyCommitFileValue, setStickyCommitFileValue] = import_react.useState("");
+	const isMobile = useIsMobile();
 	const [commentTarget, setCommentTarget] = import_react.useState(null);
 	const diffScrollRef = import_react.useRef(null);
+	const { bottomHeight: diffScrollBottomGradientHeight, onScroll: onDiffScrollGradientScroll, setScrollElement: setDiffScrollGradientElement, topHeight: diffScrollTopGradientHeight } = useScrollGradients();
+	const setDiffScrollElement = import_react.useCallback((element) => {
+		diffScrollRef.current = element;
+		setDiffScrollGradientElement(element);
+	}, [setDiffScrollGradientElement]);
 	const updateStickyCommitFileHeader = (scrollElement) => {
 		setDerivedScrollState(setStickyCommitFileValue, getStuckScrollTriggerValue({
 			getValue: (trigger) => trigger.dataset.commitFileValue || "",
@@ -19773,6 +20014,7 @@ function CommitDiffContent({ viewerContextId, cwd, active, diffLineComments, onA
 			className: "flex min-h-10 shrink-0 items-center justify-between gap-2 border-b border-border/70 bg-background p-2",
 			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitDiffHeaderTitle, { tab }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ToggleGroup$1, {
 				variant: "outline",
+				size: isMobile ? "default" : "sm",
 				value: [diffStyle],
 				onValueChange: (values) => {
 					const value = values[0];
@@ -19786,41 +20028,48 @@ function CommitDiffContent({ viewerContextId, cwd, active, diffLineComments, onA
 					children: "Split"
 				})]
 			})]
-		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-			ref: diffScrollRef,
-			className: "min-h-0 flex-1 overflow-auto",
-			onScroll: (event) => {
-				updateStickyCommitFileHeader(event.currentTarget);
-			},
-			children: diffQuery.isPending && !diffQuery.data ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-				className: "p-4",
-				children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(GitSectionNote, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {}), " Loading commit diff…"] })
-			}) : diffQuery.error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-				className: "p-4",
-				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
-					tone: "destructive",
-					children: getErrorMessage(diffQuery.error, "Failed to load commit diff")
+		}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+			className: "relative min-h-0 flex-1",
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+				ref: setDiffScrollElement,
+				className: "h-full overflow-auto",
+				onScroll: (event) => {
+					updateStickyCommitFileHeader(event.currentTarget);
+					onDiffScrollGradientScroll(event);
+				},
+				children: diffQuery.isPending && !diffQuery.data ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "p-4",
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(GitSectionNote, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {}), " Loading commit diff…"] })
+				}) : diffQuery.error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "p-4",
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, {
+						tone: "destructive",
+						children: getErrorMessage(diffQuery.error, "Failed to load commit diff")
+					})
+				}) : diffQuery.data?.patch && tab.path ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitSingleFileDiff, {
+					comments: commentsForTab.filter((comment) => {
+						if (!tab.path) return true;
+						return comment.path === tab.path || comment.path === tab.previousPath;
+					}),
+					diffStyle,
+					onStartComment: startLineComment,
+					patch: diffQuery.data.patch,
+					pendingComment
+				}) : diffQuery.data?.patch ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitPatchDiffs, {
+					comments: commentsForTab,
+					diffStyle,
+					onStartComment: startLineComment,
+					patch: diffQuery.data.patch,
+					pendingComment,
+					stuckFileValue: stickyCommitFileValue
+				}, `${diffQuery.data.commit}:${diffQuery.data.mode}`) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "p-4",
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, { children: "No line changes." })
 				})
-			}) : diffQuery.data?.patch && tab.path ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitSingleFileDiff, {
-				comments: commentsForTab.filter((comment) => {
-					if (!tab.path) return true;
-					return comment.path === tab.path || comment.path === tab.previousPath;
-				}),
-				diffStyle,
-				onStartComment: startLineComment,
-				patch: diffQuery.data.patch,
-				pendingComment
-			}) : diffQuery.data?.patch ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitPatchDiffs, {
-				comments: commentsForTab,
-				diffStyle,
-				onStartComment: startLineComment,
-				patch: diffQuery.data.patch,
-				pendingComment,
-				stuckFileValue: stickyCommitFileValue
-			}, `${diffQuery.data.commit}:${diffQuery.data.mode}`) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-				className: "p-4",
-				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitSectionNote, { children: "No line changes." })
-			})
+			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ScrollGradientOverlays, {
+				bottomHeight: diffScrollBottomGradientHeight,
+				topHeight: diffScrollTopGradientHeight
+			})]
 		})]
 	});
 }
@@ -20053,28 +20302,723 @@ function RightSidebar({ viewerContextId, cwd, active, activeFilePath = "", activ
 								})
 							}) : null]
 						})]
-					}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectFilesWorkspace, {
-						viewerContextId,
-						cwd: normalizedCwd,
-						active: active && activeTab === "files",
-						activeFilePath: currentFilePath,
-						onOpenFile: openFile,
-						previewMode
-					})
-				}),
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectOpenFileDialog, {
-					open: localState.openFileDialogOpen,
-					onOpenChange: (open) => dispatchLocal({
-						type: "set-open-file-dialog-open",
-						open
+					}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectFilesWorkspace, {
+						viewerContextId,
+						cwd: normalizedCwd,
+						active: active && activeTab === "files",
+						activeFilePath: currentFilePath,
+						onOpenFile: openFile,
+						previewMode
+					})
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectOpenFileDialog, {
+					open: localState.openFileDialogOpen,
+					onOpenChange: (open) => dispatchLocal({
+						type: "set-open-file-dialog-open",
+						open
+					}),
+					paths: fileDialogPaths,
+					onOpenFile: (path) => {
+						openFile(path, { pin: true });
+					}
+				})
+			]
+		})]
+	});
+}
+var TERMINAL_ANSI_THEMES = {
+	dark: {
+		black: "#484f58",
+		red: "#ff7b72",
+		green: "#3fb950",
+		yellow: "#d29922",
+		blue: "#58a6ff",
+		magenta: "#bc8cff",
+		cyan: "#39c5cf",
+		white: "#b1bac4",
+		brightBlack: "#6e7681",
+		brightRed: "#ffa198",
+		brightGreen: "#56d364",
+		brightYellow: "#e3b341",
+		brightBlue: "#79c0ff",
+		brightMagenta: "#d2a8ff",
+		brightCyan: "#56d4dd",
+		brightWhite: "#f0f6fc"
+	},
+	light: {
+		black: "#24292f",
+		red: "#cf222e",
+		green: "#116329",
+		yellow: "#953800",
+		blue: "#0969da",
+		magenta: "#8250df",
+		cyan: "#1b7c83",
+		white: "#6e7781",
+		brightBlack: "#57606a",
+		brightRed: "#a40e26",
+		brightGreen: "#1a7f37",
+		brightYellow: "#9a6700",
+		brightBlue: "#218bff",
+		brightMagenta: "#a475f9",
+		brightCyan: "#3192aa",
+		brightWhite: "#24292f"
+	}
+};
+var terminalTabCounter = 0;
+function createTerminalTabId() {
+	if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") return `terminal-tab-${crypto.randomUUID()}`;
+	terminalTabCounter += 1;
+	return `terminal-tab-${Date.now()}-${terminalTabCounter}`;
+}
+function createTerminalTab(id = createTerminalTabId()) {
+	return {
+		id,
+		status: { type: "idle" },
+		terminalId: null
+	};
+}
+function createTerminalTabsState(scopeKey) {
+	const storedTabs = readStoredTerminalTabs(scopeKey);
+	const tabs = storedTabs.tabs.map((id) => createTerminalTab(id));
+	return {
+		activeTabId: storedTabs.activeTabId ?? tabs[0]?.id ?? null,
+		scopeKey,
+		tabs
+	};
+}
+function rememberTerminalTabsState(state) {
+	rememberStoredTerminalTabs(state.scopeKey, {
+		activeTabId: state.activeTabId,
+		tabs: state.tabs.map((tab) => tab.id)
+	});
+}
+function terminalStatusText(status) {
+	switch (status.type) {
+		case "idle": return "Idle";
+		case "connecting": return "Connecting…";
+		case "connected": return status.shell ? `Running ${status.shell}` : "Connected";
+		case "exited": return `Exited ${status.exitCode}`;
+		case "error": return "Terminal error";
+	}
+}
+function terminalStatusDetail(status) {
+	switch (status.type) {
+		case "idle": return "This terminal has not started yet.";
+		case "connecting": return "Pico is connecting to the terminal process.";
+		case "connected": return status.shell ? `The terminal is connected and running ${status.shell}.` : "The terminal is connected.";
+		case "exited": return typeof status.signal === "number" ? `The terminal process exited with code ${status.exitCode} and signal ${status.signal}.` : `The terminal process exited with code ${status.exitCode}.`;
+		case "error": return status.message;
+	}
+}
+function terminalTabLabel(tab, index) {
+	if (tab.status.type === "connected" && tab.status.shell) return `${index + 1}: ${tab.status.shell}`;
+	return `Terminal ${index + 1}`;
+}
+function statusDotClassName(status) {
+	switch (status.type) {
+		case "connected": return "bg-success";
+		case "connecting": return "bg-warning";
+		case "error":
+		case "exited": return "bg-destructive";
+		case "idle": return "bg-muted-foreground/50";
+	}
+}
+function cssVariable(name, fallback) {
+	return window.getComputedStyle(document.documentElement).getPropertyValue(name).trim() || fallback;
+}
+function resolveTerminalThemeMode() {
+	for (const className of document.documentElement.classList) {
+		const mode = appliedThemeClassColorMode(className);
+		if (mode) return mode;
+	}
+	return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+}
+function terminalAnsiTheme() {
+	const fallback = TERMINAL_ANSI_THEMES[resolveTerminalThemeMode()];
+	return {
+		black: cssVariable("--terminal-ansi-black", fallback.black),
+		red: cssVariable("--terminal-ansi-red", fallback.red),
+		green: cssVariable("--terminal-ansi-green", fallback.green),
+		yellow: cssVariable("--terminal-ansi-yellow", fallback.yellow),
+		blue: cssVariable("--terminal-ansi-blue", fallback.blue),
+		magenta: cssVariable("--terminal-ansi-magenta", fallback.magenta),
+		cyan: cssVariable("--terminal-ansi-cyan", fallback.cyan),
+		white: cssVariable("--terminal-ansi-white", fallback.white),
+		brightBlack: cssVariable("--terminal-ansi-bright-black", fallback.brightBlack),
+		brightRed: cssVariable("--terminal-ansi-bright-red", fallback.brightRed),
+		brightGreen: cssVariable("--terminal-ansi-bright-green", fallback.brightGreen),
+		brightYellow: cssVariable("--terminal-ansi-bright-yellow", fallback.brightYellow),
+		brightBlue: cssVariable("--terminal-ansi-bright-blue", fallback.brightBlue),
+		brightMagenta: cssVariable("--terminal-ansi-bright-magenta", fallback.brightMagenta),
+		brightCyan: cssVariable("--terminal-ansi-bright-cyan", fallback.brightCyan),
+		brightWhite: cssVariable("--terminal-ansi-bright-white", fallback.brightWhite)
+	};
+}
+function createTerminalTheme() {
+	const ansiTheme = terminalAnsiTheme();
+	return {
+		...ansiTheme,
+		background: cssVariable("--terminal-background", cssVariable("--background", "#111111")),
+		cursor: cssVariable("--terminal-cursor", cssVariable("--primary", "#7aa2f7")),
+		foreground: cssVariable("--terminal-foreground", cssVariable("--foreground", ansiTheme.brightWhite)),
+		selectionBackground: cssVariable("--terminal-selection-background", cssVariable("--code-selection", "#334155"))
+	};
+}
+function createTerminalFontFamily() {
+	return cssVariable("--font-mono", "Menlo, ui-monospace, SFMono-Regular, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace");
+}
+function errorMessage(error) {
+	if (error instanceof Error && error.message.trim()) return error.message;
+	if (typeof error === "string" && error.trim()) return error;
+	return "Unknown terminal error";
+}
+function exitedStatus(event) {
+	return typeof event.signal === "number" && event.signal > 0 ? {
+		type: "exited",
+		exitCode: event.exitCode,
+		signal: event.signal
+	} : {
+		type: "exited",
+		exitCode: event.exitCode
+	};
+}
+function isTerminalToggleEvent(event) {
+	return event.ctrlKey && !event.altKey && !event.metaKey && !event.shiftKey && (event.key === "`" || event.code === "Backquote");
+}
+function TerminalStatusDot({ status }) {
+	if (status.type === "connecting") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {
+		size: "xs",
+		className: "shrink-0"
+	});
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+		"aria-hidden": "true",
+		className: cn("size-2 shrink-0 rounded-full", statusDotClassName(status))
+	});
+}
+function TerminalStatusDialog({ cwd, index, onOpenChange, open, tab }) {
+	const status = tab?.status ?? { type: "idle" };
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Dialog$1, {
+		open,
+		onOpenChange,
+		focusPromptOnClose: false,
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DialogContent, {
+			className: "max-w-sm",
+			children: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DialogHeader, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DialogTitle, { children: [tab ? terminalTabLabel(tab, index) : "Terminal", " status"] }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DialogDescription, { children: terminalStatusDetail(status) })] }),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("dl", {
+					className: "grid gap-3 text-sm",
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						className: "grid gap-1",
+						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("dt", {
+							className: "text-xs font-medium text-muted-foreground",
+							children: "Status"
+						}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("dd", { children: terminalStatusText(status) })]
+					}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						className: "grid gap-1",
+						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("dt", {
+							className: "text-xs font-medium text-muted-foreground",
+							children: "Working directory"
+						}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("dd", {
+							className: "break-all",
+							children: cwd
+						})]
+					})]
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DialogFooter, { showCloseButton: true })
+			]
+		})
+	});
+}
+function TerminalTabPane({ active, cwd, onStatusChange, onTerminalIdChange, selected, sessionId, tabId, viewerContextId }) {
+	const terminalElementRef = import_react.useRef(null);
+	const terminalRef = import_react.useRef(null);
+	const terminalIdRef = import_react.useRef(null);
+	const activeRef = import_react.useRef(active);
+	const fitAndResizeRef = import_react.useRef(() => {});
+	const onStatusChangeRef = import_react.useRef(onStatusChange);
+	const onTerminalIdChangeRef = import_react.useRef(onTerminalIdChange);
+	const [status, setStatus] = import_react.useState({ type: "idle" });
+	import_react.useLayoutEffect(() => {
+		activeRef.current = active;
+	}, [active]);
+	import_react.useEffect(() => {
+		onStatusChangeRef.current = onStatusChange;
+	}, [onStatusChange]);
+	import_react.useEffect(() => {
+		onTerminalIdChangeRef.current = onTerminalIdChange;
+	}, [onTerminalIdChange]);
+	import_react.useEffect(() => {
+		if (!cwd) {
+			setStatus({ type: "idle" });
+			onStatusChangeRef.current(tabId, { type: "idle" });
+			return;
+		}
+		const terminalElement = terminalElementRef.current;
+		if (!terminalElement) return;
+		let disposed = false;
+		let eventSource = null;
+		let inputDisposable = null;
+		let fitAddon = null;
+		let resizeObserver = null;
+		let inputFlushTimer = null;
+		let resizeFrame = null;
+		let inputBuffer = "";
+		let lastResizeKey = "";
+		const requestOptions = sessionId ? {
+			contextId: viewerContextId,
+			sessionId
+		} : { contextId: viewerContextId };
+		const publishStatus = (nextStatus) => {
+			if (disposed) return;
+			setStatus(nextStatus);
+			onStatusChangeRef.current(tabId, nextStatus);
+		};
+		const postJson = async (path, body) => {
+			return await fetchJson(buildRequestUrl(path, requestOptions), {
+				body: JSON.stringify(body),
+				headers: { "content-type": "application/json" },
+				method: "POST"
+			});
+		};
+		const flushInput = () => {
+			inputFlushTimer = null;
+			const id = terminalIdRef.current;
+			if (!id || !inputBuffer) return;
+			const data = inputBuffer;
+			inputBuffer = "";
+			postJson(`/api/terminal/${encodeURIComponent(id)}/input`, { data }).catch((error) => {
+				if (!disposed) publishStatus({
+					type: "error",
+					message: errorMessage(error)
+				});
+			});
+		};
+		const scheduleInputFlush = () => {
+			if (inputFlushTimer !== null) return;
+			inputFlushTimer = window.setTimeout(flushInput, 12);
+		};
+		const fitAndResize = () => {
+			const terminal = terminalRef.current;
+			if (!terminal || !fitAddon) return;
+			try {
+				fitAddon.fit();
+			} catch {
+				return;
+			}
+			const id = terminalIdRef.current;
+			if (!id) return;
+			const resizeKey = `${terminal.cols}x${terminal.rows}`;
+			if (resizeKey === lastResizeKey) return;
+			lastResizeKey = resizeKey;
+			postJson(`/api/terminal/${encodeURIComponent(id)}/resize`, {
+				cols: terminal.cols,
+				rows: terminal.rows
+			}).catch(() => {});
+		};
+		const scheduleFitAndResize = () => {
+			if (resizeFrame !== null) return;
+			resizeFrame = window.requestAnimationFrame(() => {
+				resizeFrame = null;
+				fitAndResize();
+			});
+		};
+		fitAndResizeRef.current = scheduleFitAndResize;
+		const startTerminal = async () => {
+			try {
+				publishStatus({ type: "connecting" });
+				terminalElement.textContent = "";
+				const [{ Terminal }, { FitAddon }] = await Promise.all([import("../_libs/xterm__xterm.mjs").then((n) => n.t), import("../_libs/xterm__addon-fit.mjs").then((n) => n.t)]);
+				if (disposed) return;
+				const terminal = new Terminal({
+					allowTransparency: true,
+					convertEol: false,
+					cursorBlink: true,
+					fontFamily: createTerminalFontFamily(),
+					fontSize: 12,
+					letterSpacing: 0,
+					lineHeight: 1.2,
+					scrollback: 5e3,
+					theme: createTerminalTheme()
+				});
+				fitAddon = new FitAddon();
+				terminal.loadAddon(fitAddon);
+				terminal.open(terminalElement);
+				terminalRef.current = terminal;
+				inputDisposable = terminal.onData((data) => {
+					if (!activeRef.current) return;
+					inputBuffer += data;
+					scheduleInputFlush();
+				});
+				scheduleFitAndResize();
+				const terminalResponse = await postJson("/api/terminal", {
+					clientKey: tabId,
+					cols: terminal.cols,
+					rows: terminal.rows
+				});
+				if (disposed) return;
+				terminalIdRef.current = terminalResponse.id;
+				onTerminalIdChangeRef.current(tabId, terminalResponse.id);
+				publishStatus({
+					type: "connected",
+					shell: terminalResponse.shell
+				});
+				eventSource = new EventSource(buildRequestUrl(`/api/terminal/${encodeURIComponent(terminalResponse.id)}/events`, requestOptions));
+				eventSource.onmessage = (message) => {
+					if (disposed) return;
+					const event = JSON.parse(message.data);
+					if (event.type === "output") {
+						terminal.write(event.data);
+						return;
+					}
+					if (event.type === "ready") {
+						publishStatus({
+							type: "connected",
+							shell: event.shell
+						});
+						return;
+					}
+					if (event.type === "exit") {
+						publishStatus(exitedStatus(event));
+						return;
+					}
+					if (event.type === "error") publishStatus({
+						type: "error",
+						message: event.error
+					});
+				};
+				eventSource.onerror = () => {
+					if (!disposed && terminalIdRef.current) setStatus((current) => {
+						if (current.type === "connected") return current;
+						const nextStatus = {
+							type: "error",
+							message: "Terminal connection interrupted."
+						};
+						onStatusChangeRef.current(tabId, nextStatus);
+						return nextStatus;
+					});
+				};
+				resizeObserver = new ResizeObserver(scheduleFitAndResize);
+				resizeObserver.observe(terminalElement);
+				scheduleFitAndResize();
+			} catch (error) {
+				if (disposed) return;
+				const message = errorMessage(error);
+				publishStatus({
+					type: "error",
+					message
+				});
+				terminalRef.current?.writeln(`\r\n${message}`);
+			}
+		};
+		startTerminal();
+		return () => {
+			disposed = true;
+			if (inputFlushTimer !== null) window.clearTimeout(inputFlushTimer);
+			if (resizeFrame !== null) window.cancelAnimationFrame(resizeFrame);
+			flushInput();
+			resizeObserver?.disconnect();
+			eventSource?.close();
+			inputDisposable?.dispose();
+			terminalRef.current?.dispose();
+			terminalRef.current = null;
+			terminalIdRef.current = null;
+			fitAndResizeRef.current = () => {};
+		};
+	}, [
+		cwd,
+		sessionId,
+		tabId,
+		viewerContextId
+	]);
+	import_react.useEffect(() => {
+		const applyTheme = () => {
+			const terminal = terminalRef.current;
+			if (!terminal) return;
+			terminal.options.theme = createTerminalTheme();
+			terminal.options.fontFamily = createTerminalFontFamily();
+		};
+		const observer = new MutationObserver(applyTheme);
+		observer.observe(document.documentElement, {
+			attributeFilter: ["class", "data-pico-theme-mode"],
+			attributes: true
+		});
+		applyTheme();
+		return () => observer.disconnect();
+	}, []);
+	import_react.useEffect(() => {
+		if (!active) {
+			terminalRef.current?.blur();
+			return;
+		}
+		const frame = window.requestAnimationFrame(() => {
+			fitAndResizeRef.current();
+			terminalRef.current?.focus();
+		});
+		return () => window.cancelAnimationFrame(frame);
+	}, [active, status]);
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		"aria-hidden": !selected,
+		"data-terminal-tab": tabId,
+		className: cn("absolute inset-0 min-h-0 w-full overflow-hidden bg-background", selected ? "z-10 opacity-100" : "pointer-events-none z-0 opacity-0"),
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+			ref: terminalElementRef,
+			className: "h-full min-h-0 w-full"
+		})
+	});
+}
+function TerminalPanel({ active, className, cwd, onClose, sessionId, showCloseButton = true, viewerContextId }) {
+	const normalizedCwd = cwd?.trim() || "";
+	const scopeKey = `${viewerContextId}:${sessionId ?? "no-session"}:${normalizedCwd}`;
+	const [tabsState, setTabsState] = import_react.useState(() => createTerminalTabsState(scopeKey));
+	const [statusDialogTabId, setStatusDialogTabId] = import_react.useState(null);
+	const tabs = tabsState.scopeKey === scopeKey ? tabsState.tabs : [];
+	const selectedTabId = tabsState.scopeKey === scopeKey ? tabsState.activeTabId ?? tabs[0]?.id ?? null : null;
+	import_react.useEffect(() => {
+		if (tabsState.scopeKey === scopeKey) return;
+		setTabsState(createTerminalTabsState(scopeKey));
+	}, [scopeKey, tabsState.scopeKey]);
+	import_react.useEffect(() => {
+		if (!active || !normalizedCwd || tabs.length > 0 || tabsState.scopeKey !== scopeKey) return;
+		const tab = createTerminalTab();
+		const nextState = {
+			activeTabId: tab.id,
+			scopeKey,
+			tabs: [tab]
+		};
+		rememberTerminalTabsState(nextState);
+		setTabsState(nextState);
+	}, [
+		active,
+		normalizedCwd,
+		scopeKey,
+		tabs.length,
+		tabsState.scopeKey
+	]);
+	const activeStatus = tabs.find((tab) => tab.id === selectedTabId)?.status ?? { type: "idle" };
+	const activeError = activeStatus.type === "error" ? activeStatus.message : void 0;
+	const statusDialogTab = tabs.find((tab) => tab.id === statusDialogTabId);
+	const statusDialogTabIndex = statusDialogTab ? tabs.indexOf(statusDialogTab) : 0;
+	const requestOptions = sessionId ? {
+		contextId: viewerContextId,
+		sessionId
+	} : { contextId: viewerContextId };
+	const addTerminalTab = () => {
+		if (!normalizedCwd) return;
+		const tab = createTerminalTab();
+		setTabsState((current) => {
+			const nextState = current.scopeKey !== scopeKey ? {
+				activeTabId: tab.id,
+				scopeKey,
+				tabs: [tab]
+			} : {
+				...current,
+				activeTabId: tab.id,
+				tabs: [...current.tabs, tab]
+			};
+			rememberTerminalTabsState(nextState);
+			return nextState;
+		});
+	};
+	const closeServerTerminal = (terminalId) => {
+		if (!terminalId) return;
+		fetchJson(buildRequestUrl(`/api/terminal/${encodeURIComponent(terminalId)}/close`, requestOptions), { method: "POST" }).catch(() => {});
+	};
+	const closeTerminalTab = (tabId) => {
+		if (tabs.length <= 0) return;
+		closeServerTerminal(tabs.find((tab) => tab.id === tabId)?.terminalId ?? null);
+		setTabsState((current) => {
+			if (current.scopeKey !== scopeKey || current.tabs.length <= 0) return current;
+			const closingIndex = current.tabs.findIndex((tab) => tab.id === tabId);
+			const nextTabs = current.tabs.filter((tab) => tab.id !== tabId);
+			const nextActiveTabId = current.activeTabId === tabId ? nextTabs[Math.min(Math.max(closingIndex, 0), nextTabs.length - 1)]?.id ?? null : current.activeTabId;
+			const nextState = {
+				...current,
+				activeTabId: nextActiveTabId,
+				tabs: nextTabs
+			};
+			rememberTerminalTabsState(nextState);
+			return nextState;
+		});
+	};
+	const updateTabStatus = (tabId, status) => {
+		setTabsState((current) => {
+			if (current.scopeKey !== scopeKey) return current;
+			return {
+				...current,
+				tabs: current.tabs.map((tab) => tab.id === tabId ? {
+					...tab,
+					status
+				} : tab)
+			};
+		});
+	};
+	const updateTabTerminalId = (tabId, terminalId) => {
+		setTabsState((current) => {
+			if (current.scopeKey !== scopeKey) return current;
+			return {
+				...current,
+				tabs: current.tabs.map((tab) => tab.id === tabId ? {
+					...tab,
+					terminalId
+				} : tab)
+			};
+		});
+	};
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", {
+		"data-terminal-panel": "true",
+		className: cn("pico-terminal-panel flex h-full min-h-0 w-full min-w-0 flex-col bg-background", className),
+		onKeyDownCapture: (event) => {
+			if (!isTerminalToggleEvent(event) || !onClose) return;
+			event.preventDefault();
+			event.stopPropagation();
+			event.nativeEvent.stopImmediatePropagation();
+			onClose();
+		},
+		children: [
+			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "flex min-h-10 shrink-0 items-center gap-2 border-b border-border/70 px-2",
+				children: [
+					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						className: "hidden max-w-56 min-w-0 flex-col gap-0 px-1 sm:flex",
+						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+							className: "truncate text-xs font-medium",
+							children: "Terminal"
+						}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+							className: "flex min-w-0 items-center gap-1 truncate text-[11px] text-muted-foreground",
+							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TerminalStatusDot, { status: activeStatus }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+								className: "truncate",
+								children: normalizedCwd ? formatDisplayPath$1(normalizedCwd) : "No cwd"
+							})]
+						})]
 					}),
-					paths: fileDialogPaths,
-					onOpenFile: (path) => {
-						openFile(path, { pin: true });
-					}
+					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						className: "flex min-w-0 flex-1 items-center gap-1 overflow-x-auto py-1",
+						children: [tabs.map((tab, index) => {
+							const selected = tab.id === selectedTabId;
+							const label = terminalTabLabel(tab, index);
+							const statusText = terminalStatusText(tab.status);
+							return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+								className: cn("group flex h-7 max-w-48 shrink-0 items-center overflow-hidden rounded-md border text-xs", selected ? "border-border bg-muted text-foreground" : "border-transparent bg-transparent text-muted-foreground hover:bg-muted/60 hover:text-foreground"),
+								children: [
+									/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+										title: `${label} · ${statusText}`,
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: "flex h-full w-7 shrink-0 items-center justify-center outline-hidden focus-visible:ring-1 focus-visible:ring-ring",
+											"aria-label": `Show ${label} status`,
+											onClick: (event) => {
+												event.stopPropagation();
+												setStatusDialogTabId(tab.id);
+											},
+											children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TerminalStatusDot, { status: tab.status })
+										})
+									}),
+									/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+										title: `${label} · ${statusText}`,
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: "flex h-full min-w-0 flex-1 items-center px-1 text-left outline-hidden focus-visible:ring-1 focus-visible:ring-ring",
+											onClick: () => {
+												setTabsState((current) => {
+													if (current.scopeKey !== scopeKey) return current;
+													const nextState = {
+														...current,
+														activeTabId: tab.id
+													};
+													rememberTerminalTabsState(nextState);
+													return nextState;
+												});
+											},
+											children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+												className: "truncate",
+												children: label
+											})
+										})
+									}),
+									/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+										title: `Close ${label}`,
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: "flex h-full w-6 shrink-0 items-center justify-center text-muted-foreground opacity-70 outline-hidden group-hover:opacity-100 hover:bg-muted hover:text-foreground focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-30",
+											"aria-label": `Close ${label}`,
+											onClick: (event) => {
+												event.stopPropagation();
+												closeTerminalTab(tab.id);
+											},
+											children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(X, { className: "size-3" })
+										})
+									})
+								]
+							}, tab.id);
+						}), normalizedCwd ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+							title: "New terminal tab",
+							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+								size: "icon",
+								variant: "ghost",
+								className: "size-7 shrink-0",
+								"aria-label": "New terminal tab",
+								onClick: addTerminalTab,
+								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Plus, { className: "size-4" })
+							})
+						}) : null]
+					}),
+					activeError ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+						title: activeError,
+						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "hidden max-w-48 truncate text-[11px] text-destructive sm:inline",
+							children: activeError
+						})
+					}) : null,
+					onClose && showCloseButton ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+						title: "Hide terminal",
+						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+							size: "icon",
+							variant: "ghost",
+							className: "size-8 shrink-0",
+							"aria-label": "Hide terminal",
+							onClick: onClose,
+							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(X, {})
+						})
+					}) : null
+				]
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TerminalStatusDialog, {
+				cwd: normalizedCwd,
+				index: statusDialogTabIndex,
+				open: statusDialogTab !== void 0,
+				tab: statusDialogTab,
+				onOpenChange: (open) => {
+					if (!open) setStatusDialogTabId(null);
+				}
+			}),
+			normalizedCwd ? tabs.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+				className: "relative min-h-0 flex-1 overflow-hidden bg-background",
+				children: tabs.map((tab) => {
+					const selected = tab.id === selectedTabId;
+					return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TerminalTabPane, {
+						active: active && selected,
+						cwd: normalizedCwd,
+						onStatusChange: updateTabStatus,
+						onTerminalIdChange: updateTabTerminalId,
+						selected,
+						sessionId,
+						tabId: tab.id,
+						viewerContextId
+					}, tab.id);
 				})
-			]
-		})]
+			}) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "flex min-h-0 flex-1 flex-col items-center justify-center gap-3 p-6 text-sm text-muted-foreground",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: "No terminal tabs are open." }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Button$1, {
+					size: "sm",
+					variant: "outline",
+					onClick: addTerminalTab,
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Plus, { className: "size-4" }), "New terminal tab"]
+				})]
+			}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+				className: "flex min-h-0 flex-1 items-center justify-center p-6 text-sm text-muted-foreground",
+				children: "Open a session before starting a terminal."
+			})
+		]
 	});
 }
 function readStoredRightSidebarActiveTab() {
@@ -20191,22 +21135,33 @@ function reorderRightSidebarFiles(store, paths) {
 		fileTabs: uniquePaths
 	}));
 }
+function shallowTerminalSession(left, right) {
+	return left.cwd === right.cwd && left.sessionId === right.sessionId;
+}
 function AppShellTabsList({ sessionStore, viewerContextId }) {
 	const cwd = useSelector(sessionStore, (sessionState) => sessionState.cwd);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(TabsList, {
 		className: "w-full gap-2 rounded-none border-b border-border/70 bg-background p-2 group-data-horizontal/tabs:h-auto md:hidden",
-		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TabsTrigger, {
-			value: "session",
-			className: "h-8 data-active:bg-muted dark:data-active:bg-muted",
-			children: "Session"
-		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TabsTrigger, {
-			value: "git",
-			className: "h-8 data-active:bg-muted dark:data-active:bg-muted",
-			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitTabStatusText, {
-				viewerContextId,
-				cwd
+		children: [
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TabsTrigger, {
+				value: "session",
+				className: "h-8 data-active:bg-muted dark:data-active:bg-muted",
+				children: "Session"
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TabsTrigger, {
+				value: "git",
+				className: "h-8 data-active:bg-muted dark:data-active:bg-muted",
+				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitTabStatusText, {
+					viewerContextId,
+					cwd
+				})
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TabsTrigger, {
+				value: "terminal",
+				className: "h-8 data-active:bg-muted dark:data-active:bg-muted",
+				children: "Terminal"
 			})
-		})]
+		]
 	});
 }
 var AppShellGitPanelController = import_react.memo(function AppShellGitPanelController({ active, composerDiffLineComments, onAddDiffLineComment, onCloseAllFiles, onCloseFile, onCloseFilesToRight, onCloseOtherFiles, onOpenFile, onReorderFiles, rightSidebarStore, sessionStore, viewerContextId }) {
@@ -20285,6 +21240,10 @@ var DESKTOP_DEFAULT_GIT_PANEL_WIDTH = 320;
 var DESKTOP_MIN_SESSION_WIDTH = 320;
 var DESKTOP_MIN_SIDE_PANEL_WIDTH = 260;
 var DESKTOP_MAX_STORED_SIDE_PANEL_WIDTH = 1600;
+var DESKTOP_DEFAULT_TERMINAL_PANEL_HEIGHT = 280;
+var DESKTOP_MIN_TERMINAL_PANEL_HEIGHT = 160;
+var DESKTOP_MIN_TOP_PANEL_HEIGHT = 220;
+var DESKTOP_MAX_STORED_TERMINAL_PANEL_HEIGHT = 1200;
 function defaultDesktopSidePanelWidths() {
 	return {
 		fileViewWidth: DESKTOP_DEFAULT_FILE_VIEW_WIDTH,
@@ -20319,6 +21278,18 @@ function storeDesktopSidePanelWidths(widths) {
 function sameDesktopSidePanelWidths(left, right) {
 	return left.fileViewWidth === right.fileViewWidth && left.gitPanelWidth === right.gitPanelWidth;
 }
+function clampStoredDesktopTerminalPanelHeight(value) {
+	if (value == null || value === "") return DESKTOP_DEFAULT_TERMINAL_PANEL_HEIGHT;
+	const height = typeof value === "number" ? value : Number(value);
+	if (!Number.isFinite(height)) return DESKTOP_DEFAULT_TERMINAL_PANEL_HEIGHT;
+	return Math.round(Math.min(DESKTOP_MAX_STORED_TERMINAL_PANEL_HEIGHT, Math.max(DESKTOP_MIN_TERMINAL_PANEL_HEIGHT, height)));
+}
+function readStoredDesktopTerminalPanelHeight() {
+	return clampStoredDesktopTerminalPanelHeight(safeLocalStorageGetItem(TERMINAL_PANEL_HEIGHT_STORAGE_KEY));
+}
+function storeDesktopTerminalPanelHeight(height) {
+	safeLocalStorageSetItem(TERMINAL_PANEL_HEIGHT_STORAGE_KEY, String(clampStoredDesktopTerminalPanelHeight(height)));
+}
 function clampDesktopPanelSize(value, min, max) {
 	if (!Number.isFinite(value)) return min;
 	if (max <= min) return Math.max(0, max);
@@ -20442,21 +21413,106 @@ function AppShellDesktopResizeHandle({ label, max, min, onResize, onResizeEnd, o
 		}
 	});
 }
+function AppShellDesktopVerticalResizeHandle({ label, max, min, onResize, onResizeEnd, onResizeStart, size }) {
+	const propsRef = useLatestRef({
+		max,
+		min,
+		onResize,
+		onResizeEnd,
+		onResizeStart,
+		size
+	});
+	const [verticalResizeCursor, setVerticalResizeCursor] = import_react.useState("row-resize");
+	const [resizeTargetMinimumSize, setResizeTargetMinimumSize] = import_react.useState(10);
+	import_react.useEffect(() => {
+		const updateResizeTarget = () => {
+			setResizeTargetMinimumSize(getSidebarResizeTargetMinimumSize());
+		};
+		const coarsePointerQuery = window.matchMedia("(pointer:coarse)");
+		setVerticalResizeCursor(getSidebarVerticalResizeCursor());
+		updateResizeTarget();
+		coarsePointerQuery.addEventListener("change", updateResizeTarget);
+		return () => {
+			coarsePointerQuery.removeEventListener("change", updateResizeTarget);
+		};
+	}, []);
+	const verticalResizeCursorClass = verticalResizeCursor === "ns-resize" ? "cursor-ns-resize" : "cursor-row-resize";
+	const resizeTo = (nextSize) => {
+		const current = propsRef.current;
+		current.onResize(clampDesktopPanelSize(nextSize, current.min, current.max));
+	};
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		role: "separator",
+		"aria-label": label,
+		"aria-orientation": "horizontal",
+		tabIndex: 0,
+		style: {
+			"--resize-target-height": `${resizeTargetMinimumSize}px`,
+			cursor: verticalResizeCursor
+		},
+		className: `absolute inset-x-0 top-0 z-20 h-(--resize-target-height) -translate-y-1/2 touch-none bg-transparent outline-hidden after:absolute after:inset-x-0 after:top-1/2 after:h-px after:bg-transparent focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1 ${resizeRailPrimaryInteractiveClass} ${verticalResizeCursorClass}`,
+		onKeyDown: (event) => {
+			if (event.key !== "ArrowUp" && event.key !== "ArrowDown") return;
+			event.preventDefault();
+			const delta = event.shiftKey ? 48 : 16;
+			resizeTo(propsRef.current.size + (event.key === "ArrowUp" ? delta : -delta));
+		},
+		onPointerDown: (event) => {
+			if (event.button !== 0) return;
+			event.preventDefault();
+			const current = propsRef.current;
+			const startY = event.clientY;
+			const startSize = current.size;
+			const cursor = getSidebarVerticalResizeCursor();
+			const previousCursor = document.body.style.cursor;
+			const previousUserSelect = document.body.style.userSelect;
+			const cleanupGlobalResizeCursor = installGlobalResizeCursor(cursor);
+			current.onResizeStart?.();
+			Object.assign(document.body.style, {
+				userSelect: "none",
+				cursor
+			});
+			const handlePointerMove = (moveEvent) => {
+				resizeTo(startSize + startY - moveEvent.clientY);
+			};
+			const handlePointerUp = () => {
+				cleanupGlobalResizeCursor();
+				Object.assign(document.body.style, {
+					userSelect: previousUserSelect,
+					cursor: previousCursor
+				});
+				document.removeEventListener("pointermove", handlePointerMove);
+				document.removeEventListener("pointerup", handlePointerUp);
+				document.removeEventListener("pointercancel", handlePointerUp);
+				propsRef.current.onResizeEnd?.();
+			};
+			document.addEventListener("pointermove", handlePointerMove);
+			document.addEventListener("pointerup", handlePointerUp);
+			document.addEventListener("pointercancel", handlePointerUp);
+		}
+	});
+}
 function AppShellTabsController(props) {
 	return useAppShellTabsControllerView(props);
 }
-function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTurn, composerDiffLineComments, composerPanelRef, contextUsageStore, conversationFrameRef, conversationItemsStore, defaultNewSessionDirectory, displaySettingsStore, fileInputRef, gitPanelOpen, hiddenThinkingPreviewStore, isSessionViewLoading, isSubmitting, isMobile, newSessionDirectoryOptions, onCancelCompaction, onCreateSession, onOpenAddDirectoryDialog, onCloseAllFileViewTabs, onCloseFileViewTab, onCloseFileViewTabsToRight, onCloseOtherFileViewTabs, onAddDiffLineComment, onOpenFileViewTab, onReorderFileViewTabs, onValueChange, rightSidebarStore, sessionStore, store, viewerContextId, workingStateStore }) {
+function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTurn, composerDiffLineComments, composerPanelRef, contextUsageStore, conversationFrameRef, conversationItemsStore, defaultNewSessionDirectory, displaySettingsStore, fileInputRef, gitPanelOpen, terminalPanelOpen, hiddenThinkingPreviewStore, isSessionViewLoading, isSubmitting, isMobile, newSessionDirectoryOptions, onCancelCompaction, onCreateSession, onOpenAddDirectoryDialog, onCloseAllFileViewTabs, onCloseFileViewTab, onCloseFileViewTabsToRight, onCloseOtherFileViewTabs, onCloseTerminalPanel, onAddDiffLineComment, onOpenFileViewTab, onReorderFileViewTabs, onValueChange, rightSidebarStore, sessionStore, store, viewerContextId, workingStateStore }) {
 	const currentTab = useSelector(appUiStore, (state) => state.currentTab);
 	const isDraftSession = useSelector(sessionStore, (sessionState) => sessionState.draft);
+	const terminalSession = useSelector(sessionStore, (sessionState) => ({
+		cwd: sessionState.cwd,
+		sessionId: sessionState.sessionId
+	}), { compare: shallowTerminalSession });
 	const showTabsList = isMobile || !isDraftSession || isSessionViewLoading;
-	const sessionVisibleClassName = currentTab === "git" ? "hidden min-h-0 flex-1 flex-col md:flex" : "flex min-h-0 flex-1 flex-col";
+	const sessionVisibleClassName = currentTab === "session" ? "flex min-h-0 flex-1 flex-col" : "hidden min-h-0 flex-1 flex-col md:flex";
 	const mobileGitClassName = currentTab === "git" ? "min-h-0 flex-1 overflow-hidden md:hidden" : "hidden";
+	const mobileTerminalClassName = currentTab === "terminal" ? "min-h-0 flex-1 overflow-hidden md:hidden" : "hidden";
 	const rightSidebarHasVisibleFiles = useSelector(rightSidebarStore, selectRightSidebarHasVisibleFiles);
 	const desktopGitPanelOpen = !isMobile && gitPanelOpen;
 	const desktopFileViewOpen = !isMobile && gitPanelOpen && rightSidebarHasVisibleFiles;
 	const desktopSideWorkspaceOpen = desktopFileViewOpen || desktopGitPanelOpen;
 	const desktopLayoutRef = import_react.useRef(null);
 	const [desktopLayoutWidth, setDesktopLayoutWidth] = import_react.useState(0);
+	const [desktopLayoutHeight, setDesktopLayoutHeight] = import_react.useState(0);
 	const [desktopSidePanelWidths, setDesktopSidePanelWidthsState] = import_react.useState(() => defaultDesktopSidePanelWidths());
 	const desktopSidePanelWidthsLoadedRef = import_react.useRef(false);
 	const desktopSidePanelWidthsRef = import_react.useRef(desktopSidePanelWidths);
@@ -20484,12 +21540,30 @@ function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTu
 		}));
 	};
 	const [desktopGitPanelMounted, setDesktopGitPanelMounted] = import_react.useState(desktopGitPanelOpen);
+	const [desktopTerminalPanelHeight, setDesktopTerminalPanelHeightState] = import_react.useState(() => DESKTOP_DEFAULT_TERMINAL_PANEL_HEIGHT);
+	const desktopTerminalPanelHeightLoadedRef = import_react.useRef(false);
+	const desktopTerminalPanelHeightRef = import_react.useRef(desktopTerminalPanelHeight);
+	desktopTerminalPanelHeightRef.current = desktopTerminalPanelHeight;
+	const [desktopTerminalPanelMounted, setDesktopTerminalPanelMounted] = import_react.useState(!isMobile && terminalPanelOpen);
 	const [desktopPanelResizing, setDesktopPanelResizing] = import_react.useState(false);
+	const [desktopTerminalResizing, setDesktopTerminalResizing] = import_react.useState(false);
+	const setDesktopTerminalPanelHeight = (action) => {
+		const current = desktopTerminalPanelHeightRef.current;
+		const next = clampStoredDesktopTerminalPanelHeight(applyStoreAction(current, action));
+		if (current === next) return;
+		desktopTerminalPanelHeightRef.current = next;
+		setDesktopTerminalPanelHeightState(next);
+		if (desktopTerminalPanelHeightLoadedRef.current) storeDesktopTerminalPanelHeight(next);
+	};
 	import_react.useEffect(() => {
 		const storedWidths = readStoredDesktopSidePanelWidths();
+		const storedTerminalPanelHeight = readStoredDesktopTerminalPanelHeight();
 		desktopSidePanelWidthsLoadedRef.current = true;
+		desktopTerminalPanelHeightLoadedRef.current = true;
 		desktopSidePanelWidthsRef.current = storedWidths;
+		desktopTerminalPanelHeightRef.current = storedTerminalPanelHeight;
 		setDesktopSidePanelWidthsState((current) => sameDesktopSidePanelWidths(current, storedWidths) ? current : storedWidths);
+		setDesktopTerminalPanelHeightState((current) => current === storedTerminalPanelHeight ? current : storedTerminalPanelHeight);
 	}, []);
 	const sessionPane = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "flex h-full min-h-0 min-w-0 flex-1 flex-col overflow-hidden",
@@ -20517,7 +21591,7 @@ function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTu
 				viewerContextId,
 				workingStateStore
 			})
-		}), isMobile ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		}), isMobile ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 			className: mobileGitClassName,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppShellGitPanelController, {
 				viewerContextId,
@@ -20533,32 +21607,50 @@ function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTu
 				onOpenFile: onOpenFileViewTab,
 				onReorderFiles: onReorderFileViewTabs
 			})
-		}) : null]
+		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+			className: mobileTerminalClassName,
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TerminalPanel, {
+				active: currentTab === "terminal",
+				cwd: terminalSession.cwd,
+				onClose: onCloseTerminalPanel,
+				sessionId: terminalSession.sessionId,
+				showCloseButton: false,
+				viewerContextId
+			})
+		})] }) : null]
 	});
 	import_react.useLayoutEffect(() => {
 		if (isMobile) {
 			setDesktopGitPanelMounted(false);
+			setDesktopTerminalPanelMounted(false);
 			return;
 		}
 		if (desktopSideWorkspaceOpen) setDesktopGitPanelMounted(true);
-	}, [desktopSideWorkspaceOpen, isMobile]);
+		if (terminalPanelOpen) setDesktopTerminalPanelMounted(true);
+	}, [
+		desktopSideWorkspaceOpen,
+		isMobile,
+		terminalPanelOpen
+	]);
 	import_react.useLayoutEffect(() => {
 		if (isMobile) return;
 		const element = desktopLayoutRef.current;
 		if (!element) return;
-		const updateWidth = () => {
+		const updateSize = () => {
 			setDesktopLayoutWidth(element.clientWidth);
+			setDesktopLayoutHeight(element.clientHeight);
 		};
-		updateWidth();
+		updateSize();
 		if (typeof ResizeObserver === "undefined") {
-			window.addEventListener("resize", updateWidth);
-			return () => window.removeEventListener("resize", updateWidth);
+			window.addEventListener("resize", updateSize);
+			return () => window.removeEventListener("resize", updateSize);
 		}
-		const observer = new ResizeObserver(updateWidth);
+		const observer = new ResizeObserver(updateSize);
 		observer.observe(element);
 		return () => observer.disconnect();
 	}, [isMobile]);
 	const desktopAvailableWidth = desktopLayoutWidth || (typeof window === "undefined" ? 1200 : window.innerWidth);
+	const desktopAvailableHeight = desktopLayoutHeight || (typeof window === "undefined" ? 800 : window.innerHeight);
 	const desktopGitPanelRendered = desktopSideWorkspaceOpen || desktopGitPanelMounted || desktopGitPanelOpen;
 	const desktopFittedWidths = fitDesktopSidePanelWidths({
 		availableWidth: desktopAvailableWidth,
@@ -20569,14 +21661,25 @@ function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTu
 	});
 	const desktopSideWorkspaceRendered = desktopSideWorkspaceOpen || desktopGitPanelMounted;
 	const desktopSideWorkspaceWidth = desktopSideWorkspaceOpen ? desktopFittedWidths.sideWidth : 0;
-	const desktopTransitionClassName = !desktopPanelResizing ? "transition-[width] duration-200 ease-linear" : "";
-	const desktopPanelGroupClassName = "relative flex h-full min-h-0 w-full flex-1 overflow-hidden";
+	const desktopTerminalOpen = !isMobile && terminalPanelOpen;
+	const desktopTerminalRendered = desktopTerminalOpen || desktopTerminalPanelMounted;
+	const desktopTerminalMaxHeight = Math.max(DESKTOP_MIN_TERMINAL_PANEL_HEIGHT, desktopAvailableHeight - DESKTOP_MIN_TOP_PANEL_HEIGHT);
+	const desktopFittedTerminalPanelHeight = clampDesktopPanelSize(desktopTerminalPanelHeight, Math.min(DESKTOP_MIN_TERMINAL_PANEL_HEIGHT, desktopTerminalMaxHeight), desktopTerminalMaxHeight);
+	const desktopTerminalVisibleHeight = desktopTerminalOpen ? desktopFittedTerminalPanelHeight : 0;
+	const desktopTransitionClassName = !desktopPanelResizing && !desktopTerminalResizing ? "transition-[width,height] duration-200 ease-linear" : "";
+	const desktopPanelGroupClassName = "relative flex min-h-0 w-full shrink-0 overflow-hidden";
 	const desktopResizeStart = () => {
 		setDesktopPanelResizing(true);
 	};
 	const desktopResizeEnd = () => {
 		setDesktopPanelResizing(false);
 	};
+	const desktopTerminalResizeStart = () => {
+		setDesktopTerminalResizing(true);
+	};
+	const desktopTerminalResizeEnd = () => {
+		setDesktopTerminalResizing(false);
+	};
 	const desktopSideWorkspaceMaxWidth = Math.max(0, desktopAvailableWidth - DESKTOP_MIN_SESSION_WIDTH);
 	const setDesktopSideWorkspaceWidth = (nextSize) => {
 		if (!desktopFileViewOpen) {
@@ -20585,6 +21688,9 @@ function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTu
 		}
 		setDesktopFileViewWidth(Math.max(DESKTOP_MIN_SIDE_PANEL_WIDTH, nextSize - desktopGitPanelWidth));
 	};
+	const setDesktopTerminalHeight = (nextSize) => {
+		setDesktopTerminalPanelHeight(clampDesktopPanelSize(nextSize, Math.min(DESKTOP_MIN_TERMINAL_PANEL_HEIGHT, desktopTerminalMaxHeight), desktopTerminalMaxHeight));
+	};
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Tabs$1, {
 		value: currentTab,
 		onValueChange,
@@ -20597,54 +21703,83 @@ function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTu
 			children: sessionPane
 		}) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 			ref: desktopLayoutRef,
-			className: desktopPanelGroupClassName,
-			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-				"data-desktop-panel": "session",
-				className: `h-full min-h-0 min-w-0 shrink-0 overflow-hidden ${desktopTransitionClassName}`,
-				style: { width: desktopSideWorkspaceOpen ? `calc(100% - ${desktopSideWorkspaceWidth}px)` : "100%" },
-				children: sessionPane
-			}), desktopSideWorkspaceRendered ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("aside", {
-				"aria-label": "Desktop side workspace",
-				"aria-hidden": !desktopSideWorkspaceOpen,
-				"data-state": desktopSideWorkspaceOpen ? "open" : "closed",
-				"data-desktop-panel": "side-workspace",
-				className: `flex h-full min-h-0 min-w-0 shrink-0 overflow-visible bg-background data-[state=closed]:pointer-events-none ${desktopTransitionClassName}`,
-				style: { width: `${desktopSideWorkspaceWidth}px` },
-				children: desktopGitPanelRendered ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-					"data-desktop-panel": "git",
-					className: `relative h-full min-h-0 min-w-0 shrink-0 overflow-visible ${desktopTransitionClassName}`,
+			className: "flex min-h-0 flex-1 flex-col overflow-hidden",
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: desktopPanelGroupClassName,
+				style: { height: desktopTerminalOpen ? `calc(100% - ${desktopTerminalVisibleHeight}px)` : "100%" },
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					"data-desktop-panel": "session",
+					className: `h-full min-h-0 min-w-0 shrink-0 overflow-hidden max-md:w-full! ${desktopTransitionClassName}`,
+					style: { width: desktopSideWorkspaceOpen ? `calc(100% - ${desktopSideWorkspaceWidth}px)` : "100%" },
+					children: sessionPane
+				}), desktopSideWorkspaceRendered ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("aside", {
+					"aria-label": "Desktop side workspace",
+					"aria-hidden": !desktopSideWorkspaceOpen,
+					"data-state": desktopSideWorkspaceOpen ? "open" : "closed",
+					"data-desktop-panel": "side-workspace",
+					className: `hidden h-full min-h-0 min-w-0 shrink-0 overflow-visible bg-background data-[state=closed]:pointer-events-none md:flex ${desktopTransitionClassName}`,
 					style: { width: `${desktopSideWorkspaceWidth}px` },
-					children: [desktopGitPanelOpen ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppShellDesktopResizeHandle, {
-						label: "Resize right sidebar",
-						min: Math.min(DESKTOP_MIN_SIDE_PANEL_WIDTH, desktopSideWorkspaceMaxWidth),
-						max: desktopSideWorkspaceMaxWidth,
-						size: desktopSideWorkspaceWidth,
-						onResize: setDesktopSideWorkspaceWidth,
-						onResizeStart: desktopResizeStart,
-						onResizeEnd: desktopResizeEnd
-					}) : null, /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-						className: "h-full min-h-0 min-w-0 overflow-hidden",
-						children: desktopGitPanelRendered ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppShellDesktopGitPanel, {
-							viewerContextId,
-							sessionStore,
-							active: desktopGitPanelOpen,
-							composerDiffLineComments,
-							rightSidebarStore,
-							onAddDiffLineComment,
-							onCloseAllFiles: onCloseAllFileViewTabs,
-							onCloseFile: onCloseFileViewTab,
-							onCloseFilesToRight: onCloseFileViewTabsToRight,
-							onCloseOtherFiles: onCloseOtherFileViewTabs,
-							onOpenFile: onOpenFileViewTab,
-							onReorderFiles: onReorderFileViewTabs
-						}) : null
-					})]
-				}) : null
+					children: desktopGitPanelRendered ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						"data-desktop-panel": "git",
+						className: `relative h-full min-h-0 min-w-0 shrink-0 overflow-visible ${desktopTransitionClassName}`,
+						style: { width: `${desktopSideWorkspaceWidth}px` },
+						children: [desktopGitPanelOpen ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppShellDesktopResizeHandle, {
+							label: "Resize right sidebar",
+							min: Math.min(DESKTOP_MIN_SIDE_PANEL_WIDTH, desktopSideWorkspaceMaxWidth),
+							max: desktopSideWorkspaceMaxWidth,
+							size: desktopSideWorkspaceWidth,
+							onResize: setDesktopSideWorkspaceWidth,
+							onResizeStart: desktopResizeStart,
+							onResizeEnd: desktopResizeEnd
+						}) : null, /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+							className: "h-full min-h-0 min-w-0 overflow-hidden",
+							children: desktopGitPanelRendered ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppShellDesktopGitPanel, {
+								viewerContextId,
+								sessionStore,
+								active: desktopGitPanelOpen,
+								composerDiffLineComments,
+								rightSidebarStore,
+								onAddDiffLineComment,
+								onCloseAllFiles: onCloseAllFileViewTabs,
+								onCloseFile: onCloseFileViewTab,
+								onCloseFilesToRight: onCloseFileViewTabsToRight,
+								onCloseOtherFiles: onCloseOtherFileViewTabs,
+								onOpenFile: onOpenFileViewTab,
+								onReorderFiles: onReorderFileViewTabs
+							}) : null
+						})]
+					}) : null
+				}) : null]
+			}), desktopTerminalRendered ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("aside", {
+				"aria-label": "Terminal",
+				"aria-hidden": !desktopTerminalOpen,
+				"data-state": desktopTerminalOpen ? "open" : "closed",
+				"data-desktop-panel": "terminal",
+				className: `relative hidden min-h-0 w-full shrink-0 overflow-visible border-t border-border/70 bg-background data-[state=closed]:pointer-events-none data-[state=closed]:border-transparent md:flex ${desktopTransitionClassName}`,
+				style: { height: `${desktopTerminalVisibleHeight}px` },
+				children: [desktopTerminalOpen ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppShellDesktopVerticalResizeHandle, {
+					label: "Resize terminal",
+					min: Math.min(DESKTOP_MIN_TERMINAL_PANEL_HEIGHT, desktopTerminalMaxHeight),
+					max: desktopTerminalMaxHeight,
+					size: desktopTerminalVisibleHeight,
+					onResize: setDesktopTerminalHeight,
+					onResizeStart: desktopTerminalResizeStart,
+					onResizeEnd: desktopTerminalResizeEnd
+				}) : null, /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "h-full min-h-0 w-full min-w-0 overflow-hidden",
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TerminalPanel, {
+						active: desktopTerminalOpen,
+						cwd: terminalSession.cwd,
+						onClose: onCloseTerminalPanel,
+						sessionId: terminalSession.sessionId,
+						viewerContextId
+					})
+				})]
 			}) : null]
 		})]
 	});
 }
-var AppShellSessionHeader = import_react.memo(function AppShellSessionHeader({ actionsRef, defaultNewSessionDirectory, displaySessionCwd, gitPanelOpen, loadingDisplaySessionTitle, currentSessionPinned, displaySettingsStore, isSessionViewLoading, newSessionDirectoryOptions, onToggleGitPanel, sessionStore, viewerContextId }) {
+var AppShellSessionHeader = import_react.memo(function AppShellSessionHeader({ actionsRef, defaultNewSessionDirectory, displaySessionCwd, gitPanelOpen, terminalPanelOpen, loadingDisplaySessionTitle, currentSessionPinned, displaySettingsStore, isSessionViewLoading, newSessionDirectoryOptions, onToggleGitPanel, onToggleTerminalPanel, sessionStore, viewerContextId }) {
 	const sessionHeaderState = useSelector(sessionStore, (sessionState) => ({
 		firstMessage: sessionState.firstMessage,
 		hideThinkingBlock: sessionState.hideThinkingBlock,
@@ -20653,8 +21788,6 @@ var AppShellSessionHeader = import_react.memo(function AppShellSessionHeader({ a
 		sessionStreaming: sessionState.streaming
 	}), { compare: shallowRecordEqual });
 	const hideToolBlocks = useSelector(displaySettingsStore, (settings) => settings.hideToolBlocks);
-	const { isMobile: sidebarIsMobile, openMobile: sidebarOpenMobile, state: sidebarState } = useSidebar();
-	const showCollapsedNewSessionButton = !(sidebarIsMobile ? sidebarOpenMobile : sidebarState === "expanded");
 	const displaySessionTitle = isSessionViewLoading ? loadingDisplaySessionTitle : getCurrentSessionTitleFromState(sessionHeaderState);
 	const moveSessionDirectoryOptions = newSessionDirectoryOptions.filter((option) => option.path !== displaySessionCwd);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
@@ -20663,25 +21796,26 @@ var AppShellSessionHeader = import_react.memo(function AppShellSessionHeader({ a
 			className: "relative flex w-full items-center gap-1",
 			children: [
 				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(SidebarTrigger, { className: "shrink-0" }),
-				showCollapsedNewSessionButton ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
 					title: defaultNewSessionDirectory ? `Create a new session in ${formatDisplayPath$1(defaultNewSessionDirectory)}` : "Create a new session",
 					kbd: formatShortcutLabel("Control+N"),
 					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
 						size: "icon",
 						variant: "ghost",
-						className: "shrink-0",
+						className: "shrink-0 md:group-data-[sidebar-state=expanded]/sidebar-wrapper:hidden",
 						"aria-label": "Create a new session",
 						onClick: () => {
 							actionsRef.current.createSession();
 						},
 						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SquarePen, {})
 					})
-				}) : null,
+				}),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 					className: "absolute left-1/2 flex w-max max-w-[calc(100%-4rem)] -translate-x-1/2 flex-col items-center justify-center gap-0 text-center",
 					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 						className: "flex max-w-full min-w-0 items-center justify-center gap-1.5",
 						children: [!isSessionViewLoading && sessionHeaderState.sessionStreaming ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {
+							size: "xs",
 							className: "shrink-0",
 							"aria-label": "Session streaming"
 						}) : null, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
@@ -20692,7 +21826,7 @@ var AppShellSessionHeader = import_react.memo(function AppShellSessionHeader({ a
 							})
 						})]
 					}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-						className: "flex max-w-full min-w-0 items-center justify-center gap-x-3",
+						className: "flex max-w-full min-w-0 items-center justify-center gap-x-2",
 						children: [displaySessionCwd ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 							className: "inline-flex min-w-0 items-center text-xs text-muted-foreground",
 							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
@@ -20830,6 +21964,19 @@ var AppShellSessionHeader = import_react.memo(function AppShellSessionHeader({ a
 								})
 							]
 						})] }),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+							title: "Toggle terminal",
+							kbd: formatShortcutLabel("Control+`"),
+							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+								size: "icon",
+								variant: "ghost",
+								className: "hidden md:inline-flex",
+								"aria-pressed": terminalPanelOpen,
+								"aria-label": "Toggle terminal panel",
+								onClick: onToggleTerminalPanel,
+								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SquareTerminal, {})
+							})
+						}),
 						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
 							title: "Toggle right sidebar",
 							kbd: formatShortcutLabel("Control+\\"),
@@ -21175,7 +22322,10 @@ function SidebarSessionItem({ entryKey, directorySessionsStore, activeSessionSto
 		},
 		children: [entry.streaming ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 			className: "absolute top-2.5 left-2 flex size-4 items-center justify-center",
-			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { "aria-label": "Session streaming" })
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {
+				size: "xs",
+				"aria-label": "Session streaming"
+			})
 		}) : showUnread ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 			className: "absolute top-2.5 left-2 flex size-4 items-center justify-center",
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
@@ -21352,7 +22502,10 @@ var DirectorySessionGroup = import_react.memo(function DirectorySessionGroup({ d
 						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DirectoryPathLabel, { path: directory })
 					}),
 					!searchActive && !overlay ? collapsed ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronRight, { className: "size-4 shrink-0 opacity-0 transition-opacity group-hover/directory-label:opacity-100 group-focus-visible/directory-label:opacity-100" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronDown, { className: "size-4 shrink-0 opacity-0 transition-opacity group-hover/directory-label:opacity-100 group-focus-visible/directory-label:opacity-100" }) : null,
-					showHeaderLoadingSpinner ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { className: "shrink-0" }) : null
+					showHeaderLoadingSpinner ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {
+						size: "xs",
+						className: "shrink-0"
+					}) : null
 				]
 			}),
 			onCreateSessionInDirectory && !overlay && !isMobile ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
@@ -21422,7 +22575,7 @@ var DirectorySessionGroup = import_react.memo(function DirectorySessionGroup({ d
 				]
 			})] }) : directoryHeader, !overlay ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CollapsibleContent, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SidebarGroupContent, { children: showLoadingState ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 				className: "flex items-center gap-2 p-2 text-sm text-sidebar-foreground/70",
-				children: [showLoadingSpinner ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+				children: [showLoadingSpinner ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { size: "xs" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 					className: "size-4",
 					"aria-hidden": "true"
 				}), "Loading sessions…"]
@@ -22845,11 +23998,21 @@ function usePromptMutationSessionSnapshot(store) {
 function normalizeQueuedStreamingBehavior(streamingBehavior) {
 	return streamingBehavior === "followUp" ? "followUp" : "steer";
 }
+function promptSidebarPreview(message, images) {
+	const text = message.replace(/\s+/g, " ").trim();
+	if (text) return text;
+	if (images.length === 0) return "";
+	return `${images.length.toLocaleString()} image${images.length === 1 ? "" : "s"}`;
+}
 function createLocalPendingId() {
 	if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") return `optimistic:${crypto.randomUUID()}`;
 	return `optimistic:${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
 }
-function buildCurrentSessionRequestUrl(path, { contextId, sessionState, fallbackSessionId }) {
+function buildCurrentSessionRequestUrl(path, { contextId, sessionState, fallbackSessionId, targetSessionKey }) {
+	if (targetSessionKey) return buildRequestUrl(path, {
+		contextId,
+		searchParams: { sessionKey: targetSessionKey }
+	});
 	const sessionKey = sessionState.sessionKey && !sessionState.sessionKey.startsWith("optimistic:") ? sessionState.sessionKey : void 0;
 	const shouldUseSessionKey = Boolean(sessionKey && (sessionState.draft || !sessionState.sessionId));
 	return buildRequestUrl(path, {
@@ -22907,16 +24070,17 @@ function movePendingComposerMessage(messages, pendingId, direction) {
 	next.splice(targetIndex, 0, movedItem);
 	return next;
 }
-function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultNewSessionDirectory, sessionStore, sessionStateRef, draftSessionLoadingOwnerKey, pendingDraftPrompt, pendingDraftFollowUps, awaitingFirstTurn, pendingMessages, composerDiffLineCommentsRef, composerImagesRef, composerTextRef, composerSkillRef, replaceComposerDraft, lastSyncedEditorTextRef, rememberRecentDirectory, prefetchDirectorySessionsIndex, addOptimisticUserMessage, removeOptimisticUserMessage, addOptimisticSidebarSession, removeOptimisticSidebarSession, setSidebarDirectories, setStoredDraftDirectory, setDraftSessionLoadingOwnerKey, setPendingDraftPrompt, setPendingDraftFollowUps, setPendingMessages, setAwaitingFirstTurn, setIsSubmitting, setComposerDiffLineComments, setComposerImages }) {
+function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultNewSessionDirectory, sessionStore, sessionStateRef, draftSessionLoadingOwnerKey, pendingDraftPrompt, pendingDraftFollowUps, awaitingFirstTurn, pendingMessages, composerDiffLineCommentsRef, composerImagesRef, composerTextRef, composerSkillRef, replaceComposerDraft, lastSyncedEditorTextRef, rememberRecentDirectory, prefetchDirectorySessionsIndex, addOptimisticUserMessage, removeOptimisticUserMessage, addOptimisticSidebarSession, removeOptimisticSidebarSession, updateOptimisticSidebarSessionPreview, setSidebarDirectories, setStoredDraftDirectory, setDraftSessionLoadingOwnerKey, setPendingDraftPrompt, setPendingDraftFollowUps, setPendingMessages, setAwaitingFirstTurn, setIsSubmitting, setComposerDiffLineComments, setComposerImages }) {
 	const queryClient = useQueryClient();
 	const draftSessionLoadingOwnerKeyRef = import_react.useRef(draftSessionLoadingOwnerKey);
+	const pendingNewSessionPromptTargetRef = import_react.useRef(null);
+	const newSessionRequestNonceRef = import_react.useRef(0);
 	const pendingDraftPromptRef = import_react.useRef(pendingDraftPrompt);
 	const pendingDraftFollowUpsRef = import_react.useRef(pendingDraftFollowUps);
 	const pendingMessagesRef = import_react.useRef(pendingMessages);
 	const awaitingFirstTurnRef = import_react.useRef(awaitingFirstTurn);
 	const awaitingFirstTurnAssistantOutputSignatureRef = import_react.useRef(null);
 	const sessionSnapshot = usePromptMutationSessionSnapshot(sessionStore);
-	const sessionStreamingRef = import_react.useRef(sessionSnapshot.streaming);
 	const flushPendingDraftPromptRef = import_react.useRef(async () => false);
 	import_react.useEffect(() => {
 		draftSessionLoadingOwnerKeyRef.current = draftSessionLoadingOwnerKey;
@@ -22933,9 +24097,6 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 	import_react.useEffect(() => {
 		awaitingFirstTurnRef.current = awaitingFirstTurn;
 	}, [awaitingFirstTurn]);
-	import_react.useEffect(() => {
-		sessionStreamingRef.current = sessionSnapshot.streaming;
-	}, [sessionSnapshot.streaming]);
 	const updatePendingMessages = import_react.useCallback((updater) => {
 		setPendingMessages((current) => {
 			const next = updater(current);
@@ -22990,6 +24151,7 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		removeOptimisticUserMessage(nextPrompt.optimisticId);
 		removeOptimisticSidebarSession(nextPrompt.optimisticSidebarSessionId);
 		for (const followUp of pendingDraftFollowUpsRef.current) removeOptimisticUserMessage(followUp.optimisticId);
+		pendingNewSessionPromptTargetRef.current = null;
 		pendingDraftPromptRef.current = null;
 		pendingDraftFollowUpsRef.current = [];
 		setPendingDraftPrompt(null);
@@ -23062,17 +24224,32 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		const ownerKey = promptDraftKey({ cwd: nextCwd });
 		draftSessionLoadingOwnerKeyRef.current = ownerKey;
 		setDraftSessionLoadingOwnerKey(ownerKey);
+		awaitingFirstTurnAssistantOutputSignatureRef.current = null;
+		awaitingFirstTurnRef.current = false;
+		setAwaitingFirstTurn(false);
+		pendingMessagesRef.current = [];
+		setPendingMessages((current) => current.length === 0 ? current : []);
+		const requestNonce = newSessionRequestNonceRef.current + 1;
+		newSessionRequestNonceRef.current = requestNonce;
 		try {
-			await createSessionRequest({ cwd: nextCwd });
+			const response = await createSessionRequest({ cwd: nextCwd });
+			if (newSessionRequestNonceRef.current !== requestNonce) return true;
+			pendingNewSessionPromptTargetRef.current = {
+				ownerKey,
+				sessionKey: response.sessionKey,
+				cwd: response.cwd
+			};
 			if (draftSessionLoadingOwnerKeyRef.current === ownerKey) {
 				draftSessionLoadingOwnerKeyRef.current = null;
 				setDraftSessionLoadingOwnerKey((current) => current === ownerKey ? null : current);
 			}
-			if (pendingDraftPromptRef.current?.ownerKey === ownerKey) flushPendingDraftPromptRef.current(ownerKey);
+			if (pendingDraftPromptRef.current?.ownerKey === ownerKey) flushPendingDraftPromptRef.current(ownerKey, response.sessionKey);
 			return true;
 		} catch (error) {
+			if (newSessionRequestNonceRef.current !== requestNonce) return true;
 			if (draftSessionLoadingOwnerKeyRef.current === ownerKey) draftSessionLoadingOwnerKeyRef.current = null;
 			setDraftSessionLoadingOwnerKey((current) => current === ownerKey ? null : current);
+			if (pendingNewSessionPromptTargetRef.current?.ownerKey === ownerKey) pendingNewSessionPromptTargetRef.current = null;
 			restorePendingDraftPrompt(ownerKey);
 			toast.error(error instanceof Error ? error.message : "Failed to create session");
 			return false;
@@ -23083,12 +24260,14 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		rememberRecentDirectory,
 		restorePendingDraftPrompt,
 		sessionStateRef,
+		setAwaitingFirstTurn,
 		setDraftSessionLoadingOwnerKey,
+		setPendingMessages,
 		setStoredDraftDirectory,
 		viewerContextId
 	]);
-	const queuePendingDraftPrompt = import_react.useCallback((streamingBehavior) => {
-		const ownerKey = draftSessionLoadingOwnerKeyRef.current;
+	const queuePendingDraftPrompt = import_react.useCallback((streamingBehavior, ownerKeyOverride) => {
+		const ownerKey = ownerKeyOverride || draftSessionLoadingOwnerKeyRef.current;
 		if (!ownerKey) return false;
 		const message = buildComposerPromptMessage({
 			text: composerTextRef.current,
@@ -23097,17 +24276,20 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		}).trim();
 		const images = composerImagesRef.current.map((image) => ({ ...image }));
 		if (!message && images.length === 0) return false;
-		if (!(pendingDraftPromptRef.current?.ownerKey === ownerKey ? pendingDraftPromptRef.current : null)) {
+		const currentPendingPrompt = pendingDraftPromptRef.current?.ownerKey === ownerKey ? pendingDraftPromptRef.current : null;
+		const sidebarPreview = promptSidebarPreview(message, images);
+		if (!currentPendingPrompt) {
 			const nextPrompt = {
 				ownerKey,
 				message,
 				images,
+				streamingBehavior,
 				optimisticId: addOptimisticUserMessage({
 					message,
 					images,
 					queued: false
 				}),
-				optimisticSidebarSessionId: addOptimisticSidebarSession()
+				optimisticSidebarSessionId: addOptimisticSidebarSession({ lastMessagePreview: sidebarPreview })
 			};
 			pendingDraftPromptRef.current = nextPrompt;
 			setPendingDraftPrompt(nextPrompt);
@@ -23117,6 +24299,10 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		} else {
 			const queuedStreamingBehavior = normalizeQueuedStreamingBehavior(streamingBehavior);
 			const optimisticId = createLocalPendingId();
+			updateOptimisticSidebarSessionPreview({
+				...currentPendingPrompt.optimisticSidebarSessionId ? { optimisticSidebarSessionId: currentPendingPrompt.optimisticSidebarSessionId } : {},
+				preview: sidebarPreview
+			});
 			const nextFollowUps = [...pendingDraftFollowUpsRef.current, {
 				message,
 				images,
@@ -23144,15 +24330,17 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		setComposerDiffLineComments,
 		setComposerImages,
 		setPendingDraftFollowUps,
-		setPendingDraftPrompt
+		setPendingDraftPrompt,
+		updateOptimisticSidebarSessionPreview
 	]);
 	const promptMutation = useMutation({
-		mutationFn: async ({ message, images, streamingBehavior, pendingId, thinkingLevel }) => {
+		mutationFn: async ({ message, images, streamingBehavior, pendingId, thinkingLevel, targetSessionKey, draftTarget }) => {
 			if (!viewerContextId) throw new Error("Viewer context unavailable");
 			return await fetchJson(buildCurrentSessionRequestUrl("/api/prompt", {
 				contextId: viewerContextId,
 				sessionState: sessionStateRef.current,
-				fallbackSessionId: activeSessionId
+				fallbackSessionId: activeSessionId,
+				targetSessionKey
 			}), {
 				method: "POST",
 				headers: { "content-type": "application/json" },
@@ -23161,7 +24349,9 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 					images,
 					streamingBehavior,
 					pendingId,
-					thinkingLevel
+					thinkingLevel,
+					draftOwnerKey: draftTarget?.ownerKey,
+					draftCwd: draftTarget?.cwd
 				})
 			});
 		},
@@ -23182,12 +24372,29 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 			diffLineComments: submittedDiffLineComments
 		}).trim();
 		if (!message && composerImagesRef.current.length === 0) return false;
-		const treatAsQueuedPrompt = options?.forceFirstPrompt ? false : Boolean(sessionStreamingRef.current || awaitingFirstTurnRef.current);
+		const currentSessionState = sessionStateRef.current;
+		const pendingNewSessionPromptTarget = pendingNewSessionPromptTargetRef.current;
+		const currentDraftOwnerKey = currentSessionState.draft ? promptDraftKey(currentSessionState) : "";
+		const implicitTargetSessionKey = !options?.targetSessionKey && currentSessionState.draft && pendingNewSessionPromptTarget && promptDraftKeyMatchesOwner(currentDraftOwnerKey, pendingNewSessionPromptTarget.ownerKey) ? pendingNewSessionPromptTarget.sessionKey : void 0;
+		const targetSessionKey = options?.targetSessionKey || implicitTargetSessionKey;
+		const targetDraft = currentSessionState.draft ? {
+			ownerKey: options?.targetDraftOwnerKey || (targetSessionKey && pendingNewSessionPromptTarget?.sessionKey === targetSessionKey ? pendingNewSessionPromptTarget.ownerKey : currentDraftOwnerKey),
+			cwd: options?.targetDraftCwd || (targetSessionKey && pendingNewSessionPromptTarget?.sessionKey === targetSessionKey ? pendingNewSessionPromptTarget.cwd || currentSessionState.cwd : currentSessionState.cwd)
+		} : void 0;
+		if (currentSessionState.draft && currentSessionState.sessionKey?.startsWith("optimistic:") && !targetSessionKey) {
+			if (!draftSessionLoadingOwnerKeyRef.current && currentDraftOwnerKey) {
+				draftSessionLoadingOwnerKeyRef.current = currentDraftOwnerKey;
+				setDraftSessionLoadingOwnerKey(currentDraftOwnerKey);
+			}
+			return queuePendingDraftPrompt(streamingBehavior, currentDraftOwnerKey);
+		}
+		const treatAsQueuedPrompt = options?.forceFirstPrompt ? false : Boolean(currentSessionState.streaming || awaitingFirstTurnRef.current);
 		const normalizedStreamingBehavior = treatAsQueuedPrompt ? normalizeQueuedStreamingBehavior(streamingBehavior) : void 0;
 		const submittedImages = composerImagesRef.current.map((image) => ({ ...image }));
+		const sidebarPreview = promptSidebarPreview(message, submittedImages);
 		const queuedPendingId = treatAsQueuedPrompt ? createLocalPendingId() : void 0;
 		if (!treatAsQueuedPrompt) {
-			awaitingFirstTurnAssistantOutputSignatureRef.current = sessionAssistantOutputSignature(sessionStateRef.current.items);
+			awaitingFirstTurnAssistantOutputSignatureRef.current = sessionAssistantOutputSignature(currentSessionState.items);
 			awaitingFirstTurnRef.current = true;
 			setAwaitingFirstTurn(true);
 		}
@@ -23196,7 +24403,11 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 			images: submittedImages,
 			queued: false
 		}));
-		const optimisticSidebarSessionId = options?.optimisticSidebarSessionId ?? (!treatAsQueuedPrompt && sessionStateRef.current.draft ? addOptimisticSidebarSession() : void 0);
+		const optimisticSidebarSessionId = options?.optimisticSidebarSessionId ?? (!treatAsQueuedPrompt && currentSessionState.draft ? addOptimisticSidebarSession({ lastMessagePreview: sidebarPreview }) : void 0);
+		updateOptimisticSidebarSessionPreview({
+			...optimisticSidebarSessionId ? { optimisticSidebarSessionId } : {},
+			preview: sidebarPreview
+		});
 		if (queuedPendingId && normalizedStreamingBehavior) addOptimisticPendingMessage({
 			pendingId: queuedPendingId,
 			text: message,
@@ -23214,9 +24425,12 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 				images: submittedImages,
 				streamingBehavior: normalizedStreamingBehavior,
 				pendingId: queuedPendingId,
-				thinkingLevel: sessionStateRef.current.thinkingLevel
+				thinkingLevel: currentSessionState.thinkingLevel,
+				targetSessionKey,
+				draftTarget: targetDraft
 			});
 			if (queuedPendingId && "queued" in response && (!response.queued || response.canceled)) removeOptimisticPendingMessage(queuedPendingId);
+			if (targetSessionKey && pendingNewSessionPromptTargetRef.current?.sessionKey === targetSessionKey) pendingNewSessionPromptTargetRef.current = null;
 			return true;
 		} catch (error) {
 			if (queuedPendingId) removeOptimisticPendingMessage(queuedPendingId);
@@ -23259,10 +24473,12 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		setAwaitingFirstTurn,
 		setComposerDiffLineComments,
 		setComposerImages,
+		setDraftSessionLoadingOwnerKey,
 		setIsSubmitting,
+		updateOptimisticSidebarSessionPreview,
 		viewerContextId
 	]);
-	const flushPendingDraftFollowUps = import_react.useCallback(async () => {
+	const flushPendingDraftFollowUps = import_react.useCallback(async (targetSessionKey, draftTarget) => {
 		if (draftSessionLoadingOwnerKeyRef.current) return false;
 		const pendingFollowUps = pendingDraftFollowUpsRef.current;
 		if (pendingFollowUps.length === 0) return false;
@@ -23283,7 +24499,9 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 					images: followUp.images,
 					streamingBehavior: followUp.streamingBehavior,
 					pendingId: followUp.optimisticId,
-					thinkingLevel: sessionStateRef.current.thinkingLevel
+					thinkingLevel: sessionStateRef.current.thinkingLevel,
+					targetSessionKey,
+					draftTarget
 				});
 			} catch (error) {
 				for (const unsentFollowUp of followUps.slice(index)) removeOptimisticUserMessage(unsentFollowUp.optimisticId);
@@ -23306,24 +24524,35 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		setComposerImages,
 		setPendingDraftFollowUps
 	]);
-	const flushPendingDraftPrompt = import_react.useCallback(async (ownerKey) => {
+	const flushPendingDraftPrompt = import_react.useCallback(async (ownerKey, targetSessionKey) => {
 		const nextPrompt = pendingDraftPromptRef.current;
 		if (!nextPrompt || nextPrompt.ownerKey !== ownerKey || draftSessionLoadingOwnerKeyRef.current) return false;
+		const pendingTarget = pendingNewSessionPromptTargetRef.current;
+		const resolvedTargetSessionKey = targetSessionKey || (pendingTarget?.ownerKey === ownerKey ? pendingTarget.sessionKey : void 0);
+		const resolvedDraftTarget = {
+			ownerKey,
+			cwd: pendingTarget?.cwd || sessionStateRef.current.cwd
+		};
 		pendingDraftPromptRef.current = null;
 		setPendingDraftPrompt(null);
 		applyPendingDraftPromptToComposer(nextPrompt);
 		if (!await submitPrompt(nextPrompt.streamingBehavior, {
 			forceFirstPrompt: true,
 			optimisticId: nextPrompt.optimisticId,
-			optimisticSidebarSessionId: nextPrompt.optimisticSidebarSessionId
+			optimisticSidebarSessionId: nextPrompt.optimisticSidebarSessionId,
+			targetSessionKey: resolvedTargetSessionKey,
+			targetDraftOwnerKey: resolvedDraftTarget.ownerKey,
+			targetDraftCwd: resolvedDraftTarget.cwd
 		})) {
 			removeOptimisticSidebarSession(nextPrompt.optimisticSidebarSessionId);
 			for (const followUp of pendingDraftFollowUpsRef.current) removeOptimisticUserMessage(followUp.optimisticId);
 			pendingDraftFollowUpsRef.current = [];
 			setPendingDraftFollowUps([]);
+			if (pendingNewSessionPromptTargetRef.current?.ownerKey === ownerKey) pendingNewSessionPromptTargetRef.current = null;
 			return false;
 		}
-		await flushPendingDraftFollowUps();
+		await flushPendingDraftFollowUps(resolvedTargetSessionKey, resolvedDraftTarget);
+		if (pendingNewSessionPromptTargetRef.current?.ownerKey === ownerKey) pendingNewSessionPromptTargetRef.current = null;
 		return true;
 	}, [
 		applyPendingDraftPromptToComposer,
@@ -23341,9 +24570,15 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		if (currentSessionState.sessionKey?.startsWith("optimistic:")) return;
 		const currentOwnerKey = promptDraftKey(currentSessionState);
 		if (!currentSessionState.draft || !promptDraftKeyMatchesOwner(currentOwnerKey, draftSessionLoadingOwnerKey)) return;
+		const targetSessionKey = currentSessionState.sessionKey?.startsWith("optimistic:") ? void 0 : currentSessionState.sessionKey;
+		if (targetSessionKey) pendingNewSessionPromptTargetRef.current = {
+			ownerKey: draftSessionLoadingOwnerKey,
+			sessionKey: targetSessionKey,
+			cwd: currentSessionState.cwd
+		};
 		draftSessionLoadingOwnerKeyRef.current = null;
 		setDraftSessionLoadingOwnerKey(null);
-		if (pendingDraftPromptRef.current?.ownerKey === draftSessionLoadingOwnerKey) flushPendingDraftPrompt(draftSessionLoadingOwnerKey);
+		if (pendingDraftPromptRef.current?.ownerKey === draftSessionLoadingOwnerKey) flushPendingDraftPrompt(draftSessionLoadingOwnerKey, targetSessionKey);
 	}, [
 		draftSessionLoadingOwnerKey,
 		flushPendingDraftPrompt,
@@ -24750,10 +25985,13 @@ function useAppShellSessionSync({ viewerContextId, sessionId, draftSessionLoadin
 	]);
 }
 var DOUBLE_ESCAPE_INTERVAL_MS = 500;
+function isTerminalTarget(target) {
+	return target instanceof HTMLElement && target.closest("[data-terminal-panel=\"true\"]") !== null;
+}
 function isEditableTarget(target) {
 	if (!(target instanceof HTMLElement)) return false;
 	const tagName = target.tagName.toLowerCase();
-	return target.isContentEditable || tagName === "input" || tagName === "textarea" || target.closest("[contenteditable=\"true\"]") !== null;
+	return target.isContentEditable || isTerminalTarget(target) || tagName === "input" || tagName === "textarea" || target.closest("[contenteditable=\"true\"]") !== null;
 }
 function isPromptTextareaTarget(target) {
 	return target instanceof HTMLTextAreaElement && target.name === "prompt";
@@ -24793,7 +26031,7 @@ function useAppShellShortcuts({ addDirectoryOpenRef, commandPaletteOpenRef, comp
 	};
 	const handleEscape = (event) => {
 		const context = getShortcutContext(event);
-		if (event.repeat || context.modalOpen || event.defaultPrevented) return;
+		if (event.repeat || context.modalOpen || event.defaultPrevented || isTerminalTarget(event.target)) return;
 		const now = Date.now();
 		if (now - lastEscapeKeyDownAtRef.current <= DOUBLE_ESCAPE_INTERVAL_MS) {
 			lastEscapeKeyDownAtRef.current = 0;
@@ -24832,7 +26070,7 @@ function useAppShellShortcuts({ addDirectoryOpenRef, commandPaletteOpenRef, comp
 	};
 	const handleFocusPrompt = (event) => {
 		const context = getShortcutContext(event);
-		if (context.blockingModalOpen || event.defaultPrevented) return;
+		if (context.blockingModalOpen || event.defaultPrevented || isTerminalTarget(event.target)) return;
 		event.preventDefault();
 		closeCommandPaletteForShortcut(context.commandPaletteOpen);
 		shortcutActionsRef.current.focusPrompt();
@@ -24859,12 +26097,19 @@ function useAppShellShortcuts({ addDirectoryOpenRef, commandPaletteOpenRef, comp
 		const key = event.altKey && event.code.startsWith("Key") ? event.code.slice(3).toLowerCase() : event.key.toLowerCase();
 		const context = getShortcutContext(event);
 		if (context.blockingModalOpen || event.defaultPrevented) return;
+		if (isTerminalTarget(event.target) && !context.commandPaletteOpen && key !== "`") return;
 		if (key === "\\") {
 			event.preventDefault();
 			closeCommandPaletteForShortcut(context.commandPaletteOpen);
 			shortcutActionsRef.current.toggleGitPanel();
 			return;
 		}
+		if (key === "`") {
+			event.preventDefault();
+			closeCommandPaletteForShortcut(context.commandPaletteOpen);
+			shortcutActionsRef.current.toggleTerminalPanel();
+			return;
+		}
 		if (key === "k") {
 			event.preventDefault();
 			shortcutActionsRef.current.openCommandPalette();
@@ -25036,6 +26281,7 @@ function useAppShellShortcuts({ addDirectoryOpenRef, commandPaletteOpenRef, comp
 		})),
 		...[
 			{ key: "\\" },
+			{ key: "`" },
 			{ key: "K" },
 			{ key: "P" },
 			{
@@ -25104,6 +26350,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 	if (!appUiStoreRef.current) appUiStoreRef.current = createPicoStore({
 		currentTab: "session",
 		gitPanelOpen: false,
+		terminalPanelOpen: false,
 		initialLoadingSessionId: sessionId || null,
 		loadingSessionId: null
 	}, shallowRecordEqual);
@@ -25119,6 +26366,11 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		setStoreField(appUiStore, "gitPanelOpen", nextOpen);
 		safeLocalStorageSetItem(RIGHT_SIDEBAR_OPEN_STORAGE_KEY, nextOpen ? "1" : "0");
 	}, [appUiStore]);
+	const setTerminalPanelOpen = import_react.useCallback((action) => {
+		const nextOpen = applyStoreAction(appUiStore.state.terminalPanelOpen, action);
+		setStoreField(appUiStore, "terminalPanelOpen", nextOpen);
+		safeLocalStorageSetItem(TERMINAL_PANEL_OPEN_STORAGE_KEY, nextOpen ? "1" : "0");
+	}, [appUiStore]);
 	const setLoadingSessionId = import_react.useCallback((action) => {
 		setStoreField(appUiStore, "loadingSessionId", action);
 	}, [appUiStore]);
@@ -25544,6 +26796,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		sessionKey: currentSessionState.sessionKey
 	}), { compare: shallowRecordEqual });
 	const gitPanelOpen = useSelector(appUiStore, (state) => state.gitPanelOpen);
+	const terminalPanelOpen = useSelector(appUiStore, (state) => state.terminalPanelOpen);
 	const openFileViewTab = (path, options) => {
 		if (!path) return;
 		batch(() => {
@@ -25640,7 +26893,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		} : currentSession : { draft: true }, sessionId);
 		setStoreState(appUiStore, (current) => ({
 			...current,
-			currentTab: current.currentTab === "git" ? "session" : current.currentTab,
+			currentTab: current.currentTab === "git" || current.currentTab === "terminal" ? "session" : current.currentTab,
 			initialLoadingSessionId: sessionId ? current.initialLoadingSessionId : null,
 			loadingSessionId: sessionId && sessionStateRef.current.sessionId !== sessionId ? sessionId : null
 		}));
@@ -25652,7 +26905,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 	]);
 	import_react.useEffect(() => {
 		if (isMobile) return;
-		setCurrentTab((tab) => tab === "git" ? "session" : tab);
+		setCurrentTab((tab) => tab === "git" || tab === "terminal" ? "session" : tab);
 	}, [isMobile, setCurrentTab]);
 	const syncComposerDraft = (value, target = sessionStateRef.current) => {
 		const parsed = parseComposerSkillMessage(value);
@@ -25696,6 +26949,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 	const applyStoredClientPreferences = () => {
 		batch(() => {
 			setGitPanelOpen(readStoredRightSidebarOpen());
+			setTerminalPanelOpen(readStoredTerminalPanelOpen());
 			setStoredDraftDirectory(readStoredDraftDirectory() || "");
 			setSessionDoneSoundEnabled(readStoredSessionDoneSoundEnabled());
 			setSessionDoneDesktopNotificationsEnabled(readStoredSessionDoneDesktopNotificationsEnabled());
@@ -25859,6 +27113,20 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		}
 		setGitPanelOpen((open) => !open);
 	};
+	const toggleTerminalPanel = () => {
+		if (isMobile) {
+			setCurrentTab((tab) => tab === "terminal" ? "session" : "terminal");
+			return;
+		}
+		setTerminalPanelOpen((open) => !open);
+	};
+	const closeTerminalPanel = () => {
+		if (isMobile) {
+			setCurrentTab((tab) => tab === "terminal" ? "session" : tab);
+			return;
+		}
+		setTerminalPanelOpen(false);
+	};
 	const openRenameDialog = () => {
 		const currentState = sessionStateRef.current;
 		if (!currentState.sessionFile) return;
@@ -26177,6 +27445,8 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 			title: "New session",
 			modified,
 			lastUserMessageAt: modified,
+			lastMessageAt: modified,
+			...options?.lastMessagePreview ? { lastMessagePreview: options.lastMessagePreview } : {},
 			streaming: true,
 			unread: false,
 			optimistic: true
@@ -26223,6 +27493,29 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 			sidebarStore.setSidebarSessionSelectionAnchor((current) => current === entryKey ? "" : current);
 		}
 	}, [sidebarStore]);
+	const updateOptimisticSidebarSessionPreview = import_react.useCallback((options) => {
+		const preview = options.preview.trim();
+		if (!preview) return;
+		const currentState = sessionStateRef.current;
+		const modified = (/* @__PURE__ */ new Date()).toISOString();
+		const sessionId = options.optimisticSidebarSessionId || currentState.sessionId || currentState.sessionKey;
+		const sessionPath = currentState.sessionFile;
+		const previewUpdate = {
+			...sessionId ? { sessionId } : {},
+			...sessionPath ? { sessionPath } : {},
+			preview,
+			modified
+		};
+		sidebarStore.setDirectoryIndexDataByPath((current) => updateOptimisticSidebarSessionPreviewEntry(current, previewUpdate));
+		sidebarStore.setSessionsEvent((current) => {
+			if (!current?.directoryIndexes) return current;
+			const directoryIndexes = updateOptimisticSidebarSessionPreviewEntry(current.directoryIndexes, previewUpdate);
+			return directoryIndexes === current.directoryIndexes ? current : {
+				...current,
+				directoryIndexes
+			};
+		});
+	}, [sessionStateRef, sidebarStore]);
 	const clearSelectedSidebarSelection = import_react.useCallback(() => {
 		sidebarStore.setSelectedSidebarSessionKeys((current) => current.length === 0 ? current : []);
 		sidebarStore.setSidebarSessionSelectionAnchor((current) => current ? "" : current);
@@ -26255,6 +27548,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		removeOptimisticUserMessage,
 		addOptimisticSidebarSession,
 		removeOptimisticSidebarSession,
+		updateOptimisticSidebarSessionPreview,
 		setSidebarDirectories: sidebarStore.setSidebarDirectories,
 		setStoredDraftDirectory,
 		setDraftSessionLoadingOwnerKey,
@@ -26311,10 +27605,6 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		const createSessionPromise = requestCreateSession(nextCwd);
 		handleSelectSession(void 0);
 		clearSelectedSidebarSelection();
-		if (shouldCloseMobileSidebar) {
-			pendingMobileSidebarPromptFocusRef.current = true;
-			setOpenMobile(false);
-		} else focusPrompt();
 		setAwaitingFirstTurn(false);
 		setPendingMessages((current) => current.length === 0 ? current : []);
 		const nextState = createOptimisticDraftSessionState({
@@ -26325,6 +27615,10 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		sessionStateRef.current = nextState;
 		conversationItemsStore.setItems(nextState.items);
 		setSessionState(nextState);
+		if (shouldCloseMobileSidebar) {
+			pendingMobileSidebarPromptFocusRef.current = true;
+			setOpenMobile(false);
+		} else focusPrompt();
 		if (await createSessionPromise) return;
 		if (sessionStateRef.current.sessionKey !== optimisticSessionKey) return;
 		sessionStateRef.current = previousState;
@@ -26711,7 +28005,8 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		hasAvailableModels: sessionStateRef.current.availableModels.length > 0,
 		isMobile,
 		selectedSidebarSessions,
-		sessionFile: sessionState.sessionFile
+		sessionFile: sessionState.sessionFile,
+		terminalPanelOpen
 	});
 	const buildCommandPaletteCommands = () => {
 		const commandState = commandPaletteStateRef.current;
@@ -26762,6 +28057,21 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 				],
 				onSelect: toggleGitPanel
 			},
+			{
+				id: "toggle-terminal",
+				group: "Workspace",
+				title: commandState.isMobile ? "Toggle terminal tab" : commandState.terminalPanelOpen ? "Close terminal" : "Open terminal",
+				description: commandState.isMobile ? "Switch the mobile terminal tab on or off" : "Toggle the bottom terminal panel",
+				shortcut: formatShortcutLabel("Control+`"),
+				keywords: [
+					"terminal",
+					"shell",
+					"console",
+					"bottom",
+					"panel"
+				],
+				onSelect: toggleTerminalPanel
+			},
 			{
 				id: "commit-changes",
 				group: "Git",
@@ -27126,6 +28436,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 			conversationFrameRef.current?.scrollConversationToTop();
 		},
 		toggleGitPanel,
+		toggleTerminalPanel,
 		toggleHideThinking,
 		toggleHideToolBlocks,
 		cycleThinkingLevel
@@ -27266,12 +28577,14 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 			defaultNewSessionDirectory,
 			displaySessionCwd,
 			gitPanelOpen,
+			terminalPanelOpen,
 			loadingDisplaySessionTitle,
 			currentSessionPinned,
 			displaySettingsStore,
 			isSessionViewLoading,
 			newSessionDirectoryOptions,
 			onToggleGitPanel: toggleGitPanel,
+			onToggleTerminalPanel: toggleTerminalPanel,
 			sessionStore,
 			viewerContextId
 		}),
@@ -27291,6 +28604,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 					displaySettingsStore,
 					fileInputRef,
 					gitPanelOpen,
+					terminalPanelOpen,
 					hiddenThinkingPreviewStore,
 					isSessionViewLoading,
 					isSubmitting,
@@ -27308,6 +28622,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 					onAddDiffLineComment: addComposerDiffLineComment,
 					onOpenFileViewTab: openFileViewTab,
 					onReorderFileViewTabs: reorderFileViewTabs,
+					onCloseTerminalPanel: closeTerminalPanel,
 					rightSidebarStore,
 					sessionStore,
 					store: composerStore,