fix: restore replay compatibility for run context approvals and guardrail execution (#2415)

Author: seratch

src/agents/run.py

@@ -86,7 +86,6 @@
     NextStepHandoff,
     NextStepInterruption,
     NextStepRunAgain,
-    SingleStepResult,
 )
 from .run_internal.session_persistence import (
     persist_session_items_for_guardrail_trip,
@@ -975,21 +974,6 @@ async def run(
                             raise
 
                         parallel_results: list[InputGuardrailResult] = []
-                        parallel_guardrail_task: asyncio.Task[list[InputGuardrailResult]] | None = (
-                            None
-                        )
-                        model_task: asyncio.Task[SingleStepResult] | None = None
-
-                        if parallel_guardrails:
-                            parallel_guardrail_task = asyncio.create_task(
-                                run_input_guardrails(
-                                    starting_agent,
-                                    parallel_guardrails,
-                                    copy_input_items(prepared_input),
-                                    context_wrapper,
-                                )
-                            )
-
                         model_task = asyncio.create_task(
                             run_single_turn(
                                 agent=current_agent,
@@ -1011,46 +995,29 @@ async def run(
                             )
                         )
 
-                        if parallel_guardrail_task:
-                            done, pending = await asyncio.wait(
-                                {parallel_guardrail_task, model_task},
-                                return_when=asyncio.FIRST_COMPLETED,
-                            )
-
-                            if parallel_guardrail_task in done:
-                                try:
-                                    parallel_results = parallel_guardrail_task.result()
-                                except InputGuardrailTripwireTriggered:
-                                    model_task.cancel()
-                                    await asyncio.gather(model_task, return_exceptions=True)
-                                    session_input_items_for_persistence = (
-                                        await persist_session_items_for_guardrail_trip(
-                                            session,
-                                            server_conversation_tracker,
-                                            session_input_items_for_persistence,
-                                            original_user_input,
-                                            run_state,
-                                            store=store_setting,
-                                        )
-                                    )
-                                    raise
-                                turn_result = await model_task
-                            else:
-                                turn_result = await model_task
-                                try:
-                                    parallel_results = await parallel_guardrail_task
-                                except InputGuardrailTripwireTriggered:
-                                    session_input_items_for_persistence = (
-                                        await persist_session_items_for_guardrail_trip(
-                                            session,
-                                            server_conversation_tracker,
-                                            session_input_items_for_persistence,
-                                            original_user_input,
-                                            run_state,
-                                            store=store_setting,
-                                        )
+                        if parallel_guardrails:
+                            try:
+                                parallel_results, turn_result = await asyncio.gather(
+                                    run_input_guardrails(
+                                        starting_agent,
+                                        parallel_guardrails,
+                                        copy_input_items(prepared_input),
+                                        context_wrapper,
+                                    ),
+                                    model_task,
+                                )
+                            except InputGuardrailTripwireTriggered:
+                                session_input_items_for_persistence = (
+                                    await persist_session_items_for_guardrail_trip(
+                                        session,
+                                        server_conversation_tracker,
+                                        session_input_items_for_persistence,
+                                        original_user_input,
+                                        run_state,
+                                        store=store_setting,
                                     )
-                                    raise
+                                )
+                                raise
                         else:
                             turn_result = await model_task
 

src/agents/run_context.py

@@ -9,23 +9,25 @@
 
 if TYPE_CHECKING:
     from .items import ToolApprovalItem, TResponseInputItem
+else:
+    # Keep runtime annotations resolvable for TypeAdapter users (e.g., Temporal's
+    # Pydantic data converter) without importing items.py and introducing cycles.
+    ToolApprovalItem = Any
+    TResponseInputItem = Any
 
 TContext = TypeVar("TContext", default=Any)
 
 
+@dataclass(eq=False)
 class _ApprovalRecord:
     """Tracks approval/rejection state for a tool.
 
     ``approved`` and ``rejected`` are either booleans (permanent allow/deny)
     or lists of call IDs when approval is scoped to specific tool calls.
     """
 
-    approved: bool | list[str]
-    rejected: bool | list[str]
-
-    def __init__(self):
-        self.approved = []
-        self.rejected = []
+    approved: bool | list[str] = field(default_factory=list)
+    rejected: bool | list[str] = field(default_factory=list)
 
 
 @dataclass(eq=False)