Merge branch 'main' into ihrpr/http-streamable-server

Author: ihrpr

.github/workflows/main.yml

@@ -46,7 +46,6 @@ jobs:
 
       - run: npm ci
 
-      # TODO: Add --provenance once the repo is public
-      - run: npm publish --access public
+      - run: npm publish --provenance --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.prettierrc

@@ -455,13 +455,6 @@ const client = new Client(
   {
     name: "example-client",
     version: "1.0.0"
-  },
-  {
-    capabilities: {
-      prompts: {},
-      resources: {},
-      tools: {}
-    }
   }
 );
 
@@ -471,15 +464,20 @@ await client.connect(transport);
 const prompts = await client.listPrompts();
 
 // Get a prompt
-const prompt = await client.getPrompt("example-prompt", {
-  arg1: "value"
+const prompt = await client.getPrompt({
+  name: "example-prompt",
+  arguments: {
+    arg1: "value"
+  }
 });
 
 // List resources
 const resources = await client.listResources();
 
 // Read a resource
-const resource = await client.readResource("file:///example.txt");
+const resource = await client.readResource({
+  uri: "file:///example.txt"
+});
 
 // Call a tool
 const result = await client.callTool({

README.md

@@ -12,6 +12,5 @@ export default {
   transformIgnorePatterns: [
     "/node_modules/(?!eventsource)/"
   ],
-  collectCoverageFrom: ["src/**/*.ts"],
   testPathIgnorePatterns: ["/node_modules/", "/dist/"],
 };

jest.config.js

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/sdk",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Model Context Protocol implementation for TypeScript",
   "license": "MIT",
   "author": "Anthropic, PBC (https://anthropic.com)",
@@ -41,7 +41,6 @@
     "prepack": "npm run build:esm && npm run build:cjs",
     "lint": "eslint src/",
     "test": "jest",
-    "coverage": "jest --coverage",
     "start": "npm run server",
     "server": "tsx watch --clear-screen=false src/cli.ts server",
     "client": "tsx src/cli.ts client"

package-lock.json

@@ -230,10 +230,19 @@ test("should respect server capabilities", async () => {
   await expect(client.listResources()).resolves.not.toThrow();
   await expect(client.listTools()).resolves.not.toThrow();
 
-  // This should throw because prompts are not supported
+  // These should throw because prompts, logging, and completions are not supported
   await expect(client.listPrompts()).rejects.toThrow(
     "Server does not support prompts",
   );
+  await expect(client.setLoggingLevel("error")).rejects.toThrow(
+    "Server does not support logging",
+  );
+  await expect(
+    client.complete({
+      ref: { type: "ref/prompt", name: "test" },
+      argument: { name: "test", value: "test" },
+    }),
+  ).rejects.toThrow("Server does not support completions");
 });
 
 test("should respect client notification capabilities", async () => {

package.json

@@ -124,7 +124,7 @@ export class Client<
     }
   }
 
-  override async connect(transport: Transport): Promise<void> {
+  override async connect(transport: Transport, options?: RequestOptions): Promise<void> {
     await super.connect(transport);
 
     try {
@@ -138,6 +138,7 @@ export class Client<
           },
         },
         InitializeResultSchema,
+        options
       );
 
       if (result === undefined) {
@@ -237,9 +238,9 @@ export class Client<
         break;
 
       case "completion/complete":
-        if (!this._serverCapabilities?.prompts) {
+        if (!this._serverCapabilities?.completions) {
           throw new Error(
-            `Server does not support prompts (required for ${method})`,
+            `Server does not support completions (required for ${method})`,
           );
         }
         break;

src/client/index.test.ts

@@ -24,7 +24,7 @@ describe("SSEClientTransport", () => {
       // Send SSE headers
       res.writeHead(200, {
         "Content-Type": "text/event-stream",
-        "Cache-Control": "no-cache",
+        "Cache-Control": "no-cache, no-transform",
         Connection: "keep-alive",
       });
 
@@ -56,6 +56,8 @@ describe("SSEClientTransport", () => {
       baseUrl = new URL(`http://127.0.0.1:${addr.port}`);
       done();
     });
+
+    jest.spyOn(console, 'error').mockImplementation(() => {});
   });
 
   afterEach(async () => {
@@ -183,7 +185,7 @@ describe("SSEClientTransport", () => {
         if (req.method === "GET") {
           res.writeHead(200, {
             "Content-Type": "text/event-stream",
-            "Cache-Control": "no-cache",
+            "Cache-Control": "no-cache, no-transform",
             Connection: "keep-alive",
           });
           res.write("event: endpoint\n");
@@ -397,7 +399,7 @@ describe("SSEClientTransport", () => {
 
             res.writeHead(200, {
               "Content-Type": "text/event-stream",
-              "Cache-Control": "no-cache",
+              "Cache-Control": "no-cache, no-transform",
               Connection: "keep-alive",
             });
             res.write("event: endpoint\n");
@@ -524,7 +526,7 @@ describe("SSEClientTransport", () => {
         if (auth === "Bearer new-token") {
           res.writeHead(200, {
             "Content-Type": "text/event-stream",
-            "Cache-Control": "no-cache",
+            "Cache-Control": "no-cache, no-transform",
             Connection: "keep-alive",
           });
           res.write("event: endpoint\n");
@@ -610,7 +612,7 @@ describe("SSEClientTransport", () => {
 
             res.writeHead(200, {
               "Content-Type": "text/event-stream",
-              "Cache-Control": "no-cache",
+              "Cache-Control": "no-cache, no-transform",
               Connection: "keep-alive",
             });
             res.write("event: endpoint\n");

src/client/index.ts

@@ -12,7 +12,6 @@ export class InMemoryTransport implements Transport {
   onerror?: (error: Error) => void;
   onmessage?: (message: JSONRPCMessage) => void;
   sessionId?: string;
-  user?: unknown;
 
   /**
    * Creates a pair of linked in-memory transports that can communicate with each other. One should be passed to a Client and one to a Server.