ouroboros-ai 0.25.3.dev87__tar.gz → 0.25.3.dev89__tar.gz

{ouroboros_ai-0.25.3.dev87 → ouroboros_ai-0.25.3.dev89}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ouroboros-ai
-Version: 0.25.3.dev87
+Version: 0.25.3.dev89
 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.25.3.dev87 → ouroboros_ai-0.25.3.dev89}/src/ouroboros/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.25.3.dev87'
-__version_tuple__ = version_tuple = (0, 25, 3, 'dev87')
+__version__ = version = '0.25.3.dev89'
+__version_tuple__ = version_tuple = (0, 25, 3, 'dev89')
 
 __commit_id__ = commit_id = None

{ouroboros_ai-0.25.3.dev87 → ouroboros_ai-0.25.3.dev89}/src/ouroboros/orchestrator/codex_cli_runtime.py

@@ -728,6 +728,25 @@ class CodexCliRuntime:
             return None
         return current_handle.native_session_id
 
+    def _build_child_env(self) -> dict[str, str]:
+        """Build an isolated environment for child runtime processes.
+
+        Strips ``OUROBOROS_AGENT_RUNTIME`` and ``OUROBOROS_LLM_BACKEND`` so
+        that a child Codex process does not re-load the Ouroboros MCP server,
+        preventing the recursive startup loop described in #185.
+        """
+        env = os.environ.copy()
+        # Prevent child from re-entering Ouroboros MCP
+        for key in ("OUROBOROS_AGENT_RUNTIME", "OUROBOROS_LLM_BACKEND"):
+            env.pop(key, None)
+        # Track recursion depth for diagnostics (defensive: ignore malformed values)
+        try:
+            depth = int(env.get("_OUROBOROS_DEPTH", "0")) + 1
+        except (ValueError, TypeError):
+            depth = 1
+        env["_OUROBOROS_DEPTH"] = str(depth)
+        return env
+
     def _requires_process_stdin(self) -> bool:
         """Return True when the runtime needs a writable stdin pipe."""
         return True
@@ -1441,6 +1460,7 @@ class CodexCliRuntime:
                 stdin=(asyncio.subprocess.PIPE if self._requires_process_stdin() else None),
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
+                env=self._build_child_env(),
             )
         except FileNotFoundError as e:
             yield AgentMessage(

{ouroboros_ai-0.25.3.dev87 → ouroboros_ai-0.25.3.dev89}/src/ouroboros/orchestrator/session.py

@@ -764,6 +764,13 @@ class SessionRepository:
                     }:
                         explicit_terminal_status = status_update
 
