Preserve add-comment metadata during ID updates

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

Author: Copilot

actions/setup/js/safe_output_handler_manager.cjs

@@ -1174,12 +1174,7 @@ async function processMessages(messageHandlers, messages, onItemCreated = null)
           outputsWithUnresolvedIds.push({
             type: messageType,
             message,
-            result: {
-              commentId: result.commentId,
-              itemNumber: result.itemNumber,
-              repo: result.repo,
-              isDiscussion: result.isDiscussion,
-            },
+            result,
             originalTempIdMapSize: tempIdMapSizeBefore,
           });
         }
@@ -1196,12 +1191,7 @@ async function processMessages(messageHandlers, messages, onItemCreated = null)
               outputsWithUnresolvedIds.push({
                 type: messageType,
                 message: message,
-                result: {
-                  commentId: comment._tracking.commentId,
-                  itemNumber: comment._tracking.itemNumber,
-                  repo: comment._tracking.repo,
-                  isDiscussion: comment._tracking.isDiscussion,
-                },
+                result: { ...comment, ...comment._tracking },
                 originalTempIdMapSize: tempIdMapSizeBefore,
               });
             }
@@ -1403,7 +1393,7 @@ function getContentToCheck(messageType, message, result) {
     case "create_discussion":
       return message.body || "";
     case "add_comment":
-      return message.body || "";
+      return result?.body || message.body || "";
     case "comment_memory":
       return result?.managedBody || message.body || "";
     case "create_pull_request":
@@ -2045,4 +2035,5 @@ module.exports = {
   partitionFailureResults,
   computeSafeOutputsStatus,
   setSafeOutputsStatusOutputs,
+  processSyntheticUpdates,
 };

actions/setup/js/safe_output_handler_manager.test.cjs

@@ -21,6 +21,7 @@ import {
   partitionFailureResults,
   computeSafeOutputsStatus,
   setSafeOutputsStatusOutputs,
+  processSyntheticUpdates,
 } from "./safe_output_handler_manager.cjs";
 
 const require = createRequire(import.meta.url);
@@ -162,7 +163,14 @@ describe("Safe Output Handler Manager", () => {
             vi.fn(async (_message, resolvedTemporaryIds) => {
               callOrder.push("add_comment");
               expect(resolvedTemporaryIds).toEqual({});
-              return { success: true, commentId: 123, itemNumber: 42, repo: "owner/repo", isDiscussion: false };
+              return {
+                success: true,
+                commentId: 123,
+                itemNumber: 42,
+                repo: "owner/repo",
+                isDiscussion: false,
+                body: "Tracking issue: #aw_track1\n\nHandler footer marker",
+              };
             }),
           ],
           [
@@ -186,11 +194,48 @@ describe("Safe Output Handler Manager", () => {
           {
             type: "add_comment",
             message: { type: "add_comment", item_number: 42, body: "Tracking issue: #aw_track1" },
-            result: { commentId: 123, itemNumber: 42, repo: "owner/repo", isDiscussion: false },
+            result: {
+              success: true,
+              commentId: 123,
+              itemNumber: 42,
+              repo: "owner/repo",
+              isDiscussion: false,
+              body: "Tracking issue: #aw_track1\n\nHandler footer marker",
+            },
             originalTempIdMapSize: 0,
           },
         ]);
       });
+
+      it("updates the posted comment body while retaining handler metadata", async () => {
+        const updateComment = vi.fn().mockResolvedValue({});
+        const github = { rest: { issues: { updateComment } } };
+        const trackedOutputs = [
+          {
+            type: "add_comment",
+            message: { type: "add_comment", body: "Tracking issue: #aw_track1" },
+            result: {
+              success: true,
+              commentId: 123,
+              itemNumber: 42,
+              repo: "owner/repo",
+              isDiscussion: false,
+              body: "Tracking issue: #aw_track1\n\nHandler footer marker",
+            },
+            originalTempIdMapSize: 0,
+          },
+        ];
+
+        const updateCount = await processSyntheticUpdates(github, {}, trackedOutputs, new Map([["aw_track1", { repo: "owner/tracker", number: 99 }]]), new Map());
+
+        expect(updateCount).toBe(1);
+        expect(updateComment).toHaveBeenCalledWith({
+          owner: "owner",
+          repo: "repo",
+          comment_id: 123,
+          body: "Tracking issue: owner/tracker#99\n\nHandler footer marker",
+        });
+      });
     });
 
     describe("logCreatedItemFromResult", () => {