@alivault/pico 0.10.0 → 0.10.2

package/.output/server/_ssr/{routes-CSvcOSyF.mjs → routes-CELGJtcT.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, 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 Ellipsis, B as ChevronDown, C as ImagePlus, D as FolderPlus, E as Folder, H as ArrowUp, I as ChevronsUpDown, K as ArrowLeft, L as ChevronsDownUp, M as Download, N as Copy, O as FileDiff, P as Command, T as GitCommitHorizontal, U as ArrowUpToLine, V as Check, W as ArrowUpRight, _ 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 EllipsisVertical, k as ExternalLink, l as Settings2, m as PanelLeftOpen, n as WandSparkles, o as Tag, p as PanelLeft, q as ArrowDown, r as Upload, s as Square, t as X, u as Search, v as Minimize2, w as GitBranch, x as ListEnd, y as Maximize2, z as ChevronRight } from "../_libs/lucide-react.mjs";
-import { $ as readStoredAutoScrollEnabled, C as THEME_COLOR_MODES, D as TitleTooltip, E as THEME_STORAGE_KEY, F as buildItemsFromSync, I as cn, J as normalizeStoredDirectoryList, K as normalizePromptImage, M as VIEWER_CONTEXT_STORAGE_KEY, N as appliedThemeClass, O as Tooltip$1, Q as promptDraftKey, R as createContextId, S as Spinner, T as THEME_FAMILIES, U as flattenTree, W as getSessionTitle, X as normalizeThemeFamily, Y as normalizeThemeColorMode, Z as previewUrlForImage, _ as RIGHT_SIDEBAR_WIDTHS_STORAGE_KEY, _t as sessionListEntryKey, a as COLLAPSED_DIRECTORIES_STORAGE_KEY, at as readStoredPromptDraft, b as SESSION_DONE_SOUND_ENABLED_STORAGE_KEY, bt as thinkingSummaryText, c as Kbd, ct as readStoredSessionDoneDesktopNotificationsEnabled, d as RECENT_DIRECTORIES_STORAGE_KEY, dt as readStoredTheme, et as readStoredCenterMessages, f as RIGHT_SIDEBAR_ACTIVE_TAB_STORAGE_KEY, ft as readStoredThemeColorMode, g as RIGHT_SIDEBAR_OPEN_STORAGE_KEY, gt as sameContextUsage, h as RIGHT_SIDEBAR_HISTORY_TAB_STORAGE_KEY, ht as safeLocalStorageSetItem, i as CENTER_MESSAGES_STORAGE_KEY, it as readStoredPinnedSessionKeys, j as TooltipTrigger, k as TooltipContent, l as KeyboardShortcutContent, lt as readStoredSessionDoneSoundEnabled, m as RIGHT_SIDEBAR_HISTORY_HEIGHT_STORAGE_KEY, mt as safeLocalStorageGetItem, n as APPLIED_THEME_STORAGE_KEY, nt as readStoredDraftDirectory, o as DRAFT_DIRECTORY_STORAGE_KEY, ot as readStoredRecentDirectories, p as RIGHT_SIDEBAR_FILE_TREE_WIDTH_STORAGE_KEY, pt as rememberStoredPromptDraft, q as normalizeSessionSelectionKeys, r as AUTO_SCROLL_ENABLED_STORAGE_KEY, rt as readStoredHideToolBlocks, s as HIDE_TOOL_BLOCKS_STORAGE_KEY, st as readStoredRightSidebarOpen, tt as readStoredCollapsedDirectories, u as PINNED_SESSIONS_STORAGE_KEY, ut as readStoredSidebarDirectories, v as Route, vt as themeColorModeLabel, w as THEME_COLOR_MODE_STORAGE_KEY, x as SIDEBAR_DIRECTORIES_STORAGE_KEY, y as SESSION_DONE_DESKTOP_NOTIFICATIONS_ENABLED_STORAGE_KEY, yt as themeFamilyLabel, z as createInitialSessionState } from "./routes-D6yf6dMU.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-CHNxptm_.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";
@@ -10,10 +10,10 @@ import { t as shallow } from "../_libs/tanstack__store.mjs";
 import { t as useSelector } from "../_libs/tanstack__react-store.mjs";
 import { n as z } from "../_libs/next-themes.mjs";
 import { n as toast } from "../_libs/sonner.mjs";
+import { a as registerCustomTheme, i as parsePatchFiles, n as MultiFileDiff, o as RegisteredCustomThemes, r as FileDiff$1, t as PatchDiff, u as createCssVariablesTheme } from "../_libs/@pierre/diffs+[...].mjs";
 import { i as AsyncDebouncer, r as Batcher, t as Throttler } from "../_libs/tanstack__pacer.mjs";
 import { t as _e } from "../_libs/cmdk.mjs";
 import { t as Drawer } from "../_libs/vaul.mjs";
-import { i as parsePatchFiles, n as MultiFileDiff, r as FileDiff$1, t as PatchDiff } from "../_libs/@pierre/diffs+[...].mjs";
 import { t as Markdown } from "../_libs/react-markdown+[...].mjs";
 import { t as rehypeRaw } from "../_libs/rehype-raw.mjs";
 import { n as defaultSchema } from "../_libs/hast-util-sanitize.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-CSvcOSyF.js
+//#region node_modules/.nitro/vite/services/ssr/assets/routes-CELGJtcT.js
 var import_react = /* @__PURE__ */ __toESM(require_react());
 var import_jsx_runtime = require_jsx_runtime();
 var MOBILE_BREAKPOINT = 768;
@@ -980,7 +980,7 @@ function CommandGroup({ className, ...props }) {
 function CommandItem({ className, children, ...props }) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(_e.Item, {
 		"data-slot": "command-item",
-		className: cn("group/command-item relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none in-data-[slot=dialog-content]:rounded-lg! data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 data-selected:bg-muted data-selected:text-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 data-selected:*:[svg]:text-foreground", className),
+		className: cn("group/command-item relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none in-data-[slot=dialog-content]:rounded-lg! data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 data-selected:bg-accent data-selected:text-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 data-selected:*:[svg]:text-foreground", className),
 		...props,
 		children: [children, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Check, { className: "ml-auto opacity-0 group-has-data-[slot=command-shortcut]/command-item:hidden group-data-[checked=true]/command-item:opacity-100" })]
 	});
@@ -3100,19 +3100,84 @@ function AppShellSessionsDialogController({ ref, openStateRef, ...props }) {
 	});
 }
 var THEME_OPTIONS = [...THEME_FAMILIES];
-var THEME_COLOR_MODE_OPTIONS = [...THEME_COLOR_MODES];
-function createInitialSettingsDialogState(currentTheme) {
+var THEME_SELECTION_SECTIONS = [
+	{
+		heading: "Auto",
+		colorMode: "auto"
+	},
+	{
+		heading: "Dark",
+		colorMode: "dark"
+	},
+	{
+		heading: "Light",
+		colorMode: "light"
+	}
+].map((section) => ({
+	...section,
+	themes: THEME_OPTIONS.filter((theme) => themeFamilySupportsColorMode(theme, section.colorMode))
+}));
+var SETTINGS_DIALOG_AUTO_FOCUS_MEDIA = "(min-width: 768px)";
+function shouldAutoFocusSettingsDialogInput() {
+	return typeof window !== "undefined" && window.matchMedia(SETTINGS_DIALOG_AUTO_FOCUS_MEDIA).matches;
+}
+function isThemeColorMode(value) {
+	return value === "auto" || value === "light" || value === "dark";
+}
+function themeSelectionKey(selection) {
+	return `${selection.colorMode}:${selection.theme}`;
+}
+function themeSelectionFromKey(value) {
+	const separatorIndex = value.indexOf(":");
+	if (separatorIndex < 0) return void 0;
+	const colorMode = value.slice(0, separatorIndex);
+	const theme = value.slice(separatorIndex + 1);
+	if (!isThemeColorMode(colorMode)) return void 0;
+	if (!THEME_OPTIONS.includes(theme)) return void 0;
+	const normalizedTheme = theme;
+	if (!themeFamilySupportsColorMode(normalizedTheme, colorMode)) return;
+	return {
+		theme: normalizedTheme,
+		colorMode
+	};
+}
+function themeSelectionForCurrent(theme, colorMode) {
+	return {
+		theme,
+		colorMode: themeFamilyFixedMode(theme) ?? colorMode
+	};
+}
+function themeSelectionModeLabel(selection, systemTheme) {
+	if (selection.colorMode === "auto") return themeColorModeLabel(selection.colorMode, systemTheme);
+	return selection.colorMode === "light" ? "Light" : "Dark";
+}
+function themeSelectionValueLabel(selection, systemTheme) {
+	return `${themeFamilyLabel(selection.theme)} · ${themeSelectionModeLabel(selection, systemTheme)}`;
+}
+function themeSelectionDescription(selection) {
+	if (selection.colorMode === "auto") return `Auto: ${themeFamilyDescription(selection.theme)}`;
+	if (themeFamilyFixedMode(selection.theme)) return `${themeSelectionModeLabel(selection)} only: ${themeFamilyDescription(selection.theme)}`;
+	return themeFamilyDescription(selection.theme);
+}
+function themeSelectionKeywords(selection) {
+	return [
+		selection.colorMode,
+		themeSelectionModeLabel(selection),
+		...themeFamilyKeywords(selection.theme)
+	];
+}
+function createInitialSettingsDialogState(currentTheme, currentThemeColorMode) {
 	return {
 		query: "",
 		themeQuery: "",
 		stage: "browse",
 		selectedCommandId: "theme",
-		selectedTheme: currentTheme
+		selectedTheme: themeSelectionForCurrent(currentTheme, currentThemeColorMode)
 	};
 }
 function settingsDialogReducer(state, action) {
 	switch (action.type) {
-		case "reset": return createInitialSettingsDialogState(action.currentTheme);
+		case "reset": return createInitialSettingsDialogState(action.currentTheme, action.currentThemeColorMode);
 		case "set-query": return {
 			...state,
 			query: action.query
@@ -3128,7 +3193,7 @@ function settingsDialogReducer(state, action) {
 		case "open-theme": return {
 			...state,
 			stage: "theme",
-			selectedTheme: action.currentTheme
+			selectedTheme: themeSelectionForCurrent(action.currentTheme, action.currentThemeColorMode)
 		};
 		case "close-theme": return {
 			...state,
@@ -3150,23 +3215,6 @@ function desktopNotificationPermissionLabel(permission) {
 function formatToggleValue(enabled) {
 	return enabled ? "On" : "Off";
 }
-function nextThemeColorMode(currentMode) {
-	return THEME_COLOR_MODE_OPTIONS[(THEME_COLOR_MODE_OPTIONS.indexOf(currentMode) + 1) % THEME_COLOR_MODE_OPTIONS.length] ?? "auto";
-}
-function themeDescription(theme) {
-	switch (theme) {
-		case "default": return "Use Pico's default palette.";
-		case "flexoki": return "Use Flexoki's warm paper and inky dark palettes.";
-		default: return "Use this theme.";
-	}
-}
-function themeKeywords(theme) {
-	return [
-		theme,
-		themeFamilyLabel(theme),
-		themeDescription(theme)
-	];
-}
 function settingsCommandKeywords(command) {
 	return [
 		command.title,
@@ -3180,7 +3228,7 @@ function settingsCommandFilter(value, search, keywords) {
 	if (!query) return 1;
 	return [value, ...keywords ?? []].join(" ").toLowerCase().includes(query) ? 1 : 0;
 }
-function getSettingsCommandGroups({ currentTheme, currentThemeColorMode, systemTheme, hideThinkingBlocks, onHideThinkingBlocksChange, hideToolBlocks, onHideToolBlocksChange, centerMessages, onCenterMessagesChange, autoScrollEnabled, onAutoScrollEnabledChange, sessionDoneSoundEnabled, onSessionDoneSoundEnabledChange, sessionDoneDesktopNotificationsEnabled, onSessionDoneDesktopNotificationsEnabledChange, desktopNotificationPermission, onLoginProviders, onLogoutProviders, onThemeCommand, onThemeColorModeCommand }) {
+function getSettingsCommandGroups({ currentTheme, currentThemeColorMode, systemTheme, hideThinkingBlocks, onHideThinkingBlocksChange, hideToolBlocks, onHideToolBlocksChange, centerMessages, onCenterMessagesChange, autoScrollEnabled, onAutoScrollEnabledChange, sessionDoneSoundEnabled, onSessionDoneSoundEnabledChange, sessionDoneDesktopNotificationsEnabled, onSessionDoneDesktopNotificationsEnabledChange, desktopNotificationPermission, onLoginProviders, onLogoutProviders, onThemeCommand }) {
 	const desktopNotificationDescription = desktopNotificationPermissionLabel(desktopNotificationPermission);
 	return [
 		{
@@ -3188,29 +3236,19 @@ function getSettingsCommandGroups({ currentTheme, currentThemeColorMode, systemT
 			commands: [{
 				id: "theme",
 				title: "Theme",
-				description: "Choose between Default and Flexoki.",
-				valueLabel: themeFamilyLabel(currentTheme),
-				keywords: [
-					"color",
-					"mode",
-					"default",
-					"flexoki"
-				],
-				onSelect: onThemeCommand
-			}, {
-				id: "theme-color-mode",
-				title: "Light/dark mode",
-				description: "Follow OS appearance, or force light or dark mode.",
-				valueLabel: themeColorModeLabel(currentThemeColorMode, systemTheme),
+				description: "Choose an auto, dark, or light color palette.",
+				valueLabel: themeSelectionValueLabel(themeSelectionForCurrent(currentTheme, currentThemeColorMode), systemTheme),
 				keywords: [
 					"auto",
 					"system",
 					"light",
 					"dark",
+					"color",
 					"mode",
-					"color"
+					"palette",
+					...THEME_OPTIONS.flatMap((theme) => themeFamilyKeywords(theme))
 				],
-				onSelect: onThemeColorModeCommand
+				onSelect: onThemeCommand
 			}]
 		},
 		{
@@ -3334,6 +3372,11 @@ function getSettingsCommandGroups({ currentTheme, currentThemeColorMode, systemT
 	];
 }
 function SettingsBrowseBody({ query, selectedCommandId, settingGroups, onQueryChange, onSelectedCommandIdChange, onSelectCommand }) {
+	const inputRef = import_react.useRef(null);
+	import_react.useEffect(() => {
+		if (!shouldAutoFocusSettingsDialogInput()) return;
+		inputRef.current?.focus();
+	}, []);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Command$1, {
 		shouldFilter: true,
 		filter: settingsCommandFilter,
@@ -3343,6 +3386,7 @@ function SettingsBrowseBody({ query, selectedCommandId, settingGroups, onQueryCh
 		className: "min-h-0 flex-1",
 		children: [
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommandInput, {
+				ref: inputRef,
 				value: query,
 				onValueChange: onQueryChange,
 				placeholder: "Search settings",
@@ -3380,7 +3424,12 @@ function SettingsBrowseBody({ query, selectedCommandId, settingGroups, onQueryCh
 		]
 	});
 }
-function SettingsThemeBody({ currentTheme, selectedTheme, themeQuery, onThemeQueryChange, onThemePreview, onThemeSelect, onCancelThemePreview }) {
+function SettingsThemeBody({ currentTheme, currentThemeColorMode, selectedTheme, systemTheme, themeQuery, onThemeQueryChange, onThemePreview, onThemeSelect, onCancelThemePreview }) {
+	const inputRef = import_react.useRef(null);
+	import_react.useEffect(() => {
+		if (!shouldAutoFocusSettingsDialogInput()) return;
+		inputRef.current?.focus();
+	}, []);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		role: "presentation",
 		className: "flex min-h-0 flex-1 flex-col",
@@ -3406,17 +3455,25 @@ function SettingsThemeBody({ currentTheme, selectedTheme, themeQuery, onThemeQue
 					children: "Choose theme"
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 					className: "truncate text-xs text-muted-foreground",
-					children: ["Current: ", themeFamilyLabel(currentTheme)]
+					children: [
+						"Current:",
+						" ",
+						themeSelectionValueLabel(themeSelectionForCurrent(currentTheme, currentThemeColorMode), systemTheme)
+					]
 				})]
 			})]
 		}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Command$1, {
 			shouldFilter: true,
 			loop: true,
-			value: selectedTheme,
-			onValueChange: (value) => onThemePreview(value),
+			value: themeSelectionKey(selectedTheme),
+			onValueChange: (value) => {
+				const selection = themeSelectionFromKey(value);
+				if (selection) onThemePreview(selection);
+			},
 			className: "min-h-0 flex-1 rounded-none!",
 			children: [
 				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommandInput, {
+					ref: inputRef,
 					value: themeQuery,
 					onValueChange: onThemeQueryChange,
 					placeholder: "Search themes",
@@ -3424,27 +3481,35 @@ function SettingsThemeBody({ currentTheme, selectedTheme, themeQuery, onThemeQue
 				}),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(CommandList, {
 					className: "max-h-none min-h-0 flex-1 md:max-h-[min(70vh,28rem)]",
-					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommandEmpty, { children: "No themes found." }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommandGroup, {
-						heading: "Themes",
-						children: THEME_OPTIONS.map((theme) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommandItem, {
-							value: theme,
-							keywords: themeKeywords(theme),
-							onMouseEnter: () => onThemePreview(theme),
-							onSelect: () => onThemeSelect(theme),
-							"data-checked": theme === currentTheme ? true : void 0,
-							className: "items-start py-2",
-							children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-								className: "flex min-w-0 flex-1 flex-col gap-0.5",
-								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-									className: "truncate font-medium",
-									children: themeFamilyLabel(theme)
-								}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-									className: "line-clamp-2 text-xs text-muted-foreground",
-									children: themeDescription(theme)
-								})]
-							})
-						}, theme))
-					})]
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommandEmpty, { children: "No themes found." }), THEME_SELECTION_SECTIONS.map((section) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommandGroup, {
+						heading: section.heading,
+						className: "**:[[cmdk-group-heading]]:sticky **:[[cmdk-group-heading]]:top-0 **:[[cmdk-group-heading]]:z-10 **:[[cmdk-group-heading]]:bg-popover",
+						children: section.themes.map((theme) => {
+							const selection = {
+								theme,
+								colorMode: section.colorMode
+							};
+							const selectionKey = themeSelectionKey(selection);
+							const currentSelection = themeSelectionForCurrent(currentTheme, currentThemeColorMode);
+							return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommandItem, {
+								value: selectionKey,
+								keywords: themeSelectionKeywords(selection),
+								onSelect: () => onThemeSelect(selection),
+								"data-checked": selectionKey === themeSelectionKey(currentSelection) ? true : void 0,
+								className: "items-start py-2",
+								children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+									className: "flex min-w-0 flex-1 flex-col gap-0.5",
+									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+										className: "truncate font-medium",
+										children: themeFamilyLabel(theme)
+									}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+										className: "line-clamp-2 text-xs text-muted-foreground",
+										children: themeSelectionDescription(selection)
+									})]
+								})
+							}, selectionKey);
+						})
+					}, section.colorMode))]
 				}),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 					className: "hidden border-t border-border/70 px-3 py-2 text-xs text-muted-foreground md:block",
