diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte index 5141fed098..48198fafc1 100644 --- a/src/lib/components/chat/Chat.svelte +++ b/src/lib/components/chat/Chat.svelte @@ -339,21 +339,6 @@ let pendingWebSearchPrompt: string | null = null; let webSearchConfirmed = false; - $: { - const currentModels = atSelectedModel?.id ? [atSelectedModel.id] : selectedModels; - const allModelsSupportWebSearch = - currentModels.filter( - (model) => $models.find((m) => m.id === model)?.info?.meta?.capabilities?.web_search ?? true - ).length === currentModels.length; - - webSearchActive = Boolean( - $config?.features?.enable_web_search && - ($user?.role === 'admin' || $user?.permissions?.features?.web_search) && - (webSearchEnabled || - (allModelsSupportWebSearch && ($settings?.webSearch ?? false) === 'always')) - ); - } - const openWebSearchConfirm = () => { window.setTimeout(() => { showWebSearchConfirm = true; @@ -374,10 +359,6 @@ showWebSearchConfirm = false; }; - $: if (!webSearchActive) { - resetWebSearchConfirmation(); - } - let showCommands = false; let generating = false; @@ -743,6 +724,25 @@ oldSelectedModelIds = structuredClone(selectedModelIds); }; + $: { + const currentModels = atSelectedModel?.id ? [atSelectedModel.id] : selectedModels; + const allModelsSupportWebSearch = + currentModels.filter( + (model) => $models.find((m) => m.id === model)?.info?.meta?.capabilities?.web_search ?? true + ).length === currentModels.length; + + webSearchActive = Boolean( + $config?.features?.enable_web_search && + ($user?.role === 'admin' || $user?.permissions?.features?.web_search) && + (webSearchEnabled || + (allModelsSupportWebSearch && ($settings?.webSearch ?? false) === 'always')) + ); + } + + $: if (!webSearchActive) { + resetWebSearchConfirmation(); + } + const mergeFiles = (current, incoming) => { const seen = new Set(); return [...(incoming ?? []), ...(current ?? [])].filter((file) => {