mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-10 13:31:38 +00:00
Add a per-platform `cron_continuable_surface` extra key (`thread` default | `in_channel`) so a continuable cron job can deliver FLAT into a Slack channel — no dedicated thread — and still be replied-to. In `in_channel` mode the scheduler skips the thread-open branch (leaves `thread_id=None`); the shipped origin-mirror then seeds the `(slack, chat_id, None)` shared-channel session — the same bucket `reply_in_thread: false` routes inbound channel replies to — so a plain channel reply continues the job in context. Design: specs/cron-inchannel-continuable (D1–D7, F5). Model B (shared-channel session), NOT anchoring to the delivery `ts` — on Slack replying to a specific message IS threading, so a `ts` anchor would only relocate the thread, never deliver true threadless continuable. - gateway/platforms/base.py: `supports_inchannel_continuable` capability flag (default False → unsupported platforms fail SAFE to `thread`). - plugins/platforms/slack/adapter.py: flag=True; `_cron_continuable_surface()` resolver (coerces to the two-value enum); `_warn_if_inchannel_without_flat_reply` connect-time warning (D5: warn, not hard-require — the misconfig fails safe). - gateway/config.py: shared-key bridge line (top-level OR nested config). - cron/scheduler.py: read the key generically from platform config, gate the `in_channel` branch on the adapter capability flag, skip thread-open. No new seed function (reuses the existing mirror — G6). Pairing (docs): `in_channel` + `reply_in_thread: false` + `require_mention: false` (or a free-response channel). Missing `reply_in_thread: false` fails safe to a threaded continuation. Gateway-side config flag — `/restart` to apply; NO Slack app reinstall. Tests (from inside the worktree, PYTHONPATH=$PWD): - +6 cron scheduler tests (in_channel skips thread-open; seeds flat channel session with thread_id=None; thread-mode regression; fail-safe on unsupported platform; value coercion). Prove-fail: removing the `and not in_channel_surface` guard turns the two load-bearing tests RED; restore → GREEN. - +10 slack resolver/capability/warning tests; +2 config-bridge tests. - tests/manual/cron_inchannel_e2e.py: offline E2E driving BOTH real legs (delivery seed + inbound reply keying) → both converge on (slack, C, None). - No regressions: test_slack.py 216 passed alone; broader sweep green (4 pre-existing cross-file-ordering failures reproduce identically on pristine origin/main). Docs: cron.md + slack.md + zh-Hans mirrors of both.
149 lines
5.8 KiB
Python
149 lines
5.8 KiB
Python
"""
|
|
Tests for the Slack ``cron_continuable_surface`` extra key and its pairing warning.
|
|
|
|
``cron_continuable_surface: in_channel`` (paired with ``reply_in_thread: false``)
|
|
lets a continuable cron job deliver FLAT into a channel — no dedicated thread —
|
|
so a plain channel reply continues the job via the shared-channel session
|
|
``(slack, channel_id, None)``. See specs/cron-inchannel-continuable decisions
|
|
D1/D4/D5/D6.
|
|
|
|
- ``_cron_continuable_surface`` resolves the key: default ``"thread"``, coerces
|
|
any unrecognised value to ``"thread"`` (fail safe), only ``"in_channel"``
|
|
opts in.
|
|
- ``supports_inchannel_continuable`` is True on Slack (it has both a flat-reply
|
|
outbound gate and a whole-channel inbound session bucket).
|
|
- ``_warn_if_inchannel_without_flat_reply`` warns (D5: warn, not hard-require)
|
|
when ``in_channel`` is set without ``reply_in_thread: false`` — the misconfig
|
|
fails SAFE to a threaded continuation, so it is a warning, not a rejection.
|
|
"""
|
|
|
|
import logging
|
|
import sys
|
|
from unittest.mock import MagicMock
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Mock slack-bolt if not installed (same pattern as test_slack_user_token_warning.py)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _ensure_slack_mock():
|
|
if "slack_bolt" in sys.modules and hasattr(sys.modules["slack_bolt"], "__file__"):
|
|
return
|
|
|
|
slack_bolt = MagicMock()
|
|
slack_bolt.async_app.AsyncApp = MagicMock
|
|
slack_bolt.adapter.socket_mode.async_handler.AsyncSocketModeHandler = MagicMock
|
|
|
|
slack_sdk = MagicMock()
|
|
slack_sdk.web.async_client.AsyncWebClient = MagicMock
|
|
|
|
for name, mod in [
|
|
("slack_bolt", slack_bolt),
|
|
("slack_bolt.async_app", slack_bolt.async_app),
|
|
("slack_bolt.adapter", slack_bolt.adapter),
|
|
("slack_bolt.adapter.socket_mode", slack_bolt.adapter.socket_mode),
|
|
("slack_bolt.adapter.socket_mode.async_handler",
|
|
slack_bolt.adapter.socket_mode.async_handler),
|
|
("slack_sdk", slack_sdk),
|
|
("slack_sdk.web", slack_sdk.web),
|
|
("slack_sdk.web.async_client", slack_sdk.web.async_client),
|
|
]:
|
|
sys.modules.setdefault(name, mod)
|
|
|
|
|
|
_ensure_slack_mock()
|
|
|
|
import plugins.platforms.slack.adapter as _slack_mod # noqa: E402
|
|
_slack_mod.SLACK_AVAILABLE = True
|
|
|
|
from plugins.platforms.slack.adapter import SlackAdapter # noqa: E402
|
|
|
|
|
|
def _make_adapter(extra):
|
|
"""object.__new__ skips __init__ (heavy setup) — established slack-test
|
|
pattern. Attach a minimal config carrying only the ``extra`` dict."""
|
|
adapter = object.__new__(SlackAdapter)
|
|
cfg = MagicMock()
|
|
cfg.extra = dict(extra)
|
|
adapter.config = cfg
|
|
return adapter
|
|
|
|
|
|
# --- capability flag -------------------------------------------------------
|
|
|
|
def test_slack_declares_inchannel_capability():
|
|
"""Slack has both halves the in_channel surface needs, so the class-level
|
|
capability flag the cron scheduler reads generically must be True."""
|
|
assert SlackAdapter.supports_inchannel_continuable is True
|
|
|
|
|
|
# --- surface resolver ------------------------------------------------------
|
|
|
|
def test_surface_defaults_to_thread():
|
|
adapter = _make_adapter({})
|
|
assert adapter._cron_continuable_surface() == "thread"
|
|
|
|
|
|
def test_surface_in_channel_opts_in():
|
|
adapter = _make_adapter({"cron_continuable_surface": "in_channel"})
|
|
assert adapter._cron_continuable_surface() == "in_channel"
|
|
|
|
|
|
def test_surface_in_channel_case_and_whitespace_insensitive():
|
|
adapter = _make_adapter({"cron_continuable_surface": " In_Channel "})
|
|
assert adapter._cron_continuable_surface() == "in_channel"
|
|
|
|
|
|
def test_surface_explicit_thread():
|
|
adapter = _make_adapter({"cron_continuable_surface": "thread"})
|
|
assert adapter._cron_continuable_surface() == "thread"
|
|
|
|
|
|
def test_surface_unrecognised_value_coerces_to_thread():
|
|
"""Fail safe: any value that isn't 'in_channel' resolves to 'thread'."""
|
|
adapter = _make_adapter({"cron_continuable_surface": "bogus"})
|
|
assert adapter._cron_continuable_surface() == "thread"
|
|
|
|
|
|
# --- pairing warning (D5: warn, not hard-require) --------------------------
|
|
|
|
def test_warns_when_in_channel_without_flat_reply(caplog):
|
|
"""in_channel set, reply_in_thread left at its True default → warn."""
|
|
adapter = _make_adapter({"cron_continuable_surface": "in_channel"})
|
|
with caplog.at_level(logging.WARNING):
|
|
adapter._warn_if_inchannel_without_flat_reply("Acme")
|
|
matched = [r for r in caplog.records
|
|
if "cron_continuable_surface=in_channel" in r.message
|
|
and "reply_in_thread=false" in r.message]
|
|
assert matched
|
|
|
|
|
|
def test_warns_when_in_channel_with_reply_in_thread_true(caplog):
|
|
"""Explicit reply_in_thread: true alongside in_channel → still warn."""
|
|
adapter = _make_adapter(
|
|
{"cron_continuable_surface": "in_channel", "reply_in_thread": True}
|
|
)
|
|
with caplog.at_level(logging.WARNING):
|
|
adapter._warn_if_inchannel_without_flat_reply("Acme")
|
|
assert any("cron_continuable_surface=in_channel" in r.message
|
|
for r in caplog.records)
|
|
|
|
|
|
def test_no_warning_when_properly_paired(caplog):
|
|
"""in_channel + reply_in_thread: false is the correct pairing → silent."""
|
|
adapter = _make_adapter(
|
|
{"cron_continuable_surface": "in_channel", "reply_in_thread": False}
|
|
)
|
|
with caplog.at_level(logging.WARNING):
|
|
adapter._warn_if_inchannel_without_flat_reply("Acme")
|
|
assert not any("cron_continuable_surface=in_channel" in r.message
|
|
for r in caplog.records)
|
|
|
|
|
|
def test_no_warning_when_surface_is_thread(caplog):
|
|
"""Default thread surface never warns about the pairing."""
|
|
adapter = _make_adapter({"reply_in_thread": True})
|
|
with caplog.at_level(logging.WARNING):
|
|
adapter._warn_if_inchannel_without_flat_reply("Acme")
|
|
assert not any("cron_continuable_surface=in_channel" in r.message
|
|
for r in caplog.records)
|