ouroboros-ai 0.31.2.dev20__tar.gz → 0.31.2.dev22__tar.gz

{ouroboros_ai-0.31.2.dev20 → ouroboros_ai-0.31.2.dev22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ouroboros-ai
-Version: 0.31.2.dev20
+Version: 0.31.2.dev22
 Summary: Specification-first workflow engine for AI coding agents. Works with Claude Code and Codex CLI.
 Author-email: Q00 <jqyu.lee@gmail.com>
 License-File: LICENSE

{ouroboros_ai-0.31.2.dev20 → ouroboros_ai-0.31.2.dev22}/src/ouroboros/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.31.2.dev20'
-__version_tuple__ = version_tuple = (0, 31, 2, 'dev20')
+__version__ = version = '0.31.2.dev22'
+__version_tuple__ = version_tuple = (0, 31, 2, 'dev22')
 
 __commit_id__ = commit_id = None

{ouroboros_ai-0.31.2.dev20 → ouroboros_ai-0.31.2.dev22}/src/ouroboros/mcp/server/adapter.py

@@ -35,6 +35,8 @@ from ouroboros.mcp.types import (
     MCPToolResult,
     ToolInputType,
 )
+from ouroboros.orchestrator.agent_runtime_context import AgentRuntimeContext
+from ouroboros.orchestrator.control_bus import ControlBus
 
 log = structlog.get_logger(__name__)
 
@@ -322,6 +324,7 @@ class MCPServerAdapter:
         self._prompt_handlers: dict[str, PromptHandler] = {}
         self._mcp_server: Any = None
         self._owned_resources: list[Any] = []  # objects with async close()
+        self._runtime_context: AgentRuntimeContext | None = None
 
         # Initialize security layer
         self._security = SecurityLayer(
@@ -697,6 +700,15 @@ class MCPServerAdapter:
         else:
             await self._mcp_server.run_stdio_async()
 
+    @property
+    def runtime_context(self) -> AgentRuntimeContext | None:
+        """Return the session-scoped runtime context owned by this server."""
+        return self._runtime_context
+
+    def set_runtime_context(self, context: AgentRuntimeContext) -> None:
+        """Attach the session-scoped runtime context to the server object graph."""
+        self._runtime_context = context
+
     def register_owned_resource(self, resource: Any) -> None:
         """Register a resource whose ``close()`` will be called on shutdown."""
         self._owned_resources.append(resource)
@@ -1460,11 +1472,34 @@ def create_ouroboros_server(
     if brownfield_store is not None:
         server.register_owned_resource(brownfield_store)
 
-    # Inject bridge into all BridgeAwareMixin handlers (loop-based auto-discovery)
+    # Build the AgentRuntimeContext that #474 funnels through every
+    # handler. For now the context only exposes the EventStore, the
+    # backend labels, the optional MCP bridge, and a fresh ControlBus
+    # for #515. Subsequent migration slices move handler internals to
+    # consume context.mcp_bridge directly instead of self.mcp_manager.
+    agent_runtime_context = AgentRuntimeContext(
+        event_store=event_store,
+        runtime_backend=resolved_runtime_backend,
+        llm_backend=llm_backend,
+        mcp_bridge=mcp_bridge,
+        control=ControlBus(),
+    )
+    server.set_runtime_context(agent_runtime_context)
+
+    # Inject the bridge from the runtime context into every
+    # BridgeAwareMixin handler. ``inject_runtime_context`` is byte-
+    # equivalent to the legacy ``inject_bridge`` for the same bridge —
+    # the swap is purely about giving every handler a single funnel
+    # (the context) instead of the per-handler ``mcp_manager`` plumbing
+    # this PR series is replacing.
     if mcp_bridge is not None:
-        from ouroboros.mcp.tools.bridge_mixin import inject_bridge
+        from ouroboros.mcp.tools.bridge_mixin import inject_runtime_context
 
-        injected = [type(h).__name__ for h in tool_handlers if inject_bridge(h, mcp_bridge)]
+        injected = [
+            type(h).__name__
+            for h in tool_handlers
+            if inject_runtime_context(h, agent_runtime_context)
+        ]
         if injected:
             log.info("mcp.bridge.injected", handlers=injected)
         server.register_owned_resource(mcp_bridge)

{ouroboros_ai-0.31.2.dev20 → ouroboros_ai-0.31.2.dev22}/src/ouroboros/mcp/tools/definitions.py

@@ -19,6 +19,8 @@ Handler modules:
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from ouroboros.mcp.tools.ac_tree_hud_handler import ACTreeHUDHandler
 from ouroboros.mcp.tools.authoring_handlers import (
     GenerateSeedHandler,
@@ -54,6 +56,29 @@ from ouroboros.mcp.tools.query_handlers import (
     SessionStatusHandler,
 )
 
+if TYPE_CHECKING:
+    from ouroboros.orchestrator.agent_runtime_context import AgentRuntimeContext
+
+
+def _resolve_bridge_fields(
+    context: AgentRuntimeContext | None,
+    mcp_manager: object | None,
+    mcp_tool_prefix: str,
+) -> tuple[object | None, str]:
+    """Pick which (mcp_manager, mcp_tool_prefix) pair the factory should use.
+
+    When ``context`` is provided and carries an ``mcp_bridge``, its bridge
+    wins over the legacy explicit kwargs — that is the migration path
+    captured by #474. When ``context`` is ``None`` (or carries no
+    bridge), the legacy kwargs are returned unchanged so existing
+    callers continue to work.
+    """
+    if context is not None and context.mcp_bridge is not None:
+        bridge = context.mcp_bridge
+        return getattr(bridge, "manager", None), getattr(bridge, "tool_prefix", "")
+    return mcp_manager, mcp_tool_prefix
+
+
 # ---------------------------------------------------------------------------
 # Convenience factory functions
 # ---------------------------------------------------------------------------
@@ -66,13 +91,24 @@ def execute_seed_handler(
     mcp_manager: object | None = None,
     mcp_tool_prefix: str = "",
     opencode_mode: str | None = None,
+    context: AgentRuntimeContext | None = None,
 ) -> ExecuteSeedHandler:
-    """Create an ExecuteSeedHandler instance."""
+    """Create an ExecuteSeedHandler instance.
+
+    When ``context`` is provided and carries an ``mcp_bridge``, the
+    bridge supersedes the explicit ``mcp_manager`` / ``mcp_tool_prefix``
+    kwargs. This is the migration path captured by #474; the legacy
+    kwargs continue to work for callers that have not adopted
+    :class:`AgentRuntimeContext`.
+    """
+    resolved_manager, resolved_prefix = _resolve_bridge_fields(
+        context, mcp_manager, mcp_tool_prefix
+    )
     return ExecuteSeedHandler(
         agent_runtime_backend=runtime_backend,
         llm_backend=llm_backend,
-        mcp_manager=mcp_manager,
-        mcp_tool_prefix=mcp_tool_prefix,
+        mcp_manager=resolved_manager,
+        mcp_tool_prefix=resolved_prefix,
         opencode_mode=opencode_mode,
     )
 
@@ -84,13 +120,21 @@ def start_execute_seed_handler(
     mcp_manager: object | None = None,
     mcp_tool_prefix: str = "",
     opencode_mode: str | None = None,
+    context: AgentRuntimeContext | None = None,
 ) -> StartExecuteSeedHandler:
-    """Create a StartExecuteSeedHandler instance."""
+    """Create a StartExecuteSeedHandler instance.
+
+    Accepts the same ``context`` keyword as :func:`execute_seed_handler`;
+    see that function's docstring for the migration semantics.
+    """
+    resolved_manager, resolved_prefix = _resolve_bridge_fields(
+        context, mcp_manager, mcp_tool_prefix
+    )
     execute_handler = ExecuteSeedHandler(
         agent_runtime_backend=runtime_backend,
         llm_backend=llm_backend,
-        mcp_manager=mcp_manager,
-        mcp_tool_prefix=mcp_tool_prefix,
+        mcp_manager=resolved_manager,
+        mcp_tool_prefix=resolved_prefix,
         opencode_mode=opencode_mode,
     )
     return StartExecuteSeedHandler(
@@ -285,6 +329,7 @@ def get_ouroboros_tools(
     mcp_manager: object | None = None,
     mcp_tool_prefix: str = "",
     opencode_mode: str | None = None,
+    context: AgentRuntimeContext | None = None,
 ) -> OuroborosToolHandlers:
     """Create the default set of Ouroboros MCP tool handlers.
 
@@ -294,12 +339,20 @@ def get_ouroboros_tools(
     In every other combination (including ``opencode_mode=None``) the handler
     falls through to its real in-process path. See
     ``ouroboros.mcp.tools.subagent.should_dispatch_via_plugin``.
+
+    When ``context`` is provided and carries an ``mcp_bridge``, the
+    bridge supersedes the explicit ``mcp_manager`` / ``mcp_tool_prefix``
+    kwargs (see :func:`_resolve_bridge_fields`). This is the migration
+    path captured by #474; legacy kwargs continue to work unchanged.
     """
+    resolved_manager, resolved_prefix = _resolve_bridge_fields(
+        context, mcp_manager, mcp_tool_prefix
+    )
     execute_seed = ExecuteSeedHandler(
         agent_runtime_backend=runtime_backend,
         llm_backend=llm_backend,
-        mcp_manager=mcp_manager,
-        mcp_tool_prefix=mcp_tool_prefix,
+        mcp_manager=resolved_manager,
+        mcp_tool_prefix=resolved_prefix,
         opencode_mode=opencode_mode,
     )
     start_execute = StartExecuteSeedHandler(

{ouroboros_ai-0.31.2.dev20 → ouroboros_ai-0.31.2.dev22}/tests/unit/mcp/server/test_adapter.py

@@ -1032,3 +1032,15 @@ class TestCreateOuroborosServerBrownfieldStore:
 
         assert captured_handler_kwargs["_store"] is mock_brownfield_store
         assert server._owned_resources == [mock_event_store, mock_brownfield_store]
+
+
+def test_create_ouroboros_server_retains_runtime_context() -> None:
+    """The composition root must keep AgentRuntimeContext reachable after return."""
+    from ouroboros.mcp.server.adapter import create_ouroboros_server
+
+    server = create_ouroboros_server(runtime_backend="codex", llm_backend="claude_code")
+
+    assert server.runtime_context is not None
+    assert server.runtime_context.runtime_backend == "codex"
+    assert server.runtime_context.llm_backend == "claude_code"
+    assert server.runtime_context.control is not None

ouroboros_ai-0.31.2.dev22/tests/unit/mcp/tools/test_definitions_runtime_context.py

@@ -0,0 +1,107 @@
+"""Tests for context-aware factory kwargs added in slice 2 of #474.
+
+The three factories (``execute_seed_handler``,
+``start_execute_seed_handler``, ``get_ouroboros_tools``) now accept an
+optional ``context: AgentRuntimeContext`` keyword. When the context
+carries an ``mcp_bridge`` it supersedes the explicit ``mcp_manager`` /
+``mcp_tool_prefix`` kwargs; otherwise the legacy kwargs are used
+unchanged. This module pins both paths.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any
+
+from ouroboros.mcp.tools.definitions import (
+    execute_seed_handler,
+    get_ouroboros_tools,
+    start_execute_seed_handler,
+)
+from ouroboros.orchestrator.agent_runtime_context import AgentRuntimeContext
+from ouroboros.persistence.event_store import EventStore
+
+
+@dataclass
+class _FakeBridge:
+    manager: Any = None
+    tool_prefix: str = ""
+
+
+def _context(bridge: _FakeBridge | None = None) -> AgentRuntimeContext:
+    store = EventStore("sqlite+aiosqlite:///:memory:")
+    return AgentRuntimeContext(event_store=store, mcp_bridge=bridge)
+
+
+class TestExecuteSeedHandlerFactory:
+    def test_context_bridge_overrides_explicit_kwargs(self) -> None:
+        manager = object()
+        bridge = _FakeBridge(manager=manager, tool_prefix="ctx_")
+        ignored_manager = object()
+
+        handler = execute_seed_handler(
+            mcp_manager=ignored_manager,  # legacy explicit
+            mcp_tool_prefix="legacy_",
+            context=_context(bridge=bridge),
+        )
+
+        assert handler.mcp_manager is manager
+        assert handler.mcp_tool_prefix == "ctx_"
+
+    def test_legacy_kwargs_used_when_context_is_none(self) -> None:
+        manager = object()
+        handler = execute_seed_handler(mcp_manager=manager, mcp_tool_prefix="legacy_")
+
+        assert handler.mcp_manager is manager
+        assert handler.mcp_tool_prefix == "legacy_"
+
+    def test_context_without_bridge_does_not_override(self) -> None:
+        legacy_manager = object()
+        handler = execute_seed_handler(
+            mcp_manager=legacy_manager,
+            mcp_tool_prefix="legacy_",
+            context=_context(bridge=None),
+        )
+
+        assert handler.mcp_manager is legacy_manager
+        assert handler.mcp_tool_prefix == "legacy_"
+
+
+class TestStartExecuteSeedHandlerFactory:
+    def test_context_bridge_overrides_explicit_kwargs(self) -> None:
+        manager = object()
+        bridge = _FakeBridge(manager=manager, tool_prefix="ctx_")
+
+        handler = start_execute_seed_handler(
+            mcp_manager=object(),
+            mcp_tool_prefix="legacy_",
+            context=_context(bridge=bridge),
+        )
+
+        assert handler.execute_handler.mcp_manager is manager
+        assert handler.execute_handler.mcp_tool_prefix == "ctx_"
+
+
+class TestGetOuroborosTools:
+    def test_context_bridge_propagates_to_execute_seed_handler(self) -> None:
+        manager = object()
+        bridge = _FakeBridge(manager=manager, tool_prefix="ctx_")
+
+        handlers = get_ouroboros_tools(
+            mcp_manager=object(),  # legacy — must lose
+            mcp_tool_prefix="legacy_",
+            context=_context(bridge=bridge),
+        )
+
+        # ExecuteSeedHandler is exposed via the OuroborosToolHandlers tuple;
+        # find it by class identity to avoid coupling to the field order.
+        execute_handler = next(h for h in handlers if type(h).__name__ == "ExecuteSeedHandler")
+        assert execute_handler.mcp_manager is manager
+        assert execute_handler.mcp_tool_prefix == "ctx_"
+
+    def test_no_context_keeps_legacy_kwargs(self) -> None:
+        manager = object()
+        handlers = get_ouroboros_tools(mcp_manager=manager, mcp_tool_prefix="legacy_")
+        execute_handler = next(h for h in handlers if type(h).__name__ == "ExecuteSeedHandler")
+        assert execute_handler.mcp_manager is manager
+        assert execute_handler.mcp_tool_prefix == "legacy_"