@automagik/omni 2.260914.13 → 2.260915.1

package/dist/index.js

@@ -137289,7 +137289,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260914.13",
+  version: "2.260915.1",
   repository: {
     type: "git",
     url: "git+https://github.com/automagik-dev/omni.git",

package/dist/server/index.js

@@ -44933,7 +44933,7 @@ class BaseChannelPlugin {
     return correlationId;
   }
   async emitMessageReceived(params) {
-    const { instanceId, timings, isHistorySync, ...payload } = params;
+    const { instanceId, timings, isHistorySync, onDuplicate, ...payload } = params;
     const options = {
       timings,
       ingestMode: isHistorySync ? "history-sync" : "realtime"
@@ -44941,14 +44941,15 @@ class BaseChannelPlugin {
     return this.publishClaimed("message.received", payload, instanceId, {
       idempotencyKey: `${this.id}:${instanceId}:${this.ingressKeyId(payload.chatId, payload.externalId)}:${payload.content.type}`,
       externalId: payload.externalId,
-      options
+      options,
+      onDuplicate
     });
   }
   ingressKeyId(_chatId, id) {
     return id;
   }
   async publishClaimed(type, payload, instanceId, params) {
-    const { idempotencyKey, externalId, options = {} } = params;
+    const { idempotencyKey, externalId, options = {}, onDuplicate } = params;
     if (!this.ingressClaim) {
       return this.publishEventInternal(type, payload, instanceId, options);
     }
@@ -44964,6 +44965,7 @@ class BaseChannelPlugin {
         instanceId,
         idempotencyKey
       });
+      onDuplicate?.();
       return generateCorrelationId("evt");
     }
     try {
@@ -250984,7 +250986,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260914.13",
+    version: "2.260915.1",
     private: true,
     type: "module",
     exports: {
@@ -403409,7 +403411,9 @@ async function handleAscFlowWebhookRequest(request, plugin3, instanceId, verifyT
   if (isRedelivery) {
     return pending();
   }
-  await plugin3.handleInboundTurn(instanceId, turn);
+  if (!await plugin3.handleInboundTurn(instanceId, turn)) {
+    return pending();
+  }
   const holdMs = holdTimeoutMs();
   if (holdMs <= 0)
     return pending();
@@ -403778,7 +403782,7 @@ function buildReplyField(replyTo) {
 }
 
 // ../channel-asc-flow/src/utils/turn-freshness.ts
-async function latestInboundText(client, codAtendimento) {
+async function latestInbound(client, codAtendimento) {
   const { status, body } = await client.get("/atendimento", { codigo_atendimento: codAtendimento });
   if (status !== 200 || typeof body !== "object" || body === null)
     return null;
@@ -403790,15 +403794,15 @@ async function latestInboundText(client, codAtendimento) {
       continue;
     const text = decodeAscEmoji(String(raw.descricao_msg ?? "").trim());
     if (text)
-      return text;
+      return { id: raw.id_mensagem == null ? null : String(raw.id_mensagem), text };
   }
   return null;
 }
 async function isStaleFlowReplay(params) {
-  const { client, instanceId, codAtendimento, text, logger: logger5 } = params;
+  const { client, instanceId, codAtendimento, text, messageId, logger: logger5 } = params;
   let latest;
   try {
-    latest = await latestInboundText(client, codAtendimento);
+    latest = await latestInbound(client, codAtendimento);
   } catch (err2) {
     logger5.warn("[asc-flow] could not read the atendimento to date this turn \u2014 processing it", {
       instanceId,
@@ -403809,8 +403813,12 @@ async function isStaleFlowReplay(params) {
   }
   if (latest === null)
     return false;
-  if (latest === text.trim())
+  if (messageId && latest.id) {
+    if (latest.id === messageId)
+      return false;
+  } else if (latest.text === text.trim()) {
     return false;
+  }
   logger5.info("[asc-flow] flow restarted with a stale input variable \u2014 dropping the replay", {
     instanceId,
     codAtendimento
@@ -404285,7 +404293,7 @@ class AscFlowPlugin extends BaseChannelPlugin {
   async handleInboundTurn(instanceId, turn) {
     const sanitized = sanitizeMessage(turn.text, this.logger, { instanceId, messageId: turn.messageId });
     if (!sanitized.ok)
-      return;
+      return false;
     const inboundState = this.ascFlowInstances.get(instanceId);
     if (inboundState) {
       this.sweepInFlight(instanceId, inboundState);
@@ -404310,7 +404318,11 @@ class AscFlowPlugin extends BaseChannelPlugin {
       logger: this.logger
     }) : null;
     const timings = this.captureInboundTimings(Date.now());
+    let duplicate = false;
     const correlationId = await this.emitMessageReceived({
+      onDuplicate: () => {
+        duplicate = true;
+      },
       instanceId,
       externalId,
       chatId: turn.codAtendimento,
@@ -404335,10 +404347,28 @@ class AscFlowPlugin extends BaseChannelPlugin {
       timings
     });
     const stamped = this.ascFlowInstances.get(instanceId)?.inFlight.get(turn.codAtendimento);
+    if (duplicate) {
+      this.dropRepublishedTurn(instanceId, turn);
+      return false;
+    }
     if (stamped && stamped.text === turn.text && !stamped.correlationId)
       stamped.correlationId = correlationId;
     if (timings)
       this.captureT2(correlationId, timings);
+    return true;
+  }
+  dropRepublishedTurn(instanceId, turn) {
+    const inFlight = this.ascFlowInstances.get(instanceId)?.inFlight;
+    const stamped = inFlight?.get(turn.codAtendimento);
+    if (stamped && stamped.text === turn.text && !stamped.correlationId)
+      inFlight?.delete(turn.codAtendimento);
+    this.logger.info("[asc-flow] messageId already published for this atendimento \u2014 dropping the re-send", {
+      instanceId,
+      codAtendimento: turn.codAtendimento
+    });
+  }
+  ingressKeyId(chatId, id) {
+    return `${chatId}:${id}`;
   }
   getLogger() {
     return this.logger;
@@ -404422,6 +404452,7 @@ class AscFlowPlugin extends BaseChannelPlugin {
       instanceId,
       codAtendimento: turn.codAtendimento,
       text: turn.text,
+      messageId: turn.messageId,
       logger: this.logger
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260914.13",
+  "version": "2.260915.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/automagik-dev/omni.git",