Merge branch 'main' into localden/authz-updates

Author: localden

ANTITRUST.md

@@ -0,0 +1,53 @@
+**MCP Project Antitrust Policy**
+
+**Antitrust Policy**
+
+Effective: September 29, 2025
+
+**Introduction**
+
+The goal of the Model Context Protocol open source project (the “Project”) is to develop a universal standard for model-to-world interactions, including enabling LLMs and agents to seamlessly connect with and utilize external data sources and tools. The purpose of this Antitrust Policy (the “Policy”) is to avoid antitrust risks in carrying out this pro-competitive mission.
+
+Participants in and contributors to the Project (collectively, “participants”) will use their best reasonable efforts to comply in all respects with all applicable state and federal antitrust and trade regulation laws, and applicable antitrust/competition laws of other countries (collectively, the “Antitrust Laws”).
+
+The goal of Antitrust Laws is to encourage vigorous competition. Nothing in this Policy prohibits or limits the ability of participants to make, sell or use any product, or otherwise to compete in the marketplace. This Policy provides general guidance on compliance with Antitrust Law. Participants should contact their respective legal counsel to address specific questions.
+
+This Policy is conservative and is intended to promote compliance with the Antitrust Laws, not to create duties or obligations beyond what the Antitrust Laws actually require. In the event of any inconsistency between this Policy and the Antitrust Laws, the Antitrust Laws preempt and control.
+
+**Participation**
+
+Technical participation in the Project shall be open to all, subject only to compliance with the provisions of the Project’s charter and other governance documents.
+
+**Conduct of Meetings**
+
+At meetings among actual or potential competitors, there is a risk that participants in those meetings may improperly disclose or discuss information in violation of the Antitrust Laws or otherwise act in an anti-competitive manner. To avoid this risk, participants must adhere to the following policies when participating in Project-related or sponsored meetings, conference calls, or other forums (collectively, “Project Meetings”).
+
+Participants must not, in fact or appearance, discuss or exchange information regarding:
+
+- An individual company’s current or projected prices, price changes, price differentials, markups, discounts, allowances, terms and conditions of sale, including credit terms, etc., or data that bear on prices, including profits, margins or cost.
+- Industry-wide pricing policies, price levels, price changes, differentials, or the like.
+- Actual or projected changes in industry production, capacity or inventories.
+- Matters relating to bids or intentions to bid for particular products, procedures for responding to bid invitations or specific contractual arrangements.
+- Plans of individual companies concerning the design, characteristics, production, distribution, marketing or introduction dates of particular products, including proposed territories or customers.
+- Matters relating to actual or potential individual suppliers that might have the effect of excluding them from any market or of influencing the business conduct of firms toward such suppliers.
+- Matters relating to actual or potential customers that might have the effect of influencing the business conduct of firms toward such customers.
+- Individual company current or projected cost of procurement, development or manufacture of any product.
+- Individual company market shares for any product or for all products.
+- Confidential or otherwise sensitive business plans or strategy.
+
+In connection with all Project Meetings, participants must do the following:
+
+- Adhere to prepared agendas.
+- Insist that meeting minutes be prepared and distributed to all participants, and that meeting minutes accurately reflect the matters that transpired.
+- Consult with their respective counsel on all antitrust questions related to Project Meetings.
+- Protest against any discussions that appear to violate these policies or the Antitrust Laws, leave any meeting in which such discussions continue, and either insist that such protest be noted in the minutes.
+
+**Requirements/Standard Setting**
+
+The Project may establish standards, technical requirements and/or specifications for use (collectively, “requirements”). Participants shall not enter into agreements that prohibit or restrict any participant from establishing or adopting any other requirements. Participants shall not undertake any efforts, directly or indirectly, to prevent any firm from manufacturing, selling, or supplying any product not conforming to a requirement.
+
+The Project shall not promote standardization of commercial terms, such as terms for license and sale.
+
+**Contact Information**
+
+To contact the Project regarding matters addressed by this Antitrust Policy, please send an email to [email protected], and reference “Antitrust Policy” in the subject line.

docs/clients.mdx

@@ -81,7 +81,6 @@ This page provides an overview of applications that support the Model Context Pr
 | [Shortwave][Shortwave]                           | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | ❓            |
 | [Simtheory][Simtheory]                           | ✅          | ✅        | ✅      | ✅                     | ❌         | ❌    | ❓            |
 | [Slack MCP Client][Slack MCP Client]             | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | ❓            |
-| [Sourcegraph Cody][Cody]                         | ✅          | ❌        | ❌      | ❓                     | ❌         | ❌    | ❓            |
 | [SpinAI][SpinAI]                                 | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | ❓            |
 | [Superinterface][Superinterface]                 | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | ❓            |
 | [Superjoin][Superjoin]                           | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | ❓            |
@@ -175,7 +174,6 @@ This page provides an overview of applications that support the Model Context Pr
 [Shortwave]: https://www.shortwave.com
 [Simtheory]: https://simtheory.ai
 [Slack MCP Client]: https://github.com/tuannvm/slack-mcp-client
