@a2a-js/sdk 0.3.5 → 0.3.6

package/dist/client/index.cjs

@@ -20,20 +20,423 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var client_exports = {};
 __export(client_exports, {
   A2AClient: () => A2AClient,
-  createAuthenticatingFetchWithRetry: () => createAuthenticatingFetchWithRetry
+  AgentCardResolver: () => AgentCardResolver,
+  Client: () => Client,
+  ClientCallContext: () => ClientCallContext,
+  ClientCallContextKey: () => ClientCallContextKey,
+  ClientFactory: () => ClientFactory,
+  ClientFactoryOptions: () => ClientFactoryOptions,
+  DefaultAgentCardResolver: () => DefaultAgentCardResolver,
+  JsonRpcTransport: () => JsonRpcTransport,
+  JsonRpcTransportFactory: () => JsonRpcTransportFactory,
+  ServiceParameters: () => ServiceParameters,
+  createAuthenticatingFetchWithRetry: () => createAuthenticatingFetchWithRetry,
+  withA2AExtensions: () => withA2AExtensions
 });
 module.exports = __toCommonJS(client_exports);
 
 // src/constants.ts
 var AGENT_CARD_PATH = ".well-known/agent-card.json";
+var HTTP_EXTENSION_HEADER = "X-A2A-Extensions";
+
+// src/errors.ts
+var TaskNotFoundError = class extends Error {
+  constructor(message) {
+    super(message ?? "Task not found");
+    this.name = "TaskNotFoundError";
+  }
+};
+var TaskNotCancelableError = class extends Error {
+  constructor(message) {
+    super(message ?? "Task cannot be canceled");
+    this.name = "TaskNotCancelableError";
+  }
+};
+var PushNotificationNotSupportedError = class extends Error {
+  constructor(message) {
+    super(message ?? "Push Notification is not supported");
+    this.name = "PushNotificationNotSupportedError";
+  }
+};
+var UnsupportedOperationError = class extends Error {
+  constructor(message) {
+    super(message ?? "This operation is not supported");
+    this.name = "UnsupportedOperationError";
+  }
+};
+var ContentTypeNotSupportedError = class extends Error {
+  constructor(message) {
+    super(message ?? "Incompatible content types");
+    this.name = "ContentTypeNotSupportedError";
+  }
+};
+var InvalidAgentResponseError = class extends Error {
+  constructor(message) {
+    super(message ?? "Invalid agent response type");
+    this.name = "InvalidAgentResponseError";
+  }
+};
+var AuthenticatedExtendedCardNotConfiguredError = class extends Error {
+  constructor(message) {
+    super(message ?? "Authenticated Extended Card not configured");
+    this.name = "AuthenticatedExtendedCardNotConfiguredError";
+  }
+};
+
+// src/client/transports/json_rpc_transport.ts
+var JsonRpcTransport = class _JsonRpcTransport {
+  customFetchImpl;
+  endpoint;
+  requestIdCounter = 1;
+  constructor(options) {
+    this.endpoint = options.endpoint;
+    this.customFetchImpl = options.fetchImpl;
+  }
+  async getExtendedAgentCard(options, idOverride) {
+    const rpcResponse = await this._sendRpcRequest("agent/getAuthenticatedExtendedCard", void 0, idOverride, options);
+    return rpcResponse.result;
+  }
+  async sendMessage(params, options, idOverride) {
+    const rpcResponse = await this._sendRpcRequest(
+      "message/send",
+      params,
+      idOverride,
+      options
+    );
+    return rpcResponse.result;
+  }
+  async *sendMessageStream(params, options) {
+    yield* this._sendStreamingRequest("message/stream", params, options);
+  }
+  async setTaskPushNotificationConfig(params, options, idOverride) {
+    const rpcResponse = await this._sendRpcRequest("tasks/pushNotificationConfig/set", params, idOverride, options);
+    return rpcResponse.result;
+  }
+  async getTaskPushNotificationConfig(params, options, idOverride) {
+    const rpcResponse = await this._sendRpcRequest("tasks/pushNotificationConfig/get", params, idOverride, options);
+    return rpcResponse.result;
+  }
+  async listTaskPushNotificationConfig(params, options, idOverride) {
+    const rpcResponse = await this._sendRpcRequest("tasks/pushNotificationConfig/list", params, idOverride, options);
+    return rpcResponse.result;
+  }
+  async deleteTaskPushNotificationConfig(params, options, idOverride) {
+    await this._sendRpcRequest("tasks/pushNotificationConfig/delete", params, idOverride, options);
+  }
+  async getTask(params, options, idOverride) {
+    const rpcResponse = await this._sendRpcRequest(
+      "tasks/get",
+      params,
+      idOverride,
+      options
+    );
+    return rpcResponse.result;
+  }
+  async cancelTask(params, options, idOverride) {
+    const rpcResponse = await this._sendRpcRequest(
+      "tasks/cancel",
+      params,
+      idOverride,
+      options
+    );
+    return rpcResponse.result;
+  }
+  async *resubscribeTask(params, options) {
+    yield* this._sendStreamingRequest("tasks/resubscribe", params, options);
+  }
+  async callExtensionMethod(method, params, idOverride, options) {
+    return await this._sendRpcRequest(
+      method,
+      params,
+      idOverride,
+      options
+    );
+  }
+  _fetch(...args) {
+    if (this.customFetchImpl) {
+      return this.customFetchImpl(...args);
+    }
+    if (typeof fetch === "function") {
+      return fetch(...args);
+    }
+    throw new Error(
+      "A `fetch` implementation was not provided and is not available in the global scope. Please provide a `fetchImpl` in the A2ATransportOptions. "
+    );
+  }
+  async _sendRpcRequest(method, params, idOverride, options) {
+    const requestId = idOverride ?? this.requestIdCounter++;
+    const rpcRequest = {
+      jsonrpc: "2.0",
+      method,
+      params,
+      id: requestId
+    };
+    const httpResponse = await this._fetchRpc(rpcRequest, "application/json", options);
+    if (!httpResponse.ok) {
+      let errorBodyText = "(empty or non-JSON response)";
+      let errorJson;
+      try {
+        errorBodyText = await httpResponse.text();
+        errorJson = JSON.parse(errorBodyText);
+      } catch (e) {
+        throw new Error(
+          `HTTP error for ${method}! Status: ${httpResponse.status} ${httpResponse.statusText}. Response: ${errorBodyText}`,
+          { cause: e }
+        );
+      }
+      if (errorJson.jsonrpc && errorJson.error) {
+        throw _JsonRpcTransport.mapToError(errorJson);
+      } else {
+        throw new Error(
+          `HTTP error for ${method}! Status: ${httpResponse.status} ${httpResponse.statusText}. Response: ${errorBodyText}`
+        );
+      }
+    }
+    const rpcResponse = await httpResponse.json();
+    if (rpcResponse.id !== requestId) {
+      console.error(
+        `CRITICAL: RPC response ID mismatch for method ${method}. Expected ${requestId}, got ${rpcResponse.id}.`
+      );
+    }
+    if ("error" in rpcResponse) {
+      throw _JsonRpcTransport.mapToError(rpcResponse);
+    }
+    return rpcResponse;
+  }
+  async _fetchRpc(rpcRequest, acceptHeader = "application/json", options) {
+    const requestInit = {
+      method: "POST",
+      headers: {
+        ...options?.serviceParameters,
+        "Content-Type": "application/json",
+        Accept: acceptHeader
+      },
+      body: JSON.stringify(rpcRequest),
+      signal: options?.signal
+    };
+    return this._fetch(this.endpoint, requestInit);
+  }
+  async *_sendStreamingRequest(method, params, options) {
+    const clientRequestId = this.requestIdCounter++;
+    const rpcRequest = {
+      jsonrpc: "2.0",
+      method,
+      params,
+      id: clientRequestId
+    };
+    const response = await this._fetchRpc(rpcRequest, "text/event-stream", options);
+    if (!response.ok) {
+      let errorBody = "";
+      let errorJson;
+      try {
+        errorBody = await response.text();
+        errorJson = JSON.parse(errorBody);
+      } catch (e) {
+        throw new Error(
+          `HTTP error establishing stream for ${method}: ${response.status} ${response.statusText}. Response: ${errorBody || "(empty)"}`,
+          { cause: e }
+        );
+      }
+      if (errorJson.error) {
+        throw new Error(
+          `HTTP error establishing stream for ${method}: ${response.status} ${response.statusText}. RPC Error: ${errorJson.error.message} (Code: ${errorJson.error.code})`
+        );
+      }
+      throw new Error(
+        `HTTP error establishing stream for ${method}: ${response.status} ${response.statusText}`
+      );
+    }
+    if (!response.headers.get("Content-Type")?.startsWith("text/event-stream")) {
+      throw new Error(
+        `Invalid response Content-Type for SSE stream for ${method}. Expected 'text/event-stream'.`
+      );
+    }
+    yield* this._parseA2ASseStream(response, clientRequestId);
+  }
+  async *_parseA2ASseStream(response, originalRequestId) {
+    if (!response.body) {
+      throw new Error("SSE response body is undefined. Cannot read stream.");
+    }
+    const reader = response.body.pipeThrough(new TextDecoderStream()).getReader();
+    let buffer = "";
+    let eventDataBuffer = "";
+    try {
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) {
+          if (eventDataBuffer.trim()) {
+            const result = this._processSseEventData(
+              eventDataBuffer,
+              originalRequestId
+            );
+            yield result;
+          }
+          break;
+        }
+        buffer += value;
+        let lineEndIndex;
+        while ((lineEndIndex = buffer.indexOf("\n")) >= 0) {
+          const line = buffer.substring(0, lineEndIndex).trim();
+          buffer = buffer.substring(lineEndIndex + 1);
+          if (line === "") {
+            if (eventDataBuffer) {
+              const result = this._processSseEventData(
+                eventDataBuffer,
+                originalRequestId
+              );
+              yield result;
+              eventDataBuffer = "";
+            }
+          } else if (line.startsWith("data:")) {
+            eventDataBuffer += line.substring(5).trimStart() + "\n";
+          }
+        }
+      }
+    } catch (error) {
+      console.error(
+        "Error reading or parsing SSE stream:",
+        error instanceof Error && error.message || "Error unknown"
+      );
+      throw error;
+    } finally {
+      reader.releaseLock();
+    }
+  }
+  _processSseEventData(jsonData, originalRequestId) {
+    if (!jsonData.trim()) {
+      throw new Error("Attempted to process empty SSE event data.");
+    }
+    try {
+      const sseJsonRpcResponse = JSON.parse(jsonData.replace(/\n$/, ""));
+      const a2aStreamResponse = sseJsonRpcResponse;
+      if (a2aStreamResponse.id !== originalRequestId) {
+        console.warn(
+          `SSE Event's JSON-RPC response ID mismatch. Client request ID: ${originalRequestId}, event response ID: ${a2aStreamResponse.id}.`
+        );
+      }
+      if ("error" in a2aStreamResponse) {
+        const err = a2aStreamResponse.error;
+        throw new Error(
+          `SSE event contained an error: ${err.message} (Code: ${err.code}) Data: ${JSON.stringify(err.data || {})}`
+        );
+      }
+      if (!("result" in a2aStreamResponse) || typeof a2aStreamResponse.result === "undefined") {
+        throw new Error(`SSE event JSON-RPC response is missing 'result' field. Data: ${jsonData}`);
+      }
+      return a2aStreamResponse.result;
+    } catch (e) {
+      if (e instanceof Error && (e.message.startsWith("SSE event contained an error") || e.message.startsWith("SSE event JSON-RPC response is missing 'result' field"))) {
+        throw e;
+      }
+      console.error(
+        "Failed to parse SSE event data string or unexpected JSON-RPC structure:",
+        jsonData,
+        e
+      );
+      throw new Error(
+        `Failed to parse SSE event data: "${jsonData.substring(0, 100)}...". Original error: ${e instanceof Error && e.message || "Unknown error"}`
+      );
+    }
+  }
+  static mapToError(response) {
+    switch (response.error.code) {
+      case -32001:
+        return new TaskNotFoundJSONRPCError(response);
+      case -32002:
+        return new TaskNotCancelableJSONRPCError(response);
+      case -32003:
+        return new PushNotificationNotSupportedJSONRPCError(response);
+      case -32004:
+        return new UnsupportedOperationJSONRPCError(response);
+      case -32005:
+        return new ContentTypeNotSupportedJSONRPCError(response);
+      case -32006:
+        return new InvalidAgentResponseJSONRPCError(response);
+      case -32007:
+        return new AuthenticatedExtendedCardNotConfiguredJSONRPCError(response);
+      default:
+        return new JSONRPCTransportError(response);
+    }
+  }
+};
+var JsonRpcTransportFactory = class _JsonRpcTransportFactory {
+  constructor(options) {
+    this.options = options;
+  }
+  static name = "JSONRPC";
+  get protocolName() {
+    return _JsonRpcTransportFactory.name;
+  }
+  async create(url, _agentCard) {
+    return new JsonRpcTransport({
+      endpoint: url,
+      fetchImpl: this.options?.fetchImpl
+    });
+  }
+};
+var JSONRPCTransportError = class extends Error {
+  constructor(errorResponse) {
+    super(
+      `JSON-RPC error: ${errorResponse.error.message} (Code: ${errorResponse.error.code}) Data: ${JSON.stringify(errorResponse.error.data || {})}`
+    );
+    this.errorResponse = errorResponse;
+  }
+};
+var TaskNotFoundJSONRPCError = class extends TaskNotFoundError {
+  constructor(errorResponse) {
+    super();
+    this.errorResponse = errorResponse;
+  }
+};
+var TaskNotCancelableJSONRPCError = class extends TaskNotCancelableError {
+  constructor(errorResponse) {
+    super();
+    this.errorResponse = errorResponse;
+  }
+};
+var PushNotificationNotSupportedJSONRPCError = class extends PushNotificationNotSupportedError {
+  constructor(errorResponse) {
+    super();
+    this.errorResponse = errorResponse;
+  }
+};
+var UnsupportedOperationJSONRPCError = class extends UnsupportedOperationError {
+  constructor(errorResponse) {
+    super();
+    this.errorResponse = errorResponse;
+  }
+};
+var ContentTypeNotSupportedJSONRPCError = class extends ContentTypeNotSupportedError {
+  constructor(errorResponse) {
+    super();
+    this.errorResponse = errorResponse;
+  }
+};
+var InvalidAgentResponseJSONRPCError = class extends InvalidAgentResponseError {
+  constructor(errorResponse) {
+    super();
+    this.errorResponse = errorResponse;
+  }
+};
+var AuthenticatedExtendedCardNotConfiguredJSONRPCError = class extends AuthenticatedExtendedCardNotConfiguredError {
+  constructor(errorResponse) {
+    super();
+    this.errorResponse = errorResponse;
+  }
+};
 
 // src/client/client.ts
 var A2AClient = class _A2AClient {
+  static emptyOptions = void 0;
   agentCardPromise;
-  requestIdCounter = 1;
-  serviceEndpointUrl;
-  // To be populated from AgentCard after fetching
   customFetchImpl;
+  serviceEndpointUrl;
+  // To be populated from AgentCard after fetchin
+  // A2AClient is built around JSON-RPC types, so it will only support JSON-RPC transport, new client with transport agnostic interface is going to be created for multi-transport.
+  // New transport abstraction isn't going to expose individual transport specific fields, so to keep returning JSON-RPC IDs here for compatibility,
+  // keep counter here and pass it to JsonRpcTransport via an optional idOverride parameter (which is not visible via transport-agnostic A2ATransport interface).
+  transport;
+  requestIdCounter = 1;
   /**
    * Constructs an A2AClient instance from an AgentCard.
    * @param agentCard The AgentCard object.
@@ -42,18 +445,22 @@ var A2AClient = class _A2AClient {
   constructor(agentCard, options) {
     this.customFetchImpl = options?.fetchImpl;
     if (typeof agentCard === "string") {
-      console.warn("Warning: Constructing A2AClient with a URL is deprecated. Please use A2AClient.fromCardUrl() instead.");
+      console.warn(
+        "Warning: Constructing A2AClient with a URL is deprecated. Please use A2AClient.fromCardUrl() instead."
+      );
       this.agentCardPromise = this._fetchAndCacheAgentCard(agentCard, options?.agentCardPath);
     } else {
       if (!agentCard.url) {
-        throw new Error("Provided Agent Card does not contain a valid 'url' for the service endpoint.");
+        throw new Error(
+          "Provided Agent Card does not contain a valid 'url' for the service endpoint."
+        );
       }
       this.serviceEndpointUrl = agentCard.url;
       this.agentCardPromise = Promise.resolve(agentCard);
     }
   }
   /**
-   * Dynamically resolves the fetch implementation to use for requests. 
+   * Dynamically resolves the fetch implementation to use for requests.
    * Prefers a custom implementation if provided, otherwise falls back to the global fetch.
    * @returns The fetch implementation.
    * @param args Arguments to pass to the fetch implementation.
@@ -79,7 +486,7 @@ var A2AClient = class _A2AClient {
   static async fromCardUrl(agentCardUrl, options) {
     const fetchImpl = options?.fetchImpl;
     const requestInit = {
-      headers: { "Accept": "application/json" }
+      headers: { Accept: "application/json" }
     };
     let response;
     if (fetchImpl) {
@@ -92,76 +499,21 @@ var A2AClient = class _A2AClient {
       );
     }
     if (!response.ok) {
-      throw new Error(`Failed to fetch Agent Card from ${agentCardUrl}: ${response.status} ${response.statusText}`);
+      throw new Error(
+        `Failed to fetch Agent Card from ${agentCardUrl}: ${response.status} ${response.statusText}`
+      );
     }
     let agentCard;
     try {
       agentCard = await response.json();
     } catch (error) {
       console.error("Failed to parse Agent Card JSON:", error);
-      throw new Error(`Failed to parse Agent Card JSON from ${agentCardUrl}. Original error: ${error.message}`);
+      throw new Error(
+        `Failed to parse Agent Card JSON from ${agentCardUrl}. Original error: ${error.message}`
+      );
     }
     return new _A2AClient(agentCard, options);
   }
-  /**
-   * Helper method to make a generic JSON-RPC POST request.
-   * @param method The RPC method name.
-   * @param params The parameters for the RPC method.
-   * @returns A Promise that resolves to the RPC response.
-   */
-  async _postRpcRequest(method, params) {
-    const endpoint = await this._getServiceEndpoint();
-    const requestId = this.requestIdCounter++;
-    const rpcRequest = {
-      jsonrpc: "2.0",
-      method,
-      params,
-      // Cast because TParams structure varies per method
-      id: requestId
-    };
-    const httpResponse = await this._fetchRpc(endpoint, rpcRequest);
-    if (!httpResponse.ok) {
-      let errorBodyText = "(empty or non-JSON response)";
-      try {
-        errorBodyText = await httpResponse.text();
-        const errorJson = JSON.parse(errorBodyText);
-        if (errorJson.jsonrpc && errorJson.error) {
-          return errorJson;
-        } else if (!errorJson.jsonrpc && errorJson.error) {
-          throw new Error(`RPC error for ${method}: ${errorJson.error.message} (Code: ${errorJson.error.code}, HTTP Status: ${httpResponse.status}) Data: ${JSON.stringify(errorJson.error.data || {})}`);
-        } else if (!errorJson.jsonrpc) {
-          throw new Error(`HTTP error for ${method}! Status: ${httpResponse.status} ${httpResponse.statusText}. Response: ${errorBodyText}`);
-        }
-      } catch (e) {
-        if (e.message.startsWith("RPC error for") || e.message.startsWith("HTTP error for")) throw e;
-        throw new Error(`HTTP error for ${method}! Status: ${httpResponse.status} ${httpResponse.statusText}. Response: ${errorBodyText}`);
-      }
-    }
-    const rpcResponse = await httpResponse.json();
-    if (rpcResponse.id !== requestId) {
-      console.error(`CRITICAL: RPC response ID mismatch for method ${method}. Expected ${requestId}, got ${rpcResponse.id}. This may lead to incorrect response handling.`);
-    }
-    return rpcResponse;
-  }
-  /**
-   * Internal helper method to fetch the RPC service endpoint.
-   * @param url The URL to fetch.
-   * @param rpcRequest The JSON-RPC request to send.
-   * @param acceptHeader The Accept header to use.  Defaults to "application/json".
-   * @returns A Promise that resolves to the fetch HTTP response.
-   */
-  async _fetchRpc(url, rpcRequest, acceptHeader = "application/json") {
-    const requestInit = {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "Accept": acceptHeader
-        // Expect JSON response for non-streaming requests
-      },
-      body: JSON.stringify(rpcRequest)
-    };
-    return this._fetch(url, requestInit);
-  }
   /**
    * Sends a message to the agent.
    * The behavior (blocking/non-blocking) and push notification configuration
@@ -171,7 +523,10 @@ var A2AClient = class _A2AClient {
    * @returns A Promise resolving to SendMessageResponse, which can be a Message, Task, or an error.
    */
   async sendMessage(params) {
-    return this._postRpcRequest("message/send", params);
+    return await this.invokeJsonRpc(
+      (t, p, id) => t.sendMessage(p, _A2AClient.emptyOptions, id),
+      params
+    );
   }
   /**
    * Sends a message to the agent and streams back responses using Server-Sent Events (SSE).
@@ -185,36 +540,12 @@ var A2AClient = class _A2AClient {
   async *sendMessageStream(params) {
     const agentCard = await this.agentCardPromise;
     if (!agentCard.capabilities?.streaming) {
-      throw new Error("Agent does not support streaming (AgentCard.capabilities.streaming is not true).");
-    }
-    const endpoint = await this._getServiceEndpoint();
-    const clientRequestId = this.requestIdCounter++;
-    const rpcRequest = {
-      // This is the initial JSON-RPC request to establish the stream
-      jsonrpc: "2.0",
-      method: "message/stream",
-      params,
-      id: clientRequestId
-    };
-    const response = await this._fetchRpc(endpoint, rpcRequest, "text/event-stream");
-    if (!response.ok) {
-      let errorBody = "";
-      try {
-        errorBody = await response.text();
-        const errorJson = JSON.parse(errorBody);
-        if (errorJson.error) {
-          throw new Error(`HTTP error establishing stream for message/stream: ${response.status} ${response.statusText}. RPC Error: ${errorJson.error.message} (Code: ${errorJson.error.code})`);
-        }
-      } catch (e) {
-        if (e.message.startsWith("HTTP error establishing stream")) throw e;
-        throw new Error(`HTTP error establishing stream for message/stream: ${response.status} ${response.statusText}. Response: ${errorBody || "(empty)"}`);
-      }
-      throw new Error(`HTTP error establishing stream for message/stream: ${response.status} ${response.statusText}`);
-    }
-    if (!response.headers.get("Content-Type")?.startsWith("text/event-stream")) {
-      throw new Error("Invalid response Content-Type for SSE stream. Expected 'text/event-stream'.");
+      throw new Error(
+        "Agent does not support streaming (AgentCard.capabilities.streaming is not true)."
+      );
     }
-    yield* this._parseA2ASseStream(response, clientRequestId);
+    const transport = await this._getOrCreateTransport();
+    yield* transport.sendMessageStream(params);
   }
   /**
    * Sets or updates the push notification configuration for a given task.
@@ -225,12 +556,11 @@ var A2AClient = class _A2AClient {
   async setTaskPushNotificationConfig(params) {
     const agentCard = await this.agentCardPromise;
     if (!agentCard.capabilities?.pushNotifications) {
-      throw new Error("Agent does not support push notifications (AgentCard.capabilities.pushNotifications is not true).");
+      throw new Error(
+        "Agent does not support push notifications (AgentCard.capabilities.pushNotifications is not true)."
+      );
     }
-    return this._postRpcRequest(
-      "tasks/pushNotificationConfig/set",
-      params
-    );
+    return await this.invokeJsonRpc((t, p, id) => t.setTaskPushNotificationConfig(p, _A2AClient.emptyOptions, id), params);
   }
   /**
    * Gets the push notification configuration for a given task.
@@ -238,8 +568,8 @@ var A2AClient = class _A2AClient {
    * @returns A Promise resolving to GetTaskPushNotificationConfigResponse.
    */
   async getTaskPushNotificationConfig(params) {
-    return this._postRpcRequest(
-      "tasks/pushNotificationConfig/get",
+    return await this.invokeJsonRpc(
+      (t, p, id) => t.getTaskPushNotificationConfig(p, _A2AClient.emptyOptions, id),
       params
     );
   }
@@ -249,10 +579,7 @@ var A2AClient = class _A2AClient {
    * @returns A Promise resolving to ListTaskPushNotificationConfigResponse.
    */
   async listTaskPushNotificationConfig(params) {
-    return this._postRpcRequest(
-      "tasks/pushNotificationConfig/list",
-      params
-    );
+    return await this.invokeJsonRpc((t, p, id) => t.listTaskPushNotificationConfig(p, _A2AClient.emptyOptions, id), params);
   }
   /**
    * Deletes the push notification configuration for a given task.
@@ -260,10 +587,7 @@ var A2AClient = class _A2AClient {
    * @returns A Promise resolving to DeleteTaskPushNotificationConfigResponse.
    */
   async deleteTaskPushNotificationConfig(params) {
-    return this._postRpcRequest(
-      "tasks/pushNotificationConfig/delete",
-      params
-    );
+    return await this.invokeJsonRpc((t, p, id) => t.deleteTaskPushNotificationConfig(p, _A2AClient.emptyOptions, id), params);
   }
   /**
    * Retrieves a task by its ID.
@@ -271,7 +595,10 @@ var A2AClient = class _A2AClient {
    * @returns A Promise resolving to GetTaskResponse, which contains the Task object or an error.
    */
   async getTask(params) {
-    return this._postRpcRequest("tasks/get", params);
+    return await this.invokeJsonRpc(
+      (t, p, id) => t.getTask(p, _A2AClient.emptyOptions, id),
+      params
+    );
   }
   /**
    * Cancels a task by its ID.
@@ -279,18 +606,34 @@ var A2AClient = class _A2AClient {
    * @returns A Promise resolving to CancelTaskResponse, which contains the updated Task object or an error.
    */
   async cancelTask(params) {
-    return this._postRpcRequest("tasks/cancel", params);
+    return await this.invokeJsonRpc(
+      (t, p, id) => t.cancelTask(p, _A2AClient.emptyOptions, id),
+      params
+    );
   }
   /**
    * @template TExtensionParams The type of parameters for the custom extension method.
-   * @template TExtensionResponse The type of response expected from the custom extension method. 
+   * @template TExtensionResponse The type of response expected from the custom extension method.
    * This should extend JSONRPCResponse. This ensures the extension response is still a valid A2A response.
    * @param method Custom JSON-RPC method defined in the AgentCard's extensions.
    * @param params Extension paramters defined in the AgentCard's extensions.
    * @returns A Promise that resolves to the RPC response.
    */
   async callExtensionMethod(method, params) {
-    return this._postRpcRequest(method, params);
+    const transport = await this._getOrCreateTransport();
+    try {
+      return await transport.callExtensionMethod(
+        method,
+        params,
+        this.requestIdCounter++
+      );
+    } catch (e) {
+      const errorResponse = extractJSONRPCError(e);
+      if (errorResponse) {
+        return errorResponse;
+      }
+      throw e;
+    }
   }
   /**
    * Resubscribes to a task's event stream using Server-Sent Events (SSE).
@@ -304,129 +647,8 @@ var A2AClient = class _A2AClient {
     if (!agentCard.capabilities?.streaming) {
       throw new Error("Agent does not support streaming (required for tasks/resubscribe).");
     }
-    const endpoint = await this._getServiceEndpoint();
-    const clientRequestId = this.requestIdCounter++;
-    const rpcRequest = {
-      // Initial JSON-RPC request to establish the stream
-      jsonrpc: "2.0",
-      method: "tasks/resubscribe",
-      params,
-      id: clientRequestId
-    };
-    const response = await this._fetch(endpoint, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "Accept": "text/event-stream"
-      },
-      body: JSON.stringify(rpcRequest)
-    });
-    if (!response.ok) {
-      let errorBody = "";
-      try {
-        errorBody = await response.text();
-        const errorJson = JSON.parse(errorBody);
-        if (errorJson.error) {
-          throw new Error(`HTTP error establishing stream for tasks/resubscribe: ${response.status} ${response.statusText}. RPC Error: ${errorJson.error.message} (Code: ${errorJson.error.code})`);
-        }
-      } catch (e) {
-        if (e.message.startsWith("HTTP error establishing stream")) throw e;
-        throw new Error(`HTTP error establishing stream for tasks/resubscribe: ${response.status} ${response.statusText}. Response: ${errorBody || "(empty)"}`);
-      }
-      throw new Error(`HTTP error establishing stream for tasks/resubscribe: ${response.status} ${response.statusText}`);
-    }
-    if (!response.headers.get("Content-Type")?.startsWith("text/event-stream")) {
-      throw new Error("Invalid response Content-Type for SSE stream on resubscribe. Expected 'text/event-stream'.");
-    }
-    yield* this._parseA2ASseStream(response, clientRequestId);
-  }
-  /**
-   * Parses an HTTP response body as an A2A Server-Sent Event stream.
-   * Each 'data' field of an SSE event is expected to be a JSON-RPC 2.0 Response object,
-   * specifically a SendStreamingMessageResponse (or similar structure for resubscribe).
-   * @param response The HTTP Response object whose body is the SSE stream.
-   * @param originalRequestId The ID of the client's JSON-RPC request that initiated this stream.
-   * Used to validate the `id` in the streamed JSON-RPC responses.
-   * @returns An AsyncGenerator yielding the `result` field of each valid JSON-RPC success response from the stream.
-   */
-  async *_parseA2ASseStream(response, originalRequestId) {
-    if (!response.body) {
-      throw new Error("SSE response body is undefined. Cannot read stream.");
-    }
-    const reader = response.body.pipeThrough(new TextDecoderStream()).getReader();
-    let buffer = "";
-    let eventDataBuffer = "";
-    try {
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) {
-          if (eventDataBuffer.trim()) {
-            const result = this._processSseEventData(eventDataBuffer, originalRequestId);
-            yield result;
-          }
-          break;
-        }
-        buffer += value;
-        let lineEndIndex;
-        while ((lineEndIndex = buffer.indexOf("\n")) >= 0) {
-          const line = buffer.substring(0, lineEndIndex).trim();
-          buffer = buffer.substring(lineEndIndex + 1);
-          if (line === "") {
-            if (eventDataBuffer) {
-              const result = this._processSseEventData(eventDataBuffer, originalRequestId);
-              yield result;
-              eventDataBuffer = "";
-            }
-          } else if (line.startsWith("data:")) {
-            eventDataBuffer += line.substring(5).trimStart() + "\n";
-          } else if (line.startsWith(":")) {
-          } else if (line.includes(":")) {
-          }
-        }
-      }
-    } catch (error) {
-      console.error("Error reading or parsing SSE stream:", error.message);
-      throw error;
-    } finally {
-      reader.releaseLock();
-    }
-  }
-  /**
-   * Processes a single SSE event's data string, expecting it to be a JSON-RPC response.
-   * @param jsonData The string content from one or more 'data:' lines of an SSE event.
-   * @param originalRequestId The ID of the client's request that initiated the stream.
-   * @returns The `result` field of the parsed JSON-RPC success response.
-   * @throws Error if data is not valid JSON, not a valid JSON-RPC response, an error response, or ID mismatch.
-   */
-  _processSseEventData(jsonData, originalRequestId) {
-    if (!jsonData.trim()) {
-      throw new Error("Attempted to process empty SSE event data.");
-    }
-    try {
-      const sseJsonRpcResponse = JSON.parse(jsonData.replace(/\n$/, ""));
-      const a2aStreamResponse = sseJsonRpcResponse;
-      if (a2aStreamResponse.id !== originalRequestId) {
-        console.warn(`SSE Event's JSON-RPC response ID mismatch. Client request ID: ${originalRequestId}, event response ID: ${a2aStreamResponse.id}.`);
-      }
-      if (this.isErrorResponse(a2aStreamResponse)) {
-        const err = a2aStreamResponse.error;
-        throw new Error(`SSE event contained an error: ${err.message} (Code: ${err.code}) Data: ${JSON.stringify(err.data || {})}`);
-      }
-      if (!("result" in a2aStreamResponse) || typeof a2aStreamResponse.result === "undefined") {
-        throw new Error(`SSE event JSON-RPC response is missing 'result' field. Data: ${jsonData}`);
-      }
-      const successResponse = a2aStreamResponse;
-      return successResponse.result;
-    } catch (e) {
-      if (e.message.startsWith("SSE event contained an error") || e.message.startsWith("SSE event JSON-RPC response is missing 'result' field")) {
-        throw e;
-      }
-      console.error("Failed to parse SSE event data string or unexpected JSON-RPC structure:", jsonData, e);
-      throw new Error(`Failed to parse SSE event data: "${jsonData.substring(0, 100)}...". Original error: ${e.message}`);
-    }
-  }
-  isErrorResponse(response) {
-    return "error" in response;
+    const transport = await this._getOrCreateTransport();
+    yield* transport.resubscribeTask(params);
   }
   ////////////////////////////////////////////////////////////////////////////////
   // Functions used to support old A2AClient Constructor to be deprecated soon
