From 088bdb331379fd78d268ee0405f9b27bdf4c6b4e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 3 Dec 2025 14:32:58 +0000
Subject: [PATCH] fix: allow directive-only toggles inside group batches

---
 src/auto-reply/reply.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/auto-reply/reply.ts b/src/auto-reply/reply.ts
index 30cd7afb4..8a4dddb88 100644
--- a/src/auto-reply/reply.ts
+++ b/src/auto-reply/reply.ts
@@ -117,6 +117,20 @@ function isAbortTrigger(text?: string): boolean {
   return ABORT_TRIGGERS.has(normalized);
 }
 
+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)
+    : text;
+  return afterMarker
+    .replace(/\[[^\]]+\]\s*/g, "")
+    .replace(/^[ \t]*[A-Za-z0-9+()\-_. ]+:\s*/gm, "")
+    .replace(/\s+/g, " ")
+    .trim();
+}
+
 export async function getReplyFromConfig(
   ctx: MsgContext,
   opts?: GetReplyOptions,
@@ -279,8 +293,7 @@ export async function getReplyFromConfig(
   const directiveOnly = (() => {
     if (!hasThinkDirective) return false;
     if (!thinkCleaned) return true;
-    // Ignore bracketed prefixes (timestamps, same-phone markers, etc.)
-    const stripped = thinkCleaned.replace(/\[[^\]]+\]\s*/g, "").trim();
+    const stripped = stripStructuralPrefixes(thinkCleaned);
     return stripped.length === 0;
   })();
 
@@ -313,7 +326,7 @@ export async function getReplyFromConfig(
   const verboseDirectiveOnly = (() => {
     if (!hasVerboseDirective) return false;
     if (!verboseCleaned) return true;
-    const stripped = verboseCleaned.replace(/\[[^\]]+\]\s*/g, "").trim();
+    const stripped = stripStructuralPrefixes(verboseCleaned);
     return stripped.length === 0;
   })();