Merge branch 'main' into fweinberger/v2-bc-express-rs-glue

Author: felixweinberger

.changeset/cfworker-out-of-barrel.md

@@ -0,0 +1,6 @@
+---
+'@modelcontextprotocol/server': patch
+'@modelcontextprotocol/client': patch
+---
+
+Stop bundling `@cfworker/json-schema` into the main package barrel. Previously `CfWorkerJsonSchemaValidator` was re-exported from the core internal barrel, so tsdown inlined the `@cfworker/json-schema` dev dependency into every consumer's bundle even when it was never used. The validator is now reachable only via the `_shims` conditional (workerd/browser) and the explicit `@modelcontextprotocol/{server,client}/validators/cf-worker` subpath, so consumers that don't opt into it no longer ship that code. No public API change.

.changeset/export-inmemory-transport.md

@@ -0,0 +1,6 @@
+---
+'@modelcontextprotocol/server': patch
+'@modelcontextprotocol/client': patch
+---
+
+Export `InMemoryTransport` for in-process testing.

.changeset/fix-failed-task-result-retrieval.md

@@ -0,0 +1,5 @@
+---
+'@modelcontextprotocol/core': patch
+---
+
+Fix `requestStream` to call `tasks/result` for failed tasks instead of yielding a hardcoded `ProtocolError`. When a task reaches the `failed` terminal status, the stream now retrieves and yields the actual stored result (matching the behavior for `completed` tasks), as required by the spec.

.changeset/zod-jsonschema-fallback.md

@@ -0,0 +1,7 @@
+---
+'@modelcontextprotocol/core': patch
+'@modelcontextprotocol/server': patch
+'@modelcontextprotocol/client': patch
+---
+
+Fix runtime crash on `tools/list` when a tool's `inputSchema` comes from zod 4.0–4.1. The SDK requires `~standard.jsonSchema` (StandardJSONSchemaV1, added in zod 4.2.0); previously a missing `jsonSchema` crashed at `undefined[io]`. `standardSchemaToJsonSchema` now detects zod 4 schemas lacking `jsonSchema` and falls back to the SDK-bundled `z.toJSONSchema()`, emitting a one-time console warning. zod 3 schemas (which the bundled zod 4 converter cannot introspect) and non-zod schema libraries without `jsonSchema` get a clear error pointing to `fromJsonSchema()`. The workspace zod catalog is also bumped to `^4.2.0`.

README.md

