fix(admin): count skipped tasks as success

Author: RavelloH

src/components/dashboard/scheduled-tasks-client.tsx

@@ -537,12 +537,6 @@ function ScheduledTaskRunsTable({
                               {numberFormat(locale, run.runningCount)}
                             </span>
                           ) : null}
-                          {run.skippedCount > 0 ? (
-                            <span className="font-mono text-muted-foreground">
-                              {labels.status.skipped}:
-                              {numberFormat(locale, run.skippedCount)}
-                            </span>
-                          ) : null}
                         </div>
                       </TableCell>
                       <TableCell className="text-right font-mono">

src/lib/edge/__tests__/scheduled-tasks.test.ts

@@ -106,6 +106,10 @@ function createEnv() {
   };
 }
 
+function scheduledGroupId(timestamp: number): string {
+  return `cron:${timestamp}:${Math.trunc(timestamp / (10 * 60 * 1000))}`;
+}
+
 describe("scheduled task runner and admin API", () => {
   it("records successful runs and exposes logs through the admin API", async () => {
     const { env, d1 } = createEnv();
@@ -220,7 +224,7 @@ describe("scheduled task runner and admin API", () => {
 
     expect(response.status).toBe(200);
     expect(payload.runs.map((run) => run.id)).toEqual(
-      [5, 6, 7, 8, 9].map((index) => `cron:${now - index * 60_000}`),
+      [5, 6, 7, 8, 9].map((index) => scheduledGroupId(now - index * 60_000)),
     );
     expect(payload.runsMeta).toEqual({
       page: 2,
@@ -229,11 +233,75 @@ describe("scheduled task runner and admin API", () => {
       hasMore: true,
       nextPage: 3,
     });
-    expect(payload.selectedRun?.id).toBe(`cron:${now - 10 * 60_000}`);
+    expect(payload.selectedRun?.id).toBe(scheduledGroupId(now - 10 * 60_000));
     expect(payload.selectedRun?.runs[0]?.id).toBe("run-10");
     d1.close();
   });
 
+  it("counts skipped runs as successful in run groups", async () => {
+    const { env, d1 } = createEnv();
+    const now = Date.now();
+    const scheduledAt = now - 60_000;
+    const expiresAt = Math.floor((now + 30 * 24 * 60 * 60 * 1000) / 1000);
+
+    for (const [index, status] of ["success", "skipped"].entries()) {
+      d1.db
+        .prepare(
+          `
+            INSERT INTO scheduled_task_runs (
+              id,
+              invocation_id,
+              task_key,
+              task_name,
+              trigger_type,
+              status,
+              scheduled_at_ms,
+              started_at_ms,
+              finished_at_ms,
+              duration_ms,
+              summary_json,
+              created_at,
+              expires_at
+            )
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+          `,
+        )
+        .run(
+          `run-${index}`,
+          `invocation-${index}`,
+          index === 0 ? "notification_tick" : "visit_hourly_rollup",
+          index === 0 ? "Notification dispatch" : "Hourly visit aggregation",
+          "cron",
+          status,
+          scheduledAt,
+          scheduledAt + index * 1_000,
+          scheduledAt + index * 1_000 + 250,
+          250,
+          "{}",
+          Math.floor(now / 1000),
+          expiresAt,
+        );
+    }
+
+    const response = await handleScheduledTasksAdmin(
+      new Request("https://edge.test/api/private/admin/scheduled-tasks"),
+      env,
+      new URL("https://edge.test/api/private/admin/scheduled-tasks"),
+      async () => ({ isAdmin: true }),
+    );
+    const payload = (await response.json()) as ScheduledTasksData;
+
+    expect(response.status).toBe(200);
+    expect(payload.runs[0]).toMatchObject({
+      status: "success",
+      taskCount: 2,
+      successCount: 2,
+      skippedCount: 1,
+    });
+    expect(payload.health.successRate24h).toBe(1);
+    d1.close();
+  });
+
   it("marks failed runs when the handler throws", async () => {
     const { env, d1 } = createEnv();
 

src/lib/edge/admin-scheduled-tasks.ts

@@ -292,7 +292,7 @@ function runGroupSelectSql(whereClause: string): string {
           ELSE MAX(finished_at_ms)
         END AS finishedAt,
         COUNT(*) AS taskCount,
-        SUM(CASE WHEN status = 'success' THEN 1 ELSE 0 END) AS successCount,
+        SUM(CASE WHEN status IN ('success', 'skipped') THEN 1 ELSE 0 END) AS successCount,
         SUM(CASE WHEN status = 'partial' THEN 1 ELSE 0 END) AS partialCount,
         SUM(CASE WHEN status = 'failed' THEN 1 ELSE 0 END) AS failedCount,
         SUM(CASE WHEN status = 'skipped' THEN 1 ELSE 0 END) AS skippedCount,
@@ -308,8 +308,6 @@ function runGroupSelectSql(whereClause: string): string {
           WHEN failedCount > 0 THEN 'failed'
           WHEN runningCount > 0 THEN 'running'
           WHEN partialCount > 0 THEN 'partial'
-          WHEN successCount > 0 AND skippedCount > 0 THEN 'partial'
-          WHEN skippedCount = taskCount THEN 'skipped'
           ELSE 'success'
         END AS status
       FROM grouped
@@ -400,7 +398,7 @@ export async function handleScheduledTasksAdmin(
           SUM(CASE WHEN status = 'partial' THEN 1 ELSE 0 END) AS partialRuns24h,
           SUM(CASE WHEN status = 'running' THEN 1 ELSE 0 END) AS runningRuns,
           SUM(CASE WHEN status = 'running' AND started_at_ms < ? THEN 1 ELSE 0 END) AS staleRunningRuns,
-          SUM(CASE WHEN status = 'success' THEN 1 ELSE 0 END) AS successRuns24h,
+          SUM(CASE WHEN status IN ('success', 'skipped') THEN 1 ELSE 0 END) AS successRuns24h,
           MAX(started_at_ms) AS lastRunAt
         FROM scheduled_task_runs
         WHERE started_at_ms >= ?
@@ -413,7 +411,7 @@ export async function handleScheduledTasksAdmin(
         SELECT
           task_key AS taskKey,
           COUNT(*) AS runs30d,
-          SUM(CASE WHEN status = 'success' THEN 1 ELSE 0 END) AS success30d,
+          SUM(CASE WHEN status IN ('success', 'skipped') THEN 1 ELSE 0 END) AS success30d,
           SUM(CASE WHEN status = 'partial' THEN 1 ELSE 0 END) AS partial30d,
           SUM(CASE WHEN status = 'failed' THEN 1 ELSE 0 END) AS failed30d,
           SUM(CASE WHEN status = 'skipped' THEN 1 ELSE 0 END) AS skipped30d,