From 311c9ac0561b4ad58a33676b6365740520a12e12 Mon Sep 17 00:00:00 2001
From: Jeremiah Lowin <153965+jlowin@users.noreply.github.com>
Date: Mon, 29 Sep 2025 20:39:39 -0400
Subject: [PATCH 1/4] Replace prompt_file with prompt input and set bot_name

---
 .github/workflows/marvin-dedupe-issues.yml | 11 +++++++----
 .github/workflows/marvin-label-triage.yml  | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/marvin-dedupe-issues.yml b/.github/workflows/marvin-dedupe-issues.yml
index a7ba89f68..5d83cbdf7 100644
--- a/.github/workflows/marvin-dedupe-issues.yml
+++ b/.github/workflows/marvin-dedupe-issues.yml
@@ -30,10 +30,11 @@ jobs:
           app-id: ${{ secrets.MARVIN_APP_ID }}
           private-key: ${{ secrets.MARVIN_APP_PRIVATE_KEY }}
 
-      - name: Create dedupe prompt
+      - name: Set dedupe prompt
+        id: dedupe-prompt
         run: |
-          mkdir -p /tmp/claude-prompts
-          cat > /tmp/claude-prompts/dedupe-prompt.txt << 'EOF'
+          cat >> $GITHUB_OUTPUT << 'EOF'
+          PROMPT<<PROMPT_END
           Find up to 3 likely duplicate issues for GitHub issue ${{ github.repository }}/issues/${{ github.event.issue.number || inputs.issue_number }}.
 
           Follow these steps precisely:
@@ -69,13 +70,15 @@ jobs:
           - To prevent auto-closure, add a comment or 👎 this comment
 
           ---
+          PROMPT_END
           EOF
 
       - name: Run Marvin dedupe command
         uses: anthropics/claude-code-action@v1
         with:
           github_token: ${{ steps.marvin-token.outputs.token }}
-          prompt_file: /tmp/claude-prompts/dedupe-prompt.txt
+          bot_name: "Marvin Context Protocol"
+          prompt: ${{ steps.dedupe-prompt.outputs.PROMPT }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY_FOR_CI }}
           claude_args: |
             --allowedTools Bash(gh issue view:*),Bash(gh search:*),Bash(gh issue list:*),Bash(gh api:*),Bash(gh issue comment:*),Task
diff --git a/.github/workflows/marvin-label-triage.yml b/.github/workflows/marvin-label-triage.yml
index 9cba2c6a5..4264741fd 100644
--- a/.github/workflows/marvin-label-triage.yml
+++ b/.github/workflows/marvin-label-triage.yml
@@ -40,10 +40,11 @@ jobs:
           app-id: ${{ secrets.MARVIN_APP_ID }}
           private-key: ${{ secrets.MARVIN_APP_PRIVATE_KEY }}
 
-      - name: Create triage prompt
+      - name: Set triage prompt
+        id: triage-prompt
         run: |
-          mkdir -p /tmp/claude-prompts
-          cat > /tmp/claude-prompts/triage-prompt.txt << 'EOF'
+          cat >> $GITHUB_OUTPUT << 'EOF'
+          PROMPT<<PROMPT_END
           You're an issue triage assistant for FastMCP, a Python framework for building Model Context Protocol servers and clients. Your task is to analyze issues/PRs and apply appropriate labels.
 
           IMPORTANT: Your ONLY action should be to apply labels using mcp__github__update_issue. DO NOT post any comments.
@@ -120,6 +121,7 @@ jobs:
           4. Apply selected labels:
              Use mcp__github__update_issue to apply your selected labels
              DO NOT post any comments
+          PROMPT_END
           EOF
 
       - name: Setup GitHub MCP Server
@@ -150,7 +152,8 @@ jobs:
         uses: anthropics/claude-code-action@v1
         with:
           github_token: ${{ steps.marvin-token.outputs.token }}
-          prompt_file: /tmp/claude-prompts/triage-prompt.txt
+          bot_name: "Marvin Context Protocol"
+          prompt: ${{ steps.triage-prompt.outputs.PROMPT }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY_FOR_CI }}
           claude_args: |
             --allowedTools Bash(gh label list),mcp__github__get_issue,mcp__github__get_issue_comments,mcp__github__update_issue,mcp__github__get_pull_request_files

From 8d06e2de318987d7701f78728122ae569ef54dcb Mon Sep 17 00:00:00 2001
From: Jeremiah Lowin <153965+jlowin@users.noreply.github.com>
Date: Mon, 29 Sep 2025 20:40:28 -0400
Subject: [PATCH 2/4] Remove github_token input, rely on OIDC + env var

---
 .github/workflows/marvin-dedupe-issues.yml | 1 -
 .github/workflows/marvin-label-triage.yml  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/marvin-dedupe-issues.yml b/.github/workflows/marvin-dedupe-issues.yml
