From d9feb9e420c6ed255fcea2e2eaf61fce7427f97a Mon Sep 17 00:00:00 2001
From: Ed Burns <edburns@microsoft.com>
Date: Thu, 18 Jun 2026 18:27:59 -0400
Subject: [PATCH 1/3] normalize-sharing-prompts-during-iteration
 .github/workflows/block-remove-before-merge.yml

I find it useful to store prompt and design files in a directory such as `1682-java-tool-ergonomics-prompts-remove-before-merge` and have them live on the topic branch during iteration. But I never want to accidentally have those files merged.

This workflow prevents such accidental merges from happening.
---
 .../workflows/block-remove-before-merge.yml   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/block-remove-before-merge.yml

diff --git a/.github/workflows/block-remove-before-merge.yml b/.github/workflows/block-remove-before-merge.yml
new file mode 100644
index 000000000..8fae30c41
--- /dev/null
+++ b/.github/workflows/block-remove-before-merge.yml
@@ -0,0 +1,27 @@
+name: "Block remove-before-merge paths"
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  check-paths:
+    name: "No remove-before-merge directories"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for remove-before-merge paths in PR
+        env:
+          GH_TOKEN: ${{ github.token }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          REPO: ${{ github.repository }}
+        run: |
+          FILES=$(gh api repos/$REPO/pulls/$PR_NUMBER/files --paginate --jq '.[].filename')
+          BLOCKED=$(echo "$FILES" | grep -E '(^|/)[-a-zA-Z0-9_]+-remove-before-merge(/|$)' || true)
+          if [ -n "$BLOCKED" ]; then
+            echo "::error::This PR contains files under a 'remove-before-merge' directory. Remove them before merging."
+            echo ""
+            echo "Offending paths:"
+            echo "$BLOCKED"
+            exit 1
+          fi
+          echo "No remove-before-merge paths found. ✅"

From 43a8d63f7f354ded9d549509954135d6909087bc Mon Sep 17 00:00:00 2001
From: Ed Burns <edburns@microsoft.com>
Date: Thu, 18 Jun 2026 18:42:50 -0400
Subject: [PATCH 2/3] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/block-remove-before-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/block-remove-before-merge.yml b/.github/workflows/block-remove-before-merge.yml
index 8fae30c41..0536d9f80 100644
--- a/.github/workflows/block-remove-before-merge.yml
+++ b/.github/workflows/block-remove-before-merge.yml
@@ -3,7 +3,7 @@ name: "Block remove-before-merge paths"
 on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
-
+  merge_group:
 jobs:
   check-paths:
     name: "No remove-before-merge directories"

From 7c5f177e179f6c8a2d0ee3a76b47cb08d36785de Mon Sep 17 00:00:00 2001
From: Ed Burns <edburns@microsoft.com>
Date: Thu, 18 Jun 2026 18:47:45 -0400
Subject: [PATCH 3/3] Add explicit pull request read permission to workflow

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/block-remove-before-merge.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/block-remove-before-merge.yml b/.github/workflows/block-remove-before-merge.yml
index 0536d9f80..126605ad8 100644
--- a/.github/workflows/block-remove-before-merge.yml
+++ b/.github/workflows/block-remove-before-merge.yml
@@ -4,6 +4,10 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
   merge_group:
+
+permissions:
+  pull-requests: read
+
 jobs:
   check-paths:
     name: "No remove-before-merge directories"