@upstash/workflow 0.2.21 → 0.2.22

package/README.md

@@ -83,6 +83,15 @@ waiting for an event or get the workflows waiting for an event:
 import { Client } from "@upstash/workflow";
 const client = new Client({ token: "<QSTASH_TOKEN>" });
 
+// trigger a workflow
+const { workflowRunId } = await client.trigger({
+  url: "https://workflow-endpoint.com",
+  body: "hello there!",         // Optional body
+  headers: { ... },             // Optional headers
+  workflowRunId: "my-workflow", // Optional workflow run ID
+  retries: 3                    // Optional retries for the initial request
+});
+
 // cancel workflow:
 await client.cancel({ workflowRunId: "<WORKFLOW_RUN_ID>" });
 
@@ -98,6 +107,36 @@ const result = await client.getWaiters({
 });
 ```
 
+## Telemetry
+
+This sdk sends anonymous telemetry headers to help us improve your experience.
+We collect the following:
+
+- SDK version
+- Platform (Cloudflare, AWS or Vercel)
+- Runtime version (node@18.x)
+
+You can opt out by setting `disableTelemetry: true` when triggering the workflow and in the serve options:
+
+```ts
+// client
+const client = new Client(/***/);
+await client.trigger({
+  // ...
+  disableTelemetry: true,
+});
+
+// workflow endpoint
+export const { POST } = serve(
+  async (context) => {
+    // ...
+  },
+  {
+    disableTelemetry: true,
+  }
+);
+```
+
 ## Contributing
 
 ### Setup

package/astro.d.mts

@@ -1,6 +1,6 @@
 import { APIContext, APIRoute } from 'astro';
-import { g as WorkflowContext, n as PublicServeOptions, y as InvokableWorkflow } from './types-Q3dM0UlR.mjs';
-import { s as serveManyBase } from './serve-many-BNusWYgt.mjs';
+import { h as WorkflowContext, o as PublicServeOptions, z as InvokableWorkflow } from './types-9nCq6bRP.mjs';
+import { s as serveManyBase } from './serve-many-CctdYIfB.mjs';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';

package/astro.d.ts

@@ -1,6 +1,6 @@
 import { APIContext, APIRoute } from 'astro';
-import { g as WorkflowContext, n as PublicServeOptions, y as InvokableWorkflow } from './types-Q3dM0UlR.js';
-import { s as serveManyBase } from './serve-many-CXqQP3RI.js';
+import { h as WorkflowContext, o as PublicServeOptions, z as InvokableWorkflow } from './types-9nCq6bRP.js';
+import { s as serveManyBase } from './serve-many-BXDr30rl.js';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';

package/astro.js

@@ -27,7 +27,95 @@ __export(astro_exports, {
 module.exports = __toCommonJS(astro_exports);
 
 // src/client/utils.ts
+var import_qstash2 = require("@upstash/qstash");
+
+// src/error.ts
 var import_qstash = require("@upstash/qstash");
+var WorkflowError = class extends import_qstash.QstashError {
+  constructor(message) {
+    super(message);
+    this.name = "WorkflowError";
+  }
+};
+var WorkflowAbort = class extends Error {
+  stepInfo;
+  stepName;
+  /**
+   * whether workflow is to be canceled on abort
+   */
+  cancelWorkflow;
+  /**
+   *
+   * @param stepName name of the aborting step
+   * @param stepInfo step information
+   * @param cancelWorkflow
+   */
+  constructor(stepName, stepInfo, cancelWorkflow = false) {
+    super(
+      `This is an Upstash Workflow error thrown after a step executes. It is expected to be raised. Make sure that you await for each step. Also, if you are using try/catch blocks, you should not wrap context.run/sleep/sleepUntil/call methods with try/catch. Aborting workflow after executing step '${stepName}'.`
+    );
+    this.name = "WorkflowAbort";
+    this.stepName = stepName;
+    this.stepInfo = stepInfo;
+    this.cancelWorkflow = cancelWorkflow;
+  }
+};
+var WorkflowNonRetryableError = class extends WorkflowAbort {
+  /**
+   * @param message error message to be displayed
+   */
+  constructor(message) {
+    super("fail", void 0, false);
+    this.name = "WorkflowNonRetryableError";
+    if (message) this.message = message;
+  }
+};
+var WorkflowRetryAfterError = class extends WorkflowAbort {
+  retryAfter;
+  /**
+   * @param retryAfter time in seconds after which the workflow should be retried
+   * @param message error message to be displayed
+   */
+  constructor(message, retryAfter) {
+    super("retry", void 0, false);
+    this.name = "WorkflowRetryAfterError";
+    this.retryAfter = retryAfter;
+    if (message) this.message = message;
+  }
+};
+var formatWorkflowError = (error) => {
+  return error instanceof Error ? {
+    error: error.name,
+    message: error.message,
+    stack: error.stack
+  } : {
+    error: "Error",
+    message: `An error occured while executing workflow: '${typeof error === "string" ? error : JSON.stringify(error)}'`
+  };
+};
+function getConstructorName(obj) {
+  if (obj === null || obj === void 0) {
+    return null;
+  }
+  const ctor = obj.constructor;
+  if (!ctor || ctor.name === "Object") {
+    return null;
+  }
+  return ctor.name;
+}
+function getConstructorNames(obj) {
+  const proto = Object.getPrototypeOf(obj);
+  const name = getConstructorName(proto);
+  if (name === null) {
+    return [];
+  }
+  return [name, ...getConstructorNames(proto)];
+}
+function isInstanceOf(v, ctor) {
+  return getConstructorNames(v).includes(ctor.name);
+}
+
+// src/client/utils.ts
 var makeNotifyRequest = async (requester, eventId, eventData) => {
   const result = await requester.request({
     path: ["v2", "notify", eventId],
@@ -67,7 +155,7 @@ var getSteps = async (requester, workflowRunId, messageId, debug) => {
       return { steps: filteredSteps, workflowRunEnded: false };
     }
   } catch (error) {
-    if (error instanceof import_qstash.QstashError && error.status === 404) {
+    if (isInstanceOf(error, import_qstash2.QstashError) && error.status === 404) {
       await debug?.log("WARN", "ENDPOINT_START", {
         message: "Couldn't fetch workflow run steps. This can happen if the workflow run succesfully ends before some callback is executed.",
         error
@@ -92,65 +180,13 @@ var WORKFLOW_PROTOCOL_VERSION_HEADER = "Upstash-Workflow-Sdk-Version";
 var DEFAULT_CONTENT_TYPE = "application/json";
 var NO_CONCURRENCY = 1;
 var DEFAULT_RETRIES = 3;
-var VERSION = "v0.2.21";
+var VERSION = "v0.2.22";
 var SDK_TELEMETRY = `@upstash/workflow@${VERSION}`;
 var TELEMETRY_HEADER_SDK = "Upstash-Telemetry-Sdk";
 var TELEMETRY_HEADER_FRAMEWORK = "Upstash-Telemetry-Framework";
 var TELEMETRY_HEADER_RUNTIME = "Upstash-Telemetry-Runtime";
 var TELEMETRY_HEADER_AGENT = "Upstash-Telemetry-Agent";
 
-// src/error.ts
-var import_qstash2 = require("@upstash/qstash");
-var WorkflowError = class extends import_qstash2.QstashError {
-  constructor(message) {
-    super(message);
-    this.name = "WorkflowError";
-  }
-};
-var WorkflowAbort = class extends Error {
-  stepInfo;
-  stepName;
-  /**
-   * whether workflow is to be canceled on abort
-   */
-  cancelWorkflow;
-  /**
-   *
-   * @param stepName name of the aborting step
-   * @param stepInfo step information
-   * @param cancelWorkflow
-   */
-  constructor(stepName, stepInfo, cancelWorkflow = false) {
-    super(
-      `This is an Upstash Workflow error thrown after a step executes. It is expected to be raised. Make sure that you await for each step. Also, if you are using try/catch blocks, you should not wrap context.run/sleep/sleepUntil/call methods with try/catch. Aborting workflow after executing step '${stepName}'.`
-    );
-    this.name = "WorkflowAbort";
-    this.stepName = stepName;
-    this.stepInfo = stepInfo;
-    this.cancelWorkflow = cancelWorkflow;
-  }
-};
-var WorkflowNonRetryableError = class extends WorkflowAbort {
-  /**
-   * @param message error message to be displayed
-   */
-  constructor(message) {
-    super("fail", void 0, false);
-    this.name = "WorkflowNonRetryableError";
-    if (message) this.message = message;
-  }
-};
-var formatWorkflowError = (error) => {
-  return error instanceof Error ? {
-    error: error.name,
-    message: error.message,
-    stack: error.stack
-  } : {
-    error: "Error",
-    message: `An error occured while executing workflow: '${typeof error === "string" ? error : JSON.stringify(error)}'`
-  };
-};
-
 // src/context/auto-executor.ts
 var import_qstash5 = require("@upstash/qstash");
 
@@ -710,17 +746,17 @@ var triggerRouteFunction = async ({
     return ok("workflow-finished");
   } catch (error) {
     const error_ = error;
-    if (error instanceof import_qstash3.QstashError && error.status === 400) {
+    if (isInstanceOf(error, import_qstash3.QstashError) && error.status === 400) {
       await debug?.log("WARN", "RESPONSE_WORKFLOW", {
         message: `tried to append to a cancelled workflow. exiting without publishing.`,
         name: error.name,
         errorMessage: error.message
       });
       return ok("workflow-was-finished");
-    } else if (!(error_ instanceof WorkflowAbort)) {
-      return err(error_);
-    } else if (error_ instanceof WorkflowNonRetryableError) {
+    } else if (isInstanceOf(error_, WorkflowNonRetryableError) || isInstanceOf(error_, WorkflowRetryAfterError)) {
       return ok(error_);
+    } else if (!isInstanceOf(error_, WorkflowAbort)) {
+      return err(error_);
     } else if (error_.cancelWorkflow) {
       await onCancel();
       return ok("workflow-finished");
@@ -2027,7 +2063,7 @@ var AutoExecutor = class _AutoExecutor {
           });
           throw new WorkflowAbort(parallelStep.stepName, resultStep);
         } catch (error) {
-          if (error instanceof WorkflowAbort || error instanceof import_qstash5.QstashError && error.status === 400) {
+          if (isInstanceOf(error, WorkflowAbort) || isInstanceOf(error, import_qstash5.QstashError) && error.status === 400) {
             throw error;
           }
           throw new WorkflowError(
@@ -2134,7 +2170,7 @@ var validateParallelSteps = (lazySteps, stepsFromRequest) => {
       validateStep(lazySteps[index], stepFromRequest);
     }
   } catch (error) {
-    if (error instanceof WorkflowError) {
+    if (isInstanceOf(error, WorkflowError)) {
       const lazyStepNames = lazySteps.map((lazyStep) => lazyStep.stepName);
       const lazyStepTypes = lazySteps.map((lazyStep) => lazyStep.stepType);
       const requestStepNames = stepsFromRequest.map((step) => step.stepName);
@@ -2315,7 +2351,7 @@ var fetchWithContextCall = async (context, agentCallParams, ...params) => {
       headers: responseHeaders
     });
   } catch (error) {
-    if (error instanceof Error && error.name === "WorkflowAbort") {
+    if (error instanceof Error && isInstanceOf(error, WorkflowAbort)) {
       throw error;
     } else {
       console.error("Error in fetch implementation:", error);
@@ -2417,10 +2453,10 @@ var Agent = class {
       });
       return { text: result.text };
     } catch (error) {
-      if (error instanceof import_ai2.ToolExecutionError) {
-        if (error.cause instanceof Error && error.cause.name === "WorkflowAbort") {
+      if (isInstanceOf(error, import_ai2.ToolExecutionError)) {
+        if (error.cause instanceof Error && isInstanceOf(error.cause, WorkflowAbort)) {
           throw error.cause;
-        } else if (error.cause instanceof import_ai2.ToolExecutionError && error.cause.cause instanceof Error && error.cause.cause.name === "WorkflowAbort") {
+        } else if (isInstanceOf(error.cause, import_ai2.ToolExecutionError) && isInstanceOf(error.cause.cause, WorkflowAbort)) {
           throw error.cause.cause;
         } else {
           throw error;
@@ -3169,7 +3205,7 @@ var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowCon
     try {
       await routeFunction(disabledContext);
     } catch (error) {
-      if (error instanceof WorkflowAbort && error.stepName === this.disabledMessage || error instanceof WorkflowNonRetryableError) {
+      if (isInstanceOf(error, WorkflowAbort) && error.stepName === this.disabledMessage || isInstanceOf(error, WorkflowNonRetryableError) || isInstanceOf(error, WorkflowRetryAfterError)) {
         return ok("step-found");
       }
       console.warn(
@@ -3422,13 +3458,24 @@ var processOptions = (options) => {
           },
           status: 489
         });
-      } else if (detailedFinishCondition?.condition === "failure-callback") {
-        return new Response(detailedFinishCondition.result ?? void 0, {
-          status: 200,
+      } else if (detailedFinishCondition?.condition === "retry-after-error") {
+        return new Response(JSON.stringify(formatWorkflowError(detailedFinishCondition.result)), {
           headers: {
+            "Retry-After": detailedFinishCondition.result.retryAfter.toString(),
             [WORKFLOW_PROTOCOL_VERSION_HEADER]: WORKFLOW_PROTOCOL_VERSION
-          }
+          },
+          status: 429
         });
+      } else if (detailedFinishCondition?.condition === "failure-callback") {
+        return new Response(
+          JSON.stringify({ result: detailedFinishCondition.result ?? void 0 }),
+          {
+            status: 200,
+            headers: {
+              [WORKFLOW_PROTOCOL_VERSION_HEADER]: WORKFLOW_PROTOCOL_VERSION
+            }
+          }
+        );
       }
       return new Response(JSON.stringify({ workflowRunId }), {
         status: 200,
@@ -3638,12 +3685,18 @@ var serveBase = (routeFunction, telemetry2, options) => {
         },
         debug
       });
-      if (result.isOk() && result.value instanceof WorkflowNonRetryableError) {
+      if (result.isOk() && isInstanceOf(result.value, WorkflowNonRetryableError)) {
         return onStepFinish(workflowRunId, result.value, {
           condition: "non-retryable-error",
           result: result.value
         });
       }
+      if (result.isOk() && isInstanceOf(result.value, WorkflowRetryAfterError)) {
+        return onStepFinish(workflowRunId, result.value, {
+          condition: "retry-after-error",
+          result: result.value
+        });
+      }
       if (result.isErr()) {
         await debug?.log("ERROR", "ERROR", { error: result.error.message });
         throw result.error;
@@ -3674,7 +3727,7 @@ var serveBase = (routeFunction, telemetry2, options) => {
         const errorMessage = `Error while running onError callback: '${formattedOnErrorError.message}'.
 Original error: '${formattedError.message}'`;
         console.error(errorMessage);
-        return new Response(errorMessage, {
+        return new Response(JSON.stringify({ error: errorMessage }), {
           status: 500,
           headers: {
             [WORKFLOW_PROTOCOL_VERSION_HEADER]: WORKFLOW_PROTOCOL_VERSION

package/astro.mjs

@@ -2,7 +2,7 @@ import {
   SDK_TELEMETRY,
   serveBase,
   serveManyBase
-} from "./chunk-NQDNC5P4.mjs";
+} from "./chunk-BON2RKOR.mjs";
 
 // platforms/astro.ts
 var telemetry = {

package/{chunk-NQDNC5P4.mjs → chunk-BON2RKOR.mjs}

@@ -1,55 +1,3 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-var __commonJS = (cb, mod) => function __require2() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// src/constants.ts
-var WORKFLOW_ID_HEADER = "Upstash-Workflow-RunId";
-var WORKFLOW_INIT_HEADER = "Upstash-Workflow-Init";
-var WORKFLOW_URL_HEADER = "Upstash-Workflow-Url";
-var WORKFLOW_FAILURE_HEADER = "Upstash-Workflow-Is-Failure";
-var WORKFLOW_FEATURE_HEADER = "Upstash-Feature-Set";
-var WORKFLOW_INVOKE_COUNT_HEADER = "Upstash-Workflow-Invoke-Count";
-var WORKFLOW_LABEL_HEADER = "Upstash-Label";
-var WORKFLOW_PROTOCOL_VERSION = "1";
-var WORKFLOW_PROTOCOL_VERSION_HEADER = "Upstash-Workflow-Sdk-Version";
-var DEFAULT_CONTENT_TYPE = "application/json";
-var NO_CONCURRENCY = 1;
-var DEFAULT_RETRIES = 3;
-var VERSION = "v0.2.21";
-var SDK_TELEMETRY = `@upstash/workflow@${VERSION}`;
-var TELEMETRY_HEADER_SDK = "Upstash-Telemetry-Sdk";
-var TELEMETRY_HEADER_FRAMEWORK = "Upstash-Telemetry-Framework";
-var TELEMETRY_HEADER_RUNTIME = "Upstash-Telemetry-Runtime";
-var TELEMETRY_HEADER_AGENT = "Upstash-Telemetry-Agent";
-
 // src/error.ts
 import { QstashError } from "@upstash/qstash";
 var WorkflowError = class extends QstashError {
@@ -91,6 +39,19 @@ var WorkflowNonRetryableError = class extends WorkflowAbort {
     if (message) this.message = message;
   }
 };
+var WorkflowRetryAfterError = class extends WorkflowAbort {
+  retryAfter;
+  /**
+   * @param retryAfter time in seconds after which the workflow should be retried
+   * @param message error message to be displayed
+   */
+  constructor(message, retryAfter) {
+    super("retry", void 0, false);
+    this.name = "WorkflowRetryAfterError";
+    this.retryAfter = retryAfter;
+    if (message) this.message = message;
+  }
+};
 var formatWorkflowError = (error) => {
   return error instanceof Error ? {
     error: error.name,
@@ -101,6 +62,47 @@ var formatWorkflowError = (error) => {
     message: `An error occured while executing workflow: '${typeof error === "string" ? error : JSON.stringify(error)}'`
   };
 };
+function getConstructorName(obj) {
+  if (obj === null || obj === void 0) {
+    return null;
+  }
+  const ctor = obj.constructor;
+  if (!ctor || ctor.name === "Object") {
+    return null;
+  }
+  return ctor.name;
+}
+function getConstructorNames(obj) {
+  const proto = Object.getPrototypeOf(obj);
+  const name = getConstructorName(proto);
+  if (name === null) {
+    return [];
+  }
+  return [name, ...getConstructorNames(proto)];
+}
+function isInstanceOf(v, ctor) {
+  return getConstructorNames(v).includes(ctor.name);
+}
+
+// src/constants.ts
+var WORKFLOW_ID_HEADER = "Upstash-Workflow-RunId";
+var WORKFLOW_INIT_HEADER = "Upstash-Workflow-Init";
+var WORKFLOW_URL_HEADER = "Upstash-Workflow-Url";
+var WORKFLOW_FAILURE_HEADER = "Upstash-Workflow-Is-Failure";
+var WORKFLOW_FEATURE_HEADER = "Upstash-Feature-Set";
+var WORKFLOW_INVOKE_COUNT_HEADER = "Upstash-Workflow-Invoke-Count";
+var WORKFLOW_LABEL_HEADER = "Upstash-Label";
+var WORKFLOW_PROTOCOL_VERSION = "1";
+var WORKFLOW_PROTOCOL_VERSION_HEADER = "Upstash-Workflow-Sdk-Version";
+var DEFAULT_CONTENT_TYPE = "application/json";
+var NO_CONCURRENCY = 1;
+var DEFAULT_RETRIES = 3;
+var VERSION = "v0.2.22";
+var SDK_TELEMETRY = `@upstash/workflow@${VERSION}`;
+var TELEMETRY_HEADER_SDK = "Upstash-Telemetry-Sdk";
+var TELEMETRY_HEADER_FRAMEWORK = "Upstash-Telemetry-Framework";
+var TELEMETRY_HEADER_RUNTIME = "Upstash-Telemetry-Runtime";
+var TELEMETRY_HEADER_AGENT = "Upstash-Telemetry-Agent";
 
 // src/types.ts
 var StepTypes = [
@@ -163,7 +165,7 @@ var fetchWithContextCall = async (context, agentCallParams, ...params) => {
       headers: responseHeaders
     });
   } catch (error) {
-    if (error instanceof Error && error.name === "WorkflowAbort") {
+    if (error instanceof Error && isInstanceOf(error, WorkflowAbort)) {
       throw error;
     } else {
       console.error("Error in fetch implementation:", error);
@@ -374,7 +376,7 @@ var getSteps = async (requester, workflowRunId, messageId, debug) => {
       return { steps: filteredSteps, workflowRunEnded: false };
     }
   } catch (error) {
-    if (error instanceof QstashError2 && error.status === 404) {
+    if (isInstanceOf(error, QstashError2) && error.status === 404) {
       await debug?.log("WARN", "ENDPOINT_START", {
         message: "Couldn't fetch workflow run steps. This can happen if the workflow run succesfully ends before some callback is executed.",
         error
@@ -927,17 +929,17 @@ var triggerRouteFunction = async ({
     return ok("workflow-finished");
   } catch (error) {
     const error_ = error;
-    if (error instanceof QstashError3 && error.status === 400) {
+    if (isInstanceOf(error, QstashError3) && error.status === 400) {
       await debug?.log("WARN", "RESPONSE_WORKFLOW", {
         message: `tried to append to a cancelled workflow. exiting without publishing.`,
         name: error.name,
         errorMessage: error.message
       });
       return ok("workflow-was-finished");
-    } else if (!(error_ instanceof WorkflowAbort)) {
-      return err(error_);
-    } else if (error_ instanceof WorkflowNonRetryableError) {
+    } else if (isInstanceOf(error_, WorkflowNonRetryableError) || isInstanceOf(error_, WorkflowRetryAfterError)) {
       return ok(error_);
+    } else if (!isInstanceOf(error_, WorkflowAbort)) {
+      return err(error_);
     } else if (error_.cancelWorkflow) {
       await onCancel();
       return ok("workflow-finished");
@@ -2230,7 +2232,7 @@ var AutoExecutor = class _AutoExecutor {
           });
           throw new WorkflowAbort(parallelStep.stepName, resultStep);
         } catch (error) {
-          if (error instanceof WorkflowAbort || error instanceof QstashError5 && error.status === 400) {
+          if (isInstanceOf(error, WorkflowAbort) || isInstanceOf(error, QstashError5) && error.status === 400) {
             throw error;
           }
           throw new WorkflowError(
@@ -2337,7 +2339,7 @@ var validateParallelSteps = (lazySteps, stepsFromRequest) => {
       validateStep(lazySteps[index], stepFromRequest);
     }
   } catch (error) {
-    if (error instanceof WorkflowError) {
+    if (isInstanceOf(error, WorkflowError)) {
       const lazyStepNames = lazySteps.map((lazyStep) => lazyStep.stepName);
       const lazyStepTypes = lazySteps.map((lazyStep) => lazyStep.stepType);
       const requestStepNames = stepsFromRequest.map((step) => step.stepName);
@@ -2536,10 +2538,10 @@ var Agent = class {
       });
       return { text: result.text };
     } catch (error) {
-      if (error instanceof ToolExecutionError) {
-        if (error.cause instanceof Error && error.cause.name === "WorkflowAbort") {
+      if (isInstanceOf(error, ToolExecutionError)) {
+        if (error.cause instanceof Error && isInstanceOf(error.cause, WorkflowAbort)) {
           throw error.cause;
-        } else if (error.cause instanceof ToolExecutionError && error.cause.cause instanceof Error && error.cause.cause.name === "WorkflowAbort") {
+        } else if (isInstanceOf(error.cause, ToolExecutionError) && isInstanceOf(error.cause.cause, WorkflowAbort)) {
           throw error.cause.cause;
         } else {
           throw error;
@@ -3213,7 +3215,7 @@ var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowCon
     try {
       await routeFunction(disabledContext);
     } catch (error) {
-      if (error instanceof WorkflowAbort && error.stepName === this.disabledMessage || error instanceof WorkflowNonRetryableError) {
+      if (isInstanceOf(error, WorkflowAbort) && error.stepName === this.disabledMessage || isInstanceOf(error, WorkflowNonRetryableError) || isInstanceOf(error, WorkflowRetryAfterError)) {
         return ok("step-found");
       }
       console.warn(
@@ -3466,13 +3468,24 @@ var processOptions = (options) => {
           },
           status: 489
         });
-      } else if (detailedFinishCondition?.condition === "failure-callback") {
-        return new Response(detailedFinishCondition.result ?? void 0, {
-          status: 200,
+      } else if (detailedFinishCondition?.condition === "retry-after-error") {
+        return new Response(JSON.stringify(formatWorkflowError(detailedFinishCondition.result)), {
           headers: {
+            "Retry-After": detailedFinishCondition.result.retryAfter.toString(),
             [WORKFLOW_PROTOCOL_VERSION_HEADER]: WORKFLOW_PROTOCOL_VERSION
-          }
+          },
+          status: 429
         });
+      } else if (detailedFinishCondition?.condition === "failure-callback") {
+        return new Response(
+          JSON.stringify({ result: detailedFinishCondition.result ?? void 0 }),
+          {
+            status: 200,
+            headers: {
+              [WORKFLOW_PROTOCOL_VERSION_HEADER]: WORKFLOW_PROTOCOL_VERSION
+            }
+          }
+        );
       }
       return new Response(JSON.stringify({ workflowRunId }), {
         status: 200,
@@ -3682,12 +3695,18 @@ var serveBase = (routeFunction, telemetry, options) => {
         },
         debug
       });
-      if (result.isOk() && result.value instanceof WorkflowNonRetryableError) {
+      if (result.isOk() && isInstanceOf(result.value, WorkflowNonRetryableError)) {
         return onStepFinish(workflowRunId, result.value, {
           condition: "non-retryable-error",
           result: result.value
         });
       }
+      if (result.isOk() && isInstanceOf(result.value, WorkflowRetryAfterError)) {
+        return onStepFinish(workflowRunId, result.value, {
+          condition: "retry-after-error",
+          result: result.value
+        });
+      }
       if (result.isErr()) {
         await debug?.log("ERROR", "ERROR", { error: result.error.message });
         throw result.error;
@@ -3718,7 +3737,7 @@ var serveBase = (routeFunction, telemetry, options) => {
         const errorMessage = `Error while running onError callback: '${formattedOnErrorError.message}'.
 Original error: '${formattedError.message}'`;
         console.error(errorMessage);
-        return new Response(errorMessage, {
+        return new Response(JSON.stringify({ error: errorMessage }), {
           status: 500,
           headers: {
             [WORKFLOW_PROTOCOL_VERSION_HEADER]: WORKFLOW_PROTOCOL_VERSION
@@ -3747,16 +3766,14 @@ var serve = (routeFunction, options) => {
 };
 
 export {
-  __require,
-  __commonJS,
-  __toESM,
+  WorkflowError,
+  WorkflowAbort,
+  WorkflowNonRetryableError,
+  WorkflowRetryAfterError,
   makeNotifyRequest,
   makeGetWaitersRequest,
   WORKFLOW_LABEL_HEADER,
   SDK_TELEMETRY,
-  WorkflowError,
-  WorkflowAbort,
-  WorkflowNonRetryableError,
   getWorkflowRunId,
   StepTypes,
   triggerFirstInvocation,

package/cloudflare.d.mts

@@ -1,5 +1,5 @@
-import { R as RouteFunction, n as PublicServeOptions, y as InvokableWorkflow } from './types-Q3dM0UlR.mjs';
-import { s as serveManyBase } from './serve-many-BNusWYgt.mjs';
+import { R as RouteFunction, o as PublicServeOptions, z as InvokableWorkflow } from './types-9nCq6bRP.mjs';
+import { s as serveManyBase } from './serve-many-CctdYIfB.mjs';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';

package/cloudflare.d.ts

@@ -1,5 +1,5 @@
-import { R as RouteFunction, n as PublicServeOptions, y as InvokableWorkflow } from './types-Q3dM0UlR.js';
-import { s as serveManyBase } from './serve-many-CXqQP3RI.js';
+import { R as RouteFunction, o as PublicServeOptions, z as InvokableWorkflow } from './types-9nCq6bRP.js';
+import { s as serveManyBase } from './serve-many-BXDr30rl.js';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';