Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

feat(slack): default thread join mode to allow, ask on own-plan runs (#122537)

Vojta Bartoš593a2fd5f371
diff --git a/products/slack_app/backend/logic/thread_join.py b/products/slack_app/backend/logic/thread_join.py
index 84d3e5c45f51..7b8cfc7168aa 100644
--- a/products/slack_app/backend/logic/thread_join.py
+++ b/products/slack_app/backend/logic/thread_join.py
@@ -30,7 +30,13 @@ def decide_thread_join(
A person's approval holds whatever the mode is now, because a mode change applies to new
people only. With the rollout flag off for the creator, the stored mode does not apply.
"""
- mode = resolve_thread_join_mode(integration, mapping.mentioning_slack_user_id)
+ from products.tasks.backend.facade import api as tasks_facade
+
+ mode = resolve_thread_join_mode(
+ integration,
+ mapping.mentioning_slack_user_id,
+ own_subscription=tasks_facade.uses_own_subscription(mapping.task_run.state),
+ )
if mode == ThreadJoinMode.ALLOW:
return ThreadJoinDecision.ALLOW
# Checked after the mode, so a creator who lets anyone join costs no flag request.
diff --git a/products/slack_app/backend/models.py b/products/slack_app/backend/models.py
index 46748d24ded5..dd9cea8def0f 100644
--- a/products/slack_app/backend/models.py
+++ b/products/slack_app/backend/models.py
@@ -151,7 +151,8 @@ class UntaggedFollowupMode(models.TextChoices):
class ThreadJoinMode(models.TextChoices):
"""What PostHog does when someone else tags it in a thread a user started.
- Read from the thread creator's settings row. An unset row resolves to ``ASK_PER_THREAD``.
+ Read from the thread creator's settings row. An unset row resolves to ``ALLOW``, or to
+ ``ASK_PER_THREAD`` when the thread's run bills to the creator's own plan.
Under ``ASK_PER_THREAD`` the creator's first approval in a thread lets anyone join it.
"""
@@ -226,7 +227,8 @@ class SlackSettings(UUIDModel):
choices=UntaggedFollowupMode.choices,
help_text="What PostHog does with this user's top-level channel questions that do not tag the app.",
)
- # NULL means the user has never picked, which resolves to ``ASK_PER_THREAD``.
+ # NULL means the user has never picked, which resolves to ``ALLOW`` (``ASK_PER_THREAD`` on
+ # a run that bills to the creator's own plan).
thread_join_mode = models.CharField(
max_length=16,
null=True,
diff --git a/products/slack_app/backend/services/slack_settings.py b/products/slack_app/backend/services/slack_settings.py
index 766567b64053..0db524a53c98 100644
--- a/products/slack_app/backend/services/slack_settings.py
+++ b/products/slack_app/backend/services/slack_settings.py
@@ -112,11 +112,14 @@ def _set_untagged_mode(slack_workspace_id: str, slack_user_id: str, column: str,
)
-def resolve_thread_join_mode(integration: Integration, slack_user_id: str | None) -> ThreadJoinMode:
+def resolve_thread_join_mode(
+ integration: Integration, slack_user_id: str | None, *, own_subscription: bool = False
+) -> ThreadJoinMode:
"""Resolve what happens when someone else tags PostHog in a thread this Slack user started.
- An absent row or empty column resolves to `ASK_PER_THREAD`, so the creator approves the first
- person who wants to join a thread, and after that anyone can join it.
+ An absent row or empty column resolves to `ALLOW`, so anyone can join until the creator picks
+ a stricter mode. When the thread's run bills to the creator's own plan, it resolves to
+ `ASK_PER_THREAD` instead, so nobody uses that plan before the creator approves.
An unknown value resolves to `NEVER`.
"""
if not slack_user_id:
@@ -126,7 +129,7 @@ def resolve_thread_join_mode(integration: Integration, slack_user_id: str | None
slack_user_id,
"thread_join_mode",
ThreadJoinMode,
- unset=ThreadJoinMode.ASK_PER_THREAD,
+ unset=ThreadJoinMode.ASK_PER_THREAD if own_subscription else ThreadJoinMode.ALLOW,
unknown=ThreadJoinMode.NEVER,
)
diff --git a/products/slack_app/backend/tests/test_followup_forwarding.py b/products/slack_app/backend/tests/test_followup_forwarding.py
index 98b4491cd070..baea7d3b98eb 100644
--- a/products/slack_app/backend/tests/test_followup_forwarding.py
+++ b/products/slack_app/backend/tests/test_followup_forwarding.py
@@ -1228,8 +1228,8 @@ class TestForwardPostHogCodeFollowupActivity(TestCase):
@parameterized.expand(
[
("allow", ThreadJoinMode.ALLOW, None, True, False, True),
- # A creator who never picked a mode is asked once per thread.
- ("unset", None, None, False, True, True),
+ # A creator who never picked a mode lets anyone join.
+ ("unset", None, None, True, False, True),
("ask_per_person", ThreadJoinMode.ASK_PER_PERSON, None, False, True, True),
("ask_per_person_already_joined", ThreadJoinMode.ASK_PER_PERSON, ["U_BOB"], True, False, True),
("ask_per_person_after_someone_else_joined", ThreadJoinMode.ASK_PER_PERSON, ["U_CAROL"], False, True, True),
@@ -1349,6 +1349,40 @@ class TestForwardPostHogCodeFollowupActivity(TestCase):
assert new_run.state["codex_subscription_user_id"] == self.user.id
assert new_run.state["slack_actor_user_id"] == bob.id
+ @parameterized.expand(
+ [
+ # A creator who never picked a mode is asked once per thread when the run bills to their plan.
+ ("unset", None, False, True),
+ ("allow", ThreadJoinMode.ALLOW, True, False),
+ ]
+ )
+ @patch("products.slack_app.backend.api.post_thread_join_prompt")
+ @patch("products.tasks.backend.facade.api.signal_task_run_user_message", return_value=True)
+ @patch("products.slack_app.backend.api.resolve_slack_user")
+ @patch("posthog.models.integration.SlackIntegration")
+ def test_a_run_on_the_creators_own_plan_asks_before_others_join_by_default(
+ self, _name, mode, delivered, prompted, mock_slack_cls, mock_resolve, mock_signal, mock_prompt
+ ):
+ self.task_run.state = {"claude_model_access": "own-subscription", "claude_subscription_user_id": self.user.id}
+ self.task_run.save(update_fields=["state"])
+ SlackSettings.objects.create(slack_workspace_id="T_SLACK", slack_user_id="U_ALICE", thread_join_mode=mode)
+ self._create_mapping(mentioning_user="U_ALICE")
+ bob = User.objects.create(email="[email protected]", first_name="Bob")
+ mock_slack_cls.return_value = MagicMock()
+ mock_resolve.return_value = SlackUserContext(user=bob, slack_email="[email protected]")
+
+ inputs = _make_inputs(self.integration.id, self.user.id)
+ with patch(
+ "products.slack_app.backend.logic.thread_join.is_slack_app_multiplayer_approvals_enabled",
+ return_value=True,
+ ):
+ forward_posthog_code_followup_activity(inputs, "C123", "1234.5678", "U_BOB", "<@BOT> ship it", "1234.5679")
+
+ assert mock_signal.called is delivered
+ assert mock_prompt.called is prompted
+ if prompted:
+ assert mock_prompt.call_args.kwargs["opens_thread"] is True
+
@patch("products.slack_app.backend.api.resolve_slack_user", return_value=None)
@patch("posthog.models.integration.SlackIntegration")
def test_cross_user_followup_unmapped_user_delegates_feedback_to_resolver(self, mock_slack_cls, mock_resolve):
diff --git a/products/tasks/backend/facade/api.py b/products/tasks/backend/facade/api.py
index f4356a87f8c6..976653db670c 100644
--- a/products/tasks/backend/facade/api.py
+++ b/products/tasks/backend/facade/api.py
@@ -268,6 +268,7 @@ __all__ = [
"own_subscription_cloud_enabled",
"can_bill_plan_unattended",
"unattended_model_access_state",
+ "uses_own_subscription",
"beacon_task_presence",
"bootstrap_task_run",
"SANDBOX_REPOSITORIES_ROOT",
@@ -4127,6 +4128,12 @@ def get_run_plan(state: dict[str, Any] | None) -> contracts.RunPlan | None:
return contracts.RunPlan(plan_name=SUBSCRIPTION_PLAN_NAMES[access.adapter], owner_user_id=access.owner_id)
+def uses_own_subscription(state: dict[str, Any] | None) -> bool:
+ """Whether a run bills to its owner's plan rather than to PostHog credits."""
+ run_state = state or {}
+ return any(run_state.get(f"{adapter}_model_access") == "own-subscription" for adapter in SUBSCRIPTION_PLAN_NAMES)
+
+
def ensure_subscription_owner(state: dict[str, Any] | None, actor_user_id: int | None) -> None:
"""Refuse anyone but the owner of the plan a run bills to. A run on PostHog credits allows everyone."""
run_state = state or {}