From a0befda1968875de77d737d2c3dc4b3223bf7ce4 Mon Sep 17 00:00:00 2001
From: Shubham Padkonde <shubhampadkonde12@gmail.com>
Date: Thu, 1 Oct 2026 23:38:54 +0530
Subject: [PATCH] fix: clean up pending agent stream reads on exit

---
 chatkit/agents.py              | 57 +++++++++++++++++---------------
 tests/test_merge_generators.py | 60 ++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 26 deletions(-)
 create mode 100644 tests/test_merge_generators.py

diff --git a/chatkit/agents.py b/chatkit/agents.py
index 7f435e3..bc622e1 100644
--- a/chatkit/agents.py
+++ b/chatkit/agents.py
@@ -234,36 +234,41 @@ def _complete(self):
 async def _merge_generators(
     a: AsyncIterator[T1],
     b: AsyncIterator[T2],
-) -> AsyncIterator[T1 | T2]:
+) -> AsyncGenerator[T1 | T2, None]:
     pending: list[AsyncIterator[T1 | T2]] = [a, b]
     pending_tasks: dict[asyncio.Task, AsyncIterator[T1 | T2]] = {
         asyncio.ensure_future(g.__anext__()): g for g in pending
     }
-    while len(pending_tasks) > 0:
-        done, _ = await asyncio.wait(
-            pending_tasks.keys(), return_when="FIRST_COMPLETED"
-        )
-        stop = False
-        for d in done:
-            try:
-                result = d.result()
-                yield result
-                dg = pending_tasks[d]
-                pending_tasks[asyncio.ensure_future(dg.__anext__())] = dg
-            except StopAsyncIteration:
-                stop = True
-            finally:
-                del pending_tasks[d]
-        if stop:
-            for task in pending_tasks.keys():
-                if not task.cancel():
-                    try:
-                        yield task.result()
-                    except asyncio.CancelledError:
-                        pass
-                    except asyncio.InvalidStateError:
-                        pass
-            break
+    try:
+        while len(pending_tasks) > 0:
+            done, _ = await asyncio.wait(
+                pending_tasks.keys(), return_when="FIRST_COMPLETED"
+            )
+            stop = False
+            for d in done:
+                try:
+                    result = d.result()
+                    yield result
+                    dg = pending_tasks[d]
+                    pending_tasks[asyncio.ensure_future(dg.__anext__())] = dg
+                except StopAsyncIteration:
+                    stop = True
+                finally:
+                    del pending_tasks[d]
+            if stop:
+                for task in pending_tasks.keys():
+                    if not task.cancel():
+                        try:
+                            yield task.result()
+                        except asyncio.CancelledError:
+                            pass
+                        except asyncio.InvalidStateError:
+                            pass
+                break
+    finally:
+        for task in pending_tasks:
+            task.cancel()
+        await asyncio.gather(*pending_tasks, return_exceptions=True)
 
 
 class _EventWrapper:
diff --git a/tests/test_merge_generators.py b/tests/test_merge_generators.py
new file mode 100644
index 0000000..5bf802d
--- /dev/null
+++ b/tests/test_merge_generators.py
@@ -0,0 +1,60 @@
+import asyncio
+from collections.abc import AsyncIterator
+
+import pytest
+
+from chatkit.agents import _merge_generators
+
+
+@pytest.mark.parametrize("exit_path", ["error", "cancel", "close", "exhausted"])
+async def test_merge_generators_cleans_up_pending_reads(exit_path):
+    started = asyncio.Event()
+    cleaned = asyncio.Event()
+    reads = []
+
+    async def waiting() -> AsyncIterator[str]:
+        reads.append(asyncio.current_task())
+        started.set()
+        try:
+            await asyncio.Event().wait()
+            yield "unused"
+        finally:
+            # Cleanup may itself require an event-loop turn.
+            await asyncio.sleep(0)
+            cleaned.set()
+
+    async def source() -> AsyncIterator[str]:
+        await started.wait()
+        if exit_path == "error":
+            raise ValueError("source failed")
+        if exit_path == "exhausted":
+            return
+        if exit_path == "cancel":
+            await asyncio.Event().wait()
+        yield "first"
+
+    merged = _merge_generators(source(), waiting())
+    next_item = asyncio.ensure_future(anext(merged))
+    try:
+        await started.wait()
+        if exit_path == "cancel":
+            next_item.cancel()
+            with pytest.raises(asyncio.CancelledError):
+                await next_item
+        elif exit_path == "error":
+            with pytest.raises(ValueError, match="source failed"):
+                await next_item
+        elif exit_path == "exhausted":
+            with pytest.raises(StopAsyncIteration):
+                await next_item
+        else:
+            assert await next_item == "first"
+            await merged.aclose()
+        assert cleaned.is_set()
+        assert all(task.done() for task in reads)
+    finally:
+        # Keep the failing baseline test from leaking its own tasks.
+        for task in reads:
+            task.cancel()
+        await asyncio.gather(*reads, return_exceptions=True)
+        await merged.aclose()