@letta-ai/letta-code 0.33.6 → 0.33.7

package/dist/mcp-client.js

@@ -16867,28 +16867,29 @@ class StreamableHTTPClientTransport {
 // src/mcp-client.ts
 var DEFAULT_CLIENT_INFO = {
   name: "letta-code",
-  version: "0.33.6"
+  version: "0.33.7"
 };
 async function connectMcpServer(config2, options = {}) {
   let client = new Client(options.clientInfo ?? DEFAULT_CLIENT_INFO);
   try {
+    options.signal?.throwIfAborted();
     const transport = createTransport(config2, options);
     try {
-      await client.connect(transport);
+      await client.connect(transport, options.signal ? { signal: options.signal } : undefined);
     } catch (error2) {
       if (!(error2 instanceof UnauthorizedError) || !options.oauth?.waitForAuthorizationCode || !supportsOAuthCompletion(transport)) {
         throw error2;
       }
-      const authorizationCode = await options.oauth.waitForAuthorizationCode();
-      await transport.finishAuth(authorizationCode);
+      const authorizationCode = await withAbort(options.oauth.waitForAuthorizationCode(), options.signal, () => options.oauth?.close());
+      await withAbort(transport.finishAuth(authorizationCode), options.signal, () => transport.close());
       await client.close().catch(() => transport.close().catch(() => {
         return;
       }));
       client = new Client(options.clientInfo ?? DEFAULT_CLIENT_INFO);
-      await client.connect(createTransport(config2, options));
+      await client.connect(createTransport(config2, options), options.signal ? { signal: options.signal } : undefined);
     }
-    await options.oauth?.close();
-    const response = await client.listTools();
+    await (options.oauth?.closeCallback?.() ?? options.oauth?.close() ?? Promise.resolve());
+    const response = await client.listTools(undefined, options.signal ? { signal: options.signal } : undefined);
     const tools = response.tools.map((tool) => ({
       ...tool,
       inputSchema: normalizeInputSchema(tool.inputSchema),
@@ -16911,7 +16912,13 @@ async function connectMcpServer(config2, options = {}) {
         if (closed)
           return;
         closed = true;
-        await client.close();
+        const results = await Promise.allSettled([
+          client.close(),
+          options.oauth?.close()
+        ]);
+        const failure = results.find((result) => result.status === "rejected");
+        if (failure)
+          throw failure.reason;
       }
     };
   } catch (error2) {
@@ -16922,6 +16929,27 @@ async function connectMcpServer(config2, options = {}) {
     throw error2;
   }
 }
+async function withAbort(operation, signal, onAbort) {
+  if (!signal)
+    return operation;
+  signal.throwIfAborted();
+  let abort;
+  const cancellation = new Promise((_resolve, reject) => {
+    abort = () => {
+      Promise.resolve(onAbort?.()).catch(() => {
+        return;
+      });
+      reject(signal.reason ?? new DOMException("Operation aborted", "AbortError"));
+    };
+    signal.addEventListener("abort", abort, { once: true });
+  });
+  try {
+    return await Promise.race([operation, cancellation]);
+  } finally {
+    if (abort)
+      signal.removeEventListener("abort", abort);
+  }
+}
 function connectStdioMcpServer(config2, options = {}) {
   return connectMcpServer({ ...config2, transport: "stdio" }, options);
 }
@@ -16930,7 +16958,8 @@ function createTransport(config2, options) {
     const headers = resolveHeaderEnvironment(config2.headers);
     return new StreamableHTTPClientTransport(new URL(config2.url), {
       requestInit: headersRequestInit(headers),
-      authProvider: options.oauth?.authProvider
+      authProvider: options.oauth?.authProvider,
+      fetch: abortAwareFetch(options.signal)
     });
   }
   if (config2.transport === "sse") {
@@ -16939,7 +16968,7 @@ function createTransport(config2, options) {
     return new SSEClientTransport(new URL(config2.url), {
       requestInit,
       authProvider: options.oauth?.authProvider,
-      fetch: headers ? (url2, init) => fetch(url2, mergeHeaders(init, headers)) : undefined
+      fetch: abortAwareFetch(options.signal, headers)
     });
   }
   return new StdioClientTransport({
@@ -16950,6 +16979,18 @@ function createTransport(config2, options) {
     stderr: options.stderr ?? "inherit"
   });
 }
+function abortAwareFetch(operationSignal, headers) {
+  if (!operationSignal && !headers)
+    return;
+  return (url2, init) => {
+    const requestInit = headers ? mergeHeaders(init, headers) : { ...init };
+    const requestSignal = requestInit.signal ?? undefined;
+    return fetch(url2, {
+      ...requestInit,
+      signal: operationSignal && requestSignal ? AbortSignal.any([operationSignal, requestSignal]) : operationSignal ?? requestSignal
+    });
+  };
+}
 function supportsOAuthCompletion(transport) {
   return "finishAuth" in transport && typeof transport.finishAuth === "function";
 }
@@ -16992,4 +17033,4 @@ export {
   connectMcpServer
 };
 
-//# debugId=EA35533720B42BA264756E2164756E21
+//# debugId=93ABE808CA1D455C64756E2164756E21