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
73 changes: 72 additions & 1 deletion cron/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ def _resolve_cron_enabled_toolsets(job: dict, cfg: dict) -> list[str] | None:
"qqbot", "yuanbao",
})

# Surfaces that persist cron runs as local Hermes sessions rather than through
# a gateway platform adapter. WebUI imports/displays ``source='cron'`` sessions
# from the shared session DB, so a WebUI-origin cron run is already delivered
# once the scheduler flushes its transcript.
_LOCAL_SESSION_DELIVERY_PLATFORMS = frozenset({"webui"})

# Platforms that support a configured cron/notification home target, mapped to
# the environment variable used by gateway setup/runtime config.
_HOME_TARGET_ENV_VARS = {
Expand Down Expand Up @@ -313,6 +319,12 @@ def _is_known_delivery_platform(platform_name: str) -> bool:
return bool(_plugin_cron_env_var(name))


def _is_local_session_delivery_target(target: dict) -> bool:
"""Whether a resolved target is satisfied by local session persistence."""
platform_name = str(target.get("platform", "")).lower()
return bool(target.get("local_session")) or platform_name in _LOCAL_SESSION_DELIVERY_PLATFORMS


def _resolve_home_env_var(platform_name: str) -> str:
"""Return the env var name for a platform's cron home channel.

Expand Down Expand Up @@ -434,6 +446,14 @@ def _resolve_single_delivery_target(job: dict, deliver_value: str) -> Optional[d

if deliver_value == "origin":
if origin:
origin_platform = str(origin["platform"]).lower()
if origin_platform in _LOCAL_SESSION_DELIVERY_PLATFORMS:
return {
"platform": origin_platform,
"chat_id": str(origin.get("chat_id", "")),
"thread_id": origin.get("thread_id"),
"local_session": True,
}
return {
"platform": origin["platform"],
"chat_id": str(origin["chat_id"]),
Expand All @@ -460,6 +480,14 @@ def _resolve_single_delivery_target(job: dict, deliver_value: str) -> Optional[d
platform_name, rest = deliver_value.split(":", 1)
platform_key = platform_name.lower()

if platform_key in _LOCAL_SESSION_DELIVERY_PLATFORMS:
return {
"platform": platform_key,
"chat_id": rest,
"thread_id": None,
"local_session": True,
}

from tools.send_message_tool import _parse_target_ref

parsed_chat_id, parsed_thread_id, is_explicit = _parse_target_ref(platform_key, rest)
Expand Down Expand Up @@ -675,6 +703,20 @@ def _deliver_result(job: dict, content: str, adapters=None, loop=None) -> Option
return msg
return None # local-only jobs don't deliver — not a failure

external_targets = []
for target in targets:
if _is_local_session_delivery_target(target):
logger.debug(
"Job '%s': cron result satisfied by local %s session persistence",
job.get("id", "?"),
target.get("platform", "session"),
)
continue
external_targets.append(target)
if not external_targets:
return None
targets = external_targets

from tools.send_message_tool import _send_to_platform
from gateway.config import load_gateway_config, Platform

Expand Down Expand Up @@ -1894,7 +1936,36 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
except Exception as e:
error_msg = f"{type(e).__name__}: {str(e)}"
logger.exception("Job '%s' failed: %s", job_name, error_msg)

failure_response = f"⚠️ Cron job '{job_name}' failed:\n{error_msg}"

# The scheduler must still mark the run failed and suppress normal
# platform delivery, but the cron session should not look like a
# prompt-only chat in WebUI/Desktop. If the agent already created the
# session row and did not persist an assistant turn, append a concise
# failure message so the run is readable as a chat transcript.
if _session_db:
try:
_session_exists = bool(_session_db.get_session(_cron_session_id))
if _session_exists:
_messages = _session_db.get_messages(_cron_session_id)
_has_assistant = any(
(m.get("role") == "assistant") and str(m.get("content") or "").strip()
for m in _messages
)
if not _has_assistant:
_session_db.append_message(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_has_assistant ignores contentless assistant tool-call messages. If one is the final persisted message, this append creates assistant→assistant adjacency. Please make the append conditional on a sequence-safe final role/state and add that regression case.

_cron_session_id,
role="assistant",
content=failure_response,
finish_reason="error",
)
except (Exception, KeyboardInterrupt) as append_exc:
logger.debug(
"Job '%s': failed to persist cron failure message: %s",
job_id,
append_exc,
)

output = f"""# Cron Job: {job_name} (FAILED)

**Job ID:** {job_id}
Expand Down
90 changes: 90 additions & 0 deletions tests/cron/test_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,23 @@ def test_origin_delivery_preserves_thread_id(self):
"thread_id": "17585",
}

