Skip to content

Commit 3e7964e

Browse files
cardernecarderne
authored
feat: surface cron windows in webapp, cli, sdk (#4572)
## Summary Adds execution-window product surfaces for both declarative and imperative schedules. - Declarative schedules can set `window` through `schedules.task()`, with support for whole-minute, hour, and percentage values. - Imperative schedules can create, update, clear, and inspect windows through the API and dashboard. - Schedule API responses preserve `nextRun` as the nominal CRON time and expose `nextRunEffectiveAt` as the stable assigned time. - The dashboard displays configured windows alongside assigned upcoming-run times. - Deploy output summarizes declarative schedules and suggests adding a wider window when the default 60-second placement range is used. ## Design Window validation remains authoritative on the server and ensures each window is compatible with the schedule cadence. Omitting a window uses the default 60-second range, while explicit zero-duration windows remain supported. Deployment summaries are derived from the deployment's stored task metadata, so they reflect the declarations associated with that deployment.
1 parent d98f64b commit 3e7964e

33 files changed

Lines changed: 898 additions & 149 deletions

File tree

‎.changeset/smooth-schedule-windows.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@trigger.dev/core": patch
3+
"@trigger.dev/sdk": patch
4+
---
5+
6+
Define stable execution windows on declarative scheduled tasks. Schedule API responses now expose both the nominal CRON time and its assigned time, while the dashboard shows configured windows and upcoming assignments.

‎apps/webapp/app/components/runs/v3/TaskRunsTable.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@ export function TaskRunsTable({
418418
{run.isPending ? (
419419
"–"
420420
) : run.startedAt ? (
421-
formatDuration(new Date(run.createdAt), new Date(run.startedAt), {
421+
formatDuration(new Date(run.triggeredAt), new Date(run.startedAt), {
422422
style: "short",
423423
})
424424
) : run.isCancellable ? (
425-
<LiveTimer startTime={new Date(run.createdAt)} />
425+
<LiveTimer startTime={new Date(run.triggeredAt)} />
426426
) : (
427-
formatDuration(new Date(run.createdAt), new Date(run.updatedAt), {
427+
formatDuration(new Date(run.triggeredAt), new Date(run.updatedAt), {
428428
style: "short",
429429
})
430430
)}

‎apps/webapp/app/components/schedules/ScheduleInspector.tsx‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,14 @@ export type ScheduleInspectorData = {
5555
cron: string;
5656
cronDescription: string;
5757
timezone: string;
58+
window?: string;
5859
externalId: string | null;
5960
deduplicationKey: string | null;
6061
userProvidedDeduplicationKey: boolean;
6162
active: boolean;
6263
environments: EnvironmentRow[];
6364
runs: RunRow[];
64-
nextRuns: Date[];
65+
nextRuns: Array<{ nominalAt: Date; effectiveAt: Date }>;
6566
};
6667

6768
type Props = {
@@ -142,6 +143,10 @@ export function ScheduleInspector({
142143
<Property.Label>Timezone</Property.Label>
143144
<Property.Value>{schedule.timezone}</Property.Value>
144145
</Property.Item>
146+
<Property.Item>
147+
<Property.Label>Window</Property.Label>
148+
<Property.Value>{schedule.window ?? "-"}</Property.Value>
149+
</Property.Item>
145150
<Property.Item className="gap-1">
146151
<Property.Label>Environment</Property.Label>
147152
<Property.Value>
@@ -210,11 +215,11 @@ export function ScheduleInspector({
210215
<TableRow key={index}>
211216
{!isUtc && (
212217
<TableCell>
213-
<DateTime date={run} timeZone={schedule.timezone} />
218+
<DateTime date={run.effectiveAt} timeZone={schedule.timezone} />
214219
</TableCell>
215220
)}
216221
<TableCell>
217-
<DateTime date={run} timeZone="UTC" />
222+
<DateTime date={run.effectiveAt} timeZone="UTC" />
218223
</TableCell>
219224
</TableRow>
220225
))
@@ -249,8 +254,8 @@ export function ScheduleInspector({
249254
}
250255
panelClassName="max-w-full"
251256
>
252-
You can only edit a declarative schedule by updating your schedules.task and then
253-
running the CLI dev and deploy commands.
257+
You can only edit a declarative schedule, including its window, by updating your
258+
schedules.task and then running the CLI dev and deploy commands.
254259
</InfoPanel>
255260
</div>
256261
)}

‎apps/webapp/app/presenters/v3/EditSchedulePresenter.server.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { filterOrphanedEnvironments } from "~/utils/environmentSort";
66
import { getTimezones } from "~/utils/timezones.server";
77
import { findCurrentWorkerFromEnvironment } from "~/v3/models/workerDeployment.server";
88
import { ServiceValidationError } from "~/v3/services/baseService.server";
9+
import { formatScheduleWindow } from "~/v3/scheduleWindow.server";
910

1011
type EditScheduleOptions = {
1112
userId: string;
@@ -124,6 +125,8 @@ export class EditSchedulePresenter {
124125
deduplicationKey: true,
125126
userProvidedDeduplicationKey: true,
126127
timezone: true,
128+
windowDurationSeconds: true,
129+
windowPercentage: true,
127130
taskIdentifier: true,
128131
instances: {
129132
select: {
@@ -144,6 +147,7 @@ export class EditSchedulePresenter {
144147
return {
145148
...schedule,
146149
cron: schedule.generatorExpression,
150+
window: formatScheduleWindow(schedule),
147151
environments: schedule.instances.flatMap((instance) => {
148152
const environment = possibleEnvironments.find((env) => env.id === instance.environmentId);
149153
if (!environment) {

‎apps/webapp/app/presenters/v3/NextRunListPresenter.server.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { regionForDisplay } from "~/runEngine/concerns/workerQueueSplit.server";
2424
import { machinePresetFromRun } from "~/v3/machinePresets.server";
2525
import { ServiceValidationError } from "~/v3/services/baseService.server";
2626
import { isCancellableRunStatus, isFinalRunStatus, isPendingRunStatus } from "~/v3/taskStatus";
27+
import { runTriggeredAt } from "~/v3/runTimestamps";
2728

2829
// Positive-only cache: only envs known to have runs are stored (empty envs are re-checked),
2930
// so "has runs" is monotonic and the TTL can be very long. Tiered memory + Redis.
@@ -299,12 +300,14 @@ export class NextRunListPresenter {
299300
const hasFinished = isFinalRunStatus(run.status);
300301

301302
const startedAt = run.startedAt ?? run.lockedAt;
303+
const triggeredAt = runTriggeredAt(run);
302304

303305
return {
304306
id: run.id,
305307
number: 1,
306308
friendlyId: run.friendlyId,
307309
createdAt: run.createdAt.toISOString(),
310+
triggeredAt: triggeredAt.toISOString(),
308311
updatedAt: run.updatedAt.toISOString(),
309312
startedAt: startedAt ? startedAt.toISOString() : undefined,
310313
delayUntil: run.delayUntil ? run.delayUntil.toISOString() : undefined,

‎apps/webapp/app/presenters/v3/RunPresenter.server.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { env } from "~/env.server";
1111
import { getEventRepositoryForStore } from "~/v3/eventRepository/index.server";
1212
import { runStore } from "~/v3/runStore.server";
1313
import { controlPlaneResolver } from "~/v3/runOpsMigration/controlPlaneResolver.server";
14+
import { runTriggeredAt } from "~/v3/runTimestamps";
1415

1516
type Result = Awaited<ReturnType<RunPresenter["call"]>>;
1617
export type Run = Result["run"];
@@ -92,6 +93,8 @@ export class RunPresenter {
9293
friendlyId: true,
9394
status: true,
9495
startedAt: true,
96+
queueTimestamp: true,
97+
scheduleId: true,
9598
completedAt: true,
9699
logsDeletedAt: true,
97100
annotations: true,
@@ -151,6 +154,7 @@ export class RunPresenter {
151154
}
152155

153156
const showLogs = showDeletedLogs || !run.logsDeletedAt;
157+
const triggeredAt = runTriggeredAt(run);
154158

155159
const runData = {
156160
id: run.id,
@@ -240,7 +244,7 @@ export class RunPresenter {
240244
message: run.taskIdentifier,
241245
style: { icon: "task", variant: "primary" },
242246
events: [],
243-
startTime: run.createdAt,
247+
startTime: triggeredAt,
244248
duration: 0,
245249
isError:
246250
run.status === "COMPLETED_WITH_ERRORS" ||
@@ -364,7 +368,7 @@ export class RunPresenter {
364368
rootStartedAt: tree?.data.startTime,
365369
startedAt: run.startedAt,
366370
queuedDuration: run.startedAt
367-
? millisecondsToNanoseconds(run.startedAt.getTime() - run.createdAt.getTime())
371+
? millisecondsToNanoseconds(run.startedAt.getTime() - triggeredAt.getTime())
368372
: undefined,
369373
overridesBySpanId: traceSummary.overridesBySpanId,
370374
linkedRunIdBySpanId,

‎apps/webapp/app/presenters/v3/ScheduleListPresenter.server.ts‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ import { getTaskIdentifiers } from "~/models/task.server";
55
import { getCurrentPlan, getPlans } from "~/services/platform.v3.server";
66
import { findCurrentWorkerFromEnvironment } from "~/v3/models/workerDeployment.server";
77
import { ServiceValidationError } from "~/v3/services/baseService.server";
8-
import { formatScheduleWindow } from "~/v3/scheduleWindow.server";
8+
import { calculateNextScheduleRunTimes, formatScheduleWindow } from "~/v3/scheduleWindow.server";
99
import { CheckScheduleService } from "~/v3/services/checkSchedule.server";
10-
import {
11-
calculateNextScheduledTimestampFromNow,
12-
previousScheduledTimestamp,
13-
} from "~/v3/utils/calculateNextSchedule.server";
10+
import { previousScheduledTimestamp } from "~/v3/utils/calculateNextSchedule.server";
11+
import { env } from "~/env.server";
1412
import { BasePresenter } from "./basePresenter.server";
1513

1614
type ScheduleListOptions = {
@@ -35,6 +33,7 @@ export type ScheduleListItem = {
3533
window?: string;
3634
externalId: string | null;
3735
nextRun: Date;
36+
nextRunEffectiveAt: Date;
3837
lastRun: Date | undefined;
3938
active: boolean;
4039
environments: {
@@ -223,6 +222,7 @@ export class ScheduleListPresenter extends BasePresenter {
223222
instances: {
224223
select: {
225224
environmentId: true,
225+
schedulePhase: true,
226226
},
227227
},
228228
active: true,
@@ -300,6 +300,23 @@ export class ScheduleListPresenter extends BasePresenter {
300300
}
301301
}
302302

303+
const instance = schedule.instances.find(
304+
(instance) => instance.environmentId === environmentId
305+
);
306+
if (!instance) {
307+
throw new Error(`Schedule instance not found for environment: ${environmentId}`);
308+
}
309+
const [nextRun] = calculateNextScheduleRunTimes({
310+
cron: schedule.generatorExpression,
311+
timezone: schedule.timezone,
312+
deduplicationKey: schedule.deduplicationKey,
313+
environmentId,
314+
schedulePhase: instance.schedulePhase,
315+
phaseSecret: env.ENCRYPTION_KEY,
316+
windowDurationSeconds: schedule.windowDurationSeconds,
317+
windowPercentage: schedule.windowPercentage,
318+
});
319+
303320
return {
304321
id: schedule.id,
305322
type: schedule.type,
@@ -314,10 +331,8 @@ export class ScheduleListPresenter extends BasePresenter {
314331
active: schedule.active,
315332
externalId: schedule.externalId,
316333
lastRun,
317-
nextRun: calculateNextScheduledTimestampFromNow(
318-
schedule.generatorExpression,
319-
schedule.timezone
320-
),
334+
nextRun: nextRun.nominalAt,
335+
nextRunEffectiveAt: nextRun.effectiveAt,
321336
environments: schedule.instances.map((instance) => {
322337
const environment = project.environments.find((env) => env.id === instance.environmentId);
323338
if (!environment) {

‎apps/webapp/app/presenters/v3/SpanPresenter.server.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import { findRunByIdWithMollifierFallback } from "~/v3/mollifier/readFallback.se
3333
import { buildSyntheticSpanRun } from "~/v3/mollifier/syntheticSpanRun.server";
3434
import { engine } from "~/v3/runEngine.server";
3535
import { runStore } from "~/v3/runStore.server";
36+
import { runTriggeredAt } from "~/v3/runTimestamps";
3637
import { getTaskEventStoreTableForRun, type TaskEventStoreTable } from "~/v3/taskEventStore.server";
3738
import { isFailedRunStatus, isFinalRunStatus } from "~/v3/taskStatus";
3839
import { BasePresenter } from "./basePresenter.server";
@@ -387,7 +388,7 @@ export class SpanPresenter extends BasePresenter {
387388
friendlyId: run.friendlyId,
388389
status: run.status,
389390
statusReason: run.statusReason ?? undefined,
390-
createdAt: run.createdAt,
391+
createdAt: runTriggeredAt(run),
391392
startedAt: run.startedAt,
392393
executedAt: run.executedAt,
393394
updatedAt: run.updatedAt,
@@ -559,6 +560,7 @@ export class SpanPresenter extends BasePresenter {
559560
startedAt: true,
560561
executedAt: true,
561562
createdAt: true,
563+
queueTimestamp: true,
562564
updatedAt: true,
563565
queuedAt: true,
564566
completedAt: true,

‎apps/webapp/app/presenters/v3/ViewSchedulePresenter.server.ts‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import type { PrismaClient } from "~/db.server";
33
import { prisma } from "~/db.server";
44
import { displayableEnvironment } from "~/models/runtimeEnvironment.server";
55
import { clickhouseFactory } from "~/services/clickhouse/clickhouseFactoryInstance.server";
6-
import { nextScheduledTimestamps } from "~/v3/utils/calculateNextSchedule.server";
76
import { NextRunListPresenter } from "./NextRunListPresenter.server";
87
import { scheduleWhereClause } from "~/models/schedules.server";
9-
import { formatScheduleWindow } from "~/v3/scheduleWindow.server";
8+
import { calculateNextScheduleRunTimes, formatScheduleWindow } from "~/v3/scheduleWindow.server";
9+
import { env } from "~/env.server";
1010

1111
type ViewScheduleOptions = {
1212
userId?: string;
@@ -52,6 +52,8 @@ export class ViewSchedulePresenter {
5252
},
5353
instances: {
5454
select: {
55+
environmentId: true,
56+
schedulePhase: true,
5557
environment: {
5658
select: {
5759
id: true,
@@ -82,8 +84,25 @@ export class ViewSchedulePresenter {
8284
return;
8385
}
8486

87+
const instance = schedule.instances.find(
88+
(instance) => instance.environmentId === environmentId
89+
);
90+
if (!instance && schedule.instances.length > 0) {
91+
return;
92+
}
93+
8594
const nextRuns = schedule.active
86-
? nextScheduledTimestamps(schedule.generatorExpression, schedule.timezone, new Date(), 5)
95+
? calculateNextScheduleRunTimes({
96+
cron: schedule.generatorExpression,
97+
timezone: schedule.timezone,
98+
deduplicationKey: schedule.deduplicationKey,
99+
environmentId,
100+
schedulePhase: instance?.schedulePhase ?? null,
101+
phaseSecret: env.ENCRYPTION_KEY,
102+
windowDurationSeconds: schedule.windowDurationSeconds,
103+
windowPercentage: schedule.windowPercentage,
104+
count: 5,
105+
})
87106
: [];
88107

89108
const runs = includeRunHistory
@@ -101,6 +120,7 @@ export class ViewSchedulePresenter {
101120
timezone: schedule.timezone,
102121
cron: schedule.generatorExpression,
103122
cronDescription: schedule.generatorDescription,
123+
window: formatScheduleWindow(schedule),
104124
nextRuns,
105125
runs,
106126
environments: schedule.instances.map((instance) => {
@@ -146,14 +166,15 @@ export class ViewSchedulePresenter {
146166
type: result.schedule.type,
147167
task: result.schedule.taskIdentifier,
148168
active: result.schedule.active,
149-
nextRun: result.schedule.nextRuns[0],
169+
nextRun: result.schedule.nextRuns[0]?.nominalAt ?? null,
170+
nextRunEffectiveAt: result.schedule.nextRuns[0]?.effectiveAt ?? null,
150171
generator: {
151172
type: "CRON",
152173
expression: result.schedule.cron,
153174
description: result.schedule.cronDescription,
154175
},
155176
timezone: result.schedule.timezone,
156-
window: formatScheduleWindow(result.schedule),
177+
window: result.schedule.window,
157178
externalId: result.schedule.externalId ?? undefined,
158179
deduplicationKey: result.schedule.userProvidedDeduplicationKey
159180
? (result.schedule.deduplicationKey ?? undefined)

0 commit comments

Comments
 (0)