@automagik/omni 2.260910.1 → 2.260910.2

package/dist/index.js

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

package/dist/server/index.js

@@ -44693,6 +44693,7 @@ class InstanceManager {
 // ../channel-sdk/src/base/BaseChannelPlugin.ts
 class BaseChannelPlugin {
   eventBus;
+  ingressClaim;
   logger;
   storage;
   config;
@@ -44704,6 +44705,7 @@ class BaseChannelPlugin {
     this.storage = context2.storage;
     this.config = context2.config;
     this.db = context2.db;
+    this.ingressClaim = context2.ingressClaim;
     await this.onInitialize(context2);
   }
   async onInitialize(_context) {}
@@ -44829,10 +44831,34 @@ class BaseChannelPlugin {
   }
   async emitMessageReceived(params) {
     const { instanceId, timings, isHistorySync, ...payload } = params;
-    return this.publishEventInternal("message.received", payload, instanceId, {
+    const options = {
       timings,
       ingestMode: isHistorySync ? "history-sync" : "realtime"
-    });
+    };
+    if (this.ingressClaim) {
+      const idempotencyKey = `${this.id}:${instanceId}:${payload.externalId}:${payload.content.type}`;
+      const eventId = await this.ingressClaim.claim({
+        idempotencyKey,
+        instanceId,
+        channelType: this.id,
+        externalId: payload.externalId
+      });
+      if (eventId === null) {
+        this.logger.info("Skipping duplicate inbound message (idempotency key already journaled)", {
+          instanceId,
+          idempotencyKey
+        });
+        return generateCorrelationId("evt");
+      }
+      options.publishEventId = eventId;
+      try {
+        return await this.publishEventInternal("message.received", payload, instanceId, options);
+      } catch (error) {
+        await this.ingressClaim.release(eventId).catch(() => {});
+        throw error;
+      }
+    }
+    return this.publishEventInternal("message.received", payload, instanceId, options);
   }
   async emitMessageSent(params) {
     const { instanceId, ...payload } = params;
@@ -251569,7 +251595,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260910.1",
+    version: "2.260910.2",
     private: true,
     type: "module",
     exports: {
@@ -363041,6 +363067,7 @@ var init_storage = __esm(() => {
 });
 
 // ../api/src/plugins/context.ts
+import { randomUUID as randomUUID2 } from "crypto";
 function createPluginDatabase(db2) {
   return {
     async execute(_sql, _params) {
@@ -363052,6 +363079,38 @@ function createPluginDatabase(db2) {
     }
   };
 }
+function createIngressClaim(db2) {
+  return {
+    async claim({ idempotencyKey, instanceId, channelType, externalId }) {
+      const id = randomUUID2();
+      try {
+        const claimed = await db2.insert(omniEvents).values({
+          id,
+          externalId,
+          channel: channelTypes.includes(channelType) ? channelType : "discord",
+          instanceId,
+          eventType: "message.received",
+          direction: "inbound",
+          status: "received",
+          idempotencyKey,
+          receivedAt: new Date,
+          metadata: { correlationId: id, source: `channel:${channelType}`, idempotencyKey },
+          tenantId: resolvePublishTenantId(undefined, instanceId)
+        }).onConflictDoNothing({ target: omniEvents.idempotencyKey }).returning({ id: omniEvents.id });
+        return claimed.length > 0 ? id : null;
+      } catch (error3) {
+        log88.warn("Ingress idempotency claim failed; publishing without dedup", {
+          idempotencyKey,
+          error: String(error3)
+        });
+        return id;
+      }
+    },
+    async release(eventId) {
+      await db2.delete(omniEvents).where(eq(omniEvents.id, eventId));
+    }
+  };
+}
 function createPluginContext(options) {
   const { pluginId, eventBus, db: db2 } = options;
   const env2 = "development";
@@ -363070,12 +363129,15 @@ function createPluginContext(options) {
         basePath: process.env.MEDIA_STORAGE_PATH ?? "./data/media"
       }
     },
-    db: createPluginDatabase(db2)
+    db: createPluginDatabase(db2),
+    ingressClaim: createIngressClaim(db2)
   };
 }
 var log88;
 var init_context3 = __esm(() => {
   init_src();
+  init_src5();
+  init_drizzle_orm();
   init_logger4();
   init_storage();
   log88 = createLogger("api:plugin-context");
@@ -367135,10 +367197,11 @@ async function shouldProcessMessage3(agentRunner, accessService, chatsService, m
   if (await isAgentOutboundEcho(chatsService, messagesService, db2, payload, metadata.instanceId, trustedTenantId)) {
     return null;
   }
-  if (payload.content?.type === "reaction") {
-    log91.debug("Skipping reaction dual-emit on message path (reaction.received owns dispatch)", {
+  if (payload.content?.type && NON_DISPATCHABLE_CONTENT_TYPES.has(payload.content.type)) {
+    log91.debug("Skipping non-conversational content type on message path", {
       instanceId: metadata.instanceId,
-      chatId: payload.chatId
+      chatId: payload.chatId,
+      contentType: payload.content.type
     });
     return null;
   }
@@ -367671,7 +367734,7 @@ async function setupAgentDispatcher(eventBus, services, db2) {
     log91.info("Agent dispatcher shutdown complete");
   };
 }
-var import_api31, log91, agentDispatchLimiter, _natsGenieProviderCtor, QUOTED_MESSAGE_MAX_CHARS = 4000, DM_HISTORY_LIMIT = 20, LIFECYCLE_PREVIEW_MAX_CHARS = 160, LIFECYCLE_SENSITIVE_KEY_PARTS, PRESENCE_DEFAULT_MIN_MS = 5000, PRESENCE_DEFAULT_MAX_WAIT_MS = 30000, activeMessageDebouncer = null, DEFAULT_DISPATCH_ERROR_MESSAGE = "Opa, tive um probleminha aqui \uD83D\uDE05 Pode mandar de novo?", DEFAULT_ERROR_HANDOFF_MESSAGE = "T\xF4 com um probleminha t\xE9cnico aqui agora. Logo algu\xE9m do time vai entrar em contato com voc\xEA.", TRANSIENT_DISPATCH_ERROR_PATTERNS, TRANSIENT_DISPATCH_RETRY_DELAYS_MS, CHANNEL_MESSAGE_LIMITS, DEFAULT_MESSAGE_LIMIT = 4000, MEDIA_BASE_PATH3, MEDIA_ICONS, MEDIA_WAIT_NULL, mediaCompletions, mediaResultCache, MEDIA_WAIT_TIMEOUT_MS = 30000, DEFAULT_SEND_MEDIA_PATH_TYPES, BOT_PREFIX = "\uD83E\uDD16 ", activeStreams, activeRunAborts, CancelThreadPayloadSchema, sessionActivityStore, PROC_REACT_START, PROC_REACT_DONE = "\u2705", queuedMessageAcks, QUEUED_ACK_TIMEOUT_MS = 120000, providerCache, openclawClientPool, _openClawClientCtor, nullFilterWarnedInstances, ACTIVE_OWNER_IDENTIFIER_CACHE_TTL_MS = 1e4, cachedActiveOwnerIdentifiers = null, cachedActiveOwnerIdentifiersAt = 0, tenantCachedActiveOwnerIdentifiers, DEFAULT_GATE_MODEL = "gemini-3-flash-preview", GATE_TIMEOUT_MS = 3000, setupAgentResponder;
+var import_api31, log91, agentDispatchLimiter, _natsGenieProviderCtor, QUOTED_MESSAGE_MAX_CHARS = 4000, DM_HISTORY_LIMIT = 20, LIFECYCLE_PREVIEW_MAX_CHARS = 160, LIFECYCLE_SENSITIVE_KEY_PARTS, PRESENCE_DEFAULT_MIN_MS = 5000, PRESENCE_DEFAULT_MAX_WAIT_MS = 30000, activeMessageDebouncer = null, DEFAULT_DISPATCH_ERROR_MESSAGE = "Opa, tive um probleminha aqui \uD83D\uDE05 Pode mandar de novo?", DEFAULT_ERROR_HANDOFF_MESSAGE = "T\xF4 com um probleminha t\xE9cnico aqui agora. Logo algu\xE9m do time vai entrar em contato com voc\xEA.", TRANSIENT_DISPATCH_ERROR_PATTERNS, TRANSIENT_DISPATCH_RETRY_DELAYS_MS, CHANNEL_MESSAGE_LIMITS, DEFAULT_MESSAGE_LIMIT = 4000, MEDIA_BASE_PATH3, NON_DISPATCHABLE_CONTENT_TYPES, MEDIA_ICONS, MEDIA_WAIT_NULL, mediaCompletions, mediaResultCache, MEDIA_WAIT_TIMEOUT_MS = 30000, DEFAULT_SEND_MEDIA_PATH_TYPES, BOT_PREFIX = "\uD83E\uDD16 ", activeStreams, activeRunAborts, CancelThreadPayloadSchema, sessionActivityStore, PROC_REACT_START, PROC_REACT_DONE = "\u2705", queuedMessageAcks, QUEUED_ACK_TIMEOUT_MS = 120000, providerCache, openclawClientPool, _openClawClientCtor, nullFilterWarnedInstances, ACTIVE_OWNER_IDENTIFIER_CACHE_TTL_MS = 1e4, cachedActiveOwnerIdentifiers = null, cachedActiveOwnerIdentifiersAt = 0, tenantCachedActiveOwnerIdentifiers, DEFAULT_GATE_MODEL = "gemini-3-flash-preview", GATE_TIMEOUT_MS = 3000, setupAgentResponder;
 var init_agent_dispatcher = __esm(() => {
   init_src2();
   init_src();
@@ -367718,6 +367781,7 @@ var init_agent_dispatcher = __esm(() => {
     telegram: 4096
   };
   MEDIA_BASE_PATH3 = process.env.MEDIA_STORAGE_PATH || "./data/media";
+  NON_DISPATCHABLE_CONTENT_TYPES = new Set(["reaction", "delete", "unknown"]);
   MEDIA_ICONS = {
     audio: "\uD83C\uDFB5",
     image: "\uD83D\uDDBC\uFE0F",
@@ -368486,7 +368550,7 @@ var init_batch_pricing = __esm(() => {
 });
 
 // ../api/src/services/media-storage.ts
-import { randomUUID as randomUUID2 } from "crypto";
+import { randomUUID as randomUUID3 } from "crypto";
 import { existsSync as existsSync4, mkdirSync as mkdirSync2 } from "fs";
 import { rm as rm3, writeFile as writeFile5 } from "fs/promises";
 import { tmpdir as tmpdir12 } from "os";
@@ -368720,7 +368784,7 @@ class MediaStorageService {
     }
     const buffer3 = await this.backend.read(reference);
     const ext = extname2(reference) || ".bin";
-    const tempPath = join23(tmpdir12(), `omni-media-${randomUUID2()}${ext}`);
+    const tempPath = join23(tmpdir12(), `omni-media-${randomUUID3()}${ext}`);
     try {
       await writeFile5(tempPath, buffer3);
     } catch (error3) {
@@ -395917,7 +395981,7 @@ var init_webhooks3 = __esm(() => {
 });
 
 // ../api/src/lib/oauth-token-cache.ts
-import { randomUUID as randomUUID3 } from "crypto";
+import { randomUUID as randomUUID4 } from "crypto";
 function put(accessToken, ttlMs = DEFAULT_TTL_MS4) {
   if (!accessToken)
     throw new Error("oauth-token-cache: accessToken is required");
@@ -395926,7 +395990,7 @@ function put(accessToken, ttlMs = DEFAULT_TTL_MS4) {
     if (oldest)
       store.delete(oldest);
   }
-  const handle = `eshandle_${randomUUID3()}`;
+  const handle = `eshandle_${randomUUID4()}`;
   store.set(handle, { accessToken, expiresAt: Date.now() + ttlMs });
   return handle;
 }
@@ -397679,8 +397743,7 @@ async function setupEventPersistence(eventBus, db2) {
         await runConsumerInTenantContext(db2, event, async () => {
           const sdb = scopedHandle(db2);
           const chatUuid = await resolveChatUuid(sdb, metadata.instanceId, payload.chatId);
-          const newEvent = {
-            ...eventIdInsert(event.id),
+          const columns2 = {
             externalId: payload.externalId,
             channel: mapChannelType(metadata.channelType),
             instanceId: metadata.instanceId,
@@ -397706,7 +397769,7 @@ async function setupEventPersistence(eventBus, db2) {
             conversationId: null,
             chatUuid
           };
-          await sdb.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
+          await sdb.insert(omniEvents).values({ ...eventIdInsert(event.id), ...columns2 }).onConflictDoUpdate({ target: omniEvents.id, set: columns2 });
         });
         if (metadata.timings && metadata.correlationId) {
           const tracker = getJourneyTracker();
@@ -407437,10 +407500,7 @@ class DiscordPlugin extends BaseChannelPlugin {
       externalId: `${messageId}-delete-${Date.now()}`,
       chatId,
       from: chatId,
-      content: {
-        type: "delete",
-        text: fromMe ? "Message deleted by bot" : "Message deleted"
-      },
+      content: { type: "delete" },
       rawPayload: {
         deletedMessageId: messageId,
         deletedAt: Date.now(),
@@ -528091,10 +528151,7 @@ function extractUnknownContent(message2) {
     return null;
   }
   log52.debug("Unknown message type", { keys: messageKeys });
-  return {
-    type: "unknown",
-    text: `Unknown message type: ${messageKeys.join(", ")}`
-  };
+  return { type: "unknown" };
 }
 function extractContent3(msg) {
   const message2 = msg.message;
@@ -531336,10 +531393,7 @@ class WhatsAppPlugin extends BaseChannelPlugin {
       externalId: `${externalId}-delete-${Date.now()}`,
       chatId,
       from: chatId,
-      content: {
-        type: "delete",
-        text: fromMe ? "Message deleted by sender" : "Message deleted"
-      },
+      content: { type: "delete" },
       rawPayload: {
         deletedMessageId: externalId,
         deletedAt: Date.now(),

package/package.json

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