@cronwatch/sdk 0.14.1 → 0.14.2

package/dist/index.cjs

@@ -722,7 +722,7 @@ function onCheck(def, stored, lastRun, state, now) {
   return { state: next, alerts, nextExpectedAt, dueAt: exp.dueAt };
 }
 function isStuck(def, run, now) {
-  return run.status === "running" && now - run.startedAt > timeoutMs(def);
+  return run.status === "running" && run.finishedAt === null && now - run.startedAt > timeoutMs(def);
 }
 function muteOpens(previous, next) {
   const muted = cloneState(next);
@@ -1218,7 +1218,7 @@ function staticAsset(path, base) {
 }
 
 // src/version.ts
-var VERSION = "0.14.1";
+var VERSION = "0.14.2";
 var API_VERSION = 1;
 
 // src/routes/timeline.ts
@@ -3148,17 +3148,16 @@ ${id}`;
     const definition = toStored(declared);
     const stored = await this.store.getRun(run.id);
     if (stored) return this.recordOver(definition, stored, run, evaluate);
+    const inserted = evaluate ? { ...run, status: "running" } : run;
     try {
-      await this.store.insertRun(run);
+      await this.store.insertRun(inserted);
     } catch (e) {
       const again = await this.store.getRun(run.id).catch(() => null);
       if (again) return this.recordOver(definition, again, run, evaluate);
       throw e;
     }
     if (!evaluate) return [];
-    await this.updateState(run.job, (before) => ({ state: holdRun(onRunStart(definition, run, before, this.now()), run.id), result: void 0 }));
-    if (run.status === "running") return [];
-    return this.finishRun(definition, run, this.now(), true);
+    return this.recordOver(definition, inserted, run, true);
   }
   /** recordRun() for a run already stored. */
   async recordOver(definition, stored, run, evaluate) {
@@ -3166,7 +3165,15 @@ ${id}`;
       this.report(new Error(`run ${run.id} of ${run.job} belongs to job "${stored.job}"; ignored`), `recording ${run.job}`);
       return [];
     }
-    if (stored.status !== "running" && stored.status !== "timeout" || run.status === "running") return [];
+    if (stored.status !== "running" && stored.status !== "timeout") return [];
+    if (evaluate && stored.status === "running") {
+      await this.updateState(run.job, async (before) => {
+        const current = await this.store.getRun(run.id);
+        if (!current || current.job !== run.job || current.status !== "running" || before.pendingRuns?.includes(run.id)) return { state: before, result: void 0 };
+        return { state: holdRun(onRunStart(definition, run, before, this.now()), run.id), result: void 0 };
+      });
+    }
+    if (run.status === "running") return [];
     const tracked = (await this.readState(run.job)).pendingRuns?.includes(run.id) ?? false;
     const claim = await this.claimFinish(run);
     if ("ignored" in claim) {