fix(cron): skip completed restart catchup slots

LiLan0125 · LiLan0125 · commit 5870f97ec24c · 2026-07-08T11:37:16.000+08:00
Closes #101988
diff --git a/src/cron/service.restart-catchup.test.ts b/src/cron/service.restart-catchup.test.ts
@@ -270,6 +270,60 @@ describe("CronService restart catch-up", () => {
     }
   });
 
+  it("does not defer an isolated cron agent-turn whose persisted due slot already succeeded", async () => {
+    const store = await makeStorePath();
+    const startNow = Date.parse("2025-12-13T11:00:00.000Z");
+    const dueAt = Date.parse("2025-12-13T09:10:00.000Z");
+    const completedAt = Date.parse("2025-12-13T09:10:30.000Z");
+    const runIsolatedAgentJob = vi.fn(async () => ({ status: "ok" as const }));
+    const enqueueSystemEvent = vi.fn();
+    const requestHeartbeat = vi.fn();
+
+    await writeStoreJobs(store.storePath, [
+      {
+        id: "startup-isolated-agent-already-ok",
+        name: "startup isolated agent already ok",
+        enabled: true,
+        createdAtMs: Date.parse("2025-12-10T12:00:00.000Z"),
+        updatedAtMs: completedAt,
+        schedule: { kind: "cron", expr: "10 9 * * *", tz: "UTC" },
+        sessionTarget: "isolated",
+        wakeMode: "next-heartbeat",
+        payload: { kind: "agentTurn", message: "daily reminder" },
+        state: {
+          nextRunAtMs: dueAt,
+          lastRunAtMs: completedAt,
+          lastRunStatus: "ok",
+        },
+      },
+    ]);
+
+    const cron = createRestartCronService({
+      storePath: store.storePath,
+      enqueueSystemEvent,
+      requestHeartbeat,
+      runIsolatedAgentJob,
+      nowMs: () => startNow,
+      startupDeferredMissedAgentJobDelayMs: 120_000,
+    });
+
+    try {
+      await cron.start();
+
+      expect(runIsolatedAgentJob).not.toHaveBeenCalled();
+      expect(enqueueSystemEvent).not.toHaveBeenCalled();
+      expect(requestHeartbeat).not.toHaveBeenCalled();
+
+      const listedJobs = await cron.list({ includeDisabled: true });
+      const updated = listedJobs.find((job) => job.id === "startup-isolated-agent-already-ok");
+      expect(updated?.state.lastRunStatus).toBe("ok");
+      expect(updated?.state.nextRunAtMs).toBe(Date.parse("2025-12-14T09:10:00.000Z"));
+    } finally {
+      cron.stop();
+      await store.cleanup();
+    }
+  });
+
   it("marks interrupted recurring jobs failed instead of replaying them on startup", async () => {
     const dueAt = Date.parse("2025-12-13T16:00:00.000Z");
     const staleRunningAt = Date.parse("2025-12-13T16:30:00.000Z");
diff --git a/src/cron/service/timer.ts b/src/cron/service/timer.ts
@@ -1640,7 +1640,19 @@ function isRunnableJob(params: {
     return false;
   }
   if (hasScheduledNextRunAtMs(next) && nowMs >= next) {
-    return true;
+    // Startup loads persisted state before maintenance recompute; an `ok`
+    // run that already covered this stale due slot must fall through to the
+    // previous-slot guard so restart catch-up does not duplicate it.
+    const alreadyCompletedDueCronSlot =
+      params.allowCronMissedRunByLastRun &&
+      job.schedule.kind === "cron" &&
+      lastRunStatus === "ok" &&
+      typeof job.state.lastRunAtMs === "number" &&
+      Number.isFinite(job.state.lastRunAtMs) &&
+      job.state.lastRunAtMs >= next;
+    if (!alreadyCompletedDueCronSlot) {
+      return true;
+    }
   }
   if (!params.allowCronMissedRunByLastRun || job.schedule.kind !== "cron") {
     return false;
