sync: auto-sync from GURU-BEAST-ROG at 2026-06-02 10:44:23

Author: Mike Swanson
Machine: GURU-BEAST-ROG
Timestamp: 2026-06-02 10:44:23

projects/discord-bot/bot/handlers/message_handler.py

@@ -41,7 +41,18 @@ class MessageHandler:
             await message.reply("Hey! How can I help?")
             return
 
+        # Resolve or create the thread first so we can include its ID in context.
+        if isinstance(message.channel, discord.Thread):
+            thread = message.channel
+        else:
+            name = self._thread_name(user_text) if user_text else "Attachment"
+            thread = await message.create_thread(
+                name=name,
+                auto_archive_duration=1440,
+            )
+
         # Build caller-identity header so the agent always knows who is asking.
+        # Thread ID is included so the agent can delete the thread on completion.
         author = message.author
         display = getattr(author, "display_name", author.name)
         guild_name = message.guild.name if message.guild else "DM"
@@ -51,20 +62,11 @@ class MessageHandler:
             f"User: @{author.name}"
             + (f" (display: {display})" if display != author.name else "")
             + f" | ID: {author.id}\n"
-            f"Channel: #{channel_name} | Guild: {guild_name}\n"
+            f"Channel: #{channel_name} | Thread ID: {thread.id} | Guild: {guild_name}\n"
             "[/DISCORD_CONTEXT]\n\n"
         )
         content = (discord_ctx + user_text).strip()
 
-        if isinstance(message.channel, discord.Thread):
-            thread = message.channel
-        else:
-            name = self._thread_name(user_text) if user_text else "Attachment"
-            thread = await message.create_thread(
-                name=name,
-                auto_archive_duration=1440,
-            )
-
         attachment_paths = await self._download_attachments(message, thread.id)
         if attachment_paths:
             lines = "\n".join(f"- {p}" for p in attachment_paths)