@@ -3459,18 +3524,23 @@ function SettingsDialogBody({ stage, browseBodyProps, themeBodyProps }) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SettingsBrowseBody, { ...browseBodyProps });
 }
 function AppShellSettingsDialog({ open, onOpenChange, currentTheme, currentThemeColorMode, onThemeChange, onThemeColorModeChange, onThemePreviewChange, systemTheme, hideThinkingBlocks, onHideThinkingBlocksChange, hideToolBlocks, onHideToolBlocksChange, centerMessages, onCenterMessagesChange, autoScrollEnabled, onAutoScrollEnabledChange, sessionDoneSoundEnabled, onSessionDoneSoundEnabledChange, sessionDoneDesktopNotificationsEnabled, onSessionDoneDesktopNotificationsEnabledChange, desktopNotificationPermission, onLoginProviders, onLogoutProviders }) {
-	const [state, dispatch] = import_react.useReducer(settingsDialogReducer, currentTheme, createInitialSettingsDialogState);
-	const themePreviewInitialRef = import_react.useRef(currentTheme);
+	const [state, dispatch] = import_react.useReducer(settingsDialogReducer, {
+		currentTheme,
+		currentThemeColorMode
+	}, ({ currentTheme: initialTheme, currentThemeColorMode: initialColorMode }) => createInitialSettingsDialogState(initialTheme, initialColorMode));
+	const themePreviewInitialRef = import_react.useRef(themeSelectionForCurrent(currentTheme, currentThemeColorMode));
 	const isMobile = useIsMobile();
 	import_react.useEffect(() => {
 		if (open) return;
-		if (state.stage === "theme") onThemePreviewChange(themePreviewInitialRef.current);
+		if (state.stage === "theme") onThemePreviewChange(themePreviewInitialRef.current.theme, themePreviewInitialRef.current.colorMode);
 		dispatch({
 			type: "reset",
-			currentTheme
+			currentTheme,
+			currentThemeColorMode
 		});
 	}, [
 		currentTheme,
+		currentThemeColorMode,
 		onThemePreviewChange,
 		open,
 		state.stage
@@ -3480,21 +3550,24 @@ function AppShellSettingsDialog({ open, onOpenChange, currentTheme, currentTheme
 			console.error(error);
 		});
 	};
-	const handleThemePreview = (theme) => {
-		if (!THEME_OPTIONS.includes(theme)) return;
+	const handleThemePreview = (selection) => {
+		if (!THEME_OPTIONS.includes(selection.theme)) return;
+		if (!themeFamilySupportsColorMode(selection.theme, selection.colorMode)) return;
 		dispatch({
 			type: "preview-theme",
-			selectedTheme: theme
+			selectedTheme: selection
 		});
-		onThemePreviewChange(theme);
+		onThemePreviewChange(selection.theme, selection.colorMode);
 	};
-	const handleThemeSelect = (theme) => {
+	const handleThemeSelect = (selection) => {
 		dispatch({
 			type: "preview-theme",
-			selectedTheme: theme
+			selectedTheme: selection
 		});
-		themePreviewInitialRef.current = theme;
-		onThemeChange(theme);
+		themePreviewInitialRef.current = selection;
+		onThemeColorModeChange(selection.colorMode);
+		onThemeChange(selection.theme);
+		onOpenChange(false);
 	};
 	const cancelThemePreview = () => {
 		const initialTheme = themePreviewInitialRef.current;
@@ -3502,7 +3575,7 @@ function AppShellSettingsDialog({ open, onOpenChange, currentTheme, currentTheme
 			type: "close-theme",
 			selectedTheme: initialTheme
 		});
-		onThemePreviewChange(initialTheme);
+		onThemePreviewChange(initialTheme.theme, initialTheme.colorMode);
 	};
 	const settingGroups = getSettingsCommandGroups({
 		currentTheme,
@@ -3524,13 +3597,13 @@ function AppShellSettingsDialog({ open, onOpenChange, currentTheme, currentTheme
 		onLoginProviders,
 		onLogoutProviders,
 		onThemeCommand: () => {
-			themePreviewInitialRef.current = currentTheme;
+			themePreviewInitialRef.current = themeSelectionForCurrent(currentTheme, currentThemeColorMode);
 			dispatch({
 				type: "open-theme",
-				currentTheme
+				currentTheme,
+				currentThemeColorMode
 			});
-		},
-		onThemeColorModeCommand: () => onThemeColorModeChange(nextThemeColorMode(currentThemeColorMode))
+		}
 	});
 	const settingsCommandBody = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SettingsDialogBody, {
 		stage: state.stage,
@@ -3550,7 +3623,9 @@ function AppShellSettingsDialog({ open, onOpenChange, currentTheme, currentTheme
 		},
 		themeBodyProps: {
 			currentTheme,
+			currentThemeColorMode,
 			selectedTheme: state.selectedTheme,
+			systemTheme,
 			themeQuery: state.themeQuery,
 			onThemeQueryChange: (themeQuery) => dispatch({
 				type: "set-theme-query",
@@ -5286,8 +5361,8 @@ function AppShellTreeDialogController({ ref, openStateRef, viewerContextId, sess
 				})
 			});
 		},
-		onSuccess: async () => {
-			await queryClient.invalidateQueries({
+		onSuccess: () => {
+			queryClient.invalidateQueries({
 				queryKey,
 				exact: true,
 				refetchType: "active"
@@ -5318,6 +5393,7 @@ function AppShellTreeDialogController({ ref, openStateRef, viewerContextId, sess
 	};
 	const navigateTreeNode = async (targetId, options) => {
 		if (!viewerContextId) return;
+		setOpenState(false);
 		try {
 			const response = await navigateTreeNodeMutation.mutateAsync({
 				targetId,
@@ -5332,7 +5408,6 @@ function AppShellTreeDialogController({ ref, openStateRef, viewerContextId, sess
 				toast.info("Tree navigation cancelled");
 				return;
 			}
-			setOpenState(false);
 			toast.success(options?.summarize ? "Continued from summarized branch" : "Moved session tree cursor");
 		} catch (error) {
 			toast.error(error instanceof Error ? error.message : "Failed to navigate tree");
@@ -6068,6 +6143,74 @@ function updateDirectoryIndexLoadingState(current, directories, loading) {
 	}
 	return changed ? next : current;
 }
+function upsertOptimisticSidebarSessionEntry(current, entry) {
+	const directory = entry.cwd.trim();
+	const optimisticId = entry.id.trim();
+	if (!directory || !optimisticId) return current;
+	const currentSnapshot = current[directory];
+	const currentSessions = currentSnapshot?.sessions || [];
+	const existingEntry = currentSessions.find((session) => session.id === optimisticId);
+	const nextSessions = [{
+		...existingEntry,
+		...entry,
+		id: optimisticId,
+		cwd: directory,
+		optimistic: true
+	}, ...currentSessions.filter((session) => session.id !== optimisticId)];
+	const totalCountBaseline = Math.max(currentSnapshot?.totalCount ?? 0, currentSessions.length);
+	return {
+		...current,
+		[directory]: {
+			directory,
+			totalCount: existingEntry ? totalCountBaseline : totalCountBaseline + 1,
+			revision: `optimistic:${optimisticId}:${currentSnapshot?.revision || "initial"}:${entry.modified || ""}`,
+			sessions: nextSessions
+		}
+	};
+}
+function removeOptimisticSidebarSessionEntry(current, optimisticId) {
+	const targetId = optimisticId?.trim() || "";
+	if (!targetId) return current;
+	let changed = false;
+	const next = { ...current };
+	for (const [directory, snapshot] of Object.entries(current)) {
+		const nextSessions = snapshot.sessions.filter((entry) => entry.id !== targetId);
+		if (nextSessions.length === snapshot.sessions.length) continue;
+		changed = true;
+		next[directory] = {
+			...snapshot,
+			totalCount: Math.max(0, snapshot.totalCount - 1),
+			revision: `remove-optimistic:${targetId}:${snapshot.revision}`,
+			sessions: nextSessions
+		};
+	}
+	return changed ? next : current;
+}
+function isOptimisticSidebarSessionEntry(entry) {
+	return Boolean(entry.optimistic || entry.id?.startsWith("optimistic:") && !entry.path);
+}
+function mergeDirectoryIndexDataPreservingOptimistic(current, next) {
+	let merged = mergeDirectoryIndexData(current, next);
+	for (const [directory, snapshot] of Object.entries(current)) {
+		const optimisticSessions = snapshot.sessions.filter(isOptimisticSidebarSessionEntry);
+		if (optimisticSessions.length === 0) continue;
+		const targetSnapshot = merged[directory];
+		if (!targetSnapshot) continue;
+		const targetIds = new Set(targetSnapshot.sessions.flatMap((entry) => entry.id ? [entry.id] : []));
+		const missingOptimisticSessions = optimisticSessions.filter((entry) => entry.id && !targetIds.has(entry.id));
+		if (missingOptimisticSessions.length === 0) continue;
+		merged = {
+			...merged,
+			[directory]: {
+				...targetSnapshot,
+				totalCount: targetSnapshot.totalCount + missingOptimisticSessions.length,
+				revision: `preserve-optimistic:${targetSnapshot.revision}`,
+				sessions: [...missingOptimisticSessions, ...targetSnapshot.sessions]
+			}
+		};
+	}
+	return merged;
+}
 function sameSessionEntryRecord(left, right) {
 	const leftKeys = Object.keys(left);
 	const rightKeys = Object.keys(right);
@@ -6239,11 +6382,11 @@ function computeAppShellSidebarDerived(state) {
 	const sidebarSessions = Array.from(sidebarSessionEntriesByKey.values());
 	const pinnedSidebarSessions = state.pinnedSidebarSessionKeys.flatMap((key) => {
 		const entry = sidebarSessionEntriesByKey.get(key);
-		return entry?.path || entry?.id ? [entry] : [];
+		return entry?.path || entry?.id && !isOptimisticSidebarSessionEntry(entry) ? [entry] : [];
 	});
 	const selectedSidebarSessions = state.selectedSidebarSessionKeys.flatMap((key) => {
 		const entry = sidebarSessionEntriesByKey.get(key);
-		return entry?.path || entry?.id ? [entry] : [];
+		return entry?.path || entry?.id && !isOptimisticSidebarSessionEntry(entry) ? [entry] : [];
 	});
 	const workspaceVersion = [
 		baseSidebarDirectories.join("\n"),
@@ -7383,54 +7526,98 @@ function FooterKbd({ children }) {
 }
 function RenameSessionDialog({ open, onOpenChange, renameValue, onRenameValueChange, onRenameSession }) {
 	const isMobile = useIsMobile();
-	const renameInput = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Input$1, {
-		value: renameValue,
-		onChange: (event) => onRenameValueChange(event.target.value),
-		onKeyDown: (event) => {
-			if (event.key !== "Enter" || event.nativeEvent.isComposing) return;
-			event.preventDefault();
-			onRenameSession();
-		},
-		placeholder: "Session name"
+	const renameInputRef = import_react.useRef(null);
+	import_react.useEffect(() => {
+		if (!open) return;
+		const frame = window.requestAnimationFrame(() => {
+			renameInputRef.current?.focus();
+			renameInputRef.current?.select();
+		});
+		return () => {
+			window.cancelAnimationFrame(frame);
+		};
+	}, [open]);
+	const body = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "flex min-h-0 flex-1 flex-col",
+		children: [
+			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "border-b border-border/70 px-3 py-2",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "truncate text-sm font-medium",
+					children: "Rename session"
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "truncate text-xs text-muted-foreground",
+					children: "Update the display name shown in the sidebar."
+				})]
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+				className: "flex min-h-0 flex-1 items-center p-3",
+				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Input$1, {
+					ref: renameInputRef,
+					value: renameValue,
+					onChange: (event) => onRenameValueChange(event.target.value),
+					onKeyDown: (event) => {
+						if (event.key === "Escape") {
+							event.preventDefault();
+							event.stopPropagation();
+							onOpenChange(false);
+							return;
+						}
+						if (event.key !== "Enter" || event.nativeEvent.isComposing) return;
+						event.preventDefault();
+						event.stopPropagation();
+						onRenameSession();
+					},
+					placeholder: "Session name",
+					className: "min-w-0 flex-1"
+				})
+			}),
+			isMobile ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "hidden flex-wrap items-center gap-x-3 gap-y-1 border-t border-border/70 px-3 py-2 text-xs text-muted-foreground md:flex",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: "inline-flex items-center gap-1",
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FooterKbd, { children: "Enter" }), " Save"]
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: "inline-flex items-center gap-1",
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FooterKbd, { children: "Esc" }), " Cancel"]
+				})]
+			})
+		]
 	});
 	if (isMobile) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Drawer$1, {
 		open,
 		onOpenChange,
 		autoFocus: false,
-		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerContent, { children: [
-			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerHeader, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DrawerTitle, { children: "Rename session" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DrawerDescription, { children: "Update the display name shown in the sidebar." })] }),
-			/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-				className: "px-4 pb-2",
-				children: renameInput
-			}),
-			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerFooter, {
-				className: "border-t border-border/70",
-				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
-					variant: "outline",
-					onClick: () => onOpenChange(false),
-					children: "Cancel"
-				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
-					onClick: onRenameSession,
-					children: "Save"
-				})]
-			})
-		] })
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerContent, {
+			className: "max-h-[90svh] overflow-hidden",
+			children: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerHeader, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DrawerTitle, { children: "Rename session" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DrawerDescription, { children: "Update the display name shown in the sidebar." })] }),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "flex min-h-0 flex-1 flex-col overflow-hidden px-4 pb-4",
+					children: body
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerFooter, {
+					className: "border-t border-border/70",
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+						variant: "outline",
+						onClick: () => onOpenChange(false),
+						children: "Cancel"
+					}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+						onClick: onRenameSession,
+						children: "Save"
+					})]
+				})
+			]
+		})
 	});
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Dialog$1, {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommandDialog, {
 		open,
 		onOpenChange,
-		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DialogContent, { children: [
-			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DialogHeader, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DialogTitle, { children: "Rename session" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DialogDescription, { children: "Update the display name shown in the sidebar." })] }),
-			renameInput,
-			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DialogFooter, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
-				variant: "outline",
-				onClick: () => onOpenChange(false),
-				children: "Cancel"
-			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
-				onClick: onRenameSession,
-				children: "Save"
-			})] })
-		] })
+		title: "Rename session",
+		description: "Update the display name shown in the sidebar.",
+		className: "sm:max-w-md",
+		initialFocus: true,
+		children: body
 	});
 }
 function RenameSessionDialogController({ ref, openStateRef, onRenameSession }) {
@@ -7480,35 +7667,138 @@ function RenameSessionDialogController({ ref, openStateRef, onRenameSession }) {
 		}
 	});
 }
-function DeleteSessionsDialog({ open, onOpenChange, title, description, onDeleteSession }) {
-	if (useIsMobile()) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Drawer$1, {
+function DeleteSessionsDialog({ open, onOpenChange, title, description, targets, onDeleteSession }) {
+	const isMobile = useIsMobile();
+	const deletePanelRef = import_react.useRef(null);
+	import_react.useEffect(() => {
+		if (!open || isMobile) return;
+		const frame = window.requestAnimationFrame(() => {
+			deletePanelRef.current?.focus();
+		});
+		return () => {
+			window.cancelAnimationFrame(frame);
+		};
+	}, [isMobile, open]);
+	import_react.useEffect(() => {
+		if (!open || isMobile) return;
+		const handleDeleteKeyDown = (event) => {
+			if (event.key === "Escape") {
+				event.preventDefault();
+				event.stopPropagation();
+				onOpenChange(false);
+				return;
+			}
+			if (event.key !== "Enter" || event.isComposing) return;
+			event.preventDefault();
+			event.stopPropagation();
+			onDeleteSession();
+		};
+		window.addEventListener("keydown", handleDeleteKeyDown, true);
+		return () => {
+			window.removeEventListener("keydown", handleDeleteKeyDown, true);
+		};
+	}, [
+		isMobile,
+		onDeleteSession,
+		onOpenChange,
+		open
+	]);
+	const previewTargets = targets.slice(0, 8);
+	const remainingTargetCount = Math.max(0, targets.length - previewTargets.length);
+	const body = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		ref: deletePanelRef,
+		role: "presentation",
+		tabIndex: -1,
+		className: "flex min-h-0 flex-1 flex-col outline-none",
+		onKeyDown: (event) => {
+			if (event.key === "Escape") {
+				event.preventDefault();
+				event.stopPropagation();
+				onOpenChange(false);
+				return;
+			}
+			if (event.key !== "Enter" || event.nativeEvent.isComposing) return;
+			event.preventDefault();
+			event.stopPropagation();
+			onDeleteSession();
+		},
+		children: [
+			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "border-b border-border/70 px-3 py-2",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "truncate text-sm font-medium",
+					children: title
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "truncate text-xs text-muted-foreground",
+					children: description
+				})]
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "flex min-h-0 flex-1 flex-col gap-3 p-3",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
+					className: "text-sm text-muted-foreground",
+					children: "This cannot be undone."
+				}), targets.length > 1 ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+					className: "max-h-48 space-y-1 overflow-y-auto rounded-lg border bg-muted/30 p-2 text-sm",
+					children: [previewTargets.map((target) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+						className: "truncate",
+						children: target.title || "New session"
+					}, target.path || target.id)), remainingTargetCount > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						className: "text-muted-foreground",
+						children: [
+							"…and ",
+							remainingTargetCount,
+							" more"
+						]
+					}) : null]
+				}) : null]
+			}),
+			isMobile ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "hidden flex-wrap items-center gap-x-3 gap-y-1 border-t border-border/70 px-3 py-2 text-xs text-muted-foreground md:flex",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: "inline-flex items-center gap-1",
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FooterKbd, { children: "Enter" }), " Delete"]
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: "inline-flex items-center gap-1",
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FooterKbd, { children: "Esc" }), " Cancel"]
+				})]
+			})
+		]
+	});
+	if (isMobile) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Drawer$1, {
 		open,
 		onOpenChange,
-		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerContent, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerHeader, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DrawerTitle, { children: title }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DrawerDescription, { children: description })] }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerFooter, {
-			className: "border-t border-border/70",
-			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
-				variant: "outline",
-				onClick: () => onOpenChange(false),
-				children: "Cancel"
-			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
-				variant: "destructive",
-				onClick: onDeleteSession,
-				children: "Delete"
-			})]
-		})] })
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerContent, {
+			className: "max-h-[90svh] overflow-hidden",
+			children: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerHeader, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DrawerTitle, { children: title }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DrawerDescription, { children: description })] }),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "flex min-h-0 flex-1 flex-col overflow-hidden px-4 pb-4",
+					children: body
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DrawerFooter, {
+					className: "border-t border-border/70",
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+						variant: "outline",
+						onClick: () => onOpenChange(false),
+						children: "Cancel"
+					}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+						variant: "destructive",
+						onClick: onDeleteSession,
+						children: "Delete"
+					})]
+				})
+			]
+		})
 	});
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Dialog$1, {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommandDialog, {
 		open,
 		onOpenChange,
-		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DialogContent, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DialogHeader, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DialogTitle, { children: title }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DialogDescription, { children: description })] }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DialogFooter, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
-			variant: "outline",
-			onClick: () => onOpenChange(false),
-			children: "Cancel"
-		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
-			variant: "destructive",
-			onClick: onDeleteSession,
-			children: "Delete"
-		})] })] })
+		title,
+		description,
+		className: "sm:max-w-md",
+		initialFocus: true,
+		children: body
 	});
 }
 function DeleteOldDirectorySessionsDialog({ open, onOpenChange, directory, daysValue, preview, previewLoading, deleteLoading, onDaysValueChange, onPreview, onDelete }) {
@@ -7750,6 +8040,7 @@ function DeleteSessionsDialogController({ ref, openStateRef, onDeleteSession })
 		onOpenChange: setOpenState,
 		title: targets.length === 1 ? "Delete session" : "Delete sessions",
 		description: targets.length === 1 ? `Delete "${targets[0]?.title || "New session"}" from disk?` : `Delete ${targets.length} selected sessions from disk?`,
+		targets,
 		onDeleteSession: () => {
 			submitDelete();
 		}
@@ -9409,6 +9700,24 @@ function formatComposerSkillName(skillName = "") {
 		return [`${part.charAt(0).toUpperCase()}${part.slice(1)}`];
 	}).join(" ");
 }
