ag2 0.9.2__tar.gz → 0.9.4__tar.gz

{ag2-0.9.2 → ag2-0.9.4}/.devcontainer/devcontainer.json

@@ -30,7 +30,7 @@
         },
         "AZURE_API_VERSION": {
             "description": "This key is required to specify the version of the Azure API you are using. Set this along with AZURE_OPENAI_API_KEY, AZURE_API_ENDPOINT for Azure OpenAI services. These variables can be configured later as environment variables in the codespace terminal."
-        },
+        }
     },
     "shutdownAction": "stopContainer",
     "workspaceFolder": "/workspaces/ag2",
@@ -46,7 +46,7 @@
         "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
         "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
         "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
-        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}"
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

{ag2-0.9.2 → ag2-0.9.4}/.devcontainer/python-3.10/devcontainer.json

@@ -30,7 +30,7 @@
         },
         "AZURE_API_VERSION": {
             "description": "This key is required to specify the version of the Azure API you are using. Set this along with AZURE_OPENAI_API_KEY, AZURE_API_ENDPOINT for Azure OpenAI services. These variables can be configured later as environment variables in the codespace terminal."
-        },
+        }
     },
     "shutdownAction": "stopContainer",
     "workspaceFolder": "/workspaces/ag2",
@@ -46,7 +46,7 @@
         "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
         "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
         "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
-        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}"
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

{ag2-0.9.2 → ag2-0.9.4}/.devcontainer/python-3.11/devcontainer.json

@@ -30,7 +30,7 @@
         },
         "AZURE_API_VERSION": {
             "description": "This key is required to specify the version of the Azure API you are using. Set this along with AZURE_OPENAI_API_KEY, AZURE_API_ENDPOINT for Azure OpenAI services. These variables can be configured later as environment variables in the codespace terminal."
-        },
+        }
     },
     "shutdownAction": "stopContainer",
     "workspaceFolder": "/workspaces/ag2",
@@ -46,7 +46,7 @@
         "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
         "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
         "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
-        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}"
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

{ag2-0.9.2 → ag2-0.9.4}/.devcontainer/python-3.12/devcontainer.json

@@ -30,7 +30,7 @@
         },
         "AZURE_API_VERSION": {
             "description": "This key is required to specify the version of the Azure API you are using. Set this along with AZURE_OPENAI_API_KEY, AZURE_API_ENDPOINT for Azure OpenAI services. These variables can be configured later as environment variables in the codespace terminal."
-        },
+        }
     },
     "shutdownAction": "stopContainer",
     "workspaceFolder": "/workspaces/ag2",
@@ -46,7 +46,7 @@
         "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
         "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
         "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
-        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}"
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

{ag2-0.9.2 → ag2-0.9.4}/.devcontainer/python-3.13/devcontainer.json

@@ -30,7 +30,7 @@
         },
         "AZURE_API_VERSION": {
             "description": "This key is required to specify the version of the Azure API you are using. Set this along with AZURE_OPENAI_API_KEY, AZURE_API_ENDPOINT for Azure OpenAI services. These variables can be configured later as environment variables in the codespace terminal."
-        },
+        }
     },
     "shutdownAction": "stopContainer",
     "workspaceFolder": "/workspaces/ag2",
@@ -46,7 +46,7 @@
         "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
         "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
         "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
-        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}"
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

