agno 2.0.0rc1__py3-none-any.whl → 2.0.1__py3-none-any.whl

agno/team/team.py

@@ -33,7 +33,7 @@ from agno.agent import Agent
 from agno.db.base import BaseDb, SessionType, UserMemory
 from agno.exceptions import ModelProviderError, RunCancelledException
 from agno.knowledge.knowledge import Knowledge
-from agno.media import Audio, AudioArtifact, AudioResponse, File, Image, ImageArtifact, Video, VideoArtifact
+from agno.media import Audio, File, Image, Video
 from agno.memory import MemoryManager
 from agno.models.base import Model
 from agno.models.message import Message, MessageReferences
@@ -51,7 +51,7 @@ from agno.run.cancel import (
     register_run,
 )
 from agno.run.messages import RunMessages
-from agno.run.team import TeamRunEvent, TeamRunOutput, TeamRunOutputEvent
+from agno.run.team import TeamRunEvent, TeamRunInput, TeamRunOutput, TeamRunOutputEvent
 from agno.session import SessionSummaryManager, TeamSession
 from agno.tools import Toolkit
 from agno.tools.function import Function
@@ -100,7 +100,6 @@ from agno.utils.reasoning import (
 from agno.utils.response import (
     async_generator_wrapper,
     check_if_run_cancelled,
-    escape_markdown_tags,
     generator_wrapper,
 )
 from agno.utils.safe_formatter import SafeFormatter
@@ -117,8 +116,6 @@ class Team:
 
     members: List[Union[Agent, "Team"]]
 
-    mode: Literal["route", "coordinate", "collaborate"] = "coordinate"
-
     # Model for this Team
     model: Optional[Model] = None
 
@@ -132,6 +129,14 @@ class Team:
     # If this team is part of a team itself, this is the role of the team
     role: Optional[str] = None
 
+    # If True, the team leader won't process responses from the members and instead will return them directly
+    # Should not be used in combination with delegate_task_to_all_members
+    respond_directly: bool = False
+    # If True, the team leader will delegate the task to all members, instead of deciding for a subset
+    delegate_task_to_all_members: bool = False
+    # Set to false if you want to send the run input directly to the member agents
+    determine_input_for_members: bool = True
+
     # --- If this Team is part of a workflow ---
     # Optional workflow ID. Indicates this team is part of a workflow.
     workflow_id: Optional[str] = None
@@ -145,9 +150,9 @@ class Team:
     session_id: Optional[str] = None
     # Session state (stored in the database to persist across runs)
     session_state: Optional[Dict[str, Any]] = None
-    # If True, the team can update the session state
+    # Set to True to add the session_state to the context
     add_session_state_to_context: bool = False
-    # If True, the team can update the session state
+    # Set to True to give the team tools to update the session_state dynamically
     enable_agentic_state: bool = False
     # If True, cache the current Team session in memory for faster access
     cache_session: bool = False
@@ -221,8 +226,6 @@ class Team:
     references_format: Literal["json", "yaml"] = "json"
 
     # --- Tools ---
-    # If True, enable the team agent to update the team context and automatically send the team context to the members
-    enable_agentic_context: bool = False
     # If True, send all previous member interactions to members
     share_member_interactions: bool = False
     # If True, add a tool to get information about the team members
@@ -234,6 +237,11 @@ class Team:
     # If True, read the team history
     read_team_history: bool = False
 
+    # If False, media (images, videos, audio, files) is only available to tools and not sent to the LLM
+    send_media_to_model: bool = True
+    # If True, store media in run output
+    store_media: bool = True
+
     # --- Team Tools ---
     # A list of tools provided to the Model.
     # Tools are functions the model may generate JSON inputs for.
@@ -342,11 +350,13 @@ class Team:
     def __init__(
         self,
         members: List[Union[Agent, "Team"]],
-        mode: Literal["route", "coordinate", "collaborate"] = "coordinate",
+        id: Optional[str] = None,
         model: Optional[Model] = None,
         name: Optional[str] = None,
         role: Optional[str] = None,
-        id: Optional[str] = None,
+        respond_directly: bool = False,
+        determine_input_for_members: bool = True,
+        delegate_task_to_all_members: bool = False,
         user_id: Optional[str] = None,
         session_id: Optional[str] = None,
         session_state: Optional[Dict[str, Any]] = None,
@@ -376,11 +386,12 @@ class Team:
         update_knowledge: bool = False,
         knowledge_retriever: Optional[Callable[..., Optional[List[Union[Dict, str]]]]] = None,
         references_format: Literal["json", "yaml"] = "json",
-        enable_agentic_context: bool = False,
         share_member_interactions: bool = False,
         get_member_information_tool: bool = False,
         search_knowledge: bool = True,
         read_team_history: bool = False,
+        store_media: bool = True,
+        send_media_to_model: bool = True,
         tools: Optional[List[Union[Toolkit, Callable, Function, Dict]]] = None,
         tool_call_limit: Optional[int] = None,
         tool_choice: Optional[Union[str, Dict[str, Any]]] = None,
@@ -424,14 +435,16 @@ class Team:
     ):
         self.members = members
 
-        self.mode = mode
-
         self.model = model
 
         self.name = name
         self.id = id
         self.role = role
 
+        self.respond_directly = respond_directly
+        self.determine_input_for_members = determine_input_for_members
+        self.delegate_task_to_all_members = delegate_task_to_all_members
+
         self.user_id = user_id
         self.session_id = session_id
         self.session_state = session_state
@@ -465,12 +478,14 @@ class Team:
         self.knowledge_retriever = knowledge_retriever
         self.references_format = references_format
 
-        self.enable_agentic_context = enable_agentic_context
         self.share_member_interactions = share_member_interactions
         self.get_member_information_tool = get_member_information_tool
         self.search_knowledge = search_knowledge
         self.read_team_history = read_team_history
 
+        self.store_media = store_media
+        self.send_media_to_model = send_media_to_model
+
         self.tools = tools
         self.tool_choice = tool_choice
         self.tool_call_limit = tool_call_limit
@@ -531,11 +546,11 @@ class Team:
 
         # TODO: Remove these
         # Images generated during this session
-        self.images: Optional[List[ImageArtifact]] = None
+        self.images: Optional[List[Image]] = None
         # Audio generated during this session
-        self.audio: Optional[List[AudioArtifact]] = None
+        self.audio: Optional[List[Audio]] = None
         # Videos generated during this session
-        self.videos: Optional[List[VideoArtifact]] = None
+        self.videos: Optional[List[Video]] = None
 
         # Team session
         self._team_session: Optional[TeamSession] = None
@@ -591,6 +606,15 @@ class Team:
         if isinstance(input, Message):
             input = input.content  # type: ignore
 
+        # If input is a string, convert it to a dict
+        if isinstance(input, str):
+            import json
+
+            try:
+                input = json.loads(input)
+            except Exception as e:
+                raise ValueError(f"Failed to parse input. Is it a valid JSON string?: {e}")
+
         # Case 1: Message is already a BaseModel instance
         if isinstance(input, BaseModel):
             if isinstance(input, self.input_schema):
@@ -715,6 +739,15 @@ class Team:
         return session_id, user_id, session_state  # type: ignore
 
     def initialize_team(self, debug_mode: Optional[bool] = None) -> None:
+        # Make sure for the team, we are using the team logger
+        use_team_logger()
+
+        if self.delegate_task_to_all_members and self.respond_directly:
+            log_warning(
+                "delegate_task_to_all_members and respond_directly are both enabled. The task will be delegated to all members."
+            )
+            self.respond_directly = False
+
         self._set_default_model()
 
         # Set debug mode
@@ -738,9 +771,6 @@ class Team:
         for member in self.members:
             self._initialize_member(member, debug_mode=self.debug_mode)
 
-        # Make sure for the team, we are using the team logger
-        use_team_logger()
-
     def add_tool(self, tool: Union[Toolkit, Callable, Function, Dict]):
         if not self.tools:
             self.tools = []
@@ -812,6 +842,11 @@ class Team:
         #  Update TeamRunOutput
         self._update_run_response(model_response=model_response, run_response=run_response, run_messages=run_messages)
 
+        if self.store_media:
+            self._store_media(run_response, model_response)
+        else:
+            self._scrub_media_from_run_output(run_response)
+
         # 4. Add the RunOutput to Team Session
         session.upsert_run(run_response=run_response)
 
@@ -1010,7 +1045,6 @@ class Team:
         videos: Optional[Sequence[Video]] = None,
         files: Optional[Sequence[File]] = None,
         knowledge_filters: Optional[Dict[str, Any]] = None,
-        store_member_responses: Optional[bool] = None,
         add_history_to_context: Optional[bool] = None,
         add_dependencies_to_context: Optional[bool] = None,
         add_session_state_to_context: Optional[bool] = None,
@@ -1036,7 +1070,6 @@ class Team:
         videos: Optional[Sequence[Video]] = None,
         files: Optional[Sequence[File]] = None,
         knowledge_filters: Optional[Dict[str, Any]] = None,
-        store_member_responses: Optional[bool] = None,
         add_history_to_context: Optional[bool] = None,
         add_dependencies_to_context: Optional[bool] = None,
         add_session_state_to_context: Optional[bool] = None,
@@ -1061,7 +1094,6 @@ class Team:
         images: Optional[Sequence[Image]] = None,
         videos: Optional[Sequence[Video]] = None,
         files: Optional[Sequence[File]] = None,
-        store_member_responses: Optional[bool] = None,
         knowledge_filters: Optional[Dict[str, Any]] = None,
         add_history_to_context: Optional[bool] = None,
         add_dependencies_to_context: Optional[bool] = None,
@@ -1077,9 +1109,6 @@ class Team:
         # Validate input against input_schema if provided
         validated_input = self._validate_input(input)
 
-        if store_member_responses is not None:
-            self.store_member_responses = store_member_responses
-
         # Create a run_id for this specific run
         run_id = str(uuid4())
 
@@ -1090,6 +1119,15 @@ class Team:
         # Initialize Team
         self.initialize_team(debug_mode=debug_mode)
 
+        image_artifacts, video_artifacts, audio_artifacts = self._validate_media_object_id(
+            images=images, videos=videos, audios=audio
+        )
+
+        # Create RunInput to capture the original user input
+        run_input = TeamRunInput(
+            input_content=input, images=image_artifacts, videos=video_artifacts, audios=audio_artifacts, files=files
+        )
+
         # Read existing session from database
         team_session = self._read_or_create_session(session_id=session_id, user_id=user_id)
         self._update_metadata(session=team_session)
@@ -1129,9 +1167,6 @@ class Team:
         if stream is None:
             stream = False if self.stream is None else self.stream
 
-        if store_member_responses is None:
-            store_member_responses = False if self.store_member_responses is None else self.store_member_responses
-
         if stream_intermediate_steps is None:
             stream_intermediate_steps = (
                 False if self.stream_intermediate_steps is None else self.stream_intermediate_steps
@@ -1163,6 +1198,7 @@ class Team:
             team_id=self.id,
             team_name=self.name,
             metadata=metadata,
+            input=run_input,
         )
 
         run_response.model = self.model.id if self.model is not None else None
@@ -1186,7 +1222,6 @@ class Team:
             audio=audio,
             files=files,
             workflow_context=workflow_context,
-            store_member_responses=store_member_responses,
             debug_mode=debug_mode,
             add_history_to_context=add_history,
             dependencies=run_dependencies,
@@ -1203,8 +1238,6 @@ class Team:
         for attempt in range(num_attempts):
             # Initialize the current run
 
-            log_debug(f"Team Mode: '{self.mode}'", center=True)
-
             # Run the team
             try:
                 run_messages = self._get_run_messages(
@@ -1227,10 +1260,6 @@ class Team:
                 if len(run_messages.messages) == 0:
                     log_error("No messages to be sent to the model.")
 
-                self.run_messages = run_messages
-                if len(run_messages.messages) == 0:
-                    log_error("No messages to be sent to the model.")
-
                 if stream:
                     response_iterator = self._run_stream(
                         run_response=run_response,
@@ -1311,7 +1340,6 @@ class Team:
         session: TeamSession,
         user_id: Optional[str] = None,
         response_format: Optional[Union[Dict, Type[BaseModel]]] = None,
-        workflow_context: Optional[Dict] = None,
     ) -> TeamRunOutput:
         """Run the Team and return the response.
 
@@ -1358,6 +1386,11 @@ class Team:
         #  Update TeamRunOutput
         self._update_run_response(model_response=model_response, run_response=run_response, run_messages=run_messages)
 
+        if self.store_media:
+            self._store_media(run_response, model_response)
+        else:
+            self._scrub_media_from_run_output(run_response)
+
         # 3. Add the run to memory
         session.upsert_run(run_response=run_response)
 
@@ -1554,7 +1587,6 @@ class Team:
         videos: Optional[Sequence[Video]] = None,
         files: Optional[Sequence[File]] = None,
         knowledge_filters: Optional[Dict[str, Any]] = None,
-        store_member_responses: Optional[bool] = None,
         add_history_to_context: Optional[bool] = None,
         add_dependencies_to_context: Optional[bool] = None,
         add_session_state_to_context: Optional[bool] = None,
@@ -1579,7 +1611,6 @@ class Team:
         images: Optional[Sequence[Image]] = None,
         videos: Optional[Sequence[Video]] = None,
         files: Optional[Sequence[File]] = None,
-        store_member_responses: Optional[bool] = None,
         knowledge_filters: Optional[Dict[str, Any]] = None,
         add_history_to_context: Optional[bool] = None,
         add_dependencies_to_context: Optional[bool] = None,
@@ -1606,7 +1637,6 @@ class Team:
         videos: Optional[Sequence[Video]] = None,
         files: Optional[Sequence[File]] = None,
         knowledge_filters: Optional[Dict[str, Any]] = None,
-        store_member_responses: Optional[bool] = None,
         add_history_to_context: Optional[bool] = None,
         add_dependencies_to_context: Optional[bool] = None,
         add_session_state_to_context: Optional[bool] = None,
@@ -1621,9 +1651,6 @@ class Team:
         # Validate input against input_schema if provided
         validated_input = self._validate_input(input)
 
-        if store_member_responses is not None:
-            self.store_member_responses = store_member_responses
-
         # Create a run_id for this specific run
         run_id = str(uuid4())
 
@@ -1634,6 +1661,15 @@ class Team:
         # Initialize Team
         self.initialize_team(debug_mode=debug_mode)
 
+        image_artifacts, video_artifacts, audio_artifacts = self._validate_media_object_id(
+            images=images, videos=videos, audios=audio
+        )
+
+        # Create RunInput to capture the original user input
+        run_input = TeamRunInput(
+            input_content=input, images=image_artifacts, videos=video_artifacts, audios=audio_artifacts, files=files
+        )
+
         team_session = self._read_or_create_session(session_id=session_id, user_id=user_id)
         self._update_metadata(session=team_session)
 
@@ -1671,9 +1707,6 @@ class Team:
         if stream is None:
             stream = False if self.stream is None else self.stream
 
-        if store_member_responses is None:
-            store_member_responses = False if self.store_member_responses is None else self.store_member_responses
-
         if stream_intermediate_steps is None:
             stream_intermediate_steps = (
                 False if self.stream_intermediate_steps is None else self.stream_intermediate_steps
@@ -1706,6 +1739,7 @@ class Team:
             team_id=self.id,
             team_name=self.name,
             metadata=metadata,
+            input=run_input,
         )
 
         run_response.model = self.model.id if self.model is not None else None
@@ -1729,7 +1763,6 @@ class Team:
             audio=audio,
             files=files,
             workflow_context=workflow_context,
-            store_member_responses=store_member_responses,
             debug_mode=debug_mode,
             add_history_to_context=add_history_to_context,
             dependencies=dependencies,
@@ -1744,8 +1777,6 @@ class Team:
         num_attempts = retries + 1
 
         for attempt in range(num_attempts):
-            log_debug(f"Mode: '{self.mode}'", center=True)
-
             # Run the team
             try:
                 run_messages = self._get_run_messages(
@@ -1837,6 +1868,21 @@ class Team:
 
             raise Exception(f"Failed after {num_attempts} attempts.")
 
+    def _store_media(self, run_response: TeamRunOutput, model_response: ModelResponse):
+        """Store media from model response in run_response for persistence"""
+        # Handle generated media fields from ModelResponse (generated media)
+        if model_response.images is not None:
+            for image in model_response.images:
+                self._add_image(image, run_response)  # Generated images go to run_response.images
+
+        if model_response.videos is not None:
+            for video in model_response.videos:
+                self._add_video(video, run_response)  # Generated videos go to run_response.videos
+
+        if model_response.audios is not None:
+            for audio in model_response.audios:
+                self._add_audio(audio, run_response)  # Generated audio go to run_response.audio
+
     def _update_run_response(
         self, model_response: ModelResponse, run_response: TeamRunOutput, run_messages: RunMessages
     ):
@@ -1871,19 +1917,6 @@ class Team:
             else:
                 run_response.tools.extend(model_response.tool_executions)
 
-        # Handle unified media fields from ModelResponse
-        if model_response.images is not None:
-            for image in model_response.images:
-                self._add_image(image, run_response)
-
-        if model_response.videos is not None:
-            for video in model_response.videos:
-                self._add_video(video, run_response)
-
-        if model_response.audios is not None:
-            for audio in model_response.audios:
-                self._add_audio(audio, run_response)
-
         # Update the run_response audio with the model response audio
         if model_response.audio is not None:
             run_response.response_audio = model_response.audio
@@ -2018,7 +2051,7 @@ class Team:
             stream_model_response=stream_model_response,
         )  # type: ignore
         async for model_response_event in model_stream:
-            for chunk in self._handle_model_response_chunk(
+            for event in self._handle_model_response_chunk(
                 session=session,
                 run_response=run_response,
                 full_model_response=full_model_response,
@@ -2028,7 +2061,7 @@ class Team:
                 parse_structured_output=self.should_parse_structured_output,
                 workflow_context=workflow_context,
             ):
-                yield chunk
+                yield event
 
         # Handle structured outputs
         if (self.output_schema is not None) and not self.use_json_mode and (full_model_response.parsed is not None):
@@ -2084,6 +2117,15 @@ class Team:
             model_response_event, tuple(get_args(TeamRunOutputEvent))
         ):
             if self.stream_member_events:
+                if model_response_event.event == TeamRunEvent.custom_event:  # type: ignore
+                    if hasattr(model_response_event, "team_id"):
+                        model_response_event.team_id = self.id
+                    if hasattr(model_response_event, "team_name"):
+                        model_response_event.team_name = self.name
+                    if not model_response_event.session_id:  # type: ignore
+                        model_response_event.session_id = session.session_id  # type: ignore
+                    if not model_response_event.run_id:  # type: ignore
+                        model_response_event.run_id = run_response.run_id  # type: ignore
                 # We just bubble the event up
                 yield self._handle_event(model_response_event, run_response)  # type: ignore
             else:
@@ -2113,28 +2155,38 @@ class Team:
                     should_yield = True
 
                 # Process thinking
-                if model_response_event.reasoning_content is not None:
-                    if not full_model_response.reasoning_content:
-                        full_model_response.reasoning_content = model_response_event.reasoning_content
-                    else:
-                        full_model_response.reasoning_content += model_response_event.reasoning_content
-                    should_yield = True
-
-                if model_response_event.citations is not None:
-                    # We get citations in one chunk
-                    full_model_response.citations = model_response_event.citations
-                    should_yield = True
-
-                # Process audio
                 if model_response_event.audio is not None:
                     if full_model_response.audio is None:
-                        full_model_response.audio = AudioResponse(id=str(uuid4()), content="", transcript="")
+                        full_model_response.audio = Audio(id=str(uuid4()), content=b"", transcript="")
 
                     if model_response_event.audio.id is not None:
                         full_model_response.audio.id = model_response_event.audio.id  # type: ignore
+
                     if model_response_event.audio.content is not None:
-                        full_model_response.audio.content += model_response_event.audio.content  # type: ignore
+                        # Handle both base64 string and bytes content
+                        if isinstance(model_response_event.audio.content, str):
+                            # Decode base64 string to bytes
+                            try:
+                                import base64
+
+                                decoded_content = base64.b64decode(model_response_event.audio.content)
+                                if full_model_response.audio.content is None:
+                                    full_model_response.audio.content = b""
+                                full_model_response.audio.content += decoded_content
+                            except Exception:
+                                # If decode fails, encode string as bytes
+                                if full_model_response.audio.content is None:
+                                    full_model_response.audio.content = b""
+                                full_model_response.audio.content += model_response_event.audio.content.encode("utf-8")
+                        elif isinstance(model_response_event.audio.content, bytes):
+                            # Content is already bytes
+                            if full_model_response.audio.content is None:
+                                full_model_response.audio.content = b""
+                            full_model_response.audio.content += model_response_event.audio.content
+
                     if model_response_event.audio.transcript is not None:
+                        if full_model_response.audio.transcript is None:
+                            full_model_response.audio.transcript = ""
                         full_model_response.audio.transcript += model_response_event.audio.transcript  # type: ignore
                     if model_response_event.audio.expires_at is not None:
                         full_model_response.audio.expires_at = model_response_event.audio.expires_at  # type: ignore
@@ -2937,31 +2989,85 @@ class Team:
                     return member.name or entity_id
         return entity_id
 
-    def _parse_response_content(
+    def _scrub_media_from_run_output(self, run_response: TeamRunOutput) -> None:
+        """
+        Completely remove all media from RunOutput when store_media=False.
+        This includes media in input, output artifacts, and all messages.
+        """
+        # 1. Scrub RunInput media
+        if run_response.input is not None:
+            run_response.input.images = []
+            run_response.input.videos = []
+            run_response.input.audios = []
+            run_response.input.files = []
+
+        # 2. RunOutput artifact media are skipped since we don't store them when store_media=False
+
+        # 3. Scrub media from all messages
+        if run_response.messages:
+            for message in run_response.messages:
+                self._scrub_media_from_message(message)
+
+        # 4. Scrub media from additional_input messages if any
+        if run_response.additional_input:
+            for message in run_response.additional_input:
+                self._scrub_media_from_message(message)
+
+        # 5. Scrub media from reasoning_messages if any
+        if run_response.reasoning_messages:
+            for message in run_response.reasoning_messages:
+                self._scrub_media_from_message(message)
+
+    def _scrub_media_from_message(self, message: Message) -> None:
+        """Remove all media from a Message object."""
+        # Input media
+        message.images = None
+        message.videos = None
+        message.audio = None
+        message.files = None
+
+        # Output media
+        message.audio_output = None
+        message.image_output = None
+        message.video_output = None
+
+    def _validate_media_object_id(
         self,
-        run_response: Union[TeamRunOutput, RunOutput],
-        tags_to_include_in_markdown: Set[str],
-        show_markdown: bool = True,
-    ) -> Any:
-        from rich.json import JSON
-        from rich.markdown import Markdown
-
-        if isinstance(run_response.content, str):
-            if show_markdown:
-                escaped_content = escape_markdown_tags(run_response.content, tags_to_include_in_markdown)
-                return Markdown(escaped_content)
-            else:
-                return run_response.get_content_as_string(indent=4)
-        elif isinstance(run_response.content, BaseModel):
-            try:
-                return JSON(run_response.content.model_dump_json(exclude_none=True), indent=2)
-            except Exception as e:
-                log_warning(f"Failed to convert response to JSON: {e}")
-        else:
-            try:
-                return JSON(json.dumps(run_response.content), indent=4)
-            except Exception as e:
-                log_warning(f"Failed to convert response to JSON: {e}")
+        images: Optional[Sequence[Image]] = None,
+        videos: Optional[Sequence[Video]] = None,
+        audios: Optional[Sequence[Audio]] = None,
+    ) -> tuple:
+        image_list = None
+        if images:
+            image_list = []
+            for img in images:
+                if not img.id:
+                    from uuid import uuid4
+
+                    img.id = str(uuid4())
+                image_list.append(img)
+
+        video_list = None
+        if videos:
+            video_list = []
+            for vid in videos:
+                if not vid.id:
+                    from uuid import uuid4
+
+                    vid.id = str(uuid4())
+                video_list.append(vid)
+
+        audio_list = None
+        if audios:
+            audio_list = []
+            for aud in audios:
+                if not aud.id:
+                    from uuid import uuid4
+
+                    aud.id = str(uuid4())
+                audio_list.append(aud)
+
+        return image_list, video_list, audio_list
 
     def cli_app(
         self,
@@ -3632,6 +3738,137 @@ class Team:
             except Exception as e:
                 log_warning(f"Failed to resolve context for '{key}': {e}")
 
+    def _collect_joint_images(
+        self,
+        run_input: Optional[TeamRunInput] = None,
+        session: Optional[TeamSession] = None,
+    ) -> Optional[Sequence[Image]]:
+        """Collect images from input, session history, and current run response."""
+        joint_images: List[Image] = []
+
+        # 1. Add images from current input
+        if run_input and run_input.images:
+            joint_images.extend(run_input.images)
+            log_debug(f"Added {len(run_input.images)} input images to joint list")
+
+        # 2. Add images from session history (from both input and generated sources)
+        try:
+            if session and session.runs:
+                for historical_run in session.runs:
+                    # Add generated images from previous runs
+                    if historical_run.images:
+                        joint_images.extend(historical_run.images)
+                        log_debug(
+                            f"Added {len(historical_run.images)} generated images from historical run {historical_run.run_id}"
+                        )
+
+                    # Add input images from previous runs
+                    if historical_run.input and historical_run.input.images:
+                        joint_images.extend(historical_run.input.images)
+                        log_debug(
+                            f"Added {len(historical_run.input.images)} input images from historical run {historical_run.run_id}"
+                        )
+        except Exception as e:
+            log_debug(f"Could not access session history for images: {e}")
+
+        if joint_images:
+            log_debug(f"Images Available to Model: {len(joint_images)} images")
+        return joint_images if joint_images else None
+
+    def _collect_joint_videos(
+        self,
+        run_input: Optional[TeamRunInput] = None,
+        session: Optional[TeamSession] = None,
+    ) -> Optional[Sequence[Video]]:
+        """Collect videos from input, session history, and current run response."""
+        joint_videos: List[Video] = []
+
+        # 1. Add videos from current input
+        if run_input and run_input.videos:
+            joint_videos.extend(run_input.videos)
+            log_debug(f"Added {len(run_input.videos)} input videos to joint list")
+
+        # 2. Add videos from session history (from both input and generated sources)
+        try:
+            if session and session.runs:
+                for historical_run in session.runs:
+                    # Add generated videos from previous runs
+                    if historical_run.videos:
+                        joint_videos.extend(historical_run.videos)
+                        log_debug(
+                            f"Added {len(historical_run.videos)} generated videos from historical run {historical_run.run_id}"
+                        )
+
+                    # Add input videos from previous runs
+                    if historical_run.input and historical_run.input.videos:
+                        joint_videos.extend(historical_run.input.videos)
+                        log_debug(
+                            f"Added {len(historical_run.input.videos)} input videos from historical run {historical_run.run_id}"
+                        )
+        except Exception as e:
+            log_debug(f"Could not access session history for videos: {e}")
+
+        if joint_videos:
+            log_debug(f"Videos Available to Model: {len(joint_videos)} videos")
+        return joint_videos if joint_videos else None
+
+    def _collect_joint_audios(
+        self,
+        run_input: Optional[TeamRunInput] = None,
+        session: Optional[TeamSession] = None,
+    ) -> Optional[Sequence[Audio]]:
+        """Collect audios from input, session history, and current run response."""
+        joint_audios: List[Audio] = []
+
+        # 1. Add audios from current input
+        if run_input and run_input.audios:
+            joint_audios.extend(run_input.audios)
+            log_debug(f"Added {len(run_input.audios)} input audios to joint list")
+
+        # 2. Add audios from session history (from both input and generated sources)
+        try:
+            if session and session.runs:
+                for historical_run in session.runs:
+                    # Add generated audios from previous runs
+                    if historical_run.audio:
+                        joint_audios.extend(historical_run.audio)
+                        log_debug(
+                            f"Added {len(historical_run.audio)} generated audios from historical run {historical_run.run_id}"
+                        )
+
+                    # Add input audios from previous runs
+                    if historical_run.input and historical_run.input.audios:
+                        joint_audios.extend(historical_run.input.audios)
+                        log_debug(
+                            f"Added {len(historical_run.input.audios)} input audios from historical run {historical_run.run_id}"
+                        )
+        except Exception as e:
+            log_debug(f"Could not access session history for audios: {e}")
+
+        if joint_audios:
+            log_debug(f"Audios Available to Model: {len(joint_audios)} audios")
+        return joint_audios if joint_audios else None
+
+    def _collect_joint_files(
+        self,
+        run_input: Optional[TeamRunInput] = None,
+    ) -> Optional[Sequence[File]]:
+        """Collect files from input and session history."""
+        from agno.utils.log import log_debug
+
+        joint_files: List[File] = []
+
+        # 1. Add files from current input
+        if run_input and run_input.files:
+            joint_files.extend(run_input.files)
+
+        # TODO: Files aren't stored in session history yet and dont have a FileArtifact
+
+        if joint_files:
+            log_debug(f"Files Available to Model: {len(joint_files)} files")
+
+        return joint_files if joint_files else None
+
     def determine_tools_for_model(
         self,
         model: Model,
@@ -3648,7 +3885,6 @@ class Team:
         audio: Optional[Sequence[Audio]] = None,
         files: Optional[Sequence[File]] = None,
         workflow_context: Optional[Dict] = None,
-        store_member_responses: bool = False,
         debug_mode: Optional[bool] = None,
         add_history_to_context: Optional[bool] = None,
         dependencies: Optional[Dict[str, Any]] = None,
@@ -3700,94 +3936,46 @@ class Team:
         if self.knowledge is not None and self.update_knowledge:
             _tools.append(self.add_to_knowledge)
 
-        if self.mode == "route":
+        # Get the user message if we are using the input directly
+        user_message = None
+        if self.determine_input_for_members is False:
             user_message = self._get_user_message(
                 run_response=run_response,
                 session_state=session_state,
                 input_message=input_message,
+                user_id=user_id,
                 audio=audio,
                 images=images,
                 videos=videos,
                 files=files,
-                user_id=user_id,
                 dependencies=dependencies,
                 add_dependencies_to_context=add_dependencies_to_context,
                 metadata=metadata,
             )
-            forward_task_func: Function = self._get_forward_task_function(
-                input=user_message,
-                run_response=run_response,
-                session_state=session_state,
-                team_run_context=team_run_context,
-                user_id=user_id,
-                session=session,
-                stream=self.stream or False,
-                stream_intermediate_steps=self.stream_intermediate_steps,
-                async_mode=async_mode,
-                images=images,  # type: ignore
-                videos=videos,  # type: ignore
-                audio=audio,  # type: ignore
-                files=files,  # type: ignore
-                knowledge_filters=knowledge_filters,
-                workflow_context=workflow_context,
-                store_member_responses=store_member_responses,
-                debug_mode=debug_mode,
-                add_history_to_context=add_history_to_context,
-                dependencies=dependencies,
-            )
-            _tools.append(forward_task_func)
-            if self.get_member_information_tool:
-                _tools.append(self.get_member_information)
-
-        elif self.mode == "coordinate":
-            _tools.append(
-                self._get_delegate_task_function(
-                    run_response=run_response,
-                    session=session,
-                    session_state=session_state,
-                    team_run_context=team_run_context,
-                    user_id=user_id,
-                    stream=self.stream or False,
-                    stream_intermediate_steps=self.stream_intermediate_steps,
-                    async_mode=async_mode,
-                    images=images,  # type: ignore
-                    videos=videos,  # type: ignore
-                    audio=audio,  # type: ignore
-                    files=files,  # type: ignore
-                    knowledge_filters=knowledge_filters,
-                    workflow_context=workflow_context,
-                    store_member_responses=store_member_responses,
-                    debug_mode=debug_mode,
-                    add_history_to_context=add_history_to_context,
-                    dependencies=dependencies,
-                )
-            )
-            if self.get_member_information_tool:
-                _tools.append(self.get_member_information)
 
-        elif self.mode == "collaborate":
-            run_member_agents_func = self._get_run_member_agents_function(
-                run_response=run_response,
-                session=session,
-                session_state=session_state,
-                team_run_context=team_run_context,
-                user_id=user_id,
-                stream=self.stream or False,
-                stream_intermediate_steps=self.stream_intermediate_steps,
-                async_mode=async_mode,
-                images=images,  # type: ignore
-                videos=videos,  # type: ignore
-                audio=audio,  # type: ignore
-                files=files,  # type: ignore
-                workflow_context=workflow_context,
-                store_member_responses=store_member_responses,
-                debug_mode=debug_mode,
-                add_history_to_context=add_history_to_context,
-            )
-            _tools.append(run_member_agents_func)
+        delegate_task_func = self._get_delegate_task_function(
+            run_response=run_response,
+            session=session,
+            session_state=session_state,
+            team_run_context=team_run_context,
+            input=user_message,
+            user_id=user_id,
+            stream=self.stream or False,
+            stream_intermediate_steps=self.stream_intermediate_steps,
+            async_mode=async_mode,
+            images=images,  # type: ignore
+            videos=videos,  # type: ignore
+            audio=audio,  # type: ignore
+            files=files,  # type: ignore
+            knowledge_filters=knowledge_filters,
+            workflow_context=workflow_context,
+            debug_mode=debug_mode,
+            add_history_to_context=add_history_to_context,
+        )
 
-            if self.get_member_information_tool:
-                _tools.append(self.get_member_information)
+        _tools.append(delegate_task_func)
+        if self.get_member_information_tool:
+            _tools.append(self.get_member_information)
 
         self._functions_for_model = {}
         self._tools_for_model = []
@@ -3866,6 +4054,29 @@ class Team:
                 except Exception as e:
                     log_warning(f"Could not add tool {tool}: {e}")
 
+        if self._functions_for_model:
+            from inspect import signature
+
+            # Check if any functions need media before collecting
+            needs_media = any(
+                any(param in signature(func.entrypoint).parameters for param in ["images", "videos", "audios", "files"])
+                for func in self._functions_for_model.values()
+                if func.entrypoint is not None
+            )
+
+            if needs_media:
+                # Only collect media if functions actually need them
+                joint_images = self._collect_joint_images(run_response.input, session)
+                joint_files = self._collect_joint_files(run_response.input)
+                joint_audios = self._collect_joint_audios(run_response.input, session)
+                joint_videos = self._collect_joint_videos(run_response.input, session)
+
+                for func in self._functions_for_model.values():
+                    func._images = joint_images
+                    func._files = joint_files
+                    func._audios = joint_audios
+                    func._videos = joint_videos
+
     def get_members_system_message_content(self, indent: int = 0) -> str:
         system_message_content = ""
         for idx, member in enumerate(self.members):
@@ -4039,9 +4250,17 @@ class Team:
         system_message_content += "</team_members>\n"
 
         system_message_content += "\n<how_to_respond>\n"
-        if self.mode == "coordinate":
+
+        if self.delegate_task_to_all_members:
+            system_message_content += (
+                "- You can either respond directly or use the `delegate_task_to_members` tool to delegate a task to all members in your team to get a collaborative response.\n"
+                "- To delegate a task to all members in your team, call `delegate_task_to_members` ONLY once. This will delegate a task to all members in your team.\n"
+                "- Analyze the responses from all members and evaluate whether the task has been completed.\n"
+                "- If you feel the task has been completed, you can stop and respond to the user.\n"
+            )
+        else:
             system_message_content += (
-                "- Your role is to forward tasks to members in your team with the highest likelihood of completing the user's request.\n"
+                "- Your role is to delegate tasks to members in your team with the highest likelihood of completing the user's request.\n"
                 "- Carefully analyze the tools available to the members and their roles before delegating tasks.\n"
                 "- You cannot use a member tool directly. You can only delegate tasks to members.\n"
                 "- When you delegate a task to another member, make sure to include:\n"
@@ -4055,24 +4274,6 @@ class Team:
                 "- For simple greetings, thanks, or questions about the team itself, you should respond directly.\n"
                 "- For all work requests, tasks, or questions requiring expertise, route to appropriate team members.\n"
             )
-        elif self.mode == "route":
-            system_message_content += (
-                "- Your role is to forward tasks to members in your team with the highest likelihood of completing the user's request.\n"
-                "- Carefully analyze the tools available to the members and their roles before forwarding tasks.\n"
-                "- When you forward a task to another Agent, make sure to include:\n"
-                "  - member_id (str): The ID of the member to forward the task to. Use only the ID of the member, not the ID of the team followed by the ID of the member.\n"
-                "  - expected_output (str): The expected output.\n"
-                "- You can forward tasks to multiple members at once.\n"
-                "- For simple greetings, thanks, or questions about the team itself, you should respond directly.\n"
-                "- For all work requests, tasks, or questions requiring expertise, route to appropriate team members.\n"
-            )
-        elif self.mode == "collaborate":
-            system_message_content += (
-                "- You can either respond directly or use the `run_member_agents` tool to run all members in your team to get a collaborative response.\n"
-                "- To run the members in your team, call `run_member_agents` ONLY once. This will run all members in your team.\n"
-                "- Analyze the responses from all members and evaluate whether the task has been completed.\n"
-                "- If you feel the task has been completed, you can stop and respond to the user.\n"
-            )
         system_message_content += "</how_to_respond>\n\n"
 
         # Attached media
@@ -4357,10 +4558,10 @@ class Team:
                 return Message(
                     role="user",
                     content="",
-                    images=images,
-                    audio=audio,
-                    videos=videos,
-                    files=files,
+                    images=None if not self.send_media_to_model else images,
+                    audio=None if not self.send_media_to_model else audio,
+                    videos=None if not self.send_media_to_model else videos,
+                    files=None if not self.send_media_to_model else files,
                     **kwargs,
                 )
             else:
@@ -4381,10 +4582,10 @@ class Team:
                 return Message(
                     role="user",
                     content=input_content,
-                    images=images,
-                    audio=audio,
-                    videos=videos,
-                    files=files,
+                    images=None if not self.send_media_to_model else images,
+                    audio=None if not self.send_media_to_model else audio,
+                    videos=None if not self.send_media_to_model else videos,
+                    files=None if not self.send_media_to_model else files,
                     **kwargs,
                 )
 
@@ -4473,10 +4674,10 @@ class Team:
                 return Message(
                     role="user",
                     content=user_msg_content,
-                    audio=audio,
-                    images=images,
-                    videos=videos,
-                    files=files,
+                    images=None if not self.send_media_to_model else images,
+                    audio=None if not self.send_media_to_model else audio,
+                    videos=None if not self.send_media_to_model else videos,
+                    files=None if not self.send_media_to_model else files,
                     **kwargs,
                 )
 
@@ -4831,11 +5032,11 @@ class Team:
         if self.share_member_interactions:
             team_member_interactions_str = self._get_team_member_interactions_str(team_run_context=team_run_context)  # type: ignore
             if context_images := self._get_team_run_context_images(team_run_context=team_run_context):  # type: ignore
-                images.extend([Image.from_artifact(img) for img in context_images])
+                images.extend(context_images)
             if context_videos := self._get_team_run_context_videos(team_run_context=team_run_context):  # type: ignore
-                videos.extend([Video.from_artifact(vid) for vid in context_videos])
+                videos.extend(context_videos)
             if context_audio := self._get_team_run_context_audio(team_run_context=team_run_context):  # type: ignore
-                audio.extend([Audio.from_artifact(aud) for aud in context_audio])
+                audio.extend(context_audio)
         return team_member_interactions_str
 
     def _find_member_by_id(self, member_id: str) -> Optional[Tuple[int, Union[Agent, "Team"]]]:
@@ -4865,7 +5066,7 @@ class Team:
 
         return None
 
-    def _get_run_member_agents_function(
+    def _get_delegate_task_function(
         self,
         run_response: TeamRunOutput,
         session: TeamSession,
@@ -4875,12 +5076,13 @@ class Team:
         stream: bool = False,
         stream_intermediate_steps: bool = False,
         async_mode: bool = False,
+        input: Optional[Message] = None,  # Used for determine_input_for_memberss=False
         images: Optional[List[Image]] = None,
         videos: Optional[List[Video]] = None,
         audio: Optional[List[Audio]] = None,
         files: Optional[List[File]] = None,
+        knowledge_filters: Optional[Dict[str, Any]] = None,
         workflow_context: Optional[Dict] = None,
-        store_member_responses: bool = False,
         debug_mode: Optional[bool] = None,
         add_history_to_context: Optional[bool] = None,
     ) -> Function:
@@ -4893,555 +5095,84 @@ class Team:
         if not files:
             files = []
 
-        def run_member_agents(
-            task_description: str, expected_output: Optional[str] = None
-        ) -> Iterator[Union[RunOutputEvent, TeamRunOutputEvent, str]]:
-            """
-            Send the same task to all the member agents and return the responses.
-
-            Args:
-                task_description (str): The task description to send to the member agents.
-                expected_output (str, optional): The expected output from the member agents.
-
-            Returns:
-                str: The responses from the member agents.
-            """
-            # Make sure for the member agent, we are using the agent logger
-            use_agent_logger()
+        def _setup_delegate_task_to_member(
+            member_agent: Union[Agent, "Team"], task_description: str, expected_output: Optional[str] = None
+        ):
+            # 1. Initialize the member agent
+            self._initialize_member(member_agent)
 
-            # 1. Determine team context to send
+            # 2. Determine team context to send
             team_member_interactions_str = self._determine_team_member_interactions(
                 team_run_context, images, videos, audio
             )
 
-            # 2. Create the member agent task
-            member_agent_task = format_member_agent_task(
-                task_description, expected_output, team_member_interactions_str
-            )
+            member_agent_task: Union[str, Message]
 
-            for member_agent_index, member_agent in enumerate(self.members):
-                self._initialize_member(member_agent)
+            # 3. Create the member agent task or use the input directly
+            if self.determine_input_for_members is False:
+                member_agent_task = input  # type: ignore
+            else:
+                # Don't override the expected output of a member agent
+                if member_agent.expected_output is not None:
+                    expected_output = None
+
+                member_agent_task = format_member_agent_task(  # type: ignore
+                    task_description, expected_output, team_member_interactions_str
+                )
 
-                # Add history for the member if enabled
-                history = None
-                if member_agent.add_history_to_context:
-                    history = self._get_history_for_member_agent(session, member_agent)
-                    if history:
+            # 4. Add history for the member if enabled
+            history = None
+            if member_agent.add_history_to_context:
+                history = self._get_history_for_member_agent(session, member_agent)
+                if history:
+                    if isinstance(member_agent_task, str):
                         history.append(Message(role="user", content=member_agent_task))
+                    else:
+                        history.append(member_agent_task)
 
-                member_session_state_copy = copy(session_state)
-                if stream:
-                    member_agent_run_response_stream = member_agent.run(
-                        input=member_agent_task if history is None else history,
-                        user_id=user_id,
-                        # All members have the same session_id
-                        session_id=session.session_id,
-                        session_state=member_session_state_copy,  # Send a copy to the agent
-                        images=images,
-                        videos=videos,
-                        audio=audio,
-                        files=files,
-                        stream=True,
-                        stream_intermediate_steps=stream_intermediate_steps,
-                        workflow_context=workflow_context,
-                        debug_mode=debug_mode,
-                        add_history_to_context=add_history_to_context,
-                        yield_run_response=True,
-                    )
-                    member_agent_run_response = None
-                    for member_agent_run_response_chunk in member_agent_run_response_stream:
-                        # If we get the full run response, we can break out of the loop
-                        if isinstance(member_agent_run_response_chunk, TeamRunOutput) or isinstance(
-                            member_agent_run_response_chunk, RunOutput
-                        ):
-                            member_agent_run_response = member_agent_run_response_chunk  # type: ignore
-                            break
-                        check_if_run_cancelled(member_agent_run_response_chunk)
-                        yield member_agent_run_response_chunk
+            # 5. Handle respond_directly
+            if self.respond_directly:
+                # Since we return the response directly from the member agent, we need to set the output schema from the team down.
+                if not member_agent.output_schema and self.output_schema:
+                    member_agent.output_schema = self.output_schema
 
-                else:
-                    member_agent_run_response = member_agent.run(  # type: ignore
-                        input=member_agent_task if history is None else history,
-                        user_id=user_id,
-                        # All members have the same session_id
-                        session_id=session.session_id,
-                        session_state=member_session_state_copy,  # Send a copy to the agent
-                        images=images,
-                        videos=videos,
-                        audio=audio,
-                        files=files,
-                        stream=False,
-                        workflow_context=workflow_context,
-                        debug_mode=debug_mode,
-                        add_history_to_context=add_history_to_context,
-                    )
-
-                    check_if_run_cancelled(member_agent_run_response)  # type: ignore
-
-                    try:
-                        if member_agent_run_response.content is None and (  # type: ignore
-                            member_agent_run_response.tools is None or len(member_agent_run_response.tools) == 0  # type: ignore
-                        ):
-                            yield f"Agent {member_agent.name}: No response from the member agent."
-                        elif isinstance(member_agent_run_response.content, str):  # type: ignore
-                            if len(member_agent_run_response.content.strip()) > 0:  # type: ignore
-                                yield f"Agent {member_agent.name}: {member_agent_run_response.content}"  # type: ignore
-                            elif (
-                                member_agent_run_response.tools is not None and len(member_agent_run_response.tools) > 0  # type: ignore
-                            ):
-                                yield f"Agent {member_agent.name}: {','.join([tool.result for tool in member_agent_run_response.tools])}"  # type: ignore
-                        elif issubclass(type(member_agent_run_response.content), BaseModel):  # type: ignore
-                            yield f"Agent {member_agent.name}: {member_agent_run_response.content.model_dump_json(indent=2)}"  # type: ignore
-                        else:
-                            import json
-
-                            yield f"Agent {member_agent.name}: {json.dumps(member_agent_run_response.content, indent=2)}"  # type: ignore
-                    except Exception as e:
-                        yield f"Agent {member_agent.name}: Error - {str(e)}"
-
-                # Add team run id to the member run
-                if member_agent_run_response is not None:
-                    member_agent_run_response.parent_run_id = run_response.run_id  # type: ignore
-
-                # Update the memory
-                member_name = member_agent.name if member_agent.name else f"agent_{member_agent_index}"
-                self._add_interaction_to_team_run_context(
-                    team_run_context=team_run_context,
-                    member_name=member_name,
-                    task=task_description,
-                    run_response=member_agent_run_response,  # type: ignore
-                )
-
-                # Add the member run to the team run response
-                if self.store_member_responses and run_response and member_agent_run_response:
-                    run_response.add_member_run(member_agent_run_response)
-
-                # Add the member run to the team session
-                if member_agent_run_response:
-                    session.upsert_run(member_agent_run_response)
-
-                # Update team session state
-                merge_dictionaries(session_state, member_session_state_copy)  # type: ignore
-
-                # Update the team media
-                if member_agent_run_response is not None:
-                    self._update_team_media(member_agent_run_response)  # type: ignore
-
-            # Afterward, switch back to the team logger
-            use_team_logger()
-
-        async def arun_member_agents(
-            task_description: str, expected_output: Optional[str] = None
-        ) -> AsyncIterator[Union[RunOutputEvent, TeamRunOutputEvent, str]]:
-            """
-            Send the same task to all the member agents and return the responses.
-
-            Args:
-                task_description (str): The task description to send to the member agents.
-                expected_output (str): The expected output from the member agents.
-
-            Returns:
-                str: The responses from the member agents.
-            """
-            # Make sure for the member agent, we are using the agent logger
-            use_agent_logger()
-
-            # 1. Determine team context to send
-            team_member_interactions_str = self._determine_team_member_interactions(
-                team_run_context, images, videos, audio
-            )
-
-            if stream:
-                # Concurrent streaming: launch each member as a streaming worker and merge events
-                done_marker = object()
-                queue: "asyncio.Queue[Union[RunOutputEvent, TeamRunOutputEvent, str, object]]" = asyncio.Queue()
-
-                async def stream_member(agent: Union[Agent, "Team"], idx: int) -> None:
-                    # Compute expected output per agent (do not mutate shared var)
-                    local_expected_output = None if agent.expected_output is not None else expected_output
-
-                    member_agent_task = format_member_agent_task(
-                        task_description, local_expected_output, team_member_interactions_str
-                    )
-
-                    # Add history for the member if enabled
-                    history = None
-                    if agent.add_history_to_context:
-                        history = self._get_history_for_member_agent(session, agent)
-                        if history:
-                            history.append(Message(role="user", content=member_agent_task))
-
-                    member_session_state_copy = copy(session_state)
-
-                    # Stream events from the member
-                    member_stream = agent.arun(  # type: ignore
-                        input=member_agent_task if history is None else history,
-                        user_id=user_id,
-                        session_id=session.session_id,
-                        session_state=member_session_state_copy,  # Send a copy to the agent
-                        images=images,
-                        videos=videos,
-                        audio=audio,
-                        files=files,
-                        stream=True,
-                        stream_intermediate_steps=stream_intermediate_steps,
-                        debug_mode=debug_mode,
-                        yield_run_response=True,
-                    )
-                    member_agent_run_response = None
-                    try:
-                        async for member_agent_run_output_event in member_stream:
-                            if isinstance(member_agent_run_output_event, TeamRunOutput) or isinstance(
-                                member_agent_run_output_event, RunOutput
-                            ):
-                                member_agent_run_response = member_agent_run_output_event  # type: ignore
-                                break
-                            check_if_run_cancelled(member_agent_run_output_event)
-                            await queue.put(member_agent_run_output_event)
-                    finally:
-                        # Add team run id to the member run
-                        if member_agent_run_response is not None:
-                            member_agent_run_response.parent_run_id = run_response.run_id  # type: ignore
-
-                        member_name = agent.name if agent.name else f"agent_{idx}"
-                        self._add_interaction_to_team_run_context(
-                            team_run_context=team_run_context,
-                            member_name=member_name,
-                            task=task_description,
-                            run_response=member_agent_run_response,  # type: ignore
-                        )
-
-                        # Add the member run to the team run response
-                        if store_member_responses and run_response:
-                            run_response.add_member_run(member_agent_run_response)  # type: ignore
-
-                        # Add the member run to the team session
-                        session.upsert_run(member_agent_run_response)  # type: ignore
-
-                        # Update team session state
-                        merge_dictionaries(session_state, member_session_state_copy)  # type: ignore
-
-                        # Update the team media
-                        if member_agent_run_response is not None:
-                            self._update_team_media(member_agent_run_response)
-
-                        # Signal completion for this member
-                        await queue.put(done_marker)
-
-                # Initialize and launch all members
-                tasks: List[asyncio.Task[None]] = []
-                for member_agent_index, member_agent in enumerate(self.members):
-                    current_agent = member_agent
-                    current_index = member_agent_index
-                    self._initialize_member(current_agent)
-                    tasks.append(asyncio.create_task(stream_member(current_agent, current_index)))
-
-                # Drain queue until all members reported done
-                completed = 0
-                try:
-                    while completed < len(tasks):
-                        item = await queue.get()
-                        if item is done_marker:
-                            completed += 1
-                        else:
-                            yield item  # type: ignore
-                finally:
-                    # Ensure tasks do not leak on cancellation
-                    for t in tasks:
-                        if not t.done():
-                            t.cancel()
-                    # Await cancellation to suppress warnings
-                    for t in tasks:
-                        with contextlib.suppress(Exception):
-                            await t
-            else:
-                # Non-streaming concurrent run of members; collect results when done
-                tasks = []
-                for member_agent_index, member_agent in enumerate(self.members):
-                    current_agent = member_agent
-                    current_index = member_agent_index
-                    self._initialize_member(current_agent)
-
-                    # Compute expected output per agent (do not mutate shared var)
-                    local_expected_output = None if current_agent.expected_output is not None else expected_output
-
-                    member_agent_task = format_member_agent_task(
-                        task_description, local_expected_output, team_member_interactions_str
-                    )
-
-                    # Add history for the member if enabled
-                    history = None
-                    if current_agent.add_history_to_context:
-                        history = self._get_history_for_member_agent(session, current_agent)
-                        if history:
-                            history.append(Message(role="user", content=member_agent_task))
-
-                    async def run_member_agent(agent=current_agent) -> str:
-                        member_session_state_copy = copy(session_state)
-                        member_agent_run_response = await agent.arun(
-                            input=member_agent_task if history is None else history,
-                            user_id=user_id,
-                            # All members have the same session_id
-                            session_id=session.session_id,
-                            images=images,
-                            videos=videos,
-                            audio=audio,
-                            files=files,
-                            stream=False,
-                            debug_mode=debug_mode,
-                        )
-                        check_if_run_cancelled(member_agent_run_response)
-
-                        # Add team run id to the member run
-                        if member_agent_run_response is not None:
-                            member_agent_run_response.parent_run_id = run_response.run_id  # type: ignore
-
-                        # Update the memory
-                        member_name = member_agent.name if member_agent.name else f"agent_{member_agent_index}"
-                        self._add_interaction_to_team_run_context(
-                            team_run_context=team_run_context,
-                            member_name=member_name,
-                            task=task_description,
-                            run_response=member_agent_run_response,  # type: ignore
-                        )
-
-                        # Add the member run to the team run response
-                        if store_member_responses and run_response and member_agent_run_response:
-                            run_response.add_member_run(member_agent_run_response)
-
-                        # Add the member run to the team session
-                        if member_agent_run_response:
-                            session.upsert_run(member_agent_run_response)
-
-                        # Update team session state
-                        merge_dictionaries(session_state, member_session_state_copy)  # type: ignore
-
-                        # Update the team media
-                        if member_agent_run_response is not None:
-                            self._update_team_media(member_agent_run_response)  # type: ignore
-
-                        try:
-                            if member_agent_run_response.content is None and (
-                                member_agent_run_response.tools is None or len(member_agent_run_response.tools) == 0
-                            ):
-                                return f"Agent {member_name}: No response from the member agent."
-                            elif isinstance(member_agent_run_response.content, str):
-                                if len(member_agent_run_response.content.strip()) > 0:
-                                    return f"Agent {member_name}: {member_agent_run_response.content}"
-                                elif (
-                                    member_agent_run_response.tools is not None
-                                    and len(member_agent_run_response.tools) > 0
-                                ):
-                                    return f"Agent {member_name}: {','.join([tool.result for tool in member_agent_run_response.tools])}"
-                            elif issubclass(type(member_agent_run_response.content), BaseModel):
-                                return f"Agent {member_name}: {member_agent_run_response.content.model_dump_json(indent=2)}"  # type: ignore
-                            else:
-                                import json
-
-                                return f"Agent {member_name}: {json.dumps(member_agent_run_response.content, indent=2)}"
-                        except Exception as e:
-                            return f"Agent {member_name}: Error - {str(e)}"
-
-                        return f"Agent {member_name}: No Response"
-
-                    tasks.append(run_member_agent)  # type: ignore
-
-                results = await asyncio.gather(*[task() for task in tasks])  # type: ignore
-                for result in results:
-                    yield result
-
-            # Afterward, switch back to the team logger
-            use_team_logger()
-
-        if async_mode:
-            run_member_agents_function = arun_member_agents  # type: ignore
-        else:
-            run_member_agents_function = run_member_agents  # type: ignore
-
-        run_member_agents_func = Function.from_callable(
-            run_member_agents_function, name="run_member_agents", strict=True
-        )
-
-        return run_member_agents_func
-
-    def _get_delegate_task_function(
-        self,
-        run_response: TeamRunOutput,
-        session: TeamSession,
-        session_state: Dict[str, Any],
-        team_run_context: Dict[str, Any],
-        user_id: Optional[str] = None,
-        stream: bool = False,
-        stream_intermediate_steps: bool = False,
-        async_mode: bool = False,
-        images: Optional[List[Image]] = None,
-        videos: Optional[List[Video]] = None,
-        audio: Optional[List[Audio]] = None,
-        files: Optional[List[File]] = None,
-        knowledge_filters: Optional[Dict[str, Any]] = None,
-        workflow_context: Optional[Dict] = None,
-        store_member_responses: bool = False,
-        debug_mode: Optional[bool] = None,
-        add_history_to_context: Optional[bool] = None,
-        dependencies: Optional[Dict[str, Any]] = None,
-    ) -> Function:
-        if not images:
-            images = []
-        if not videos:
-            videos = []
-        if not audio:
-            audio = []
-        if not files:
-            files = []
-
-        def delegate_task_to_member(
-            member_id: str, task_description: str, expected_output: Optional[str] = None
-        ) -> Iterator[Union[RunOutputEvent, TeamRunOutputEvent, str]]:
-            """Use this function to delegate a task to the selected team member.
-            You must provide a clear and concise description of the task the member should achieve AND the expected output.
-
-            Args:
-                member_id (str): The ID of the member to delegate the task to. Use only the ID of the member, not the ID of the team followed by the ID of the member.
-                task_description (str): A clear and concise description of the task the member should achieve.
-                expected_output (str, optional): The expected output from the member (optional).
-            Returns:
-                str: The result of the delegated task.
-            """
-            # 1. Find the member agent using the helper function
-            result = self._find_member_by_id(member_id)
-            history = None
-            if result is None:
-                yield f"Member with ID {member_id} not found in the team or any subteams. Please choose the correct member from the list of members:\n\n{self.get_members_system_message_content(indent=0)}"
-                return
-
-            member_agent_index, member_agent = result
-            self._initialize_member(member_agent)
-
-            # 2. Determine team context to send
-            team_member_interactions_str = self._determine_team_member_interactions(
-                team_run_context, images, videos, audio
-            )
-
-            # 3. Create the member agent task
-            # Don't override the expected output of a member agent
-            if member_agent.expected_output is not None:
-                expected_output = None
-            member_agent_task = format_member_agent_task(
-                task_description, expected_output, team_member_interactions_str
-            )
-
-            # 4. Add history for the member if enabled
-            if member_agent.add_history_to_context:
-                history = self._get_history_for_member_agent(session, member_agent)
-                if history:
-                    history.append(Message(role="user", content=member_agent_task))
-
-            # Make sure for the member agent, we are using the agent logger
-            use_agent_logger()
-
-            # Handle enable_agentic_knowledge_filters on the member agent
-            if self.enable_agentic_knowledge_filters and not member_agent.enable_agentic_knowledge_filters:
-                member_agent.enable_agentic_knowledge_filters = self.enable_agentic_knowledge_filters
-
-            member_session_state_copy = copy(session_state)
-            if stream:
-                member_agent_run_response_stream = member_agent.run(
-                    input=member_agent_task if history is None else history,
-                    user_id=user_id,
-                    # All members have the same session_id
-                    session_id=session.session_id,
-                    session_state=member_session_state_copy,  # Send a copy to the agent
-                    images=images,
-                    videos=videos,
-                    audio=audio,
-                    files=files,
-                    stream=True,
-                    stream_intermediate_steps=stream_intermediate_steps,
-                    debug_mode=debug_mode,
-                    add_history_to_context=add_history_to_context,
-                    workflow_context=workflow_context,
-                    knowledge_filters=knowledge_filters
-                    if not member_agent.knowledge_filters and member_agent.knowledge
-                    else None,
-                    yield_run_response=True,
-                )
-                member_agent_run_response = None
-                for member_agent_run_output_event in member_agent_run_response_stream:
-                    if isinstance(member_agent_run_output_event, TeamRunOutput) or isinstance(
-                        member_agent_run_output_event, RunOutput
-                    ):
-                        member_agent_run_response = member_agent_run_output_event  # type: ignore
-                        break
-                    check_if_run_cancelled(member_agent_run_output_event)
-
-                    # Yield the member event directly
-                    yield member_agent_run_output_event
-            else:
-                member_agent_run_response = member_agent.run(  # type: ignore
-                    input=member_agent_task if history is None else history,
-                    user_id=user_id,
-                    # All members have the same session_id
-                    session_id=session.session_id,
-                    session_state=member_session_state_copy,  # Send a copy to the agent
-                    images=images,
-                    videos=videos,
-                    audio=audio,
-                    files=files,
-                    stream=False,
-                    debug_mode=debug_mode,
-                    add_history_to_context=add_history_to_context,
-                    knowledge_filters=knowledge_filters
-                    if not member_agent.knowledge_filters and member_agent.knowledge
-                    else None,
-                )
-
-                check_if_run_cancelled(member_agent_run_response)  # type: ignore
-
-                try:
-                    if member_agent_run_response.content is None and (  # type: ignore
-                        member_agent_run_response.tools is None or len(member_agent_run_response.tools) == 0  # type: ignore
-                    ):
-                        yield "No response from the member agent."
-                    elif isinstance(member_agent_run_response.content, str):  # type: ignore
-                        content = member_agent_run_response.content.strip()  # type: ignore
-                        if len(content) > 0:
-                            yield content
-
-                        # If the content is empty but we have tool calls
-                        elif member_agent_run_response.tools is not None and len(member_agent_run_response.tools) > 0:  # type: ignore
-                            tool_str = ""
-                            for tool in member_agent_run_response.tools:  # type: ignore
-                                if tool.result:
-                                    tool_str += f"{tool.result},"
-                            yield tool_str.rstrip(",")
-
-                    elif issubclass(type(member_agent_run_response.content), BaseModel):  # type: ignore
-                        yield member_agent_run_response.content.model_dump_json(indent=2)  # type: ignore
-                    else:
-                        import json
+                # If the member will produce structured output, we need to parse the response
+                if member_agent.output_schema is not None:
+                    self._member_response_model = member_agent.output_schema
 
-                        yield json.dumps(member_agent_run_response.content, indent=2)  # type: ignore
-                except Exception as e:
-                    yield str(e)
+            # 6. Handle enable_agentic_knowledge_filters on the member agent
+            if self.enable_agentic_knowledge_filters and not member_agent.enable_agentic_knowledge_filters:
+                member_agent.enable_agentic_knowledge_filters = self.enable_agentic_knowledge_filters
 
-            # Afterward, switch back to the team logger
-            use_team_logger()
+            return member_agent_task, history
 
+        def _process_delegate_task_to_member(
+            member_agent_run_response: Optional[Union[TeamRunOutput, RunOutput]],
+            member_agent: Union[Agent, "Team"],
+            member_agent_task: Union[str, Message],
+            member_session_state_copy: Dict[str, Any],
+        ):
             # Add team run id to the member run
             if member_agent_run_response is not None:
                 member_agent_run_response.parent_run_id = run_response.run_id  # type: ignore
 
-            # Update the memory
-            member_name = member_agent.name if member_agent.name else f"agent_{member_agent_index}"
+            # Update the team run context
+            member_name = member_agent.name if member_agent.name else member_agent.id if member_agent.id else "Unknown"
+            if isinstance(member_agent_task, str):
+                normalized_task = member_agent_task
+            elif member_agent_task.content:
+                normalized_task = str(member_agent_task.content)
+            else:
+                normalized_task = ""
             self._add_interaction_to_team_run_context(
                 team_run_context=team_run_context,
                 member_name=member_name,
-                task=task_description,
+                task=normalized_task,
                 run_response=member_agent_run_response,  # type: ignore
             )
 
-            # Add the member run to the team run response
-            if store_member_responses and run_response and member_agent_run_response:
+            # Add the member run to the team run response if enabled
+            if run_response and member_agent_run_response:
                 run_response.add_member_run(member_agent_run_response)
 
             # Add the member run to the team session
@@ -5455,9 +5186,9 @@ class Team:
             if member_agent_run_response is not None:
                 self._update_team_media(member_agent_run_response)  # type: ignore
 
-        async def adelegate_task_to_member(
+        def delegate_task_to_member(
             member_id: str, task_description: str, expected_output: Optional[str] = None
-        ) -> AsyncIterator[Union[RunOutputEvent, TeamRunOutputEvent, str]]:
+        ) -> Iterator[Union[RunOutputEvent, TeamRunOutputEvent, str]]:
             """Use this function to delegate a task to the selected team member.
             You must provide a clear and concise description of the task the member should achieve AND the expected output.
 
@@ -5476,41 +5207,16 @@ class Team:
                 yield f"Member with ID {member_id} not found in the team or any subteams. Please choose the correct member from the list of members:\n\n{self.get_members_system_message_content(indent=0)}"
                 return
 
-            member_agent_index, member_agent = result
-            self._initialize_member(member_agent)
-
-            # 2. Determine team context to send
-            team_member_interactions_str = self._determine_team_member_interactions(
-                team_run_context=team_run_context, images=images, videos=videos, audio=audio
-            )
-
-            # 3. Create the member agent task
-            # Don't override the expected output of a member agent
-            if member_agent.expected_output is not None:
-                expected_output = None
-            member_agent_task = format_member_agent_task(
-                task_description, expected_output, team_member_interactions_str
-            )
-
-            # 4. Add history for the member if enabled
-            if member_agent.add_history_to_context:
-                history = self._get_history_for_member_agent(session, member_agent)
-                if history:
-                    history.append(Message(role="user", content=member_agent_task))
+            _, member_agent = result
+            member_agent_task, history = _setup_delegate_task_to_member(member_agent, task_description, expected_output)
 
             # Make sure for the member agent, we are using the agent logger
             use_agent_logger()
 
-            # Handle enable_agentic_knowledge_filters
-            if self.enable_agentic_knowledge_filters and not member_agent.enable_agentic_knowledge_filters:
-                member_agent.enable_agentic_knowledge_filters = self.enable_agentic_knowledge_filters
-
-            member_input = member_agent_task if history is None else history
-
             member_session_state_copy = copy(session_state)
             if stream:
-                member_agent_run_response_stream = member_agent.arun(  # type: ignore
-                    input=member_input,
+                member_agent_run_response_stream = member_agent.run(
+                    input=member_agent_task if not history else history,
                     user_id=user_id,
                     # All members have the same session_id
                     session_id=session.session_id,
@@ -5530,217 +5236,22 @@ class Team:
                     yield_run_response=True,
                 )
                 member_agent_run_response = None
-                async for member_agent_run_response_event in member_agent_run_response_stream:
-                    if isinstance(member_agent_run_response_event, TeamRunOutput) or isinstance(
-                        member_agent_run_response_event, RunOutput
+                for member_agent_run_output_event in member_agent_run_response_stream:
+                    # If we get the final response, we can break out of the loop
+                    if isinstance(member_agent_run_output_event, TeamRunOutput) or isinstance(
+                        member_agent_run_output_event, RunOutput
                     ):
-                        member_agent_run_response = member_agent_run_response_event  # type: ignore
+                        member_agent_run_response = member_agent_run_output_event  # type: ignore
                         break
-                    check_if_run_cancelled(member_agent_run_response_event)
-                    yield member_agent_run_response_event
-            else:
-                member_agent_run_response = await member_agent.arun(  # type: ignore
-                    input=member_input,
-                    user_id=user_id,
-                    # All members have the same session_id
-                    session_id=session.session_id,
-                    session_state=member_session_state_copy,  # Send a copy to the agent
-                    images=images,
-                    videos=videos,
-                    audio=audio,
-                    files=files,
-                    stream=False,
-                    debug_mode=debug_mode,
-                    add_history_to_context=add_history_to_context,
-                    knowledge_filters=knowledge_filters
-                    if not member_agent.knowledge_filters and member_agent.knowledge
-                    else None,
-                )
-                check_if_run_cancelled(member_agent_run_response)  # type: ignore
-
-                try:
-                    if member_agent_run_response.content is None and (  # type: ignore
-                        member_agent_run_response.tools is None or len(member_agent_run_response.tools) == 0  # type: ignore
-                    ):
-                        yield "No response from the member agent."
-                    elif isinstance(member_agent_run_response.content, str):  # type: ignore
-                        if len(member_agent_run_response.content.strip()) > 0:  # type: ignore
-                            yield member_agent_run_response.content  # type: ignore
-
-                        # If the content is empty but we have tool calls
-                        elif (
-                            member_agent_run_response.tools is not None  # type: ignore
-                            and len(member_agent_run_response.tools) > 0  # type: ignore
-                        ):
-                            yield ",".join([tool.result for tool in member_agent_run_response.tools if tool.result])  # type: ignore
-                    elif issubclass(type(member_agent_run_response.content), BaseModel):  # type: ignore
-                        yield member_agent_run_response.content.model_dump_json(indent=2)  # type: ignore
-                    else:
-                        import json
-
-                        yield json.dumps(member_agent_run_response.content, indent=2)  # type: ignore
-                except Exception as e:
-                    yield str(e)
-
-            # Afterward, switch back to the team logger
-            use_team_logger()
-
-            # Add team run id to the member run
-            if member_agent_run_response is not None:
-                member_agent_run_response.parent_run_id = run_response.run_id  # type: ignore
-
-            # Update the memory
-            member_name = member_agent.name if member_agent.name else f"agent_{member_agent_index}"
-            self._add_interaction_to_team_run_context(
-                team_run_context=team_run_context,
-                member_name=member_name,
-                task=task_description,
-                run_response=member_agent_run_response,  # type: ignore
-            )
-
-            # Add the member run to the team run response
-            if store_member_responses and run_response and member_agent_run_response:
-                run_response.add_member_run(member_agent_run_response)
-
-            # Add the member run to the team session
-            if member_agent_run_response:
-                session.upsert_run(member_agent_run_response)
-
-            # Update team session state
-            merge_dictionaries(session_state, member_session_state_copy)  # type: ignore
-
-            # Update the team media
-            if member_agent_run_response is not None:
-                self._update_team_media(member_agent_run_response)  # type: ignore
-
-        if async_mode:
-            delegate_function = adelegate_task_to_member  # type: ignore
-        else:
-            delegate_function = delegate_task_to_member  # type: ignore
-
-        delegate_func = Function.from_callable(delegate_function, name="delegate_task_to_member", strict=True)
-
-        return delegate_func
-
-    def _get_forward_task_function(
-        self,
-        input: Message,
-        run_response: TeamRunOutput,
-        team_run_context: Dict[str, Any],
-        session: TeamSession,
-        session_state: Dict[str, Any],
-        user_id: Optional[str] = None,
-        stream: bool = False,
-        stream_intermediate_steps: bool = False,
-        async_mode: bool = False,
-        images: Optional[Sequence[Image]] = None,
-        videos: Optional[Sequence[Video]] = None,
-        audio: Optional[Sequence[Audio]] = None,
-        files: Optional[Sequence[File]] = None,
-        knowledge_filters: Optional[Dict[str, Any]] = None,
-        workflow_context: Optional[Dict] = None,
-        store_member_responses: bool = False,
-        debug_mode: Optional[bool] = None,
-        add_history_to_context: Optional[bool] = None,
-        dependencies: Optional[Dict[str, Any]] = None,
-    ) -> Function:
-        if not images:
-            images = []
-        if not videos:
-            videos = []
-        if not audio:
-            audio = []
-        if not files:
-            files = []
-
-        def forward_task_to_member(
-            member_id: str, expected_output: Optional[str] = None
-        ) -> Iterator[Union[RunOutputEvent, TeamRunOutputEvent, str]]:
-            """Use this function to forward the request to the selected team member.
-            Args:
-                member_id (str): The ID of the member to delegate the task to. Use only the ID of the member, not the ID of the team followed by the ID of the member.
-                expected_output (str, optional): The expected output from the member (optional).
-            Returns:
-                str: The result of the delegated task.
-            """
-            self._member_response_model = None
-
-            # Find the member agent using the helper function
-            result = self._find_member_by_id(member_id)
-            history = None
-            if result is None:
-                yield f"Member with ID {member_id} not found in the team or any subteams. Please choose the correct member from the list of members:\n\n{self.get_members_system_message_content(indent=0)}"
-                return
-
-            member_agent_index, member_agent = result
-            self._initialize_member(member_agent)
-
-            # Since we return the response directly from the member agent, we need to set the response model from the team down.
-            if not member_agent.output_schema and self.output_schema:
-                member_agent.output_schema = self.output_schema
-
-            # If the member will produce structured output, we need to parse the response
-            if member_agent.output_schema is not None:
-                self._member_response_model = member_agent.output_schema
-
-            # Make sure for the member agent, we are using the agent logger
-            use_agent_logger()
-
-            # If found in subteam, include the path in the task description
-            member_agent_task = input.get_content_string() if input is not None else ""
-
-            # Add history for the member if enabled
-            should_add_member_history = (
-                add_history_to_context if add_history_to_context is not None else member_agent.add_history_to_context
-            )
-            if should_add_member_history:
-                history = self._get_history_for_member_agent(session, member_agent)
-                if history:
-                    history.append(Message(role="user", content=member_agent_task))
-
-            # Don't override the expected output of a member agent
-            if member_agent.expected_output is None and expected_output:
-                member_agent_task += f"\n\n<expected_output>\n{expected_output}\n</expected_output>"
 
-            # Handle enable_agentic_knowledge_filters
-            if self.enable_agentic_knowledge_filters and not member_agent.enable_agentic_knowledge_filters:
-                member_agent.enable_agentic_knowledge_filters = self.enable_agentic_knowledge_filters
+                    # Check if the run is cancelled
+                    check_if_run_cancelled(member_agent_run_output_event)
 
-            # 2. Get the response from the member agent
-            member_session_state_copy = copy(session_state)
-            if stream:
-                member_agent_run_response_stream = member_agent.run(
-                    input=member_agent_task if history is None else history,
-                    user_id=user_id,
-                    # All members have the same session_id
-                    session_id=session.session_id,
-                    session_state=member_session_state_copy,  # Send a copy to the agent
-                    images=images,
-                    videos=videos,
-                    audio=audio,
-                    files=files,
-                    stream=True,
-                    stream_intermediate_steps=stream_intermediate_steps,
-                    debug_mode=debug_mode,
-                    add_history_to_context=add_history_to_context,
-                    workflow_context=workflow_context,
-                    knowledge_filters=knowledge_filters
-                    if not member_agent.knowledge_filters and member_agent.knowledge
-                    else None,
-                    yield_run_response=True,
-                )
-                member_agent_run_response = None
-                for member_agent_run_response_chunk in member_agent_run_response_stream:
-                    if isinstance(member_agent_run_response_chunk, TeamRunOutput) or isinstance(
-                        member_agent_run_response_chunk, RunOutput
-                    ):
-                        member_agent_run_response = member_agent_run_response_chunk  # type: ignore
-                        break
-                    check_if_run_cancelled(member_agent_run_response_chunk)
-                    yield member_agent_run_response_chunk
+                    # Yield the member event directly
+                    yield member_agent_run_output_event
             else:
                 member_agent_run_response = member_agent.run(  # type: ignore
-                    input=member_agent_task if history is None else history,
+                    input=member_agent_task if not history else history,
                     user_id=user_id,
                     # All members have the same session_id
                     session_id=session.session_id,
@@ -5751,11 +5262,13 @@ class Team:
                     files=files,
                     stream=False,
                     debug_mode=debug_mode,
+                    workflow_context=workflow_context,
                     add_history_to_context=add_history_to_context,
                     knowledge_filters=knowledge_filters
                     if not member_agent.knowledge_filters and member_agent.knowledge
                     else None,
                 )
+
                 check_if_run_cancelled(member_agent_run_response)  # type: ignore
 
                 try:
@@ -5764,13 +5277,12 @@ class Team:
                     ):
                         yield "No response from the member agent."
                     elif isinstance(member_agent_run_response.content, str):  # type: ignore
-                        if len(member_agent_run_response.content.strip()) > 0:  # type: ignore
-                            yield member_agent_run_response.content  # type: ignore
+                        content = member_agent_run_response.content.strip()  # type: ignore
+                        if len(content) > 0:
+                            yield content
 
                         # If the content is empty but we have tool calls
-                        elif (
-                            member_agent_run_response.tools is not None and len(member_agent_run_response.tools) > 0  # type: ignore
-                        ):
+                        elif member_agent_run_response.tools is not None and len(member_agent_run_response.tools) > 0:  # type: ignore
                             tool_str = ""
                             for tool in member_agent_run_response.tools:  # type: ignore
                                 if tool.result:
@@ -5789,46 +5301,23 @@ class Team:
             # Afterward, switch back to the team logger
             use_team_logger()
 
-            # Add team run id to the member run
-            if member_agent_run_response is not None:
-                member_agent_run_response.parent_run_id = run_response.run_id  # type: ignore
-
-            # Update the memory
-            member_name = member_agent.name if member_agent.name else f"agent_{member_agent_index}"
-            self._add_interaction_to_team_run_context(
-                team_run_context=team_run_context,
-                member_name=member_name,
-                task=member_agent_task,
-                run_response=member_agent_run_response,  # type: ignore
+            _process_delegate_task_to_member(
+                member_agent_run_response, member_agent, member_agent_task, member_session_state_copy
             )
 
-            # Add the member run to the team run response
-            if store_member_responses and run_response and member_agent_run_response:
-                run_response.add_member_run(member_agent_run_response)
-
-            # Add the member run to the team session
-            if member_agent_run_response:
-                session.upsert_run(member_agent_run_response)
-
-            # Update team session state
-            merge_dictionaries(session_state, member_session_state_copy)  # type: ignore
-
-            # Update the team media
-            if member_agent_run_response is not None:
-                self._update_team_media(member_agent_run_response)  # type: ignore
-
-        async def aforward_task_to_member(
-            member_id: str, expected_output: Optional[str] = None
+        async def adelegate_task_to_member(
+            member_id: str, task_description: str, expected_output: Optional[str] = None
         ) -> AsyncIterator[Union[RunOutputEvent, TeamRunOutputEvent, str]]:
-            """Use this function to forward a message to the selected team member.
+            """Use this function to delegate a task to the selected team member.
+            You must provide a clear and concise description of the task the member should achieve AND the expected output.
 
             Args:
                 member_id (str): The ID of the member to delegate the task to. Use only the ID of the member, not the ID of the team followed by the ID of the member.
+                task_description (str): A clear and concise description of the task the member should achieve.
                 expected_output (str, optional): The expected output from the member (optional).
             Returns:
                 str: The result of the delegated task.
             """
-            self._member_response_model = None
 
             # Find the member agent using the helper function
             result = self._find_member_by_id(member_id)
@@ -5837,38 +5326,16 @@ class Team:
                 yield f"Member with ID {member_id} not found in the team or any subteams. Please choose the correct member from the list of members:\n\n{self.get_members_system_message_content(indent=0)}"
                 return
 
-            member_agent_index, member_agent = result
-            self._initialize_member(member_agent)
-
-            # If the member will produce structured output, we need to parse the response
-            if member_agent.output_schema is not None:
-                self._member_response_model = member_agent.output_schema
+            _, member_agent = result
+            member_agent_task, history = _setup_delegate_task_to_member(member_agent, task_description, expected_output)
 
             # Make sure for the member agent, we are using the agent logger
             use_agent_logger()
 
-            # If found in subteam, include the path in the task description
-            member_agent_task = input.get_content_string() if input is not None else ""
-
-            if member_agent.add_history_to_context:
-                history = self._get_history_for_member_agent(session, member_agent)
-                if history:
-                    history.append(Message(role="user", content=member_agent_task))
-
-            # Don't override the expected output of a member agent
-            if member_agent.expected_output is None and expected_output:
-                member_agent_task += f"\n\n<expected_output>\n{expected_output}\n</expected_output>"
-
-            # Handle enable_agentic_knowledge_filters
-            if self.enable_agentic_knowledge_filters and not member_agent.enable_agentic_knowledge_filters:
-                member_agent.enable_agentic_knowledge_filters = self.enable_agentic_knowledge_filters
-
-            member_input = member_agent_task if history is None else history
-            # 2. Get the response from the member agent
             member_session_state_copy = copy(session_state)
             if stream:
                 member_agent_run_response_stream = member_agent.arun(  # type: ignore
-                    input=member_input,
+                    input=member_agent_task if not history else history,
                     user_id=user_id,
                     # All members have the same session_id
                     session_id=session.session_id,
@@ -5879,9 +5346,9 @@ class Team:
                     files=files,
                     stream=True,
                     stream_intermediate_steps=stream_intermediate_steps,
-                    workflow_context=workflow_context,
                     debug_mode=debug_mode,
                     add_history_to_context=add_history_to_context,
+                    workflow_context=workflow_context,
                     knowledge_filters=knowledge_filters
                     if not member_agent.knowledge_filters and member_agent.knowledge
                     else None,
@@ -5889,16 +5356,21 @@ class Team:
                 )
                 member_agent_run_response = None
                 async for member_agent_run_response_event in member_agent_run_response_stream:
+                    # If we get the final response, we can break out of the loop
                     if isinstance(member_agent_run_response_event, TeamRunOutput) or isinstance(
                         member_agent_run_response_event, RunOutput
                     ):
                         member_agent_run_response = member_agent_run_response_event  # type: ignore
                         break
+
+                    # Check if the run is cancelled
                     check_if_run_cancelled(member_agent_run_response_event)
+
+                    # Yield the member event directly
                     yield member_agent_run_response_event
             else:
                 member_agent_run_response = await member_agent.arun(  # type: ignore
-                    input=member_input,
+                    input=member_agent_task if not history else history,
                     user_id=user_id,
                     # All members have the same session_id
                     session_id=session.session_id,
@@ -5909,9 +5381,10 @@ class Team:
                     files=files,
                     stream=False,
                     debug_mode=debug_mode,
+                    workflow_context=workflow_context,
                     add_history_to_context=add_history_to_context,
                     knowledge_filters=knowledge_filters
-                    if (member_agent.knowledge_filters and member_agent.knowledge)
+                    if not member_agent.knowledge_filters and member_agent.knowledge
                     else None,
                 )
                 check_if_run_cancelled(member_agent_run_response)  # type: ignore
@@ -5927,7 +5400,8 @@ class Team:
 
                         # If the content is empty but we have tool calls
                         elif (
-                            member_agent_run_response.tools is not None and len(member_agent_run_response.tools) > 0  # type: ignore
+                            member_agent_run_response.tools is not None  # type: ignore
+                            and len(member_agent_run_response.tools) > 0  # type: ignore
                         ):
                             yield ",".join([tool.result for tool in member_agent_run_response.tools if tool.result])  # type: ignore
                     elif issubclass(type(member_agent_run_response.content), BaseModel):  # type: ignore
@@ -5942,45 +5416,295 @@ class Team:
             # Afterward, switch back to the team logger
             use_team_logger()
 
-            # Add team run id to the member run
-            if member_agent_run_response is not None:
-                member_agent_run_response.parent_run_id = run_response.run_id  # type: ignore
-
-            # Update the memory
-            member_name = member_agent.name if member_agent.name else f"agent_{member_agent_index}"
-            self._add_interaction_to_team_run_context(
-                team_run_context=team_run_context,
-                member_name=member_name,
-                task=member_agent_task,
-                run_response=member_agent_run_response,  # type: ignore
+            _process_delegate_task_to_member(
+                member_agent_run_response, member_agent, member_agent_task, member_session_state_copy
             )
 
-            # Add the member run to the team run response
-            if store_member_responses and run_response and member_agent_run_response:
-                run_response.add_member_run(member_agent_run_response)
+        # When the task should be delegated to all members
+        def delegate_task_to_members(
+            task_description: str, expected_output: Optional[str] = None
+        ) -> Iterator[Union[RunOutputEvent, TeamRunOutputEvent, str]]:
+            """
+            Use this function to delegate a task to all the member agents and return a response.
+            You must provide a clear and concise description of the task the member should achieve AND the expected output.
 
-            # Add the member run to the team session
-            if member_agent_run_response:
-                session.upsert_run(member_agent_run_response)
+            Args:
+                task_description (str): A clear and concise description of the task to send to member agents.
+                expected_output (str, optional): The expected output from the member agents (optional).
+            Returns:
+                str: The result of the delegated task.
+            """
 
-            # Update team session state
-            merge_dictionaries(session_state, member_session_state_copy)  # type: ignore
+            # Run all the members sequentially
+            for _, member_agent in enumerate(self.members):
+                member_agent_task, history = _setup_delegate_task_to_member(
+                    member_agent, task_description, expected_output
+                )
 
-            # Update the team media
-            if member_agent_run_response is not None:
-                self._update_team_media(member_agent_run_response)  # type: ignore
+                member_session_state_copy = copy(session_state)
+                if stream:
+                    member_agent_run_response_stream = member_agent.run(
+                        input=member_agent_task if not history else history,
+                        user_id=user_id,
+                        # All members have the same session_id
+                        session_id=session.session_id,
+                        session_state=member_session_state_copy,  # Send a copy to the agent
+                        images=images,
+                        videos=videos,
+                        audio=audio,
+                        files=files,
+                        stream=True,
+                        stream_intermediate_steps=stream_intermediate_steps,
+                        workflow_context=workflow_context,
+                        knowledge_filters=knowledge_filters
+                        if not member_agent.knowledge_filters and member_agent.knowledge
+                        else None,
+                        debug_mode=debug_mode,
+                        add_history_to_context=add_history_to_context,
+                        yield_run_response=True,
+                    )
+                    member_agent_run_response = None
+                    for member_agent_run_response_chunk in member_agent_run_response_stream:
+                        # If we get the final response, we can break out of the loop
+                        if isinstance(member_agent_run_response_chunk, TeamRunOutput) or isinstance(
+                            member_agent_run_response_chunk, RunOutput
+                        ):
+                            member_agent_run_response = member_agent_run_response_chunk  # type: ignore
+                            break
 
-        if async_mode:
-            forward_function = aforward_task_to_member  # type: ignore
+                        # Check if the run is cancelled
+                        check_if_run_cancelled(member_agent_run_response_chunk)
+
+                        # Yield the member event directly
+                        yield member_agent_run_response_chunk
+
+                else:
+                    member_agent_run_response = member_agent.run(  # type: ignore
+                        input=member_agent_task if not history else history,
+                        user_id=user_id,
+                        # All members have the same session_id
+                        session_id=session.session_id,
+                        session_state=member_session_state_copy,  # Send a copy to the agent
+                        images=images,
+                        videos=videos,
+                        audio=audio,
+                        files=files,
+                        stream=False,
+                        workflow_context=workflow_context,
+                        knowledge_filters=knowledge_filters
+                        if not member_agent.knowledge_filters and member_agent.knowledge
+                        else None,
+                        debug_mode=debug_mode,
+                        add_history_to_context=add_history_to_context,
+                    )
+
+                    check_if_run_cancelled(member_agent_run_response)  # type: ignore
+
+                    try:
+                        if member_agent_run_response.content is None and (  # type: ignore
+                            member_agent_run_response.tools is None or len(member_agent_run_response.tools) == 0  # type: ignore
+                        ):
+                            yield f"Agent {member_agent.name}: No response from the member agent."
+                        elif isinstance(member_agent_run_response.content, str):  # type: ignore
+                            if len(member_agent_run_response.content.strip()) > 0:  # type: ignore
+                                yield f"Agent {member_agent.name}: {member_agent_run_response.content}"  # type: ignore
+                            elif (
+                                member_agent_run_response.tools is not None and len(member_agent_run_response.tools) > 0  # type: ignore
+                            ):
+                                yield f"Agent {member_agent.name}: {','.join([tool.result for tool in member_agent_run_response.tools])}"  # type: ignore
+                        elif issubclass(type(member_agent_run_response.content), BaseModel):  # type: ignore
+                            yield f"Agent {member_agent.name}: {member_agent_run_response.content.model_dump_json(indent=2)}"  # type: ignore
+                        else:
+                            import json
+
+                            yield f"Agent {member_agent.name}: {json.dumps(member_agent_run_response.content, indent=2)}"  # type: ignore
+                    except Exception as e:
+                        yield f"Agent {member_agent.name}: Error - {str(e)}"
+
+                _process_delegate_task_to_member(
+                    member_agent_run_response, member_agent, member_agent_task, member_session_state_copy
+                )
+
+            # After all the member runs, switch back to the team logger
+            use_team_logger()
+
+        # When the task should be delegated to all members
+        async def adelegate_task_to_members(
+            task_description: str, expected_output: Optional[str] = None
+        ) -> AsyncIterator[Union[RunOutputEvent, TeamRunOutputEvent, str]]:
+            """Use this function to delegate a task to all the member agents and return a response.
+            You must provide a clear and concise description of the task to send to member agents AND the expected output.
+
+            Args:
+                task_description (str): A clear and concise description of the task to send to member agents.
+                expected_output (str, optional): The expected output from the member agents (optional).
+            Returns:
+                str: The result of the delegated task.
+            """
+
+            if stream:
+                # Concurrent streaming: launch each member as a streaming worker and merge events
+                done_marker = object()
+                queue: "asyncio.Queue[Union[RunOutputEvent, TeamRunOutputEvent, str, object]]" = asyncio.Queue()
+
+                async def stream_member(agent: Union[Agent, "Team"], idx: int) -> None:
+                    member_agent_task, history = _setup_delegate_task_to_member(
+                        agent, task_description, expected_output
+                    )
+                    member_session_state_copy = copy(session_state)
+
+                    member_stream = agent.arun(  # type: ignore
+                        input=member_agent_task if not history else history,
+                        user_id=user_id,
+                        session_id=session.session_id,
+                        session_state=member_session_state_copy,  # Send a copy to the agent
+                        images=images,
+                        videos=videos,
+                        audio=audio,
+                        files=files,
+                        stream=True,
+                        stream_intermediate_steps=stream_intermediate_steps,
+                        workflow_context=workflow_context,
+                        debug_mode=debug_mode,
+                        knowledge_filters=knowledge_filters
+                        if not member_agent.knowledge_filters and member_agent.knowledge
+                        else None,
+                        add_history_to_context=add_history_to_context,
+                        yield_run_response=True,
+                    )
+                    member_agent_run_response = None
+                    try:
+                        async for member_agent_run_output_event in member_stream:
+                            if isinstance(member_agent_run_output_event, TeamRunOutput) or isinstance(
+                                member_agent_run_output_event, RunOutput
+                            ):
+                                member_agent_run_response = member_agent_run_output_event  # type: ignore
+                                break
+                            check_if_run_cancelled(member_agent_run_output_event)
+                            await queue.put(member_agent_run_output_event)
+                    finally:
+                        _process_delegate_task_to_member(
+                            member_agent_run_response, member_agent, member_agent_task, member_session_state_copy
+                        )
+
+                # Initialize and launch all members
+                tasks: List[asyncio.Task[None]] = []
+                for member_agent_index, member_agent in enumerate(self.members):
+                    current_agent = member_agent
+                    current_index = member_agent_index
+                    self._initialize_member(current_agent)
+                    tasks.append(asyncio.create_task(stream_member(current_agent, current_index)))
+
+                # Drain queue until all members reported done
+                completed = 0
+                try:
+                    while completed < len(tasks):
+                        item = await queue.get()
+                        if item is done_marker:
+                            completed += 1
+                        else:
+                            yield item  # type: ignore
+                finally:
+                    # Ensure tasks do not leak on cancellation
+                    for t in tasks:
+                        if not t.done():
+                            t.cancel()
+                    # Await cancellation to suppress warnings
+                    for t in tasks:
+                        with contextlib.suppress(Exception):
+                            await t
+
+            else:
+                # Non-streaming concurrent run of members; collect results when done
+                tasks = []
+                for member_agent_index, member_agent in enumerate(self.members):
+                    current_agent = member_agent
+                    current_index = member_agent_index
+                    member_agent_task, history = _setup_delegate_task_to_member(
+                        current_agent, task_description, expected_output
+                    )
+
+                    async def run_member_agent(agent=current_agent) -> str:
+                        member_session_state_copy = copy(session_state)
+                        member_agent_run_response = await agent.arun(
+                            input=member_agent_task if not history else history,
+                            user_id=user_id,
+                            # All members have the same session_id
+                            session_id=session.session_id,
+                            session_state=member_session_state_copy,  # Send a copy to the agent
+                            images=images,
+                            videos=videos,
+                            audio=audio,
+                            files=files,
+                            stream=False,
+                            stream_intermediate_steps=stream_intermediate_steps,
+                            debug_mode=debug_mode,
+                            workflow_context=workflow_context,
+                            knowledge_filters=knowledge_filters
+                            if not member_agent.knowledge_filters and member_agent.knowledge
+                            else None,
+                            add_history_to_context=add_history_to_context,
+                        )
+                        check_if_run_cancelled(member_agent_run_response)
+
+                        _process_delegate_task_to_member(
+                            member_agent_run_response, member_agent, member_agent_task, member_session_state_copy
+                        )
+
+                        member_name = member_agent.name if member_agent.name else f"agent_{member_agent_index}"
+                        try:
+                            if member_agent_run_response.content is None and (
+                                member_agent_run_response.tools is None or len(member_agent_run_response.tools) == 0
+                            ):
+                                return f"Agent {member_name}: No response from the member agent."
+                            elif isinstance(member_agent_run_response.content, str):
+                                if len(member_agent_run_response.content.strip()) > 0:
+                                    return f"Agent {member_name}: {member_agent_run_response.content}"
+                                elif (
+                                    member_agent_run_response.tools is not None
+                                    and len(member_agent_run_response.tools) > 0
+                                ):
+                                    return f"Agent {member_name}: {','.join([tool.result for tool in member_agent_run_response.tools])}"
+                            elif issubclass(type(member_agent_run_response.content), BaseModel):
+                                return f"Agent {member_name}: {member_agent_run_response.content.model_dump_json(indent=2)}"  # type: ignore
+                            else:
+                                import json
+
+                                return f"Agent {member_name}: {json.dumps(member_agent_run_response.content, indent=2)}"
+                        except Exception as e:
+                            return f"Agent {member_name}: Error - {str(e)}"
+
+                        return f"Agent {member_name}: No Response"
+
+                    tasks.append(run_member_agent)  # type: ignore
+
+                results = await asyncio.gather(*[task() for task in tasks])  # type: ignore
+                for result in results:
+                    yield result
+
+            # After all the member runs, switch back to the team logger
+            use_team_logger()
+
+        if self.delegate_task_to_all_members:
+            if async_mode:
+                delegate_function = adelegate_task_to_members  # type: ignore
+            else:
+                delegate_function = delegate_task_to_members  # type: ignore
+
+            delegate_func = Function.from_callable(delegate_function, name="delegate_task_to_members")
         else:
-            forward_function = forward_task_to_member  # type: ignore
+            if async_mode:
+                delegate_function = adelegate_task_to_member  # type: ignore
+            else:
+                delegate_function = delegate_task_to_member  # type: ignore
 
-        forward_func = Function.from_callable(forward_function, name="forward_task_to_member", strict=True)
+            delegate_func = Function.from_callable(delegate_function, name="delegate_task_to_member")
 
-        forward_func.stop_after_tool_call = True
-        forward_func.show_result = True
+        if self.respond_directly:
+            delegate_func.stop_after_tool_call = True
+            delegate_func.show_result = True
 
-        return forward_func
+        return delegate_func
 
     ###########################################################################
     # Session Management
@@ -6128,7 +5852,7 @@ class Team:
 
             return team_session
 
-        log_warning(f"TeamSession {session_id_to_load} not found in db")
+        log_debug(f"TeamSession {session_id_to_load} not found in db")
         return None
 
     def save_session(self, session: TeamSession) -> None:
@@ -6138,6 +5862,12 @@ class Team:
                 session.session_data["session_state"].pop("current_session_id", None)  # type: ignore
                 session.session_data["session_state"].pop("current_user_id", None)  # type: ignore
                 session.session_data["session_state"].pop("current_run_id", None)  # type: ignore
+
+            # scrub the member responses if not storing them
+            if not self.store_member_responses and session.runs is not None:
+                for run in session.runs:
+                    if hasattr(run, "member_responses"):
+                        run.member_responses = []
             self._upsert_session(session=session)
             log_debug(f"Created or updated TeamSession record: {session.session_id}")
 
@@ -6376,7 +6106,7 @@ class Team:
             team_member_interactions_str += "</member interactions>\n"
         return team_member_interactions_str
 
-    def _get_team_run_context_images(self, team_run_context: Dict[str, Any]) -> List[ImageArtifact]:
+    def _get_team_run_context_images(self, team_run_context: Dict[str, Any]) -> List[Image]:
         if not team_run_context:
             return []
         images = []
@@ -6386,7 +6116,7 @@ class Team:
                     images.extend(interaction["run_response"].images)
         return images
 
-    def _get_team_run_context_videos(self, team_run_context: Dict[str, Any]) -> List[VideoArtifact]:
+    def _get_team_run_context_videos(self, team_run_context: Dict[str, Any]) -> List[Video]:
         if not team_run_context:
             return []
         videos = []
@@ -6396,7 +6126,7 @@ class Team:
                     videos.extend(interaction["run_response"].videos)
         return videos
 
-    def _get_team_run_context_audio(self, team_run_context: Dict[str, Any]) -> List[AudioArtifact]:
+    def _get_team_run_context_audio(self, team_run_context: Dict[str, Any]) -> List[Audio]:
         if not team_run_context:
             return []
         audio = []
@@ -6410,21 +6140,21 @@ class Team:
     # Handle images, videos and audio
     ###########################################################################
 
-    def _add_image(self, image: ImageArtifact, run_response: TeamRunOutput) -> None:
+    def _add_image(self, image: Image, run_response: TeamRunOutput) -> None:
         """Add an image to both the agent's stateful storage and the current run response"""
         # Add to run response
         if run_response.images is None:
             run_response.images = []
         run_response.images.append(image)
 
-    def _add_video(self, video: VideoArtifact, run_response: TeamRunOutput) -> None:
+    def _add_video(self, video: Video, run_response: TeamRunOutput) -> None:
         """Add a video to both the agent's stateful storage and the current run response"""
         # Add to run response
         if run_response.videos is None:
             run_response.videos = []
         run_response.videos.append(video)
 
-    def _add_audio(self, audio: AudioArtifact, run_response: TeamRunOutput) -> None:
+    def _add_audio(self, audio: Audio, run_response: TeamRunOutput) -> None:
         """Add audio to both the agent's stateful storage and the current run response"""
         # Add to run response
         if run_response.audio is None:
@@ -6867,8 +6597,6 @@ class Team:
             team_data["team_id"] = self.id
         if self.model is not None:
             team_data["model"] = self.model.to_dict()
-        if self.mode is not None:
-            team_data["mode"] = self.mode
         return team_data
 
     ###########################################################################