+function formatComposerDiffLineCommentReference(comment) {
+	const sideLabel = comment.side === "deletions" ? "old" : "new";
+	return `${comment.path}:L${comment.lineNumber} (${sideLabel})`;
+}
+function formatComposerDiffLineCommentForPrompt(comment) {
+	const sourceLabel = comment.commit === "working-tree" ? "working tree changes" : comment.shortHash;
+	return `- ${formatComposerDiffLineCommentReference(comment)} in ${sourceLabel}: ${comment.text}`;
+}
+function buildComposerPromptMessage({ diffLineComments, skillName, text }) {
+	const baseMessage = serializeComposerDraft({
+		text,
+		skillName
+	}).trim();
+	const comments = diffLineComments?.filter((comment) => comment.text.trim().length > 0);
+	if (!comments || comments.length === 0) return baseMessage;
+	const commentBlock = `Diff comments:\n${comments.map(formatComposerDiffLineCommentForPrompt).join("\n")}`;
+	return baseMessage ? `${baseMessage}\n\n${commentBlock}` : commentBlock;
+}
 function parseSlashCommandInput(value = "") {
 	const rawValue = typeof value === "string" ? value : "";
 	const trimmedStart = rawValue.trimStart();
@@ -9653,9 +9962,12 @@ function readQuotedAttribute(tag, name) {
 }
 function normalizeHighlightClassName(value) {
 	if (!value) return void 0;
-	const classNames = value.split(/\s+/).filter((className) => /^sh__[A-Za-z0-9_-]+$/.test(className));
+	const classNames = value.split(/\s+/).filter((className) => className === "line");
 	return classNames.length > 0 ? classNames.join(" ") : void 0;
 }
+function isSafeCssVariableColor(value) {
+	return /^var\(--[A-Za-z0-9-]+(?:,\s*var\(--[A-Za-z0-9-]+\))?\)$/.test(value);
+}
 function normalizeHighlightStyle(value) {
 	if (!value) return void 0;
 	for (const declaration of value.split(";")) {
@@ -9663,7 +9975,7 @@ function normalizeHighlightStyle(value) {
 		const property = rawProperty?.trim().toLowerCase();
 		const color = rawValueParts.join(":").trim();
 		if (property !== "color") continue;
-		if (!/^var\(--sh-[A-Za-z0-9-]+\)$/.test(color)) continue;
+		if (!isSafeCssVariableColor(color)) continue;
 		return { color };
 	}
 }
@@ -9709,7 +10021,7 @@ function renderHighlightedChild(child) {
 }
 function HighlightedCode({ className, html, language }) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", {
-		className: cn(language && `language-${language}`, className),
+		className: cn("shiki", language && `language-${language}`, className),
 		children: parseHighlightedHtml(html).map(renderHighlightedChild)
 	});
 }
@@ -10013,6 +10325,78 @@ var MarkdownBlock = import_react.memo(function MarkdownBlock({ streaming = false
 		})
 	});
 });
+var PICO_DIFF_THEME_PAIR = {
+	light: PICO_DIFF_SHIKI_THEMES.light,
+	dark: PICO_DIFF_SHIKI_THEMES.dark
+};
+var PICO_DIFF_COLOR_CSS = `
+:host {
+  --diffs-addition-color-override: var(--success);
+  --diffs-deletion-color-override: var(--danger);
+  --diffs-modified-color-override: var(--primary);
+  --diffs-bg-addition-emphasis-override: color-mix(in lab, var(--diffs-bg) 42%, var(--diffs-addition-base));
+  --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-line-type="change-addition"]:is(
+  [data-gutter-buffer],
+  [data-column-number],
+  [data-line],
+  [data-no-newline]
+) {
+  --mix-light: 84%;
+  --mix-dark: 76%;
+}
+
+[data-line-type="change-deletion"]:is(
+  [data-gutter-buffer],
+  [data-column-number],
+  [data-line],
+  [data-no-newline]
+) {
+  --mix-light: 84%;
+  --mix-dark: 76%;
+}
+`;
+function registerPicoDiffTheme(name, type) {
+	if (RegisteredCustomThemes.has(name)) return;
+	const theme = createCssVariablesTheme({
+		name,
+		variablePrefix: "--diffs-",
+		variableDefaults: { ...PICO_SHIKI_VARIABLE_DEFAULTS },
+		fontStyle: false
+	});
+	registerCustomTheme(name, () => Promise.resolve({
+		...theme,
+		type
+	}));
+}
+function ensurePicoDiffThemes() {
+	registerPicoDiffTheme(PICO_DIFF_SHIKI_THEMES.light, "light");
+	registerPicoDiffTheme(PICO_DIFF_SHIKI_THEMES.dark, "dark");
+}
+function resolvePicoDiffThemeType({ resolvedTheme, systemTheme, theme }) {
+	return appliedThemeClassColorMode(theme) ?? appliedThemeClassColorMode(resolvedTheme) ?? (resolvedTheme === "dark" || systemTheme === "dark" ? "dark" : "light");
+}
+ensurePicoDiffThemes();
+function usePicoDiffThemeOptions() {
+	const { resolvedTheme, systemTheme, theme } = z();
+	return {
+		theme: PICO_DIFF_THEME_PAIR,
+		themeType: resolvePicoDiffThemeType({
+			resolvedTheme,
+			systemTheme,
+			theme
+		}),
+		unsafeCSS: PICO_DIFF_COLOR_CSS
+	};
+}
 function Collapsible$1({ ...props }) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CollapsibleRoot, {
 		"data-slot": "collapsible",
@@ -11033,6 +11417,7 @@ function EditDiffStatCountsView({ stats }) {
 	});
 }
 function EditDiffBlock({ isBorderless = false, patch }) {
+	const themeOptions = usePicoDiffThemeOptions();
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 		className: cn("overflow-hidden text-xs", !isBorderless && "rounded-md border bg-background"),
 		style: { "--diffs-font-family": "var(--font-mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace)" },
@@ -11040,6 +11425,7 @@ function EditDiffBlock({ isBorderless = false, patch }) {
 			patch,
 			disableWorkerPool: true,
 			options: {
+				...themeOptions,
 				diffStyle: "unified",
 				disableFileHeader: true,
 				lineDiffType: "word-alt",
@@ -11210,11 +11596,11 @@ function ToolBlockCardBody({ block }) {
 	const isSelfContainedWriteTool = block.name === "write" && !block.isError && getWriteToolPayload(block)?.content !== void 0;
 	const hasSelfContainedToolOutput = isSuccessfulEditTool || isSelfContainedWriteTool;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-		className: "border-t pt-3",
+		className: cn("border-t", !isSuccessfulEditTool && "pt-3"),
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 			ref: block.name === "bash" ? autoScroll.ref : void 0,
 			onScroll: block.name === "bash" ? autoScroll.onScroll : void 0,
-			className: cn(isSelfContainedWriteTool ? "overflow-hidden rounded-lg" : "max-h-96 overflow-auto", hasSelfContainedToolOutput ? "rounded-lg" : "rounded-lg border bg-background/80 p-3"),
+			className: cn(isSelfContainedWriteTool ? "overflow-hidden rounded-lg" : "max-h-96 overflow-auto", isSuccessfulEditTool ? "rounded-t-none rounded-b-xl" : hasSelfContainedToolOutput ? "rounded-lg" : "rounded-lg border bg-background/80 p-3"),
 			children: block.name === "bash" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("pre", {
 				className: cn("overflow-x-auto font-mono text-xs leading-5 break-words whitespace-pre-wrap", block.isError && "text-destructive"),
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AnsiText, { text: shellBodyText })
@@ -11268,6 +11654,7 @@ var ToolBlockCard = import_react.memo(function ToolBlockCard({ blockKey, store }
 function ToolBlockCardContent({ blockKey, header, store }) {
 	const [isOpen, setIsOpen] = useRememberedToolCollapsibleOpen(header.openStateKey);
 	const bodyBlock = useAssistantToolBlockBody(store, blockKey, isOpen);
+	const isSuccessfulEditTool = header.name === "edit" && !header.running && !header.isError;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Collapsible$1, {
 		open: isOpen,
 		onOpenChange: setIsOpen,
@@ -11293,7 +11680,7 @@ function ToolBlockCardContent({ blockKey, header, store }) {
 		}), isOpen && bodyBlock ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CollapsibleContent, {
 			className: "overflow-hidden text-sm data-open:animate-accordion-down data-closed:animate-accordion-up",
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-				className: "h-(--collapsible-panel-height) px-3 pt-0 pb-3 data-ending-style:h-0 data-starting-style:h-0",
+				className: cn("h-(--collapsible-panel-height) data-ending-style:h-0 data-starting-style:h-0", !isSuccessfulEditTool && "px-3 pt-0 pb-3"),
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolBlockCardBody, { block: bodyBlock })
 			})
 		}) : null]
@@ -12074,7 +12461,7 @@ function getClipboardImageFiles(data) {
 	if (itemFiles.length > 0) return itemFiles;
 	return Array.from(data.files).filter((file) => file.type.startsWith("image/"));
 }
-function ComposerPanel({ activeSessionId, currentPendingMessages, composerImages, composerText, composerSkill, composerSyncNonce, centerMessages, contextUsageStore, displaySettingsStore, sessionStore, isSubmitting, isStreaming, awaitingFirstTurn, disabled = false, flush = false, topContent, viewerContextId, fileInputRef, onComposerTextChange, onPickImages, onRemoveComposerImage, onSubmitPrompt, onAbort, onEditPendingMessage, onRemovePendingMessage, onReorderPending, onRunBuiltinSlashCommand, onSelectModel, onSelectThinkingLevel, requestPathCompletions, requestFileCompletions, ref }) {
+function ComposerPanel({ activeSessionId, currentPendingMessages, composerDiffLineComments, composerImages, composerText, composerSkill, composerSyncNonce, centerMessages, contextUsageStore, displaySettingsStore, sessionStore, isSubmitting, isStreaming, awaitingFirstTurn, disabled = false, flush = false, topContent, viewerContextId, fileInputRef, onComposerTextChange, onPickImages, onRemoveComposerDiffLineComment, onRemoveComposerImage, onSubmitPrompt, onAbort, onEditPendingMessage, onRemovePendingMessage, onReorderPending, onRunBuiltinSlashCommand, onSelectModel, onSelectThinkingLevel, requestPathCompletions, requestFileCompletions, ref }) {
 	const promptRef = import_react.useRef(null);
 	const [pickerState, dispatchPickerState] = import_react.useReducer(composerPickerReducer, INITIAL_COMPOSER_PICKER_STATE);
 	const { modelPickerOpen, thinkingPickerOpen, modelQuery } = pickerState;
@@ -12108,6 +12495,7 @@ function ComposerPanel({ activeSessionId, currentPendingMessages, composerImages
 			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 				className: "overflow-visible rounded-[18px] border bg-card",
 				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ComposerPromptEditor, {
+					composerDiffLineComments,
 					composerImages,
 					composerText,
 					composerSkill,
@@ -12122,6 +12510,7 @@ function ComposerPanel({ activeSessionId, currentPendingMessages, composerImages
 					sessionStore,
 					onComposerTextChange,
 					onPickImages,
+					onRemoveComposerDiffLineComment,
 					onRemoveComposerImage,
 					onSubmitPrompt,
 					onAbort,
@@ -12195,7 +12584,7 @@ var ComposerAttachments = import_react.memo(function ComposerAttachments({ image
 		}, promptImageKey(image)))
 	});
 });
-var ComposerPromptEditor = import_react.memo(function ComposerPromptEditor({ composerImages, composerText, composerSkill, composerSyncNonce, isSubmitting, isStreaming, awaitingFirstTurn, disabled = false, fileInputRef, promptRef, displaySettingsStore, sessionStore, onComposerTextChange, onPickImages, onRemoveComposerImage, onSubmitPrompt, onAbort, onRunBuiltinSlashCommand, requestPathCompletions, requestFileCompletions }) {
+var ComposerPromptEditor = import_react.memo(function ComposerPromptEditor({ composerDiffLineComments, composerImages, composerText, composerSkill, composerSyncNonce, isSubmitting, isStreaming, awaitingFirstTurn, disabled = false, fileInputRef, promptRef, displaySettingsStore, sessionStore, onComposerTextChange, onPickImages, onRemoveComposerDiffLineComment, onRemoveComposerImage, onSubmitPrompt, onAbort, onRunBuiltinSlashCommand, requestPathCompletions, requestFileCompletions }) {
 	const slashCommands = useComposerSlashCommands({
 		displaySettingsStore,
 		sessionStore
@@ -12282,8 +12671,9 @@ var ComposerPromptEditor = import_react.memo(function ComposerPromptEditor({ com
 		dismissMenus,
 		promptRef
 	]);
-	const hasSubmittableContent = hasDraftText || composerImages.length > 0;
-	const acceptFollowUps = isStreaming || awaitingFirstTurn;
+	const hasSubmittableContent = hasDraftText || composerDiffLineComments.length > 0 || composerImages.length > 0;
+	const responseInFlight = isStreaming || awaitingFirstTurn || isSubmitting;
+	const acceptFollowUps = responseInFlight;
 	const setAssistPointerSelectionSuppressedValue = (next) => {
 		assistPointerSelectionSuppressedRef.current = next;
 		setAssistPointerSelectionSuppressed(next);
@@ -12358,6 +12748,11 @@ var ComposerPromptEditor = import_react.memo(function ComposerPromptEditor({ com
 			applyDraft("", void 0, { immediate: true });
 			return;
 		}
+		if (event.key === "Backspace" && !draftText && !currentDraftSkill && composerDiffLineComments.length > 0) {
+			const lastComment = composerDiffLineComments.at(-1);
+			if (lastComment) onRemoveComposerDiffLineComment(lastComment.id);
+			return;
+		}
 		if (visibleCompletion && (event.key === "ArrowDown" || event.key === "ArrowUp")) {
 			event.preventDefault();
 			setAssistPointerSelectionSuppressedValue(true);
@@ -12416,7 +12811,7 @@ var ComposerPromptEditor = import_react.memo(function ComposerPromptEditor({ com
 				dismissMenus();
 				return;
 			}
-			if (isStreaming && !event.repeat) {
+			if (responseInFlight && !event.repeat) {
 				event.preventDefault();
 				event.stopPropagation();
 				onAbort();
@@ -12463,39 +12858,62 @@ var ComposerPromptEditor = import_react.memo(function ComposerPromptEditor({ com
 					className: "min-w-0",
 					children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 						className: "flex min-w-0 flex-wrap items-start gap-2",
-						children: [draftSkill ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
-							className: "inline-flex h-7 max-w-[45%] shrink-0 items-center gap-0 overflow-hidden rounded-full bg-primary/10 pr-0.5 pl-2 text-sm font-medium text-primary",
-							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
-								className: "truncate",
-								children: ["Skill: ", formatComposerSkillName(draftSkill)]
-							}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
-								size: "icon-sm",
-								variant: "ghost",
-								className: "ml-1 rounded-full text-primary hover:bg-primary/10 hover:text-primary",
-								"aria-label": `Remove skill ${formatComposerSkillName(draftSkill)}`,
+						children: [
+							draftSkill ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+								className: "inline-flex h-7 max-w-[45%] shrink-0 items-center gap-0 overflow-hidden rounded-full bg-primary/10 pr-0.5 pl-2 text-sm font-medium text-primary",
+								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+									className: "truncate",
+									children: ["Skill: ", formatComposerSkillName(draftSkill)]
+								}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+									size: "icon-sm",
+									variant: "ghost",
+									className: "ml-1 rounded-full text-primary hover:bg-primary/10 hover:text-primary",
+									"aria-label": `Remove skill ${formatComposerSkillName(draftSkill)}`,
+									disabled,
+									onClick: () => applyDraft(draftTextRef.current, void 0, { immediate: true }),
+									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(X, { className: "size-3.5" })
+								})]
+							}) : null,
+							composerDiffLineComments.map((comment) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+								title: `${formatComposerDiffLineCommentReference(comment)}: ${comment.text}`,
+								className: "inline-flex h-7 max-w-[45%] shrink-0 items-center gap-1 overflow-hidden rounded-full bg-amber-500/10 pr-0.5 pl-2 text-sm font-medium text-amber-700 dark:text-amber-300",
+								children: [
+									/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitPullRequestArrow, { className: "size-3.5 shrink-0" }),
+									/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+										className: "truncate",
+										children: ["Diff: ", formatComposerDiffLineCommentReference(comment)]
+									}),
+									/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+										size: "icon-sm",
+										variant: "ghost",
+										className: "ml-1 rounded-full text-amber-700 hover:bg-amber-500/10 hover:text-amber-700 dark:text-amber-300 dark:hover:text-amber-300",
+										"aria-label": `Remove diff comment for ${formatComposerDiffLineCommentReference(comment)}`,
+										disabled,
+										onClick: () => onRemoveComposerDiffLineComment(comment.id),
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(X, { className: "size-3.5" })
+									})
+								]
+							}, comment.id)),
+							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Textarea, {
+								ref: promptRef,
+								name: "prompt",
+								rows: 1,
+								autoComplete: "off",
+								"data-1p-ignore": "true",
+								"data-form-type": "other",
+								"data-lpignore": "true",
+								defaultValue: composerText,
+								onChange: handleTextChange,
+								onClick: syncSelection,
+								onKeyUp: syncSelection,
+								onSelect: syncSelection,
+								onKeyDown: handleKeyDown,
+								onPaste: handlePaste,
 								disabled,
-								onClick: () => applyDraft(draftTextRef.current, void 0, { immediate: true }),
-								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(X, { className: "size-3.5" })
-							})]
-						}) : null, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Textarea, {
-							ref: promptRef,
-							name: "prompt",
-							rows: 1,
-							autoComplete: "off",
-							"data-1p-ignore": "true",
-							"data-form-type": "other",
-							"data-lpignore": "true",
-							defaultValue: composerText,
-							onChange: handleTextChange,
-							onClick: syncSelection,
-							onKeyUp: syncSelection,
-							onSelect: syncSelection,
-							onKeyDown: handleKeyDown,
-							onPaste: handlePaste,
-							disabled,
-							placeholder: acceptFollowUps ? "Add a message to the queue..." : draftSkill ? `Ask with ${formatComposerSkillName(draftSkill)}…` : "Ask anything…",
-							className: "max-h-[min(40dvh,18rem)] min-h-[22px] max-w-full min-w-0 flex-1 basis-[min(240px,100%)] resize-none overflow-y-auto rounded-none border-0 bg-transparent p-0 text-base shadow-none ring-0 focus-visible:border-transparent focus-visible:ring-0 disabled:cursor-text disabled:bg-transparent disabled:opacity-60 md:text-sm dark:bg-transparent dark:disabled:bg-transparent"
-						})]
+								placeholder: acceptFollowUps ? "Add a message to the queue..." : draftSkill ? `Ask with ${formatComposerSkillName(draftSkill)}…` : "Ask anything…",
+								className: "max-h-[min(40dvh,18rem)] min-h-[22px] max-w-full min-w-0 flex-1 basis-[min(240px,100%)] resize-none overflow-y-auto rounded-none border-0 bg-transparent p-0 text-base shadow-none ring-0 focus-visible:border-transparent focus-visible:ring-0 disabled:cursor-text disabled:bg-transparent disabled:opacity-60 md:text-sm dark:bg-transparent dark:disabled:bg-transparent"
+							})
+						]
 					})
 				})]
 			}),
