fix: resolve merge conflict markers in docs and CLAUDE.md

Author: felixweinberger

CLAUDE.md

@@ -153,21 +153,13 @@ When a request arrives from the remote side:
 
 ```typescript
 // In Client (for server→client requests like sampling, elicitation)
-<<<<<<< HEAD
-client.setRequestHandler(CreateMessageRequestSchema, async (request, ctx) => {
-=======
-client.setRequestHandler('sampling/createMessage', async (request, extra) => {
->>>>>>> f6e8204b8621f55ee08c4f8cb8b2b85eff104842
+client.setRequestHandler('sampling/createMessage', async (request, ctx) => {
   // Handle sampling request from server
   return { role: "assistant", content: {...}, model: "..." };
 });
 
 // In Server (for client→server requests like tools/call)
-<<<<<<< HEAD
-server.setRequestHandler(CallToolRequestSchema, async (request, ctx) => {
-=======
-server.setRequestHandler('tools/call', async (request, extra) => {
->>>>>>> f6e8204b8621f55ee08c4f8cb8b2b85eff104842
+server.setRequestHandler('tools/call', async (request, ctx) => {
   // Handle tool call from client
   return { content: [...] };
 });
@@ -240,11 +232,7 @@ const result = await server.createMessage({
 });
 
 // Client must have registered handler:
-<<<<<<< HEAD
-client.setRequestHandler(CreateMessageRequestSchema, async (request, ctx) => {
-=======
-client.setRequestHandler('sampling/createMessage', async (request, extra) => {
->>>>>>> f6e8204b8621f55ee08c4f8cb8b2b85eff104842
+client.setRequestHandler('sampling/createMessage', async (request, ctx) => {
   // Client-side LLM call
   return { role: "assistant", content: {...} };
 });
@@ -255,13 +243,8 @@ client.setRequestHandler('sampling/createMessage', async (request, extra) => {
 ### Request Handler Registration (Low-Level Server)
 
 ```typescript
