fix(cron): protect schedule activation ownership

vincentkoc · amersheeny · commit 6a00c36e6667 · 2026-06-22T18:56:01.000+01:00
diff --git a/packages/gateway-protocol/src/schema/cron.ts b/packages/gateway-protocol/src/schema/cron.ts
@@ -410,7 +410,6 @@ const CronJobStatePatchSchema = Type.Object(
     nextRunAtMs: Type.Optional(Type.Integer({ minimum: 0 })),
     runningAtMs: Type.Optional(Type.Integer({ minimum: 0 })),
     lastRunAtMs: Type.Optional(Type.Integer({ minimum: 0 })),
-    scheduleActivatedAtMs: Type.Optional(Type.Integer({ minimum: 0 })),
     lastRunStatus: Type.Optional(CronRunStatusSchema),
     lastStatus: Type.Optional(DeprecatedCronRunStatusSchema),
     lastError: Type.Optional(Type.String()),
diff --git a/src/cron/cron-protocol-schema.test.ts b/src/cron/cron-protocol-schema.test.ts
@@ -1,10 +1,14 @@
 // Cron protocol schema tests cover runtime validation for cron protocol payloads.
 import { describe, expect, it } from "vitest";
-import { CronJobStateSchema } from "../../packages/gateway-protocol/src/schema.js";
+import {
+  CronJobPatchSchema,
+  CronJobStateSchema,
+} from "../../packages/gateway-protocol/src/schema.js";
 
 type SchemaLike = {
   properties?: Record<string, unknown>;
   deprecated?: boolean;
+  additionalProperties?: boolean;
 };
 
 describe("cron protocol schema", () => {
@@ -30,4 +34,11 @@ describe("cron protocol schema", () => {
     const properties = (CronJobStateSchema as SchemaLike).properties ?? {};
     expect(properties.scheduleActivatedAtMs).toBeDefined();
   });
+
+  it("rejects schedule activation timestamps in public state patches", () => {
+    const patchProperties = (CronJobPatchSchema as SchemaLike).properties ?? {};
+    const stateSchema = patchProperties.state as SchemaLike | undefined;
+    expect(stateSchema?.additionalProperties).toBe(false);
+    expect(stateSchema?.properties?.scheduleActivatedAtMs).toBeUndefined();
+  });
 });
diff --git a/src/cron/service.jobs.test.ts b/src/cron/service.jobs.test.ts
@@ -8,7 +8,7 @@ import {
   recomputeNextRunsForMaintenance,
 } from "./service/jobs.js";
 import type { CronServiceState } from "./service/state.js";
-import type { CronJob, CronJobPatch } from "./types.js";
+import type { CronJob, CronJobCreate, CronJobPatch } from "./types.js";
 
 const DEFAULT_TOP_OF_HOUR_STAGGER_MS = 5 * 60 * 1000;
 
@@ -67,6 +67,19 @@ describe("applyJobPatch", () => {
     expect(job.delivery).toBeUndefined();
   });
 
+  it("ignores caller-supplied schedule activation state", () => {
+    const job = createIsolatedAgentTurnJob("job-activation-owner", undefined, {
+      state: { scheduleActivatedAtMs: 456 },
+    });
+    const patch = {
+      state: { scheduleActivatedAtMs: 123 },
+    } as unknown as CronJobPatch;
+
+    applyJobPatch(job, patch);
+
+    expect(job.state.scheduleActivatedAtMs).toBe(456);
+  });
+
   it("keeps webhook delivery when switching to main session", () => {
     const job = createIsolatedAgentTurnJob("job-webhook", {
       mode: "webhook",
@@ -597,6 +610,26 @@ function createMockState(now: number, opts?: { defaultAgentId?: string }): CronS
   } as unknown as CronServiceState;
 }
 
+describe("createJob schedule activation ownership", () => {
+  it("uses the service clock instead of caller-supplied state", () => {
+    const now = Date.parse("2026-06-16T06:00:00.000Z");
+    const state = createMockState(now);
+    const input = {
+      name: "activation-owned",
+      enabled: true,
+      schedule: { kind: "cron" as const, expr: "0 * * * *", tz: "UTC" },
+      sessionTarget: "main" as const,
+      wakeMode: "now" as const,
+      payload: { kind: "systemEvent" as const, text: "tick" },
+      state: { scheduleActivatedAtMs: now - 60_000 },
+    } as unknown as CronJobCreate;
+
+    const job = createJob(state, input);
+
+    expect(job.state.scheduleActivatedAtMs).toBe(now);
+  });
+});
+
 describe("createJob rejects sessionTarget main for non-default agents", () => {
   const now = Date.parse("2026-02-28T12:00:00.000Z");
 
diff --git a/src/cron/service/jobs.ts b/src/cron/service/jobs.ts
@@ -24,6 +24,7 @@ import type {
   CronJob,
   CronJobCreate,
   CronJobPatch,
+  CronJobState,
   CronPayload,
   CronPayloadPatch,
 } from "../types.js";
@@ -794,6 +795,7 @@ export function createJob(state: CronServiceState, input: CronJobCreate): CronJo
     failureAlert: input.failureAlert,
     state: {
       ...input.state,
+      scheduleActivatedAtMs: now,
     },
   };
   assertSupportedJobSpec(job);
@@ -802,11 +804,6 @@ export function createJob(state: CronServiceState, input: CronJobCreate): CronJo
   assertFailureDestinationSupport(job);
   assertCronExpressionSatisfiable(job, now);
   job.state.nextRunAtMs = computeJobNextRunAtMs(job, now);
-  // Creation activates the schedule; absent an explicit caller value, anchor
-  // catch-up's "predates the schedule" boundary at creation time (#91944).
-  if (!isFiniteTimestamp(job.state.scheduleActivatedAtMs)) {
-    job.state.scheduleActivatedAtMs = now;
-  }
   return job;
 }
 
@@ -882,7 +879,11 @@ export function applyJobPatch(
         : undefined;
   }
   if (patch.state) {
-    job.state = { ...job.state, ...patch.state };
+    const statePatch = { ...patch.state } as Partial<CronJobState>;
+    // The scheduler owns this boundary; public state patches must not move it
+    // backward or forward and change restart catch-up behavior (#91944).
+    delete statePatch.scheduleActivatedAtMs;
+    job.state = { ...job.state, ...statePatch };
   }
   if ("agentId" in patch) {
     job.agentId = normalizeOptionalAgentId((patch as { agentId?: unknown }).agentId);
diff --git a/src/cron/types.ts b/src/cron/types.ts
@@ -343,9 +343,11 @@ export type CronStoreFile = {
   jobs: CronJob[];
 };
 
+type CronJobCallerState = Omit<CronJobState, "scheduleActivatedAtMs">;
+
 /** Create input accepted by cron APIs before id/timestamps/state are assigned. */
 export type CronJobCreate = Omit<CronJob, "id" | "createdAtMs" | "updatedAtMs" | "state"> & {
-  state?: Partial<CronJobState>;
+  state?: Partial<CronJobCallerState>;
 };
 
 /** Patch input accepted by cron APIs without allowing immutable identity fields. */
@@ -354,5 +356,5 @@ export type CronJobPatch = Partial<
 > & {
   payload?: CronPayloadPatch;
   delivery?: CronDeliveryPatch;
-  state?: Partial<CronJobState>;
+  state?: Partial<CronJobCallerState>;
 };