+            # Sanitize stale runtime metadata when session reached a terminal
+            # state.  Progress events captured during execution may contain
+            # ``runtime_status: running`` which contradicts the authoritative
+            # terminal status and confuses downstream consumers (#188).
+            if explicit_terminal_status is not None and last_progress.get("runtime_status"):
+                last_progress["runtime_status"] = explicit_terminal_status.value
+
             # Apply accumulated progress
             tracker = replace(
                 tracker,

{ouroboros_ai-0.25.3.dev87 → ouroboros_ai-0.25.3.dev89}/src/ouroboros/providers/codex_cli_adapter.py

@@ -612,6 +612,22 @@ class CodexCliLLMAdapter:
 
         return stdout_lines, stderr_lines, session_id, last_content
 
+    @staticmethod
+    def _build_child_env() -> dict[str, str]:
+        """Build an isolated environment for child Codex processes.
+
+        Strips Ouroboros MCP env vars to prevent recursive startup (#185).
+        """
+        env = os.environ.copy()
+        for key in ("OUROBOROS_AGENT_RUNTIME", "OUROBOROS_LLM_BACKEND"):
+            env.pop(key, None)
+        try:
+            depth = int(env.get("_OUROBOROS_DEPTH", "0")) + 1
+        except (ValueError, TypeError):
+            depth = 1
+        env["_OUROBOROS_DEPTH"] = str(depth)
+        return env
+
     async def _complete_once(
         self,
         messages: list[Message],
@@ -650,6 +666,7 @@ class CodexCliLLMAdapter:
                 stdin=asyncio.subprocess.PIPE,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
+                env=self._build_child_env(),
             )
         except FileNotFoundError as exc:
             output_path.unlink(missing_ok=True)

ouroboros_ai-0.25.3.dev89/tests/unit/orchestrator/test_codex_recursion_guard.py

@@ -0,0 +1,90 @@
+"""Tests for Codex recursive startup prevention (#185)."""
+
+from __future__ import annotations
+
+import os
+from unittest.mock import patch
+
+from ouroboros.orchestrator.codex_cli_runtime import CodexCliRuntime
+from ouroboros.providers.codex_cli_adapter import CodexCliLLMAdapter
+
+
+def _make_runtime() -> CodexCliRuntime:
+    """Create a bare CodexCliRuntime without __init__ side effects."""
+    return CodexCliRuntime.__new__(CodexCliRuntime)
+
+
+class TestCodexCliRuntimeChildEnv:
+    """Test _build_child_env strips dangerous env vars."""
+
+    def test_strips_ouroboros_agent_runtime(self) -> None:
+        """Child env must not contain OUROBOROS_AGENT_RUNTIME."""
+        runtime = _make_runtime()
+        with patch.dict(os.environ, {"OUROBOROS_AGENT_RUNTIME": "codex"}):
+            env = runtime._build_child_env()
+        assert "OUROBOROS_AGENT_RUNTIME" not in env
+
+    def test_strips_ouroboros_llm_backend(self) -> None:
+        """Child env must not contain OUROBOROS_LLM_BACKEND."""
+        runtime = _make_runtime()
+        with patch.dict(os.environ, {"OUROBOROS_LLM_BACKEND": "codex"}):
+            env = runtime._build_child_env()
+        assert "OUROBOROS_LLM_BACKEND" not in env
+
+    def test_increments_depth_counter(self) -> None:
+        """Each child process increments _OUROBOROS_DEPTH."""
+        runtime = _make_runtime()
+        with patch.dict(os.environ, {"_OUROBOROS_DEPTH": "2"}):
+            env = runtime._build_child_env()
+        assert env["_OUROBOROS_DEPTH"] == "3"
+
+    def test_depth_starts_at_one_when_absent(self) -> None:
+        """First child starts at depth 1 when parent has no depth var."""
+        runtime = _make_runtime()
+        env_clean = {k: v for k, v in os.environ.items() if k != "_OUROBOROS_DEPTH"}
+        with patch.dict(os.environ, env_clean, clear=True):
+            env = runtime._build_child_env()
+        assert env["_OUROBOROS_DEPTH"] == "1"
+
+    def test_malformed_depth_defaults_to_one(self) -> None:
+        """Non-integer _OUROBOROS_DEPTH falls back to 1 instead of crashing."""
+        runtime = _make_runtime()
+        with patch.dict(os.environ, {"_OUROBOROS_DEPTH": "not_a_number"}):
+            env = runtime._build_child_env()
+        assert env["_OUROBOROS_DEPTH"] == "1"
+
+    def test_empty_depth_defaults_to_one(self) -> None:
+        """Empty string _OUROBOROS_DEPTH falls back to 1."""
+        runtime = _make_runtime()
+        with patch.dict(os.environ, {"_OUROBOROS_DEPTH": ""}):
+            env = runtime._build_child_env()
+        assert env["_OUROBOROS_DEPTH"] == "1"
+
+    def test_preserves_other_env_vars(self) -> None:
+        """Non-Ouroboros env vars are preserved."""
+        runtime = _make_runtime()
+        with patch.dict(os.environ, {"MY_TEST_VAR": "hello"}):
+            env = runtime._build_child_env()
+        assert env.get("MY_TEST_VAR") == "hello"
+
+
+class TestCodexCliAdapterChildEnv:
+    """Test that CodexCliLLMAdapter also strips env vars."""
+
+    def test_strips_ouroboros_agent_runtime(self) -> None:
+        """Adapter child env must not contain OUROBOROS_AGENT_RUNTIME."""
+        with patch.dict(os.environ, {"OUROBOROS_AGENT_RUNTIME": "codex"}):
+            env = CodexCliLLMAdapter._build_child_env()
+        assert "OUROBOROS_AGENT_RUNTIME" not in env
+
+    def test_increments_depth(self) -> None:
+        """Adapter also tracks recursion depth."""
+        with patch.dict(os.environ, {"_OUROBOROS_DEPTH": "0"}):
+            env = CodexCliLLMAdapter._build_child_env()
+        assert env["_OUROBOROS_DEPTH"] == "1"
+
+    def test_malformed_depth_defaults_to_one(self) -> None:
+        """Adapter handles non-integer _OUROBOROS_DEPTH gracefully."""
+        with patch.dict(os.environ, {"_OUROBOROS_DEPTH": "garbage"}):
+            env = CodexCliLLMAdapter._build_child_env()
+        assert env["_OUROBOROS_DEPTH"] == "1"

{ouroboros_ai-0.25.3.dev87 → ouroboros_ai-0.25.3.dev89}/tests/unit/orchestrator/test_session.py

@@ -1460,3 +1460,81 @@ class TestCancelOrphanedSessions:
             event = call[0][0]
             assert event.type == "orchestrator.session.cancelled"
             assert "cancelled_at" in event.data
+
+
+class TestStaleRuntimeMetadataCleansing:
+    """Test that terminal sessions have stale runtime_status sanitized (#188)."""
+
+    async def test_cancelled_session_overwrites_stale_runtime_status(self) -> None:
+        """runtime_status should reflect terminal state after cancellation."""
+        from ouroboros.events.base import BaseEvent
+
+        mock_event_store = AsyncMock()
+        mock_event_store.replay = AsyncMock(
+            return_value=[
+                BaseEvent(
+                    type="orchestrator.session.started",
+                    aggregate_type="session",
+                    aggregate_id="sess-stale",
+                    data={"execution_id": "exec-1", "seed_id": "seed-1"},
+                ),
+                BaseEvent(
+                    type="orchestrator.progress.updated",
+                    aggregate_type="session",
+                    aggregate_id="sess-stale",
+                    data={"progress": {"runtime_status": "running", "phase": "executing"}},
+                ),
+                BaseEvent(
+                    type="orchestrator.session.cancelled",
+                    aggregate_type="session",
+                    aggregate_id="sess-stale",
+                    data={"reason": "Auto-cancelled on startup", "cancelled_by": "auto_cleanup"},
+                ),
+            ]
+        )
+        mock_event_store.query_session_related_events = None
+
+        repository = SessionRepository(mock_event_store)
+        result = await repository.reconstruct_session("sess-stale")
+
+        assert result.is_ok
+        tracker = result.value
+        assert tracker.status == SessionStatus.CANCELLED
+        assert tracker.progress.get("runtime_status") == "cancelled"
+
+    async def test_completed_session_overwrites_stale_runtime_status(self) -> None:
+        """runtime_status should reflect 'completed' for completed sessions."""
+        from ouroboros.events.base import BaseEvent
+
+        mock_event_store = AsyncMock()
+        mock_event_store.replay = AsyncMock(
+            return_value=[
+                BaseEvent(
+                    type="orchestrator.session.started",
+                    aggregate_type="session",
+                    aggregate_id="sess-done",
+                    data={"execution_id": "exec-2", "seed_id": "seed-2"},
+                ),
+                BaseEvent(
+                    type="orchestrator.progress.updated",
+                    aggregate_type="session",
+                    aggregate_id="sess-done",
+                    data={"progress": {"runtime_status": "running"}},
+                ),
+                BaseEvent(
+                    type="orchestrator.session.completed",
+                    aggregate_type="session",
+                    aggregate_id="sess-done",
+                    data={"summary": {"success": True}},
+                ),
+            ]
+        )
+        mock_event_store.query_session_related_events = None
+
+        repository = SessionRepository(mock_event_store)
+        result = await repository.reconstruct_session("sess-done")
+
+        assert result.is_ok
+        tracker = result.value
+        assert tracker.status == SessionStatus.COMPLETED
+        assert tracker.progress.get("runtime_status") == "completed"