From 6d4edb5ba3acdd16e8cb2f7267cca4181e97a358 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 22 Apr 2026 13:58:59 +0000
Subject: [PATCH 1/5] Add comment-memory disclosure note above generated footer

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/9d598f1b-9a4b-4dd1-900d-80084b794d67

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/js/comment_memory.cjs      | 12 ++++++++++++
 actions/setup/js/comment_memory.test.cjs |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/actions/setup/js/comment_memory.cjs b/actions/setup/js/comment_memory.cjs
index f62d2a16ee5..e94d589745d 100644
--- a/actions/setup/js/comment_memory.cjs
+++ b/actions/setup/js/comment_memory.cjs
@@ -18,6 +18,17 @@ const { COMMENT_MEMORY_TAG, COMMENT_MEMORY_MAX_SCAN_PAGES } = require("./comment
 // that happen to contain a matching comment-memory tag.
 const MANAGED_COMMENT_PROVENANCE_MARKER = "<!-- gh-aw-agentic-workflow:";
 const MANAGED_COMMENT_HEADER = "### Comment Memory";
+const MANAGED_COMMENT_DISCLOSURE_NOTE = [
+  "> [!NOTE]",
+  "> This comment is managed by comment memory.",
+  ">",
+  "> <details>",
+  "> <summary>What this comment does</summary>",
+  ">",
+  "> It stores persistent context for this thread in the `<gh-aw-comment-memory>` block above.",
+  "> Edit only the text in that block; workflow metadata and the footer are regenerated automatically.",
+  "> </details>",
+].join("\n");
 
 function sanitizeMemoryID(memoryID) {
   const normalized = String(memoryID || "default").trim();
@@ -45,6 +56,7 @@ function buildManagedMemoryBody(rawBody, memoryID, options) {
 
   if (includeFooter) {
     core.info(`comment_memory: footer enabled for memory_id='${memoryID}'`);
+    body += "\n\n" + MANAGED_COMMENT_DISCLOSURE_NOTE;
     body += "\n\n" + generateFooterWithMessages(workflowName, runUrl, workflowSource, workflowSourceURL, triggeringIssueNumber, triggeringPRNumber, undefined, historyUrl).trimEnd();
   } else {
     core.info(`comment_memory: footer disabled for memory_id='${memoryID}', adding XML marker only`);
diff --git a/actions/setup/js/comment_memory.test.cjs b/actions/setup/js/comment_memory.test.cjs
index 04f8dad855c..8f7c14ac5b6 100644
--- a/actions/setup/js/comment_memory.test.cjs
+++ b/actions/setup/js/comment_memory.test.cjs
@@ -47,7 +47,11 @@ describe("comment_memory", () => {
     expect(body).toContain("### Comment Memory");
     expect(body).toContain('<gh-aw-comment-memory id="session">');
     expect(body).toContain("Persist me");
+    expect(body).toContain("> [!NOTE]");
+    expect(body).toContain("> <summary>What this comment does</summary>");
     expect(body).toContain("Generated by");
+    expect(body.indexOf("</gh-aw-comment-memory>")).toBeLessThan(body.indexOf("> [!NOTE]"));
+    expect(body.indexOf("> [!NOTE]")).toBeLessThan(body.indexOf("Generated by"));
   });
 
   it("throws E001 for invalid memory ID in managed body builder", async () => {

From e121c0266cdd2d9c45a2678738e1ec1d07452959 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 22 Apr 2026 14:02:09 +0000
Subject: [PATCH 2/5] Refine comment-memory note wording and test readability

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/9d598f1b-9a4b-4dd1-900d-80084b794d67

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/js/comment_memory.cjs      | 2 +-
 actions/setup/js/comment_memory.test.cjs | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/actions/setup/js/comment_memory.cjs b/actions/setup/js/comment_memory.cjs
index e94d589745d..431d1904af8 100644
--- a/actions/setup/js/comment_memory.cjs
+++ b/actions/setup/js/comment_memory.cjs
@@ -25,7 +25,7 @@ const MANAGED_COMMENT_DISCLOSURE_NOTE = [
   "> <details>",
   "> <summary>What this comment does</summary>",
   ">",
-  "> It stores persistent context for this thread in the `<gh-aw-comment-memory>` block above.",
+  "> It stores persistent context for this thread in the `<gh-aw-comment-memory>` block at the top of this comment.",
   "> Edit only the text in that block; workflow metadata and the footer are regenerated automatically.",
   "> </details>",
 ].join("\n");
diff --git a/actions/setup/js/comment_memory.test.cjs b/actions/setup/js/comment_memory.test.cjs
index 8f7c14ac5b6..f67039750ce 100644
--- a/actions/setup/js/comment_memory.test.cjs
+++ b/actions/setup/js/comment_memory.test.cjs
@@ -50,8 +50,11 @@ describe("comment_memory", () => {
     expect(body).toContain("> [!NOTE]");
     expect(body).toContain("> <summary>What this comment does</summary>");
     expect(body).toContain("Generated by");
-    expect(body.indexOf("</gh-aw-comment-memory>")).toBeLessThan(body.indexOf("> [!NOTE]"));
-    expect(body.indexOf("> [!NOTE]")).toBeLessThan(body.indexOf("Generated by"));
+    const memoryEndIdx = body.indexOf("</gh-aw-comment-memory>");
+    const noteIdx = body.indexOf("> [!NOTE]");
+    const footerIdx = body.indexOf("Generated by");
+    expect(memoryEndIdx).toBeLessThan(noteIdx);
+    expect(noteIdx).toBeLessThan(footerIdx);
   });
 
   it("throws E001 for invalid memory ID in managed body builder", async () => {

From a7287eab0e10e5f2542cc293db0563a560deb3e4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 22 Apr 2026 14:15:15 +0000
Subject: [PATCH 3/5] Refactor comment-memory disclosure note into markdown
 template

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/166e5cf2-fed9-4237-a2ce-87e1515f31fb

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/js/comment_memory.cjs                | 14 +++-----------
 actions/setup/md/comment_memory_disclosure_note.md |  9 +++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 actions/setup/md/comment_memory_disclosure_note.md

diff --git a/actions/setup/js/comment_memory.cjs b/actions/setup/js/comment_memory.cjs
index 431d1904af8..9eeaac734c2 100644
--- a/actions/setup/js/comment_memory.cjs
+++ b/actions/setup/js/comment_memory.cjs
@@ -2,12 +2,14 @@
 /// <reference types="@actions/github-script" />
 require("./shim.cjs");
 
+const path = require("path");
 const { sanitizeContent } = require("./sanitize_content.cjs");
 const { getErrorMessage } = require("./error_helpers.cjs");
 const { SAFE_OUTPUT_E001 } = require("./error_codes.cjs");
 const { resolveTarget, isStagedMode } = require("./safe_output_helpers.cjs");
 const { resolveTargetRepoConfig, resolveAndValidateRepo } = require("./repo_helpers.cjs");
 const { createAuthenticatedGitHubClient } = require("./handler_auth.cjs");
+const { renderTemplateFromFile } = require("./messages_core.cjs");
 const { generateFooterWithMessages, generateXMLMarker } = require("./messages_footer.cjs");
 const { buildWorkflowRunUrl } = require("./workflow_metadata_helpers.cjs");
 const { getTrackerID } = require("./get_tracker_id.cjs");
@@ -18,17 +20,7 @@ const { COMMENT_MEMORY_TAG, COMMENT_MEMORY_MAX_SCAN_PAGES } = require("./comment
 // that happen to contain a matching comment-memory tag.
 const MANAGED_COMMENT_PROVENANCE_MARKER = "<!-- gh-aw-agentic-workflow:";
 const MANAGED_COMMENT_HEADER = "### Comment Memory";
-const MANAGED_COMMENT_DISCLOSURE_NOTE = [
-  "> [!NOTE]",
-  "> This comment is managed by comment memory.",
-  ">",
-  "> <details>",
-  "> <summary>What this comment does</summary>",
-  ">",
-  "> It stores persistent context for this thread in the `<gh-aw-comment-memory>` block at the top of this comment.",
-  "> Edit only the text in that block; workflow metadata and the footer are regenerated automatically.",
-  "> </details>",
-].join("\n");
+const MANAGED_COMMENT_DISCLOSURE_NOTE = renderTemplateFromFile(path.join(__dirname, "../md/comment_memory_disclosure_note.md"), {});
 
 function sanitizeMemoryID(memoryID) {
   const normalized = String(memoryID || "default").trim();
diff --git a/actions/setup/md/comment_memory_disclosure_note.md b/actions/setup/md/comment_memory_disclosure_note.md
new file mode 100644
index 00000000000..fd317e2ce48
--- /dev/null
+++ b/actions/setup/md/comment_memory_disclosure_note.md
@@ -0,0 +1,9 @@
+> [!NOTE]
+> This comment is managed by comment memory.
+>
+> <details>
+> <summary>What this comment does</summary>
+>
+> It stores persistent context for this thread in the `<gh-aw-comment-memory>` block at the top of this comment.
+> Edit only the text in that block; workflow metadata and the footer are regenerated automatically.
+> </details>

From 96a86472ed1f01c37773992f36d0afbd443f51bd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 22 Apr 2026 14:37:43 +0000
Subject: [PATCH 4/5] Render comment-memory disclosure note lazily in handler

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/8d98ac82-6815-4400-b775-96d88cbe20a5

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/js/comment_memory.cjs           | 19 ++++++++++++++++---
 .../md/comment_memory_disclosure_note.md      |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/actions/setup/js/comment_memory.cjs b/actions/setup/js/comment_memory.cjs
index 9eeaac734c2..2d349d16eba 100644
--- a/actions/setup/js/comment_memory.cjs
+++ b/actions/setup/js/comment_memory.cjs
@@ -20,7 +20,7 @@ const { COMMENT_MEMORY_TAG, COMMENT_MEMORY_MAX_SCAN_PAGES } = require("./comment
 // that happen to contain a matching comment-memory tag.
 const MANAGED_COMMENT_PROVENANCE_MARKER = "<!-- gh-aw-agentic-workflow:";
 const MANAGED_COMMENT_HEADER = "### Comment Memory";
-const MANAGED_COMMENT_DISCLOSURE_NOTE = renderTemplateFromFile(path.join(__dirname, "../md/comment_memory_disclosure_note.md"), {});
+const MANAGED_COMMENT_DISCLOSURE_NOTE_PATH = path.join(__dirname, "../md/comment_memory_disclosure_note.md");
 
 function sanitizeMemoryID(memoryID) {
   const normalized = String(memoryID || "default").trim();
@@ -32,7 +32,7 @@ function sanitizeMemoryID(memoryID) {
 }
 
 function buildManagedMemoryBody(rawBody, memoryID, options) {
-  const { includeFooter, runUrl, workflowName, workflowSource, workflowSourceURL, historyUrl, triggeringIssueNumber, triggeringPRNumber } = options;
+  const { includeFooter, runUrl, workflowName, workflowSource, workflowSourceURL, historyUrl, triggeringIssueNumber, triggeringPRNumber, disclosureNote } = options;
   if (!/^[a-zA-Z0-9_-]+$/.test(memoryID)) {
     throw new Error(`${SAFE_OUTPUT_E001}: memory_id must contain only alphanumeric characters, hyphens, and underscores`);
   }
@@ -48,7 +48,12 @@ function buildManagedMemoryBody(rawBody, memoryID, options) {
 
   if (includeFooter) {
     core.info(`comment_memory: footer enabled for memory_id='${memoryID}'`);
-    body += "\n\n" + MANAGED_COMMENT_DISCLOSURE_NOTE;
+    const resolvedDisclosureNote =
+      disclosureNote ??
+      renderTemplateFromFile(MANAGED_COMMENT_DISCLOSURE_NOTE_PATH, {
+        comment_memory_tag: COMMENT_MEMORY_TAG,
+      });
+    body += "\n\n" + resolvedDisclosureNote;
     body += "\n\n" + generateFooterWithMessages(workflowName, runUrl, workflowSource, workflowSourceURL, triggeringIssueNumber, triggeringPRNumber, undefined, historyUrl).trimEnd();
   } else {
     core.info(`comment_memory: footer disabled for memory_id='${memoryID}', adding XML marker only`);
@@ -113,6 +118,7 @@ async function main(config = {}) {
   core.info(`comment_memory: initialized with max=${maxCount}, defaultMemoryID='${defaultMemoryID}', target='${target}', footer=${includeFooter}, staged=${staged}`);
 
   let processedCount = 0;
+  let managedCommentDisclosureNote = null;
 
   return async message => {
     if (!message || message.type !== "comment_memory") {
@@ -169,6 +175,12 @@ async function main(config = {}) {
         serverUrl: context.serverUrl,
       }) || undefined;
 
+    if (managedCommentDisclosureNote === null) {
+      managedCommentDisclosureNote = renderTemplateFromFile(MANAGED_COMMENT_DISCLOSURE_NOTE_PATH, {
+        comment_memory_tag: COMMENT_MEMORY_TAG,
+      });
+    }
+
     const managedBody = buildManagedMemoryBody(message.body || "", memoryID, {
       includeFooter,
       runUrl,
@@ -178,6 +190,7 @@ async function main(config = {}) {
       historyUrl,
       triggeringIssueNumber,
       triggeringPRNumber,
+      disclosureNote: managedCommentDisclosureNote,
     });
     try {
       enforceCommentLimits(managedBody);
diff --git a/actions/setup/md/comment_memory_disclosure_note.md b/actions/setup/md/comment_memory_disclosure_note.md
index fd317e2ce48..4791d852adc 100644
--- a/actions/setup/md/comment_memory_disclosure_note.md
+++ b/actions/setup/md/comment_memory_disclosure_note.md
@@ -4,6 +4,6 @@
 > <details>
 > <summary>What this comment does</summary>
 >
-> It stores persistent context for this thread in the `<gh-aw-comment-memory>` block at the top of this comment.
+> It stores persistent context for this thread in the `<{comment_memory_tag}>` block at the top of this comment.
 > Edit only the text in that block; workflow metadata and the footer are regenerated automatically.
 > </details>

From 9f411939b786588967b3e54b2db6993b3a65d343 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 22 Apr 2026 14:41:18 +0000
Subject: [PATCH 5/5] Rename disclosure cache variable for clarity

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/8d98ac82-6815-4400-b775-96d88cbe20a5

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/js/comment_memory.cjs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/actions/setup/js/comment_memory.cjs b/actions/setup/js/comment_memory.cjs
index 2d349d16eba..950e3e5f748 100644
--- a/actions/setup/js/comment_memory.cjs
+++ b/actions/setup/js/comment_memory.cjs
@@ -118,7 +118,7 @@ async function main(config = {}) {
   core.info(`comment_memory: initialized with max=${maxCount}, defaultMemoryID='${defaultMemoryID}', target='${target}', footer=${includeFooter}, staged=${staged}`);
 
   let processedCount = 0;
-  let managedCommentDisclosureNote = null;
+  let cachedDisclosureNote = null;
 
   return async message => {
     if (!message || message.type !== "comment_memory") {
@@ -175,8 +175,8 @@ async function main(config = {}) {
         serverUrl: context.serverUrl,
       }) || undefined;
 
-    if (managedCommentDisclosureNote === null) {
-      managedCommentDisclosureNote = renderTemplateFromFile(MANAGED_COMMENT_DISCLOSURE_NOTE_PATH, {
+    if (cachedDisclosureNote === null) {
+      cachedDisclosureNote = renderTemplateFromFile(MANAGED_COMMENT_DISCLOSURE_NOTE_PATH, {
         comment_memory_tag: COMMENT_MEMORY_TAG,
       });
     }
@@ -190,7 +190,7 @@ async function main(config = {}) {
       historyUrl,
       triggeringIssueNumber,
       triggeringPRNumber,
-      disclosureNote: managedCommentDisclosureNote,
+      disclosureNote: cachedDisclosureNote,
     });
     try {
       enforceCommentLimits(managedBody);