Skip to content

Commit f4b4b3e

Browse files
committed
feat(web): add shortcuts to increase/decrease reasoning level
1 parent 062987b commit f4b4b3e

5 files changed

Lines changed: 230 additions & 31 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6047,6 +6047,13 @@ export default function ChatView(props: ChatViewProps) {
60476047
return;
60486048
}
60496049

6050+
if (command === "reasoning.increase" || command === "reasoning.decrease") {
6051+
event.preventDefault();
6052+
event.stopPropagation();
6053+
composerRef.current?.adjustReasoningLevel(command === "reasoning.increase" ? 1 : -1);
6054+
return;
6055+
}
6056+
60506057
const scriptId = projectScriptIdFromCommand(command);
60516058
if (!scriptId || !activeProject) return;
60526059
const script = activeProjectScripts.find((entry) => entry.id === scriptId);

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ import { ProviderModelPicker } from "./ProviderModelPicker";
169169
import { type ComposerCommandItem, ComposerCommandMenu } from "./ComposerCommandMenu";
170170
import { ComposerPendingApprovalActions } from "./ComposerPendingApprovalActions";
171171
import { CompactComposerControlsMenu } from "./CompactComposerControlsMenu";
172+
import { getReasoningLevelChange } from "./TraitsPicker";
172173
import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
173174
import { ComposerPendingApprovalPanel } from "./ComposerPendingApprovalPanel";
174175
import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";
@@ -1124,6 +1125,7 @@ export interface ChatComposerHandle {
11241125
openModelPicker: () => void;
11251126
toggleModelPicker: () => void;
11261127
isModelPickerOpen: () => boolean;
1128+
adjustReasoningLevel: (direction: 1 | -1) => void;
11271129
compactContext: () => void;
11281130
readSnapshot: () => {
11291131
value: string;
@@ -4560,6 +4562,29 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
45604562
{ ensureLeadingBoundary: true, citationCommentAnchor: sourceAnchor },
45614563
),
45624564
openModelPicker,
4565+
adjustReasoningLevel: (direction) => {
4566+
if (noProviderAvailable) return;
4567+
const change = getReasoningLevelChange({
4568+
provider: selectedProvider,
4569+
models: selectedProviderModels,
4570+
model: selectedModel,
4571+
modelOptions: composerModelOptions?.[selectedInstanceId],
4572+
prompt: promptRef.current,
4573+
planModeEnabled: settings.planModeEnabled,
4574+
direction,
4575+
});
4576+
if (!change) return;
4577+
if ("modelOptions" in change) {
4578+
useComposerDraftStore
4579+
.getState()
4580+
.setProviderModelOptions(composerDraftTarget, selectedProvider, change.modelOptions, {
4581+
instanceId: selectedInstanceId,
4582+
model: selectedModel,
4583+
persistSticky: true,
4584+
});
4585+
}
4586+
if (change.prompt !== promptRef.current) setPromptFromTraits(change.prompt);
4587+
},
45634588
toggleModelPicker: () => {
45644589
if (isComposerModelPickerOpen) {
45654590
setIsComposerModelPickerOpen(false);
@@ -4658,6 +4683,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
46584683
activeThread,
46594684
addComposerAttachments,
46604685
composerDraftTarget,
4686+
composerModelOptions,
46614687
composerCursor,
46624688
composerTerminalContexts,
46634689
insertComposerDraftTerminalContext,
@@ -4680,6 +4706,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
46804706
isComposerModelPickerOpen,
46814707
openModelPicker,
46824708
readComposerSnapshot,
4709+
selectedInstanceId,
46834710
selectedModel,
46844711
selectedModelOptionsForDispatch,
46854712
selectedModelSelection,
@@ -4688,6 +4715,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
46884715
selectedPromptEffort,
46894716
selectedProvider,
46904717
selectedProviderModels,
4718+
setPromptFromTraits,
4719+
settings.planModeEnabled,
46914720
interactionMode,
46924721
planModeUiEnabled,
46934722
compactThreadContext,

‎apps/web/src/components/chat/TraitsPicker.test.ts‎

Lines changed: 113 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
import { describe, expect, it } from "vite-plus/test";
2-
import { ProviderDriverKind, type ProviderOptionDescriptor } from "@t3tools/contracts";
3-
import { buildTraitsTriggerDisplay, buildUnavailableModelOptionDescriptors } from "./TraitsPicker";
2+
import {
3+
ProviderDriverKind,
4+
type ProviderOptionDescriptor,
5+
type ServerProviderModel,
6+
} from "@t3tools/contracts";
7+
import {
8+
getReasoningLevelChange,
9+
buildTraitsTriggerDisplay,
10+
buildUnavailableModelOptionDescriptors,
11+
} from "./TraitsPicker";
412

513
function selectDescriptor(
614
id: string,
@@ -188,3 +196,106 @@ describe("buildUnavailableModelOptionDescriptors", () => {
188196
]);
189197
});
190198
});
199+
200+
describe("reasoning level shortcuts", () => {
201+
const modelWith = (
202+
descriptors: ReadonlyArray<ProviderOptionDescriptor>,
203+
): ReadonlyArray<ServerProviderModel> => [
204+
{
205+
slug: "test-model",
206+
name: "Test",
207+
isCustom: false,
208+
capabilities: { optionDescriptors: descriptors },
209+
},
210+
];
211+
const options = [
212+
{ id: "low", label: "Low" },
213+
{ id: "high", label: "High", isDefault: true },
214+
{ id: "ultrathink", label: "Ultrathink" },
215+
];
216+
const input = {
217+
provider: CODEX,
218+
model: "test-model",
219+
models: modelWith([
220+
{ ...selectDescriptor("effort", options, "high"), promptInjectedValues: ["ultrathink"] },
221+
fastModeDescriptor(false),
222+
]),
223+
modelOptions: [{ id: "fastMode", value: true }],
224+
prompt: "Solve this",
225+
planModeEnabled: false,
226+
direction: -1 as const,
227+
};
228+
229+
it("steps from the default, skips unsupported levels, and preserves other traits", () => {
230+
expect(
231+
getReasoningLevelChange({
232+
...input,
233+
models: modelWith([
234+
{ id: "effort", label: "Effort", type: "select", options },
235+
fastModeDescriptor(false),
236+
]),
237+
}),
238+
).toEqual({
239+
prompt: "Solve this",
240+
modelOptions: [
241+
{ id: "effort", value: "low" },
242+
{ id: "fastMode", value: true },
243+
],
244+
});
245+
});
246+
247+
it("stops at both ends", () => {
248+
expect(
249+
getReasoningLevelChange({ ...input, modelOptions: [{ id: "effort", value: "low" }] }),
250+
).toBeNull();
251+
expect(
252+
getReasoningLevelChange({ ...input, prompt: "Ultrathink:\nSolve this", direction: 1 }),
253+
).toBeNull();
254+
});
255+
256+
it("enters and leaves prompt-controlled ultrathink", () => {
257+
const increased = getReasoningLevelChange({ ...input, direction: 1 });
258+
expect(increased).toEqual({ prompt: "Ultrathink:\nSolve this" });
259+
expect(getReasoningLevelChange({ ...input, prompt: increased!.prompt })).toEqual({
260+
prompt: "Solve this",
261+
modelOptions: [
262+
{ id: "effort", value: "high" },
263+
{ id: "fastMode", value: true },
264+
],
265+
});
266+
expect(
267+
getReasoningLevelChange({ ...input, prompt: "Please ultrathink about this" }),
268+
).toBeNull();
269+
});
270+
271+
it("changes only the prompt when enabling ultrathink, and preserves slash commands", () => {
272+
expect(getReasoningLevelChange({ ...input, prompt: "", direction: 1 })).toEqual({
273+
prompt: "Ultrathink:\n",
274+
});
275+
expect(getReasoningLevelChange({ ...input, prompt: "/review", direction: 1 })).toEqual({
276+
prompt: "/review",
277+
});
278+
});
279+
280+
it.each(["reasoningEffort", "effort", "variant"])("supports the %s descriptor", (id) => {
281+
expect(
282+
getReasoningLevelChange({
283+
...input,
284+
models: modelWith([selectDescriptor(id, options, "high")]),
285+
})?.modelOptions,
286+
).toEqual([{ id, value: "low" }]);
287+
});
288+
289+
it.each(["agent", "contextWindow"])("does not step through %s options", (id) => {
290+
expect(
291+
getReasoningLevelChange({
292+
...input,
293+
models: modelWith([selectDescriptor(id, options, "high")]),
294+
}),
295+
).toBeNull();
296+
});
297+
298+
it("does nothing when the model is unavailable", () => {
299+
expect(getReasoningLevelChange({ ...input, models: [] })).toBeNull();
300+
});
301+
});

