From ef29fb12f1f641bf1d83b434a37298846d211deb Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Thu, 29 Oct 2026 16:44:26 +0900
Subject: [PATCH] refac

---
 backend/open_webui/tools/builtin.py           |  4 ++--
 backend/open_webui/utils/middleware.py        |  5 ++---
 src/lib/components/chat/Chat.svelte           | 21 -------------------
 .../Messages/StructuredOutputRenderer.svelte  |  5 +++++
 .../chat/Messages/structuredOutput.ts         | 19 +++++++++++++++++
 5 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/backend/open_webui/tools/builtin.py b/backend/open_webui/tools/builtin.py
index 999cca0a1c..f545667b49 100644
--- a/backend/open_webui/tools/builtin.py
+++ b/backend/open_webui/tools/builtin.py
@@ -3150,7 +3150,7 @@ async def display_file(
 
     :param path: Terminal file path, or file_id or /api/v1/files/<file_id>/content for a chat or knowledge base file
     :param page: For PDF, DOCX, and PPTX files, open the preview at this 1-based page or slide number
-    :param inline: Show the file inline in chat instead of opening the file viewer
+    :param inline: Show terminal files inline instead of opening the file viewer; uploaded files always display inline
     :return: JSON with the file's path, name, content type, and display state
     """
     if __request__ is None:
@@ -3182,7 +3182,7 @@ async def display_file(
             'type': 'file',
             'source': 'open_webui',
             'exists': True,
-            'displayed': inline,
+            'displayed': True,
             'path': path,
             'full_path': path,
             'name': file_meta.get('name') or file.filename,
diff --git a/backend/open_webui/utils/middleware.py b/backend/open_webui/utils/middleware.py
index 31ed987dc8..819349958d 100644
--- a/backend/open_webui/utils/middleware.py
+++ b/backend/open_webui/utils/middleware.py
@@ -973,8 +973,8 @@ async def terminal_event_handler(
         path = result.get('path') or tool_function_params.get('path', '')
         if not path:
             return
-        # Only emit if the file actually exists
-        if result.get('exists') is False:
+        # Only open the viewer for existing files that are not displayed inline.
+        if result.get('exists') is False or result.get('displayed') is True:
             return
         page = tool_function_params.get('page')
 
@@ -982,7 +982,6 @@ async def terminal_event_handler(
             {
                 'type': f'terminal:{tool_function_name}',
                 'data': {
-                    **result,
                     'path': path,
                     **({'page': page} if page else {}),
                 },
diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 751e7c0e4d..ba296f72c1 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -136,7 +136,6 @@
 	import NotificationToast from '../NotificationToast.svelte';
 	import Spinner from '../common/Spinner.svelte';
 	import Modal from '../common/Modal.svelte';
-	import ToolOutputFile from './Messages/ToolOutputFile.svelte';
 	import { isEmbedWindow } from '../common/FullHeightIframe.svelte';
 	import Tooltip from '../common/Tooltip.svelte';
 	import Sidebar from '../icons/Sidebar.svelte';
@@ -523,8 +522,6 @@
 	let params = {};
 	let chatVariables = {};
 	let showChatVariablesModal = false;
-	let showDisplayedFile = false;
-	let displayedFile: Record<string, unknown> | null = null;
 	let loadedChatIdProp = '';
 	let currentDraftKey = '';
 
@@ -1298,13 +1295,6 @@
 	};
 
 	const terminalEventHandler = (type: string, data: any, message: any) => {
-		if (type === 'terminal:display_file' && data?.source === 'open_webui') {
-			if ($settings?.terminalFileDisplay !== 'inline') {
-				displayedFile = data;
-				showDisplayedFile = true;
-			}
-			return;
-		}
 		const attachment = history.messages[message?.parentId]?.files?.find(
 			(file: any) => file.type === 'filesystem'
 		);
@@ -5062,17 +5052,6 @@
 
 <audio id="audioElement" style="display: none;"></audio>
 
-<Modal bind:show={showDisplayedFile} size="xl">
-	<button
-		class="float-right p-2"
-		aria-label={$i18n.t('Close')}
-		on:click={() => (showDisplayedFile = false)}
-	>
-		<XMark className="size-4" />
-	</button>
-	<ToolOutputFile item={displayedFile} chatId={$chatId} />
-</Modal>
-
 {#if getChatVariablesForm(selectedModelIds, chatVariables, $models).conflicts.length > 0}
 	<Modal bind:show={showChatVariablesModal} size="md">
 		<div>
diff --git a/src/lib/components/chat/Messages/StructuredOutputRenderer.svelte b/src/lib/components/chat/Messages/StructuredOutputRenderer.svelte
index 19080ede50..1082ff6d17 100644
--- a/src/lib/components/chat/Messages/StructuredOutputRenderer.svelte
+++ b/src/lib/components/chat/Messages/StructuredOutputRenderer.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
+	import { getContext } from 'svelte';
 	import Collapsible from '$lib/components/common/Collapsible.svelte';
+	import Image from '$lib/components/common/Image.svelte';
 	import ToolCallDisplay from '$lib/components/common/ToolCallDisplay.svelte';
 	import ToolOutputFile from './ToolOutputFile.svelte';
 	import { resolveChatMessageToolCall } from '$lib/apis/chats';
@@ -38,6 +40,7 @@
 	export let onPreview: any = () => {};
 	export let onToolCallResolved: any = () => {};
 
+	const i18n = getContext<typeof import('$lib/i18n').default>('i18n');
 	const getDetailTitle = (detailToken: OutputDetailToken): any => detailToken.summary;
 	const getDetailAttributes = (detailToken: OutputDetailToken): any => detailToken.attributes;
 	let resolvingCallId = '';
@@ -100,6 +103,8 @@
 		{:else}
 			<div class="whitespace-pre-wrap text-[0.9375rem]">{displayItem.text}</div>
 		{/if}
+	{:else if displayItem.type === 'image'}
+		<Image src={displayItem.src} alt={$i18n.t('Generated Image')} />
 	{:else if displayItem.type === 'detail_group'}
 		<ConsecutiveDetailsGroup
 			id={`${id}-${displayItem.id}`}
diff --git a/src/lib/components/chat/Messages/structuredOutput.ts b/src/lib/components/chat/Messages/structuredOutput.ts
index 22c79b4658..c2aa6bb165 100644
--- a/src/lib/components/chat/Messages/structuredOutput.ts
+++ b/src/lib/components/chat/Messages/structuredOutput.ts
@@ -50,6 +50,11 @@ export type OutputDisplayItem =
 			id: string;
 			text: string;
 	  }
+	| {
+			type: 'image';
+			id: string;
+			src: string;
+	  }
 	| {
 			type: 'detail_single';
 			id: string;
@@ -438,6 +443,20 @@ export function buildOutputDisplayItems(output: OutputItem[] = []): OutputDispla
 			return;
 		}
 
+		if (item.type === 'image_generation_call') {
+			if (typeof item.result === 'string' && item.result) {
+				flushDetails();
+				displayItems.push({
+					type: 'image',
+					id: item.id ?? `image-${index}`,
+					src: item.result.startsWith('data:')
+						? item.result
+						: `data:image/${item.output_format || 'png'};base64,${item.result}`
+				});
+			}
+			return;
+		}
+
 		const fallbackText = getMessageText(item);
 		if (fallbackText.trim()) {
 			flushDetails();