def test_webui_origin_delivery_is_local_session_target(self):
"""WebUI-origin cron jobs are surfaced via the local cron session, not a gateway adapter."""
job = {
"deliver": "origin",
"origin": {
"platform": "webui",
"chat_id": "webui-session-123",
},
}

assert _resolve_delivery_target(job) == {
"platform": "webui",
"chat_id": "webui-session-123",
"thread_id": None,
"local_session": True,
}

@pytest.mark.parametrize(
("platform", "env_var", "chat_id"),
[
Expand Down Expand Up @@ -528,6 +545,24 @@ def test_delivery_wraps_content_with_header_and_footer(self):
assert "Here is today's summary." in sent_content
assert "To stop or manage this job" in sent_content

def test_webui_origin_delivery_is_satisfied_by_session_persistence(self):
"""WebUI-origin delivery should not try to route through gateway Platform('webui')."""
with patch("gateway.config.load_gateway_config") as load_cfg, \
patch("tools.send_message_tool._send_to_platform", new=AsyncMock()) as send_mock:
result = _deliver_result(
{
"id": "webui-job",
"name": "webui job",
"deliver": "origin",
"origin": {"platform": "webui", "chat_id": "webui-session-123"},
},
"Output already persisted to the cron session.",
)

assert result is None
load_cfg.assert_not_called()
send_mock.assert_not_called()

def test_delivery_uses_job_id_when_no_name(self):
"""When a job has no name, the wrapper should fall back to job id."""
from gateway.config import Platform
Expand Down Expand Up @@ -959,6 +994,8 @@ def test_run_job_closes_agent_on_failure_to_prevent_fd_leak(self, tmp_path):
"prompt": "hello",
}
fake_db = MagicMock()
fake_db.get_session.return_value = {"id": "cron_failing-job_test"}
fake_db.get_messages.return_value = [{"role": "user", "content": "hello"}]

with patch("cron.scheduler._hermes_home", tmp_path), \
patch("cron.scheduler._resolve_origin", return_value=None), \
Expand All @@ -983,6 +1020,59 @@ def test_run_job_closes_agent_on_failure_to_prevent_fd_leak(self, tmp_path):
assert success is False
assert final_response == ""
assert "RuntimeError: boom" in error
fake_db.append_message.assert_called_once()
append_kwargs = fake_db.append_message.call_args.kwargs
assert append_kwargs["role"] == "assistant"
assert append_kwargs["finish_reason"] == "error"
assert "Cron job 'failing' failed" in append_kwargs["content"]
assert "RuntimeError: boom" in append_kwargs["content"]
mock_agent.close.assert_called_once()

def test_run_job_persists_failure_message_when_agent_reports_failed_result(self, tmp_path):
job = {
"id": "reported-failure-job",
"name": "reported failure",
"prompt": "hello",
}
fake_db = MagicMock()
fake_db.get_session.return_value = {"id": "cron_reported-failure-job_test"}
fake_db.get_messages.return_value = [{"role": "user", "content": "hello"}]

with patch("cron.scheduler._hermes_home", tmp_path), \
patch("cron.scheduler._resolve_origin", return_value=None), \
patch("dotenv.load_dotenv"), \
patch("hermes_state.SessionDB", return_value=fake_db), \
patch(
"hermes_cli.runtime_provider.resolve_runtime_provider",
return_value={
"api_key": "***",
"base_url": "https://example.invalid/v1",
"provider": "openrouter",
"api_mode": "chat_completions",
},
), \
patch("run_agent.AIAgent") as mock_agent_cls:
mock_agent = MagicMock()
mock_agent.run_conversation.return_value = {
"failed": True,
"completed": False,
"error": "provider guardrail blocked model",
}
mock_agent_cls.return_value = mock_agent

success, output, final_response, error = run_job(job)

assert success is False
assert final_response == ""
assert error is not None
assert "provider guardrail blocked model" in error
assert "provider guardrail blocked model" in output
fake_db.append_message.assert_called_once()
append_kwargs = fake_db.append_message.call_args.kwargs
assert append_kwargs["role"] == "assistant"
assert append_kwargs["finish_reason"] == "error"
assert "Cron job 'reported failure' failed" in append_kwargs["content"]
assert "provider guardrail blocked model" in append_kwargs["content"]
mock_agent.close.assert_called_once()

def test_run_job_reaps_stale_auxiliary_clients_per_tick(self, tmp_path):
Expand Down