feat: add persistent model-aware reasoning effort settings
This commit is contained in:
+52
-9
@@ -7,6 +7,8 @@ import {
|
||||
type ProviderModelPreferences,
|
||||
} from "@/lib/workspace-domain";
|
||||
import { useEffect, useLayoutEffect, useMemo, useRef, useState } from "preact/hooks";
|
||||
import { ReasoningEffortControl } from "@/components/ReasoningEffortControl";
|
||||
import { getReasoningCapabilities, loadReasoningPreferences, normalizeReasoningEffort, reasoningPreferenceKey, saveReasoningPreferences, type ReasoningEffort } from "@/lib/reasoning-effort";
|
||||
import type { TargetedTouchEvent } from "preact";
|
||||
import { getProviderLabel } from "@/lib/message-generation";
|
||||
import {
|
||||
@@ -690,6 +692,9 @@ export default function App() {
|
||||
return stored.openai ?? PROVIDER_FALLBACK_MODELS.openai[0];
|
||||
});
|
||||
const [quickProvider, setQuickProvider] = useState<Provider>(() => loadStoredQuickQuestionModelSelection().provider);
|
||||
const [reasoningPreferences, setReasoningPreferences] = useState(loadReasoningPreferences);
|
||||
const [reasoningPreferencesSaved, setReasoningPreferencesSaved] = useState(true);
|
||||
const [reasoningEffort, setReasoningEffort] = useState<ReasoningEffort | null>(() => loadReasoningPreferences()[reasoningPreferenceKey(provider, model)] ?? null);
|
||||
const [quickProviderModelPreferences, setQuickProviderModelPreferences] = useState<ProviderModelPreferences>(
|
||||
() => loadStoredQuickQuestionModelSelection().modelPreferences
|
||||
);
|
||||
@@ -719,6 +724,7 @@ export default function App() {
|
||||
const [chatSettingsTitleDraft, setChatSettingsTitleDraft] = useState("");
|
||||
const [chatSettingsProviderDraft, setChatSettingsProviderDraft] = useState<Provider>("openai");
|
||||
const [chatSettingsModelDraft, setChatSettingsModelDraft] = useState("");
|
||||
const [chatSettingsReasoningDraft, setChatSettingsReasoningDraft] = useState<ReasoningEffort | null>(null);
|
||||
const [chatSettingsPromptDraft, setChatSettingsPromptDraft] = useState("");
|
||||
const [chatSettingsEnabledToolsDraft, setChatSettingsEnabledToolsDraft] = useState<string[]>([]);
|
||||
const [additionalSystemPrompt, setAdditionalSystemPrompt] = useState("");
|
||||
@@ -883,6 +889,8 @@ export default function App() {
|
||||
setChatSettingsTitleDraft("");
|
||||
setChatSettingsProviderDraft("openai");
|
||||
setChatSettingsModelDraft("");
|
||||
setChatSettingsReasoningDraft(null);
|
||||
setReasoningEffort(null);
|
||||
setChatSettingsPromptDraft("");
|
||||
setChatSettingsEnabledToolsDraft([]);
|
||||
setAdditionalSystemPrompt("");
|
||||
@@ -1148,6 +1156,11 @@ export default function App() {
|
||||
[chatSettingsProviderDraft, modelCatalog]
|
||||
);
|
||||
const providerOptions = PROVIDERS;
|
||||
const chatSettingsReasoningCapabilities = getReasoningCapabilities(modelCatalog, chatSettingsProviderDraft, chatSettingsModelDraft);
|
||||
|
||||
useEffect(() => {
|
||||
setReasoningPreferencesSaved(saveReasoningPreferences(reasoningPreferences));
|
||||
}, [reasoningPreferences]);
|
||||
|
||||
useEffect(() => {
|
||||
if (model.trim()) return;
|
||||
@@ -1443,6 +1456,7 @@ export default function App() {
|
||||
if (!chat) return;
|
||||
setAdditionalSystemPrompt(chat.additionalSystemPrompt ?? "");
|
||||
setEnabledTools(normalizeEnabledTools(chat.enabledTools, availableChatTools));
|
||||
setReasoningEffort(chat.reasoningEffort ?? null);
|
||||
}, [availableChatTools, draftKind, selectedChat, selectedChatSummary, selectedItem]);
|
||||
|
||||
const selectedTitle = useMemo(() => {
|
||||
@@ -1494,7 +1508,9 @@ export default function App() {
|
||||
setSelectedSearch(null);
|
||||
setPendingAttachments([]);
|
||||
setDraftChatTitle("");
|
||||
setModel(pickProviderModel(getModelOptions(modelCatalog, provider), providerModelPreferences[provider]));
|
||||
const nextModel = pickProviderModel(getModelOptions(modelCatalog, provider), providerModelPreferences[provider]);
|
||||
setModel(nextModel);
|
||||
setReasoningEffort(reasoningPreferences[reasoningPreferenceKey(provider, nextModel)] ?? null);
|
||||
setAdditionalSystemPrompt("");
|
||||
setEnabledTools(getDefaultEnabledTools(availableChatTools));
|
||||
setIsChatSettingsOpen(false);
|
||||
@@ -1751,6 +1767,7 @@ export default function App() {
|
||||
initiatedModel: updatedChat.initiatedModel,
|
||||
lastUsedProvider: updatedChat.lastUsedProvider,
|
||||
lastUsedModel: updatedChat.lastUsedModel,
|
||||
reasoningEffort: updatedChat.reasoningEffort,
|
||||
additionalSystemPrompt: updatedChat.additionalSystemPrompt,
|
||||
enabledTools: updatedChat.enabledTools,
|
||||
};
|
||||
@@ -1810,6 +1827,7 @@ export default function App() {
|
||||
setChatSettingsTitleDraft(getChatSettingsSeedTitle());
|
||||
setChatSettingsProviderDraft(provider);
|
||||
setChatSettingsModelDraft(model);
|
||||
setChatSettingsReasoningDraft(reasoningEffort);
|
||||
setChatSettingsPromptDraft(additionalSystemPrompt);
|
||||
setChatSettingsEnabledToolsDraft(normalizeEnabledTools(enabledTools, availableChatTools));
|
||||
setIsChatSettingsOpen(true);
|
||||
@@ -1822,9 +1840,19 @@ export default function App() {
|
||||
});
|
||||
};
|
||||
|
||||
const commitLocalChatSettings = (nextProvider: Provider, nextModel: string, nextPrompt: string, nextTools: string[], nextTitle: string) => {
|
||||
const changeChatSettingsModel = (nextProvider: Provider, nextModel: string) => {
|
||||
setChatSettingsProviderDraft(nextProvider);
|
||||
setChatSettingsModelDraft(nextModel.trim());
|
||||
setChatSettingsReasoningDraft(nextProvider === provider && nextModel.trim() === model.trim()
|
||||
? reasoningEffort : reasoningPreferences[reasoningPreferenceKey(nextProvider, nextModel)] ?? null);
|
||||
setChatSettingsError(null);
|
||||
};
|
||||
|
||||
const commitLocalChatSettings = (nextProvider: Provider, nextModel: string, nextPrompt: string, nextTools: string[], nextTitle: string, nextEffort: ReasoningEffort | null) => {
|
||||
setProvider(nextProvider);
|
||||
setModel(nextModel);
|
||||
setReasoningEffort(nextEffort);
|
||||
setReasoningPreferences((current) => ({ ...current, [reasoningPreferenceKey(nextProvider, nextModel)]: nextEffort }));
|
||||
setProviderModelPreferences((current) => ({
|
||||
...current,
|
||||
[nextProvider]: nextModel || null,
|
||||
@@ -1853,6 +1881,7 @@ export default function App() {
|
||||
}
|
||||
|
||||
const nextPrompt = chatSettingsPromptDraft.trim();
|
||||
const nextEffort = normalizeReasoningEffort(chatSettingsReasoningCapabilities, chatSettingsReasoningDraft);
|
||||
const nextTools = availableChatTools.length
|
||||
? normalizeEnabledTools(chatSettingsEnabledToolsDraft, availableChatTools)
|
||||
: chatSettingsEnabledToolsDraft;
|
||||
@@ -1864,6 +1893,9 @@ export default function App() {
|
||||
if (isExistingChat) {
|
||||
const updatedChat = await updateChatSettings(existingChatId, {
|
||||
title: nextTitle,
|
||||
provider: chatSettingsProviderDraft,
|
||||
model: nextModel,
|
||||
reasoningEffort: nextEffort,
|
||||
additionalSystemPrompt: nextPrompt || null,
|
||||
...(availableChatTools.length ? { enabledTools: nextTools } : {}),
|
||||
});
|
||||
@@ -1873,7 +1905,7 @@ export default function App() {
|
||||
setDraftKind("chat");
|
||||
}
|
||||
|
||||
commitLocalChatSettings(chatSettingsProviderDraft, nextModel, nextPrompt, nextTools, nextTitle);
|
||||
commitLocalChatSettings(chatSettingsProviderDraft, nextModel, nextPrompt, nextTools, nextTitle, nextEffort);
|
||||
setIsChatSettingsOpen(false);
|
||||
} catch (err) {
|
||||
const message = err instanceof Error ? err.message : String(err);
|
||||
@@ -2219,6 +2251,7 @@ export default function App() {
|
||||
|
||||
const handleSendChat = async (content: string, attachments: ChatAttachment[]): Promise<SidebarSelection> => {
|
||||
const selectedModel = model.trim();
|
||||
const selectedEffort = normalizeReasoningEffort(getReasoningCapabilities(modelCatalog, provider, selectedModel), reasoningEffort);
|
||||
if (!selectedModel) {
|
||||
throw new Error("No model available for selected provider");
|
||||
}
|
||||
@@ -2252,6 +2285,7 @@ export default function App() {
|
||||
...(draftChatTitle.trim() ? { title: draftChatTitle.trim() } : {}),
|
||||
provider,
|
||||
model: selectedModel,
|
||||
reasoningEffort: selectedEffort,
|
||||
...(additionalSystemPrompt.trim() ? { additionalSystemPrompt: additionalSystemPrompt.trim() } : {}),
|
||||
...(initialEnabledTools !== undefined ? { enabledTools: initialEnabledTools } : {}),
|
||||
});
|
||||
@@ -2281,6 +2315,7 @@ export default function App() {
|
||||
initiatedModel: chat.initiatedModel,
|
||||
lastUsedProvider: chat.lastUsedProvider,
|
||||
lastUsedModel: chat.lastUsedModel,
|
||||
reasoningEffort: chat.reasoningEffort,
|
||||
additionalSystemPrompt: chat.additionalSystemPrompt,
|
||||
enabledTools: chat.enabledTools,
|
||||
messages: [],
|
||||
@@ -2343,6 +2378,7 @@ export default function App() {
|
||||
clientRequestId,
|
||||
provider,
|
||||
model: selectedModel,
|
||||
reasoningEffort: selectedEffort,
|
||||
messages: requestMessages,
|
||||
},
|
||||
{
|
||||
@@ -2918,6 +2954,7 @@ export default function App() {
|
||||
initiatedModel: chat.initiatedModel,
|
||||
lastUsedProvider: chat.lastUsedProvider,
|
||||
lastUsedModel: chat.lastUsedModel,
|
||||
reasoningEffort: chat.reasoningEffort,
|
||||
additionalSystemPrompt: chat.additionalSystemPrompt,
|
||||
enabledTools: chat.enabledTools,
|
||||
messages: [],
|
||||
@@ -3080,6 +3117,7 @@ export default function App() {
|
||||
initiatedModel: chat.initiatedModel,
|
||||
lastUsedProvider: chat.lastUsedProvider,
|
||||
lastUsedModel: chat.lastUsedModel,
|
||||
reasoningEffort: chat.reasoningEffort,
|
||||
additionalSystemPrompt: chat.additionalSystemPrompt,
|
||||
enabledTools: chat.enabledTools,
|
||||
messages: [],
|
||||
@@ -3646,9 +3684,10 @@ export default function App() {
|
||||
quickModelsDisabled={isQuickQuestionSending || isConvertingQuickQuestion}
|
||||
onQuickProviderChange={selectQuickProvider}
|
||||
onQuickModelChange={selectQuickModel}
|
||||
preferencesSaved={modelPreferencesSaved && quickPreferencesSaved}
|
||||
preferencesSaved={modelPreferencesSaved && quickPreferencesSaved && reasoningPreferencesSaved}
|
||||
onRetrySave={() => {
|
||||
setModelPreferencesSaved(saveModelPreferences(providerModelPreferences));
|
||||
setReasoningPreferencesSaved(saveReasoningPreferences(reasoningPreferences));
|
||||
setQuickPreferencesSaved(saveQuickQuestionModelSelection({ provider: quickProvider, modelPreferences: quickProviderModelPreferences }));
|
||||
}}
|
||||
/> : null}
|
||||
@@ -3752,10 +3791,8 @@ export default function App() {
|
||||
value={chatSettingsProviderDraft}
|
||||
onChange={(event) => {
|
||||
const nextProvider = event.currentTarget.value as Provider;
|
||||
setChatSettingsProviderDraft(nextProvider);
|
||||
const options = getModelOptions(modelCatalog, nextProvider);
|
||||
setChatSettingsModelDraft(pickProviderModel(options, providerModelPreferences[nextProvider]));
|
||||
setChatSettingsError(null);
|
||||
changeChatSettingsModel(nextProvider, pickProviderModel(options, providerModelPreferences[nextProvider]));
|
||||
}}
|
||||
disabled={isSavingChatSettings}
|
||||
>
|
||||
@@ -3775,13 +3812,19 @@ export default function App() {
|
||||
value={chatSettingsModelDraft}
|
||||
disabled={isSavingChatSettings}
|
||||
onChange={(nextModel) => {
|
||||
setChatSettingsModelDraft(nextModel.trim());
|
||||
setChatSettingsError(null);
|
||||
changeChatSettingsModel(chatSettingsProviderDraft, nextModel);
|
||||
}}
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<ReasoningEffortControl
|
||||
capabilities={chatSettingsReasoningCapabilities}
|
||||
value={chatSettingsReasoningDraft}
|
||||
onChange={setChatSettingsReasoningDraft}
|
||||
disabled={isSavingChatSettings}
|
||||
/>
|
||||
|
||||
<label className="block">
|
||||
<span className="mb-1.5 block text-xs font-semibold text-violet-100/72">Additional system prompt</span>
|
||||
<Textarea
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
import { normalizeReasoningEffort, reasoningEffortLabel, type ReasoningCapabilities, type ReasoningEffort } from "@/lib/reasoning-effort";
|
||||
|
||||
export function ReasoningEffortControl({ capabilities, value, onChange, disabled }: {
|
||||
capabilities: ReasoningCapabilities | null;
|
||||
value: ReasoningEffort | null;
|
||||
onChange: (effort: ReasoningEffort | null) => void;
|
||||
disabled?: boolean;
|
||||
}) {
|
||||
const effort = normalizeReasoningEffort(capabilities, value);
|
||||
const label = effort ? reasoningEffortLabel(effort)
|
||||
: `Model default${capabilities?.defaultEffort ? ` (${reasoningEffortLabel(capabilities.defaultEffort)})` : ""}`;
|
||||
return (
|
||||
<section className="rounded-lg border border-violet-300/18 bg-background/44 px-3 py-3">
|
||||
<div className="flex flex-wrap items-center justify-between gap-2">
|
||||
<label htmlFor="chat-reasoning-effort" className="text-xs font-semibold text-violet-100/72">Reasoning effort</label>
|
||||
<output htmlFor="chat-reasoning-effort" className="text-sm text-violet-50">{label}</output>
|
||||
</div>
|
||||
{capabilities ? (
|
||||
<>
|
||||
<input
|
||||
id="chat-reasoning-effort"
|
||||
type="range"
|
||||
min={0}
|
||||
max={capabilities.efforts.length}
|
||||
step={1}
|
||||
value={effort ? capabilities.efforts.indexOf(effort) + 1 : 0}
|
||||
onInput={(event) => onChange(capabilities.efforts[Number(event.currentTarget.value) - 1] ?? null)}
|
||||
aria-valuetext={label}
|
||||
aria-describedby="chat-reasoning-help"
|
||||
disabled={disabled}
|
||||
className="mt-2 h-8 w-full cursor-pointer accent-violet-400 disabled:cursor-default disabled:opacity-50"
|
||||
/>
|
||||
<div className="flex justify-between text-xs text-muted-foreground" aria-hidden="true">
|
||||
<span>Model default</span>
|
||||
<span>{reasoningEffortLabel(capabilities.efforts[capabilities.efforts.length - 1])}</span>
|
||||
</div>
|
||||
<p id="chat-reasoning-help" className="mt-2 text-xs text-muted-foreground">Higher effort gives the model more time to reason and can increase response time and cost.</p>
|
||||
</>
|
||||
) : (
|
||||
<p className="mt-2 text-xs text-muted-foreground">Reasoning settings aren’t available for this model. It will use its own defaults.</p>
|
||||
)}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
+10
-1
@@ -1,3 +1,5 @@
|
||||
import type { ReasoningCapabilities, ReasoningEffort } from "./reasoning-effort";
|
||||
|
||||
export type ChatSummary = {
|
||||
id: string;
|
||||
title: string | null;
|
||||
@@ -11,6 +13,7 @@ export type ChatSummary = {
|
||||
initiatedModel: string | null;
|
||||
lastUsedProvider: Provider | null;
|
||||
lastUsedModel: string | null;
|
||||
reasoningEffort?: ReasoningEffort | null;
|
||||
additionalSystemPrompt: string | null;
|
||||
enabledTools: string[] | null;
|
||||
};
|
||||
@@ -72,6 +75,7 @@ export type ChatDetail = {
|
||||
initiatedModel: string | null;
|
||||
lastUsedProvider: Provider | null;
|
||||
lastUsedModel: string | null;
|
||||
reasoningEffort?: ReasoningEffort | null;
|
||||
additionalSystemPrompt: string | null;
|
||||
enabledTools: string[] | null;
|
||||
messages: Message[];
|
||||
@@ -163,6 +167,7 @@ export type ProviderModelInfo = {
|
||||
models: string[];
|
||||
loadedAt: string | null;
|
||||
error: string | null;
|
||||
reasoningCapabilities?: Record<string, ReasoningCapabilities>;
|
||||
};
|
||||
|
||||
export type ModelCatalogResponse = {
|
||||
@@ -207,6 +212,7 @@ type CreateChatRequest = {
|
||||
title?: string;
|
||||
provider?: Provider;
|
||||
model?: string;
|
||||
reasoningEffort?: ReasoningEffort | null;
|
||||
additionalSystemPrompt?: string;
|
||||
enabledTools?: string[];
|
||||
messages?: CompletionRequestMessage[];
|
||||
@@ -345,7 +351,7 @@ export async function updateChatStar(chatId: string, starred: boolean) {
|
||||
|
||||
export async function updateChatSettings(
|
||||
chatId: string,
|
||||
body: { title?: string; additionalSystemPrompt?: string | null; enabledTools?: string[] }
|
||||
body: { title?: string; provider?: Provider; model?: string; reasoningEffort?: ReasoningEffort | null; additionalSystemPrompt?: string | null; enabledTools?: string[] }
|
||||
) {
|
||||
const data = await api<{ chat: ChatSummary }>(`/v1/chats/${chatId}`, {
|
||||
method: "PATCH",
|
||||
@@ -569,6 +575,7 @@ export async function runCompletion(body: {
|
||||
chatId: string;
|
||||
provider: Provider;
|
||||
model: string;
|
||||
reasoningEffort?: ReasoningEffort | null;
|
||||
messages: CompletionRequestMessage[];
|
||||
additionalSystemPrompt?: string;
|
||||
enabledTools?: string[];
|
||||
@@ -587,6 +594,7 @@ export async function runCompletionStream(
|
||||
clientRequestId?: string;
|
||||
provider: Provider;
|
||||
model: string;
|
||||
reasoningEffort?: ReasoningEffort | null;
|
||||
messages: CompletionRequestMessage[];
|
||||
additionalSystemPrompt?: string;
|
||||
enabledTools?: string[];
|
||||
@@ -617,6 +625,7 @@ export async function runQuickQuestionStream(
|
||||
body: {
|
||||
provider: Provider;
|
||||
model: string;
|
||||
reasoningEffort?: ReasoningEffort | null;
|
||||
question: string;
|
||||
},
|
||||
handlers: CompletionStreamHandlers,
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
import type { ModelCatalogResponse, Provider } from "./api";
|
||||
|
||||
export const REASONING_EFFORTS = ["none", "minimal", "low", "medium", "high", "xhigh", "max"] as const;
|
||||
export type ReasoningEffort = (typeof REASONING_EFFORTS)[number];
|
||||
export type ReasoningCapabilities = { efforts: ReasoningEffort[]; defaultEffort: ReasoningEffort | null };
|
||||
export type ReasoningPreferences = Record<string, ReasoningEffort | null>;
|
||||
export const REASONING_PREFERENCES_STORAGE_KEY = "sybil:reasoningEffortByModel";
|
||||
|
||||
export function reasoningPreferenceKey(provider: Provider, model: string) {
|
||||
return JSON.stringify([provider, model.trim()]);
|
||||
}
|
||||
|
||||
export function getReasoningCapabilities(catalog: ModelCatalogResponse["providers"], provider: Provider, model: string): ReasoningCapabilities | null {
|
||||
// Missing/old catalogs and unrecognized values must fail closed.
|
||||
const entry = catalog[provider]?.reasoningCapabilities?.[model.trim()];
|
||||
if (!entry || !Array.isArray(entry.efforts) || !entry.efforts.length
|
||||
|| !entry.efforts.every((effort) => REASONING_EFFORTS.includes(effort))
|
||||
|| new Set(entry.efforts).size !== entry.efforts.length
|
||||
|| (entry.defaultEffort !== null && !entry.efforts.includes(entry.defaultEffort))) return null;
|
||||
return entry;
|
||||
}
|
||||
|
||||
export function normalizeReasoningEffort(capabilities: ReasoningCapabilities | null, effort: unknown): ReasoningEffort | null {
|
||||
return capabilities?.efforts.includes(effort as ReasoningEffort) ? effort as ReasoningEffort : null;
|
||||
}
|
||||
|
||||
export function reasoningEffortLabel(effort: ReasoningEffort) {
|
||||
if (effort === "xhigh") return "Extra high";
|
||||
return effort.charAt(0).toUpperCase() + effort.slice(1);
|
||||
}
|
||||
|
||||
export function loadReasoningPreferences(): ReasoningPreferences {
|
||||
try {
|
||||
const parsed: unknown = JSON.parse(window.localStorage.getItem(REASONING_PREFERENCES_STORAGE_KEY) ?? "{}");
|
||||
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
|
||||
return Object.fromEntries(Object.entries(parsed).filter(([, value]) => value === null || REASONING_EFFORTS.includes(value)));
|
||||
} catch { return {}; }
|
||||
}
|
||||
|
||||
export function saveReasoningPreferences(preferences: ReasoningPreferences) {
|
||||
try { window.localStorage.setItem(REASONING_PREFERENCES_STORAGE_KEY, JSON.stringify(preferences)); return true; }
|
||||
catch { return false; }
|
||||
}
|
||||
Reference in New Issue
Block a user