@rivetkit/workflow-engine 2.3.0-rc.9 → 2.3.1

package/dist/tsup/{chunk-CIDHCIH7.js → chunk-KA2T56AJ.js}

@@ -1664,30 +1664,6 @@ function setEntry(storage, location, entry) {
   storage.history.entries.set(key, entry);
 }
 
-// src/utils.ts
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-var TIMEOUT_MAX = 2147483647;
-function setLongTimeout(listener, after) {
-  let timeout;
-  function start(remaining) {
-    if (remaining <= TIMEOUT_MAX) {
-      timeout = setTimeout(listener, remaining);
-    } else {
-      timeout = setTimeout(() => {
-        start(remaining - TIMEOUT_MAX);
-      }, TIMEOUT_MAX);
-    }
-  }
-  start(after);
-  return {
-    abort: () => {
-      if (timeout !== void 0) clearTimeout(timeout);
-    }
-  };
-}
-
 // src/context.ts
 var DEFAULT_MAX_RETRIES = 3;
 var DEFAULT_RETRY_BACKOFF_BASE = 100;
@@ -1963,7 +1939,7 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
    * Throws HistoryDivergedError if duplicate detected.
    */
   checkDuplicateName(name) {
-    const fullKey = locationToKey(this.storage, this.currentLocation) + "/" + name;
+    const fullKey = `${locationToKey(this.storage, this.currentLocation)}/${name}`;
     if (this.usedNamesInExecution.has(fullKey)) {
       throw new HistoryDivergedError(
         `Duplicate entry name "${name}" at location "${locationToKey(this.storage, this.currentLocation)}". Each step/loop/sleep/queue.next/join/race must have a unique name within its scope.`
@@ -2017,7 +1993,7 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
   validateComplete() {
     const prefix = locationToKey(this.storage, this.currentLocation);
     for (const key of this.storage.history.entries.keys()) {
-      const isUnderPrefix = prefix === "" ? true : key.startsWith(prefix + "/") || key === prefix;
+      const isUnderPrefix = prefix === "" ? true : key.startsWith(`${prefix}/`) || key === prefix;
       if (isUnderPrefix) {
         if (!this.visitedKeys.has(key)) {
           throw new HistoryDivergedError(
@@ -2034,25 +2010,33 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
     this.abortController.abort(new EvictedError());
   }
   /**
-   * Wait for eviction message.
-   *
-   * The event listener uses { once: true } to auto-remove after firing,
-   * preventing memory leaks if this method is called multiple times.
+   * Wait for `ms`, rejecting early with EvictedError if the workflow is
+   * evicted. Both the timer and the abort listener are torn down on either
+   * outcome, so a completed sleep never leaves a dangling listener on the
+   * long-lived run abort signal.
    */
-  waitForEviction() {
-    return new Promise((_, reject) => {
-      if (this.abortSignal.aborted) {
-        reject(new EvictedError());
-        return;
+  async sleepOrEvict(ms) {
+    if (this.abortSignal.aborted) {
+      throw new EvictedError();
+    }
+    let timer;
+    let onAbort;
+    try {
+      await new Promise((resolve, reject) => {
+        timer = setTimeout(resolve, ms);
+        onAbort = () => reject(new EvictedError());
+        this.abortSignal.addEventListener("abort", onAbort, {
+          once: true
+        });
+      });
+    } finally {
+      if (timer !== void 0) {
+        clearTimeout(timer);
       }
-      this.abortSignal.addEventListener(
-        "abort",
-        () => {
-          reject(new EvictedError());
-        },
-        { once: true }
-      );
-    });
+      if (onAbort) {
+        this.abortSignal.removeEventListener("abort", onAbort);
+      }
+    }
   }
   // === Step ===
   async step(nameOrConfig, run) {
@@ -2201,7 +2185,7 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
       }
       const maxRetries2 = config2.maxRetries ?? DEFAULT_MAX_RETRIES;
       if (metadata2.attempts > maxRetries2) {
-        const lastError = stepData.error ?? metadata2.error;
+        const lastError = metadata2.error;
         const exhaustedError = new StepExhaustedError(
           config2.name,
           lastError
@@ -2290,14 +2274,13 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
       });
       return output;
     } catch (error) {
-      if (error instanceof StepTimeoutError) {
-        if (entry.kind.type === "step") {
-          entry.kind.data.error = String(error);
-        }
-        entry.dirty = true;
+      if (entry.kind.type === "step") {
+        entry.kind.data.error = String(error);
+      }
+      entry.dirty = true;
+      if (error instanceof StepTimeoutError && !config2.retryOnTimeout) {
         metadata.status = "exhausted";
         metadata.error = String(error);
-        await this.flushStorage();
         await this.notifyStepError(config2, metadata.attempts, error, {
           willRetry: false
         });
@@ -2311,13 +2294,8 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
         );
       }
       if (error instanceof CriticalError || error instanceof RollbackError) {
-        if (entry.kind.type === "step") {
-          entry.kind.data.error = String(error);
-        }
-        entry.dirty = true;
         metadata.status = "exhausted";
         metadata.error = String(error);
-        await this.flushStorage();
         await this.notifyStepError(config2, metadata.attempts, error, {
           willRetry: false
         });
@@ -2330,14 +2308,9 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
           })
         );
       }
-      if (entry.kind.type === "step") {
-        entry.kind.data.error = String(error);
-      }
-      entry.dirty = true;
       const willRetry = metadata.attempts <= maxRetries;
       metadata.status = willRetry ? "failed" : "exhausted";
       metadata.error = String(error);
-      await this.flushStorage();
       if (willRetry) {
         const retryDelay = calculateBackoff(
           metadata.attempts,
@@ -2361,7 +2334,7 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
         attachTryStepFailure(
           new StepExhaustedError(config2.name, String(error)),
           {
-            kind: "exhausted",
+            kind: error instanceof StepTimeoutError ? "timeout" : "exhausted",
             stepName: config2.name,
             attempts: metadata.attempts,
             error: extractErrorInfo(error)
@@ -2379,7 +2352,9 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
   	 *
   	 * Note: This does NOT cancel the underlying operation. JavaScript Promises
   	 * cannot be cancelled once started. When a timeout occurs:
-  	 * - The step is marked as failed with StepTimeoutError
+  	 * - The step is rejected with StepTimeoutError. By default this is treated
+  	 *   as a critical failure with no retry. Set retryOnTimeout: true on the
+  	 *   step config to retry timeouts like any other error.
   	 * - The underlying async operation continues running in the background
   	 * - Any side effects from the operation may still occur
   	 *
@@ -2704,7 +2679,7 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
       return;
     }
     if (remaining < this.driver.workerPollInterval) {
-      await Promise.race([sleep(remaining), this.waitForEviction()]);
+      await this.sleepOrEvict(remaining);
       this.checkEvicted();
       if (entry.kind.type === "sleep") {
         entry.kind.data.state = "completed";
@@ -3515,6 +3490,30 @@ var WorkflowContextImpl = class _WorkflowContextImpl {
   }
 };
 
+// src/utils.ts
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+var TIMEOUT_MAX = 2147483647;
+function setLongTimeout(listener, after) {
+  let timeout;
+  function start(remaining) {
+    if (remaining <= TIMEOUT_MAX) {
+      timeout = setTimeout(listener, remaining);
+    } else {
+      timeout = setTimeout(() => {
+        start(remaining - TIMEOUT_MAX);
+      }, TIMEOUT_MAX);
+    }
+  }
+  start(after);
+  return {
+    abort: () => {
+      if (timeout !== void 0) clearTimeout(timeout);
+    }
+  };
+}
+
 // src/index.ts
 var Loop = {
   continue: (state) => ({
@@ -3738,25 +3737,41 @@ async function executeLiveWorkflow(workflowId, workflowFn, input, driver, messag
     const hasMessages = result.waitingForMessages !== void 0;
     const hasDeadline = result.sleepUntil !== void 0;
     if (hasMessages && hasDeadline) {
+      const iterationAbort = new AbortController();
+      const onRunAbort = () => iterationAbort.abort();
+      if (abortController.signal.aborted) {
+        iterationAbort.abort();
+      } else {
+        abortController.signal.addEventListener("abort", onRunAbort, {
+          once: true
+        });
+      }
+      const messagePromise = awaitWithEviction(
+        driver.waitForMessages(
+          result.waitingForMessages,
+          iterationAbort.signal
+        ),
+        iterationAbort.signal
+      );
+      const sleepPromise = waitForSleep(
+        runtime,
+        result.sleepUntil,
+        iterationAbort.signal
+      );
+      messagePromise.catch(() => {
+      });
+      sleepPromise.catch(() => {
+      });
       try {
-        const messagePromise = awaitWithEviction(
-          driver.waitForMessages(
-            result.waitingForMessages,
-            abortController.signal
-          ),
-          abortController.signal
-        );
-        const sleepPromise = waitForSleep(
-          runtime,
-          result.sleepUntil,
-          abortController.signal
-        );
         await Promise.race([messagePromise, sleepPromise]);
       } catch (error) {
         if (error instanceof EvictedError) {
           return lastResult;
         }
         throw error;
+      } finally {
+        iterationAbort.abort();
+        abortController.signal.removeEventListener("abort", onRunAbort);
       }
       continue;
     }
@@ -4199,15 +4214,15 @@ export {
   deleteEntriesWithPrefix,
   getEntry,
   setEntry,
-  sleep,
   DEFAULT_MAX_RETRIES,
   DEFAULT_RETRY_BACKOFF_BASE,
   DEFAULT_RETRY_BACKOFF_MAX,
   DEFAULT_LOOP_HISTORY_PRUNE_INTERVAL,
   DEFAULT_STEP_TIMEOUT,
   WorkflowContextImpl,
+  sleep,
   Loop,
   runWorkflow,
   replayWorkflowFromStep
 };
-//# sourceMappingURL=chunk-CIDHCIH7.js.map
+//# sourceMappingURL=chunk-KA2T56AJ.js.map