refac

src/lib/components/admin/Settings/Models.svelte

@@ -71,6 +71,8 @@
 	let models = null;
 	let modelsConfig = null;
 	let modelOrderList: string[] = [];
+	let defaultModelIds: string[] = [];
+	let defaultPinnedModelIds: string[] = [];
 
 	let workspaceModels: ModelListItem[] = [];
 	let baseModels: ModelListItem[] = [];
@@ -121,6 +123,9 @@
 		return 'text-gray-500 dark:text-gray-400';
 	};
 
+	const isDefaultModel = (model) => defaultModelIds.includes(model.id);
+	const isDefaultPinnedModel = (model) => defaultPinnedModelIds.includes(model.id);
+
 	$: if (models) {
 		const modelOrder = new Map(modelOrderList.map((id, idx) => [id, idx]));
 
@@ -230,6 +235,10 @@
 
 		modelsConfig = await getModelsConfig(localStorage.token);
 		modelOrderList = modelsConfig?.MODEL_ORDER_LIST ?? [];
+		defaultModelIds = (modelsConfig?.DEFAULT_MODELS ?? '').split(',').filter((id) => id);
+		defaultPinnedModelIds = (modelsConfig?.DEFAULT_PINNED_MODELS ?? '')
+			.split(',')
+			.filter((id) => id);
 
 		tags = await getBaseModelTags(localStorage.token);
 		if (selectedTag && !tags.includes(selectedTag)) {
@@ -282,8 +291,8 @@
 		savingModelOrder = true;
 
 		const res = await setModelsConfig(localStorage.token, {
-			DEFAULT_MODELS: modelsConfig?.DEFAULT_MODELS ?? null,
+			DEFAULT_MODELS: defaultModelIds.join(','),
-			DEFAULT_PINNED_MODELS: modelsConfig?.DEFAULT_PINNED_MODELS ?? null,
+			DEFAULT_PINNED_MODELS: defaultPinnedModelIds.join(','),
 			MODEL_ORDER_LIST: orderedModelIds,
 			DEFAULT_MODEL_METADATA: modelsConfig?.DEFAULT_MODEL_METADATA ?? null,
 			DEFAULT_MODEL_PARAMS: modelsConfig?.DEFAULT_MODEL_PARAMS ?? null
@@ -307,6 +316,65 @@
 		savingModelOrder = false;
 	};
 
+	const saveModelDefaults = async (
+		nextDefaultModelIds: string[],
+		nextDefaultPinnedModelIds: string[],
+		successMessage: string
+	) => {
+		const previousDefaultModelIds = defaultModelIds;
+		const previousDefaultPinnedModelIds = defaultPinnedModelIds;
+
+		defaultModelIds = nextDefaultModelIds;
+		defaultPinnedModelIds = nextDefaultPinnedModelIds;
+
+		const res = await setModelsConfig(localStorage.token, {
+			DEFAULT_MODELS: nextDefaultModelIds.join(','),
+			DEFAULT_PINNED_MODELS: nextDefaultPinnedModelIds.join(','),
+			MODEL_ORDER_LIST: modelsConfig?.MODEL_ORDER_LIST ?? [],
+			DEFAULT_MODEL_METADATA: modelsConfig?.DEFAULT_MODEL_METADATA ?? null,
+			DEFAULT_MODEL_PARAMS: modelsConfig?.DEFAULT_MODEL_PARAMS ?? null
+		}).catch((error) => {
+			toast.error(`${error}`);
+			return null;
+		});
+
+		if (res) {
+			modelsConfig = res;
+			toast.success(successMessage);
+		} else {
+			defaultModelIds = previousDefaultModelIds;
+			defaultPinnedModelIds = previousDefaultPinnedModelIds;
+		}
+	};
+
+	const toggleDefaultModelHandler = async (model) => {
+		const nextDefaultModelIds = isDefaultModel(model)
+			? defaultModelIds.filter((id) => id !== model.id)
+			: [...new Set([...defaultModelIds, model.id])];
+
+		await saveModelDefaults(
+			nextDefaultModelIds,
+			defaultPinnedModelIds,
+			isDefaultModel(model)
+				? $i18n.t('Model removed from selected models')
+				: $i18n.t('Model added to selected models')
+		);
+	};
+
+	const toggleDefaultPinnedModelHandler = async (model) => {
+		const nextDefaultPinnedModelIds = isDefaultPinnedModel(model)
+			? defaultPinnedModelIds.filter((id) => id !== model.id)
+			: [...new Set([...defaultPinnedModelIds, model.id])];
+
+		await saveModelDefaults(
+			defaultModelIds,
+			nextDefaultPinnedModelIds,
+			isDefaultPinnedModel(model)
+				? $i18n.t('Model removed from pinned models')
+				: $i18n.t('Model added to pinned models')
+		);
+	};
+
 	const positionChangeHandler = async (event) => {
 		const { oldIndex, newIndex, item } = event;
 
@@ -876,6 +944,22 @@
 												>
 													{modelAccessLabel(model)}
 												</span>
+
+												{#if isDefaultModel(model)}
+													<span
+														class="shrink-0 text-[11px] font-normal leading-4 text-gray-500 dark:text-gray-400"
+													>
+														{$i18n.t('Selected')}
+													</span>
+												{/if}
+
+												{#if isDefaultPinnedModel(model)}
+													<span
+														class="shrink-0 text-[11px] font-normal leading-4 text-gray-500 dark:text-gray-400"
+													>
+														{$i18n.t('Pinned')}
+													</span>
+												{/if}
 											</div>
 										</Tooltip>
 									</div>
@@ -934,6 +1018,14 @@
 										privacyHandler={() => {
 											toggleModelPrivacyHandler(model);
 										}}
+										isDefaultSelected={isDefaultModel(model)}
+										isDefaultPinned={isDefaultPinnedModel(model)}
+										defaultSelectedHandler={() => {
+											toggleDefaultModelHandler(model);
+										}}
+										defaultPinnedHandler={() => {
+											toggleDefaultPinnedModelHandler(model);
+										}}
 										pinModelHandler={() => {
 											pinModelHandler(model.id);
 										}}

src/lib/components/admin/Settings/Models/ModelMenu.svelte

@@ -14,6 +14,7 @@
 	import ArrowUpCircle from '$lib/components/icons/ArrowUpCircle.svelte';
 	import Pin from '$lib/components/icons/Pin.svelte';
 	import PinSlash from '$lib/components/icons/PinSlash.svelte';
+	import Check from '$lib/components/icons/Check.svelte';
 	import GlobeAlt from '$lib/components/icons/GlobeAlt.svelte';
 	import LockClosed from '$lib/components/icons/LockClosed.svelte';
 
@@ -28,6 +29,10 @@
 	export let exportHandler: Function;
 	export let hideHandler: Function;
 	export let privacyHandler: Function;
+	export let isDefaultSelected = false;
+	export let isDefaultPinned = false;
+	export let defaultSelectedHandler: Function;
+	export let defaultPinnedHandler: Function;
 	export let pinModelHandler: Function;
 	export let copyLinkHandler: Function;
 	export let cloneHandler: Function;
@@ -108,6 +113,46 @@
 				</div>
 			</button>
 
+			<button
+				class="select-none flex w-full gap-2 items-center h-[1.6875rem] px-2 text-[13px] font-normal cursor-pointer hover:bg-gray-50/40 dark:hover:bg-gray-800/40 rounded-xl"
+				on:click={async () => {
+					show = false;
+					await defaultSelectedHandler();
+				}}
+			>
+				<Check className="size-3.5" />
+
+				<div class="flex items-center">
+					{#if isDefaultSelected}
+						{$i18n.t('Remove Selected Model')}
+					{:else}
+						{$i18n.t('Set as Selected Model')}
+					{/if}
+				</div>
+			</button>
+
+			<button
+				class="select-none flex w-full gap-2 items-center h-[1.6875rem] px-2 text-[13px] font-normal cursor-pointer hover:bg-gray-50/40 dark:hover:bg-gray-800/40 rounded-xl"
+				on:click={async () => {
+					show = false;
+					await defaultPinnedHandler();
+				}}
+			>
+				{#if isDefaultPinned}
+					<PinSlash className="size-3.5" />
+				{:else}
+					<Pin className="size-3.5" />
+				{/if}
+
+				<div class="flex items-center">
+					{#if isDefaultPinned}
+						{$i18n.t('Remove Pinned Model')}
+					{:else}
+						{$i18n.t('Set as Pinned Model')}
+					{/if}
+				</div>
+			</button>
+
 			<button
 				class="select-none flex w-full gap-2 items-center h-[1.6875rem] px-2 text-[13px] font-normal cursor-pointer hover:bg-gray-50/40 dark:hover:bg-gray-800/40 rounded-xl"
 				on:click={() => {

src/lib/components/admin/Settings/Models/ModelSettingsModal.svelte

@@ -4,7 +4,7 @@
 	import { getContext, onMount } from 'svelte';
 	const i18n = getContext('i18n');
 
-	import { models, config as _config } from '$lib/stores';
+	import { config as _config } from '$lib/stores';
 	import { DEFAULT_CAPABILITIES } from '$lib/constants';
 	import { getModelsConfig, setModelsConfig, setDefaultPromptSuggestions } from '$lib/apis/configs';
 	import { getBackendConfig } from '$lib/apis';
@@ -14,7 +14,6 @@
 	import ChevronUp from '$lib/components/icons/ChevronUp.svelte';
 	import ChevronDown from '$lib/components/icons/ChevronDown.svelte';
 	import XMark from '$lib/components/icons/XMark.svelte';
-	import ModelSelector from './ModelSelector.svelte';
 	import AdvancedParams from '$lib/components/chat/Settings/Advanced/AdvancedParams.svelte';
 
 	import Capabilities from '$lib/components/workspace/Models/Capabilities.svelte';
@@ -29,10 +28,6 @@
 
 	let config = null;
 
-	let defaultModelIds = [];
-
-	let defaultPinnedModelIds = [];
-
 	let modelIds = [];
 
 	let loading = false;
@@ -52,30 +47,7 @@
 	const init = async () => {
 		config = await getModelsConfig(localStorage.token);
 
-		if (config?.DEFAULT_MODELS) {
+		modelIds = config.MODEL_ORDER_LIST || [];
-			defaultModelIds = (config?.DEFAULT_MODELS).split(',').filter((id) => id);
-		} else {
-			defaultModelIds = [];
-		}
-
-		if (config?.DEFAULT_PINNED_MODELS) {
-			defaultPinnedModelIds = (config?.DEFAULT_PINNED_MODELS).split(',').filter((id) => id);
-		} else {
-			defaultPinnedModelIds = [];
-		}
-
-		const modelOrderList = config.MODEL_ORDER_LIST || [];
-		const allModelIds = $models.map((model) => model.id);
-
-		// Create a Set for quick lookup of ordered IDs
-		const orderedSet = new Set(modelOrderList);
-
-		modelIds = [
-			// Add all IDs from MODEL_ORDER_LIST that exist in allModelIds
-			...modelOrderList.filter((id) => orderedSet.has(id) && allModelIds.includes(id)),
-			// Add remaining IDs not in MODEL_ORDER_LIST, sorted alphabetically
-			...allModelIds.filter((id) => !orderedSet.has(id)).sort((a, b) => a.localeCompare(b))
-		];
 
 		const savedMeta = config?.DEFAULT_MODEL_METADATA;
 		if (savedMeta && Object.keys(savedMeta).length > 0) {
@@ -101,8 +73,8 @@
 		};
 
 		const res = await setModelsConfig(localStorage.token, {
-			DEFAULT_MODELS: defaultModelIds.join(','),
+			DEFAULT_MODELS: config?.DEFAULT_MODELS ?? null,
-			DEFAULT_PINNED_MODELS: defaultPinnedModelIds.join(','),
+			DEFAULT_PINNED_MODELS: config?.DEFAULT_PINNED_MODELS ?? null,
 			MODEL_ORDER_LIST: modelIds,
 			DEFAULT_MODEL_METADATA: metadata,
 			DEFAULT_MODEL_PARAMS: Object.fromEntries(
@@ -173,28 +145,6 @@
 
 							<div class="flex-1 mt-1 lg:mt-1 lg:h-[30rem] lg:max-h-[30rem] flex flex-col min-w-0">
 								<div class="w-full h-full overflow-y-auto overflow-x-hidden scrollbar-hidden">
-									<ModelSelector
-										title={$i18n.t('Selected Models')}
-										tooltip={$i18n.t(
-											'Set the default models that are automatically selected for all users when a new chat is created.'
-										)}
-										models={$models.filter((model) => !(model?.info?.meta?.hidden ?? false))}
-										bind:modelIds={defaultModelIds}
-									/>
-
-										<hr class=" border-gray-50 dark:border-gray-800/10 my-2.5 w-full" />
-
-										<ModelSelector
-											title={$i18n.t('Pinned Models')}
-											tooltip={$i18n.t(
-												'Set the models that are automatically pinned to the sidebar for all users.'
-											)}
-											models={$models.filter((model) => !(model?.info?.meta?.hidden ?? false))}
-											bind:modelIds={defaultPinnedModelIds}
-										/>
-
-										<hr class=" border-gray-50 dark:border-gray-800/10 my-2.5 w-full" />
-
 									<div>
 										<button
 											class="flex w-full justify-between items-center"
@@ -261,9 +211,7 @@
 														.filter(
 															([key, value]) =>
 																value &&
-																	['web_search', 'code_interpreter', 'image_generation'].includes(
+																['web_search', 'code_interpreter', 'image_generation'].includes(key)
-																		key
-																	)
 														)
 														.map(([key, value]) => key)}
 

src/lib/components/workspace/Prompts/PromptEditor.svelte

@@ -2,6 +2,7 @@
 	import { onMount, tick, getContext } from 'svelte';
 	import type { Writable } from 'svelte/store';
 	import type { i18n as i18nType } from 'i18next';
+	import { goto } from '$app/navigation';
 
 	import Textarea from '$lib/components/common/Textarea.svelte';
 	import { toast } from 'svelte-sonner';
@@ -15,6 +16,7 @@
 	import Spinner from '$lib/components/common/Spinner.svelte';
 	import Modal from '$lib/components/common/Modal.svelte';
 	import XMark from '$lib/components/icons/XMark.svelte';
+	import ChevronLeft from '$lib/components/icons/ChevronLeft.svelte';
 	import {
 		getPromptHistory,
 		setProductionPromptVersion,
@@ -382,9 +384,19 @@
 
 {#if edit}
 	<!-- Edit mode: Read-only view with history -->
-	<div class="flex flex-col w-full h-full max-h-[100dvh]">
+	<div class="flex h-full max-h-[100dvh] w-full flex-col">
-		<!-- Header -->
+		<button
-		<div class="flex items-start justify-between gap-4 shrink-0">
+			class="mb-1 flex h-6 w-fit items-center gap-1 rounded-md px-0.5 text-xs text-gray-400 transition-colors duration-75 hover:text-gray-700 dark:text-gray-600 dark:hover:text-gray-300"
+			type="button"
+			on:click={() => {
+				goto('/workspace/prompts');
+			}}
+		>
+			<ChevronLeft className="size-3" strokeWidth="2" />
+			<span>{$i18n.t('Back')}</span>
+		</button>
+
+		<div class="flex shrink-0 items-start justify-between gap-3 pb-2">
 			<div class="min-w-0 flex-1">
 				<input
 					class="w-full bg-transparent text-sm outline-hidden"
@@ -394,10 +406,11 @@
 					{disabled}
 				/>
 
-				<div class="flex w-full flex-1 items-center gap-0.5 text-xs text-gray-500">
+				<div class="mt-0.5 flex min-w-0 items-center gap-2 text-xs text-gray-500">
+					<div class="flex min-w-0 flex-1 items-center gap-0.5">
 						<span>/</span>
 						<input
-						class="bg-transparent outline-hidden"
+							class="min-w-0 flex-1 bg-transparent outline-hidden"
 							placeholder={$i18n.t('command')}
 							bind:value={command}
 							on:input={debouncedSaveMetadata}
@@ -405,12 +418,12 @@
 						/>
 					</div>
 				</div>
+			</div>
 
-			<div>
+			<div class="flex shrink-0 items-center gap-1.5 pr-0.5">
-				<div class="flex items-center gap-2 shrink-0 justify-end">
 				{#if !disabled}
 					<button
-							class="flex shrink-0 items-center rounded-lg bg-gray-50 px-2 py-1 text-xs text-gray-900 ring-1 ring-gray-200 transition hover:bg-gray-100 dark:bg-gray-850 dark:text-gray-100 dark:ring-gray-800 dark:hover:bg-gray-800"
+						class="flex shrink-0 items-center gap-1 rounded-lg bg-gray-50 px-2 py-1 text-xs font-normal text-gray-900 transition ring-1 ring-gray-200 hover:bg-gray-100 dark:bg-gray-850 dark:text-gray-100 dark:ring-gray-800 dark:hover:bg-gray-800"
 						on:click={() => (showEditModal = true)}
 					>
 						{$i18n.t('Edit')}
@@ -418,26 +431,11 @@
 
 					<AccessButton on:click={() => (showAccessControlModal = true)} />
 				{:else}
-						<span class="text-xs text-gray-500 bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded-full"
+					<span class="rounded-lg bg-gray-100 px-2 py-1 text-xs text-gray-500 dark:bg-gray-850">
-							>{$i18n.t('Read Only')}</span
+						{$i18n.t('Read Only')}
-						>
+					</span>
 				{/if}
 			</div>
-
-				<div>
-					<Tooltip content={$i18n.t('Click to copy ID')}>
-						<button
-							class="text-xs text-gray-500 font-mono px-2 py-1 rounded-lg cursor-pointer hover:underline transition"
-							on:click={() => {
-								copyToClipboard(prompt.id);
-								toast.success($i18n.t('ID copied to clipboard'));
-							}}
-						>
-							{prompt.id}
-						</button>
-					</Tooltip>
-				</div>
-			</div>
 		</div>
 
 		<div class="mb-2 flex justify-between items-center gap-2">
@@ -456,6 +454,18 @@
 					}}
 				/>
 			</div>
+
+			<Tooltip content={$i18n.t('Click to copy ID')}>
+				<button
+					class="min-w-0 max-w-[14rem] shrink-0 truncate rounded-md px-1 py-0.5 font-mono text-xs text-gray-400 transition hover:text-gray-700 dark:hover:text-gray-300"
+					on:click={() => {
+						copyToClipboard(prompt.id);
+						toast.success($i18n.t('ID copied to clipboard'));
+					}}
+				>
+					{prompt.id}
+				</button>
+			</Tooltip>
 		</div>
 
 		<div class="flex flex-1 flex-col gap-3 overflow-hidden pb-4 md:flex-row">
@@ -517,9 +527,12 @@
 						</button>
 					</div>
 					<!-- Scrollable content -->
-					<div class="h-full overflow-y-auto rounded-lg bg-transparent px-1 py-1">
+					<div
-						<pre class="text-xs whitespace-pre-wrap font-mono pr-8">{selectedHistoryEntry?.snapshot
+						class="h-full overflow-y-auto rounded-lg bg-gray-50/60 px-3 py-2 dark:bg-white/[0.03]"
-								?.content || content}</pre>
+					>
+						<pre
+							class="whitespace-pre-wrap pr-8 font-mono text-[11px] leading-relaxed">{selectedHistoryEntry
+								?.snapshot?.content || content}</pre>
 					</div>
 				</div>
 			</div>