1 files changed, 7 insertions, 3 deletions
diff --git a/Omni/Jr.hs b/Omni/Jr.hs
index 2de4975..0746424 100755
--- a/Omni/Jr.hs
+++ b/Omni/Jr.hs
@@ -221,13 +221,15 @@ handleConflict tid conflictFiles commitSha = do
       TaskCore.updateTaskStatus tid TaskCore.Open []
     else do
       conflictDetails <- gatherConflictContext commitSha conflictFiles
+      maybeExistingCtx <- TaskCore.getRetryContext tid
       TaskCore.setRetryContext
         TaskCore.RetryContext
           { TaskCore.retryTaskId = tid,
             TaskCore.retryOriginalCommit = Text.pack commitSha,
             TaskCore.retryConflictFiles = conflictFiles,
             TaskCore.retryAttempt = attempt,
-            TaskCore.retryReason = conflictDetails
+            TaskCore.retryReason = conflictDetails,
+            TaskCore.retryNotes = maybeExistingCtx +> TaskCore.retryNotes
           }
       TaskCore.updateTaskStatus tid TaskCore.Open []
       putText ("[review] Task " <> tid <> " returned to queue (attempt " <> tshow attempt <> "/3).")
@@ -401,7 +403,8 @@ autoReview tid task commitSha = do
                 TaskCore.retryOriginalCommit = Text.pack commitSha,
                 TaskCore.retryConflictFiles = [],
                 TaskCore.retryAttempt = attempt,
-                TaskCore.retryReason = reason
+                TaskCore.retryReason = reason,
+                TaskCore.retryNotes = maybeCtx +> TaskCore.retryNotes
               }
           TaskCore.updateTaskStatus tid TaskCore.Open []
           putText ("[review] Task " <> tid <> " reopened (attempt " <> tshow attempt <> "/3).")
@@ -435,7 +438,8 @@ interactiveReview tid commitSha = do
                 TaskCore.retryOriginalCommit = Text.pack commitSha,
                 TaskCore.retryConflictFiles = [],
                 TaskCore.retryAttempt = attempt,
-                TaskCore.retryReason = "rejected: " <> reason
+                TaskCore.retryReason = "rejected: " <> reason,
+                TaskCore.retryNotes = maybeCtx +> TaskCore.retryNotes
               }
           TaskCore.updateTaskStatus tid TaskCore.Open []
           putText ("Task " <> tid <> " reopened (attempt " <> tshow attempt <> "/3).")