From 65e3555620393fc0277fa1e7f19fce052571b1a6 Mon Sep 17 00:00:00 2001
From: Justin Spahr-Summers <justin@anthropic.com>
Date: Sat, 16 Nov 2024 15:57:15 +0000
Subject: [PATCH 1/2] Add message when aborting due to timeout

---
 src/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils.ts b/src/utils.ts
index 11672ecd2..3ca6af286 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -4,7 +4,7 @@
 export function abortAfterTimeout(timeoutMs: number): AbortSignal {
   const controller = new AbortController();
   setTimeout(() => {
-    controller.abort();
+    controller.abort("Timeout exceeded");
   }, timeoutMs);
 
   return controller.signal;

From 7d50d8ca16a8873719089f6102a16e0b258a38a8 Mon Sep 17 00:00:00 2001
From: Justin Spahr-Summers <justin@anthropic.com>
Date: Sat, 16 Nov 2024 15:59:03 +0000
Subject: [PATCH 2/2] Add missing `options` to request methods

---
 src/client/index.ts | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/client/index.ts b/src/client/index.ts
index 2c08bcc09..1ad516166 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -278,8 +278,8 @@ export class Client<
     }
   }
 
-  async ping() {
-    return this.request({ method: "ping" }, EmptyResultSchema);
+  async ping(options?: RequestOptions) {
+    return this.request({ method: "ping" }, EmptyResultSchema, options);
   }
 
   async complete(params: CompleteRequest["params"], options?: RequestOptions) {
@@ -290,10 +290,11 @@ export class Client<
     );
   }
 
-  async setLoggingLevel(level: LoggingLevel) {
+  async setLoggingLevel(level: LoggingLevel, options?: RequestOptions) {
     return this.request(
       { method: "logging/setLevel", params: { level } },
       EmptyResultSchema,
+      options,
     );
   }
 
@@ -352,17 +353,25 @@ export class Client<
     );
   }
 
-  async subscribeResource(params: SubscribeRequest["params"]) {
+  async subscribeResource(
+    params: SubscribeRequest["params"],
+    options?: RequestOptions,
+  ) {
     return this.request(
       { method: "resources/subscribe", params },
       EmptyResultSchema,
+      options,
     );
   }
 
-  async unsubscribeResource(params: UnsubscribeRequest["params"]) {
+  async unsubscribeResource(
+    params: UnsubscribeRequest["params"],
+    options?: RequestOptions,
+  ) {
     return this.request(
       { method: "resources/unsubscribe", params },
       EmptyResultSchema,
+      options,
     );
   }