@alivault/pico 0.10.1 → 0.10.2

package/.output/server/_ssr/{routes-NB2wmfpS.mjs → routes-CELGJtcT.mjs}

@@ -2,7 +2,7 @@ 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 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 promptDraftKeyMatchesOwner, 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 sameContextUsage, a as COLLAPSED_DIRECTORIES_STORAGE_KEY, at as readStoredPinnedSessionKeys, b as SESSION_DONE_SOUND_ENABLED_STORAGE_KEY, bt as themeFamilyLabel, c as Kbd, ct as readStoredRightSidebarOpen, d as RECENT_DIRECTORIES_STORAGE_KEY, dt as readStoredSidebarDirectories, et as readStoredAutoScrollEnabled, f as RIGHT_SIDEBAR_ACTIVE_TAB_STORAGE_KEY, ft as readStoredTheme, g as RIGHT_SIDEBAR_OPEN_STORAGE_KEY, gt as safeLocalStorageSetItem, h as RIGHT_SIDEBAR_HISTORY_TAB_STORAGE_KEY, ht as safeLocalStorageGetItem, i as CENTER_MESSAGES_STORAGE_KEY, it as readStoredHideToolBlocks, j as TooltipTrigger, k as TooltipContent, l as KeyboardShortcutContent, lt as readStoredSessionDoneDesktopNotificationsEnabled, m as RIGHT_SIDEBAR_HISTORY_HEIGHT_STORAGE_KEY, mt as rememberStoredPromptDraft, n as APPLIED_THEME_STORAGE_KEY, nt as readStoredCollapsedDirectories, o as DRAFT_DIRECTORY_STORAGE_KEY, ot as readStoredPromptDraft, p as RIGHT_SIDEBAR_FILE_TREE_WIDTH_STORAGE_KEY, pt as readStoredThemeColorMode, q as normalizeSessionSelectionKeys, r as AUTO_SCROLL_ENABLED_STORAGE_KEY, rt as readStoredDraftDirectory, s as HIDE_TOOL_BLOCKS_STORAGE_KEY, st as readStoredRecentDirectories, tt as readStoredCenterMessages, u as PINNED_SESSIONS_STORAGE_KEY, ut as readStoredSessionDoneSoundEnabled, v as Route, vt as sessionListEntryKey, w as THEME_COLOR_MODE_STORAGE_KEY, x as SIDEBAR_DIRECTORIES_STORAGE_KEY, xt as thinkingSummaryText, y as SESSION_DONE_DESKTOP_NOTIFICATIONS_ENABLED_STORAGE_KEY, yt as themeColorModeLabel, z as createInitialSessionState } from "./routes-DbGwM-bj.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-NB2wmfpS.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",
@@ -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();
 		}
@@ -9671,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(";")) {
@@ -9681,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 };
 	}
 }
@@ -9727,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)
 	});
 }
@@ -10031,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",
@@ -11051,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)" },
@@ -11058,6 +11425,7 @@ function EditDiffBlock({ isBorderless = false, patch }) {
 			patch,
 			disableWorkerPool: true,
 			options: {
+				...themeOptions,
 				diffStyle: "unified",
 				disableFileHeader: true,
 				lineDiffType: "word-alt",
@@ -11228,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 })
@@ -11286,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,
@@ -11311,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]
@@ -13943,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) {
@@ -13969,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,
@@ -14017,6 +14394,7 @@ function AppShellConversationFrame({ autoScrollEnabled, children, conversationIt
 			onClick: scrollConversationToBottom,
 			scrollStateStore
 		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConversationPreviousMessageButton, {
+			centerMessages,
 			onClick: jumpToPreviousMessage,
 			scrollStateStore
 		})] }) : null]
