fix: extend store_media fix to team run paths and add tests

Apply the same store_media decoupling to Team that PR #6793 applied to
Agent: remove if-guards on store_media_util() in all 6 team run paths
and add save/restore of media fields around cleanup_and_store so callers
still see generated media when store_media=False.

Add unit tests verifying sync and async agent.run() returns images in
RunOutput even with store_media=False.

Closes #5101

Author: Mustafa-Esoofally

libs/agno/agno/team/_run.py

@@ -367,8 +367,8 @@ def _run_tasks(
 
         # === Post-loop ===
 
-        # Store media if enabled
-        if team.store_media and model_response is not None:
+        # Always add media to run_response for caller availability
+        if model_response is not None:
             store_media_util(run_response, model_response)
 
         # Convert response to structured format
@@ -1136,9 +1136,8 @@ def _run(
                         team, run_response=run_response, session=session, run_context=run_context
                     )
 
-                # 8. Store media if enabled
-                if team.store_media:
-                    store_media_util(run_response, model_response)
+                # 8. Always add media to run_response for caller availability
+                store_media_util(run_response, model_response)
 
                 # 9. Convert response to structured format
                 _convert_response_to_structured_format(team, run_response=run_response, run_context=run_context)
@@ -2127,8 +2126,8 @@ async def _arun_tasks(
 
         # === Post-loop ===
 
-        # Store media if enabled
-        if team.store_media and model_response is not None:
+        # Always add media to run_response for caller availability
+        if model_response is not None:
             store_media_util(run_response, model_response)
 
         # Convert response to structured format
@@ -2955,9 +2954,8 @@ async def _arun(
                         team, run_response=run_response, session=team_session, run_context=run_context
                     )
 
-                # 8. Store media if enabled
-                if team.store_media:
-                    store_media_util(run_response, model_response)
+                # 8. Always add media to run_response for caller availability
+                store_media_util(run_response, model_response)
 
                 # 9. Convert response to structured format
                 _convert_response_to_structured_format(team, run_response=run_response, run_context=run_context)
@@ -3885,11 +3883,24 @@ def _cleanup_and_store(
     session: TeamSession,
     run_context: Optional[RunContext] = None,
 ) -> None:
-    #  Scrub the stored run based on storage flags
     from agno.team._session import update_session_metrics
 
+    # Save output media before scrubbing so they remain available to the caller
+    saved_images = run_response.images
+    saved_videos = run_response.videos
+    saved_audio = run_response.audio
+    saved_files = run_response.files
+
+    # Scrub the stored run based on storage flags
     scrub_run_output_for_storage(team, run_response)
 
+    # Also scrub output media artifacts when store_media is disabled
+    if not team.store_media:
+        run_response.images = None
+        run_response.videos = None
+        run_response.audio = None
+        run_response.files = None
+
     # Stop the timer for the Run duration
     if run_response.metrics:
         run_response.metrics.stop_timer()
@@ -3914,18 +3925,37 @@ def _cleanup_and_store(
     # Save session to memory
     team.save_session(session=session)
 
+    # Restore output media so the caller can access them
+    run_response.images = saved_images
+    run_response.videos = saved_videos
+    run_response.audio = saved_audio
+    run_response.files = saved_files
+
 
 async def _acleanup_and_store(
     team: "Team",
     run_response: TeamRunOutput,
     session: TeamSession,
     run_context: Optional[RunContext] = None,
 ) -> None:
-    #  Scrub the stored run based on storage flags
     from agno.team._session import update_session_metrics
 
+    # Save output media before scrubbing so they remain available to the caller
+    saved_images = run_response.images
+    saved_videos = run_response.videos
+    saved_audio = run_response.audio
+    saved_files = run_response.files
+
+    # Scrub the stored run based on storage flags
     scrub_run_output_for_storage(team, run_response)
 
+    # Also scrub output media artifacts when store_media is disabled
+    if not team.store_media:
+        run_response.images = None
+        run_response.videos = None
+        run_response.audio = None
+        run_response.files = None
+
     # Stop the timer for the Run duration
     if run_response.metrics:
         run_response.metrics.stop_timer()
@@ -3950,6 +3980,12 @@ async def _acleanup_and_store(
     # Save session to memory
     await team.asave_session(session=session)
 
+    # Restore output media so the caller can access them
+    run_response.images = saved_images
+    run_response.videos = saved_videos
+    run_response.audio = saved_audio
+    run_response.files = saved_files
+
 
 def scrub_run_output_for_storage(team: "Team", run_response: TeamRunOutput) -> bool:
     """
@@ -4924,9 +4960,8 @@ def _continue_run(
                 # Convert to structured format
                 _convert_response_to_structured_format(team, run_response=run_response, run_context=run_context)
 
-                # Store media
-                if team.store_media:
-                    store_media_util(run_response, model_response)
+                # Always add media to run_response for caller availability
+                store_media_util(run_response, model_response)
 
                 # Execute post-hooks
                 if team.post_hooks is not None:
@@ -5577,8 +5612,7 @@ async def _acontinue_run(
 
                     _convert_response_to_structured_format(team, run_response=run_response, run_context=run_context)
 
-                    if team.store_media:
-                        store_media_util(run_response, model_response)
+                    store_media_util(run_response, model_response)
 
                 elif member_results:
                     # Member-only: re-run team with results

libs/agno/tests/unit/agent/test_store_media_run_output.py

@@ -0,0 +1,133 @@
+"""Tests for store_media=False still returning media in RunOutput to caller.
+
+Verifies fix for https://github.com/agno-agi/agno/issues/5101
+"""
+
+from typing import Any, AsyncIterator, Iterator
+from unittest.mock import AsyncMock, Mock
+
+import pytest
+
+from agno.agent.agent import Agent
+from agno.media import Image
+from agno.models.base import Model
+from agno.models.message import MessageMetrics
+from agno.models.response import ModelResponse
+
+
+class MockModelWithImage(Model):
+    def __init__(self):
+        super().__init__(id="test-model", name="test-model", provider="test")
+        self.instructions = None
+
+        self._mock_response = Mock()
+        self._mock_response.content = "Here is your generated image"
+        self._mock_response.role = "assistant"
+        self._mock_response.reasoning_content = None
+        self._mock_response.redacted_reasoning_content = None
+        self._mock_response.tool_calls = None
+        self._mock_response.tool_executions = None
+        self._mock_response.images = [Image(url="https://example.com/generated.png", id="img-1")]
+        self._mock_response.videos = None
+        self._mock_response.audios = None
+        self._mock_response.audio = None
+        self._mock_response.files = None
+        self._mock_response.citations = None
+        self._mock_response.references = None
+        self._mock_response.metadata = None
+        self._mock_response.provider_data = None
+        self._mock_response.extra = None
+        self._mock_response.response_usage = MessageMetrics()
+
+        self.response = Mock(return_value=self._mock_response)
+        self.aresponse = AsyncMock(return_value=self._mock_response)
+
+    def get_instructions_for_model(self, *args, **kwargs):
+        return None
+
+    def get_system_message_for_model(self, *args, **kwargs):
+        return None
+
+    async def aget_instructions_for_model(self, *args, **kwargs):
+        return None
+
+    async def aget_system_message_for_model(self, *args, **kwargs):
+        return None
+
+    def parse_args(self, *args, **kwargs):
+        return {}
+
+    def invoke(self, *args, **kwargs) -> ModelResponse:
+        return self._mock_response
+
+    async def ainvoke(self, *args, **kwargs) -> ModelResponse:
+        return await self.aresponse(*args, **kwargs)
+
+    def invoke_stream(self, *args, **kwargs) -> Iterator[ModelResponse]:
+        yield self._mock_response
+
+    async def ainvoke_stream(self, *args, **kwargs) -> AsyncIterator[ModelResponse]:
+        yield self._mock_response
+        return
+
+    def _parse_provider_response(self, response: Any, **kwargs) -> ModelResponse:
+        return self._mock_response
+
+    def _parse_provider_response_delta(self, response: Any) -> ModelResponse:
+        return self._mock_response
+
+
+def test_store_media_false_returns_images_to_caller():
+    """Returned RunOutput should have images even with store_media=False."""
+    agent = Agent(
+        model=MockModelWithImage(),
+        store_media=False,
+    )
+
+    result = agent.run("Generate an image")
+
+    assert result.images is not None
+    assert len(result.images) == 1
+    assert result.images[0].url == "https://example.com/generated.png"
+
+
+@pytest.mark.asyncio
+async def test_store_media_false_returns_images_to_caller_async():
+    """Async: returned RunOutput should have images even with store_media=False."""
+    agent = Agent(
+        model=MockModelWithImage(),
+        store_media=False,
+    )
+
+    result = await agent.arun("Generate an image")
+
+    assert result.images is not None
+    assert len(result.images) == 1
+    assert result.images[0].url == "https://example.com/generated.png"
+
+
+def test_store_media_true_returns_images_to_caller():
+    """With store_media=True (default), caller should still see images."""
+    agent = Agent(
+        model=MockModelWithImage(),
+        store_media=True,
+    )
+
+    result = agent.run("Generate an image")
+
+    assert result.images is not None
+    assert len(result.images) == 1
+
+
+def test_store_media_false_without_db():
+    """store_media=False works correctly without any DB configured."""
+    agent = Agent(
+        model=MockModelWithImage(),
+        store_media=False,
+    )
+
+    result = agent.run("Generate an image")
+
+    assert result.images is not None
+    assert len(result.images) == 1
+    assert result.images[0].id == "img-1"