merge commit

Author: KKonstantinov

.changeset/config.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://unpkg.com/@changesets/config@3.1.2/schema.json",
-    "changelog": ["@changesets/changelog-github", { "repo": "@modelcontextprotocol/typescript-sdk" }],
+    "changelog": ["@changesets/changelog-github", { "repo": "modelcontextprotocol/typescript-sdk" }],
     "commit": false,
     "fixed": [],
     "linked": [],

.github/workflows/release.yml

@@ -40,6 +40,6 @@ jobs:
               with:
                   publish: pnpm run build:all && pnpm changeset publish
               env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  GITHUB_TOKEN: ${{ github.token }}
                   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
                   NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

CONTRIBUTING.md

@@ -2,20 +2,40 @@
 
 We welcome contributions to the Model Context Protocol TypeScript SDK! This document outlines the process for contributing to the project.
 
+## Branches
+
+This repository has two main branches:
+
+- **`main`** – v2 of the SDK (currently in development). This is a monorepo with split packages.
+- **`v1.x`** – stable v1 release. Bug fixes and patches for v1 should target this branch.
+
+**Which branch should I use as a base?**
+
+- For **new features** or **v2-related work**: base your PR on `main`
+- For **v1 bug fixes** or **patches**: base your PR on `v1.x`
+
 ## Getting Started
 
+This project uses [pnpm](https://pnpm.io/) as its package manager. If you don't have pnpm installed, enable it via [corepack](https://nodejs.org/api/corepack.html) (included with Node.js 16.9+):
+
+```bash
+corepack enable
+```
+
+Then:
+
 1. Fork the repository
 2. Clone your fork: `git clone https://github.com/YOUR-USERNAME/typescript-sdk.git`
-3. Install dependencies: `npm install`
-4. Build the project: `npm run build`
-5. Run tests: `npm test`
+3. Install dependencies: `pnpm install`
+4. Build the project: `pnpm build:all`
+5. Run tests: `pnpm test:all`
 
 ## Development Process
 
-1. Create a new branch for your changes
+1. Create a new branch for your changes (based on `main` or `v1.x` as appropriate)
 2. Make your changes
-3. Run `npm run lint` to ensure code style compliance
-4. Run `npm test` to verify all tests pass
+3. Run `pnpm lint:all` to ensure code style compliance
+4. Run `pnpm test:all` to verify all tests pass
 5. Submit a pull request
 
 ## Pull Request Guidelines
@@ -28,8 +48,17 @@ We welcome contributions to the Model Context Protocol TypeScript SDK! This docu
 
 ## Running Examples
 
-- Start the server: `npm run server`
-- Run the client: `npm run client`
+See [`examples/server/README.md`](examples/server/README.md) and [`examples/client/README.md`](examples/client/README.md) for a full list of runnable examples.
+
+Quick start:
+
+```bash
+# Run a server example
+pnpm --filter @modelcontextprotocol/examples-server exec tsx src/simpleStreamableHttp.ts
+
+# Run a client example (in another terminal)
+pnpm --filter @modelcontextprotocol/examples-client exec tsx src/simpleStreamableHttp.ts
+```
 
 ## Code of Conduct
 

README.md

@@ -1,6 +1,13 @@
 # MCP TypeScript SDK
 
-![NPM Version](https://img.shields.io/npm/v/%40modelcontextprotocol%server) ![NPM Version](https://img.shields.io/npm/v/%40modelcontextprotocol%client) ![MIT licensed](https://img.shields.io/npm/l/%40modelcontextprotocol%server)
+> [!IMPORTANT]
+> **This is the `main` branch which contains v2 of the SDK (currently in development, pre-alpha).**
+>
+> We anticipate a stable v2 release in Q1 2026. Until then, **v1.x remains the recommended version** for production use. v1.x will continue to receive bug fixes and security updates for at least 6 months after v2 ships to give people time to upgrade.
+>
+> For v1 documentation and code, see the [`v1.x` branch](https://github.com/modelcontextprotocol/typescript-sdk/tree/v1.x).
+
+![NPM Version](https://img.shields.io/npm/v/%40modelcontextprotocol%2Fserver) ![NPM Version](https://img.shields.io/npm/v/%40modelcontextprotocol%2Fclient) ![MIT licensed](https://img.shields.io/npm/l/%40modelcontextprotocol%2Fserver)
 
 <details>
 <summary>Table of Contents</summary>

package.json

@@ -33,6 +33,7 @@
     },
     "devDependencies": {
         "@cfworker/json-schema": "catalog:runtimeShared",
+        "@changesets/changelog-github": "^0.5.2",
         "@changesets/cli": "^2.29.8",
         "@eslint/js": "catalog:devTools",
         "@types/content-type": "catalog:devTools",

packages/server/src/index.ts

@@ -1,5 +1,4 @@
 export * from './server/completable.js';
-export * from './server/inMemoryEventStore.js';
 export * from './server/mcp.js';
 export * from './server/middleware/hostHeaderValidation.js';
 export * from './server/server.js';