index 5d83cbdf7..7fe10af14 100644
--- a/.github/workflows/marvin-dedupe-issues.yml
+++ b/.github/workflows/marvin-dedupe-issues.yml
@@ -76,7 +76,6 @@ jobs:
       - name: Run Marvin dedupe command
         uses: anthropics/claude-code-action@v1
         with:
-          github_token: ${{ steps.marvin-token.outputs.token }}
           bot_name: "Marvin Context Protocol"
           prompt: ${{ steps.dedupe-prompt.outputs.PROMPT }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY_FOR_CI }}
diff --git a/.github/workflows/marvin-label-triage.yml b/.github/workflows/marvin-label-triage.yml
index 4264741fd..d220e9c19 100644
--- a/.github/workflows/marvin-label-triage.yml
+++ b/.github/workflows/marvin-label-triage.yml
@@ -151,7 +151,6 @@ jobs:
       - name: Run Marvin for Issue Triage
         uses: anthropics/claude-code-action@v1
         with:
-          github_token: ${{ steps.marvin-token.outputs.token }}
           bot_name: "Marvin Context Protocol"
           prompt: ${{ steps.triage-prompt.outputs.PROMPT }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY_FOR_CI }}

From 717c4c1e81d93535b4e14bdb705794880afa5de5 Mon Sep 17 00:00:00 2001
From: Jeremiah Lowin <153965+jlowin@users.noreply.github.com>
Date: Mon, 29 Sep 2025 20:41:44 -0400
Subject: [PATCH 3/4] Add github_token back to match working marvin.yml

---
 .github/workflows/marvin-dedupe-issues.yml | 1 +
 .github/workflows/marvin-label-triage.yml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/marvin-dedupe-issues.yml b/.github/workflows/marvin-dedupe-issues.yml
index 7fe10af14..5d83cbdf7 100644
--- a/.github/workflows/marvin-dedupe-issues.yml
+++ b/.github/workflows/marvin-dedupe-issues.yml
@@ -76,6 +76,7 @@ jobs:
       - name: Run Marvin dedupe command
         uses: anthropics/claude-code-action@v1
         with:
+          github_token: ${{ steps.marvin-token.outputs.token }}
           bot_name: "Marvin Context Protocol"
           prompt: ${{ steps.dedupe-prompt.outputs.PROMPT }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY_FOR_CI }}
diff --git a/.github/workflows/marvin-label-triage.yml b/.github/workflows/marvin-label-triage.yml
index d220e9c19..4264741fd 100644
--- a/.github/workflows/marvin-label-triage.yml
+++ b/.github/workflows/marvin-label-triage.yml
@@ -151,6 +151,7 @@ jobs:
       - name: Run Marvin for Issue Triage
         uses: anthropics/claude-code-action@v1
         with:
+          github_token: ${{ steps.marvin-token.outputs.token }}
           bot_name: "Marvin Context Protocol"
           prompt: ${{ steps.triage-prompt.outputs.PROMPT }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY_FOR_CI }}

From 8ae918974879ff5d884bf65ec435141a66ab240e Mon Sep 17 00:00:00 2001
From: Jeremiah Lowin <153965+jlowin@users.noreply.github.com>
Date: Mon, 29 Sep 2025 20:48:25 -0400
Subject: [PATCH 4/4] Remove github_token to use built-in claude[bot] auth

---
 .github/workflows/marvin-dedupe-issues.yml | 1 -
 .github/workflows/marvin-label-triage.yml  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/marvin-dedupe-issues.yml b/.github/workflows/marvin-dedupe-issues.yml
index 5d83cbdf7..7fe10af14 100644
--- a/.github/workflows/marvin-dedupe-issues.yml
+++ b/.github/workflows/marvin-dedupe-issues.yml
@@ -76,7 +76,6 @@ jobs:
       - name: Run Marvin dedupe command
         uses: anthropics/claude-code-action@v1
         with:
-          github_token: ${{ steps.marvin-token.outputs.token }}
           bot_name: "Marvin Context Protocol"
           prompt: ${{ steps.dedupe-prompt.outputs.PROMPT }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY_FOR_CI }}
diff --git a/.github/workflows/marvin-label-triage.yml b/.github/workflows/marvin-label-triage.yml
index 4264741fd..d220e9c19 100644
--- a/.github/workflows/marvin-label-triage.yml
+++ b/.github/workflows/marvin-label-triage.yml
@@ -151,7 +151,6 @@ jobs:
       - name: Run Marvin for Issue Triage
         uses: anthropics/claude-code-action@v1
         with:
-          github_token: ${{ steps.marvin-token.outputs.token }}
           bot_name: "Marvin Context Protocol"
           prompt: ${{ steps.triage-prompt.outputs.PROMPT }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY_FOR_CI }}