Add Slack thread mention gating

This commit is contained in:
saitama 2026-06-30 18:50:43 -03:00 committed by Teknium
parent f50e1e9c51
commit 094c883bc0
4 changed files with 235 additions and 11 deletions

View file

@ -2524,6 +2524,8 @@ DEFAULT_CONFIG = {
# @mentions someone other than the bot) unless the bot is also mentioned.
# Opt-in; default off keeps existing behaviour. Env: SLACK_IGNORE_OTHER_USER_MENTIONS.
"ignore_other_user_mentions": False,
# If True, require @mention in Slack thread replies too.
"thread_require_mention": False,
"channel_prompts": {}, # Per-channel ephemeral system prompts
},

View file

@ -4396,7 +4396,9 @@ class SlackAdapter(BasePlatformAdapter):
# @mentioning another user without also mentioning the bot — then
# stay silent regardless of the rules below)
# 0. Channel is in free_response_channels, OR require_mention is
# disabled — always process regardless of mention.
# disabled - process without mention. If thread_require_mention is
# enabled, this free-response behavior is limited to top-level
# channel messages and thread replies must still @mention the bot.
# 1. The bot is @mentioned in this message, OR
# 2. The message is a reply in a thread the bot started/participated in, OR
# 3. The message is in a thread where the bot was previously @mentioned, OR
@ -4462,12 +4464,40 @@ class SlackAdapter(BasePlatformAdapter):
)
return
if channel_id in self._slack_free_response_channels():
pass # Free-response channel — always process
elif not self._slack_require_mention():
pass # Mention requirement disabled globally for Slack
if (
channel_id in self._slack_free_response_channels()
or not self._slack_require_mention()
):
# Free-response channel, or mention requirement disabled
# globally. thread_require_mention still gates thread
# replies: top-level messages stay free-response, but a bot
# must be re-mentioned to join thread follow-ups.
if (
self._slack_thread_require_mention()
and is_thread_reply
and not is_mentioned
):
logger.debug(
"[Slack] Ignoring thread reply without mention "
"(thread_require_mention=true): channel=%s thread_ts=%s",
channel_id,
event_thread_ts,
)
return
elif self._slack_strict_mention() and not is_mentioned:
return # Strict mode: ignore until @-mentioned again
elif (
self._slack_thread_require_mention()
and is_thread_reply
and not is_mentioned
):
logger.debug(
"[Slack] Ignoring thread reply without mention "
"(thread_require_mention=true): channel=%s thread_ts=%s",
channel_id,
event_thread_ts,
)
return
elif not is_mentioned:
if not await self._should_wake_on_unmentioned_message(
event_thread_ts=event_thread_ts,
@ -4501,15 +4531,20 @@ class SlackAdapter(BasePlatformAdapter):
command_probe_text = command_text
is_command_text = True
# Register this thread so all future messages auto-trigger the bot.
# Skipped in strict mode: strict_mention=true bots must be
# re-mentioned every turn, so remembering the thread would
# defeat the feature (and re-enable agent-to-agent ack loops).
# Skipped in strict/thread-gated mode: strict_mention=true and
# thread_require_mention=true bots must be re-mentioned for
# follow-up thread turns, so remembering the thread would defeat
# the feature (and re-enable agent-to-agent ack loops).
#
# Use the session-scoped ``thread_ts`` (which falls back to the
# message ts for top-level mentions) rather than the raw event
# thread_ts: a top-level @mention STARTS a thread, and replies to
# it must auto-trigger the bot too (#24848).
if thread_ts and not self._slack_strict_mention():
if (
thread_ts
and not self._slack_strict_mention()
and not self._slack_thread_require_mention()
):
self._register_mentioned_thread(thread_ts)
# Thread context rules:
@ -6751,6 +6786,27 @@ class SlackAdapter(BasePlatformAdapter):
"on",
}
def _slack_thread_require_mention(self) -> bool:
"""When true, Slack thread replies require an explicit @-mention.
This is narrower than ``strict_mention``: top-level channel messages can
still be processed without a mention when ``require_mention`` is false
or the channel is listed in ``free_response_channels``. Thread replies
remain gated to prevent a bot from joining every follow-up in busy
support threads.
"""
configured = self.config.extra.get("thread_require_mention")
if configured is not None:
if isinstance(configured, str):
return configured.lower() in {"true", "1", "yes", "on"}
return bool(configured)
return os.getenv("SLACK_THREAD_REQUIRE_MENTION", "false").lower() in {
"true",
"1",
"yes",
"on",
}
def _slack_message_addressed_to_other_user(self, text: str, self_uids: set) -> bool:
"""Return True when ``text`` opens by @-mentioning a non-bot user.
@ -7229,6 +7285,12 @@ def _apply_yaml_config(yaml_cfg: dict, slack_cfg: dict) -> dict | None:
os.environ["SLACK_IGNORE_OTHER_USER_MENTIONS"] = str(
slack_cfg["ignore_other_user_mentions"]
).lower()
if "thread_require_mention" in slack_cfg and not os.getenv(
"SLACK_THREAD_REQUIRE_MENTION"
):
os.environ["SLACK_THREAD_REQUIRE_MENTION"] = str(
slack_cfg["thread_require_mention"]
).lower()
if "allow_bots" in slack_cfg and not os.getenv("SLACK_ALLOW_BOTS"):
os.environ["SLACK_ALLOW_BOTS"] = str(slack_cfg["allow_bots"]).lower()
frc = slack_cfg.get("free_response_channels")
@ -7279,8 +7341,9 @@ def register(ctx) -> None:
setup_fn=interactive_setup,
# YAML→env config bridge — owns the translation of config.yaml slack:
# keys (require_mention, strict_mention, ignore_other_user_mentions,
# allow_bots, free_response_channels, reactions, allowed_channels) into
# SLACK_* env vars that the adapter reads via os.getenv(). Replaces the
# thread_require_mention, allow_bots, free_response_channels,
# reactions, allowed_channels) into SLACK_* env vars that the adapter
# reads via os.getenv(). Replaces the
# hardcoded block in gateway/config.py. Hook contract: #24849.
apply_yaml_config_fn=_apply_yaml_config,
# Auth env vars for _is_user_authorized() integration

View file

@ -37,3 +37,9 @@ optional_env:
description: "Display name for the Slack home channel"
prompt: "Home channel display name"
password: false
- name: SLACK_THREAD_REQUIRE_MENTION
description: >-
Require an explicit @mention for Slack thread replies while preserving
top-level free response channels
prompt: "Require mentions in Slack threads? (true/false)"
password: false

View file

@ -0,0 +1,153 @@
import asyncio
import os
from gateway.config import PlatformConfig
from plugins.platforms.slack.adapter import SlackAdapter, _apply_yaml_config
def run(coro):
return asyncio.run(coro)
def make_adapter(extra=None):
config = PlatformConfig(extra=extra or {})
adapter = SlackAdapter(config)
adapter._bot_user_id = "UBOT"
adapter._team_bot_user_ids["T1"] = "UBOT"
adapter._has_active_session_for_thread = lambda **_: False
async def no_thread_context(**_):
return ""
async def no_parent_text(**_):
return ""
async def user_name(*_, **__):
return "Sebastian"
adapter._fetch_thread_context = no_thread_context
adapter._fetch_thread_parent_text = no_parent_text
adapter._resolve_user_name = user_name
return adapter
def slack_event(text, ts="100.000", thread_ts=None):
event = {
"type": "message",
"channel": "C123",
"channel_type": "channel",
"team": "T1",
"user": "U123",
"text": text,
"ts": ts,
}
if thread_ts is not None:
event["thread_ts"] = thread_ts
return event
def test_thread_require_mention_env_bridge(monkeypatch):
monkeypatch.delenv("SLACK_THREAD_REQUIRE_MENTION", raising=False)
_apply_yaml_config(
{},
{
"thread_require_mention": True,
},
)
assert os.environ["SLACK_THREAD_REQUIRE_MENTION"] == "true"
def test_thread_require_mention_parses_yaml_and_env(monkeypatch):
monkeypatch.setenv("SLACK_THREAD_REQUIRE_MENTION", "true")
assert make_adapter()._slack_thread_require_mention() is True
assert (
make_adapter({"thread_require_mention": "false"})._slack_thread_require_mention()
is False
)
assert make_adapter({"thread_require_mention": True})._slack_thread_require_mention() is True
def test_thread_require_mention_allows_top_level_free_response():
adapter = make_adapter(
{
"allowed_channels": ["C123"],
"require_mention": False,
"thread_require_mention": True,
"reply_in_thread": True,
}
)
handled = []
async def capture(event):
handled.append(event)
adapter.handle_message = capture
run(adapter._handle_slack_message(slack_event("vpn is broken", ts="100.000")))
assert len(handled) == 1
assert handled[0].text == "vpn is broken"
assert handled[0].source.thread_id == "100.000"
def test_thread_require_mention_blocks_unmentioned_thread_reply():
adapter = make_adapter(
{
"allowed_channels": ["C123"],
"require_mention": False,
"thread_require_mention": True,
"reply_in_thread": True,
}
)
handled = []
async def capture(event):
handled.append(event)
adapter.handle_message = capture
run(
adapter._handle_slack_message(
slack_event("we found another 403", ts="101.000", thread_ts="100.000")
)
)
assert handled == []
def test_thread_require_mention_allows_mentioned_thread_reply_without_sticky_thread():
adapter = make_adapter(
{
"allowed_channels": ["C123"],
"require_mention": False,
"thread_require_mention": True,
"reply_in_thread": True,
}
)
handled = []
async def capture(event):
handled.append(event)
adapter.handle_message = capture
run(
adapter._handle_slack_message(
slack_event("<@UBOT> update this", ts="101.000", thread_ts="100.000")
)
)
assert len(handled) == 1
assert handled[0].text == "update this"
assert "100.000" not in adapter._mentioned_threads
run(
adapter._handle_slack_message(
slack_event("follow-up without mention", ts="102.000", thread_ts="100.000")
)
)
assert len(handled) == 1