merge: resolve conflicts from main, keeping main's changes

Author: mwbrooks

.github/workflows/dependencies.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Collect metadata
         id: metadata
-        uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a # v2.5.0
+        uses: dependabot/fetch-metadata@ffa630c65fa7e0ecfa0625b5ceda64399aea1b36 # v3.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve

claude-agent-sdk/listeners/actions/feedback.py

@@ -1,16 +1,23 @@
 from logging import Logger
 
 from slack_bolt import Ack
+from slack_bolt.context.async_context import AsyncBoltContext
 from slack_sdk.web.async_client import AsyncWebClient
 
 
-async def handle_feedback(ack: Ack, body: dict, client: AsyncWebClient, logger: Logger):
+async def handle_feedback(
+    ack: Ack,
+    body: dict,
+    client: AsyncWebClient,
+    context: AsyncBoltContext,
+    logger: Logger,
+):
     """Handle thumbs up/down feedback on Casey's responses."""
     await ack()
 
     try:
-        channel_id = body["channel"]["id"]
-        user_id = body["user"]["id"]
+        channel_id = context.channel_id
+        user_id = context.user_id
         message_ts = body["message"]["ts"]
         feedback_value = body["actions"][0]["value"]
 

claude-agent-sdk/listeners/events/app_home_opened.py

@@ -1,14 +1,17 @@
 from logging import Logger
 
+from slack_bolt.context.async_context import AsyncBoltContext
 from slack_sdk.web.async_client import AsyncWebClient
 
 from listeners.views.app_home_builder import build_app_home_view
 
 
-async def handle_app_home_opened(client: AsyncWebClient, event: dict, logger: Logger):
+async def handle_app_home_opened(
+    client: AsyncWebClient, context: AsyncBoltContext, logger: Logger
+):
     """Publish the App Home view when a user opens the app's Home tab."""
     try:
-        user_id = event["user"]
+        user_id = context.user_id
         view = build_app_home_view()
         await client.views_publish(user_id=user_id, view=view)
     except Exception as e:

claude-agent-sdk/listeners/events/app_mentioned.py

@@ -2,7 +2,7 @@
 import re
 from logging import Logger
 
-from slack_bolt.agent.async_agent import AsyncBoltAgent
+from slack_bolt.context.async_context import AsyncBoltContext
 from slack_bolt.context.say.async_say import AsyncSay
 from slack_sdk.web.async_client import AsyncWebClient
 
@@ -24,18 +24,18 @@
 
 async def handle_app_mentioned(
     client: AsyncWebClient,
+    context: AsyncBoltContext,
     event: dict,
-    agent: AsyncBoltAgent,
     logger: Logger,
     say: AsyncSay,
 ):
     """Handle @Casey mentions in channels."""
     try:
-        channel_id = event["channel"]
-        team_id = event.get("team")
+        channel_id = context.channel_id
+        team_id = context.team_id
         text = event.get("text", "")
         thread_ts = event.get("thread_ts") or event["ts"]
-        user_id = event.get("user")
+        user_id = context.user_id
 
         # Strip the bot mention from the text
         cleaned_text = re.sub(r"<@[A-Z0-9]+>", "", text).strip()
@@ -78,9 +78,9 @@ async def handle_app_mentioned(
         )
 
         # Stream response in thread with feedback buttons
