fix(discord): plumb RawBody for commands

steipete · steipete · commit 8451b0839f4f · 2026-01-10T17:23:56.000+01:00
diff --git a/src/auto-reply/reply.ts b/src/auto-reply/reply.ts
@@ -60,7 +60,11 @@ import {
   defaultGroupActivation,
   resolveGroupRequireMention,
 } from "./reply/groups.js";
-import { stripMentions, stripStructuralPrefixes } from "./reply/mentions.js";
+import {
+  CURRENT_MESSAGE_MARKER,
+  stripMentions,
+  stripStructuralPrefixes,
+} from "./reply/mentions.js";
 import {
   createModelSelectionState,
   resolveContextTokens,
@@ -429,7 +433,6 @@ export async function getReplyFromConfig(
         hasQueueDirective: false,
         queueReset: false,
       };
-  const marker = "[Current message - respond to this]";
   const existingBody = sessionCtx.BodyStripped ?? sessionCtx.Body ?? "";
   const cleanedBody = (() => {
     if (!existingBody) return parsedDirectives.cleaned;
@@ -439,15 +442,20 @@ export async function getReplyFromConfig(
       }).cleaned;
     }
 
-    const markerIndex = existingBody.indexOf(marker);
+    const markerIndex = existingBody.indexOf(CURRENT_MESSAGE_MARKER);
     if (markerIndex < 0) {
       return parseInlineDirectives(existingBody, {
         modelAliases: configuredAliases,
       }).cleaned;
     }
 
-    const head = existingBody.slice(0, markerIndex + marker.length);
-    const tail = existingBody.slice(markerIndex + marker.length);
+    const head = existingBody.slice(
+      0,
+      markerIndex + CURRENT_MESSAGE_MARKER.length,
+    );
+    const tail = existingBody.slice(
+      markerIndex + CURRENT_MESSAGE_MARKER.length,
+    );
     const cleanedTail = parseInlineDirectives(tail, {
       modelAliases: configuredAliases,
     }).cleaned;
diff --git a/src/auto-reply/reply/mentions.ts b/src/auto-reply/reply/mentions.ts
@@ -23,6 +23,8 @@ function deriveMentionPatterns(identity?: { name?: string; emoji?: string }) {
 
 const BACKSPACE_CHAR = "\u0008";
 
+export const CURRENT_MESSAGE_MARKER = "[Current message - respond to this]";
+
 function normalizeMentionPattern(pattern: string): string {
   if (!pattern.includes(BACKSPACE_CHAR)) return pattern;
   return pattern.split(BACKSPACE_CHAR).join("\\b");
@@ -87,9 +89,12 @@ export function matchesMentionPatterns(
 export function stripStructuralPrefixes(text: string): string {
   // Ignore wrapper labels, timestamps, and sender prefixes so directive-only
   // detection still works in group batches that include history/context.
-  const marker = "[Current message - respond to this]";
-  const afterMarker = text.includes(marker)
-    ? text.slice(text.indexOf(marker) + marker.length).trimStart()
+  const afterMarker = text.includes(CURRENT_MESSAGE_MARKER)
+    ? text
+        .slice(
+          text.indexOf(CURRENT_MESSAGE_MARKER) + CURRENT_MESSAGE_MARKER.length,
+        )
+        .trimStart()
     : text;
 
   return afterMarker
diff --git a/src/discord/monitor.ts b/src/discord/monitor.ts
@@ -1088,6 +1088,7 @@ export function createDiscordMessageHandler(params: {
       });
       const ctxPayload = {
         Body: combinedBody,
+        RawBody: baseText,
         From: isDirectMessage
           ? `discord:${author.id}`
           : `group:${message.channelId}`,
