merge conflicts

Author: lukegalbraithrussell

docs/english/concepts/ai-apps.md

@@ -1,5 +1,5 @@
 ---
-title: AI Apps
+title: Using AI in Apps
 lang: en
 slug: /concepts/ai-apps
 ---
@@ -8,7 +8,7 @@ slug: /concepts/ai-apps
 If you don't have a paid workspace for development, you can join the [Developer Program](https://api.slack.com/developer-program) and provision a sandbox with access to all Slack features for free.
 :::
 
-AI apps comprise a new messaging experience for Slack. If you're unfamiliar with using AI apps within Slack, you'll want to read the [API documentation on the subject](/ai/). Then come back here to implement them with Bolt!
+The Agents & AI Apps feature comprises a unique messaging experience for Slack. If you're unfamiliar with using the Agents & AI Apps feature within Slack, you'll want to read the [API documentation on the subject](/ai/). Then come back here to implement them with Bolt!
 
 ## Configuring your app to support AI features {#configuring-your-app}
 
@@ -28,11 +28,16 @@ AI apps comprise a new messaging experience for Slack. If you're unfamiliar with
 
 That being said, using the `Assistant` class will streamline the process. And we already wrote this nice guide for you!
 
+<<<<<<< HEAD:docs/english/concepts/ai-apps.md
+=======
+:::info
+You _could_ go it alone and [listen](event-listening) for the `assistant_thread_started`, `assistant_thread_context_changed`, and `message.im` events (see implementation details below) in order to implement the AI features in your app. That being said, using the `Assistant` class will streamline the process. And we already wrote this nice guide for you!
+>>>>>>> origin:docs/content/concepts/ai-apps.md
 :::
 
 ## The `Assistant` class instance {#assistant-class}
 
-The `Assistant` class can be used to handle the incoming events expected from a user interacting with an AI app in Slack. A typical flow would look like:
+The `Assistant` class can be used to handle the incoming events expected from a user interacting with an app in Slack that has the Agents & AI Apps feature enabled. A typical flow would look like:
 
 1. [The user starts a thread](#handling-a-new-thread). The `Assistant` class handles the incoming [`assistant_thread_started`](/reference/events/assistant_thread_started) event.
 2. [The thread context may change at any point](#handling-thread-context-changes). The `Assistant` class can handle any incoming [`assistant_thread_context_changed`](/reference/events/assistant_thread_context_changed) events. The class also provides a default context store to keep track of thread context changes as the user moves through Slack.
@@ -108,12 +113,19 @@ If you do provide your own `threadContextStore` property, it must feature `get`
 
 ## Handling a new thread {#handling-a-new-thread}
 
+<<<<<<< HEAD:docs/english/concepts/ai-apps.md
 When the user opens a new thread with your AI app, the [`assistant_thread_started`](/reference/events/assistant_thread_started) event will be sent to your app.
 
 :::tip[When a user opens an AI app thread while in a channel, the channel info is stored as the thread's `AssistantThreadContext` data. You can grab that info by using the `get_thread_context` utility, as subsequent user message event payloads won't include the channel info.]
+=======
+When the user opens a new thread with your AI-enabled app, the [`assistant_thread_started`](https://docs.slack.dev/reference/events/assistant_thread_started) event will be sent to your app.
+
+:::tip
+When a user opens an app thread while in a channel, the channel info is stored as the thread's `AssistantThreadContext` data. You can grab that info by using the `get_thread_context` utility, as subsequent user message event payloads won't include the channel info.
+>>>>>>> origin:docs/content/concepts/ai-apps.md
 :::
 
-### Block Kit interactions in the AI app thread {#block-kit-interactions}
+### Block Kit interactions in the app thread {#block-kit-interactions}
 
 For advanced use cases, Block Kit buttons may be used instead of suggested prompts, as well as the sending of messages with structured [metadata](/messaging/message-metadata/) to trigger subsequent interactions with the user.
 

docs/english/concepts/listener-middleware.md

@@ -11,11 +11,10 @@ If your listener middleware is a quite simple one, you can use a listener matche
 Refer to [the module document](https://docs.slack.dev/bolt-python/api-docs/slack_bolt/kwargs_injection/args.html) to learn the available listener arguments.
 
 ```python
-# Listener middleware which filters out messages with "bot_message" subtype
+# Listener middleware which filters out messages from a bot
 def no_bot_messages(message, next):
-    subtype = message.get("subtype")
-    if subtype != "bot_message":
-       next()
+    if "bot_id" not in message:
+        next()
 
 # This listener only receives messages from humans
 @app.event(event="message", middleware=[no_bot_messages])
@@ -24,10 +23,10 @@ def log_message(logger, event):
 
 # Listener matchers: simplified version of listener middleware
 def no_bot_messages(message) -> bool:
-    return message.get("subtype") != "bot_message"
+    return "bot_id" not in message
 
 @app.event(
-    event="message", 
+    event="message",
     matchers=[no_bot_messages]
     # or matchers=[lambda message: message.get("subtype") != "bot_message"]
 )

docs/japanese/concepts/listener-middleware.md

@@ -11,11 +11,10 @@ slug: /concepts/listener-middleware
 <span>指定可能な引数の一覧は<a href="https://docs.slack.dev/bolt-python/api-docs/slack_bolt/kwargs_injection/args.html">モジュールドキュメント</a>を参考にしてください。</span>
 
 ```python
-# "bot_message" サブタイプのメッセージを抽出するリスナーミドルウェア
+# ボットからのメッセージをフィルタリングするリスナーミドルウェア
 def no_bot_messages(message, next):
-    subtype = message.get("subtype")
-    if subtype != "bot_message":
-       next()
+    if "bot_id" not in message:
+        next()
 
 # このリスナーは人間によって送信されたメッセージのみを受け取ります
 @app.event(event="message", middleware=[no_bot_messages])
@@ -24,13 +23,13 @@ def log_message(logger, event):
 
 # リスナーマッチャー： 簡略化されたバージョンのリスナーミドルウェア
 def no_bot_messages(message) -> bool:
-    return message.get("subtype") != "bot_message"
+    return "bot_id" not in message
 
 @app.event(
-    event="message", 
+    event="message",
     matchers=[no_bot_messages]
     # or matchers=[lambda message: message.get("subtype") != "bot_message"]
 )
 def log_message(logger, event):
     logger.info(f"(MSG) User: {event['user']}\nMessage: {event['text']}")
-```
+```