From 8e48520d7463476054840c053a908c11a6e182d9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 1 Mar 2026 23:11:20 +0000
Subject: [PATCH] fix(channels): align command-body parsing sources

---
 extensions/bluebubbles/src/monitor-processing.ts          | 5 +++--
 extensions/mattermost/src/mattermost/monitor.ts           | 4 +++-
 extensions/msteams/src/monitor-handler/message-handler.ts | 4 +++-
 src/signal/monitor/event-handler.ts                       | 5 ++++-
 src/slack/monitor/message-handler/prepare.ts              | 4 +++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/extensions/bluebubbles/src/monitor-processing.ts b/extensions/bluebubbles/src/monitor-processing.ts
index 486864fa4c3..2ea42034907 100644
--- a/extensions/bluebubbles/src/monitor-processing.ts
+++ b/extensions/bluebubbles/src/monitor-processing.ts
@@ -1098,14 +1098,15 @@ export async function processMessage(
       });
     }
   }
+  const commandBody = messageText.trim();
 
   const ctxPayload = core.channel.reply.finalizeInboundContext({
     Body: body,
     BodyForAgent: rawBody,
     InboundHistory: inboundHistory,
     RawBody: rawBody,
-    CommandBody: rawBody,
-    BodyForCommands: rawBody,
+    CommandBody: commandBody,
+    BodyForCommands: commandBody,
     MediaUrl: mediaUrls[0],
     MediaUrls: mediaUrls.length > 0 ? mediaUrls : undefined,
     MediaPath: mediaPaths[0],
diff --git a/extensions/mattermost/src/mattermost/monitor.ts b/extensions/mattermost/src/mattermost/monitor.ts
index b66c15812ae..71b02afff5f 100644
--- a/extensions/mattermost/src/mattermost/monitor.ts
+++ b/extensions/mattermost/src/mattermost/monitor.ts
@@ -638,6 +638,7 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
 
     const to = kind === "direct" ? `user:${senderId}` : `channel:${channelId}`;
     const mediaPayload = buildAgentMediaPayload(mediaList);
+    const commandBody = rawText.trim();
     const inboundHistory =
       historyKey && historyLimit > 0
         ? (channelHistories.get(historyKey) ?? []).map((entry) => ({
@@ -651,7 +652,8 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
       BodyForAgent: bodyText,
       InboundHistory: inboundHistory,
       RawBody: bodyText,
-      CommandBody: bodyText,
+      CommandBody: commandBody,
+      BodyForCommands: commandBody,
       From:
         kind === "direct"
           ? `mattermost:${senderId}`
diff --git a/extensions/msteams/src/monitor-handler/message-handler.ts b/extensions/msteams/src/monitor-handler/message-handler.ts
index 520a158321e..a85e06348b0 100644
--- a/extensions/msteams/src/monitor-handler/message-handler.ts
+++ b/extensions/msteams/src/monitor-handler/message-handler.ts
@@ -495,13 +495,15 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
             timestamp: entry.timestamp,
           }))
         : undefined;
+    const commandBody = text.trim();
 
     const ctxPayload = core.channel.reply.finalizeInboundContext({
       Body: combinedBody,
       BodyForAgent: rawBody,
       InboundHistory: inboundHistory,
       RawBody: rawBody,
-      CommandBody: rawBody,
+      CommandBody: commandBody,
+      BodyForCommands: commandBody,
       From: teamsFrom,
       To: teamsTo,
       SessionKey: route.sessionKey,
diff --git a/src/signal/monitor/event-handler.ts b/src/signal/monitor/event-handler.ts
index 9aea1f6433a..583328f8a2c 100644
--- a/src/signal/monitor/event-handler.ts
+++ b/src/signal/monitor/event-handler.ts
@@ -64,6 +64,7 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {
     groupName?: string;
     isGroup: boolean;
     bodyText: string;
+    commandBody: string;
     timestamp?: number;
     messageId?: string;
     mediaPath?: string;
@@ -147,7 +148,8 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {
       BodyForAgent: entry.bodyText,
       InboundHistory: inboundHistory,
       RawBody: entry.bodyText,
-      CommandBody: entry.bodyText,
+      CommandBody: entry.commandBody,
+      BodyForCommands: entry.commandBody,
       From: entry.isGroup
         ? `group:${entry.groupId ?? "unknown"}`
         : `signal:${entry.senderRecipient}`,
@@ -691,6 +693,7 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {
       groupName,
       isGroup,
       bodyText,
+      commandBody: messageText,
       timestamp: envelope.timestamp ?? undefined,
       messageId,
       mediaPath,
diff --git a/src/slack/monitor/message-handler/prepare.ts b/src/slack/monitor/message-handler/prepare.ts
index 95134725adc..13ca763c17c 100644
--- a/src/slack/monitor/message-handler/prepare.ts
+++ b/src/slack/monitor/message-handler/prepare.ts
@@ -611,13 +611,15 @@ export async function prepareSlackMessage(params: {
           timestamp: entry.timestamp,
         }))
       : undefined;
+  const commandBody = textForCommandDetection.trim();
 
   const ctxPayload = finalizeInboundContext({
     Body: combinedBody,
     BodyForAgent: rawBody,
     InboundHistory: inboundHistory,
     RawBody: rawBody,
-    CommandBody: rawBody,
+    CommandBody: commandBody,
+    BodyForCommands: commandBody,
     From: slackFrom,
     To: slackTo,
     SessionKey: sessionKey,