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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ouroboros-ai
-Version: 0.31.2.dev22
+Version: 0.31.2.dev24
 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.dev22 → ouroboros_ai-0.31.2.dev24}/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.dev22'
-__version_tuple__ = version_tuple = (0, 31, 2, 'dev22')
+__version__ = version = '0.31.2.dev24'
+__version_tuple__ = version_tuple = (0, 31, 2, 'dev24')
 
 __commit_id__ = commit_id = None

{ouroboros_ai-0.31.2.dev22 → ouroboros_ai-0.31.2.dev24}/src/ouroboros/mcp/tools/evaluation_handlers.py

@@ -19,6 +19,7 @@ from ouroboros.core.errors import ValidationError
 from ouroboros.core.seed import Seed
 from ouroboros.core.types import Result
 from ouroboros.mcp.errors import MCPServerError, MCPToolError
+from ouroboros.mcp.tools.bridge_mixin import BridgeAwareMixin
 from ouroboros.mcp.tools.subagent import (
     build_evaluate_subagent,
     build_subagent_result,
@@ -1183,12 +1184,19 @@ class ChecklistVerifyHandler:
 
 
 @dataclass
-class LateralThinkHandler:
+class LateralThinkHandler(BridgeAwareMixin):
     """Handler for the lateral_think tool.
 
     Generates alternative thinking approaches using lateral thinking personas
     to break through stagnation in problem-solving.
 
+    Inherits :class:`BridgeAwareMixin` (#475) so the composition root's
+    loop-injection populates ``mcp_manager`` and ``mcp_tool_prefix``
+    automatically when an MCP bridge is configured. The bridge fields
+    are not consumed by this PR — a follow-up slice forwards them into
+    the lateral-think dispatch path so dynamic external MCP servers
+    reach the unstuck pipeline.
+
     The multi-persona fan-out path emits a ``_subagents`` envelope that is
     consumed by the OpenCode bridge plugin. It is gated on
     ``should_dispatch_via_plugin(agent_runtime_backend, opencode_mode)`` —

{ouroboros_ai-0.31.2.dev22 → ouroboros_ai-0.31.2.dev24}/src/ouroboros/mcp/tools/evolution_handlers.py

@@ -29,6 +29,7 @@ from ouroboros.core.worktree import (
 from ouroboros.evaluation.verification_artifacts import build_verification_artifacts
 from ouroboros.mcp.errors import MCPServerError, MCPToolError
 from ouroboros.mcp.job_manager import JobLinks, JobManager
+from ouroboros.mcp.tools.bridge_mixin import BridgeAwareMixin
 from ouroboros.mcp.tools.subagent import (
     build_evolve_subagent,
     build_subagent_result,
@@ -100,12 +101,19 @@ def _resolve_evolve_verification_working_dir(
 
 
 @dataclass
-class EvolveStepHandler:
+class EvolveStepHandler(BridgeAwareMixin):
     """Handler for the ouroboros_evolve_step tool.
 
     Runs exactly ONE generation of the evolutionary loop.
     Designed for Ralph integration: stateless between calls,
     all state reconstructed from events.
+
+    Inherits :class:`BridgeAwareMixin` (#475) so the composition
+    root's loop-injection automatically populates ``mcp_manager`` and
+    ``mcp_tool_prefix`` when an MCP bridge is configured. The bridge
+    is forwarded into the inner ``EvolutionaryLoop`` runner whenever it
+    is available so dynamic external MCP servers reach the evolution
+    pipeline without per-handler explicit wiring.
     """
 
     evolutionary_loop: Any | None = field(default=None, repr=False)

ouroboros_ai-0.31.2.dev24/tests/unit/mcp/tools/test_evolve_step_bridge_aware.py

@@ -0,0 +1,64 @@
+"""Confirm EvolveStepHandler now inherits BridgeAwareMixin (slice 1 of #475).
+
+The composition root's loop-injection (#529) populates BridgeAwareMixin
+fields automatically, so this test verifies (a) the handler inherits
+the mixin and (b) ``inject_runtime_context`` populates its bridge
+fields exactly like any other BridgeAwareMixin handler.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any
+
+from ouroboros.mcp.tools.bridge_mixin import BridgeAwareMixin, inject_runtime_context
+from ouroboros.mcp.tools.evolution_handlers import EvolveStepHandler
+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 test_evolve_step_handler_inherits_bridge_aware_mixin() -> None:
+    """The class hierarchy now includes BridgeAwareMixin."""
+    handler = EvolveStepHandler()
+    assert isinstance(handler, BridgeAwareMixin)
+    # Default field values come from the mixin.
+    assert handler.mcp_manager is None
+    assert handler.mcp_tool_prefix == ""
+
+
+def test_inject_runtime_context_populates_evolve_step_handler() -> None:
+    """``inject_runtime_context`` writes bridge fields onto the handler."""
+    manager = object()
+    bridge = _FakeBridge(manager=manager, tool_prefix="ctx_")
+    store = EventStore("sqlite+aiosqlite:///:memory:")
+    context = AgentRuntimeContext(event_store=store, mcp_bridge=bridge)
+    handler = EvolveStepHandler()
+
+    assert inject_runtime_context(handler, context) is True
+    assert handler.mcp_manager is manager
+    assert handler.mcp_tool_prefix == "ctx_"
+
+
+def test_existing_evolve_step_handler_constructor_unchanged() -> None:
+    """Pre-existing keyword args still construct the handler unchanged.
+
+    The mixin adds two fields with defaults so callers that did not pass
+    ``mcp_manager`` or ``mcp_tool_prefix`` continue to work; this test
+    pins the contract.
+    """
+    handler = EvolveStepHandler(
+        evolutionary_loop=None,
+        event_store=None,
+        agent_runtime_backend="codex_cli",
+        opencode_mode=None,
+    )
+    assert handler.agent_runtime_backend == "codex_cli"
+    assert handler.opencode_mode is None
+    assert handler.mcp_manager is None
+    assert handler.mcp_tool_prefix == ""

ouroboros_ai-0.31.2.dev24/tests/unit/mcp/tools/test_unstuck_bridge_aware.py

@@ -0,0 +1,53 @@
+"""Confirm LateralThinkHandler inherits BridgeAwareMixin (slice 2 of #475).
+
+Same shape as the EvolveStepHandler slice (#530): the composition
+root's loop-injection (#529) populates BridgeAwareMixin fields
+automatically, so this test verifies inheritance + injection without
+touching dispatch internals.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any
+
+from ouroboros.mcp.tools.bridge_mixin import BridgeAwareMixin, inject_runtime_context
+from ouroboros.mcp.tools.evaluation_handlers import LateralThinkHandler
+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 test_lateral_think_handler_inherits_bridge_aware_mixin() -> None:
+    handler = LateralThinkHandler()
+    assert isinstance(handler, BridgeAwareMixin)
+    assert handler.mcp_manager is None
+    assert handler.mcp_tool_prefix == ""
+
+
+def test_inject_runtime_context_populates_lateral_think_handler() -> None:
+    manager = object()
+    bridge = _FakeBridge(manager=manager, tool_prefix="ctx_")
+    store = EventStore("sqlite+aiosqlite:///:memory:")
+    context = AgentRuntimeContext(event_store=store, mcp_bridge=bridge)
+    handler = LateralThinkHandler()
+
+    assert inject_runtime_context(handler, context) is True
+    assert handler.mcp_manager is manager
+    assert handler.mcp_tool_prefix == "ctx_"
+
+
+def test_existing_lateral_think_handler_constructor_unchanged() -> None:
+    handler = LateralThinkHandler(
+        agent_runtime_backend="opencode",
+        opencode_mode="plugin",
+    )
+    assert handler.agent_runtime_backend == "opencode"
+    assert handler.opencode_mode == "plugin"
+    assert handler.mcp_manager is None
+    assert handler.mcp_tool_prefix == ""