Skip to content

Commit a7eec6e

Browse files
committed
fix(scheduled-tasks): preserve stable task order on status updates and toggles
1 parent ff397a2 commit a7eec6e

3 files changed

Lines changed: 69 additions & 4 deletions

File tree

‎apps/server/src/scheduledTasks/ScheduledTaskService.schedule.test.ts‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,68 @@ it.effect("preserves a due run when a save only pads the scheduled hour", () =>
108108
}).pipe(Effect.provide(ScheduledTaskService.layer.pipe(Layer.provide(layerDependencies))));
109109
}).pipe(Effect.provide(SqlitePersistence.layerMemory)),
110110
);
111+
112+
it.effect("preserves list order when toggling a task enabled state", () =>
113+
Effect.gen(function* () {
114+
const layerDependencies = Layer.mergeAll(
115+
NodeCrypto.layer,
116+
Scheduler.layer,
117+
Layer.mock(ThreadLaunchService.ThreadLaunchService)({}),
118+
Layer.mock(ThreadManagementService.ThreadManagementService)({}),
119+
Layer.mock(SecretRequests.SecretRequests)({}),
120+
);
121+
yield* Effect.gen(function* () {
122+
const service = yield* ScheduledTaskService.ScheduledTaskService;
123+
const task1Input = yield* decodeUpsertInput({
124+
id: "scheduled-task:first",
125+
title: "First Task",
126+
prompt: "First prompt",
127+
enabled: true,
128+
schedule: { type: "interval", everyMs: 60_000 },
129+
projectId: "project-order-test",
130+
workspaceStrategy: { type: "root" },
131+
modelSelection: { instanceId: "codex", model: "gpt-5" },
132+
runtimeMode: "full-access",
133+
interactionMode: "default",
134+
});
135+
yield* service.upsert(task1Input);
136+
137+
yield* TestClock.adjust("10 seconds");
138+
139+
const task2Input = yield* decodeUpsertInput({
140+
id: "scheduled-task:second",
141+
title: "Second Task",
142+
prompt: "Second prompt",
143+
enabled: true,
144+
schedule: { type: "interval", everyMs: 60_000 },
145+
projectId: "project-order-test",
146+
workspaceStrategy: { type: "root" },
147+
modelSelection: { instanceId: "codex", model: "gpt-5" },
148+
runtimeMode: "full-access",
149+
interactionMode: "default",
150+
});
151+
yield* service.upsert(task2Input);
152+
153+
const initial = yield* service.list();
154+
expect(initial.tasks.map((t) => t.id)).toEqual([
155+
"scheduled-task:first",
156+
"scheduled-task:second",
157+
]);
158+
159+
yield* TestClock.adjust("10 seconds");
160+
161+
yield* service.setEnabled({
162+
id: "scheduled-task:second" as any,
163+
enabled: false,
164+
});
165+
166+
const afterToggle = yield* service.list();
167+
expect(afterToggle.tasks.map((t) => t.id)).toEqual([
168+
"scheduled-task:first",
169+
"scheduled-task:second",
170+
]);
171+
expect(afterToggle.tasks[1]?.enabled).toBe(false);
172+
expect(afterToggle.tasks[0]?.enabled).toBe(true);
173+
}).pipe(Effect.provide(ScheduledTaskService.layer.pipe(Layer.provide(layerDependencies))));
174+
}).pipe(Effect.provide(SqlitePersistence.layerMemory)),
175+
);

‎apps/server/src/scheduledTasks/ScheduledTaskService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ export const layer = Layer.effect(
438438
webhook_token,
439439
webhook_secret
440440
FROM scheduled_tasks
441-
ORDER BY updated_at DESC, task_id ASC
441+
ORDER BY created_at ASC, task_id ASC
442442
`;
443443

444444
// Strict decode for the API surface: a corrupt row is a visible error.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,12 @@ function ScheduledTaskRow({
416416
const remove = useAtomCommand(serverEnvironment.deleteScheduledTask, {
417417
label: "scheduled task delete",
418418
});
419-
const act = async (action: "toggle" | "run" | "delete") => {
419+
const act = async (action: "toggle" | "run" | "delete", nextEnabled?: boolean) => {
420420
if (busy) return;
421421
setBusy(true);
422422
const result =
423423
action === "toggle"
424-
? await toggle({ environmentId, input: { id: task.id, enabled: !task.enabled } })
424+
? await toggle({ environmentId, input: { id: task.id, enabled: nextEnabled ?? !task.enabled } })
425425
: action === "run"
426426
? await run({ environmentId, input: { id: task.id } })
427427
: await remove({ environmentId, input: { id: task.id } });
@@ -464,7 +464,7 @@ function ScheduledTaskRow({
464464
checked={task.enabled}
465465
disabled={busy}
466466
aria-label={`Enable ${task.title}`}
467-
onCheckedChange={() => void act("toggle")}
467+
onCheckedChange={(checked) => void act("toggle", checked)}
468468
/>
469469
<Menu>
470470
<MenuTrigger

0 commit comments

Comments
 (0)