PraisonAI 4.6.82__tar.gz → 4.6.95__tar.gz

{praisonai-4.6.82 → praisonai-4.6.95}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PraisonAI
-Version: 4.6.82
+Version: 4.6.95
 Summary: PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human-agent collaboration.
 Author: Mervin Praison
 License: MIT
@@ -11,14 +11,16 @@ Description-Content-Type: text/markdown
 Requires-Dist: rich>=13.7
 Requires-Dist: markdown>=3.5
 Requires-Dist: pyparsing>=3.0.0
-Requires-Dist: praisonaiagents>=1.6.82
+Requires-Dist: praisonaiagents>=1.6.95
 Requires-Dist: python-dotenv>=0.19.0
 Requires-Dist: litellm<2,>=1.83.14
 Requires-Dist: PyYAML>=6.0
 Requires-Dist: mcp>=1.20.0
-Requires-Dist: typer>=0.9.0
+Requires-Dist: typer>=0.12.0
+Requires-Dist: click>=8.4.2
 Requires-Dist: textual>=0.47.0
 Requires-Dist: pydantic>=2.0.0
+Requires-Dist: toml>=0.10.2
 Provides-Extra: ui
 Requires-Dist: aiui<0.4,>=0.3.121; extra == "ui"
 Provides-Extra: gradio
@@ -91,8 +93,20 @@ Requires-Dist: autogen-ext[openai]>=0.4.0; extra == "autogen-v4"
 Requires-Dist: autogen-core>=0.4.0; extra == "autogen-v4"
 Requires-Dist: praisonai-tools>=0.1.0; extra == "autogen-v4"
 Requires-Dist: crewai; extra == "autogen-v4"
+Provides-Extra: langgraph
+Requires-Dist: langgraph<2,>=0.2.0; extra == "langgraph"
+Requires-Dist: langgraph-prebuilt<2,>=0.2.0; extra == "langgraph"
+Requires-Dist: langchain-core<2,>=0.3.0; extra == "langgraph"
+Requires-Dist: langchain-openai<2,>=0.2.0; extra == "langgraph"
+Requires-Dist: praisonai-tools>=0.1.0; extra == "langgraph"
+Provides-Extra: openai-agents
+Requires-Dist: praisonai-frameworks[openai-agents]>=0.1.3; extra == "openai-agents"
+Requires-Dist: praisonai-tools>=0.1.0; extra == "openai-agents"
 Provides-Extra: acp
 Requires-Dist: agent-client-protocol>=0.7.0; extra == "acp"
+Provides-Extra: flow
+Requires-Dist: langflow>=1.0.0; extra == "flow"
+Requires-Dist: requests>=2.31.0; extra == "flow"
 Provides-Extra: lite
 Provides-Extra: all
 Requires-Dist: fastapi>=0.115.0; extra == "all"
