@automagik/omni 2.260910.1 → 2.260910.3

package/dist/commands/events.d.ts

@@ -197,6 +197,10 @@ export interface FollowParams {
     isStopped?: () => boolean;
     /** Line sink — defaults to output.raw (stdout). Injected by tests. */
     emit?: (line: string) => void;
+    /** Consecutive transport failures tolerated before giving up (default 5). */
+    maxRetries?: number;
+    /** First backoff delay; doubles per retry up to 30s (default 1000). */
+    retryBaseMs?: number;
 }
 /**
  * The `omni events follow` loop: pull a page from the stored cursor, print

package/dist/commands/events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/commands/events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/commands/events.ts"],"names":[],"mappings":"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"}

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.3",
   repository: {
     type: "git",
     url: "git+https://github.com/automagik-dev/omni.git",
@@ -144289,13 +144289,32 @@ function summarizeConsumerRow(row) {
     updatedAt: row.updatedAt
   };
 }
+var sleep4 = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
+var isTransportError = (err2) => !(err2 instanceof Error && err2.message.startsWith("API returned "));
+async function pullWithRetry(params) {
+  const maxRetries = params.maxRetries ?? 5;
+  const baseMs = params.retryBaseMs ?? 1000;
+  const path = `/${encodeURIComponent(params.consumer)}/pull?limit=${params.limit}&waitMs=${params.waitMs}`;
+  for (let attempt = 0;; attempt++) {
+    try {
+      return await consumersApiRequest(path, { method: "POST" });
+    } catch (err2) {
+      if (!isTransportError(err2) || attempt >= maxRetries || params.isStopped?.())
+        throw err2;
+      const delay = Math.min(baseMs * 2 ** attempt, 30000);
+      process.stderr.write(`\u26A0 Pull failed (${errorMessage(err2)}); reconnecting in ${delay}ms (${attempt + 1}/${maxRetries})
+`);
+      await sleep4(delay);
+    }
+  }
+}
 async function followConsumer(params) {
   const emit = params.emit ?? raw;
   let acked = -1;
   for (;; ) {
     if (params.isStopped?.())
       return;
-    const page = await consumersApiRequest(`/${encodeURIComponent(params.consumer)}/pull?limit=${params.limit}&waitMs=${params.waitMs}`, { method: "POST" });
+    const page = await pullWithRetry(params);
     for (const item of page.items) {
       emit(JSON.stringify(item));
     }
@@ -144316,7 +144335,7 @@ async function followConsumer(params) {
       return;
     }
     if (!progressed && params.waitMs < 1000) {
-      await new Promise((resolve2) => setTimeout(resolve2, 1000));
+      await sleep4(1000);
     }
   }
 }
@@ -144463,6 +144482,7 @@ function createEventsCommand() {
       });
     } catch (err2) {
       error(`Failed to follow consumer: ${errorMessage(err2)}`);
+      process.exitCode = 1;
     } finally {
       processEvents.off("SIGINT", shutdown);
       processEvents.off("SIGTERM", shutdown);

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.3",
     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");
@@ -363692,6 +363754,15 @@ function maybeUpdateRecency(services, instanceId, chatId, rawPayload, payload, p
     log90.debug("Failed to update instance lastMessageAt (non-critical)", { error: String(error3) });
   });
 }
+async function linkJournalRow(db2, eventId, link) {
+  if (!isValidUuid(eventId))
+    return;
+  await scopedHandle(db2).update(omniEvents).set({
+    chatUuid: link.chatUuid,
+    canonicalChatId: link.canonicalChatId,
+    personId: sql`coalesce(${omniEvents.personId}, ${link.personId})`
+  }).where(eq(omniEvents.id, eventId));
+}
 async function resolveOrCreateChat(services, instanceId, chatExternalId, chatType, channel5, effectiveName, canonicalId, rawPayload, trustedTenantId) {
   const resolvedPhoneJid = rawPayload?.resolvedPhoneJid;
   if (chatExternalId.endsWith("@lid") && resolvedPhoneJid) {
@@ -363806,6 +363877,7 @@ async function handleMessageReceived(services, payload, metadata, eventTimestamp
   }
   await maybeRecordParticipantActivity(services, chat2.id, payload.from);
   maybeUpdateRecency(services, metadata.instanceId, chat2.id, rawPayload, payload, platformTimestamp ?? new Date(eventTimestamp), trustedTenantId);
+  return { chatUuid: chat2.id, canonicalChatId: chat2.canonicalId ?? null, personId: personId ?? null };
 }
 function logMessageReceivedError(payload, error3) {
   const rawPayload = payload.rawPayload;
@@ -363901,7 +363973,12 @@ async function setupMessagePersistence(eventBus, services) {
       try {
         const workMetadata = { ...metadata, instanceId };
         const identity = await resolveSenderIdentityForWorkItem(services, payload, workMetadata, metadata.channelType ?? "whatsapp", trustedTenantId);
-        await runConsumerInTenantContext(services.db, event, () => handleMessageReceived(services, payload, workMetadata, event.timestamp, trustedTenantId, identity));
+        const journalLink = await runConsumerInTenantContext(services.db, event, () => handleMessageReceived(services, payload, workMetadata, event.timestamp, trustedTenantId, identity));
+        if (journalLink) {
+          await runTenantWorkDb(services.db, trustedTenantId, () => linkJournalRow(services.db, event.id, journalLink)).catch((err2) => {
+            log90.debug("Failed to link journal row (non-critical)", { eventId: event.id, error: String(err2) });
+          });
+        }
         if (sentryEnabled()) {
           exports_public_api2.count("messages.received", 1, {
             attributes: { channel_type: metadata.channelType ?? "whatsapp" }
@@ -364187,8 +364264,11 @@ async function detectStartupGaps(services) {
 var log90, CONTENT_TYPE_MAP, INTERNAL_JID_SUFFIXES, MEDIA_BADGES, OUTBOUND_MEDIA_TYPES;
 var init_message_persistence = __esm(() => {
   init_src();
+  init_src5();
   init_esm6();
+  init_drizzle_orm();
   init_sentry_scrub();
+  init_tenant_scope();
   init_worker_tenant_context();
   init_canonical_handle();
   init_loader2();
@@ -367135,10 +367215,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 +367752,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 +367799,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 +368568,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 +368802,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 +395999,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 +396008,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;
 }
@@ -397635,14 +397717,14 @@ function mapContentType2(contentType) {
 function eventIdInsert(eventId) {
   return eventId && isValidUuid(eventId) ? { id: eventId } : {};
 }
-async function resolveChatUuid(db2, instanceId, chatId) {
+async function resolveChatLink(db2, instanceId, chatId) {
   if (!instanceId || !chatId)
-    return null;
+    return NO_CHAT_LINK;
   try {
-    const [chat2] = await db2.select({ id: chats.id }).from(chats).where(and2(eq(chats.instanceId, instanceId), eq(chats.externalId, chatId))).limit(1);
-    return chat2?.id ?? null;
+    const chat2 = await new ChatService(db2, null).findByExternalIdSmart(instanceId, chatId);
+    return chat2 ? { chatUuid: chat2.id, canonicalChatId: chat2.canonicalId ?? null } : NO_CHAT_LINK;
   } catch {
-    return null;
+    return NO_CHAT_LINK;
   }
 }
 async function resolvePersonId2(db2, candidate) {
@@ -397678,9 +397760,8 @@ async function setupEventPersistence(eventBus, db2) {
       try {
         await runConsumerInTenantContext(db2, event, async () => {
           const sdb = scopedHandle(db2);
-          const chatUuid = await resolveChatUuid(sdb, metadata.instanceId, payload.chatId);
-          const newEvent = {
-            ...eventIdInsert(event.id),
+          const chatLink = await resolveChatLink(sdb, metadata.instanceId, payload.chatId);
+          const columns2 = {
             externalId: payload.externalId,
             channel: mapChannelType(metadata.channelType),
             instanceId: metadata.instanceId,
@@ -397704,9 +397785,9 @@ async function setupEventPersistence(eventBus, db2) {
             agentId: metadata.agentId ?? null,
             causationId: metadata.causationId ?? null,
             conversationId: null,
-            chatUuid
+            ...chatLink
           };
-          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();
@@ -397729,7 +397810,7 @@ async function setupEventPersistence(eventBus, db2) {
       try {
         await runConsumerInTenantContext(db2, event, async () => {
           const sdb = scopedHandle(db2);
-          const chatUuid = await resolveChatUuid(sdb, metadata.instanceId, payload.chatId);
+          const chatLink = await resolveChatLink(sdb, metadata.instanceId, payload.chatId);
           const newEvent = {
             ...eventIdInsert(event.id),
             externalId: payload.externalId,
@@ -397758,7 +397839,7 @@ async function setupEventPersistence(eventBus, db2) {
             agentId: metadata.agentId ?? null,
             causationId: metadata.causationId ?? null,
             conversationId: null,
-            chatUuid
+            ...chatLink
           };
           await sdb.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
         });
@@ -397784,7 +397865,7 @@ async function setupEventPersistence(eventBus, db2) {
             status: "completed"
           }).where(eq(omniEvents.externalId, payload.externalId)).returning();
           if (updated.length === 0) {
-            const chatUuid = await resolveChatUuid(sdb, metadata.instanceId, payload.chatId);
+            const chatLink = await resolveChatLink(sdb, metadata.instanceId, payload.chatId);
             const newEvent = {
               ...eventIdInsert(event.id),
               externalId: payload.externalId,
@@ -397799,7 +397880,7 @@ async function setupEventPersistence(eventBus, db2) {
               agentId: metadata.agentId ?? null,
               causationId: metadata.causationId ?? null,
               conversationId: null,
-              chatUuid
+              ...chatLink
             };
             await sdb.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
           }
@@ -397824,7 +397905,7 @@ async function setupEventPersistence(eventBus, db2) {
             readAt: new Date(payload.readAt)
           }).where(eq(omniEvents.externalId, payload.externalId)).returning();
           if (updated.length === 0) {
-            const chatUuid = await resolveChatUuid(sdb, metadata.instanceId, payload.chatId);
+            const chatLink = await resolveChatLink(sdb, metadata.instanceId, payload.chatId);
             const newEvent = {
               ...eventIdInsert(event.id),
               externalId: payload.externalId,
@@ -397839,7 +397920,7 @@ async function setupEventPersistence(eventBus, db2) {
               agentId: metadata.agentId ?? null,
               causationId: metadata.causationId ?? null,
               conversationId: null,
-              chatUuid
+              ...chatLink
             };
             await sdb.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
           }
@@ -397873,7 +397954,7 @@ async function setupEventPersistence(eventBus, db2) {
             }).where(and2(eq(omniEvents.instanceId, metadata.instanceId), eq(omniEvents.externalId, payload.externalId))).returning({ id: omniEvents.id });
           }
           if (updated.length === 0) {
-            const chatUuid = await resolveChatUuid(sdb, metadata.instanceId, payload.chatId);
+            const chatLink = await resolveChatLink(sdb, metadata.instanceId, payload.chatId);
             const newEvent = {
               ...eventIdInsert(event.id),
               externalId: payload.externalId,
@@ -397894,7 +397975,7 @@ async function setupEventPersistence(eventBus, db2) {
               agentId: metadata.agentId ?? null,
               causationId: metadata.causationId ?? null,
               conversationId: null,
-              chatUuid
+              ...chatLink
             };
             await sdb.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
           }
@@ -397922,7 +398003,8 @@ async function setupEventPersistence(eventBus, db2) {
           const instanceId = metadata.instanceId && isValidUuid(metadata.instanceId) ? metadata.instanceId : null;
           const payloadChatId = typeof payload.chatId === "string" ? payload.chatId : undefined;
           const personId = await resolvePersonId2(sdb, metadata.personId) ?? await resolvePersonId2(sdb, payload.personId);
-          const chatUuid = await resolveChatUuidById(sdb, payload.chatUuid) ?? await resolveChatUuid(sdb, instanceId ?? undefined, payloadChatId);
+          const chatUuid = await resolveChatUuidById(sdb, payload.chatUuid);
+          const chatLink = chatUuid ? { chatUuid, canonicalChatId: null } : await resolveChatLink(sdb, instanceId ?? undefined, payloadChatId);
           const newEvent = {
             ...eventIdInsert(event.id),
             channel: "internal",
@@ -397941,7 +398023,7 @@ async function setupEventPersistence(eventBus, db2) {
             causationId: metadata.causationId ?? null,
             conversationId: null,
             chatId: payloadChatId,
-            chatUuid
+            ...chatLink
           };
           await sdb.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
         });
@@ -397959,14 +398041,16 @@ async function setupEventPersistence(eventBus, db2) {
     throw error3;
   }
 }
-var log125, CONSUMER_OPTIONS;
+var log125, NO_CHAT_LINK, CONSUMER_OPTIONS;
 var init_event_persistence = __esm(() => {
   init_src();
   init_src5();
   init_drizzle_orm();
+  init_chats();
   init_tenant_scope();
   init_worker_tenant_context();
   log125 = createLogger("event-persistence");
+  NO_CHAT_LINK = { chatUuid: null, canonicalChatId: null };
   CONSUMER_OPTIONS = {
     queue: "event-persistence",
     maxRetries: 3,
@@ -401227,6 +401311,7 @@ function startBunServer(app) {
   return Bun.serve({
     port: PORT,
     hostname: HOST,
+    idleTimeout: 60,
     fetch(req, server) {
       const url = new URL(req.url);
       if (url.pathname.startsWith("/api/v2/voice/stream/")) {
@@ -407437,10 +407522,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 +528173,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 +531415,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.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/automagik-dev/omni.git",