‎apps/web/src/components/chat/TraitsPicker.tsx‎

Lines changed: 79 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,67 @@ function getSelectedTraits(
215215
};
216216
}
217217

218+
function getTraitSelectChange(
219+
selected: ReturnType<typeof getSelectedTraits>,
220+
descriptor: Extract<ProviderOptionDescriptor, { type: "select" }>,
221+
prompt: string,
222+
value: string,
223+
) {
224+
if (!value) return null;
225+
if (descriptor.promptInjectedValues?.includes(value)) {
226+
return {
227+
prompt:
228+
prompt.trim().length === 0
229+
? ULTRATHINK_PROMPT_PREFIX
230+
: applyClaudePromptEffortPrefix(prompt, "ultrathink"),
231+
};
232+
}
233+
const isPrimary = descriptor.id === selected.primarySelectDescriptor?.id;
234+
if (isPrimary && selected.ultrathinkInBodyText) return null;
235+
return {
236+
prompt:
237+
isPrimary && selected.ultrathinkPromptControlled
238+
? prompt.replace(/^Ultrathink:\s*/i, "")
239+
: prompt,
240+
modelOptions: buildProviderOptionSelectionsFromDescriptors(
241+
replaceDescriptorCurrentValue(selected.descriptors, descriptor.id, value),
242+
),
243+
};
244+
}
245+
246+
/** Step through the model's reasoning choices, stopping at either end. */
247+
export function getReasoningLevelChange(input: {
248+
provider: ProviderDriverKind;
249+
models: ReadonlyArray<ServerProviderModel>;
250+
model: string;
251+
prompt: string;
252+
modelOptions: ProviderOptions | null | undefined;
253+
planModeEnabled: boolean;
254+
direction: 1 | -1;
255+
}) {
256+
const selected = getSelectedTraits(
257+
input.provider,
258+
input.models,
259+
input.model,
260+
input.prompt,
261+
input.modelOptions,
262+
true,
263+
input.planModeEnabled,
264+
);
265+
const descriptor = selected.selectDescriptors.find((entry) =>
266+
["reasoningEffort", "effort", "variant"].includes(entry.id),
267+
);
268+
if (!descriptor || selected.modelIsUnavailable || selected.ultrathinkInBodyText) return null;
269+
const current = selected.ultrathinkPromptControlled
270+
? "ultrathink"
271+
: getProviderOptionCurrentValue(descriptor);
272+
const index = descriptor.options.findIndex((option) => option.id === current);
273+
if (index < 0) return null;
274+
const next = descriptor.options[index + input.direction];
275+
if (!next) return null;
276+
return getTraitSelectChange(selected, descriptor, input.prompt, next.id);
277+
}
278+
218279
function getTraitsSectionVisibility(input: {
219280
provider: ProviderDriverKind;
220281
models: ReadonlyArray<ServerProviderModel>;
@@ -315,6 +376,15 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
315376
},
316377
[instanceId, model, persistence, provider, setProviderModelOptions],
317378
);
379+
const selected = getTraitsSectionVisibility({
380+
provider,
381+
models,
382+
model,
383+
prompt,
384+
modelOptions,
385+
allowPromptInjectedEffort,
386+
planModeEnabled,
387+
});
318388
const {
319389
descriptors,
320390
selectDescriptors,
@@ -324,38 +394,16 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
324394
ultrathinkInBodyText,
325395
hasAnyControls,
326396
modelIsUnavailable,
327-
} = getTraitsSectionVisibility({
328-
provider,
329-
models,
330-
model,
331-
prompt,
332-
modelOptions,
333-
allowPromptInjectedEffort,
334-
planModeEnabled,
335-
});
336-
const updateDescriptors = (nextDescriptors: ReadonlyArray<ProviderOptionDescriptor>) => {
337-
updateModelOptions(buildProviderOptionSelectionsFromDescriptors(nextDescriptors));
338-
};
397+
} = selected;
339398

