From 7a903bd12f293f4c81ea764080bbc6cbcb8e4f82 Mon Sep 17 00:00:00 2001
From: Eden Zimbelman <eden.zimbelman@salesforce.com>
Date: Mon, 18 May 2026 21:32:10 -0700
Subject: [PATCH] refactor: use say_stream helper instead of client.chat_stream

Replace manual client.chat_stream() calls with the say_stream context
utility, which automatically injects channel, thread_ts, recipient IDs.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
---
 listeners/assistant/message.py | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/listeners/assistant/message.py b/listeners/assistant/message.py
index 3fece10..022476c 100644
--- a/listeners/assistant/message.py
+++ b/listeners/assistant/message.py
@@ -2,8 +2,8 @@
 from logging import Logger
 
 from openai.types.responses import ResponseInputParam
-from slack_bolt import BoltContext, Say, SetStatus
-from slack_sdk import WebClient
+from slack_bolt import Say, SetStatus
+from slack_bolt.context.say_stream import SayStream
 from slack_sdk.models.messages.chunk import (
     MarkdownTextChunk,
     PlanUpdateChunk,
@@ -15,31 +15,23 @@
 
 
 def message(
-    client: WebClient,
-    context: BoltContext,
     logger: Logger,
     message: dict,
-    payload: dict,
     say: Say,
+    say_stream: SayStream,
     set_status: SetStatus,
 ):
     """
     Handles when users send messages or select a prompt in an assistant thread and generate AI responses:
 
     Args:
-        client: Slack WebClient for making API calls
-        context: Bolt context containing channel and thread information
         logger: Logger instance for error tracking
-        payload: Event payload with message details (channel, user, text, etc.)
+        message: The message event payload
         say: Function to send messages to the thread
+        say_stream: Function to start a chat stream in the thread
         set_status: Function to update the assistant's status
     """
     try:
-        channel_id = payload["channel"]
-        team_id = context.team_id
-        thread_ts = payload["thread_ts"]
-        user_id = context.user_id
-
         # The first example shows a message with thinking steps that has different
         # chunks to construct and update a plan alongside text outputs.
         if message["text"] == "Wonder a few deep thoughts.":
@@ -56,11 +48,7 @@ def message(
 
             time.sleep(4)
 
-            streamer = client.chat_stream(
-                channel=channel_id,
-                recipient_team_id=team_id,
-                recipient_user_id=user_id,
-                thread_ts=thread_ts,
+            streamer = say_stream(
                 task_display_mode="plan",
             )
             streamer.append(
@@ -140,11 +128,7 @@ def message(
                 ],
             )
 
-            streamer = client.chat_stream(
-                channel=channel_id,
-                recipient_team_id=team_id,
-                recipient_user_id=user_id,
-                thread_ts=thread_ts,
+            streamer = say_stream(
                 task_display_mode="timeline",
             )
             prompts: ResponseInputParam = [