@@ -437,7 +659,16 @@ var A2AClient = class _A2AClient {
   // * getAgentCard changed to this.agentCard
   // * delete resolveAgentCardUrl(), _fetchAndCacheAgentCard(),
   //   agentCardPath from A2AClientOptions
+  // * delete _getOrCreateTransport
   ////////////////////////////////////////////////////////////////////////////////
+  async _getOrCreateTransport() {
+    if (this.transport) {
+      return this.transport;
+    }
+    const endpoint = await this._getServiceEndpoint();
+    this.transport = new JsonRpcTransport({ fetchImpl: this.customFetchImpl, endpoint });
+    return this.transport;
+  }
   /**
    * Fetches the Agent Card from the agent's well-known URI and caches its service endpoint URL.
    * This method is called by the constructor.
@@ -449,14 +680,18 @@ var A2AClient = class _A2AClient {
     try {
       const agentCardUrl = this.resolveAgentCardUrl(agentBaseUrl, agentCardPath);
       const response = await this._fetch(agentCardUrl, {
-        headers: { "Accept": "application/json" }
+        headers: { Accept: "application/json" }
       });
       if (!response.ok) {
-        throw new Error(`Failed to fetch Agent Card from ${agentCardUrl}: ${response.status} ${response.statusText}`);
+        throw new Error(
+          `Failed to fetch Agent Card from ${agentCardUrl}: ${response.status} ${response.statusText}`
+        );
       }
       const agentCard = await response.json();
       if (!agentCard.url) {
-        throw new Error("Fetched Agent Card does not contain a valid 'url' for the service endpoint.");
+        throw new Error(
+          "Fetched Agent Card does not contain a valid 'url' for the service endpoint."
+        );
       }
       this.serviceEndpointUrl = agentCard.url;
       return agentCard;
@@ -466,22 +701,24 @@ var A2AClient = class _A2AClient {
     }
   }
   /**
-  * Retrieves the Agent Card.
-  * If an `agentBaseUrl` is provided, it fetches the card from that specific URL.
-  * Otherwise, it returns the card fetched and cached during client construction.
-  * @param agentBaseUrl Optional. The base URL of the agent to fetch the card from.
-  * @param agentCardPath path to the agent card, defaults to .well-known/agent-card.json
-  * If provided, this will fetch a new card, not use the cached one from the constructor's URL.
-  * @returns A Promise that resolves to the AgentCard.
-  */
+   * Retrieves the Agent Card.
+   * If an `agentBaseUrl` is provided, it fetches the card from that specific URL.
+   * Otherwise, it returns the card fetched and cached during client construction.
+   * @param agentBaseUrl Optional. The base URL of the agent to fetch the card from.
+   * @param agentCardPath path to the agent card, defaults to .well-known/agent-card.json
+   * If provided, this will fetch a new card, not use the cached one from the constructor's URL.
+   * @returns A Promise that resolves to the AgentCard.
+   */
   async getAgentCard(agentBaseUrl, agentCardPath) {
     if (agentBaseUrl) {
       const agentCardUrl = this.resolveAgentCardUrl(agentBaseUrl, agentCardPath);
       const response = await this._fetch(agentCardUrl, {
-        headers: { "Accept": "application/json" }
+        headers: { Accept: "application/json" }
       });
       if (!response.ok) {
-        throw new Error(`Failed to fetch Agent Card from ${agentCardUrl}: ${response.status} ${response.statusText}`);
+        throw new Error(
+          `Failed to fetch Agent Card from ${agentCardUrl}: ${response.status} ${response.statusText}`
+        );
       }
       return await response.json();
     }
@@ -505,11 +742,39 @@ var A2AClient = class _A2AClient {
     }
     await this.agentCardPromise;
     if (!this.serviceEndpointUrl) {
-      throw new Error("Agent Card URL for RPC endpoint is not available. Fetching might have failed.");
+      throw new Error(
+        "Agent Card URL for RPC endpoint is not available. Fetching might have failed."
+      );
     }
     return this.serviceEndpointUrl;
   }
+  async invokeJsonRpc(caller, params) {
+    const transport = await this._getOrCreateTransport();
+    const requestId = this.requestIdCounter++;
+    try {
+      const result = await caller(transport, params, requestId);
+      return {
+        id: requestId,
+        jsonrpc: "2.0",
+        result: result ?? null
+        // JSON-RPC requires result property on success, it will be null for "void" methods.
+      };
+    } catch (e) {
+      const errorResponse = extractJSONRPCError(e);
+      if (errorResponse) {
+        return errorResponse;
+      }
+      throw e;
+    }
+  }
 };