-        streamer = await agent.chat_stream(
+        streamer = await client.chat_stream(
             channel=channel_id,
-            recipient_team_id=team_id,  # chat_stream helper cannot infer event["team"] from client
+            recipient_team_id=team_id,
             recipient_user_id=user_id,
             thread_ts=thread_ts,
         )

claude-agent-sdk/listeners/events/message.py

@@ -1,7 +1,7 @@
 import random
 from logging import Logger
 
-from slack_bolt.agent.async_agent import AsyncBoltAgent
+from slack_bolt.context.async_context import AsyncBoltContext
 from slack_bolt.context.say.async_say import AsyncSay
 from slack_sdk.web.async_client import AsyncWebClient
 
@@ -23,8 +23,8 @@
 
 async def handle_message(
     client: AsyncWebClient,
+    context: AsyncBoltContext,
     event: dict,
-    agent: AsyncBoltAgent,
     logger: Logger,
     say: AsyncSay,
 ):
@@ -38,9 +38,11 @@ async def handle_message(
         return
 
     try:
-        channel_id = event["channel"]
+        channel_id = context.channel_id
+        team_id = context.team_id
         text = event.get("text", "")
         thread_ts = event.get("thread_ts") or event["ts"]
+        user_id = context.user_id
 
         # Get session ID for conversation context
         existing_session_id = session_store.get_session(channel_id, thread_ts)
@@ -73,7 +75,12 @@ async def handle_message(
         )
 
         # Stream response in thread with feedback buttons
-        streamer = await agent.chat_stream()
+        streamer = await client.chat_stream(
+            channel=channel_id,
+            recipient_team_id=team_id,
+            recipient_user_id=user_id,
+            thread_ts=thread_ts,
+        )
         await streamer.append(markdown_text=response_text)
         feedback_blocks = create_feedback_block()
         await streamer.stop(blocks=feedback_blocks)

claude-agent-sdk/listeners/views/issue_modal.py

@@ -1,7 +1,7 @@
 from logging import Logger
 
 from slack_bolt import Ack
-from slack_bolt.agent.async_agent import AsyncBoltAgent
+from slack_bolt.context.async_context import AsyncBoltContext
 from slack_sdk.web.async_client import AsyncWebClient
 
 from agent import run_casey_agent
@@ -10,14 +10,18 @@
 
 
 async def handle_issue_submission(
-    ack: Ack, body: dict, client: AsyncWebClient, agent: AsyncBoltAgent, logger: Logger
+    ack: Ack,
+    body: dict,
+    client: AsyncWebClient,
+    context: AsyncBoltContext,
+    logger: Logger,
 ):
     """Handle modal submission: open DM, post issue, and run Casey agent."""
     await ack()
 
     try:
-        team_id = body["user"]["team_id"]
-        user_id = body["user"]["id"]
+        team_id = context.team_id
+        user_id = context.user_id
         values = body["view"]["state"]["values"]
         category = values["category_block"]["category_select"]["selected_option"][
             "value"
@@ -61,7 +65,7 @@ async def handle_issue_submission(
         response_text, new_session_id = await run_casey_agent(user_message)
 
         # Stream the response in thread with feedback buttons
-        streamer = await agent.chat_stream(
+        streamer = await client.chat_stream(
             channel=channel_id,
             recipient_team_id=team_id,
             recipient_user_id=user_id,

claude-agent-sdk/pyproject.toml

@@ -3,18 +3,18 @@ name = "bolt-python-support-agent-claude"
 version = "0.1.0"
 requires-python = ">=3.12"
 dependencies = [
-    "slack-sdk==3.40.1",
+    "slack-sdk==3.41.0",
     # slack-bolt is installed from a vendored whl — see ../vendor/
     "slack-cli-hooks<1.0.0",
     "claude-agent-sdk>=0.1.36",
     "aiohttp>=3.13.3",
-    "python-dotenv==1.2.1",
+    "python-dotenv==1.2.2",
 ]
 
 [project.optional-dependencies]
 dev = [
     "pytest",
-    "ruff==0.15.2",
+    "ruff==0.15.8",
 ]
 
 [tool.setuptools.packages.find]

claude-agent-sdk/requirements.txt

@@ -1,9 +1,9 @@
-slack-sdk==3.40.1
+slack-sdk==3.41.0
 ../vendor/slack_bolt-1.27.0+837e120-py2.py3-none-any.whl
 slack-cli-hooks<1.0.0
 claude-agent-sdk>=0.1.36
 aiohttp>=3.13.3
-python-dotenv==1.2.1
+python-dotenv==1.2.2
 
 pytest
-ruff==0.15.2
+ruff==0.15.8

openai-agents-sdk/listeners/actions/feedback.py

@@ -1,16 +1,18 @@
 from logging import Logger
 
-from slack_bolt import Ack
+from slack_bolt import Ack, BoltContext
 from slack_sdk import WebClient
 
 
-def handle_feedback(ack: Ack, body: dict, client: WebClient, logger: Logger):
+def handle_feedback(
+    ack: Ack, body: dict, client: WebClient, context: BoltContext, logger: Logger
+):
     """Handle thumbs up/down feedback on Casey's responses."""
     ack()
 
     try:
-        channel_id = body["channel"]["id"]
-        user_id = body["user"]["id"]
+        channel_id = context.channel_id
+        user_id = context.user_id
         message_ts = body["message"]["ts"]
         feedback_value = body["actions"][0]["value"]
 

openai-agents-sdk/listeners/events/app_home_opened.py

@@ -1,14 +1,15 @@
 from logging import Logger
 
+from slack_bolt import BoltContext
 from slack_sdk import WebClient
 
 from listeners.views.app_home_builder import build_app_home_view
 
 
-def handle_app_home_opened(client: WebClient, event: dict, logger: Logger):
+def handle_app_home_opened(client: WebClient, context: BoltContext, logger: Logger):
     """Publish the App Home view when a user opens the app's Home tab."""
     try:
-        user_id = event["user"]
+        user_id = context.user_id
         view = build_app_home_view()
         client.views_publish(user_id=user_id, view=view)
     except Exception as e: