Merge remote-tracking branch 'upstream/main' into patch-1

Author: connor4312

.gitattributes

@@ -1 +1,2 @@
 package-lock.json linguist-generated=true
+schema/*/schema.json linguist-generated=true

.github/workflows/main.yml

@@ -18,8 +18,8 @@ jobs:
 
       - run: npm ci
 
-      - run: npm run validate:schema
+      - name: Check TypeScript definitions
+        run: npm run check:schema:ts
 
-      - run: npm run generate:json
       - name: Verify that `npm run generate:json` did not change outputs (if it did, please re-run it and re-commit!)
-        run: git diff --exit-code
+        run: npm run check:schema:json

.github/workflows/markdown-format.yml

@@ -4,23 +4,28 @@ on:
   push:
     paths:
       - '**/*.md'
+      - '**/*.mdx'
   pull_request:
     paths:
       - '**/*.md'
+      - '**/*.mdx'
 
 jobs:
   format:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      
+
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: '20'
-          
+
       - name: Install dependencies
         run: npm ci
-        
+
       - name: Check markdown formatting
-        run: npm run format:check
+        run: npm run check:docs:format
+
+      - name: Check markdown links
+        run: npm run check:docs:links

CONTRIBUTING.md

@@ -32,24 +32,32 @@ npm install  # install dependencies
 
 ## Making Changes
 
-Note that schema changes are made to `schema.ts`. `schema.json` is generated from
-`schema.ts` using `npm run validate:schema`.
+Note that schema changes are made to `schema.ts`, and `schema.json` is generated from
+`schema.ts`.
 
 1. Create a new branch:
 
 ```bash
 git checkout -b feature/your-feature-name
 ```
 
-2. Make your changes
-3. Validate your changes:
+2. Make your changes.
+
+3. Validate schema changes and generate `schema.json`:
+
+```bash
+npm run check:schema:ts
+npm run generate:json
+```
+
+4. Validate documentation changes and apply formatting:
 
 ```bash
-npm run validate:schema    # validate schema
-npm run generate:json     # generate JSON schema
+npm run check:docs
+npm run format
 ```
 
-4. Run docs locally (optional):
+5. Preview documentation locally (optional):
 
 ```bash
 npm run serve:docs
@@ -64,10 +72,11 @@ When contributing to the documentation:
 - Include code examples where appropriate
 - Use proper MDX formatting and components
 - Test all links and code samples
+  - You may run `npm run check:docs:links` to look for broken internal links.
 - Use appropriate headings: "When to use", "Steps", and "Tips" for tutorials
 - Place new pages in appropriate sections (concepts, tutorials, etc.)
-- Update docs.json when adding new pages
-- Follow existing file naming conventions (kebab-case.mdx)
+- Update `docs.json` when adding new pages
+- Follow existing file naming conventions (`kebab-case.mdx`)
 - Include proper frontmatter in MDX files
 
 ### Specification Proposal Guidelines

docs/clients.mdx

@@ -7,7 +7,11 @@ description: Our plans for evolving Model Context Protocol
 
 The Model Context Protocol is rapidly evolving. This page outlines our current thinking on key priorities and direction for approximately **the next six months**, though these may change significantly as the project develops. To see what's changed recently, check out the **[specification changelog](/specification/2025-03-26/changelog/)**.
 
-<Note>The ideas presented here are not commitments—we may solve these challenges differently than described, or some may not materialize at all. This is also not an _exhaustive_ list; we may incorporate work that isn't mentioned here.</Note>
+<Note>
+
+The ideas presented here are not commitments—we may solve these challenges differently than described, or some may not materialize at all. This is also not an _exhaustive_ list; we may incorporate work that isn't mentioned here.
+
+</Note>
 
 We value community participation! Each section links to relevant discussions where you can learn more and contribute your thoughts.
 

docs/development/roadmap.mdx

@@ -53,7 +53,6 @@
           {
             "group": "Development",
             "pages": [
-              "development/updates",
               "development/roadmap",
               "development/contributing"
             ]
@@ -203,7 +202,8 @@
                 "group": "Client Features",
                 "pages": [
                   "specification/draft/client/roots",
-                  "specification/draft/client/sampling"
+                  "specification/draft/client/sampling",
+                  "specification/draft/client/elicitation"
                 ]
               },
               {
@@ -227,25 +227,17 @@
           },
           {
             "group": "Resources",
-            "pages": [
-              "specification/versioning",
-              "specification/contributing"
-            ]
+            "pages": ["specification/versioning", "specification/contributing"]
           }
         ]
       }
     ],
     "global": {
       "anchors": [
         {
-          "anchor": "Python SDK",
-          "href": "https://github.com/modelcontextprotocol/python-sdk",
-          "icon": "python"
-        },
-        {
-          "anchor": "TypeScript SDK",
-          "href": "https://github.com/modelcontextprotocol/typescript-sdk",
-          "icon": "square-js"
+          "anchor": "C# SDK",
+          "href": "https://github.com/modelcontextprotocol/csharp-sdk",
+          "icon": "square-c"
         },
         {
           "anchor": "Java SDK",
@@ -258,14 +250,24 @@
           "icon": "square-k"
         },
         {
-          "anchor": "C# SDK",
-          "href": "https://github.com/modelcontextprotocol/csharp-sdk",
-          "icon": "square-c"
+          "anchor": "Python SDK",
+          "href": "https://github.com/modelcontextprotocol/python-sdk",
+          "icon": "python"
+        },
+        {
+          "anchor": "Ruby SDK",
+          "href": "https://github.com/modelcontextprotocol/ruby-sdk",
+          "icon": "gem"
         },
         {
           "anchor": "Swift SDK",
           "href": "https://github.com/modelcontextprotocol/swift-sdk",
           "icon": "swift"
+        },
+        {
+          "anchor": "TypeScript SDK",
+          "href": "https://github.com/modelcontextprotocol/typescript-sdk",
+          "icon": "square-js"
         }
       ]
     }
@@ -309,9 +311,6 @@
     }
   ],
   "contextual": {
-    "options": [
-      "copy",
-      "view"
-    ]
+    "options": ["copy", "view"]
   }
 }