fix(auto-reply): strip delivery hints from leading metadata

obviyus · obviyus · commit 65e6d9c98c60 · 2026-06-14T18:18:20.000+05:30
diff --git a/src/auto-reply/reply/strip-inbound-meta.test.ts b/src/auto-reply/reply/strip-inbound-meta.test.ts
@@ -140,6 +140,16 @@ What should I grab on the way?`;
     expect(stripLeadingInboundMetadata(input)).toBe("What should I grab on the way?");
   });
 
+  it("strips message-tool delivery hints before leading metadata blocks", () => {
+    const input = `${MESSAGE_TOOL_ONLY_DELIVERY_HINT}\n\n${CONV_BLOCK}\n\nActual user message`;
+    expect(stripLeadingInboundMetadata(input)).toBe("Actual user message");
+  });
+
+  it("strips message-tool delivery hints before leading user text", () => {
+    const input = `${MESSAGE_TOOL_ONLY_DELIVERY_HINT}\n\nActual user message`;
+    expect(stripLeadingInboundMetadata(input)).toBe("Actual user message");
+  });
+
   it("strips an active-memory prompt prefix block from leading-only history views even when earlier text precedes it", () => {
     const input = `Queued earlier user turn\n\n${ACTIVE_MEMORY_PREFIX_BLOCK}\n\nWhat should I grab on the way?`;
     expect(stripLeadingInboundMetadata(input)).toBe(
diff --git a/src/auto-reply/reply/strip-inbound-meta.ts b/src/auto-reply/reply/strip-inbound-meta.ts
@@ -282,8 +282,21 @@ export function stripLeadingInboundMetadata(text: string): string {
     return "";
   }
 
+  const strippedDeliveryHint = isMessageToolDeliveryHintLine(lines[index]);
+  while (index < lines.length && isMessageToolDeliveryHintLine(lines[index])) {
+    index++;
+    while (index < lines.length && lines[index] === "") {
+      index++;
+    }
+  }
+  if (index >= lines.length) {
+    return "";
+  }
+
   if (!isInboundMetaSentinelLine(lines[index])) {
-    const strippedNoLeading = stripTrailingUntrustedContextSuffix(lines);
+    const strippedNoLeading = stripTrailingUntrustedContextSuffix(
+      strippedDeliveryHint ? lines.slice(index) : lines,
+    );
     return strippedNoLeading.join("\n");
   }
 