+function extractJSONRPCError(error) {
+  if (error instanceof Object && "errorResponse" in error && error.errorResponse instanceof Object && "jsonrpc" in error.errorResponse && error.errorResponse.jsonrpc === "2.0" && "error" in error.errorResponse && error.errorResponse.error !== null) {
+    return error.errorResponse;
+  } else {
+    return void 0;
+  }
+}
 
 // src/client/auth-handler.ts
 function createAuthenticatingFetchWithRetry(fetchImpl, authHandler) {
@@ -543,8 +808,544 @@ function createAuthenticatingFetchWithRetry(fetchImpl, authHandler) {
   Object.defineProperties(authFetch, Object.getOwnPropertyDescriptors(fetchImpl));
   return authFetch;
 }
+
+// src/client/card-resolver.ts
+var DefaultAgentCardResolver = class {
+  constructor(options) {
+    this.options = options;
+  }
+  /**
+   * Fetches the agent card based on provided base URL and path.
+   * Path is selected in the following order:
+   * 1) path parameter
+   * 2) path from options
+   * 3) .well-known/agent-card.json
+   */
+  async resolve(baseUrl, path) {
+    const agentCardUrl = new URL(path ?? this.options?.path ?? AGENT_CARD_PATH, baseUrl);
+    const response = await this.fetchImpl(agentCardUrl);
+    if (!response.ok) {
+      throw new Error(`Failed to fetch Agent Card from ${agentCardUrl}: ${response.status}`);
+    }
+    return await response.json();
+  }
+  fetchImpl(...args) {
+    if (this.options?.fetchImpl) {
+      return this.options.fetchImpl(...args);
+    }
+    return fetch(...args);
+  }
+};
+var AgentCardResolver = {
+  default: new DefaultAgentCardResolver()
+};
+
+// src/client/multitransport-client.ts
+var Client = class {
+  constructor(transport, agentCard, config) {
+    this.transport = transport;
+    this.agentCard = agentCard;
+    this.config = config;
+  }
+  /**
+   * If the current agent card supports the extended feature, it will try to fetch the extended agent card from the server,
+   * Otherwise it will return the current agent card value.
+   */
+  async getAgentCard(options) {
+    if (this.agentCard.supportsAuthenticatedExtendedCard) {
+      this.agentCard = await this.executeWithInterceptors(
+        { method: "getAgentCard" },
+        options,
+        (_, options2) => this.transport.getExtendedAgentCard(options2)
+      );
+    }
+    return this.agentCard;
+  }
+  /**
+   * Sends a message to an agent to initiate a new interaction or to continue an existing one.
+   * Uses blocking mode by default.
+   */
+  sendMessage(params, options) {
+    params = this.applyClientConfig({
+      params,
+      blocking: !(this.config?.polling ?? false)
+    });
+    return this.executeWithInterceptors(
+      { method: "sendMessage", value: params },
+      options,
+      this.transport.sendMessage.bind(this.transport)
+    );
+  }
+  /**
+   * Sends a message to an agent to initiate/continue a task AND subscribes the client to real-time updates for that task.
+   * Performs fallback to non-streaming if not supported by the agent.
+   */
+  async *sendMessageStream(params, options) {
+    const method = "sendMessageStream";
+    params = this.applyClientConfig({ params, blocking: true });
+    const beforeArgs = {
+      input: { method, value: params },
+      agentCard: this.agentCard,
+      options
+    };
+    const beforeResult = await this.interceptBefore(beforeArgs);
+    if (beforeResult) {
+      const earlyReturn = beforeResult.earlyReturn.value;
+      const afterArgs = {
+        result: { method, value: earlyReturn },
+        agentCard: this.agentCard,
+        options: beforeArgs.options
+      };
+      await this.interceptAfter(afterArgs, beforeResult.executed);
+      yield afterArgs.result.value;
+      return;
+    }
+    if (!this.agentCard.capabilities.streaming) {
+      const result = await this.transport.sendMessage(beforeArgs.input.value, beforeArgs.options);
+      const afterArgs = {
+        result: { method, value: result },
+        agentCard: this.agentCard,
+        options: beforeArgs.options
+      };
+      await this.interceptAfter(afterArgs);
+      yield afterArgs.result.value;
+      return;
+    }
+    for await (const event of this.transport.sendMessageStream(
+      beforeArgs.input.value,
+      beforeArgs.options
+    )) {
+      const afterArgs = {
+        result: { method, value: event },
+        agentCard: this.agentCard,
+        options: beforeArgs.options
+      };
+      await this.interceptAfter(afterArgs);
+      yield afterArgs.result.value;
+      if (afterArgs.earlyReturn) {
+        return;
+      }
+    }
+  }
+  /**
+   * Sets or updates the push notification configuration for a specified task.
+   * Requires the server to have AgentCard.capabilities.pushNotifications: true.
+   */
+  setTaskPushNotificationConfig(params, options) {
+    if (!this.agentCard.capabilities.pushNotifications) {
+      throw new PushNotificationNotSupportedError();
+    }
+    return this.executeWithInterceptors(
+      { method: "setTaskPushNotificationConfig", value: params },
+      options,
+      this.transport.setTaskPushNotificationConfig.bind(this.transport)
+    );
+  }
+  /**
+   * Retrieves the current push notification configuration for a specified task.
+   * Requires the server to have AgentCard.capabilities.pushNotifications: true.
+   */
+  getTaskPushNotificationConfig(params, options) {
+    if (!this.agentCard.capabilities.pushNotifications) {
+      throw new PushNotificationNotSupportedError();
+    }
+    return this.executeWithInterceptors(
+      { method: "getTaskPushNotificationConfig", value: params },
+      options,
+      this.transport.getTaskPushNotificationConfig.bind(this.transport)
+    );
+  }
+  /**
+   * Retrieves the associated push notification configurations for a specified task.
+   * Requires the server to have AgentCard.capabilities.pushNotifications: true.
+   */
+  listTaskPushNotificationConfig(params, options) {
+    if (!this.agentCard.capabilities.pushNotifications) {
+      throw new PushNotificationNotSupportedError();
+    }
+    return this.executeWithInterceptors(
+      { method: "listTaskPushNotificationConfig", value: params },
+      options,
+      this.transport.listTaskPushNotificationConfig.bind(this.transport)
+    );
+  }
+  /**
+   * Deletes an associated push notification configuration for a task.
+   */
+  deleteTaskPushNotificationConfig(params, options) {
+    return this.executeWithInterceptors(
+      { method: "deleteTaskPushNotificationConfig", value: params },
+      options,
+      this.transport.deleteTaskPushNotificationConfig.bind(this.transport)
+    );
+  }
+  /**
+   * Retrieves the current state (including status, artifacts, and optionally history) of a previously initiated task.
+   */
+  getTask(params, options) {
+    return this.executeWithInterceptors(
+      { method: "getTask", value: params },
+      options,
+      this.transport.getTask.bind(this.transport)
+    );
+  }
+  /**
+   * Requests the cancellation of an ongoing task. The server will attempt to cancel the task,
+   * but success is not guaranteed (e.g., the task might have already completed or failed, or cancellation might not be supported at its current stage).
+   */
+  cancelTask(params, options) {
+    return this.executeWithInterceptors(
+      { method: "cancelTask", value: params },
+      options,
+      this.transport.cancelTask.bind(this.transport)
+    );
+  }
+  /**
+   * Allows a client to reconnect to an updates stream for an ongoing task after a previous connection was interrupted.
+   */
+  async *resubscribeTask(params, options) {
+    const method = "resubscribeTask";
+    const beforeArgs = {
+      input: { method, value: params },
+      agentCard: this.agentCard,
+      options
+    };
+    const beforeResult = await this.interceptBefore(beforeArgs);
+    if (beforeResult) {
+      const earlyReturn = beforeResult.earlyReturn.value;
+      const afterArgs = {
+        result: { method, value: earlyReturn },
+        agentCard: this.agentCard,
+        options: beforeArgs.options
+      };
+      await this.interceptAfter(afterArgs, beforeResult.executed);
+      yield afterArgs.result.value;
+      return;
+    }
+    for await (const event of this.transport.resubscribeTask(
+      beforeArgs.input.value,
+      beforeArgs.options
+    )) {
+      const afterArgs = {
+        result: { method, value: event },
+        agentCard: this.agentCard,
+        options: beforeArgs.options
+      };
+      await this.interceptAfter(afterArgs);
+      yield afterArgs.result.value;
+      if (afterArgs.earlyReturn) {
+        return;
+      }
+    }
+  }
+  applyClientConfig({
+    params,
+    blocking
+  }) {
+    const result = { ...params, configuration: params.configuration ?? {} };
+    if (!result.configuration.acceptedOutputModes && this.config?.acceptedOutputModes) {
+      result.configuration.acceptedOutputModes = this.config.acceptedOutputModes;
+    }
+    if (!result.configuration.pushNotificationConfig && this.config?.pushNotificationConfig) {
+      result.configuration.pushNotificationConfig = this.config.pushNotificationConfig;
+    }
+    result.configuration.blocking ??= blocking;
+    return result;
+  }
+  async executeWithInterceptors(input, options, transportCall) {
+    const beforeArgs = {
+      input,
+      agentCard: this.agentCard,
+      options
+    };
+    const beforeResult = await this.interceptBefore(beforeArgs);
+    if (beforeResult) {
+      const afterArgs2 = {
+        result: {
+          method: input.method,
+          value: beforeResult.earlyReturn.value
+        },
+        agentCard: this.agentCard,
+        options: beforeArgs.options
+      };
+      await this.interceptAfter(afterArgs2, beforeResult.executed);
+      return afterArgs2.result.value;
+    }
+    const result = await transportCall(beforeArgs.input.value, beforeArgs.options);
+    const afterArgs = {
+      result: { method: input.method, value: result },
+      agentCard: this.agentCard,
+      options: beforeArgs.options
+    };
+    await this.interceptAfter(afterArgs);
+    return afterArgs.result.value;
+  }
+  async interceptBefore(args) {
+    if (!this.config?.interceptors || this.config.interceptors.length === 0) {
+      return;
+    }
+    const executed = [];
+    for (const interceptor of this.config.interceptors) {
+      await interceptor.before(args);
+      executed.push(interceptor);
+      if (args.earlyReturn) {
+        return {
+          earlyReturn: args.earlyReturn,
+          executed
+        };
+      }
+    }
+  }
+  async interceptAfter(args, interceptors) {
+    const reversedInterceptors = [...interceptors ?? this.config?.interceptors ?? []].reverse();
+    for (const interceptor of reversedInterceptors) {
+      await interceptor.after(args);
+      if (args.earlyReturn) {
+        return;
+      }
+    }
+  }
+};
+
+// src/client/factory.ts
+var ClientFactoryOptions = {
+  /**
+   * SDK default options for {@link ClientFactory}.
+   */
+  default: {
+    transports: [new JsonRpcTransportFactory()]
+  },
+  /**
+   * Creates new options by merging an original and an override object.
+   * Transports are merged based on `TransportFactory.protocolName`,
+   * interceptors are concatenated, other fields are overriden.
+   *
+   * @example
+   * ```ts
+   * const options = ClientFactoryOptions.createFrom(ClientFactoryOptions.default, {
+   *  transports: [new MyCustomTransportFactory()], // adds a custom transport
+   *  clientConfig: { interceptors: [new MyInterceptor()] }, // adds a custom interceptor
+   * });
+   * ```
+   */
+  createFrom(original, overrides) {
+    return {
+      ...original,
+      ...overrides,
+      transports: mergeTransports(original.transports, overrides.transports),
+      clientConfig: {
+        ...original.clientConfig ?? {},
+        ...overrides.clientConfig ?? {},
+        interceptors: mergeArrays(
+          original.clientConfig?.interceptors,
+          overrides.clientConfig?.interceptors
+        ),
+        acceptedOutputModes: overrides.clientConfig?.acceptedOutputModes ?? original.clientConfig?.acceptedOutputModes
+      },
+      preferredTransports: overrides.preferredTransports ?? original.preferredTransports
+    };
+  }
+};
+var ClientFactory = class {
+  constructor(options = ClientFactoryOptions.default) {
+    this.options = options;
+    if (!options.transports || options.transports.length === 0) {
+      throw new Error("No transports provided");
+    }
+    this.transportsByName = transportsByName(options.transports);
+    for (const transport of options.preferredTransports ?? []) {
+      const factory = this.options.transports.find((t) => t.protocolName === transport);
+      if (!factory) {
+        throw new Error(
+          `Unknown preferred transport: ${transport}, available transports: ${[...this.transportsByName.keys()].join()}`
+        );
+      }
+    }
+    this.agentCardResolver = options.cardResolver ?? AgentCardResolver.default;
+  }
+  transportsByName;
+  agentCardResolver;
+  /**
+   * Creates a new client from the provided agent card.
+   */
+  async createFromAgentCard(agentCard) {
+    const agentCardPreferred = agentCard.preferredTransport ?? JsonRpcTransportFactory.name;
+    const additionalInterfaces = agentCard.additionalInterfaces ?? [];
+    const urlsPerAgentTransports = new Map([
+      [agentCardPreferred, agentCard.url],
+      ...additionalInterfaces.map((i) => [i.transport, i.url])
+    ]);
+    const transportsByPreference = [
+      ...this.options.preferredTransports ?? [],
+      agentCardPreferred,
+      ...additionalInterfaces.map((i) => i.transport)
+    ];
+    for (const transport of transportsByPreference) {
+      if (!urlsPerAgentTransports.has(transport)) {
+        continue;
+      }
+      const factory = this.transportsByName.get(transport);
+      if (!factory) {
+        continue;
+      }
+      return new Client(
+        await factory.create(urlsPerAgentTransports.get(transport), agentCard),
+        agentCard,
+        this.options.clientConfig
+      );
+    }
+    throw new Error(
+      "No compatible transport found, available transports: " + [...this.transportsByName.keys()].join()
+    );
+  }
+  /**
+   * Downloads agent card using AgentCardResolver from options
+   * and creates a new client from the downloaded card.
+   *
+   * @example
+   * ```ts
+   * const factory = new ClientFactory(); // use default options and default {@link AgentCardResolver}.
+   * const client1 = await factory.createFromUrl('https://example.com'); // /.well-known/agent-card.json is used by default
+   * const client2 = await factory.createFromUrl('https://example.com', '/my-agent-card.json'); // specify custom path
+   * const client3 = await factory.createFromUrl('https://example.com/my-agent-card.json', ''); // specify full URL and set path to empty
+   * ```
+   */
+  async createFromUrl(baseUrl, path) {
+    const agentCard = await this.agentCardResolver.resolve(baseUrl, path);
+    return this.createFromAgentCard(agentCard);
+  }
+};
+function mergeTransports(original, overrides) {
+  if (!overrides) {
+    return original;
+  }
+  const result = transportsByName(original);
+  const overridesByName = transportsByName(overrides);
+  for (const [name, factory] of overridesByName) {
+    result.set(name, factory);
+  }
+  return Array.from(result.values());
+}
+function transportsByName(transports) {
+  const result = /* @__PURE__ */ new Map();
+  if (!transports) {
+    return result;
+  }
+  for (const t of transports) {
+    if (result.has(t.protocolName)) {
+      throw new Error(`Duplicate protocol name: ${t.protocolName}`);
+    }
+    result.set(t.protocolName, t);
+  }
+  return result;
+}
+function mergeArrays(a1, a2) {
+  if (!a1 && !a2) {
+    return void 0;
+  }
+  return [...a1 ?? [], ...a2 ?? []];
+}
+
+// src/extensions.ts
+var Extensions = {
+  /**
+   * Creates new {@link Extensions} from `current` and `additional`.
+   * If `current` already contains `additional` it is returned unmodified.
+   */
+  createFrom: (current, additional) => {
+    if (current?.includes(additional)) {
+      return current;
+    }
+    return [...current ?? [], additional];
+  },
+  /**
+   * Creates {@link Extensions} from comma separated extensions identifiers as per
+   * https://a2a-protocol.org/latest/specification/#326-service-parameters.
+   * Parses the output of `toServiceParameter`.
+   */
+  parseServiceParameter: (value) => {
+    if (!value) {
+      return [];
+    }
+    const unique = new Set(
+      value.split(",").map((ext) => ext.trim()).filter((ext) => ext.length > 0)
+    );
+    return Array.from(unique);
+  },
+  /**
+   * Converts {@link Extensions} to comma separated extensions identifiers as per
+   * https://a2a-protocol.org/latest/specification/#326-service-parameters.
+   */
+  toServiceParameter: (value) => {
+    return value.join(",");
+  }
+};
+
+// src/client/service-parameters.ts
+var ServiceParameters = {
+  create(...updates) {
+    return ServiceParameters.createFrom(void 0, ...updates);
+  },
+  createFrom: (serviceParameters, ...updates) => {
+    const result = serviceParameters ? { ...serviceParameters } : {};
+    for (const update of updates) {
+      update(result);
+    }
+    return result;
+  }
+};
+function withA2AExtensions(...extensions) {
+  return (parameters) => {
+    parameters[HTTP_EXTENSION_HEADER] = Extensions.toServiceParameter(extensions);
+  };
+}
+
+// src/client/context.ts
+var ClientCallContext = {
+  /**
+   * Create a new {@link ClientCallContext} with optional updates applied.
+   */
+  create: (...updates) => {
+    return ClientCallContext.createFrom(void 0, ...updates);
+  },
+  /**
+   * Create a new {@link ClientCallContext} based on an existing one with updates applied.
+   */
+  createFrom: (context, ...updates) => {
+    const result = context ? { ...context } : {};
+    for (const update of updates) {
+      update(result);
+    }
+    return result;
+  }
+};
+var ClientCallContextKey = class {
+  symbol;
+  constructor(description) {
+    this.symbol = Symbol(description);
+  }
+  set(value) {
+    return (context) => {
+      context[this.symbol] = value;
+    };
+  }
+  get(context) {
+    return context[this.symbol];
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   A2AClient,
-  createAuthenticatingFetchWithRetry
+  AgentCardResolver,
+  Client,
+  ClientCallContext,
+  ClientCallContextKey,
+  ClientFactory,
+  ClientFactoryOptions,
+  DefaultAgentCardResolver,
+  JsonRpcTransport,
+  JsonRpcTransportFactory,
+  ServiceParameters,
+  createAuthenticatingFetchWithRetry,
+  withA2AExtensions
 });