fix(workflow): Keep regular-tool FRs on mixed task turns

[a2105z]

Link to Issue or Description of Change

1. Link to an existing issue (if applicable):

• Closes: chat-mode wrapper (_llm_agent_wrapper.py) silently drops regular-tool FR when model emits regular FC + task FC in same turn → session poisoning #6581

Problem:
When a chat-mode coordinator emits both a regular tool function call and a task-delegation function call in the same model turn, _llm_agent_wrapper.py broke out of run_async immediately after handling the task FC. That closed the generator before the pending regular-tool function-response event was read.

Effects:

1. The regular tool never executed (side effects silently lost).
2. Session history retained unbalanced FC/FR pairs, so later Gemini requests failed with:
   400 INVALID_ARGUMENT: Please ensure that the number of function response parts is equal to the number of function call parts.

Solution:
Before breaking on task FCs, if the turn also contains eager (non-deferred / non-long-running) tool calls, drain pending non-model events from the current LLM step so regular-tool FRs are yielded and persisted. Then dispatch task FCs and synthesize task FRs as before, and re-enter run_async.

Testing Plan

Unit Tests:

• I have added or updated unit tests for my change.
• All unit tests pass locally.

New / updated tests:

• tests/unittests/workflow/test_llm_agent_wrapper_mixed_turn.py
  • _event_has_eager_tool_calls true for regular+task, false for task-only
  • _drain_pending_tool_response_events yields FR then stops
  • drain stops immediately on a model-role event
• tests/unittests/workflow/test_task_api_e2e.py
  • test_chat_root_mixed_regular_tool_and_task_keeps_regular_fr
  • test_chat_root_mixed_turn_with_two_regular_tools_and_task

pytest results (local):

# Focused new + task API suite
pytest tests/unittests/workflow/test_llm_agent_wrapper_mixed_turn.py \
       tests/unittests/workflow/test_task_api_e2e.py -v
# 14 passed, 1 xfailed

# Broader regression suite
pytest tests/unittests/workflow/ \
       tests/unittests/agents/test_llm_agent_interruptions.py \
       tests/unittests/agents/test_llm_agent_single_turn_subagents.py -q
# 694 passed, 11 skipped, 12 xfailed

Manual / repro verification:

• Reproduced chat-mode wrapper (_llm_agent_wrapper.py) silently drops regular-tool FR when model emits regular FC + task FC in same turn → session poisoning #6581 against current main with the issue's stub-LLM mixed-turn script: set_todo_list FR was missing and the tool did not execute (FAIL).
• After the fix, the same repro persists FR:set_todo_list, and the tool executes.
• Full happy path with proper task finish_task confirms:
  • regular tool runs
  • regular-tool FR persisted
  • task FR synthesized
  • coordinator follow-up turn completes
  • session FC/FR pairs remain balanced

Pre-commit:

pre-commit run --files \
  src/google/adk/workflow/_llm_agent_wrapper.py \
  tests/unittests/workflow/test_task_api_e2e.py \
  tests/unittests/workflow/test_llm_agent_wrapper_mixed_turn.py
# all hooks passed

Checklist

• I have read the CONTRIBUTING.md document.
• I have performed a self-review of my own code.
• I have commented my code, particularly in hard-to-understand areas.
• I have added tests that prove my fix is effective or that my feature works.
• New and existing unit tests pass locally with my changes.
• I have manually tested my changes end-to-end.
• Any dependent changes have been merged and published in downstream modules.

Additional context

Files changed:

• src/google/adk/workflow/_llm_agent_wrapper.py — drain eager-tool FRs before breaking on task delegation
• tests/unittests/workflow/test_task_api_e2e.py — mixed-turn e2e coverage
• tests/unittests/workflow/test_llm_agent_wrapper_mixed_turn.py — helper unit tests

Exact commands run

pytest tests/unittests/workflow/test_llm_agent_wrapper_mixed_turn.py \
       tests/unittests/workflow/test_task_api_e2e.py -v
# 14 passed, 1 xfailed

pytest tests/unittests/workflow/ \
       tests/unittests/agents/test_llm_agent_interruptions.py \
       tests/unittests/agents/test_llm_agent_single_turn_subagents.py -q
# 694 passed, 11 skipped, 12 xfailed

pre-commit run --files \
  src/google/adk/workflow/_llm_agent_wrapper.py \
  tests/unittests/workflow/test_task_api_e2e.py \
  tests/unittests/workflow/test_llm_agent_wrapper_mixed_turn.py
# all hooks passed

[a2105z]

Hi @DeanChensj — thanks for taking a look at this (and for all the prior work on the chat/task wrapper; I leaned on that area while debugging).

I put up a fix for #6581: on mixed turns (regular tool FC + task FC in the same model response), the wrapper was breaking out of run_async before the regular-tool FR was drained, which dropped the tool side-effect and left unbalanced FC/FR history for later Gemini turns.

Happy to adjust the approach if you'd prefer a different drain/boundary condition — just let me know what you'd like changed. Appreciate any feedback when you have a moment.

[a2105z]

Resolved the merge conflict in src/google/adk/workflow/_llm_agent_wrapper.py by aligning the PR with the Copybara-landed version already on main (4cab3ac1 / Closes #6581). Related mixed-turn tests were synced the same way so this branch no longer diverges from what landed.

PR should be conflict-free now; safe to close if Copybara is considered the merge of record.

[a2105z]

Hi @DeanChensj — Copybara already imported this in 4cab3ac1 (Merge …/pull/6586, Closes #6581), but the PR is still open and never got the usual thank-you comment / merged label / close from the Copybara PR Handler.

Could you re-run Actions → Copybara PR Handler → Run workflow with:

• pr_number: 6586
• commit_sha: 4cab3ac1

(or close it and add the merged label if that’s easier)? Happy to close it myself if you prefer — just didn’t want to short-circuit the normal import bookkeeping. Thanks!

[DeanChensj]

Thanks, let me close this PR manually and look into why the PR does not auto-close.