@@ -12550,7 +12968,7 @@ var ComposerPromptEditor = import_react.memo(function ComposerPromptEditor({ com
 						onClick: () => runPrimaryComposerAction("steer"),
 						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ListStart, { "data-icon": "inline-start" }), "Steer"]
 					}),
-					isStreaming ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+					responseInFlight ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
 						title: "Abort",
 						kbd: "Esc",
 						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
@@ -12929,6 +13347,7 @@ var AppShellComposerController = import_react.memo(function AppShellComposerCont
 		ref: composerPanelRef,
 		activeSessionId: snapshot.activeSessionId,
 		currentPendingMessages: snapshot.currentPendingMessages,
+		composerDiffLineComments: snapshot.composerDiffLineComments,
 		composerImages: snapshot.composerImages,
 		composerText: snapshot.composerText,
 		composerSkill: snapshot.composerSkill,
@@ -12947,6 +13366,7 @@ var AppShellComposerController = import_react.memo(function AppShellComposerCont
 		fileInputRef,
 		onComposerTextChange,
 		onPickImages,
+		onRemoveComposerDiffLineComment: actionsRef.current.removeDiffLineComment,
 		onRemoveComposerImage,
 		onSubmitPrompt,
 		onAbort,
@@ -13892,21 +14312,29 @@ function ConversationScrollRevisionObserver({ conversationItemsStore, disabled,
 	}, [conversationRevision, disabled]);
 	return null;
 }
-function ConversationPreviousMessageButton({ onClick, scrollStateStore }) {
+function ConversationPreviousMessageButton({ centerMessages, onClick, scrollStateStore }) {
 	const isDisabled = useMessageScrollValue(scrollStateStore, (snapshot) => !snapshot.hasPreviousMessageJumpTarget);
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
+	const button = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TitleTooltip, {
 		title: "Jump to previous message",
 		kbd: formatShortcutLabel("Control+ArrowLeft"),
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
 			variant: "secondary",
 			size: "icon-lg",
 			disabled: isDisabled,
-			className: "absolute right-4 bottom-4 z-10 rounded-full border-0 shadow-[0_10px_24px_rgba(0,0,0,0.28)] disabled:pointer-events-none disabled:opacity-0 md:right-[18px] md:bottom-[18px]",
+			className: cn("rounded-full border-0 shadow-[0_10px_24px_rgba(0,0,0,0.28)] disabled:pointer-events-none disabled:opacity-0", centerMessages ? "pointer-events-auto" : "absolute right-4 bottom-4 z-10 md:right-[18px] md:bottom-[18px]"),
 			"aria-label": "Jump to previous message",
 			onClick,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrowUpToLine, { className: "size-4" })
 		})
 	});
+	if (!centerMessages) return button;
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		className: "pointer-events-none absolute inset-x-4 bottom-4 z-10 md:bottom-[18px]",
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+			className: "mx-auto flex w-full max-w-[80ch] justify-end",
+			children: button
+		})
+	});
 }
 var ConversationContentChangeContext = import_react.createContext(null);
 function useAppShellConversationSessionState(store) {
@@ -13918,7 +14346,7 @@ function useAppShellConversationSessionState(store) {
 		streaming: sessionState.streaming
 	}), { compare: shallowRecordEqual });
 }
-function AppShellConversationFrame({ autoScrollEnabled, children, conversationItemsStore, isSessionViewLoading, ref, sessionState }) {
+function AppShellConversationFrame({ autoScrollEnabled, children, centerMessages, conversationItemsStore, isSessionViewLoading, ref, sessionState }) {
 	const { bottomRef, jumpToNextMessage, jumpToPreviousMessage, messagesContentRef, messagesScrollAreaRef, scrollConversationToBottom, scrollConversationToTop, scrollStateStore, syncAfterConversationChange } = useAppShellMessageScroll({
 		autoScrollEnabled,
 		isSessionViewLoading,
@@ -13966,6 +14394,7 @@ function AppShellConversationFrame({ autoScrollEnabled, children, conversationIt
 			onClick: scrollConversationToBottom,
 			scrollStateStore
 		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConversationPreviousMessageButton, {
+			centerMessages,
 			onClick: jumpToPreviousMessage,
 			scrollStateStore
 		})] }) : null]
@@ -13973,9 +14402,11 @@ function AppShellConversationFrame({ autoScrollEnabled, children, conversationIt
 }
 function AppShellWorkingIndicatorLabel({ fallbackLabel, hiddenThinkingPreviewStore, useHiddenThinkingPreview }) {
 	const hiddenThinkingPreview = useSelector(hiddenThinkingPreviewStore);
+	const visibleLabel = useHiddenThinkingPreview && hiddenThinkingPreview ? hiddenThinkingPreview : fallbackLabel;
+	if (!visibleLabel.trim()) return null;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 		className: "font-medium text-foreground",
-		children: useHiddenThinkingPreview && hiddenThinkingPreview ? hiddenThinkingPreview : fallbackLabel
+		children: visibleLabel
 	});
 }
 function AppShellMessagesWorkingIndicator({ hiddenThinkingPreviewStore, onCancel, state, useHiddenThinkingPreview }) {
@@ -14113,7 +14544,7 @@ function AppShellConversationEmptyState({ awaitingFirstTurn, conversationItemsSt
 	const conversationLoadingLabel = isSessionViewLoading ? "Loading session…" : displayedWorkingState && !displayedWorkingState.done ? displayedWorkingState.label : "Loading…";
 	if (showConversationLoadingState) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "flex flex-1 flex-col items-center justify-center gap-3 py-10 text-sm text-muted-foreground",
-		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: conversationLoadingLabel })]
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {}), conversationLoadingLabel ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: conversationLoadingLabel }) : null]
 	});
 	if (hasMessages) return null;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Empty, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(EmptyHeader, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(EmptyTitle, { children: draft ? "New session" : "Start a new conversation" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(EmptyDescription, { children: draft ? void 0 : "This is the native Pico session view backed by the new TypeScript runtime." })] }), draft ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(EmptyContent, {
@@ -14179,6 +14610,7 @@ var AppShellSessionConversation = import_react.memo(function AppShellSessionConv
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AppShellConversationFrame, {
 		ref: conversationFrameRef,
 		autoScrollEnabled,
+		centerMessages,
 		conversationItemsStore,
 		isSessionViewLoading,
 		sessionState,
@@ -16327,7 +16759,7 @@ var GIT_GRAPH_LANE_COLORS = [
 ];
 var GIT_GRAPH_NULL_VERTEX_ID = -1;
 var GIT_GRAPH_ROW_HEIGHT = 32;
-var GIT_GRAPH_COMMIT_DETAILS_HEIGHT = 300;
+var GIT_GRAPH_COMMIT_DETAILS_HEIGHT = 200;
 var GIT_GRAPH_LANE_WIDTH = 14;
 var GIT_GRAPH_OFFSET_X = 12;
 var initialGitCommitRowState = {
@@ -17361,7 +17793,7 @@ function useGitCommitRowView({ viewerContextId, cwd, graphWidth, line, value, on
 				}, contextMenuKey)
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AccordionContent, {
-				className: "relative h-[300px] border-b border-border/70 bg-muted/50 p-0",
+				className: "relative h-[200px] border-b border-border/70 bg-muted/50 p-0",
 				children: [
 					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 						ref: commitBodyScrollRef,
@@ -17767,6 +18199,124 @@ function GitFileDiff({ file }) {
 		}) : null]
 	});
 }
+function reviewDiffCommentSideLabel(side) {
+	return side === "deletions" ? "old" : "new";
+}
+function reviewDiffCommentLineFromRange(range) {
+	return Math.min(range.start, range.end);
+}
+function reviewDiffCommentSideFromRange(range) {
+	return range.side || range.endSide || "additions";
+}
+function reviewDiffCommentPath(file, side) {
+	return side === "deletions" ? file.previousPath || file.path : file.path;
+}
+function reviewDiffCommentTabKey(file) {
+	return `changes:${reviewFileValue(file)}`;
+}
+function reviewDiffLineCommentAnnotations({ comments, pendingComment }) {
+	const annotations = comments.map((comment) => ({
+		lineNumber: comment.lineNumber,
+		metadata: comment,
+		side: comment.side
+	}));
+	if (pendingComment) annotations.push({
+		lineNumber: pendingComment.lineNumber,
+		metadata: pendingComment,
+		side: pendingComment.side
+	});
+	return annotations;
+}
+function ReviewDiffPendingLineComment({ comment }) {
+	const [text, setText] = import_react.useState("");
+	const textareaRef = import_react.useRef(null);
+	import_react.useEffect(() => {
+		textareaRef.current?.focus();
+	}, []);
+	const submit = () => {
+		const normalizedText = text.trim();
+		if (!normalizedText) return;
+		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",
+		onPointerDown: (event) => event.stopPropagation(),
+		onSubmit: (event) => {
+			event.preventDefault();
+			submit();
+		},
+		children: [
+			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "mb-2 flex min-w-0 items-center justify-between gap-2 text-xs text-muted-foreground",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: "min-w-0 truncate",
+					children: [
+						"Comment on ",
+						comment.path,
+						":L",
+						comment.lineNumber,
+						" (",
+						reviewDiffCommentSideLabel(comment.side),
+						")"
+					]
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+					type: "button",
+					variant: "ghost",
+					size: "icon-sm",
+					"aria-label": "Cancel line comment",
+					onClick: comment.onCancel,
+					children: "×"
+				})]
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Textarea, {
+				ref: textareaRef,
+				value: text,
+				rows: 2,
+				placeholder: "Add a note for the prompt…",
+				className: "min-h-16 resize-none text-sm",
+				onChange: (event) => setText(event.target.value),
+				onKeyDown: (event) => {
+					if (event.key === "Enter" && (event.metaKey || event.ctrlKey)) {
+						event.preventDefault();
+						submit();
+					}
+					if (event.key === "Escape") {
+						event.preventDefault();
+						comment.onCancel();
+					}
+				}
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "mt-2 flex flex-wrap justify-end gap-2",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+					type: "button",
+					variant: "ghost",
+					onClick: comment.onCancel,
+					children: "Cancel"
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
+					type: "submit",
+					disabled: !text.trim(),
+					children: "Add to prompt"
+				})]
+			})
+		]
+	});
+}
+function ReviewDiffLineAnnotation({ annotation }) {
+	const comment = annotation.metadata;
+	if (!comment) return null;
+	if (comment.kind === "pending") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReviewDiffPendingLineComment, { comment });
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "my-1 ml-2 inline-flex max-w-[min(32rem,calc(100vw_-_5rem),90%)] items-center gap-1 rounded-full border border-amber-500/20 bg-amber-500/10 px-2 py-1 text-[11px] text-amber-800 dark:text-amber-200",
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+			className: "shrink-0",
+			children: "💬"
+		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+			className: "truncate",
+			children: comment.text
+		})]
+	});
+}
 var GIT_HISTORY_PANEL_MIN_HEIGHT = 160;
 var GIT_HISTORY_PANEL_MAX_STORED_HEIGHT = 1600;
 function clampStoredGitHistoryPanelHeight(height) {
@@ -17866,7 +18416,7 @@ function gitFileShouldPreviewPatch(file) {
 function FileReviewContent(props) {
 	return useFileReviewContentView(props);
 }
-function useFileReviewContentView({ viewerContextId, cwd, active, onMaximizeHistory, onOpenCommitDiff, onOpenFile, showEmbeddedHistory = true }) {
+function useFileReviewContentView({ viewerContextId, cwd, active, diffLineComments = [], onAddDiffLineComment, onMaximizeHistory, onOpenCommitDiff, onOpenFile, showEmbeddedHistory = true }) {
 	const normalizedCwd = normalizeCwd(cwd);
 	const isMobile = useIsMobile();
 	const [state, dispatch] = import_react.useReducer(fileReviewReducer, initialFileReviewState, (initialState) => ({
@@ -18102,10 +18652,12 @@ function useFileReviewContentView({ viewerContextId, cwd, active, onMaximizeHist
 						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, {
@@ -18174,10 +18726,12 @@ function useFileReviewContentView({ viewerContextId, cwd, active, onMaximizeHist
 		]
 	});
 }
-function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffStyle, file, open, stuck, onOpenFile }) {
+function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffLineComments = [], diffStyle, file, open, stuck, onAddDiffLineComment, onOpenFile }) {
 	const normalizedCwd = normalizeCwd(cwd);
 	const queryClient = useQueryClient();
 	const value = reviewFileValue(file);
+	const commentTabKey = reviewDiffCommentTabKey(file);
+	const [commentTarget, setCommentTarget] = import_react.useState(null);
 	const [fullContextRequested, setFullContextRequested] = import_react.useState(false);
 	const previewPatch = gitFileShouldPreviewPatch(file) && !fullContextRequested;
 	const diffQuery = useQuery({
@@ -18210,6 +18764,41 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffStyle, file
 	const oldContent = reviewQuery.data?.oldContent ?? "";
 	const newContent = reviewQuery.data?.newContent ?? "";
 	const patch = diffQuery.data?.patch ?? "";
+	const commentsForFile = diffLineComments.filter((comment) => comment.cwd === normalizedCwd && comment.tabKey === commentTabKey);
+	const startLineComment = (range) => {
+		if (!onAddDiffLineComment) return;
+		const side = reviewDiffCommentSideFromRange(range);
+		setCommentTarget({
+			commit: "working-tree",
+			lineNumber: reviewDiffCommentLineFromRange(range),
+			mode: "head",
+			path: reviewDiffCommentPath(file, side),
+			shortHash: "working tree",
+			side,
+			tabKey: commentTabKey,
+			tabTitle: "Working tree changes"
+		});
+	};
+	const lineAnnotations = reviewDiffLineCommentAnnotations({
+		comments: commentsForFile,
+		pendingComment: commentTarget ? {
+			...commentTarget,
+			kind: "pending",
+			onCancel: () => setCommentTarget(null),
+			onSubmit: (text) => {
+				onAddDiffLineComment?.({
+					...commentTarget,
+					text
+				});
+				setCommentTarget(null);
+			}
+		} : null
+	});
+	const commentableOptions = onAddDiffLineComment ? {
+		enableGutterUtility: true,
+		onGutterUtilityClick: startLineComment
+	} : {};
+	const themeOptions = usePicoDiffThemeOptions();
 	const [indexStatus, worktreeStatus] = gitFileStatusCharacters(file.status);
 	const canStage = worktreeStatus !== " " || indexStatus === "?";
 	const invalidateChangedFileQueries = async () => {
@@ -18267,6 +18856,15 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffStyle, file
 		}
 	});
 	const actionPending = stageMutation.isPending || discardMutation.isPending;
+	import_react.useEffect(() => {
+		setCommentTarget(null);
+	}, [
+		value,
+		previewPatch,
+		patch,
+		oldContent,
+		newContent
+	]);
 	const openFile = (event) => {
 		event?.stopPropagation();
 		onOpenFile?.(file.path, { pin: true });
@@ -18375,9 +18973,13 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffStyle, file
 			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PatchDiff, {
 				patch,
 				disableWorkerPool: true,
+				lineAnnotations,
+				renderAnnotation: (annotation) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReviewDiffLineAnnotation, { annotation }),
 				options: {
+					...themeOptions,
 					diffStyle,
 					disableFileHeader: true,
+					...commentableOptions,
 					overflow: "wrap"
 				}
 			})] }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
@@ -18402,9 +19004,13 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffStyle, file
 					contents: newContent
 				},
 				disableWorkerPool: true,
+				lineAnnotations,
+				renderAnnotation: (annotation) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReviewDiffLineAnnotation, { annotation }),
 				options: {
+					...themeOptions,
 					diffStyle,
 					disableFileHeader: true,
+					...commentableOptions,
 					overflow: "wrap"
 				}
 			}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
@@ -18414,6 +19020,7 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffStyle, file
 		})]
 	});
 }
+var EMPTY_RIGHT_SIDEBAR_DIFF_LINE_COMMENTS = [];
 var EMPTY_RIGHT_SIDEBAR_FILE_TABS = [];
 function readStoredHistoryAsTab() {
 	return safeLocalStorageGetItem(RIGHT_SIDEBAR_HISTORY_TAB_STORAGE_KEY) === "1";
@@ -18535,7 +19142,160 @@ function commitFileDiffLineCounts(fileDiff) {
 		deletions: 0
 	});
 }
