fix(adk): propagate isolation_scope to prevent history filtering loops

PiperOrigin-RevId: 933314484

Author: google-genai-bot

src/google/adk/agents/context.py

@@ -403,6 +403,7 @@ def get_invocation_context(self) -> InvocationContext:
     ctx_with_proxy = ctx.model_copy(
         update={
             'session': self.session,
+            'isolation_scope': self.isolation_scope,
         }
     )
     return ctx_with_proxy

src/google/adk/workflow/_llm_agent_wrapper.py

@@ -207,12 +207,14 @@ def prepare_llm_agent_context(agent: Any, ctx: Context) -> Context:
 
   ic = ctx._invocation_context.model_copy()
   ic._event_queue = ctx._invocation_context._event_queue
+  ic.isolation_scope = ctx.isolation_scope
   agent_ctx = Context(
       invocation_context=ic,
       node_path=ctx.node_path,
       run_id=ctx.run_id,
       resume_inputs=ctx.resume_inputs,
   )
+  agent_ctx.isolation_scope = ctx.isolation_scope
 
   ic.session = ic.session.model_copy(deep=False)
   return agent_ctx

tests/unittests/agents/test_context.py

@@ -647,3 +647,29 @@ def test_derive_scheduler_with_parent_no_scheduler(self):
 
     scheduler = _derive_scheduler(mock_parent)
     assert isinstance(scheduler, DynamicNodeScheduler)
+
+
+class TestContextGetInvocationContext:
+  """Test get_invocation_context method in Context."""
+
+  def test_get_invocation_context_propagates_isolation_scope(
+      self, mock_invocation_context
+  ):
+    """Test that get_invocation_context propagates isolation_scope to the copy."""
+    context = Context(mock_invocation_context)
+    context.isolation_scope = "test-isolation-scope"
+
+    # Mock model_copy to return a mock copy
+    mock_copy = MagicMock()
+    mock_invocation_context.model_copy.return_value = mock_copy
+
+    result = context.get_invocation_context()
+
+    # Verify model_copy was called with correct update dict
+    mock_invocation_context.model_copy.assert_called_once_with(
+        update={
+            "session": context.session,
+            "isolation_scope": "test-isolation-scope",
+        }
+    )
+    assert result is mock_copy

tests/unittests/workflow/test_llm_agent_as_node.py

@@ -500,6 +500,44 @@ async def fake_run(invocation_context):
   assert captured_branches[0] is None
 
 
+@pytest.mark.asyncio
+async def test_single_turn_propagates_isolation_scope(
+    request: pytest.FixtureRequest,
+):
+  """Single-turn workflow node propagates isolation_scope to the agent."""
+  agent = _make_agent(mode='single_turn')
+  wrapper = build_node(agent)
+  captured_isolation_scopes = []
+
+  async def fake_run_async(invocation_context):
+    captured_isolation_scopes.append(invocation_context.isolation_scope)
+    yield Event(
+        invocation_id='inv',
+        author=wrapper.name,
+        content=types.Content(parts=[types.Part(text='ok')]),
+    )
+
+  object.__setattr__(wrapper, 'run_async', fake_run_async)
+
+  # Use the helper to create a real InvocationContext
+  ic = await create_parent_invocation_context(
+      request.function.__name__, wrapper
+  )
+
+  # Create the parent context with isolation_scope
+  ctx = Context(invocation_context=ic)
+  ctx.isolation_scope = 'test-scope-123'
+
+  # Run the node
+  events = [
+      event async for event in wrapper._run_impl(ctx=ctx, node_input='hi')
+  ]
+
+  assert len(events) == 1
+  assert events[0].content.parts[0].text == 'ok'
+  assert captured_isolation_scopes == ['test-scope-123']
+
+
 @pytest.mark.xfail(
     strict=True,
     reason=(