@@ -14232,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,
@@ -17860,7 +18239,7 @@ function ReviewDiffPendingLineComment({ comment }) {
 		comment.onSubmit(normalizedText);
 	};
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("form", {
-		className: "m-2 max-w-[min(38rem,calc(100%-1rem))] rounded-lg border border-border/70 bg-background p-2 shadow-sm",
+		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();
@@ -17908,7 +18287,7 @@ function ReviewDiffPendingLineComment({ comment }) {
 				}
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-				className: "mt-2 flex justify-end gap-2",
+				className: "mt-2 flex flex-wrap justify-end gap-2",
 				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button$1, {
 					type: "button",
 					variant: "ghost",
@@ -17928,7 +18307,7 @@ function ReviewDiffLineAnnotation({ annotation }) {
 	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,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",
+		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: "💬"
@@ -18419,6 +18798,7 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffLineComment
 		enableGutterUtility: true,
 		onGutterUtilityClick: startLineComment
 	} : {};
+	const themeOptions = usePicoDiffThemeOptions();
 	const [indexStatus, worktreeStatus] = gitFileStatusCharacters(file.status);
 	const canStage = worktreeStatus !== " " || indexStatus === "?";
 	const invalidateChangedFileQueries = async () => {
@@ -18596,6 +18976,7 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffLineComment
 				lineAnnotations,
 				renderAnnotation: (annotation) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReviewDiffLineAnnotation, { annotation }),
 				options: {
+					...themeOptions,
 					diffStyle,
 					disableFileHeader: true,
 					...commentableOptions,
@@ -18626,6 +19007,7 @@ function ReviewFileAccordionItem({ viewerContextId, cwd, active, diffLineComment
 				lineAnnotations,
 				renderAnnotation: (annotation) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReviewDiffLineAnnotation, { annotation }),
 				options: {
+					...themeOptions,
 					diffStyle,
 					disableFileHeader: true,
 					...commentableOptions,
@@ -18781,7 +19163,7 @@ function assignClassName(element, className) {
 }
 function renderPendingCommitDiffLineComment(pendingComment) {
 	const form = document.createElement("form");
-	assignClassName(form, "m-2 max-w-[min(38rem,calc(100%-1rem))] rounded-lg border border-border/70 bg-background p-2 shadow-sm");
+	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");
@@ -18809,7 +19191,7 @@ function renderPendingCommitDiffLineComment(pendingComment) {
 		}
 	});
 	const footer = document.createElement("div");
-	assignClassName(footer, "mt-2 flex justify-end gap-2");
+	assignClassName(footer, "mt-2 flex flex-wrap justify-end gap-2");
 	const secondaryCancelButton = document.createElement("button");
 	secondaryCancelButton.type = "button";
 	secondaryCancelButton.textContent = "Cancel";
@@ -18844,7 +19226,7 @@ function renderCommitDiffLineAnnotation(annotation) {
 	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,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");
+	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");
@@ -18862,6 +19244,7 @@ function CommitDiffFileRenderer({ comments, diffStyle, disableFileHeader = false
 		pendingComment
 	});
 	const options = {
+		...usePicoDiffThemeOptions(),
 		diffStyle,
 		disableFileHeader,
 		enableGutterUtility: true,
@@ -20500,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,
@@ -20576,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,
@@ -20612,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();
@@ -20670,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);
@@ -20688,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 ?? {},
@@ -21135,7 +21519,6 @@ function useAppSidebarView({ sessionSearch, onOpenSessionsDialog, visibleDirecto
 											directorySessionsStore,
 											collapsedDirectoryStore,
 											searchActive,
-											directoryOrderingEnabled,
 											moveTargetDirectories: visibleDirectories,
 											activeSessionStore,
 											selectedSessionKeyStore,
@@ -21167,7 +21550,6 @@ function useAppSidebarView({ sessionSearch, onOpenSessionsDialog, visibleDirecto
 						directorySessionsStore,
 						collapsedDirectoryStore,
 						searchActive,
-						directoryOrderingEnabled,
 						moveTargetDirectories: visibleDirectories,
 						activeSessionStore,
 						selectedSessionKeyStore,
@@ -21415,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 {
@@ -21505,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 {
@@ -21596,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,
@@ -22200,11 +22582,10 @@ function createLocalPendingId() {
 }
 function buildCurrentSessionRequestUrl(path, { contextId, sessionState, fallbackSessionId }) {
 	const sessionKey = sessionState.sessionKey && !sessionState.sessionKey.startsWith("optimistic:") ? sessionState.sessionKey : void 0;
-	const hasFallbackSession = Boolean(fallbackSessionId && fallbackSessionId !== sessionState.sessionId);
-	const shouldUseSessionKey = Boolean(sessionKey && !hasFallbackSession && (sessionState.draft || !sessionState.sessionId));
+	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
 	});
 }
@@ -22257,7 +22638,7 @@ function movePendingComposerMessage(messages, pendingId, direction) {
 	next.splice(targetIndex, 0, movedItem);
 	return next;
 }
-function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultNewSessionDirectory, sessionStore, sessionStateRef, draftSessionLoadingOwnerKey, pendingDraftPrompt, pendingDraftFollowUps, awaitingFirstTurn, pendingMessages, composerDiffLineCommentsRef, composerImagesRef, composerTextRef, composerSkillRef, replaceComposerDraft, lastSyncedEditorTextRef, rememberRecentDirectory, prefetchDirectorySessionsIndex, addOptimisticUserMessage, removeOptimisticUserMessage, setSidebarDirectories, setStoredDraftDirectory, setDraftSessionLoadingOwnerKey, setPendingDraftPrompt, setPendingDraftFollowUps, setPendingMessages, setAwaitingFirstTurn, setIsSubmitting, setComposerDiffLineComments, setComposerImages }) {
+function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultNewSessionDirectory, sessionStore, sessionStateRef, draftSessionLoadingOwnerKey, pendingDraftPrompt, pendingDraftFollowUps, awaitingFirstTurn, pendingMessages, composerDiffLineCommentsRef, composerImagesRef, composerTextRef, composerSkillRef, replaceComposerDraft, lastSyncedEditorTextRef, rememberRecentDirectory, prefetchDirectorySessionsIndex, addOptimisticUserMessage, removeOptimisticUserMessage, addOptimisticSidebarSession, removeOptimisticSidebarSession, 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);
@@ -22337,6 +22718,7 @@ 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 = [];
@@ -22348,6 +22730,7 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		return applyPendingDraftPromptToComposer(nextPrompt);
 	}, [
 		applyPendingDraftPromptToComposer,
+		removeOptimisticSidebarSession,
 		removeOptimisticUserMessage,
 		setAwaitingFirstTurn,
 		setPendingDraftFollowUps,
@@ -22380,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({
@@ -22443,7 +22831,8 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 					message,
 					images,
 					queued: false
-				})
+				}),
+				optimisticSidebarSessionId: addOptimisticSidebarSession()
 			};
 			pendingDraftPromptRef.current = nextPrompt;
 			setPendingDraftPrompt(nextPrompt);
@@ -22468,6 +22857,7 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		lastSyncedEditorTextRef.current = "";
 		return true;
 	}, [
+		addOptimisticSidebarSession,
 		addOptimisticUserMessage,
 		composerDiffLineCommentsRef,
 		composerImagesRef,
@@ -22531,6 +22921,7 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 			images: submittedImages,
 			queued: false
 		}));
+		const optimisticSidebarSessionId = options?.optimisticSidebarSessionId ?? (!treatAsQueuedPrompt && sessionStateRef.current.draft ? addOptimisticSidebarSession() : void 0);
 		if (queuedPendingId && normalizedStreamingBehavior) addOptimisticPendingMessage({
 			pendingId: queuedPendingId,
 			text: message,
@@ -22555,6 +22946,7 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		} catch (error) {
 			if (queuedPendingId) removeOptimisticPendingMessage(queuedPendingId);
 			removeOptimisticUserMessage(optimisticId);
+			removeOptimisticSidebarSession(optimisticSidebarSessionId);
 			if (!treatAsQueuedPrompt) {
 				awaitingFirstTurnAssistantOutputSignatureRef.current = null;
 				awaitingFirstTurnRef.current = false;
@@ -22575,6 +22967,7 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		}
 	}, [
 		addOptimisticPendingMessage,
+		addOptimisticSidebarSession,
 		addOptimisticUserMessage,
 		composerDiffLineCommentsRef,
 		composerImagesRef,
@@ -22585,6 +22978,7 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 		queuePendingDraftPrompt,
 		sessionStateRef,
 		removeOptimisticPendingMessage,
+		removeOptimisticSidebarSession,
 		removeOptimisticUserMessage,
 		replaceComposerDraft,
 		setAwaitingFirstTurn,
@@ -22645,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([]);
@@ -22657,6 +23053,7 @@ function useAppShellPromptMutations({ viewerContextId, activeSessionId, defaultN
 	}, [
 		applyPendingDraftPromptToComposer,
 		flushPendingDraftFollowUps,
+		removeOptimisticSidebarSession,
 		removeOptimisticUserMessage,
 		setPendingDraftFollowUps,
 		setPendingDraftPrompt,
@@ -22834,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);
@@ -23560,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;
 }
@@ -24136,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);
@@ -24314,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."
 			} }
 		},
 		{
@@ -25475,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);
@@ -25505,6 +25973,8 @@ function useAppShellSessionWorkspaceView({ viewerContextId, sessionId, onSelectS
 		prefetchDirectorySessionsIndex,
 		addOptimisticUserMessage,
 		removeOptimisticUserMessage,
+		addOptimisticSidebarSession,
+		removeOptimisticSidebarSession,
 		setSidebarDirectories: sidebarStore.setSidebarDirectories,
 		setStoredDraftDirectory,
 		setDraftSessionLoadingOwnerKey,
@@ -25558,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) {
@@ -25574,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);
@@ -25910,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);