Merge branch 'main' into main

Author: strawgate

.github/pull_request_template.md

@@ -0,0 +1,28 @@
+## Description
+<!-- 
+Please provide a clear and concise description of the changes made in this pull request.
+
+Using AI to generate code? Please include a note in the description with which AI tool you used.
+-->
+
+**Contributors Checklist**
+<!--
+NOTE:
+1. You must create an issue in the repository before making a Pull Request.
+2. You must not create a Pull Request for an issue that is already assigned to someone else.
+
+If you do not follow these steps, your Pull Request will be closed without review.
+-->
+
+- [ ] My change is related to issue #(issue number)
+- [ ] I have followed the repository's development workflow
+- [ ] I have tested my changes manually and by adding relevant tests
+- [ ] I have performed all required documentation updates
+
+**Review Checklist**
+<!-- Your Pull Request will not be reviewed if tests are failing, you have not self-reviewed your changes, or you have not checked all of the following: -->
+
+- [ ] I have self-reviewed my changes
+- [ ] My Pull Request is ready for review
+
+---

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

@@ -15,10 +15,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v6
 
       - name: Auto-close duplicate issues
         run: uv run scripts/auto_close_duplicates.py

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

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Generate Marvin App token
         id: marvin-token
@@ -45,7 +45,7 @@ jobs:
 
           4. Next, feed the results from steps 2 and 3 into another agent using the Task tool, so that it can filter out false positives that are likely not actually duplicates of the original issue. If there are no duplicates remaining, do not proceed.
 
-          5. Finally, comment back on the issue with a list of up to three duplicate issues (or zero, if there are no likely duplicates)
+          5. Finally, comment back on the issue with a list of up to three duplicate issues (or zero, if there are no likely duplicates). If there are no duplicates, DO NOT COMMENT. Just exit.
 
           Notes for your agents:
           - Use `gh` to interact with GitHub, rather than web fetch
@@ -72,8 +72,9 @@ jobs:
       - name: Run Marvin dedupe command
         uses: anthropics/claude-code-base-action@beta
         with:
+          model: claude-3-5-haiku-latest
           prompt_file: /tmp/claude-prompts/dedupe-prompt.txt
           allowed_tools: "Bash(gh issue view:*),Bash(gh search:*),Bash(gh issue list:*),Bash(gh api:*),Bash(gh issue comment:*),Task"
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY_FOR_CI }}
           claude_env: |
             GH_TOKEN: ${{ steps.marvin-token.outputs.token }}

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

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout base repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: ${{ github.repository }}
           ref: ${{ github.event.repository.default_branch }}
@@ -151,7 +151,7 @@ jobs:
           prompt_file: /tmp/claude-prompts/triage-prompt.txt
           allowed_tools: "Bash(gh label list),mcp__github__get_issue,mcp__github__get_issue_comments,mcp__github__update_issue,mcp__github__get_pull_request_files"
           timeout_minutes: "5"
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY_FOR_CI }}
           mcp_config: /tmp/mcp-config/mcp-servers.json
           claude_env: |
             GH_TOKEN: ${{ steps.marvin-token.outputs.token }}

.github/workflows/marvin.yml

@@ -31,24 +31,18 @@ jobs:
       (github.event_name == 'issues' && github.event.action == 'labeled' && github.event.label.name == 'marvin')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-
-      # Set up Python environment
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
+      - uses: actions/checkout@v5
 
       # Install UV package manager
       - name: Install UV
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"
 
       # Install project dependencies
       - name: Install dependencies
-        run: uv sync --dev
+        run: uv sync --python 3.12
 
       # Install pre-commit hooks automatically
       - name: Install pre-commit hooks

.github/workflows/publish.yml

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

.github/workflows/run-static.yml

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

.github/workflows/run-tests.yml

@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install uv
         uses: astral-sh/setup-uv@v6
@@ -48,18 +48,18 @@ jobs:
         run: uv sync --frozen
 
       - name: Run tests (excluding integration and client_process)
-        run: uv run pytest tests -m "not integration and not client_process"
+        run: uv run pytest -v tests -m "not integration and not client_process"
 
       - name: Run client process tests separately
-        run: uv run pytest tests -m "client_process" -x
+        run: uv run pytest -v tests -m "client_process" -x
 
   run_integration_tests:
     name: "Run integration tests"
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install uv
         uses: astral-sh/setup-uv@v6
@@ -73,7 +73,7 @@ jobs:
         run: uv sync --frozen
 
       - name: Run integration tests
-        run: uv run pytest tests -m "integration"
+        run: uv run pytest -v tests -m "integration"
         env:
           FASTMCP_GITHUB_TOKEN: ${{ secrets.FASTMCP_GITHUB_TOKEN }}
           FASTMCP_TEST_AUTH_GITHUB_CLIENT_ID: ${{ secrets.FASTMCP_TEST_AUTH_GITHUB_CLIENT_ID }}

.github/workflows/update-config-schema.yml

