@smthrs/engine-store 1.0.0-rc.7 → 1.0.0-rc.8

package/dist/cjs/internal/ActionPersistence.js

@@ -598,7 +598,10 @@ const make = (deps) => {
           }
         }
       });
-      return yield* admission.withPermit(`${deps.runId}|${stepKeyDigest}`)(
+      const exclusive = (effect) => admission.withPermit(`run:${deps.runId}|${stepKeyDigest}`)(
+        cacheDeclaration._tag === "Eligible" ? admission.withPermit(`cache:${keyDigest}`)(effect) : effect
+      );
+      return yield* exclusive(
         Effect.gen(function* () {
           const attemptSource = (record) => ({
             runId: deps.runId,
@@ -731,6 +734,7 @@ const make = (deps) => {
             return Option.none();
           });
           const existing = yield* attempts.get(attemptId);
+          const orphaned = Option.isSome(existing) && existing.value.state === "running" && decodeMeta(existing.value.meta)?.effectCrossing !== "succeeded" ? existing.value : void 0;
           if (cacheDeclaration._tag === "Eligible") {
             const observed = yield* cache.get(keyDigest).pipe(
               Effect.catch(
@@ -761,7 +765,7 @@ const make = (deps) => {
                   }
                 ));
               }
-              if (candidate._tag === "CandidateEvidence" && Option.isNone(existing)) {
+              if (candidate._tag === "CandidateEvidence" && (Option.isNone(existing) || orphaned !== void 0)) {
                 const boundary2 = yield* StepBoundary.StepBoundary;
                 const measured = yield* boundary2.prepare(cacheDeclaration.metadata).pipe(Effect.option);
                 const verified = Option.isSome(measured) && StepBoundary.readSetMatches(measured.value);
@@ -784,6 +788,27 @@ const make = (deps) => {
                       recordedRunId: cached.value.recordedRunId,
                       recordedEventSeq: cached.value.recordedEventSeq
                     }));
+                    if (orphaned !== void 0) {
+                      const finishedAtMs2 = yield* Clock.currentTimeMillis.pipe(Effect.map(Math.floor));
+                      const settled2 = yield* settleAttempt({
+                        ...attemptId,
+                        state: "succeeded",
+                        finishedAtMs: finishedAtMs2,
+                        outcome: attemptPayload(cached.value.result),
+                        meta: attemptPayload(
+                          {
+                            ...decodeMeta(orphaned.meta),
+                            ...declarationMeta,
+                            admittedBy: deps.owner
+                          }
+                        )
+                      }, [
+                        JournalRecords.attemptFinished(attemptSource("finished"), { ...attemptId, state: "succeeded" })
+                      ]);
+                      if (!settled2) {
+                        return yield* Effect.interrupt;
+                      }
+                    }
                     yield* Metric.update(EngineStoreMetrics.stepCacheDecision.VerifiedHit, 1);
                     yield* import_flow.Action.reportDispatch({
                       outcome: "replayed",