{ag2-0.9.2 → ag2-0.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ag2
-Version: 0.9.2
+Version: 0.9.4
 Summary: A programming framework for agentic AI
 Project-URL: Homepage, https://ag2.ai/
 Project-URL: Documentation, https://docs.ag2.ai
@@ -72,7 +72,7 @@ Requires-Dist: azure-cosmos>=4.2.0; extra == 'cosmosdb'
 Provides-Extra: crawl4ai
 Requires-Dist: crawl4ai<0.5,>=0.4.247; extra == 'crawl4ai'
 Provides-Extra: deepseek
-Requires-Dist: openai>=1.66.2; extra == 'deepseek'
+Requires-Dist: openai>=1.87.0; extra == 'deepseek'
 Provides-Extra: dev
 Requires-Dist: cairosvg; extra == 'dev'
 Requires-Dist: codespell==2.4.1; extra == 'dev'
@@ -96,7 +96,7 @@ Requires-Dist: mypy==1.15.0; extra == 'dev'
 Requires-Dist: nbclient==0.10.2; extra == 'dev'
 Requires-Dist: nbconvert==7.16.6; extra == 'dev'
 Requires-Dist: nbformat==5.10.4; extra == 'dev'
-Requires-Dist: openai>=1.66.2; extra == 'dev'
+Requires-Dist: openai>=1.87.0; extra == 'dev'
 Requires-Dist: pandas==2.2.3; extra == 'dev'
 Requires-Dist: pdoc3==0.11.6; extra == 'dev'
 Requires-Dist: pillow; extra == 'dev'
@@ -130,6 +130,8 @@ Requires-Dist: pillow; extra == 'docs'
 Requires-Dist: pyyaml==6.0.2; extra == 'docs'
 Requires-Dist: termcolor==3.0.1; extra == 'docs'
 Requires-Dist: typer==0.15.2; extra == 'docs'
+Provides-Extra: duckduckgo
+Requires-Dist: duckduckgo-search>=8.0.2; extra == 'duckduckgo'
 Provides-Extra: flaml
 Requires-Dist: flaml; extra == 'flaml'
 Requires-Dist: numpy<2.0.0,>=1.24.0; (python_version < '3.13') and extra == 'flaml'
@@ -138,14 +140,14 @@ Provides-Extra: gemini
 Requires-Dist: google-api-core; extra == 'gemini'
 Requires-Dist: google-auth; extra == 'gemini'
 Requires-Dist: google-cloud-aiplatform; extra == 'gemini'
-Requires-Dist: google-genai>=1.2.0; extra == 'gemini'
+Requires-Dist: google-genai>=1.20.0; extra == 'gemini'
 Requires-Dist: jsonschema; extra == 'gemini'
 Requires-Dist: pillow; extra == 'gemini'
 Provides-Extra: gemini-realtime
 Requires-Dist: google-api-core; extra == 'gemini-realtime'
 Requires-Dist: google-auth; extra == 'gemini-realtime'
 Requires-Dist: google-cloud-aiplatform; extra == 'gemini-realtime'
-Requires-Dist: google-genai>=1.2.0; extra == 'gemini-realtime'
+Requires-Dist: google-genai>=1.20.0; extra == 'gemini-realtime'
 Requires-Dist: jsonschema; extra == 'gemini-realtime'
 Requires-Dist: pillow; extra == 'gemini-realtime'
 Requires-Dist: websockets<16,>=14.0; extra == 'gemini-realtime'
@@ -198,7 +200,7 @@ Provides-Extra: mathchat
 Requires-Dist: sympy; extra == 'mathchat'
 Requires-Dist: wolframalpha; extra == 'mathchat'
 Provides-Extra: mcp
-Requires-Dist: mcp<1.6,>=1.4.0; (python_version >= '3.10') and extra == 'mcp'
+Requires-Dist: mcp>=1.9.4; (python_version >= '3.10') and extra == 'mcp'
 Provides-Extra: mcp-proxy-gen
 Requires-Dist: fastapi-code-generator>=0.5.4; extra == 'mcp-proxy-gen'
 Requires-Dist: fastapi<1,>=0.112; extra == 'mcp-proxy-gen'
@@ -216,9 +218,9 @@ Provides-Extra: ollama
 Requires-Dist: fix-busted-json>=0.0.18; extra == 'ollama'
 Requires-Dist: ollama>=0.4.7; extra == 'ollama'
 Provides-Extra: openai
-Requires-Dist: openai>=1.66.2; extra == 'openai'
+Requires-Dist: openai>=1.87.0; extra == 'openai'
 Provides-Extra: openai-realtime
-Requires-Dist: openai>=1.66.2; extra == 'openai-realtime'
+Requires-Dist: openai>=1.87.0; extra == 'openai-realtime'
 Requires-Dist: openai[realtime]; extra == 'openai-realtime'
 Provides-Extra: rag
 Requires-Dist: chromadb<1,>=0.5; extra == 'rag'
@@ -282,6 +284,8 @@ Requires-Dist: protobuf==5.29.3; extra == 'retrievechat-qdrant'
 Requires-Dist: pypdf; extra == 'retrievechat-qdrant'
 Requires-Dist: qdrant-client; extra == 'retrievechat-qdrant'
 Requires-Dist: sentence-transformers<=4.1.0; extra == 'retrievechat-qdrant'
+Provides-Extra: tavily
+Requires-Dist: tavily-python>=0.7.4; extra == 'tavily'
 Provides-Extra: teachable
 Requires-Dist: chromadb; extra == 'teachable'
 Provides-Extra: test
@@ -309,7 +313,7 @@ Requires-Dist: mock==5.2.0; extra == 'types'
 Requires-Dist: mypy==1.15.0; extra == 'types'
 Requires-Dist: nbconvert==7.16.6; extra == 'types'
 Requires-Dist: nbformat==5.10.4; extra == 'types'
-Requires-Dist: openai>=1.66.2; extra == 'types'
+Requires-Dist: openai>=1.87.0; extra == 'types'
 Requires-Dist: pandas==2.2.3; extra == 'types'
 Requires-Dist: pytest-asyncio==0.26.0; extra == 'types'
 Requires-Dist: pytest-cov==6.1.1; extra == 'types'
@@ -678,7 +682,7 @@ AG2 supports more advanced concepts to help you build your AI agent workflows. Y
 
 - [Structured Output](https://docs.ag2.ai/latest/docs/user-guide/basic-concepts/structured-outputs)
 - [Ending a conversation](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/orchestration/ending-a-chat/)
-- [Retrieval Augmented Generation (RAG)](https://docs.ag2.ai/docs/user-guide/advanced-concepts/rag)
+- [Retrieval Augmented Generation (RAG)](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/rag/)
 - [Code Execution](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/code-execution)
 - [Tools with Secrets](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/tools/tools-with-secrets/)
 

{ag2-0.9.2 → ag2-0.9.4}/README.md

@@ -351,7 +351,7 @@ AG2 supports more advanced concepts to help you build your AI agent workflows. Y
 
 - [Structured Output](https://docs.ag2.ai/latest/docs/user-guide/basic-concepts/structured-outputs)
 - [Ending a conversation](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/orchestration/ending-a-chat/)
-- [Retrieval Augmented Generation (RAG)](https://docs.ag2.ai/docs/user-guide/advanced-concepts/rag)
+- [Retrieval Augmented Generation (RAG)](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/rag/)
 - [Code Execution](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/code-execution)
 - [Tools with Secrets](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/tools/tools-with-secrets/)
 

{ag2-0.9.2 → ag2-0.9.4}/autogen/agentchat/contrib/agent_optimizer.py

@@ -140,7 +140,7 @@ History:
 
 According to the information I provide, please take one of four actions to manipulate list B using the functions you know.
 Instead of returning TERMINATE directly or taking no action, you should try your best to optimize the function list. Only take no action if you really think the current list is optimal, as more actions will harm performance in future tasks.
-Even adding a general function that can substitute the assistant’s repeated suggestions of Python code with the same functionality could also be helpful.
+Even adding a general function that can substitute the assistant's repeated suggestions of Python code with the same functionality could also be helpful.
 """
 
 
@@ -176,14 +176,15 @@ class AgentOptimizer:
     def __init__(
         self,
         max_actions_per_step: int,
-        llm_config: Union[LLMConfig, dict[str, Any]],
+        llm_config: Optional[Union[LLMConfig, dict[str, Any]]] = None,
         optimizer_model: Optional[str] = "gpt-4-1106-preview",
     ):
         """(These APIs are experimental and may change in the future.)
 
         Args:
             max_actions_per_step (int): the maximum number of actions that the optimizer can take in one step.
-            llm_config (LLMConfig or dict): llm inference configuration.
+            llm_config (LLMConfig or dict or None): llm inference configuration.
+                If None, the current LLMConfig from context is used.
                 Please refer to [OpenAIWrapper.create](https://docs.ag2.ai/latest/docs/api-reference/autogen/OpenAIWrapper/#autogen.OpenAIWrapper.create) for available options.
                 When using OpenAI or Azure OpenAI endpoints, please specify a non-empty 'model' either in `llm_config` or in each config of 'config_list' in `llm_config`.
             optimizer_model: the model used for the optimizer.
@@ -203,6 +204,8 @@ class AgentOptimizer:
         self._failure_functions_performance = []
         self._best_performance = -1
 
+        if llm_config is None:
+            llm_config = LLMConfig.current
         assert isinstance(llm_config, (dict, LLMConfig)), "llm_config must be a dict or LLMConfig"
         llm_config = copy.deepcopy(llm_config)
         self.llm_config = llm_config

{ag2-0.9.2 → ag2-0.9.4}/autogen/agentchat/contrib/capabilities/transforms.py

@@ -60,15 +60,23 @@ class MessageHistoryLimiter:
     It trims the conversation history by removing older messages, retaining only the most recent messages.
     """
 
-    def __init__(self, max_messages: Optional[int] = None, keep_first_message: bool = False):
+    def __init__(
+        self,
+        max_messages: Optional[int] = None,
+        keep_first_message: bool = False,
+        exclude_names: Optional[list[str]] = None,
+    ):
         """Args:
         max_messages Optional[int]: Maximum number of messages to keep in the context. Must be greater than 0 if not None.
         keep_first_message bool: Whether to keep the original first message in the conversation history.
             Defaults to False.
+        exclude_names Optional[list[str]]: List of message sender names to exclude from the message history.
+            Messages from these senders will be filtered out before applying the message limit. Defaults to None.
         """
         self._validate_max_messages(max_messages)
         self._max_messages = max_messages
         self._keep_first_message = keep_first_message
+        self._exclude_names = exclude_names
 
     def apply_transform(self, messages: list[dict[str, Any]]) -> list[dict[str, Any]]:
         """Truncates the conversation history to the specified maximum number of messages.
@@ -83,25 +91,30 @@ class MessageHistoryLimiter:
         Returns:
             List[Dict]: A new list containing the most recent messages up to the specified maximum.
         """
-        if self._max_messages is None or len(messages) <= self._max_messages:
-            return messages
+
+        exclude_names = getattr(self, "_exclude_names", None)
+
+        filtered = [msg for msg in messages if msg.get("name") not in exclude_names] if exclude_names else messages
+
+        if self._max_messages is None or len(filtered) <= self._max_messages:
+            return filtered
 
         truncated_messages = []
         remaining_count = self._max_messages
 
         # Start with the first message if we need to keep it
-        if self._keep_first_message:
-            truncated_messages = [messages[0]]
+        if self._keep_first_message and filtered:
+            truncated_messages = [filtered[0]]
             remaining_count -= 1
 
         # Loop through messages in reverse
-        for i in range(len(messages) - 1, 0, -1):
+        for i in range(len(filtered) - 1, 0, -1):
             if remaining_count > 1:
-                truncated_messages.insert(1 if self._keep_first_message else 0, messages[i])
+                truncated_messages.insert(1 if self._keep_first_message else 0, filtered[i])
             if remaining_count == 1:  # noqa: SIM102
                 # If there's only 1 slot left and it's a 'tools' message, ignore it.
-                if messages[i].get("role") != "tool":
-                    truncated_messages.insert(1, messages[i])
+                if filtered[i].get("role") != "tool":
+                    truncated_messages.insert(1, filtered[i])
 
             remaining_count -= 1
             if remaining_count == 0:

{ag2-0.9.2 → ag2-0.9.4}/autogen/agentchat/conversable_agent.py

@@ -77,13 +77,13 @@ from .chat import (
     initiate_chats,
 )
 from .group.context_variables import ContextVariables
+from .group.guardrails import Guardrail
 from .group.handoffs import Handoffs
 from .utils import consolidate_chat_info, gather_usage_summary
 
 if TYPE_CHECKING:
     from .group.on_condition import OnCondition
     from .group.on_context_condition import OnContextCondition
-
 __all__ = ("ConversableAgent",)
 
 logger = logging.getLogger(__name__)
@@ -224,6 +224,8 @@ class ConversableAgent(LLMAgent):
             handoffs (Handoffs): Handoffs object containing all handoff transition conditions.
         """
         self.handoffs = handoffs if handoffs is not None else Handoffs()
+        self.input_guardrails: list["Guardrail"] = []
+        self.output_guardrails: list["Guardrail"] = []
 
         # we change code_execution_config below and we have to make sure we don't change the input
         # in case of UserProxyAgent, without this we could even change the default value {}
@@ -1471,7 +1473,11 @@ class ConversableAgent(LLMAgent):
                 self.send(msg2send, recipient, request_reply=True, silent=silent)
 
             else:  # No breaks in the for loop, so we have reached max turns
-                iostream.send(TerminationEvent(termination_reason=f"Maximum turns ({max_turns}) reached"))
+                iostream.send(
+                    TerminationEvent(
+                        termination_reason=f"Maximum turns ({max_turns}) reached", sender=self, recipient=recipient
+                    )
+                )
         else:
             self._prepare_chat(recipient, clear_history)
             if isinstance(message, Callable):
@@ -1651,7 +1657,11 @@ class ConversableAgent(LLMAgent):
                     break
                 await self.a_send(msg2send, recipient, request_reply=True, silent=silent)
             else:  # No breaks in the for loop, so we have reached max turns
-                iostream.send(TerminationEvent(termination_reason=f"Maximum turns ({max_turns}) reached"))
+                iostream.send(
+                    TerminationEvent(
+                        termination_reason=f"Maximum turns ({max_turns}) reached", sender=self, recipient=recipient
+                    )
+                )
         else:
             self._prepare_chat(recipient, clear_history)
             if isinstance(message, Callable):
@@ -2587,7 +2597,7 @@ class ConversableAgent(LLMAgent):
             self._consecutive_auto_reply_counter[sender] = 0
 
             if termination_reason:
-                iostream.send(TerminationEvent(termination_reason=termination_reason))
+                iostream.send(TerminationEvent(termination_reason=termination_reason, sender=self, recipient=sender))
 
             return True, None
 
@@ -2727,7 +2737,7 @@ class ConversableAgent(LLMAgent):
             self._consecutive_auto_reply_counter[sender] = 0
 
             if termination_reason:
-                iostream.send(TerminationEvent(termination_reason=termination_reason))
+                iostream.send(TerminationEvent(termination_reason=termination_reason, sender=self, recipient=sender))
 
             return True, None
 
@@ -3994,6 +4004,42 @@ class ConversableAgent(LLMAgent):
         """
         self.handoffs.add_many(conditions)
 
+    def register_input_guardrail(self, guardrail: "Guardrail") -> None:
+        """
+        Register a guardrail to be used for input validation.
+
+        Args:
+            guardrail: The guardrail to register.
+        """
+        self.input_guardrails.append(guardrail)
+
+    def register_input_guardrails(self, guardrails: list["Guardrail"]) -> None:
+        """
+        Register multiple guardrails to be used for input validation.
+
+        Args:
+            guardrails: List of guardrails to register.
+        """
+        self.input_guardrails.extend(guardrails)
+
+    def register_output_guardrail(self, guardrail: "Guardrail") -> None:
+        """
+        Register a guardrail to be used for output validation.
+
+        Args:
+            guardrail: The guardrail to register.
+        """
+        self.output_guardrails.append(guardrail)
+
+    def register_output_guardrails(self, guardrails: list["Guardrail"]) -> None:
+        """
+        Register multiple guardrails to be used for output validation.
+
+        Args:
+            guardrails: List of guardrails to register.
+        """
+        self.output_guardrails.extend(guardrails)
+
 
 @export_module("autogen")
 def register_function(

{ag2-0.9.2 → ag2-0.9.4}/autogen/agentchat/group/group_utils.py

@@ -82,6 +82,46 @@ def link_agents_to_group_manager(agents: list[Agent], group_chat_manager: Agent)
         agent._group_manager = group_chat_manager  # type: ignore[attr-defined]
 
 
+def _evaluate_after_works_conditions(
+    agent: "ConversableAgent",
+    groupchat: GroupChat,
+    user_agent: Optional["ConversableAgent"],
+) -> Optional[Union[Agent, str]]:
+    """Evaluate after_works context conditions for an agent.
+
+    Args:
+        agent: The agent to evaluate after_works conditions for
+        groupchat: The current group chat
+        user_agent: Optional user proxy agent
+
+    Returns:
+        The resolved speaker selection result if a condition matches, None otherwise
+    """
+    if not hasattr(agent, "handoffs") or not agent.handoffs.after_works:  # type: ignore[attr-defined]
+        return None
+
+    for after_work_condition in agent.handoffs.after_works:  # type: ignore[attr-defined]
+        # Check if condition is available
+        is_available = (
+            after_work_condition.available.is_available(agent, groupchat.messages)
+            if after_work_condition.available
+            else True
+        )
+
+        # Evaluate the condition (None condition means always true)
+        if is_available and (
+            after_work_condition.condition is None or after_work_condition.condition.evaluate(agent.context_variables)
+        ):
+            # Condition matched, resolve and return
+            return after_work_condition.target.resolve(
+                groupchat,
+                agent,
+                user_agent,
+            ).get_speaker_selection_result(groupchat)
+
+    return None
+
+
 def _run_oncontextconditions(
     agent: "ConversableAgent",
     messages: Optional[list[dict[str, Any]]] = None,
@@ -94,14 +134,10 @@ def _run_oncontextconditions(
             on_condition.available.is_available(agent, messages if messages else []) if on_condition.available else True
         )
 
-        if is_available and on_condition.condition.evaluate(agent.context_variables):
-            # Condition has been met, we'll set the Tool Executor's next target
-            # attribute and that will be picked up on the next iteration when
-            # _determine_next_agent is called
-            for agent in agent._group_manager.groupchat.agents:  # type: ignore[attr-defined]
-                if isinstance(agent, GroupToolExecutor):
-                    agent.set_next_target(on_condition.target)
-                    break
+        if is_available and (
+            on_condition.condition is None or on_condition.condition.evaluate(agent.context_variables)
+        ):
+            on_condition.target.activate_target(agent._group_manager.groupchat)  # type: ignore[attr-defined]
 
             transfer_name = on_condition.target.display_name()
 
@@ -161,12 +197,25 @@ def ensure_handoff_agents_in_group(agents: list["ConversableAgent"]) -> None:
                 and context_conditions.target.agent_name not in agent_names
             ):
                 raise ValueError("Agent in OnContextCondition Hand-offs must be in the agents list")
-        if (
-            agent.handoffs.after_work is not None
-            and isinstance(agent.handoffs.after_work, (AgentTarget, AgentNameTarget))
-            and agent.handoffs.after_work.agent_name not in agent_names
-        ):
-            raise ValueError("Agent in after work target Hand-offs must be in the agents list")
+        # Check after_works targets
+        for after_work_condition in agent.handoffs.after_works:
+            if (
+                isinstance(after_work_condition.target, (AgentTarget, AgentNameTarget))
+                and after_work_condition.target.agent_name not in agent_names
+            ):
+                raise ValueError("Agent in after work target Hand-offs must be in the agents list")
+
+
+def ensure_guardrail_agents_in_group(agents: list["ConversableAgent"]) -> None:
+    """Ensure the agents in handoffs are in the group chat."""
+    agent_names = [agent.name for agent in agents]
+    for agent in agents:
+        for guardrail in agent.input_guardrails + agent.output_guardrails:
+            if (
+                isinstance(guardrail.target, (AgentTarget, AgentNameTarget))
+                and guardrail.target.agent_name not in agent_names
+            ):
+                raise ValueError("Agent in guardrail's target must be in the agents list")
 
 
 def prepare_exclude_transit_messages(agents: list["ConversableAgent"]) -> None:
@@ -211,6 +260,9 @@ def prepare_group_agents(
     # Ensure all agents in hand-off after-works are in the passed in agents list
     ensure_handoff_agents_in_group(agents)
 
+    # Ensure all agents in guardrails are in the passed in agents list
+    ensure_guardrail_agents_in_group(agents)
+
     # Create Tool Executor for the group
     tool_execution = GroupToolExecutor()
 
@@ -320,17 +372,19 @@ def setup_context_variables(
     tool_execution: "ConversableAgent",
     agents: list["ConversableAgent"],
     manager: GroupChatManager,
+    user_agent: Optional["ConversableAgent"],
     context_variables: ContextVariables,
 ) -> None:
-    """Assign a common context_variables reference to all agents in the group, including the tool executor and group chat manager.
+    """Assign a common context_variables reference to all agents in the group, including the tool executor, group chat manager, and user proxy agent.
 
     Args:
         tool_execution: The tool execution agent.
         agents: List of all agents in the conversation.
         manager: GroupChatManager instance.
+        user_agent: Optional user proxy agent.
         context_variables: Context variables to assign to all agents.
     """
-    for agent in agents + [tool_execution] + [manager]:
+    for agent in agents + [tool_execution] + [manager] + ([user_agent] if user_agent else []):
         agent.context_variables = context_variables
 
 
@@ -426,22 +480,25 @@ def determine_next_agent(
 
     # If the user last spoke, return to the agent prior to them (if they don't have an after work, otherwise it's treated like any other agent)
     if user_agent and last_speaker == user_agent:
-        if user_agent.handoffs.after_work is None:
+        if not user_agent.handoffs.after_works:
             return last_agent_speaker
         else:
             last_agent_speaker = user_agent
 
     # AFTER WORK:
 
-    # Get the appropriate After Work condition (from the agent if they have one, otherwise the group level one)
-    after_work_condition = (
-        last_agent_speaker.handoffs.after_work  # type: ignore[attr-defined]
-        if last_agent_speaker.handoffs.after_work is not None  # type: ignore[attr-defined]
-        else group_after_work
+    # First, try to evaluate after_works context conditions
+    after_works_result = _evaluate_after_works_conditions(
+        last_agent_speaker,  # type: ignore[arg-type]
+        groupchat,
+        user_agent,
     )
+    if after_works_result is not None:
+        return after_works_result
 
+    # If no after_works conditions matched, use the group-level after_work
     # Resolve the next agent, termination, or speaker selection method
-    resolved_speaker_selection_result = after_work_condition.resolve(
+    resolved_speaker_selection_result = group_after_work.resolve(
         groupchat,
         last_agent_speaker,  # type: ignore[arg-type]
         user_agent,
@@ -525,10 +582,7 @@ def create_group_manager(
                 if (
                     len(agent.handoffs.get_context_conditions_by_target_type(GroupManagerTarget)) > 0
                     or len(agent.handoffs.get_llm_conditions_by_target_type(GroupManagerTarget)) > 0
-                    or (
-                        agent.handoffs.after_work is not None
-                        and isinstance(agent.handoffs.after_work, GroupManagerTarget)
-                    )
+                    or any(isinstance(aw.target, GroupManagerTarget) for aw in agent.handoffs.after_works)
                 ):
                     has_group_manager_target = True
                     break