Teknium
f6938b37f3
tools/terminal_tool.py: drop 30 pure re-export names (lifecycle/config/backends/
sudo/guards/result/interrupt/utils/_DockerEnvironment/is_managed_tool_gateway_ready)
and the noqa-F401 comments on the 25 names the facade itself uses. Sibling modules
(terminal_tool_backends/_result/_sudo/_lifecycle, environments/base, process_registry)
that read removed names through the facade now import from the defining module.
tools/environments/base.py: drop 11 re-exports (base_output/base_session_env/
path_utils) and the BaseEnvironment.stop() compat alias (no in-tree caller; the
lifecycle hasattr(env, 'stop') fallback stays for third-party envs).
tools/environments/docker.py: drop 1 re-export + the re-export comment.
Callers/tests repointed to tools.terminal_tool_{lifecycle,backends,sudo,config,
guards,result}, tools.interrupt, tools.environments.{base_output,base_session_env,
path_utils}.
54 lines
1.6 KiB
Python
54 lines
1.6 KiB
Python
"""Regression tests for MCP server availability in cron jobs.
|
|
|
|
Background
|
|
==========
|
|
``cron/scheduler.py:run_job()`` constructs ``AIAgent(...)`` directly without
|
|
calling ``discover_mcp_tools()`` — the initialization that CLI and gateway
|
|
paths do at startup. Cron jobs therefore never saw any MCP tools from
|
|
``mcp_servers`` in config.yaml. See #4219.
|
|
|
|
The fix inserts ``discover_mcp_tools()`` before the ``AIAgent(...)`` call,
|
|
wrapped in try/except so a broken MCP server can't kill an otherwise
|
|
working cron job. ``discover_mcp_tools`` is idempotent — subsequent ticks
|
|
short-circuit on already-connected servers.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from unittest.mock import patch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_no_agent_cron_job_does_not_initialize_mcp():
|
|
"""Cron jobs with no_agent=True are script-only — no AIAgent, no MCP
|
|
tools needed. We must NOT pay the MCP init cost for those."""
|
|
from cron import scheduler
|
|
|
|
job = {
|
|
"id": "noagent-job",
|
|
"name": "noagent-job",
|
|
"no_agent": True,
|
|
"script": "/nonexistent/script.sh",
|
|
}
|
|
|
|
discover_called = []
|
|
|
|
def fake_discover():
|
|
discover_called.append(True)
|
|
return []
|
|
|
|
# _run_job_script returns (ok, output); make it fail cleanly so we
|
|
# don't need a real script file.
|
|
with patch("tools.mcp_tool_discovery.discover_mcp_tools", side_effect=fake_discover), \
|
|
patch("cron.scheduler_script._run_job_script", return_value=(False, "no such file")):
|
|
scheduler.run_job(job)
|
|
|
|
assert not discover_called, (
|
|
"discover_mcp_tools was called for a no_agent job — wasted MCP init "
|
|
"for a script-only cron tick"
|
|
)
|