From e81b8df7dcc6d0d6746438882f3d98cc5dbca580 Mon Sep 17 00:00:00 2001
From: lhp <248789758@qq.com>
Date: Tue, 15 Apr 2025 15:46:40 +0800
Subject: [PATCH] Fix: prevent ContextVar reset error in async streaming
 context.(I make sure no other errors occur.)

---
 src/agents/result.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/agents/result.py b/src/agents/result.py
index a2a6cc4a..2dae6332 100644
--- a/src/agents/result.py
+++ b/src/agents/result.py
@@ -186,7 +186,12 @@ async def stream_events(self) -> AsyncIterator[StreamEvent]:
             self._event_queue.task_done()
 
         if self._trace:
-            self._trace.finish(reset_current=True)
+            try:
+                self._trace.finish(reset_current=True)
+            except ValueError:
+                logger.warning("ContextVar reset failed — switching to reset_current=False")
+                self._trace.finish(reset_current=False)
+
 
         self._cleanup_tasks()