@@ -1157,15 +1157,19 @@ def _mark_response_hooks_started() -> None:
11571157 )
11581158 for item in resumed_response_boundary .items :
11591159 ensure_nested_history_run_item_occurrence_key (item )
1160+ processed = run_state ._last_processed_response
1161+ guardrail_result_start = processed .tool_output_guardrail_result_start
11601162 blocked_output_owner_starts = _BlockedOutputOwnerStarts (
11611163 nonstreamed_session_items = (resumed_response_boundary .session_start ),
11621164 run_state_generated_items = (
11631165 resumed_response_boundary .generated_start
11641166 ),
11651167 run_state_session_items = resumed_response_boundary .session_start ,
11661168 run_state_model_responses = len (run_state ._model_responses ) - 1 ,
1167- run_state_tool_output_guardrail_results = len (
1168- run_state ._tool_output_guardrail_results
1169+ run_state_tool_output_guardrail_results = (
1170+ guardrail_result_start
1171+ if guardrail_result_start is not None
1172+ else len (run_state ._tool_output_guardrail_results )
11691173 ),
11701174 )
11711175
@@ -1198,8 +1202,13 @@ def _mark_response_hooks_started() -> None:
11981202
11991203 input_before_turn_rewrite = original_input
12001204 original_input = turn_result .original_input
1201- generated_items , turn_session_items = resumed_turn_items (turn_result )
1202- session_items .extend (turn_session_items )
1205+ generated_items , session_items , turn_session_items = resumed_turn_items (
1206+ turn_result , session_items , run_state
1207+ )
1208+ retry_terminal_output = (
1209+ isinstance (turn_result .next_step , NextStepFinalOutput )
1210+ and turn_result .has_recovered_tool_outputs
1211+ )
12031212 if run_state is not None :
12041213 if turn_result .nested_history_owned_items is not None :
12051214 run_state ._nested_history_owned_session_item_refs = (
@@ -1211,12 +1220,13 @@ def _mark_response_hooks_started() -> None:
12111220 turn_result .nested_history_owned_items ,
12121221 )
12131222 )
1214- update_run_state_after_resume (
1215- run_state ,
1216- turn_result = turn_result ,
1217- generated_items = generated_items ,
1218- session_items = session_items ,
1219- )
1223+ if not retry_terminal_output :
1224+ update_run_state_after_resume (
1225+ run_state ,
1226+ turn_result = turn_result ,
1227+ generated_items = generated_items ,
1228+ session_items = session_items ,
1229+ )
12201230 if isinstance (
12211231 turn_result .next_step ,
12221232 NextStepInterruption | NextStepHandoff ,
@@ -1313,6 +1323,13 @@ def _mark_response_hooks_started() -> None:
13131323 return _finalize_result (result )
13141324
13151325 if isinstance (turn_result .next_step , NextStepRunAgain ):
1326+ if turn_result .has_recovered_tool_outputs :
1327+ tool_input_guardrail_results .extend (
1328+ turn_result .tool_input_guardrail_results
1329+ )
1330+ tool_output_guardrail_results .extend (
1331+ turn_result .tool_output_guardrail_results
1332+ )
13161333 continue
13171334
13181335 append_model_response_if_new (
@@ -1416,6 +1433,12 @@ def _mark_response_hooks_started() -> None:
14161433 ) from None
14171434 raise
14181435 except (Exception , asyncio .CancelledError ) as guardrail_error :
1436+ if retry_terminal_output :
1437+ # Keep accepted execution private and retryable until
1438+ # the final guardrails permit delivery.
1439+ del output_guardrail_results [output_guardrail_result_start :]
1440+ session_items = list (run_state ._session_items )
1441+ raise
14191442 if not isinstance (
14201443 guardrail_error , asyncio .CancelledError
14211444 ) or not _is_terminal_tool_output_response (
@@ -1444,6 +1467,13 @@ def _mark_response_hooks_started() -> None:
14441467 )
14451468 raise
14461469
1470+ if retry_terminal_output :
1471+ update_run_state_after_resume (
1472+ run_state ,
1473+ turn_result = turn_result ,
1474+ generated_items = generated_items ,
1475+ session_items = session_items ,
1476+ )
14471477 final_turn_items = _final_turn_items_for_persistence (
14481478 list (turn_session_items ),
14491479 current_processed_response ,
@@ -2297,6 +2327,17 @@ async def _save_max_turns_handler_output(
22972327 )
22982328 if isinstance (exc , AgentsException ):
22992329 _clear_data_redacted_error_traceback (exc )
2330+ public_tool_output_results = tool_output_guardrail_results
2331+ if (
2332+ run_state is not None
2333+ and isinstance (run_state ._current_step , NextStepInterruption )
2334+ and run_state ._last_processed_response is not None
2335+ ):
2336+ # Pending execution records belong only to the retry checkpoint.
2337+ processed = run_state ._last_processed_response
2338+ public_tool_output_results = tool_output_guardrail_results [
2339+ : processed .tool_output_guardrail_result_start
2340+ ]
23002341 exc .run_data = RunErrorDetails (
23012342 input = original_input ,
23022343 new_items = session_items ,
@@ -2306,7 +2347,7 @@ async def _save_max_turns_handler_output(
23062347 input_guardrail_results = input_guardrail_results ,
23072348 output_guardrail_results = output_guardrail_results ,
23082349 tool_input_guardrail_results = tool_input_guardrail_results ,
2309- tool_output_guardrail_results = tool_output_guardrail_results ,
2350+ tool_output_guardrail_results = public_tool_output_results ,
23102351 )
23112352 raise
23122353 finally :
@@ -2683,7 +2724,14 @@ def run_streamed(
26832724 else []
26842725 ),
26852726 tool_output_guardrail_results = (
2686- list (getattr (run_state , "_tool_output_guardrail_results" , []))
2727+ list (run_state ._tool_output_guardrail_results )[
2728+ : (
2729+ run_state ._last_processed_response .tool_output_guardrail_result_start
2730+ if isinstance (run_state ._current_step , NextStepInterruption )
2731+ and run_state ._last_processed_response is not None
2732+ else None
2733+ )
2734+ ]
26872735 if run_state is not None
26882736 else []
26892737 ),
0 commit comments