Merge branch 'main' into fix/list-tasks-auth

Author: dend

.claude-plugin/marketplace.json

@@ -0,0 +1,16 @@
+{
+  "name": "modelcontextprotocol",
+  "owner": {
+    "name": "Model Context Protocol"
+  },
+  "metadata": {
+    "description": "Official Claude Code plugins for the Model Context Protocol"
+  },
+  "plugins": [
+    {
+      "name": "mcp-spec",
+      "source": "./plugins/mcp-spec",
+      "description": "Skills for researching and contributing to the MCP specification"
+    }
+  ]
+}

.gitattributes

@@ -2,3 +2,5 @@ package-lock.json linguist-generated=true
 schema/*/schema.json linguist-generated=true
 docs/specification/*/schema.md linguist-generated=true
 docs/specification/*/schema.mdx linguist-generated=true
+docs/community/seps/index.mdx linguist-generated=true
+docs/community/seps/[0-9]*.mdx linguist-generated=true

.github/CODEOWNERS

@@ -10,3 +10,4 @@
 # Authorization-related files - @auth team should be notified
 /docs/specification/**/authorization.mdx @modelcontextprotocol/core-maintainers @modelcontextprotocol/auth-wg
 /docs/specification/**/security_best_practices.mdx @modelcontextprotocol/core-maintainers @modelcontextprotocol/auth-wg
+/docs/docs/tutorials/security/security_best_practices.mdx @modelcontextprotocol/core-maintainers @modelcontextprotocol/auth-wg

.github/dependabot.yml

@@ -4,3 +4,8 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
+
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

.github/workflows/sep-lifecycle-manual.yml

@@ -72,7 +72,7 @@ jobs:
           LOG_LEVEL: info
 
       - name: Upload logs
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: automation-logs-manual-${{ github.run_id }}

.github/workflows/sep-lifecycle.yml

@@ -103,7 +103,7 @@ jobs:
           LOG_LEVEL: info
 
       - name: Upload logs
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: automation-logs-${{ github.run_id }}

.github/workflows/sep-reminder.yml

@@ -11,7 +11,7 @@ permissions: {}
 jobs:
   discord-reminder:
     runs-on: ubuntu-latest
-
+    if: github.repository == 'modelcontextprotocol/modelcontextprotocol'
     steps:
       - name: Post Discord reminder
         run: |

.gitignore

@@ -2,3 +2,4 @@
 node_modules/
 .DS_Store
 .idea/
+.jj

AGENTS.md

@@ -9,6 +9,13 @@ This repository contains the MCP specification, documentation, and blog.
   - `docs/specification/` - MCP specification (more formal, versioned)
 - `blog/` - Hugo blog (`npm run serve:blog`)
 
+### Documentation Guidelines
+
+- When creating flowcharts, and graphs to visualize aspect of the protocol, use mermaid diagrams where
+  possible.
+- When writing tables, ensure column headers and columns are aligned with whitespace.
+- Before pushing or creating PR's ensure that `npm run prep` is free of warnings and errors.
+
 ## Specification Versioning
 
 Specifications use **date-based versioning** (YYYY-MM-DD), not semantic versioning:

MAINTAINERS.md

@@ -111,13 +111,15 @@ This document lists current maintainers in the Model Context Protocol project.
 - [Cliff Hall](https://github.com/cliffhall)
 - [Konstantin Konstantinov](https://github.com/KKonstantinov)
 - [Ola Hungerford](https://github.com/olaservo)
+- [Bob Dickinson](https://github.com/BobDickinson)
 
 ### Registry
 
 - [Toby Padilla](https://github.com/toby)
 - [Tadas Antanavicius](https://github.com/tadasant)
 - [Adam Jones](https://github.com/domdomegg)
 - [Radoslav (Rado) Dimitrov](https://github.com/rdimitrov)
+- [Bob Dickinson](https://github.com/BobDickinson)
 
 ### MCPB (Model Context Protocol Bundle)
 
@@ -197,6 +199,10 @@ This document lists current maintainers in the Model Context Protocol project.
 - [Liad Yosef](https://github.com/liady)
 - [Ido Salomon](https://github.com/idosal)
 
+### Primitive Grouping Interest Group
+
+- [Tapan Chugh](https://github.com/chughtapan)
+
 ## About This Document
 
 This document is updated by the MCP maintainers and reflects the current