From 7fa340de6e53625024ba2f36836945fe8183d647 Mon Sep 17 00:00:00 2001
From: LeanBitLab <245915690+LeanBitLab@users.noreply.github.com>
Date: Thu, 30 Apr 2026 20:28:33 +0000
Subject: [PATCH 1/2] Fix missing dependencies in jules-merge GitHub Action

Added `--package=@google/jules-sdk` and `--package=@modelcontextprotocol/sdk` to the `npx` command in `.github/workflows/jules-merge-conflicts.yml` to supply the missing dependencies required by the `@google/jules-merge` SDK execution.
---
 .github/workflows/jules-merge-conflicts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/jules-merge-conflicts.yml b/.github/workflows/jules-merge-conflicts.yml
index 6e85f3d..e6f437d 100644
--- a/.github/workflows/jules-merge-conflicts.yml
+++ b/.github/workflows/jules-merge-conflicts.yml
@@ -20,4 +20,4 @@ jobs:
 
       - name: Scan for overlapping changes
         run: |
-          npx -y --package=@google/jules-merge jules-merge scan --json '{"prs":[${{ github.event.pull_request.number }}],"repo":"${{ github.repository }}","base":"${{ github.event.pull_request.base.ref }}"}'
+          npx -y --package=@google/jules-sdk --package=@modelcontextprotocol/sdk --package=@google/jules-merge jules-merge scan --json '{"prs":[${{ github.event.pull_request.number }}],"repo":"${{ github.repository }}","base":"${{ github.event.pull_request.base.ref }}"}'

From 15a2140180c0a893df57127fcdfcbaed654d49f0 Mon Sep 17 00:00:00 2001
From: LeanBitLab <245915690+LeanBitLab@users.noreply.github.com>
Date: Thu, 30 Apr 2026 20:33:00 +0000
Subject: [PATCH 2/2] Provide GitHub token to jules-merge action

Added `GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}` to the environment variables for the jules-merge scan step to resolve the "GitHub auth not configured" failure.
---
 .github/workflows/jules-merge-conflicts.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/jules-merge-conflicts.yml b/.github/workflows/jules-merge-conflicts.yml
index e6f437d..7b31d84 100644
--- a/.github/workflows/jules-merge-conflicts.yml
+++ b/.github/workflows/jules-merge-conflicts.yml
@@ -19,5 +19,7 @@ jobs:
           fetch-depth: 0
 
       - name: Scan for overlapping changes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           npx -y --package=@google/jules-sdk --package=@modelcontextprotocol/sdk --package=@google/jules-merge jules-merge scan --json '{"prs":[${{ github.event.pull_request.number }}],"repo":"${{ github.repository }}","base":"${{ github.event.pull_request.base.ref }}"}'