@@ -14,7 +14,7 @@
 - [Overview](#overview)
 - [Packages](#packages)
 - [Installation](#installation)
-- [Quick Start (runnable examples)](#quick-start-runnable-examples)
+- [Getting Started](#getting-started)
 - [Documentation](#documentation)
 - [Contributing](#contributing)
 - [License](#license)
@@ -90,59 +90,53 @@ npm install @modelcontextprotocol/express express
 npm install @modelcontextprotocol/hono hono
 ```
 
-## Quick Start (runnable examples)
+## Getting Started
 
-The runnable examples live under `examples/` and are kept in sync with the docs.
+Here is what an MCP server looks like. This minimal example exposes a single `greet` tool over stdio:
 
-1. **Install dependencies** (from repo root):
+```typescript
+import { McpServer, StdioServerTransport } from '@modelcontextprotocol/server';
+import * as z from 'zod/v4';
 
-```bash
-pnpm install
-```
-
-2. **Run a Streamable HTTP example server**:
-
-```bash
-pnpm --filter @modelcontextprotocol/examples-server exec tsx src/simpleStreamableHttp.ts
-```
+const server = new McpServer({ name: 'greeting-server', version: '1.0.0' });
 
-Alternatively, from within the example package:
+server.registerTool(
+  'greet',
+  {
+    description: 'Greet someone by name',
+    inputSchema: z.object({ name: z.string() }),
+  },
+  async ({ name }) => ({
+    content: [{ type: 'text', text: `Hello, ${name}!` }],
+  }),
+);
 
-```bash
-cd examples/server
-pnpm tsx src/simpleStreamableHttp.ts
-```
-
-3. **Run the interactive client in another terminal**:
+async function main() {
+  const transport = new StdioServerTransport();
+  await server.connect(transport);
+}
 
-```bash
-pnpm --filter @modelcontextprotocol/examples-client exec tsx src/simpleStreamableHttp.ts
+main();
 ```
 
-Alternatively, from within the example package:
+Ready to build something real? Follow the step-by-step quickstart tutorials:
 
-```bash
-cd examples/client
-pnpm tsx src/simpleStreamableHttp.ts
-```
+- [Build a weather server](docs/server-quickstart.md) — server quickstart
+- [Build an LLM-powered chatbot](docs/client-quickstart.md) — client quickstart
 
-Next steps:
+The complete code for each tutorial is in [`examples/server-quickstart/`](https://github.com/modelcontextprotocol/typescript-sdk/tree/main/examples/server-quickstart/) and [`examples/client-quickstart/`](https://github.com/modelcontextprotocol/typescript-sdk/tree/main/examples/client-quickstart/). For more advanced runnable examples, see:
 
-- Server examples index: [`examples/server/README.md`](examples/server/README.md)
-- Client examples index: [`examples/client/README.md`](examples/client/README.md)
-- Guided walkthroughs: [`docs/server.md`](docs/server.md) and [`docs/client.md`](docs/client.md)
+- [`examples/server/README.md`](examples/server/README.md) — server examples index
+- [`examples/client/README.md`](examples/client/README.md) — client examples index
 
 ## Documentation
 
-- Local SDK docs:
-    - [docs/server.md](docs/server.md) – building MCP servers: transports, tools, resources, prompts, server-initiated requests, and deployment
-    - [docs/client.md](docs/client.md) – building MCP clients: connecting, tools, resources, prompts, server-initiated requests, and error handling
-    - [docs/faq.md](docs/faq.md) – frequently asked questions and troubleshooting
-- External references:
-    - [SDK API documentation](https://ts.sdk.modelcontextprotocol.io/)
-    - [Model Context Protocol documentation](https://modelcontextprotocol.io)
-    - [MCP Specification](https://spec.modelcontextprotocol.io)
-    - [Example Servers](https://github.com/modelcontextprotocol/servers)
+- [Server Guide](docs/server.md) — building MCP servers: transports, tools, resources, prompts, server-initiated requests, and deployment
+- [Client Guide](docs/client.md) — building MCP clients: connecting, tools, resources, prompts, server-initiated requests, and error handling
+- [FAQ](docs/faq.md) — frequently asked questions and troubleshooting
+- [API docs](https://modelcontextprotocol.github.io/typescript-sdk/)
+- [MCP documentation](https://modelcontextprotocol.io/docs)
+- [MCP specification](https://modelcontextprotocol.io/specification/latest)
 
 ### Building docs locally
 

docs/faq.md

@@ -67,7 +67,7 @@ For production use, you can either:
 
 ### Where can I find runnable server examples?
 
-The SDK ships several runnable server examples under `examples/server/src`. Start from the server examples index in [`examples/server/README.md`](../examples/server/README.md) and the entry-point quick start in the root [`README.md`](../README.md).
+The [server quickstart](./server-quickstart.md) walks you through building a weather server from scratch. Its complete source lives in [`examples/server-quickstart/`](https://github.com/modelcontextprotocol/typescript-sdk/tree/main/examples/server-quickstart/). For more advanced examples (OAuth, streaming, sessions, etc.), see the server examples index in [`examples/server/README.md`](../examples/server/README.md).
 
 ### Where are the server auth helpers?
 

docs/migration.md

@@ -469,22 +469,20 @@ const client = new Client(
 );
 ```
 
-### `InMemoryTransport` removed from public API
+### `InMemoryTransport` moved
 
-`InMemoryTransport` has been removed from the public API surface. It was previously used for in-process client-server connections and testing.
-
-For **testing**, import it directly from the internal core package:
+`InMemoryTransport` is now exported from `@modelcontextprotocol/client` and `@modelcontextprotocol/server` (both re-export it). It is still intended for in-process client-server connections and testing.
 
 ```typescript
 // v1
 import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
 
-// v2 (testing only — @modelcontextprotocol/core is internal, not for production use)
-import { InMemoryTransport } from '@modelcontextprotocol/core';
+// v2
+import { InMemoryTransport } from '@modelcontextprotocol/server';
+// or
+import { InMemoryTransport } from '@modelcontextprotocol/client';
 ```
 
-For **production in-process connections**, use `StreamableHTTPClientTransport` with a local server URL, or connect client and server via paired streams.
-
 ### Removed type aliases and deprecated exports
 
 The following deprecated type aliases have been removed from `@modelcontextprotocol/core`:

packages/client/src/shimsBrowser.ts

@@ -3,7 +3,7 @@
  *
  * This file is selected via package.json export conditions when running in a browser.
  */
-export { CfWorkerJsonSchemaValidator as DefaultJsonSchemaValidator } from '@modelcontextprotocol/core';
+export { CfWorkerJsonSchemaValidator as DefaultJsonSchemaValidator } from '@modelcontextprotocol/core/validators/cfWorker';
 
 /**
  * Whether `fetch()` may throw `TypeError` due to CORS. Only true in browser contexts

packages/client/src/shimsWorkerd.ts

@@ -3,7 +3,7 @@
  *
  * This file is selected via package.json export conditions when running in workerd.
  */
-export { CfWorkerJsonSchemaValidator as DefaultJsonSchemaValidator } from '@modelcontextprotocol/core';
+export { CfWorkerJsonSchemaValidator as DefaultJsonSchemaValidator } from '@modelcontextprotocol/core/validators/cfWorker';
 
 /**
  * Whether `fetch()` may throw `TypeError` due to CORS. CORS is a browser-only concept —

packages/client/src/validators/cfWorker.ts

@@ -6,5 +6,5 @@
  * import { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/client/validators/cf-worker';
  * ```
  */
-export { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/core';
-export type { CfWorkerSchemaDraft } from '@modelcontextprotocol/core';
+export type { CfWorkerSchemaDraft } from '@modelcontextprotocol/core/validators/cfWorker';
+export { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/core/validators/cfWorker';