Merge branch 'main' into feat/keycloak-auth-provider

Author: stephaneberle9

.github/workflows/auto-close-duplicates.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Generate Marvin App token
         id: marvin-token

.github/workflows/auto-close-needs-mre.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Generate Marvin App token
         id: marvin-token

.github/workflows/martian-issue-triage.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout base repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ github.repository }}
           ref: ${{ github.event.repository.default_branch }}

.github/workflows/martian-test-failure.yml

@@ -23,7 +23,7 @@ jobs:
       actions: read # Required for Claude to read CI results
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
 
@@ -104,27 +104,30 @@ jobs:
           </details>
 
           # Important Guidelines
-          - Be concise and actionable - developers want to quickly understand and fix the issue
+          - Be concise and actionable - developers want to quickly understand and fix the issue. Provide
+            additional context, references, etc in collapsible details blocks to ensure that the comment you're adding
+            is short and easy to read but additional information is a click away.
           - Focus on facts from the logs and code, not speculation
           - If you can't determine the root cause, say so clearly
+          - If your only suggestion is a bad suggestion (disable the test, change the timeout, etc), indicate that you've run out of ideas and
+            that they probably don't want to do that.
           - Provide specific file names, line numbers, and code references when possible
           - You can run make commands (e.g., `make lint`, `make typecheck`, `make sync`) to build, test, or lint the code
           - You can also run git commands (e.g., `git status`, `git log`, `git diff`) to inspect the repository
           - You can use WebSearch and WebFetch to research errors, stack traces, or related issues
           - For bash commands, you are limited to make and git commands only
 
-          # CRITICAL: Loop Detection
-          **IMPORTANT**: Before posting your analysis, check the PR comments to detect if there's a loop where:
-          - CodeRabbit or another bot triggered this workflow
-          - Your previous analysis triggered CodeRabbit or another bot
-          - This created a repeating cycle of bot comments
-
           # CRITICAL: ANGRY USERS
           **IMPORTANT**: If the user is angry with you, the triage bot, don't respond. Just exit immediately without further action.
+            If at any point in the conversation the user has asked you to stop replying to the thread, just exit immediately.
+
+          If you are posting the same suggestion as you have previously made, do not post the suggestion again.
 
-          If you detect such a loop (e.g., you see multiple similar bot comments or your own previous analysis comments):
-          1. **DO NOT** post another analysis comment
-          2. Exit immediately without further action
+          # IMPORTANT: EDIT YOUR COMMENT
+          Do not post a new comment every time you triage a failing workflow. If a previous comment has been posted by you (marvin)
+          in a previous triage, edit that comment do not add a new comment for each failure. Be sure to include a note that you've edited
+          your comment to reflect the latest analysis. Don't worry about keeping the old content around, there's comment history for 
+          that.
 
           # Problems Encountered
           If you encounter any problems during your analysis (e.g., unable to fetch logs, tools not working), document them clearly so the team knows what limitations you faced.

.github/workflows/marvin-dedupe-issues.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Generate Marvin App token
         id: marvin-token

.github/workflows/marvin-label-triage.yml

@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout base repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ github.repository }}
           ref: ${{ github.event.repository.default_branch }}

.github/workflows/marvin.yml

@@ -31,7 +31,7 @@ jobs:
       (github.event_name == 'issues' && github.event.action == 'labeled' && github.event.label.name == 'marvin')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       # Install UV package manager
       - name: Install UV

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ jobs:
       id-token: write # For PyPI's trusted publishing
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/run-static.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install uv
         uses: astral-sh/setup-uv@v7
         with:

.github/workflows/run-tests.yml

@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install uv
         uses: astral-sh/setup-uv@v7
@@ -60,7 +60,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install uv
         uses: astral-sh/setup-uv@v7
@@ -85,7 +85,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install uv
         uses: astral-sh/setup-uv@v7
@@ -99,8 +99,8 @@ jobs:
         run: uv sync --upgrade
 
       - name: Run integration tests
-        # use longer per-test timeout than the default 3s
-        run: uv run pytest tests -m "integration" --timeout=15 --numprocesses auto --maxprocesses 2 --dist worksteal
+        # use longer per-test timeout for remote API calls (default is 5s)
+        run: uv run pytest tests -m "integration" --timeout=30 --numprocesses auto --maxprocesses 2 --dist worksteal
         env:
           FASTMCP_GITHUB_TOKEN: ${{ secrets.FASTMCP_GITHUB_TOKEN }}
           FASTMCP_TEST_AUTH_GITHUB_CLIENT_ID: ${{ secrets.FASTMCP_TEST_AUTH_GITHUB_CLIENT_ID }}