@automagik/omni 2.260720.2 → 2.260723.1

package/dist/index.js

@@ -125191,7 +125191,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260720.2",
+  version: "2.260723.1",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -227026,7 +227026,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260720.2",
+    version: "2.260723.1",
     type: "module",
     exports: {
       ".": {
@@ -337808,6 +337808,19 @@ var init_instances = __esm(() => {
 });
 
 // ../api/src/services/messages.ts
+function sanitizeMediaText(data) {
+  const out = { ...data };
+  if (typeof out.transcription === "string")
+    out.transcription = sanitizeText(out.transcription) ?? "";
+  if (typeof out.imageDescription === "string")
+    out.imageDescription = sanitizeText(out.imageDescription) ?? "";
+  if (typeof out.videoDescription === "string")
+    out.videoDescription = sanitizeText(out.videoDescription) ?? "";
+  if (typeof out.documentExtraction === "string") {
+    out.documentExtraction = sanitizeText(out.documentExtraction) ?? "";
+  }
+  return out;
+}
 function buildMessagePreview(options) {
   const sender = options.isFromMe ? "You" : options.senderDisplayName ?? null;
   let content;
@@ -337974,7 +337987,15 @@ class MessageService {
         value -= 2;
       return value;
     };
-    return rows.map((message2) => ({ message: message2, score: score(message2) })).sort((a, b3) => b3.score - a.score || b3.message.platformTimestamp.getTime() - a.message.platformTimestamp.getTime())[0]?.message ?? null;
+    const ranked = rows.map((message2) => ({ message: message2, score: score(message2) })).sort((a, b3) => b3.score - a.score || b3.message.platformTimestamp.getTime() - a.message.platformTimestamp.getTime());
+    const AMBIGUOUS_TIE_WINDOW_MS = 5 * 60000;
+    const top = ranked[0];
+    if (!top)
+      return null;
+    const ambiguousTie = top.score > 0 && ranked.some((entry, index2) => index2 > 0 && entry.score === top.score && Math.abs(top.message.platformTimestamp.getTime() - entry.message.platformTimestamp.getTime()) <= AMBIGUOUS_TIE_WINDOW_MS);
+    if (ambiguousTie)
+      return null;
+    return top.message;
   }
   async getByExternalIds(chatId, externalIds) {
     if (externalIds.length === 0)
@@ -338001,10 +338022,10 @@ class MessageService {
         mediaUrl: options.mediaUrl,
         mediaLocalPath: options.mediaLocalPath,
         mediaMetadata: options.mediaMetadata,
-        transcription: options.transcription,
-        imageDescription: options.imageDescription,
-        videoDescription: options.videoDescription,
-        documentExtraction: options.documentExtraction,
+        transcription: sanitizeText(options.transcription),
+        imageDescription: sanitizeText(options.imageDescription),
+        videoDescription: sanitizeText(options.videoDescription),
+        documentExtraction: sanitizeText(options.documentExtraction),
         replyToMessageId: options.replyToMessageId,
         replyToExternalId: options.replyToExternalId,
         quotedText: options.quotedText,
@@ -338079,7 +338100,7 @@ class MessageService {
     return { message: message2, created: true };
   }
   async update(id, data) {
-    const [updated] = await this.db.update(messages2).set({ ...data, updatedAt: new Date }).where(eq(messages2.id, id)).returning();
+    const [updated] = await this.db.update(messages2).set({ ...sanitizeMediaText(data), updatedAt: new Date }).where(eq(messages2.id, id)).returning();
     if (!updated) {
       throw new NotFoundError("Message", id);
     }
@@ -338183,28 +338204,28 @@ class MessageService {
     return updated;
   }
   async updateTranscription(id, transcription) {
-    const [updated] = await this.db.update(messages2).set({ transcription, updatedAt: new Date }).where(eq(messages2.id, id)).returning();
+    const [updated] = await this.db.update(messages2).set({ transcription: sanitizeText(transcription) ?? "", updatedAt: new Date }).where(eq(messages2.id, id)).returning();
     if (!updated) {
       throw new NotFoundError("Message", id);
     }
     return updated;
   }
   async updateImageDescription(id, description) {
-    const [updated] = await this.db.update(messages2).set({ imageDescription: description, updatedAt: new Date }).where(eq(messages2.id, id)).returning();
+    const [updated] = await this.db.update(messages2).set({ imageDescription: sanitizeText(description) ?? "", updatedAt: new Date }).where(eq(messages2.id, id)).returning();
     if (!updated) {
       throw new NotFoundError("Message", id);
     }
     return updated;
   }
   async updateVideoDescription(id, description) {
-    const [updated] = await this.db.update(messages2).set({ videoDescription: description, updatedAt: new Date }).where(eq(messages2.id, id)).returning();
+    const [updated] = await this.db.update(messages2).set({ videoDescription: sanitizeText(description) ?? "", updatedAt: new Date }).where(eq(messages2.id, id)).returning();
     if (!updated) {
       throw new NotFoundError("Message", id);
     }
     return updated;
   }
   async updateDocumentExtraction(id, extraction) {
-    const [updated] = await this.db.update(messages2).set({ documentExtraction: extraction, updatedAt: new Date }).where(eq(messages2.id, id)).returning();
+    const [updated] = await this.db.update(messages2).set({ documentExtraction: sanitizeText(extraction) ?? "", updatedAt: new Date }).where(eq(messages2.id, id)).returning();
     if (!updated) {
       throw new NotFoundError("Message", id);
     }
@@ -369643,6 +369664,69 @@ async function handleGupshupWebhook(request, plugin3, instanceId, webhookVerifyT
   });
   return new Response("OK", { status: 200 });
 }
+var CROSS_ID_WINDOW_MS = 60000;
+var FILEMANAGER_URL_RE = /^https:\/\/filemanager\.gupshup\.io\/\S+$/;
+var recentTextByChat = new Map;
+var recentMediaByChat = new Map;
+function pruneExpiredCrossIdEntries(now) {
+  for (const map of [recentTextByChat, recentMediaByChat]) {
+    for (const [key, value] of map) {
+      if (now - value.ts > CROSS_ID_WINDOW_MS * 1.5)
+        map.delete(key);
+    }
+  }
+}
+function isRelayMediaEcho(chatKey, messageId, bodyText, now) {
+  if (!messageId.startsWith("gs-entry-") || !FILEMANAGER_URL_RE.test(bodyText))
+    return null;
+  const lastMedia = recentMediaByChat.get(chatKey);
+  if (lastMedia && now - lastMedia.ts <= CROSS_ID_WINDOW_MS)
+    return lastMedia.id;
+  return null;
+}
+function isDuplicateTextRedelivery(chatKey, messageId, bodyText, now) {
+  const normalized = bodyText.toLowerCase().replace(/\s+/g, " ");
+  if (normalized.length <= 3)
+    return null;
+  const textKey = `${chatKey}:${normalized}`;
+  const prev = recentTextByChat.get(textKey);
+  if (prev && prev.id !== messageId && now - prev.ts <= CROSS_ID_WINDOW_MS)
+    return prev.id;
+  if (!prev || prev.id === messageId)
+    recentTextByChat.set(textKey, { ts: now, id: messageId });
+  return null;
+}
+function isCrossIdDuplicate(instanceId, msg, from, logger5) {
+  const now = Date.now();
+  pruneExpiredCrossIdEntries(now);
+  const chatKey = `${instanceId}:${from.trim()}`;
+  const rawType = msg.type ?? msg.raw?.type ?? "";
+  const bodyText = (msg.text ?? "").trim();
+  if (rawType !== "text" || !bodyText) {
+    if (rawType && rawType !== "text")
+      recentMediaByChat.set(chatKey, { ts: now, id: msg.id });
+    return false;
+  }
+  const echoOf = isRelayMediaEcho(chatKey, msg.id, bodyText, now);
+  if (echoOf) {
+    logger5.info("gupshup cross-id dedupe: relay media echo dropped", {
+      instanceId,
+      messageId: msg.id,
+      mediaMessageId: echoOf
+    });
+    return true;
+  }
+  const duplicateOf = isDuplicateTextRedelivery(chatKey, msg.id, bodyText, now);
+  if (duplicateOf) {
+    logger5.info("gupshup cross-id dedupe: duplicate content dropped", {
+      instanceId,
+      messageId: msg.id,
+      firstMessageId: duplicateOf
+    });
+    return true;
+  }
+  return false;
+}
 async function processInboundMessage(plugin3, instanceId, webhook, dedupeCache, options = {}) {
   const msg = webhook.messageobj;
   const from = webhook.sender;
@@ -369650,6 +369734,9 @@ async function processInboundMessage(plugin3, instanceId, webhook, dedupeCache,
   if (dedupeCache.isDuplicate(instanceId, dedupeKey, "gupshup", plugin3.getLogger())) {
     return false;
   }
+  if (isCrossIdDuplicate(instanceId, msg, from, plugin3.getLogger())) {
+    return false;
+  }
   const content = extractContent2(msg);
   if (!content)
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260720.2",
+  "version": "2.260723.1",
   "description": "LLM-optimized CLI for Omni",
   "type": "module",
   "bin": {