Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/benchflow/rollout/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1380,8 +1380,16 @@ async def disconnect(self) -> None:
self._session = None
self._session_adapter = None
self._is_session_factory = False
# Kill any lingering agent processes to prevent context bleed between scenes
agent_pattern = _agent_process_kill_pattern(self._agent_launch)
# Kill any lingering agent processes to prevent context bleed between scenes.
# Oracle awaits solve.sh directly and starts no persistent agent. Its launch
# value is only a fallback label; on shared PID namespaces, a pkill pattern
# derived from it can match the host's ``--agent oracle`` command.
# Use the current launch label because connect_as() updates it for each role.
agent_pattern = (
None
if self._agent_launch.strip() == "oracle"
else _agent_process_kill_pattern(self._agent_launch)
)
if self._env and agent_pattern:
with contextlib.suppress(Exception):
await self._env.exec(
Expand Down
43 changes: 43 additions & 0 deletions tests/test_oracle.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,51 @@
from types import SimpleNamespace
from unittest.mock import AsyncMock, MagicMock

import pytest


@pytest.mark.asyncio
@pytest.mark.parametrize(
("agent_launch", "cleanup_command"),
[
("oracle", None),
("opencode", "pkill -f '(^|[ /])opencode( |$)' || true"),
(
"oracle-agent-acp",
"pkill -f '(^|[ /])oracle\\-agent\\-acp( |$)' || true",
),
],
)
async def test_disconnect_skips_process_cleanup_only_for_oracle(
agent_launch: str, cleanup_command: str | None
):
"""Guards the Oracle fix against PR #274's unconditional label cleanup."""
from benchflow.rollout import Rollout

env = SimpleNamespace(exec=AsyncMock())
rollout = SimpleNamespace(
_phase="verified",
_is_session_factory=False,
_capture_partial_acp_trajectory=lambda: None,
_acp_client=None,
_session=None,
_session_adapter=None,
_agent_launch=agent_launch,
_env=env,
_active_role=None,
_session_tool_count=0,
_session_traj_count=0,
)

await Rollout.disconnect(rollout)

if cleanup_command:
env.exec.assert_awaited_once_with(cleanup_command, timeout_sec=10)
else:
env.exec.assert_not_awaited()
assert rollout._phase == "verified"


def _oracle_env():
env = MagicMock()

Expand Down