From 3f7d5393a7cbde6b973e8a29cc869f07dc1ab3e0 Mon Sep 17 00:00:00 2001
From: Radhika Gupta <guptaradhika@microsoft.com>
Date: Fri, 6 Nov 2026 08:46:17 -0800
Subject: [PATCH 1/2] Require current PR link in changelog CI

---
 .github/workflows/pr-validation.yml | 25 ++++++++++++++++++++++++-
 CHANGELOG.md                        |  5 +++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
index ae105d3b0..ae424c3e0 100644
--- a/.github/workflows/pr-validation.yml
+++ b/.github/workflows/pr-validation.yml
@@ -22,10 +22,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Verify CHANGELOG.md was updated
+      - name: Verify CHANGELOG.md was updated and links this PR
         env:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
         run: |
           if git diff --name-only "$BASE_SHA...$HEAD_SHA" | grep -qx 'CHANGELOG.md'; then
             echo "CHANGELOG.md was updated."
@@ -35,6 +37,27 @@ jobs:
             exit 1
           fi
 
+          added_changelog_lines="$(
+            git diff --unified=0 "$BASE_SHA...$HEAD_SHA" -- CHANGELOG.md |
+              awk '
+                /^@@/ {
+                  in_hunk = 1
+                  next
+                }
+                in_hunk && /^\+/ {
+                  print substr($0, 2)
+                }
+              '
+          )"
+          expected_pr_link="([#$PR_NUMBER]($PR_URL))"
+          if grep -Fq "$expected_pr_link" <<< "$added_changelog_lines"; then
+            echo "CHANGELOG.md links to PR #$PR_NUMBER."
+          else
+            echo "::error::New CHANGELOG.md content does not link to this PR."
+            echo "Add $expected_pr_link to the changelog entry, or apply the 'skip-changelog' label."
+            exit 1
+          fi
+
   lockfile:
     name: uv.lock is up to date
     runs-on: ubuntu-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 707b701b3..476c87b8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Release History
+#
+
+### Features Added
+- Testing to see if changelog validation works
+
 # 1.6.0 (2026-11-05)
 
 ### Features Added

From 89f01aacdb06fb38381c688f89ec070561dccc50 Mon Sep 17 00:00:00 2001
From: Radhika Gupta <guptaradhika@microsoft.com>
Date: Fri, 6 Nov 2026 09:08:33 -0800
Subject: [PATCH 2/2] Remove test changelog entry

---
 CHANGELOG.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 476c87b8a..707b701b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,4 @@
 # Release History
-#
-
-### Features Added
-- Testing to see if changelog validation works
-
 # 1.6.0 (2026-11-05)
 
 ### Features Added