@a2a-js/sdk 0.2.4 → 0.2.5

package/README.md

@@ -182,7 +182,7 @@ class MyAgentExecutor implements AgentExecutor {
       artifact: {
         artifactId: "artifact-1",
         name: "artifact-1",
-        parts: [{ text: `Task ${context.task.id} completed.` }],
+        parts: [{ kind: "text", text: `Task ${taskId} completed.` }],
       },
       append: false, // Each emission is a complete file snapshot
       lastChunk: true, // True for this file artifact

package/dist/client/index.cjs

@@ -24,21 +24,25 @@ __export(client_exports, {
 module.exports = __toCommonJS(client_exports);
 
 // src/client/client.ts
-var A2AClient = class {
+var A2AClient = class _A2AClient {
   agentBaseUrl;
+  agentCardPath;
   agentCardPromise;
+  static DEFAULT_AGENT_CARD_PATH = ".well-known/agent.json";
   requestIdCounter = 1;
   serviceEndpointUrl;
   // To be populated from AgentCard after fetching
   /**
    * Constructs an A2AClient instance.
    * It initiates fetching the agent card from the provided agent baseUrl.
-   * The Agent Card is expected at `${agentBaseUrl}/.well-known/agent.json`.
+   * The Agent Card is fetched from a path relative to the agentBaseUrl, which defaults to '.well-known/agent.json'.
    * The `url` field from the Agent Card will be used as the RPC service endpoint.
-   * @param agentBaseUrl The base URL of the A2A agent (e.g., https://agent.example.com).
+   * @param agentBaseUrl The base URL of the A2A agent (e.g., https://agent.example.com)
+   * @param agentCardPath path to the agent card, defaults to .well-known/agent.json
    */
-  constructor(agentBaseUrl) {
+  constructor(agentBaseUrl, agentCardPath = _A2AClient.DEFAULT_AGENT_CARD_PATH) {
     this.agentBaseUrl = agentBaseUrl.replace(/\/$/, "");
+    this.agentCardPath = agentCardPath.replace(/^\//, "");
     this.agentCardPromise = this._fetchAndCacheAgentCard();
   }
   /**
@@ -47,7 +51,7 @@ var A2AClient = class {
    * @returns A Promise that resolves to the AgentCard.
    */
   async _fetchAndCacheAgentCard() {
-    const agentCardUrl = `${this.agentBaseUrl}/.well-known/agent.json`;
+    const agentCardUrl = `${this.agentBaseUrl}/${this.agentCardPath}`;
     try {
       const response = await fetch(agentCardUrl, {
         headers: { "Accept": "application/json" }
@@ -71,13 +75,13 @@ var A2AClient = class {
    * 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.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) {
+  async getAgentCard(agentBaseUrl, agentCardPath = _A2AClient.DEFAULT_AGENT_CARD_PATH) {
     if (agentBaseUrl) {
-      const specificAgentBaseUrl = agentBaseUrl.replace(/\/$/, "");
-      const agentCardUrl = `${specificAgentBaseUrl}/.well-known/agent.json`;
+      const agentCardUrl = `${agentBaseUrl.replace(/\/$/, "")}/${agentCardPath.replace(/^\//, "")}`;
       const response = await fetch(agentCardUrl, {
         headers: { "Accept": "application/json" }
       });
@@ -133,7 +137,7 @@ var A2AClient = class {
         errorBodyText = await httpResponse.text();
         const errorJson = JSON.parse(errorBodyText);
         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)}`);
+          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}`);
         }
@@ -371,7 +375,7 @@ var A2AClient = class {
       }
       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)}`);
+        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}`);

package/dist/client/index.d.cts

@@ -6,17 +6,20 @@ type A2AStreamEventData = Message | Task | TaskStatusUpdateEvent | TaskArtifactU
  */
 declare class A2AClient {
     private agentBaseUrl;
+    private agentCardPath;
     private agentCardPromise;
+    private static readonly DEFAULT_AGENT_CARD_PATH;
     private requestIdCounter;
     private serviceEndpointUrl?;
     /**
      * Constructs an A2AClient instance.
      * It initiates fetching the agent card from the provided agent baseUrl.
-     * The Agent Card is expected at `${agentBaseUrl}/.well-known/agent.json`.
+     * The Agent Card is fetched from a path relative to the agentBaseUrl, which defaults to '.well-known/agent.json'.
      * The `url` field from the Agent Card will be used as the RPC service endpoint.
-     * @param agentBaseUrl The base URL of the A2A agent (e.g., https://agent.example.com).
+     * @param agentBaseUrl The base URL of the A2A agent (e.g., https://agent.example.com)
+     * @param agentCardPath path to the agent card, defaults to .well-known/agent.json
      */
-    constructor(agentBaseUrl: string);
+    constructor(agentBaseUrl: string, agentCardPath?: string);
     /**
      * Fetches the Agent Card from the agent's well-known URI and caches its service endpoint URL.
      * This method is called by the constructor.
@@ -28,10 +31,11 @@ declare class A2AClient {
      * 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.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.
      */
-    getAgentCard(agentBaseUrl?: string): Promise<AgentCard>;
+    getAgentCard(agentBaseUrl?: string, agentCardPath?: string): Promise<AgentCard>;
     /**
      * Gets the RPC service endpoint URL. Ensures the agent card has been fetched first.
      * @returns A Promise that resolves to the service endpoint URL string.

package/dist/client/index.d.ts

@@ -6,17 +6,20 @@ type A2AStreamEventData = Message | Task | TaskStatusUpdateEvent | TaskArtifactU
  */
 declare class A2AClient {
     private agentBaseUrl;
+    private agentCardPath;
     private agentCardPromise;
+    private static readonly DEFAULT_AGENT_CARD_PATH;
     private requestIdCounter;
     private serviceEndpointUrl?;
     /**
      * Constructs an A2AClient instance.
      * It initiates fetching the agent card from the provided agent baseUrl.
-     * The Agent Card is expected at `${agentBaseUrl}/.well-known/agent.json`.
+     * The Agent Card is fetched from a path relative to the agentBaseUrl, which defaults to '.well-known/agent.json'.
      * The `url` field from the Agent Card will be used as the RPC service endpoint.
-     * @param agentBaseUrl The base URL of the A2A agent (e.g., https://agent.example.com).
+     * @param agentBaseUrl The base URL of the A2A agent (e.g., https://agent.example.com)
+     * @param agentCardPath path to the agent card, defaults to .well-known/agent.json
      */
-    constructor(agentBaseUrl: string);
+    constructor(agentBaseUrl: string, agentCardPath?: string);
     /**
      * Fetches the Agent Card from the agent's well-known URI and caches its service endpoint URL.
      * This method is called by the constructor.
@@ -28,10 +31,11 @@ declare class A2AClient {
      * 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.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.
      */
-    getAgentCard(agentBaseUrl?: string): Promise<AgentCard>;
+    getAgentCard(agentBaseUrl?: string, agentCardPath?: string): Promise<AgentCard>;
     /**
      * Gets the RPC service endpoint URL. Ensures the agent card has been fetched first.
      * @returns A Promise that resolves to the service endpoint URL string.

package/dist/client/index.js

@@ -1,19 +1,23 @@
 // src/client/client.ts
-var A2AClient = class {
+var A2AClient = class _A2AClient {
   agentBaseUrl;
+  agentCardPath;
   agentCardPromise;
+  static DEFAULT_AGENT_CARD_PATH = ".well-known/agent.json";
   requestIdCounter = 1;
   serviceEndpointUrl;
   // To be populated from AgentCard after fetching
   /**
    * Constructs an A2AClient instance.
    * It initiates fetching the agent card from the provided agent baseUrl.
-   * The Agent Card is expected at `${agentBaseUrl}/.well-known/agent.json`.
+   * The Agent Card is fetched from a path relative to the agentBaseUrl, which defaults to '.well-known/agent.json'.
    * The `url` field from the Agent Card will be used as the RPC service endpoint.
-   * @param agentBaseUrl The base URL of the A2A agent (e.g., https://agent.example.com).
+   * @param agentBaseUrl The base URL of the A2A agent (e.g., https://agent.example.com)
+   * @param agentCardPath path to the agent card, defaults to .well-known/agent.json
    */
-  constructor(agentBaseUrl) {
+  constructor(agentBaseUrl, agentCardPath = _A2AClient.DEFAULT_AGENT_CARD_PATH) {
     this.agentBaseUrl = agentBaseUrl.replace(/\/$/, "");
+    this.agentCardPath = agentCardPath.replace(/^\//, "");
     this.agentCardPromise = this._fetchAndCacheAgentCard();
   }
   /**
@@ -22,7 +26,7 @@ var A2AClient = class {
    * @returns A Promise that resolves to the AgentCard.
    */
   async _fetchAndCacheAgentCard() {
-    const agentCardUrl = `${this.agentBaseUrl}/.well-known/agent.json`;
+    const agentCardUrl = `${this.agentBaseUrl}/${this.agentCardPath}`;
     try {
       const response = await fetch(agentCardUrl, {
         headers: { "Accept": "application/json" }
@@ -46,13 +50,13 @@ var A2AClient = class {
    * 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.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) {
+  async getAgentCard(agentBaseUrl, agentCardPath = _A2AClient.DEFAULT_AGENT_CARD_PATH) {
     if (agentBaseUrl) {
-      const specificAgentBaseUrl = agentBaseUrl.replace(/\/$/, "");
-      const agentCardUrl = `${specificAgentBaseUrl}/.well-known/agent.json`;
+      const agentCardUrl = `${agentBaseUrl.replace(/\/$/, "")}/${agentCardPath.replace(/^\//, "")}`;
       const response = await fetch(agentCardUrl, {
         headers: { "Accept": "application/json" }
       });
@@ -108,7 +112,7 @@ var A2AClient = class {
         errorBodyText = await httpResponse.text();
         const errorJson = JSON.parse(errorBodyText);
         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)}`);
+          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}`);
         }
@@ -346,7 +350,7 @@ var A2AClient = class {
       }
       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)}`);
+        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}`);

package/dist/server/index.cjs

@@ -34,6 +34,7 @@ __export(server_exports, {
   DefaultExecutionEventBus: () => DefaultExecutionEventBus,
   DefaultExecutionEventBusManager: () => DefaultExecutionEventBusManager,
   DefaultRequestHandler: () => DefaultRequestHandler,
+  ExecutionEventQueue: () => ExecutionEventQueue,
   InMemoryTaskStore: () => InMemoryTaskStore,
   JsonRpcTransportHandler: () => JsonRpcTransportHandler,
   RequestContext: () => RequestContext,
@@ -107,6 +108,63 @@ var DefaultExecutionEventBusManager = class {
   }
 };
 
+// src/server/events/execution_event_queue.ts
+var ExecutionEventQueue = class {
+  eventBus;
+  eventQueue = [];
+  resolvePromise;
+  stopped = false;
+  boundHandleEvent;
+  constructor(eventBus) {
+    this.eventBus = eventBus;
+    this.eventBus.on("event", this.handleEvent);
+    this.eventBus.on("finished", this.handleFinished);
+  }
+  handleEvent = (event) => {
+    if (this.stopped) return;
+    this.eventQueue.push(event);
+    if (this.resolvePromise) {
+      this.resolvePromise();
+      this.resolvePromise = void 0;
+    }
+  };
+  handleFinished = () => {
+    this.stop();
+  };
+  /**
+   * Provides an async generator that yields events from the event bus.
+   * Stops when a Message event is received or a TaskStatusUpdateEvent with final=true is received.
+   */
+  async *events() {
+    while (!this.stopped || this.eventQueue.length > 0) {
+      if (this.eventQueue.length > 0) {
+        const event = this.eventQueue.shift();
+        yield event;
+        if (event.kind === "message" || event.kind === "status-update" && event.final) {
+          this.handleFinished();
+          break;
+        }
+      } else if (!this.stopped) {
+        await new Promise((resolve) => {
+          this.resolvePromise = resolve;
+        });
+      }
+    }
+  }
+  /**
+   * Stops the event queue from processing further events.
+   */
+  stop() {
+    this.stopped = true;
+    if (this.resolvePromise) {
+      this.resolvePromise();
+      this.resolvePromise = void 0;
+    }
+    this.eventBus.off("event", this.handleEvent);
+    this.eventBus.off("finished", this.handleFinished);
+  }
+};
+
 // src/server/request_handler/default_request_handler.ts
 var import_uuid = require("uuid");
 
@@ -185,63 +243,6 @@ var A2AError = class _A2AError extends Error {
   }
 };
 
-// src/server/events/execution_event_queue.ts
-var ExecutionEventQueue = class {
-  eventBus;
-  eventQueue = [];
-  resolvePromise;
-  stopped = false;
-  boundHandleEvent;
-  constructor(eventBus) {
-    this.eventBus = eventBus;
-    this.eventBus.on("event", this.handleEvent);
-    this.eventBus.on("finished", this.handleFinished);
-  }
-  handleEvent = (event) => {
-    if (this.stopped) return;
-    this.eventQueue.push(event);
-    if (this.resolvePromise) {
-      this.resolvePromise();
-      this.resolvePromise = void 0;
-    }
-  };
-  handleFinished = () => {
-    this.stop();
-  };
-  /**
-   * Provides an async generator that yields events from the event bus.
-   * Stops when a Message event is received or a TaskStatusUpdateEvent with final=true is received.
-   */
-  async *events() {
-    while (!this.stopped || this.eventQueue.length > 0) {
-      if (this.eventQueue.length > 0) {
-        const event = this.eventQueue.shift();
-        yield event;
-        if (event.kind === "message" || event.kind === "status-update" && event.final) {
-          this.handleFinished();
-          break;
-        }
-      } else if (!this.stopped) {
-        await new Promise((resolve) => {
-          this.resolvePromise = resolve;
-        });
-      }
-    }
-  }
-  /**
-   * Stops the event queue from processing further events.
-   */
-  stop() {
-    this.stopped = true;
-    if (this.resolvePromise) {
-      this.resolvePromise();
-      this.resolvePromise = void 0;
-    }
-    this.eventBus.off("event", this.handleEvent);
-    this.eventBus.off("finished", this.handleFinished);
-  }
-};
-
 // src/server/result_manager.ts
 var ResultManager = class {
   taskStore;
@@ -411,11 +412,11 @@ var DefaultRequestHandler = class {
         }
       }
     }
-    const messageForContext = { ...incomingMessage };
-    if (!messageForContext.contextId) {
-      messageForContext.contextId = task?.contextId || (0, import_uuid.v4)();
-    }
-    const contextId = incomingMessage.contextId || (0, import_uuid.v4)();
+    const contextId = incomingMessage.contextId || task?.contextId || (0, import_uuid.v4)();
+    const messageForContext = {
+      ...incomingMessage,
+      contextId
+    };
     return new RequestContext(
       messageForContext,
       taskId,
@@ -878,6 +879,7 @@ var A2AExpressApp = class {
   DefaultExecutionEventBus,
   DefaultExecutionEventBusManager,
   DefaultRequestHandler,
+  ExecutionEventQueue,
   InMemoryTaskStore,
   JsonRpcTransportHandler,
   RequestContext,

package/dist/server/index.d.cts

@@ -71,6 +71,30 @@ declare class DefaultExecutionEventBusManager implements ExecutionEventBusManage
     cleanupByTaskId(taskId: string): void;
 }
 
+/**
+ * An async queue that subscribes to an ExecutionEventBus for events
+ * and provides an async generator to consume them.
+ */
+declare class ExecutionEventQueue {
+    private eventBus;
+    private eventQueue;
+    private resolvePromise?;
+    private stopped;
+    private boundHandleEvent;
+    constructor(eventBus: ExecutionEventBus);
+    private handleEvent;
+    private handleFinished;
+    /**
+     * Provides an async generator that yields events from the event bus.
+     * Stops when a Message event is received or a TaskStatusUpdateEvent with final=true is received.
+     */
+    events(): AsyncGenerator<AgentExecutionEvent, void, undefined>;
+    /**
+     * Stops the event queue from processing further events.
+     */
+    stop(): void;
+}
+
 interface A2ARequestHandler {
     getAgentCard(): Promise<AgentCard>;
     sendMessage(params: MessageSendParams): Promise<Message | Task>;
@@ -204,4 +228,4 @@ declare class A2AError extends Error {
     static unsupportedOperation(operation: string): A2AError;
 }
 
-export { A2AError, A2AExpressApp, type A2ARequestHandler, type AgentExecutor, DefaultExecutionEventBus, DefaultExecutionEventBusManager, DefaultRequestHandler, type ExecutionEventBus, type ExecutionEventBusManager, InMemoryTaskStore, JsonRpcTransportHandler, RequestContext, ResultManager, type TaskStore };
+export { A2AError, A2AExpressApp, type A2ARequestHandler, type AgentExecutionEvent, type AgentExecutor, DefaultExecutionEventBus, DefaultExecutionEventBusManager, DefaultRequestHandler, type ExecutionEventBus, type ExecutionEventBusManager, ExecutionEventQueue, InMemoryTaskStore, JsonRpcTransportHandler, RequestContext, ResultManager, type TaskStore };

package/dist/server/index.d.ts

@@ -71,6 +71,30 @@ declare class DefaultExecutionEventBusManager implements ExecutionEventBusManage
     cleanupByTaskId(taskId: string): void;
 }
 
+/**
+ * An async queue that subscribes to an ExecutionEventBus for events
+ * and provides an async generator to consume them.
+ */
+declare class ExecutionEventQueue {
+    private eventBus;
+    private eventQueue;
+    private resolvePromise?;
+    private stopped;
+    private boundHandleEvent;
+    constructor(eventBus: ExecutionEventBus);
+    private handleEvent;
+    private handleFinished;
+    /**
+     * Provides an async generator that yields events from the event bus.
+     * Stops when a Message event is received or a TaskStatusUpdateEvent with final=true is received.
+     */
+    events(): AsyncGenerator<AgentExecutionEvent, void, undefined>;
+    /**
+     * Stops the event queue from processing further events.
+     */
+    stop(): void;
+}
+
 interface A2ARequestHandler {
     getAgentCard(): Promise<AgentCard>;
     sendMessage(params: MessageSendParams): Promise<Message | Task>;
@@ -204,4 +228,4 @@ declare class A2AError extends Error {
     static unsupportedOperation(operation: string): A2AError;
 }
 
-export { A2AError, A2AExpressApp, type A2ARequestHandler, type AgentExecutor, DefaultExecutionEventBus, DefaultExecutionEventBusManager, DefaultRequestHandler, type ExecutionEventBus, type ExecutionEventBusManager, InMemoryTaskStore, JsonRpcTransportHandler, RequestContext, ResultManager, type TaskStore };
+export { A2AError, A2AExpressApp, type A2ARequestHandler, type AgentExecutionEvent, type AgentExecutor, DefaultExecutionEventBus, DefaultExecutionEventBusManager, DefaultRequestHandler, type ExecutionEventBus, type ExecutionEventBusManager, ExecutionEventQueue, InMemoryTaskStore, JsonRpcTransportHandler, RequestContext, ResultManager, type TaskStore };

package/dist/server/index.js

@@ -64,6 +64,63 @@ var DefaultExecutionEventBusManager = class {
   }
 };
 
+// src/server/events/execution_event_queue.ts
+var ExecutionEventQueue = class {
+  eventBus;
+  eventQueue = [];
+  resolvePromise;
+  stopped = false;
+  boundHandleEvent;
+  constructor(eventBus) {
+    this.eventBus = eventBus;
+    this.eventBus.on("event", this.handleEvent);
+    this.eventBus.on("finished", this.handleFinished);
+  }
+  handleEvent = (event) => {
+    if (this.stopped) return;
+    this.eventQueue.push(event);
+    if (this.resolvePromise) {
+      this.resolvePromise();
+      this.resolvePromise = void 0;
+    }
+  };
+  handleFinished = () => {
+    this.stop();
+  };
+  /**
+   * Provides an async generator that yields events from the event bus.
+   * Stops when a Message event is received or a TaskStatusUpdateEvent with final=true is received.
+   */
+  async *events() {
+    while (!this.stopped || this.eventQueue.length > 0) {
+      if (this.eventQueue.length > 0) {
+        const event = this.eventQueue.shift();
+        yield event;
+        if (event.kind === "message" || event.kind === "status-update" && event.final) {
+          this.handleFinished();
+          break;
+        }
+      } else if (!this.stopped) {
+        await new Promise((resolve) => {
+          this.resolvePromise = resolve;
+        });
+      }
+    }
+  }
+  /**
+   * Stops the event queue from processing further events.
+   */
+  stop() {
+    this.stopped = true;
+    if (this.resolvePromise) {
+      this.resolvePromise();
+      this.resolvePromise = void 0;
+    }
+    this.eventBus.off("event", this.handleEvent);
+    this.eventBus.off("finished", this.handleFinished);
+  }
+};
+
 // src/server/request_handler/default_request_handler.ts
 import { v4 as uuidv4 } from "uuid";
 
@@ -142,63 +199,6 @@ var A2AError = class _A2AError extends Error {
   }
 };
 
-// src/server/events/execution_event_queue.ts
-var ExecutionEventQueue = class {
-  eventBus;
-  eventQueue = [];
-  resolvePromise;
-  stopped = false;
-  boundHandleEvent;
-  constructor(eventBus) {
-    this.eventBus = eventBus;
-    this.eventBus.on("event", this.handleEvent);
-    this.eventBus.on("finished", this.handleFinished);
-  }
-  handleEvent = (event) => {
-    if (this.stopped) return;
-    this.eventQueue.push(event);
-    if (this.resolvePromise) {
-      this.resolvePromise();
-      this.resolvePromise = void 0;
-    }
-  };
-  handleFinished = () => {
-    this.stop();
-  };
-  /**
-   * Provides an async generator that yields events from the event bus.
-   * Stops when a Message event is received or a TaskStatusUpdateEvent with final=true is received.
-   */
-  async *events() {
-    while (!this.stopped || this.eventQueue.length > 0) {
-      if (this.eventQueue.length > 0) {
-        const event = this.eventQueue.shift();
-        yield event;
-        if (event.kind === "message" || event.kind === "status-update" && event.final) {
-          this.handleFinished();
-          break;
-        }
-      } else if (!this.stopped) {
-        await new Promise((resolve) => {
-          this.resolvePromise = resolve;
-        });
-      }
-    }
-  }
-  /**
-   * Stops the event queue from processing further events.
-   */
-  stop() {
-    this.stopped = true;
-    if (this.resolvePromise) {
-      this.resolvePromise();
-      this.resolvePromise = void 0;
-    }
-    this.eventBus.off("event", this.handleEvent);
-    this.eventBus.off("finished", this.handleFinished);
-  }
-};
-
 // src/server/result_manager.ts
 var ResultManager = class {
   taskStore;
@@ -368,11 +368,11 @@ var DefaultRequestHandler = class {
         }
       }
     }
-    const messageForContext = { ...incomingMessage };
-    if (!messageForContext.contextId) {
-      messageForContext.contextId = task?.contextId || uuidv4();
-    }
-    const contextId = incomingMessage.contextId || uuidv4();
+    const contextId = incomingMessage.contextId || task?.contextId || uuidv4();
+    const messageForContext = {
+      ...incomingMessage,
+      contextId
+    };
     return new RequestContext(
       messageForContext,
       taskId,
@@ -834,6 +834,7 @@ export {
   DefaultExecutionEventBus,
   DefaultExecutionEventBusManager,
   DefaultRequestHandler,
+  ExecutionEventQueue,
   InMemoryTaskStore,
   JsonRpcTransportHandler,
   RequestContext,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a2a-js/sdk",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Server & Client SDK for Agent2Agent protocol",
   "repository": "google-a2a/a2a-js.git",
   "engines": {
@@ -53,7 +53,7 @@
     "clean": "gts clean",
     "build": "tsup",
     "pretest": "npm run build",
-    "test": "mocha build/test/**/*.js",
+    "test": "mocha test/**/*.spec.ts",
     "coverage": "c8 npm run test",
     "generate": "curl https://raw.githubusercontent.com/google-a2a/A2A/refs/heads/main/specification/json/a2a.json > spec.json && node scripts/generateTypes.js && rm spec.json",
     "sample:cli": "tsx src/samples/cli.ts",
@@ -66,5 +66,8 @@
     "cors": "^2.8.5",
     "express": "^4.21.2",
     "uuid": "^11.1.0"
+  },
+  "mocha": {
+    "require": "tsx"
   }
 }