Skip to content

Commit f0dac29

Browse files
ScottN-PVclaudejuliusmarminge
authored
fix(scheduler): label fixed-time tasks with the server timezone (#18653)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent dd5876e commit f0dac29

7 files changed

Lines changed: 121 additions & 11 deletions

File tree

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import * as DateTime from "effect/DateTime";
66
import * as Effect from "effect/Effect";
77
import * as Layer from "effect/Layer";
88
import * as Schema from "effect/Schema";
9+
import * as Stream from "effect/Stream";
910
import * as TestClock from "effect/testing/TestClock";
1011

1112
import * as ThreadLaunchService from "../orchestration-v2/ThreadLaunchService.ts";
@@ -58,6 +59,52 @@ it.effect("rejects a stale form save after deletion while preserving explicit-id
5859
}).pipe(Effect.provide(SqlitePersistence.layerMemory)),
5960
);
6061

62+
it.effect("includes the scheduler zone in empty lists and subscription updates", () =>
63+
Effect.gen(function* () {
64+
const layerDependencies = Layer.mergeAll(
65+
NodeCrypto.layer,
66+
Scheduler.layer,
67+
Layer.mock(ThreadLaunchService.ThreadLaunchService)({}),
68+
Layer.mock(ManagedProjectFolders.ManagedProjectFolders)({
69+
namedProjectsRoot: "/projects",
70+
isScratchProject: () => Effect.succeed(false),
71+
}),
72+
Layer.mock(ThreadManagementService.ThreadManagementService)({}),
73+
Layer.mock(SecretRequests.SecretRequests)({}),
74+
);
75+
yield* Effect.gen(function* () {
76+
const service = yield* ScheduledTaskService.ScheduledTaskService;
77+
const timeZone = DateTime.zoneToString(DateTime.zoneMakeLocal());
78+
expect(yield* service.list()).toEqual({ tasks: [], timeZone });
79+
80+
const input = yield* decodeUpsertInput({
81+
title: "Morning review",
82+
prompt: "Review the open pull requests.",
83+
enabled: false,
84+
schedule: { type: "fixed_time", timeOfDay: "09:00" },
85+
projectId: "project-schedule-zone",
86+
workspaceStrategy: { type: "root" },
87+
modelSelection: { instanceId: "codex", model: "gpt-5.4" },
88+
runtimeMode: "full-access",
89+
interactionMode: "default",
90+
});
91+
const snapshots = yield* service.subscribeList().pipe(
92+
Stream.tap((snapshot) =>
93+
snapshot.tasks.length === 0 ? service.upsert(input) : Effect.void,
94+
),
95+
Stream.take(2),
96+
Stream.runCollect,
97+
);
98+
const populated = yield* service.list();
99+
expect(populated).toMatchObject({
100+
timeZone,
101+
tasks: [{ title: "Morning review", schedule: input.schedule }],
102+
});
103+
expect(snapshots).toEqual([{ tasks: [], timeZone }, populated]);
104+
}).pipe(Effect.provide(ScheduledTaskService.layer.pipe(Layer.provide(layerDependencies))));
105+
}).pipe(Effect.provide(SqlitePersistence.layerMemory)),
106+
);
107+
61108
it.effect("preserves a due run when a save only pads the scheduled hour", () =>
62109
Effect.gen(function* () {
63110
const dueAt = DateTime.makeZonedUnsafe(

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,10 @@ export const layer = Layer.effect(
927927

928928
const list: ScheduledTaskService["Service"]["list"] = () =>
929929
listRows().pipe(
930-
Effect.map((tasks) => ({ tasks })),
930+
Effect.map((tasks) => ({
931+
tasks,
932+
timeZone: DateTime.zoneToString(DateTime.zoneMakeLocal()),
933+
})),
931934
Effect.mapError((cause) => taskError("Could not list schedule tasks.", { cause })),
932935
);
933936

‎apps/server/src/ws.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,7 @@ export const layerWsRpc = (
12941294
currentSession.scopes.includes(AuthOrchestrationOperateScope)
12951295
? result
12961296
: {
1297+
...result,
12971298
tasks: result.tasks.map(({ webhook: _webhook, ...task }) => task),
12981299
};
12991300
const authorizeEffect = <A, E, R>(

‎apps/web/src/components/chat/ThreadAutomationsPanel.permissions.browser.test.tsx‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { EnvironmentId, ThreadId, ScheduledTaskId, type ScheduledTask } from "@t3tools/contracts";
1+
import {
2+
EnvironmentId,
3+
ThreadId,
4+
ScheduledTaskId,
5+
type ScheduledTask,
6+
type ScheduledTaskListResult,
7+
} from "@t3tools/contracts";
28
import { act } from "react";
39
import { createRoot, type Root } from "react-dom/client";
410
import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test";
@@ -28,7 +34,7 @@ vi.mock(import("../../state/use-atom-command"), async (importOriginal) => {
2834
});
2935
vi.mock(import("../../state/query"), async (importOriginal) => ({
3036
...(await importOriginal()),
31-
useEnvironmentQuery: (() => ({ data: { tasks: [task] }, error: null })) as never,
37+
useEnvironmentQuery: (() => ({ data: listResult, error: null })) as never,
3238
}));
3339

3440
import { ThreadAutomationsPanel } from "./ThreadAutomationsPanel";
@@ -41,12 +47,15 @@ const task = {
4147
enabled: true,
4248
schedule: { type: "interval", everyMs: 60000 },
4349
lastRunStatus: "never",
50+
nextRunAt: null,
4451
} as ScheduledTask;
52+
let listResult: ScheduledTaskListResult & { timeZone?: string };
4553
let root: Root;
4654
let container: HTMLDivElement;
4755
beforeEach(() => {
4856
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
4957
state.allowed = true;
58+
listResult = { tasks: [task] };
5059
state.toggle.mockReset().mockResolvedValue({ _tag: "Success" });
5160
state.run.mockReset().mockResolvedValue({ _tag: "Success" });
5261
container = document.createElement("div");
@@ -84,3 +93,33 @@ it("rejects a retained toggle after task permission is revoked", async () => {
8493
await act(async () => byLabel("Pause Daily review").click());
8594
expect(state.toggle).toHaveBeenCalledOnce();
8695
});
96+
97+
it("labels fixed times with the server zone and preserves labels from older servers", async () => {
98+
const tasks: ScheduledTask[] = [
99+
{ ...task, schedule: { type: "fixed_time", timeOfDay: "09:00" } },
100+
{ ...task, id: ScheduledTaskId.make("interval"), title: "Interval review" },
101+
{
102+
...task,
103+
id: ScheduledTaskId.make("webhook"),
104+
title: "Webhook review",
105+
schedule: { type: "webhook", signature: null },
106+
},
107+
];
108+
const labels = () => Array.from(container.querySelectorAll("li p"), (row) => row.textContent);
109+
110+
listResult = { tasks, timeZone: "Asia/Kolkata" };
111+
await renderPanel();
112+
expect(labels()).toEqual(["Daily at 09:00 Asia/Kolkata", "Every 1 min", "On webhook"]);
113+
114+
listResult = { tasks, timeZone: "Etc/UTC" };
115+
await renderPanel();
116+
expect(labels()).toEqual(["Daily at 09:00 UTC", "Every 1 min", "On webhook"]);
117+
118+
listResult = { tasks, timeZone: "UTC" };
119+
await renderPanel();
120+
expect(labels()).toEqual(["Daily at 09:00 UTC", "Every 1 min", "On webhook"]);
121+
122+
listResult = { tasks };
123+
await renderPanel();
124+
expect(labels()).toEqual(["Daily at 09:00", "Every 1 min", "On webhook"]);
125+
});

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ const STATUS_DOT_CLASS: Record<ScheduledTask["lastRunStatus"], string> = {
3737
failed: "bg-destructive",
3838
};
3939

40-
function taskScheduleLine(task: ScheduledTask) {
40+
function taskScheduleLine(task: ScheduledTask, timeZone: string | undefined) {
4141
return (
4242
<>
43-
{scheduleLabel(task.schedule)}
43+
{scheduleLabel(task.schedule, timeZone)}
4444
{task.enabled && task.nextRunAt !== null ? (
4545
<>
4646
{" · next "}
@@ -185,11 +185,15 @@ export function ThreadAutomationsPanel(props: {
185185
<span className="block truncate text-sm font-medium text-foreground/80">
186186
{task.title}
187187
</span>
188-
<p className="truncate text-2xs text-muted-foreground">{taskScheduleLine(task)}</p>
188+
<p className="truncate text-2xs text-muted-foreground">
189+
{taskScheduleLine(task, tasksQuery.data?.timeZone)}
190+
</p>
189191
</TooltipTrigger>
190192
<TooltipPopup side="left">
191193
<p className="font-medium">{task.title}</p>
192-
<p className="text-muted-foreground">{taskScheduleLine(task)}</p>
194+
<p className="text-muted-foreground">
195+
{taskScheduleLine(task, tasksQuery.data?.timeZone)}
196+
</p>
193197
</TooltipPopup>
194198
</Tooltip>
195199
<Tooltip>

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,11 @@ function splitModelKey(value: string): ModelSelection | null {
179179
};
180180
}
181181

182-
export function scheduleLabel(schedule: ScheduledTaskSchedule): string {
182+
function scheduleTimeZoneLabel(timeZone: string | undefined) {
183+
return timeZone === "Etc/UTC" ? "UTC" : timeZone;
184+
}
185+
186+
export function scheduleLabel(schedule: ScheduledTaskSchedule, timeZone?: string): string {
183187
if (schedule.type === "webhook") return "On webhook";
184188
if (schedule.type === "interval") {
185189
const minutes = schedule.everyMs / 60_000;
@@ -194,7 +198,8 @@ export function scheduleLabel(schedule: ScheduledTaskSchedule): string {
194198
: weekdays.length === 5 && weekdays.every((day) => day >= 1 && day <= 5)
195199
? "Weekdays"
196200
: weekdays.map((day) => WEEKDAY_LABELS[day]).join(", ");
197-
return `${days} at ${schedule.timeOfDay}`;
201+
const zone = scheduleTimeZoneLabel(timeZone);
202+
return `${days} at ${schedule.timeOfDay}${zone === undefined ? "" : ` ${zone}`}`;
198203
}
199204

200205
/**
@@ -364,6 +369,7 @@ function ScheduledTaskEnvironmentList({
364369
return {
365370
environment,
366371
connected: index >= 0,
372+
timeZone: data?.timeZone,
367373
tasks: data?.tasks.filter((task) =>
368374
matchesScheduledTaskScope(scope, environment.environmentId, task.projectId),
369375
),
@@ -405,7 +411,7 @@ function ScheduledTaskEnvironmentList({
405411

406412
return (
407413
<SettingsGroup>
408-
{populated.map(({ environment, tasks }) => {
414+
{populated.map(({ environment, tasks, timeZone }) => {
409415
const { primary, secondary } = settingsScopeEnvironmentLabels(environment, environments);
410416
const transport = environmentTransportLabel(environment);
411417
return (
@@ -435,6 +441,7 @@ function ScheduledTaskEnvironmentList({
435441
key={task.id}
436442
environmentId={environment.environmentId}
437443
task={task}
444+
timeZone={timeZone}
438445
onEdit={() => onEdit(environment.environmentId, task)}
439446
/>
440447
))}
@@ -550,6 +557,7 @@ function ScheduledTaskEnvironmentSection({
550557
key={task.id}
551558
environmentId={environment.environmentId}
552559
task={task}
560+
timeZone={tasksQuery.data?.timeZone}
553561
onEdit={() => onEdit(environment.environmentId, task)}
554562
/>
555563
))
@@ -563,10 +571,12 @@ function ScheduledTaskEnvironmentSection({
563571
function ScheduledTaskRow({
564572
environmentId,
565573
task,
574+
timeZone,
566575
onEdit,
567576
}: {
568577
readonly environmentId: EnvironmentId;
569578
readonly task: ScheduledTask;
579+
readonly timeZone: string | undefined;
570580
readonly onEdit: () => void;
571581
}) {
572582
const canOperate = useAtomValue(
@@ -611,7 +621,7 @@ function ScheduledTaskRow({
611621
status={
612622
<div className="flex flex-wrap items-center gap-2">
613623
<span>
614-
{scheduleLabel(task.schedule)} ·{" "}
624+
{scheduleLabel(task.schedule, timeZone)} ·{" "}
615625
{!task.enabled ? (
616626
"Paused"
617627
) : isWebhook ? (
@@ -998,6 +1008,7 @@ function ScheduledTaskEditorForm({
9981008
draft.editingId !== null &&
9991009
tasksQuery.data !== null &&
10001010
!tasksQuery.data.tasks.some((entry) => entry.id === draft.editingId);
1011+
const runAtZone = scheduleTimeZoneLabel(tasksQuery.data?.timeZone);
10011012
const liveTask = tasksQuery.data
10021013
? (tasksQuery.data.tasks.find((entry) => entry.id === draft.editingId) ?? null)
10031014
: task;
@@ -1501,6 +1512,9 @@ function ScheduledTaskEditorForm({
15011512
setDraft((current) => ({ ...current, timeOfDay: event.target.value }))
15021513
}
15031514
/>
1515+
{runAtZone === undefined ? null : (
1516+
<span className="text-xs text-muted-foreground">{runAtZone}</span>
1517+
)}
15041518
<span className="text-xs text-muted-foreground">on</span>
15051519
</div>
15061520
<ToggleGroup

‎packages/contracts/src/scheduledTask.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ export const ScheduledTaskListResult = Schema.Struct({
196196
// Trigger types grow over time; a client must not lose the whole list over
197197
// one task it cannot decode.
198198
tasks: ForwardCompatibleArray(ScheduledTask),
199+
/** The server's IANA zone for fixed-time schedules. Absent from older servers. */
200+
timeZone: Schema.optional(TrimmedNonEmptyString),
199201
});
200202
export type ScheduledTaskListResult = typeof ScheduledTaskListResult.Type;
201203

0 commit comments

Comments
 (0)