From ef5d57486e9ec428f8d0515718e4db25ca5df715 Mon Sep 17 00:00:00 2001
From: Mason <theforbiddenai@gmail.com>
Date: Fri, 6 Jun 2025 15:02:25 -0400
Subject: [PATCH 1/9] Add retry handler support

Signed-off-by: Mason <theforbiddenai@gmail.com>
---
 sdk-workflows/pom.xml                         |  2 +-
 .../dapr/workflows/WorkflowTaskOptions.java   | 18 +++++++++++++-
 .../runtime/DefaultWorkflowContext.java       | 24 ++++++++++++-------
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml
index 5827154672..883489fd01 100644
--- a/sdk-workflows/pom.xml
+++ b/sdk-workflows/pom.xml
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>durabletask-client</artifactId>
-      <version>1.5.5</version>
+      <version>1.5.6</version>
     </dependency>
     <!--
     manually declare durabletask-client's jackson dependencies
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskOptions.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskOptions.java
index 4f3be9d7f9..25f1da7335 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskOptions.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskOptions.java
@@ -13,16 +13,32 @@
 
 package io.dapr.workflows;
 
+import io.dapr.durabletask.RetryHandler;
+
 public class WorkflowTaskOptions {
 
   private final WorkflowTaskRetryPolicy retryPolicy;
+  private final RetryHandler retryHandler;
 
-  public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy) {
+  public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy, RetryHandler retryHandler) {
     this.retryPolicy = retryPolicy;
+    this.retryHandler = retryHandler;
+  }
+
+  public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy) {
+    this(retryPolicy, null);
+  }
+
+  public WorkflowTaskOptions(RetryHandler retryHandler) {
+    this(null, retryHandler);
   }
 
   public WorkflowTaskRetryPolicy getRetryPolicy() {
     return retryPolicy;
   }
 
+  public RetryHandler getRetryHandler() {
+    return retryHandler;
+  }
+
 }
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
index f6964b6d2f..bb83fe7f97 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
@@ -14,6 +14,7 @@
 package io.dapr.workflows.runtime;
 
 import io.dapr.durabletask.CompositeTaskFailedException;
+import io.dapr.durabletask.RetryHandler;
 import io.dapr.durabletask.RetryPolicy;
 import io.dapr.durabletask.Task;
 import io.dapr.durabletask.TaskCanceledException;
@@ -233,17 +234,22 @@ private static TaskOptions toTaskOptions(WorkflowTaskOptions options) {
       return null;
     }
 
-    WorkflowTaskRetryPolicy workflowTaskRetryPolicy = options.getRetryPolicy();
-    RetryPolicy retryPolicy = new RetryPolicy(
-        workflowTaskRetryPolicy.getMaxNumberOfAttempts(),
-        workflowTaskRetryPolicy.getFirstRetryInterval()
-    );
+    RetryPolicy retryPolicy = null;
+    RetryHandler retryHandler = options.getRetryHandler();
 
-    retryPolicy.setBackoffCoefficient(workflowTaskRetryPolicy.getBackoffCoefficient());
-    if (workflowTaskRetryPolicy.getRetryTimeout() != null) {
-      retryPolicy.setRetryTimeout(workflowTaskRetryPolicy.getRetryTimeout());
+    if (options.getRetryPolicy() != null) {
+      WorkflowTaskRetryPolicy workflowTaskRetryPolicy = options.getRetryPolicy();
+      retryPolicy = new RetryPolicy(
+              workflowTaskRetryPolicy.getMaxNumberOfAttempts(),
+              workflowTaskRetryPolicy.getFirstRetryInterval()
+      );
+
+      retryPolicy.setBackoffCoefficient(workflowTaskRetryPolicy.getBackoffCoefficient());
+      if (workflowTaskRetryPolicy.getRetryTimeout() != null) {
+        retryPolicy.setRetryTimeout(workflowTaskRetryPolicy.getRetryTimeout());
+      }
     }
 
-    return new TaskOptions(retryPolicy);
+    return new TaskOptions(retryPolicy, retryHandler);
   }
 }

From dbe95c8bc4a8fa90bcbda682cdac0a01d825e2dd Mon Sep 17 00:00:00 2001
From: Mason <theforbiddenai@gmail.com>
Date: Mon, 9 Jun 2025 14:25:45 -0400
Subject: [PATCH 2/9] Wrap DurableTask objects

Signed-off-by: Mason <theforbiddenai@gmail.com>
---
 .../workflows/WorkflowTaskFailureDetails.java | 93 +++++++++++++++++++
 .../dapr/workflows/WorkflowTaskOptions.java   | 10 +-
 .../workflows/WorkflowTaskRetryContext.java   | 87 +++++++++++++++++
 .../workflows/WorkflowTaskRetryHandler.java   | 26 ++++++
 .../runtime/DefaultWorkflowContext.java       | 37 +++++++-
 5 files changed, 245 insertions(+), 8 deletions(-)
 create mode 100644 sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java
 create mode 100644 sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java
 create mode 100644 sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryHandler.java

diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java
new file mode 100644
index 0000000000..a6e4158a9e
--- /dev/null
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.workflows;
+
+public class WorkflowTaskFailureDetails {
+  private final String errorType;
+  private final String errorMessage;
+  private final String stackTrace;
+
+  /**
+   * Constructor for WorkflowTaskFailureDetails.
+   *
+   * @param errorType The type of error
+   * @param errorMessage The error message
+   * @param stackTrace The stacktrace of the error
+   */
+  public WorkflowTaskFailureDetails(
+          String errorType,
+          String errorMessage,
+          String stackTrace) {
+    this.errorType = errorType;
+    this.errorMessage = errorMessage;
+    this.stackTrace = stackTrace;
+  }
+
+  /**
+   * Gets the exception class name if the failure was caused by an unhandled exception. Otherwise, gets a symbolic
+   * name that describes the general type of error that was encountered.
+   *
+   * @return the error type as a {@code String} value
+   */
+  public String getErrorType() {
+    return this.errorType;
+  }
+
+  /**
+   * Gets a summary description of the error that caused this failure. If the failure was caused by an exception, the
+   * exception message is returned.
+   *
+   * @return a summary description of the error
+   */
+  public String getErrorMessage() {
+    return this.errorMessage;
+  }
+
+  /**
+   * Gets the stack trace of the exception that caused this failure, or {@code null} if the failure was caused by
+   * a non-exception error.
+   *
+   * @return the stack trace of the failure exception or {@code null} if the failure was not caused by an exception
+   */
+  public String getStackTrace() {
+    return this.stackTrace;
+  }
+
+  /**
+   * Returns {@code true} if the task failure was provided by the specified exception type, otherwise {@code false}.
+   *
+   * <p>This method allows checking if a task failed due to a specific exception type by attempting to load the class
+   * specified in {@link #getErrorType()}. If the exception class cannot be loaded for any reason, this method will
+   * return {@code false}. Base types are supported by this method, as shown in the following example:
+   * <pre>{@code
+   * boolean isRuntimeException = failureDetails.isCausedBy(RuntimeException.class);
+   * }</pre>
+   *
+   * @param exceptionClass the class representing the exception type to test
+   * @return {@code true} if the task failure was provided by the specified exception type, otherwise {@code false}
+   */
+  public boolean isCausedBy(Class<? extends Exception> exceptionClass) {
+    String actualClassName = this.getErrorType();
+    try {
+      // Try using reflection to load the failure's class type and see if it's a subtype of the specified
+      // exception. For example, this should always succeed if exceptionClass is System.Exception.
+      Class<?> actualExceptionClass = Class.forName(actualClassName);
+      return exceptionClass.isAssignableFrom(actualExceptionClass);
+    } catch (ClassNotFoundException ex) {
+      // Can't load the class and thus can't tell if it's related
+      return false;
+    }
+  }
+
+}
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskOptions.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskOptions.java
index 25f1da7335..6e16452686 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskOptions.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskOptions.java
@@ -13,14 +13,12 @@
 
 package io.dapr.workflows;
 
-import io.dapr.durabletask.RetryHandler;
-
 public class WorkflowTaskOptions {
 
   private final WorkflowTaskRetryPolicy retryPolicy;
-  private final RetryHandler retryHandler;
+  private final WorkflowTaskRetryHandler retryHandler;
 
-  public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy, RetryHandler retryHandler) {
+  public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy, WorkflowTaskRetryHandler retryHandler) {
     this.retryPolicy = retryPolicy;
     this.retryHandler = retryHandler;
   }
@@ -29,7 +27,7 @@ public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy) {
     this(retryPolicy, null);
   }
 
