From 4b28a47afea34c1ff58f390e5ec4e886a5db9f3e Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sun, 8 Feb 2026 13:02:35 -0800
Subject: [PATCH 1/9] feat(desktop): split auto-apply preset into workspace
 creation and new tab settings

Give users independent control over when the default preset is applied:
one toggle for workspace/worktree creation and another for new tabs,
panes, and splits. Explicit preset launches via hotkey/menu are never gated.

Refactors TerminalSettings from a monolithic component into isolated
sub-components (PresetsSection, SessionsSection, individual setting
components), each owning their own queries. This prevents query
resolutions in one section from re-rendering others, fixing the
"Maximum update depth exceeded" error caused by Radix UI ref
composition cascading through react-dnd connectors on re-renders.
---
 .../src/lib/trpc/routers/settings/index.ts    |   21 +
 .../TerminalSettings/TerminalSettings.tsx     | 1046 +---------------
 .../components/ApplyPresetOnNewTabSetting.tsx |   57 +
 .../components/AutoApplyPresetSetting.tsx     |   53 +
 .../components/LinkBehaviorSetting.tsx        |   68 ++
 .../components/PresetRow/PresetRow.tsx        |    8 +-
 .../components/PresetsSection.tsx             |  420 +++++++
 .../components/SessionsSection.tsx            |  442 +++++++
 .../utils/settings-search/settings-search.ts  |   25 +-
 .../stores/tabs/useTabsWithPresets.ts         |   17 +-
 apps/desktop/src/shared/constants.ts          |    1 +
 .../0020_add_apply_preset_on_new_tab.sql      |    1 +
 .../local-db/drizzle/meta/0020_snapshot.json  | 1078 +++++++++++++++++
 packages/local-db/drizzle/meta/_journal.json  |    7 +
 packages/local-db/src/schema/schema.ts        |    3 +
 15 files changed, 2236 insertions(+), 1011 deletions(-)
 create mode 100644 apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/ApplyPresetOnNewTabSetting.tsx
 create mode 100644 apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/AutoApplyPresetSetting.tsx
 create mode 100644 apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/LinkBehaviorSetting.tsx
 create mode 100644 apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
 create mode 100644 apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/SessionsSection.tsx
 create mode 100644 packages/local-db/drizzle/0020_add_apply_preset_on_new_tab.sql
 create mode 100644 packages/local-db/drizzle/meta/0020_snapshot.json

diff --git a/apps/desktop/src/lib/trpc/routers/settings/index.ts b/apps/desktop/src/lib/trpc/routers/settings/index.ts
index ba0dcfa465e..e9451a677e1 100644
--- a/apps/desktop/src/lib/trpc/routers/settings/index.ts
+++ b/apps/desktop/src/lib/trpc/routers/settings/index.ts
@@ -10,6 +10,7 @@ import { app } from "electron";
 import { quitWithoutConfirmation } from "main/index";
 import { localDb } from "main/lib/local-db";
 import {
+	DEFAULT_APPLY_PRESET_ON_NEW_TAB,
 	DEFAULT_AUTO_APPLY_DEFAULT_PRESET,
 	DEFAULT_CONFIRM_ON_QUIT,
 	DEFAULT_TERMINAL_LINK_BEHAVIOR,
@@ -314,6 +315,26 @@ export const createSettingsRouter = () => {
 				return { success: true };
 			}),
 
