-
+
@@ -260,6 +257,18 @@
+
+
+ {
+ terminalConnections = terminalConnections.map((c, i) =>
+ i === idx ? { ...c, enabled: !(c?.enabled !== false) } : c
+ );
+ saveTerminalServers();
+ }}
+ />
+
{/each}
diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 933846afa..74d0ce4de 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -42,12 +42,12 @@
functions,
selectedFolder,
pinnedChats,
- showEmbeds
+ showEmbeds,
+ selectedTerminalId
} from '$lib/stores';
import { WEBUI_API_BASE_URL } from '$lib/constants';
-
import {
convertMessagesToHistory,
copyToClipboard,
@@ -140,13 +140,18 @@
let selectedToolIds = [];
let selectedFilterIds = [];
+
let imageGenerationEnabled = false;
let webSearchEnabled = false;
let codeInterpreterEnabled = false;
- // Auto-inject terminal servers into selected tool IDs so they act like toggled-on tools
+ // Auto-inject direct terminal servers into selected tool IDs so they act like toggled-on tools
+ // System terminals (with id field) are handled server-side via terminal_id, not as direct tool servers
$: if ($terminalServers && $terminalServers.length > 0) {
- const terminalIds = $terminalServers.map((_, i) => `direct_server:terminal_${i}`);
+ const directTerminalServers = $terminalServers.filter((t) => !t.id);
+ const terminalIds = directTerminalServers.map(
+ (_, i) => `direct_server:terminal_${$terminalServers.indexOf(directTerminalServers[i])}`
+ );
const missingIds = terminalIds.filter((id) => !selectedToolIds.includes(id));
if (missingIds.length > 0) {
selectedToolIds = [...selectedToolIds, ...missingIds];
@@ -155,7 +160,10 @@
// Remove disabled terminal servers from selectedToolIds automatically
$: if (selectedToolIds.length > 0) {
- const terminalIds = ($terminalServers ?? []).map((_, i) => `direct_server:terminal_${i}`);
+ const directTerminalServers = ($terminalServers ?? []).filter((t) => !t.id);
+ const terminalIds = directTerminalServers.map(
+ (_, i) => `direct_server:terminal_${($terminalServers ?? []).indexOf(directTerminalServers[i])}`
+ );
const invalidTerminalIds = selectedToolIds.filter(
(id) => id.startsWith('direct_server:terminal_') && !terminalIds.includes(id)
);
@@ -354,9 +362,12 @@
selectedToolIds = selectedToolIds.filter((id) => !id.startsWith('direct_server:'));
}
- // Auto-inject terminal servers
+ // Auto-inject direct terminal servers (system ones are handled via terminal_id)
if ($terminalServers && $terminalServers.length > 0) {
- const terminalIds = $terminalServers.map((_, i) => `direct_server:terminal_${i}`);
+ const directTerminalServers = $terminalServers.filter((t) => !t.id);
+ const terminalIds = directTerminalServers.map(
+ (_, i) => `direct_server:terminal_${$terminalServers.indexOf(directTerminalServers[i])}`
+ );
selectedToolIds = [...new Set([...selectedToolIds, ...terminalIds])];
}
@@ -650,6 +661,14 @@
audioQueue.set(new AudioQueue(document.getElementById('audioElement')));
+ // Reset direct terminal enabled states — selectedTerminalId starts null on every page load
+ if ($settings?.terminalServers?.some((s) => s.enabled)) {
+ settings.set({
+ ...$settings,
+ terminalServers: ($settings.terminalServers ?? []).map((s) => ({ ...s, enabled: false }))
+ });
+ }
+
pageSubscribe = page.subscribe(async (p) => {
if (p.url.pathname === '/') {
await tick();
@@ -2130,9 +2149,8 @@
});
}
- // Determine the active terminal (first accessible backend terminal, or user-configured)
- const activeTerminal = $terminalServers?.[0] ?? null;
- const activeTerminalId = activeTerminal?.id ?? null;
+ // Use the user-selected terminal from the dropdown
+ const activeTerminalId = $selectedTerminalId ?? null;
const res = await generateOpenAIChatCompletion(
localStorage.token,
diff --git a/src/lib/components/chat/ChatControls.svelte b/src/lib/components/chat/ChatControls.svelte
index b2eb3354f..e5398f7f9 100644
--- a/src/lib/components/chat/ChatControls.svelte
+++ b/src/lib/components/chat/ChatControls.svelte
@@ -17,7 +17,9 @@
showArtifacts,
showEmbeds,
settings,
- showFileNavPath
+ showFileNavPath,
+ selectedTerminalId,
+ user
} from '$lib/stores';
import { uploadFile } from '$lib/apis/files';
@@ -59,10 +61,24 @@
// Tab state for Controls+Files panel
let activeTab: 'controls' | 'files' | 'overview' = savedTab;
$: savedTab = activeTab;
- $: hasTerminal = !!($settings?.terminalServers ?? []).find((s) => s.enabled)?.url
- || $terminalServers.length > 0;
$: hasMessages = history?.messages && Object.keys(history.messages).length > 0;
- $: if (!hasMessages && activeTab === 'overview') activeTab = 'controls';
+
+ $: showControlsTab = $user?.role === 'admin' || ($user?.permissions?.chat?.controls ?? true);
+ $: showFilesTab = !!$selectedTerminalId;
+ $: showOverviewTab = hasMessages;
+
+ // Tab fallback: if active tab becomes hidden, switch to next available
+ $: if (!showOverviewTab && activeTab === 'overview') activeTab = 'controls';
+ $: if (!showFilesTab && activeTab === 'files') activeTab = 'controls';
+ $: if (!showControlsTab && activeTab === 'controls') {
+ if (showFilesTab) activeTab = 'files';
+ else if (showOverviewTab) activeTab = 'overview';
+ }
+
+ // Auto-close if there are no visible tabs
+ $: if (!showControlsTab && !showFilesTab && !showOverviewTab) {
+ showControls.set(false);
+ }
// Auto-switch to Files tab when display_file is triggered
$: if ($showFileNavPath) {
@@ -70,6 +86,12 @@
showControls.set(true);
}
+ // Auto-open Files tab when a terminal is selected
+ $: if ($selectedTerminalId) {
+ activeTab = 'files';
+ showControls.set(true);
+ }
+
// Attach a terminal file to the chat input
const handleTerminalAttach = async (blob: Blob, name: string, contentType: string) => {
const tempItemId = uuidv4();
@@ -182,7 +204,9 @@
document.addEventListener('mousedown', onMouseDown);
document.addEventListener('mouseup', onMouseUp);
- setTimeout(() => { paneReady = true; }, 0);
+ setTimeout(() => {
+ paneReady = true;
+ }, 0);
// If controls were persisted as open, set the pane to the saved size
if ($showControls && pane) {
@@ -247,15 +271,17 @@
-
- {#if hasTerminal}
+ {#if showControlsTab}
+
+ {/if}
+ {#if showFilesTab}