From 91f16464bb7f0465502201d322ad6517cacdf3ff Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 14 Nov 2026 01:22:54 +0900
Subject: [PATCH] refac

---
 .../chat/MessageInput/TerminalMenu.svelte     | 38 ++++++++------
 .../layout/Sidebar/Folders/FolderModal.svelte | 52 ++++++++++++++-----
 2 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/src/lib/components/chat/MessageInput/TerminalMenu.svelte b/src/lib/components/chat/MessageInput/TerminalMenu.svelte
index f65eebc1cd..644bf27420 100644
--- a/src/lib/components/chat/MessageInput/TerminalMenu.svelte
+++ b/src/lib/components/chat/MessageInput/TerminalMenu.svelte
@@ -57,6 +57,10 @@
 	export let disabled = false;
 	export let chatId: string | null = null;
 	export let terminalContext: TerminalContext | null = null;
+	/** Also offers the working directory of the selected terminal. */
+	export let showDirectory = true;
+	/** Replaces the icon button that opens the menu; receives the selected ID and its label. */
+	export let trigger: import('svelte').Snippet<[string | null, string]> | undefined = undefined;
 
 	// Connections the user may create terminals on; a terminal on one of them is theirs to manage.
 	let writable: { id: string; name: string }[] = [];
@@ -355,21 +359,25 @@
 			</Tooltip>
 		{:else}
 			<Dropdown bind:show align="start">
-				<Tooltip content={selectedLabel} placement="top">
-					<button type="button" aria-label={selectedLabel} class={triggerClass}>
-						{#if selectedDevice}
-							<Server className="size-3.5" strokeWidth="2" />
-						{:else}
-							<Cloud className="size-3.5" strokeWidth="2" />
-						{/if}
+				{#if trigger}
+					{@render trigger($selectedTerminalId, selectedLabel)}
+				{:else}
+					<Tooltip content={selectedLabel} placement="top">
+						<button type="button" aria-label={selectedLabel} class={triggerClass}>
+							{#if selectedDevice}
+								<Server className="size-3.5" strokeWidth="2" />
+							{:else}
+								<Cloud className="size-3.5" strokeWidth="2" />
+							{/if}
 
-						{#if $selectedTerminalId && selectedLabel}
-							<span data-input-label class="truncate text-[0.8125rem] max-w-[9.375rem]"
-								>{selectedLabel}</span
-							>
-						{/if}
-					</button>
-				</Tooltip>
+							{#if $selectedTerminalId && selectedLabel}
+								<span data-input-label class="truncate text-[0.8125rem] max-w-[9.375rem]"
+									>{selectedLabel}</span
+								>
+							{/if}
+						</button>
+					</Tooltip>
+				{/if}
 
 				<div slot="content">
 					<DropdownMenu
@@ -393,7 +401,7 @@
 	{/key}
 {/if}
 
-{#if folderTarget && (selectedSystemTerminal?.scope !== 'chat' || isSavedChatId(chatId))}
+{#if showDirectory && folderTarget && (selectedSystemTerminal?.scope !== 'chat' || isSavedChatId(chatId))}
 	{#key `${$user?.id}:${folderTarget.selector}:${chatId ?? ''}`}
 		<WorkingDirectoryMenu
 			{inMenu}
diff --git a/src/lib/components/layout/Sidebar/Folders/FolderModal.svelte b/src/lib/components/layout/Sidebar/Folders/FolderModal.svelte
index 38f46913f7..9415ec1ff0 100644
--- a/src/lib/components/layout/Sidebar/Folders/FolderModal.svelte
+++ b/src/lib/components/layout/Sidebar/Folders/FolderModal.svelte
@@ -22,7 +22,9 @@
 	import ModelSelector from '$lib/components/chat/ModelSelector/Selector.svelte';
 	import FileNav from '$lib/components/chat/FileNav.svelte';
 	import FolderOpen from '$lib/components/icons/FolderOpen.svelte';
-	import TerminalSelector from '$lib/components/workspace/Models/TerminalSelector.svelte';
+	import TerminalMenu from '$lib/components/chat/MessageInput/TerminalMenu.svelte';
+	import ChevronDown from '$lib/components/icons/ChevronDown.svelte';
+	import { writable } from 'svelte/store';
 
 	import Textarea from '$lib/components/common/Textarea.svelte';
 	import Knowledge from '$lib/components/workspace/Models/Knowledge.svelte';
@@ -82,6 +84,19 @@
 		}, 250);
 	};
 
+	// The composer's terminal menu picks the folder's default terminal.
+	const folderTerminal = writable<string | null>(null);
+	$: folderTerminal.set(data.terminal_id || null);
+	const folderTerminalSelection = {
+		subscribe: folderTerminal.subscribe,
+		set: (id: string | null) => {
+			if ((id ?? '') === data.terminal_id) return;
+			data.terminal_id = id ?? '';
+			data.working_directory = '';
+			data.model_ids = data.model_ids.filter((modelId) => !modelId.startsWith('agent:'));
+		}
+	};
+
 	$: modelTerminalId = data.terminal_id;
 	$: modelDirectory = data.working_directory;
 	$: loadTerminalModels(show, modelTerminalId, modelDirectory);
@@ -346,17 +361,30 @@
 						buttonClassName="w-full py-1 text-xs font-normal text-gray-600 hover:text-gray-900 dark:text-gray-400 dark:hover:text-gray-100 transition"
 					>
 						<div slot="content" class="space-y-0.5 pt-1">
-							<TerminalSelector
-								bind:terminalId={data.terminal_id}
-								label={$i18n.t('Default terminal')}
-								description={$i18n.t(
-									'Select the terminal used by default for new chats in this folder.'
-								)}
-								onChange={() => {
-									data.working_directory = '';
-									data.model_ids = data.model_ids.filter((id) => !id.startsWith('agent:'));
-								}}
-							/>
+							<div
+								class="grid min-h-7 grid-cols-[7rem_minmax(0,1fr)] items-center gap-2 px-1 text-xs font-normal text-gray-600 dark:text-gray-400 sm:grid-cols-[8rem_minmax(0,1fr)]"
+							>
+								<ModelSettingsLabel
+									label={$i18n.t('Default terminal')}
+									description={$i18n.t(
+										'Select the terminal used by default for new chats in this folder.'
+									)}
+								/>
+								<div class="flex min-w-0">
+									<TerminalMenu selectedTerminalId={folderTerminalSelection} showDirectory={false}>
+										{#snippet trigger(selected: string | null, label: string)}
+											<button
+												type="button"
+												class="flex w-fit max-w-full min-w-0 items-center gap-1 bg-transparent px-0.5 text-left text-xs font-normal text-gray-900 dark:text-gray-100"
+											>
+												<span class="sr-only">{$i18n.t('Default terminal')}: </span>
+												<span class="truncate">{selected ? label : $i18n.t('None')}</span>
+												<ChevronDown className="size-3 shrink-0" />
+											</button>
+										{/snippet}
+									</TerminalMenu>
+								</div>
+							</div>
 							{#if data.terminal_id}
 								<div
 									class="grid grid-cols-[7rem_minmax(0,1fr)] items-start gap-2 px-1 py-1 sm:grid-cols-[8rem_minmax(0,1fr)]"