fix(runtime): fold native execution into shared containment (ODY-152)

tests/test_agent_bash_windows.py

@@ -6,6 +6,8 @@ import pytest
 from types import SimpleNamespace
 
 from src.agent_tools import subprocess_tools
+from src import containment
+from tests.containment_helpers import capture_owned_spawn
 
 
 @pytest.mark.asyncio
@@ -84,26 +86,17 @@ async def test_windows_bash_applies_the_subprocess_env(monkeypatch):
 
 
 @pytest.mark.asyncio
-async def test_windows_bash_tool_passes_ctx_env_through_to_the_child(monkeypatch):
-    captured = {}
+async def test_windows_bash_tool_passes_ctx_env_through_to_the_child(monkeypatch, tmp_path):
+    captured = capture_owned_spawn(monkeypatch, tmp_path)
     env = {"PATH": r"C:\Odysseus\venv\Scripts", "VIRTUAL_ENV": r"C:\Odysseus\venv"}
 
     monkeypatch.setattr(subprocess_tools, "IS_WINDOWS", True)
     monkeypatch.setattr(
         subprocess_tools, "find_bash", lambda: r"C:\Program Files\Git\bin\bash.exe"
     )
-    monkeypatch.setattr("src.tool_execution.agent_cwd", lambda: r"D:\Workspaces\Project")
-
-    async def fake_exec(*argv, **kwargs):
-        captured["argv"] = argv
-        captured["kwargs"] = kwargs
-        return SimpleNamespace(pid=4242)
-
-    async def fake_stream(_process, **_kwargs):
-        return "ok", "", 0, False
-
-    monkeypatch.setattr(subprocess_tools.asyncio, "create_subprocess_exec", fake_exec)
-    monkeypatch.setattr(subprocess_tools, "_run_subprocess_streaming", fake_stream)
+    monkeypatch.setattr(containment, "IS_WINDOWS", True)
+    monkeypatch.setattr(containment, "find_bash", lambda: r"C:\Program Files\Git\bin\bash.exe")
+    monkeypatch.setattr("src.tool_execution.agent_cwd", lambda: str(tmp_path))
 
     result = await subprocess_tools.BashTool().execute(
         "pwd",
@@ -134,9 +127,13 @@ async def test_windows_bash_without_git_bash_fails_clearly(monkeypatch):
 
 
 @pytest.mark.asyncio
-async def test_bash_tool_returns_install_hint_when_git_bash_is_missing(monkeypatch):
+async def test_bash_tool_returns_install_hint_when_git_bash_is_missing(monkeypatch, tmp_path):
+    capture_owned_spawn(monkeypatch, tmp_path)
     monkeypatch.setattr(subprocess_tools, "IS_WINDOWS", True)
     monkeypatch.setattr(subprocess_tools, "find_bash", lambda: None)
+    monkeypatch.setattr(containment, "IS_WINDOWS", True)
+    monkeypatch.setattr(containment, "find_bash", lambda: None)
+    monkeypatch.setattr("src.tool_execution.agent_cwd", lambda: str(tmp_path))
 
     result = await subprocess_tools.BashTool().execute(
         "pwd",
@@ -148,11 +145,13 @@ async def test_bash_tool_returns_install_hint_when_git_bash_is_missing(monkeypat
 
 
 @pytest.mark.asyncio
-async def test_windows_bash_does_not_use_a_stray_tmux_executable(monkeypatch):
-    captured = {}
-    workspace = r"D:\Workspaces\Project with spaces"
+async def test_windows_bash_does_not_use_a_stray_tmux_executable(monkeypatch, tmp_path):
+    captured = capture_owned_spawn(monkeypatch, tmp_path)
+    workspace = str(tmp_path)
 
     monkeypatch.setattr(subprocess_tools, "IS_WINDOWS", True)
+    monkeypatch.setattr(containment, "IS_WINDOWS", True)
+    monkeypatch.setattr(containment, "find_bash", lambda: r"C:\Program Files\Git\bin\bash.exe")
     monkeypatch.setattr(
         subprocess_tools.shutil,
         "which",
@@ -163,17 +162,7 @@ async def test_windows_bash_does_not_use_a_stray_tmux_executable(monkeypatch):
     async def fail_tmux(*_args, **_kwargs):
         pytest.fail("native Windows must not enter the POSIX tmux path")
 
-    async def fake_create(command, **kwargs):
-        captured["command"] = command
-        captured["kwargs"] = kwargs
-        return SimpleNamespace(pid=12345)
-
-    async def fake_stream(_process, **_kwargs):
-        return "ok", "", 0, False
-
     monkeypatch.setattr(subprocess_tools, "_run_tmux_bash", fail_tmux)
-    monkeypatch.setattr(subprocess_tools, "_create_bash_subprocess", fake_create)
-    monkeypatch.setattr(subprocess_tools, "_run_subprocess_streaming", fake_stream)
 
     result = await subprocess_tools.BashTool().execute(
         "pwd",
@@ -185,7 +174,7 @@ async def test_windows_bash_does_not_use_a_stray_tmux_executable(monkeypatch):
     # Every bash result now carries the execution boundary it actually got.
     # Asserting dict equality here would make that field impossible to add
     # without touching a test about tmux, so the shape is asserted instead.
-    assert result["containment"]["reported_dimensions"] == ["filesystem"]
+    assert result["containment"]["network"] == "inherit"
     assert captured["command"] == "pwd"
     assert captured["kwargs"]["cwd"] == workspace