fix(imessage): include from-me drop diagnostics

omarshahine · omarshahine · commit 597684c3650d · 2026-06-09T23:52:07.000Z
diff --git a/extensions/imessage/src/monitor.watch-subscribe-retry.test.ts b/extensions/imessage/src/monitor.watch-subscribe-retry.test.ts
@@ -4,7 +4,10 @@ import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from "vites
 import type { createIMessageRpcClient, IMessageRpcClient } from "./client.js";
 import { monitorIMessageProvider } from "./monitor.js";
 import type { attachIMessageMonitorAbortHandler } from "./monitor/abort-handler.js";
-import { describeIMessageInboundDropDiagnostic } from "./monitor/monitor-provider.js";
+import {
+  describeIMessageInboundDropDiagnostic,
+  shouldThrottleIMessageInboundDropDiagnostic,
+} from "./monitor/monitor-provider.js";
 
 const waitForTransportReadyMock = vi.hoisted(() =>
   vi.fn<typeof waitForTransportReady>(async () => {}),
@@ -181,6 +184,27 @@ describe("describeIMessageInboundDropDiagnostic", () => {
     expect(diagnostic).not.toContain("+1555");
   });
 
+  it("describes from-me drops and marks them for throttling", () => {
+    const diagnostic = describeIMessageInboundDropDiagnostic({
+      accountId: "default",
+      reason: "from me",
+      message: {
+        id: 43,
+        chat_id: 456,
+        guid: "p:0/outbound-guid",
+        is_group: true,
+        created_at: "2026-06-09T10:01:00.000Z",
+      },
+    });
+
+    expect(diagnostic).toBe(
+      'imessage: dropped inbound message account=default reason="from me" chat_id=456 group=true message_id=43 guid=present created_at=2026-06-09T10:01:00.000Z',
+    );
+    expect(diagnostic).not.toContain("outbound-guid");
+    expect(shouldThrottleIMessageInboundDropDiagnostic("from me")).toBe(true);
+    expect(shouldThrottleIMessageInboundDropDiagnostic("echo")).toBe(false);
+  });
+
   it("keeps normal policy drops quiet", () => {
     expect(
       describeIMessageInboundDropDiagnostic({
diff --git a/extensions/imessage/src/monitor/monitor-provider.ts b/extensions/imessage/src/monitor/monitor-provider.ts
@@ -260,9 +260,15 @@ function isRetriableWatchSubscribeStartupError(error: unknown): boolean {
 const IMESSAGE_DIAGNOSTIC_DROP_REASONS = new Set([
   "agent echo in self-chat",
   "echo",
+  "from me",
   "reflected assistant content",
   "self-chat echo",
 ]);
+const IMESSAGE_THROTTLED_DIAGNOSTIC_DROP_REASONS = new Set(["from me"]);
+
+export function shouldThrottleIMessageInboundDropDiagnostic(reason: string): boolean {
+  return IMESSAGE_THROTTLED_DIAGNOSTIC_DROP_REASONS.has(reason);
+}
 
 export function describeIMessageInboundDropDiagnostic(params: {
   accountId: string;
@@ -419,6 +425,7 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P
   // replay aggressively without the old catchup cursor/retry bookkeeping.
   const inboundReplayGuard = createIMessageInboundReplayGuard();
   let staleBacklogSuppressed = 0;
+  const loggedThrottledDropDiagnostics = new Set<string>();
 
   // Downtime recovery. We pass the persisted recovery cursor (the last
   // dispatched rowid) to watch.subscribe as since_rowid so imsg replays the rows
@@ -911,7 +918,16 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P
         message,
       });
       if (diagnostic) {
-        runtime.log?.(warn(diagnostic));
+        const throttleKey = `${rateLimitKey}:${decision.reason}`;
+        const shouldThrottleDiagnostic = shouldThrottleIMessageInboundDropDiagnostic(
+          decision.reason,
+        );
+        if (!shouldThrottleDiagnostic || !loggedThrottledDropDiagnostics.has(throttleKey)) {
+          if (shouldThrottleDiagnostic) {
+            loggedThrottledDropDiagnostics.add(throttleKey);
+          }
+          runtime.log?.(warn(diagnostic));
+        }
       }
       // Surface the silent-allowlist drop once per chat. Without this, operators
       // who set groupPolicy="allowlist" without populating
