Skip to content

Commit 258e300

Browse files
committed
fix(web): allow setting reasoning effort for scheduled tasks
1 parent 67fdc53 commit 258e300

3 files changed

Lines changed: 169 additions & 34 deletions

File tree

‎apps/web/src/components/settings/ScheduledTasksSettings.browser.test.tsx‎

Lines changed: 133 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ import {
55
EnvironmentId,
66
ProjectId,
77
ProviderInstanceId,
8+
ProviderDriverKind,
9+
type ServerProvider,
10+
type UnifiedSettings,
811
ScheduledTaskId,
912
ThreadId,
1013
type ScheduledTask,
@@ -13,6 +16,7 @@ import { describe, expect, it, vi } from "vite-plus/test";
1316
import { page, userEvent } from "vite-plus/test/browser";
1417

1518
import "~/index.css";
19+
import { createModelCapabilities } from "@t3tools/shared/model";
1620
import { act, render } from "../../../test/render";
1721
import { ScheduledTasksSettings } from "./ScheduledTasksSettings";
1822

@@ -47,14 +51,26 @@ const threadFamilyRead = {
4751
threads: [{ id: task.threadId, title: "Fix login bug" }],
4852
};
4953

50-
const state = vi.hoisted(() => ({ connected: true, tasksLoaded: true, secondary: false }));
54+
const state = vi.hoisted(() => ({
55+
connected: true,
56+
tasksLoaded: true,
57+
tasks: [] as ScheduledTask[],
58+
secondary: false,
59+
providers: null as unknown as Atom.Writable<ReadonlyArray<ServerProvider>>,
60+
settings: null as unknown as UnifiedSettings,
61+
upsert: vi.fn(async () => ({ _tag: "Success" as const })),
62+
}));
5163
const secondaryId = EnvironmentId.make("secondary");
5264
const permissions = new Map<string, Atom.Writable<boolean>>();
5365

5466
function setup() {
5567
state.connected = true;
5668
state.tasksLoaded = true;
69+
state.tasks = [task];
5770
state.secondary = false;
71+
state.providers = Atom.make<ReadonlyArray<ServerProvider>>([]);
72+
state.settings = DEFAULT_UNIFIED_SETTINGS;
73+
state.upsert.mockClear();
5874
permissions.clear();
5975
permissions.set(environmentId, Atom.make(true));
6076
permissions.set(secondaryId, Atom.make(true));
@@ -104,6 +120,7 @@ vi.mock(import("../../state/server"), async (original) => {
104120
...actual,
105121
serverEnvironment: {
106122
...actual.serverEnvironment,
123+
providersValueAtom: (() => state.providers) as never,
107124
upsertScheduledTask: {
108125
...actual.serverEnvironment.upsertScheduledTask,
109126
permissionAtom: (id: string | null) => permissions.get(id ?? "")!,
@@ -125,7 +142,7 @@ vi.mock(import("../../state/query"), async (original) => ({
125142
data:
126143
request === null || request === threadFamilyRead
127144
? request
128-
: { tasks: state.tasksLoaded ? [task] : [] },
145+
: { tasks: state.tasksLoaded ? state.tasks : [] },
129146
error: null,
130147
isPending: false,
131148
refresh: vi.fn(),
@@ -142,10 +159,123 @@ vi.mock(import("../../state/entities"), async (original) => ({
142159
}));
143160
vi.mock(import("../../hooks/useSettings"), async (original) => ({
144161
...(await original()),
145-
useEnvironmentSettings: (() => DEFAULT_UNIFIED_SETTINGS) as never,
162+
useEnvironmentSettings: (() => state.settings) as never,
163+
}));
164+
165+
vi.mock(import("../../state/use-atom-command"), async (original) => ({
166+
...(await original()),
167+
useAtomCommand: (() => state.upsert) as never,
168+
}));
169+
vi.mock(import("../../state/session"), async (original) => ({
170+
...(await original()),
171+
readEnvironmentScope: () => true,
146172
}));
147173

148174
describe("ScheduledTasksSettings", () => {
175+
it.each([false, true])(
176+
"preserves and edits model options (existing task: %s)",
177+
async (editing) => {
178+
setup();
179+
const selection = {
180+
...task.modelSelection,
181+
options: [{ id: "reasoningEffort", value: "high" }],
182+
};
183+
state.tasks = [{ ...task, modelSelection: selection }];
184+
state.settings = { ...DEFAULT_UNIFIED_SETTINGS, defaultModelSelection: selection };
185+
state.providers = Atom.make<ReadonlyArray<ServerProvider>>([
186+
{
187+
instanceId: selection.instanceId,
188+
driver: ProviderDriverKind.make("codex"),
189+
enabled: true,
190+
installed: true,
191+
version: null,
192+
status: "ready",
193+
auth: { status: "authenticated" },
194+
checkedAt: "2026-11-03T00:00:00.000Z",
195+
models: [
196+
{
197+
slug: selection.model,
198+
name: "GPT-5.4",
199+
isCustom: false,
200+
capabilities: createModelCapabilities({
201+
optionDescriptors: [
202+
{
203+
id: "reasoningEffort",
204+
label: "Reasoning effort",
205+
type: "select",
206+
options: [
207+
{ id: "low", label: "Low", isDefault: true },
208+
{ id: "high", label: "High" },
209+
],
210+
currentValue: "low",
211+
},
212+
],
213+
}),
214+
},
215+
{ slug: "plain", name: "Plain model", isCustom: false, capabilities: null },
216+
],
217+
skills: [],
218+
slashCommands: [],
219+
},
220+
]);
221+
await using screen = await render(
222+
<ScheduledTasksSettings {...(editing ? { taskId: task.id } : {})} />,
223+
);
224+
if (!editing) await screen.getByRole("button", { name: "New task" }).click();
225+
await userEvent.fill(page.getByRole("textbox", { name: "Name" }), "Effort task");
226+
await userEvent.fill(
227+
page.getByRole("textbox", { name: "Prompt", exact: true }),
228+
"Review issues",
229+
);
230+
await page.getByRole("button", { name: "GPT-5.4", exact: true }).click();
231+
await page.getByRole("option", { name: /GPT-5.4/ }).click();
232+
expect(page.getByRole("button", { name: "High", exact: true }).query()).not.toBeNull();
233+
await page.getByRole("button", { name: editing ? "Save task" : "Create task" }).click();
234+
await vi.waitFor(() =>
235+
expect(state.upsert).toHaveBeenLastCalledWith({
236+
environmentId,
237+
input: expect.objectContaining({ modelSelection: selection }),
238+
}),
239+
);
240+
241+
await screen.rerender(<ScheduledTasksSettings />);
242+
await screen.rerender(<ScheduledTasksSettings taskId={task.id} />);
243+
await userEvent.fill(page.getByRole("textbox", { name: "Name" }), "Low effort task");
244+
await userEvent.fill(
245+
page.getByRole("textbox", { name: "Prompt", exact: true }),
246+
"Review issues",
247+
);
248+
await page.getByRole("button", { name: "High", exact: true }).click();
249+
await page.getByRole("menuitemradio", { name: /^Low/ }).click();
250+
await expect.element(page.getByRole("button", { name: "Low", exact: true })).toBeVisible();
251+
await page.getByRole("button", { name: "Save task" }).click();
252+
await vi.waitFor(() =>
253+
expect(state.upsert).toHaveBeenLastCalledWith({
254+
environmentId,
255+
input: expect.objectContaining({
256+
modelSelection: {
257+
...selection,
258+
options: expect.arrayContaining([{ id: "reasoningEffort", value: "low" }]),
259+
},
260+
}),
261+
}),
262+
);
263+
await screen.rerender(<ScheduledTasksSettings />);
264+
await screen.rerender(<ScheduledTasksSettings taskId={task.id} />);
265+
await page.getByRole("button", { name: "GPT-5.4", exact: true }).click();
266+
await page.getByRole("option", { name: /Plain model/ }).click();
267+
expect(page.getByRole("button", { name: "High", exact: true }).query()).toBeNull();
268+
await page.getByRole("button", { name: "Save task" }).click();
269+
await vi.waitFor(() =>
270+
expect(state.upsert).toHaveBeenLastCalledWith({
271+
environmentId,
272+
input: expect.objectContaining({
273+
modelSelection: { instanceId: selection.instanceId, model: "plain" },
274+
}),
275+
}),
276+
);
277+
},
278+
);
149279
it("creates on a permitted secondary and reacts to permission changes", async () => {
150280
setup();
151281
state.secondary = true;

‎apps/web/src/components/settings/ScheduledTasksSettings.tsx‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
import { type ReactNode, useRef, useState } from "react";
1515
import type {
1616
EnvironmentId,
17-
ModelSelection,
1817
OrchestrationV2ThreadLaunchWorkspaceStrategy,
1918
ProjectId,
2019
ScheduledTask,
@@ -104,6 +103,8 @@ import { Menu, MenuTrigger, MenuPopup, MenuItem, MenuSeparator } from "../ui/men
104103
import { ToggleGroup, Toggle } from "../ui/toggle-group";
105104
import { Empty, EmptyHeader, EmptyTitle, EmptyDescription, EmptyMedia } from "../ui/empty";
106105
import { ProviderModelPicker } from "../chat/ProviderModelPicker";
106+
import { TraitsPicker } from "../chat/TraitsPicker";
107+
import { createModelSelection } from "@t3tools/shared/model";
107108
import { Badge } from "../ui/badge";
108109
import { Button } from "../ui/button";
109110
import {
@@ -157,10 +158,9 @@ const EMPTY_DRAFT: DraftState = {
157158
baseRef: "main",
158159
startFromOrigin: true,
159160
existingWorktreePath: "",
160-
modelKey: "",
161+
modelSelection: null,
161162
runtimeMode: "full-access",
162163
interactionMode: "default",
163-
baseModelSelection: null,
164164
signatureEnabled: false,
165165
...WEBHOOK_SIGNATURE_DEFAULTS,
166166
signatureSecret: "",
@@ -289,15 +289,6 @@ function Field({
289289
);
290290
}
291291

292-
function splitModelKey(value: string): ModelSelection | null {
293-
const index = value.indexOf(":");
294-
if (index <= 0 || index === value.length - 1) return null;
295-
return {
296-
instanceId: ProviderInstanceId.make(value.slice(0, index)),
297-
model: value.slice(index + 1),
298-
};
299-
}
300-
301292
const ONCE_FORMATTER = new Intl.DateTimeFormat(undefined, {
302293
dateStyle: "medium",
303294
timeStyle: "short",
@@ -1313,7 +1304,7 @@ function ScheduledTaskEditorForm({
13131304
);
13141305

13151306
const firstInstance = instanceEntries[0];
1316-
const draftSelection = draft.modelKey ? splitModelKey(draft.modelKey) : null;
1307+
const draftSelection = draft.modelSelection;
13171308
const activeSelection =
13181309
draftSelection &&
13191310
instanceEntries.some((entry) => entry.instanceId === draftSelection.instanceId && entry.enabled)
@@ -1322,6 +1313,7 @@ function ScheduledTaskEditorForm({
13221313
const activeInstanceId =
13231314
activeSelection?.instanceId ?? firstInstance?.instanceId ?? ("" as ProviderInstanceId);
13241315
const activeModel = activeSelection?.model ?? "";
1316+
const activeEntry = instanceEntries.find((entry) => entry.instanceId === activeInstanceId);
13251317
const modelOptionsByInstance = getCustomModelOptionsByInstance(
13261318
settings,
13271319
providers,
@@ -1397,12 +1389,6 @@ function ScheduledTaskEditorForm({
13971389
reportFailure("Checkout path is required", "Enter the path of the checkout to run in.");
13981390
return;
13991391
}
1400-
const modelSelection =
1401-
draft.baseModelSelection !== null &&
1402-
draft.baseModelSelection.instanceId === selection.instanceId &&
1403-
draft.baseModelSelection.model === selection.model
1404-
? draft.baseModelSelection
1405-
: selection;
14061392
const workspaceStrategy: OrchestrationV2ThreadLaunchWorkspaceStrategy =
14071393
draft.workspaceMode === "root"
14081394
? { type: "root" }
@@ -1423,7 +1409,7 @@ function ScheduledTaskEditorForm({
14231409
threadId: draft.threadId ? (draft.threadId as ThreadId) : null,
14241410
...(offersThreadModes ? { threadMode: draft.threadMode } : {}),
14251411
workspaceStrategy,
1426-
modelSelection,
1412+
modelSelection: selection,
14271413
// Tasks have no mode picker; a mode above the administrator's ceiling would fail every run.
14281414
runtimeMode:
14291415
clampManagedRuntimeMode(environment?.serverConfig?.managedPolicy, draft.runtimeMode) ??
@@ -1473,8 +1459,7 @@ function ScheduledTaskEditorForm({
14731459
setDraft((current) => ({
14741460
...current,
14751461
projectId: defaultScheduledTaskProjectId(projectsOn(next.environmentId), scope),
1476-
modelKey: "",
1477-
baseModelSelection: null,
1462+
modelSelection: null,
14781463
baseRef: "main",
14791464
startFromOrigin: true,
14801465
existingWorktreePath: "",
@@ -1655,7 +1640,7 @@ function ScheduledTaskEditorForm({
16551640
</Field>
16561641

16571642
<Field label="Model">
1658-
<div>
1643+
<div className="flex flex-wrap items-center gap-1.5">
16591644
<ProviderModelPicker
16601645
environmentId={environmentId}
16611646
disabled={saving || !connected}
@@ -1666,10 +1651,33 @@ function ScheduledTaskEditorForm({
16661651
modelOptionsByInstance={modelOptionsByInstance}
16671652
isComposerOwned={false}
16681653
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
1669-
onInstanceModelChange={(instanceId, model) =>
1670-
setDraft((current) => ({ ...current, modelKey: `${instanceId}:${model}` }))
1671-
}
1654+
onInstanceModelChange={(instanceId, model) => {
1655+
if (instanceId === activeSelection?.instanceId && model === activeSelection.model)
1656+
return;
1657+
setDraft((current) => ({
1658+
...current,
1659+
modelSelection: createModelSelection(instanceId, model),
1660+
}));
1661+
}}
16721662
/>
1663+
{activeSelection && activeEntry ? (
1664+
<TraitsPicker
1665+
provider={activeEntry.driverKind}
1666+
models={activeEntry.models}
1667+
model={activeModel}
1668+
modelOptions={activeSelection.options ?? []}
1669+
allowPromptInjectedEffort={false}
1670+
planModeEnabled={settings.planModeEnabled}
1671+
disabled={saving || !connected}
1672+
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
1673+
onModelOptionsChange={(options) =>
1674+
setDraft((current) => ({
1675+
...current,
1676+
modelSelection: createModelSelection(activeInstanceId, activeModel, options),
1677+
}))
1678+
}
1679+
/>
1680+
) : null}
16731681
</div>
16741682
</Field>
16751683

‎apps/web/src/components/settings/scheduledTasksSettings.logic.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,9 @@ export interface DraftState {
7777
readonly baseRef: string;
7878
readonly startFromOrigin: boolean;
7979
readonly existingWorktreePath: string;
80-
readonly modelKey: string;
80+
readonly modelSelection: ModelSelection | null;
8181
readonly runtimeMode: RuntimeMode;
8282
readonly interactionMode: ProviderInteractionMode;
83-
/** Retain the source selection's provider options when the picker leaves instanceId:model unchanged. */
84-
readonly baseModelSelection: ModelSelection | null;
8583
readonly signatureEnabled: boolean;
8684
readonly signatureHeader: string;
8785
readonly signatureEncoding: "hex" | "base64";
@@ -268,10 +266,9 @@ export function taskToDraft(task: ScheduledTask): DraftState {
268266
task.workspaceStrategy.type === "existing_worktree"
269267
? task.workspaceStrategy.worktreePath
270268
: "",
271-
modelKey: `${task.modelSelection.instanceId}:${task.modelSelection.model}`,
269+
modelSelection: task.modelSelection,
272270
runtimeMode: task.runtimeMode,
273271
interactionMode: task.interactionMode,
274-
baseModelSelection: task.modelSelection,
275272
...(schedule.type === "webhook" && schedule.signature !== null
276273
? {
277274
signatureEnabled: true,

0 commit comments

Comments
 (0)