@@ -0,0 +1,89 @@
+name: Update FastMCPConfig Schema
+
+# This workflow runs on merges to main to automatically update the config schema
+# by creating a PR when changes are needed.
+
+on:
+  push:
+    branches: ["main"]
+    paths:
+      - "src/fastmcp/utilities/fastmcp_config/**"
+      - "!src/fastmcp/utilities/fastmcp_config/v1/schema.json" # Exclude the local schema file
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  update-config-schema:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Generate Marvin App token
+        id: marvin-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ secrets.MARVIN_APP_ID }}
+          private-key: ${{ secrets.MARVIN_APP_PRIVATE_KEY }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+
+      - name: Install dependencies
+        run: uv sync --python 3.12
+
+      - name: Generate config schema
+        run: |
+          echo "🔄 Generating fastmcp.json schema..."
+
+          # Generate schema in docs/public for web access
+          uv run python -c "
+          from fastmcp.utilities.fastmcp_config import generate_schema
+          generate_schema('docs/public/schemas/fastmcp.json/latest.json')
+          print('✅ Latest schema generated in docs/public')
+          "
+
+          # Also update the v1 schema in docs/public
+          uv run python -c "
+          from fastmcp.utilities.fastmcp_config import generate_schema
+          generate_schema('docs/public/schemas/fastmcp.json/v1.json')
+          print('✅ v1 schema generated in docs/public')
+          "
+
+          # Generate schema in the source directory for local development
+          uv run python -c "
+          from fastmcp.utilities.fastmcp_config import generate_schema
+          generate_schema('src/fastmcp/utilities/fastmcp_config/v1/schema.json')
+          print('✅ Schema generated in utilities/fastmcp_config/v1/')
+          "
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ steps.marvin-token.outputs.token }}
+          commit-message: "chore: Update fastmcp.json schema"
+          title: "chore: Update fastmcp.json schema"
+          body: |
+            This PR updates the fastmcp.json schema files to match the current source code.
+
+            The schema is automatically generated from `src/fastmcp/utilities/fastmcp_config/` to ensure consistency.
+
+            **Note:** This PR is fully automated and will update itself with any subsequent changes to the schema, or close automatically if the schema becomes up-to-date through other means. Feel free to leave it open until you're ready to merge.
+
+            🤖 Generated by Marvin
+          branch: marvin/update-config-schema
+          delete-branch: true
+          author: "marvin-context-protocol[bot] <225465937+marvin-context-protocol[bot]@users.noreply.github.com>"
+          committer: "marvin-context-protocol[bot] <225465937+marvin-context-protocol[bot]@users.noreply.github.com>"
+
+      - name: Summary
+        run: |
+          echo "✅ Config schema generation workflow completed"
+          echo "PR will be created if there are changes, or closed if schema is already up to date"

.github/workflows/update-sdk-docs.yml

@@ -1,8 +1,7 @@
 name: Update SDK Documentation
 
 # This workflow runs on merges to main to automatically update SDK docs
-# without blocking PRs. SDK doc generation can fail if another PR merges
-# first, so handling it post-merge prevents annoying CI failures for contributors.
+# by creating a PR when changes are needed.
 
 on:
   push:
@@ -22,23 +21,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+
+      - name: Generate Marvin App token
+        id: marvin-token
+        uses: actions/create-github-app-token@v2
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          app-id: ${{ secrets.MARVIN_APP_ID }}
+          private-key: ${{ secrets.MARVIN_APP_PRIVATE_KEY }}
 
       - name: Install uv
         uses: astral-sh/setup-uv@v6
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"
 
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
       - name: Install dependencies
-        run: uv sync --dev
+        run: uv sync --python 3.12
 
       - name: Install just
         uses: extractions/setup-just@v3
@@ -48,34 +47,26 @@ jobs:
           echo "🔄 Generating SDK documentation..."
           just api-ref-all
 
-      - name: Check for changes
-        id: check_changes
-        run: |
-          if git diff --quiet docs/python-sdk/ docs/docs.json; then
-            echo "No changes detected in SDK documentation"
-            echo "has_changes=false" >> $GITHUB_OUTPUT
-          else
-            echo "Changes detected in SDK documentation"
-            echo "has_changes=true" >> $GITHUB_OUTPUT
-          fi
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ steps.marvin-token.outputs.token }}
+          commit-message: "chore: Update SDK documentation"
+          title: "chore: Update SDK documentation"
+          body: |
+            This PR updates the auto-generated SDK documentation to reflect the latest source code changes.
 
-      - name: Commit and push changes
-        if: steps.check_changes.outputs.has_changes == 'true'
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "GitHub Action"
-          git add docs/python-sdk/ docs/docs.json
-          git commit -m "chore: Update SDK documentation
+            📚 Documentation is automatically generated from the source code docstrings and type annotations.
 
-          🤖 Generated with [Claude Code](https://claude.ai/code)
+            **Note:** This PR is fully automated and will update itself with any subsequent changes to the SDK, or close automatically if the documentation becomes up-to-date through other means. Feel free to leave it open until you're ready to merge.
 
-          Co-Authored-By: Claude <[email protected]>"
-          git push
+            🤖 Generated by Marvin
+          branch: marvin/update-sdk-docs
+          delete-branch: true
+          author: "marvin-context-protocol[bot] <225465937+marvin-context-protocol[bot]@users.noreply.github.com>"
+          committer: "marvin-context-protocol[bot] <225465937+marvin-context-protocol[bot]@users.noreply.github.com>"
 
       - name: Summary
         run: |
-          if [ "${{ steps.check_changes.outputs.has_changes }}" == "true" ]; then
-            echo "✅ SDK documentation updated and committed"
-          else
-            echo "✅ SDK documentation is already up to date"
-          fi
+          echo "✅ SDK documentation generation workflow completed"
+          echo "PR will be created if there are changes, or closed if documentation is already up to date"