340399
const handleSelectChange = (
341400
descriptor: Extract<ProviderOptionDescriptor, { type: "select" }>,
342401
value: string,
343402
) => {
344-
if (!value) return;
345-
if (descriptor.promptInjectedValues?.includes(value)) {
346-
const nextPrompt =
347-
prompt.trim().length === 0
348-
? ULTRATHINK_PROMPT_PREFIX
349-
: applyClaudePromptEffortPrefix(prompt, "ultrathink");
350-
onPromptChange(nextPrompt);
351-
return;
352-
}
353-
if (ultrathinkInBodyText && descriptor.id === primarySelectDescriptor?.id) return;
354-
if (ultrathinkPromptControlled && descriptor.id === primarySelectDescriptor?.id) {
355-
const stripped = prompt.replace(/^Ultrathink:\s*/i, "");
356-
onPromptChange(stripped);
357-
}
358-
updateDescriptors(replaceDescriptorCurrentValue(descriptors, descriptor.id, value));
403+
const change = getTraitSelectChange(selected, descriptor, prompt, value);
404+
if (!change) return;
405+
if (change.prompt !== prompt) onPromptChange(change.prompt);
406+
if ("modelOptions" in change) updateModelOptions(change.modelOptions);
359407
};
360408

361409
if (!hasAnyControls) {
@@ -457,8 +505,10 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
457505
<MenuRadioGroup
458506
value={selectedValue}
459507
onValueChange={(value) => {
460-
updateDescriptors(
461-
replaceDescriptorCurrentValue(descriptors, descriptor.id, value === "on"),
508+
updateModelOptions(
509+
buildProviderOptionSelectionsFromDescriptors(
510+
replaceDescriptorCurrentValue(descriptors, descriptor.id, value === "on"),
511+
),
462512
);
463513
}}
464514
>

‎packages/contracts/src/keybindings.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ export const STATIC_KEYBINDING_COMMANDS = [
7272
"projectSearch.toggle",
7373
"themeEditor.toggle",
7474
"composer.stash",
75+
"reasoning.increase",
76+
"reasoning.decrease",
7577
"chat.new",
7678
"chat.newLocal",
7779
"editor.openFavorite",

0 commit comments

Comments
 (0)