@automagik/omni 2.260423.9 → 2.260424.1

package/dist/index.js

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

package/dist/server/index.js

@@ -22659,6 +22659,10 @@ function generateCorrelationId(prefix = "corr") {
   const random = Math.random().toString(36).substring(2, 10);
   return `${prefix}-${timestamp}-${random}`;
 }
+function isValidUuid(id) {
+  const uuidRegex2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+  return uuidRegex2.test(id);
+}
 var init_ids = () => {};
 
 // ../../node_modules/.bun/croner@9.1.0/node_modules/croner/dist/croner.js
@@ -224550,7 +224554,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package8 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260423.9",
+    version: "2.260424.1",
     type: "module",
     exports: {
       ".": {
@@ -280781,7 +280785,7 @@ class FollowUpSweeperService {
         lastInboundCustomerMessageAt: chatFollowUpState.lastInboundCustomerMessageAt,
         chatName: chats.name,
         channelType: instances.channel
-      }).from(chatFollowUpState).leftJoin(chats, eq(chatFollowUpState.chatId, chats.id)).leftJoin(instances, eq(chatFollowUpState.instanceId, instances.id)).where(and2(isNull2(chatFollowUpState.disarmReason), lte(chatFollowUpState.nextFireAt, now))).orderBy(chatFollowUpState.nextFireAt).limit(limit2).for("update", { of: chatFollowUpState, skipLocked: true });
+      }).from(chatFollowUpState).leftJoin(chats, eq(chatFollowUpState.chatId, chats.id)).leftJoin(instances, eq(chatFollowUpState.instanceId, instances.id)).where(and2(isNull2(chatFollowUpState.disarmReason), lte(chatFollowUpState.nextFireAt, now), sql`(${chats.settings}->>'agentPaused')::boolean IS DISTINCT FROM true`)).orderBy(chatFollowUpState.nextFireAt).limit(limit2).for("update", { of: chatFollowUpState, skipLocked: true });
       return claimed;
     });
     return rows.map((r) => ({
@@ -300724,6 +300728,11 @@ var init_messages5 = __esm(() => {
     await services.chats.update(data.chatId, {
       settings: { agentPaused: true }
     });
+    await services.followUpLifecycle.disarm({
+      chatId: data.chatId,
+      instanceId: data.instanceId,
+      reason: "handoff"
+    });
     db2.insert(handoffLogs).values({
       instanceId: data.instanceId,
       chatUuid: data.chatId,
@@ -302860,6 +302869,9 @@ function mapContentType2(contentType) {
   }
   return null;
 }
+function eventIdInsert(eventId) {
+  return eventId && isValidUuid(eventId) ? { id: eventId } : {};
+}
 async function resolveChatUuid(db2, instanceId, chatId) {
   if (!instanceId || !chatId)
     return null;
@@ -302883,6 +302895,7 @@ async function setupEventPersistence(eventBus, db2) {
       try {
         const chatUuid = await resolveChatUuid(db2, metadata.instanceId, payload.chatId);
         const newEvent = {
+          ...eventIdInsert(event.id),
           externalId: payload.externalId,
           channel: mapChannelType(metadata.channelType),
           instanceId: metadata.instanceId,
@@ -302907,7 +302920,7 @@ async function setupEventPersistence(eventBus, db2) {
           conversationId: null,
           chatUuid
         };
-        await db2.insert(omniEvents).values(newEvent);
+        await db2.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
         if (metadata.timings && metadata.correlationId) {
           const tracker = getJourneyTracker();
           tracker.recordCheckpoint(metadata.correlationId, "T4", JOURNEY_STAGES.T4);
@@ -302929,6 +302942,7 @@ async function setupEventPersistence(eventBus, db2) {
       try {
         const chatUuid = await resolveChatUuid(db2, metadata.instanceId, payload.chatId);
         const newEvent = {
+          ...eventIdInsert(event.id),
           externalId: payload.externalId,
           channel: mapChannelType(metadata.channelType),
           instanceId: metadata.instanceId,
@@ -302952,7 +302966,7 @@ async function setupEventPersistence(eventBus, db2) {
           conversationId: null,
           chatUuid
         };
-        await db2.insert(omniEvents).values(newEvent);
+        await db2.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
         log104.debug("Persisted message.sent", {
           externalId: payload.externalId,
           instanceId: metadata.instanceId
@@ -302975,6 +302989,7 @@ async function setupEventPersistence(eventBus, db2) {
         if (updated.length === 0) {
           const chatUuid = await resolveChatUuid(db2, metadata.instanceId, payload.chatId);
           const newEvent = {
+            ...eventIdInsert(event.id),
             externalId: payload.externalId,
             channel: mapChannelType(metadata.channelType),
             instanceId: metadata.instanceId,
@@ -302988,7 +303003,7 @@ async function setupEventPersistence(eventBus, db2) {
             conversationId: null,
             chatUuid
           };
-          await db2.insert(omniEvents).values(newEvent);
+          await db2.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
         }
         log104.debug("Persisted message.delivered", {
           externalId: payload.externalId
@@ -303010,6 +303025,7 @@ async function setupEventPersistence(eventBus, db2) {
         if (updated.length === 0) {
           const chatUuid = await resolveChatUuid(db2, metadata.instanceId, payload.chatId);
           const newEvent = {
+            ...eventIdInsert(event.id),
             externalId: payload.externalId,
             channel: mapChannelType(metadata.channelType),
             instanceId: metadata.instanceId,
@@ -303023,7 +303039,7 @@ async function setupEventPersistence(eventBus, db2) {
             conversationId: null,
             chatUuid
           };
-          await db2.insert(omniEvents).values(newEvent);
+          await db2.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
         }
         log104.debug("Persisted message.read", {
           externalId: payload.externalId
@@ -303041,6 +303057,7 @@ async function setupEventPersistence(eventBus, db2) {
       try {
         const chatUuid = await resolveChatUuid(db2, metadata.instanceId, payload.chatId);
         const newEvent = {
+          ...eventIdInsert(event.id),
           externalId: payload.externalId,
           channel: mapChannelType(metadata.channelType),
           instanceId: metadata.instanceId,
@@ -303060,7 +303077,7 @@ async function setupEventPersistence(eventBus, db2) {
           conversationId: null,
           chatUuid
         };
-        await db2.insert(omniEvents).values(newEvent);
+        await db2.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
         log104.debug("Persisted message.failed", {
           chatId: payload.chatId,
           error: payload.error
@@ -303125,6 +303142,9 @@ function shouldProcess(contentType) {
     return false;
   return PROCESSABLE_MEDIA_TYPES.has(contentType);
 }
+function isUuid(value) {
+  return typeof value === "string" && isValidUuid(value);
+}
 function getMimeType2(content) {
   if (content.mimeType)
     return content.mimeType;
@@ -303203,6 +303223,28 @@ async function resolveMediaPath2(ctx, instanceId, chatId, externalId, content, m
     fullPath: join25(ctx.mediaStorage.getBasePath(), filePath)
   };
 }
+async function resolveSafeMediaContentEventId(ctx, eventId) {
+  if (!isUuid(eventId))
+    return null;
+  const maxWaitMs = 250;
+  const pollMs = 50;
+  const deadline = Date.now() + maxWaitMs;
+  while (true) {
+    try {
+      const [event] = await ctx.db.select({ id: omniEvents.id }).from(omniEvents).where(eq(omniEvents.id, eventId)).limit(1);
+      if (event)
+        return event.id;
+    } catch (error2) {
+      log105.debug("Failed to validate media_content event FK", { eventId, error: String(error2) });
+      return null;
+    }
+    if (Date.now() >= deadline) {
+      log105.debug("Skipping media_content event FK; omni_event not found", { eventId });
+      return null;
+    }
+    await new Promise((resolve4) => setTimeout(resolve4, pollMs));
+  }
+}
 async function persistProcessingResult(ctx, messageId, eventId, result, contentType) {
   if (result.content) {
     const updateField = getContentFieldForType(result.processingType, contentType);
@@ -303211,8 +303253,9 @@ async function persistProcessingResult(ctx, messageId, eventId, result, contentT
     }
   }
   try {
+    const safeEventId = await resolveSafeMediaContentEventId(ctx, eventId);
     await ctx.db.insert(mediaContent).values({
-      eventId: eventId ?? undefined,
+      eventId: safeEventId,
       mediaId: messageId,
       processingType: result.processingType,
       content: result.content ?? "",
@@ -424351,6 +424394,15 @@ init_src();
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "fs";
 import { basename, dirname as dirname2, join as join8 } from "path";
 
+// ../channel-whatsapp/src/utils/message.ts
+function getDocumentMessage(message2) {
+  return message2?.documentMessage ?? message2?.documentWithCaptionMessage?.message?.documentMessage;
+}
+function getMessageContextInfo(msg) {
+  const message2 = msg.message;
+  return message2?.extendedTextMessage?.contextInfo ?? message2?.imageMessage?.contextInfo ?? message2?.videoMessage?.contextInfo ?? getDocumentMessage(message2)?.contextInfo;
+}
+
 // ../channel-whatsapp/src/utils/download.ts
 function detectMediaType(msg) {
   const message2 = msg.message;
@@ -424377,11 +424429,12 @@ function detectMediaType(msg) {
       duration: message2.videoMessage.seconds || undefined
     };
   }
-  if (message2.documentMessage) {
+  const documentMessage = getDocumentMessage(message2);
+  if (documentMessage) {
     return {
       type: "document",
-      mimeType: message2.documentMessage.mimetype || "application/octet-stream",
-      filename: message2.documentMessage.fileName || undefined
+      mimeType: documentMessage.mimetype || "application/octet-stream",
+      filename: documentMessage.fileName || undefined
     };
   }
   if (message2.stickerMessage) {
@@ -424472,8 +424525,9 @@ function getMediaSize(msg) {
   if (message2.videoMessage?.fileLength) {
     return Number(message2.videoMessage.fileLength);
   }
-  if (message2.documentMessage?.fileLength) {
-    return Number(message2.documentMessage.fileLength);
+  const documentMessage = getDocumentMessage(message2);
+  if (documentMessage?.fileLength) {
+    return Number(documentMessage.fileLength);
   }
   if (message2.stickerMessage?.fileLength) {
     return Number(message2.stickerMessage.fileLength);
@@ -424521,14 +424575,17 @@ var contentExtractors = [
     })
   },
   {
-    check: (m2) => !!m2.documentMessage,
-    extract: (m2) => ({
-      type: "document",
-      filename: m2.documentMessage?.fileName ?? undefined,
-      mimeType: m2.documentMessage?.mimetype ?? "application/octet-stream",
-      caption: m2.documentMessage?.caption ?? undefined,
-      mediaUrl: m2.documentMessage?.url ?? undefined
-    })
+    check: (m2) => !!getDocumentMessage(m2),
+    extract: (m2) => {
+      const document2 = getDocumentMessage(m2);
+      return {
+        type: "document",
+        filename: document2?.fileName ?? undefined,
+        mimeType: document2?.mimetype ?? "application/octet-stream",
+        caption: document2?.caption ?? undefined,
+        mediaUrl: document2?.url ?? undefined
+      };
+    }
   },
   {
     check: (m2) => !!m2.stickerMessage,
@@ -424781,10 +424838,6 @@ function extractPhoneFromVcard(vcard) {
   }
   return;
 }
-function getMessageContextInfo(msg) {
-  const message2 = msg.message;
-  return message2?.extendedTextMessage?.contextInfo ?? message2?.imageMessage?.contextInfo ?? message2?.videoMessage?.contextInfo ?? message2?.documentMessage?.contextInfo;
-}
 function getReplyToId2(msg) {
   const contextInfo = getMessageContextInfo(msg);
   return contextInfo?.stanzaId || undefined;
@@ -427573,10 +427626,6 @@ class WhatsAppPlugin extends BaseChannelPlugin {
       }
     }
   }
-  getMessageContextInfo(rawMessage) {
-    const message2 = rawMessage.message;
-    return message2?.extendedTextMessage?.contextInfo ?? message2?.imageMessage?.contextInfo ?? message2?.videoMessage?.contextInfo ?? message2?.documentMessage?.contextInfo;
-  }
   async handleMessageReceived(instanceId, externalId, chatId, from, content, replyToId, rawMessage, isFromMe2, platformTimestamp) {
     if (externalId && rawMessage.key) {
       const cacheKey = `${instanceId}:${externalId}`;
@@ -427601,7 +427650,7 @@ class WhatsAppPlugin extends BaseChannelPlugin {
       ...rawMessage,
       isFromMe: isFromMe2
     };
-    const contextInfo = this.getMessageContextInfo(rawMessage);
+    const contextInfo = getMessageContextInfo(rawMessage);
     if (contextInfo?.mentionedJid && contextInfo.mentionedJid.length > 0) {
       extendedPayload.mentionedJids = contextInfo.mentionedJid;
       this.logger.debug("Processing mentioned JIDs", {
@@ -428185,6 +428234,7 @@ class WhatsAppPlugin extends BaseChannelPlugin {
     return null;
   }
   extractMediaContent(message2) {
+    const documentMessage = getDocumentMessage(message2);
     if (message2.imageMessage) {
       return {
         type: "image",
@@ -428202,11 +428252,11 @@ class WhatsAppPlugin extends BaseChannelPlugin {
         caption: message2.videoMessage.caption ?? undefined
       };
     }
-    if (message2.documentMessage) {
+    if (documentMessage) {
       return {
         type: "document",
-        mimeType: message2.documentMessage.mimetype ?? "application/octet-stream",
-        caption: message2.documentMessage.caption ?? undefined
+        mimeType: documentMessage.mimetype ?? "application/octet-stream",
+        caption: documentMessage.caption ?? undefined
       };
     }
     if (message2.stickerMessage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260423.9",
+  "version": "2.260424.1",
   "description": "LLM-optimized CLI for Omni",
   "type": "module",
   "bin": {
@@ -39,15 +39,15 @@
     "qrcode-terminal": "^0.12.0"
   },
   "devDependencies": {
-    "@omni/api": "2.260423.8",
-    "@omni/channel-discord": "2.260423.8",
-    "@omni/channel-gupshup": "2.260423.8",
-    "@omni/channel-sdk": "2.260423.8",
-    "@omni/channel-slack": "2.260423.8",
-    "@omni/channel-telegram": "2.260423.8",
-    "@omni/channel-whatsapp": "2.260423.8",
-    "@omni/core": "2.260423.8",
-    "@omni/sdk": "2.260423.8",
+    "@omni/api": "2.260423.10",
+    "@omni/channel-discord": "2.260423.10",
+    "@omni/channel-gupshup": "2.260423.10",
+    "@omni/channel-sdk": "2.260423.10",
+    "@omni/channel-slack": "2.260423.10",
+    "@omni/channel-telegram": "2.260423.10",
+    "@omni/channel-whatsapp": "2.260423.10",
+    "@omni/core": "2.260423.10",
+    "@omni/sdk": "2.260423.10",
     "@types/node": "^22.10.3",
     "@types/qrcode-terminal": "^0.12.2",
     "typescript": "^5.7.3"