-[Cody]: https://sourcegraph.com/cody
 [SpinAI]: https://spinai.dev
 [Superinterface]: https://superinterface.ai
 [Superjoin]: https://superjoin.ai
@@ -1020,17 +1018,6 @@ Simtheory is an agentic AI workspace that unifies multiple AI models, tools, and
 - **Dynamic and Secure Integration:** Supports dynamic registration of MCP tools, works in both channels and direct messages and manages credentials securely via environment variables or Kubernetes secrets.
 - **Easy Deployment and Extensibility:** Offers official Docker images, a Helm chart for Kubernetes, and Docker Compose for local development, making it simple to deploy, configure, and extend with additional MCP servers or tools.
 
-### Sourcegraph Cody
-
-[Cody](https://openctx.org/docs/providers/modelcontextprotocol) is Sourcegraph's AI coding assistant, which implements MCP through OpenCTX.
-
-**Key features:**
-
-- Support for MCP resources
-- Integration with Sourcegraph's code intelligence
-- Uses OpenCTX as an abstraction layer
-- Future support planned for additional MCP features
-
 ### SpinAI
 
 [SpinAI](https://spinai.dev) is an open-source TypeScript framework for building observable AI agents. The framework provides native MCP compatibility, allowing agents to seamlessly integrate with MCP servers and tools.

docs/community/antitrust.mdx

@@ -0,0 +1,54 @@
+---
+title: Antitrust Policy
+description: MCP Project Antitrust Policy for participants and contributors
+---
+
+**Effective: September 29, 2025**
+
+## Introduction
+
+The goal of the Model Context Protocol open source project (the "Project") is to develop a universal standard for model-to-world interactions, including enabling LLMs and agents to seamlessly connect with and utilize external data sources and tools. The purpose of this Antitrust Policy (the "Policy") is to avoid antitrust risks in carrying out this pro-competitive mission.
+
+Participants in and contributors to the Project (collectively, "participants") will use their best reasonable efforts to comply in all respects with all applicable state and federal antitrust and trade regulation laws, and applicable antitrust/competition laws of other countries (collectively, the "Antitrust Laws").
+
+The goal of Antitrust Laws is to encourage vigorous competition. Nothing in this Policy prohibits or limits the ability of participants to make, sell or use any product, or otherwise to compete in the marketplace. This Policy provides general guidance on compliance with Antitrust Law. Participants should contact their respective legal counsel to address specific questions.
+
+This Policy is conservative and is intended to promote compliance with the Antitrust Laws, not to create duties or obligations beyond what the Antitrust Laws actually require. In the event of any inconsistency between this Policy and the Antitrust Laws, the Antitrust Laws preempt and control.
+
+## Participation
+
+Technical participation in the Project shall be open to all, subject only to compliance with the provisions of the Project's charter and other governance documents.
+
+## Conduct of Meetings
+
+At meetings among actual or potential competitors, there is a risk that participants in those meetings may improperly disclose or discuss information in violation of the Antitrust Laws or otherwise act in an anti-competitive manner. To avoid this risk, participants must adhere to the following policies when participating in Project-related or sponsored meetings, conference calls, or other forums (collectively, "Project Meetings").
+
+Participants must not, in fact or appearance, discuss or exchange information regarding:
+
+- An individual company's current or projected prices, price changes, price differentials, markups, discounts, allowances, terms and conditions of sale, including credit terms, etc., or data that bear on prices, including profits, margins or cost.
+- Industry-wide pricing policies, price levels, price changes, differentials, or the like.
+- Actual or projected changes in industry production, capacity or inventories.
+- Matters relating to bids or intentions to bid for particular products, procedures for responding to bid invitations or specific contractual arrangements.
+- Plans of individual companies concerning the design, characteristics, production, distribution, marketing or introduction dates of particular products, including proposed territories or customers.
+- Matters relating to actual or potential individual suppliers that might have the effect of excluding them from any market or of influencing the business conduct of firms toward such suppliers.
+- Matters relating to actual or potential customers that might have the effect of influencing the business conduct of firms toward such customers.
+- Individual company current or projected cost of procurement, development or manufacture of any product.
+- Individual company market shares for any product or for all products.
+- Confidential or otherwise sensitive business plans or strategy.
+
+In connection with all Project Meetings, participants must do the following:
+
+- Adhere to prepared agendas.
+- Insist that meeting minutes be prepared and distributed to all participants, and that meeting minutes accurately reflect the matters that transpired.
+- Consult with their respective counsel on all antitrust questions related to Project Meetings.
+- Protest against any discussions that appear to violate these policies or the Antitrust Laws, leave any meeting in which such discussions continue, and either insist that such protest be noted in the minutes.
+
+## Requirements/Standard Setting
+
+The Project may establish standards, technical requirements and/or specifications for use (collectively, "requirements"). Participants shall not enter into agreements that prohibit or restrict any participant from establishing or adopting any other requirements. Participants shall not undertake any efforts, directly or indirectly, to prevent any firm from manufacturing, selling, or supplying any product not conforming to a requirement.
+
+The Project shall not promote standardization of commercial terms, such as terms for license and sale.
+
+## Contact Information
+
+To contact the Project regarding matters addressed by this Antitrust Policy, please send an email to [email protected], and reference "Antitrust Policy" in the subject line.

docs/docs.json

@@ -264,12 +264,28 @@
         "tab": "Community",
         "pages": [
           "community/communication",
-          "community/governance",
-          "community/sep-guidelines",
-          "community/working-interest-groups",
-          "development/roadmap",
-          "clients",
-          "examples"
+          {
+            "group": "Governance",
+            "pages": [
+              "community/governance",
+              "community/sep-guidelines",
+              "community/working-interest-groups",
+              "community/antitrust"
+            ]
+          },
+          {
+            "group": "Roadmap",
+            "pages": [
+              "development/roadmap"
+            ]
+          },
+          {
+            "group": "Examples",
+            "pages": [
+              "clients",
+              "examples"
+            ]
+          }
         ]
       },
       {
@@ -386,4 +402,4 @@
       "view"
     ]
   }