@@ -751,7 +765,7 @@ praisonai agents.yaml
 | Query Rewriter Agent | [Example](examples/python/agents/query-rewriter-agent.py) | [📖](https://docs.praison.ai/docs/agents/query-rewriter) |
 | Native Web Search | [Example](examples/python/agents/websearch-agent.py) | [📖](https://docs.praison.ai/docs/agents/websearch) |
 | Built-in Search Tools | [Example](examples/python/agents/websearch-agent.py) | [📖](https://docs.praison.ai/docs/tools/tavily) |
-| Unified Web Search | [Example](src/praisonai-agents/examples/web_search_example.py) | [📖](https://docs.praison.ai/docs/tools/web-search) |
+| Unified Web Search | [Example](examples/python/web_search_example.py) | [📖](https://docs.praison.ai/docs/tools/web-search) |
 | Web Fetch (Anthropic) | [Example](examples/python/agents/web-fetch-agent.py) | [📖](https://docs.praison.ai/docs/features/model-capabilities) |
 
 </details>

{praisonai-4.6.82 → praisonai-4.6.95}/PraisonAI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PraisonAI
-Version: 4.6.82
+Version: 4.6.95
 Summary: PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human-agent collaboration.
 Author: Mervin Praison
 License: MIT
@@ -11,14 +11,16 @@ Description-Content-Type: text/markdown
 Requires-Dist: rich>=13.7
 Requires-Dist: markdown>=3.5
 Requires-Dist: pyparsing>=3.0.0
-Requires-Dist: praisonaiagents>=1.6.82
+Requires-Dist: praisonaiagents>=1.6.95
 Requires-Dist: python-dotenv>=0.19.0
 Requires-Dist: litellm<2,>=1.83.14
 Requires-Dist: PyYAML>=6.0
 Requires-Dist: mcp>=1.20.0
-Requires-Dist: typer>=0.9.0
+Requires-Dist: typer>=0.12.0
+Requires-Dist: click>=8.4.2
 Requires-Dist: textual>=0.47.0
 Requires-Dist: pydantic>=2.0.0
+Requires-Dist: toml>=0.10.2
 Provides-Extra: ui
 Requires-Dist: aiui<0.4,>=0.3.121; extra == "ui"
 Provides-Extra: gradio
@@ -91,8 +93,20 @@ Requires-Dist: autogen-ext[openai]>=0.4.0; extra == "autogen-v4"
 Requires-Dist: autogen-core>=0.4.0; extra == "autogen-v4"
 Requires-Dist: praisonai-tools>=0.1.0; extra == "autogen-v4"
 Requires-Dist: crewai; extra == "autogen-v4"
+Provides-Extra: langgraph
+Requires-Dist: langgraph<2,>=0.2.0; extra == "langgraph"
+Requires-Dist: langgraph-prebuilt<2,>=0.2.0; extra == "langgraph"
+Requires-Dist: langchain-core<2,>=0.3.0; extra == "langgraph"
+Requires-Dist: langchain-openai<2,>=0.2.0; extra == "langgraph"
+Requires-Dist: praisonai-tools>=0.1.0; extra == "langgraph"
+Provides-Extra: openai-agents
+Requires-Dist: praisonai-frameworks[openai-agents]>=0.1.3; extra == "openai-agents"
+Requires-Dist: praisonai-tools>=0.1.0; extra == "openai-agents"
 Provides-Extra: acp
 Requires-Dist: agent-client-protocol>=0.7.0; extra == "acp"
+Provides-Extra: flow
+Requires-Dist: langflow>=1.0.0; extra == "flow"
+Requires-Dist: requests>=2.31.0; extra == "flow"
 Provides-Extra: lite
 Provides-Extra: all
 Requires-Dist: fastapi>=0.115.0; extra == "all"
@@ -751,7 +765,7 @@ praisonai agents.yaml
 | Query Rewriter Agent | [Example](examples/python/agents/query-rewriter-agent.py) | [📖](https://docs.praison.ai/docs/agents/query-rewriter) |
 | Native Web Search | [Example](examples/python/agents/websearch-agent.py) | [📖](https://docs.praison.ai/docs/agents/websearch) |
 | Built-in Search Tools | [Example](examples/python/agents/websearch-agent.py) | [📖](https://docs.praison.ai/docs/tools/tavily) |
-| Unified Web Search | [Example](src/praisonai-agents/examples/web_search_example.py) | [📖](https://docs.praison.ai/docs/tools/web-search) |
+| Unified Web Search | [Example](examples/python/web_search_example.py) | [📖](https://docs.praison.ai/docs/tools/web-search) |
 | Web Fetch (Anthropic) | [Example](examples/python/agents/web-fetch-agent.py) | [📖](https://docs.praison.ai/docs/features/model-capabilities) |
 
 </details>

{praisonai-4.6.82 → praisonai-4.6.95}/PraisonAI.egg-info/SOURCES.txt

@@ -61,14 +61,15 @@ praisonai/audit/__init__.py
 praisonai/audit/agent_centric.py
 praisonai/bots/__init__.py
 praisonai/bots/_ack.py
+praisonai/bots/_admission.py
 praisonai/bots/_approval.py
 praisonai/bots/_approval_base.py
 praisonai/bots/_approval_store.py
-praisonai/bots/_auth.py
 praisonai/bots/_chunk.py
 praisonai/bots/_commands.py
 praisonai/bots/_config_schema.py
 praisonai/bots/_correlation.py
+praisonai/bots/_dead_targets.py
 praisonai/bots/_debounce.py
 praisonai/bots/_defaults.py
 praisonai/bots/_delivery.py
@@ -82,14 +83,18 @@ praisonai/bots/_ingress.py
 praisonai/bots/_media.py
 praisonai/bots/_metrics.py
 praisonai/bots/_mirror.py
+praisonai/bots/_outbound_media.py
 praisonai/bots/_outbound_messenger.py
+praisonai/bots/_outbound_resilience.py
 praisonai/bots/_outbox.py
 praisonai/bots/_pairing_ui.py
 praisonai/bots/_presentation_approval.py
+praisonai/bots/_presentation_approval_backend.py
 praisonai/bots/_presentation_renderer.py
 praisonai/bots/_protocol_mixin.py
 praisonai/bots/_rate_limit.py
 praisonai/bots/_registry.py
+praisonai/bots/_relay_adapter.py
 praisonai/bots/_reset_policy.py
 praisonai/bots/_resilience.py
 praisonai/bots/_run_control.py
@@ -351,14 +356,10 @@ praisonai/cli/features/output_style.py
 praisonai/cli/features/package.py
 praisonai/cli/features/performance.py
 praisonai/cli/features/persistence.py
-praisonai/cli/features/plugin_cli.py
-praisonai/cli/features/profile.py
-praisonai/cli/features/profiling.py
 praisonai/cli/features/recipe.py
 praisonai/cli/features/recipe_creator.py
 praisonai/cli/features/recipe_optimizer.py
 praisonai/cli/features/recipe_prompts.py
-praisonai/cli/features/recipes.py
 praisonai/cli/features/registry.py
 praisonai/cli/features/repo_map.py
 praisonai/cli/features/router.py
@@ -368,6 +369,7 @@ praisonai/cli/features/sandbox_executor.py
 praisonai/cli/features/sdk_knowledge.py
 praisonai/cli/features/serve.py
 praisonai/cli/features/session.py
+praisonai/cli/features/session_checkpoints.py
 praisonai/cli/features/skills.py
 praisonai/cli/features/slash_commands.py
 praisonai/cli/features/telemetry.py
@@ -548,17 +550,20 @@ praisonai/flow/components/__init__.py
 praisonai/flow/components/PraisonAI/praisonai_agent.py
 praisonai/flow/components/PraisonAI/praisonai_agents.py
 praisonai/framework_adapters/__init__.py
+praisonai/framework_adapters/_config_builder.py
 praisonai/framework_adapters/autogen_adapter.py
 praisonai/framework_adapters/base.py
 praisonai/framework_adapters/crewai_adapter.py
 praisonai/framework_adapters/praisonai_adapter.py
 praisonai/framework_adapters/registry.py
 praisonai/framework_adapters/validators.py
+praisonai/framework_adapters/workflow_framework.py
 praisonai/gateway/__init__.py
 praisonai/gateway/auth.py
 praisonai/gateway/client.py
 praisonai/gateway/cookie_auth.py
 praisonai/gateway/exec_approval.py
+praisonai/gateway/forensics.py
 praisonai/gateway/gateway_approval.py
 praisonai/gateway/health_monitor.py
 praisonai/gateway/home_channels.py
@@ -789,7 +794,6 @@ praisonai/scheduler/blueprint_catalogue.py
 praisonai/scheduler/condition_gate.py
 praisonai/scheduler/daemon_manager.py
 praisonai/scheduler/deployment.py
-praisonai/scheduler/enhanced_executor.py
 praisonai/scheduler/executor.py
 praisonai/scheduler/run_policy.py
 praisonai/scheduler/shared.py

{praisonai-4.6.82 → praisonai-4.6.95}/PraisonAI.egg-info/requires.txt

@@ -1,14 +1,16 @@
 rich>=13.7
 markdown>=3.5
 pyparsing>=3.0.0
-praisonaiagents>=1.6.82
+praisonaiagents>=1.6.95
 python-dotenv>=0.19.0
 litellm<2,>=1.83.14
 PyYAML>=6.0
 mcp>=1.20.0
-typer>=0.9.0
+typer>=0.12.0
+click>=8.4.2
 textual>=0.47.0
 pydantic>=2.0.0
+toml>=0.10.2
 
 [acp]
 agent-client-protocol>=0.7.0
@@ -141,6 +143,10 @@ pytest-asyncio>=0.21.0
 [dynamodb]
 boto3>=1.35.0
 
+[flow]
+langflow>=1.0.0
+requests>=2.31.0
+
 [gradio]
 gradio>=4.26.0
 
@@ -150,6 +156,13 @@ langextract>=1.0.0
 [langfuse]
 langfuse>=3.0.0
 
+[langgraph]
+langgraph<2,>=0.2.0
+langgraph-prebuilt<2,>=0.2.0
+langchain-core<2,>=0.3.0
+langchain-openai<2,>=0.2.0
+praisonai-tools>=0.1.0
+
 [lite]
 
 [modal]
@@ -167,6 +180,10 @@ psycopg2-binary>=2.9.0
 [observability]
 langfuse>=3.0.0
 
+[openai-agents]
+praisonai-frameworks[openai-agents]>=0.1.3
+praisonai-tools>=0.1.0
+
 [os]
 fastapi>=0.115.0
 uvicorn>=0.34.0

{praisonai-4.6.82 → praisonai-4.6.95}/README.md

@@ -568,7 +568,7 @@ praisonai agents.yaml
 | Query Rewriter Agent | [Example](examples/python/agents/query-rewriter-agent.py) | [📖](https://docs.praison.ai/docs/agents/query-rewriter) |
 | Native Web Search | [Example](examples/python/agents/websearch-agent.py) | [📖](https://docs.praison.ai/docs/agents/websearch) |
 | Built-in Search Tools | [Example](examples/python/agents/websearch-agent.py) | [📖](https://docs.praison.ai/docs/tools/tavily) |
-| Unified Web Search | [Example](src/praisonai-agents/examples/web_search_example.py) | [📖](https://docs.praison.ai/docs/tools/web-search) |
+| Unified Web Search | [Example](examples/python/web_search_example.py) | [📖](https://docs.praison.ai/docs/tools/web-search) |
 | Web Fetch (Anthropic) | [Example](examples/python/agents/web-fetch-agent.py) | [📖](https://docs.praison.ai/docs/features/model-capabilities) |
 
 </details>

{praisonai-4.6.82 → praisonai-4.6.95}/praisonai/_async_bridge.py

@@ -7,11 +7,13 @@ on every call (which is expensive and breaks multi-agent workflows).
 """
 import asyncio
 import atexit
+import contextlib
+import contextvars
 import os
 import threading
 import concurrent.futures
 from concurrent.futures import CancelledError as FutureCancelledError, Future
-from typing import Awaitable, TypeVar
+from typing import Awaitable, Iterator, Optional, TypeVar
 
 T = TypeVar("T")
 
@@ -25,6 +27,13 @@ class AsyncBridge:
         self._loop: asyncio.AbstractEventLoop | None = None
         self._thread: threading.Thread | None = None
         self._lock = threading.Lock()
+        # Permanently-closed flag. Set by ``shutdown(permanent=True)`` for
+        # scope-owned bridges so a leaked context (e.g. an ``asyncio.Task`` that
+        # copied the ContextVar inside a ``scoped_bridge`` block) cannot silently
+        # resurrect an orphaned loop+thread after the scope exits. The shared
+        # default is never marked permanent so its only teardown is the atexit
+        # hook at process exit.
+        self._closed = False
         # Identity of the thread currently holding ``self._lock``. Set under the
         # lock by ``get()``/``submit()`` so ``_spawn_locked()`` can verify the
         # *caller* (not merely *someone*) owns the lock.
@@ -47,6 +56,16 @@ class AsyncBridge:
             raise AssertionError(
                 "_spawn_locked() must be called while holding self._lock"
             )
+        # Refuse to resurrect a permanently-closed (scope-owned) bridge. This
+        # guards the case where a context copied inside ``scoped_bridge`` outlives
+        # the ``with`` block and later tries to run work through the now-shut-down
+        # bridge: instead of silently starting an orphaned loop+thread that no
+        # scope or atexit hook owns, fail loudly.
+        if self._closed:
+            raise RuntimeError(
+                "AsyncBridge has been shut down and cannot be reused; "
+                "this usually means a context outlived its scoped_bridge() block"
+            )
         if self._loop is None or self._loop.is_closed():
             self._loop = asyncio.new_event_loop()
             self._thread = threading.Thread(
@@ -103,9 +122,22 @@ class AsyncBridge:
             fut.cancel()
             raise
 
-    def shutdown(self, timeout: float = 5.0) -> None:
+    def shutdown(self, timeout: float = 5.0, *, permanent: bool = False) -> None:
+        """Tear down the loop+thread.
+
+        Args:
+            timeout: Seconds to wait for in-flight tasks to cancel and the
+                background thread to join.
+            permanent: When ``True`` the bridge is marked closed and may not be
+                reused; a later ``run_sync``/``submit`` raises ``RuntimeError``
+                rather than silently resurrecting an orphaned loop. Used by
+                :func:`scoped_bridge` for the bridges it owns. The shared default
+                is shut down with ``permanent=False`` so it never poisons callers.
+        """
         # Snapshot loop and thread outside lock to avoid holding lock during wait
         with self._lock:
+            if permanent:
+                self._closed = True
             loop, thread = self._loop, self._thread
             if loop is None:
                 return
@@ -149,10 +181,67 @@ class AsyncBridge:
 _BG: AsyncBridge = AsyncBridge()
 
 
+# Context-scoped override. When set (via :func:`scoped_bridge`), callers in that
+# context — and any code they transitively invoke, including async tasks that
+# copy the context — resolve to the scoped bridge instead of the shared default.
+# This lets server/gateway/managed callers bind a per-session loop+thread
+# without rewriting internal modules that import ``run_sync`` directly.
+_bridge_var: contextvars.ContextVar[Optional[AsyncBridge]] = contextvars.ContextVar(
+    "praisonai_async_bridge", default=None
+)
+
+
 def _default_bridge() -> AsyncBridge:
+    """Resolve the active bridge: context-scoped override, else shared default."""
+    scoped = _bridge_var.get()
+    if scoped is not None:
+        return scoped
     return _BG
 
 
+def current_bridge() -> AsyncBridge:
+    """Return the :class:`AsyncBridge` active in the current context.
+
+    Returns the bridge bound by an enclosing :func:`scoped_bridge` block, or the
+    process-wide shared default when no scope is active. Prefer this over reaching
+    for the module-level ``_BG`` so embedders can override the bridge via
+    dependency injection.
+    """
+    return _default_bridge()
+
+
+@contextlib.contextmanager
+def scoped_bridge(bridge: Optional[AsyncBridge] = None) -> Iterator[AsyncBridge]:
+    """Bind a per-scope :class:`AsyncBridge` for the duration of the ``with`` block.
+
+    Server callers (``praisonai serve``, gateway, managed agents) can isolate a
+    session's sync→async work onto its own loop+thread so a stuck coroutine in one
+    session does not park the shared default loop for every other session::
+
+        with scoped_bridge() as bridge:
+            run_sync(some_coro())   # uses ``bridge`` instead of the global default
+            ...
+        # bridge is shut down automatically on exit when created here.
+
+    Args:
+        bridge: An existing bridge to bind. When ``None`` a fresh bridge is created
+            for the scope and shut down on exit. A caller-provided bridge is left
+            untouched (the caller owns its lifecycle).
+    """
+    owns = bridge is None
+    if bridge is None:
+        bridge = AsyncBridge()
+    token = _bridge_var.set(bridge)
+    try:
+        yield bridge
+    finally:
+        _bridge_var.reset(token)
+        if owns:
+            # ``permanent=True`` poisons the bridge so a context that copied the
+            # ContextVar inside this block cannot resurrect it after we exit.
+            bridge.shutdown(permanent=True)
+
+
 def _shutdown_default() -> None:
     """Private process-exit hook: tear down the shared default bridge.
 

{praisonai-4.6.82 → praisonai-4.6.95}/praisonai/_framework_availability.py

@@ -20,6 +20,29 @@ def _autogen_v4_probe() -> bool:
     return (importlib.util.find_spec("autogen_agentchat") is not None
             and importlib.util.find_spec("autogen_ext") is not None)
 
+def _langgraph_probe() -> bool:
+    # find_spec on a submodule imports the parent package; guard against
+    # import-time errors in langgraph/its deps crashing the availability check.
+    try:
+        if importlib.util.find_spec("langgraph") is None:
+            return False
+        return importlib.util.find_spec("langgraph.prebuilt") is not None
+    except Exception:
+        return False
+
+def _openai_agents_probe() -> bool:
+    try:
+        importlib.metadata.distribution("openai-agents")
+    except importlib.metadata.PackageNotFoundError:
+        return False
+    if importlib.util.find_spec("agents") is None:
+        return False
+    try:
+        from agents import Runner  # noqa: F401
+        return True
+    except ImportError:
+        return False
+
 _PROBES: dict[str, Callable[[], bool]] = {
     "crewai":            lambda: importlib.util.find_spec("crewai") is not None,
     "autogen":           lambda: importlib.util.find_spec("autogen") is not None,
@@ -40,6 +63,8 @@ _PROBES: dict[str, Callable[[], bool]] = {
     "pinecone":          lambda: importlib.util.find_spec("pinecone") is not None,
     "qdrant_client":     lambda: importlib.util.find_spec("qdrant_client") is not None,
     "weaviate":          lambda: importlib.util.find_spec("weaviate") is not None,
+    "langgraph":         _langgraph_probe,
+    "openai_agents":     _openai_agents_probe,
 }
 
 def is_available(name: str) -> bool:

{praisonai-4.6.82 → praisonai-4.6.95}/praisonai/agents_generator.py

@@ -80,10 +80,6 @@ def __dir__():
 
 
 
-_TOOL_TIMEOUT_EXECUTOR = None
-# Eagerly initialised so concurrent first-callers always share one lock (and
-# therefore one executor); a lazily-created lock would itself race.
-_TOOL_TIMEOUT_EXECUTOR_LOCK = threading.Lock()
 _DEFAULT_TOOL_TIMEOUT_WORKERS = 32
 
 
@@ -113,33 +109,15 @@ def _resolve_tool_timeout_workers():
     return workers
 
 
-def _get_tool_timeout_executor():
-    """Lazily create a bounded, observable thread pool for sync tool timeouts.
-
-    Using a bounded pool (instead of unbounded bare daemon threads) means any
-    background work left running after a timeout is at least capped and named,
-    so operators can enumerate it rather than accumulating phantom threads.
-    """
-    global _TOOL_TIMEOUT_EXECUTOR
-    import concurrent.futures
-
-    with _TOOL_TIMEOUT_EXECUTOR_LOCK:
-        if _TOOL_TIMEOUT_EXECUTOR is None:
-            _TOOL_TIMEOUT_EXECUTOR = concurrent.futures.ThreadPoolExecutor(
-                max_workers=_resolve_tool_timeout_workers(),
-                thread_name_prefix="praisonai-tool-timeout",
-            )
-    return _TOOL_TIMEOUT_EXECUTOR
-
-
-def _wrap_with_timeout(tool, timeout_seconds: float):
+def _wrap_with_timeout(tool, timeout_seconds: float, executor_factory):
     """Enforce a per-call timeout on a tool, sync or async.
 
     For async tools the underlying task is cancelled on timeout. For sync tools
-    the call runs in a bounded thread pool; on timeout we best-effort cancel the
-    future and log a warning. Note: a synchronous call that has already started
-    cannot be forcibly interrupted, so background work may continue executing —
-    the returned payload flags this with ``background_work_may_continue``.
+    the call runs in an instance-owned bounded thread pool obtained from
+    ``executor_factory``; on timeout we best-effort cancel the future and log a
+    warning. Note: a synchronous call that has already started cannot be forcibly
+    interrupted, so background work may continue executing — the returned payload
+    flags this with ``background_work_may_continue``.
     """
     if timeout_seconds is None or timeout_seconds <= 0 or not callable(tool):
         return tool
@@ -165,7 +143,7 @@ def _wrap_with_timeout(tool, timeout_seconds: float):
 
     @functools.wraps(tool)
     def _sync_wrapped(*args, **kwargs):
-        executor = _get_tool_timeout_executor()
+        executor = executor_factory()
         future = executor.submit(tool, *args, **kwargs)
         try:
             return future.result(timeout=timeout_seconds)
@@ -235,7 +213,7 @@ def _resolve_yaml_cli_backend(cli_backend_config, logger):
 
 
 class AgentsGenerator:
-    def __init__(self, agent_file, framework, config_list, log_level=None, agent_callback=None, task_callback=None, agent_yaml=None, tools=None, cli_config=None, adapter_registry=None):
+    def __init__(self, agent_file, framework, config_list, log_level=None, agent_callback=None, task_callback=None, agent_yaml=None, tools=None, cli_config=None, adapter_registry=None, tool_timeout_executor=None):
         """
         Initialize the AgentsGenerator object.
 
@@ -289,11 +267,56 @@ class AgentsGenerator:
         # DI-friendly: tests/multi-tenant runtimes pass their own registry;
         # CLI users get the process default.
         self._adapter_registry = adapter_registry or _get_default_adapter_registry()
+
+        # Instance-owned tool-timeout executor so multi-tenant runtimes can scope
+        # it per session (no process-wide singleton). Created lazily on first use
+        # to avoid spawning threads for generators that never time a sync tool.
+        # A caller-supplied executor is treated as borrowed and never shut down.
+        self._tool_timeout_executor = tool_timeout_executor
+        self._owns_tool_timeout_executor = tool_timeout_executor is None
+        self._tool_timeout_executor_lock = threading.Lock()
         
         # Defer framework adapter creation until YAML is loaded
         # This fixes the issue where empty framework string fails before YAML framework is read
         self.framework_adapter = None
 
+    def _get_tool_timeout_executor(self):
+        """Lazily create this generator's bounded sync-tool-timeout thread pool.
+
+        The pool is owned by the instance (not a module global), so concurrent
+        sessions / tenants never share workers and a stuck tool in one session
+        cannot starve another.
+        """
+        import concurrent.futures
+
+        with self._tool_timeout_executor_lock:
+            if self._tool_timeout_executor is None:
+                self._tool_timeout_executor = concurrent.futures.ThreadPoolExecutor(
+                    max_workers=_resolve_tool_timeout_workers(),
+                    thread_name_prefix=f"praisonai-tool-timeout-{id(self):x}",
+                )
+            # Capture the reference inside the lock so a concurrent close() can
+            # never null the attribute out between the check and the return.
+            return self._tool_timeout_executor
+
+    def _wrap_tool_with_timeout(self, tool, timeout_seconds):
+        """Wrap a tool with this generator's instance-owned timeout executor."""
+        return _wrap_with_timeout(tool, timeout_seconds, self._get_tool_timeout_executor)
+
+    def close(self):
+        """Release the owned tool-timeout executor; safe to call repeatedly."""
+        with self._tool_timeout_executor_lock:
+            if self._owns_tool_timeout_executor and self._tool_timeout_executor is not None:
+                self._tool_timeout_executor.shutdown(wait=False, cancel_futures=True)
+                self._tool_timeout_executor = None
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc, tb):
+        self.close()
+        return False
+
     def _get_framework_adapter(self, framework: str) -> FrameworkAdapter:
         """
         Get the appropriate framework adapter for the given framework.
@@ -339,6 +362,21 @@ class AgentsGenerator:
         # Handle agent-level overrides using unified approach
         agent_level_fields = ['tool_timeout', 'tool_retry_policy', 'planning_tools', 'autonomy', 'planning', 'web', 'web_fetch']
         agent_overrides = {k: v for k, v in cli_config.items() if k in agent_level_fields}
+
+        if "tool_retry_policy" in agent_overrides:
+            policy = agent_overrides["tool_retry_policy"]
+            try:
+                from praisonaiagents.tools.retry import RetryPolicy
+
+                if isinstance(policy, RetryPolicy):
+                    agent_overrides["tool_retry_policy"] = {
+                        "max_attempts": policy.max_attempts,
+                        "delay": policy.initial_delay_ms / 1000.0,
+                        "backoff_factor": policy.backoff_factor,
+                        "max_delay": policy.max_delay_ms / 1000.0,
+                    }
+            except (ImportError, AttributeError, TypeError):
+                pass
         
         # Handle handoff configuration - convert CLI flags into handoff dict
         handoff_fields = ['handoff', 'handoff_policy', 'handoff_timeout', 'handoff_max_depth', 'handoff_max_concurrent', 'handoff_detect_cycles']
@@ -708,6 +746,16 @@ class AgentsGenerator:
         # Ensure name is present
         if 'name' not in config:
             config['name'] = config.get('topic', 'Workflow')
+
+        from .framework_adapters.workflow_framework import (
+            framework_from_config,
+            validate_workflow_framework,
+        )
+        effective_framework = (self.framework or framework_from_config(config))
+        validate_workflow_framework(
+            effective_framework,
+            source="agents.yaml workflow section",
+        )
         
         # Pass model from config_list to workflow as default_llm
         if self.config_list and self.config_list[0].get('model'):
@@ -763,6 +811,16 @@ class AgentsGenerator:
         # Ensure name is present (YAMLWorkflowParser handles roles->agents conversion)
         if 'name' not in config:
             config['name'] = config.get('topic', 'Workflow')
+
+        from .framework_adapters.workflow_framework import (
+            framework_from_config,
+            validate_workflow_framework,
+        )
+        effective_framework = (self.framework or framework_from_config(config))
+        validate_workflow_framework(
+            effective_framework,
+            source="agents.yaml workflow section",
+        )
         
         # Pass model from config_list to workflow as default_llm
         if self.config_list and self.config_list[0].get('model'):