Merge upstream/main and resolve conflicts

Author: grimmerk

.github/workflows/main.yml

@@ -1,51 +1,89 @@
 on:
-  push:
-    branches:
-      - main
-  pull_request:
-  release:
-    types: [published]
+    push:
+        branches:
+            - main
+    pull_request:
+    workflow_dispatch:
+    release:
+        types: [published]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: npm
-
-      - run: npm ci
-      - run: npm run build
-      - run: npm test
-      - run: npm run lint
-
-  publish:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'release'
-    environment: release
-    needs: build
-
-    permissions:
-      contents: read
-      id-token: write
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: npm
-          registry-url: 'https://registry.npmjs.org'
-
-      - run: npm ci
-
-      - run: npm publish --provenance --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
+              with:
+                  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
+
+    publish:
+        runs-on: ubuntu-latest
+        if: github.event_name == 'release'
+        environment: release
+        needs: [build, test]
+
+        permissions:
+            contents: read
+            id-token: write
+
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: 24
+                  cache: npm
+                  registry-url: 'https://registry.npmjs.org'
+
+            - run: npm ci
+
+            - name: Determine npm tag
+              id: npm-tag
+              run: |
+                  VERSION=$(node -p "require('./package.json').version")
+                  # Check if this is a beta release
+                  if [[ "$VERSION" == *"-beta"* ]]; then
+                    echo "tag=--tag beta" >> $GITHUB_OUTPUT
+                  # Check if this release is from a non-main branch (patch/maintenance release)
+                  elif [[ "${{ github.event.release.target_commitish }}" != "main" ]]; then
+                    # Use "release-X.Y" as tag for old branch releases (e.g., "release-1.23" for 1.23.x)
+                    # npm tags are mutable pointers to versions (like "latest" pointing to 1.24.3).
+                    # Using "release-1.23" means users can `npm install @modelcontextprotocol/sdk@release-1.23`
+                    # to get the latest patch on that minor version, and the tag updates if we
+                    # release 1.23.2, 1.23.3, etc.
+                    # Note: Can't use "v1.23" because npm rejects tags that look like semver ranges.
+                    MAJOR_MINOR=$(echo "$VERSION" | cut -d. -f1,2)
+                    echo "tag=--tag release-${MAJOR_MINOR}" >> $GITHUB_OUTPUT
+                  else
+                    echo "tag=" >> $GITHUB_OUTPUT
+                  fi
+
+            - run: npm publish --provenance --access public ${{ steps.npm-tag.outputs.tag }}
+              env:
+                  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.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
 
@@ -133,3 +130,6 @@ out
 
 .DS_Store
 dist/
+
+# IDE
+.idea/

.prettierignore

@@ -0,0 +1,13 @@
+# Ignore artifacts:
+build
+dist
+coverage
+*-lock.*
+node_modules
+**/build
+**/dist
+.github/CODEOWNERS
+pnpm-lock.yaml
+
+# Ignore generated files
+src/spec.types.ts

.prettierrc.json

@@ -0,0 +1,20 @@
+{
+    "printWidth": 140,
+    "tabWidth": 4,
+    "useTabs": false,
+    "semi": true,
+    "singleQuote": true,
+    "trailingComma": "none",
+    "bracketSpacing": true,
+    "bracketSameLine": false,
+    "proseWrap": "always",
+    "arrowParens": "avoid",
+    "overrides": [
+        {
+            "files": "**/*.md",
+            "options": {
+                "printWidth": 280
+            }
+        }
+    ]
+}