Merge branch 'main' into fix/tool-not-found-invalid-params

Author: latent-9

.github/workflows/conformance-weekly.yaml

@@ -1,13 +1,8 @@
 name: conformance-weekly
 
-# Runs the MCP conformance suite weekly against the latest
-# @modelcontextprotocol/conformance release. The on:pull_request pipeline
-# pins to whatever version is available at PR time; this schedule catches
-# upstream releases that add scenarios between PRs.
-#
-# It also scores each run and publishes the client/server pass-rate as
-# shields.io endpoint JSON to the orphan `badges` branch (consumed by the
-# README); that branch is created on the first run.
+# Tracks the newest published @modelcontextprotocol/conformance; the
+# on:pull_request pipeline pins an exact version instead. Also publishes
+# score badges to the orphan `badges` branch, consumed by the README.
 on:
   schedule:
     - cron: '0 6 * * 1' # Mondays 06:00 UTC
@@ -19,8 +14,20 @@ permissions:
 
 jobs:
   server:
-    name: conformance / server (latest)
+    name: conformance / server (${{ matrix.spec-version }}, ${{ matrix.dist-tag }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - spec-version: '2025-11-25'
+            dist-tag: latest
+            path: '/'
+            baseline: conformance-baseline-2025-11-25.yml
+          - spec-version: '2026-07-28'
+            dist-tag: alpha
+            path: '/'
+            baseline: conformance-baseline-2026-07-28.yml
     steps:
       - uses: actions/checkout@v7
       - uses: actions/setup-node@v7
@@ -35,31 +42,47 @@ jobs:
           sleep 5
       - name: Run conformance tests
         working-directory: ./tests/Conformance
-        run: npx --yes @modelcontextprotocol/conformance@latest server --url http://localhost:8000/ --expected-failures conformance-baseline.yml --output-dir results
+        run: >-
+          npx --yes @modelcontextprotocol/conformance@${{ matrix.dist-tag }} server
+          --url http://localhost:8000${{ matrix.path }}
+          --suite all
+          --spec-version ${{ matrix.spec-version }}
+          --expected-failures ${{ matrix.baseline }}
+          --output-dir results
       - name: Generate score badge
         if: always()
-        run: php tests/Conformance/score.php server
+        run: php tests/Conformance/score.php server ${{ matrix.spec-version }}
       - name: Show docker logs on failure
         if: failure()
         run: docker compose -f tests/Conformance/Fixtures/docker-compose.yml logs
       - name: Upload conformance results
         if: failure()
         uses: actions/upload-artifact@v7
         with:
-          name: conformance-server-results
+          name: conformance-server-results-${{ matrix.spec-version }}
           path: |
             tests/Conformance/logs
             tests/Conformance/results
       - name: Upload score badge
         if: always()
         uses: actions/upload-artifact@v7
         with:
-          name: server-badge
-          path: tests/Conformance/server-conformance.json
+          name: badge-server-${{ matrix.spec-version }}
+          path: tests/Conformance/server-conformance-${{ matrix.spec-version }}.json
 
   client:
-    name: conformance / client (latest)
+    name: conformance / client (${{ matrix.spec-version }}, ${{ matrix.dist-tag }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - spec-version: '2025-11-25'
+            dist-tag: latest
+            baseline: conformance-baseline-2025-11-25.yml
+          - spec-version: '2026-07-28'
+            dist-tag: alpha
+            baseline: conformance-baseline-2026-07-28.yml
     steps:
       - uses: actions/checkout@v7
       - uses: shivammathur/setup-php@v2
@@ -73,24 +96,30 @@ jobs:
       - run: mkdir -p tests/Conformance/logs
       - name: Run conformance tests
         working-directory: ./tests/Conformance
-        run: npx --yes @modelcontextprotocol/conformance@latest client --command "php ${{ github.workspace }}/tests/Conformance/client.php" --suite all --expected-failures conformance-baseline.yml --output-dir results
+        run: >-
+          npx --yes @modelcontextprotocol/conformance@${{ matrix.dist-tag }} client
+          --command "php ${{ github.workspace }}/tests/Conformance/client.php"
+          --suite all
+          --spec-version ${{ matrix.spec-version }}
+          --expected-failures ${{ matrix.baseline }}
+          --output-dir results
       - name: Generate score badge
         if: always()
-        run: php tests/Conformance/score.php client
+        run: php tests/Conformance/score.php client ${{ matrix.spec-version }}
       - name: Upload conformance results
         if: failure()
         uses: actions/upload-artifact@v7
         with:
-          name: conformance-client-results
+          name: conformance-client-results-${{ matrix.spec-version }}
           path: |
             tests/Conformance/logs
             tests/Conformance/results
       - name: Upload score badge
         if: always()
         uses: actions/upload-artifact@v7
         with:
-          name: client-badge
-          path: tests/Conformance/client-conformance.json
+          name: badge-client-${{ matrix.spec-version }}
+          path: tests/Conformance/client-conformance-${{ matrix.spec-version }}.json
 
   notify:
     name: Open issue on failure
@@ -116,26 +145,21 @@ jobs:
           - Run: $RUN_URL
           - Triggered: $(date -u +%FT%TZ)
 
-          Upstream likely published a release whose scenarios the SDK does not satisfy. Either fix the SDK, update the conformance fixtures, or add the new failure to \`tests/Conformance/conformance-baseline.yml\`."
+          Upstream likely published a release whose scenarios the SDK does not satisfy. Either fix the SDK, update the conformance fixtures, or add the new failure to \`tests/Conformance/conformance-baseline-2025-11-25.yml\`."
           fi
 
   publish:
     name: Publish conformance badges
     runs-on: ubuntu-latest
     needs: [server, client]
-    # Publish even when the suite regressed (the badge should reflect reality);
-    # skip on forks, which cannot push the `badges` branch.
     if: ${{ !cancelled() && github.repository == 'modelcontextprotocol/php-sdk' }}
     steps:
       - uses: actions/checkout@v7
       - uses: actions/download-artifact@v8
         with:
-          name: server-badge
-          path: badges-in
-      - uses: actions/download-artifact@v8
-        with:
-          name: client-badge
+          pattern: badge-*
           path: badges-in
+          merge-multiple: true
       - name: Publish to badges branch
         run: |
           git config user.name "github-actions[bot]"
@@ -150,7 +174,8 @@ jobs:
             git -C badges-wt rm -rf --quiet . >/dev/null 2>&1 || true
           fi
 
-          cp badges-in/server-conformance.json badges-in/client-conformance.json badges-wt/
+          rm -f badges-wt/server-conformance.json badges-wt/client-conformance.json
+          cp badges-in/*.json badges-wt/
 
           cd badges-wt
           git add -A

.github/workflows/pipeline.yaml

@@ -5,6 +5,10 @@ permissions:
   contents: read
   pull-requests: write
 
+env:
+  # Pinned exact version; conformance-weekly.yaml tracks upstream releases.
+  CONFORMANCE_PKG: "@modelcontextprotocol/conformance@0.2.0-alpha.11"
+
 jobs:
   unit:
     runs-on: ubuntu-latest
@@ -95,8 +99,19 @@ jobs:
         run: vendor/bin/phpunit --testsuite=inspector
 
   conformance-server:
-    name: conformance / server
+    name: conformance / server (${{ matrix.spec-version }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - spec-version: '2025-11-25'
+            path: '/'
+            baseline: conformance-baseline-2025-11-25.yml
+          - spec-version: '2026-07-28'
+            path: '/'
+            baseline: conformance-baseline-2026-07-28.yml
+
     steps:
       - name: Checkout
         uses: actions/checkout@v7
@@ -118,7 +133,12 @@ jobs:
 
       - name: Run conformance tests
         working-directory: ./tests/Conformance
-        run: npx @modelcontextprotocol/conformance server --url http://localhost:8000/ --expected-failures conformance-baseline.yml
+        run: >-
+          npx --yes ${{ env.CONFORMANCE_PKG }} server
+          --url http://localhost:8000${{ matrix.path }}
+          --suite all
+          --spec-version ${{ matrix.spec-version }}
+          --expected-failures ${{ matrix.baseline }}
 
       - name: Show logs on failure
         if: failure()
@@ -146,8 +166,17 @@ jobs:
         run: docker compose -f tests/Conformance/Fixtures/docker-compose.yml down
 
   conformance-client:
-    name: conformance / client
+    name: conformance / client (${{ matrix.spec-version }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - spec-version: '2025-11-25'
+            baseline: conformance-baseline-2025-11-25.yml
+          - spec-version: '2026-07-28'
+            baseline: conformance-baseline-2026-07-28.yml
+
     steps:
       - name: Checkout
         uses: actions/checkout@v7
@@ -171,7 +200,12 @@ jobs:
 
       - name: Run client conformance tests
         working-directory: ./tests/Conformance
-        run: npx @modelcontextprotocol/conformance client --command "php ${{ github.workspace }}/tests/Conformance/client.php" --suite all --expected-failures conformance-baseline.yml
+        run: >-
+          npx --yes ${{ env.CONFORMANCE_PKG }} client
+          --command "php ${{ github.workspace }}/tests/Conformance/client.php"
+          --suite all
+          --spec-version ${{ matrix.spec-version }}
+          --expected-failures ${{ matrix.baseline }}
 
       - name: Show logs on failure
         if: failure()

.gitignore

@@ -8,7 +8,7 @@ examples/**/cache
 examples/**/sessions
 tests/Conformance/client-conformance.json
 tests/Conformance/server-conformance.json
-tests/Conformance/results
+tests/Conformance/results*
 tests/Conformance/sessions
 tests/Conformance/logs/*.log