Skip to content

Commit c87464d

Browse files
ScottN-PVclaude
andcommitted
fix(web): scheduled task times name the server's timezone
Fixed-time schedules run in the server's timezone, but the settings row, the Run at picker and the thread's automations panel showed the bare time. A browser in another zone could not tell when a task would run. The scheduled task list now carries the server's IANA zone, and those three places name it ("Daily at 16:31 UTC"). Older servers send no zone, and their labels stay as they were. Refs #18632 Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 09c5e7a commit c87464d

8 files changed

Lines changed: 88 additions & 13 deletions

File tree

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,25 @@ it.effect("rejects a stale form save after deletion while preserving explicit-id
5353
}).pipe(Effect.provide(SqlitePersistence.layerMemory)),
5454
);
5555

56+
it.effect("lists the zone fixed-time schedules run in, before any task exists", () =>
57+
Effect.gen(function* () {
58+
const layerDependencies = Layer.mergeAll(
59+
NodeCrypto.layer,
60+
Scheduler.layer,
61+
Layer.mock(ThreadLaunchService.ThreadLaunchService)({}),
62+
Layer.mock(ThreadManagementService.ThreadManagementService)({}),
63+
Layer.mock(SecretRequests.SecretRequests)({}),
64+
);
65+
yield* Effect.gen(function* () {
66+
const service = yield* ScheduledTaskService.ScheduledTaskService;
67+
expect(yield* service.list()).toEqual({
68+
tasks: [],
69+
timeZone: DateTime.zoneToString(DateTime.zoneMakeLocal()),
70+
});
71+
}).pipe(Effect.provide(ScheduledTaskService.layer.pipe(Layer.provide(layerDependencies))));
72+
}).pipe(Effect.provide(SqlitePersistence.layerMemory)),
73+
);
74+
5675
it.effect("preserves a due run when a save only pads the scheduled hour", () =>
5776
Effect.gen(function* () {
5877
const dueAt = DateTime.makeZonedUnsafe(

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,11 @@ export const layer = Layer.effect(
915915

916916
const list: ScheduledTaskService["Service"]["list"] = () =>
917917
listRows().pipe(
918-
Effect.map((tasks) => ({ tasks })),
918+
// Fixed-time schedules run in the server's zone, which a client cannot see on its own.
919+
Effect.map((tasks) => ({
920+
tasks,
921+
timeZone: DateTime.zoneToString(DateTime.zoneMakeLocal()),
922+
})),
919923
Effect.mapError((cause) => taskError("Could not list schedule tasks.", { cause })),
920924
);
921925

‎apps/server/src/ws.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,7 @@ const layerWsRpc = (
13071307
currentSession.scopes.includes(AuthOrchestrationOperateScope)
13081308
? result
13091309
: {
1310+
...result,
13101311
tasks: result.tasks.map(({ webhook: _webhook, ...task }) => task),
13111312
};
13121313
const authorizeEffect = <A, E, R>(

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

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ import {
3030
THREAD_DETAILS_PANEL_ROW_CONTENT_CLASS,
3131
} from "./threadDetailsPanelStyles";
3232

33+
function scheduleSummary(task: ScheduledTask, timeZone: string | undefined): string {
34+
const next =
35+
task.enabled && task.nextRunAt !== null
36+
? ` · next ${relativeLabel(task.nextRunAt)}`
37+
: task.enabled
38+
? ""
39+
: " · paused";
40+
return `${scheduleLabel(task.schedule, timeZone)}${next}`;
41+
}
42+
3343
const STATUS_DOT_CLASS: Record<ScheduledTask["lastRunStatus"], string> = {
3444
never: "bg-muted-foreground/40",
3545
running: "bg-sky-500",
@@ -166,14 +176,20 @@ export function ThreadAutomationsPanel(props: {
166176
<span className="block truncate text-sm font-medium text-foreground/80">
167177
{task.title}
168178
</span>
169-
<p className="truncate text-2xs text-muted-foreground">
170-
{scheduleLabel(task.schedule)}
171-
{task.enabled && task.nextRunAt !== null
172-
? ` · next ${relativeLabel(task.nextRunAt)}`
173-
: task.enabled
174-
? ""
175-
: " · paused"}
176-
</p>
179+
{/* The card is narrow, so the line can cut off the zone; hover or focus shows all of it. */}
180+
<Tooltip>
181+
<TooltipTrigger
182+
render={
183+
<p
184+
tabIndex={0}
185+
className="truncate rounded-sm text-2xs text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring"
186+
/>
187+
}
188+
>
189+
{scheduleSummary(task, tasksQuery.data?.timeZone)}
190+
</TooltipTrigger>
191+
<TooltipPopup>{scheduleSummary(task, tasksQuery.data?.timeZone)}</TooltipPopup>
192+
</Tooltip>
177193
</div>
178194
<Tooltip>
179195
<TooltipTrigger

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ import {
7878
type DraftState,
7979
type ScheduleMode,
8080
type WorkspaceMode,
81+
scheduleTimeZoneLabel,
8182
} from "./scheduledTasksSettings.logic";
8283
import { Label } from "../ui/label";
8384
import { Menu, MenuTrigger, MenuPopup, MenuItem, MenuSeparator } from "../ui/menu";
@@ -178,7 +179,7 @@ function splitModelKey(value: string): ModelSelection | null {
178179
};
179180
}
180181

181-
export function scheduleLabel(schedule: ScheduledTaskSchedule): string {
182+
export function scheduleLabel(schedule: ScheduledTaskSchedule, timeZone?: string): string {
182183
if (schedule.type === "webhook") return "On webhook";
183184
if (schedule.type === "interval") {
184185
const minutes = schedule.everyMs / 60_000;
@@ -193,7 +194,8 @@ export function scheduleLabel(schedule: ScheduledTaskSchedule): string {
193194
: weekdays.length === 5 && weekdays.every((day) => day >= 1 && day <= 5)
194195
? "Weekdays"
195196
: weekdays.map((day) => WEEKDAY_LABELS[day]).join(", ");
196-
return `${days} at ${schedule.timeOfDay}`;
197+
const zone = scheduleTimeZoneLabel(timeZone);
198+
return `${days} at ${schedule.timeOfDay}${zone === null ? "" : ` ${zone}`}`;
197199
}
198200

199201
/**
@@ -358,6 +360,7 @@ function ScheduledTaskEnvironmentList({
358360
return {
359361
environment,
360362
connected,
363+
timeZone: data?.timeZone,
361364
tasks: data?.tasks.filter((task) =>
362365
matchesScheduledTaskScope(scope, environment.environmentId, task.projectId),
363366
),
@@ -404,7 +407,7 @@ function ScheduledTaskEnvironmentList({
404407

405408
return (
406409
<SettingsGroup>
407-
{populated.map(({ environment, tasks }) => {
410+
{populated.map(({ environment, tasks, timeZone }) => {
408411
const { primary, secondary } = settingsScopeEnvironmentLabels(environment, environments);
409412
const transport = environmentTransportLabel(environment);
410413
return (
@@ -434,6 +437,7 @@ function ScheduledTaskEnvironmentList({
434437
key={task.id}
435438
environmentId={environment.environmentId}
436439
task={task}
440+
timeZone={timeZone}
437441
onEdit={() => onEdit(environment.environmentId, task)}
438442
/>
439443
))}
@@ -550,6 +554,7 @@ function ScheduledTaskEnvironmentSection({
550554
key={task.id}
551555
environmentId={environment.environmentId}
552556
task={task}
557+
timeZone={tasksQuery.data?.timeZone}
553558
onEdit={() => onEdit(environment.environmentId, task)}
554559
/>
555560
))
@@ -563,10 +568,12 @@ function ScheduledTaskEnvironmentSection({
563568
function ScheduledTaskRow({
564569
environmentId,
565570
task,
571+
timeZone,
566572
onEdit,
567573
}: {
568574
readonly environmentId: EnvironmentId;
569575
readonly task: ScheduledTask;
576+
readonly timeZone: string | undefined;
570577
readonly onEdit: () => void;
571578
}) {
572579
const canOperate = useAtomValue(
@@ -611,7 +618,7 @@ function ScheduledTaskRow({
611618
status={
612619
<div className="flex flex-wrap items-center gap-2">
613620
<span>
614-
{scheduleLabel(task.schedule)} ·{" "}
621+
{scheduleLabel(task.schedule, timeZone)} ·{" "}
615622
{!task.enabled
616623
? "Paused"
617624
: isWebhook
@@ -964,6 +971,7 @@ function ScheduledTaskEditorDialog({
964971
draft.editingId !== null &&
965972
tasksQuery.data !== null &&
966973
!tasksQuery.data.tasks.some((entry) => entry.id === draft.editingId);
974+
const runAtZone = scheduleTimeZoneLabel(tasksQuery.data?.timeZone);
967975
const liveTask = tasksQuery.data
968976
? (tasksQuery.data.tasks.find((entry) => entry.id === draft.editingId) ?? null)
969977
: task;
@@ -1478,6 +1486,9 @@ function ScheduledTaskEditorDialog({
14781486
setDraft((current) => ({ ...current, timeOfDay: event.target.value }))
14791487
}
14801488
/>
1489+
{runAtZone === null ? null : (
1490+
<span className="text-xs text-muted-foreground">{runAtZone}</span>
1491+
)}
14811492
<span className="text-xs text-muted-foreground">on</span>
14821493
</div>
14831494
<ToggleGroup

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
scheduledTaskDefaultModel,
2121
matchesScheduledTaskScope,
2222
scheduleFromDraft,
23+
scheduleTimeZoneLabel,
2324
taskToDraft,
2425
} from "./scheduledTasksSettings.logic";
2526

@@ -314,3 +315,15 @@ describe("scheduled task model defaults", () => {
314315
).toBeNull();
315316
});
316317
});
318+
319+
describe("scheduleTimeZoneLabel", () => {
320+
it("names the server's zone, with UTC shown as UTC", () => {
321+
expect(scheduleTimeZoneLabel("Etc/UTC")).toBe("UTC");
322+
expect(scheduleTimeZoneLabel("UTC")).toBe("UTC");
323+
expect(scheduleTimeZoneLabel("Asia/Kolkata")).toBe("Asia/Kolkata");
324+
});
325+
326+
it("names nothing for an older server that does not report its zone", () => {
327+
expect(scheduleTimeZoneLabel(undefined)).toBeNull();
328+
});
329+
});

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ import type { ProviderInstanceEntry } from "../../providerInstances";
1919

2020
import type { ResolvedSettingsScope } from "./settingsScope";
2121

22+
/**
23+
* The zone to name after a fixed-time schedule, from the one the server reports. Older
24+
* servers report none, so their labels stay as they were.
25+
*/
26+
export function scheduleTimeZoneLabel(timeZone: string | undefined): string | null {
27+
if (timeZone === undefined) return null;
28+
return timeZone === "Etc/UTC" || timeZone === "UTC" ? "UTC" : timeZone;
29+
}
30+
2231
export function matchesScheduledTaskScope(
2332
scope: ResolvedSettingsScope,
2433
environmentId: EnvironmentId,

‎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 IANA zone fixed-time schedules run in. Absent from older servers. */
200+
timeZone: Schema.optional(TrimmedNonEmptyString),
199201
});
200202
export type ScheduledTaskListResult = typeof ScheduledTaskListResult.Type;
201203

0 commit comments

Comments
 (0)