Skip to content

Fix: Sub-agent with sequential LRO tools fails to resume (Issue #5349) #5365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
9chait9 wants to merge 2 commits into
base: main
Choose a base branch
from
+17 −3
Draft

Fix: Sub-agent with sequential LRO tools fails to resume (Issue #5349) #5365

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4321de7
Fix premature end_of_agent in sub-agent resumption.
9chait9 Apr 17, 2026
04f56d2
Fix issue #5349: Sub-agent with sequential LRO tools fails to resume.
9chait9 Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/google/adk/agents/llm_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,15 @@ async def _convert_tool_union_to_tools(
return [FunctionTool(func=tool_union)]

# At this point, tool_union must be a BaseToolset
return await tool_union.get_tools_with_prefix(ctx)
try:
return await tool_union.get_tools_with_prefix(ctx)
except Exception as e:
logger.warning(
'Failed to get tools from toolset %s: %s',
type(tool_union).__name__,
e,
)
return []


class LlmAgent(BaseAgent):
Expand Down Expand Up @@ -466,12 +474,18 @@ async def _run_async_impl(
if agent_state is not None and (
agent_to_transfer := self._get_subagent_to_resume(ctx)
):
sub_agent_paused = False # Track pause state
async with Aclosing(agent_to_transfer.run_async(ctx)) as agen:
async for event in agen:
# Check if this event signals a pause (requires Bug 1 fix context)
if ctx.should_pause_invocation(event):
sub_agent_paused = True
yield event

ctx.set_agent_state(self.name, end_of_agent=True)
yield self._create_agent_state_event(ctx)
# Only mark as ended if it didn't pause
if not sub_agent_paused:
ctx.set_agent_state(self.name, end_of_agent=True)
yield self._create_agent_state_event(ctx)
return

should_pause = False
Expand Down