Merge branch 'main' into fweinberger/tooltask-handlers

Author: felixweinberger

.changeset/fix-server-protocol-version.md

@@ -0,0 +1,5 @@
+---
+'@modelcontextprotocol/server': patch
+---
+
+fix(server): propagate negotiated protocol version to transport in _oninitialize

.changeset/pre.json

@@ -0,0 +1,25 @@
+{
+  "mode": "pre",
+  "tag": "alpha",
+  "initialVersions": {
+    "@modelcontextprotocol/eslint-config": "2.0.0",
+    "@modelcontextprotocol/tsconfig": "2.0.0",
+    "@modelcontextprotocol/vitest-config": "2.0.0",
+    "@modelcontextprotocol/examples-client": "2.0.0-alpha.0",
+    "@modelcontextprotocol/examples-client-quickstart": "2.0.0-alpha.0",
+    "@modelcontextprotocol/examples-server": "2.0.0-alpha.0",
+    "@modelcontextprotocol/examples-server-quickstart": "2.0.0-alpha.0",
+    "@modelcontextprotocol/examples-shared": "2.0.0-alpha.0",
+    "@modelcontextprotocol/client": "2.0.0-alpha.0",
+    "@modelcontextprotocol/core": "2.0.0-alpha.0",
+    "@modelcontextprotocol/express": "2.0.0-alpha.0",
+    "@modelcontextprotocol/fastify": "2.0.0-alpha.0",
+    "@modelcontextprotocol/hono": "2.0.0-alpha.0",
+    "@modelcontextprotocol/node": "2.0.0-alpha.0",
+    "@modelcontextprotocol/server": "2.0.0-alpha.0",
+    "@modelcontextprotocol/test-conformance": "2.0.0-alpha.0",
+    "@modelcontextprotocol/test-helpers": "2.0.0-alpha.0",
+    "@modelcontextprotocol/test-integration": "2.0.0-alpha.0"
+  },
+  "changesets": []
+}

.github/workflows/main.yml

@@ -4,8 +4,6 @@ on:
             - main
     pull_request:
     workflow_dispatch:
-    release:
-        types: [published]
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}
@@ -94,53 +92,3 @@ jobs:
             - name: Run ${{ matrix.runtime }} integration tests
               run: pnpm --filter @modelcontextprotocol/test-integration test:integration:${{ matrix.runtime }}
 
-    publish:
-        runs-on: ubuntu-latest
-        if: github.event_name == 'release'
-        environment: release
-        needs: [build, test, test-runtimes]
-
-        permissions:
-            contents: read
-            id-token: write
-
-        steps:
-            - uses: actions/checkout@v6
-
-            - name: Install pnpm
-              uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
-              id: pnpm-install
-              with:
-                  run_install: false
-            - uses: actions/setup-node@v6
-              with:
-                  node-version: 24
-                  cache: pnpm
-                  cache-dependency-path: pnpm-lock.yaml
-                  registry-url: 'https://registry.npmjs.org'
-            - run: pnpm install
-
-            - 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-primary branch (patch/maintenance release)
-                  elif [[ "${{ github.event.release.target_commitish }}" != "main" && "${{ github.event.release.target_commitish }}" != "v1.x" ]]; 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: pnpm publish --provenance --access public ${{ steps.npm-tag.outputs.tag }}
-              env:
-                  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

packages/client/README.md

