fix: isolate delegated task branches

Merge #6495

Fixes #6457

PiperOrigin-RevId: 954877821

Author: March-77

contributing/samples/multi_agent/task_sub_agent/tests/10_burgers.json

@@ -42,6 +42,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -99,6 +100,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -133,6 +135,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -156,6 +159,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -199,6 +203,7 @@
         "skipSummarization": true
       },
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {

contributing/samples/multi_agent/task_sub_agent/tests/3_burgers.json

@@ -42,6 +42,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -76,6 +77,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -106,6 +108,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -189,6 +192,7 @@
     },
     {
       "author": "payment_collector",
+      "branch": "payment_collector@fc-3",
       "content": {
         "parts": [
           {
@@ -223,6 +227,7 @@
     },
     {
       "author": "payment_collector",
+      "branch": "payment_collector@fc-3",
       "content": {
         "parts": [
           {
@@ -257,6 +262,7 @@
     },
     {
       "author": "payment_collector",
+      "branch": "payment_collector@fc-3",
       "content": {
         "parts": [
           {
@@ -283,6 +289,7 @@
     },
     {
       "author": "payment_collector",
+      "branch": "payment_collector@fc-3",
       "content": {
         "parts": [
           {

contributing/samples/multi_agent/task_sub_agent/tests/credit_card.json

@@ -42,6 +42,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -76,6 +77,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {

contributing/samples/multi_agent/task_sub_agent/tests/order_food.json

@@ -42,6 +42,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -76,6 +77,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -110,6 +112,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -144,6 +147,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {
@@ -178,6 +182,7 @@
     },
     {
       "author": "order_collector",
+      "branch": "order_collector@fc-1",
       "content": {
         "parts": [
           {

src/google/adk/workflow/_llm_agent_wrapper.py

@@ -137,11 +137,10 @@ async def _dispatch_task_fc(
   """Dispatch a task-delegation FC via ``ctx.run_node`` and return the output.
 
   ``run_id=fc.id`` makes the child run idempotent across resumes (same
-  FC always maps to the same scheduler-tracked child run).  Scope is
-  carried by ``isolation_scope`` (``override_isolation_scope=fc.id``); we
-  intentionally do NOT set a branch — task-mode and single_turn-mode
-  agents share the parent's branch and rely on isolation_scope for
-  scoping instead.
+  FC always maps to the same scheduler-tracked child run).  Each task
+  runs in a stable sub-branch so resumable LLM flow logic sees only the
+  task's own function calls.  ``isolation_scope`` remains keyed by the
+  FC id to keep task history scoped independently of branch ancestry.
   """
   target_agent = parent_agent.root_agent.find_agent(fc.name)
   if target_agent is None:
@@ -154,6 +153,7 @@ async def _dispatch_task_fc(
       wrapped_target,
       node_input=fc.args,
       run_id=fc.id,
+      use_sub_branch=True,
       override_isolation_scope=fc.id,
       raise_on_wait=True,
   )

tests/unittests/workflow/test_task_api_e2e.py

@@ -34,7 +34,11 @@
 from google.adk.agents.context import Context
 from google.adk.agents.llm_agent import LlmAgent
 from google.adk.apps.app import App
+from google.adk.apps.app import ResumabilityConfig
 from google.adk.events.event import Event
+from google.adk.flows.llm_flows.functions import REQUEST_CONFIRMATION_FUNCTION_CALL_NAME
+from google.adk.tools.function_tool import FunctionTool
+from google.adk.tools.tool_context import ToolContext
 from google.adk.workflow import node
 from google.adk.workflow import START
 from google.adk.workflow._base_node import BaseNode
@@ -66,6 +70,11 @@ def _text_part(text: str) -> types.Part:
   return types.Part.from_text(text=text)
 
 
+def _confirmed_task_step(tool_context: ToolContext) -> dict[str, bool]:
+  """Return whether the resumable task step was confirmed."""
+  return {'confirmed': tool_context.tool_confirmation.confirmed}
+
+
 def _make_task_agent(
     name: str,
     responses: list,
@@ -450,7 +459,83 @@ async def test_chat_coordinator_resumes_unresolved_task_fc(
 
 
 # ---------------------------------------------------------------------------
-# 9. Strict isolation filtering: a stranger event with a foreign
+# 9. Resumable task delegation: a task sub-agent that pauses for tool
+#    confirmation resumes without executing its parent's delegation FC.
+# ---------------------------------------------------------------------------
+
+
+@pytest.mark.asyncio
+async def test_task_sub_agent_resumes_without_parent_delegation_fc(
+    request: pytest.FixtureRequest,
+):
+  """A resumed task child does not execute its parent's delegation call."""
+  confirmation_tool = FunctionTool(
+      func=_confirmed_task_step,
+      require_confirmation=True,
+  )
+  child = _make_task_agent(
+      name='child',
+      responses=[
+          types.Part.from_function_call(
+              name=confirmation_tool.name,
+              args={},
+          ),
+          _finish_part({'result': 'confirmed'}),
+      ],
+  )
+  child.tools.append(confirmation_tool)
+
+  root = LlmAgent(
+      name='root',
+      model=testing_utils.MockModel.create(
+          responses=[
+              _delegate_part('child', 'perform a confirmed step'),
+              'Task confirmed.',
+          ]
+      ),
+      sub_agents=[child],
+  )
+  app = App(
+      name=request.function.__name__,
+      root_agent=root,
+      resumability_config=ResumabilityConfig(is_resumable=True),
+  )
+  runner = testing_utils.InMemoryRunner(app=app)
+
+  first_events = await runner.run_async(testing_utils.get_user_content('start'))
+  confirmation_fc = next(
+      fc
+      for event in first_events
+      for fc in event.get_function_calls()
+      if fc.name == REQUEST_CONFIRMATION_FUNCTION_CALL_NAME
+  )
+  invocation_id = next(
+      event.invocation_id
+      for event in first_events
+      if confirmation_fc in event.get_function_calls()
+  )
+
+  resumed_events = await runner.run_async(
+      testing_utils.UserContent(
+          types.Part(
+              function_response=types.FunctionResponse(
+                  id=confirmation_fc.id,
+                  name=REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+                  response={'confirmed': True},
+              )
+          )
+      ),
+      invocation_id=invocation_id,
+  )
+
+  assert {'result': 'confirmed'} in _collect_finish_outputs(resumed_events)
+  assert any(
+      'Task confirmed.' in text for text in _get_text_responses(resumed_events)
+  )
+
+
+# ---------------------------------------------------------------------------
+# 10. Strict isolation filtering: a stranger event with a foreign
 #    isolation_scope must NOT appear in the task agent's LLM context.
 # ---------------------------------------------------------------------------