didericis
bdca1c8bea
Issue #249: in practice the per-bottle `supervise` flag was never turned off — all bottles should be supervised. Remove the manifest flag and make the supervise sidecar unconditional, mirroring egress. - Reject `supervise:` as a removed bottle key with a migration hint. - Drop the `supervise` field from ManifestBottle and the extends merge. - prepare_supervise always returns a SupervisePlan; the plan type is now non-optional and the per-backend `is None` guards are gone, so the supervise daemon, current-config mount, aliases, and MCP registration always render. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YcU7nerbg8cVj9R4EkpfLJ
299 lines
11 KiB
Python
299 lines
11 KiB
Python
"""Unit: CodexAgentProvider provisioning (PRD 0050, contrib/codex).
|
|
|
|
The Codex provider owns its own skills / prompt / provision /
|
|
supervise-mcp end-to-end — symmetric with the claude provider but
|
|
not sharing a helper module, since codex's apply steps include
|
|
the dummy-auth dance and a `codex login status` verify that have
|
|
no claude equivalent."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import unittest
|
|
import tempfile
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from bot_bottle.agent_provider import (
|
|
AgentProvisionCommand,
|
|
AgentProvisionDir,
|
|
AgentProvisionFile,
|
|
AgentProvisionPlan,
|
|
)
|
|
from bot_bottle.backend import Bottle, BottleSpec, ExecResult
|
|
from bot_bottle.backend.docker.bottle_plan import DockerBottlePlan
|
|
from bot_bottle.contrib.codex.agent_provider import CodexAgentProvider
|
|
from bot_bottle.egress import EgressPlan
|
|
from bot_bottle.git_gate import GitGatePlan
|
|
from bot_bottle.manifest import ManifestIndex
|
|
from bot_bottle.supervise import SupervisePlan
|
|
|
|
|
|
_URL = "http://supervise:9100/"
|
|
|
|
|
|
def _make_bottle(exec_result: ExecResult | None = None) -> MagicMock:
|
|
bottle = MagicMock(spec=Bottle)
|
|
bottle.name = "bot-bottle-demo-abc12"
|
|
bottle.exec.return_value = (
|
|
exec_result if exec_result is not None
|
|
else ExecResult(returncode=0, stdout="", stderr="")
|
|
)
|
|
return bottle
|
|
|
|
|
|
def _exec_scripts(bottle: MagicMock) -> list[str]:
|
|
return [c.args[0] for c in bottle.exec.call_args_list]
|
|
|
|
|
|
def _plan(
|
|
*,
|
|
agent_prompt: str = "",
|
|
skills: list[str] | None = None,
|
|
agent_provision: AgentProvisionPlan | None = None,
|
|
) -> DockerBottlePlan:
|
|
bottle_json: dict = {"agent_provider": {"template": "codex"}} # type: ignore
|
|
index = ManifestIndex.from_json_obj({
|
|
"bottles": {"dev": bottle_json},
|
|
"agents": {
|
|
"demo": {
|
|
"skills": list(skills or []),
|
|
"prompt": agent_prompt,
|
|
"bottle": "dev",
|
|
},
|
|
},
|
|
})
|
|
manifest = index.load_for_agent("demo")
|
|
spec = BottleSpec(
|
|
manifest=index, agent_name="demo",
|
|
copy_cwd=False, user_cwd="/tmp/x",
|
|
)
|
|
supervise_plan = SupervisePlan(
|
|
slug="demo-abc12",
|
|
queue_dir=Path("/tmp/queue"),
|
|
current_config_dir=Path("/tmp/current-config"),
|
|
)
|
|
return DockerBottlePlan(
|
|
spec=spec,
|
|
manifest=manifest,
|
|
stage_dir=Path("/tmp/stage"),
|
|
slug="demo-abc12",
|
|
forwarded_env={},
|
|
git_gate_plan=GitGatePlan(
|
|
slug="demo-abc12",
|
|
entrypoint_script=Path("/tmp/git-gate-entrypoint.sh"),
|
|
hook_script=Path("/tmp/git-gate-hook"),
|
|
access_hook_script=Path("/tmp/git-gate-access-hook"),
|
|
upstreams=(),
|
|
),
|
|
egress_plan=EgressPlan(
|
|
slug="demo-abc12",
|
|
routes_path=Path("/tmp/routes.yaml"),
|
|
routes=(),
|
|
token_env_map={},
|
|
),
|
|
supervise_plan=supervise_plan,
|
|
use_runsc=False,
|
|
agent_provision=agent_provision or AgentProvisionPlan(
|
|
template="codex", command="codex", prompt_mode="read_prompt_file",
|
|
image="bot-bottle-codex:latest", dockerfile="",
|
|
guest_home="/home/node",
|
|
instance_name="bot-bottle-demo-abc12",
|
|
prompt_file=Path("/tmp/state/demo-abc12/agent/prompt.txt"),
|
|
guest_env={},
|
|
),
|
|
)
|
|
|
|
|
|
class TestCodexProvisionPrompt(unittest.TestCase):
|
|
def test_cp_uses_bottle_cp_in_and_chowns(self):
|
|
bottle = _make_bottle()
|
|
r = CodexAgentProvider().provision_prompt(
|
|
_plan(agent_prompt="hello"), bottle,
|
|
)
|
|
self.assertEqual("/home/node/.bot-bottle-prompt.txt", r)
|
|
bottle.cp_in.assert_called_once_with(
|
|
"/tmp/state/demo-abc12/agent/prompt.txt",
|
|
"/home/node/.bot-bottle-prompt.txt",
|
|
)
|
|
scripts = _exec_scripts(bottle)
|
|
self.assertTrue(
|
|
any("chown node:node" in s
|
|
and "/home/node/.bot-bottle-prompt.txt" in s
|
|
for s in scripts)
|
|
)
|
|
|
|
def test_returns_none_when_agent_has_no_prompt(self):
|
|
bottle = _make_bottle()
|
|
r = CodexAgentProvider().provision_prompt(_plan(agent_prompt=""), bottle)
|
|
self.assertIsNone(r)
|
|
bottle.cp_in.assert_called_once()
|
|
|
|
def test_returns_path_when_provider_prompt_exists(self):
|
|
bottle = _make_bottle()
|
|
provision = AgentProvisionPlan(
|
|
template="codex", command="codex",
|
|
prompt_mode="read_prompt_file",
|
|
image="", dockerfile="", guest_home="/home/node",
|
|
instance_name="bot-bottle-demo-abc12",
|
|
prompt_file=Path("/tmp/prompt.txt"),
|
|
guest_env={},
|
|
has_prompt=True,
|
|
)
|
|
r = CodexAgentProvider().provision_prompt(
|
|
_plan(agent_prompt="", agent_provision=provision), bottle,
|
|
)
|
|
self.assertEqual("/home/node/.bot-bottle-prompt.txt", r)
|
|
|
|
def test_writes_tui_settings_into_codex_config(self):
|
|
with tempfile.TemporaryDirectory(prefix="bb-codex-ui.") as tmp:
|
|
state_dir = Path(tmp)
|
|
prompt_file = state_dir / "prompt.txt"
|
|
prompt_file.write_text("Existing instructions.\n")
|
|
plan = CodexAgentProvider().provision_plan(
|
|
dockerfile="",
|
|
state_dir=state_dir,
|
|
instance_name="bot-bottle-demo-abc12",
|
|
prompt_file=prompt_file,
|
|
label="research-ui",
|
|
color="cyan",
|
|
)
|
|
config = (state_dir / "codex-config.toml").read_text()
|
|
prompt_text = prompt_file.read_text()
|
|
self.assertTrue(plan.has_prompt)
|
|
self.assertEqual("Existing instructions.\n", prompt_text)
|
|
self.assertIn("[tui]", config)
|
|
self.assertIn('status_line = ["model-with-reasoning"]', config)
|
|
self.assertIn('terminal_title = ["spinner", "project"]', config)
|
|
self.assertIn('theme = "ansi"', config)
|
|
|
|
|
|
class TestCodexProvisionSkills(unittest.TestCase):
|
|
def test_noop_when_agent_has_no_skills(self):
|
|
bottle = _make_bottle()
|
|
CodexAgentProvider().provision_skills(_plan(skills=[]), bottle)
|
|
bottle.cp_in.assert_not_called()
|
|
bottle.exec.assert_not_called()
|
|
|
|
def test_mkdir_plus_cp_per_skill(self):
|
|
bottle = _make_bottle()
|
|
with patch(
|
|
"bot_bottle.backend.util.host_skill_dir",
|
|
side_effect=lambda n: f"/host/skills/{n}", # type: ignore
|
|
), patch(
|
|
"bot_bottle.contrib.codex.agent_provider.os.path.isdir",
|
|
return_value=True,
|
|
):
|
|
CodexAgentProvider().provision_skills(
|
|
_plan(skills=["init-prd"]), bottle,
|
|
)
|
|
scripts = _exec_scripts(bottle)
|
|
self.assertTrue(
|
|
any("mkdir -p" in s and "/home/node/.claude/skills" in s
|
|
for s in scripts)
|
|
)
|
|
bottle.cp_in.assert_called_once()
|
|
self.assertEqual(
|
|
"/home/node/.claude/skills/init-prd/",
|
|
bottle.cp_in.call_args.args[1],
|
|
)
|
|
|
|
|
|
class TestCodexProvision(unittest.TestCase):
|
|
"""Codex's declarative provision step: ~/.codex/ dir + config.toml
|
|
+ (optional) dummy-auth.json + `codex login status` verify."""
|
|
|
|
def test_creates_dir_and_copies_config(self):
|
|
provision = AgentProvisionPlan(
|
|
template="codex", command="codex",
|
|
prompt_mode="read_prompt_file",
|
|
image="", dockerfile="", guest_home="/home/node",
|
|
instance_name="bot-bottle-demo-abc12",
|
|
prompt_file=Path("/tmp/prompt.txt"),
|
|
guest_env={},
|
|
dirs=(AgentProvisionDir("/home/node/.codex"),),
|
|
files=(AgentProvisionFile(
|
|
Path("/tmp/codex-config.toml"),
|
|
"/home/node/.codex/config.toml",
|
|
),),
|
|
)
|
|
bottle = _make_bottle()
|
|
CodexAgentProvider().provision(
|
|
_plan(agent_provision=provision), bottle,
|
|
)
|
|
bottle.cp_in.assert_called_once_with(
|
|
"/tmp/codex-config.toml",
|
|
"/home/node/.codex/config.toml",
|
|
)
|
|
scripts = _exec_scripts(bottle)
|
|
self.assertTrue(any("mkdir -p" in s and "/home/node/.codex" in s for s in scripts))
|
|
self.assertTrue(any("chown" in s and "/home/node/.codex/config.toml" in s for s in scripts))
|
|
self.assertTrue(any("chmod" in s and "/home/node/.codex/config.toml" in s for s in scripts))
|
|
|
|
def test_runs_pre_copy_then_verify(self):
|
|
provision = AgentProvisionPlan(
|
|
template="codex", command="codex",
|
|
prompt_mode="read_prompt_file",
|
|
image="", dockerfile="", guest_home="/home/node",
|
|
instance_name="bot-bottle-demo-abc12",
|
|
prompt_file=Path("/tmp/prompt.txt"),
|
|
guest_env={},
|
|
pre_copy=(AgentProvisionCommand(
|
|
("find", "/home/node/.codex", "-name", "*.sqlite", "-delete"),
|
|
"could not reset runtime db files",
|
|
),),
|
|
verify=(AgentProvisionCommand(
|
|
("runuser", "-u", "node", "--", "codex", "login", "status"),
|
|
"codex rejected the dummy auth",
|
|
),),
|
|
)
|
|
bottle = _make_bottle()
|
|
CodexAgentProvider().provision(
|
|
_plan(agent_provision=provision), bottle,
|
|
)
|
|
scripts = _exec_scripts(bottle)
|
|
self.assertTrue(any("find" in s and "-delete" in s for s in scripts))
|
|
self.assertTrue(any("runuser" in s and "codex login status" in s for s in scripts))
|
|
|
|
def test_dies_when_dir_creation_fails(self):
|
|
provision = AgentProvisionPlan(
|
|
template="codex", command="codex",
|
|
prompt_mode="read_prompt_file",
|
|
image="", dockerfile="", guest_home="/home/node",
|
|
instance_name="bot-bottle-demo-abc12",
|
|
prompt_file=Path("/tmp/prompt.txt"),
|
|
guest_env={},
|
|
dirs=(AgentProvisionDir("/home/node/.codex"),),
|
|
)
|
|
bottle = _make_bottle(exec_result=ExecResult(1, "", "mkdir: nope\n"))
|
|
with self.assertRaises(SystemExit):
|
|
CodexAgentProvider().provision(
|
|
_plan(agent_provision=provision), bottle,
|
|
)
|
|
|
|
|
|
class TestCodexSuperviseMcp(unittest.TestCase):
|
|
def test_runs_codex_mcp_add_as_node(self):
|
|
bottle = _make_bottle()
|
|
CodexAgentProvider().provision_supervise_mcp(
|
|
_plan(), bottle, _URL,
|
|
)
|
|
bottle.exec.assert_called_once()
|
|
script = bottle.exec.call_args.args[0]
|
|
self.assertEqual("node", bottle.exec.call_args.kwargs.get("user"))
|
|
self.assertEqual(
|
|
f"codex mcp add supervise --url {_URL}",
|
|
script,
|
|
)
|
|
|
|
def test_logs_warning_on_failure_but_does_not_raise(self):
|
|
bottle = _make_bottle(
|
|
exec_result=ExecResult(returncode=1, stdout="", stderr="boom"),
|
|
)
|
|
CodexAgentProvider().provision_supervise_mcp(
|
|
_plan(), bottle, _URL,
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|