-  public WorkflowTaskOptions(RetryHandler retryHandler) {
+  public WorkflowTaskOptions(WorkflowTaskRetryHandler retryHandler) {
     this(null, retryHandler);
   }
 
@@ -37,7 +35,7 @@ public WorkflowTaskRetryPolicy getRetryPolicy() {
     return retryPolicy;
   }
 
-  public RetryHandler getRetryHandler() {
+  public WorkflowTaskRetryHandler getRetryHandler() {
     return retryHandler;
   }
 
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java
new file mode 100644
index 0000000000..f8e6cac914
--- /dev/null
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.workflows;
+
+import io.dapr.workflows.runtime.DefaultWorkflowContext;
+
+import java.time.Duration;
+
+public class WorkflowTaskRetryContext {
+
+  private final DefaultWorkflowContext workflowContext;
+  private final int lastAttemptNumber;
+  private final WorkflowTaskFailureDetails lastFailure;
+  private final Duration totalRetryTime;
+
+  /**
+   * Constructor for WorkflowTaskRetryContext.
+   *
+   * @param workflowContext The workflow context
+   * @param lastAttemptNumber The number of the previous attempt
+   * @param lastFailure The failure details from the most recent failure
+   * @param totalRetryTime The amount of time spent retrying
+   */
+  public WorkflowTaskRetryContext(
+          DefaultWorkflowContext workflowContext,
+          int lastAttemptNumber,
+          WorkflowTaskFailureDetails lastFailure,
+          Duration totalRetryTime) {
+    this.workflowContext = workflowContext;
+    this.lastAttemptNumber = lastAttemptNumber;
+    this.lastFailure = lastFailure;
+    this.totalRetryTime = totalRetryTime;
+  }
+
+  /**
+   * Gets the context of the current orchestration.
+   *
+   * <p>The orchestration context can be used in retry handlers to schedule timers (via the
+   * {@link DefaultWorkflowContext#createTimer} methods) for implementing delays between retries. It can also be
+   * used to implement time-based retry logic by using the {@link DefaultWorkflowContext#getCurrentInstant} method.
+   *
+   * @return the context of the parent orchestration
+   */
+  public DefaultWorkflowContext getOrchestrationContext() {
+    return this.workflowContext;
+  }
+
+  /**
+   * Gets the details of the previous task failure, including the exception type, message, and callstack.
+   *
+   * @return the details of the previous task failure
+   */
+  public WorkflowTaskFailureDetails getLastFailure() {
+    return this.lastFailure;
+  }
+
+  /**
+   * Gets the previous retry attempt number. This number starts at 1 and increments each time the retry handler
+   * is invoked for a particular task failure.
+   *
+   * @return the previous retry attempt number
+   */
+  public int getLastAttemptNumber() {
+    return this.lastAttemptNumber;
+  }
+
+  /**
+   * Gets the total amount of time spent in a retry loop for the current task.
+   *
+   * @return the total amount of time spent in a retry loop for the current task
+   */
+  public Duration getTotalRetryTime() {
+    return this.totalRetryTime;
+  }
+
+}
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryHandler.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryHandler.java
new file mode 100644
index 0000000000..8c0452ce6f
--- /dev/null
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryHandler.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.workflows;
+
+public interface WorkflowTaskRetryHandler {
+
+  /**
+   * Invokes retry handler logic. Return value indicates whether to continue retrying.
+   *
+   * @param retryContext The context of the retry
+   * @return {@code true} to continue retrying or {@code false} to stop retrying.
+   */
+  boolean handle(WorkflowTaskRetryContext retryContext);
+
+}
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
index bb83fe7f97..099fc3732a 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
@@ -14,6 +14,7 @@
 package io.dapr.workflows.runtime;
 
 import io.dapr.durabletask.CompositeTaskFailedException;
+import io.dapr.durabletask.FailureDetails;
 import io.dapr.durabletask.RetryHandler;
 import io.dapr.durabletask.RetryPolicy;
 import io.dapr.durabletask.Task;
@@ -21,7 +22,10 @@
 import io.dapr.durabletask.TaskOptions;
 import io.dapr.durabletask.TaskOrchestrationContext;
 import io.dapr.workflows.WorkflowContext;
+import io.dapr.workflows.WorkflowTaskFailureDetails;
 import io.dapr.workflows.WorkflowTaskOptions;
+import io.dapr.workflows.WorkflowTaskRetryContext;
+import io.dapr.workflows.WorkflowTaskRetryHandler;
 import io.dapr.workflows.WorkflowTaskRetryPolicy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -229,13 +233,13 @@ public UUID newUuid() {
     return this.innerContext.newUUID();
   }
 
-  private static TaskOptions toTaskOptions(WorkflowTaskOptions options) {
+  private TaskOptions toTaskOptions(WorkflowTaskOptions options) {
     if (options == null) {
       return null;
     }
 
     RetryPolicy retryPolicy = null;
-    RetryHandler retryHandler = options.getRetryHandler();
+    RetryHandler retryHandler = toRetryHandler(options.getRetryHandler());
 
     if (options.getRetryPolicy() != null) {
       WorkflowTaskRetryPolicy workflowTaskRetryPolicy = options.getRetryPolicy();
@@ -252,4 +256,33 @@ private static TaskOptions toTaskOptions(WorkflowTaskOptions options) {
 
     return new TaskOptions(retryPolicy, retryHandler);
   }
+
+  /**
+   * Converts a {@link WorkflowTaskRetryHandler} to a {@link RetryHandler}.
+   *
+   * @param workflowTaskRetryHandler The {@link WorkflowTaskRetryHandler} being converted
+   * @return A {@link RetryHandler}
+   */
+  private RetryHandler toRetryHandler(WorkflowTaskRetryHandler workflowTaskRetryHandler) {
+    if (workflowTaskRetryHandler == null) {
+      return null;
+    }
+
+    return retryContext -> {
+      FailureDetails failureDetails = retryContext.getLastFailure();
+      WorkflowTaskFailureDetails workflowFailureDetails = new WorkflowTaskFailureDetails(
+              failureDetails.getErrorType(),
+              failureDetails.getErrorMessage(),
+              failureDetails.getStackTrace()
+      );
+      WorkflowTaskRetryContext workflowRetryContext = new WorkflowTaskRetryContext(
+              this,
+              retryContext.getLastAttemptNumber(),
+              workflowFailureDetails,
+              retryContext.getTotalRetryTime()
+      );
+
+      return workflowTaskRetryHandler.handle(workflowRetryContext);
+    };
+  }
 }

From 5e47afb03bcc9667dfa959108cd14c8ce53d4224 Mon Sep 17 00:00:00 2001
From: Mason <theforbiddenai@gmail.com>
Date: Mon, 9 Jun 2025 14:27:47 -0400
Subject: [PATCH 3/9] Rename method

Signed-off-by: Mason <theforbiddenai@gmail.com>
---
 .../java/io/dapr/workflows/WorkflowTaskRetryContext.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java
index f8e6cac914..425281a6cb 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java
@@ -44,15 +44,15 @@ public WorkflowTaskRetryContext(
   }
 
   /**
-   * Gets the context of the current orchestration.
+   * Gets the context of the current workflow.
    *
-   * <p>The orchestration context can be used in retry handlers to schedule timers (via the
+   * <p>The workflow context can be used in retry handlers to schedule timers (via the
    * {@link DefaultWorkflowContext#createTimer} methods) for implementing delays between retries. It can also be
    * used to implement time-based retry logic by using the {@link DefaultWorkflowContext#getCurrentInstant} method.
    *
-   * @return the context of the parent orchestration
+   * @return the context of the parent workflow
    */
-  public DefaultWorkflowContext getOrchestrationContext() {
+  public DefaultWorkflowContext getWorkflowContext() {
     return this.workflowContext;
   }
 

From d1dc8f7e38dbf41f28cdd3c07fc47afc70a60fb9 Mon Sep 17 00:00:00 2001
From: Mason <theforbiddenai@gmail.com>
Date: Mon, 9 Jun 2025 14:54:05 -0400
Subject: [PATCH 4/9] Add isNonRetriable field to WorkflowTaskFailureDetails

Signed-off-by: Mason <theforbiddenai@gmail.com>
---
 .../dapr/workflows/WorkflowTaskFailureDetails.java | 14 +++++++++++++-
 .../workflows/runtime/DefaultWorkflowContext.java  |  3 ++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java
index a6e4158a9e..db4c0c5068 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java
@@ -17,6 +17,7 @@ public class WorkflowTaskFailureDetails {
   private final String errorType;
   private final String errorMessage;
   private final String stackTrace;
+  private final boolean isNonRetriable;
 
   /**
    * Constructor for WorkflowTaskFailureDetails.
@@ -24,14 +25,17 @@ public class WorkflowTaskFailureDetails {
    * @param errorType The type of error
    * @param errorMessage The error message
    * @param stackTrace The stacktrace of the error
+   * @param isNonRetriable Whether the failure is retriable or not
    */
   public WorkflowTaskFailureDetails(
           String errorType,
           String errorMessage,
-          String stackTrace) {
+          String stackTrace,
+          boolean isNonRetriable) {
     this.errorType = errorType;
     this.errorMessage = errorMessage;
     this.stackTrace = stackTrace;
+    this.isNonRetriable = isNonRetriable;
   }
 
   /**
@@ -64,6 +68,14 @@ public String getStackTrace() {
     return this.stackTrace;
   }
 
+  /**
+   * Returns {@code true} if the failure doesn't permit retries, otherwise {@code false}.
+   * @return {@code true} if the failure doesn't permit retries, otherwise {@code false}.
+   */
+  public boolean isNonRetriable() {
+    return this.isNonRetriable;
+  }
+
   /**
    * Returns {@code true} if the task failure was provided by the specified exception type, otherwise {@code false}.
    *
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
index 099fc3732a..6ac072442c 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
@@ -273,7 +273,8 @@ private RetryHandler toRetryHandler(WorkflowTaskRetryHandler workflowTaskRetryHa
       WorkflowTaskFailureDetails workflowFailureDetails = new WorkflowTaskFailureDetails(
               failureDetails.getErrorType(),
               failureDetails.getErrorMessage(),
-              failureDetails.getStackTrace()
+              failureDetails.getStackTrace(),
+              failureDetails.isNonRetriable()
       );
       WorkflowTaskRetryContext workflowRetryContext = new WorkflowTaskRetryContext(
               this,

From 8e111ee5f9f7edbde54256befc7f85876c8812ba Mon Sep 17 00:00:00 2001
From: Mason <theforbiddenai@gmail.com>
Date: Mon, 9 Jun 2025 15:47:01 -0400
Subject: [PATCH 5/9] Add unit test

Signed-off-by: Mason <theforbiddenai@gmail.com>
---
 .../workflows/DefaultWorkflowContextTest.java | 51 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
index 54265c7411..4c8c6a5fd6 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
@@ -14,6 +14,9 @@
 package io.dapr.workflows;
 
 import io.dapr.durabletask.CompositeTaskFailedException;
+import io.dapr.durabletask.FailureDetails;
+import io.dapr.durabletask.RetryContext;
+import io.dapr.durabletask.RetryHandler;
 import io.dapr.durabletask.Task;
 import io.dapr.durabletask.TaskCanceledException;
 import io.dapr.durabletask.TaskOptions;
@@ -35,10 +38,11 @@
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -278,7 +282,7 @@ public void callChildWorkflowWithName() {
   }
 
   @Test
-  public void callChildWorkflowWithOptions() {
+  public void callChildWorkflowWithRetryPolicy() {
     String expectedName = "TestActivity";
     String expectedInput = "TestInput";
     String expectedInstanceId = "TestInstanceId";
@@ -305,6 +309,49 @@ public void callChildWorkflowWithOptions() {
     assertEquals(retryPolicy.getMaxNumberOfAttempts(), taskOptions.getRetryPolicy().getMaxNumberOfAttempts());
     assertEquals(retryPolicy.getFirstRetryInterval(), taskOptions.getRetryPolicy().getFirstRetryInterval());
     assertEquals(Duration.ZERO, taskOptions.getRetryPolicy().getRetryTimeout());
+    assertNull(taskOptions.getRetryHandler());
+  }
+
+  @Test
+  public void callChildWorkflowWithRetryHandler() {
+    String expectedName = "TestActivity";
+    String expectedInput = "TestInput";
+    String expectedInstanceId = "TestInstanceId";
+
+    WorkflowTaskRetryHandler retryHandler = spy(new WorkflowTaskRetryHandler() {
+      @Override
+      public boolean handle(WorkflowTaskRetryContext retryContext) {
+        return true;
+      }
+    });
+
+    WorkflowTaskOptions executionOptions = new WorkflowTaskOptions(retryHandler);
+    ArgumentCaptor<TaskOptions> captor = ArgumentCaptor.forClass(TaskOptions.class);
+
+    context.callChildWorkflow(expectedName, expectedInput, expectedInstanceId, executionOptions, String.class);
+
+    verify(mockInnerContext, times(1))
+            .callSubOrchestrator(
+                    eq(expectedName),
+                    eq(expectedInput),
+                    eq(expectedInstanceId),
+                    captor.capture(),
+                    eq(String.class)
+            );
+
+    TaskOptions taskOptions = captor.getValue();
+
+    RetryHandler durableRetryHandler = taskOptions.getRetryHandler();
+    RetryContext retryContext = mock(RetryContext.class);
+
+    when(retryContext.getLastFailure()).thenReturn(mock(FailureDetails.class, invocationOnMock -> null));
+    when(retryContext.getLastAttemptNumber()).thenReturn(0);
+    when(retryContext.getOrchestrationContext()).thenReturn(null);
+    when(retryContext.getTotalRetryTime()).thenReturn(null);
+
+    durableRetryHandler.handle(retryContext);
+
+    verify(retryHandler, times(1)).handle(any());
   }
 
   @Test

From 62c7554731b062f975c1eee7cc15cf8ff85addda Mon Sep 17 00:00:00 2001
From: Mason <theforbiddenai@gmail.com>
Date: Tue, 10 Jun 2025 13:26:16 -0400
Subject: [PATCH 6/9] Removed duplicate WorkflowFailureDetails class

Signed-off-by: Mason <theforbiddenai@gmail.com>
---
 .../workflows/WorkflowTaskFailureDetails.java | 105 ------------------
 .../workflows/WorkflowTaskRetryContext.java   |   7 +-
 .../client/WorkflowFailureDetails.java        |  10 ++
 .../runtime/DefaultWorkflowContext.java       |  11 +-
 .../DefaultWorkflowFailureDetails.java        |  11 ++
 5 files changed, 26 insertions(+), 118 deletions(-)
 delete mode 100644 sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java

diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java
deleted file mode 100644
index db4c0c5068..0000000000
--- a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskFailureDetails.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2025 The Dapr Authors
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package io.dapr.workflows;
-
-public class WorkflowTaskFailureDetails {
-  private final String errorType;
-  private final String errorMessage;
-  private final String stackTrace;
-  private final boolean isNonRetriable;
-
-  /**
-   * Constructor for WorkflowTaskFailureDetails.
-   *
-   * @param errorType The type of error
-   * @param errorMessage The error message
-   * @param stackTrace The stacktrace of the error
-   * @param isNonRetriable Whether the failure is retriable or not
-   */
-  public WorkflowTaskFailureDetails(
-          String errorType,
-          String errorMessage,
-          String stackTrace,
-          boolean isNonRetriable) {
-    this.errorType = errorType;
-    this.errorMessage = errorMessage;
-    this.stackTrace = stackTrace;
-    this.isNonRetriable = isNonRetriable;
-  }
-
-  /**
-   * Gets the exception class name if the failure was caused by an unhandled exception. Otherwise, gets a symbolic
-   * name that describes the general type of error that was encountered.
-   *
-   * @return the error type as a {@code String} value
-   */
-  public String getErrorType() {
-    return this.errorType;
-  }
-
-  /**
-   * Gets a summary description of the error that caused this failure. If the failure was caused by an exception, the
-   * exception message is returned.
-   *
-   * @return a summary description of the error
-   */
-  public String getErrorMessage() {
-    return this.errorMessage;
-  }
-
-  /**
-   * Gets the stack trace of the exception that caused this failure, or {@code null} if the failure was caused by
-   * a non-exception error.
-   *
-   * @return the stack trace of the failure exception or {@code null} if the failure was not caused by an exception
-   */
-  public String getStackTrace() {
-    return this.stackTrace;
-  }
-
-  /**
-   * Returns {@code true} if the failure doesn't permit retries, otherwise {@code false}.
-   * @return {@code true} if the failure doesn't permit retries, otherwise {@code false}.
-   */
-  public boolean isNonRetriable() {
-    return this.isNonRetriable;
-  }
-
-  /**
-   * Returns {@code true} if the task failure was provided by the specified exception type, otherwise {@code false}.
-   *
-   * <p>This method allows checking if a task failed due to a specific exception type by attempting to load the class
-   * specified in {@link #getErrorType()}. If the exception class cannot be loaded for any reason, this method will
-   * return {@code false}. Base types are supported by this method, as shown in the following example:
-   * <pre>{@code
-   * boolean isRuntimeException = failureDetails.isCausedBy(RuntimeException.class);
-   * }</pre>
-   *
-   * @param exceptionClass the class representing the exception type to test
-   * @return {@code true} if the task failure was provided by the specified exception type, otherwise {@code false}
-   */
-  public boolean isCausedBy(Class<? extends Exception> exceptionClass) {
-    String actualClassName = this.getErrorType();
-    try {
-      // Try using reflection to load the failure's class type and see if it's a subtype of the specified
-      // exception. For example, this should always succeed if exceptionClass is System.Exception.
-      Class<?> actualExceptionClass = Class.forName(actualClassName);
-      return exceptionClass.isAssignableFrom(actualExceptionClass);
-    } catch (ClassNotFoundException ex) {
-      // Can't load the class and thus can't tell if it's related
-      return false;
-    }
-  }
-
-}
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java
index 425281a6cb..15fa3fd505 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryContext.java
@@ -13,6 +13,7 @@
 
 package io.dapr.workflows;
 
+import io.dapr.workflows.client.WorkflowFailureDetails;
 import io.dapr.workflows.runtime.DefaultWorkflowContext;
 
 import java.time.Duration;
@@ -21,7 +22,7 @@ public class WorkflowTaskRetryContext {
 
   private final DefaultWorkflowContext workflowContext;
   private final int lastAttemptNumber;
-  private final WorkflowTaskFailureDetails lastFailure;
+  private final WorkflowFailureDetails lastFailure;
   private final Duration totalRetryTime;
 
   /**
@@ -35,7 +36,7 @@ public class WorkflowTaskRetryContext {
   public WorkflowTaskRetryContext(
           DefaultWorkflowContext workflowContext,
           int lastAttemptNumber,
-          WorkflowTaskFailureDetails lastFailure,
+          WorkflowFailureDetails lastFailure,
           Duration totalRetryTime) {
     this.workflowContext = workflowContext;
     this.lastAttemptNumber = lastAttemptNumber;
@@ -61,7 +62,7 @@ public DefaultWorkflowContext getWorkflowContext() {
    *
    * @return the details of the previous task failure
    */
-  public WorkflowTaskFailureDetails getLastFailure() {
+  public WorkflowFailureDetails getLastFailure() {
     return this.lastFailure;
   }
 
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/client/WorkflowFailureDetails.java b/sdk-workflows/src/main/java/io/dapr/workflows/client/WorkflowFailureDetails.java
index 31922bf528..1adf1fe005 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/client/WorkflowFailureDetails.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/client/WorkflowFailureDetails.java
@@ -39,4 +39,14 @@ public interface WorkflowFailureDetails {
    */
   String getStackTrace();
 
+  /**
+   * Checks whether the failure was caused by the provided exception class.
+   *
+   * @param exceptionClass the exception class to check
+   * @return {@code true} if the failure was caused by the provided exception class
+   */
+  default boolean isCausedBy(Class<? extends Exception> exceptionClass) {
+    throw new UnsupportedOperationException("This method is not implemented");
+  }
+
 }
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
index 6ac072442c..068697847f 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
@@ -14,7 +14,6 @@
 package io.dapr.workflows.runtime;
 
 import io.dapr.durabletask.CompositeTaskFailedException;
-import io.dapr.durabletask.FailureDetails;
 import io.dapr.durabletask.RetryHandler;
 import io.dapr.durabletask.RetryPolicy;
 import io.dapr.durabletask.Task;
@@ -22,7 +21,6 @@
 import io.dapr.durabletask.TaskOptions;
 import io.dapr.durabletask.TaskOrchestrationContext;
 import io.dapr.workflows.WorkflowContext;
-import io.dapr.workflows.WorkflowTaskFailureDetails;
 import io.dapr.workflows.WorkflowTaskOptions;
 import io.dapr.workflows.WorkflowTaskRetryContext;
 import io.dapr.workflows.WorkflowTaskRetryHandler;
@@ -269,17 +267,10 @@ private RetryHandler toRetryHandler(WorkflowTaskRetryHandler workflowTaskRetryHa
     }
 
     return retryContext -> {
-      FailureDetails failureDetails = retryContext.getLastFailure();
-      WorkflowTaskFailureDetails workflowFailureDetails = new WorkflowTaskFailureDetails(
-              failureDetails.getErrorType(),
-              failureDetails.getErrorMessage(),
-              failureDetails.getStackTrace(),
-              failureDetails.isNonRetriable()
-      );
       WorkflowTaskRetryContext workflowRetryContext = new WorkflowTaskRetryContext(
               this,
               retryContext.getLastAttemptNumber(),
-              workflowFailureDetails,
+              new DefaultWorkflowFailureDetails(retryContext.getLastFailure()),
               retryContext.getTotalRetryTime()
       );
 
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowFailureDetails.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowFailureDetails.java
index c51fe7c3a7..ee6e0d8020 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowFailureDetails.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowFailureDetails.java
@@ -62,6 +62,17 @@ public String getStackTrace() {
     return workflowFailureDetails.getStackTrace();
   }
 
+  /**
+   * Checks whether the failure was caused by the provided exception class.
+   *
+   * @param exceptionClass the exception class to check
+   * @return {@code true} if the failure was caused by the provided exception class
+   */
+  @Override
+  public boolean isCausedBy(Class<? extends Exception> exceptionClass) {
+    return workflowFailureDetails.isCausedBy(exceptionClass);
+  }
+
   @Override
   public String toString() {
     return workflowFailureDetails.toString();

From 83b0f2ff9c49959443df4b20ad573535fd961d25 Mon Sep 17 00:00:00 2001
From: Mason <theforbiddenai@gmail.com>
Date: Tue, 10 Jun 2025 13:31:46 -0400
Subject: [PATCH 7/9] Removed unneeded when statements in retry policy unit
 test

Signed-off-by: Mason <theforbiddenai@gmail.com>
---
 .../java/io/dapr/workflows/DefaultWorkflowContextTest.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
index 4c8c6a5fd6..4b5aa95065 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
@@ -342,12 +342,7 @@ public boolean handle(WorkflowTaskRetryContext retryContext) {
     TaskOptions taskOptions = captor.getValue();
 
     RetryHandler durableRetryHandler = taskOptions.getRetryHandler();
-    RetryContext retryContext = mock(RetryContext.class);
-
-    when(retryContext.getLastFailure()).thenReturn(mock(FailureDetails.class, invocationOnMock -> null));
-    when(retryContext.getLastAttemptNumber()).thenReturn(0);
-    when(retryContext.getOrchestrationContext()).thenReturn(null);
-    when(retryContext.getTotalRetryTime()).thenReturn(null);
+    RetryContext retryContext = mock(RetryContext.class, invocationOnMock -> null);
 
     durableRetryHandler.handle(retryContext);
 

From ee84d8a24595c8d7acc102e23bb4f59e01a10d1f Mon Sep 17 00:00:00 2001
From: Mason <theforbiddenai@gmail.com>
Date: Tue, 10 Jun 2025 14:31:17 -0400
Subject: [PATCH 8/9] Add unit test to test both RetryPolicy and RetryHandler

Signed-off-by: Mason <theforbiddenai@gmail.com>
---
 .../workflows/DefaultWorkflowContextTest.java | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
index 4b5aa95065..bfe567364e 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
@@ -347,6 +347,52 @@ public boolean handle(WorkflowTaskRetryContext retryContext) {
     durableRetryHandler.handle(retryContext);
 
     verify(retryHandler, times(1)).handle(any());
+    assertNull(taskOptions.getRetryPolicy());
+  }
+
+  @Test
+  public void callChildWorkflowWithRetryPolicyAndHandler() {
+    String expectedName = "TestActivity";
+    String expectedInput = "TestInput";
+    String expectedInstanceId = "TestInstanceId";
+
+    WorkflowTaskRetryPolicy retryPolicy = WorkflowTaskRetryPolicy.newBuilder()
+            .setMaxNumberOfAttempts(1)
+            .setFirstRetryInterval(Duration.ofSeconds(10))
+            .build();
+
+    WorkflowTaskRetryHandler retryHandler = spy(new WorkflowTaskRetryHandler() {
+      @Override
+      public boolean handle(WorkflowTaskRetryContext retryContext) {
+        return true;
+      }
+    });
+
+    WorkflowTaskOptions executionOptions = new WorkflowTaskOptions(retryPolicy, retryHandler);
+    ArgumentCaptor<TaskOptions> captor = ArgumentCaptor.forClass(TaskOptions.class);
+
+    context.callChildWorkflow(expectedName, expectedInput, expectedInstanceId, executionOptions, String.class);
+
+    verify(mockInnerContext, times(1))
+            .callSubOrchestrator(
+                    eq(expectedName),
+                    eq(expectedInput),
+                    eq(expectedInstanceId),
+                    captor.capture(),
+                    eq(String.class)
+            );
+
+    TaskOptions taskOptions = captor.getValue();
+
+    RetryHandler durableRetryHandler = taskOptions.getRetryHandler();
+    RetryContext retryContext = mock(RetryContext.class, invocationOnMock -> null);
+
+    durableRetryHandler.handle(retryContext);
+
+    verify(retryHandler, times(1)).handle(any());
+    assertEquals(retryPolicy.getMaxNumberOfAttempts(), taskOptions.getRetryPolicy().getMaxNumberOfAttempts());
+    assertEquals(retryPolicy.getFirstRetryInterval(), taskOptions.getRetryPolicy().getFirstRetryInterval());
+    assertEquals(Duration.ZERO, taskOptions.getRetryPolicy().getRetryTimeout());
   }
 
   @Test

From 80deb0e0b76f8c236a36b06891192446328d1fb8 Mon Sep 17 00:00:00 2001
From: Mason <theforbiddenai@gmail.com>
Date: Wed, 11 Jun 2025 08:20:28 -0400
Subject: [PATCH 9/9] Create toRetryPolicy method

Signed-off-by: Mason <theforbiddenai@gmail.com>
---
 .../runtime/DefaultWorkflowContext.java       | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
index 068697847f..f3e93a7c38 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
@@ -236,23 +236,34 @@ private TaskOptions toTaskOptions(WorkflowTaskOptions options) {
       return null;
     }
 
-    RetryPolicy retryPolicy = null;
+    RetryPolicy retryPolicy = toRetryPolicy(options.getRetryPolicy());
     RetryHandler retryHandler = toRetryHandler(options.getRetryHandler());
 
-    if (options.getRetryPolicy() != null) {
-      WorkflowTaskRetryPolicy workflowTaskRetryPolicy = options.getRetryPolicy();
-      retryPolicy = new RetryPolicy(
-              workflowTaskRetryPolicy.getMaxNumberOfAttempts(),
-              workflowTaskRetryPolicy.getFirstRetryInterval()
-      );
+    return new TaskOptions(retryPolicy, retryHandler);
+  }
 
-      retryPolicy.setBackoffCoefficient(workflowTaskRetryPolicy.getBackoffCoefficient());
-      if (workflowTaskRetryPolicy.getRetryTimeout() != null) {
-        retryPolicy.setRetryTimeout(workflowTaskRetryPolicy.getRetryTimeout());
-      }
+  /**
+   * Converts a {@link WorkflowTaskRetryPolicy} to a {@link RetryPolicy}.
+   *
+   * @param workflowTaskRetryPolicy The {@link WorkflowTaskRetryPolicy} being converted
+   * @return A {@link RetryPolicy}
+   */
+  private RetryPolicy toRetryPolicy(WorkflowTaskRetryPolicy workflowTaskRetryPolicy) {
+    if (workflowTaskRetryPolicy == null) {
+      return null;
     }
 
-    return new TaskOptions(retryPolicy, retryHandler);
+    RetryPolicy retryPolicy = new RetryPolicy(
+            workflowTaskRetryPolicy.getMaxNumberOfAttempts(),
+            workflowTaskRetryPolicy.getFirstRetryInterval()
+    );
+
+    retryPolicy.setBackoffCoefficient(workflowTaskRetryPolicy.getBackoffCoefficient());
+    if (workflowTaskRetryPolicy.getRetryTimeout() != null) {
+      retryPolicy.setRetryTimeout(workflowTaskRetryPolicy.getRetryTimeout());
+    }
+
+    return retryPolicy;
   }
 
   /**