Merge branch 'main' into justin/custom-requests

src/cli.ts

@@ -9,11 +9,12 @@ import WebSocket from "ws";
 import express from "express";
 import { Client } from "./client/index.js";
 import { SSEClientTransport } from "./client/sse.js";
+import { StdioClientTransport } from "./client/stdio.js";
+import { WebSocketClientTransport } from "./client/websocket.js";
 import { Server } from "./server/index.js";
 import { SSEServerTransport } from "./server/sse.js";
-import { WebSocketClientTransport } from "./client/websocket.js";
-import { StdioClientTransport } from "./client/stdio.js";
 import { StdioServerTransport } from "./server/stdio.js";
+import { ListResourcesResultSchema } from "./types.js";
 
 async function runClient(url_or_command: string, args: string[]) {
   const client = new Client({
@@ -46,6 +47,8 @@ async function runClient(url_or_command: string, args: string[]) {
   await client.connect(clientTransport);
   console.log("Initialized.");
 
+  await client.request({ method: "resources/list" }, ListResourcesResultSchema);
+
   await client.close();
   console.log("Closed.");
 }

src/types.ts

@@ -338,7 +338,7 @@ export const ProgressNotificationSchema = NotificationSchema.extend({
     /**
      * The progress token which was given in the initial request, used to associate this notification with the request that is proceeding.
      */
-    progressToken: z.optional(ProgressTokenSchema),
+    progressToken: ProgressTokenSchema,
   }),
 });
 
@@ -350,7 +350,7 @@ export const PaginatedRequestSchema = RequestSchema.extend({
      * If provided, the server should return results starting after this cursor.
      */
     cursor: z.optional(CursorSchema),
-  }),
+  }).optional(),
 });
 
 export const PaginatedResultSchema = ResultSchema.extend({