refactor: remove agent from context, construct in kwargs injection instead

mwbrooks · mwbrooks · commit f10f94debc54 · 2026-02-15T21:56:34.000-08:00
diff --git a/slack_bolt/context/async_context.py b/slack_bolt/context/async_context.py
@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from slack_sdk.web.async_client import AsyncWebClient
 
@@ -15,9 +15,6 @@
 from slack_bolt.context.set_title.async_set_title import AsyncSetTitle
 from slack_bolt.util.utils import create_copy
 
-if TYPE_CHECKING:
-    from slack_bolt.agent.async_agent import AsyncBoltAgent
-
 
 class AsyncBoltContext(BaseContext):
     """Context object associated with a request from Slack."""
@@ -190,36 +187,6 @@ async def handle_button_clicks(context):
             self["fail"] = AsyncFail(client=self.client, function_execution_id=self.function_execution_id)
         return self["fail"]
 
-    @property
-    def agent(self) -> "AsyncBoltAgent":
-        """`agent` listener argument for building AI-powered Slack agents.
-
-        Experimental:
-            This API is experimental and may change in future releases.
-
-            @app.event("app_mention")
-            async def handle_mention(agent):
-                stream = await agent.chat_stream()
-                await stream.append(markdown_text="Hello!")
-                await stream.stop()
-
-        Returns:
-            `AsyncBoltAgent` instance
-        """
-        if "agent" not in self:
-            # Deferred import: AsyncBoltAgent is only imported at runtime when accessed,
-            # avoiding unnecessary loading when the agent property is never used.
-            from slack_bolt.agent.async_agent import AsyncBoltAgent
-
-            self["agent"] = AsyncBoltAgent(
-                client=self.client,
-                channel_id=self.channel_id,
-                thread_ts=self.thread_ts,
-                team_id=self.team_id,
-                user_id=self.user_id,
-            )
-        return self["agent"]
-
     @property
     def set_title(self) -> Optional[AsyncSetTitle]:
         return self.get("set_title")
diff --git a/slack_bolt/context/base_context.py b/slack_bolt/context/base_context.py
@@ -38,7 +38,6 @@ class BaseContext(dict):
         "set_status",
         "set_title",
         "set_suggested_prompts",
-        "agent",
     ]
     # Note that these items are not copyable, so when you add new items to this list,
     # you must modify ThreadListenerRunner/AsyncioListenerRunner's _build_lazy_request method to pass the values.
diff --git a/slack_bolt/context/context.py b/slack_bolt/context/context.py
@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from slack_sdk import WebClient
 
@@ -15,9 +15,6 @@
 from slack_bolt.context.set_title import SetTitle
 from slack_bolt.util.utils import create_copy
 
-if TYPE_CHECKING:
-    from slack_bolt.agent.agent import BoltAgent
-
 
 class BoltContext(BaseContext):
     """Context object associated with a request from Slack."""
@@ -191,36 +188,6 @@ def handle_button_clicks(context):
             self["fail"] = Fail(client=self.client, function_execution_id=self.function_execution_id)
         return self["fail"]
 
-    @property
-    def agent(self) -> "BoltAgent":
-        """`agent` listener argument for building AI-powered Slack agents.
-
-        Experimental:
-            This API is experimental and may change in future releases.
-
-            @app.event("app_mention")
-            def handle_mention(agent):
-                stream = agent.chat_stream()
-                stream.append(markdown_text="Hello!")
-                stream.stop()
-
-        Returns:
-            `BoltAgent` instance
-        """
-        if "agent" not in self:
-            # Deferred import: BoltAgent is only imported at runtime when accessed,
-            # avoiding unnecessary loading when the agent property is never used.
-            from slack_bolt.agent.agent import BoltAgent
-
-            self["agent"] = BoltAgent(
-                client=self.client,
-                channel_id=self.channel_id,
-                thread_ts=self.thread_ts,
-                team_id=self.team_id,
-                user_id=self.user_id,
-            )
-        return self["agent"]
-
     @property
     def set_title(self) -> Optional[SetTitle]:
         return self.get("set_title")
