Merge branch 'main' into fix/auth-requestinit-headers

Author: pcarleton

.github/workflows/main.yml

@@ -18,19 +18,35 @@ jobs:
             - uses: actions/checkout@v4
             - uses: actions/setup-node@v4
               with:
-                  node-version: 18
+                  node-version: 24
                   cache: npm
 
             - run: npm ci
+            - run: npm run check
             - run: npm run build
+
+    test:
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                node-version: [18, 24]
+
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+                  cache: npm
+
+            - run: npm ci
             - run: npm test
-            - run: npm run lint
 
     publish:
         runs-on: ubuntu-latest
         if: github.event_name == 'release'
         environment: release
-        needs: build
+        needs: [build, test]
 
         permissions:
             contents: read
@@ -40,7 +56,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: actions/setup-node@v4
               with:
-                  node-version: 18
+                  node-version: 24
                   cache: npm
                   registry-url: 'https://registry.npmjs.org'
 

.github/workflows/publish.yml

@@ -0,0 +1,27 @@
+name: Publish Any Commit
+permissions:
+    contents: read
+on:
+    pull_request:
+    push:
+        branches:
+            - '**'
+        tags:
+            - '!**'
+
+jobs:
+    pkg-publish:
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: 24
+                  cache: npm
+
+            - run: npm ci
+            - name: Build
+              run: npm run build
+            - name: Publish
+              run: npx pkg-pr-new publish

.github/workflows/update-spec-types.yml

@@ -0,0 +1,71 @@
+name: Update Spec Types
+
+on:
+    schedule:
+        # Run nightly at 4 AM UTC
+        - cron: '0 4 * * *'
+    workflow_dispatch:
+
+permissions:
+    contents: write
+    pull-requests: write
+
+jobs:
+    update-spec-types:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: '24'
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Fetch latest spec types
+              run: npm run fetch:spec-types
+
+            - name: Check for changes
+              id: check_changes
+              run: |
+                  if git diff --quiet src/spec.types.ts; then
+                    echo "has_changes=false" >> $GITHUB_OUTPUT
+                  else
+                    echo "has_changes=true" >> $GITHUB_OUTPUT
+                    LATEST_SHA=$(grep "Last updated from commit:" src/spec.types.ts | cut -d: -f2 | tr -d ' ')
+                    echo "sha=$LATEST_SHA" >> $GITHUB_OUTPUT
+                  fi
+
+            - name: Create Pull Request
+              if: steps.check_changes.outputs.has_changes == 'true'
+              env:
+                  GH_TOKEN: ${{ github.token }}
+              run: |
+                  git config user.name "github-actions[bot]"
+                  git config user.email "github-actions[bot]@users.noreply.github.com"
+
+                  git checkout -B update-spec-types
+                  git add src/spec.types.ts
+                  git commit -m "chore: update spec.types.ts from upstream"
+                  git push -f origin update-spec-types
+
+                  # Create PR if it doesn't exist, or update if it does
+                  PR_BODY="This PR updates \`src/spec.types.ts\` from the Model Context Protocol specification.
+
+                  Source file: https://github.com/modelcontextprotocol/modelcontextprotocol/blob/${{ steps.check_changes.outputs.sha }}/schema/draft/schema.ts
+
+                  This is an automated update triggered by the nightly cron job."
+
+                  if gh pr view update-spec-types &>/dev/null; then
+                    echo "PR already exists, updating description..."
+                    gh pr edit update-spec-types --body "$PR_BODY"
+                  else
+                    gh pr create \
+                      --title "chore: update spec.types.ts from upstream" \
+                      --body "$PR_BODY" \
+                      --base main \
+                      --head update-spec-types
+                  fi

.gitignore

@@ -69,9 +69,6 @@ web_modules/
 # Output of 'npm pack'
 *.tgz
 
-# Output of 'npm run fetch:spec-types'
-spec.types.ts
-
 # Yarn Integrity file
 .yarn-integrity
 

.prettierignore

@@ -7,4 +7,7 @@ node_modules
 **/build
 **/dist
 .github/CODEOWNERS
-pnpm-lock.yaml
+pnpm-lock.yaml
+
+# Ignore generated files
+src/spec.types.ts

eslint.config.mjs

@@ -15,6 +15,9 @@ export default tseslint.config(
             '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }]
         }
     },
+    {
+        ignores: ['src/spec.types.ts']
+    },
     {
         files: ['src/client/**/*.ts', 'src/server/**/*.ts'],
         ignores: ['**/*.test.ts'],

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@modelcontextprotocol/sdk",
-    "version": "1.21.0",
+    "version": "1.21.1",
     "description": "Model Context Protocol implementation for TypeScript",
     "license": "MIT",
     "author": "Anthropic, PBC (https://anthropic.com)",
@@ -59,7 +59,8 @@
         "dist"
     ],
     "scripts": {
-        "fetch:spec-types": "curl -o spec.types.ts https://raw.githubusercontent.com/modelcontextprotocol/modelcontextprotocol/refs/heads/main/schema/draft/schema.ts",
+        "fetch:spec-types": "tsx scripts/fetch-spec-types.ts",
+        "typecheck": "tsgo --noEmit",
         "build": "npm run build:esm && npm run build:cjs",
         "build:esm": "mkdir -p dist/esm && echo '{\"type\": \"module\"}' > dist/esm/package.json && tsc -p tsconfig.prod.json",
         "build:esm:w": "npm run build:esm -- -w",
@@ -69,10 +70,11 @@
         "prepack": "npm run build:esm && npm run build:cjs",
         "lint": "eslint src/ && prettier --check .",
         "lint:fix": "eslint src/ --fix && prettier --write .",
-        "test": "npm run fetch:spec-types && jest",
+        "check": "npm run typecheck && npm run lint",
+        "test": "jest",
         "start": "npm run server",
-        "server": "tsx watch --clear-screen=false src/cli.ts server",
-        "client": "tsx src/cli.ts client"
+        "server": "tsx watch --clear-screen=false scripts/cli.ts server",
+        "client": "tsx scripts/cli.ts client"
     },
     "dependencies": {
         "ajv": "^8.17.1",
@@ -111,6 +113,7 @@
         "@types/node": "^22.0.2",
         "@types/supertest": "^6.0.2",
         "@types/ws": "^8.5.12",
+        "@typescript/native-preview": "^7.0.0-dev.20251103.1",
         "eslint": "^9.8.0",
         "eslint-config-prettier": "^10.1.8",
         "jest": "^29.7.0",