@@ -0,0 +1,20 @@
+# `@modelcontextprotocol/client`
+
+The MCP (Model Context Protocol) TypeScript client SDK. Build MCP clients that connect to MCP servers.
+
+> [!WARNING] **This is an alpha release.** Expect breaking changes until v2 stabilizes. We're publishing early to gather feedback — please try it and open issues — but we can't guarantee API stability yet. We'll aim to minimize disruption between alphas.
+
+> [!NOTE] This is **v2** of the MCP TypeScript SDK. It replaces the monolithic `@modelcontextprotocol/sdk` package from v1. See the **[migration guide](https://github.com/modelcontextprotocol/typescript-sdk/blob/main/docs/migration.md)** if you're coming from v1.
+
+## Install
+
+```bash
+npm install @modelcontextprotocol/client@alpha
+```
+
+## Documentation
+
+- **[Repository README](https://github.com/modelcontextprotocol/typescript-sdk#readme)** — overview, package layout, examples
+- **[Client guide](https://github.com/modelcontextprotocol/typescript-sdk/blob/main/docs/client.md)**
+- **[API reference](https://ts.sdk.modelcontextprotocol.io/v2/)**
+- **[MCP specification](https://modelcontextprotocol.io)**

packages/server/README.md

@@ -0,0 +1,23 @@
+# `@modelcontextprotocol/server`
+
+The MCP (Model Context Protocol) TypeScript server SDK. Build MCP servers that expose tools, resources, and prompts.
+
+> [!WARNING] **This is an alpha release.** Expect breaking changes until v2 stabilizes. We're publishing early to gather feedback — please try it and open issues — but we can't guarantee API stability yet. We'll aim to minimize disruption between alphas.
+
+> [!NOTE] This is **v2** of the MCP TypeScript SDK. It replaces the monolithic `@modelcontextprotocol/sdk` package from v1. See the **[migration guide](https://github.com/modelcontextprotocol/typescript-sdk/blob/main/docs/migration.md)** if you're coming from v1.
+
+## Install
+
+```bash
+npm install @modelcontextprotocol/server@alpha
+```
+
+Optional framework adapters: [`@modelcontextprotocol/express`](https://www.npmjs.com/package/@modelcontextprotocol/express), [`@modelcontextprotocol/hono`](https://www.npmjs.com/package/@modelcontextprotocol/hono),
+[`@modelcontextprotocol/node`](https://www.npmjs.com/package/@modelcontextprotocol/node).
+
+## Documentation
+
+- **[Repository README](https://github.com/modelcontextprotocol/typescript-sdk#readme)** — overview, package layout, examples
+- **[Server guide](https://github.com/modelcontextprotocol/typescript-sdk/blob/main/docs/server.md)**
+- **[API reference](https://ts.sdk.modelcontextprotocol.io/v2/)**
+- **[MCP specification](https://modelcontextprotocol.io)**

packages/server/src/server/server.ts

@@ -433,6 +433,8 @@ export class Server extends Protocol<ServerContext> {
             ? requestedVersion
             : (this._supportedProtocolVersions[0] ?? LATEST_PROTOCOL_VERSION);
 
+        this.transport?.setProtocolVersion?.(protocolVersion);
+
         return {
             protocolVersion,
             capabilities: this.getCapabilities(),

packages/server/test/server/server.test.ts

@@ -0,0 +1,42 @@
+import type { JSONRPCMessage } from '@modelcontextprotocol/core';
+import { InMemoryTransport, LATEST_PROTOCOL_VERSION } from '@modelcontextprotocol/core';
+import { Server } from '../../src/server/server.js';
+
+describe('Server', () => {
+    describe('_oninitialize', () => {
+        it('should propagate negotiated protocol version to transport', async () => {
+            const server = new Server({ name: 'test', version: '1.0.0' }, { capabilities: {} });
+
+            const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+
+            const setProtocolVersion = vi.fn();
+            (serverTransport as { setProtocolVersion?: (version: string) => void }).setProtocolVersion = setProtocolVersion;
+
+            await server.connect(serverTransport);
+
+            // Collect response from the server
+            const responsePromise = new Promise<JSONRPCMessage>(resolve => {
+                clientTransport.onmessage = msg => resolve(msg);
+            });
+            await clientTransport.start();
+
+            // Send initialize request directly
+            await clientTransport.send({
+                jsonrpc: '2.0',
+                id: 1,
+                method: 'initialize',
+                params: {
+                    protocolVersion: LATEST_PROTOCOL_VERSION,
+                    capabilities: {},
+                    clientInfo: { name: 'test-client', version: '1.0.0' }
+                }
+            } as JSONRPCMessage);
+
+            await responsePromise;
+
+            expect(setProtocolVersion).toHaveBeenCalledWith(LATEST_PROTOCOL_VERSION);
+
+            await server.close();
+        });
+    });
+});