-<<<<<<< HEAD
-server.setRequestHandler(SomeRequestSchema, async (request, ctx) => {
-    // ctx provides mcpCtx, requestCtx, task, sendNotification, sendRequest
-=======
-server.setRequestHandler('tools/call', async (request, extra) => {
-    // extra contains sessionId, authInfo, sendNotification, etc.
->>>>>>> f6e8204b8621f55ee08c4f8cb8b2b85eff104842
+server.setRequestHandler('tools/call', async (request, ctx) => {
+    // ctx provides mcpReq, http, task, notification
     return {
         /* result */
     };

docs/migration-SKILL.md

@@ -252,9 +252,8 @@ Request/notification params remain fully typed. Remove unused schema imports aft
 
 `Client.listPrompts()`, `listResources()`, `listResourceTemplates()`, `listTools()` now return empty results when the server lacks the corresponding capability (instead of sending the request). Set `enforceStrictCapabilities: true` in `ClientOptions` to throw an error instead.
 
-<<<<<<< HEAD
 
-## 10. Context API (replaces `RequestHandlerExtra`)
+## 11. Context API (replaces `RequestHandlerExtra`)
 
 Tool, prompt, and resource callbacks now receive a structured context object (`ctx`) instead of the flat `extra` parameter.
 
@@ -269,7 +268,7 @@ Tool, prompt, and resource callbacks now receive a structured context object (`c
 | `extra.authInfo`                     | `ctx.http?.authInfo`               |
 | `extra.requestInfo?.headers`         | `ctx.http?.req.headers`            |
 | `extra.sendNotification(n)`          | `ctx.notification.send(n)`         |
-| `extra.sendRequest(r, s, o)`         | `ctx.mcpReq.send(r, s, o)`         |
+| `extra.sendRequest(r, s, o)`        | `ctx.mcpReq.send(r, s, o)`        |
 | `extra.taskId`                       | `ctx.task?.id`                     |
 | `extra.taskStore`                    | `ctx.task?.store`                  |
 | `extra.taskRequestedTtl`             | `ctx.task?.requestedTtl`           |
@@ -337,12 +336,6 @@ server.registerTool('my-tool', { inputSchema: { q: z.string() } }, async ({ q },
 
 ## 12. Migration Steps (apply in this order)
 
-=======
-
-## 11. Migration Steps (apply in this order)
-
-> > > > > > > f6e8204b8621f55ee08c4f8cb8b2b85eff104842
-
 1. Update `package.json`: `npm uninstall @modelcontextprotocol/sdk`, install the appropriate v2 packages
 2. Replace all imports from `@modelcontextprotocol/sdk/...` using the import mapping tables (sections 3-4), including `StreamableHTTPServerTransport` → `NodeStreamableHTTPServerTransport`
 3. Replace removed type aliases (`JSONRPCError` → `JSONRPCErrorResponse`, etc.) per section 5

docs/migration.md

@@ -240,22 +240,13 @@ app.use(hostHeaderValidation(['example.com']));
 
 Note: the v2 signature takes a plain `string[]` instead of an options object.
 
-<<<<<<< HEAD
-
 ### Context API replaces `RequestHandlerExtra`
 
-# The `extra` parameter in tool, prompt, and resource callbacks has been replaced with a structured context object (`ctx`). The old flat `RequestHandlerExtra` interface is replaced by `ServerContextInterface` (for server callbacks) and `ClientContextInterface` (for client callbacks).
-
-### `setRequestHandler` and `setNotificationHandler` use method strings
-
-The low-level `setRequestHandler` and `setNotificationHandler` methods on `Client`, `Server`, and `Protocol` now take a method string instead of a Zod schema.
-
-> > > > > > > f6e8204b8621f55ee08c4f8cb8b2b85eff104842
+The `extra` parameter in tool, prompt, and resource callbacks has been replaced with a structured context object (`ctx`). The old flat `RequestHandlerExtra` interface is replaced by `ServerContextInterface` (for server callbacks) and `ClientContextInterface` (for client callbacks).
 
 **Before (v1):**
 
 ```typescript
-<<<<<<< HEAD
 server.registerTool('my-tool', { inputSchema: { query: z.string() } }, async ({ query }, extra) => {
   // Flat properties
   console.log(extra.requestId);
@@ -277,27 +268,12 @@ server.registerTool('my-tool', { inputSchema: { query: z.string() } }, async ({
   extra.closeSSEStream?.();
 
   return { content: [{ type: 'text', text: 'Done' }] };
-=======
-import { Server, InitializeRequestSchema, LoggingMessageNotificationSchema } from '@modelcontextprotocol/sdk/server/index.js';
-
-const server = new Server({ name: 'my-server', version: '1.0.0' });
-
-// Request handler with schema
-server.setRequestHandler(InitializeRequestSchema, async (request) => {
-  return { protocolVersion: '...', capabilities: {}, serverInfo: { name: '...', version: '...' } };
-});
-
-// Notification handler with schema
-server.setNotificationHandler(LoggingMessageNotificationSchema, (notification) => {
-  console.log(notification.params.data);
->>>>>>> f6e8204b8621f55ee08c4f8cb8b2b85eff104842
 });
 ```
 
 **After (v2):**
 
 ```typescript
-<<<<<<< HEAD
 server.registerTool('my-tool', { inputSchema: { query: z.string() } }, async ({ query }, ctx) => {
   // Grouped into nested objects
   console.log(ctx.mcpReq.id);          // was extra.requestId
@@ -341,7 +317,7 @@ server.registerTool('my-tool', { inputSchema: { query: z.string() } }, async ({
 | `extra.authInfo`                     | `ctx.http?.authInfo`               |
 | `extra.requestInfo?.headers`         | `ctx.http?.req.headers`            |
 | `extra.sendNotification(n)`          | `ctx.notification.send(n)`         |
-| `extra.sendRequest(r, s, o)`         | `ctx.mcpReq.send(r, s, o)`         |
+| `extra.sendRequest(r, s, o)`        | `ctx.mcpReq.send(r, s, o)`        |
 | `extra.taskId`                       | `ctx.task?.id`                     |
 | `extra.taskStore`                    | `ctx.task?.store`                  |
 | `extra.taskRequestedTtl`             | `ctx.task?.requestedTtl`           |
@@ -361,15 +337,45 @@ server.registerTool('my-tool', { inputSchema: { query: z.string() } }, async ({
 | `ctx.mcpReq.requestSampling(params, opts?)` | Request LLM sampling from client                       |
 | `ctx.http?.req`                             | Raw fetch `Request` object (access URL, headers, etc.) |
 
-======= import { Server } from '@modelcontextprotocol/server';
+### `setRequestHandler` and `setNotificationHandler` use method strings
+
+The low-level `setRequestHandler` and `setNotificationHandler` methods on `Client`, `Server`, and `Protocol` now take a method string instead of a Zod schema.
+
+**Before (v1):**
+
+```typescript
+import { Server, InitializeRequestSchema, LoggingMessageNotificationSchema } from '@modelcontextprotocol/sdk/server/index.js';
 
 const server = new Server({ name: 'my-server', version: '1.0.0' });
 
-// Request handler with method string server.setRequestHandler('initialize', async (request) => { return { protocolVersion: '...', capabilities: {}, serverInfo: { name: '...', version: '...' } }; });
+// Request handler with schema
+server.setRequestHandler(InitializeRequestSchema, async (request) => {
+  return { protocolVersion: '...', capabilities: {}, serverInfo: { name: '...', version: '...' } };
+});
 
-// Notification handler with method string server.setNotificationHandler('notifications/message', (notification) => { console.log(notification.params.data); });
+// Notification handler with schema
+server.setNotificationHandler(LoggingMessageNotificationSchema, (notification) => {
+  console.log(notification.params.data);
+});
+```
 
-````
+**After (v2):**
+
+```typescript
+import { Server } from '@modelcontextprotocol/server';
+
+const server = new Server({ name: 'my-server', version: '1.0.0' });
+
+// Request handler with method string
+server.setRequestHandler('initialize', async (request) => {
+  return { protocolVersion: '...', capabilities: {}, serverInfo: { name: '...', version: '...' } };
+});
+
+// Notification handler with method string
+server.setNotificationHandler('notifications/message', (notification) => {
+  console.log(notification.params.data);
+});
+```
 
 The request and notification parameters remain fully typed via `RequestTypeMap` and `NotificationTypeMap`. You no longer need to import the individual `*RequestSchema` or `*NotificationSchema` constants for handler registration.
 
@@ -390,7 +396,6 @@ Common method string replacements:
 | `ToolListChangedNotificationSchema` | `'notifications/tools/list_changed'` |
 | `ResourceListChangedNotificationSchema` | `'notifications/resources/list_changed'` |
 | `PromptListChangedNotificationSchema` | `'notifications/prompts/list_changed'` |
->>>>>>> f6e8204b8621f55ee08c4f8cb8b2b85eff104842
 
 ### Client list methods return empty results for missing capabilities