-function CommitFileDiffAccordionItem({ diffStyle, fileDiff, index, stuck }) {
+function commitDiffCommentSideLabel(side) {
+	return side === "deletions" ? "old" : "new";
+}
+function commitDiffLineCommentAnnotations({ comments, pendingComment }) {
+	const annotations = comments.map((comment) => ({
+		lineNumber: comment.lineNumber,
+		metadata: comment,
+		side: comment.side
+	}));
+	if (pendingComment) annotations.push({
+		lineNumber: pendingComment.lineNumber,
+		metadata: pendingComment,
+		side: pendingComment.side
+	});
+	return annotations;
+}
+function assignClassName(element, className) {
+	for (const classItem of className.split(/\s+/)) if (classItem) element.classList.add(classItem);
+}
+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");
+	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");
+	label.textContent = `Comment on ${pendingComment.path}:L${pendingComment.lineNumber} (${commitDiffCommentSideLabel(pendingComment.side)})`;
+	assignClassName(label, "min-w-0 truncate");
+	const cancelButton = document.createElement("button");
+	cancelButton.type = "button";
+	cancelButton.textContent = "×";
+	cancelButton.setAttribute("aria-label", "Cancel line comment");
+	assignClassName(cancelButton, "inline-flex size-7 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-muted hover:text-foreground");
+	cancelButton.addEventListener("click", () => pendingComment.onCancel());
+	header.append(label, cancelButton);
+	const textarea = document.createElement("textarea");
+	textarea.rows = 2;
+	textarea.placeholder = "Add a note for the prompt…";
+	assignClassName(textarea, "flex min-h-16 w-full resize-none rounded-lg border border-input bg-transparent px-2.5 py-2 text-sm outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50");
+	textarea.addEventListener("keydown", (event) => {
+		if (event.key === "Enter" && (event.metaKey || event.ctrlKey)) {
+			event.preventDefault();
+			submit();
+		}
+		if (event.key === "Escape") {
+			event.preventDefault();
+			pendingComment.onCancel();
+		}
+	});
+	const footer = document.createElement("div");
+	assignClassName(footer, "mt-2 flex flex-wrap justify-end gap-2");
+	const secondaryCancelButton = document.createElement("button");
+	secondaryCancelButton.type = "button";
+	secondaryCancelButton.textContent = "Cancel";
+	assignClassName(secondaryCancelButton, "inline-flex h-8 items-center rounded-md px-3 text-sm hover:bg-muted");
+	secondaryCancelButton.addEventListener("click", () => pendingComment.onCancel());
+	const submitButton = document.createElement("button");
+	submitButton.type = "submit";
+	submitButton.textContent = "Add to prompt";
+	assignClassName(submitButton, "inline-flex h-8 items-center rounded-md bg-primary px-3 text-sm font-medium text-primary-foreground disabled:pointer-events-none disabled:opacity-50");
+	function syncSubmitDisabled() {
+		submitButton.disabled = textarea.value.trim().length === 0;
+	}
+	function submit() {
+		const text = textarea.value.trim();
+		if (!text) return;
+		pendingComment.onSubmit(text);
+	}
+	textarea.addEventListener("input", syncSubmitDisabled);
+	form.addEventListener("submit", (event) => {
+		event.preventDefault();
+		submit();
+	});
+	footer.append(secondaryCancelButton, submitButton);
+	form.append(header, textarea, footer);
+	syncSubmitDisabled();
+	window.setTimeout(() => textarea.focus(), 0);
+	return form;
+}
+function renderCommitDiffLineAnnotation(annotation) {
+	const comment = annotation.metadata;
+	if (!comment) return void 0;
+	if (comment.kind === "pending") return renderPendingCommitDiffLineComment(comment);
+	const savedComment = comment;
+	const wrapper = document.createElement("div");
+	assignClassName(wrapper, "my-1 ml-2 inline-flex max-w-[min(32rem,calc(100vw_-_5rem),90%)] items-center gap-1 rounded-full border border-amber-500/20 bg-amber-500/10 px-2 py-1 text-[11px] text-amber-800 dark:text-amber-200");
+	const icon = document.createElement("span");
+	icon.textContent = "💬";
+	assignClassName(icon, "shrink-0");
+	const text = document.createElement("span");
+	text.textContent = savedComment.text;
+	assignClassName(text, "truncate");
+	wrapper.append(icon, text);
+	return wrapper;
+}
+function CommitDiffFileRenderer({ comments, diffStyle, disableFileHeader = false, fileDiff, onStartComment, pendingComment }) {
+	const [container, setContainer] = import_react.useState(null);
+	const instanceRef = import_react.useRef(null);
+	const lineAnnotations = commitDiffLineCommentAnnotations({
+		comments,
+		pendingComment
+	});
+	const options = {
+		...usePicoDiffThemeOptions(),
+		diffStyle,
+		disableFileHeader,
+		enableGutterUtility: true,
+		lineDiffType: "word-alt",
+		lineHoverHighlight: "both",
+		maxLineDiffLength: 1e3,
+		onGutterUtilityClick: (range) => {
+			onStartComment({
+				lineNumber: Math.min(range.start, range.end),
+				path: fileDiff.name,
+				side: range.side || range.endSide || "additions"
+			});
+		},
+		onLineNumberClick: (props) => {
+			onStartComment({
+				lineNumber: props.lineNumber,
+				path: fileDiff.name,
+				side: props.annotationSide
+			});
+		},
+		overflow: "wrap",
+		renderAnnotation: renderCommitDiffLineAnnotation
+	};
+	import_react.useLayoutEffect(() => {
+		if (!container) return;
+		const existing = instanceRef.current;
+		if (existing) {
+			existing.setOptions(options);
+			existing.render({
+				containerWrapper: container,
+				fileDiff,
+				forceRender: true,
+				lineAnnotations
+			});
+			return;
+		}
+		const instance = new FileDiff$1(options, void 0, false);
+		instanceRef.current = instance;
+		instance.render({
+			containerWrapper: container,
+			fileDiff,
+			lineAnnotations
+		});
+	});
+	import_react.useLayoutEffect(() => () => {
+		instanceRef.current?.cleanUp();
+		instanceRef.current = null;
+	}, []);
+	return import_react.createElement("div", { ref: setContainer });
+}
+function CommitFileDiffAccordionItem({ comments, diffStyle, fileDiff, index, onStartComment, pendingComment, stuck }) {
 	const value = commitFileDiffValue(fileDiff, index);
 	const counts = commitFileDiffLineCounts(fileDiff);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(AccordionItem, {
@@ -18586,21 +19346,18 @@ function CommitFileDiffAccordionItem({ diffStyle, fileDiff, index, stuck }) {
 			})
 		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AccordionContent, {
 			className: "bg-background p-0",
-			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FileDiff$1, {
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitDiffFileRenderer, {
+				comments,
+				diffStyle,
+				disableFileHeader: true,
 				fileDiff,
-				disableWorkerPool: true,
-				options: {
-					diffStyle,
-					disableFileHeader: true,
-					lineDiffType: "word-alt",
-					maxLineDiffLength: 1e3,
-					overflow: "wrap"
-				}
+				onStartComment,
+				pendingComment
 			})
 		})]
 	});
 }
-function CommitSingleFileDiff({ diffStyle, patch }) {
+function CommitSingleFileDiff({ comments, diffStyle, onStartComment, patch, pendingComment }) {
 	const fileDiff = parsePatchFiles(patch).flatMap((parsed) => parsed.files)[0];
 	if (!fileDiff) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 		className: "p-4",
@@ -18609,19 +19366,16 @@ function CommitSingleFileDiff({ diffStyle, patch }) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 		className: "min-h-full text-xs",
 		style: { "--diffs-font-family": "var(--font-mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace)" },
-		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FileDiff$1, {
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitDiffFileRenderer, {
+			comments,
+			diffStyle,
 			fileDiff,
-			disableWorkerPool: true,
-			options: {
-				diffStyle,
-				lineDiffType: "word-alt",
-				maxLineDiffLength: 1e3,
-				overflow: "wrap"
-			}
+			onStartComment,
+			pendingComment
 		})
 	});
 }
-function CommitPatchDiffs({ diffStyle, patch, stuckFileValue }) {
+function CommitPatchDiffs({ comments, diffStyle, onStartComment, patch, pendingComment, stuckFileValue }) {
 	const fileDiffs = parsePatchFiles(patch).flatMap((parsed) => parsed.files);
 	const firstValue = fileDiffs[0] ? commitFileDiffValue(fileDiffs[0], 0) : void 0;
 	if (fileDiffs.length === 0) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
@@ -18636,9 +19390,12 @@ function CommitPatchDiffs({ diffStyle, patch, stuckFileValue }) {
 			defaultValue: firstValue ? [firstValue] : [],
 			className: "border-b border-border/80",
 			children: fileDiffs.map((fileDiff, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitFileDiffAccordionItem, {
+				comments: comments.filter((comment) => comment.path === fileDiff.name),
 				diffStyle,
 				fileDiff,
 				index,
+				onStartComment,
+				pendingComment: pendingComment?.path === fileDiff.name ? pendingComment : null,
 				stuck: stuckFileValue === commitFileDiffValue(fileDiff, index)
 			}, commitFileDiffValue(fileDiff, index)))
 		})
@@ -18684,9 +19441,10 @@ function CommitDiffHeaderTitle({ tab }) {
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitDiffPathBreadcrumb, { path: tab.path })
 	});
 }
-function CommitDiffContent({ viewerContextId, cwd, active, tab }) {
+function CommitDiffContent({ viewerContextId, cwd, active, diffLineComments, onAddDiffLineComment, tab }) {
 	const [diffStyle, setDiffStyle] = import_react.useState("unified");
 	const [stickyCommitFileValue, setStickyCommitFileValue] = import_react.useState("");
+	const [commentTarget, setCommentTarget] = import_react.useState(null);
 	const diffScrollRef = import_react.useRef(null);
 	const updateStickyCommitFileHeader = (scrollElement) => {
 		setDerivedScrollState(setStickyCommitFileValue, getStuckScrollTriggerValue({
@@ -18712,7 +19470,34 @@ function CommitDiffContent({ viewerContextId, cwd, active, tab }) {
 			"error"
 		]
 	});
+	const commentsForTab = tab ? diffLineComments.filter((comment) => comment.tabKey === tab.key && comment.commit === tab.commit && comment.mode === tab.mode) : EMPTY_RIGHT_SIDEBAR_DIFF_LINE_COMMENTS;
+	const startLineComment = (lineTarget) => {
+		if (!tab || !onAddDiffLineComment) return;
+		setCommentTarget({
+			commit: tab.commit,
+			lineNumber: lineTarget.lineNumber,
+			mode: tab.mode,
+			path: lineTarget.path,
+			shortHash: tab.shortHash,
+			side: lineTarget.side,
+			tabKey: tab.key,
+			tabTitle: tab.title
+		});
+	};
+	const pendingComment = commentTarget ? {
+		...commentTarget,
+		kind: "pending",
+		onCancel: () => setCommentTarget(null),
+		onSubmit: (text) => {
+			onAddDiffLineComment?.({
+				...commentTarget,
+				text
+			});
+			setCommentTarget(null);
+		}
+	} : null;
 	import_react.useEffect(() => {
+		setCommentTarget(null);
 		setDerivedScrollState(setStickyCommitFileValue, "");
 		updateStickyCommitFileHeader(diffScrollRef.current);
 	}, [tab?.key, diffQuery.data?.patch]);
@@ -18755,11 +19540,20 @@ function CommitDiffContent({ viewerContextId, cwd, active, tab }) {
 					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,
-				patch: diffQuery.data.patch
+				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",
@@ -18768,7 +19562,7 @@ function CommitDiffContent({ viewerContextId, cwd, active, tab }) {
 		})]
 	});
 }
-function RightSidebar({ viewerContextId, cwd, active, activeFilePath = "", activeTab: controlledActiveTab, filePreviewPath = "", fileTabs = EMPTY_RIGHT_SIDEBAR_FILE_TABS, fileTreeCollapsed = false, onActiveFileChange, onActiveTabChange, onCloseAllFiles, onCloseFile, onCloseFilesToRight, onCloseOtherFiles, onFileTreeCollapsedChange, onOpenFile, onReorderFiles, showToolbar = true }) {
+function RightSidebar({ viewerContextId, cwd, active, activeFilePath = "", activeTab: controlledActiveTab, diffLineComments = EMPTY_RIGHT_SIDEBAR_DIFF_LINE_COMMENTS, filePreviewPath = "", fileTabs = EMPTY_RIGHT_SIDEBAR_FILE_TABS, fileTreeCollapsed = false, onActiveFileChange, onActiveTabChange, onAddDiffLineComment, onCloseAllFiles, onCloseFile, onCloseFilesToRight, onCloseOtherFiles, onFileTreeCollapsedChange, onOpenFile, onReorderFiles, showToolbar = true }) {
 	const normalizedCwd = normalizeCwd(cwd);
 	const isMobile = useIsMobile();
 	const [localState, dispatchLocal] = import_react.useReducer(rightSidebarLocalReducer, initialRightSidebarLocalState);
@@ -18912,96 +19706,88 @@ function RightSidebar({ viewerContextId, cwd, active, activeFilePath = "", activ
 					showHistory: historyAsTab,
 					showReview: true
 				}),
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Activity, {
-					mode: activeTab === "review" ? "visible" : "hidden",
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-						className: "min-h-0 flex-1 overflow-hidden",
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FileReviewContent, {
-							viewerContextId,
-							cwd: normalizedCwd,
-							active: active && activeTab === "review",
-							onMaximizeHistory: () => {
-								setHistoryAsTab(true);
-								setActiveTab("history");
-							},
-							onOpenCommitDiff: openCommitDiff,
-							onOpenFile: openFile,
-							showEmbeddedHistory: !historyAsTab
-						})
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: activeTab === "review" ? "min-h-0 flex-1 overflow-hidden" : "hidden",
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FileReviewContent, {
+						viewerContextId,
+						cwd: normalizedCwd,
+						active: active && activeTab === "review",
+						diffLineComments,
+						onMaximizeHistory: () => {
+							setHistoryAsTab(true);
+							setActiveTab("history");
+						},
+						onAddDiffLineComment,
+						onOpenCommitDiff: openCommitDiff,
+						onOpenFile: openFile,
+						showEmbeddedHistory: !historyAsTab
 					})
 				}),
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Activity, {
-					mode: activeTab === "history" ? "visible" : "hidden",
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-						className: "min-h-0 flex-1 overflow-hidden",
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitCommitsSection, {
-							viewerContextId,
-							cwd: normalizedCwd,
-							active: active && activeTab === "history",
-							flush: true,
-							onOpenCommitDiff: openCommitDiff,
-							onRestoreEmbedded: () => {
-								setHistoryAsTab(false);
-								setActiveTab("review");
-							}
-						})
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: activeTab === "history" ? "min-h-0 flex-1 overflow-hidden" : "hidden",
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitCommitsSection, {
+						viewerContextId,
+						cwd: normalizedCwd,
+						active: active && activeTab === "history",
+						flush: true,
+						onOpenCommitDiff: openCommitDiff,
+						onRestoreEmbedded: () => {
+							setHistoryAsTab(false);
+							setActiveTab("review");
+						}
 					})
 				}),
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Activity, {
-					mode: activeTab === "commit-diff" ? "visible" : "hidden",
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-						className: "min-h-0 flex-1 overflow-hidden",
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitDiffContent, {
-							viewerContextId,
-							cwd: normalizedCwd,
-							active: active && activeTab === "commit-diff",
-							tab: activeCommitDiffTab
-						})
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: activeTab === "commit-diff" ? "min-h-0 flex-1 overflow-hidden" : "hidden",
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CommitDiffContent, {
+						viewerContextId,
+						cwd: normalizedCwd,
+						active: active && activeTab === "commit-diff",
+						diffLineComments,
+						onAddDiffLineComment,
+						tab: activeCommitDiffTab
 					})
 				}),
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Activity, {
-					mode: activeTab === "files" ? "visible" : "hidden",
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-						className: "min-h-0 flex-1 overflow-hidden",
-						children: previewMode === "external" && hasOpenFileTabs ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-							className: "flex h-full min-h-0 min-w-0 flex-col overflow-hidden",
-							children: [currentFilePath ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FilePathBreadcrumb, {
-								path: currentFilePath,
-								fileTreeCollapsed,
-								onFileTreeCollapsedChange
-							}) : null, /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-								className: "flex min-h-0 flex-1 overflow-hidden",
-								children: [fileTreeCollapsed ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectFileTreePane, {
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: activeTab === "files" ? "min-h-0 flex-1 overflow-hidden" : "hidden",
+					children: previewMode === "external" && hasOpenFileTabs ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						className: "flex h-full min-h-0 min-w-0 flex-col overflow-hidden",
+						children: [currentFilePath ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FilePathBreadcrumb, {
+							path: currentFilePath,
+							fileTreeCollapsed,
+							onFileTreeCollapsedChange
+						}) : null, /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+							className: "flex min-h-0 flex-1 overflow-hidden",
+							children: [fileTreeCollapsed ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectFileTreePane, {
+								viewerContextId,
+								cwd: normalizedCwd,
+								active: active && activeTab === "files",
+								activeFilePath: currentFilePath,
+								onOpenFile: openFile,
+								previewMode
+							}), currentFilePath ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+								className: "min-h-0 min-w-0 flex-1 overflow-hidden",
+								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectFileContent, {
 									viewerContextId,
 									cwd: normalizedCwd,
 									active: active && activeTab === "files",
-									activeFilePath: currentFilePath,
-									onOpenFile: openFile,
-									previewMode
-								}), currentFilePath ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-									className: "min-h-0 min-w-0 flex-1 overflow-hidden",
-									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectFileContent, {
-										viewerContextId,
-										cwd: normalizedCwd,
-										active: active && activeTab === "files",
-										path: currentFilePath
-									})
-								}) : null]
-							})]
-						}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectFilesWorkspace, {
-							viewerContextId,
-							cwd: normalizedCwd,
-							active: active && activeTab === "files",
-							activeFilePath: currentFilePath,
-							onCloseFile: () => {
-								dispatchLocal({
-									type: "set-inline-active-file",
-									path: ""
-								});
-							},
-							onOpenFile: openFile,
-							previewMode
-						})
+									path: currentFilePath
+								})
+							}) : null]
+						})]
+					}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectFilesWorkspace, {
+						viewerContextId,
+						cwd: normalizedCwd,
+						active: active && activeTab === "files",
+						activeFilePath: currentFilePath,
+						onCloseFile: () => {
+							dispatchLocal({
+								type: "set-inline-active-file",
+								path: ""
+							});
+						},
+						onOpenFile: openFile,
+						previewMode
 					})
 				}),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProjectOpenFileDialog, {
@@ -19151,13 +19937,14 @@ function AppShellTabsList({ sessionStore, viewerContextId }) {
 		})]
 	});
 }