-}
+}

docs/docs/develop/build-client.mdx

@@ -279,7 +279,7 @@ if __name__ == "__main__":
     asyncio.run(main())
 ```
 
-You can find the complete `client.py` file [here.](https://gist.github.com/zckly/f3f28ea731e096e53b39b47bf0a2d4b1)
+You can find the complete `client.py` file [here](https://github.com/modelcontextprotocol/quickstart-resources/blob/main/mcp-client-python/client.py).
 
 ## Key Components Explained
 
@@ -344,7 +344,7 @@ uv run client.py path/to/build/index.js # node server
 
 <Note>
 
-If you're continuing the weather tutorial from the server quickstart, your command might look something like this: `python client.py .../quickstart-resources/weather-server-python/weather.py`
+If you're continuing [the weather tutorial from the server quickstart](https://github.com/modelcontextprotocol/quickstart-resources/tree/main/weather-server-python), your command might look something like this: `python client.py .../quickstart-resources/weather-server-python/weather.py`
 
 </Note>
 
@@ -758,7 +758,7 @@ node build/index.js path/to/build/index.js # node server
 
 <Note>
 
-If you're continuing the weather tutorial from the server quickstart, your command might look something like this: `node build/index.js .../quickstart-resources/weather-server-typescript/build/index.js`
+If you're continuing [the weather tutorial from the server quickstart](https://github.com/modelcontextprotocol/quickstart-resources/tree/main/weather-server-typescript), your command might look something like this: `node build/index.js .../quickstart-resources/weather-server-typescript/build/index.js`
 
 </Note>
 

docs/docs/develop/build-server.mdx

@@ -252,9 +252,12 @@ Forecast: {period['detailedForecast']}
 Finally, let's initialize and run the server:
 
 ```python
-if __name__ == "__main__":
+def main():
     # Initialize and run the server
     mcp.run(transport='stdio')
+
+if __name__ == "__main__":
+    main()
 ```
 
 Your server is complete! Run `uv run weather.py` to start the MCP server, which will listen for messages from MCP hosts.

docs/specification/draft/basic/index.mdx

@@ -158,7 +158,7 @@ Icons are represented as an array of `Icon` objects, where each icon includes:
   - An HTTP/HTTPS URL pointing to an image file
   - A data URI with base64-encoded image data
 - `mimeType`: Optional MIME type if the server's type is missing or generic
-- `sizes`: Optional size specification (e.g., "48x48", "any" for scalable formats like SVG, or "48x48 96x96" for multiple sizes)
+- `sizes`: Optional array of size specifications (e.g., `["48x48"]`, `["any"]` for scalable formats like SVG, or `["48x48", "96x96"]` for multiple sizes)
 
 **Required MIME type support:**
 

docs/specification/draft/basic/lifecycle.mdx

@@ -74,7 +74,7 @@ The client **MUST** initiate this phase by sending an `initialize` request conta
         {
           "src": "https://example.com/icon.png",
           "mimeType": "image/png",
-          "sizes": "48x48"
+          "sizes": ["48x48"]
         }
       ],
       "websiteUrl": "https://example.com"
@@ -112,7 +112,7 @@ The server **MUST** respond with its own capabilities and information:
         {
           "src": "https://example.com/server-icon.svg",
           "mimeType": "image/svg+xml",
-          "sizes": "any"
+          "sizes": ["any"]
         }
       ],
       "websiteUrl": "https://example.com/server"

docs/specification/draft/changelog.mdx

@@ -10,7 +10,7 @@ the previous revision, [2025-06-18](/specification/2025-06-18).
 ## Major changes
 
 1. Enhance authorization server discovery with support for [OpenID Connect Discovery 1.0](https://openid.net/specs/openid-connect-discovery-1_0.html). (PR [#797](https://github.com/modelcontextprotocol/modelcontextprotocol/pull/797))
-2. Allow servers to expose icons as additional metadata for tools, resources and prompts ([SEP-973](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/973)).
+2. Allow servers to expose icons as additional metadata for tools, resources, resource templates, and prompts ([SEP-973](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/973)).
 3. Enhance authorization flows with incremental scope consent via `WWW-Authenticate` ([SEP-835](https://github.com/modelcontextprotocol/modelcontextprotocol/pull/835))
 
 ## Minor changes