diff --git a/slack_bolt/kwargs_injection/async_utils.py b/slack_bolt/kwargs_injection/async_utils.py
@@ -87,7 +87,15 @@ def build_async_required_kwargs(
 
     # Defer agent creation to avoid constructing AsyncBoltAgent on every request
     if "agent" in required_arg_names or "args" in required_arg_names:
-        all_available_args["agent"] = request.context.agent
+        from slack_bolt.agent.async_agent import AsyncBoltAgent
+
+        all_available_args["agent"] = AsyncBoltAgent(
+            client=request.context.client,
+            channel_id=request.context.channel_id,
+            thread_ts=request.context.thread_ts,
+            team_id=request.context.team_id,
+            user_id=request.context.user_id,
+        )
         if "agent" in required_arg_names:
             warnings.warn(
                 "The agent listener argument is experimental and may change in future versions.",
diff --git a/slack_bolt/kwargs_injection/utils.py b/slack_bolt/kwargs_injection/utils.py
@@ -86,7 +86,15 @@ def build_required_kwargs(
 
     # Defer agent creation to avoid constructing BoltAgent on every request
     if "agent" in required_arg_names or "args" in required_arg_names:
-        all_available_args["agent"] = request.context.agent
+        from slack_bolt.agent.agent import BoltAgent
+
+        all_available_args["agent"] = BoltAgent(
+            client=request.context.client,
+            channel_id=request.context.channel_id,
+            thread_ts=request.context.thread_ts,
+            team_id=request.context.team_id,
+            user_id=request.context.user_id,
+        )
         if "agent" in required_arg_names:
             warnings.warn(
                 "The agent listener argument is experimental and may change in future versions.",
diff --git a/tests/scenario_tests/test_events_agent.py b/tests/scenario_tests/test_events_agent.py
@@ -80,33 +80,6 @@ def handle_action(ack, agent: BoltAgent):
         assert response.status == 200
         assert_target_called()
 
-    def test_agent_accessible_via_context(self):
-        app = App(client=self.web_client)
-
-        state = {"called": False}
-
-        def assert_target_called():
-            count = 0
-            while state["called"] is False and count < 20:
-                sleep(0.1)
-                count += 1
-            assert state["called"] is True
-            state["called"] = False
-
-        @app.event("app_mention")
-        def handle_mention(context: BoltContext):
-            agent = context.agent
-            assert agent is not None
-            assert isinstance(agent, BoltAgentDirect)
-            # Verify the same instance is returned on subsequent access
-            assert context.agent is agent
-            state["called"] = True
-
-        request = BoltRequest(body=app_mention_event_body, mode="socket_mode")
-        response = app.dispatch(request)
-        assert response.status == 200
-        assert_target_called()
-
     def test_agent_kwarg_emits_experimental_warning(self):
         app = App(client=self.web_client)
 
diff --git a/tests/scenario_tests_async/test_events_agent.py b/tests/scenario_tests_async/test_events_agent.py
@@ -86,34 +86,6 @@ async def handle_action(ack, agent: AsyncBoltAgent):
         assert response.status == 200
         await assert_target_called()
 
-    @pytest.mark.asyncio
-    async def test_agent_accessible_via_context(self):
-        app = AsyncApp(client=self.web_client)
-
-        state = {"called": False}
-
-        async def assert_target_called():
-            count = 0
-            while state["called"] is False and count < 20:
-                await asyncio.sleep(0.1)
-                count += 1
-            assert state["called"] is True
-            state["called"] = False
-
-        @app.event("app_mention")
-        async def handle_mention(context: AsyncBoltContext):
-            agent = context.agent
-            assert agent is not None
-            assert isinstance(agent, AsyncBoltAgent)
-            # Verify the same instance is returned on subsequent access
-            assert context.agent is agent
-            state["called"] = True
-
-        request = AsyncBoltRequest(body=app_mention_event_body, mode="socket_mode")
-        response = await app.async_dispatch(request)
-        assert response.status == 200
-        await assert_target_called()
-
     @pytest.mark.asyncio
     async def test_agent_kwarg_emits_experimental_warning(self):
         app = AsyncApp(client=self.web_client)

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ class BaseContext(dict):`
`38`	`38`	`"set_status",`
`39`	`39`	`"set_title",`
`40`	`40`	`"set_suggested_prompts",`
`41`		`- "agent",`
`42`	`41`	`]`
`43`	`42`	`# Note that these items are not copyable, so when you add new items to this list,`
`44`	`43`	`# you must modify ThreadListenerRunner/AsyncioListenerRunner's _build_lazy_request method to pass the values.`