mirrors/hermes-agent
1
0
Fork 0
mirror of https://github.com/NousResearch/hermes-agent.git synced 2026-07-28 18:19:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Preserve Slack cron thread origin

Browse source
This commit is contained in:
Jake Long Vu 2026-06-01 15:08:33 +07:00 • committed by Teknium
parent 0c07a19752
commit f279f7fcf1
2 changed files with 117 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cron/scheduler.py
View file

@ -1192,6 +1192,16 @@ def _resolve_single_delivery_target(job: dict, deliver_value: str) -> Optional[d
except Exception:
pass
if (
thread_id is None
and platform_key == "slack"
and origin
and str(origin.get("platform") or "").lower() == platform_key
and str(origin.get("chat_id")) == str(chat_id)
and origin.get("thread_id")
):
thread_id = origin.get("thread_id")
return {
"platform": platform_name,
"chat_id": chat_id,

107
tests/cron/test_scheduler.py
View file

@ -378,6 +378,54 @@ class TestResolveDeliveryTarget:
"thread_id": None,
}
def test_explicit_slack_same_channel_preserves_origin_thread_id(self):
job = {
"deliver": "slack:C0B3KEP3SD6",
"origin": {
"platform": "slack",
"chat_id": "C0B3KEP3SD6",
"thread_id": "1778485067.844139",
},
}
assert _resolve_delivery_target(job) == {
"platform": "slack",
"chat_id": "C0B3KEP3SD6",
"thread_id": "1778485067.844139",
}
def test_explicit_slack_other_channel_does_not_inherit_origin_thread_id(self):
job = {
"deliver": "slack:COTHERCHAN",
"origin": {
"platform": "slack",
"chat_id": "C0B3KEP3SD6",
"thread_id": "1778485067.844139",
},
}
assert _resolve_delivery_target(job) == {
"platform": "slack",
"chat_id": "COTHERCHAN",
"thread_id": None,
}
def test_explicit_slack_thread_target_overrides_origin_thread_id(self):
job = {
"deliver": "slack:C0B3KEP3SD6:1778500000.000001",
"origin": {
"platform": "slack",
"chat_id": "C0B3KEP3SD6",
"thread_id": "1778485067.844139",
},
}
assert _resolve_delivery_target(job) == {
"platform": "slack",
"chat_id": "C0B3KEP3SD6",
"thread_id": "1778500000.000001",
}
def test_bare_platform_uses_matching_origin_chat(self):
job = {
"deliver": "telegram",
@ -1808,6 +1856,65 @@ class TestRunJobSessionPersistence:
assert os.getenv("HERMES_CRON_AUTO_DELIVER_THREAD_ID") is None
fake_db.close.assert_called_once()
def test_run_job_preserves_slack_origin_thread_for_same_explicit_channel(self, tmp_path, monkeypatch):
job = {
"id": "slack-thread-job",
"name": "slack-thread",
"prompt": "hello",
"deliver": "slack:C0B3KEP3SD6",
"origin": {
"platform": "slack",
"chat_id": "C0B3KEP3SD6",
"thread_id": "1778485067.844139",
},
}
fake_db = MagicMock()
seen = {}
monkeypatch.delenv("HERMES_CRON_AUTO_DELIVER_PLATFORM", raising=False)
monkeypatch.delenv("HERMES_CRON_AUTO_DELIVER_CHAT_ID", raising=False)
monkeypatch.delenv("HERMES_CRON_AUTO_DELIVER_THREAD_ID", raising=False)
class FakeAgent:
def __init__(self, *args, **kwargs):
pass
def run_conversation(self, *args, **kwargs):
from gateway.session_context import get_session_env
seen["platform"] = get_session_env("HERMES_CRON_AUTO_DELIVER_PLATFORM") or None
seen["chat_id"] = get_session_env("HERMES_CRON_AUTO_DELIVER_CHAT_ID") or None
seen["thread_id"] = get_session_env("HERMES_CRON_AUTO_DELIVER_THREAD_ID") or None
return {"final_response": "ok"}
with patch("cron.scheduler._hermes_home", tmp_path), \
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", FakeAgent):
success, output, final_response, error = run_job(job)
assert success is True
assert error is None
assert final_response == "ok"
assert "ok" in output
assert seen == {
"platform": "slack",
"chat_id": "C0B3KEP3SD6",
"thread_id": "1778485067.844139",
}
assert os.getenv("HERMES_CRON_AUTO_DELIVER_PLATFORM") is None
assert os.getenv("HERMES_CRON_AUTO_DELIVER_CHAT_ID") is None
assert os.getenv("HERMES_CRON_AUTO_DELIVER_THREAD_ID") is None
fake_db.close.assert_called_once()
@pytest.mark.parametrize("timeout_value", ["600", "0"])
def test_run_job_heartbeats_oneshot_claim_in_both_wait_modes(
self, tmp_path, monkeypatch, timeout_value