-var AppShellGitPanelController = import_react.memo(function AppShellGitPanelController({ active, onCloseAllFiles, onCloseFile, onCloseFilesToRight, onCloseOtherFiles, onOpenFile, onReorderFiles, rightSidebarStore, sessionStore, viewerContextId }) {
+var AppShellGitPanelController = import_react.memo(function AppShellGitPanelController({ active, composerDiffLineComments, onAddDiffLineComment, onCloseAllFiles, onCloseFile, onCloseFilesToRight, onCloseOtherFiles, onOpenFile, onReorderFiles, rightSidebarStore, sessionStore, viewerContextId }) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RightSidebar, {
 		viewerContextId,
 		cwd: useSelector(sessionStore, (sessionState) => sessionState.cwd),
 		active,
 		activeFilePath: useSelector(rightSidebarStore, (state) => state.fileActivePath),
 		activeTab: useSelector(rightSidebarStore, (state) => state.activeTab),
+		diffLineComments: composerDiffLineComments,
 		filePreviewPath: useSelector(rightSidebarStore, (state) => state.filePreviewPath),
 		fileTabs: useSelector(rightSidebarStore, selectRightSidebarVisibleFileTabs, { compare: sameStringArray$3 }),
 		fileTreeCollapsed: useSelector(rightSidebarStore, (state) => state.fileTreeCollapsed),
@@ -19167,6 +19954,7 @@ var AppShellGitPanelController = import_react.memo(function AppShellGitPanelCont
 		onActiveTabChange: (tab) => {
 			setRightSidebarActiveTab(rightSidebarStore, tab);
 		},
+		onAddDiffLineComment,
 		onCloseAllFiles,
 		onCloseFile,
 		onCloseFilesToRight,
@@ -19178,7 +19966,7 @@ var AppShellGitPanelController = import_react.memo(function AppShellGitPanelCont
 		onReorderFiles
 	});
 });
-function AppShellDesktopGitPanel({ active, onCloseAllFiles, onCloseFile, onCloseFilesToRight, onCloseOtherFiles, onOpenFile, onReorderFiles, rightSidebarStore, sessionStore, viewerContextId }) {
+function AppShellDesktopGitPanel({ active, composerDiffLineComments, onAddDiffLineComment, onCloseAllFiles, onCloseFile, onCloseFilesToRight, onCloseOtherFiles, onOpenFile, onReorderFiles, rightSidebarStore, sessionStore, viewerContextId }) {
 	const cwd = useSelector(sessionStore, (sessionState) => sessionState.cwd);
 	const activeFilePath = useSelector(rightSidebarStore, (state) => state.fileActivePath);
 	const activeTab = useSelector(rightSidebarStore, (state) => state.activeTab);
@@ -19196,6 +19984,7 @@ function AppShellDesktopGitPanel({ active, onCloseAllFiles, onCloseFile, onClose
 			active,
 			activeFilePath,
 			activeTab,
+			diffLineComments: composerDiffLineComments,
 			filePreviewPath,
 			fileTabs,
 			fileTreeCollapsed,
@@ -19205,6 +19994,7 @@ function AppShellDesktopGitPanel({ active, onCloseAllFiles, onCloseFile, onClose
 			onActiveTabChange: (tab) => {
 				setRightSidebarActiveTab(rightSidebarStore, tab);
 			},
+			onAddDiffLineComment,
 			onCloseAllFiles,
 			onCloseFile,
 			onCloseFilesToRight,
@@ -19383,7 +20173,7 @@ function AppShellDesktopResizeHandle({ label, max, min, onResize, onResizeEnd, o
 function AppShellTabsController(props) {
 	return useAppShellTabsControllerView(props);
 }
-function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTurn, composerPanelRef, contextUsageStore, conversationFrameRef, conversationItemsStore, defaultNewSessionDirectory, displaySettingsStore, fileInputRef, gitPanelOpen, hiddenThinkingPreviewStore, isSessionViewLoading, isSubmitting, isMobile, newSessionDirectoryOptions, onCancelCompaction, onCreateSession, onOpenAddDirectoryDialog, onCloseAllFileViewTabs, onCloseFileViewTab, onCloseFileViewTabsToRight, onCloseOtherFileViewTabs, onOpenFileViewTab, onReorderFileViewTabs, onValueChange, rightSidebarStore, sessionStore, store, viewerContextId, workingStateStore }) {
+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 }) {
 	const currentTab = useSelector(appUiStore, (state) => state.currentTab);
 	const isDraftSession = useSelector(sessionStore, (sessionState) => sessionState.draft);
 	const showTabsList = isMobile || !isDraftSession || isSessionViewLoading;
@@ -19461,7 +20251,9 @@ function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTu
 				viewerContextId,
 				sessionStore,
 				active: currentTab === "git",
+				composerDiffLineComments,
 				rightSidebarStore,
+				onAddDiffLineComment,
 				onCloseAllFiles: onCloseAllFileViewTabs,
 				onCloseFile: onCloseFileViewTab,
 				onCloseFilesToRight: onCloseFileViewTabsToRight,
@@ -19564,7 +20356,9 @@ function useAppShellTabsControllerView({ actionsRef, appUiStore, awaitingFirstTu
 							viewerContextId,
 							sessionStore,
 							active: desktopGitPanelOpen,
+							composerDiffLineComments,
 							rightSidebarStore,
+							onAddDiffLineComment,
 							onCloseAllFiles: onCloseAllFileViewTabs,
 							onCloseFile: onCloseFileViewTab,
 							onCloseFilesToRight: onCloseFileViewTabsToRight,
@@ -20089,10 +20883,11 @@ function SidebarSessionItem({ entryKey, directorySessionsStore, activeSessionSto
 	const pinnedDirectoryLabel = isPinned ? formatDisplayPath$1(entry.cwd?.trim() || entry.path?.trim() || "") : "";
 	const exactTimestamp = hasTimestamp && timestamp ? new Date(timestamp).toLocaleString() : void 0;
 	const showUnread = Boolean(entry.unread) && !entry.streaming;
+	const isOptimisticSession = Boolean(entry.optimistic || entry.id?.startsWith("optimistic:") && !entry.path);
 	const availableMoveTargetDirectories = moveTargetDirectories.filter((directory) => directory && directory !== entry.cwd);
 	const canMoveAnyDirectory = Boolean(entry.path && onMoveSessionAnyDirectory);
 	const hasMoveActions = Boolean(entry.path && onMoveSession) && availableMoveTargetDirectories.length > 0 || canMoveAnyDirectory;
-	const hasSessionActions = Boolean(onTogglePinnedSession || entry.path && (onRenameSession || onDeleteSession || onSetSessionUnread) || hasMoveActions) && !overlay;
+	const hasSessionActions = Boolean(!isOptimisticSession && onTogglePinnedSession || entry.path && (onRenameSession || onDeleteSession || onSetSessionUnread) || hasMoveActions) && !overlay;
 	const sessionButton = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(SidebarMenuButton, {
 		type: "button",
 		"data-sidebar-session-item": true,
@@ -20165,7 +20960,7 @@ function SidebarSessionItem({ entryKey, directorySessionsStore, activeSessionSto
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SidebarMenuItem, { children: hasSessionActions ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ContextMenu$1, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContextMenuTrigger, { render: sessionRow }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ContextMenuContent, {
 		className: "w-44",
 		children: [
-			onTogglePinnedSession ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContextMenuItem, {
+			onTogglePinnedSession && !isOptimisticSession ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContextMenuItem, {
 				onClick: () => onTogglePinnedSession(entry),
 				children: isPinned ? "Unpin" : "Pin to sidebar"
 			}) : null,
@@ -20201,7 +20996,7 @@ function SidebarSessionItem({ entryKey, directorySessionsStore, activeSessionSto
 function sameDirectorySessionEntry(left, right) {
 	if (left === right) return true;
 	if (!left || !right) return false;
-	return left.path === right.path && left.id === right.id && left.cwd === right.cwd && left.name === right.name && left.title === right.title && left.modified === right.modified && left.lastUserMessageAt === right.lastUserMessageAt && left.lastMessageAt === right.lastMessageAt && left.lastMessagePreview === right.lastMessagePreview && left.messageCount === right.messageCount && JSON.stringify(left.contextUsage ?? null) === JSON.stringify(right.contextUsage ?? null) && Boolean(left.streaming) === Boolean(right.streaming) && Boolean(left.unread) === Boolean(right.unread);
+	return left.path === right.path && left.id === right.id && left.cwd === right.cwd && left.name === right.name && left.title === right.title && left.modified === right.modified && left.lastUserMessageAt === right.lastUserMessageAt && left.lastMessageAt === right.lastMessageAt && left.lastMessagePreview === right.lastMessagePreview && left.messageCount === right.messageCount && JSON.stringify(left.contextUsage ?? null) === JSON.stringify(right.contextUsage ?? null) && Boolean(left.streaming) === Boolean(right.streaming) && Boolean(left.unread) === Boolean(right.unread) && Boolean(left.optimistic) === Boolean(right.optimistic);
 }
 function buildDirectorySessionEntryMap(sessionsByDirectory) {
 	const entriesByKey = /* @__PURE__ */ new Map();
@@ -20259,7 +21054,7 @@ function useDirectorySessions(store, directory) {
 function useDirectorySessionEntry(store, entryKey) {
 	return useSelector(store, (state) => state.entriesByKey.get(entryKey), { compare: sameDirectorySessionEntry });
 }
-var DirectorySessionGroup = import_react.memo(function DirectorySessionGroup({ directory, directorySessionsStore, collapsedDirectoryStore, searchActive, directoryOrderingEnabled, moveTargetDirectories, activeSessionStore, selectedSessionKeyStore, pinnedSessionKeys, isMobile, setOpenMobile, isDragging, isSessionDropTarget, overlay = false, attributes, listeners, onSessionClick, onRenameSession, onDeleteSession, onSetSessionUnread, onMoveSession, onMoveSessionAnyDirectory, onTogglePinnedSession, onCreateSessionInDirectory, onDeleteOldSessionsInDirectory, onRemoveDirectory }) {
+var DirectorySessionGroup = import_react.memo(function DirectorySessionGroup({ directory, directorySessionsStore, collapsedDirectoryStore, searchActive, moveTargetDirectories, activeSessionStore, selectedSessionKeyStore, pinnedSessionKeys, isMobile, setOpenMobile, isDragging, isSessionDropTarget, overlay = false, attributes, listeners, onSessionClick, onRenameSession, onDeleteSession, onSetSessionUnread, onMoveSession, onMoveSessionAnyDirectory, onTogglePinnedSession, onCreateSessionInDirectory, onDeleteOldSessionsInDirectory, onRemoveDirectory }) {
 	const [renderCount, setRenderCount] = import_react.useState(5);
 	const { isLoadingSessions, sessionKeys } = useDirectorySessions(directorySessionsStore, directory);
 	const collapsed = useDirectoryCollapsed(collapsedDirectoryStore, directory, searchActive);
@@ -20277,7 +21072,7 @@ var DirectorySessionGroup = import_react.memo(function DirectorySessionGroup({ d
 		children: [
 			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(CollapsibleTrigger, {
 				type: "button",
-				className: cn("group/directory-label flex min-w-0 flex-1 items-center gap-2 text-left text-sm text-sidebar-foreground", directoryOrderingEnabled && !overlay && "cursor-grab active:cursor-grabbing", searchActive && "cursor-default"),
+				className: cn("group/directory-label flex min-w-0 flex-1 cursor-default items-center gap-2 text-left text-sm text-sidebar-foreground"),
 				disabled: searchActive || overlay,
 				...attributes ?? {},
 				...listeners ?? {},
@@ -20724,7 +21519,6 @@ function useAppSidebarView({ sessionSearch, onOpenSessionsDialog, visibleDirecto
 											directorySessionsStore,
 											collapsedDirectoryStore,
 											searchActive,
-											directoryOrderingEnabled,
 											moveTargetDirectories: visibleDirectories,
 											activeSessionStore,
 											selectedSessionKeyStore,
@@ -20756,7 +21550,6 @@ function useAppSidebarView({ sessionSearch, onOpenSessionsDialog, visibleDirecto
 						directorySessionsStore,
 						collapsedDirectoryStore,
 						searchActive,
-						directoryOrderingEnabled,
 						moveTargetDirectories: visibleDirectories,
 						activeSessionStore,
 						selectedSessionKeyStore,
@@ -21004,7 +21797,7 @@ function useAppShellSidebarControllerView({ viewerContextId, sidebarStore, sessi
 				return indexData ? [[directory, indexData]] : [];
 			}));
 			sidebarStore.setSidebarState((current) => {
-				const nextDirectoryIndexDataByPath = Object.keys(activeDirectoryIndexes).length > 0 ? mergeDirectoryIndexData(current.directoryIndexDataByPath, activeDirectoryIndexes) : current.directoryIndexDataByPath;
+				const nextDirectoryIndexDataByPath = Object.keys(activeDirectoryIndexes).length > 0 ? mergeDirectoryIndexDataPreservingOptimistic(current.directoryIndexDataByPath, activeDirectoryIndexes) : current.directoryIndexDataByPath;
 				const nextDirectoryIndexLoading = updateDirectoryIndexLoadingState(current.directoryIndexLoading, activeDirectories, false);
 				if (nextDirectoryIndexDataByPath === current.directoryIndexDataByPath && nextDirectoryIndexLoading === current.directoryIndexLoading) return current;
 				return {
@@ -21094,7 +21887,7 @@ function useAppShellSidebarControllerView({ viewerContextId, sidebarStore, sessi
 				return indexData ? [[directory, indexData]] : [];
 			}));
 			sidebarStore.setSidebarState((current) => {
-				const nextDirectoryIndexDataByPath = Object.keys(activeDirectoryIndexes).length > 0 ? mergeDirectoryIndexData(current.directoryIndexDataByPath, activeDirectoryIndexes) : current.directoryIndexDataByPath;
+				const nextDirectoryIndexDataByPath = Object.keys(activeDirectoryIndexes).length > 0 ? mergeDirectoryIndexDataPreservingOptimistic(current.directoryIndexDataByPath, activeDirectoryIndexes) : current.directoryIndexDataByPath;
 				const nextDirectoryIndexLoading = updateDirectoryIndexLoadingState(current.directoryIndexLoading, activeDirectories, false);
 				if (nextDirectoryIndexDataByPath === current.directoryIndexDataByPath && nextDirectoryIndexLoading === current.directoryIndexLoading) return current;
 				return {
@@ -21185,7 +21978,7 @@ function useAppShellSidebarControllerView({ viewerContextId, sidebarStore, sessi
 			return;
 		}
 		setSidebarSelection([key], key);
-		if (entry.id) sessionWorkspaceRef.current?.selectSession(entry.id, { sessionPath: entry.path });
+		if (entry.id && !isOptimisticSidebarSessionEntry(entry)) sessionWorkspaceRef.current?.selectSession(entry.id, { sessionPath: entry.path });
 	};
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppSidebar, {
 		sessionSearch,
@@ -21626,8 +22419,30 @@ function movePendingDraftFollowUpMessage(messages, pendingId, direction) {
 	next.splice(targetIndex, 0, movedItem);
 	return next;
 }
+var EMPTY_COMPOSER_DIFF_LINE_COMMENTS = [];
 var EMPTY_COMPOSER_IMAGES = [];
 var EMPTY_COMPOSER_PENDING_MESSAGES = [];
+function sameComposerDiffLineComments(left, right) {
+	if (left === right) return true;
+	if (left.length !== right.length) return false;
+	for (let index = 0; index < left.length; index += 1) {
+		const leftComment = left[index];
+		const rightComment = right[index];
+		if (!leftComment || !rightComment) return false;
+		if (leftComment.id !== rightComment.id) return false;
+		if (leftComment.cwd !== rightComment.cwd) return false;
+		if (leftComment.path !== rightComment.path) return false;
+		if (leftComment.lineNumber !== rightComment.lineNumber) return false;
+		if (leftComment.side !== rightComment.side) return false;
+		if (leftComment.text !== rightComment.text) return false;
+		if (leftComment.tabKey !== rightComment.tabKey) return false;
+		if (leftComment.tabTitle !== rightComment.tabTitle) return false;
+		if (leftComment.commit !== rightComment.commit) return false;
+		if (leftComment.shortHash !== rightComment.shortHash) return false;
+		if (leftComment.mode !== rightComment.mode) return false;
+	}
+	return true;
+}
 function sameComposerPromptImages(left, right) {
 	if (left === right) return true;
 	if (left.length !== right.length) return false;
@@ -21656,13 +22471,14 @@ function sameComposerPendingMessages(left, right) {
 	return true;
 }
 function sameAppShellComposerSnapshot(left, right) {
-	return left.activeSessionId === right.activeSessionId && left.awaitingFirstTurn === right.awaitingFirstTurn && left.centerMessages === right.centerMessages && left.composerSkill === right.composerSkill && left.composerSyncNonce === right.composerSyncNonce && left.composerText === right.composerText && left.disabled === right.disabled && left.isStreaming === right.isStreaming && left.isSubmitting === right.isSubmitting && left.viewerContextId === right.viewerContextId && sameComposerPromptImages(left.composerImages, right.composerImages) && sameComposerPendingMessages(left.currentPendingMessages, right.currentPendingMessages);
+	return left.activeSessionId === right.activeSessionId && left.awaitingFirstTurn === right.awaitingFirstTurn && left.centerMessages === right.centerMessages && sameComposerDiffLineComments(left.composerDiffLineComments, right.composerDiffLineComments) && left.composerSkill === right.composerSkill && left.composerSyncNonce === right.composerSyncNonce && left.composerText === right.composerText && left.disabled === right.disabled && left.isStreaming === right.isStreaming && left.isSubmitting === right.isSubmitting && left.viewerContextId === right.viewerContextId && sameComposerPromptImages(left.composerImages, right.composerImages) && sameComposerPendingMessages(left.currentPendingMessages, right.currentPendingMessages);
 }
 function createInitialAppShellComposerSnapshot(viewerContextId) {
 	return {
 		activeSessionId: void 0,
 		awaitingFirstTurn: false,
 		centerMessages: false,
+		composerDiffLineComments: EMPTY_COMPOSER_DIFF_LINE_COMMENTS,
 		composerImages: EMPTY_COMPOSER_IMAGES,
 		composerSkill: void 0,
 		composerSyncNonce: 0,
@@ -21732,10 +22548,23 @@ function createPicoLatestThrottler(options) {
 	};
 }
 function samePromptMutationSessionSnapshot(left, right) {
-	return left.cwd === right.cwd && left.draft === right.draft && left.sessionFile === right.sessionFile && left.sessionId === right.sessionId && left.sessionKey === right.sessionKey && left.streaming === right.streaming;
+	return left.assistantOutputSignature === right.assistantOutputSignature && left.cwd === right.cwd && left.draft === right.draft && left.sessionFile === right.sessionFile && left.sessionId === right.sessionId && left.sessionKey === right.sessionKey && left.streaming === right.streaming;
+}
+function sessionAssistantOutputSignature(items) {
+	let outputCount = 0;
+	let lastOutputKey = "";
+	for (let index = 0; index < items.length; index += 1) {
+		const item = items[index];
+		if (!item || item.kind !== "assistant") continue;
+		if (!item.blocks.some((block) => block.type === "text" && block.text.trim())) continue;
+		outputCount += 1;
+		lastOutputKey = item.itemKey || item.renderKey || `index:${index}`;
+	}
+	return `${outputCount}:${lastOutputKey}`;
 }
 function usePromptMutationSessionSnapshot(store) {
 	return useSelector(store, (sessionState) => ({
+		assistantOutputSignature: sessionAssistantOutputSignature(sessionState.items),
 		cwd: sessionState.cwd,
 		draft: sessionState.draft,
 		sessionFile: sessionState.sessionFile,
@@ -21756,7 +22585,7 @@ function buildCurrentSessionRequestUrl(path, { contextId, sessionState, fallback
 	const shouldUseSessionKey = Boolean(sessionKey && (sessionState.draft || !sessionState.sessionId));
 	return buildRequestUrl(path, {
 		contextId,
-		sessionId: shouldUseSessionKey ? void 0 : sessionState.sessionId ?? fallbackSessionId,
+		sessionId: shouldUseSessionKey || sessionState.draft ? void 0 : sessionState.sessionId ?? fallbackSessionId,
 		searchParams: shouldUseSessionKey ? { sessionKey } : void 0
 	});
 }
@@ -21809,13 +22638,14 @@ function movePendingComposerMessage(messages, pendingId, direction) {
 	next.splice(targetIndex, 0, movedItem);
 	return next;
 }
-function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultNewSessionDirectory, sessionStore, sessionStateRef, draftSessionLoadingOwnerKey, pendingDraftPrompt, pendingDraftFollowUps, awaitingFirstTurn, pendingMessages, composerImagesRef, composerTextRef, composerSkillRef, replaceComposerDraft, lastSyncedEditorTextRef, rememberRecentDirectory, prefetchDirectorySessionsIndex, addOptimisticUserMessage, removeOptimisticUserMessage, setSidebarDirectories, setStoredDraftDirectory, setDraftSessionLoadingOwnerKey, setPendingDraftPrompt, setPendingDraftFollowUps, setPendingMessages, setAwaitingFirstTurn, setIsSubmitting, 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, setSidebarDirectories, setStoredDraftDirectory, setDraftSessionLoadingOwnerKey, setPendingDraftPrompt, setPendingDraftFollowUps, setPendingMessages, setAwaitingFirstTurn, setIsSubmitting, setComposerDiffLineComments, setComposerImages }) {
 	const queryClient = useQueryClient();
 	const draftSessionLoadingOwnerKeyRef = import_react.useRef(draftSessionLoadingOwnerKey);
 	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);
 	import_react.useEffect(() => {
@@ -21888,16 +22718,19 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		const nextPrompt = pendingDraftPromptRef.current;
 		if (!nextPrompt || nextPrompt.ownerKey !== ownerKey) return false;
 		removeOptimisticUserMessage(nextPrompt.optimisticId);
+		removeOptimisticSidebarSession(nextPrompt.optimisticSidebarSessionId);
 		for (const followUp of pendingDraftFollowUpsRef.current) removeOptimisticUserMessage(followUp.optimisticId);
 		pendingDraftPromptRef.current = null;
 		pendingDraftFollowUpsRef.current = [];
 		setPendingDraftPrompt(null);
 		setPendingDraftFollowUps([]);
+		awaitingFirstTurnAssistantOutputSignatureRef.current = null;
 		awaitingFirstTurnRef.current = false;
 		setAwaitingFirstTurn(false);
 		return applyPendingDraftPromptToComposer(nextPrompt);
 	}, [
 		applyPendingDraftPromptToComposer,
+		removeOptimisticSidebarSession,
 		removeOptimisticUserMessage,
 		setAwaitingFirstTurn,
 		setPendingDraftFollowUps,
@@ -21930,15 +22763,20 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 	]);
 	const createSessionRequest = import_react.useCallback(async ({ cwd }) => {
 		if (!viewerContextId) throw new Error("Viewer context unavailable");
-		return await fetchJson(buildRequestUrl("/api/session/new", {
+		return await fetchJson(buildCurrentSessionRequestUrl("/api/session/new", {
 			contextId: viewerContextId,
-			sessionId: activeSessionId
+			sessionState: sessionStateRef.current,
+			fallbackSessionId: activeSessionId
 		}), {
 			method: "POST",
 			headers: { "content-type": "application/json" },
 			body: JSON.stringify({ cwd })
 		});
-	}, [activeSessionId, viewerContextId]);
+	}, [
+		activeSessionId,
+		sessionStateRef,
+		viewerContextId
+	]);
 	const createSession = import_react.useCallback(async (cwdOverride) => {
 		if (!viewerContextId) return false;
 		const nextCwd = resolveNewSessionCwd({
@@ -21977,9 +22815,10 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 	const queuePendingDraftPrompt = import_react.useCallback((streamingBehavior) => {
 		const ownerKey = draftSessionLoadingOwnerKeyRef.current;
 		if (!ownerKey) return false;
-		const message = serializeComposerDraft({
+		const message = buildComposerPromptMessage({
 			text: composerTextRef.current,
-			skillName: composerSkillRef.current
+			skillName: composerSkillRef.current,
+			diffLineComments: composerDiffLineCommentsRef.current
 		}).trim();
 		const images = composerImagesRef.current.map((image) => ({ ...image }));
 		if (!message && images.length === 0) return false;
@@ -21992,7 +22831,8 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 					message,
 					images,
 					queued: false
-				})
+				}),
+				optimisticSidebarSessionId: addOptimisticSidebarSession()
 			};
 			pendingDraftPromptRef.current = nextPrompt;
 			setPendingDraftPrompt(nextPrompt);
@@ -22012,17 +22852,21 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 			setPendingDraftFollowUps(nextFollowUps);
 		}
 		replaceComposerDraft("", void 0, { forceSync: true });
+		setComposerDiffLineComments([]);
 		setComposerImages([]);
 		lastSyncedEditorTextRef.current = "";
 		return true;
 	}, [
+		addOptimisticSidebarSession,
 		addOptimisticUserMessage,
+		composerDiffLineCommentsRef,
 		composerImagesRef,
 		composerSkillRef,
 		composerTextRef,
 		lastSyncedEditorTextRef,
 		replaceComposerDraft,
 		setAwaitingFirstTurn,
+		setComposerDiffLineComments,
 		setComposerImages,
 		setPendingDraftFollowUps,
 		setPendingDraftPrompt
@@ -22056,32 +22900,37 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 	const submitPrompt = import_react.useCallback(async (streamingBehavior, options) => {
 		if (!viewerContextId) return false;
 		if (draftSessionLoadingOwnerKeyRef.current) return queuePendingDraftPrompt(streamingBehavior);
-		const message = serializeComposerDraft({
+		const submittedDiffLineComments = composerDiffLineCommentsRef.current.map((comment) => ({ ...comment }));
+		const message = buildComposerPromptMessage({
 			text: composerTextRef.current,
-			skillName: composerSkillRef.current
+			skillName: composerSkillRef.current,
+			diffLineComments: submittedDiffLineComments
 		}).trim();
 		if (!message && composerImagesRef.current.length === 0) return false;
 		const treatAsQueuedPrompt = options?.forceFirstPrompt ? false : Boolean(sessionStreamingRef.current || awaitingFirstTurnRef.current);
 		const normalizedStreamingBehavior = treatAsQueuedPrompt ? normalizeQueuedStreamingBehavior(streamingBehavior) : void 0;
 		const submittedImages = composerImagesRef.current.map((image) => ({ ...image }));
 		const queuedPendingId = treatAsQueuedPrompt ? createLocalPendingId() : void 0;
+		if (!treatAsQueuedPrompt) {
+			awaitingFirstTurnAssistantOutputSignatureRef.current = sessionAssistantOutputSignature(sessionStateRef.current.items);
+			awaitingFirstTurnRef.current = true;
+			setAwaitingFirstTurn(true);
+		}
 		const optimisticId = options?.optimisticId ?? (treatAsQueuedPrompt ? void 0 : addOptimisticUserMessage({
 			message,
 			images: submittedImages,
 			queued: false
 		}));
+		const optimisticSidebarSessionId = options?.optimisticSidebarSessionId ?? (!treatAsQueuedPrompt && sessionStateRef.current.draft ? addOptimisticSidebarSession() : void 0);
 		if (queuedPendingId && normalizedStreamingBehavior) addOptimisticPendingMessage({
 			pendingId: queuedPendingId,
 			text: message,
 			images: submittedImages.map((image) => ({ ...image })),
 			streamingBehavior: normalizedStreamingBehavior
 		});
-		if (!treatAsQueuedPrompt) {
-			awaitingFirstTurnRef.current = true;
-			setAwaitingFirstTurn(true);
-		}
 		setIsSubmitting(true);
 		replaceComposerDraft("", void 0, { forceSync: true });
+		setComposerDiffLineComments([]);
 		setComposerImages([]);
 		lastSyncedEditorTextRef.current = "";
 		try {
@@ -22097,15 +22946,18 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		} catch (error) {
 			if (queuedPendingId) removeOptimisticPendingMessage(queuedPendingId);
 			removeOptimisticUserMessage(optimisticId);
+			removeOptimisticSidebarSession(optimisticSidebarSessionId);
 			if (!treatAsQueuedPrompt) {
+				awaitingFirstTurnAssistantOutputSignatureRef.current = null;
 				awaitingFirstTurnRef.current = false;
 				setAwaitingFirstTurn(false);
 			}
 			if (!serializeComposerDraft({
 				text: composerTextRef.current,
 				skillName: composerSkillRef.current
-			}).trim()) {
+			}).trim() && composerDiffLineCommentsRef.current.length === 0) {
 				replaceComposerDraft(message);
+				setComposerDiffLineComments((current) => current.length === 0 ? submittedDiffLineComments.map((comment) => ({ ...comment })) : current);
 				setComposerImages((current) => current.length === 0 ? submittedImages.map((image) => ({ ...image })) : current);
 			}
 			toast.error(error instanceof Error ? error.message : "Failed to submit prompt");
@@ -22115,7 +22967,9 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		}
 	}, [
 		addOptimisticPendingMessage,
+		addOptimisticSidebarSession,
 		addOptimisticUserMessage,
+		composerDiffLineCommentsRef,
 		composerImagesRef,
 		composerSkillRef,
 		composerTextRef,
@@ -22124,9 +22978,11 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		queuePendingDraftPrompt,
 		sessionStateRef,
 		removeOptimisticPendingMessage,
+		removeOptimisticSidebarSession,
 		removeOptimisticUserMessage,
 		replaceComposerDraft,
 		setAwaitingFirstTurn,
+		setComposerDiffLineComments,
 		setComposerImages,
 		setIsSubmitting,
 		viewerContextId
@@ -22183,8 +23039,10 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		applyPendingDraftPromptToComposer(nextPrompt);
 		if (!await submitPrompt(nextPrompt.streamingBehavior, {
 			forceFirstPrompt: true,
-			optimisticId: nextPrompt.optimisticId
+			optimisticId: nextPrompt.optimisticId,
+			optimisticSidebarSessionId: nextPrompt.optimisticSidebarSessionId
 		})) {
+			removeOptimisticSidebarSession(nextPrompt.optimisticSidebarSessionId);
 			for (const followUp of pendingDraftFollowUpsRef.current) removeOptimisticUserMessage(followUp.optimisticId);
 			pendingDraftFollowUpsRef.current = [];
 			setPendingDraftFollowUps([]);
@@ -22195,6 +23053,7 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 	}, [
 		applyPendingDraftPromptToComposer,
 		flushPendingDraftFollowUps,
+		removeOptimisticSidebarSession,
 		removeOptimisticUserMessage,
 		setPendingDraftFollowUps,
 		setPendingDraftPrompt,
@@ -22205,7 +23064,7 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		const currentSessionState = sessionStateRef.current;
 		if (currentSessionState.sessionKey?.startsWith("optimistic:")) return;
 		const currentOwnerKey = promptDraftKey(currentSessionState);
-		if (!currentSessionState.draft || currentOwnerKey !== draftSessionLoadingOwnerKey) return;
+		if (!currentSessionState.draft || !promptDraftKeyMatchesOwner(currentOwnerKey, draftSessionLoadingOwnerKey)) return;
 		draftSessionLoadingOwnerKeyRef.current = null;
 		setDraftSessionLoadingOwnerKey(null);
 		if (pendingDraftPromptRef.current?.ownerKey === draftSessionLoadingOwnerKey) flushPendingDraftPrompt(draftSessionLoadingOwnerKey);
@@ -22218,15 +23077,17 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 	]);
 	import_react.useEffect(() => {
 		if (!awaitingFirstTurn) return;
-		const currentSessionState = sessionStateRef.current;
-		const hasAssistantOutput = currentSessionState.items.some((item) => item.kind === "assistant" && item.blocks.some((block) => block.type === "text" && block.text.trim()));
-		if (currentSessionState.streaming || hasAssistantOutput || pendingMessages.length > 0) {
+		const baselineAssistantOutputSignature = awaitingFirstTurnAssistantOutputSignatureRef.current;
+		const assistantOutputStarted = baselineAssistantOutputSignature !== null && sessionSnapshot.assistantOutputSignature !== baselineAssistantOutputSignature;
+		if (sessionStateRef.current.streaming || assistantOutputStarted || pendingMessages.length > 0) {
+			awaitingFirstTurnAssistantOutputSignatureRef.current = null;
 			awaitingFirstTurnRef.current = false;
 			setAwaitingFirstTurn(false);
 		}
 	}, [
 		awaitingFirstTurn,
 		pendingMessages.length,
+		sessionSnapshot.assistantOutputSignature,
 		sessionSnapshot.streaming,
 		sessionStateRef,
 		setAwaitingFirstTurn
@@ -22370,20 +23231,33 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 }
 function usePicoTheme() {
 	const { setTheme, systemTheme } = z();
-	const [themeFamily, setThemeFamilyState] = import_react.useState(() => readStoredTheme());
-	const [colorMode, setColorModeState] = import_react.useState(() => readStoredThemeColorMode());
+	const initialThemeRef = import_react.useRef(void 0);
+	const initialTheme = initialThemeRef.current ?? readStoredTheme();
+	initialThemeRef.current = initialTheme;
+	const [themeFamily, setThemeFamilyState] = import_react.useState(initialTheme);
+	const [colorMode, setColorModeState] = import_react.useState(() => themeFamilyFixedMode(initialTheme) ?? readStoredThemeColorMode());
 	const appliedTheme = appliedThemeClass(themeFamily, colorMode, systemTheme);
 	import_react.useEffect(() => {
 		setTheme(appliedTheme);
 		safeLocalStorageSetItem(APPLIED_THEME_STORAGE_KEY, appliedTheme);
+		const appliedThemeMode = appliedThemeClassColorMode(appliedTheme);
+		if (appliedThemeMode) document.documentElement.dataset.picoThemeMode = appliedThemeMode;
 	}, [appliedTheme, setTheme]);
-	const previewThemeFamily = (value) => {
-		setThemeFamilyState(normalizeThemeFamily(value));
+	const previewThemeFamily = (value, nextColorMode) => {
+		const nextTheme = normalizeThemeFamily(value);
+		const fixedMode = themeFamilyFixedMode(nextTheme);
+		setThemeFamilyState(nextTheme);
+		if (nextColorMode || fixedMode) setColorModeState(normalizeThemeColorMode(nextColorMode ?? fixedMode));
 	};
 	const setThemeFamily = (value) => {
 		const nextTheme = normalizeThemeFamily(value);
+		const fixedMode = themeFamilyFixedMode(nextTheme);
 		setThemeFamilyState(nextTheme);
 		safeLocalStorageSetItem(THEME_STORAGE_KEY, nextTheme);
+		if (fixedMode) {
+			setColorModeState(fixedMode);
+			safeLocalStorageSetItem(THEME_COLOR_MODE_STORAGE_KEY, fixedMode);
+		}
 	};
 	const setColorMode = (value) => {
 		const nextMode = normalizeThemeColorMode(value);
@@ -23096,6 +23970,7 @@ function sameSessionListEntries(left = [], right = []) {
 		if (!sameContextUsage(leftEntry.contextUsage, rightEntry.contextUsage)) return false;
 		if (Boolean(leftEntry.streaming) !== Boolean(rightEntry.streaming)) return false;
 		if (Boolean(leftEntry.unread) !== Boolean(rightEntry.unread)) return false;
+		if (Boolean(leftEntry.optimistic) !== Boolean(rightEntry.optimistic)) return false;
 	}
 	return true;
 }
@@ -23169,20 +24044,28 @@ function shouldPublishSessionState(previous, next) {
 	if (previous === next) return false;
 	return !sameSessionStateExceptConversation(previous, next) || !samePublishableUiState(previous.uiState, next.uiState) || previous.items.length === 0 !== (next.items.length === 0);
 }
-function stateSyncPayloadConfirmsPendingDraft(payload, ownerKey) {
-	if (!ownerKey || payload.draft !== true) return false;
+function stateSyncPayloadDraftKey(payload) {
 	return promptDraftKey({
 		cwd: typeof payload.cwd === "string" ? payload.cwd : void 0,
 		sessionFile: typeof payload.sessionFile === "string" ? payload.sessionFile : void 0,
 		sessionId: typeof payload.sessionId === "string" ? payload.sessionId : void 0
-	}) === ownerKey;
+	});
+}
+function stateSyncPayloadConfirmsPendingDraft(payload, ownerKey) {
+	if (!ownerKey || payload.draft !== true) return false;
+	return promptDraftKeyMatchesOwner(stateSyncPayloadDraftKey(payload), ownerKey);
+}
+function stateSyncPayloadConfirmsOptimisticDraft(payload, previousState) {
+	if (payload.draft !== true) return false;
+	return promptDraftKeyMatchesOwner(stateSyncPayloadDraftKey(payload), promptDraftKey(previousState));
 }
 function shouldIgnoreOptimisticDraftStateSync(options) {
 	const previousSessionKey = options.previousState.sessionKey || "";
 	const payloadSessionKey = typeof options.payload.sessionKey === "string" ? options.payload.sessionKey : "";
 	if (!previousSessionKey.startsWith("optimistic:")) return false;
 	if (!payloadSessionKey || payloadSessionKey === previousSessionKey) return false;
-	return !stateSyncPayloadConfirmsPendingDraft(options.payload, options.ownerKey);
+	if (stateSyncPayloadConfirmsPendingDraft(options.payload, options.ownerKey) || stateSyncPayloadConfirmsOptimisticDraft(options.payload, options.previousState)) return false;
+	return true;
 }
 function useAppShellSessionSync({ viewerContextId, sessionId, draftSessionLoadingOwnerKey, bootstrapSidebarDirectories, hideToolBlocksRef, sessionStore, sessionStateRef, composerTextRef, composerSkillRef, replaceComposerDraftRef, handleSelectSessionRef, pendingRouteSessionIdRef, pendingRouteSessionPathRef, setSessionState, setConversationItems, setHiddenThinkingPreview, setWorkingState, setCompactRunningState, setComposerContextUsage, setComposerStreaming, setSessionsEvent, setSessionDoneEvents, applySidebarSessionStatusRef, setComposerImages, setPendingMessages, pendingUiRequestHandlerRef, lastSyncedEditorTextRef }) {
 	const queryClient = useQueryClient();
@@ -23191,6 +24074,7 @@ function useAppShellSessionSync({ viewerContextId, sessionId, draftSessionLoadin
 	const draftSessionLoadingOwnerKeyRef = import_react.useRef(draftSessionLoadingOwnerKey);
 	const currentSourceRef = import_react.useRef(null);
 	const hasReceivedStateSyncRef = import_react.useRef(false);
+	const [hasReceivedStateSync, setHasReceivedStateSync] = import_react.useState(false);
 	const backgroundedAtRef = import_react.useRef(null);
 	const wasBackgroundedRef = import_react.useRef(false);
 	const [eventsReconnectNonce, setEventsReconnectNonce] = import_react.useState(0);
@@ -23205,8 +24089,8 @@ function useAppShellSessionSync({ viewerContextId, sessionId, draftSessionLoadin
 		initialEventsSessionIdRef.current = sessionId;
 	}, [sessionId]);
 	const syncedSessionId = useSelector(sessionStore, (sessionState) => sessionState.sessionId);
-	const syncedSessionIdRef = import_react.useRef(syncedSessionId);
 	const latestActivationRevisionRef = import_react.useRef(0);
+	const sessionSelectNonceRef = import_react.useRef(Date.now() * 1e3);
 	const observedRouteSessionIdRef = import_react.useRef(void 0);
 	const syncedSessionDraft = useSelector(sessionStore, (sessionState) => sessionState.draft);
 	import_react.useEffect(() => {
@@ -23320,7 +24204,10 @@ function useAppShellSessionSync({ viewerContextId, sessionId, draftSessionLoadin
 			const activationRevision = payload.activationRevision;
 			if (typeof activationRevision === "number" && activationRevision < latestActivationRevisionRef.current) return;
 			if (typeof activationRevision === "number") latestActivationRevisionRef.current = activationRevision;
-			hasReceivedStateSyncRef.current = true;
+			if (!hasReceivedStateSyncRef.current) {
+				hasReceivedStateSyncRef.current = true;
+				setHasReceivedStateSync(true);
+			}
 			const previousState = sessionStateRef.current;
 			if (shouldIgnoreOptimisticDraftStateSync({
 				ownerKey: draftSessionLoadingOwnerKeyRef.current,
@@ -23339,7 +24226,7 @@ function useAppShellSessionSync({ viewerContextId, sessionId, draftSessionLoadin
 			const currentDraftOwnerKey = draftSessionLoadingOwnerKeyRef.current;
 			const confirmedDraft = nextState.draft && !nextState.sessionKey?.startsWith("optimistic:");
 			const previousWasOptimisticDraft = previousState.draft && previousState.sessionKey?.startsWith("optimistic:");
-			const draftMatchesPendingOwner = currentDraftOwnerKey ? promptDraftKey(nextState) === currentDraftOwnerKey : false;
+			const draftMatchesPendingOwner = promptDraftKeyMatchesOwner(promptDraftKey(nextState), currentDraftOwnerKey);
 			const shouldClearDraftRoute = Boolean(currentRouteSessionId && !pendingRouteSessionIdRef.current && confirmedDraft && (draftMatchesPendingOwner || previousWasOptimisticDraft));
 			const preserveLocalPrompt = !sessionChanged && localPromptText !== previousEditorText;
 			const nextPromptText = preserveLocalPrompt ? localPromptText : readStoredPromptDraft(nextState) ?? nextState.uiState.editorText ?? "";
@@ -23455,6 +24342,8 @@ function useAppShellSessionSync({ viewerContextId, sessionId, draftSessionLoadin
 	import_react.useEffect(() => {
 		if (!viewerContextId) return;
 		hasReceivedStateSyncRef.current = false;
+		setHasReceivedStateSync(false);
+		latestActivationRevisionRef.current = 0;
 		const gitInvalidationBatcher = new Batcher((items) => {
 			const scopesByCwd = /* @__PURE__ */ new Map();
 			for (const item of items) {
@@ -23528,21 +24417,23 @@ function useAppShellSessionSync({ viewerContextId, sessionId, draftSessionLoadin
 		queryClient,
 		viewerContextId
 	]);
-	import_react.useEffect(() => {
-		syncedSessionIdRef.current = syncedSessionId;
-	}, [syncedSessionId]);
 	import_react.useEffect(() => {
 		if (!viewerContextId || !sessionId) return;
 		if (draftSessionLoadingOwnerKey) return;
-		if (!hasReceivedStateSyncRef.current) return;
-		if (sessionId === syncedSessionIdRef.current) return;
+		if (!hasReceivedStateSync) return;
+		if (sessionId === syncedSessionId) return;
 		if (pendingRouteSessionIdRef.current !== sessionId) return;
 		const abortController = new AbortController();
 		const sessionPath = pendingRouteSessionPathRef.current;
+		const selectionNonce = Math.max(sessionSelectNonceRef.current + 1, Date.now() * 1e3);
+		sessionSelectNonceRef.current = selectionNonce;
 		fetchJson(buildRequestUrl("/api/session/select", {
 			contextId: viewerContextId,
 			sessionId,
-			searchParams: { sessionPath }
+			searchParams: {
+				selectionNonce,
+				sessionPath
+			}
 		}), {
 			method: "POST",
 			signal: abortController.signal
@@ -23555,8 +24446,10 @@ function useAppShellSessionSync({ viewerContextId, sessionId, draftSessionLoadin
 		};
 	}, [
 		draftSessionLoadingOwnerKey,
+		hasReceivedStateSync,
 		pendingRouteSessionIdRef,
 		pendingRouteSessionPathRef,
+		syncedSessionId,
 		viewerContextId,
 		sessionId
 	]);
@@ -23654,13 +24547,12 @@ function useAppShellShortcuts({ addDirectoryOpenRef, commandPaletteOpenRef, comp
 		event.preventDefault();
 		sessionButtons[nextIndex]?.focus();
 	};
-	const handleSidebarDelete = (event) => {
+	const handleSidebarBackspaceDelete = (event) => {
 		const context = getShortcutContext(event);
 		if (context.modalOpen || isEditableTarget(event.target) && !context.targetIsSessionSearch) return;
-		const targetsToDelete = context.selectedSidebarSessions.length > 0 ? context.selectedSidebarSessions : context.focusedSidebarSession?.path ? [context.focusedSidebarSession] : [];
-		if (targetsToDelete.length === 0) return;
+		if (context.selectedSidebarSessions.length <= 1) return;
 		event.preventDefault();
-		shortcutActionsRef.current.openDeleteDialog(targetsToDelete);
+		shortcutActionsRef.current.openDeleteDialog(context.selectedSidebarSessions);
 	};
 	const handleFocusPrompt = (event) => {
 		const context = getShortcutContext(event);
@@ -23832,11 +24724,11 @@ function useAppShellShortcuts({ addDirectoryOpenRef, commandPaletteOpenRef, comp
 			} }
 		})),
 		{
-			hotkey: "Delete",
-			callback: handleSidebarDelete,
+			hotkey: "Backspace",
+			callback: handleSidebarBackspaceDelete,
 			options: { meta: {
 				name: "Delete selected sidebar sessions",
-				description: "Open the delete dialog for focused or selected sessions."
+				description: "Open the delete dialog for multiple selected sidebar sessions."
 			} }
 		},
 		{
@@ -23965,6 +24857,8 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 	if (!composerImagesStoreRef.current) composerImagesStoreRef.current = createPicoStore([]);
 	const composerImagesStore = composerImagesStoreRef.current;
 	const composerImagesRef = import_react.useRef([]);
+	const composerDiffLineCommentsRef = import_react.useRef([]);
+	const [composerDiffLineComments, setComposerDiffLineCommentsState] = import_react.useState([]);
 	const displaySettingsStoreRef = import_react.useRef(null);
 	if (!displaySettingsStoreRef.current) displaySettingsStoreRef.current = createPicoStore({
 		autoScrollEnabled: true,
@@ -24070,6 +24964,18 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 	const composerStoreRef = import_react.useRef(null);
 	if (!composerStoreRef.current) composerStoreRef.current = createPicoStore(createInitialAppShellComposerSnapshot(viewerContextId), sameAppShellComposerSnapshot);
 	const composerStore = composerStoreRef.current;
+	const setComposerDiffLineComments = import_react.useCallback((action) => {
+		const current = composerDiffLineCommentsRef.current;
+		const next = applyStoreAction(current, action);
+		if (next === current) return;
+		composerDiffLineCommentsRef.current = next;
+		setComposerDiffLineCommentsState(next);
+		const currentComposerSnapshot = composerStore.state;
+		setStoreState(composerStore, {
+			...currentComposerSnapshot,
+			composerDiffLineComments: currentComposerSnapshot.disabled ? [] : next
+		});
+	}, [composerStore]);
 	const contextUsageStoreRef = import_react.useRef(null);
 	if (!contextUsageStoreRef.current) contextUsageStoreRef.current = createPicoStore(void 0);
 	const contextUsageStore = contextUsageStoreRef.current;
@@ -24217,8 +25123,8 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 				...currentComposerSnapshot,
 				awaitingFirstTurn: currentComposerSnapshot.disabled ? false : next
 			});
-			if (next && !sessionStateRef.current.streaming) setStoreState(workingStateStore, { label: "Waiting for first response…" });
-			else if (!next && workingStateStore.state?.label === "Waiting for first response…") setStoreState(workingStateStore, null);
+			if (next && !sessionStateRef.current.streaming) setStoreState(workingStateStore, { label: "" });
+			else if (!next && workingStateStore.state?.label === "") setStoreState(workingStateStore, null);
 		});
 	}, [
 		awaitingFirstTurnStore,
@@ -24979,6 +25885,64 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		});
 	};
 	const prefetchDirectorySessionsIndex = import_react.useCallback((_directory) => {}, []);
+	const addOptimisticSidebarSession = import_react.useCallback((options) => {
+		const currentState = sessionStateRef.current;
+		const optimisticId = (options?.id || currentState.sessionKey || `optimistic:${promptDraftKey(currentState)}`).trim();
+		const cwd = (options?.cwd || currentState.cwd || defaultNewSessionDirectory).trim();
+		if (!optimisticId || !cwd) return void 0;
+		const modified = (/* @__PURE__ */ new Date()).toISOString();
+		const entry = {
+			id: optimisticId,
+			cwd,
+			title: "New session",
+			modified,
+			lastUserMessageAt: modified,
+			streaming: true,
+			unread: false,
+			optimistic: true
+		};
+		const entryKey = sessionListEntryKey(entry);
+		sidebarStore.setSidebarDirectories((current) => {
+			const normalizedCurrent = normalizeStoredDirectoryList(current);
+			if (normalizedCurrent.includes(cwd)) return current;
+			const nextDirectories = normalizeStoredDirectoryList([cwd, ...normalizedCurrent]);
+			safeLocalStorageSetItem(SIDEBAR_DIRECTORIES_STORAGE_KEY, JSON.stringify(nextDirectories));
+			return nextDirectories;
+		});
+		const optimisticEntry = {
+			...entry,
+			id: optimisticId,
+			cwd
+		};
+		sidebarStore.setDirectoryIndexDataByPath((current) => upsertOptimisticSidebarSessionEntry(current, optimisticEntry));
+		sidebarStore.setSessionsEvent((current) => current ? {
+			...current,
+			directoryIndexes: upsertOptimisticSidebarSessionEntry(current.directoryIndexes || {}, optimisticEntry)
+		} : current);
+		if (entryKey) {
+			sidebarStore.setSelectedSidebarSessionKeys((current) => sameStringArray$3(current, [entryKey]) ? current : [entryKey]);
+			sidebarStore.setSidebarSessionSelectionAnchor((current) => current === entryKey ? current : entryKey);
+		}
+		return optimisticId;
+	}, [
+		defaultNewSessionDirectory,
+		sessionStateRef,
+		sidebarStore
+	]);
+	const removeOptimisticSidebarSession = import_react.useCallback((optimisticId) => {
+		const targetId = optimisticId?.trim() || "";
+		if (!targetId) return;
+		const entryKey = sessionListEntryKey({ id: targetId });
+		sidebarStore.setDirectoryIndexDataByPath((current) => removeOptimisticSidebarSessionEntry(current, targetId));
+		sidebarStore.setSessionsEvent((current) => current?.directoryIndexes ? {
+			...current,
+			directoryIndexes: removeOptimisticSidebarSessionEntry(current.directoryIndexes, targetId)
+		} : current);
+		if (entryKey) {
+			sidebarStore.setSelectedSidebarSessionKeys((current) => current.filter((key) => key !== entryKey));
+			sidebarStore.setSidebarSessionSelectionAnchor((current) => current === entryKey ? "" : current);
+		}
+	}, [sidebarStore]);
 	const clearSelectedSidebarSelection = import_react.useCallback(() => {
 		sidebarStore.setSelectedSidebarSessionKeys((current) => current.length === 0 ? current : []);
 		sidebarStore.setSidebarSessionSelectionAnchor((current) => current ? "" : current);
@@ -24999,6 +25963,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		pendingDraftFollowUps,
 		awaitingFirstTurn,
 		pendingMessages,
+		composerDiffLineCommentsRef,
 		composerImagesRef,
 		composerTextRef,
 		composerSkillRef,
@@ -25008,6 +25973,8 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		prefetchDirectorySessionsIndex,
 		addOptimisticUserMessage,
 		removeOptimisticUserMessage,
+		addOptimisticSidebarSession,
+		removeOptimisticSidebarSession,
 		setSidebarDirectories: sidebarStore.setSidebarDirectories,
 		setStoredDraftDirectory,
 		setDraftSessionLoadingOwnerKey,
@@ -25016,6 +25983,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		setPendingMessages,
 		setAwaitingFirstTurn,
 		setIsSubmitting,
+		setComposerDiffLineComments,
 		setComposerImages
 	});
 	const switchEmptyDraftDirectory = import_react.useCallback((directory) => {
@@ -25060,6 +26028,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		const ownerKey = promptDraftKey({ cwd: nextCwd });
 		const optimisticSessionKey = `optimistic:${ownerKey}`;
 		const shouldCloseMobileSidebar = Boolean(options?.closeMobileSidebar) && isMobile && openMobile;
+		const createSessionPromise = requestCreateSession(nextCwd);
 		handleSelectSession(void 0);
 		clearSelectedSidebarSelection();
 		if (shouldCloseMobileSidebar) {
@@ -25076,7 +26045,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		sessionStateRef.current = nextState;
 		conversationItemsStore.setItems(nextState.items);
 		setSessionState(nextState);
-		if (await requestCreateSession(nextCwd)) return;
+		if (await createSessionPromise) return;
 		if (sessionStateRef.current.sessionKey !== optimisticSessionKey) return;
 		sessionStateRef.current = previousState;
 		conversationItemsStore.setItems(previousState.items);
@@ -25096,6 +26065,22 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		setPendingMessages,
 		setSessionState
 	]);
+	const createDiffLineCommentId = () => {
+		if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") return `diff-comment:${crypto.randomUUID()}`;
+		return `diff-comment:${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+	};
+	const addComposerDiffLineComment = (comment) => {
+		const text = comment.text.trim();
+		const cwd = sessionStateRef.current.cwd?.trim() || "";
+		if (!text || !cwd) return;
+		setComposerDiffLineComments((current) => [...current, {
+			...comment,
+			id: createDiffLineCommentId(),
+			cwd,
+			text
+		}]);
+		composerPanelRef.current?.focusPrompt({ preventScroll: true });
+	};
 	const onPickImages = async (files) => {
 		if (!files || files.length === 0) return;
 		const imageFiles = Array.from(files).filter((file) => file.type.startsWith("image/"));
@@ -25113,6 +26098,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 	}));
 	const currentPendingMessages = pendingDraftFollowUpMessages.length > 0 || pendingMessages.length > 0 ? [...pendingDraftFollowUpMessages, ...pendingMessages] : EMPTY_COMPOSER_PENDING_MESSAGES;
 	const composerDisabled = isSessionViewLoading;
+	const displayedDiffLineComments = composerDisabled ? EMPTY_COMPOSER_DIFF_LINE_COMMENTS : composerDiffLineComments;
 	const displayedPendingMessages = composerDisabled ? EMPTY_COMPOSER_PENDING_MESSAGES : currentPendingMessages;
 	const displayedComposerImages = composerDisabled ? EMPTY_COMPOSER_IMAGES : composerImages;
 	const displayedComposerText = composerDisabled ? "" : composerDraftSeed.text;
@@ -25395,8 +26381,8 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 	const handleThemeChange = (value) => {
 		setThemeFamily(value);
 	};
-	const handleThemePreviewChange = (value) => {
-		previewThemeFamily(value);
+	const handleThemePreviewChange = (value, colorMode) => {
+		previewThemeFamily(value, colorMode);
 	};
 	const handleThemeColorModeChange = (value) => {
 		setColorMode(value);
@@ -25405,6 +26391,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		activeSessionId,
 		awaitingFirstTurn: composerDisabled ? false : awaitingFirstTurn,
 		centerMessages: displaySettingsRef.current.centerMessages,
+		composerDiffLineComments: displayedDiffLineComments,
 		composerImages: displayedComposerImages,
 		composerSkill: displayedComposerSkill,
 		composerSyncNonce: composerDraftSeed.syncNonce,
@@ -25421,6 +26408,9 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 	const composerActionsRef = useLatestRef({
 		abortSession,
 		onPickImages,
+		removeDiffLineComment: (id) => {
+			setComposerDiffLineComments((current) => current.filter((comment) => comment.id !== id));
+		},
 		onRemoveComposerImage: (index) => {
 			setComposerImages((current) => current.filter((_, imageIndex) => imageIndex !== index));
 		},
@@ -26012,6 +27002,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppShellTabsController, {
 					actionsRef: composerActionsRef,
 					appUiStore,
+					composerDiffLineComments: displayedDiffLineComments,
 					composerPanelRef,
 					contextUsageStore,
 					conversationFrameRef,
@@ -26034,6 +27025,7 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 					onCloseFileViewTab: closeFileViewTab,
 					onCloseFileViewTabsToRight: closeFileViewTabsToRight,
 					onCloseOtherFileViewTabs: closeOtherFileViewTabs,
+					onAddDiffLineComment: addComposerDiffLineComment,
 					onOpenFileViewTab: openFileViewTab,
 					onReorderFileViewTabs: reorderFileViewTabs,
 					rightSidebarStore,