+		getApplyPresetOnNewTab: publicProcedure.query(() => {
+			const row = getSettings();
+			return row.applyPresetOnNewTab ?? DEFAULT_APPLY_PRESET_ON_NEW_TAB;
+		}),
+
+		setApplyPresetOnNewTab: publicProcedure
+			.input(z.object({ enabled: z.boolean() }))
+			.mutation(({ input }) => {
+				localDb
+					.insert(settings)
+					.values({ id: 1, applyPresetOnNewTab: input.enabled })
+					.onConflictDoUpdate({
+						target: settings.id,
+						set: { applyPresetOnNewTab: input.enabled },
+					})
+					.run();
+
+				return { success: true };
+			}),
+
 		restartApp: publicProcedure.mutation(() => {
 			app.relaunch();
 			quitWithoutConfirmation();
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/TerminalSettings.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/TerminalSettings.tsx
index 8800cdab342..ae6a4ef6c8f 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/TerminalSettings.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/TerminalSettings.tsx
@@ -1,116 +1,40 @@
-import type {
-	ExecutionMode,
-	TerminalLinkBehavior,
-	TerminalPreset,
-} from "@superset/local-db";
-import {
-	AlertDialog,
-	AlertDialogContent,
-	AlertDialogDescription,
-	AlertDialogFooter,
-	AlertDialogHeader,
-	AlertDialogTitle,
-} from "@superset/ui/alert-dialog";
-import { Button } from "@superset/ui/button";
-import { Label } from "@superset/ui/label";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@superset/ui/select";
-import { toast } from "@superset/ui/sonner";
-import { Switch } from "@superset/ui/switch";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import {
-	HiOutlineCheck,
-	HiOutlinePlus,
-	HiOutlineQuestionMarkCircle,
-} from "react-icons/hi2";
-import {
-	getPresetIcon,
-	useIsDarkTheme,
-} from "renderer/assets/app-icons/preset-icons";
-import { electronTrpc } from "renderer/lib/electron-trpc";
-import { usePresets } from "renderer/react-query/presets";
-import {
-	PRESET_COLUMNS,
-	type PresetColumnKey,
-} from "renderer/routes/_authenticated/settings/presets/types";
-import { DEFAULT_AUTO_APPLY_DEFAULT_PRESET } from "shared/constants";
+import type { ReactNode } from "react";
 import {
 	isItemVisible,
 	SETTING_ITEM_ID,
 	type SettingItemId,
 } from "../../../utils/settings-search";
-import { PresetRow } from "./components/PresetRow";
-
-interface PresetTemplate {
-	name: string;
-	preset: {
-		name: string;
-		description: string;
-		cwd: string;
-		commands: string[];
-	};
-}
-
-const PRESET_TEMPLATES: PresetTemplate[] = [
-	{
-		name: "codex",
-		preset: {
-			name: "codex",
-			description: "Danger mode: All permissions auto-approved",
-			cwd: "",
-			commands: [
-				'codex -c model_reasoning_effort="high" --ask-for-approval never --sandbox danger-full-access -c model_reasoning_summary="detailed" -c model_supports_reasoning_summaries=true',
-			],
-		},
-	},
-	{
-		name: "claude",
-		preset: {
-			name: "claude",
-			description: "Danger mode: All permissions auto-approved",
-			cwd: "",
-			commands: ["claude --dangerously-skip-permissions"],
-		},
-	},
-	{
-		name: "gemini",
-		preset: {
-			name: "gemini",
-			description: "Danger mode: All permissions auto-approved",
-			cwd: "",
-			commands: ["gemini --yolo"],
-		},
-	},
-	{
-		name: "cursor-agent",
-		preset: {
-			name: "cursor-agent",
-			description: "Cursor AI agent for terminal-based coding assistance",
-			cwd: "",
-			commands: ["cursor-agent"],
-		},
-	},
-	{
-		name: "opencode",
-		preset: {
-			name: "opencode",
-			description: "OpenCode: Open-source AI coding agent",
-			cwd: "",
-			commands: ["opencode"],
-		},
-	},
-];
+import { ApplyPresetOnNewTabSetting } from "./components/ApplyPresetOnNewTabSetting";
+import { AutoApplyPresetSetting } from "./components/AutoApplyPresetSetting";
+import { LinkBehaviorSetting } from "./components/LinkBehaviorSetting";
+import { PresetsSection } from "./components/PresetsSection";
+import { SessionsSection } from "./components/SessionsSection";
 
 interface TerminalSettingsProps {
 	visibleItems?: SettingItemId[] | null;
 }
 
+/**
+ * Renders a list of visible sections with automatic border separators.
+ * Each section is its own component that owns its data-fetching,
+ * so query resolutions in one section don't re-render others.
+ */
+function SectionList({ children }: { children: ReactNode[] }) {
+	const visibleChildren = children.filter(Boolean);
+	return (
+		<div>
+			{visibleChildren.map((child, i) => (
+				<div
+					key={(child as React.ReactElement).key ?? i}
+					className={i > 0 ? "pt-6 border-t mt-6" : ""}
+				>
+					{child}
+				</div>
+			))}
+		</div>
+	);
+}
+
 export function TerminalSettings({ visibleItems }: TerminalSettingsProps) {
 	const showPresets = isItemVisible(
 		SETTING_ITEM_ID.TERMINAL_PRESETS,
@@ -124,385 +48,18 @@ export function TerminalSettings({ visibleItems }: TerminalSettingsProps) {
 		SETTING_ITEM_ID.TERMINAL_AUTO_APPLY_PRESET,
 		visibleItems,
 	);
-	const showSessions = isItemVisible(
-		SETTING_ITEM_ID.TERMINAL_SESSIONS,
+	const showApplyPresetOnNewTab = isItemVisible(
+		SETTING_ITEM_ID.TERMINAL_APPLY_PRESET_ON_NEW_TAB,
 		visibleItems,
 	);
 	const showLinkBehavior = isItemVisible(
 		SETTING_ITEM_ID.TERMINAL_LINK_BEHAVIOR,
 		visibleItems,
 	);
-
-	const utils = electronTrpc.useUtils();
-	const isDark = useIsDarkTheme();
-
-	// Presets
-	const {
-		presets: serverPresets,
-		isLoading: isLoadingPresets,
-		createPreset,
-		updatePreset,
-		deletePreset,
-		setDefaultPreset,
-		reorderPresets,
-	} = usePresets();
-	const [localPresets, setLocalPresets] =
-		useState<TerminalPreset[]>(serverPresets);
-	const presetsContainerRef = useRef<HTMLDivElement>(null);
-	const prevPresetsCountRef = useRef(serverPresets.length);
-	const serverPresetsRef = useRef(serverPresets);
-
-	useEffect(() => {
-		serverPresetsRef.current = serverPresets;
-	}, [serverPresets]);
-
-	useEffect(() => {
-		setLocalPresets(serverPresets);
-
-		if (serverPresets.length > prevPresetsCountRef.current) {
-			requestAnimationFrame(() => {
-				presetsContainerRef.current?.scrollTo({
-					top: presetsContainerRef.current.scrollHeight,
-					behavior: "smooth",
-				});
-			});
-		}
-		prevPresetsCountRef.current = serverPresets.length;
-	}, [serverPresets]);
-
-	const existingPresetNames = useMemo(
-		() => new Set(serverPresets.map((p) => p.name)),
-		[serverPresets],
-	);
-
-	const isTemplateAdded = (template: PresetTemplate) =>
-		existingPresetNames.has(template.preset.name);
-
-	const handleCellChange = useCallback(
-		(rowIndex: number, column: PresetColumnKey, value: string) => {
-			setLocalPresets((prev) =>
-				prev.map((p, i) => (i === rowIndex ? { ...p, [column]: value } : p)),
-			);
-		},
-		[],
-	);
-
-	const handleCellBlur = useCallback(
-		(rowIndex: number, column: PresetColumnKey) => {
-			setLocalPresets((currentLocal) => {
-				const preset = currentLocal[rowIndex];
-				if (!preset) return currentLocal;
-				const serverPreset = serverPresetsRef.current.find(
-					(p) => p.id === preset.id,
-				);
-				if (!serverPreset) return currentLocal;
-				if (preset[column] === serverPreset[column]) return currentLocal;
-
-				updatePreset.mutate({
-					id: preset.id,
-					patch: { [column]: preset[column] },
-				});
-				return currentLocal;
-			});
-		},
-		[updatePreset],
-	);
-
-	const handleCommandsChange = useCallback(
-		(rowIndex: number, commands: string[]) => {
-			setLocalPresets((prev) => {
-				const preset = prev[rowIndex];
-				const isDelete = preset && commands.length < preset.commands.length;
-				const newPresets = prev.map((p, i) =>
-					i === rowIndex ? { ...p, commands } : p,
-				);
-
-				// Save immediately on delete since onBlur won't have the updated state yet
-				if (isDelete && preset) {
-					updatePreset.mutate({
-						id: preset.id,
-						patch: { commands },
-					});
-				}
-				return newPresets;
-			});
-		},
-		[updatePreset],
-	);
-
-	const handleCommandsBlur = useCallback(
-		(rowIndex: number) => {
-			setLocalPresets((currentLocal) => {
-				const preset = currentLocal[rowIndex];
-				if (!preset) return currentLocal;
-				const serverPreset = serverPresetsRef.current.find(
-					(p) => p.id === preset.id,
-				);
-				if (!serverPreset) return currentLocal;
-				if (
-					JSON.stringify(preset.commands) ===
-					JSON.stringify(serverPreset.commands)
-				)
-					return currentLocal;
-
-				updatePreset.mutate({
-					id: preset.id,
-					patch: { commands: preset.commands },
-				});
-				return currentLocal;
-			});
-		},
-		[updatePreset],
-	);
-
-	const handleExecutionModeChange = useCallback(
-		(rowIndex: number, mode: ExecutionMode) => {
-			setLocalPresets((currentLocal) => {
-				const preset = currentLocal[rowIndex];
-				if (!preset) return currentLocal;
-
-				const newPresets = currentLocal.map((p, i) =>
-					i === rowIndex ? { ...p, executionMode: mode } : p,
-				);
-
-				updatePreset.mutate({
-					id: preset.id,
-					patch: { executionMode: mode },
-				});
-
-				return newPresets;
-			});
-		},
-		[updatePreset],
-	);
-
-	const handleAddRow = useCallback(() => {
-		createPreset.mutate({
-			name: "",
-			cwd: "",
-			commands: [""],
-		});
-	}, [createPreset]);
-
-	const handleAddTemplate = useCallback(
-		(template: PresetTemplate) => {
-			if (existingPresetNames.has(template.preset.name)) return;
-			createPreset.mutate(template.preset);
-		},
-		[createPreset, existingPresetNames],
-	);
-
-	const handleDeleteRow = useCallback(
-		(rowIndex: number) => {
-			setLocalPresets((currentLocal) => {
-				const preset = currentLocal[rowIndex];
-				if (preset) {
-					deletePreset.mutate({ id: preset.id });
-				}
-				return currentLocal;
-			});
-		},
-		[deletePreset],
-	);
-
-	const handleSetDefault = useCallback(
-		(presetId: string | null) => {
-			setDefaultPreset.mutate({ id: presetId });
-		},
-		[setDefaultPreset],
-	);
-
-	const handleLocalReorder = useCallback(
-		(fromIndex: number, toIndex: number) => {
-			setLocalPresets((prev) => {
-				const newPresets = [...prev];
-				const [removed] = newPresets.splice(fromIndex, 1);
-				newPresets.splice(toIndex, 0, removed);
-				return newPresets;
-			});
-		},
-		[],
-	);
-
-	const handlePersistReorder = useCallback(
-		(presetId: string, targetIndex: number) => {
-			reorderPresets.mutate({ presetId, targetIndex });
-		},
-		[reorderPresets],
-	);
-
-	const { data: daemonSessions } =
-		electronTrpc.terminal.listDaemonSessions.useQuery();
-	const sessions = daemonSessions?.sessions ?? [];
-	const aliveSessions = useMemo(
-		() => sessions.filter((session) => session.isAlive),
-		[sessions],
+	const showSessions = isItemVisible(
+		SETTING_ITEM_ID.TERMINAL_SESSIONS,
+		visibleItems,
 	);
-	const sessionsSorted = useMemo(() => {
-		return [...aliveSessions].sort((a, b) => {
-			// Attached sessions first, then newest attach time.
-			if (a.attachedClients !== b.attachedClients) {
-				return b.attachedClients - a.attachedClients;
-			}
-			const aTime = a.lastAttachedAt ? Date.parse(a.lastAttachedAt) : 0;
-			const bTime = b.lastAttachedAt ? Date.parse(b.lastAttachedAt) : 0;
-			return bTime - aTime;
-		});
-	}, [aliveSessions]);
-
-	const [confirmKillAllOpen, setConfirmKillAllOpen] = useState(false);
-	const [confirmClearHistoryOpen, setConfirmClearHistoryOpen] = useState(false);
-	const [confirmRestartDaemonOpen, setConfirmRestartDaemonOpen] =
-		useState(false);
-	const [showSessionList, setShowSessionList] = useState(false);
-	const [pendingKillSession, setPendingKillSession] = useState<{
-		sessionId: string;
-		workspaceId: string;
-	} | null>(null);
-
-	// Terminal link behavior setting
-	const { data: terminalLinkBehavior, isLoading: isLoadingLinkBehavior } =
-		electronTrpc.settings.getTerminalLinkBehavior.useQuery();
-
-	const setTerminalLinkBehavior =
-		electronTrpc.settings.setTerminalLinkBehavior.useMutation({
-			onMutate: async ({ behavior }) => {
-				await utils.settings.getTerminalLinkBehavior.cancel();
-				const previous = utils.settings.getTerminalLinkBehavior.getData();
-				utils.settings.getTerminalLinkBehavior.setData(undefined, behavior);
-				return { previous };
-			},
-			onError: (_err, _vars, context) => {
-				if (context?.previous !== undefined) {
-					utils.settings.getTerminalLinkBehavior.setData(
-						undefined,
-						context.previous,
-					);
-				}
-			},
-			onSettled: () => {
-				utils.settings.getTerminalLinkBehavior.invalidate();
-			},
-		});
-
-	const handleLinkBehaviorChange = (value: string) => {
-		setTerminalLinkBehavior.mutate({
-			behavior: value as TerminalLinkBehavior,
-		});
-	};
-
-	// Auto-apply default preset setting
-	const { data: autoApplyDefaultPreset, isLoading: isLoadingAutoApply } =
-		electronTrpc.settings.getAutoApplyDefaultPreset.useQuery();
-
-	const setAutoApplyDefaultPreset =
-		electronTrpc.settings.setAutoApplyDefaultPreset.useMutation({
-			onMutate: async ({ enabled }) => {
-				await utils.settings.getAutoApplyDefaultPreset.cancel();
-				const previous = utils.settings.getAutoApplyDefaultPreset.getData();
-				utils.settings.getAutoApplyDefaultPreset.setData(undefined, enabled);
-				return { previous };
-			},
-			onError: (_err, _vars, context) => {
-				if (context?.previous !== undefined) {
-					utils.settings.getAutoApplyDefaultPreset.setData(
-						undefined,
-						context.previous,
-					);
-				}
-			},
-			onSettled: () => {
-				utils.settings.getAutoApplyDefaultPreset.invalidate();
-			},
-		});
-
-	const handleAutoApplyToggle = (enabled: boolean) => {
-		setAutoApplyDefaultPreset.mutate({ enabled });
-	};
-
-	const killAllDaemonSessions =
-		electronTrpc.terminal.killAllDaemonSessions.useMutation({
-			onMutate: async () => {
-				await utils.terminal.listDaemonSessions.cancel();
-				const previous = utils.terminal.listDaemonSessions.getData();
-				utils.terminal.listDaemonSessions.setData(undefined, {
-					sessions: [],
-				});
-				return { previous };
-			},
-			onSuccess: (result) => {
-				if (result.remainingCount > 0) {
-					toast.warning("Some sessions could not be killed", {
-						description: `${result.killedCount} terminated, ${result.remainingCount} remaining`,
-					});
-				} else {
-					toast.success("Killed all terminal sessions", {
-						description: `${result.killedCount} sessions terminated`,
-					});
-				}
-			},
-			onError: (error, _vars, context) => {
-				if (context?.previous) {
-					utils.terminal.listDaemonSessions.setData(
-						undefined,
-						context.previous,
-					);
-				}
-				toast.error("Failed to kill sessions", {
-					description: error.message,
-				});
-			},
-			onSettled: () => {
-				setTimeout(() => {
-					utils.terminal.listDaemonSessions.invalidate();
-				}, 300);
-			},
-		});
-
-	const clearTerminalHistory =
-		electronTrpc.terminal.clearTerminalHistory.useMutation({
-			onSuccess: () => {
-				toast.success("Cleared terminal history");
-				utils.terminal.listDaemonSessions.invalidate();
-			},
-			onError: (error) => {
-				toast.error("Failed to clear terminal history", {
-					description: error.message,
-				});
-			},
-		});
-
-	const killDaemonSession = electronTrpc.terminal.kill.useMutation({
-		onSuccess: () => {
-			toast.success("Killed terminal session");
-			utils.terminal.listDaemonSessions.invalidate();
-		},
-		onError: (error) => {
-			toast.error("Failed to kill session", {
-				description: error.message,
-			});
-		},
-	});
-
-	const restartDaemon = electronTrpc.terminal.restartDaemon.useMutation({
-		onSuccess: () => {
-			toast.success("Daemon restarted", {
-				description:
-					"Terminal daemon has been restarted. Open a terminal to spawn a fresh daemon.",
-			});
-			utils.terminal.listDaemonSessions.invalidate();
-		},
-		onError: (error) => {
-			toast.error("Failed to restart daemon", {
-				description: error.message,
-			});
-		},
-	});
-
-	const formatTimestamp = (value?: string) => {
-		if (!value) return "—";
-		return value.replace("T", " ").replace(/\.\d+Z$/, "Z");
-	};
 
 	return (
 		<div className="p-6 max-w-7xl w-full">
@@ -513,536 +70,21 @@ export function TerminalSettings({ visibleItems }: TerminalSettingsProps) {
 				</p>
 			</div>
 
-			<div className="space-y-6">
-				{/* Presets Section */}
+			<SectionList>
 				{(showPresets || showQuickAdd) && (
-					<div className="space-y-4">
-						<div className="flex items-center justify-between">
-							<div className="space-y-0.5">
-								<Label className="text-sm font-medium">Terminal Presets</Label>
-								<p className="text-xs text-muted-foreground">
-									Presets let you quickly launch terminals with pre-configured
-									commands.
-								</p>
-							</div>
-							{showPresets && (
-								<Button
-									variant="default"
-									size="sm"
-									className="gap-2"
-									onClick={handleAddRow}
-								>
-									<HiOutlinePlus className="h-4 w-4" />
-									Add Preset
-								</Button>
-							)}
-						</div>
-
-						{showQuickAdd && (
-							<div className="flex flex-wrap gap-2">
-								<span className="text-xs text-muted-foreground mr-1 self-center">
-									Quick add:
-								</span>
-								{PRESET_TEMPLATES.map((template) => {
-									const alreadyAdded = isTemplateAdded(template);
-									const presetIcon = getPresetIcon(template.name, isDark);
-									return (
-										<Tooltip key={template.name}>
-											<TooltipTrigger asChild>
-												<Button
-													variant="outline"
-													size="sm"
-													className="gap-1.5 text-xs h-7"
-													onClick={() => handleAddTemplate(template)}
-													disabled={alreadyAdded || createPreset.isPending}
-												>
-													{alreadyAdded ? (
-														<HiOutlineCheck className="h-3 w-3" />
-													) : presetIcon ? (
-														<img
-															src={presetIcon}
-															alt=""
-															className="h-3 w-3 object-contain"
-														/>
-													) : null}
-													{template.name}
-												</Button>
-											</TooltipTrigger>
-											<TooltipContent side="bottom" showArrow={false}>
-												{alreadyAdded
-													? "Already added"
-													: template.preset.description}
-											</TooltipContent>
-										</Tooltip>
-									);
-								})}
-							</div>
-						)}
-
-						{showPresets && (
-							<div className="rounded-lg border border-border overflow-hidden">
-								<div className="flex items-center gap-4 py-2 px-4 bg-accent/10 border-b border-border">
-									<div className="w-6 shrink-0" />
-									{PRESET_COLUMNS.map((column) => (
-										<div
-											key={column.key}
-											className="flex-1 text-xs font-medium text-muted-foreground uppercase tracking-wider"
-										>
-											{column.label}
-										</div>
-									))}
-									<Tooltip>
-										<TooltipTrigger asChild>
-											<div className="w-28 text-xs font-medium text-muted-foreground uppercase tracking-wider shrink-0 cursor-help flex items-center gap-1">
-												Mode
-												<HiOutlineQuestionMarkCircle className="h-3.5 w-3.5" />
-											</div>
-										</TooltipTrigger>
-										<TooltipContent side="top" className="max-w-xs">
-											<p className="font-medium mb-1">Execution Mode</p>
-											<p className="text-xs">
-												<strong>Sequential:</strong> Commands run one after
-												another in a single terminal (joined with &&)
-											</p>
-											<p className="text-xs mt-1">
-												<strong>Parallel:</strong> Each command runs in its own
-												split pane within a single tab
-											</p>
-										</TooltipContent>
-									</Tooltip>
-									<div className="w-20 text-xs font-medium text-muted-foreground uppercase tracking-wider text-center shrink-0">
-										Actions
-									</div>
-								</div>
-
-								<div
-									ref={presetsContainerRef}
-									className="max-h-[320px] overflow-y-auto"
-								>
-									{isLoadingPresets ? (
-										<div className="py-8 text-center text-sm text-muted-foreground">
-											Loading presets...
-										</div>
-									) : localPresets.length > 0 ? (
-										localPresets.map((preset, index) => (
-											<PresetRow
-												key={preset.id}
-												preset={preset}
-												rowIndex={index}
-												isEven={index % 2 === 0}
-												onChange={handleCellChange}
-												onBlur={handleCellBlur}
-												onCommandsChange={handleCommandsChange}
-												onCommandsBlur={handleCommandsBlur}
-												onExecutionModeChange={handleExecutionModeChange}
-												onDelete={handleDeleteRow}
-												onSetDefault={handleSetDefault}
-												onLocalReorder={handleLocalReorder}
-												onPersistReorder={handlePersistReorder}
-											/>
-										))
-									) : (
-										<div className="py-8 text-center text-sm text-muted-foreground">
-											No presets yet. Click "Add Preset" to create your first
-											preset.
-										</div>
-									)}
-								</div>
-							</div>
-						)}
-					</div>
-				)}
-
-				{showAutoApplyPreset && (
-					<div
-						className={
-							showPresets || showQuickAdd
-								? "flex items-center justify-between pt-6 border-t"
-								: "flex items-center justify-between"
-						}
-					>
-						<div className="space-y-0.5">
-							<Label
-								htmlFor="auto-apply-preset"
-								className="text-sm font-medium"
-							>
-								Auto-apply default preset
-							</Label>
-							<p className="text-xs text-muted-foreground">
-								Automatically apply your default preset when creating new
-								workspaces
-							</p>
-						</div>
-						<Switch
-							id="auto-apply-preset"
-							checked={
-								autoApplyDefaultPreset ?? DEFAULT_AUTO_APPLY_DEFAULT_PRESET
-							}
-							onCheckedChange={handleAutoApplyToggle}
-							disabled={
-								isLoadingAutoApply || setAutoApplyDefaultPreset.isPending
-							}
-						/>
-					</div>
+					<PresetsSection
+						key="presets"
+						showPresets={showPresets}
+						showQuickAdd={showQuickAdd}
+					/>
 				)}
-
-				{showLinkBehavior && (
-					<div
-						className={
-							showPresets || showQuickAdd || showAutoApplyPreset
-								? "flex items-center justify-between pt-6 border-t"
-								: "flex items-center justify-between"
-						}
-					>
-						<div className="space-y-0.5">
-							<Label
-								htmlFor="terminal-link-behavior"
-								className="text-sm font-medium"
-							>
-								Terminal file links
-							</Label>
-							<p className="text-xs text-muted-foreground">
-								Choose how to open file paths when Cmd+clicking in the terminal
-							</p>
-						</div>
-						<Select
-							value={terminalLinkBehavior ?? "external-editor"}
-							onValueChange={handleLinkBehaviorChange}
-							disabled={
-								isLoadingLinkBehavior || setTerminalLinkBehavior.isPending
-							}
-						>
-							<SelectTrigger className="w-[180px]">
-								<SelectValue />
-							</SelectTrigger>
-							<SelectContent>
-								<SelectItem value="external-editor">External editor</SelectItem>
-								<SelectItem value="file-viewer">File viewer</SelectItem>
-							</SelectContent>
-						</Select>
-					</div>
-				)}
-
-				{showSessions && (
-					<div className="rounded-md border border-border/60 p-4 space-y-3">
-						<div className="space-y-0.5">
-							<div className="flex items-center justify-between">
-								<Label className="text-sm font-medium">Manage sessions</Label>
-								<Button
-									variant="ghost"
-									size="sm"
-									onClick={() => utils.terminal.listDaemonSessions.invalidate()}
-								>
-									Refresh
-								</Button>
-							</div>
-							<p className="text-xs text-muted-foreground">
-								Daemon sessions running: {aliveSessions.length}
-							</p>
-							{aliveSessions.length >= 20 && (
-								<p className="text-xs text-muted-foreground/70">
-									Large numbers of persistent terminals can increase CPU/memory
-									usage. Consider killing old sessions if you notice slowdowns.
-								</p>
-							)}
-						</div>
-
-						<div className="flex flex-wrap gap-2">
-							<Button
-								variant="destructive"
-								size="sm"
-								disabled={
-									aliveSessions.length === 0 || killAllDaemonSessions.isPending
-								}
-								onClick={() => setConfirmKillAllOpen(true)}
-							>
-								Kill all sessions
-							</Button>
-							<Button
-								variant="secondary"
-								size="sm"
-								disabled={
-									aliveSessions.length === 0 || clearTerminalHistory.isPending
-								}
-								onClick={() => setConfirmClearHistoryOpen(true)}
-							>
-								Clear terminal history
-							</Button>
-							<Button
-								variant="outline"
-								size="sm"
-								disabled={restartDaemon.isPending}
-								onClick={() => setConfirmRestartDaemonOpen(true)}
-							>
-								Restart daemon
-							</Button>
-							<Button
-								variant="ghost"
-								size="sm"
-								disabled={aliveSessions.length === 0}
-								onClick={() => setShowSessionList((v) => !v)}
-							>
-								{showSessionList ? "Hide sessions" : "Show sessions"}
-							</Button>
-						</div>
-
-						{showSessionList && aliveSessions.length > 0 && (
-							<div className="rounded-md border border-border/60 overflow-hidden">
-								<div className="max-h-64 overflow-auto">
-									<table className="w-full text-xs">
-										<thead className="sticky top-0 bg-background">
-											<tr className="text-muted-foreground">
-												<th className="px-2 py-2 text-left font-medium">
-													Workspace
-												</th>
-												<th className="px-2 py-2 text-left font-medium">
-													Session
-												</th>
-												<th className="px-2 py-2 text-right font-medium">
-													Clients
-												</th>
-												<th className="px-2 py-2 text-right font-medium">
-													PID
-												</th>
-												<th className="px-2 py-2 text-left font-medium">
-													Last attached
-												</th>
-												<th className="px-2 py-2 text-right font-medium">
-													Action
-												</th>
-											</tr>
-										</thead>
-										<tbody className="divide-y divide-border/60">
-											{sessionsSorted.map((session) => (
-												<tr
-													key={session.sessionId}
-													className="hover:bg-muted/30"
-												>
-													<td className="px-2 py-2 font-mono">
-														{session.workspaceId}
-													</td>
-													<td className="px-2 py-2 font-mono">
-														{session.sessionId}
-													</td>
-													<td className="px-2 py-2 text-right">
-														{session.attachedClients}
-													</td>
-													<td className="px-2 py-2 text-right font-mono">
-														{session.pid ?? "—"}
-													</td>
-													<td className="px-2 py-2">
-														{formatTimestamp(session.lastAttachedAt)}
-													</td>
-													<td className="px-2 py-2 text-right">
-														<Button
-															variant="ghost"
-															size="sm"
-															onClick={() =>
-																setPendingKillSession({
-																	sessionId: session.sessionId,
-																	workspaceId: session.workspaceId,
-																})
-															}
-														>
-															Kill
-														</Button>
-													</td>
-												</tr>
-											))}
-										</tbody>
-									</table>
-								</div>
-							</div>
-						)}
-					</div>
+				{showAutoApplyPreset && <AutoApplyPresetSetting key="auto-apply" />}
+				{showApplyPresetOnNewTab && (
+					<ApplyPresetOnNewTabSetting key="apply-on-new-tab" />
 				)}
-			</div>
-
-			<AlertDialog
-				open={confirmKillAllOpen}
-				onOpenChange={setConfirmKillAllOpen}
-			>
-				<AlertDialogContent className="max-w-[520px] gap-0 p-0">
-					<AlertDialogHeader className="px-4 pt-4 pb-2">
-						<AlertDialogTitle className="font-medium">
-							Kill all terminal sessions?
-						</AlertDialogTitle>
-						<AlertDialogDescription asChild>
-							<div className="text-muted-foreground space-y-1.5">
-								<span className="block">
-									This will terminate all persistent terminal processes (builds,
-									tests, agents, etc.).
-								</span>
-								<span className="block">
-									You can't undo this action. Terminal panes will show "Process
-									exited" and can be restarted.
-								</span>
-							</div>
-						</AlertDialogDescription>
-					</AlertDialogHeader>
-					<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
-						<Button
-							variant="ghost"
-							size="sm"
-							onClick={() => setConfirmKillAllOpen(false)}
-						>
-							Cancel
-						</Button>
-						<Button
-							variant="destructive"
-							size="sm"
-							disabled={killAllDaemonSessions.isPending}
-							onClick={() => {
-								setConfirmKillAllOpen(false);
-								killAllDaemonSessions.mutate();
-							}}
-						>
-							Kill all
-						</Button>
-					</AlertDialogFooter>
-				</AlertDialogContent>
-			</AlertDialog>
-
-			<AlertDialog
-				open={confirmClearHistoryOpen}
-				onOpenChange={setConfirmClearHistoryOpen}
-			>
-				<AlertDialogContent className="max-w-[520px] gap-0 p-0">
-					<AlertDialogHeader className="px-4 pt-4 pb-2">
-						<AlertDialogTitle className="font-medium">
-							Clear terminal history?
-						</AlertDialogTitle>
-						<AlertDialogDescription asChild>
-							<div className="text-muted-foreground space-y-1.5">
-								<span className="block">
-									This deletes the saved scrollback used for reboot/crash
-									recovery.
-								</span>
-								<span className="block">
-									Running terminal processes continue, but older output may no
-									longer be available after restarting the app.
-								</span>
-							</div>
-						</AlertDialogDescription>
-					</AlertDialogHeader>
-					<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
-						<Button
-							variant="ghost"
-							size="sm"
-							onClick={() => setConfirmClearHistoryOpen(false)}
-						>
-							Cancel
-						</Button>
-						<Button
-							variant="secondary"
-							size="sm"
-							disabled={clearTerminalHistory.isPending}
-							onClick={() => {
-								setConfirmClearHistoryOpen(false);
-								clearTerminalHistory.mutate();
-							}}
-						>
-							Clear history
-						</Button>
-					</AlertDialogFooter>
-				</AlertDialogContent>
-			</AlertDialog>
-
-			<AlertDialog
-				open={!!pendingKillSession}
-				onOpenChange={(open) => {
-					if (!open) setPendingKillSession(null);
-				}}
-			>
-				<AlertDialogContent className="max-w-[520px] gap-0 p-0">
-					<AlertDialogHeader className="px-4 pt-4 pb-2">
-						<AlertDialogTitle className="font-medium">
-							Kill terminal session?
-						</AlertDialogTitle>
-						<AlertDialogDescription asChild>
-							<div className="text-muted-foreground space-y-1.5">
-								<span className="block">
-									This will terminate the session and its underlying process.
-								</span>
-								{pendingKillSession && (
-									<span className="block font-mono text-xs">
-										{pendingKillSession.workspaceId} /{" "}
-										{pendingKillSession.sessionId}
-									</span>
-								)}
-							</div>
-						</AlertDialogDescription>
-					</AlertDialogHeader>
-					<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
-						<Button
-							variant="ghost"
-							size="sm"
-							onClick={() => setPendingKillSession(null)}
-						>
-							Cancel
-						</Button>
-						<Button
-							variant="destructive"
-							size="sm"
-							disabled={killDaemonSession.isPending}
-							onClick={() => {
-								const sessionId = pendingKillSession?.sessionId;
-								setPendingKillSession(null);
-								if (!sessionId) return;
-								killDaemonSession.mutate({ paneId: sessionId });
-							}}
-						>
-							Kill
-						</Button>
-					</AlertDialogFooter>
-				</AlertDialogContent>
-			</AlertDialog>
-
-			<AlertDialog
-				open={confirmRestartDaemonOpen}
-				onOpenChange={setConfirmRestartDaemonOpen}
-			>
-				<AlertDialogContent className="max-w-[520px] gap-0 p-0">
-					<AlertDialogHeader className="px-4 pt-4 pb-2">
-						<AlertDialogTitle className="font-medium">
-							Restart terminal daemon?
-						</AlertDialogTitle>
-						<AlertDialogDescription asChild>
-							<div className="text-muted-foreground space-y-1.5">
-								<span className="block">
-									This will shut down the terminal daemon process and kill all
-									running sessions. Use this to fix terminals that are stuck or
-									unresponsive.
-								</span>
-								<span className="block">
-									A fresh daemon will start automatically when you open a new
-									terminal.
-								</span>
-							</div>
-						</AlertDialogDescription>
-					</AlertDialogHeader>
-					<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
-						<Button
-							variant="ghost"
-							size="sm"
-							onClick={() => setConfirmRestartDaemonOpen(false)}
-						>
-							Cancel
-						</Button>
-						<Button
-							variant="default"
-							size="sm"
-							disabled={restartDaemon.isPending}
-							onClick={() => {
-								setConfirmRestartDaemonOpen(false);
-								restartDaemon.mutate(undefined, {});
-							}}
-						>
-							Restart daemon
-						</Button>
-					</AlertDialogFooter>
-				</AlertDialogContent>
-			</AlertDialog>
+				{showLinkBehavior && <LinkBehaviorSetting key="link-behavior" />}
+				{showSessions && <SessionsSection key="sessions" />}
+			</SectionList>
 		</div>
 	);
 }
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/ApplyPresetOnNewTabSetting.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/ApplyPresetOnNewTabSetting.tsx
new file mode 100644
index 00000000000..82c187e17cc
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/ApplyPresetOnNewTabSetting.tsx
@@ -0,0 +1,57 @@
+import { Label } from "@superset/ui/label";
+import { Switch } from "@superset/ui/switch";
+import { electronTrpc } from "renderer/lib/electron-trpc";
+import { DEFAULT_APPLY_PRESET_ON_NEW_TAB } from "shared/constants";
+
+export function ApplyPresetOnNewTabSetting() {
+	const utils = electronTrpc.useUtils();
+
+	const { data: applyPresetOnNewTab, isLoading } =
+		electronTrpc.settings.getApplyPresetOnNewTab.useQuery();
+
+	const setApplyPresetOnNewTab =
+		electronTrpc.settings.setApplyPresetOnNewTab.useMutation({
+			onMutate: async ({ enabled }) => {
+				await utils.settings.getApplyPresetOnNewTab.cancel();
+				const previous = utils.settings.getApplyPresetOnNewTab.getData();
+				utils.settings.getApplyPresetOnNewTab.setData(undefined, enabled);
+				return { previous };
+			},
+			onError: (_err, _vars, context) => {
+				if (context?.previous !== undefined) {
+					utils.settings.getApplyPresetOnNewTab.setData(
+						undefined,
+						context.previous,
+					);
+				}
+			},
+			onSettled: () => {
+				utils.settings.getApplyPresetOnNewTab.invalidate();
+			},
+		});
+
+	return (
+		<div className="flex items-center justify-between">
+			<div className="space-y-0.5">
+				<Label
+					htmlFor="apply-preset-on-new-tab"
+					className="text-sm font-medium"
+				>
+					Apply preset on new tab
+				</Label>
+				<p className="text-xs text-muted-foreground">
+					Automatically apply your default preset when opening new tabs, panes,
+					or splits
+				</p>
+			</div>
+			<Switch
+				id="apply-preset-on-new-tab"
+				checked={applyPresetOnNewTab ?? DEFAULT_APPLY_PRESET_ON_NEW_TAB}
+				onCheckedChange={(enabled) =>
+					setApplyPresetOnNewTab.mutate({ enabled })
+				}
+				disabled={isLoading || setApplyPresetOnNewTab.isPending}
+			/>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/AutoApplyPresetSetting.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/AutoApplyPresetSetting.tsx
new file mode 100644
index 00000000000..cde96246f1c
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/AutoApplyPresetSetting.tsx
@@ -0,0 +1,53 @@
+import { Label } from "@superset/ui/label";
+import { Switch } from "@superset/ui/switch";
+import { electronTrpc } from "renderer/lib/electron-trpc";
+import { DEFAULT_AUTO_APPLY_DEFAULT_PRESET } from "shared/constants";
+
+export function AutoApplyPresetSetting() {
+	const utils = electronTrpc.useUtils();
+
+	const { data: autoApplyDefaultPreset, isLoading } =
+		electronTrpc.settings.getAutoApplyDefaultPreset.useQuery();
+
+	const setAutoApplyDefaultPreset =
+		electronTrpc.settings.setAutoApplyDefaultPreset.useMutation({
+			onMutate: async ({ enabled }) => {
+				await utils.settings.getAutoApplyDefaultPreset.cancel();
+				const previous = utils.settings.getAutoApplyDefaultPreset.getData();
+				utils.settings.getAutoApplyDefaultPreset.setData(undefined, enabled);
+				return { previous };
+			},
+			onError: (_err, _vars, context) => {
+				if (context?.previous !== undefined) {
+					utils.settings.getAutoApplyDefaultPreset.setData(
+						undefined,
+						context.previous,
+					);
+				}
+			},
+			onSettled: () => {
+				utils.settings.getAutoApplyDefaultPreset.invalidate();
+			},
+		});
+
+	return (
+		<div className="flex items-center justify-between">
+			<div className="space-y-0.5">
+				<Label htmlFor="auto-apply-preset" className="text-sm font-medium">
+					Apply preset on workspace creation
+				</Label>
+				<p className="text-xs text-muted-foreground">
+					Automatically apply your default preset when creating new workspaces
+				</p>
+			</div>
+			<Switch
+				id="auto-apply-preset"
+				checked={autoApplyDefaultPreset ?? DEFAULT_AUTO_APPLY_DEFAULT_PRESET}
+				onCheckedChange={(enabled) =>
+					setAutoApplyDefaultPreset.mutate({ enabled })
+				}
+				disabled={isLoading || setAutoApplyDefaultPreset.isPending}
+			/>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/LinkBehaviorSetting.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/LinkBehaviorSetting.tsx
new file mode 100644
index 00000000000..963a2157f40
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/LinkBehaviorSetting.tsx
@@ -0,0 +1,68 @@
+import type { TerminalLinkBehavior } from "@superset/local-db";
+import { Label } from "@superset/ui/label";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@superset/ui/select";
+import { electronTrpc } from "renderer/lib/electron-trpc";
+
+export function LinkBehaviorSetting() {
+	const utils = electronTrpc.useUtils();
+
+	const { data: terminalLinkBehavior, isLoading } =
+		electronTrpc.settings.getTerminalLinkBehavior.useQuery();
+
+	const setTerminalLinkBehavior =
+		electronTrpc.settings.setTerminalLinkBehavior.useMutation({
+			onMutate: async ({ behavior }) => {
+				await utils.settings.getTerminalLinkBehavior.cancel();
+				const previous = utils.settings.getTerminalLinkBehavior.getData();
+				utils.settings.getTerminalLinkBehavior.setData(undefined, behavior);
+				return { previous };
+			},
+			onError: (_err, _vars, context) => {
+				if (context?.previous !== undefined) {
+					utils.settings.getTerminalLinkBehavior.setData(
+						undefined,
+						context.previous,
+					);
+				}
+			},
+			onSettled: () => {
+				utils.settings.getTerminalLinkBehavior.invalidate();
+			},
+		});
+
+	return (
+		<div className="flex items-center justify-between">
+			<div className="space-y-0.5">
+				<Label htmlFor="terminal-link-behavior" className="text-sm font-medium">
+					Terminal file links
+				</Label>
+				<p className="text-xs text-muted-foreground">
+					Choose how to open file paths when Cmd+clicking in the terminal
+				</p>
+			</div>
+			<Select
+				value={terminalLinkBehavior ?? "external-editor"}
+				onValueChange={(value) =>
+					setTerminalLinkBehavior.mutate({
+						behavior: value as TerminalLinkBehavior,
+					})
+				}
+				disabled={isLoading || setTerminalLinkBehavior.isPending}
+			>
+				<SelectTrigger className="w-[180px]">
+					<SelectValue />
+				</SelectTrigger>
+				<SelectContent>
+					<SelectItem value="external-editor">External editor</SelectItem>
+					<SelectItem value="file-viewer">File viewer</SelectItem>
+				</SelectContent>
+			</Select>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
index 785d5e298db..7f83cb2f54e 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
@@ -9,7 +9,7 @@ import {
 	SelectValue,
 } from "@superset/ui/select";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
-import { useRef } from "react";
+import { useEffect, useRef } from "react";
 import { useDrag, useDrop } from "react-dnd";
 import { HiOutlineStar, HiStar } from "react-icons/hi2";
 import { LuGripVertical, LuTrash } from "react-icons/lu";
@@ -125,8 +125,10 @@ export function PresetRow({
 		},
 	});
 
-	preview(drop(rowRef));
-	drag(dragHandleRef);
+	useEffect(() => {
+		preview(drop(rowRef));
+		drag(dragHandleRef);
+	}, [preview, drop, drag]);
 
 	const handleToggleDefault = () => {
 		onSetDefault(preset.isDefault ? null : preset.id);
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
new file mode 100644
index 00000000000..725743e9f62
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
@@ -0,0 +1,420 @@
+import type { ExecutionMode, TerminalPreset } from "@superset/local-db";
+import { Button } from "@superset/ui/button";
+import { Label } from "@superset/ui/label";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import {
+	HiOutlineCheck,
+	HiOutlinePlus,
+	HiOutlineQuestionMarkCircle,
+} from "react-icons/hi2";
+import {
+	getPresetIcon,
+	useIsDarkTheme,
+} from "renderer/assets/app-icons/preset-icons";
+import { usePresets } from "renderer/react-query/presets";
+import {
+	PRESET_COLUMNS,
+	type PresetColumnKey,
+} from "renderer/routes/_authenticated/settings/presets/types";
+import { PresetRow } from "./PresetRow";
+
+interface PresetTemplate {
+	name: string;
+	preset: {
+		name: string;
+		description: string;
+		cwd: string;
+		commands: string[];
+	};
+}
+
+const PRESET_TEMPLATES: PresetTemplate[] = [
+	{
+		name: "codex",
+		preset: {
+			name: "codex",
+			description: "Danger mode: All permissions auto-approved",
+			cwd: "",
+			commands: [
+				'codex -c model_reasoning_effort="high" --ask-for-approval never --sandbox danger-full-access -c model_reasoning_summary="detailed" -c model_supports_reasoning_summaries=true',
+			],
+		},
+	},
+	{
+		name: "claude",
+		preset: {
+			name: "claude",
+			description: "Danger mode: All permissions auto-approved",
+			cwd: "",
+			commands: ["claude --dangerously-skip-permissions"],
+		},
+	},
+	{
+		name: "gemini",
+		preset: {
+			name: "gemini",
+			description: "Danger mode: All permissions auto-approved",
+			cwd: "",
+			commands: ["gemini --yolo"],
+		},
+	},
+	{
+		name: "cursor-agent",
+		preset: {
+			name: "cursor-agent",
+			description: "Cursor AI agent for terminal-based coding assistance",
+			cwd: "",
+			commands: ["cursor-agent"],
+		},
+	},
+	{
+		name: "opencode",
+		preset: {
+			name: "opencode",
+			description: "OpenCode: Open-source AI coding agent",
+			cwd: "",
+			commands: ["opencode"],
+		},
+	},
+];
+
+interface PresetsSectionProps {
+	showPresets: boolean;
+	showQuickAdd: boolean;
+}
+
+export function PresetsSection({
+	showPresets,
+	showQuickAdd,
+}: PresetsSectionProps) {
+	const isDark = useIsDarkTheme();
+	const {
+		presets: serverPresets,
+		isLoading: isLoadingPresets,
+		createPreset,
+		updatePreset,
+		deletePreset,
+		setDefaultPreset,
+		reorderPresets,
+	} = usePresets();
+
+	const [localPresets, setLocalPresets] =
+		useState<TerminalPreset[]>(serverPresets);
+	const presetsContainerRef = useRef<HTMLDivElement>(null);
+	const prevPresetsCountRef = useRef(serverPresets.length);
+	const serverPresetsRef = useRef(serverPresets);
+
+	useEffect(() => {
+		serverPresetsRef.current = serverPresets;
+	}, [serverPresets]);
+
+	useEffect(() => {
+		setLocalPresets(serverPresets);
+
+		if (serverPresets.length > prevPresetsCountRef.current) {
+			requestAnimationFrame(() => {
+				presetsContainerRef.current?.scrollTo({
+					top: presetsContainerRef.current.scrollHeight,
+					behavior: "smooth",
+				});
+			});
+		}
+		prevPresetsCountRef.current = serverPresets.length;
+	}, [serverPresets]);
+
+	const existingPresetNames = useMemo(
+		() => new Set(serverPresets.map((p) => p.name)),
+		[serverPresets],
+	);
+
+	const isTemplateAdded = (template: PresetTemplate) =>
+		existingPresetNames.has(template.preset.name);
+
+	const handleCellChange = useCallback(
+		(rowIndex: number, column: PresetColumnKey, value: string) => {
+			setLocalPresets((prev) =>
+				prev.map((p, i) => (i === rowIndex ? { ...p, [column]: value } : p)),
+			);
+		},
+		[],
+	);
+
+	const handleCellBlur = useCallback(
+		(rowIndex: number, column: PresetColumnKey) => {
+			setLocalPresets((currentLocal) => {
+				const preset = currentLocal[rowIndex];
+				if (!preset) return currentLocal;
+				const serverPreset = serverPresetsRef.current.find(
+					(p) => p.id === preset.id,
+				);
+				if (!serverPreset) return currentLocal;
+				if (preset[column] === serverPreset[column]) return currentLocal;
+
+				updatePreset.mutate({
+					id: preset.id,
+					patch: { [column]: preset[column] },
+				});
+				return currentLocal;
+			});
+		},
+		[updatePreset],
+	);
+
+	const handleCommandsChange = useCallback(
+		(rowIndex: number, commands: string[]) => {
+			setLocalPresets((prev) => {
+				const preset = prev[rowIndex];
+				const isDelete = preset && commands.length < preset.commands.length;
+				const newPresets = prev.map((p, i) =>
+					i === rowIndex ? { ...p, commands } : p,
+				);
+
+				if (isDelete && preset) {
+					updatePreset.mutate({
+						id: preset.id,
+						patch: { commands },
+					});
+				}
+				return newPresets;
+			});
+		},
+		[updatePreset],
+	);
+
+	const handleCommandsBlur = useCallback(
+		(rowIndex: number) => {
+			setLocalPresets((currentLocal) => {
+				const preset = currentLocal[rowIndex];
+				if (!preset) return currentLocal;
+				const serverPreset = serverPresetsRef.current.find(
+					(p) => p.id === preset.id,
+				);
+				if (!serverPreset) return currentLocal;
+				if (
+					JSON.stringify(preset.commands) ===
+					JSON.stringify(serverPreset.commands)
+				)
+					return currentLocal;
+
+				updatePreset.mutate({
+					id: preset.id,
+					patch: { commands: preset.commands },
+				});
+				return currentLocal;
+			});
+		},
+		[updatePreset],
+	);
+
+	const handleExecutionModeChange = useCallback(
+		(rowIndex: number, mode: ExecutionMode) => {
+			setLocalPresets((currentLocal) => {
+				const preset = currentLocal[rowIndex];
+				if (!preset) return currentLocal;
+
+				const newPresets = currentLocal.map((p, i) =>
+					i === rowIndex ? { ...p, executionMode: mode } : p,
+				);
+
+				updatePreset.mutate({
+					id: preset.id,
+					patch: { executionMode: mode },
+				});
+
+				return newPresets;
+			});
+		},
+		[updatePreset],
+	);
+
+	const handleAddRow = useCallback(() => {
+		createPreset.mutate({
+			name: "",
+			cwd: "",
+			commands: [""],
+		});
+	}, [createPreset]);
+
+	const handleAddTemplate = useCallback(
+		(template: PresetTemplate) => {
+			if (existingPresetNames.has(template.preset.name)) return;
+			createPreset.mutate(template.preset);
+		},
+		[createPreset, existingPresetNames],
+	);
+
+	const handleDeleteRow = useCallback(
+		(rowIndex: number) => {
+			setLocalPresets((currentLocal) => {
+				const preset = currentLocal[rowIndex];
+				if (preset) {
+					deletePreset.mutate({ id: preset.id });
+				}
+				return currentLocal;
+			});
+		},
+		[deletePreset],
+	);
+
+	const handleSetDefault = useCallback(
+		(presetId: string | null) => {
+			setDefaultPreset.mutate({ id: presetId });
+		},
+		[setDefaultPreset],
+	);
+
+	const handleLocalReorder = useCallback(
+		(fromIndex: number, toIndex: number) => {
+			setLocalPresets((prev) => {
+				const newPresets = [...prev];
+				const [removed] = newPresets.splice(fromIndex, 1);
+				newPresets.splice(toIndex, 0, removed);
+				return newPresets;
+			});
+		},
+		[],
+	);
+
+	const handlePersistReorder = useCallback(
+		(presetId: string, targetIndex: number) => {
+			reorderPresets.mutate({ presetId, targetIndex });
+		},
+		[reorderPresets],
+	);
+
+	return (
+		<div className="space-y-4">
+			<div className="flex items-center justify-between">
+				<div className="space-y-0.5">
+					<Label className="text-sm font-medium">Terminal Presets</Label>
+					<p className="text-xs text-muted-foreground">
+						Presets let you quickly launch terminals with pre-configured
+						commands.
+					</p>
+				</div>
+				{showPresets && (
+					<Button
+						variant="default"
+						size="sm"
+						className="gap-2"
+						onClick={handleAddRow}
+					>
+						<HiOutlinePlus className="h-4 w-4" />
+						Add Preset
+					</Button>
+				)}
+			</div>
+
+			{showQuickAdd && (
+				<div className="flex flex-wrap gap-2">
+					<span className="text-xs text-muted-foreground mr-1 self-center">
+						Quick add:
+					</span>
+					{PRESET_TEMPLATES.map((template) => {
+						const alreadyAdded = isTemplateAdded(template);
+						const presetIcon = getPresetIcon(template.name, isDark);
+						return (
+							<Tooltip key={template.name}>
+								<TooltipTrigger asChild>
+									<Button
+										variant="outline"
+										size="sm"
+										className="gap-1.5 text-xs h-7"
+										onClick={() => handleAddTemplate(template)}
+										disabled={alreadyAdded || createPreset.isPending}
+									>
+										{alreadyAdded ? (
+											<HiOutlineCheck className="h-3 w-3" />
+										) : presetIcon ? (
+											<img
+												src={presetIcon}
+												alt=""
+												className="h-3 w-3 object-contain"
+											/>
+										) : null}
+										{template.name}
+									</Button>
+								</TooltipTrigger>
+								<TooltipContent side="bottom" showArrow={false}>
+									{alreadyAdded ? "Already added" : template.preset.description}
+								</TooltipContent>
+							</Tooltip>
+						);
+					})}
+				</div>
+			)}
+
+			{showPresets && (
+				<div className="rounded-lg border border-border overflow-hidden">
+					<div className="flex items-center gap-4 py-2 px-4 bg-accent/10 border-b border-border">
+						<div className="w-6 shrink-0" />
+						{PRESET_COLUMNS.map((column) => (
+							<div
+								key={column.key}
+								className="flex-1 text-xs font-medium text-muted-foreground uppercase tracking-wider"
+							>
+								{column.label}
+							</div>
+						))}
+						<Tooltip>
+							<TooltipTrigger asChild>
+								<div className="w-28 text-xs font-medium text-muted-foreground uppercase tracking-wider shrink-0 cursor-help flex items-center gap-1">
+									Mode
+									<HiOutlineQuestionMarkCircle className="h-3.5 w-3.5" />
+								</div>
+							</TooltipTrigger>
+							<TooltipContent side="top" className="max-w-xs">
+								<p className="font-medium mb-1">Execution Mode</p>
+								<p className="text-xs">
+									<strong>Sequential:</strong> Commands run one after another in
+									a single terminal (joined with &&)
+								</p>
+								<p className="text-xs mt-1">
+									<strong>Parallel:</strong> Each command runs in its own split
+									pane within a single tab
+								</p>
+							</TooltipContent>
+						</Tooltip>
+						<div className="w-20 text-xs font-medium text-muted-foreground uppercase tracking-wider text-center shrink-0">
+							Actions
+						</div>
+					</div>
+
+					<div
+						ref={presetsContainerRef}
+						className="max-h-[320px] overflow-y-auto"
+					>
+						{isLoadingPresets ? (
+							<div className="py-8 text-center text-sm text-muted-foreground">
+								Loading presets...
+							</div>
+						) : localPresets.length > 0 ? (
+							localPresets.map((preset, index) => (
+								<PresetRow
+									key={preset.id}
+									preset={preset}
+									rowIndex={index}
+									isEven={index % 2 === 0}
+									onChange={handleCellChange}
+									onBlur={handleCellBlur}
+									onCommandsChange={handleCommandsChange}
+									onCommandsBlur={handleCommandsBlur}
+									onExecutionModeChange={handleExecutionModeChange}
+									onDelete={handleDeleteRow}
+									onSetDefault={handleSetDefault}
+									onLocalReorder={handleLocalReorder}
+									onPersistReorder={handlePersistReorder}
+								/>
+							))
+						) : (
+							<div className="py-8 text-center text-sm text-muted-foreground">
+								No presets yet. Click "Add Preset" to create your first preset.
+							</div>
+						)}
+					</div>
+				</div>
+			)}
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/SessionsSection.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/SessionsSection.tsx
new file mode 100644
index 00000000000..36dda370f0f
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/SessionsSection.tsx
@@ -0,0 +1,442 @@
+import {
+	AlertDialog,
+	AlertDialogContent,
+	AlertDialogDescription,
+	AlertDialogFooter,
+	AlertDialogHeader,
+	AlertDialogTitle,
+} from "@superset/ui/alert-dialog";
+import { Button } from "@superset/ui/button";
+import { Label } from "@superset/ui/label";
+import { toast } from "@superset/ui/sonner";
+import { useMemo, useState } from "react";
+import { electronTrpc } from "renderer/lib/electron-trpc";
+
+export function SessionsSection() {
+	const utils = electronTrpc.useUtils();
+
+	const { data: daemonSessions } =
+		electronTrpc.terminal.listDaemonSessions.useQuery();
+	const sessions = daemonSessions?.sessions ?? [];
+	const aliveSessions = useMemo(
+		() => sessions.filter((session) => session.isAlive),
+		[sessions],
+	);
+	const sessionsSorted = useMemo(() => {
+		return [...aliveSessions].sort((a, b) => {
+			if (a.attachedClients !== b.attachedClients) {
+				return b.attachedClients - a.attachedClients;
+			}
+			const aTime = a.lastAttachedAt ? Date.parse(a.lastAttachedAt) : 0;
+			const bTime = b.lastAttachedAt ? Date.parse(b.lastAttachedAt) : 0;
+			return bTime - aTime;
+		});
+	}, [aliveSessions]);
+
+	const [confirmKillAllOpen, setConfirmKillAllOpen] = useState(false);
+	const [confirmClearHistoryOpen, setConfirmClearHistoryOpen] = useState(false);
+	const [confirmRestartDaemonOpen, setConfirmRestartDaemonOpen] =
+		useState(false);
+	const [showSessionList, setShowSessionList] = useState(false);
+	const [pendingKillSession, setPendingKillSession] = useState<{
+		sessionId: string;
+		workspaceId: string;
+	} | null>(null);
+
+	const killAllDaemonSessions =
+		electronTrpc.terminal.killAllDaemonSessions.useMutation({
+			onMutate: async () => {
+				await utils.terminal.listDaemonSessions.cancel();
+				const previous = utils.terminal.listDaemonSessions.getData();
+				utils.terminal.listDaemonSessions.setData(undefined, {
+					sessions: [],
+				});
+				return { previous };
+			},
+			onSuccess: (result) => {
+				if (result.remainingCount > 0) {
+					toast.warning("Some sessions could not be killed", {
+						description: `${result.killedCount} terminated, ${result.remainingCount} remaining`,
+					});
+				} else {
+					toast.success("Killed all terminal sessions", {
+						description: `${result.killedCount} sessions terminated`,
+					});
+				}
+			},
+			onError: (error, _vars, context) => {
+				if (context?.previous) {
+					utils.terminal.listDaemonSessions.setData(
+						undefined,
+						context.previous,
+					);
+				}
+				toast.error("Failed to kill sessions", {
+					description: error.message,
+				});
+			},
+			onSettled: () => {
+				setTimeout(() => {
+					utils.terminal.listDaemonSessions.invalidate();
+				}, 300);
+			},
+		});
+
+	const clearTerminalHistory =
+		electronTrpc.terminal.clearTerminalHistory.useMutation({
+			onSuccess: () => {
+				toast.success("Cleared terminal history");
+				utils.terminal.listDaemonSessions.invalidate();
+			},
+			onError: (error) => {
+				toast.error("Failed to clear terminal history", {
+					description: error.message,
+				});
+			},
+		});
+
+	const killDaemonSession = electronTrpc.terminal.kill.useMutation({
+		onSuccess: () => {
+			toast.success("Killed terminal session");
+			utils.terminal.listDaemonSessions.invalidate();
+		},
+		onError: (error) => {
+			toast.error("Failed to kill session", {
+				description: error.message,
+			});
+		},
+	});
+
+	const restartDaemon = electronTrpc.terminal.restartDaemon.useMutation({
+		onSuccess: () => {
+			toast.success("Daemon restarted", {
+				description:
+					"Terminal daemon has been restarted. Open a terminal to spawn a fresh daemon.",
+			});
+			utils.terminal.listDaemonSessions.invalidate();
+		},
+		onError: (error) => {
+			toast.error("Failed to restart daemon", {
+				description: error.message,
+			});
+		},
+	});
+
+	const formatTimestamp = (value?: string) => {
+		if (!value) return "—";
+		return value.replace("T", " ").replace(/\.\d+Z$/, "Z");
+	};
+
+	return (
+		<>
+			<div className="rounded-md border border-border/60 p-4 space-y-3">
+				<div className="space-y-0.5">
+					<div className="flex items-center justify-between">
+						<Label className="text-sm font-medium">Manage sessions</Label>
+						<Button
+							variant="ghost"
+							size="sm"
+							onClick={() => utils.terminal.listDaemonSessions.invalidate()}
+						>
+							Refresh
+						</Button>
+					</div>
+					<p className="text-xs text-muted-foreground">
+						Daemon sessions running: {aliveSessions.length}
+					</p>
+					{aliveSessions.length >= 20 && (
+						<p className="text-xs text-muted-foreground/70">
+							Large numbers of persistent terminals can increase CPU/memory
+							usage. Consider killing old sessions if you notice slowdowns.
+						</p>
+					)}
+				</div>
+
+				<div className="flex flex-wrap gap-2">
+					<Button
+						variant="destructive"
+						size="sm"
+						disabled={
+							aliveSessions.length === 0 || killAllDaemonSessions.isPending
+						}
+						onClick={() => setConfirmKillAllOpen(true)}
+					>
+						Kill all sessions
+					</Button>
+					<Button
+						variant="secondary"
+						size="sm"
+						disabled={
+							aliveSessions.length === 0 || clearTerminalHistory.isPending
+						}
+						onClick={() => setConfirmClearHistoryOpen(true)}
+					>
+						Clear terminal history
+					</Button>
+					<Button
+						variant="outline"
+						size="sm"
+						disabled={restartDaemon.isPending}
+						onClick={() => setConfirmRestartDaemonOpen(true)}
+					>
+						Restart daemon
+					</Button>
+					<Button
+						variant="ghost"
+						size="sm"
+						disabled={aliveSessions.length === 0}
+						onClick={() => setShowSessionList((v) => !v)}
+					>
+						{showSessionList ? "Hide sessions" : "Show sessions"}
+					</Button>
+				</div>
+
+				{showSessionList && aliveSessions.length > 0 && (
+					<div className="rounded-md border border-border/60 overflow-hidden">
+						<div className="max-h-64 overflow-auto">
+							<table className="w-full text-xs">
+								<thead className="sticky top-0 bg-background">
+									<tr className="text-muted-foreground">
+										<th className="px-2 py-2 text-left font-medium">
+											Workspace
+										</th>
+										<th className="px-2 py-2 text-left font-medium">Session</th>
+										<th className="px-2 py-2 text-right font-medium">
+											Clients
+										</th>
+										<th className="px-2 py-2 text-right font-medium">PID</th>
+										<th className="px-2 py-2 text-left font-medium">
+											Last attached
+										</th>
+										<th className="px-2 py-2 text-right font-medium">Action</th>
+									</tr>
+								</thead>
+								<tbody className="divide-y divide-border/60">
+									{sessionsSorted.map((session) => (
+										<tr key={session.sessionId} className="hover:bg-muted/30">
+											<td className="px-2 py-2 font-mono">
+												{session.workspaceId}
+											</td>
+											<td className="px-2 py-2 font-mono">
+												{session.sessionId}
+											</td>
+											<td className="px-2 py-2 text-right">
+												{session.attachedClients}
+											</td>
+											<td className="px-2 py-2 text-right font-mono">
+												{session.pid ?? "—"}
+											</td>
+											<td className="px-2 py-2">
+												{formatTimestamp(session.lastAttachedAt)}
+											</td>
+											<td className="px-2 py-2 text-right">
+												<Button
+													variant="ghost"
+													size="sm"
+													onClick={() =>
+														setPendingKillSession({
+															sessionId: session.sessionId,
+															workspaceId: session.workspaceId,
+														})
+													}
+												>
+													Kill
+												</Button>
+											</td>
+										</tr>
+									))}
+								</tbody>
+							</table>
+						</div>
+					</div>
+				)}
+			</div>
+
+			<AlertDialog
+				open={confirmKillAllOpen}
+				onOpenChange={setConfirmKillAllOpen}
+			>
+				<AlertDialogContent className="max-w-[520px] gap-0 p-0">
+					<AlertDialogHeader className="px-4 pt-4 pb-2">
+						<AlertDialogTitle className="font-medium">
+							Kill all terminal sessions?
+						</AlertDialogTitle>
+						<AlertDialogDescription asChild>
+							<div className="text-muted-foreground space-y-1.5">
+								<span className="block">
+									This will terminate all persistent terminal processes (builds,
+									tests, agents, etc.).
+								</span>
+								<span className="block">
+									You can't undo this action. Terminal panes will show "Process
+									exited" and can be restarted.
+								</span>
+							</div>
+						</AlertDialogDescription>
+					</AlertDialogHeader>
+					<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
+						<Button
+							variant="ghost"
+							size="sm"
+							onClick={() => setConfirmKillAllOpen(false)}
+						>
+							Cancel
+						</Button>
+						<Button
+							variant="destructive"
+							size="sm"
+							disabled={killAllDaemonSessions.isPending}
+							onClick={() => {
+								setConfirmKillAllOpen(false);
+								killAllDaemonSessions.mutate();
+							}}
+						>
+							Kill all
+						</Button>
+					</AlertDialogFooter>
+				</AlertDialogContent>
+			</AlertDialog>
+
+			<AlertDialog
+				open={confirmClearHistoryOpen}
+				onOpenChange={setConfirmClearHistoryOpen}
+			>
+				<AlertDialogContent className="max-w-[520px] gap-0 p-0">
+					<AlertDialogHeader className="px-4 pt-4 pb-2">
+						<AlertDialogTitle className="font-medium">
+							Clear terminal history?
+						</AlertDialogTitle>
+						<AlertDialogDescription asChild>
+							<div className="text-muted-foreground space-y-1.5">
+								<span className="block">
+									This deletes the saved scrollback used for reboot/crash
+									recovery.
+								</span>
+								<span className="block">
+									Running terminal processes continue, but older output may no
+									longer be available after restarting the app.
+								</span>
+							</div>
+						</AlertDialogDescription>
+					</AlertDialogHeader>
+					<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
+						<Button
+							variant="ghost"
+							size="sm"
+							onClick={() => setConfirmClearHistoryOpen(false)}
+						>
+							Cancel
+						</Button>
+						<Button
+							variant="secondary"
+							size="sm"
+							disabled={clearTerminalHistory.isPending}
+							onClick={() => {
+								setConfirmClearHistoryOpen(false);
+								clearTerminalHistory.mutate();
+							}}
+						>
+							Clear history
+						</Button>
+					</AlertDialogFooter>
+				</AlertDialogContent>
+			</AlertDialog>
+
+			<AlertDialog
+				open={!!pendingKillSession}
+				onOpenChange={(open) => {
+					if (!open) setPendingKillSession(null);
+				}}
+			>
+				<AlertDialogContent className="max-w-[520px] gap-0 p-0">
+					<AlertDialogHeader className="px-4 pt-4 pb-2">
+						<AlertDialogTitle className="font-medium">
+							Kill terminal session?
+						</AlertDialogTitle>
+						<AlertDialogDescription asChild>
+							<div className="text-muted-foreground space-y-1.5">
+								<span className="block">
+									This will terminate the session and its underlying process.
+								</span>
+								{pendingKillSession && (
+									<span className="block font-mono text-xs">
+										{pendingKillSession.workspaceId} /{" "}
+										{pendingKillSession.sessionId}
+									</span>
+								)}
+							</div>
+						</AlertDialogDescription>
+					</AlertDialogHeader>
+					<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
+						<Button
+							variant="ghost"
+							size="sm"
+							onClick={() => setPendingKillSession(null)}
+						>
+							Cancel
+						</Button>
+						<Button
+							variant="destructive"
+							size="sm"
+							disabled={killDaemonSession.isPending}
+							onClick={() => {
+								const sessionId = pendingKillSession?.sessionId;
+								setPendingKillSession(null);
+								if (!sessionId) return;
+								killDaemonSession.mutate({ paneId: sessionId });
+							}}
+						>
+							Kill
+						</Button>
+					</AlertDialogFooter>
+				</AlertDialogContent>
+			</AlertDialog>
+
+			<AlertDialog
+				open={confirmRestartDaemonOpen}
+				onOpenChange={setConfirmRestartDaemonOpen}
+			>
+				<AlertDialogContent className="max-w-[520px] gap-0 p-0">
+					<AlertDialogHeader className="px-4 pt-4 pb-2">
+						<AlertDialogTitle className="font-medium">
+							Restart terminal daemon?
+						</AlertDialogTitle>
+						<AlertDialogDescription asChild>
+							<div className="text-muted-foreground space-y-1.5">
+								<span className="block">
+									This will shut down the terminal daemon process and kill all
+									running sessions. Use this to fix terminals that are stuck or
+									unresponsive.
+								</span>
+								<span className="block">
+									A fresh daemon will start automatically when you open a new
+									terminal.
+								</span>
+							</div>
+						</AlertDialogDescription>
+					</AlertDialogHeader>
+					<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
+						<Button
+							variant="ghost"
+							size="sm"
+							onClick={() => setConfirmRestartDaemonOpen(false)}
+						>
+							Cancel
+						</Button>
+						<Button
+							variant="default"
+							size="sm"
+							disabled={restartDaemon.isPending}
+							onClick={() => {
+								setConfirmRestartDaemonOpen(false);
+								restartDaemon.mutate(undefined, {});
+							}}
+						>
+							Restart daemon
+						</Button>
+					</AlertDialogFooter>
+				</AlertDialogContent>
+			</AlertDialog>
+		</>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts
index c9632ae229a..73ef7c22265 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts
@@ -28,6 +28,7 @@ export const SETTING_ITEM_ID = {
 	TERMINAL_PRESETS: "terminal-presets",
 	TERMINAL_QUICK_ADD: "terminal-quick-add",
 	TERMINAL_AUTO_APPLY_PRESET: "terminal-auto-apply-preset",
+	TERMINAL_APPLY_PRESET_ON_NEW_TAB: "terminal-apply-preset-on-new-tab",
 	TERMINAL_SESSIONS: "terminal-sessions",
 	TERMINAL_LINK_BEHAVIOR: "terminal-link-behavior",
 
@@ -405,8 +406,9 @@ export const SETTINGS_ITEMS: SettingsItem[] = [
 	{
 		id: SETTING_ITEM_ID.TERMINAL_AUTO_APPLY_PRESET,
 		section: "terminal",
-		title: "Auto-apply Default Preset",
-		description: "Automatically apply default preset when creating workspaces",
+		title: "Apply Preset on Workspace Creation",
+		description:
+			"Automatically apply default preset when creating new workspaces",
 		keywords: [
 			"terminal",
 			"preset",
@@ -420,6 +422,25 @@ export const SETTINGS_ITEMS: SettingsItem[] = [
 			"launch",
 		],
 	},
+	{
+		id: SETTING_ITEM_ID.TERMINAL_APPLY_PRESET_ON_NEW_TAB,
+		section: "terminal",
+		title: "Apply Preset on New Tab",
+		description:
+			"Automatically apply default preset when opening new tabs, panes, or splits",
+		keywords: [
+			"terminal",
+			"preset",
+			"default",
+			"auto",
+			"apply",
+			"tab",
+			"pane",
+			"split",
+			"new",
+			"open",
+		],
+	},
 	{
 		id: SETTING_ITEM_ID.TERMINAL_SESSIONS,
 		section: "terminal",
diff --git a/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts b/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
index 2d082087402..4424a1da3cb 100644
--- a/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
+++ b/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
@@ -1,7 +1,9 @@
 import type { TerminalPreset } from "@superset/local-db";
 import { useCallback, useMemo } from "react";
 import type { MosaicBranch } from "react-mosaic-component";
+import { electronTrpc } from "renderer/lib/electron-trpc";
 import { usePresets } from "renderer/react-query/presets";
+import { DEFAULT_APPLY_PRESET_ON_NEW_TAB } from "shared/constants";
 import { useTabsStore } from "./store";
 import type { AddTabOptions } from "./types";
 
@@ -13,6 +15,11 @@ import type { AddTabOptions } from "./types";
 export function useTabsWithPresets() {
 	const { defaultPreset } = usePresets();
 
+	const { data: applyPresetOnNewTab } =
+		electronTrpc.settings.getApplyPresetOnNewTab.useQuery();
+	const isNewTabPresetEnabled =
+		applyPresetOnNewTab ?? DEFAULT_APPLY_PRESET_ON_NEW_TAB;
+
 	const storeAddTab = useTabsStore((s) => s.addTab);
 	const storeAddTabWithMultiplePanes = useTabsStore(
 		(s) => s.addTabWithMultiplePanes,
@@ -24,19 +31,20 @@ export function useTabsWithPresets() {
 	const renameTab = useTabsStore((s) => s.renameTab);
 
 	const defaultPresetOptions: AddTabOptions | undefined = useMemo(() => {
-		if (!defaultPreset) return undefined;
+		if (!isNewTabPresetEnabled || !defaultPreset) return undefined;
 		return {
 			initialCommands: defaultPreset.commands,
 			initialCwd: defaultPreset.cwd || undefined,
 		};
-	}, [defaultPreset]);
+	}, [isNewTabPresetEnabled, defaultPreset]);
 
 	const shouldUseParallelMode = useMemo(() => {
 		return (
+			isNewTabPresetEnabled &&
 			defaultPreset?.executionMode === "parallel" &&
 			defaultPreset.commands.length > 1
 		);
-	}, [defaultPreset]);
+	}, [isNewTabPresetEnabled, defaultPreset]);
 
 	const addTab = useCallback(
 		(workspaceId: string, options?: AddTabOptions) => {
@@ -59,7 +67,7 @@ export function useTabsWithPresets() {
 
 			const result = storeAddTab(workspaceId, defaultPresetOptions);
 
-			if (defaultPreset?.name) {
+			if (isNewTabPresetEnabled && defaultPreset?.name) {
 				renameTab(result.tabId, defaultPreset.name);
 			}
 
@@ -71,6 +79,7 @@ export function useTabsWithPresets() {
 			defaultPresetOptions,
 			defaultPreset,
 			shouldUseParallelMode,
+			isNewTabPresetEnabled,
 			renameTab,
 		],
 	);
diff --git a/apps/desktop/src/shared/constants.ts b/apps/desktop/src/shared/constants.ts
index 2eadec60637..f588b40698a 100644
--- a/apps/desktop/src/shared/constants.ts
+++ b/apps/desktop/src/shared/constants.ts
@@ -54,6 +54,7 @@ export const MOCK_ORG_ID = "mock-org-id";
 export const DEFAULT_CONFIRM_ON_QUIT = true;
 export const DEFAULT_TERMINAL_LINK_BEHAVIOR = "external-editor" as const;
 export const DEFAULT_AUTO_APPLY_DEFAULT_PRESET = true;
+export const DEFAULT_APPLY_PRESET_ON_NEW_TAB = true;
 export const DEFAULT_TELEMETRY_ENABLED = true;
 
 // External links (documentation, help resources, etc.)
diff --git a/packages/local-db/drizzle/0020_add_apply_preset_on_new_tab.sql b/packages/local-db/drizzle/0020_add_apply_preset_on_new_tab.sql
new file mode 100644
index 00000000000..cf01395d1ee
--- /dev/null
+++ b/packages/local-db/drizzle/0020_add_apply_preset_on_new_tab.sql
@@ -0,0 +1 @@
+ALTER TABLE `settings` ADD `apply_preset_on_new_tab` integer;
\ No newline at end of file
diff --git a/packages/local-db/drizzle/meta/0020_snapshot.json b/packages/local-db/drizzle/meta/0020_snapshot.json
new file mode 100644
index 00000000000..885a1603cdb
--- /dev/null
+++ b/packages/local-db/drizzle/meta/0020_snapshot.json
@@ -0,0 +1,1078 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "94b221c1-711b-4c2b-85ff-111e7133bd7d",
+  "prevId": "732c942c-5f01-451f-a6cf-92c38b434076",
+  "tables": {
+    "organization_members": {
+      "name": "organization_members",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "organization_members_organization_id_idx": {
+          "name": "organization_members_organization_id_idx",
+          "columns": [
+            "organization_id"
+          ],
+          "isUnique": false
+        },
+        "organization_members_user_id_idx": {
+          "name": "organization_members_user_id_idx",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "organization_members_organization_id_organizations_id_fk": {
+          "name": "organization_members_organization_id_organizations_id_fk",
+          "tableFrom": "organization_members",
+          "tableTo": "organizations",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "organization_members_user_id_users_id_fk": {
+          "name": "organization_members_user_id_users_id_fk",
+          "tableFrom": "organization_members",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "organizations": {
+      "name": "organizations",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "clerk_org_id": {
+          "name": "clerk_org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_org": {
+          "name": "github_org",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "organizations_clerk_org_id_unique": {
+          "name": "organizations_clerk_org_id_unique",
+          "columns": [
+            "clerk_org_id"
+          ],
+          "isUnique": true
+        },
+        "organizations_slug_unique": {
+          "name": "organizations_slug_unique",
+          "columns": [
+            "slug"
+          ],
+          "isUnique": true
+        },
+        "organizations_slug_idx": {
+          "name": "organizations_slug_idx",
+          "columns": [
+            "slug"
+          ],
+          "isUnique": false
+        },
+        "organizations_clerk_org_id_idx": {
+          "name": "organizations_clerk_org_id_idx",
+          "columns": [
+            "clerk_org_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "main_repo_path": {
+          "name": "main_repo_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "tab_order": {
+          "name": "tab_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_opened_at": {
+          "name": "last_opened_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "config_toast_dismissed": {
+          "name": "config_toast_dismissed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "default_branch": {
+          "name": "default_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_owner": {
+          "name": "github_owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch_prefix_mode": {
+          "name": "branch_prefix_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch_prefix_custom": {
+          "name": "branch_prefix_custom",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "hide_image": {
+          "name": "hide_image",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "projects_main_repo_path_idx": {
+          "name": "projects_main_repo_path_idx",
+          "columns": [
+            "main_repo_path"
+          ],
+          "isUnique": false
+        },
+        "projects_last_opened_at_idx": {
+          "name": "projects_last_opened_at_idx",
+          "columns": [
+            "last_opened_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "settings": {
+      "name": "settings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "last_active_workspace_id": {
+          "name": "last_active_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_used_app": {
+          "name": "last_used_app",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_presets": {
+          "name": "terminal_presets",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_presets_initialized": {
+          "name": "terminal_presets_initialized",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "selected_ringtone_id": {
+          "name": "selected_ringtone_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "confirm_on_quit": {
+          "name": "confirm_on_quit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_link_behavior": {
+          "name": "terminal_link_behavior",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "persist_terminal": {
+          "name": "persist_terminal",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": true
+        },
+        "auto_apply_default_preset": {
+          "name": "auto_apply_default_preset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "apply_preset_on_new_tab": {
+          "name": "apply_preset_on_new_tab",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch_prefix_mode": {
+          "name": "branch_prefix_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch_prefix_custom": {
+          "name": "branch_prefix_custom",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notification_sounds_muted": {
+          "name": "notification_sounds_muted",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "delete_local_branch": {
+          "name": "delete_local_branch",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "tasks": {
+      "name": "tasks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status_color": {
+          "name": "status_color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_type": {
+          "name": "status_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_position": {
+          "name": "status_position",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "priority": {
+          "name": "priority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repository_id": {
+          "name": "repository_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "assignee_id": {
+          "name": "assignee_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "creator_id": {
+          "name": "creator_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "estimate": {
+          "name": "estimate",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "due_date": {
+          "name": "due_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "labels": {
+          "name": "labels",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pr_url": {
+          "name": "pr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "external_provider": {
+          "name": "external_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "external_key": {
+          "name": "external_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "external_url": {
+          "name": "external_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_synced_at": {
+          "name": "last_synced_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sync_error": {
+          "name": "sync_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "tasks_slug_unique": {
+          "name": "tasks_slug_unique",
+          "columns": [
+            "slug"
+          ],
+          "isUnique": true
+        },
+        "tasks_slug_idx": {
+          "name": "tasks_slug_idx",
+          "columns": [
+            "slug"
+          ],
+          "isUnique": false
+        },
+        "tasks_organization_id_idx": {
+          "name": "tasks_organization_id_idx",
+          "columns": [
+            "organization_id"
+          ],
+          "isUnique": false
+        },
+        "tasks_assignee_id_idx": {
+          "name": "tasks_assignee_id_idx",
+          "columns": [
+            "assignee_id"
+          ],
+          "isUnique": false
+        },
+        "tasks_status_idx": {
+          "name": "tasks_status_idx",
+          "columns": [
+            "status"
+          ],
+          "isUnique": false
+        },
+        "tasks_created_at_idx": {
+          "name": "tasks_created_at_idx",
+          "columns": [
+            "created_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "tasks_organization_id_organizations_id_fk": {
+          "name": "tasks_organization_id_organizations_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "organizations",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "tasks_assignee_id_users_id_fk": {
+          "name": "tasks_assignee_id_users_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "users",
+          "columnsFrom": [
+            "assignee_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "tasks_creator_id_users_id_fk": {
+          "name": "tasks_creator_id_users_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "users",
+          "columnsFrom": [
+            "creator_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "clerk_id": {
+          "name": "clerk_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "users_clerk_id_unique": {
+          "name": "users_clerk_id_unique",
+          "columns": [
+            "clerk_id"
+          ],
+          "isUnique": true
+        },
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        },
+        "users_email_idx": {
+          "name": "users_email_idx",
+          "columns": [
+            "email"
+          ],
+          "isUnique": false
+        },
+        "users_clerk_id_idx": {
+          "name": "users_clerk_id_idx",
+          "columns": [
+            "clerk_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "workspaces": {
+      "name": "workspaces",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "worktree_id": {
+          "name": "worktree_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "tab_order": {
+          "name": "tab_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_opened_at": {
+          "name": "last_opened_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "is_unread": {
+          "name": "is_unread",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": false
+        },
+        "is_unnamed": {
+          "name": "is_unnamed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": false
+        },
+        "deleting_at": {
+          "name": "deleting_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "workspaces_project_id_idx": {
+          "name": "workspaces_project_id_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "workspaces_worktree_id_idx": {
+          "name": "workspaces_worktree_id_idx",
+          "columns": [
+            "worktree_id"
+          ],
+          "isUnique": false
+        },
+        "workspaces_last_opened_at_idx": {
+          "name": "workspaces_last_opened_at_idx",
+          "columns": [
+            "last_opened_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "workspaces_project_id_projects_id_fk": {
+          "name": "workspaces_project_id_projects_id_fk",
+          "tableFrom": "workspaces",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspaces_worktree_id_worktrees_id_fk": {
+          "name": "workspaces_worktree_id_worktrees_id_fk",
+          "tableFrom": "workspaces",
+          "tableTo": "worktrees",
+          "columnsFrom": [
+            "worktree_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "worktrees": {
+      "name": "worktrees",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "base_branch": {
+          "name": "base_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "git_status": {
+          "name": "git_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_status": {
+          "name": "github_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "worktrees_project_id_idx": {
+          "name": "worktrees_project_id_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "worktrees_branch_idx": {
+          "name": "worktrees_branch_idx",
+          "columns": [
+            "branch"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "worktrees_project_id_projects_id_fk": {
+          "name": "worktrees_project_id_projects_id_fk",
+          "tableFrom": "worktrees",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/local-db/drizzle/meta/_journal.json b/packages/local-db/drizzle/meta/_journal.json
index d6ac4a2497b..93d72b999d9 100644
--- a/packages/local-db/drizzle/meta/_journal.json
+++ b/packages/local-db/drizzle/meta/_journal.json
@@ -141,6 +141,13 @@
       "when": 1770438863796,
       "tag": "0019_add_hide_image_to_projects",
       "breakpoints": true
+    },
+    {
+      "idx": 20,
+      "version": "6",
+      "when": 1770596618589,
+      "tag": "0020_add_apply_preset_on_new_tab",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/local-db/src/schema/schema.ts b/packages/local-db/src/schema/schema.ts
index 74757311d4d..42fb268a93a 100644
--- a/packages/local-db/src/schema/schema.ts
+++ b/packages/local-db/src/schema/schema.ts
@@ -151,6 +151,9 @@ export const settings = sqliteTable("settings", {
 	autoApplyDefaultPreset: integer("auto_apply_default_preset", {
 		mode: "boolean",
 	}),
+	applyPresetOnNewTab: integer("apply_preset_on_new_tab", {
+		mode: "boolean",
+	}),
 	branchPrefixMode: text("branch_prefix_mode").$type<BranchPrefixMode>(),
 	branchPrefixCustom: text("branch_prefix_custom"),
 	notificationSoundsMuted: integer("notification_sounds_muted", {

From 93ca149a06c058e30fd48d396a9322a7a7b9429d Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sun, 8 Feb 2026 17:29:26 -0800
Subject: [PATCH 2/9] feat(desktop): make preset auto-apply a per-preset
 setting instead of global toggle

Replace the global "apply preset on new tab" setting with per-preset
flags (applyOnWorkspaceCreated, applyOnNewTab) that give users granular
control over when each preset auto-applies. Each preset now shows two
toggle icons in the row: folder+ for workspace creation and document+
for new tab.
---
 .../src/lib/trpc/routers/settings/index.ts    |   69 +-
 .../routers/workspaces/procedures/init.ts     |    6 +-
 .../src/renderer/react-query/presets/index.ts |   20 +
 .../TerminalSettings/TerminalSettings.tsx     |    8 -
 .../components/ApplyPresetOnNewTabSetting.tsx |   57 -
 .../components/AutoApplyPresetSetting.tsx     |    5 +-
 .../components/PresetRow/PresetRow.tsx        |   64 +-
 .../components/PresetsSection.tsx             |   17 +-
 .../utils/settings-search/settings-search.ts  |   24 +-
 .../stores/tabs/useTabsWithPresets.ts         |   48 +-
 apps/desktop/src/shared/constants.ts          |    1 -
 .../0020_add_apply_preset_on_new_tab.sql      |    1 -
 .../local-db/drizzle/meta/0020_snapshot.json  | 1078 -----------------
 packages/local-db/drizzle/meta/_journal.json  |    7 -
 packages/local-db/src/schema/schema.ts        |    3 -
 packages/local-db/src/schema/zod.ts           |    2 +
 16 files changed, 156 insertions(+), 1254 deletions(-)
 delete mode 100644 apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/ApplyPresetOnNewTabSetting.tsx
 delete mode 100644 packages/local-db/drizzle/0020_add_apply_preset_on_new_tab.sql
 delete mode 100644 packages/local-db/drizzle/meta/0020_snapshot.json

diff --git a/apps/desktop/src/lib/trpc/routers/settings/index.ts b/apps/desktop/src/lib/trpc/routers/settings/index.ts
index e9451a677e1..cb11dcd4008 100644
--- a/apps/desktop/src/lib/trpc/routers/settings/index.ts
+++ b/apps/desktop/src/lib/trpc/routers/settings/index.ts
@@ -10,7 +10,6 @@ import { app } from "electron";
 import { quitWithoutConfirmation } from "main/index";
 import { localDb } from "main/lib/local-db";
 import {
-	DEFAULT_APPLY_PRESET_ON_NEW_TAB,
 	DEFAULT_AUTO_APPLY_DEFAULT_PRESET,
 	DEFAULT_CONFIRM_ON_QUIT,
 	DEFAULT_TERMINAL_LINK_BEHAVIOR,
@@ -160,6 +159,34 @@ export const createSettingsRouter = () => {
 				return { success: true };
 			}),
 
+		setPresetAutoApply: publicProcedure
+			.input(
+				z.object({
+					id: z.string().nullable(),
+					field: z.enum(["applyOnWorkspaceCreated", "applyOnNewTab"]),
+				}),
+			)
+			.mutation(({ input }) => {
+				const row = getSettings();
+				const presets = row.terminalPresets ?? [];
+
+				const updatedPresets = presets.map((p) => ({
+					...p,
+					[input.field]: input.id === p.id ? true : undefined,
+				}));
+
+				localDb
+					.insert(settings)
+					.values({ id: 1, terminalPresets: updatedPresets })
+					.onConflictDoUpdate({
+						target: settings.id,
+						set: { terminalPresets: updatedPresets },
+					})
+					.run();
+
+				return { success: true };
+			}),
+
 		reorderTerminalPresets: publicProcedure
 			.input(
 				z.object({
@@ -207,6 +234,26 @@ export const createSettingsRouter = () => {
 			return presets.find((p) => p.isDefault) ?? null;
 		}),
 
+		getWorkspaceCreationPreset: publicProcedure.query(() => {
+			const row = getSettings();
+			const presets = row.terminalPresets ?? [];
+			return (
+				presets.find((p) => p.applyOnWorkspaceCreated) ??
+				presets.find((p) => p.isDefault) ??
+				null
+			);
+		}),
+
+		getNewTabPreset: publicProcedure.query(() => {
+			const row = getSettings();
+			const presets = row.terminalPresets ?? [];
+			return (
+				presets.find((p) => p.applyOnNewTab) ??
+				presets.find((p) => p.isDefault) ??
+				null
+			);
+		}),
+
 		getSelectedRingtoneId: publicProcedure.query(() => {
 			const row = getSettings();
 			const storedId = row.selectedRingtoneId;
@@ -315,26 +362,6 @@ export const createSettingsRouter = () => {
 				return { success: true };
 			}),
 
-		getApplyPresetOnNewTab: publicProcedure.query(() => {
-			const row = getSettings();
-			return row.applyPresetOnNewTab ?? DEFAULT_APPLY_PRESET_ON_NEW_TAB;
-		}),
-
-		setApplyPresetOnNewTab: publicProcedure
-			.input(z.object({ enabled: z.boolean() }))
-			.mutation(({ input }) => {
-				localDb
-					.insert(settings)
-					.values({ id: 1, applyPresetOnNewTab: input.enabled })
-					.onConflictDoUpdate({
-						target: settings.id,
-						set: { applyPresetOnNewTab: input.enabled },
-					})
-					.run();
-
-				return { success: true };
-			}),
-
 		restartApp: publicProcedure.mutation(() => {
 			app.relaunch();
 			quitWithoutConfirmation();
diff --git a/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts b/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts
index 0e380dc3e57..b467f4d0011 100644
--- a/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts
+++ b/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts
@@ -13,7 +13,11 @@ function getDefaultPreset() {
 	const row = localDb.select().from(settings).get();
 	if (!row) return null;
 	const presets = row.terminalPresets ?? [];
-	return presets.find((p) => p.isDefault) ?? null;
+	return (
+		presets.find((p) => p.applyOnWorkspaceCreated) ??
+		presets.find((p) => p.isDefault) ??
+		null
+	);
 }
 
 export const createInitProcedures = () => {
diff --git a/apps/desktop/src/renderer/react-query/presets/index.ts b/apps/desktop/src/renderer/react-query/presets/index.ts
index a2c2b888985..4100564f13c 100644
--- a/apps/desktop/src/renderer/react-query/presets/index.ts
+++ b/apps/desktop/src/renderer/react-query/presets/index.ts
@@ -65,6 +65,24 @@ function useSetDefaultPreset(
 	});
 }
 
+function useSetPresetAutoApply(
+	options?: Parameters<
+		typeof electronTrpc.settings.setPresetAutoApply.useMutation
+	>[0],
+) {
+	const utils = electronTrpc.useUtils();
+
+	return electronTrpc.settings.setPresetAutoApply.useMutation({
+		...options,
+		onSuccess: async (...args) => {
+			await utils.settings.getTerminalPresets.invalidate();
+			await utils.settings.getWorkspaceCreationPreset.invalidate();
+			await utils.settings.getNewTabPreset.invalidate();
+			await options?.onSuccess?.(...args);
+		},
+	});
+}
+
 function useReorderTerminalPresets(
 	options?: Parameters<
 		typeof electronTrpc.settings.reorderTerminalPresets.useMutation
@@ -96,6 +114,7 @@ export function usePresets() {
 	const updatePreset = useUpdateTerminalPreset();
 	const deletePreset = useDeleteTerminalPreset();
 	const setDefaultPreset = useSetDefaultPreset();
+	const setPresetAutoApply = useSetPresetAutoApply();
 	const reorderPresets = useReorderTerminalPresets();
 
 	return {
@@ -106,6 +125,7 @@ export function usePresets() {
 		updatePreset,
 		deletePreset,
 		setDefaultPreset,
+		setPresetAutoApply,
 		reorderPresets,
 	};
 }
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/TerminalSettings.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/TerminalSettings.tsx
index ae6a4ef6c8f..136ad182d72 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/TerminalSettings.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/TerminalSettings.tsx
@@ -4,7 +4,6 @@ import {
 	SETTING_ITEM_ID,
 	type SettingItemId,
 } from "../../../utils/settings-search";
-import { ApplyPresetOnNewTabSetting } from "./components/ApplyPresetOnNewTabSetting";
 import { AutoApplyPresetSetting } from "./components/AutoApplyPresetSetting";
 import { LinkBehaviorSetting } from "./components/LinkBehaviorSetting";
 import { PresetsSection } from "./components/PresetsSection";
@@ -48,10 +47,6 @@ export function TerminalSettings({ visibleItems }: TerminalSettingsProps) {
 		SETTING_ITEM_ID.TERMINAL_AUTO_APPLY_PRESET,
 		visibleItems,
 	);
-	const showApplyPresetOnNewTab = isItemVisible(
-		SETTING_ITEM_ID.TERMINAL_APPLY_PRESET_ON_NEW_TAB,
-		visibleItems,
-	);
 	const showLinkBehavior = isItemVisible(
 		SETTING_ITEM_ID.TERMINAL_LINK_BEHAVIOR,
 		visibleItems,
@@ -79,9 +74,6 @@ export function TerminalSettings({ visibleItems }: TerminalSettingsProps) {
 					/>
 				)}
 				{showAutoApplyPreset && <AutoApplyPresetSetting key="auto-apply" />}
-				{showApplyPresetOnNewTab && (
-					<ApplyPresetOnNewTabSetting key="apply-on-new-tab" />
-				)}
 				{showLinkBehavior && <LinkBehaviorSetting key="link-behavior" />}
 				{showSessions && <SessionsSection key="sessions" />}
 			</SectionList>
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/ApplyPresetOnNewTabSetting.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/ApplyPresetOnNewTabSetting.tsx
deleted file mode 100644
index 82c187e17cc..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/ApplyPresetOnNewTabSetting.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Label } from "@superset/ui/label";
-import { Switch } from "@superset/ui/switch";
-import { electronTrpc } from "renderer/lib/electron-trpc";
-import { DEFAULT_APPLY_PRESET_ON_NEW_TAB } from "shared/constants";
-
-export function ApplyPresetOnNewTabSetting() {
-	const utils = electronTrpc.useUtils();
-
-	const { data: applyPresetOnNewTab, isLoading } =
-		electronTrpc.settings.getApplyPresetOnNewTab.useQuery();
-
-	const setApplyPresetOnNewTab =
-		electronTrpc.settings.setApplyPresetOnNewTab.useMutation({
-			onMutate: async ({ enabled }) => {
-				await utils.settings.getApplyPresetOnNewTab.cancel();
-				const previous = utils.settings.getApplyPresetOnNewTab.getData();
-				utils.settings.getApplyPresetOnNewTab.setData(undefined, enabled);
-				return { previous };
-			},
-			onError: (_err, _vars, context) => {
-				if (context?.previous !== undefined) {
-					utils.settings.getApplyPresetOnNewTab.setData(
-						undefined,
-						context.previous,
-					);
-				}
-			},
-			onSettled: () => {
-				utils.settings.getApplyPresetOnNewTab.invalidate();
-			},
-		});
-
-	return (
-		<div className="flex items-center justify-between">
-			<div className="space-y-0.5">
-				<Label
-					htmlFor="apply-preset-on-new-tab"
-					className="text-sm font-medium"
-				>
-					Apply preset on new tab
-				</Label>
-				<p className="text-xs text-muted-foreground">
-					Automatically apply your default preset when opening new tabs, panes,
-					or splits
-				</p>
-			</div>
-			<Switch
-				id="apply-preset-on-new-tab"
-				checked={applyPresetOnNewTab ?? DEFAULT_APPLY_PRESET_ON_NEW_TAB}
-				onCheckedChange={(enabled) =>
-					setApplyPresetOnNewTab.mutate({ enabled })
-				}
-				disabled={isLoading || setApplyPresetOnNewTab.isPending}
-			/>
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/AutoApplyPresetSetting.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/AutoApplyPresetSetting.tsx
index cde96246f1c..4f69fe7142d 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/AutoApplyPresetSetting.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/AutoApplyPresetSetting.tsx
@@ -34,10 +34,11 @@ export function AutoApplyPresetSetting() {
 		<div className="flex items-center justify-between">
 			<div className="space-y-0.5">
 				<Label htmlFor="auto-apply-preset" className="text-sm font-medium">
-					Apply preset on workspace creation
+					Auto-apply default preset
 				</Label>
 				<p className="text-xs text-muted-foreground">
-					Automatically apply your default preset when creating new workspaces
+					Automatically apply the workspace creation preset when creating new
+					workspaces
 				</p>
 			</div>
 			<Switch
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
index 7f83cb2f54e..27bf72a2afc 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
@@ -11,7 +11,7 @@ import {
 import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
 import { useEffect, useRef } from "react";
 import { useDrag, useDrop } from "react-dnd";
-import { HiOutlineStar, HiStar } from "react-icons/hi2";
+import { HiOutlineDocumentPlus, HiOutlineFolderPlus } from "react-icons/hi2";
 import { LuGripVertical, LuTrash } from "react-icons/lu";
 import {
 	PRESET_COLUMNS,
@@ -67,6 +67,8 @@ function PresetCell({
 	);
 }
 
+type AutoApplyField = "applyOnWorkspaceCreated" | "applyOnNewTab";
+
 interface PresetRowProps {
 	preset: TerminalPreset;
 	rowIndex: number;
@@ -77,7 +79,7 @@ interface PresetRowProps {
 	onCommandsBlur: (rowIndex: number) => void;
 	onExecutionModeChange: (rowIndex: number, mode: ExecutionMode) => void;
 	onDelete: (rowIndex: number) => void;
-	onSetDefault: (presetId: string | null) => void;
+	onToggleAutoApply: (presetId: string | null, field: AutoApplyField) => void;
 	onLocalReorder: (fromIndex: number, toIndex: number) => void;
 	onPersistReorder: (presetId: string, targetIndex: number) => void;
 }
@@ -92,7 +94,7 @@ export function PresetRow({
 	onCommandsBlur,
 	onExecutionModeChange,
 	onDelete,
-	onSetDefault,
+	onToggleAutoApply,
 	onLocalReorder,
 	onPersistReorder,
 }: PresetRowProps) {
@@ -130,9 +132,12 @@ export function PresetRow({
 		drag(dragHandleRef);
 	}, [preview, drop, drag]);
 
-	const handleToggleDefault = () => {
-		onSetDefault(preset.isDefault ? null : preset.id);
-	};
+	const isWorkspaceCreation =
+		preset.applyOnWorkspaceCreated ||
+		(!preset.applyOnNewTab && preset.isDefault);
+	const isNewTab =
+		preset.applyOnNewTab ||
+		(!preset.applyOnWorkspaceCreated && preset.isDefault);
 
 	return (
 		<div
@@ -178,29 +183,52 @@ export function PresetRow({
 					</SelectContent>
 				</Select>
 			</div>
-			<div className="w-20 flex justify-center gap-1 shrink-0 pt-1">
+			<div className="w-[7rem] flex justify-center gap-0.5 shrink-0 pt-1">
 				<Tooltip>
 					<TooltipTrigger asChild>
 						<Button
 							variant="ghost"
 							size="sm"
-							onClick={handleToggleDefault}
-							className={`h-8 w-8 p-0 ${preset.isDefault ? "text-yellow-500 hover:text-yellow-600" : "text-muted-foreground hover:text-foreground"}`}
+							onClick={() =>
+								onToggleAutoApply(
+									isWorkspaceCreation ? null : preset.id,
+									"applyOnWorkspaceCreated",
+								)
+							}
+							className={`h-8 w-8 p-0 ${isWorkspaceCreation ? "text-blue-500 hover:text-blue-600" : "text-muted-foreground hover:text-foreground"}`}
 							aria-label={
-								preset.isDefault ? "Remove default" : "Set as default"
+								isWorkspaceCreation
+									? "Remove from workspace creation"
+									: "Apply on workspace creation"
+							}
+						>
+							<HiOutlineFolderPlus className="h-4 w-4" />
+						</Button>
+					</TooltipTrigger>
+					<TooltipContent side="top">
+						{isWorkspaceCreation
+							? "Applied on workspace creation (click to remove)"
+							: "Apply on workspace creation"}
+					</TooltipContent>
+				</Tooltip>
+				<Tooltip>
+					<TooltipTrigger asChild>
+						<Button
+							variant="ghost"
+							size="sm"
+							onClick={() =>
+								onToggleAutoApply(isNewTab ? null : preset.id, "applyOnNewTab")
 							}
+							className={`h-8 w-8 p-0 ${isNewTab ? "text-green-500 hover:text-green-600" : "text-muted-foreground hover:text-foreground"}`}
+							aria-label={isNewTab ? "Remove from new tab" : "Apply on new tab"}
 						>
-							{preset.isDefault ? (
-								<HiStar className="h-4 w-4" />
-							) : (
-								<HiOutlineStar className="h-4 w-4" />
-							)}
+							<HiOutlineDocumentPlus className="h-4 w-4" />
 						</Button>
 					</TooltipTrigger>
 					<TooltipContent side="top">
-						{preset.isDefault
-							? "Remove as default"
-							: "Set as default for new terminals"}
+						{isNewTab
+							? "Applied on new tab (click to remove)"
+							: "Apply on new tab"}
 					</TooltipContent>
 				</Tooltip>
 				<Button
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
index 725743e9f62..0a6d4f8cdbc 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
@@ -95,7 +95,7 @@ export function PresetsSection({
 		createPreset,
 		updatePreset,
 		deletePreset,
-		setDefaultPreset,
+		setPresetAutoApply,
 		reorderPresets,
 	} = usePresets();
 
@@ -257,11 +257,14 @@ export function PresetsSection({
 		[deletePreset],
 	);
 
-	const handleSetDefault = useCallback(
-		(presetId: string | null) => {
-			setDefaultPreset.mutate({ id: presetId });
+	const handleToggleAutoApply = useCallback(
+		(
+			presetId: string | null,
+			field: "applyOnWorkspaceCreated" | "applyOnNewTab",
+		) => {
+			setPresetAutoApply.mutate({ id: presetId, field });
 		},
-		[setDefaultPreset],
+		[setPresetAutoApply],
 	);
 
 	const handleLocalReorder = useCallback(
@@ -376,7 +379,7 @@ export function PresetsSection({
 								</p>
 							</TooltipContent>
 						</Tooltip>
-						<div className="w-20 text-xs font-medium text-muted-foreground uppercase tracking-wider text-center shrink-0">
+						<div className="w-[7rem] text-xs font-medium text-muted-foreground uppercase tracking-wider text-center shrink-0">
 							Actions
 						</div>
 					</div>
@@ -402,7 +405,7 @@ export function PresetsSection({
 									onCommandsBlur={handleCommandsBlur}
 									onExecutionModeChange={handleExecutionModeChange}
 									onDelete={handleDeleteRow}
-									onSetDefault={handleSetDefault}
+									onToggleAutoApply={handleToggleAutoApply}
 									onLocalReorder={handleLocalReorder}
 									onPersistReorder={handlePersistReorder}
 								/>
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts
index 73ef7c22265..cb611ce0951 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts
@@ -28,7 +28,6 @@ export const SETTING_ITEM_ID = {
 	TERMINAL_PRESETS: "terminal-presets",
 	TERMINAL_QUICK_ADD: "terminal-quick-add",
 	TERMINAL_AUTO_APPLY_PRESET: "terminal-auto-apply-preset",
-	TERMINAL_APPLY_PRESET_ON_NEW_TAB: "terminal-apply-preset-on-new-tab",
 	TERMINAL_SESSIONS: "terminal-sessions",
 	TERMINAL_LINK_BEHAVIOR: "terminal-link-behavior",
 
@@ -406,9 +405,9 @@ export const SETTINGS_ITEMS: SettingsItem[] = [
 	{
 		id: SETTING_ITEM_ID.TERMINAL_AUTO_APPLY_PRESET,
 		section: "terminal",
-		title: "Apply Preset on Workspace Creation",
+		title: "Auto-Apply Default Preset",
 		description:
-			"Automatically apply default preset when creating new workspaces",
+			"Automatically apply the workspace creation preset when creating new workspaces",
 		keywords: [
 			"terminal",
 			"preset",
@@ -422,25 +421,6 @@ export const SETTINGS_ITEMS: SettingsItem[] = [
 			"launch",
 		],
 	},
-	{
-		id: SETTING_ITEM_ID.TERMINAL_APPLY_PRESET_ON_NEW_TAB,
-		section: "terminal",
-		title: "Apply Preset on New Tab",
-		description:
-			"Automatically apply default preset when opening new tabs, panes, or splits",
-		keywords: [
-			"terminal",
-			"preset",
-			"default",
-			"auto",
-			"apply",
-			"tab",
-			"pane",
-			"split",
-			"new",
-			"open",
-		],
-	},
 	{
 		id: SETTING_ITEM_ID.TERMINAL_SESSIONS,
 		section: "terminal",
diff --git a/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts b/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
index 4424a1da3cb..10948e8364c 100644
--- a/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
+++ b/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
@@ -2,23 +2,17 @@ import type { TerminalPreset } from "@superset/local-db";
 import { useCallback, useMemo } from "react";
 import type { MosaicBranch } from "react-mosaic-component";
 import { electronTrpc } from "renderer/lib/electron-trpc";
-import { usePresets } from "renderer/react-query/presets";
-import { DEFAULT_APPLY_PRESET_ON_NEW_TAB } from "shared/constants";
 import { useTabsStore } from "./store";
 import type { AddTabOptions } from "./types";
 
 /**
  * Hook that wraps tab store actions with default preset support.
- * When a default preset is configured, new terminals will automatically
- * use that preset's commands and cwd.
+ * When a preset with applyOnNewTab is configured, new terminals will
+ * automatically use that preset's commands and cwd.
  */
 export function useTabsWithPresets() {
-	const { defaultPreset } = usePresets();
-
-	const { data: applyPresetOnNewTab } =
-		electronTrpc.settings.getApplyPresetOnNewTab.useQuery();
-	const isNewTabPresetEnabled =
-		applyPresetOnNewTab ?? DEFAULT_APPLY_PRESET_ON_NEW_TAB;
+	const { data: newTabPreset } =
+		electronTrpc.settings.getNewTabPreset.useQuery();
 
 	const storeAddTab = useTabsStore((s) => s.addTab);
 	const storeAddTabWithMultiplePanes = useTabsStore(
@@ -31,20 +25,19 @@ export function useTabsWithPresets() {
 	const renameTab = useTabsStore((s) => s.renameTab);
 
 	const defaultPresetOptions: AddTabOptions | undefined = useMemo(() => {
-		if (!isNewTabPresetEnabled || !defaultPreset) return undefined;
+		if (!newTabPreset) return undefined;
 		return {
-			initialCommands: defaultPreset.commands,
-			initialCwd: defaultPreset.cwd || undefined,
+			initialCommands: newTabPreset.commands,
+			initialCwd: newTabPreset.cwd || undefined,
 		};
-	}, [isNewTabPresetEnabled, defaultPreset]);
+	}, [newTabPreset]);
 
 	const shouldUseParallelMode = useMemo(() => {
 		return (
-			isNewTabPresetEnabled &&
-			defaultPreset?.executionMode === "parallel" &&
-			defaultPreset.commands.length > 1
+			newTabPreset?.executionMode === "parallel" &&
+			(newTabPreset?.commands.length ?? 0) > 1
 		);
-	}, [isNewTabPresetEnabled, defaultPreset]);
+	}, [newTabPreset]);
 
 	const addTab = useCallback(
 		(workspaceId: string, options?: AddTabOptions) => {
@@ -52,14 +45,14 @@ export function useTabsWithPresets() {
 				return storeAddTab(workspaceId, options);
 			}
 
-			if (shouldUseParallelMode && defaultPreset) {
+			if (shouldUseParallelMode && newTabPreset) {
 				const { tabId, paneIds } = storeAddTabWithMultiplePanes(workspaceId, {
-					commands: defaultPreset.commands,
-					initialCwd: defaultPreset.cwd || undefined,
+					commands: newTabPreset.commands,
+					initialCwd: newTabPreset.cwd || undefined,
 				});
 
-				if (defaultPreset.name) {
-					renameTab(tabId, defaultPreset.name);
+				if (newTabPreset.name) {
+					renameTab(tabId, newTabPreset.name);
 				}
 
 				return { tabId, paneId: paneIds[0] };
@@ -67,8 +60,8 @@ export function useTabsWithPresets() {
 
 			const result = storeAddTab(workspaceId, defaultPresetOptions);
 
-			if (isNewTabPresetEnabled && defaultPreset?.name) {
-				renameTab(result.tabId, defaultPreset.name);
+			if (newTabPreset?.name) {
+				renameTab(result.tabId, newTabPreset.name);
 			}
 
 			return result;
@@ -77,9 +70,8 @@ export function useTabsWithPresets() {
 			storeAddTab,
 			storeAddTabWithMultiplePanes,
 			defaultPresetOptions,
-			defaultPreset,
+			newTabPreset,
 			shouldUseParallelMode,
-			isNewTabPresetEnabled,
 			renameTab,
 		],
 	);
@@ -179,6 +171,6 @@ export function useTabsWithPresets() {
 		splitPaneHorizontal,
 		splitPaneAuto,
 		openPreset,
-		defaultPreset,
+		defaultPreset: newTabPreset,
 	};
 }
diff --git a/apps/desktop/src/shared/constants.ts b/apps/desktop/src/shared/constants.ts
index f588b40698a..2eadec60637 100644
--- a/apps/desktop/src/shared/constants.ts
+++ b/apps/desktop/src/shared/constants.ts
@@ -54,7 +54,6 @@ export const MOCK_ORG_ID = "mock-org-id";
 export const DEFAULT_CONFIRM_ON_QUIT = true;
 export const DEFAULT_TERMINAL_LINK_BEHAVIOR = "external-editor" as const;
 export const DEFAULT_AUTO_APPLY_DEFAULT_PRESET = true;
-export const DEFAULT_APPLY_PRESET_ON_NEW_TAB = true;
 export const DEFAULT_TELEMETRY_ENABLED = true;
 
 // External links (documentation, help resources, etc.)
diff --git a/packages/local-db/drizzle/0020_add_apply_preset_on_new_tab.sql b/packages/local-db/drizzle/0020_add_apply_preset_on_new_tab.sql
deleted file mode 100644
index cf01395d1ee..00000000000
--- a/packages/local-db/drizzle/0020_add_apply_preset_on_new_tab.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `settings` ADD `apply_preset_on_new_tab` integer;
\ No newline at end of file
diff --git a/packages/local-db/drizzle/meta/0020_snapshot.json b/packages/local-db/drizzle/meta/0020_snapshot.json
deleted file mode 100644
index 885a1603cdb..00000000000
--- a/packages/local-db/drizzle/meta/0020_snapshot.json
+++ /dev/null
@@ -1,1078 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "94b221c1-711b-4c2b-85ff-111e7133bd7d",
-  "prevId": "732c942c-5f01-451f-a6cf-92c38b434076",
-  "tables": {
-    "organization_members": {
-      "name": "organization_members",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "organization_id": {
-          "name": "organization_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "role": {
-          "name": "role",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "organization_members_organization_id_idx": {
-          "name": "organization_members_organization_id_idx",
-          "columns": [
-            "organization_id"
-          ],
-          "isUnique": false
-        },
-        "organization_members_user_id_idx": {
-          "name": "organization_members_user_id_idx",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "organization_members_organization_id_organizations_id_fk": {
-          "name": "organization_members_organization_id_organizations_id_fk",
-          "tableFrom": "organization_members",
-          "tableTo": "organizations",
-          "columnsFrom": [
-            "organization_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "organization_members_user_id_users_id_fk": {
-          "name": "organization_members_user_id_users_id_fk",
-          "tableFrom": "organization_members",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "organizations": {
-      "name": "organizations",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "clerk_org_id": {
-          "name": "clerk_org_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "slug": {
-          "name": "slug",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "github_org": {
-          "name": "github_org",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "avatar_url": {
-          "name": "avatar_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "organizations_clerk_org_id_unique": {
-          "name": "organizations_clerk_org_id_unique",
-          "columns": [
-            "clerk_org_id"
-          ],
-          "isUnique": true
-        },
-        "organizations_slug_unique": {
-          "name": "organizations_slug_unique",
-          "columns": [
-            "slug"
-          ],
-          "isUnique": true
-        },
-        "organizations_slug_idx": {
-          "name": "organizations_slug_idx",
-          "columns": [
-            "slug"
-          ],
-          "isUnique": false
-        },
-        "organizations_clerk_org_id_idx": {
-          "name": "organizations_clerk_org_id_idx",
-          "columns": [
-            "clerk_org_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "projects": {
-      "name": "projects",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "main_repo_path": {
-          "name": "main_repo_path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "tab_order": {
-          "name": "tab_order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_opened_at": {
-          "name": "last_opened_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "config_toast_dismissed": {
-          "name": "config_toast_dismissed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "default_branch": {
-          "name": "default_branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_owner": {
-          "name": "github_owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "branch_prefix_mode": {
-          "name": "branch_prefix_mode",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "branch_prefix_custom": {
-          "name": "branch_prefix_custom",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "hide_image": {
-          "name": "hide_image",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "projects_main_repo_path_idx": {
-          "name": "projects_main_repo_path_idx",
-          "columns": [
-            "main_repo_path"
-          ],
-          "isUnique": false
-        },
-        "projects_last_opened_at_idx": {
-          "name": "projects_last_opened_at_idx",
-          "columns": [
-            "last_opened_at"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "settings": {
-      "name": "settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "last_active_workspace_id": {
-          "name": "last_active_workspace_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_used_app": {
-          "name": "last_used_app",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "terminal_presets": {
-          "name": "terminal_presets",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "terminal_presets_initialized": {
-          "name": "terminal_presets_initialized",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "selected_ringtone_id": {
-          "name": "selected_ringtone_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "active_organization_id": {
-          "name": "active_organization_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "confirm_on_quit": {
-          "name": "confirm_on_quit",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "terminal_link_behavior": {
-          "name": "terminal_link_behavior",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "persist_terminal": {
-          "name": "persist_terminal",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": true
-        },
-        "auto_apply_default_preset": {
-          "name": "auto_apply_default_preset",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "apply_preset_on_new_tab": {
-          "name": "apply_preset_on_new_tab",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "branch_prefix_mode": {
-          "name": "branch_prefix_mode",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "branch_prefix_custom": {
-          "name": "branch_prefix_custom",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "notification_sounds_muted": {
-          "name": "notification_sounds_muted",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "delete_local_branch": {
-          "name": "delete_local_branch",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "tasks": {
-      "name": "tasks",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "slug": {
-          "name": "slug",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status_color": {
-          "name": "status_color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status_type": {
-          "name": "status_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status_position": {
-          "name": "status_position",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "priority": {
-          "name": "priority",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "organization_id": {
-          "name": "organization_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repository_id": {
-          "name": "repository_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "assignee_id": {
-          "name": "assignee_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "creator_id": {
-          "name": "creator_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "estimate": {
-          "name": "estimate",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "due_date": {
-          "name": "due_date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "labels": {
-          "name": "labels",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "pr_url": {
-          "name": "pr_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "external_provider": {
-          "name": "external_provider",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "external_id": {
-          "name": "external_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "external_key": {
-          "name": "external_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "external_url": {
-          "name": "external_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_synced_at": {
-          "name": "last_synced_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "sync_error": {
-          "name": "sync_error",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "started_at": {
-          "name": "started_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "completed_at": {
-          "name": "completed_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "deleted_at": {
-          "name": "deleted_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "tasks_slug_unique": {
-          "name": "tasks_slug_unique",
-          "columns": [
-            "slug"
-          ],
-          "isUnique": true
-        },
-        "tasks_slug_idx": {
-          "name": "tasks_slug_idx",
-          "columns": [
-            "slug"
-          ],
-          "isUnique": false
-        },
-        "tasks_organization_id_idx": {
-          "name": "tasks_organization_id_idx",
-          "columns": [
-            "organization_id"
-          ],
-          "isUnique": false
-        },
-        "tasks_assignee_id_idx": {
-          "name": "tasks_assignee_id_idx",
-          "columns": [
-            "assignee_id"
-          ],
-          "isUnique": false
-        },
-        "tasks_status_idx": {
-          "name": "tasks_status_idx",
-          "columns": [
-            "status"
-          ],
-          "isUnique": false
-        },
-        "tasks_created_at_idx": {
-          "name": "tasks_created_at_idx",
-          "columns": [
-            "created_at"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "tasks_organization_id_organizations_id_fk": {
-          "name": "tasks_organization_id_organizations_id_fk",
-          "tableFrom": "tasks",
-          "tableTo": "organizations",
-          "columnsFrom": [
-            "organization_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "tasks_assignee_id_users_id_fk": {
-          "name": "tasks_assignee_id_users_id_fk",
-          "tableFrom": "tasks",
-          "tableTo": "users",
-          "columnsFrom": [
-            "assignee_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        },
-        "tasks_creator_id_users_id_fk": {
-          "name": "tasks_creator_id_users_id_fk",
-          "tableFrom": "tasks",
-          "tableTo": "users",
-          "columnsFrom": [
-            "creator_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "clerk_id": {
-          "name": "clerk_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "avatar_url": {
-          "name": "avatar_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "deleted_at": {
-          "name": "deleted_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "users_clerk_id_unique": {
-          "name": "users_clerk_id_unique",
-          "columns": [
-            "clerk_id"
-          ],
-          "isUnique": true
-        },
-        "users_email_unique": {
-          "name": "users_email_unique",
-          "columns": [
-            "email"
-          ],
-          "isUnique": true
-        },
-        "users_email_idx": {
-          "name": "users_email_idx",
-          "columns": [
-            "email"
-          ],
-          "isUnique": false
-        },
-        "users_clerk_id_idx": {
-          "name": "users_clerk_id_idx",
-          "columns": [
-            "clerk_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "workspaces": {
-      "name": "workspaces",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "project_id": {
-          "name": "project_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "worktree_id": {
-          "name": "worktree_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "tab_order": {
-          "name": "tab_order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "last_opened_at": {
-          "name": "last_opened_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "is_unread": {
-          "name": "is_unread",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": false
-        },
-        "is_unnamed": {
-          "name": "is_unnamed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": false
-        },
-        "deleting_at": {
-          "name": "deleting_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "workspaces_project_id_idx": {
-          "name": "workspaces_project_id_idx",
-          "columns": [
-            "project_id"
-          ],
-          "isUnique": false
-        },
-        "workspaces_worktree_id_idx": {
-          "name": "workspaces_worktree_id_idx",
-          "columns": [
-            "worktree_id"
-          ],
-          "isUnique": false
-        },
-        "workspaces_last_opened_at_idx": {
-          "name": "workspaces_last_opened_at_idx",
-          "columns": [
-            "last_opened_at"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "workspaces_project_id_projects_id_fk": {
-          "name": "workspaces_project_id_projects_id_fk",
-          "tableFrom": "workspaces",
-          "tableTo": "projects",
-          "columnsFrom": [
-            "project_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "workspaces_worktree_id_worktrees_id_fk": {
-          "name": "workspaces_worktree_id_worktrees_id_fk",
-          "tableFrom": "workspaces",
-          "tableTo": "worktrees",
-          "columnsFrom": [
-            "worktree_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "worktrees": {
-      "name": "worktrees",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "project_id": {
-          "name": "project_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "path": {
-          "name": "path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "base_branch": {
-          "name": "base_branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "git_status": {
-          "name": "git_status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_status": {
-          "name": "github_status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "worktrees_project_id_idx": {
-          "name": "worktrees_project_id_idx",
-          "columns": [
-            "project_id"
-          ],
-          "isUnique": false
-        },
-        "worktrees_branch_idx": {
-          "name": "worktrees_branch_idx",
-          "columns": [
-            "branch"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "worktrees_project_id_projects_id_fk": {
-          "name": "worktrees_project_id_projects_id_fk",
-          "tableFrom": "worktrees",
-          "tableTo": "projects",
-          "columnsFrom": [
-            "project_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
\ No newline at end of file
diff --git a/packages/local-db/drizzle/meta/_journal.json b/packages/local-db/drizzle/meta/_journal.json
index 93d72b999d9..d6ac4a2497b 100644
--- a/packages/local-db/drizzle/meta/_journal.json
+++ b/packages/local-db/drizzle/meta/_journal.json
@@ -141,13 +141,6 @@
       "when": 1770438863796,
       "tag": "0019_add_hide_image_to_projects",
       "breakpoints": true
-    },
-    {
-      "idx": 20,
-      "version": "6",
-      "when": 1770596618589,
-      "tag": "0020_add_apply_preset_on_new_tab",
-      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/local-db/src/schema/schema.ts b/packages/local-db/src/schema/schema.ts
index 42fb268a93a..74757311d4d 100644
--- a/packages/local-db/src/schema/schema.ts
+++ b/packages/local-db/src/schema/schema.ts
@@ -151,9 +151,6 @@ export const settings = sqliteTable("settings", {
 	autoApplyDefaultPreset: integer("auto_apply_default_preset", {
 		mode: "boolean",
 	}),
-	applyPresetOnNewTab: integer("apply_preset_on_new_tab", {
-		mode: "boolean",
-	}),
 	branchPrefixMode: text("branch_prefix_mode").$type<BranchPrefixMode>(),
 	branchPrefixCustom: text("branch_prefix_custom"),
 	notificationSoundsMuted: integer("notification_sounds_muted", {
diff --git a/packages/local-db/src/schema/zod.ts b/packages/local-db/src/schema/zod.ts
index bd91026d78e..be05a5d5e74 100644
--- a/packages/local-db/src/schema/zod.ts
+++ b/packages/local-db/src/schema/zod.ts
@@ -61,6 +61,8 @@ export const terminalPresetSchema = z.object({
 	cwd: z.string(),
 	commands: z.array(z.string()),
 	isDefault: z.boolean().optional(),
+	applyOnWorkspaceCreated: z.boolean().optional(),
+	applyOnNewTab: z.boolean().optional(),
 	executionMode: z.enum(EXECUTION_MODES).optional(),
 });
 

From cb71add8dd50c72318174c63a85380589eadc4be Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sun, 8 Feb 2026 20:34:51 -0800
Subject: [PATCH 3/9] fix(desktop): use filled icons when active and better
 icon choices for preset toggles

---
 .../components/PresetRow/PresetRow.tsx        | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
index 27bf72a2afc..181906e0d3a 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
@@ -11,7 +11,12 @@ import {
 import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
 import { useEffect, useRef } from "react";
 import { useDrag, useDrop } from "react-dnd";
-import { HiOutlineDocumentPlus, HiOutlineFolderPlus } from "react-icons/hi2";
+import {
+	HiOutlineRectangleGroup,
+	HiOutlineSquare2Stack,
+	HiRectangleGroup,
+	HiSquare2Stack,
+} from "react-icons/hi2";
 import { LuGripVertical, LuTrash } from "react-icons/lu";
 import {
 	PRESET_COLUMNS,
@@ -202,7 +207,11 @@ export function PresetRow({
 									: "Apply on workspace creation"
 							}
 						>
-							<HiOutlineFolderPlus className="h-4 w-4" />
+							{isWorkspaceCreation ? (
+								<HiRectangleGroup className="h-4 w-4" />
+							) : (
+								<HiOutlineRectangleGroup className="h-4 w-4" />
+							)}
 						</Button>
 					</TooltipTrigger>
 					<TooltipContent side="top">
@@ -222,7 +231,11 @@ export function PresetRow({
 							className={`h-8 w-8 p-0 ${isNewTab ? "text-green-500 hover:text-green-600" : "text-muted-foreground hover:text-foreground"}`}
 							aria-label={isNewTab ? "Remove from new tab" : "Apply on new tab"}
 						>
-							<HiOutlineDocumentPlus className="h-4 w-4" />
+							{isNewTab ? (
+								<HiSquare2Stack className="h-4 w-4" />
+							) : (
+								<HiOutlineSquare2Stack className="h-4 w-4" />
+							)}
 						</Button>
 					</TooltipTrigger>
 					<TooltipContent side="top">

From e96137aa94c21930a2a827d95efd4d462e46959e Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sun, 8 Feb 2026 20:39:51 -0800
Subject: [PATCH 4/9] feat(desktop): use badge toggles and allow multiple
 presets per trigger

Replace icon buttons with clickable WS/Tab badges that toggle
independently. Multiple presets can now be tagged for the same trigger -
all tagged presets fire when a workspace is created or a new tab opens.

- setPresetAutoApply toggles per-preset (no longer mutually exclusive)
- getWorkspaceCreationPresets/getNewTabPresets return arrays
- WorkspaceInitEffects applies all workspace-tagged presets
- useTabsWithPresets opens a tab for each new-tab-tagged preset
---
 .../src/lib/trpc/routers/settings/index.ts    |  30 +++--
 .../routers/workspaces/procedures/init.ts     |  18 +--
 .../src/renderer/react-query/presets/index.ts |   4 +-
 .../workspaces/useCreateBranchWorkspace.ts    |   1 +
 .../tools/start-claude-session.ts             |   1 +
 .../components/PresetRow/PresetRow.tsx        |  81 +++++-------
 .../components/PresetsSection.tsx             |   5 +-
 .../main/components/WorkspaceInitEffects.tsx  |  36 +++---
 .../stores/tabs/useTabsWithPresets.ts         | 120 ++++++++----------
 .../src/renderer/stores/workspace-init.ts     |   1 +
 10 files changed, 140 insertions(+), 157 deletions(-)

diff --git a/apps/desktop/src/lib/trpc/routers/settings/index.ts b/apps/desktop/src/lib/trpc/routers/settings/index.ts
index cb11dcd4008..3b5f28a2be7 100644
--- a/apps/desktop/src/lib/trpc/routers/settings/index.ts
+++ b/apps/desktop/src/lib/trpc/routers/settings/index.ts
@@ -162,8 +162,9 @@ export const createSettingsRouter = () => {
 		setPresetAutoApply: publicProcedure
 			.input(
 				z.object({
-					id: z.string().nullable(),
+					id: z.string(),
 					field: z.enum(["applyOnWorkspaceCreated", "applyOnNewTab"]),
+					enabled: z.boolean(),
 				}),
 			)
 			.mutation(({ input }) => {
@@ -172,7 +173,10 @@ export const createSettingsRouter = () => {
 
 				const updatedPresets = presets.map((p) => ({
 					...p,
-					[input.field]: input.id === p.id ? true : undefined,
+					[input.field]:
+						p.id === input.id
+							? input.enabled || undefined
+							: p[input.field as keyof typeof p],
 				}));
 
 				localDb
@@ -234,24 +238,22 @@ export const createSettingsRouter = () => {
 			return presets.find((p) => p.isDefault) ?? null;
 		}),
 
-		getWorkspaceCreationPreset: publicProcedure.query(() => {
+		getWorkspaceCreationPresets: publicProcedure.query(() => {
 			const row = getSettings();
 			const presets = row.terminalPresets ?? [];
-			return (
-				presets.find((p) => p.applyOnWorkspaceCreated) ??
-				presets.find((p) => p.isDefault) ??
-				null
-			);
+			const tagged = presets.filter((p) => p.applyOnWorkspaceCreated);
+			if (tagged.length > 0) return tagged;
+			const defaultPreset = presets.find((p) => p.isDefault);
+			return defaultPreset ? [defaultPreset] : [];
 		}),
 
-		getNewTabPreset: publicProcedure.query(() => {
+		getNewTabPresets: publicProcedure.query(() => {
 			const row = getSettings();
 			const presets = row.terminalPresets ?? [];
-			return (
-				presets.find((p) => p.applyOnNewTab) ??
-				presets.find((p) => p.isDefault) ??
-				null
-			);
+			const tagged = presets.filter((p) => p.applyOnNewTab);
+			if (tagged.length > 0) return tagged;
+			const defaultPreset = presets.find((p) => p.isDefault);
+			return defaultPreset ? [defaultPreset] : [];
 		}),
 
 		getSelectedRingtoneId: publicProcedure.query(() => {
diff --git a/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts b/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts
index b467f4d0011..a573fadbc1e 100644
--- a/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts
+++ b/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts
@@ -9,15 +9,14 @@ import { getProject, getWorkspaceWithRelations } from "../utils/db-helpers";
 import { loadSetupConfig } from "../utils/setup";
 import { initializeWorkspaceWorktree } from "../utils/workspace-init";
 
-function getDefaultPreset() {
+function getWorkspaceCreationPresets() {
 	const row = localDb.select().from(settings).get();
-	if (!row) return null;
+	if (!row) return [];
 	const presets = row.terminalPresets ?? [];
-	return (
-		presets.find((p) => p.applyOnWorkspaceCreated) ??
-		presets.find((p) => p.isDefault) ??
-		null
-	);
+	const tagged = presets.filter((p) => p.applyOnWorkspaceCreated);
+	if (tagged.length > 0) return tagged;
+	const defaultPreset = presets.find((p) => p.isDefault);
+	return defaultPreset ? [defaultPreset] : [];
 }
 
 export const createInitProcedures = () => {
@@ -124,12 +123,13 @@ export const createInitProcedures = () => {
 					worktreePath: relations.worktree?.path,
 					projectName: project.name,
 				});
-				const defaultPreset = getDefaultPreset();
+				const defaultPresets = getWorkspaceCreationPresets();
 
 				return {
 					projectId: project.id,
 					initialCommands: setupConfig?.setup ?? null,
-					defaultPreset,
+					defaultPreset: defaultPresets[0] ?? null,
+					defaultPresets,
 				};
 			}),
 	});
diff --git a/apps/desktop/src/renderer/react-query/presets/index.ts b/apps/desktop/src/renderer/react-query/presets/index.ts
index 4100564f13c..0f6b07d7563 100644
--- a/apps/desktop/src/renderer/react-query/presets/index.ts
+++ b/apps/desktop/src/renderer/react-query/presets/index.ts
@@ -76,8 +76,8 @@ function useSetPresetAutoApply(
 		...options,
 		onSuccess: async (...args) => {
 			await utils.settings.getTerminalPresets.invalidate();
-			await utils.settings.getWorkspaceCreationPreset.invalidate();
-			await utils.settings.getNewTabPreset.invalidate();
+			await utils.settings.getWorkspaceCreationPresets.invalidate();
+			await utils.settings.getNewTabPresets.invalidate();
 			await options?.onSuccess?.(...args);
 		},
 	});
diff --git a/apps/desktop/src/renderer/react-query/workspaces/useCreateBranchWorkspace.ts b/apps/desktop/src/renderer/react-query/workspaces/useCreateBranchWorkspace.ts
index 468761474a1..57531eaedde 100644
--- a/apps/desktop/src/renderer/react-query/workspaces/useCreateBranchWorkspace.ts
+++ b/apps/desktop/src/renderer/react-query/workspaces/useCreateBranchWorkspace.ts
@@ -39,6 +39,7 @@ export function useCreateBranchWorkspace(
 					projectId: data.projectId,
 					initialCommands: setupData?.initialCommands ?? null,
 					defaultPreset: setupData?.defaultPreset ?? null,
+					defaultPresets: setupData?.defaultPresets ?? [],
 				});
 
 				// Branch workspaces skip git init, so mark ready immediately to trigger terminal setup
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/AgentHooks/hooks/useCommandWatcher/tools/start-claude-session.ts b/apps/desktop/src/renderer/routes/_authenticated/components/AgentHooks/hooks/useCommandWatcher/tools/start-claude-session.ts
index 50ca43bf59e..423a0b10e2a 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/components/AgentHooks/hooks/useCommandWatcher/tools/start-claude-session.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/AgentHooks/hooks/useCommandWatcher/tools/start-claude-session.ts
@@ -35,6 +35,7 @@ async function execute(
 			initialCommands: [...(pending?.initialCommands ?? []), params.command],
 			// Preserve undefined (signals "fetch from backend") vs null (no preset needed)
 			defaultPreset: pending ? pending.defaultPreset : null,
+			defaultPresets: pending?.defaultPresets,
 		});
 
 		return {
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
index 181906e0d3a..c0d4a070052 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
@@ -1,5 +1,4 @@
 import { EXECUTION_MODES, type ExecutionMode } from "@superset/local-db";
-import { Button } from "@superset/ui/button";
 import { Input } from "@superset/ui/input";
 import {
 	Select,
@@ -11,12 +10,6 @@ import {
 import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
 import { useEffect, useRef } from "react";
 import { useDrag, useDrop } from "react-dnd";
-import {
-	HiOutlineRectangleGroup,
-	HiOutlineSquare2Stack,
-	HiRectangleGroup,
-	HiSquare2Stack,
-} from "react-icons/hi2";
 import { LuGripVertical, LuTrash } from "react-icons/lu";
 import {
 	PRESET_COLUMNS,
@@ -84,7 +77,11 @@ interface PresetRowProps {
 	onCommandsBlur: (rowIndex: number) => void;
 	onExecutionModeChange: (rowIndex: number, mode: ExecutionMode) => void;
 	onDelete: (rowIndex: number) => void;
-	onToggleAutoApply: (presetId: string | null, field: AutoApplyField) => void;
+	onToggleAutoApply: (
+		presetId: string,
+		field: AutoApplyField,
+		enabled: boolean,
+	) => void;
 	onLocalReorder: (fromIndex: number, toIndex: number) => void;
 	onPersistReorder: (presetId: string, targetIndex: number) => void;
 }
@@ -188,71 +185,61 @@ export function PresetRow({
 					</SelectContent>
 				</Select>
 			</div>
-			<div className="w-[7rem] flex justify-center gap-0.5 shrink-0 pt-1">
+			<div className="w-[7rem] flex items-center justify-center gap-1 shrink-0 pt-1">
 				<Tooltip>
 					<TooltipTrigger asChild>
-						<Button
-							variant="ghost"
-							size="sm"
+						<button
+							type="button"
 							onClick={() =>
 								onToggleAutoApply(
-									isWorkspaceCreation ? null : preset.id,
+									preset.id,
 									"applyOnWorkspaceCreated",
+									!isWorkspaceCreation,
 								)
 							}
-							className={`h-8 w-8 p-0 ${isWorkspaceCreation ? "text-blue-500 hover:text-blue-600" : "text-muted-foreground hover:text-foreground"}`}
-							aria-label={
+							className={`text-[10px] leading-none font-medium px-1.5 py-1 rounded-md border cursor-pointer transition-colors ${
 								isWorkspaceCreation
-									? "Remove from workspace creation"
-									: "Apply on workspace creation"
-							}
+									? "bg-blue-500/15 text-blue-600 border-blue-500/30 dark:text-blue-400"
+									: "text-muted-foreground/50 border-transparent hover:border-border hover:text-muted-foreground"
+							}`}
 						>
-							{isWorkspaceCreation ? (
-								<HiRectangleGroup className="h-4 w-4" />
-							) : (
-								<HiOutlineRectangleGroup className="h-4 w-4" />
-							)}
-						</Button>
+							WS
+						</button>
 					</TooltipTrigger>
 					<TooltipContent side="top">
 						{isWorkspaceCreation
-							? "Applied on workspace creation (click to remove)"
-							: "Apply on workspace creation"}
+							? "Runs on workspace creation (click to remove)"
+							: "Run on workspace creation"}
 					</TooltipContent>
 				</Tooltip>
 				<Tooltip>
 					<TooltipTrigger asChild>
-						<Button
-							variant="ghost"
-							size="sm"
+						<button
+							type="button"
 							onClick={() =>
-								onToggleAutoApply(isNewTab ? null : preset.id, "applyOnNewTab")
+								onToggleAutoApply(preset.id, "applyOnNewTab", !isNewTab)
 							}
-							className={`h-8 w-8 p-0 ${isNewTab ? "text-green-500 hover:text-green-600" : "text-muted-foreground hover:text-foreground"}`}
-							aria-label={isNewTab ? "Remove from new tab" : "Apply on new tab"}
+							className={`text-[10px] leading-none font-medium px-1.5 py-1 rounded-md border cursor-pointer transition-colors ${
+								isNewTab
+									? "bg-green-500/15 text-green-600 border-green-500/30 dark:text-green-400"
+									: "text-muted-foreground/50 border-transparent hover:border-border hover:text-muted-foreground"
+							}`}
 						>
-							{isNewTab ? (
-								<HiSquare2Stack className="h-4 w-4" />
-							) : (
-								<HiOutlineSquare2Stack className="h-4 w-4" />
-							)}
-						</Button>
+							Tab
+						</button>
 					</TooltipTrigger>
 					<TooltipContent side="top">
-						{isNewTab
-							? "Applied on new tab (click to remove)"
-							: "Apply on new tab"}
+						{isNewTab ? "Runs on new tab (click to remove)" : "Run on new tab"}
 					</TooltipContent>
 				</Tooltip>
-				<Button
-					variant="ghost"
-					size="sm"
+				<button
+					type="button"
 					onClick={() => onDelete(rowIndex)}
-					className="h-8 w-8 p-0 hover:bg-destructive/10 hover:text-destructive"
+					className="h-7 w-7 flex items-center justify-center rounded-md text-muted-foreground hover:bg-destructive/10 hover:text-destructive transition-colors"
 					aria-label="Delete row"
 				>
-					<LuTrash className="h-4 w-4" />
-				</Button>
+					<LuTrash className="h-3.5 w-3.5" />
+				</button>
 			</div>
 		</div>
 	);
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
index 0a6d4f8cdbc..c97878ed060 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
@@ -259,10 +259,11 @@ export function PresetsSection({
 
 	const handleToggleAutoApply = useCallback(
 		(
-			presetId: string | null,
+			presetId: string,
 			field: "applyOnWorkspaceCreated" | "applyOnNewTab",
+			enabled: boolean,
 		) => {
-			setPresetAutoApply.mutate({ id: presetId, field });
+			setPresetAutoApply.mutate({ id: presetId, field, enabled });
 		},
 		[setPresetAutoApply],
 	);
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
index ff37c84f56d..f333a795e97 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
@@ -88,21 +88,23 @@ export function WorkspaceInitEffects() {
 			const hasSetupScript =
 				Array.isArray(setup.initialCommands) &&
 				setup.initialCommands.length > 0;
-			const hasDefaultPreset =
-				shouldApplyPreset &&
-				setup.defaultPreset != null &&
-				setup.defaultPreset.commands.length > 0;
+			const presets = (
+				setup.defaultPresets ??
+				(setup.defaultPreset ? [setup.defaultPreset] : [])
+			).filter((p) => p.commands.length > 0);
+			const hasPresets = shouldApplyPreset && presets.length > 0;
 
-			if (hasSetupScript && hasDefaultPreset && setup.defaultPreset) {
+			if (hasSetupScript && hasPresets) {
 				const { tabId: setupTabId, paneId: setupPaneId } = addTab(
 					setup.workspaceId,
 				);
 				setTabAutoTitle(setupTabId, "Workspace Setup");
-				createPresetTerminal(
-					setup.workspaceId,
-					setup.defaultPreset,
-					setupTabId,
-				);
+				// Add first preset to the setup tab
+				createPresetTerminal(setup.workspaceId, presets[0], setupTabId);
+				// Additional presets get their own tabs
+				for (let i = 1; i < presets.length; i++) {
+					createPresetTerminal(setup.workspaceId, presets[i]);
+				}
 
 				createOrAttach.mutate(
 					{
@@ -171,17 +173,15 @@ export function WorkspaceInitEffects() {
 				return;
 			}
 
-			if (
-				shouldApplyPreset &&
-				setup.defaultPreset &&
-				setup.defaultPreset.commands.length > 0
-			) {
-				createPresetTerminal(setup.workspaceId, setup.defaultPreset);
+			if (hasPresets) {
+				for (const preset of presets) {
+					createPresetTerminal(setup.workspaceId, preset);
+				}
 				onComplete();
 				return;
 			}
 
-			// No setup script or default preset — sidebar card handles the prompt
+			// No setup script or presets — sidebar card handles the prompt
 			onComplete();
 		},
 		[
@@ -223,6 +223,7 @@ export function WorkspaceInitEffects() {
 							const completeSetup: PendingTerminalSetup = {
 								...setup,
 								defaultPreset: setupData?.defaultPreset ?? null,
+								defaultPresets: setupData?.defaultPresets ?? [],
 							};
 							handleTerminalSetup(completeSetup, () => {
 								removePendingTerminalSetup(workspaceId);
@@ -283,6 +284,7 @@ export function WorkspaceInitEffects() {
 						projectId: setupData.projectId,
 						initialCommands: setupData.initialCommands,
 						defaultPreset: setupData.defaultPreset,
+						defaultPresets: setupData.defaultPresets ?? [],
 					};
 
 					handleTerminalSetup(fetchedSetup, () => {
diff --git a/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts b/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
index 10948e8364c..83997ff5922 100644
--- a/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
+++ b/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
@@ -7,12 +7,12 @@ import type { AddTabOptions } from "./types";
 
 /**
  * Hook that wraps tab store actions with default preset support.
- * When a preset with applyOnNewTab is configured, new terminals will
- * automatically use that preset's commands and cwd.
+ * When presets are tagged with applyOnNewTab, new terminals will
+ * automatically use those presets' commands and cwd.
  */
 export function useTabsWithPresets() {
-	const { data: newTabPreset } =
-		electronTrpc.settings.getNewTabPreset.useQuery();
+	const { data: newTabPresets = [] } =
+		electronTrpc.settings.getNewTabPresets.useQuery();
 
 	const storeAddTab = useTabsStore((s) => s.addTab);
 	const storeAddTabWithMultiplePanes = useTabsStore(
@@ -24,20 +24,39 @@ export function useTabsWithPresets() {
 	const storeSplitPaneAuto = useTabsStore((s) => s.splitPaneAuto);
 	const renameTab = useTabsStore((s) => s.renameTab);
 
-	const defaultPresetOptions: AddTabOptions | undefined = useMemo(() => {
-		if (!newTabPreset) return undefined;
+	const firstPreset = newTabPresets[0] ?? null;
+
+	const firstPresetOptions: AddTabOptions | undefined = useMemo(() => {
+		if (!firstPreset) return undefined;
 		return {
-			initialCommands: newTabPreset.commands,
-			initialCwd: newTabPreset.cwd || undefined,
+			initialCommands: firstPreset.commands,
+			initialCwd: firstPreset.cwd || undefined,
 		};
-	}, [newTabPreset]);
+	}, [firstPreset]);
+
+	const openPresetAsTab = useCallback(
+		(workspaceId: string, preset: TerminalPreset) => {
+			const isParallel =
+				preset.executionMode === "parallel" && preset.commands.length > 1;
+
+			const { tabId } = isParallel
+				? storeAddTabWithMultiplePanes(workspaceId, {
+						commands: preset.commands,
+						initialCwd: preset.cwd || undefined,
+					})
+				: storeAddTab(workspaceId, {
+						initialCommands: preset.commands,
+						initialCwd: preset.cwd || undefined,
+					});
 
-	const shouldUseParallelMode = useMemo(() => {
-		return (
-			newTabPreset?.executionMode === "parallel" &&
-			(newTabPreset?.commands.length ?? 0) > 1
-		);
-	}, [newTabPreset]);
+			if (preset.name) {
+				renameTab(tabId, preset.name);
+			}
+
+			return { tabId };
+		},
+		[storeAddTab, storeAddTabWithMultiplePanes, renameTab],
+	);
 
 	const addTab = useCallback(
 		(workspaceId: string, options?: AddTabOptions) => {
@@ -45,43 +64,29 @@ export function useTabsWithPresets() {
 				return storeAddTab(workspaceId, options);
 			}
 
-			if (shouldUseParallelMode && newTabPreset) {
-				const { tabId, paneIds } = storeAddTabWithMultiplePanes(workspaceId, {
-					commands: newTabPreset.commands,
-					initialCwd: newTabPreset.cwd || undefined,
-				});
-
-				if (newTabPreset.name) {
-					renameTab(tabId, newTabPreset.name);
-				}
-
-				return { tabId, paneId: paneIds[0] };
+			if (newTabPresets.length === 0) {
+				return storeAddTab(workspaceId);
 			}
 
-			const result = storeAddTab(workspaceId, defaultPresetOptions);
+			// Open the first preset using the normal addTab path
+			const firstResult = openPresetAsTab(workspaceId, newTabPresets[0]);
 
-			if (newTabPreset?.name) {
-				renameTab(result.tabId, newTabPreset.name);
+			// Open additional presets as separate tabs
+			for (let i = 1; i < newTabPresets.length; i++) {
+				openPresetAsTab(workspaceId, newTabPresets[i]);
 			}
 
-			return result;
+			return { tabId: firstResult.tabId, paneId: firstResult.tabId };
 		},
-		[
-			storeAddTab,
-			storeAddTabWithMultiplePanes,
-			defaultPresetOptions,
-			newTabPreset,
-			shouldUseParallelMode,
-			renameTab,
-		],
+		[storeAddTab, newTabPresets, openPresetAsTab],
 	);
 
 	const addPane = useCallback(
 		(tabId: string, options?: AddTabOptions) => {
-			const effectiveOptions = options ?? defaultPresetOptions;
+			const effectiveOptions = options ?? firstPresetOptions;
 			return storeAddPane(tabId, effectiveOptions);
 		},
-		[storeAddPane, defaultPresetOptions],
+		[storeAddPane, firstPresetOptions],
 	);
 
 	const splitPaneVertical = useCallback(
@@ -91,7 +96,7 @@ export function useTabsWithPresets() {
 			path?: MosaicBranch[],
 			options?: AddTabOptions,
 		) => {
-			const effectiveOptions = options ?? defaultPresetOptions;
+			const effectiveOptions = options ?? firstPresetOptions;
 			return storeSplitPaneVertical(
 				tabId,
 				sourcePaneId,
@@ -99,7 +104,7 @@ export function useTabsWithPresets() {
 				effectiveOptions,
 			);
 		},
-		[storeSplitPaneVertical, defaultPresetOptions],
+		[storeSplitPaneVertical, firstPresetOptions],
 	);
 
 	const splitPaneHorizontal = useCallback(
@@ -109,7 +114,7 @@ export function useTabsWithPresets() {
 			path?: MosaicBranch[],
 			options?: AddTabOptions,
 		) => {
-			const effectiveOptions = options ?? defaultPresetOptions;
+			const effectiveOptions = options ?? firstPresetOptions;
 			return storeSplitPaneHorizontal(
 				tabId,
 				sourcePaneId,
@@ -117,7 +122,7 @@ export function useTabsWithPresets() {
 				effectiveOptions,
 			);
 		},
-		[storeSplitPaneHorizontal, defaultPresetOptions],
+		[storeSplitPaneHorizontal, firstPresetOptions],
 	);
 
 	const splitPaneAuto = useCallback(
@@ -128,7 +133,7 @@ export function useTabsWithPresets() {
 			path?: MosaicBranch[],
 			options?: AddTabOptions,
 		) => {
-			const effectiveOptions = options ?? defaultPresetOptions;
+			const effectiveOptions = options ?? firstPresetOptions;
 			return storeSplitPaneAuto(
 				tabId,
 				sourcePaneId,
@@ -137,31 +142,14 @@ export function useTabsWithPresets() {
 				effectiveOptions,
 			);
 		},
-		[storeSplitPaneAuto, defaultPresetOptions],
+		[storeSplitPaneAuto, firstPresetOptions],
 	);
 
 	const openPreset = useCallback(
 		(workspaceId: string, preset: TerminalPreset) => {
-			const isParallel =
-				preset.executionMode === "parallel" && preset.commands.length > 1;
-
-			const { tabId } = isParallel
-				? storeAddTabWithMultiplePanes(workspaceId, {
-						commands: preset.commands,
-						initialCwd: preset.cwd || undefined,
-					})
-				: storeAddTab(workspaceId, {
-						initialCommands: preset.commands,
-						initialCwd: preset.cwd || undefined,
-					});
-
-			if (preset.name) {
-				renameTab(tabId, preset.name);
-			}
-
-			return { tabId };
+			return openPresetAsTab(workspaceId, preset);
 		},
-		[storeAddTab, storeAddTabWithMultiplePanes, renameTab],
+		[openPresetAsTab],
 	);
 
 	return {
@@ -171,6 +159,6 @@ export function useTabsWithPresets() {
 		splitPaneHorizontal,
 		splitPaneAuto,
 		openPreset,
-		defaultPreset: newTabPreset,
+		defaultPreset: firstPreset,
 	};
 }
diff --git a/apps/desktop/src/renderer/stores/workspace-init.ts b/apps/desktop/src/renderer/stores/workspace-init.ts
index 25fb88337e4..61c05095a64 100644
--- a/apps/desktop/src/renderer/stores/workspace-init.ts
+++ b/apps/desktop/src/renderer/stores/workspace-init.ts
@@ -8,6 +8,7 @@ export interface PendingTerminalSetup {
 	projectId: string;
 	initialCommands: string[] | null;
 	defaultPreset?: TerminalPreset | null;
+	defaultPresets?: TerminalPreset[];
 }
 
 interface WorkspaceInitState {

From 23c5eadcafb58cc158fa218a66341397452c561a Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sun, 8 Feb 2026 20:47:58 -0800
Subject: [PATCH 5/9] Use tabs

---
 .../_authenticated/settings/presets/types.ts  |  5 +-
 .../components/PresetRow/PresetRow.tsx        | 70 ++++++-------------
 .../components/PresetsSection.tsx             | 56 ++++++++++++---
 3 files changed, 71 insertions(+), 60 deletions(-)

diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/presets/types.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/presets/types.ts
index df42000bffd..11586832422 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/presets/types.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/presets/types.ts
@@ -9,6 +9,7 @@ export interface PresetColumnConfig {
 	label: string;
 	placeholder: string;
 	mono?: boolean;
+	tooltip?: string;
 }
 
 export const PRESET_COLUMNS: PresetColumnConfig[] = [
@@ -20,9 +21,11 @@ export const PRESET_COLUMNS: PresetColumnConfig[] = [
 	},
 	{
 		key: "cwd",
-		label: "CWD",
+		label: "Directory",
 		placeholder: "e.g. ./src (optional)",
 		mono: true,
+		tooltip:
+			"Working directory for the terminal session (relative to workspace root)",
 	},
 	{
 		key: "commands",
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
index c0d4a070052..d959a374295 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetRow/PresetRow.tsx
@@ -1,4 +1,5 @@
 import { EXECUTION_MODES, type ExecutionMode } from "@superset/local-db";
+import { Checkbox } from "@superset/ui/checkbox";
 import { Input } from "@superset/ui/input";
 import {
 	Select,
@@ -7,7 +8,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@superset/ui/select";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
 import { useEffect, useRef } from "react";
 import { useDrag, useDrop } from "react-dnd";
 import { LuGripVertical, LuTrash } from "react-icons/lu";
@@ -185,53 +185,27 @@ export function PresetRow({
 					</SelectContent>
 				</Select>
 			</div>
-			<div className="w-[7rem] flex items-center justify-center gap-1 shrink-0 pt-1">
-				<Tooltip>
-					<TooltipTrigger asChild>
-						<button
-							type="button"
-							onClick={() =>
-								onToggleAutoApply(
-									preset.id,
-									"applyOnWorkspaceCreated",
-									!isWorkspaceCreation,
-								)
-							}
-							className={`text-[10px] leading-none font-medium px-1.5 py-1 rounded-md border cursor-pointer transition-colors ${
-								isWorkspaceCreation
-									? "bg-blue-500/15 text-blue-600 border-blue-500/30 dark:text-blue-400"
-									: "text-muted-foreground/50 border-transparent hover:border-border hover:text-muted-foreground"
-							}`}
-						>
-							WS
-						</button>
-					</TooltipTrigger>
-					<TooltipContent side="top">
-						{isWorkspaceCreation
-							? "Runs on workspace creation (click to remove)"
-							: "Run on workspace creation"}
-					</TooltipContent>
-				</Tooltip>
-				<Tooltip>
-					<TooltipTrigger asChild>
-						<button
-							type="button"
-							onClick={() =>
-								onToggleAutoApply(preset.id, "applyOnNewTab", !isNewTab)
-							}
-							className={`text-[10px] leading-none font-medium px-1.5 py-1 rounded-md border cursor-pointer transition-colors ${
-								isNewTab
-									? "bg-green-500/15 text-green-600 border-green-500/30 dark:text-green-400"
-									: "text-muted-foreground/50 border-transparent hover:border-border hover:text-muted-foreground"
-							}`}
-						>
-							Tab
-						</button>
-					</TooltipTrigger>
-					<TooltipContent side="top">
-						{isNewTab ? "Runs on new tab (click to remove)" : "Run on new tab"}
-					</TooltipContent>
-				</Tooltip>
+			<div className="w-[7rem] flex justify-center shrink-0 pt-1.5">
+				<Checkbox
+					checked={isWorkspaceCreation}
+					onCheckedChange={(checked) =>
+						onToggleAutoApply(
+							preset.id,
+							"applyOnWorkspaceCreated",
+							checked === true,
+						)
+					}
+				/>
+			</div>
+			<div className="w-14 flex justify-center shrink-0 pt-1.5">
+				<Checkbox
+					checked={isNewTab}
+					onCheckedChange={(checked) =>
+						onToggleAutoApply(preset.id, "applyOnNewTab", checked === true)
+					}
+				/>
+			</div>
+			<div className="w-10 flex justify-center shrink-0 pt-0.5">
 				<button
 					type="button"
 					onClick={() => onDelete(rowIndex)}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
index c97878ed060..76d939614e9 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/PresetsSection.tsx
@@ -353,14 +353,28 @@ export function PresetsSection({
 				<div className="rounded-lg border border-border overflow-hidden">
 					<div className="flex items-center gap-4 py-2 px-4 bg-accent/10 border-b border-border">
 						<div className="w-6 shrink-0" />
-						{PRESET_COLUMNS.map((column) => (
-							<div
-								key={column.key}
-								className="flex-1 text-xs font-medium text-muted-foreground uppercase tracking-wider"
-							>
-								{column.label}
-							</div>
-						))}
+						{PRESET_COLUMNS.map((column) =>
+							column.tooltip ? (
+								<Tooltip key={column.key}>
+									<TooltipTrigger asChild>
+										<div className="flex-1 text-xs font-medium text-muted-foreground uppercase tracking-wider cursor-help flex items-center gap-1">
+											{column.label}
+											<HiOutlineQuestionMarkCircle className="h-3.5 w-3.5" />
+										</div>
+									</TooltipTrigger>
+									<TooltipContent side="top" className="max-w-xs">
+										{column.tooltip}
+									</TooltipContent>
+								</Tooltip>
+							) : (
+								<div
+									key={column.key}
+									className="flex-1 text-xs font-medium text-muted-foreground uppercase tracking-wider"
+								>
+									{column.label}
+								</div>
+							),
+						)}
 						<Tooltip>
 							<TooltipTrigger asChild>
 								<div className="w-28 text-xs font-medium text-muted-foreground uppercase tracking-wider shrink-0 cursor-help flex items-center gap-1">
@@ -380,9 +394,29 @@ export function PresetsSection({
 								</p>
 							</TooltipContent>
 						</Tooltip>
-						<div className="w-[7rem] text-xs font-medium text-muted-foreground uppercase tracking-wider text-center shrink-0">
-							Actions
-						</div>
+						<Tooltip>
+							<TooltipTrigger asChild>
+								<div className="w-[7rem] text-xs font-medium text-muted-foreground uppercase tracking-wider shrink-0 cursor-help flex items-center justify-center gap-1">
+									Workspace
+									<HiOutlineQuestionMarkCircle className="h-3.5 w-3.5" />
+								</div>
+							</TooltipTrigger>
+							<TooltipContent side="top" className="max-w-xs">
+								Auto-run this preset when creating a new workspace
+							</TooltipContent>
+						</Tooltip>
+						<Tooltip>
+							<TooltipTrigger asChild>
+								<div className="w-14 text-xs font-medium text-muted-foreground uppercase tracking-wider shrink-0 cursor-help flex items-center justify-center gap-1">
+									Tab
+									<HiOutlineQuestionMarkCircle className="h-3.5 w-3.5" />
+								</div>
+							</TooltipTrigger>
+							<TooltipContent side="top" className="max-w-xs">
+								Auto-run this preset when opening a new tab
+							</TooltipContent>
+						</Tooltip>
+						<div className="w-10 shrink-0" />
 					</div>
 
 					<div

From 8c136e163163cb0d5be320aecf095eec7dbc3922 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sun, 8 Feb 2026 20:51:00 -0800
Subject: [PATCH 6/9] New tab each

---
 .../main/components/WorkspaceInitEffects.tsx  | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
index f333a795e97..7aea7473e27 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
@@ -31,8 +31,6 @@ export function WorkspaceInitEffects() {
 	const processingRef = useRef<Set<string>>(new Set());
 
 	const addTab = useTabsStore((state) => state.addTab);
-	const addPane = useTabsStore((state) => state.addPane);
-	const addPanesToTab = useTabsStore((state) => state.addPanesToTab);
 	const addTabWithMultiplePanes = useTabsStore(
 		(state) => state.addTabWithMultiplePanes,
 	);
@@ -45,26 +43,10 @@ export function WorkspaceInitEffects() {
 		(
 			workspaceId: string,
 			preset: NonNullable<PendingTerminalSetup["defaultPreset"]>,
-			existingTabId?: string,
 		) => {
 			const isParallel =
 				preset.executionMode === "parallel" && preset.commands.length > 1;
 
-			if (existingTabId) {
-				if (isParallel) {
-					addPanesToTab(existingTabId, {
-						commands: preset.commands,
-						initialCwd: preset.cwd || undefined,
-					});
-				} else {
-					addPane(existingTabId, {
-						initialCommands: preset.commands,
-						initialCwd: preset.cwd || undefined,
-					});
-				}
-				return;
-			}
-
 			if (isParallel) {
 				const options: AddTabWithMultiplePanesOptions = {
 					commands: preset.commands,
@@ -80,7 +62,7 @@ export function WorkspaceInitEffects() {
 				renameTab(tabId, preset.name);
 			}
 		},
-		[addTab, addPane, addPanesToTab, addTabWithMultiplePanes, renameTab],
+		[addTab, addTabWithMultiplePanes, renameTab],
 	);
 
 	const handleTerminalSetup = useCallback(
@@ -99,11 +81,9 @@ export function WorkspaceInitEffects() {
 					setup.workspaceId,
 				);
 				setTabAutoTitle(setupTabId, "Workspace Setup");
-				// Add first preset to the setup tab
-				createPresetTerminal(setup.workspaceId, presets[0], setupTabId);
-				// Additional presets get their own tabs
-				for (let i = 1; i < presets.length; i++) {
-					createPresetTerminal(setup.workspaceId, presets[i]);
+				// Each preset gets its own tab
+				for (const preset of presets) {
+					createPresetTerminal(setup.workspaceId, preset);
 				}
 
 				createOrAttach.mutate(

From d65f8a1474421fbdf597404fa7df6ed7fb37855b Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sun, 8 Feb 2026 20:55:21 -0800
Subject: [PATCH 7/9] Deslop

---
 .../screens/main/components/WorkspaceInitEffects.tsx      | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
index 7aea7473e27..a408b3ece4b 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
@@ -9,10 +9,7 @@ import {
 } from "renderer/stores/workspace-init";
 import { DEFAULT_AUTO_APPLY_DEFAULT_PRESET } from "shared/constants";
 
-/**
- * Handles terminal setup when workspaces become ready.
- * Mounted at app root to survive dialog unmounts.
- */
+/** Mounted at app root to survive dialog unmounts. */
 export function WorkspaceInitEffects() {
 	const initProgress = useWorkspaceInitStore((s) => s.initProgress);
 	const pendingTerminalSetups = useWorkspaceInitStore(
@@ -81,7 +78,6 @@ export function WorkspaceInitEffects() {
 					setup.workspaceId,
 				);
 				setTabAutoTitle(setupTabId, "Workspace Setup");
-				// Each preset gets its own tab
 				for (const preset of presets) {
 					createPresetTerminal(setup.workspaceId, preset);
 				}
@@ -161,7 +157,6 @@ export function WorkspaceInitEffects() {
 				return;
 			}
 
-			// No setup script or presets — sidebar card handles the prompt
 			onComplete();
 		},
 		[
@@ -181,7 +176,6 @@ export function WorkspaceInitEffects() {
 				continue;
 			}
 
-			// No initProgress means workspace is already initialized — process immediately
 			if (!progress) {
 				processingRef.current.add(workspaceId);
 				handleTerminalSetup(setup, () => {

From 0adabc01cddf23c985358a91ad16131513b75acc Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sun, 8 Feb 2026 21:12:33 -0800
Subject: [PATCH 8/9] Refactor and clean

---
 .../src/lib/trpc/routers/settings/index.ts    | 38 +++++++------
 .../routers/workspaces/procedures/init.ts     | 16 +-----
 .../src/renderer/react-query/presets/index.ts | 27 ---------
 .../workspaces/useCreateBranchWorkspace.ts    |  1 -
 .../tools/start-claude-session.ts             |  2 -
 .../main/components/WorkspaceInitEffects.tsx  | 56 +++----------------
 .../stores/tabs/useTabsWithPresets.ts         | 49 +++++++---------
 .../src/renderer/stores/workspace-init.ts     |  2 +-
 8 files changed, 54 insertions(+), 137 deletions(-)

diff --git a/apps/desktop/src/lib/trpc/routers/settings/index.ts b/apps/desktop/src/lib/trpc/routers/settings/index.ts
index 3b5f28a2be7..d466a55989b 100644
--- a/apps/desktop/src/lib/trpc/routers/settings/index.ts
+++ b/apps/desktop/src/lib/trpc/routers/settings/index.ts
@@ -29,6 +29,18 @@ function getSettings() {
 	return row;
 }
 
+/** Get presets tagged with a given auto-apply field, falling back to the isDefault preset */
+export function getPresetsForTrigger(
+	field: "applyOnWorkspaceCreated" | "applyOnNewTab",
+) {
+	const row = getSettings();
+	const presets = row.terminalPresets ?? [];
+	const tagged = presets.filter((p) => p[field]);
+	if (tagged.length > 0) return tagged;
+	const defaultPreset = presets.find((p) => p.isDefault);
+	return defaultPreset ? [defaultPreset] : [];
+}
+
 export const createSettingsRouter = () => {
 	return router({
 		getLastUsedApp: publicProcedure.query(() => {
@@ -175,7 +187,9 @@ export const createSettingsRouter = () => {
 					...p,
 					[input.field]:
 						p.id === input.id
-							? input.enabled || undefined
+							? input.enabled
+								? true
+								: undefined
 							: p[input.field as keyof typeof p],
 				}));
 
@@ -238,23 +252,13 @@ export const createSettingsRouter = () => {
 			return presets.find((p) => p.isDefault) ?? null;
 		}),
 
-		getWorkspaceCreationPresets: publicProcedure.query(() => {
-			const row = getSettings();
-			const presets = row.terminalPresets ?? [];
-			const tagged = presets.filter((p) => p.applyOnWorkspaceCreated);
-			if (tagged.length > 0) return tagged;
-			const defaultPreset = presets.find((p) => p.isDefault);
-			return defaultPreset ? [defaultPreset] : [];
-		}),
+		getWorkspaceCreationPresets: publicProcedure.query(() =>
+			getPresetsForTrigger("applyOnWorkspaceCreated"),
+		),
 
-		getNewTabPresets: publicProcedure.query(() => {
-			const row = getSettings();
-			const presets = row.terminalPresets ?? [];
-			const tagged = presets.filter((p) => p.applyOnNewTab);
-			if (tagged.length > 0) return tagged;
-			const defaultPreset = presets.find((p) => p.isDefault);
-			return defaultPreset ? [defaultPreset] : [];
-		}),
+		getNewTabPresets: publicProcedure.query(() =>
+			getPresetsForTrigger("applyOnNewTab"),
+		),
 
 		getSelectedRingtoneId: publicProcedure.query(() => {
 			const row = getSettings();
diff --git a/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts b/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts
index a573fadbc1e..ce8780614fe 100644
--- a/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts
+++ b/apps/desktop/src/lib/trpc/routers/workspaces/procedures/init.ts
@@ -1,24 +1,13 @@
-import { settings } from "@superset/local-db";
 import { observable } from "@trpc/server/observable";
-import { localDb } from "main/lib/local-db";
 import { workspaceInitManager } from "main/lib/workspace-init-manager";
 import type { WorkspaceInitProgress } from "shared/types/workspace-init";
 import { z } from "zod";
 import { publicProcedure, router } from "../../..";
+import { getPresetsForTrigger } from "../../settings";
 import { getProject, getWorkspaceWithRelations } from "../utils/db-helpers";
 import { loadSetupConfig } from "../utils/setup";
 import { initializeWorkspaceWorktree } from "../utils/workspace-init";
 
-function getWorkspaceCreationPresets() {
-	const row = localDb.select().from(settings).get();
-	if (!row) return [];
-	const presets = row.terminalPresets ?? [];
-	const tagged = presets.filter((p) => p.applyOnWorkspaceCreated);
-	if (tagged.length > 0) return tagged;
-	const defaultPreset = presets.find((p) => p.isDefault);
-	return defaultPreset ? [defaultPreset] : [];
-}
-
 export const createInitProcedures = () => {
 	return router({
 		onInitProgress: publicProcedure
@@ -123,12 +112,11 @@ export const createInitProcedures = () => {
 					worktreePath: relations.worktree?.path,
 					projectName: project.name,
 				});
-				const defaultPresets = getWorkspaceCreationPresets();
+				const defaultPresets = getPresetsForTrigger("applyOnWorkspaceCreated");
 
 				return {
 					projectId: project.id,
 					initialCommands: setupConfig?.setup ?? null,
-					defaultPreset: defaultPresets[0] ?? null,
 					defaultPresets,
 				};
 			}),
diff --git a/apps/desktop/src/renderer/react-query/presets/index.ts b/apps/desktop/src/renderer/react-query/presets/index.ts
index 0f6b07d7563..b4c340034e2 100644
--- a/apps/desktop/src/renderer/react-query/presets/index.ts
+++ b/apps/desktop/src/renderer/react-query/presets/index.ts
@@ -48,23 +48,6 @@ function useDeleteTerminalPreset(
 	});
 }
 
-function useSetDefaultPreset(
-	options?: Parameters<
-		typeof electronTrpc.settings.setDefaultPreset.useMutation
-	>[0],
-) {
-	const utils = electronTrpc.useUtils();
-
-	return electronTrpc.settings.setDefaultPreset.useMutation({
-		...options,
-		onSuccess: async (...args) => {
-			await utils.settings.getTerminalPresets.invalidate();
-			await utils.settings.getDefaultPreset.invalidate();
-			await options?.onSuccess?.(...args);
-		},
-	});
-}
-
 function useSetPresetAutoApply(
 	options?: Parameters<
 		typeof electronTrpc.settings.setPresetAutoApply.useMutation
@@ -99,32 +82,22 @@ function useReorderTerminalPresets(
 	});
 }
 
-/**
- * Combined hook for accessing terminal presets with all CRUD operations
- * Provides easy access to presets data and mutations from anywhere in the app
- */
 export function usePresets() {
 	const { data: presets = [], isLoading } =
 		electronTrpc.settings.getTerminalPresets.useQuery();
 
-	const { data: defaultPreset } =
-		electronTrpc.settings.getDefaultPreset.useQuery();
-
 	const createPreset = useCreateTerminalPreset();
 	const updatePreset = useUpdateTerminalPreset();
 	const deletePreset = useDeleteTerminalPreset();
-	const setDefaultPreset = useSetDefaultPreset();
 	const setPresetAutoApply = useSetPresetAutoApply();
 	const reorderPresets = useReorderTerminalPresets();
 
 	return {
 		presets,
-		defaultPreset,
 		isLoading,
 		createPreset,
 		updatePreset,
 		deletePreset,
-		setDefaultPreset,
 		setPresetAutoApply,
 		reorderPresets,
 	};
diff --git a/apps/desktop/src/renderer/react-query/workspaces/useCreateBranchWorkspace.ts b/apps/desktop/src/renderer/react-query/workspaces/useCreateBranchWorkspace.ts
index 57531eaedde..699bf40dbab 100644
--- a/apps/desktop/src/renderer/react-query/workspaces/useCreateBranchWorkspace.ts
+++ b/apps/desktop/src/renderer/react-query/workspaces/useCreateBranchWorkspace.ts
@@ -38,7 +38,6 @@ export function useCreateBranchWorkspace(
 					workspaceId: data.workspace.id,
 					projectId: data.projectId,
 					initialCommands: setupData?.initialCommands ?? null,
-					defaultPreset: setupData?.defaultPreset ?? null,
 					defaultPresets: setupData?.defaultPresets ?? [],
 				});
 
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/AgentHooks/hooks/useCommandWatcher/tools/start-claude-session.ts b/apps/desktop/src/renderer/routes/_authenticated/components/AgentHooks/hooks/useCommandWatcher/tools/start-claude-session.ts
index 423a0b10e2a..6c7bb002ab9 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/components/AgentHooks/hooks/useCommandWatcher/tools/start-claude-session.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/AgentHooks/hooks/useCommandWatcher/tools/start-claude-session.ts
@@ -33,8 +33,6 @@ async function execute(
 			workspaceId: workspace.id,
 			projectId: pending?.projectId ?? workspace.projectId,
 			initialCommands: [...(pending?.initialCommands ?? []), params.command],
-			// Preserve undefined (signals "fetch from backend") vs null (no preset needed)
-			defaultPreset: pending ? pending.defaultPreset : null,
 			defaultPresets: pending?.defaultPresets,
 		});
 
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
index a408b3ece4b..2cf37b499d2 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceInitEffects.tsx
@@ -2,7 +2,7 @@ import { toast } from "@superset/ui/sonner";
 import { useCallback, useEffect, useRef } from "react";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import { useTabsStore } from "renderer/stores/tabs/store";
-import type { AddTabWithMultiplePanesOptions } from "renderer/stores/tabs/types";
+import { useTabsWithPresets } from "renderer/stores/tabs/useTabsWithPresets";
 import {
 	type PendingTerminalSetup,
 	useWorkspaceInitStore,
@@ -28,49 +28,19 @@ export function WorkspaceInitEffects() {
 	const processingRef = useRef<Set<string>>(new Set());
 
 	const addTab = useTabsStore((state) => state.addTab);
-	const addTabWithMultiplePanes = useTabsStore(
-		(state) => state.addTabWithMultiplePanes,
-	);
 	const setTabAutoTitle = useTabsStore((state) => state.setTabAutoTitle);
-	const renameTab = useTabsStore((state) => state.renameTab);
+	const { openPreset } = useTabsWithPresets();
 	const createOrAttach = electronTrpc.terminal.createOrAttach.useMutation();
 	const utils = electronTrpc.useUtils();
 
-	const createPresetTerminal = useCallback(
-		(
-			workspaceId: string,
-			preset: NonNullable<PendingTerminalSetup["defaultPreset"]>,
-		) => {
-			const isParallel =
-				preset.executionMode === "parallel" && preset.commands.length > 1;
-
-			if (isParallel) {
-				const options: AddTabWithMultiplePanesOptions = {
-					commands: preset.commands,
-					initialCwd: preset.cwd || undefined,
-				};
-				const { tabId } = addTabWithMultiplePanes(workspaceId, options);
-				renameTab(tabId, preset.name);
-			} else {
-				const { tabId } = addTab(workspaceId, {
-					initialCommands: preset.commands,
-					initialCwd: preset.cwd || undefined,
-				});
-				renameTab(tabId, preset.name);
-			}
-		},
-		[addTab, addTabWithMultiplePanes, renameTab],
-	);
-
 	const handleTerminalSetup = useCallback(
 		(setup: PendingTerminalSetup, onComplete: () => void) => {
 			const hasSetupScript =
 				Array.isArray(setup.initialCommands) &&
 				setup.initialCommands.length > 0;
-			const presets = (
-				setup.defaultPresets ??
-				(setup.defaultPreset ? [setup.defaultPreset] : [])
-			).filter((p) => p.commands.length > 0);
+			const presets = (setup.defaultPresets ?? []).filter(
+				(p) => p.commands.length > 0,
+			);
 			const hasPresets = shouldApplyPreset && presets.length > 0;
 
 			if (hasSetupScript && hasPresets) {
@@ -79,7 +49,7 @@ export function WorkspaceInitEffects() {
 				);
 				setTabAutoTitle(setupTabId, "Workspace Setup");
 				for (const preset of presets) {
-					createPresetTerminal(setup.workspaceId, preset);
+					openPreset(setup.workspaceId, preset);
 				}
 
 				createOrAttach.mutate(
@@ -151,7 +121,7 @@ export function WorkspaceInitEffects() {
 
 			if (hasPresets) {
 				for (const preset of presets) {
-					createPresetTerminal(setup.workspaceId, preset);
+					openPreset(setup.workspaceId, preset);
 				}
 				onComplete();
 				return;
@@ -159,13 +129,7 @@ export function WorkspaceInitEffects() {
 
 			onComplete();
 		},
-		[
-			addTab,
-			setTabAutoTitle,
-			createOrAttach,
-			createPresetTerminal,
-			shouldApplyPreset,
-		],
+		[addTab, setTabAutoTitle, createOrAttach, openPreset, shouldApplyPreset],
 	);
 
 	useEffect(() => {
@@ -190,13 +154,12 @@ export function WorkspaceInitEffects() {
 
 				// Always fetch from backend to ensure we have the latest preset
 				// (client-side preset query may not have resolved when pending setup was created)
-				if (setup.defaultPreset === undefined) {
+				if (setup.defaultPresets === undefined) {
 					utils.workspaces.getSetupCommands
 						.fetch({ workspaceId })
 						.then((setupData) => {
 							const completeSetup: PendingTerminalSetup = {
 								...setup,
-								defaultPreset: setupData?.defaultPreset ?? null,
 								defaultPresets: setupData?.defaultPresets ?? [],
 							};
 							handleTerminalSetup(completeSetup, () => {
@@ -257,7 +220,6 @@ export function WorkspaceInitEffects() {
 						workspaceId,
 						projectId: setupData.projectId,
 						initialCommands: setupData.initialCommands,
-						defaultPreset: setupData.defaultPreset,
 						defaultPresets: setupData.defaultPresets ?? [],
 					};
 
diff --git a/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts b/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
index 83997ff5922..88b82ed8239 100644
--- a/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
+++ b/apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts
@@ -5,11 +5,6 @@ import { electronTrpc } from "renderer/lib/electron-trpc";
 import { useTabsStore } from "./store";
 import type { AddTabOptions } from "./types";
 
-/**
- * Hook that wraps tab store actions with default preset support.
- * When presets are tagged with applyOnNewTab, new terminals will
- * automatically use those presets' commands and cwd.
- */
 export function useTabsWithPresets() {
 	const { data: newTabPresets = [] } =
 		electronTrpc.settings.getNewTabPresets.useQuery();
@@ -39,21 +34,30 @@ export function useTabsWithPresets() {
 			const isParallel =
 				preset.executionMode === "parallel" && preset.commands.length > 1;
 
-			const { tabId } = isParallel
-				? storeAddTabWithMultiplePanes(workspaceId, {
-						commands: preset.commands,
-						initialCwd: preset.cwd || undefined,
-					})
-				: storeAddTab(workspaceId, {
-						initialCommands: preset.commands,
-						initialCwd: preset.cwd || undefined,
-					});
+			let tabId: string;
+			let paneId: string;
+
+			if (isParallel) {
+				const result = storeAddTabWithMultiplePanes(workspaceId, {
+					commands: preset.commands,
+					initialCwd: preset.cwd || undefined,
+				});
+				tabId = result.tabId;
+				paneId = result.paneIds[0];
+			} else {
+				const result = storeAddTab(workspaceId, {
+					initialCommands: preset.commands,
+					initialCwd: preset.cwd || undefined,
+				});
+				tabId = result.tabId;
+				paneId = result.paneId;
+			}
 
 			if (preset.name) {
 				renameTab(tabId, preset.name);
 			}
 
-			return { tabId };
+			return { tabId, paneId };
 		},
 		[storeAddTab, storeAddTabWithMultiplePanes, renameTab],
 	);
@@ -68,15 +72,12 @@ export function useTabsWithPresets() {
 				return storeAddTab(workspaceId);
 			}
 
-			// Open the first preset using the normal addTab path
 			const firstResult = openPresetAsTab(workspaceId, newTabPresets[0]);
-
-			// Open additional presets as separate tabs
 			for (let i = 1; i < newTabPresets.length; i++) {
 				openPresetAsTab(workspaceId, newTabPresets[i]);
 			}
 
-			return { tabId: firstResult.tabId, paneId: firstResult.tabId };
+			return { tabId: firstResult.tabId, paneId: firstResult.paneId };
 		},
 		[storeAddTab, newTabPresets, openPresetAsTab],
 	);
@@ -145,20 +146,12 @@ export function useTabsWithPresets() {
 		[storeSplitPaneAuto, firstPresetOptions],
 	);
 
-	const openPreset = useCallback(
-		(workspaceId: string, preset: TerminalPreset) => {
-			return openPresetAsTab(workspaceId, preset);
-		},
-		[openPresetAsTab],
-	);
-
 	return {
 		addTab,
 		addPane,
 		splitPaneVertical,
 		splitPaneHorizontal,
 		splitPaneAuto,
-		openPreset,
-		defaultPreset: firstPreset,
+		openPreset: openPresetAsTab,
 	};
 }
diff --git a/apps/desktop/src/renderer/stores/workspace-init.ts b/apps/desktop/src/renderer/stores/workspace-init.ts
index 61c05095a64..26aad9b4654 100644
--- a/apps/desktop/src/renderer/stores/workspace-init.ts
+++ b/apps/desktop/src/renderer/stores/workspace-init.ts
@@ -7,7 +7,7 @@ export interface PendingTerminalSetup {
 	workspaceId: string;
 	projectId: string;
 	initialCommands: string[] | null;
-	defaultPreset?: TerminalPreset | null;
+	/** When undefined, signals that presets haven't been fetched yet and should be loaded from the backend */
 	defaultPresets?: TerminalPreset[];
 }
 

From 7bdb7e2760c1491053be5b03c8a087da6238d5e5 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sun, 8 Feb 2026 21:26:45 -0800
Subject: [PATCH 9/9] Fix default

---
 .../src/lib/trpc/routers/settings/index.ts    | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/apps/desktop/src/lib/trpc/routers/settings/index.ts b/apps/desktop/src/lib/trpc/routers/settings/index.ts
index d466a55989b..4676a7d9ed9 100644
--- a/apps/desktop/src/lib/trpc/routers/settings/index.ts
+++ b/apps/desktop/src/lib/trpc/routers/settings/index.ts
@@ -183,15 +183,29 @@ export const createSettingsRouter = () => {
 				const row = getSettings();
 				const presets = row.terminalPresets ?? [];
 
-				const updatedPresets = presets.map((p) => ({
-					...p,
-					[input.field]:
-						p.id === input.id
-							? input.enabled
-								? true
-								: undefined
-							: p[input.field as keyof typeof p],
-				}));
+				const updatedPresets = presets.map((p) => {
+					if (p.id !== input.id) return p;
+
+					// Migrate legacy isDefault preset to explicit fields on first toggle
+					const needsMigration =
+						p.isDefault &&
+						p.applyOnWorkspaceCreated === undefined &&
+						p.applyOnNewTab === undefined;
+
+					const base = needsMigration
+						? {
+								...p,
+								isDefault: undefined,
+								applyOnWorkspaceCreated: true as const,
+								applyOnNewTab: true as const,
+							}
+						: p;
+
+					return {
+						...base,
+						[input.field]: input.enabled ? true : undefined,
+					};
+				});
 
 				localDb
 					.insert(settings)