feat(desktop): open new terminals in the active tab directory

apps/desktop/src/lib/trpc/routers/settings/index.ts

@@ -21,6 +21,7 @@ import {
 	DEFAULT_AUTO_APPLY_DEFAULT_PRESET,
 	DEFAULT_CONFIRM_ON_QUIT,
 	DEFAULT_FILE_OPEN_MODE,
+	DEFAULT_NEW_TERMINAL_IN_CURRENT_TAB_DIRECTORY,
 	DEFAULT_OPEN_LINKS_IN_APP,
 	DEFAULT_SHOW_PRESETS_BAR,
 	DEFAULT_SHOW_RESOURCE_MONITOR,
@@ -436,6 +437,32 @@ export const createSettingsRouter = () => {
 				return { success: true };
 			}),
 
+		getNewTerminalInCurrentTabDirectory: publicProcedure.query(() => {
+			const row = getSettings();
+			return (
+				row.newTerminalInCurrentTabDirectory ??
+				DEFAULT_NEW_TERMINAL_IN_CURRENT_TAB_DIRECTORY
+			);
+		}),
+
+		setNewTerminalInCurrentTabDirectory: publicProcedure
+			.input(z.object({ enabled: z.boolean() }))
+			.mutation(({ input }) => {
+				localDb
+					.insert(settings)
+					.values({
+						id: 1,
+						newTerminalInCurrentTabDirectory: input.enabled,
+					})
+					.onConflictDoUpdate({
+						target: settings.id,
+						set: { newTerminalInCurrentTabDirectory: input.enabled },
+					})
+					.run();
+
+				return { success: true };
+			}),
+
 		getTerminalLinkBehavior: publicProcedure.query(() => {
 			const row = getSettings();
 			return row.terminalLinkBehavior ?? DEFAULT_TERMINAL_LINK_BEHAVIOR;

apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/TerminalSettings.tsx

@@ -5,6 +5,7 @@ import {
 	type SettingItemId,
 } from "../../../utils/settings-search";
 import { LinkBehaviorSetting } from "./components/LinkBehaviorSetting";
+import { NewTerminalDirectorySetting } from "./components/NewTerminalDirectorySetting";
 import { PresetsSection } from "./components/PresetsSection";
 import { SessionsSection } from "./components/SessionsSection";
 
@@ -52,6 +53,10 @@ export function TerminalSettings({
 		SETTING_ITEM_ID.TERMINAL_LINK_BEHAVIOR,
 		visibleItems,
 	);
+	const showNewTerminalDirectory = isItemVisible(
+		SETTING_ITEM_ID.TERMINAL_NEW_TERMINAL_DIRECTORY,
+		visibleItems,
+	);
 	const showSessions = isItemVisible(
 		SETTING_ITEM_ID.TERMINAL_SESSIONS,
 		visibleItems,
@@ -76,6 +81,9 @@ export function TerminalSettings({
 						onEditingPresetIdChange={onEditingPresetIdChange}
 					/>
 				)}
+				{showNewTerminalDirectory && (
+					<NewTerminalDirectorySetting key="new-terminal-directory" />
+				)}
 				{showLinkBehavior && <LinkBehaviorSetting key="link-behavior" />}
 				{showSessions && <SessionsSection key="sessions" />}
 			</SectionList>

apps/desktop/src/renderer/routes/_authenticated/settings/terminal/components/TerminalSettings/components/NewTerminalDirectorySetting.tsx

@@ -0,0 +1,58 @@
+import { Label } from "@superset/ui/label";
+import { Switch } from "@superset/ui/switch";
+import { electronTrpc } from "renderer/lib/electron-trpc";
+
+export function NewTerminalDirectorySetting() {
+	const utils = electronTrpc.useUtils();
+	const { data: enabled, isLoading } =
+		electronTrpc.settings.getNewTerminalInCurrentTabDirectory.useQuery();
+	const setEnabled =
+		electronTrpc.settings.setNewTerminalInCurrentTabDirectory.useMutation({
+			onMutate: async ({ enabled: nextEnabled }) => {
+				await utils.settings.getNewTerminalInCurrentTabDirectory.cancel();
+				const previous =
+					utils.settings.getNewTerminalInCurrentTabDirectory.getData();
+				utils.settings.getNewTerminalInCurrentTabDirectory.setData(
+					undefined,
+					nextEnabled,
+				);
+				return { previous };
+			},
+			onError: (_err, _vars, context) => {
+				if (context?.previous !== undefined) {
+					utils.settings.getNewTerminalInCurrentTabDirectory.setData(
+						undefined,
+						context.previous,
+					);
+				}
+			},
+			onSettled: () => {
+				utils.settings.getNewTerminalInCurrentTabDirectory.invalidate();
+			},
+		});
+
+	return (
+		<div className="flex items-center justify-between">
+			<div className="space-y-0.5">
+				<Label
+					htmlFor="new-terminal-in-current-tab-directory"
+					className="text-sm font-medium"
+				>
+					New terminals follow current tab directory
+				</Label>
+				<p className="text-xs text-muted-foreground">
+					Open new terminals in the active tab&apos;s directory when Superset
+					can resolve one
+				</p>
+			</div>
+			<Switch
+				id="new-terminal-in-current-tab-directory"
+				checked={enabled ?? true}
+				onCheckedChange={(nextEnabled) =>
+					setEnabled.mutate({ enabled: nextEnabled })
+				}
+				disabled={isLoading || setEnabled.isPending}
+			/>
+		</div>
+	);
+}

apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.test.ts

@@ -62,4 +62,10 @@ describe("settings search - font settings", () => {
 		expect(editorFont?.section).toBe("appearance");
 		expect(terminalFont?.section).toBe("appearance");
 	});
+
+	it('searching "directory" returns the new terminal directory setting', () => {
+		const results = searchSettings("directory");
+		const ids = getIds(results);
+		expect(ids).toContain(SETTING_ITEM_ID.TERMINAL_NEW_TERMINAL_DIRECTORY);
+	});
 });

apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts

@@ -33,6 +33,7 @@ export const SETTING_ITEM_ID = {
 
 	TERMINAL_PRESETS: "terminal-presets",
 	TERMINAL_QUICK_ADD: "terminal-quick-add",
+	TERMINAL_NEW_TERMINAL_DIRECTORY: "terminal-new-terminal-directory",
 	TERMINAL_SESSIONS: "terminal-sessions",
 	TERMINAL_LINK_BEHAVIOR: "terminal-link-behavior",
 
@@ -518,6 +519,24 @@ export const SETTINGS_ITEMS: SettingsItem[] = [
 			"assistant",
 		],
 	},
+	{
+		id: SETTING_ITEM_ID.TERMINAL_NEW_TERMINAL_DIRECTORY,
+		section: "terminal",
+		title: "New terminal directory",
+		description:
+			"Open new terminals in the current tab's directory when possible",
+		keywords: [
+			"terminal",
+			"directory",
+			"cwd",
+			"current working directory",
+			"new terminal",
+			"follow tab",
+			"open here",
+			"folder",
+			"path",
+		],
+	},
 	{
 		id: SETTING_ITEM_ID.TERMINAL_SESSIONS,
 		section: "terminal",

apps/desktop/src/renderer/stores/tabs/useTabsWithPresets.ts

@@ -18,11 +18,15 @@ import {
 } from "./preset-launch";
 import { useTabsStore } from "./store";
 import type { AddTabOptions, SplitPaneOptions } from "./types";
-import { resolveActiveTabIdForWorkspace } from "./utils";
+import {
+	resolveActiveTabIdForWorkspace,
+	resolveNewTerminalInitialCwd,
+} from "./utils";
 
 interface OpenPresetOptions {
 	target?: PresetOpenTarget;
 	modeOverride?: PresetMode;
+	fallbackInitialCwd?: string;
 }
 
 interface PreparedPreset {
@@ -51,6 +55,9 @@ function preparePreset(preset: TerminalPreset): PreparedPreset {
 export function useTabsWithPresets() {
 	const { data: newTabPresets = [] } =
 		electronTrpc.settings.getNewTabPresets.useQuery();
+	const { data: openInCurrentTabDirectory = true } =
+		electronTrpc.settings.getNewTerminalInCurrentTabDirectory.useQuery();
+	const utils = electronTrpc.useUtils();
 
 	const storeAddTab = useTabsStore((s) => s.addTab);
 	const storeAddTabWithMultiplePanes = useTabsStore(
@@ -350,7 +357,13 @@ export function useTabsWithPresets() {
 			const prepared = preparePreset(preset);
 			const target = options?.target ?? "new-tab";
 			const mode = options?.modeOverride ?? prepared.mode;
-			return executePreset(workspaceId, { ...prepared, mode }, target);
+			const initialCwd =
+				prepared.initialCwd ?? options?.fallbackInitialCwd ?? undefined;
+			return executePreset(
+				workspaceId,
+				{ ...prepared, mode, initialCwd },
+				target,
+			);
 		},
 		[executePreset],
 	);
@@ -361,20 +374,39 @@ export function useTabsWithPresets() {
 				return storeAddTab(workspaceId, options);
 			}
 
+			const sourceInitialCwd = openInCurrentTabDirectory
+				? resolveNewTerminalInitialCwd({
+						workspaceId,
+						worktreePath: utils.workspaces.get.getData({ id: workspaceId })
+							?.worktreePath,
+						tabs: useTabsStore.getState().tabs,
+						panes: useTabsStore.getState().panes,
+						activeTabIds: useTabsStore.getState().activeTabIds,
+						tabHistoryStacks: useTabsStore.getState().tabHistoryStacks,
+						focusedPaneIds: useTabsStore.getState().focusedPaneIds,
+					})
+				: undefined;
+
 			if (newTabPresets.length === 0) {
-				return storeAddTab(workspaceId);
+				return storeAddTab(workspaceId, {
+					initialCwd: sourceInitialCwd,
+				});
 			}
 
 			const firstResult = openPreset(workspaceId, newTabPresets[0], {
 				target: "new-tab",
+				fallbackInitialCwd: sourceInitialCwd,
 			});
 			for (let i = 1; i < newTabPresets.length; i++) {
-				openPreset(workspaceId, newTabPresets[i], { target: "new-tab" });
+				openPreset(workspaceId, newTabPresets[i], {
+					target: "new-tab",
+					fallbackInitialCwd: sourceInitialCwd,
+				});
 			}
 
 			return { tabId: firstResult.tabId, paneId: firstResult.paneId };
 		},
-		[storeAddTab, newTabPresets, openPreset],
+		[storeAddTab, newTabPresets, openInCurrentTabDirectory, openPreset, utils],
 	);
 
 	const addPane = useCallback(

apps/desktop/src/renderer/stores/tabs/utils.test.ts

@@ -8,6 +8,7 @@ import {
 	getAdjacentPaneId,
 	resolveActiveTabIdForWorkspace,
 	resolveFileViewerMode,
+	resolveNewTerminalInitialCwd,
 } from "./utils";
 
 describe("findPanePath", () => {
@@ -403,6 +404,92 @@ describe("buildMultiPaneLayout", () => {
 	});
 });
 
+describe("resolveNewTerminalInitialCwd", () => {
+	const createTab = ({
+		id,
+		workspaceId,
+	}: {
+		id: string;
+		workspaceId: string;
+	}): Tab => ({
+		id,
+		name: id,
+		workspaceId,
+		layout: `${id}-pane`,
+		createdAt: 0,
+	});
+
+	it("uses the focused terminal cwd when available", () => {
+		expect(
+			resolveNewTerminalInitialCwd({
+				workspaceId: "ws-1",
+				worktreePath: "/repo",
+				tabs: [createTab({ id: "tab-1", workspaceId: "ws-1" })],
+				panes: {
+					"pane-1": {
+						id: "pane-1",
+						tabId: "tab-1",
+						type: "terminal",
+						name: "Terminal",
+						cwd: "/repo/packages/ui",
+					},
+				},
+				activeTabIds: { "ws-1": "tab-1" },
+				tabHistoryStacks: {},
+				focusedPaneIds: { "tab-1": "pane-1" },
+			}),
+		).toBe("/repo/packages/ui");
+	});
+
+	it("falls back to the file viewer's directory", () => {
+		expect(
+			resolveNewTerminalInitialCwd({
+				workspaceId: "ws-1",
+				worktreePath: "/repo",
+				tabs: [createTab({ id: "tab-1", workspaceId: "ws-1" })],
+				panes: {
+					"pane-1": {
+						id: "pane-1",
+						tabId: "tab-1",
+						type: "file-viewer",
+						name: "Button.tsx",
+						fileViewer: {
+							filePath: "packages/ui/src/button.tsx",
+							viewMode: "raw",
+							isPinned: false,
+							diffLayout: "inline",
+						},
+					},
+				},
+				activeTabIds: { "ws-1": "tab-1" },
+				tabHistoryStacks: {},
+				focusedPaneIds: { "tab-1": "pane-1" },
+			}),
+		).toBe("/repo/packages/ui/src");
+	});
+
+	it("falls back to the workspace root when no directory can be resolved", () => {
+		expect(
+			resolveNewTerminalInitialCwd({
+				workspaceId: "ws-1",
+				worktreePath: "/repo",
+				tabs: [createTab({ id: "tab-1", workspaceId: "ws-1" })],
+				panes: {
+					"pane-1": {
+						id: "pane-1",
+						tabId: "tab-1",
+						type: "webview",
+						name: "Browser",
+					},
+				},
+				activeTabIds: { "ws-1": "tab-1" },
+				tabHistoryStacks: {},
+				focusedPaneIds: { "tab-1": "pane-1" },
+			}),
+		).toBe("/repo");
+	});
+});
+
 describe("resolveFileViewerMode", () => {
 	it("returns diff for modified file with diffCategory", () => {
 		expect(