Skip to content
Draft
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: 12 additions & 0 deletions acp_adapter/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,12 @@ def _make_agent(
for name, cfg in (config.get("mcp_servers") or {}).items()
if not isinstance(cfg, dict) or cfg.get("enabled", True) is not False
]
agent_config = config.get("agent")
max_turns = (
agent_config.get("max_turns")
if isinstance(agent_config, dict)
else None
)

kwargs = {
"platform": "acp",
Expand All @@ -631,6 +637,12 @@ def _make_agent(
"session_db": self._get_db(),
"model": model or default_model,
}
if (
isinstance(max_turns, int)
and not isinstance(max_turns, bool)
and max_turns > 0
):
kwargs["max_iterations"] = max_turns

try:
runtime = resolve_runtime_provider(requested=requested_provider or config_provider)
Expand Down
52 changes: 52 additions & 0 deletions tests/acp/test_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,58 @@ def fake_agent(**kwargs):
manager.create_session(cwd="/work")

assert captured["enabled_toolsets"] == ["hermes-acp", "mcp-olympus", "mcp-exa"]
assert "max_iterations" not in captured

@pytest.mark.parametrize(
("agent_config", "expected"),
[
({"max_turns": 8}, 8),
({"max_turns": True}, None),
({"max_turns": 0}, None),
({"max_turns": -1}, None),
({"max_turns": "8"}, None),
("invalid", None),
],
)
def test_create_session_validates_agent_max_turns(
self, tmp_path, monkeypatch, agent_config, expected
):
captured = {}

def fake_resolve_runtime_provider(requested=None, **kwargs):
return {
"provider": "openrouter",
"api_mode": "chat_completions",
"base_url": "https://openrouter.example/v1",
"api_key": "***",
"command": None,
"args": [],
}

def fake_agent(**kwargs):
captured.update(kwargs)
return SimpleNamespace(model=kwargs.get("model"))

monkeypatch.setattr(
"hermes_cli.config.load_config",
lambda: {
"model": {"provider": "openrouter", "default": "test-model"},
"agent": agent_config,
},
)
monkeypatch.setattr(
"hermes_cli.runtime_provider.resolve_runtime_provider",
fake_resolve_runtime_provider,
)

with patch("run_agent.AIAgent", side_effect=fake_agent):
manager = SessionManager(db=SessionDB(tmp_path / "state.db"))
manager.create_session(cwd="/work")

if expected is None:
assert "max_iterations" not in captured
else:
assert captured["max_iterations"] == expected

def test_create_session_writes_to_db(self, manager):
state = manager.create_session(cwd="/project")
Expand Down